diff --git a/modules/home/fish.nix b/modules/home/fish.nix
index 3d9f0bb..bbe4ec9 100644
--- a/modules/home/fish.nix
+++ b/modules/home/fish.nix
@@ -13,32 +13,32 @@
     interactiveShellInit = ''
       set fish_greeting
 
-      set fish_color_normal 4c4f69
-      set fish_color_command 1e66f5
-      set fish_color_param dd7878
-      set fish_color_keyword d20f39
-      set fish_color_quote 40a02b
-      set fish_color_redirection ea76cb
-      set fish_color_end fe640b
-      set fish_color_comment 8c8fa1
-      set fish_color_error d20f39
-      set fish_color_gray 9ca0b0
-      set fish_color_selection --background=ccd0da
-      set fish_color_search_match --background=ccd0da
-      set fish_color_option 40a02b
-      set fish_color_operator ea76cb
-      set fish_color_escape e64553
-      set fish_color_autosuggestion 9ca0b0
-      set fish_color_cancel d20f39
-      set fish_color_cwd df8e1d
-      set fish_color_user 179299
-      set fish_color_host 1e66f5
-      set fish_color_host_remote 40a02b
-      set fish_color_status d20f39
-      set fish_pager_color_progress 9ca0b0
-      set fish_pager_color_prefix ea76cb
-      set fish_pager_color_completion 4c4f69
-      set fish_pager_color_description 9ca0b0
+      set fish_color_normal cdd6f4
+      set fish_color_command 89b4fa
+      set fish_color_param f2cdcd
+      set fish_color_keyword f38ba8
+      set fish_color_quote a6e3a1
+      set fish_color_redirection f5c2e7
+      set fish_color_end fab387
+      set fish_color_comment 7f849c
+      set fish_color_error f38ba8
+      set fish_color_gray 6c7086
+      set fish_color_selection --background=313244
+      set fish_color_search_match --background=313244
+      set fish_color_option a6e3a1
+      set fish_color_operator f5c2e7
+      set fish_color_escape eba0ac
+      set fish_color_autosuggestion 6c7086
+      set fish_color_cancel f38ba8
+      set fish_color_cwd f9e2af
+      set fish_color_user 94e2d5
+      set fish_color_host 89b4fa
+      set fish_color_host_remote a6e3a1
+      set fish_color_status f38ba8
+      set fish_pager_color_progress 6c7086
+      set fish_pager_color_prefix f5c2e7
+      set fish_pager_color_completion cdd6f4
+      set fish_pager_color_description 6c7086
 
       set -gx LS_COLORS "$(vivid generate catppuccin-mocha)"
 
diff --git a/modules/home/opencode.nix b/modules/home/opencode.nix
index 77a0685..952d6e7 100644
--- a/modules/home/opencode.nix
+++ b/modules/home/opencode.nix
@@ -2,7 +2,7 @@
   programs.opencode = {
     enable = true;
     settings = {
-      theme = "system";
+      theme = "catppuccin";
       instructions = [
         "CLAUDE.md"
         "AGENT.md"
diff --git a/modules/home/zellij.nix b/modules/home/zellij.nix
index e6b62fd..d859299 100644
--- a/modules/home/zellij.nix
+++ b/modules/home/zellij.nix
@@ -27,26 +27,26 @@
           plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
             hide_frame_for_single_pane "true"
 
-            format_left  "{mode}#[fg=#1e66f5,bg=#eff1f5,bold] {session}#[bg=#eff1f5] {tabs}"
+            format_left  "{mode}#[fg=#89b4fa,bg=#1e1e2e,bold] {session}#[bg=#1e1e2e] {tabs}"
             format_right "{datetime}"
-            format_space "#[bg=#eff1f5]"
+            format_space "#[bg=#1e1e2e]"
 
-            mode_normal          "#[fg=#eff1f5,bg=#1e66f5] "
-            mode_locked          "#[fg=#eff1f5,bg=#fe640b] L "
-            mode_tab             "#[fg=#eff1f5,bg=#40a02b] T "
-            mode_pane            "#[fg=#eff1f5,bg=#8839ef] P "
-            mode_session         "#[fg=#eff1f5,bg=#179299] S "
-            mode_resize          "#[fg=#eff1f5,bg=#df8e1d] R "
-            mode_move            "#[fg=#eff1f5,bg=#ea76cb] M "
-            mode_search          "#[fg=#eff1f5,bg=#d20f39] S "
+            mode_normal          "#[fg=#1e1e2e,bg=#89b4fa] "
+            mode_locked          "#[fg=#1e1e2e,bg=#fab387] L "
+            mode_tab             "#[fg=#1e1e2e,bg=#a6e3a1] T "
+            mode_pane            "#[fg=#1e1e2e,bg=#cba6f7] P "
+            mode_session         "#[fg=#1e1e2e,bg=#94e2d5] S "
+            mode_resize          "#[fg=#1e1e2e,bg=#f9e2af] R "
+            mode_move            "#[fg=#1e1e2e,bg=#f5c2e7] M "
+            mode_search          "#[fg=#1e1e2e,bg=#f38ba8] S "
 
-            tab_normal               "#[fg=#6c6f85,bg=#eff1f5] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
-            tab_active               "#[fg=#eff1f5,bg=#1e66f5,bold,underline] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
+            tab_normal               "#[fg=#6c7086,bg=#1e1e2e] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
+            tab_active               "#[fg=#1e1e2e,bg=#89b4fa,bold,underline] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
             tab_fullscreen_indicator "□ "
-            tab_sync_indicator       "  "
+            tab_sync_indicator       "  "
             tab_floating_indicator   "󰉈 "
 
-            datetime          "#[fg=#4c4f69,bg=#eff1f5] {format} "
+            datetime          "#[fg=#cdd6f4,bg=#1e1e2e] {format} "
             datetime_format   "%A, %d %b %Y %H:%M"
             datetime_timezone "Europe/Berlin"
           }