diff --git a/home-manager/home.nix b/home-manager/home.nix
index 56214f3..9b052ba 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,7 +1,7 @@
 {config, pkgs, lib, ... }:
 let
 	# Theme/Mode
-	THEME = "mocha";
+	THEME = "gruvbox";
 	MODE = "dark";
 
 	# Colours
diff --git a/home-manager/themes/dracula_dark.nix b/home-manager/themes/dracula_dark.nix
index cb99896..9ada8ba 100644
--- a/home-manager/themes/dracula_dark.nix
+++ b/home-manager/themes/dracula_dark.nix
@@ -24,7 +24,9 @@
 	DARK_CYAN="6cb4c3";
 
 	GTK_THEME = "dracula-theme";
-	GTK_THEME_NAME = "Dracula"; # No light mode :(
+	GTK_THEME_NAME = "Dracula";
 	GTK_ICONS = "dracula-icon-theme";
-	GTK_CURSOR = "capitane-cursors-theme";
+	GTK_ICONS_NAME = "Dracula";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitane Cursors - White";
 }
diff --git a/home-manager/themes/gruvbox_dark.nix b/home-manager/themes/gruvbox_dark.nix
index 8cb8d7f..c88a2ea 100644
--- a/home-manager/themes/gruvbox_dark.nix
+++ b/home-manager/themes/gruvbox_dark.nix
@@ -26,5 +26,7 @@
 	GTK_THEME = "gruvbox-gtk-theme";
 	GTK_THEME_NAME = "Gruvbox-Dark";
 	GTK_ICONS = "gruvbox-plus-icons";
-	GTK_CURSOR = "capitane-cursors-themed";
+	GTK_ICONS_NAME = "Gruvbox Plus Dark";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitaine Cursors (Gruvbox) - White";
 }
diff --git a/home-manager/themes/gruvbox_light.nix b/home-manager/themes/gruvbox_light.nix
index 2812b19..2604ff5 100644
--- a/home-manager/themes/gruvbox_light.nix
+++ b/home-manager/themes/gruvbox_light.nix
@@ -26,5 +26,7 @@
 	GTK_THEME = "gruvbox-gtk-theme";
 	GTK_THEME_NAME = "Gruvbox-Light";
 	GTK_ICONS = "gruvbox-plus-icons";
-	GTK_CURSOR = "capitane-cursors-themed";
+	GTK_ICONS_NAME = "Gruvbox Plus Light";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitaine Cursors (Gruvbox)";
 }
diff --git a/home-manager/themes/macchiato_dark.nix b/home-manager/themes/macchiato_dark.nix
index e504e3d..85f9eb7 100644
--- a/home-manager/themes/macchiato_dark.nix
+++ b/home-manager/themes/macchiato_dark.nix
@@ -27,6 +27,6 @@
 	GTK_THEME_NAME = "catppuccin-frappe-blue-standard";
 	GTK_ICONS = "zafiro-icons";
 	GTK_ICONS_NAME = "Zafiro-icons-Dark";
-	GTK_CURSOR = "catppuccin-cursors";
-	GTK_CURSOR_NAME = "macchiatoGreen";
+	GTK_CURSOR = "nordzy-cursor-theme";
+	GTK_CURSOR_NAME = "Nordzy-catppuccin-macchiato-blue";
 }
diff --git a/home-manager/themes/mocha_dark.nix b/home-manager/themes/mocha_dark.nix
index 496ab64..29cb24e 100644
--- a/home-manager/themes/mocha_dark.nix
+++ b/home-manager/themes/mocha_dark.nix
@@ -28,5 +28,5 @@
 	GTK_ICONS = "zafiro-icons";
 	GTK_ICONS_NAME = "Zafiro-icons-Dark";
 	GTK_CURSOR = "catppuccin-cursors";
-	GTK_CURSOR_NAME = "mochaGreen";
+	GTK_CURSOR_NAME = "Catppuccin Mocha Blue";
 }
diff --git a/home-manager/themes/nord_dark.nix b/home-manager/themes/nord_dark.nix
index 9f43d15..33a7e20 100644
--- a/home-manager/themes/nord_dark.nix
+++ b/home-manager/themes/nord_dark.nix
@@ -26,5 +26,7 @@
 	GTK_THEME = "nordic";
 	GTK_THEME_NAME = "Nordic";
 	GTK_ICONS = "zafiro-icons";
+	GTK_ICONS_NAME = "Zafiro-icons-Dark";
 	GTK_CURSOR = "nordzy-cursor-theme";
+	GTK_CURSOR_NAME = "Nordzy-cursors-white";
 }
diff --git a/home-manager/themes/solarized_dark.nix b/home-manager/themes/solarized_dark.nix
index c7c12ac..7e8236a 100644
--- a/home-manager/themes/solarized_dark.nix
+++ b/home-manager/themes/solarized_dark.nix
@@ -26,5 +26,7 @@
 	GTK_THEME = "solarc-gtk-theme";
 	GTK_THEME_NAME = "SolArc-Dark";
 	GTK_ICONS = "gruvbox-plus-icons";
-	GTK_CURSOR = "capitane-cursors-themed";
+	GTK_ICONS_NAME = "Gruvbox Plus Dark";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitaine Cursors - White";
 }
diff --git a/home-manager/themes/wallpaper.png b/home-manager/themes/wallpaper.png
index 505fda6..68970af 100644
Binary files a/home-manager/themes/wallpaper.png and b/home-manager/themes/wallpaper.png differ