diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc
index a9b78321..797c92a5 100644
--- a/.config/skhd/skhdrc
+++ b/.config/skhd/skhdrc
@@ -5,7 +5,7 @@ cmd - return : /Applications/iTerm.app/Contents/MacOS/iTerm2
 cmd - h : yabai -m window --focus west
 cmd - j : yabai -m window --focus south
 cmd - k : yabai -m window --focus north
-cmd - l : yabai -m window --fcous east
+cmd - l : yabai -m window --focus east
 
 # Moving windows
 cmd + shift - h : yabai -m window --warp west
@@ -13,6 +13,16 @@ cmd + shift - j : yabai -m window --warp south
 cmd + shift - k : yabai -m window --warp north
 cmd + shift - l : yabai -m window --warp east
 
+# Focus workspace
+cmd - 1 : yabai -m space --focus 1
+cmd - 2 : yabai -m space --focus 2
+cmd - 3 : yabai -m space --focus 3
+cmd - 4 : yabai -m space --focus 4
+cmd - 5 : yabai -m space --focus 5
+cmd - 6 : yabai -m space --focus 6
+cmd - 7 : yabai -m space --focus 7
+cmd - 8 : yabai -m space --focus 8
+
 # Move focus container to workspace
 cmd + shift - 1 : yabai -m window --space 1
 cmd + shift - 2 : yabai -m window --space 2
@@ -48,4 +58,6 @@ cmd + shift - f : yabai -m window --toggle native-fullscreen
 cmd + shift - 0 : yabai -m space --balance
 
 # Restart yabai
-cmd + shift - r : launchctl kickstart -k "gui/${UID}/homebrew.mxcl.yabai"
+cmd + shift - r : \
+	skhd -r ; \
+	~/.config/yabai/yabairc
diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc
index afd42eb0..5f530e2c 100755
--- a/.config/yabai/yabairc
+++ b/.config/yabai/yabairc
@@ -1,12 +1,12 @@
 #!/usr/bin/env sh
 
 # bar settings
-yabai -m config status_bar                   off
+yabai -m config status_bar                   on
 yabai -m config status_bar_text_font         "Helvetica Neue:Bold:12.0"
-yabai -m config status_bar_icon_font         "FontAwesome:Regular:12.0"
-yabai -m config status_bar_background_color  0xff202020
-yabai -m config status_bar_foreground_color  0xffa8a8a8
-yabai -m config status_bar_space_icon_strip  I II III IV V VI VII VIII IX X
+yabai -m config status_bar_icon_font         "Font Awesome 5 Free:Regular:12.0"
+yabai -m config status_bar_background_color  0xff3b4252
+yabai -m config status_bar_foreground_color  0xffd8dee8
+yabai -m config status_bar_space_icon_strip  1 2 3 4 5 6 7 8 9 0
 yabai -m config status_bar_power_icon_strip   
 yabai -m config status_bar_space_icon        
 yabai -m config status_bar_clock_icon        
@@ -18,15 +18,15 @@ yabai -m config window_placement             second_child
 yabai -m config window_topmost               off
 yabai -m config window_opacity               off
 yabai -m config window_opacity_duration      0.0
-yabai -m config window_shadow                on
-yabai -m config window_border                off
+yabai -m config window_shadow                off
+yabai -m config window_border                on
 yabai -m config window_border_placement      inset
 yabai -m config window_border_width          4
 yabai -m config window_border_radius         -1.0
 yabai -m config active_window_border_topmost off
-yabai -m config active_window_border_color   0xff775759
-yabai -m config normal_window_border_color   0xff505050
-yabai -m config insert_window_border_color   0xffd75f5f
+yabai -m config active_window_border_color   0xff81a1c1
+yabai -m config normal_window_border_color   0xff4c566a
+yabai -m config insert_window_border_color   0xffebcb8b
 yabai -m config active_window_opacity        1.0
 yabai -m config normal_window_opacity        0.90
 yabai -m config split_ratio                  0.50
@@ -37,10 +37,10 @@ yabai -m config mouse_action2                resize
 
 # general space settings
 yabai -m config layout                       bsp
-yabai -m config top_padding                  20
-yabai -m config bottom_padding               20
-yabai -m config left_padding                 20
-yabai -m config right_padding                20
+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
 
 echo "yabai configuration loaded.."