diff --git a/de/bar/bar.bash b/de/bar/bar.bash
index f61575b..03743b4 100755
--- a/de/bar/bar.bash
+++ b/de/bar/bar.bash
@@ -42,16 +42,16 @@ if [ $# -gt 0 ]; then
 	return
 fi
 
-if [ $BAR_ON_TOP -eq 1 ]; then
+if [ "$BAR_ON_TOP" -eq 1 ]; then
 	export BAR_BOTTOM="false"
 	export POS_Y=$GAP
-	bspc config -m ${BAR_MONITOR} top_padding "$EHEIGHT"
-	bspc config -m ${BAR_MONITOR} bottom_padding "0"
+	bspc config -m "${BAR_MONITOR}" top_padding "$EHEIGHT"
+	bspc config -m "${BAR_MONITOR}" bottom_padding "0"
 else
 	export BAR_BOTTOM="true"
 	export POS_Y=$GAP
-	bspc config -m ${BAR_MONITOR} top_padding "0"
-	bspc config -m ${BAR_MONITOR} bottom_padding "$EHEIGHT"
+	bspc config -m "${BAR_MONITOR}" top_padding "0"
+	bspc config -m "${BAR_MONITOR}" bottom_padding "$EHEIGHT"
 fi
 
 # bspc
diff --git a/de/bspwm/config b/de/bspwm/config
index 52a0d69..285661e 100755
--- a/de/bspwm/config
+++ b/de/bspwm/config
@@ -14,15 +14,17 @@ if [ -f "$HOME/.env_bspwm" ]; then
 	source "$HOME/.env_bspwm"
 fi
 
-bspc config normal_border_color   "$(xrdb -query | sed -ne 's/.*background:\s*//p')"
-bspc config focused_border_color  "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
-bspc config active_border_color   "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
-bspc config presel_feedback_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
-bspc config border_width          "$BORDER_WIDTH"
-bspc config split_ratio           0.3333333
-bspc config borderless_monocle    true
-bspc config gapless_monocle       true
-bspc config pointer_modifier			"mod4"
+bspc config normal_border_color      "$(xrdb -query | sed -ne 's/.*background:\s*//p')"
+bspc config focused_border_color      "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
+bspc config active_border_color       "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
+bspc config presel_feedback_color     "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
+bspc config border_width              "$BORDER_WIDTH"
+bspc config split_ratio               0.3333333
+bspc config borderless_monocle        true
+bspc config gapless_monocle           true
+bspc config pointer_modifier			    "mod4"
+bspc config remove_unplugged_monitors true
+bspc config remove_disabled_monitors  true
 
 bspc config window_gap "$WINDOW_GAP"
 
diff --git a/scripts/bin/undock b/scripts/bin/undock
index 86d6793..a8b468b 100755
--- a/scripts/bin/undock
+++ b/scripts/bin/undock
@@ -3,5 +3,7 @@
 resrc
 "${DOTFILES_PATH}/de/x/loadresources"
 autorandr --change
+"${DOTFILES_PATH}/de/bspwm/bspwmrc"
+"${DOTFILES_PATH}/de/x/loadresources"
 restartbar
 "${HOME}/.fehbg"
diff --git a/scripts/bin/workdock b/scripts/bin/workdock
index 29d155e..964a033 100755
--- a/scripts/bin/workdock
+++ b/scripts/bin/workdock
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
+resrc
 "${DOTFILES_PATH}/de/x/loadresources" lodpi
 autorandr --change
+"${DOTFILES_PATH}/de/bspwm/bspwmrc"
+"${DOTFILES_PATH}/de/x/loadresources" lodpi
 restartbar
 "${HOME}/.fehbg"