diff --git a/aspects/ai.nix b/aspects/ai.nix
index 3431ddd..f67bbbc 100644
--- a/aspects/ai.nix
+++ b/aspects/ai.nix
@@ -4,7 +4,7 @@
     { inputs, pkgs, ... }:
     {
       environment.systemPackages =
-        (with pkgs; [ ])
+        (with pkgs; [ claude-desktop ])
         ++ (with inputs.nix-ai-tools.packages.${pkgs.system}; [
           claude-code
           claudebox
diff --git a/aspects/bluetooth.nix b/aspects/bluetooth.nix
index 6c7b2d8..2027ac1 100644
--- a/aspects/bluetooth.nix
+++ b/aspects/bluetooth.nix
@@ -8,9 +8,6 @@
       ...
     }:
     {
-      hardware.bluetooth = {
-        enable = true;
-        powerOnBoot = false;
-      };
+      hardware.bluetooth.enable = true;
     };
 }
diff --git a/aspects/desktop/office.nix b/aspects/desktop/office.nix
index 68d958a..fe41d1d 100644
--- a/aspects/desktop/office.nix
+++ b/aspects/desktop/office.nix
@@ -10,7 +10,6 @@
         aspellDicts.en
         aspellDicts.en-computers
         aspellDicts.pt_BR
-        glow
         papers
         presenterm
         rnote
diff --git a/aspects/dev.nix b/aspects/dev.nix
index afe9edc..89a1026 100644
--- a/aspects/dev.nix
+++ b/aspects/dev.nix
@@ -10,11 +10,14 @@
     {
       environment.systemPackages = with pkgs; [
         android-tools
+        bat
         lazygit
         fd
         fzf
+        glow
         nixfmt
         nix-init
+        nix-output-monitor
         ripgrep
       ];
 
diff --git a/aspects/stylix.nix b/aspects/stylix.nix
index f7eb9fa..ec3fd42 100644
--- a/aspects/stylix.nix
+++ b/aspects/stylix.nix
@@ -1,5 +1,4 @@
 { ... }:
-
 {
   flake.modules = {
     nixos.stylix =
@@ -16,7 +15,10 @@
         ...
       }:
       {
-        imports = [ inputs.stylix.homeModules.stylix ];
+        imports = [
+          inputs.stylix.homeModules.stylix
+          inputs.zen-browser.homeModules.beta
+        ];
 
         stylix = {
           enable = true;
@@ -63,6 +65,15 @@
               terminal = 12;
             };
           };
+          targets.zen-browser = {
+            enable = true;
+            profileNames = [ "william" ];
+          };
+        };
+
+        programs.zen-browser = {
+          enable = true;
+          profiles.william = { };
         };
       };
   };
diff --git a/aspects/users/user.nix b/aspects/users/user.nix
index ca74e8d..ad1b8ca 100644
--- a/aspects/users/user.nix
+++ b/aspects/users/user.nix
@@ -1,4 +1,4 @@
-{ inputs, lib, ... }:
+{ inputs, self, ... }:
 
 {
   flake = {
@@ -30,6 +30,37 @@
         };
         modules = [
           { nixpkgs.overlays = [ inputs.self.overlays.default ]; }
+
+          # CLI aspects (common module included)
+          inputs.self.modules.homeManager.cli-base
+          inputs.self.modules.homeManager.cli-btop
+          inputs.self.modules.homeManager.cli-comma
+          inputs.self.modules.homeManager.cli-direnv
+          inputs.self.modules.homeManager.cli-helix
+          inputs.self.modules.homeManager.cli-starship
+          inputs.self.modules.homeManager.cli-tmux
+
+          # Shell
+          inputs.self.modules.homeManager.shell-fish
+          inputs.self.modules.homeManager.shell-bash
+
+          # Desktop
+          inputs.self.modules.homeManager.desktop-desktop
+          inputs.self.modules.homeManager.desktop-niri
+
+          # Gaming
+          inputs.self.modules.homeManager.gaming-mangohud
+
+          # Programs
+          inputs.self.modules.homeManager.programs-media # for obs-studio
+
+          # Stylix
+          inputs.self.modules.homeManager.stylix
+
+          # User-specific (from _user/)
+          ./_user/git.nix
+
+          # Home configuration
           {
             home = {
               username = "user";
@@ -37,17 +68,7 @@
               stateVersion = "22.05";
             };
           }
-          ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user)
-        ]
-        ++ (with inputs.self.modules.homeManager; [
-          base # base aspect
-          cli # cli aspect
-          desktop # desktop aspect
-
-          # other aspect
-          stylix
-          niri
-        ]);
+        ];
       };
 
       "user@io" = inputs.home-manager.lib.homeManagerConfiguration {
@@ -58,6 +79,31 @@
         };
         modules = [
           { nixpkgs.overlays = [ inputs.self.overlays.default ]; }
+
+          # CLI aspects (common module included)
+          inputs.self.modules.homeManager.cli-base
+          inputs.self.modules.homeManager.cli-btop
+          inputs.self.modules.homeManager.cli-comma
+          inputs.self.modules.homeManager.cli-direnv
+          inputs.self.modules.homeManager.cli-helix
+          inputs.self.modules.homeManager.cli-starship
+          inputs.self.modules.homeManager.cli-tmux
+
+          # Shell
+          inputs.self.modules.homeManager.shell-fish
+          inputs.self.modules.homeManager.shell-bash
+
+          # Desktop
+          inputs.self.modules.homeManager.desktop-desktop
+          inputs.self.modules.homeManager.desktop-niri
+
+          # Stylix
+          inputs.self.modules.homeManager.stylix
+
+          # User-specific (from _user/)
+          ./_user/git.nix
+
+          # Home configuration
           {
             home = {
               username = "user";
@@ -65,17 +111,7 @@
               stateVersion = "22.05";
             };
           }
-          ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user)
-        ]
-        ++ (with inputs.self.modules.homeManager; [
-          base # base aspect
-          cli # cli aspect
-          desktop # desktop aspect
-
-          # other aspect
-          stylix
-          niri
-        ]);
+        ];
       };
     };
   };