diff --git a/.scripts/change-colortheme b/.scripts/change-colortheme
index 3e24612..a267706 100755
--- a/.scripts/change-colortheme
+++ b/.scripts/change-colortheme
@@ -162,7 +162,7 @@ def _change_waybar(palette: dict[str, str], flavor: str):
     waybar_template = Path.home().joinpath('.config', 'waybar', 'style.css.template')
     waybar_dist = copy_template(waybar_template, Path.home().joinpath('.config', 'waybar'))
     replace_placeholders(waybar_dist, palette, flavor)
-    os.system('waybar-toggle.sh')
+    os.system('waybar-toggle')
 
 
 def _change_ohmyposh(palette: dict[str, str], flavor: str):
diff --git a/.scripts/screenshot b/.scripts/screenshot
index eda139a..1186373 100755
--- a/.scripts/screenshot
+++ b/.scripts/screenshot
@@ -77,7 +77,7 @@ if __name__ == "__main__":
     # notification
     Notify.init("Screenshot Utility")
     n = Notify.Notification.new(
-        "Screenshot Taken",
+        "Screenshot taken",
         "Click to edit"
     )
     n.add_action(
diff --git a/hypr/hyprland/general.conf b/hypr/hyprland/general.conf
index af4b78e..0965c46 100755
--- a/hypr/hyprland/general.conf
+++ b/hypr/hyprland/general.conf
@@ -2,6 +2,7 @@ input {
     # Keyboard: Add a layout and uncomment kb_options for Win+Space switching shortcut
     kb_layout = de
     # kb_options = grp:win_space_toggle
+    # kb_options = caps:swapescape
     numlock_by_default = true
     repeat_delay = 250
     repeat_rate = 35
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index d8cdfe3..157e12c 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -17,7 +17,7 @@
     "custom/mediaplayer"
   ],
   "modules-center": ["clock"],
-  "modules-right": ["group/monitors", "custom/separator", "tray", "custom/separator", "idle_inhibitor", "custom/power"],
+  "modules-right": ["group/monitors", "custom/separator", "group/tray-expander", "idle_inhibitor", "custom/power"],
   // -------------------------------------------------------------------------
   // Modules
   // -------------------------------------------------------------------------
@@ -226,6 +226,20 @@
     "on-scroll-up": "playerctl next",
     "on-scroll-down": "playerctl previous"
   },
+  "group/tray-expander": {
+    "orientation": "inherit",
+    "drawer": {
+      "transition-duration": 600,
+      "children-class": "tray-group-item"
+    },
+    "modules": ["custom/expand-icon", "tray", "custom/separator"]
+  },
+  "custom/expand-icon": {
+    "format": "",
+    "tooltip": false,
+    "min-length": 2,
+    "max-length": 2
+  },
   "tray": {
     "icon-size": 15,
     "spacing": 5
diff --git a/waybar/style.css b/waybar/style.css
index 7d2e6f4..40cb9b2 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -56,9 +56,9 @@ tooltip {
 
 #custom-rofi,
 #idle_inhibitor,
-#custom-power {
-  padding-left: 6px;
-  padding-right: 6px;
+#custom-power,
+#custom-expand-icon {
+  padding: 0px 6px;
   font-size: 18px;
 }
 
@@ -164,6 +164,10 @@ window#waybar.empty #window {
   background-color: alpha(@archlinux, 0.3);
 }
 
+#custom-expand-icon {
+  color: @green;
+}
+
 #idle_inhibitor {
   color: @yellow;
 }
diff --git a/waybar/style.css.template b/waybar/style.css.template
index aa91f8d..e03b4f3 100644
--- a/waybar/style.css.template
+++ b/waybar/style.css.template
@@ -56,9 +56,9 @@ tooltip {
 
 #custom-rofi,
 #idle_inhibitor,
-#custom-power {
-  padding-left: 6px;
-  padding-right: 6px;
+#custom-power,
+#custom-expand-icon {
+  padding: 0px 6px;
   font-size: 18px;
 }
 
@@ -164,6 +164,10 @@ window#waybar.empty #window {
   background-color: alpha(@archlinux, 0.3);
 }
 
+#custom-expand-icon {
+  color: @green;
+}
+
 #idle_inhibitor {
   color: @yellow;
 }