diff --git a/home-modules/hyprland/hyprland.nix b/home-modules/hyprland/hyprland.nix
index b40d5ae..f487865 100644
--- a/home-modules/hyprland/hyprland.nix
+++ b/home-modules/hyprland/hyprland.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: 
 let
-  animation-speed = "1";
+  animation-speed = "4";
   transparency = "0.9";
   gap-size = 10;
   monitors = {
@@ -85,17 +85,17 @@ workspace = [
   "${monitors.main.name}, 19"
   "${monitors.main.name}, 10,gapsin:0,gapsout:0"
   "${monitors.main.name}, 100"
-  "${monitors.second.name}, 11,gapsin:0,gapsout:0"
-  "${monitors.second.name}, 11"
-  "${monitors.second.name}, 12"
-  "${monitors.second.name}, 13"
-  "${monitors.second.name}, 14"
-  "${monitors.second.name}, 15"
-  "${monitors.second.name}, 16"
-  "${monitors.second.name}, 17"
-  "${monitors.second.name}, 18"
-  "${monitors.second.name}, 19"
-  "${monitors.second.name}, 10"
+  "${monitors.second.name}, 21,gapsin:0,gapsout:0"
+  "${monitors.second.name}, 21"
+  "${monitors.second.name}, 22"
+  "${monitors.second.name}, 23"
+  "${monitors.second.name}, 24"
+  "${monitors.second.name}, 25"
+  "${monitors.second.name}, 26"
+  "${monitors.second.name}, 27"
+  "${monitors.second.name}, 28"
+  "${monitors.second.name}, 29"
+  "${monitors.second.name}, 20"
 ];
 
 "device:logitech-wireless-mouse-mx-master-1" = {
@@ -348,7 +348,7 @@ workspace = [
         ###########################################################################
         ## ROW 3:
 
-        "SUPER,       A, execr, echo ' 󰹑 ' > /tmp/waybar-mode && pkill -RTMIN+8 waybar"
+        "SUPER,       A, execr, waybar_mode set ' 󰹑 '"
         "SUPER,       A, submap, scrL"
         "SUPER,       S, exec, spotify"
         # "SUPER,       D, exec, discord "
@@ -369,7 +369,7 @@ workspace = [
         ## ROW 4:
 
         # "SUPER,       <,"
-        "SUPER,       Y, execr, echo '󰹑 ' > /tmp/waybar-mode && pkill -RTMIN+8 waybar"
+        "SUPER,       Y, execr, waybar_mode set '󰹑 '"
         "SUPER,       Y, submap, scrR"
         "SUPER,       X, exec, pkill wlogout || wlogout --protocol layer-shell -b 5 -T 450 -B 450"
         "SUPER,       C, exec, /home/nx2/scripts/quickconfig/quickconfig.sh "
@@ -445,49 +445,64 @@ workspace = [
       # '8888Y' 'Y8888P' Y8888P' YP    YP 88   YP YP       '8888Y'
     extraConfig = ''
       submap = browserSM
-      bind = , W, exec, waybar_mode unset && hyprctl dispatch exec [workspace 11] firefox 
+      bind = , W, exec, waybar_mode unset
+      bind = , W, exec, hyprctl dispatch exec [workspace 11] firefox 
       bind = , W, submap, reset
 
-      bind = , Y, exec, waybar_mode unset && firefox https://youtube.com 
+      bind = , Y, exec, waybar_mode unset 
+      bind = , Y, exec, firefox https://youtube.com 
       bind = , Y, submap, reset
 
-      bind = , T, exec, waybar_mode unset && hyprctl dispatch exec [workspace 10] "firefox https://twitch.tv"
+      bind = , T, exec, waybar_mode unset
+      bind = , T, exec,  hyprctl dispatch exec [workspace 10] "firefox https://twitch.tv"
       bind = , T, submap, reset
 
-      bind = , R, exec, waybar_mode unset && firefox https://reddit.com 
+      bind = , R, exec, waybar_mode unset
+      bind = , R, exec,  firefox https://reddit.com 
       bind = , R, submap, reset
 
-      bind = , C, exec, waybar_mode unset && firefox https://calendar.google.com 
+      bind = , C, exec, waybar_mode unset
+      bind = , C, exec,  firefox https://calendar.google.com 
       bind = , C, submap, reset
 
-      bind = , Ü, exec, waybar_mode unset && firefox https://translate.google.com 
+      bind = , Ü, exec, waybar_mode unset
+      bind = , Ü, exec,  firefox https://translate.google.com 
       bind = , Ü, submap, reset
 
-      bind = , N, exec, waybar_mode unset && firefox https://Netflix.com 
+      bind = , N, exec, waybar_mode unset
+      bind = , N, exec,  firefox https://Netflix.com 
       bind = , N, submap, reset
 
-      bind = , A, exec, waybar_mode unset && firefox https://www.amazon.de/b?node=3010075031&ref_=nav_ya_signin 
+      bind = , A, exec, waybar_mode unset
+      bind = , A, exec,  firefox https://www.amazon.de/b?node=3010075031&ref_=nav_ya_signin 
       bind = , A, submap, reset
 
-      bind = , D, exec, waybar_mode unset && firefox https://www.disneyplus.com/home 
+      bind = , D, exec, waybar_mode unset
+      bind = , D, exec,  firefox https://www.disneyplus.com/home 
       bind = , D, submap, reset
 
-      bind = , H, exec, waybar_mode unset && firefox https://www.hs-mittweida.de 
+      bind = , H, exec, waybar_mode unset
+      bind = , H, exec,  firefox https://www.hs-mittweida.de 
       bind = , H, submap, reset
 
-      bind = , X, exec, waybar_mode unset && firefox https://nx2.site 
+      bind = , X, exec, waybar_mode unset
+      bind = , X, exec,  firefox https://nx2.site 
       bind = , X, submap, reset
 
-      bind = , L, exec, waybar_mode unset && firefox https://feddit.de
+      bind = , L, exec, waybar_mode unset
+      bind = , L, exec,  firefox https://feddit.de
       bind = , L, submap, reset
 
-      bind = , I, exec, waybar_mode unset && firefox https://www.imdb.com
+      bind = , I, exec, waybar_mode unset
+      bind = , I, exec,  firefox https://www.imdb.com
       bind = , I, submap, reset
 
-      bind = , M, exec, waybar_mode unset && firefox https://ieji.de/home
+      bind = , M, exec, waybar_mode unset
+      bind = , M, exec,  firefox https://ieji.de/home
       bind = , M, submap, reset
 
-      bind = , S, exec, waybar_mode unset && firefox 127.0.0.1:8384/
+      bind = , S, exec, waybar_mode unset
+      bind = , S, exec,  firefox 127.0.0.1:8384/
       bind = , S, submap, reset
 
       bind = , Escape, exec, waybar_mode unset