diff --git a/Droidnix/README.org b/Droidnix/README.org
index 504442624..3e2dfcf91 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -616,39 +616,28 @@ Setting up GTK
 { pkgs, config, lib, ... }:
 
 let
-  # Resolve the username from the host config
   username = config.defaultUser or "henrov";
 in
 {
-  ############################
-  # System-level GTK packages
-  ############################
   environment.systemPackages = with pkgs; [
     gtk3
     gtk4
   ];
 
-  ############################
-  # Home Manager user-level GTK configuration
-  ############################
-  # Directly assign the GTK config to the user, no recursiveUpdate
   home-manager.users."${username}" = {
     gtk = {
       enable = true;
 
-      # GTK theme
       theme = {
         name    = "Catppuccin-Mocha-Standard-Blue-Dark";
         package = pkgs.magnetic-catppuccin-gtk;
       };
 
-      # Icon theme
       iconTheme = {
         name    = "Papirus-Dark";
         package = pkgs.papirus-icon-theme;
       };
 
-      # Extra GTK3 / GTK4 settings
       gtk3.extraConfig = {
         "gtk-application-prefer-dark-theme" = 1;
       };
@@ -656,6 +645,12 @@ in
         "gtk-application-prefer-dark-theme" = 1;
       };
     };
+
+    # Ensure GTK apps launched from Hyprland / terminal use dark theme
+    home.sessionVariables = {
+      GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
+      XDG_DATA_DIRS = "${pkgs.papirus-icon-theme}/share:$XDG_DATA_DIRS";
+    };
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/modules/traveldroid/desktop/gtk.nix b/Droidnix/generated/modules/traveldroid/desktop/gtk.nix
index 253e2bafe..ac83e54dd 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/gtk.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/gtk.nix
@@ -1,39 +1,28 @@
 { pkgs, config, lib, ... }:
 
 let
-  # Resolve the username from the host config
   username = config.defaultUser or "henrov";
 in
 {
-  ############################
-  # System-level GTK packages
-  ############################
   environment.systemPackages = with pkgs; [
     gtk3
     gtk4
   ];
 
-  ############################
-  # Home Manager user-level GTK configuration
-  ############################
-  # Directly assign the GTK config to the user, no recursiveUpdate
   home-manager.users."${username}" = {
     gtk = {
       enable = true;
 
-      # GTK theme
       theme = {
         name    = "Catppuccin-Mocha-Standard-Blue-Dark";
         package = pkgs.magnetic-catppuccin-gtk;
       };
 
-      # Icon theme
       iconTheme = {
         name    = "Papirus-Dark";
         package = pkgs.papirus-icon-theme;
       };
 
-      # Extra GTK3 / GTK4 settings
       gtk3.extraConfig = {
         "gtk-application-prefer-dark-theme" = 1;
       };
@@ -41,5 +30,11 @@ in
         "gtk-application-prefer-dark-theme" = 1;
       };
     };
+
+    # Ensure GTK apps launched from Hyprland / terminal use dark theme
+    home.sessionVariables = {
+      GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
+      XDG_DATA_DIRS = "${pkgs.papirus-icon-theme}/share:$XDG_DATA_DIRS";
+    };
   };
 }