diff --git a/Cyberpunk-Neon.xdefaults b/Cyberpunk-Neon.xdefaults
index dac9d94..5cd566b 100644
--- a/Cyberpunk-Neon.xdefaults
+++ b/Cyberpunk-Neon.xdefaults
@@ -20,4 +20,4 @@
 ! gaspar's modifications
 *alpha: 0.85F
 wallpaper: girl
-vim*colorscheme: cyberpunk-neon
+vim*theme: cyberpunk-neon
diff --git a/catppuccin.xdefaults b/catppuccin.xdefaults
index 1c843ba..0d4596a 100644
--- a/catppuccin.xdefaults
+++ b/catppuccin.xdefaults
@@ -32,3 +32,8 @@
 ! Whites
 *color7: #C3BAC6
 *color15: #D9E0EE
+
+
+
+! gaspar's changes
+wallpaper: evening-sky
diff --git a/gruvbox-dark-wallpapers/buildings.png b/gruvbox-dark-wallpapers/buildings.png
new file mode 100644
index 0000000..4a07b22
Binary files /dev/null and b/gruvbox-dark-wallpapers/buildings.png differ
diff --git a/gruvbox-dark.xdefaults b/gruvbox-dark.xdefaults
index 3dd66ec..84900ce 100644
--- a/gruvbox-dark.xdefaults
+++ b/gruvbox-dark.xdefaults
@@ -36,5 +36,5 @@
 *color15: #ebdbb2
 
 ! gaspar's modifications
-wallpaper: battery-cup
-vim*colorscheme: gruvbox
+wallpaper: buildings
+vim*theme: gruvbox
diff --git a/leet.xdefaults b/leet.xdefaults
index 4dbe17d..65bbe6b 100644
--- a/leet.xdefaults
+++ b/leet.xdefaults
@@ -21,4 +21,4 @@
 *color15:			#CEC67D
 wallpaper:			redandblack/abstract
 zsh*prompt:         %{$fg[yellow]%}-> %{$fg[red]%}[ %{$fg[blue]%}%1~%{$fg[red]%} ]%}%{$fg[yellow]%} :: %{$reset_color%}
-vim*colorscheme:    leet2
+vim*theme:    leet2
diff --git a/redish.xdefaults b/redish.xdefaults
index c5e3030..3fd90fe 100644
--- a/redish.xdefaults
+++ b/redish.xdefaults
@@ -24,4 +24,4 @@ st*font:			terminus:size=16
 *color15:			#8C6161
 wallpaper:			redandblack/city
 zsh*prompt:         %B-> [ %1~ ] :: %b
-vim*colorscheme:    desert
+vim*theme:    desert
diff --git a/settheme b/settheme
index 6a30f86..780ffad 100755
--- a/settheme
+++ b/settheme
@@ -19,6 +19,9 @@ fi
 rm -rf ~/.local/share/themes/bin
 
 [ -d ~/.local/share/themes/"$1"-bin ] && cp -r ~/.local/share/themes/{"$1"-,}bin
+:<<'comment'
+export PATH="$HOME/.local/share/themes/bin:$PATH"
+comment
 
 xrdb ~/.Xresources
 
@@ -28,13 +31,32 @@ echo -e "dwm\nst\ndmenu\ntabbed" |
 		(cd ~/.local/src/$t && make clean && ./xtheme && make PREFIX=$HOME/.local install ; make clean ; cd -)
 	done
 
-cat ~/.local/share/themes/"$1".xdefaults | grep -P "^\wallpaper:\s*\S*$" -m 1 &&
+wallres=$(cat ~/.local/share/themes/"$1".xdefaults | grep -P "^wallpaper:\s*\S*$" -m 1)
+[[ "$wallres" != '' ]] &&											\
 	feh --bg-fill ~/.local/share/themes/"$1"-wallpapers/$(			\
-		cat ~/.local/share/themes/"$1".xdefaults					\
-			| grep -P "^wallpaper:\s*\S*$"							\
-			| sed "s/^.*:\s//"										\
+			echo "$wallres"											\
+			| sed "s/^.*:\s*//"										\
 		)*
 
+rm -f ~/.local/share/themes/theme.vim
+
+vimthemeres=$(cat ~/.local/share/themes/"$1".xdefaults | grep -P "^vim\*?\.?theme:\s*\S*$" -m 1)
+[[ "$vimthemeres" != '' ]] &&			\
+	cp ~/.local/share/themes/{$(		\
+			echo "$vimthemeres"			\
+			| sed "s/^.*:\s*//"			\
+		),theme}.vim
+
+:<<'comment'
+set background=dark
+let themefile = '~/.local/share/themes/theme.vim'
+if filereadable (expand (themefile))
+	execute 'source' themefile
+else
+	color leet2
+endif
+comment
+
 (
 	killall dunst
 	cd ~/.config/dunst
diff --git a/solarized-dark-bin/mupdf-gl b/solarized-dark-bin/mupdf-gl
deleted file mode 100755
index ed99c63..0000000
--- a/solarized-dark-bin/mupdf-gl
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/local/bin/mupdf-gl -B 839496 -C 002b36 $@
diff --git a/solarized-dark-wallpapers/abstract.png b/solarized-dark-wallpapers/abstract.png
new file mode 100644
index 0000000..19ef9ac
Binary files /dev/null and b/solarized-dark-wallpapers/abstract.png differ
diff --git a/solarized-dark-wallpapers/chinatown.png b/solarized-dark-wallpapers/chinatown.png
new file mode 100644
index 0000000..ce9e07b
Binary files /dev/null and b/solarized-dark-wallpapers/chinatown.png differ
diff --git a/solarized-dark-wallpapers/city-buildings.png b/solarized-dark-wallpapers/city-buildings.png
new file mode 100644
index 0000000..21f3eb9
Binary files /dev/null and b/solarized-dark-wallpapers/city-buildings.png differ
diff --git a/solarized-dark-wallpapers/walking.jpg b/solarized-dark-wallpapers/walking.jpg
deleted file mode 100644
index 7eb8f3a..0000000
Binary files a/solarized-dark-wallpapers/walking.jpg and /dev/null differ
diff --git a/solarized-dark.xdefaults b/solarized-dark.xdefaults
index 1dc206e..5267d7a 100644
--- a/solarized-dark.xdefaults
+++ b/solarized-dark.xdefaults
@@ -92,8 +92,8 @@
 
 // gaspar's modifications
 
-wallpaper: cubes
-vim*colorscheme: solarized
+wallpaper:					cubes
+vim*theme:					solarized
 
 dwm*barSingleBg:			1
 dwm*borderpx:				6
@@ -109,43 +109,6 @@ dwm*selbackground:			#174956		# selenized dark bg1
 ! dwm*selborder:			#0a4c5c		# custom color
 dwm*selborder:				#174956		# selenized dark bg1
 
-/*
-	=== VIM INTEGRATION ===
-
-		set background=dark
-
-		let themefile = system ("echo\ -n\ \$\(xrdb\ -query\ \|\ grep\ -P\ \'\^vim\\.\?\\\*\?colorscheme:\\s\*\\S+\'\ \|\ sed\ \'s/\\s\\+/\ /\'\ \|\ cut\ -d\ \'\ \'\ -f\ 2\)")
-
-		if themefile != ''
-			execute 'source ~/.local/share/themes/'.themefile.'.vim'
-		else
-			color leet2
-		endif
-
-
-
-	=== WALLPAPER INTEGRATION ===
-
-		cat ~/.local/share/themes/"$1".xdefaults | grep -P "^\wallpaper:\s*\S*$" -m 1 &&
-		feh --bg-fill ~/.local/share/themes/"$1"-wallpapers/$(			\
-			cat ~/.local/share/themes/"$1".xdefaults					\
-				| grep -P "^wallpaper:\s*\S*$"							\
-				| sed "s/^.*:\s//"										\
-			)*
-
-
-
-	=== MAN INTEGRATION ===
-
-		export PATH="$HOME/.local/share/themes/bin:$HOME/.local/bin:$PATH"
-
-
-
-	=== DWM, ST INTEGRATION ===
-
-	via xtheme patches
-*/
-
 // https://ethanschoonover.com/solarized/
 // https://observer.com/2015/02/meet-the-man-behind-solarized-the-most-important-color-scheme-in-computer-history/
 // https://www.wired.com/story/very-mathematical-history-perfect-color-combination/
diff --git a/solarized-light-bin/mupdf-gl b/solarized-light-bin/mupdf-gl
deleted file mode 100755
index e9a3c63..0000000
--- a/solarized-light-bin/mupdf-gl
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/local/bin/mupdf-gl -B 657b83 -C fdf6e3 $@
diff --git a/solarized-light.xdefaults b/solarized-light.xdefaults
index 3087a1e..c507fc2 100644
--- a/solarized-light.xdefaults
+++ b/solarized-light.xdefaults
@@ -92,7 +92,7 @@
 
 ! gaspar's modifications
 
-vim*colorscheme:			solarized
+vim*theme:					solarized
 wallpaper:					geom
 dwm*barSingleBg:			1
 dwm*borderpx:				6