diff --git a/modules/hyprland/displays.nix b/modules/hyprland/displays.nix
index 6ea45c7..65f9c8e 100644
--- a/modules/hyprland/displays.nix
+++ b/modules/hyprland/displays.nix
@@ -9,22 +9,23 @@ in
   wayland.windowManager.hyprland.settings = {
 
     windowrulev2 = [
-      "float,class:^(kitty)$,title:^switch-to-windows-elevation"
+      # "float,class:^(kitty)$,title:^switch-to-windows-elevation"
       # "center,class:^(kitty)$,title:^switch-to-windows-elevation"
       # "size 40% 40%,class:^(kitty)$,title:^switch-to-windows-elevation"
     ];
 
     workspace = if (hostname == "NicksNixDesktop") then [
-      "1,monitor:DP-3,default:true"
-      "3,monitor:DP-3"
-      "5,monitor:DP-3"
-      "7,monitor:DP-3"
-      "9,monitor:DP-3"
+      "2,monitor:DP-3,default:true"
+      "4,monitor:DP-3"
+      "6,monitor:DP-3"
+      "8,monitor:DP-3"
+      "0,monitor:DP-3"
 
-      "2,monitor:DP-2,default:true"
-      "4,monitor:DP-2"
-      "6,monitor:DP-2"
-      "8,monitor:DP-2"
+      "1,monitor:DP-2,default:true"
+      "3,monitor:DP-2"
+      "5,monitor:DP-2"
+      "7,monitor:DP-2"
+      "9,monitor:DP-2"
     ] else [
 
     ];
diff --git a/modules/hyprland/keybinds.nix b/modules/hyprland/keybinds.nix
index 21cc39c..b9f0e7f 100644
--- a/modules/hyprland/keybinds.nix
+++ b/modules/hyprland/keybinds.nix
@@ -51,7 +51,7 @@ in
     ] ++
       # Change workspace
       (map (n:
-        "$mod,${n},workspace,name:${n}"
+        "$mod,${n}, exec, ewwtilities workspace-selector ${n}"
       ) workspaces) ++
       # Move window to workspace
       (map (n: