diff --git a/Droidnix/generated/hyprland/hyprland.nix b/Droidnix/generated/hyprland/hyprland.nix
index 487c5a991..98e6d5f6c 100644
--- a/Droidnix/generated/hyprland/hyprland.nix
+++ b/Droidnix/generated/hyprland/hyprland.nix
@@ -25,7 +25,7 @@ in
   # Home Manager: Hyprland-specific configurations
   home-manager.users.${user.username} = {
     # Use config.home-manager.users.${user.username} instead of userConfig
-    home.stateVersion = config.home-manager.users.${user.username}.stateVersion or "23.11"; # Default fallback
+    home.stateVersion = config.home-manager.users.${user.username}.stateVersion or "25.11"; # Default fallback
     home.username = user.username; # Use the 'user' argument
     home.homeDirectory =
       config.home-manager.users.${user.username}.homeDirectory or "/home/${user.username}";
diff --git a/Droidnix/generated/system/applications/file_management/thunar.nix b/Droidnix/generated/system/applications/file_management/thunar.nix
new file mode 100644
index 000000000..f371f0832
--- /dev/null
+++ b/Droidnix/generated/system/applications/file_management/thunar.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home-manager.users.${config.home.username} = {
+    # Symlink Papirus icon theme
+    xdg.configFile."local/share/icons/Papirus".source = "/assets/system/theming/icons/papirus";
+    xdg.configFile."local/share/icons/Papirus-Dark".source = "/assets/system/theming/icons/papirus-dark";  # If you have the dark variant
+
+    # Set Papirus as the default icon theme
+    gtk.enable = true;
+    gtk.gtk3.iconTheme.name = "Papirus";
+    gtk.gtk4.iconTheme.name = "Papirus";
+
+    # Thunar and its plugins (as before)
+    home.packages = with pkgs; [
+      thunar
+      thunar-volman
+      thunar-archive-plugin
+      thunar-media-tags-plugin
+      tumbler
+      ffmpegthumbnailer
+      gvfs
+      gvfs-mtp
+      gvfs-afc
+      gvfs-goa
+      gvfs-google
+      gvfs-smb
+      gvfs-nfs
+      xdg-utils
+    ];
+
+    xdg.mimeApps = {
+      defaultApplications = {
+        "inode/directory" = "Thunar.desktop";
+      };
+    };
+  };
+}
diff --git a/Droidnix/generated/system/applications/file_management/top.nix b/Droidnix/generated/system/applications/file_management/top.nix
index c7da173ce..e6377b86c 100644
--- a/Droidnix/generated/system/applications/file_management/top.nix
+++ b/Droidnix/generated/system/applications/file_management/top.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, user, inputs, flakeRoot,... }:
 {
   imports = [
-    # No subfolders to import
+    ./thunar.nix
   ];
   # .. put any code here
 }
diff --git a/Droidnix/generated/system/core/gtk.nix b/Droidnix/generated/system/core/gtk.nix
new file mode 100644
index 000000000..ce369aae9
--- /dev/null
+++ b/Droidnix/generated/system/core/gtk.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+
+{
+  # Enable GTK and Qt theming
+  programs.gtk.enable = true;
+  programs.qt.enable = true;
+
+  # Set a dark GTK theme (e.g., Adwaita-dark)
+  environment.systemPackages = with pkgs; [
+    adwaita-icon-theme
+  ];
+
+  # GTK settings
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Adwaita-dark";
+      iconTheme = {
+        name = "Adwaita";
+        package = adwaita-icon-theme;
+      };
+    };
+  };
+
+  # Qt settings
+  environment.sessionVariables = {
+    QT_STYLE_OVERRIDE = "gtk2";
+    QT_QPA_PLATFORMTHEME = "gtk2";
+    GTK_THEME = "Adwaita:dark";
+  };
+
+  # For Qt5/Qt6 apps
+  environment.etc."xdg/qt5ct/qss/qt5ct.qss".text = ''
+    /* Set dark palette for Qt5 apps */
+    @import "dark";
+  '';
+}
diff --git a/Droidnix/generated/system/core/top.nix b/Droidnix/generated/system/core/top.nix
index 68dcdc894..b09e91b9d 100644
--- a/Droidnix/generated/system/core/top.nix
+++ b/Droidnix/generated/system/core/top.nix
@@ -6,6 +6,7 @@
     ./waybar.nix
     ./login-tuigreeter.nix
     #./login-lightdm.nix
+    ./gtk.nix
   ];
   # .. put any code here
 }
diff --git a/Droidnix/generated/system/core/wayland.nix b/Droidnix/generated/system/core/wayland.nix
index 9d7e5e81d..ef08a62f4 100644
--- a/Droidnix/generated/system/core/wayland.nix
+++ b/Droidnix/generated/system/core/wayland.nix
@@ -8,5 +8,9 @@
         "org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
       };
     };
+
+  home.packages = with pkgs; [
+     uwsm
+     ];
   };
 }