diff --git a/backgrounds b/backgrounds
index 5a4270d..336fe10 160000
--- a/backgrounds
+++ b/backgrounds
@@ -1 +1 @@
-Subproject commit 5a4270dc6b36f94427a91ddc1f15f3bcc344f1bc
+Subproject commit 336fe1088f4fb13bf8f03b5df16c6145ea94fe24
diff --git a/hypr/hyprland/keybinds.conf b/hypr/hyprland/keybinds.conf
index 26869bf..732c161 100755
--- a/hypr/hyprland/keybinds.conf
+++ b/hypr/hyprland/keybinds.conf
@@ -42,7 +42,7 @@ bind = Super+Shift, C, exec, hyprpicker -a # Pick color (Hex) >> clipboard
 # bind = Ctrl+Alt, R, exec, ~/.config/ags/scripts/record-script.sh --fullscreen # [hidden] Record screen (no sound)
 bind = Super+Alt, R, exec, ~/.scripts/record-script.sh --fullscreen-sound # Record screen (with sound)
 # wallpaper
-bind = Super+Shift, W, exec, fish ~/.scripts/change-wallpaper.fish # Change wallpaper
+bind = Super+Shift, W, exec, ~/.local/bin/wallpaper_chooser # Launch wallpaper chooser
 
 ##! Session
 # bind = Ctrl+Super, L, exec, ags run-js 'lock.lock()' # [hidden]
diff --git a/hypr/hyprland/rules.conf b/hypr/hyprland/rules.conf
index 6398c1f..ba83868 100755
--- a/hypr/hyprland/rules.conf
+++ b/hypr/hyprland/rules.conf
@@ -32,7 +32,8 @@ windowrulev2 = float, class:^(org.gnome.NautilusPreviewer)$ # Sushi in Nautilus
 windowrulev2 = float, class:^(coin)$
 windowrulev2 = noblur, class:^(coin)$
 windowrulev2 = bordersize 0, class:^(coin)$
-windowrulev2 = noshadow, class:^(coin)$
+windowrulev2 = noshadow, class:^(coin)
+windowrulev2 = float, class:^(wallpaper_chooser)$
 
 # Picture-in-Picture
 windowrulev2 = float, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index a32f81b..b1b7be4 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -8,21 +8,9 @@
   "margin-bottom": 0,
   "margin-right": 0,
   "spacing": 2, // Gaps between modules (px)
-  "modules-left": [
-    "custom/rofi",
-    "group/workspaceactions",
-    "custom/mediaplayer",
-    "hyprland/window"
-  ],
-  "modules-center": [
-    "clock"
-  ],
-  "modules-right": [
-    "group/monitors",
-    "tray",
-    "custom/caffeine",
-    "custom/power"
-  ],
+  "modules-left": ["custom/rofi", "group/workspaceactions", "hyprland/window", "custom/mediaplayer"],
+  "modules-center": ["clock"],
+  "modules-right": ["group/monitors", "tray", "custom/caffeine", "custom/power"],
   // -------------------------------------------------------------------------
   // Modules
   // -------------------------------------------------------------------------
@@ -31,7 +19,6 @@
     "format": "󰐥",
     "tooltip": false,
     "on-click": "wlogout",
-    "on-click-right": "hyprctl dispatch killactive",
     "min-length": 2,
     "max-length": 2
   },
@@ -63,7 +50,7 @@
   },
   // Time and Date
   "clock": {
-    "format": "󰥔  {:%H:%M |  %e %b}",
+    "format": "󰥔 {:%H:%M |  %e %b}",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt>{calendar}</tt>",
     "today-format": "<b>{}</b>"
   },
@@ -181,7 +168,7 @@
     "on-scroll-up": "hyprctl dispatch workspace e+1 1>/dev/null",
     "on-scroll-down": "hyprctl dispatch workspace e-1 1>/dev/null",
     "sort-by-number": true,
-    "active-only": false//,
+    "active-only": false //,
     // "window-rewrite-default": "",
     // "window-rewrite": {
     //   "class<kitty>": "",
@@ -200,7 +187,7 @@
     "show-special": true,
     "special-visible-only": false,
     "format": "S",
-    "window-rewrite-default": ""//,
+    "window-rewrite-default": "" //,
     // "window-rewrite": {
     //   "class<kitty>": "",
     //   "class<code>": "󰨞",
@@ -216,10 +203,11 @@
     "on-click": "~/.scripts/workspace-new.sh"
   },
   "hyprland/window": {
-    "format": "{class}",
+    "format": "",
     "max-length": 100,
     "separate-outputs": true,
     "icon": true,
+    "on-click-middle": "hyprctl dispatch killactive",
     "icon-size": 14
   },
   "custom/mediaplayer": {
diff --git a/waybar/style.css b/waybar/style.css
index e2f2897..3088fcc 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -98,6 +98,8 @@ tooltip {
 
 window#waybar.empty #window{
   background-color: transparent;
+  padding: 0;
+  margin: 0;
 }
 
 #custom-mediaplayer {
diff --git a/waybar/style.css.template b/waybar/style.css.template
index 93e38c3..347fed2 100644
--- a/waybar/style.css.template
+++ b/waybar/style.css.template
@@ -98,6 +98,8 @@ tooltip {
 
 window#waybar.empty #window{
   background-color: transparent;
+  padding: 0;
+  margin: 0;
 }
 
 #custom-mediaplayer {