diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 45c2dcdd..8e337513 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -20,15 +20,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-## Load session startup script
+# Load session startup script
 dtfscript=$HOME/.config/dtfscripts/wmstartup.sh
 if [[ -x "$dtfscript" ]]; then
 	source "$dtfscript"
 fi
 unset dtfscript
 
-## bspwm GENERAL CONFIGURATION
 printf "[INFO] Configuring bspwm\n"
+# Monitor setup script
+# Unique to bspwm, because i3 handles this alright
 $HOME/.config/bspwm/monitorset.sh
 
 bspc config border_width	4
@@ -42,6 +43,7 @@ bspc config remove_unplugged_monitors	true
 
 bspc config click_to_focus		any
 
+bspc config pointer_follows_focus	true
 bspc config pointer_follows_monitor	true
 bspc config pointer_modifier		mod1
 bspc config pointer_action1		move
@@ -53,7 +55,6 @@ bspc config focused_border_color		"#83a598"
 bspc config presel_feedback_color		"#9b9b9b"
 
 printf "[INFO] Setting window rules\n"
-## bspwm WINDOW RULES
 bspc rule -r '*'
 bspc rule -a Waterfox desktop=1
 bspc rule -a Discord desktop=7
diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index e9ce6830..4bd9827b 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -21,8 +21,15 @@
 # SOFTWARE.
 
 ## Clean up some variables that I use in device-specific scripts
-unset PB_BAR_WIDTH
 unset PB_MONITOR
+unset PB_WM_RESTACK
+unset PB_BAR_WIDTH
+unset PB_BAR_PRIMARY_MODULES_LEFT PB_BAR_PRIMARY_MODULES_CENTER PB_BAR_PRIMARY_MODULES_RIGHT
+unset PB_BAR_PRIMARY_2_MODULES_LEFT PB_BAR_PRIMARY_2_MODULES_CENTER PB_BAR_PRIMARY_2_MODULES_RIGHT
+unset PB_BAR_SECONDARY_MODULES_LEFT PB_BAR_SECONDARY_MODULES_CENTER PB_BAR_SECONDARY_MODULES_RIGHT
+unset PB_BAR_SECONDARY_2_MODULES_LEFT PB_BAR_SECONDARY_2_MODULES_CENTER PB_BAR_SECONDARY_2_MODULES_RIGHT
+unset PB_MODULE_BAR_WIDTH
+unset PB_MODULE_WLAN_INTERFACE
 
 ## Patch path, if not already done
 if [[ "$PATH" != "*$HOME/.local/bin*" ]]; then