diff --git a/Droidnix/README.org b/Droidnix/README.org
index 087fad9ab..747c2e270 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -198,16 +198,8 @@ outputs =
       lib.nixosSystem {
         inherit system;
         modules = [
-          # Importing nix.nix
-          ./generated/out_of_tree/core/nix.nix
-          # theming engine
-          stylix.nixosModules.stylix
-          # Importing theme file
-          ./generated/out_of_tree/core/theme.nix
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/${machine}/top.nix
-          # Catppuccin theme module
-          # catppuccin.nixosModules.catppuccin
           # Anchoring all the other nixes
           ./generated/top.nix
           # Home Manager module
@@ -342,6 +334,10 @@ This is the top of the machine hierarchy
 
 {
   imports = [
+    ./../../core/nix.nix
+    ./../../core/stylix.nix
+    ./../../core/gtk.nix
+    ./../../core/terminal.nix
     ./boot.nix
     ./hardware-configuration.nix
     ./machine.nix
@@ -593,26 +589,6 @@ This sets audiosystem for this machine
 #+END_SRC
 
 
-
-** =generated/out_of_tree/core/theme.nix=
-I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
-You'll notice the color values in multiple places outside this as well.
-#+BEGIN_SRC nix :tangle generated/out_of_tree/core/theme.nix :noweb tangle :mkdirp yes :eval never-html
-{ 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;
-    };
-  };
-}
-#+END_SRC
-
 ** =generated/out_of_tree/machines/traveldroid/xdg.nix=
 This sets the XDG implementation
 #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/xdg.nix :noweb tangle :mkdirp yes :eval never-html
@@ -625,35 +601,46 @@ This sets the XDG implementation
 }
 #+END_SRC
 
-** =generated/out_of_tree/core/gtk.nix=
-I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
-You'll notice the color values in multiple places outside this as well.
-#+BEGIN_SRC nix :tangle generated/system/out_of_tree/gtk.nix :noweb tangle :mkdirp yes :eval never-html
-{ pkgs, user, ... }:
+** =generated/out_of_tree/core/stylix.nix=
+This sets the stylix implementation
+#+BEGIN_SRC nix :tangle generated/out_of_tree/core/stylix.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, flakeRoot, ... }:
 {
-  home-manager.users.${user.username} = {
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Catppuccin-Mocha-Standard-Blue-Dark";
-        package = pkgs.magnetic-catppuccin-gtk;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-      gtk3.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
-      };
-      gtk4.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
-      };
-    };
-
+  # Enable Stylix at system level
+ stylix.nixosModules.stylix;
+  # Minimal configuration
+  stylix = {
+    enable = true;
+    base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
+    polarity = "dark";
   };
 }
 #+END_SRC
 
+** =generated/out_of_tree/core/gtk.nix=
+Sets theming for GTK
+#+BEGIN_SRC nix :tangle generated/system/out_of_tree/gtk.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, ... }:
+
+{
+  # Stylix GTK target
+  stylix.targets.gtk.enable = true;
+}
+#+END_SRC
+
+** =generated/out_of_tree/core/terminal.nix=
+Sets theming for the terminal
+#+BEGIN_SRC nix :tangle generated/system/out_of_tree/terminal.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, ... }:
+
+{
+  # Example for terminal (NVF = Neovim/terminal flavor)
+  stylix.targets.nvf.enable = true;
+  # Optional: feh wallpaper integration
+  stylix.targets.feh.enable = true;
+}
+#+END_SRC
+
 ** =generated/out_of_tree/core/nix.nix=
 I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
 You'll notice the color values in multiple places outside this as well.
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 4d04a2255..78f258e23 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -54,16 +54,8 @@ outputs =
       lib.nixosSystem {
         inherit system;
         modules = [
-          # Importing nix.nix
-          ./generated/out_of_tree/core/nix.nix
-          # theming engine
-          stylix.nixosModules.stylix
-          # Importing theme file
-          ./generated/out_of_tree/core/theme.nix
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/${machine}/top.nix
-          # Catppuccin theme module
-          # catppuccin.nixosModules.catppuccin
           # Anchoring all the other nixes
           ./generated/top.nix
           # Home Manager module
diff --git a/Droidnix/generated/out_of_tree/core/stylix.nix b/Droidnix/generated/out_of_tree/core/stylix.nix
new file mode 100644
index 000000000..a768ee277
--- /dev/null
+++ b/Droidnix/generated/out_of_tree/core/stylix.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, flakeRoot, ... }:
+{
+  # Enable Stylix at system level
+ stylix.nixosModules.stylix;
+  # Minimal configuration
+  stylix = {
+    enable = true;
+    base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
+    polarity = "dark";
+  };
+}
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
index 1d1c0b5ea..460824268 100644
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
+++ b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
@@ -10,6 +10,10 @@
 
 {
   imports = [
+    ./../../core/nix.nix
+    ./../../core/stylix.nix
+    ./../../core/gtk.nix
+    ./../../core/terminal.nix
     ./boot.nix
     ./hardware-configuration.nix
     ./machine.nix
diff --git a/Droidnix/generated/system/out_of_tree/gtk.nix b/Droidnix/generated/system/out_of_tree/gtk.nix
index 50ea31c9e..445355e8d 100644
--- a/Droidnix/generated/system/out_of_tree/gtk.nix
+++ b/Droidnix/generated/system/out_of_tree/gtk.nix
@@ -1,23 +1,6 @@
-{ pkgs, user, ... }:
-{
-  home-manager.users.${user.username} = {
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Catppuccin-Mocha-Standard-Blue-Dark";
-        package = pkgs.magnetic-catppuccin-gtk;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-      gtk3.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
-      };
-      gtk4.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
-      };
-    };
+{ config, pkgs, ... }:
 
-  };
+{
+  # Stylix GTK target
+  stylix.targets.gtk.enable = true;
 }
diff --git a/Droidnix/generated/system/out_of_tree/terminal.nix b/Droidnix/generated/system/out_of_tree/terminal.nix
new file mode 100644
index 000000000..393b84e1b
--- /dev/null
+++ b/Droidnix/generated/system/out_of_tree/terminal.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  # Example for terminal (NVF = Neovim/terminal flavor)
+  stylix.targets.nvf.enable = true;
+  # Optional: feh wallpaper integration
+  stylix.targets.feh.enable = true;
+}