diff --git a/Droidnix/README.org b/Droidnix/README.org
index b22c1fbb2..c4f8c7c74 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1260,11 +1260,8 @@ This file sets up Kitty terminal
   flake.nixosModules.kitty = { config, pkgs, lib, ... }:
 
   let
-    # ✅ relatieve paden i.p.v. flakeRoot
     kittyConf = ./assets/system/conf/kitty/kitty.conf;
     kittyTheme = ./assets/system/conf/kitty/Catppuccin-Mocha.conf;
-
-    # ✅ vaste user (of uit config halen)
     username = "henrov";
   in
   {
@@ -1273,7 +1270,6 @@ This file sets up Kitty terminal
 
     config = lib.mkIf (config.mySystem.terminals.kitty.enable or false) {
 
-      # 👇 juiste Home Manager scope
       home-manager.users.${username} = {
 
         programs.kitty.enable = true;
@@ -1315,17 +1311,13 @@ This sets up the zsh terminal
 
 let
   username = "henrov";
-in
-{
-  # Home Manager configuratie
-  homeConfigurations = {
-    ${username} = lib.recursiveUpdate (import <home-manager/nixos> {
-      inherit pkgs lib;
-      # eventueel: extraModules = [ ... ];
-    }) {
-      home.username = username;
-      home.homeDirectory = "/home/${username}";
+in {
+  options.mySystem.terminals.zsh.enable =
+    lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
+  config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
+    # Home Manager scope
+    home-manager.users.${username} = {
       programs.zsh = {
         enable = true;
         enableCompletion = true;
@@ -1340,6 +1332,7 @@ in
             "zsh-autosuggestions"
             "zsh-completions"
             "zsh-history-substring-search"
+            "zsh-syntax-highlighting"
           ];
         };
 
@@ -1351,24 +1344,19 @@ in
           local mocha_lavender="#B4BEFE"
           local mocha_blue="#89B4FA"
           local mocha_sapphire="#74C7EC"
-          local mocha_teal="#94E2D5"
+          local mocha_teal="#94D2D5"
           local mocha_green="#A6E3A1"
           local mocha_yellow="#F9E2AF"
           local mocha_peach="#FAB387"
           local mocha_maroon="#EBA0AC"
           local mocha_red="#F38BA8"
           local mocha_mauve="#CBA6F7"
-          local mocha_pink="#F5C2E7"
+          local mocha_pink="#F5E2C7"
           local mocha_flamingo="#F2CDCD"
           local mocha_rosewater="#F5E0DC"
 
           PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
           RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
-
-          # Zsh-syntax-highlighting sourcen
-          if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
-            source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-          fi
         '';
       };
     };
diff --git a/Droidnix/generated/modules/terminals/kitty.nix b/Droidnix/generated/modules/terminals/kitty.nix
index ac1ee314f..dc7ffe350 100644
--- a/Droidnix/generated/modules/terminals/kitty.nix
+++ b/Droidnix/generated/modules/terminals/kitty.nix
@@ -4,11 +4,8 @@
   flake.nixosModules.kitty = { config, pkgs, lib, ... }:
 
   let
-    # ✅ relatieve paden i.p.v. flakeRoot
     kittyConf = ./assets/system/conf/kitty/kitty.conf;
     kittyTheme = ./assets/system/conf/kitty/Catppuccin-Mocha.conf;
-
-    # ✅ vaste user (of uit config halen)
     username = "henrov";
   in
   {
@@ -17,7 +14,6 @@
 
     config = lib.mkIf (config.mySystem.terminals.kitty.enable or false) {
 
-      # 👇 juiste Home Manager scope
       home-manager.users.${username} = {
 
         programs.kitty.enable = true;
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
index 10d58ecda..993276c49 100644
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ b/Droidnix/generated/modules/terminals/zsh.nix
@@ -2,17 +2,13 @@
 
 let
   username = "henrov";
-in
-{
-  # Home Manager configuratie
-  homeConfigurations = {
-    ${username} = lib.recursiveUpdate (import <home-manager/nixos> {
-      inherit pkgs lib;
-      # eventueel: extraModules = [ ... ];
-    }) {
-      home.username = username;
-      home.homeDirectory = "/home/${username}";
+in {
+  options.mySystem.terminals.zsh.enable =
+    lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
+  config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
+    # Home Manager scope
+    home-manager.users.${username} = {
       programs.zsh = {
         enable = true;
         enableCompletion = true;
@@ -27,6 +23,7 @@ in
             "zsh-autosuggestions"
             "zsh-completions"
             "zsh-history-substring-search"
+            "zsh-syntax-highlighting"
           ];
         };
 
@@ -38,24 +35,19 @@ in
           local mocha_lavender="#B4BEFE"
           local mocha_blue="#89B4FA"
           local mocha_sapphire="#74C7EC"
-          local mocha_teal="#94E2D5"
+          local mocha_teal="#94D2D5"
           local mocha_green="#A6E3A1"
           local mocha_yellow="#F9E2AF"
           local mocha_peach="#FAB387"
           local mocha_maroon="#EBA0AC"
           local mocha_red="#F38BA8"
           local mocha_mauve="#CBA6F7"
-          local mocha_pink="#F5C2E7"
+          local mocha_pink="#F5E2C7"
           local mocha_flamingo="#F2CDCD"
           local mocha_rosewater="#F5E0DC"
 
           PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
           RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
-
-          # Zsh-syntax-highlighting sourcen
-          if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
-            source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-          fi
         '';
       };
     };