diff --git a/flake.nix b/flake.nix
index 1aff15a..49164b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,7 +51,7 @@
       username = "pinj"; # Single source of truth for username
     in
     {
-      nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+      nixosConfigurations.atlas = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {
           inherit inputs username;
diff --git a/modules/desktop/apps.nix b/modules/desktop/apps.nix
index 4e4734a..17354ef 100644
--- a/modules/desktop/apps.nix
+++ b/modules/desktop/apps.nix
@@ -19,26 +19,32 @@
     sbctl
     nil
     nixd
-
-    # Wayland
     xwayland-satellite
     grim
     slurp
+    btop
+    mission-center
+    file-roller
+    gnome-disk-utility
+    unzip
+    zip
+    p7zip
+    unrar
 
     # File management
     nautilus
 
-    # Editors and browsers
+    # Editor
     zed-editor
+
+    # Zen Browser
     inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
 
     # Desktop shell
     inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
-    inputs.opencode.packages.${pkgs.stdenv.hostPlatform.system}.default
 
     # Terminal
     ghostty
-    claude-code
 
     # Media viewers
     loupe
@@ -63,16 +69,6 @@
     onlyoffice-desktopeditors
     obsidian
 
-    # System utilities
-    btop
-    mission-center
-    file-roller
-    gnome-disk-utility
-    unzip
-    zip
-    p7zip
-    unrar
-
     # Recording
     gpu-screen-recorder
 
@@ -88,6 +84,11 @@
     protonvpn-gui
     protonmail-bridge-gui
 
+    # Game Launchers
+    faugus-launcher
+    lutris
+    heroic
+
     # Cloud sync
     rclone
   ];
diff --git a/modules/dev/tools.nix b/modules/dev/tools.nix
index e4cf06c..cfd7824 100644
--- a/modules/dev/tools.nix
+++ b/modules/dev/tools.nix
@@ -42,5 +42,7 @@
     sd
     pv
     parallel
+    claude-code
+    inputs.opencode.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
 }
diff --git a/modules/gaming/wine.nix b/modules/gaming/wine.nix
index 24a6b3e..c71c55a 100644
--- a/modules/gaming/wine.nix
+++ b/modules/gaming/wine.nix
@@ -12,9 +12,6 @@
     wineWowPackages.stagingFull
     winetricks
     protontricks
-    faugus-launcher
-    lutris
-    heroic
   ];
 
   services.udev.packages = with pkgs; [