diff --git a/home-manager/home.nix b/home-manager/home.nix
index d1d7a2e..04d6a1c 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -5,7 +5,7 @@ let
 	MODE = "dark";
 
 	# Colours
-	inherit (import ./themes/${THEME}_${MODE}.nix) BG FG GRAY DARK_GRAY RED DARK_RED GREEN DARK_GREEN YELLOW DARK_YELLOW BLUE DARK_BLUE PURPLE DARK_PURPLE CYAN DARK_CYAN GTK_THEME GTK_THEME_NAME GTK_ICONS GTK_CURSOR;
+	inherit (import ./themes/${THEME}_${MODE}.nix) BG FG GRAY DARK_GRAY RED DARK_RED GREEN DARK_GREEN YELLOW DARK_YELLOW BLUE DARK_BLUE PURPLE DARK_PURPLE CYAN DARK_CYAN GTK_THEME GTK_THEME_NAME GTK_ICONS GTK_ICONS_NAME GTK_CURSOR GTK_CURSOR_NAME;
 	ACCENT = "${CYAN}";
 	SECOND_ACCENT = "${PURPLE}";
 	ACTIVE_BORDER_COLOR = "${ACCENT}";
@@ -88,8 +88,8 @@ in
 	# Required for Hyprpicker to work
 	pointerCursor = {
 	  	gtk.enable = true;
-	  	package = pkgs.gnome.adwaita-icon-theme;
-	  	name = "Adwaita";
+	  	package = ${GTK_CURSOR};
+	  	name = "${GTK_CURSOR_NAME}";
 	  	size = 16;
 	};
 	file = {
@@ -163,7 +163,7 @@ in
 		package = pkgs.${FONT_PACKAGE};
 	};
 	iconTheme = {
-		name = "${GTK_ICONS}";
+		name = "${GTK_ICONS_NAME}";
 		package = pkgs.${GTK_ICONS};
 	};
 	theme = {