diff --git a/.config/X11/xprofile b/.config/X11/xprofile
index 0bac3a2f..26c6dd91 100755
--- a/.config/X11/xprofile
+++ b/.config/X11/xprofile
@@ -1,5 +1,5 @@
 #!/bin/sh
-dmenupasspath="$(which dmenupass)"
+dmenupasspath="$HOME/.local/libexec/dwm/dmenupass"
 
 export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm
 export QT_QPA_PLATFORMTHEME="gtk2"   # Have QT use gtk2 theme.
diff --git a/.config/X11/xsession.d/80autostart b/.config/X11/xsession.d/80autostart
index c9c721f5..80a8711a 100755
--- a/.config/X11/xsession.d/80autostart
+++ b/.config/X11/xsession.d/80autostart
@@ -13,7 +13,7 @@ start playerctld daemon
 start picom
 start unclutter -noevents
 start dunst
-start dwmblocks
-start $HOME/.local/libexec/daemons/remapd
 start syncthingtray
 start system-config-printer-applet
+start "$HOME/.local/libexec/daemons/remapd"
+start env PATH="$HOME/.local/libexec/statusbar:$PATH" dwmblocks
diff --git a/.local/libexec/dwm/dmenusys b/.local/libexec/dwm/dmenusys
index 3349bc73..b8b73125 100755
--- a/.local/libexec/dwm/dmenusys
+++ b/.local/libexec/dwm/dmenusys
@@ -1,11 +1,7 @@
 #!/bin/sh
 # A dmenu wrapper script for system functions.
-case "$(readlink -f /sbin/init)" in
-*systemd*) ctl='systemctl' ;;
-*) ctl='loginctl' ;;
-esac
+ctl='loginctl'
 
-# case "$(printf " lock\nﴚ leave dwm\n累 renew dwm\nﭦ hibernate\n sleep\nﰇ reboot\n襤 shutdown\n display off" | dmenu -i -p 'Action: ')" in
 case "$(printf "󰌾 lock\n󰗼 leave dwm\n󰑙 renew dwm\n󰜉 reboot\n⏻ shutdown\n󰶐 display off" | dmenu -i -p 'Action: ')" in
 '󰌾 lock')
 	xset s activate &
@@ -13,8 +9,8 @@ case "$(printf "󰌾 lock\n󰗼 leave dwm\n󰑙 renew dwm\n󰜉 reboot\n⏻ shut
 	;;
 '󰗼 leave dwm') kill -TERM "$(pgrep -u "$USER" "\bdwm$")" ;;
 '󰑙 renew dwm') kill -HUP "$(pgrep -u "$USER" "\bdwm$")" ;;
-	# '⏼ hibernate') $ctl hibernate -i ;;
-	# '⏾ sleep') $ctl suspend -i ;;
+'⏼ hibernate') $ctl hibernate -i ;;
+'⏾ sleep') $ctl suspend -i ;;
 '󰜉 reboot') $ctl reboot ;;
 '⏻ shutdown') $ctl poweroff ;;
 '󰶐 display off') xset dpms force off ;;
diff --git a/.local/libexec/dwm/togcom b/.local/libexec/dwm/togcompositor
similarity index 100%
rename from .local/libexec/dwm/togcom
rename to .local/libexec/dwm/togcompositor
diff --git a/.local/libexec/dwm/togtouchpad b/.local/libexec/dwm/togtouchpad
new file mode 100755
index 00000000..172cd65c
--- /dev/null
+++ b/.local/libexec/dwm/togtouchpad
@@ -0,0 +1,15 @@
+#!/bin/sh
+# shellcheck disable=2037
+
+TPdevice=$(xinput | sed -nre '/TouchPad|Touchpad/s/.*id=([0-9]*).*/\1/p')
+
+alias off=xinput --disable "$TPdevice" && notify-send -h string:x-dunst-stack-tag:"togtp" "Touchpad Disabled" -i input-touchpad-off
+alias on=xinput --enable "$TPdevice" && notify-send -h string:x-dunst-stack-tag:"togtp" "Touchpad Enabled" -i input-touchpad-on
+
+[ "$1" = "-n" ] && { off; exit; }
+
+[ "$1" = "-y" ] && { on; exit; }
+
+xinput list-props "$TPdevice" | grep -oPq "Device Enabled \(\d*\):\s*1" && { off; exit; }
+
+on
diff --git a/.local/libexec/dwm/togtp b/.local/libexec/dwm/togtp
deleted file mode 100755
index c8b15c38..00000000
--- a/.local/libexec/dwm/togtp
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-TPdevice=$(xinput | sed -nre '/TouchPad|Touchpad/s/.*id=([0-9]*).*/\1/p')
-if xinput list-props "$TPdevice" | grep -oPq "Device Enabled \(\d*\):\s*1"; then
-	xinput --disable "$TPdevice" && notify-send -h string:x-dunst-stack-tag:"togtp" "Touchpad Disabled" -i input-touchpad-off
-else
-	xinput --enable "$TPdevice" && notify-send -h string:x-dunst-stack-tag:"togtp" "Touchpad Enabled" -i input-touchpad-on
-fi