diff --git a/Droidnix/README.org b/Droidnix/README.org
index b8faf5955..188ff9d0e 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1071,12 +1071,78 @@ This is top file of this level which contains just an import statement for all r
 { config, pkgs, lib, user, inputs, flakeRoot,... }:
 {
   imports = [
-    # No subfolders to import
+    ./kitty.nix
+    ./starship.nix
+    ./zsh.nix
   ];
   # .. put any code here
 }
 #+END_SRC
 
+** =generated/system/applications/terminal_shell/kitty.nix=
+This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
+#+BEGIN_SRC nix :tangle generated/system/applications/terminal_shell/kitty.nix :noweb tangle :mkdirp yes :eval never-html
+{
+  xdg.enable = true;
+  programs.kitty = {
+  enable = true;
+  extraConfig = ''
+  # 1) Theme first (stable path)
+  include themes/Catppuccin-Mocha.conf
+  # 2) Force transparency last (wins)
+  #background_opacity 0.60
+  #dynamic_background_opacity yes
+  '';
+  };
+}
+#+END_SRC
+
+** =generated/system/applications/terminal_shell/starship.nix=
+This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
+#+BEGIN_SRC nix :tangle generated/system/applications/terminal_shell/starship.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, lib, flakeRoot, ... }:
+{
+  xdg.enable = true;
+  programs.starship = {
+  enable = true;
+  enableZshIntegration  = true;
+  enableBashIntegration = true;
+  enableFishIntegration = true;
+  };
+}
+
+#+END_SRC
+
+** =generated/system/applications/terminal_shell/zsh.nix=
+This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
+#+BEGIN_SRC nix :tangle generated/system/applications/terminal_shell/zsh.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, lib, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autocd = true;
+    dotDir = "${config.xdg.configHome}/zsh";
+    oh-my-zsh = {
+      enable = true;
+      theme = "";
+      plugins = [
+        "git"
+        "sudo"
+        "extract"
+        "colored-man-pages"
+        "command-not-found"
+        "history"
+        "docker"
+        "kubectl"
+      ];
+    };
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+  };
+}
+#+END_SRC
+
 ** =generated/system/development/databases/top.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/system/development/databases/top.nix :noweb tangle :mkdirp yes :eval never-html
diff --git a/Droidnix/generated/system/applications/terminal_shell/kitty.nix b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
new file mode 100644
index 000000000..476efca5c
--- /dev/null
+++ b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, lib, flakeRoot, ... }:
+{
+  xdg.enable = true;
+  programs.kitty = {
+  enable = true;
+  extraConfig = ''
+  # 1) Theme first (stable path)
+  include themes/Catppuccin-Mocha.conf
+  # 2) Force transparency last (wins)
+  #background_opacity 0.60
+  #dynamic_background_opacity yes
+  '';
+  };
+}
diff --git a/Droidnix/generated/system/applications/terminal_shell/starship.nix b/Droidnix/generated/system/applications/terminal_shell/starship.nix
new file mode 100644
index 000000000..fd379d41d
--- /dev/null
+++ b/Droidnix/generated/system/applications/terminal_shell/starship.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, lib, flakeRoot, ... }:
+{
+  xdg.enable = true;
+  programs.starship = {
+  enable = true;
+  enableZshIntegration  = true;
+  enableBashIntegration = true;
+  enableFishIntegration = true;
+  };
+}
diff --git a/Droidnix/generated/system/applications/terminal_shell/top.nix b/Droidnix/generated/system/applications/terminal_shell/top.nix
index c7da173ce..a23045c18 100644
--- a/Droidnix/generated/system/applications/terminal_shell/top.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/top.nix
@@ -1,7 +1,17 @@
-{ config, pkgs, lib, user, inputs, flakeRoot,... }:
+{
+  config,
+  pkgs,
+  lib,
+  user,
+  inputs,
+  flakeRoot,
+  ...
+}:
 {
   imports = [
-    # No subfolders to import
+    ./kitty.nix
+    ./starship.nix
+    ./zsh.nix
   ];
   # .. put any code here
 }
diff --git a/Droidnix/generated/system/applications/terminal_shell/zsh.nix b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
new file mode 100644
index 000000000..d607ec07f
--- /dev/null
+++ b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autocd = true;
+    dotDir = "${config.xdg.configHome}/zsh";
+    oh-my-zsh = {
+      enable = true;
+      theme = "";
+      plugins = [
+        "git"
+        "sudo"
+        "extract"
+        "colored-man-pages"
+        "command-not-found"
+        "history"
+        "docker"
+        "kubectl"
+      ];
+    };
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+  };
+}