diff --git a/home/default.nix b/home/default.nix
index 562317e..47a6a2e 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,7 +5,7 @@
   pkgs,
   ...
 }:
-{
+rec {
   imports = [
     ./firefox
     ./fish
@@ -17,8 +17,6 @@
     ./vscodium
   ];
 
-  xdg.configFile."gtk-4.0/gtk.css".source = "${pkgs.catppuccin-gtk}/share/themes/Catppuccin-Frappe-Standard-Blue-Dark/gtk-4.0/gtk.css";
-
   dconf = {
     enable = true;
     settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
@@ -30,37 +28,29 @@
 
   services.blueman-applet.enable = true;
 
-  qt.enable = true;
   qt.platformTheme.name = "gtk";
 
-  gtk =
-    let
-      pointer = {
-        name = "Catppuccin-Frappe-Lavender-Cursors";
-        package = pkgs.catppuccin-cursors.frappeLavender;
-        size = 32;
-      };
-    in
-    {
-      enable = true;
-      theme = {
-        name = "Catppuccin-Frappe-Compact-Lavender-Dark";
-        package = pkgs.catppuccin-gtk.override {
-          accents = [ "lavender" ];
-          size = "compact";
-          variant = "frappe";
-        };
-      };
-      cursorTheme = pointer;
-      iconTheme = {
-        name = "Papirus-Dark";
-        #   package = pkgs.papirus-icon-theme;
-        package = pkgs.catppuccin-papirus-folders.override {
-          accent = "lavender";
-          flavor = "frappe";
-        };
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Catppuccin-Frappe-Compact-Lavender-Dark";
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "lavender" ];
+        size = "compact";
+        variant = "frappe";
       };
     };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.catppuccin-papirus-folders.override {
+        accent = "lavender";
+        flavor = "frappe";
+      };
+    };
+    cursorTheme = with home.pointerCursor; {
+      inherit name package size;
+    };
+  };
 
   programs.direnv = {
     enable = true;
@@ -72,6 +62,14 @@
     inherit username;
     inherit homeDirectory;
 
+    pointerCursor = {
+      gtk.enable = true;
+      x11.enable = true;
+      name = "Catppuccin-Frappe-Lavender-Cursors";
+      package = pkgs.catppuccin-cursors.frappeLavender;
+      size = 32;
+    };
+
     packages =
       let
         pk = with pkgs; [
diff --git a/home/sway/default.nix b/home/sway/default.nix
index bae6e27..e524eaa 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -151,7 +151,7 @@
         };
         seat = {
           "*" = {
-            xcursor_theme = "Catppuccin-Frappe-Lavender-Cursors 32";
+            xcursor_theme = "${config.home.pointerCursor.name} ${toString config.home.pointerCursor.size}";
             keyboard_grouping = "none";
           };
         };