diff --git a/flake.nix b/flake.nix
index a730409..49f02b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,7 @@
               "steam-original"
               "steam-run"
               "steam-unwrapped"
+              "keymapp"
             ];
           overlays = extraOverlays ++ (pkgs.lib.attrValues self.overlays);
         };
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 8573003..448863f 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -184,10 +184,12 @@ in
             tldr
             kdePackages.ark
             linuxPackages.perf
+            keymapp
           ])
           ++ [ pkgs.jellyfin-mpv-shim ];
       };
 
     };
+    hardware.keyboard.zsa.enable = true;
   };
 }
diff --git a/modules/desktop/wm.nix b/modules/desktop/wm.nix
index 40da5e7..848b932 100644
--- a/modules/desktop/wm.nix
+++ b/modules/desktop/wm.nix
@@ -226,36 +226,66 @@ in
             # Switch workspaces with mainMod + [0-9]
             "$mod, code:10, moveworkspacetomonitor, 1 current"
             "$mod, code:10, workspace, 1"
+            "$mod, 1, moveworkspacetomonitor, 1 current"
+            "$mod, 1, workspace, 1"
             "$mod, code:11, moveworkspacetomonitor, 2 current"
             "$mod, code:11, workspace, 2"
+            "$mod, 2, moveworkspacetomonitor, 2 current"
+            "$mod, 2, workspace, 2"
             "$mod, code:12, moveworkspacetomonitor, 3 current"
             "$mod, code:12, workspace, 3"
+            "$mod, 3, moveworkspacetomonitor, 3 current"
+            "$mod, 3, workspace, 3"
             "$mod, code:13, moveworkspacetomonitor, 4 current"
             "$mod, code:13, workspace, 4"
+            "$mod, 4, moveworkspacetomonitor, 4 current"
+            "$mod, 4, workspace, 4"
             "$mod, code:14, moveworkspacetomonitor, 5 current"
             "$mod, code:14, workspace, 5"
+            "$mod, 5, moveworkspacetomonitor, 5 current"
+            "$mod, 5, workspace, 5"
             "$mod, code:15, moveworkspacetomonitor, 6 current"
             "$mod, code:15, workspace, 6"
+            "$mod, 6, moveworkspacetomonitor, 6 current"
+            "$mod, 6, workspace, 6"
             "$mod, code:16, moveworkspacetomonitor, 7 current"
             "$mod, code:16, workspace, 7"
+            "$mod, 7, moveworkspacetomonitor, 7 current"
+            "$mod, 7, workspace, 7"
             "$mod, code:17, moveworkspacetomonitor, 8 current"
             "$mod, code:17, workspace, 8"
+            "$mod, 8, moveworkspacetomonitor, 8 current"
+            "$mod, 8, workspace, 8"
             "$mod, code:18, moveworkspacetomonitor, 9 current"
             "$mod, code:18, workspace, 9"
+            "$mod, 9, moveworkspacetomonitor, 9 current"
+            "$mod, 9, workspace, 9"
             "$mod, code:19, moveworkspacetomonitor, 10 current"
             "$mod, code:19, workspace, 10"
+            "$mod, 0, moveworkspacetomonitor, 10 current"
+            "$mod, 0, workspace, 10"
 
             # Move active window to a workspace with mainMod + SHIFT + [0-9]
             "$mod SHIFT, code:10, movetoworkspace, 1"
+            "$mod SHIFT, 1, movetoworkspace, 1"
             "$mod SHIFT, code:11, movetoworkspace, 2"
+            "$mod SHIFT, 2, movetoworkspace, 2"
             "$mod SHIFT, code:12, movetoworkspace, 3"
+            "$mod SHIFT, 3, movetoworkspace, 3"
             "$mod SHIFT, code:13, movetoworkspace, 4"
+            "$mod SHIFT, 4, movetoworkspace, 4"
             "$mod SHIFT, code:14, movetoworkspace, 5"
+            "$mod SHIFT, 5, movetoworkspace, 5"
             "$mod SHIFT, code:15, movetoworkspace, 6"
+            "$mod SHIFT, 6, movetoworkspace, 6"
             "$mod SHIFT, code:16, movetoworkspace, 7"
+            "$mod SHIFT, 7, movetoworkspace, 7"
             "$mod SHIFT, code:17, movetoworkspace, 8"
+            "$mod SHIFT, 8, movetoworkspace, 8"
             "$mod SHIFT, code:18, movetoworkspace, 9"
+            "$mod SHIFT, 9, movetoworkspace, 9"
             "$mod SHIFT, code:19, movetoworkspace, 10"
+            "$mod SHIFT, 0, movetoworkspace, 10"
 
             # Scroll through existing workspaces with mainMod + scroll
             "$mod, mouse_down, workspace, e-1"
@@ -275,8 +305,8 @@ in
             ", XF86MonBrightnessDown, exec, light -U 5"
             ", XF86MonBrightnessUp, exec, light -A 5"
 
-            ", Print, exec, flameshot full"
-            "SHIFT , Print, exec, env QT_SCREEN_SCALE_FACTORS=0.66666666 flameshot gui"
+            # ", Print, exec, flameshot full"
+            ", Print, exec, env QT_SCREEN_SCALE_FACTORS=0.66666666 flameshot gui"
           ];
 
           bindm = [