diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
index 7d984766..a6b2bb12 100644
--- a/home/hyprland/hyprland.conf
+++ b/home/hyprland/hyprland.conf
@@ -99,61 +99,64 @@ bind = SUPER SHIFT, L, movewindow, r
 bind = SUPER SHIFT, K, movewindow, u
 bind = SUPER SHIFT, J, movewindow, d
 
-# 1: home
-bind = SUPER, A, moveworkspacetomonitor, 1 current
-bind = SUPER, A, workspace, 1
-bind = SUPER SHIFT, A, movetoworkspace, 1
-windowrule = workspace 1,^(steam).*
-windowrule = workspace 1,(.gamescope-wrapped)
+# Workspace definitions
+# home
+bind = SUPER, A, moveworkspacetomonitor, name:home current
+bind = SUPER, A, workspace, name:home
+bind = SUPER SHIFT, A, movetoworkspace, name:home
+windowrule = workspace name:home,^(steam).*
+windowrule = workspace name:home,(.gamescope-wrapped)
 
-# 2: browser
-bind = SUPER, W, moveworkspacetomonitor, 2 current
-bind = SUPER, W, workspace, 2
-bind = SUPER SHIFT, W, movetoworkspace, 2
-windowrule = workspace 2,(firefox)
-windowrule = workspace 2,(chromium-browser)
+# browser
+bind = SUPER, W, moveworkspacetomonitor, name:browser current
+bind = SUPER, W, workspace, name:browser
+bind = SUPER SHIFT, W, movetoworkspace, name:browser
+windowrule = workspace name:browser,(firefox)
+windowrule = workspace name:browser,(chromium-browser)
 windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
 windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)
 windowrulev2 = float,title:^(about:blank).*,class:(chromium-browser)
 
-# 3: files
-bind = SUPER, F, moveworkspacetomonitor, 3 current
-bind = SUPER, F, workspace, 3
-bind = SUPER SHIFT, F, movetoworkspace, 3
-windowrule = workspace 3,^(libreoffice).*
-windowrule = workspace 3,(Zotero)
-windowrulev2 = workspace 3,title:(Open),class:(soffice)
+# files
+bind = SUPER, F, moveworkspacetomonitor, name:files current
+bind = SUPER, F, workspace, name:files
+bind = SUPER SHIFT, F, movetoworkspace, name:files
+windowrule = workspace name:files,^(libreoffice).*
+windowrule = workspace name:files,(Zotero)
+windowrulev2 = workspace name:files,title:(Open),class:(soffice)
 windowrulev2 = float,title:(Open),class:(soffice)
 
-# 4: chat
-bind = SUPER, C, moveworkspacetomonitor, 4 current
-bind = SUPER, C, workspace, 4
-bind = SUPER SHIFT, C, movetoworkspace, 4
-windowrule = workspace 4,(Signal)
-windowrule = workspace 4,(fractal)
-windowrule = workspace 4,(discord)
+# chat
+bind = SUPER, C, moveworkspacetomonitor, name:chat current
+bind = SUPER, C, workspace, name:chat
+bind = SUPER SHIFT, C, movetoworkspace, name:chat
+windowrule = workspace name:chat,(Signal)
+windowrule = workspace name:chat,(fractal)
+windowrule = workspace name:chat,(discord)
 
-# 5: pass
-bind = SUPER, B, moveworkspacetomonitor, 5 current
-bind = SUPER, B, workspace, 5
-bind = SUPER SHIFT, B, movetoworkspace, 5
-windowrule = workspace 5,(Bitwarden)
+# music
+bind = SUPER, S, moveworkspacetomonitor, name:music current
+bind = SUPER, S, workspace, name:music
+bind = SUPER SHIFT, S, movetoworkspace, name:music
+windowrulev2 = workspace name:music,class:(org.wezfurlong.wezterm),title:(ncspot)
 
-# 6: remote
-bind = SUPER, R, moveworkspacetomonitor, 6 current
-bind = SUPER, R, workspace, 6
-bind = SUPER SHIFT, R, movetoworkspace, 6
-windowrule = workspace 6,(Nxplayer.bin)
-windowrule = float,(Nxplayer.bin)
-windowrule = center,(Nxplayer.bin)
+# pass
+bind = SUPER, B, moveworkspacetomonitor, name:pass current
+bind = SUPER, B, workspace, name:pass
+bind = SUPER SHIFT, B, movetoworkspace, name:pass
+windowrule = workspace name:pass,(Bitwarden)
+
+# remote
+bind = SUPER, R, moveworkspacetomonitor, name:remote current
+bind = SUPER, R, workspace, name:remote
+bind = SUPER SHIFT, R, movetoworkspace, name:remote
+windowrule = workspace name:remote,(Nxplayer.bin)
+windowrulev2 = float,class:(Nxplayer.bin),title:^(NoMachine)$
+# windowrulev2 = nofloat,class:(Nxplayer.bin),title:^(NoMachine).+$
 
-bind = SUPER, period, workspace, m+1
-bind = SUPER SHIFT, period, movetoworkspace, r+1
-bind = SUPER, comma, workspace, m-1
-bind = SUPER SHIFT, comma, movetoworkspace, r-1
 bind = SUPER, bracketright, focusmonitor, +1
-bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1
 bind = SUPER, bracketleft, focusmonitor, -1
+bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1
 bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1
 
 bind = SUPER, N, workspace, empty
diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
index a3a9d3ed..726ef11c 100644
--- a/home/hyprland/waybar/modules/wlr_workspaces.nix
+++ b/home/hyprland/waybar/modules/wlr_workspaces.nix
@@ -4,13 +4,14 @@
   all-outputs = false;
   format = "{icon}";
   format-icons = {
-    "1" = "󰟀";
-    "2" = "󰖟";
-    "3" = "󰝰";
-    "4" = "󰭹";
-    "5" = "󰌾";
-    "6" = "󰢹";
+    "home" = "󰟀";
+    "browser" = "󰖟";
+    "files" = "󰝰";
+    "chat" = "󰭹";
+    "music" = "󰲸";
+    "pass" = "󰌾";
+    "remote" = "󰢹";
     urgent = "󱈸";
   };
-  sort-by-number = true;
+  sort-by-name = true;
 }