diff --git a/.config/cava/config b/.config/cava/config
deleted file mode 100644
index e2f033c..0000000
--- a/.config/cava/config
+++ /dev/null
@@ -1,11 +0,0 @@
-[color]
-gradient = 1
-
-gradient_color_1 = '#94e2d5'
-gradient_color_2 = '#89dceb'
-gradient_color_3 = '#74c7ec'
-gradient_color_4 = '#89b4fa'
-gradient_color_5 = '#cba6f7'
-gradient_color_6 = '#f5c2e7'
-gradient_color_7 = '#eba0ac'
-gradient_color_8 = '#f38ba8'
diff --git a/.config/cava/config b/.config/cava/config
new file mode 120000
index 0000000..498bc27
--- /dev/null
+++ b/.config/cava/config
@@ -0,0 +1 @@
+../../../.cache/wal/cava
\ No newline at end of file
diff --git a/.config/cava/config.bak b/.config/cava/config.bak
new file mode 100644
index 0000000..e2f033c
--- /dev/null
+++ b/.config/cava/config.bak
@@ -0,0 +1,11 @@
+[color]
+gradient = 1
+
+gradient_color_1 = '#94e2d5'
+gradient_color_2 = '#89dceb'
+gradient_color_3 = '#74c7ec'
+gradient_color_4 = '#89b4fa'
+gradient_color_5 = '#cba6f7'
+gradient_color_6 = '#f5c2e7'
+gradient_color_7 = '#eba0ac'
+gradient_color_8 = '#f38ba8'
diff --git a/.config/fuzzel/fuzzel.ini b/.config/fuzzel/fuzzel.ini
deleted file mode 100644
index 5142263..0000000
--- a/.config/fuzzel/fuzzel.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[main]
-dpi-aware=no
-lines=10
-filter-desktop=yes
-icon-theme=Papirus-Dark
-font=Fira Code:size=12
-terminal=foot -e
-list-executables-in-path=yes
-password-character=*
-width=80
-horizontal-pad=10
-vertical-pad=10
-inner-pad=5
-
-[colors]
-background=1e1e2edd
-text=cdd6f4ff
-prompt=bac2deff
-placeholder=7f849cff
-input=cdd6f4ff
-match=89b4faff
-selection=585b70ff
-selection-text=cdd6f4ff
-selection-match=89b4faff
-counter=7f849cff
-border=89b4faff
-
-[key-bindings]
-execute-input=Control+Return Shift+KP_Enter
diff --git a/.config/fuzzel/fuzzel.ini b/.config/fuzzel/fuzzel.ini
new file mode 120000
index 0000000..a8fa42d
--- /dev/null
+++ b/.config/fuzzel/fuzzel.ini
@@ -0,0 +1 @@
+../../../.cache/wal/colors-fuzzel.ini
\ No newline at end of file
diff --git a/.config/fuzzel/fuzzel.ini.bak b/.config/fuzzel/fuzzel.ini.bak
new file mode 100644
index 0000000..5142263
--- /dev/null
+++ b/.config/fuzzel/fuzzel.ini.bak
@@ -0,0 +1,29 @@
+[main]
+dpi-aware=no
+lines=10
+filter-desktop=yes
+icon-theme=Papirus-Dark
+font=Fira Code:size=12
+terminal=foot -e
+list-executables-in-path=yes
+password-character=*
+width=80
+horizontal-pad=10
+vertical-pad=10
+inner-pad=5
+
+[colors]
+background=1e1e2edd
+text=cdd6f4ff
+prompt=bac2deff
+placeholder=7f849cff
+input=cdd6f4ff
+match=89b4faff
+selection=585b70ff
+selection-text=cdd6f4ff
+selection-match=89b4faff
+counter=7f849cff
+border=89b4faff
+
+[key-bindings]
+execute-input=Control+Return Shift+KP_Enter
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 0cfe40f..ee06b7e 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,11 +1,12 @@
+source = $HOME/.cache/wal/colors-hyprland.conf
 autogenerated = 0
 
 ###################
 ### MY PROGRAMS ###
 ###################
-$terminal = footclient
+$terminal = footclient -o include=~/.cache/wal/colors-foot.ini
 $menu = fuzzel
-$browser = zen-browser
+$browser = librewolf
 
 
 #################
@@ -85,10 +86,8 @@ general {
     border_size = 2
     resize_on_border = false
     allow_tearing = false
-    # col.active_border = rgba(7da6ffee)
-    # col.inactive_border = rgba(888e8eaa)
-    col.active_border = rgb(8aadf4) rgb(24273A) rgb(24273A) rgb(8aadf4) 45deg
-    col.inactive_border = rgb(24273A) rgb(24273A) rgb(24273A) rgb(27273A) 45deg
+    col.active_border = $color14 $color0 $color0 $color14 45deg
+    col.inactive_border = $color0 $color0 $color0 $color0 45deg
     layout = master
 }
 
@@ -261,7 +260,7 @@ bind = $mainMod, S, togglespecialworkspace, magic
 bind = $mainMod SHIFT, S, movetoworkspace, special:magic
 
 # Have scratchpad like DWM which opens alacritty in special workspace
-workspace = special:h, on-created-empty: footclient
+workspace = special:h, on-created-empty: footclient -o include=~/.cache/wal/colors-foot.ini
 bind = $mainMod SHIFT, Return, togglespecialworkspace, h
 
 
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 5fe9fa3..aedfce1 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,100 +1,60 @@
-source = $HOME/.config/hypr/mocha.conf
+# -- pywal colors --
+source = $HOME/.cache/wal/colors-hyprland.conf
 
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-$font = Fira Code
-
-# GENERAL
 general {
-  hide_cursor = true
+    hide_cursor = true
+    no_fade_in = false
+    grace = 0
+    disable_loading_bar = true
 }
 
-# BACKGROUND
+
 background {
   monitor =
-  path = $HOME/.config/background
   blur_passes = 0
-  color = $base
+  color = $background
 }
 
-# LAYOUT
+# -- time --
 label {
-  monitor =
-  text = Layout: $LAYOUT
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = 30, -30
-  halign = left
-  valign = top
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%H:%M")"
+    color = $color7
+    font_size = 80
+    font_family = Fira Code ExtraBold
+    position = 0, 100
+    halign = center
+    valign = center
 }
 
-# TIME
+
+# -- greeting --
 label {
-  monitor =
-  text = $TIME
-  color = $text
-  font_size = 90
-  font_family = $font
-  position = -30, 0
-  halign = right
-  valign = top
+    monitor =
+    text = Hello $USER :3
+    color = $color7
+    font_size = 20
+    font_family = Fira Code
+    position = 0, 0
+    halign = center
+    valign = center
 }
 
-# DATE
-label {
-  monitor =
-  text = cmd[update:43200000] date +"%A, %d %B %Y"
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = -30, -150
-  halign = right
-  valign = top
-}
-
-# FINGERPRINT
-{
-  monitor = "";
-  text = "$FPRINTPROMPT";
-  color = "$text";
-  font_size = 14;
-  font_family = $font;
-  position = "0, -107";
-  halign = "center";
-  valign = "center";
-}
-
-# USER AVATAR
-image {
-  monitor =
-  path = $HOME/.face
-  size = 100
-  border_color = $accent
-  position = 0, 75
-  halign = center
-  valign = center
-}
-
-# INPUT FIELD
+# -- password input --
 input-field {
-  monitor =
-  size = 300, 60
-  outline_thickness = 4
-  dots_size = 0.2
-  dots_spacing = 0.2
-  dots_center = true
-  outer_color = $accent
-  inner_color = $surface0
-  font_color = $text
-  fade_on_empty = false
-  placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
-  hide_input = false
-  check_color = $accent
-  fail_color = $red
-  fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-  capslock_color = $yellow
-  position = 0, -47
-  halign = center
-  valign = center
+    monitor =
+    size = 230, 40
+    outline_thickness = 0
+    dots_size = 0.2
+    dots_spacing = 0.4
+    dots_center = true
+    inner_color = $color1
+    font_color = $color7
+    fade_on_empty = false
+    placeholder_text = <span foreground='white'><i>Unlock the mystery</i></span>
+    fail_color = $color7
+    hide_input = false
+    position = 0, -50
+    halign = center
+    valign = center
 }
diff --git a/.config/hypr/mocha.conf b/.config/hypr/mocha.conf
deleted file mode 100644
index 8ccb56a..0000000
--- a/.config/hypr/mocha.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b
diff --git a/.config/shell/profile b/.config/shell/profile
index 3901d4a..aaa8e14 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -3,7 +3,7 @@
 export EDITOR="nvim"
 export TERMINAL="foot"
 export TERMINAL_PROG="foot"
-export BROWSER="zen-browser"
+export BROWSER="librewolf"
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
diff --git a/.config/swaync/style.css b/.config/swaync/style.css
index bbe5dc8..29e2d30 100644
--- a/.config/swaync/style.css
+++ b/.config/swaync/style.css
@@ -1,324 +1,176 @@
+@import '../../.cache/wal/colors-waybar.css';
+
+@define-color text            @foreground;
+@define-color bg              @color1;
+@define-color selected        @color6;
+@define-color hover           alpha(@selected, .4);
+
 * {
-  all: unset;
-  font-size: 14px;
-  font-family: "Ubuntu Nerd Font";
-  transition: 200ms;
+    outline: none;
+    transition: 200ms;
 }
 
-trough highlight {
-  background: #cdd6f4;
+.notification-row {
+    outline: none;
+    margin: 0;
+    padding: 0px;
 }
 
-scale {
-  margin: 0 7px;
+.notification-row .notification-background .close-button {
+    /* The notification Close Button */
+    background: transparent;
+    color: @text;
+    text-shadow: none;
+    box-shadow: none;
+    margin-top: 2px;
+    margin-right: 2px;
+    padding: 0;
+    border: none;
+    border-radius: 100%;
+    min-width: 24px;
+    min-height: 24px;
 }
 
-scale trough {
-  margin: 0rem 1rem;
-  min-height: 8px;
-  min-width: 70px;
-  border-radius: 12.6px;
+.notification-row .notification-background .close-button:hover {
+    box-shadow: none;
+    background: @hover;
+    transition: background 0.15s ease-in-out;
+    border: 0px;
 }
 
-trough slider {
-  margin: -10px;
-  border-radius: 12.6px;
-  box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
-  transition: all 0.2s ease;
-  background-color: #89b4fa;
+.notification-row .notification-background .notification {
+    /* The actual notification */
+    background: @background;
 }
 
-trough slider:hover {
-  box-shadow: 0 0 2px rgba(0, 0, 0, 0.8), 0 0 8px #89b4fa;
+.notification-row .notification-background .notification .notification-action, .notification-row .notification-background .notification .notification-default-action {
+    color: @text;
 }
 
-trough {
-  background-color: #313244;
+.notification-row .notification-background .notification .notification-action:hover, .notification-row .notification-background .notification .notification-default-action:hover {
+    -gtk-icon-effect: none;
+    background: @hover;
 }
 
-/* notifications */
-.notification-background {
-  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #45475a;
-  border-radius: 12.6px;
-  margin: 18px;
-  background: #181825;
-  color: #cdd6f4;
-  padding: 0;
+.notification-group .notification-group-headers {
+    /* Notficiation Group Headers */
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 
-.notification-background .notification {
-  padding: 7px;
-  border-radius: 12.6px;
+.notification-group .notification-group-headers .notification-group-header {
+    font-size: 20px;
+    margin-left: 3px;
 }
 
-.notification-background .notification.critical {
-  box-shadow: inset 0 0 7px 0 #f38ba8;
+.notification-group.collapsed .notification-row .notification {
+    background-color: @background;
 }
 
-.notification .notification-content {
-  margin: 7px;
+.notification-group.collapsed:hover .notification-row:not(:only-child) .notification {
+    /* Notification Group collapsed, hovered */
+    box-shadow: 0 0 0 1px alpha(@hover, 0.3), 0 1px 3px 1px alpha(@hover, 0.3), 0 2px 6px 2px alpha(@hover, 0.3);
 }
 
-.notification .notification-content overlay {
-  /* icons */
-  margin: 4px;
-}
-
-.notification-content .summary {
-  color: #cdd6f4;
-}
-
-.notification-content .time {
-  color: #a6adc8;
-}
-
-.notification-content .body {
-  color: #bac2de;
-}
-
-.notification > *:last-child > * {
-  min-height: 3.4em;
-}
-
-.notification-background .close-button {
-  margin: 7px;
-  padding: 2px;
-  border-radius: 6.3px;
-  color: #1e1e2e;
-  background-color: #f38ba8;
-}
-
-.notification-background .close-button:hover {
-  background-color: #eba0ac;
-}
-
-.notification-background .close-button:active {
-  background-color: #f5c2e7;
-}
-
-.notification .notification-action {
-  border-radius: 7px;
-  color: #cdd6f4;
-  box-shadow: inset 0 0 0 1px #45475a;
-  margin: 4px;
-  padding: 8px;
-  font-size: 0.2rem; /* controls the button size not text size*/
-}
-
-.notification .notification-action {
-  background-color: #313244;
-}
-
-.notification .notification-action:hover {
-  background-color: #45475a;
-}
-
-.notification .notification-action:active {
-  background-color: #585b70;
-}
-
-.notification.critical progress {
-  background-color: #f38ba8;
-}
-
-.notification.low progress,
-.notification.normal progress {
-  background-color: #89b4fa;
-}
-
-.notification progress,
-.notification trough,
-.notification progressbar {
-  border-radius: 12.6px;
-  padding: 3px 0;
-}
-
-/* control center */
 .control-center {
-  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244;
-  border-radius: 12.6px;
-  background-color: #1e1e2e;
-  color: #cdd6f4;
-  padding: 14px;
+    /* The Control Center which contains the old notifications + widgets */
+    box-shadow: 0px 2px 5px black;
+    background: alpha(@background, .55);
+    border: 2px solid @selected;
 }
 
-.control-center .notification-background {
-  border-radius: 7px;
-  box-shadow: inset 0 0 0 1px #45475a;
-  margin: 4px 10px;
+.control-center-clear-all {
+    /* Clear All button */
+    background: @bg;
 }
 
-.control-center .notification-background .notification {
-  border-radius: 7px;
+.control-center-clear-all:hover {
+    background: @hover;
 }
 
-.control-center .notification-background .notification.low {
-  opacity: 0.8;
+.control-center-clear-all:active {
+    background: @selected;
 }
 
-.control-center .widget-title > label {
-  color: #cdd6f4;
-  font-size: 1.3em;
+/*** Widgets ***/
+/* Title widget */
+.widget-title {
+    background: none;
+    margin-top: 15px;
+    margin-left: 15px;
+    margin-right: 15px;
 }
 
-.control-center .widget-title button {
-  border-radius: 7px;
-  color: #cdd6f4;
-  background-color: #313244;
-  box-shadow: inset 0 0 0 1px #45475a;
-  padding: 8px;
-}
-
-.control-center .widget-title button:hover {
-  background-color: #45475a;
-}
-
-.control-center .widget-title button:active {
-  background-color: #585b70;
-}
-
-.control-center .notification-group {
-  margin-top: 10px;
-}
-
-scrollbar slider {
-  margin: -3px;
-  opacity: 0.8;
-}
-
-scrollbar trough {
-  margin: 2px 0;
-}
-
-/* dnd */
+/* Do Not Disturb widget */
 .widget-dnd {
-  margin-top: 5px;
-  border-radius: 8px;
-  font-size: 1.1rem;
+    background: none;
+    margin-left: 15px;
+    margin-right: 15px;
 }
 
 .widget-dnd > switch {
-  font-size: initial;
-  border-radius: 8px;
-  background: #313244;
-  box-shadow: none;
+    background: @bg;
+    font-size: initial;
+    border-radius: 12px;
+    box-shadow: none;
+    padding: 2px;
+}
+
+.widget-dnd > switch:hover {
+    background: @hover;
 }
 
 .widget-dnd > switch:checked {
-  background: #89b4fa;
+    background: @selected;
 }
 
 .widget-dnd > switch slider {
-  background: #45475a;
-  border-radius: 8px;
+    background: @text;
+    border-radius: 12px;
 }
 
-/* mpris */
-.widget-mpris-player {
-  background: #313244;
-  border-radius: 12.6px;
-  color: #cdd6f4;
+/* Media Player widget */
+@define-color mpris-album-art-overlay rgba(0, 0, 0, 0.55);
+@define-color mpris-button-hover rgba(0, 0, 0, 0.50);
+.widget-mpris {
 }
 
-.mpris-overlay {
-  background-color: #313244;
-  opacity: 0.9;
-  padding: 15px 10px;
+.widget-mpris .widget-mpris-player {
+    padding: 10px;
+    margin: 8px 15px;
+    background-color: @mpris-album-art-overlay;
+    box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.75);
+    border: 2px;
 }
 
-.widget-mpris-album-art {
-  -gtk-icon-size: 100px;
-  border-radius: 12.6px;
-  margin: 0 10px;
+.widget-mpris .widget-mpris-player .widget-mpris-title {
+    font-size: 16px;
 }
 
-.widget-mpris-title {
-  font-size: 1.2rem;
-  color: #cdd6f4;
-}
-
-.widget-mpris-subtitle {
-  font-size: 1rem;
-  color: #bac2de;
-}
-
-.widget-mpris button {
-  border-radius: 12.6px;
-  color: #cdd6f4;
-  margin: 0 5px;
-  padding: 2px;
-}
-
-.widget-mpris button image {
-  -gtk-icon-size: 1.8rem;
-}
-
-.widget-mpris button:hover {
-  background-color: #313244;
-}
-
-.widget-mpris button:active {
-  background-color: #45475a;
-}
-
-.widget-mpris button:disabled {
-  opacity: 0.5;
-}
-
-.widget-menubar > box > .menu-button-bar > button > label {
-  font-size: 3rem;
-  padding: 0.5rem 2rem;
-}
-
-.widget-menubar > box > .menu-button-bar > :last-child {
-  color: #f38ba8;
-}
-
-.power-buttons button:hover,
-.powermode-buttons button:hover,
-.screenshot-buttons button:hover {
-  background: #313244;
-}
-
-.control-center .widget-label > label {
-  color: #cdd6f4;
-  font-size: 2rem;
+.widget-mpris .widget-mpris-player .widget-mpris-subtitle {
+    font-size: 14px;
 }
 
+/* Buttons widget */
 .widget-buttons-grid {
-  padding-top: 1rem;
+    background-color: alpha(@color2, 0.5);
 }
 
-.widget-buttons-grid > flowbox > flowboxchild > button label {
-  font-size: 2.5rem;
+.widget-buttons-grid > flowbox > flowboxchild > button {
+    background: alpha(@color2, 0.5);
+    border-radius: 12px;
+    min-width: 45px;
 }
 
-.widget-volume {
-  padding: 1rem 0;
+.widget-buttons-grid > flowbox > flowboxchild > button:hover {
+    background: @hover;
 }
 
-.widget-volume label {
-  color: #74c7ec;
-  padding: 0 1rem;
+.widget-buttons-grid > flowbox > flowboxchild > button:active {
+    background: @selected;
 }
 
-.widget-volume trough highlight {
-  background: #74c7ec;
-}
-
-.widget-backlight trough highlight {
-  background: #f9e2af;
-}
-
-.widget-backlight label {
-  font-size: 1.5rem;
-  color: #f9e2af;
-}
-
-.widget-backlight .KB {
-  padding-bottom: 1rem;
-}
-
-.image {
-  padding-right: 0.5rem;
+.widget-buttons-grid > flowbox > flowboxchild > button.toggle:checked {
+    /* style given to the active toggle button */
+    background: red;
 }
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 41b0238..e2e710b 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -14,8 +14,8 @@
         "hyprland/window"
     ],
     "modules-right": [
-        "custom/gpumode",
         "tray",
+        "custom/gpumode",
         "pulseaudio",
         "battery",
         "backlight",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index cbdc817..7a5032a 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,39 +1,4 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;
+@import url('../../.cache/wal/colors-waybar.css');
 
 * {
 font-family: "Fira Code", "FontAwesome";
@@ -49,7 +14,7 @@ window#waybar {
   transition-property: background-color;
   transition-duration: 0.5s;
   /* background: transparent; */
-  background: @base ;
+  background: @background;
   /*border: 2px solid @overlay0;*/
   /*background: @theme_base_color;*/
   /* border-radius: 10px; */
@@ -77,12 +42,12 @@ window#waybar.hidden {
 
 /* non-empty workspaces */
 #workspaces button {
-    background-color: @base;
+    background-color: @background;
 
     border: none;
     border-radius: 0;
 
-    color: @text;
+    color: @foreground;
     transition: all 0.2s ease;
     text-shadow: none;
 
@@ -91,7 +56,7 @@ window#waybar.hidden {
     padding-right: 10px;
     /* padding-top: 1px; */
 
-    box-shadow: inset 0 -1px #e3e3e3;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 /* the first and last buttons should be rounded */
@@ -106,22 +71,22 @@ window#waybar.hidden {
 
 /* empty persistent workspaces */
 #workspaces button.empty {
-    background-color: @base;
+    background-color: @background;
     box-shadow: none;
 }
 
 #workspaces button:hover {
     /* transition-duration: .3s; */
-    color: @base;
-    background-color: #7da6ff;
-    box-shadow: inset 0 -1px #ffffff;
+    color: @background;
+    background-color: @color7;
+    box-shadow: inset 0 -1px @foreground;
     /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
     text-shadow: inherit;
 }
 
 /* non-empty persistent workspaces */
 #workspaces button.persistent {
-    background-color: #4c566a;
+    background-color: @color1;
 }
 
 
@@ -130,20 +95,20 @@ window#waybar.hidden {
 #workspaces button.active,
 #workspaces button.visible {
     /* background-color: #4c566a; */
-    color: @surface0;
-    background-color: #7da6ff;
+    color: @color0;
+    background-color: @color7;
     /* box-shadow: inset 0 -4px #eceff4; */
 }
 
 #workspaces button.urgent {
-    color: #bf616a;
+    color: @color3;
 }
 
 /**************/
 
 #mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
+    background-color: @color2;
+    border-bottom: 3px solid @foreground;
 }
 
 #clock,
@@ -164,7 +129,7 @@ window#waybar.hidden {
 #window,
 #custom-notification,
 #mpd {
-    background-color: @base;
+    background-color: @background;
     padding: 0 12px 0 12px;
     margin-left: 10px;
 
@@ -181,27 +146,33 @@ window#waybar.hidden {
 }
 
 #window {
-    color: @text
+    color: @foreground
 }
 
 #clock {
-    color: @text;
-    box-shadow: inset 0 -1px #eceff4;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 #custom-date {
-    color: #b48ead;
-    box-shadow: inset 0 -1px #b48ead;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
+#custom-gpumode{
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
+}
+
+
 #battery {
-    color: #ebcb8b;
-    box-shadow: inset 0 -1px #ebcb8b;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 #backlight {
-    color: @teal;
-    box-shadow: inset 0 -1px @teal;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 @keyframes blink {
@@ -212,8 +183,8 @@ window#waybar.hidden {
 }
 
 #battery.critical:not(.charging) {
-    background-color: #bf616a;
-    color: #ffffff;
+    background-color: @color5;
+    color: @foreground;
     animation-name: blink;
     animation-duration: 0.5s;
     animation-timing-function: linear;
@@ -226,13 +197,13 @@ label:focus {
 }
 
 #cpu {
-    color: #bf616a;
-    box-shadow: inset 0 -1px #bf616a;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 #memory {
-    color: #a3be8c;
-    box-shadow: inset 0 -1px #a3be8c;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 /* #disk {
@@ -240,33 +211,33 @@ label:focus {
 } */
 
 #network {
-    color: #5e81ac;
+    color: @color13;
 }
 
 #network.disconnected {
-    color: #81a1c1;
+    color: @color13;
 }
 
 #network.linked {
-    color: #bf616a;
+    color: @color10;
 }
 
 #pulseaudio {
-    color: @text;
-    box-shadow: inset 0 -1px @text;
+    color: @foreground;
+    box-shadow: inset 0 -1px @cursor;
 }
 
 
 #temperature {
-    color: #d08770;
+    color: @foreground;
 }
 
 #temperature.critical {
-    color: #bf616a;
+    color: @color2;
 }
 
 #tray {
-    color: @subtext0;
+    color: @color15;
     box-shadow: inset 0 -1px @subtext0;
 
 }
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
deleted file mode 100644
index 50680df..0000000
--- a/.config/zathura/zathurarc
+++ /dev/null
@@ -1,53 +0,0 @@
-set sandbox none
-set statusbar-h-padding 0
-set statusbar-v-padding 0
-set page-padding 1
-set selection-clipboard clipboard
-map u scroll half-up
-map d scroll half-down
-map D toggle_page_mode
-map r reload
-map R rotate
-map K zoom in
-map J zoom out
-map i recolor
-map p print
-map b toggle_statusbar
-
-set default-fg                rgba(205,214,244,1)
-set default-bg                rgba(30,30,46,1)
-
-set completion-bg             rgba(49,50,68,1)
-set completion-fg             rgba(205,214,244,1)
-set completion-highlight-bg   rgba(203,166,247,1)
-set completion-highlight-fg   rgba(30,30,46,1)
-set completion-group-bg       rgba(24,24,37,1)
-set completion-group-fg       rgba(205,214,244,1)
-
-set statusbar-fg              rgba(205,214,244,1)
-set statusbar-bg              rgba(17,17,27,1)
-set inputbar-fg               rgba(205,214,244,1)
-set inputbar-bg               rgba(30,30,46,1)
-
-set notification-bg           rgba(30,30,46,1)
-set notification-fg           rgba(205,214,244,1)
-set notification-error-bg     rgba(30,30,46,1)
-set notification-error-fg     rgba(243,139,168,1)
-set notification-warning-bg   rgba(30,30,46,1)
-set notification-warning-fg   rgba(249,226,175,1)
-
-# set recolor                   "true"
-set recolor-lightcolor        rgba(30,30,46,1)
-set recolor-darkcolor         rgba(205,214,244,1)
-
-set index-fg                  rgba(205,214,244,1)
-set index-bg                  rgba(30,30,46,1)
-set index-active-fg           rgba(205,214,244,1)
-set index-active-bg           rgba(49,50,68,1)
-
-set render-loading-bg         rgba(30,30,46,1)
-set render-loading-fg         rgba(205,214,244,1)
-
-set highlight-color           rgba(147,153,178,0.3)
-set highlight-fg              rgba(205,214,244,1)
-set highlight-active-color    rgba(203,166,247,0.3)
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
new file mode 120000
index 0000000..3c9cbb3
--- /dev/null
+++ b/.config/zathura/zathurarc
@@ -0,0 +1 @@
+../../../.cache/wal/colors-zathura
\ No newline at end of file
diff --git a/.config/zathura/zathurarc.bak b/.config/zathura/zathurarc.bak
new file mode 100644
index 0000000..50680df
--- /dev/null
+++ b/.config/zathura/zathurarc.bak
@@ -0,0 +1,53 @@
+set sandbox none
+set statusbar-h-padding 0
+set statusbar-v-padding 0
+set page-padding 1
+set selection-clipboard clipboard
+map u scroll half-up
+map d scroll half-down
+map D toggle_page_mode
+map r reload
+map R rotate
+map K zoom in
+map J zoom out
+map i recolor
+map p print
+map b toggle_statusbar
+
+set default-fg                rgba(205,214,244,1)
+set default-bg                rgba(30,30,46,1)
+
+set completion-bg             rgba(49,50,68,1)
+set completion-fg             rgba(205,214,244,1)
+set completion-highlight-bg   rgba(203,166,247,1)
+set completion-highlight-fg   rgba(30,30,46,1)
+set completion-group-bg       rgba(24,24,37,1)
+set completion-group-fg       rgba(205,214,244,1)
+
+set statusbar-fg              rgba(205,214,244,1)
+set statusbar-bg              rgba(17,17,27,1)
+set inputbar-fg               rgba(205,214,244,1)
+set inputbar-bg               rgba(30,30,46,1)
+
+set notification-bg           rgba(30,30,46,1)
+set notification-fg           rgba(205,214,244,1)
+set notification-error-bg     rgba(30,30,46,1)
+set notification-error-fg     rgba(243,139,168,1)
+set notification-warning-bg   rgba(30,30,46,1)
+set notification-warning-fg   rgba(249,226,175,1)
+
+# set recolor                   "true"
+set recolor-lightcolor        rgba(30,30,46,1)
+set recolor-darkcolor         rgba(205,214,244,1)
+
+set index-fg                  rgba(205,214,244,1)
+set index-bg                  rgba(30,30,46,1)
+set index-active-fg           rgba(205,214,244,1)
+set index-active-bg           rgba(49,50,68,1)
+
+set render-loading-bg         rgba(30,30,46,1)
+set render-loading-fg         rgba(205,214,244,1)
+
+set highlight-color           rgba(147,153,178,0.3)
+set highlight-fg              rgba(205,214,244,1)
+set highlight-active-color    rgba(203,166,247,0.3)
diff --git a/.local/bin/setwall b/.local/bin/setwall
index a18a971..a7d7a1f 100755
--- a/.local/bin/setwall
+++ b/.local/bin/setwall
@@ -38,9 +38,11 @@ if ! pgrep -x hyprpaper >/dev/null; then
 preload = $NEW_WALL
 wallpaper = ,$NEW_WALL
 EOF
+    wal -i $NEW_WALL
     hyprpaper &
 else
     # Hyprpaper is running → change it live
+    wal -i $NEW_WALL
     hyprctl hyprpaper preload "$NEW_WALL"
     hyprctl hyprpaper wallpaper ",$NEW_WALL"
 fi