diff --git a/.config/firestarter/conky b/.config/firestarter/conky
index 08f8109e..3e5a7551 100644
--- a/.config/firestarter/conky
+++ b/.config/firestarter/conky
@@ -3,7 +3,5 @@
 :
 # Note: the dumb sleep hack is because Conky crashes with window_type override if the WM hasn't loaded yet
 # This gives the WM ample time to load up
-command -v conky && [ -r "${XDG_CONFIG_HOME:-/home/salt/.config}/conky/gen.sh" ]
-sleep 5 && "${XDG_CONFIG_HOME:-/home/salt/.config}/conky/gen.sh" && conky
 command -v conky && [ -r "${XDG_CONFIG_HOME:-/home/salt/.config}/conky/conky.conf" ]
 sleep 5 && conky
diff --git a/.xinitrc b/.xinitrc
index a694233e..27a37a84 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [ -x "$HOME/.wpgen/wpgen" ]; then
+	"$HOME/.wpgen/wpgen"
+fi
+if [ -x "$HOME/.config/conky/gen.sh" ]; then
+	"$HOME/.config/conky/gen.sh"
+fi
 if [ -x "$HOME/.firestarter/firestarter" ]; then
 	export FS_DIEONWM=true
 	exec "$HOME/.firestarter/firestarter" -vvv | tee .firestarter.log