diff --git a/.config/hypr/config/colors.conf b/.config/hypr/config/colors.conf
index 8ec54c1..f06fdcc 100644
--- a/.config/hypr/config/colors.conf
+++ b/.config/hypr/config/colors.conf
@@ -1,19 +1,19 @@
-$wallpaper = /usr/share/wallpapers/downloaded/pexels-jplenio-1102912.jpg
-$background = rgb(0E0E11)
-$foreground = rgb(FDF2DE)
-$color0 = rgb(38393C)
-$color1 = rgb(424652)
-$color2 = rgb(6A3E40)
-$color3 = rgb(736956)
-$color4 = rgb(897C88)
-$color5 = rgb(9B8166)
-$color6 = rgb(F9D9A2)
-$color7 = rgb(F4E4C8)
-$color8 = rgb(AA9F8C)
-$color9 = rgb(424652)
-$color10 = rgb(6A3E40)
-$color11 = rgb(736956)
-$color12 = rgb(897C88)
-$color13 = rgb(9B8166)
-$color14 = rgb(F9D9A2)
-$color15 = rgb(F4E4C8)
\ No newline at end of file
+$wallpaper = /usr/share/wallpapers/downloaded/pexels-alex-montes-892479-1820563.jpg
+$background = rgb(232525)
+$foreground = rgb(F8FBFB)
+$color0 = rgb(4E5052)
+$color1 = rgb(DE6D49)
+$color2 = rgb(978E7D)
+$color3 = rgb(49A2B8)
+$color4 = rgb(EEAFA6)
+$color5 = rgb(F6CE70)
+$color6 = rgb(EBF3F4)
+$color7 = rgb(EDF1F1)
+$color8 = rgb(A6A8A9)
+$color9 = rgb(DE6D49)
+$color10 = rgb(978E7D)
+$color11 = rgb(49A2B8)
+$color12 = rgb(EEAFA6)
+$color13 = rgb(F6CE70)
+$color14 = rgb(EBF3F4)
+$color15 = rgb(EDF1F1)
\ No newline at end of file
diff --git a/.config/hypr/config/keybinds.conf b/.config/hypr/config/keybinds.conf
index 6f0367b..8620a23 100644
--- a/.config/hypr/config/keybinds.conf
+++ b/.config/hypr/config/keybinds.conf
@@ -163,6 +163,7 @@ binds {
 
 # Toggle Waybar
 bind = $mainMod, W, exec, killall -SIGUSR1 waybar
+bind = $mainMod SHIFT, W, exec, killall -SIGUSR2 waybar # restart
 
 # ======= Monitors =======
 # Toggle Monitor Flip
diff --git a/.config/hypr/config/windowrules.conf b/.config/hypr/config/windowrules.conf
index 7d55223..fd08973 100644
--- a/.config/hypr/config/windowrules.conf
+++ b/.config/hypr/config/windowrules.conf
@@ -289,4 +289,18 @@ windowrule {
   match:class = ^(waypaper)$
   float = on
   center = on
+}
+
+windowrule {
+  name = calcure
+  match:title = ^(calcure)$
+  float = on
+  center = on
+}
+
+windowrule {
+  name = gnome-calculator-fix
+  match:class = ^(org.gnome.Calculator)$
+  float = on
+  center = on
 }
\ No newline at end of file
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index b522f60..37e8ef1 100644
--- a/.config/hypr/hypridle.conf
+++ b/.config/hypr/hypridle.conf
@@ -5,20 +5,20 @@ general {
 }
 
 listener {
-    timeout = 150                                # 2.5min.
+    timeout = 7200                            # 2.5min.
     on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
     on-resume = brightnessctl -r                 # monitor backlight restore.
 }
 
 # turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
 listener {
-    timeout = 150                                          # 2.5min.
+    timeout = 7200                                      # 2.5min.
     on-timeout = brightnessctl -sd asus::kbd_backlight set 0 # turn off keyboard backlight.
     on-resume = brightnessctl -rd asus::kbd_backlight        # turn on keyboard backlight.
 }
 
 listener {
-    timeout = 300                                 # 5min
+    timeout = 7200                                # 5min
     on-timeout = ~/.config/swaylock/lockscript.sh            # lock screen when timeout has passed
 }
 
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 93e0e6f..86a84c7 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -17,7 +17,8 @@ source = ~/.config/hypr/config/monitor.conf
 source = ~/.config/hypr/config/variables.conf
 source = ~/.config/hypr/config/windowrules.conf
 source = ~/.config/hypr/config/workspaces.conf
+source = ~/.config/hypr/config/plugins.conf
 
 # Modifying these configs can be done by creating a user defined config in the home directory, e.g.
 ## ~/.config/hypr/config/user-config.conf
-# source ~/.config/hypr/config/user-config.conf
+# source ~/.config/hypr/config/user-config.conf
\ No newline at end of file
diff --git a/.config/waybar/colors-wallust.css b/.config/waybar/colors-wallust.css
index b1639f9..8e9439d 100644
--- a/.config/waybar/colors-wallust.css
+++ b/.config/waybar/colors-wallust.css
@@ -1,19 +1,19 @@
-@define-color cursor #9D7C73;
-@define-color background #0E0E11;
-@define-color foreground #FDF2DE;
-@define-color color0  #38393C;
-@define-color color1  #424652;
-@define-color color2  #6A3E40;
-@define-color color3  #736956;
-@define-color color4  #897C88;
-@define-color color5  #9B8166;
-@define-color color6  #F9D9A2;
-@define-color color7  #F4E4C8;
-@define-color color8  #AA9F8C;
-@define-color color9  #424652;
-@define-color color10 #6A3E40;
-@define-color color11 #736956;
-@define-color color12 #897C88;
-@define-color color13 #9B8166;
-@define-color color14 #F9D9A2;
-@define-color color15 #F4E4C8;
+@define-color cursor #C2BEB5;
+@define-color background #232525;
+@define-color foreground #F8FBFB;
+@define-color color0  #4E5052;
+@define-color color1  #DE6D49;
+@define-color color2  #978E7D;
+@define-color color3  #49A2B8;
+@define-color color4  #EEAFA6;
+@define-color color5  #F6CE70;
+@define-color color6  #EBF3F4;
+@define-color color7  #EDF1F1;
+@define-color color8  #A6A8A9;
+@define-color color9  #DE6D49;
+@define-color color10 #978E7D;
+@define-color color11 #49A2B8;
+@define-color color12 #EEAFA6;
+@define-color color13 #F6CE70;
+@define-color color14 #EBF3F4;
+@define-color color15 #EDF1F1;
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 09f10c4..def526f 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -18,6 +18,7 @@
   "modules-left": [
     "clock",
     "custom/weather",
+    "tray",
     //"custom/rofi",
     "hyprland/workspaces",
     //"hyprland/submap",
@@ -30,20 +31,20 @@
   //        //"custom/gammastep"
   //    ],
   "modules-right": [
+    "cava",
+    "wireplumber",
     //"wlr/taskbar",
     //"custom/storage",
     "memory",
     "cpu",
     "temperature",
     "battery",
+
     //"pulseaudio",
-    "wireplumber",
-    "cava",
     //"backlight",
     "bluetooth",
     //"custom/screenshot_t",
     "custom/power_profiles",
-    //"tray",
     "custom/power",
   ],
 
@@ -84,17 +85,17 @@
   "clock#1": {
     "format": " {:%a}",
     "tooltip": false,
-    "on-click": "gnome-calendar",
+    "on-click": "kitty -e calcure --class=\"float\" -T calcure",
   },
   "clock#2": {
     "format": " {:%d-%h-%Y}",
     "tooltip": false,
-    "on-click": "gnome-calendar",
+    "on-click": "kitty -e calcure --class=\"float\" -T calcure",
   },
   "clock#3": {
     "format": " {:%H:%M:%S %p}",
     "tooltip": false,
-    "on-click": "gnome-calendar",
+    "on-click": "kitty -e calcure --class=\"float\" -T calcure",
   },
 
   "bluetooth": {
@@ -227,7 +228,7 @@
     "format": "  {:%H:%M   %e %b}",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
     "today-format": "<b>{}</b>",
-    "on-click": "gnome-calendar",
+    "on-click": "kitty -e calcure --class=\"float\" -T calcure",
   },
 
   "clock#date": {
@@ -380,8 +381,9 @@
   },
 
   "tray": {
-    "icon-size": 15,
+    "icon-size": 11,
     "spacing": 5,
+    "show-passive-items": true,
   },
 
   "custom/power_profiles": {
@@ -413,25 +415,28 @@
   },
 
   "cava": {
+    "on-click": "pavucontrol",
     // "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
     "framerate": 30,
+    "sensitivity": 3,
     "autosens": 1,
-    "sensitivity": 100,
-    "bars": 14,
-    "lower_cutoff_freq": 50,
+    "bars": 12,
+    "lower_cutoff_freq": 10,
     "higher_cutoff_freq": 10000,
     "hide_on_silence": false,
-    // "format_silent": "quiet",
-    "method": "pulse",
+    "format_silent": "quiet",
+    "method": "pipewire",
     "source": "auto",
-    "stereo": true,
+    "stereo": false,
     "reverse": false,
     "bar_delimiter": 0,
-    "monstercat": false,
-    "waves": false,
+    "bar_spacing": 1,
+    "monstercat": true,
+    "waves": true,
     "noise_reduction": 0.77,
     "input_delay": 2,
-    "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
+    "eq": { "1": 1.8, "2": 1.4, "3": 1.1, "4": 1.0, "5": 1.0 },
+    "format-icons": ["", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
     "actions": {
       "on-click-right": "mode",
     },
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 4f8ff1d..133dfd1 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -18,9 +18,8 @@
 
 .modules-left,
 .modules-right {
-  background-color: rgba(17, 24, 39, 0.5);
-  margin-top: 2px;
-  border-radius: 3px;
+  background-color: rgba(17, 24, 39, 0.1);
+  margin: 4px;
   padding: 3px 6px;
 }
 
@@ -40,20 +39,15 @@ window#waybar.empty #window {
   background-color: transparent;
 }
 
+/* --- Workspaces --- */
 #workspaces button {
   padding: 3px 2px;
   margin: 3px 2px;
   border-radius: 6px;
   color: @foreground;
-  background-color: @color0;
+  background-color: alpha(@foreground, 0.15);
   transition: all 0.3s ease-in-out;
-  font-size: 9px; /* Slightly smaller font size */
-}
-
-#workspaces {
-  background-color: transparent;
-  margin: 0;
-  padding: 0;
+  font-size: 9px;
 }
 
 #workspaces button.active {
@@ -69,15 +63,44 @@ window#waybar.empty #window {
   background-color: @color9;
 }
 
+#workspaces {
+  background-color: transparent;
+  margin: 0;
+  padding: 0;
+}
+
+/* --- Tray --- */
+#tray {
+  margin: 2px;
+}
+
+#tray > * {
+  background-color: alpha(@foreground, 0.15);
+  margin: 2px;
+}
+
+#tray > * > image,
+#tray > * image {
+  padding: 0px 10px;
+}
+
+#tray > *:hover {
+  background: @color2;
+}
+
+#tray > .needs-attention {
+  background-color: @color9;
+}
+
 #window {
   background-color: alpha(@background, 0.1);
   color: @foreground;
   border-radius: 3px;
-  padding: 1px 10px; /* Reduced padding */
+  padding: 1px 10px;
   margin: 2px;
 }
 
-/* Shared module styling */
+/* --- Shared module styling --- */
 #clock,
 #battery,
 #cpu,
@@ -91,8 +114,9 @@ window#waybar.empty #window {
 #temperature,
 #backlight,
 #network,
+#pulseaudio,
 #wireplumber,
-#pulseaudio {
+#cava {
   background-color: alpha(@foreground, 0.15);
   color: @foreground;
   padding: 0px 10px;
@@ -113,18 +137,41 @@ window#waybar.empty #window {
 #backlight:hover,
 #network:hover,
 #wireplumber:hover,
-#pulseaudio:hover {
+#pulseaudio:hover,
+#cava:hover {
   background: @color2;
 }
 
+#wireplumber {
+  border-radius: 0px 3px 3px 0px;
+  margin-left: 0px;
+}
+
+#cava {
+  border-radius: 3px 0px 0px 3px;
+  margin-right: 0px;
+}
+
 #bluetooth {
   background-color: alpha(@color3, 0.3);
 }
 
 #bluetooth.disabled {
+}
+
+#bluetooth.on {
   background-color: alpha(@color2, 1);
 }
 
+#bluetooth.connected {
+  background-color: alpha(@color4, 1);
+}
+
+#bluetooth.connected:hover,
+#bluetooth.on:hover {
+  background-color: alpha(@color3, 0.3);
+}
+
 #battery.critical:not(.charging) {
   color: @color1;
   background-color: alpha(@color2, 1);
@@ -134,15 +181,6 @@ window#waybar.empty #window {
   background-color: alpha(@color2, 1);
 }
 
-#tray > .passive {
-  -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: rgba(253, 77, 75, 0.5);
-}
-
 #idle_inhibitor {
   background-color: rgba(45, 52, 54, 0.5);
 }