diff --git a/users/hashcube/theming/cursor.nix b/users/hashcube/theming/cursor.nix
index 494ccbe..b047e3c 100644
--- a/users/hashcube/theming/cursor.nix
+++ b/users/hashcube/theming/cursor.nix
@@ -4,7 +4,10 @@
 	home.pointerCursor = {
 		name = "catppuccin-mocha-pink-cursors";
 		package = pkgs.catppuccin-cursors.mochaPink;
-		gtk.enable = true;
+    gtk = {
+      enable = true;
+      size = 32;
+    };
     x11.enable = true;
 	};
 }
diff --git a/users/hashcube/theming/gtk.nix b/users/hashcube/theming/gtk.nix
index e19c741..b3c8406 100644
--- a/users/hashcube/theming/gtk.nix
+++ b/users/hashcube/theming/gtk.nix
@@ -1,16 +1,21 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
-{
-	gtk = {
-    gtk4.theme = config.gtk.theme;
+let
+  config = {
 		enable = true;
     font = {
 			name = "IosevkaHashcube Nerd Font Mono";
 			package = pkgs.iosevka-hashcube;
+      size = 11;
     };
 		iconTheme = {
 			name = "Papirus-Dark";
 		};
+    cursorTheme = {
+      name = "catppuccin-mocha-pink-cursors";
+      package = pkgs.catppuccin-cursors.mochaPink;
+      size = 32;
+    };
 		theme = {
 			name = "catppuccin-mocha-pink-standard";
 			package = pkgs.catppuccin-gtk.override {
@@ -18,5 +23,12 @@
 				accents = [ "pink" ];
 			};
 		};
+  };
+in {
+  gtk = {
+    inherit (config) enable font iconTheme cursorTheme theme;
+    gtk2 = config;
+    gtk3 = config;
+    gtk4 = config;
 	};
 }