diff --git a/modules/hyprland/hyprland.nix b/modules/hyprland/hyprland.nix
index fb5ff42..0bbcad9 100644
--- a/modules/hyprland/hyprland.nix
+++ b/modules/hyprland/hyprland.nix
@@ -38,8 +38,10 @@ in desktopSystemConfiguration {
     };
 
     settings = {
-      monitor    = [ ", preferred, auto, 1" ];
-      windowrule = [ "noinitialfocus" ];
+      monitor = [ ", preferred, auto, 1" ];
+
+      windowrule   = [ "noinitialfocus" ];
+      windowrulev2 = [ "workspace special silent, class:^(xwaylandvideobridge)$" ];
 
       exec = [ "pkill swaybg; swaybg --image ${./wallpaper.png}" ];
 
@@ -82,24 +84,17 @@ in desktopSystemConfiguration {
         "SUPER+CTRL, l, resizeactive, 100 0"
       ];
 
-      bind = [
+      bind = flatten [
         "SUPER    , TAB, workspace, e+1"
         "SUPER+ALT, TAB, workspace, e-1"
 
         "SUPER, mouse_up,   workspace, e+1"
         "SUPER, mouse_down, workspace, e-1"
 
-        "SUPER, 1, workspace, 1"
-        "SUPER, 2, workspace, 2"
-        "SUPER, 3, workspace, 3"
-        "SUPER, 4, workspace, 4"
-        "SUPER, 5, workspace, 5"
-
-        "SUPER+ALT, 1, movetoworkspacesilent, 1"
-        "SUPER+ALT, 2, movetoworkspacesilent, 2"
-        "SUPER+ALT, 3, movetoworkspacesilent, 3"
-        "SUPER+ALT, 4, movetoworkspacesilent, 4"
-        "SUPER+ALT, 5, movetoworkspacesilent, 5"
+        (map (n: [
+          "SUPER    , ${toString n}, workspace            , ${toString n}"
+          "SUPER+ALT, ${toString n}, movetoworkspacesilent, ${toString n}"
+        ]) (range [ 1 10 ]))
 
         "SUPER+ALT, left , movewindow, l"
         "SUPER+ALT, down , movewindow, d"
diff --git a/modules/hyprland/waybar.nix b/modules/hyprland/waybar.nix
index f228e05..8681093 100644
--- a/modules/hyprland/waybar.nix
+++ b/modules/hyprland/waybar.nix
@@ -24,7 +24,7 @@ desktopUserHomeConfiguration {
         format-icons.default = "";
         format-icons.active  = "";
 
-        persistent-workspaces."*" = 5;
+        persistent-workspaces."*" = 10;
       };
 
       modules-center = [
@@ -104,25 +104,16 @@ desktopUserHomeConfiguration {
         color: ${base05};
       }
 
-      #workspaces button:nth-child(1) {
-        color: ${base08};
-      }
-
-      #workspaces button:nth-child(2) {
-        color: ${base09};
-      }
-
-      #workspaces button:nth-child(3) {
-        color: ${base0A};
-      }
-
-      #workspaces button:nth-child(4) {
-        color: ${base0B};
-      }
-
-      #workspaces button:nth-child(5) {
-        color: ${base0C};
-      }
+      #workspaces button:nth-child(1)  { color: ${base08}; }
+      #workspaces button:nth-child(2)  { color: ${base09}; }
+      #workspaces button:nth-child(3)  { color: ${base0A}; }
+      #workspaces button:nth-child(4)  { color: ${base0B}; }
+      #workspaces button:nth-child(5)  { color: ${base0C}; }
+      #workspaces button:nth-child(6)  { color: ${base0D}; }
+      #workspaces button:nth-child(7)  { color: ${base0E}; }
+      #workspaces button:nth-child(8)  { color: ${base0F}; }
+      #workspaces button:nth-child(9)  { color: ${base04}; }
+      #workspaces button:nth-child(10) { color: ${base06}; }
 
       #workspaces button.empty {
         color: ${base02};