diff --git a/Droidnix/README.org b/Droidnix/README.org
index b050e87b8..4f8ab9651 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1200,22 +1200,17 @@ This file installs and configures eww
     adwaita-icon-theme
   ];
 
-  # GTK settings
-  gtk = {
-    theme = {
-      name = "Adwaita-dark";
-      iconTheme = {
-        name = "Adwaita";
-        package = pkgs.adwaita-icon-theme;
-      };
-    };
+  # GTK icon theme
+  gtk.iconTheme = {
+    name = "Adwaita";
+    package = pkgs.adwaita-icon-theme;
   };
 
-  # Qt settings
+  # Set GTK theme via environment variable
   environment.sessionVariables = {
+    GTK_THEME = "Adwaita:dark";
     QT_STYLE_OVERRIDE = "gtk2";
     QT_QPA_PLATFORMTHEME = "gtk2";
-    GTK_THEME = "Adwaita:dark";
   };
 
   # For Qt5/Qt6 apps
@@ -1224,7 +1219,6 @@ This file installs and configures eww
     @import "dark";
   '';
 }
-
 #+END_SRC
 
 ** =generated/system/development/top.nix=
diff --git a/Droidnix/generated/system/core/gtk.nix b/Droidnix/generated/system/core/gtk.nix
index 22549ee06..f192681ab 100644
--- a/Droidnix/generated/system/core/gtk.nix
+++ b/Droidnix/generated/system/core/gtk.nix
@@ -10,22 +10,17 @@
     adwaita-icon-theme
   ];
 
-  # GTK settings
-  gtk = {
-    theme = {
-      name = "Adwaita-dark";
-      iconTheme = {
-        name = "Adwaita";
-        package = pkgs.adwaita-icon-theme;
-      };
-    };
+  # GTK icon theme
+  gtk.iconTheme = {
+    name = "Adwaita";
+    package = pkgs.adwaita-icon-theme;
   };
 
-  # Qt settings
+  # Set GTK theme via environment variable
   environment.sessionVariables = {
+    GTK_THEME = "Adwaita:dark";
     QT_STYLE_OVERRIDE = "gtk2";
     QT_QPA_PLATFORMTHEME = "gtk2";
-    GTK_THEME = "Adwaita:dark";
   };
 
   # For Qt5/Qt6 apps