diff --git a/scripts/color-mode b/scripts/color-mode
index c4cbed4..950a88f 100755
--- a/scripts/color-mode
+++ b/scripts/color-mode
@@ -3,10 +3,18 @@
 xcolor() { xrdb -query | grep -Po "color$1:\s+\K#\w+"; }
 
 xrdb -override $XDG_CONFIG_HOME/x/$1
-test "$1" == light &&
-  xsetroot -fg $(xcolor 14) -bg $(xcolor 11) -bitmap ~/img/tiles/tile.xbm
-test "$1" == dark &&
-  xsetroot -fg $(xcolor 6) -bg $(xcolor 0) -bitmap ~/img/tiles/tile.xbm
 
 pkill -USR1 'qutebrowser|urxvt'
 $XDG_CONFIG_HOME/bspwm/bspwmrc
+
+if test "$1" == light; then
+  xsetroot -fg $(xcolor 14) -bg $(xcolor 11) -bitmap ~/img/tiles/tile.xbm
+  bspc config focused_border_color  $(xcolor 3)
+  bspc config normal_border_color   $(xcolor 8)
+  bspc config presel_feedback_color $(xcolor 3)
+fi
+
+if test "$1" == dark; then
+  xsetroot -fg \#4F5B66 -bg \#343D46 -bitmap ~/img/tiles/tile.xbm
+fi
+