diff --git a/Droidnix/README.org b/Droidnix/README.org
index 03cc7e759..85102d882 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1365,11 +1365,13 @@ in
     lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
   # Wrap everything in config if enabled
-  config = lib.mkIf (config.enableZsh or false) (let
+  config = { config, ... }: let
+    # Enable flag now safely references the toggle option
+    enableProgram = config.enableZsh or false;
+
     # Safe reference to defaultUser inside mkIf
     username = config.defaultUser or "henrov";
-  in
-  {
+  in lib.mkIf enableProgram {
     myApps = {
       zsh = {
         enable = true;
@@ -1422,9 +1424,8 @@ in
         '';
       };
     };
-  });
-}
-#+END_SRC
+  };
+}#+END_SRC
 
 ** =generated/modules/apps/emacs/emacs.nix=
 This sets up the emacs terminal
diff --git a/Droidnix/generated/modules/apps/emacs/emacs.nix b/Droidnix/generated/modules/apps/emacs/emacs.nix
deleted file mode 100644
index 0ca795268..000000000
--- a/Droidnix/generated/modules/apps/emacs/emacs.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ lib, ... }:
-
-{
-  flake.nixosModules.emacs = { config, pkgs, lib, ... }:
-
-  {
-    # Optie om de module aan/uit te zetten
-    options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config";
-
-    config = lib.mkIf (config.mySystem.system.emacs.enable or false) {
-      # System packages (optioneel)
-      environment.systemPackages = with pkgs; [
-        # Voeg systeem-brede packages toe als je wilt
-      ];
-
-      # Home Manager configuratie
-      home-manager.users.henrov = {
-        programs.emacs = {
-          enable = true;
-          package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
-
-          extraPackages = epkgs: with epkgs; [
-            # Tree-sitter and language support
-            manualPackages.treesit-grammars.with-all-grammars
-            rust-mode
-            rustic
-            nix-mode
-            hcl-mode
-
-            # UI/UX and navigation
-            nerd-icons
-            doom-modeline
-            diminish
-            eldoc
-            eldoc-box
-            pulsar
-            which-key
-            avy
-            consult
-            vertico
-            marginalia
-            crux
-            shell-pop
-
-            # Completion and snippets
-            nerd-icons-corfu
-            corfu
-            cape
-            orderless
-            yasnippet
-            yasnippet-snippets
-
-            # Utilities and tools
-            rg
-            exec-path-from-shell
-            eat
-            f
-            gptel
-            nixpkgs-fmt
-            envrc
-
-            # Theming
-            catppuccin-theme
-
-            # Git
-            magit
-
-            # Editing and workflow
-            expreg
-            vundo
-            puni
-
-            # Error and side panel support
-            sideline
-            sideline-flymake
-            sideline-eglot
-          ];
-        };
-
-        home.sessionVariables = {
-          EDITOR = "emacs";
-          XDG_SCREENSHOTS_DIR = "~/screenshots";
-        };
-      };
-    };
-  };
-}
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
deleted file mode 100644
index 3a7765117..000000000
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib, ... }:
-
-let
-  # --- Program-specific paths/assets ---
-  programName = "zsh";
-  programAssets = ../../../assets/system/conf/${programName};
-  programFiles = builtins.readDir programAssets;
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
-  });
-in
-{
-  # Top-level toggle for this program
-  options.enableZsh =
-    lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
-
-  # Wrap everything in config if enabled
-  config = lib.mkIf (config.enableZsh or false) (let
-    # Safe reference to defaultUser inside mkIf
-    username = config.defaultUser or "henrov";
-  in
-  {
-    myApps = {
-      zsh = {
-        enable = true;
-        assetsDir = programAssets;
-        files = files;
-        user = username;
-
-        # Zsh-specific settings
-        ohMyZsh = {
-          enable = true;
-          theme = "catppuccin-mocha";
-          plugins = [
-            "git"
-            "docker"
-            "direnv"
-            "zsh-autosuggestions"
-            "zsh-completions"
-            "zsh-history-substring-search"
-            # zsh-syntax-highlighting is sourced in initExtra
-          ];
-        };
-
-        initExtra = ''
-          # Catppuccin Mocha colors
-          local mocha_base="#1E1E2E"
-          local mocha_surface0="#313244"
-          local mocha_text="#CDD6F4"
-          local mocha_lavender="#B4BEFE"
-          local mocha_blue="#89B4FA"
-          local mocha_sapphire="#74C7EC"
-          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="#F5E2C7"
-          local mocha_flamingo="#F2CDCD"
-          local mocha_rosewater="#F5E0DC"
-
-          # Prompt
-          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%}'
-
-          # Source zsh-syntax-highlighting if present
-          if [ -f ${files."zsh-syntax-highlighting".src} ]; then
-            source ${files."zsh-syntax-highlighting".src}
-          fi
-        '';
-      };
-    };
-  });
-}