diff --git a/os/arch/.config/bspwm/bspwmrc b/os/arch/.config/bspwm/bspwmrc
index d942c0e4..9e566677 100755
--- a/os/arch/.config/bspwm/bspwmrc
+++ b/os/arch/.config/bspwm/bspwmrc
@@ -1,27 +1,24 @@
-#! /bin/sh
+#!/bin/sh
 
-bspc config border_width    2
-bspc config window_gap      14
-bspc config bottom_padding  0
-bspc config left_padding    0
-bspc config right_padding   0
-running lemonbar || bspc config top_padding 0
+bspc config border_width    5
+bspc config window_gap      11
+bspc config top_padding     22
+# bspc config bottom_padding  0
+# bspc config left_padding    0
+# bspc config right_padding   0
 
 bspc config split_ratio          0.50
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 bspc config paddingless_monocle  true
-bspc config focus_by_distance    true
-bspc config history_aware_focus  true
+bspc config click_to_focus       true
 
 
 #
 # Appearance
 #
 
-bspc config normal_frame_opacity  0.0
-bspc config focused_frame_opacity 0.1
-bspc config normal_border_color  "#155872"
+bspc config normal_border_color  "#373b41"
 bspc config active_border_color  "#1C1E20"
 bspc config focused_border_color "#22252c"
 
@@ -32,7 +29,7 @@ bspc config focused_border_color "#22252c"
 
 i=1
 for monitor in $(bspc query -M); do
-    bspc monitor $monitor -n "$i" -d $1/{desktop,code,web,file,chat,art,misc,music}
+    bspc monitor $monitor -n "$i" -d $i/{desktop,web,code,chat,art,music}
     let i++
 done
 NMON=$i
@@ -43,8 +40,11 @@ unset i
 # Rules
 #
 
+bspc rule -a scratchpad state=floating sticky=on center=on
+bspc rule -a Emacs desktop=^3 split_ratio=0.25 state=tiled
+bspc rule -a Gimp desktop=^6
 bspc rule -a mplayer2 state=floating
+bspc rule -a Vlc state=floating
+bspc rule -a feh state=floating center=on
 bspc rule -a Kupfer.py focus=on
 bspc rule -a Screenkey manage=off
-bspc rule -a scratchpad state=floating sticky=on center=on
-bspc rule -a Emacs split_ratio=0.25