diff --git a/Droidnix/README.org b/Droidnix/README.org
index 14044e767..fa62fd9ea 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1317,10 +1317,9 @@ let
   username = "henrov";
 in
 {
-  # Zorg dat Home Manager actief is
+  # Activeer Home Manager (als NixOS module)
   programs.home-manager.enable = true;
 
-  # Configureer Home Manager gebruiker
   home-manager.users.${username} = {
     programs.zsh = {
       enable = true;
@@ -1328,20 +1327,23 @@ in
 
       ohMyZsh = {
         enable = true;
+        theme = "catppuccin-mocha";
+
+        # Plugins in de juiste volgorde
         plugins = [
           "git"
           "docker"
           "direnv"
           "zsh-autosuggestions"
-          "zsh-syntax-highlighting"
           "zsh-completions"
           "zsh-history-substring-search"
+          # zsh-syntax-highlighting wordt apart in initExtra gesourced
         ];
-        theme = "catppuccin-mocha";
       };
 
+      # Extra init script om syntax-highlighting correct te laden
       initExtra = ''
-        # Example prompt colors for Catppuccin Mocha
+        # Catppuccin Mocha kleuren
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
         local mocha_text="#CDD6F4"
@@ -1359,8 +1361,16 @@ in
         local mocha_flamingo="#F2CDCD"
         local mocha_rosewater="#F5E0DC"
 
+        # Prompt configuratie
         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 correct 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
+
+        # Zsh-autosuggestions en andere plugins worden automatisch geladen via oh-my-zsh
       '';
     };
   };
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
index cbaaf8a1f..92c6c0aa2 100644
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ b/Droidnix/generated/modules/terminals/zsh.nix
@@ -4,10 +4,9 @@ let
   username = "henrov";
 in
 {
-  # Zorg dat Home Manager actief is
+  # Activeer Home Manager (als NixOS module)
   programs.home-manager.enable = true;
 
-  # Configureer Home Manager gebruiker
   home-manager.users.${username} = {
     programs.zsh = {
       enable = true;
@@ -15,20 +14,23 @@ in
 
       ohMyZsh = {
         enable = true;
+        theme = "catppuccin-mocha";
+
+        # Plugins in de juiste volgorde
         plugins = [
           "git"
           "docker"
           "direnv"
           "zsh-autosuggestions"
-          "zsh-syntax-highlighting"
           "zsh-completions"
           "zsh-history-substring-search"
+          # zsh-syntax-highlighting wordt apart in initExtra gesourced
         ];
-        theme = "catppuccin-mocha";
       };
 
+      # Extra init script om syntax-highlighting correct te laden
       initExtra = ''
-        # Example prompt colors for Catppuccin Mocha
+        # Catppuccin Mocha kleuren
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
         local mocha_text="#CDD6F4"
@@ -46,8 +48,16 @@ in
         local mocha_flamingo="#F2CDCD"
         local mocha_rosewater="#F5E0DC"
 
+        # Prompt configuratie
         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 correct 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
+
+        # Zsh-autosuggestions en andere plugins worden automatisch geladen via oh-my-zsh
       '';
     };
   };