diff --git a/hosts/desktop/keybinds.nix b/hosts/desktop/keybinds.nix
index 25ebba3..c80362e 100644
--- a/hosts/desktop/keybinds.nix
+++ b/hosts/desktop/keybinds.nix
@@ -20,16 +20,24 @@
       "$mod, 1, workspace, 1"
       "$mod, 2, workspace, 2"
       "$mod, 3, workspace, 3"
+      "$mod, 4, workspace, 4"
+      "$mod, 5, workspace, 5"
       "$mod + SHIFT, 1, movetoworkspace, 1"
       "$mod + SHIFT, 2, movetoworkspace, 2"
       "$mod + SHIFT, 3, movetoworkspace, 3"
+      "$mod + SHIFT, 4, movetoworkspace, 4"
+      "$mod + SHIFT, 5, movetoworkspace, 5"
 
-      "$mod, 8, workspace, 4"
-      "$mod, 9, workspace, 5"
-      "$mod, 0, workspace, 6"
-      "$mod + SHIFT, 8, movetoworkspace, 4"
-      "$mod + SHIFT, 9, movetoworkspace, 5"
-      "$mod + SHIFT, 0, movetoworkspace, 6"
+      "$mod, 6, workspace, 6"
+      "$mod, 7, workspace, 7"
+      "$mod, 8, workspace, 8"
+      "$mod, 9, workspace, 9"
+      "$mod, 0, workspace, 10"
+      "$mod + SHIFT, 6, movetoworkspace, 6"
+      "$mod + SHIFT, 7, movetoworkspace, 7"
+      "$mod + SHIFT, 8, movetoworkspace, 8"
+      "$mod + SHIFT, 9, movetoworkspace, 9"
+      "$mod + SHIFT, 0, movetoworkspace, 10"
 
       "$mod, H, movefocus, l"
       "$mod, L, movefocus, r"
diff --git a/hosts/desktop/wm.nix b/hosts/desktop/wm.nix
index f778aea..dce95f9 100644
--- a/hosts/desktop/wm.nix
+++ b/hosts/desktop/wm.nix
@@ -64,6 +64,7 @@ in
       }
     ];
     hyprland.workspaces = [
+      # First monitor
       {
         name = "1";
         monitor = "$monitor1";
@@ -79,17 +80,34 @@ in
       }
       {
         name = "4";
-        monitor = "$monitor2";
-        default = true;
+        monitor = "$monitor1";
       }
       {
         name = "5";
-        monitor = "$monitor2";
+        monitor = "$monitor1";
       }
+      # Second monitor
       {
         name = "6";
         monitor = "$monitor2";
       }
+      {
+        name = "7";
+        monitor = "$monitor2";
+      }
+      {
+        name = "8";
+        monitor = "$monitor2";
+      }
+      {
+        name = "9";
+        monitor = "$monitor2";
+      }
+      {
+        name = "10";
+        monitor = "$monitor2";
+        default = true;
+      }
     ];
   };
 }
diff --git a/modules/home-manager/programs/eww/eww.yuck b/modules/home-manager/programs/eww/eww.yuck
index ce35164..6d6813a 100644
--- a/modules/home-manager/programs/eww/eww.yuck
+++ b/modules/home-manager/programs/eww/eww.yuck
@@ -53,7 +53,17 @@
 (defwidget workspaces [workspace]
   (box :class "workspace"
        :orientation "h"
-    "${workspace == 1 ? '' : ''} ${workspace == 2 ? '' : ''} ${workspace == 3 ? '' : ''}"))
+    "${
+      workspace == 1 ? '' : ''
+    } ${
+      workspace == 2 ? '' : ''
+    } ${
+      workspace == 3 ? '' : ''
+    } ${
+      workspace == 4 ? '' : ''
+    } ${
+      workspace == 5 ? '' : ''
+    }"))
 
 (defwindow bar
            :monitor 0
@@ -137,5 +147,5 @@
                :halign "end"
                :class "leftstuff"
       (empty)
-      (workspaces :workspace "${active-workspace - 3}")))))
+      (workspaces :workspace "${active-workspace - 5}")))))