diff --git a/.config/sway/config b/.config/sway/config
index 4fa188d..cbe78b1 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -63,7 +63,7 @@ input type:touchpad {
 }
 
 input type:keyboard {
-    xkb_options caps:swapescape
+    xkb_options caps:escape_shifted_capslock
 }
 
 
@@ -245,5 +245,9 @@ client.background       $base07
 
 default_border pixel 2
 
-gaps inner 10
+# Gaps
+gaps inner 5
+smart_gaps on
+smart_borders on
+
 include /etc/sway/config.d/*