diff --git a/home/desktop.nix b/home/desktop.nix
index 326e32a..2b7b652 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -231,10 +231,10 @@
   };
 
   # === Ghostty config ===
-  home.file.".config/ghostty/config".text = ''
+  home.file.".config/ghostty/config" = { force = true; text = ''
     font-family = JetBrainsMono Nerd Font
     font-size = 13
-    theme = catppuccin-mocha
+    theme = Catppuccin Mocha
     background-opacity = 0.9
     window-padding-x = 8
     window-padding-y = 4
@@ -245,7 +245,7 @@
   '';
 
   # === Zellij config ===
-  home.file.".config/zellij/config.kdl".text = ''
+  home.file.".config/zellij/config.kdl" = { force = true; text = ''
     theme "catppuccin-mocha"
     default_shell "zsh"
     pane_frames false
@@ -312,10 +312,10 @@
     "hyprland/workspaces" = {
       format = "{icon}";
       format-icons = {
-        shell = "󰆍"; code = "󰨞"; web = "󰖟"; chat = "󰭻"; vault = "󰠮";
+        "1" = "󰆍"; "2" = "󰨞"; "3" = "󰖟"; "4" = "󰭻"; "5" = "󰠮";
         media = "󰎆"; "7" = "󰎇"; "8" = "󰎈"; "9" = "󰎉"; sys = "󰒓"; default = "󰊌";
       };
-      persistent_workspaces = { "1" = ["shell"]; "2" = ["code"]; "3" = ["web"]; "4" = ["chat"]; "5" = ["vault"]; };
+      persistent_workspaces = { "1" = []; "2" = []; "3" = []; "4" = []; "5" = []; };
     };
     clock = { format = "{:%a %b %d  %H:%M}"; tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"; };
     cpu = { format = "   {usage}%"; };
diff --git a/home/hyprland.conf b/home/hyprland.conf
index b32ee80..09b7875 100644
--- a/home/hyprland.conf
+++ b/home/hyprland.conf
@@ -59,20 +59,20 @@ animations {
   animation = workspaces,1,4,easeOutQuint,fade
 }
 
-workspace = 1,  name:shell,   persistent:true
-workspace = 2,  name:code,    persistent:true
-workspace = 3,  name:web,     persistent:true
-workspace = 4,  name:chat,    persistent:true
-workspace = 5,  name:vault,   persistent:true
-workspace = 6,  name:media
-workspace = 7,  name:7
-workspace = 8,  name:8
-workspace = 9,  name:9
-workspace = 10, name:sys
+workspace = 1, persistent:true
+workspace = 2, persistent:true
+workspace = 3, persistent:true
+workspace = 4, persistent:true
+workspace = 5, persistent:true
+workspace = 6
+workspace = 7
+workspace = 8
+workspace = 9
+workspace = 10
 
 $mainMod = SUPER
 
-bind = $mainMod, Return,        exec, ghostty -e zellij
+bind = $mainMod, Return, exec, hyprctl dispatch workspace 1; ghostty -e zellij
 bind = $mainMod SHIFT, Return,  exec, ghostty
 bind = $mainMod, B,             exec, firefox
 bind = $mainMod, D,             exec, rofi -show drun -show-icons
@@ -97,26 +97,26 @@ bind = $mainMod CTRL, H, resizeactive, -40 0
 bind = $mainMod CTRL, J, resizeactive, 0 40
 bind = $mainMod CTRL, K, resizeactive, 0 -40
 bind = $mainMod CTRL, L, resizeactive, 40 0
-bind = $mainMod, 1, workspace, name:shell
-bind = $mainMod, 2, workspace, name:code
-bind = $mainMod, 3, workspace, name:web
-bind = $mainMod, 4, workspace, name:chat
-bind = $mainMod, 5, workspace, name:vault
-bind = $mainMod, 6, workspace, name:media
-bind = $mainMod, 7, workspace, name:7
-bind = $mainMod, 8, workspace, name:8
-bind = $mainMod, 9, workspace, name:9
-bind = $mainMod, 0, workspace, name:sys
-bind = $mainMod SHIFT, 1, movetoworkspace, name:shell
-bind = $mainMod SHIFT, 2, movetoworkspace, name:code
-bind = $mainMod SHIFT, 3, movetoworkspace, name:web
-bind = $mainMod SHIFT, 4, movetoworkspace, name:chat
-bind = $mainMod SHIFT, 5, movetoworkspace, name:vault
-bind = $mainMod SHIFT, 6, movetoworkspace, name:media
-bind = $mainMod SHIFT, 7, movetoworkspace, name:7
-bind = $mainMod SHIFT, 8, movetoworkspace, name:8
-bind = $mainMod SHIFT, 9, movetoworkspace, name:9
-bind = $mainMod SHIFT, 0, movetoworkspace, name:sys
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up,   workspace, e-1
 bind = $mainMod,       S, exec, grim -g "$(slurp)" - | swappy -f -
@@ -134,7 +134,7 @@ windowrule = match:class ^(pavucontrol)$, float on
 windowrule = match:class ^(firefox)$, match:title PIP, float on
 windowrule = match:title ^(Authentication Required)$, float on
 windowrule = match:class ^(pavucontrol)$, size 75% 75%
-windowrule = match:class ^(code-oss|Code|jetbrains-.*|nvim)$, workspace name:code
-windowrule = match:class ^(firefox|chromium-browser|google-chrome)$, workspace name:web
-windowrule = match:class ^(discord|Slack|TelegramDesktop)$, workspace name:chat
-windowrule = match:class ^(ghostty|Zellij|Alacritty)$, workspace name:shell
+windowrule = match:class ^(code-oss|Code|jetbrains-.*|nvim)$, workspace 2
+windowrule = match:class ^(firefox|chromium-browser|google-chrome)$, workspace 3
+windowrule = match:class ^(discord|Slack|TelegramDesktop)$, workspace 4
+windowrule = match:class ghostty, workspace 1
diff --git a/modules/laptop.nix b/modules/laptop.nix
index d42c8d5..281745f 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -29,9 +29,11 @@
     # SSH essentials
     openssh
     mosh
+    networkmanager
   ];
 
-  # === DNS ===
+  # === Networking ===
+  networking.networkmanager.enable = true;
   networking.networkmanager.insertNameservers = [ "1.1.1.1" "8.8.8.8" ];
 
   # === Wallpaper ===