diff --git a/home-manager/home.nix b/home-manager/home.nix
index 9cef271..2656829 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,7 +1,7 @@
 {config, pkgs, lib, ... }:
 let
 	# Theme/Mode
-	THEME = "solarized";
+	THEME = "nord";
 	MODE = "dark";
 
 	# Colours
@@ -93,45 +93,46 @@ in
 	  	size = 16;
 	};
 	file = {
-		"theme.txt" = {
+		"theme.sh" = {
 			text = ''
-				THEME = "solarized";
-				MODE = "dark";
+				THEME="${THEME}";
+				MODE="${MODE}";
 
 				# Colors
-				BG = ${BG}
-				FG = ${FG}
-				GRAY = ${GRAY}
-				DARK_GRAY = ${DARK_GRAY}
-				RED = ${RED}
-				DARK_RED = ${DARK_RED}
-				GREEN = ${GREEN}
-				DARK_GREEN = ${DARK_GREEN}
-				YELLOW = ${YELLOW}
-				DARK_YELLOW = ${DARK_YELLOW}
-				BLUE = ${BLUE}
-				DARK_BLUE = ${DARK_BLUE}
-				PURPLE = ${PURPLE}
-				DARK_PURPLE = ${DARK_PURPLE}
-				CYAN = ${CYAN}
-				DARK_CYAN = ${DARK_CYAN}
+				BG="${BG}"
+				FG="${RED}"
+				GRAY="${GRAY}"
+				DARK_GRAY="${DARK_GRAY}"
+				RED="${RED}"
+				DARK_RED="${DARK_RED}"
+				GREEN="${GREEN}"
+				DARK_GREEN="${DARK_GREEN}"
+				YELLOW="${YELLOW}"
+				DARK_YELLOW="${DARK_YELLOW}"
+				BLUE="${BLUE}"
+				DARK_BLUE="${DARK_BLUE}"
+				PURPLE="${PURPLE}"
+				DARK_PURPLE="${DARK_PURPLE}"
+				CYAN="${CYAN}"
+				DARK_CYAN="${DARK_CYAN}"
 
 				# GTK
-				GTK_THEME = "solarized";
-				GTK_THEME_NAME = ${GTK_THEME_NAME}
-				GTK_ICONS = ${GTK_ICONS}
-				GTK_CURSOR = ${GTK_CURSOR}
+				GTK_THEME="${GTK_THEME}";
+				GTK_THEME_NAME="${GTK_THEME_NAME}"
+				GTK_ICONS="${GTK_ICONS}"
+				GTK_CURSOR="${GTK_CURSOR}"
 			'';
 		};
 		"scripts/wallpaper-updater.sh" = {
 			text = ''
 				file="";
 				while sleep 1; do
-					new_file=$(cat $HOME/theme.txt)
+					new_file=$(cat $HOME/theme.sh)
 					if [[ "$new_file" != "$file" ]]; then
+						source $HOME/theme.sh
 						magick ${WALLPAPER_PATH} \
-							-fuzz 10% -fill "#${BG}" -opaque "$(convert ${WALLPAPER_PATH} -format "%[pixel:u.p{0,0}]" info:-)" \
-							-fuzz 10% -fill "#${ACCENT}" -opaque "$(convert ${WALLPAPER_PATH} -format "%[pixel:u.p{3475,1627}]" info:-)" \
+							-fuzz 10% -fill "#''${BG}" -opaque "$(convert ${WALLPAPER_PATH} -format "%[pixel:u.p{0,0}]" info:-)" \
+							-fuzz 10% -fill "#''${ACCENT}" -opaque "$(convert ${WALLPAPER_PATH} -format "%[pixel:u.p{3475,1627}]" info:-)" \
 							${WALLPAPER_PATH}
 						oldid=$(pgrep wpaperd)
 						wpaperd &
@@ -146,8 +147,8 @@ in
 			text = ''
 				echo theme = $1
 				echo mode = $2
-				sed -i "s/THEME\ =\ ".*"/THEME\ =\ \"''${1}\";/" $HOME/.config/home-manager/home.nix
-				sed -i "s/MODE\ =\ ".*"/MODE\ =\ \"''${2}\";/" $HOME/.config/home-manager/home.nix
+				sed -i "s/THEME\ =\ ".*";/THEME\ =\ \"''${1}\";/" $HOME/.config/home-manager/home.nix
+				sed -i "s/MODE\ =\ ".*";/MODE\ =\ \"''${2}\";/" $HOME/.config/home-manager/home.nix
 				home-manager switch
 			'';
 			executable = true;
diff --git a/home-manager/themes/wallpaper.png b/home-manager/themes/wallpaper.png
index 651fee5..32df897 100644
Binary files a/home-manager/themes/wallpaper.png and b/home-manager/themes/wallpaper.png differ