diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 5c9b405b..ec5e2851 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -84,14 +84,14 @@ in ''
   bind = SUPER, Q, killactive,
   bind = SUPER SHIFT, Q, exec, rofi -replace -show power-menu
   bind = SUPER, V, togglefloating
-  bind = SUPER, M, fullscreen, 0
-  bind = SUPER SHIFT, M, fullscreen, 1
+  bind = SUPER, F, fullscreen, 0
+  bind = SUPER SHIFT, F, fullscreen, 1
   bind = SUPER, tab, exec, rofi -replace -show window
   bind = SUPER, P, exec, pkill rofi || rofi-pass
   bind = SUPER SHIFT, P, exec, pkill rofi || rofi-pass --last-used
   bind = SUPER ALT, P, exec, pkill rofi || rofi-pass --insert
-  bind = SUPER, X, exec, ${pkgs.mako}/bin/makoctl restore
-  bind = SUPER SHIFT, X, exec, ${pkgs.mako}/bin/makoctl dismiss -a
+  bind = SUPER, M, exec, ${pkgs.mako}/bin/makoctl restore
+  bind = SUPER SHIFT, M, exec, ${pkgs.mako}/bin/makoctl dismiss -a
 
   # Common program shortcuts
   bind = SUPER, Space, exec, rofi -replace -show combi
@@ -172,10 +172,21 @@ in ''
   bind = SUPER SHIFT, 6, movetoworkspace, 6
 
   # Named workspaces
-  bind = SUPER, E, moveworkspacetomonitor, name:emacs current
-  bind = SUPER, E, workspace, name:emacs
-  bind = SUPER SHIFT, E, movetoworkspace, name:emacs
-  bind = SUPER ALT, E, exec, [workspace name:emacs] emacs
+  bind = SUPER, X, moveworkspacetomonitor, name:emacs current
+  bind = SUPER, X, workspace, name:emacs
+  bind = SUPER SHIFT, X, movetoworkspace, name:emacs
+  bind = SUPER ALT, X, exec, [workspace name:emacs] emacs
+
+  bind = SUPER, T, moveworkspacetomonitor, name:term current
+  bind = SUPER, T, workspace, name:term
+  bind = SUPER SHIFT, T, movetoworkspace, name:term
+  bind = SUPER ALT, T, exec, [workspace name:term] alacritty -e zellij
+
+  bind = SUPER, S, moveworkspacetomonitor, name:system current
+  bind = SUPER, S, workspace, name:system
+  bind = SUPER SHIFT, S, movetoworkspace, name:system
+  bind = SUPER ALT, B, exec, [workspace name:system] alacritty -e btm --battery
+  windowrule = workspace name:system, (czkawka_gui)
 
   bind = SUPER, W, moveworkspacetomonitor, name:web current
   bind = SUPER, W, workspace, name:web
@@ -188,31 +199,22 @@ in ''
   windowrulev2 = center,title:(Library),class:(firefox)
   windowrulev2 = pin,title:(Picture-in-Picture),class:(firefox)
 
-  bind = SUPER, T, moveworkspacetomonitor, name:term current
-  bind = SUPER, T, workspace, name:term
-  bind = SUPER SHIFT, T, movetoworkspace, name:term
-  bind = SUPER ALT, T, exec, [workspace name:term] alacritty -e zellij
-
-  bind = SUPER, B, moveworkspacetomonitor, name:btm current
-  bind = SUPER, B, workspace, name:btm
-  bind = SUPER SHIFT, B, movetoworkspace, name:btm
-  bind = SUPER ALT, B, exec, [workspace name:btm] alacritty -e btm --battery
-
-  bind = SUPER, N, moveworkspacetomonitor, name:neomutt current
-  bind = SUPER, N, workspace, name:neomutt
-  bind = SUPER SHIFT, N, movetoworkspace, name:neomutt
-  bind = SUPER ALT, N, exec, [workspace name:neomutt] alacritty -e neomutt
+  bind = SUPER, E, moveworkspacetomonitor, name:email current
+  bind = SUPER, E, workspace, name:email
+  bind = SUPER SHIFT, E, movetoworkspace, name:email
+  bind = SUPER ALT, E, exec, [workspace name:email] alacritty -e neomutt
 
   bind = SUPER, C, moveworkspacetomonitor, name:chat current
   bind = SUPER, C, workspace, name:chat
   bind = SUPER SHIFT, C, movetoworkspace, name:chat
+  bind = SUPER ALT, C, exec, [workspace name:system] alacritty -e irssi
   windowrule = workspace name:chat, (Signal|WebCord|whatsapp-for-linux)
   windowrule = group set always, (Signal|WebCord|whatsapp-for-linux)
 
-  bind = SUPER, S, moveworkspacetomonitor, name:steam current
-  bind = SUPER, S, workspace, name:steam
-  bind = SUPER SHIFT, S, movetoworkspace, name:steam
-  windowrule = workspace name:steam silent, (steam)
+  bind = SUPER, G, moveworkspacetomonitor, name:games current
+  bind = SUPER, G, workspace, name:games
+  bind = SUPER SHIFT, G, movetoworkspace, name:games
+  windowrule = workspace name:games silent, (steam)
   windowrulev2 = float,title:(Friends List),class:(steam)
   windowrulev2 = float,title:(Steam Settings),class:(steam)
 
@@ -228,8 +230,8 @@ in ''
   bind = SUPER SHIFT, comma, movetoworkspace, r-1
   bind = SUPER, period, workspace, m+1
   bind = SUPER SHIFT, period, movetoworkspace, r+1
-  # bind = SUPER, N, workspace, empty
-  # bind = SUPER SHIFT, N, movetoworkspace, empty
+  bind = SUPER, N, workspace, empty
+  bind = SUPER SHIFT, N, movetoworkspace, empty
   bind = SUPER, minus, togglespecialworkspace
   bind = SUPER SHIFT, minus, movetoworkspace, special
   bind = SUPER, bracketright, focusmonitor, +1
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index f7ffce91..de63ad1b 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -38,12 +38,12 @@
           "5" = "󰫇";
           "6" = "󰫈";
           "emacs" = "";
-          "web" = "󰀹";
-          "btm" = "";
-          "neomutt" = "󰇮";
           "term" = "󰆍";
+          "system" = "";
+          "web" = "󰀹";
+          "email" = "󰇮";
           "chat" = "󰭹";
-          "steam" = "󰓓";
+          "games" = "󰊗";
           "remote" = "󰢹";
           default = "󰋙";
           special = "󰁡";