diff --git a/modules/programs/gui/thunar/module.nix b/modules/programs/gui/thunar/module.nix
deleted file mode 100644
index 7a829d0..0000000
--- a/modules/programs/gui/thunar/module.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  programs.thunar = {
-    enable = true;
-    plugins = builtins.attrValues {
-      inherit
-        (pkgs.xfce)
-        thunar-volman
-        thunar-vcs-plugin
-        thunar-archive-plugin
-        thunar-media-tags-plugin
-        ;
-    };
-  };
-  services.gvfs = {
-    enable = true;
-    package = pkgs.gvfs;
-  };
-}
diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix
index 18727cb..4bd9a68 100644
--- a/modules/style/fonts.nix
+++ b/modules/style/fonts.nix
@@ -58,6 +58,7 @@ in {
         (pkgs)
         material-icons
         material-design-icons
+        papirus-icon-theme
         lexend
         noto-fonts
         noto-fonts-cjk-sans
diff --git a/modules/style/gtk.nix b/modules/style/gtk.nix
index 7440c41..d079c06 100644
--- a/modules/style/gtk.nix
+++ b/modules/style/gtk.nix
@@ -7,9 +7,9 @@
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) str package;
   inherit (lib.modules) mkIf;
-  cfg = config.modules.theming.gtk;
+  cfg = config.modules.theme.gtk;
 in {
-  options.modules.theming.gtk = {
+  options.modules.theme.gtk = {
     enable = mkEnableOption "Wether to enable GTK theming";
     theme = {
       name = mkOption {
@@ -32,7 +32,7 @@ in {
       };
       package = mkOption {
         description = "The GTK icon theme package";
-        default = pkgs.papirus-icon-theme;
+        default = pkgs.catppuccin-papirus-folders;
         type = package;
       };
     };
@@ -40,25 +40,5 @@ in {
   config = mkIf cfg.enable {
     # NOTE: we need this or gtk breaks
     programs.dconf.enable = true;
-
-    environment = {
-      systemPackages = builtins.attrValues {
-        inherit
-          (pkgs)
-          gruvbox-gtk-theme
-          papirus-icon-theme
-          ;
-      };
-      variables = let
-        cursorSize = 32;
-      in {
-        GTK_THEME = "Gruvbox-Dark";
-        XCURSOR_THEME = "BreezeX-RosePine-Linux";
-        XCURSOR_SIZE = cursorSize;
-
-        HYPRCURSOR_THEME = "BreezeX-RosePine-Linux";
-        HYPRCURSOR_SIZE = cursorSize;
-      };
-    };
   };
 }
diff --git a/modules/style/theming.nix b/modules/style/theming.nix
index 5e3655e..ce272d4 100644
--- a/modules/style/theming.nix
+++ b/modules/style/theming.nix
@@ -7,31 +7,9 @@
   inherit (lib.modules) mkMerge mkIf;
   inherit (lib.options) mkEnableOption;
   cfg = config.modules.theming;
-  inherit (builtins) toString isBool;
-  inherit (lib) boolToString escape generators;
-
-  toGtk3Ini = generators.toINI {
-    mkKeyValue = key: value: let
-      value' =
-        if isBool value
-        then boolToString value
-        else toString value;
-    in "${escape ["="] key}=${value'}";
-  };
-
-  gtkIni = {
-    gtk-application-prefer-dark-theme = 1;
-    gtk-font-name = "Lexend 11";
-    gtk-icon-theme-name = "Papirus-Dark";
-    gtk-xft-antialias = 1;
-    gtk-xft-hinting = 1;
-    gtk-xft-hintstyle = "hintslight";
-    gtk-xft-rgba = "rgb";
-    gtk-cursor-theme-name = "BreezeX-RosePine-Linux";
-    gtk-theme-name = "Gruvbox-Dark";
-  };
 in {
   options.modules.theming = {
+    gtk.enable = mkEnableOption "gtk theming";
     qt.enable = mkEnableOption "qt theming";
   };
   config = mkMerge [
@@ -41,23 +19,25 @@ in {
           inherit (pkgs) rose-pine-cursor;
         };
         etc = {
-          "xdg/gtk-4.0/settings.ini".text = toGtk3Ini {
-            Settings = gtkIni;
-          };
-          "xdg/gtk-3.0/settings.ini".text = toGtk3Ini {
-            Settings = gtkIni;
-          };
+          "xdg/gtk-4.0/settings.ini".text = ''
+            [Settings]
+            gtk-application-prefer-dark-theme=true
+            gtk-cursor-theme-name=BreezeX-RosePine-Linux
+          '';
+
+          "xdg/gtk-3.0/settings.ini".text = ''
+            [Settings]
+            gtk-application-prefer-dark-theme=true
+            gtk-cursor-theme-name=BreezeX-RosePine-Linux
+          '';
 
           "xdg/gtk-2.0/gtkrc".text = ''
-            gtk-cursor-theme-name = BreezeX-RosePine-Linux
-            gtk-cursor-theme-size = 32
-            gtk-theme-name = Gruvbox-Dark
-            gtk-icon-theme-name = Papirus-Dark
-            gtk-font-name = Lexend 11
+            gtk-cursor-theme-name = "BreezeX-RosePine-Linux"
+            gtk-cursor-theme-size = 30
           '';
 
           "xdg/Xresources".text = ''
-            Xcursor.size: 32
+            Xcursor.size: 30
             Xcursor.theme: BreezeX-RosePine-Linux
           '';
         };
diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix
index 037b44e..04d2c77 100644
--- a/modules/wms/wayland/hyprland/exec.nix
+++ b/modules/wms/wayland/hyprland/exec.nix
@@ -10,7 +10,7 @@ in {
     # Hyprland settings
     # Programs which get executed at Hyprland start.
     exec-once = [
-      "hyprctl setcursor ${pkgs.rose-pine-cursor} BreezeX-RosePine-Linux"
+      # "hyprctl setcursor ${cursor.name} ${toString cursor.size}"
 
       "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
       "[workspace special:audio; silent;tile] ${pkgs.pwvucontrol}/bin/pwvucontrol"