diff --git a/home/desktop/config/waybar/modules.json b/home/desktop/config/waybar/modules.json
index 95a30192..9fb570db 100644
--- a/home/desktop/config/waybar/modules.json
+++ b/home/desktop/config/waybar/modules.json
@@ -172,17 +172,16 @@
         "all-outputs": true,
         "format": "{icon}",
         "format-icons": {
-            "dev": "󰅴",
-            "browser": "󰈹",
-            "files": "󰝰",
-            "chat": "󰭹",
-            "I": "I",
-            "II": "II",
-            "III": "III",
-            "IV": "IV",
-            "V": "V",
+            "1": "󰟀",
+            "2": "󰅴",
+            "3": "󰈹",
+            "4": "󰝰",
+            "5": "󰭹",
+            "6": "",
+            "7": "󰓓",
+            "8": "󰣙",
             "urgent": "",
-            "default": ""
+            "default": "󰣘"
         },
         "sort-by-name": true,
         "sort-by-coordinates": false,
diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 956e0de5..4a199cee 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -83,85 +83,61 @@
     }
 
     # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-    bind = ALT, Return, exec, wezterm
-    bind = ALT, Space, exec, pkill rofi || rofi -show drun
-    bind = ALT, E, exec, thunar
-    bind = ALT, Q, killactive,
-    bind = ALT, P, exec, swaylock
-    bind = ALT, M, fullscreen, 0
-    bind = ALT SHIFT, M, fullscreen, 1
-    bind = ALT SHIFT, P, exec, powermenu
-    bind = ALT SHIFT, Space, togglefloating,
+    bind = SUPER, Return, exec, wezterm
+    bind = SUPER, Space, exec, pkill rofi || rofi -show drun
+    bind = SUPER, E, exec, thunar
+    bind = SUPER, Q, killactive,
+    bind = SUPER, P, exec, swaylock
+    bind = SUPER, M, fullscreen, 0
+    bind = SUPER SHIFT, M, fullscreen, 1
+    bind = SUPER SHIFT, P, exec, powermenu
+    bind = SUPER SHIFT, Space, togglefloating,
 
     bind = , Print, exec, grim -g "$(slurp)"
     bind = , XF86AudioMute, exec, pamixer -t
     binde = , XF86AudioRaiseVolume, exec, pamixer -i 2
     binde = , XF86AudioLowerVolume, exec, pamixer -d 2
 
-    bind = ALT, H, movefocus, l
-    bind = ALT, L, movefocus, r
-    bind = ALT, K, movefocus, u
-    bind = ALT, J, movefocus, d
-    bind = ALT SHIFT, H, movewindow, l
-    bind = ALT SHIFT, L, movewindow, r
-    bind = ALT SHIFT, K, movewindow, u
-    bind = ALT SHIFT, J, movewindow, d
+    bind = SUPER, H, movefocus, l
+    bind = SUPER, L, movefocus, r
+    bind = SUPER, K, movefocus, u
+    bind = SUPER, J, movefocus, d
+    bind = SUPER SHIFT, H, movewindow, l
+    bind = SUPER SHIFT, L, movewindow, r
+    bind = SUPER SHIFT, K, movewindow, u
+    bind = SUPER SHIFT, J, movewindow, d
 
-    windowrule = workspace name:browser, firefox
-    windowrule = workspace name:files, thunar
-    windowrule = workspace name:files, libreoffice.*
-    windowrule = workspace name:files, Zotero
-    windowrule = workspace name:chat, Signal
-    windowrule = workspace name:chat, fractal
+    windowrule = workspace 2, neovide
+    windowrule = workspace 3, firefox
+    windowrule = workspace 4, thunar
+    windowrule = workspace 4, libreoffice.*
+    windowrule = workspace 4, Zotero
+    windowrule = workspace 5, Signal
+    windowrule = workspace 5, fractal
 
-    bind = ALT, D, moveworkspacetomonitor, name:dev current
-    bind = ALT, D, workspace, name:dev
-    bind = ALT SHIFT, D, moveworkspacetomonitor, name:dev current
-    bind = ALT SHIFT, D, movetoworkspace, name:dev
+    bind = SUPER, A, workspace, 1
+    bind = SUPER, S, workspace, 2
+    bind = SUPER, D, workspace, 3
+    bind = SUPER, F, workspace, 4
+    bind = SUPER, U, workspace, 5
+    bind = SUPER, I, workspace, 6
+    bind = SUPER, O, workspace, 7
+    bind = SUPER, P, workspace, 8
+    bind = SUPER SHIFT, A, movetoworkspace, 1
+    bind = SUPER SHIFT, S, movetoworkspace, 2
+    bind = SUPER SHIFT, D, movetoworkspace, 3
+    bind = SUPER SHIFT, F, movetoworkspace, 4
+    bind = SUPER SHIFT, U, movetoworkspace, 5
+    bind = SUPER SHIFT, I, movetoworkspace, 6
+    bind = SUPER SHIFT, O, movetoworkspace, 7
+    bind = SUPER SHIFT, P, movetoworkspace, 8
 
-    bind = ALT, W, moveworkspacetomonitor, name:browser current
-    bind = ALT, W, workspace, name:browser
-    bind = ALT, W, exec, pgrep firefox > /dev/null || firefox
-    bind = ALT SHIFT, W, moveworkspacetomonitor, name:browser current
-    bind = ALT SHIFT, W, movetoworkspace, name:browser
-
-    bind = ALT, F, moveworkspacetomonitor, name:files current
-    bind = ALT, F, workspace, name:files
-    bind = ALT SHIFT, F, moveworkspacetomonitor, name:files current
-    bind = ALT SHIFT, F, movetoworkspace, name:files
-
-    bind = ALT, C, moveworkspacetomonitor, name:chat current
-    bind = ALT, C, workspace, name:chat
-    bind = ALT SHIFT, C, moveworkspacetomonitor, name:chat current
-    bind = ALT SHIFT, C, movetoworkspace, name:chat
-
-    bind = ALT, 1, moveworkspacetomonitor, name:I current
-    bind = ALT, 1, workspace, name:I
-    bind = ALT SHIFT, 1, moveworkspacetomonitor, name:I current
-    bind = ALT SHIFT, 1, movetoworkspace, name:I
-    bind = ALT, 2, moveworkspacetomonitor, name:II current
-    bind = ALT, 2, workspace, name:II
-    bind = ALT SHIFT, 2, moveworkspacetomonitor, name:II current
-    bind = ALT SHIFT, 2, movetoworkspace, name:II
-    bind = ALT, 3, moveworkspacetomonitor, name:III current
-    bind = ALT, 3, workspace, name:III
-    bind = ALT SHIFT, 3, moveworkspacetomonitor, name:III current
-    bind = ALT SHIFT, 3, movetoworkspace, name:III
-    bind = ALT, 4, moveworkspacetomonitor, name:IV current
-    bind = ALT, 4, workspace, name:IV
-    bind = ALT SHIFT, 4, moveworkspacetomonitor, name:IV current
-    bind = ALT SHIFT, 4, movetoworkspace, name:IV
-    bind = ALT, 5, moveworkspacetomonitor, name:V current
-    bind = ALT, 5, workspace, name:V
-    bind = ALT SHIFT, 5, moveworkspacetomonitor, name:V current
-    bind = ALT SHIFT, 5, movetoworkspace, name:V
-
-    bind = ALT, bracketright, focusmonitor, +1
-    bind = ALT, bracketleft, focusmonitor, +1
+    bind = SUPER, bracketright, focusmonitor, +1
+    bind = SUPER, bracketleft, focusmonitor, +1
 
     # Move/resize windows with mainMod + LMB/RMB and dragging
-    bindm = ALT, mouse:272, movewindow
-    bindm = ALT, mouse:273, resizewindow
+    bindm = SUPER, mouse:272, movewindow
+    bindm = SUPER, mouse:273, resizewindow
 
     # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
     windowrule = float, pavucontrol