diff --git a/Droidnix/README.org b/Droidnix/README.org
index 644582d37..665588d74 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1158,29 +1158,17 @@ in
 ** =generated/modules/terminals/zsh.nix=
 This sets up the zsh terminal
 #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
+{ lib, config, ... }:
 
 {
-  # --- NixOS Configuration ---
-  environment.systemPackages = with pkgs; [
-    zsh
-    git
-    docker
-  ];
-
-  # --- Home Manager Configuration ---
-  home-manager.users.henrov = {
-    programs.zsh = {
+  # Dendritic flake configuration for Zsh
+  mySystem = {
+    terminals.zsh = {
       enable = true;
       enableCompletion = true;
 
-      # Enable oh-my-zsh and use its plugins
-      oh-my-zsh = {
+      # Oh-My-Zsh configuration
+      ohMyZsh = {
         enable = true;
         plugins = [
           "git"
@@ -1191,17 +1179,12 @@ This sets up the zsh terminal
           "zsh-completions"
           "zsh-history-substring-search"
         ];
-        theme = "agnoster"; # Fallback, overridden below
+        theme = "catppuccin-mocha"; # fallback / reference
       };
 
-      # Source Nixpkgs-provided plugins explicitly
+      # Optional initContent for advanced theming / plugin sourcing
       initContent = ''
-        # Source plugins installed by Nix
-        source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-        source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-        source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
-
-        # Catppuccin Mocha theme for oh-my-zsh
+        # Example prompt colors for Catppuccin Mocha
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
         local mocha_text="#CDD6F4"
@@ -1238,14 +1221,10 @@ This sets up the zsh terminal
         ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
         ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
 
-        # Right prompt with Git status
-        RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
-
-        # Set the custom theme
+        # Set custom theme
         ZSH_THEME="catppuccin-mocha"
       '';
     };
-
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
index 6c9e211ad..9ee9a4ec8 100644
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ b/Droidnix/generated/modules/terminals/zsh.nix
@@ -1,26 +1,14 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
+{ lib, config, ... }:
 
 {
-  # --- NixOS Configuration ---
-  environment.systemPackages = with pkgs; [
-    zsh
-    git
-    docker
-  ];
-
-  # --- Home Manager Configuration ---
-  home-manager.users.henrov = {
-    programs.zsh = {
+  # Dendritic flake configuration for Zsh
+  mySystem = {
+    terminals.zsh = {
       enable = true;
       enableCompletion = true;
 
-      # Enable oh-my-zsh and use its plugins
-      oh-my-zsh = {
+      # Oh-My-Zsh configuration
+      ohMyZsh = {
         enable = true;
         plugins = [
           "git"
@@ -31,17 +19,12 @@
           "zsh-completions"
           "zsh-history-substring-search"
         ];
-        theme = "agnoster"; # Fallback, overridden below
+        theme = "catppuccin-mocha"; # fallback / reference
       };
 
-      # Source Nixpkgs-provided plugins explicitly
+      # Optional initContent for advanced theming / plugin sourcing
       initContent = ''
-        # Source plugins installed by Nix
-        source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-        source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-        source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
-
-        # Catppuccin Mocha theme for oh-my-zsh
+        # Example prompt colors for Catppuccin Mocha
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
         local mocha_text="#CDD6F4"
@@ -78,13 +61,9 @@
         ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
         ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
 
-        # Right prompt with Git status
-        RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
-
-        # Set the custom theme
+        # Set custom theme
         ZSH_THEME="catppuccin-mocha"
       '';
     };
-
   };
 }