diff --git a/home-manager/home.nix b/home-manager/home.nix
index 85c2108..52c43a2 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,7 +1,7 @@
 {config, pkgs, lib, ... }:
 let
 	# Theme/Mode
-	THEME = "solarized";
+	THEME = "mocha";
 	MODE = "dark";
 
 	# Colours
@@ -507,7 +507,8 @@ in
 			#custom-gruvbox,
 			#custom-nord,
 			#custom-solarized,
-			#custom-dracula {
+			#custom-dracula,
+			#custom-mocha {
 				color: #${FG};
 				background: #${BG};
 				border: ${BORDER_WIDTH}px solid #${ACCENT};
diff --git a/home-manager/themes/mocha_dark.nix b/home-manager/themes/mocha_dark.nix
index 263f9b8..496ab64 100644
--- a/home-manager/themes/mocha_dark.nix
+++ b/home-manager/themes/mocha_dark.nix
@@ -23,8 +23,10 @@
 	CYAN="89dceb";
 	DARK_CYAN="74c7ec";
 
-	GTK_THEME = "magnetic-catppuccin-gtk";
-	GTK_THEME_NAME = "Catppuccin-Mocha";
+	GTK_THEME = "catppuccin-gtk";
+	GTK_THEME_NAME = "catppuccin-frappe-blue-standard";
 	GTK_ICONS = "zafiro-icons";
+	GTK_ICONS_NAME = "Zafiro-icons-Dark";
 	GTK_CURSOR = "catppuccin-cursors";
+	GTK_CURSOR_NAME = "mochaGreen";
 }
diff --git a/home-manager/themes/wallpaper.png b/home-manager/themes/wallpaper.png
index b5b0d90..505fda6 100644
Binary files a/home-manager/themes/wallpaper.png and b/home-manager/themes/wallpaper.png differ