diff --git a/Droidnix/README.org b/Droidnix/README.org
index abf9f7174..04cc60ec6 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1191,33 +1191,21 @@ This file sets up wayland
 #+END_SRC
 
 ** =generated/system/core/gtk.nix=
-This file installs and configures eww
+This file configures gtk
 #+BEGIN_SRC nix :tangle generated/system/core/gtk.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  # Enable GTK and Qt theming
-  programs.gtk.enable = true;
-  programs.qt.enable = true;
-
-  # Install the Adwaita icon theme
   environment.systemPackages = with pkgs; [
-    adwaita-icon-theme
+    catppuccin-gtk
+    papirus-icon-theme
   ];
 
-  # Set GTK theme and icon theme via environment variables
   environment.sessionVariables = {
-    GTK_THEME = "Adwaita:dark";
-    GTK_ICON_THEME = "Adwaita";
-    QT_STYLE_OVERRIDE = "gtk2";
-    QT_QPA_PLATFORMTHEME = "gtk2";
+    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
+    GTK_ICON_THEME = "Papirus-Dark";
+    GTK_APPLICATION_PREFER_DARK_THEME = "1";
   };
-
-  # For Qt5/Qt6 apps
-  environment.etc."xdg/qt5ct/qss/qt5ct.qss".text = ''
-    /* Set dark palette for Qt5 apps */
-    @import "dark";
-  '';
 }
 #+END_SRC
 
diff --git a/Droidnix/generated/system/core/gtk.nix b/Droidnix/generated/system/core/gtk.nix
index 74987ec4f..e55351f39 100644
--- a/Droidnix/generated/system/core/gtk.nix
+++ b/Droidnix/generated/system/core/gtk.nix
@@ -1,26 +1,14 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  # Enable GTK and Qt theming
-  programs.gtk.enable = true;
-  programs.qt.enable = true;
-
-  # Install the Adwaita icon theme
   environment.systemPackages = with pkgs; [
-    adwaita-icon-theme
+    catppuccin-gtk
+    papirus-icon-theme
   ];
 
-  # Set GTK theme and icon theme via environment variables
   environment.sessionVariables = {
-    GTK_THEME = "Adwaita:dark";
-    GTK_ICON_THEME = "Adwaita";
-    QT_STYLE_OVERRIDE = "gtk2";
-    QT_QPA_PLATFORMTHEME = "gtk2";
+    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
+    GTK_ICON_THEME = "Papirus-Dark";
+    GTK_APPLICATION_PREFER_DARK_THEME = "1";
   };
-
-  # For Qt5/Qt6 apps
-  environment.etc."xdg/qt5ct/qss/qt5ct.qss".text = ''
-    /* Set dark palette for Qt5 apps */
-    @import "dark";
-  '';
 }