diff --git a/aspects/ai.nix b/aspects/ai.nix
index 637d9a3..2e702af 100644
--- a/aspects/ai.nix
+++ b/aspects/ai.nix
@@ -5,8 +5,10 @@
       { inputs, pkgs, ... }:
       {
         environment.systemPackages =
-          (with pkgs; [ ])
+          (with pkgs; [ opencode-claude-auth ])
           ++ (with inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}; [
+            ccusage-opencode
+            claude-code
             opencode
           ]);
 
@@ -17,11 +19,14 @@
           ];
         };
       };
-    homeManager.ai = {
-      programs.opencode = {
-        enable = true;
-        settings.theme = "system";
+    homeManager.ai =
+      { inputs, pkgs, ... }:
+      {
+        programs.opencode = {
+          enable = true;
+          package = inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}.opencode;
+          settings.theme = "system";
+        };
       };
-    };
   };
 }
diff --git a/aspects/base/zsh.nix b/aspects/base/zsh.nix
index 151801d..18d7ff6 100644
--- a/aspects/base/zsh.nix
+++ b/aspects/base/zsh.nix
@@ -29,11 +29,9 @@
           initExtra = ''
             unsetopt beep
             ${lib.getExe pkgs.nix-your-shell} zsh | source /dev/stdin
-
             # Expand !! and !$ on space (Fish-style)
             bindkey ' ' magic-space
             setopt HIST_VERIFY
-
             # Fish-style Ctrl+Backspace: delete one path segment at a time
             function backward-kill-path-component() {
               if [[ "$LBUFFER" == */ ]]; then
@@ -48,6 +46,9 @@
             }
             zle -N backward-kill-path-component
             bindkey '^H' backward-kill-path-component
+            # Ctrl+Arrow Keys to move back and forward by a word
+            bindkey "^[[1;5D" backward-word
+            bindkey "^[[1;5C" forward-word
           '';
           loginExtra = "${lib.getExe pkgs.nix-your-shell} zsh | source /dev/stdin";
           history = {