diff --git a/config b/config
index fbf725e..4a6eb5c 100644
--- a/config
+++ b/config
@@ -37,6 +37,17 @@ focus_wrapping no
 mouse_warping container
 # floating_maximum_size 1600 x 900
 font pango:$font
+hide_edge_borders --i3 smart
+smart_gaps off
+default_border pixel 4
+#
+# Gaps
+#
+gaps inner 5
+gaps outer 0
+gaps left 0
+gaps right 0
+
 
 ### Output configuration
 output * bg $background fill
@@ -157,6 +168,7 @@ bindsym $mod+f fullscreen
 
 # Toggle the current focus between tiling and floating mode
 bindsym $mod+Shift+space floating toggle
+bindsym $mod+Shift+b border toggle
 
 # Swap focus between the tiling area and the floating area
 bindsym $mod+space focus mode_toggle
@@ -244,6 +256,7 @@ for_window [class=".*"] title_format '<span font_weight="bold">%title</span> <sp
 # Read `man 5 sway-bar` for more information about this section.
 bar {
     position top
+    gaps 3 5
     status_command i3status-rs $HOME/.config/sway/i3status.d/$(hostname).toml
     font $font
     colors {