diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc
index ce83417..cff777b 100755
--- a/.config/yabai/yabairc
+++ b/.config/yabai/yabairc
@@ -14,11 +14,11 @@ yabai -m config focus_follows_mouse          off
 yabai -m config mouse_follows_focus          off
 
 yabai -m config layout                       bsp
-yabai -m config top_padding                  10
-yabai -m config bottom_padding               10
-yabai -m config left_padding                 10
-yabai -m config right_padding                10
-yabai -m config window_gap                   10
+yabai -m config top_padding                  0
+yabai -m config bottom_padding               0
+yabai -m config left_padding                 0
+yabai -m config right_padding                0
+yabai -m config window_gap                   0
 
 yabai -m config mouse_action1                move
 yabai -m config mouse_action2                resize
@@ -33,6 +33,8 @@ yabai -m rule --add app=Calculator manage=off
 
 # Launch borders
 #borders active_color=0xffFF2400 inactive_color=0xff494d64 width=4.0 style=round blur_radius=7.4 &
-borders active_color=0xff228B22 inactive_color=0xff494d64 width=6.0 style=round blur_radius=7.4 &
+#borders active_color=0xff228B22 inactive_color=0xff494d64 width=6.0 style=round blur_radius=7.4 &
+#borders order=above active_color=0xff228B22 inactive_color=0xff494d64 width=8.0 style=square blur_radius=7.4 &
+borders order=above active_color=0xff228B22 inactive_color=0xff494d64 width=8.0 style=square &
 
 echo "$(date) yabai config $0 loaded"