diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 9618803..e92821e 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -7,8 +7,8 @@ bspc config split_ratio 0.5
 bspc config single_monocle true
 bspc config borderless_monocle true
 bspc config gapless_monocle true
-bspc config focus_by_distance true
 bspc config focus_follows_pointer true
+bspc config click_to_focus true
 
 bspc config initial_polarity second_child
 bspc config remove_unplugged_monitors true
@@ -21,8 +21,7 @@ bspc rule -a Slack desktop='^8'
 bspc rule -a TelegramDesktop desktop='^7'
 bspc rule -a Liferea desktop='^6'
 
-pulseaudio
-xss-lock -- i3lock -e -i ~/images/lockscreen.png &
+pulseaudio --check || pulseaudio
 nitrogen --restore &
 redshift &
 ps -u jdkaplan | grep -oq panel && pkill panel; $XDG_CONFIG_HOME/panel/panel &
diff --git a/panel/panel b/panel/panel
index bb54e8a..05ec932 100755
--- a/panel/panel
+++ b/panel/panel
@@ -6,6 +6,8 @@ PANEL_FONT_FAMILY='-misc-inputmononarrow-medium-r-*-*-12-*-*-*-*-*-*-*'
 COLOR_FOREGROUND='#FFAAAAAA'
 COLOR_BACKGROUND='#FF222222'
 
+PANEL_WM_NAME='bar'
+
 if [ $(pgrep -cx panel) -gt 1 ] ; then
 	printf "%s\n" "The panel is already running." >&2
 	exit 1
@@ -17,7 +19,7 @@ bspc config bottom_padding $PANEL_HEIGHT
 
 $XDG_CONFIG_HOME/panel/panel_bar.py | lemonbar -g x$PANEL_HEIGHT -f "$PANEL_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" -b | while read -r line; do sh -c "$line"; done &
 
-wid=$(xdo id -a bar)
+wid=$(xdo id -a "$PANEL_WM_NAME")
 tries_left=20
 while [ -z "$wid" -a "$tries_left" -gt 0 ] ; do
 	sleep 0.05
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 9c69660..5ba04db 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -39,10 +39,6 @@ super + shift + q
 super + m
 	bspc desktop -l next
 
-# if the current node is automatic, send it to the last manual, otherwise pull the last leaf
-super + y
-	bspc query -N -n focused.automatic && bspc node -n last.!automatic || bspc node last.leaf -n focused
-
 # swap the current node and the biggest node
 super + g
 	bspc node -s biggest
@@ -153,8 +149,8 @@ super + @button{1-3}
 XF86MonBrightness{Up,Down}
 	xbacklight -{inc,dec} 10
 
-# XF86Display
-# XF86Tools
-# XF86Search
-# XF86LaunchA
-# XF86Explorer
+# XF86Display  # F7
+# XF86Tools    # F9
+# XF86Search   # F10
+# XF86LaunchA  # F11
+# XF86Explorer # F12