diff --git a/bspwm/.config/bspwm/bspwm_settings b/bspwm/.config/bspwm/bspwm_settings
new file mode 100755
index 0000000..2748732
--- /dev/null
+++ b/bspwm/.config/bspwm/bspwm_settings
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+bspc config border_width              2
+bspc config window_gap                0
+bspc config top_padding               0
+bspc config split_ratio               0.5
+bspc config borderless_monocle        true
+bspc config gapless_monocle           true
+bspc config focus_follows_pointer     true
+bspc config single_monocle            true
+bspc config remove_unplugged_monitors true
+bspc config remove_disabled_monitors  true
+
+bspc rule -a Emacs state=tiled
+
+bspc monitor -d I II III IV V VI VII VIII IX X
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 11881ff..d5b45a6 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -2,29 +2,6 @@
 
 sxhkd &
 
-bspc config border_width          2
-bspc config window_gap            0
-bspc config top_padding           0
-bspc config split_ratio           0.5
-bspc config borderless_monocle    true
-bspc config gapless_monocle       true
-bspc config focus_follows_pointer true
-bspc config single_monocle        true
+~/.config/bspwm/bspwm_settings
 
-bspc rule -a Emacs state=tiled
-
-bspc monitor -d I II III IV V VI VII VIII IX X
-
-xinput set-button-map 14 1 2 3 5 4 6 7 8 9 10 11 12
-setxkbmap -option compose:ralt
-xsetroot -cursor_name left_ptr
-~/bin/caps
-~/bin/key-rate
-
-(dropbox start&)
-(nm-applet&)
-(~/bin/battery_notify&)
-(~/bin/autohide&)
-
-feh --bg-scale --randomize ~/Pictures/wallpapers/*
-polybar my-awesome-polybar
+~/.config/bspwm/user_settings
diff --git a/bspwm/.config/bspwm/user_settings b/bspwm/.config/bspwm/user_settings
new file mode 100755
index 0000000..aa1a63d
--- /dev/null
+++ b/bspwm/.config/bspwm/user_settings
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+xinput set-button-map 14 1 2 3 5 4 6 7 8 9 10 11 12
+setxkbmap -option compose:ralt
+xsetroot -cursor_name left_ptr
+~/bin/caps
+~/bin/key-rate
+
+(dropbox start&)
+(nm-applet&)
+(~/bin/battery_notify&)
+(~/bin/autohide&)
+
+feh --bg-scale --randomize ~/Pictures/wallpapers/*
+polybar my-awesome-polybar