diff --git a/Droidnix/README.org b/Droidnix/README.org
index 7a3ee0011..0d8008b8c 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1371,19 +1371,18 @@ This is top file of this level which contains just an import statement for all r
 This file sets up Kitty terminal
 #+BEGIN_SRC nix :tangle generated/system/applications/terminal_shell/kitty.nix :noweb tangle :mkdirp yes :eval never-html
 { config, pkgs, lib, user, flakeRoot, ... }:
-let
-  kittyConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/kitty";
-in
+
 {
   home-manager.users.${user.username} = {
     programs.kitty = {
       enable = true;
     };
 
-    # Copy the actual kitty.conf (not a symlink)
-    xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [
-      (builtins.readFile "${flakeRoot}/assets/system/conf/kitty/kitty.conf")
-    ];
+    # Copy the main kitty.conf
+    xdg.configFile."kitty/kitty.conf".text = builtins.readFile "${flakeRoot}/assets/system/conf/kitty/kitty.conf";
+
+    # Copy the Stylix-generated Catppuccin Mocha theme
+    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/out_of_tree/core/theme.nix b/Droidnix/generated/out_of_tree/core/theme.nix
deleted file mode 100644
index cf41b4393..000000000
--- a/Droidnix/generated/out_of_tree/core/theme.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, flakeRoot, ... }:
-{
-  stylix = {
-    enable = true;
-    base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
-    polarity = "dark";
-    targets = {
-      gtk.enable = true;
-      # kde.enable = false;
-      # gnome.enable = false;
-    };
-  };
-}
diff --git a/Droidnix/generated/out_of_tree/gtk.nix b/Droidnix/generated/out_of_tree/gtk.nix
deleted file mode 100644
index 445355e8d..000000000
--- a/Droidnix/generated/out_of_tree/gtk.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Stylix GTK target
-  stylix.targets.gtk.enable = true;
-}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix
deleted file mode 100644
index de9a335df..000000000
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, user, ... }:
-{
-  environment.sessionVariables = {
-    XDG_SESSION_TYPE = "wayland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XCURSOR_SIZE = "24";
-    GTK_ENABLE_DARK_MODE = "1";
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    # Use this instead of GTK_APPLICATION_PREFER_DARK_THEME for newer GTK apps:
-    GTK_THEME_VARIANT = "dark";
-    # For Qt apps (if any):
-    QT_STYLE_OVERRIDE = "gtk2";
-    # For Zen Browser (Firefox fork):
-    MOZ_ENABLE_WAYLAND = "1";
-    GSETTINGS_SCHEMA_DIR = "${pkgs.gsettings-desktop-schemas}/share/glib-2.0/schemas";
-  };
-
-    # Add other session-wide variables here (e.g., QT_QPA_PLATFORM, SDL_VIDEODRIVER)
-}
diff --git a/Droidnix/generated/system/applications/terminal_shell/kitty.nix b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
index b7ffd890f..ae1e34f74 100644
--- a/Droidnix/generated/system/applications/terminal_shell/kitty.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/kitty.nix
@@ -1,16 +1,15 @@
 { config, pkgs, lib, user, flakeRoot, ... }:
-let
-  kittyConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/kitty";
-in
+
 {
   home-manager.users.${user.username} = {
     programs.kitty = {
       enable = true;
     };
 
-    # Copy the actual kitty.conf (not a symlink)
-    xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [
-      (builtins.readFile "${flakeRoot}/assets/system/conf/kitty/kitty.conf")
-    ];
+    # Copy the main kitty.conf
+    xdg.configFile."kitty/kitty.conf".text = builtins.readFile "${flakeRoot}/assets/system/conf/kitty/kitty.conf";
+
+    # Copy the Stylix-generated Catppuccin Mocha theme
+    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
   };
 }
diff --git a/Droidnix/generated/system/core/theme.nix b/Droidnix/generated/system/core/theme.nix
deleted file mode 100644
index aefc2c0c8..000000000
--- a/Droidnix/generated/system/core/theme.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, flakeRoot, ... }:
-
-{
-  programs.stylix = {
-    enable = true;
-    settings = {
-      theme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
-    };
-  };
-}
diff --git a/Droidnix/generated/system/out_of_tree/gtk.nix b/Droidnix/generated/system/out_of_tree/gtk.nix
deleted file mode 100644
index 445355e8d..000000000
--- a/Droidnix/generated/system/out_of_tree/gtk.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Stylix GTK target
-  stylix.targets.gtk.enable = true;
-}
diff --git a/Droidnix/generated/system/out_of_tree/nix.nix b/Droidnix/generated/system/out_of_tree/nix.nix
deleted file mode 100644
index bb28420bf..000000000
--- a/Droidnix/generated/system/out_of_tree/nix.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  nix.settings = {
-    extra-experimental-features = [ "nix-command" "flakes" ];
-  };
-}
diff --git a/Droidnix/generated/system/out_of_tree/terminal.nix b/Droidnix/generated/system/out_of_tree/terminal.nix
deleted file mode 100644
index 393b84e1b..000000000
--- a/Droidnix/generated/system/out_of_tree/terminal.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Example for terminal (NVF = Neovim/terminal flavor)
-  stylix.targets.nvf.enable = true;
-  # Optional: feh wallpaper integration
-  stylix.targets.feh.enable = true;
-}