diff --git a/firestarter b/firestarter
index ace1404..aacdce6 100755
--- a/firestarter
+++ b/firestarter
@@ -109,8 +109,8 @@ EOF
 	# Information bars
 	cat << EOF > "$_optconfigdir/bar"
 #.fsdefaults
-command -v polybar && [ -r "$HOME/.config/polybar/launch.sh" ]
-"$HOME/.config/polybar/launch.sh"
+command -v polybar && [ -r "~/.config/polybar/launch.sh" ]
+"~/.config/polybar/launch.sh"
 command -v tint2
 tint2
 command -v lxpanel
@@ -161,10 +161,10 @@ polkit-efl-authentication-agent-1
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 # Debian locations
 # On generation time, your architecture is filled in here
-[ -x "/usr/lib/$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1" ]
-"/usr/lib/$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1"
-[ -x "/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1" ]
-"/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1"
+[ -x "/usr/lib/\$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1" ]
+"/usr/lib/\$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1"
+[ -x "/usr/lib/\$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1" ]
+"/usr/lib/\$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1"
 # OpenSuSE locations
 [ -x "/usr/lib/polkit-mate/polkit-mate-authentication-agent-1" ]
 "/usr/lib/polkit-mate/polkit-mate-authentication-agent-1"
@@ -226,8 +226,8 @@ command -v xfce4-power-manager
 xfce4-power-manager
 command -v mate-power-manager
 mate-power-manager
-[ -x "/usr/lib/$(uname -m)-linux-gnu/libexec/org_kde_powerdevil" ]
-/usr/lib/$(uname -m)-linux-gnu/libexec/org_kde_powerdevil
+[ -x "/usr/lib/\$(uname -m)-linux-gnu/libexec/org_kde_powerdevil" ]
+/usr/lib/\$(uname -m)-linux-gnu/libexec/org_kde_powerdevil
 command -v gnome-power-manager
 gnome-power-manager
 EOF
@@ -261,7 +261,7 @@ EOF
 :
 # 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/.config}/conky/conky.conf" ]
+command -v conky && [ -r "\${XDG_CONFIG_HOME:-~/.config}/conky/conky.conf" ]
 sleep 5 && conky
 EOF
 	# Wallpaper setters
@@ -269,7 +269,7 @@ EOF
 #.fsdefaults
 [ -z "\$DISPLAY" ]
 :
-command -v feh && [ -r "$HOME/.fehbg" ]
+command -v feh && [ -r "~/.fehbg" ]
 ~/.fehbg
 command -v nitrogen
 nitrogen --restore