diff --git a/modules/i3/files/i3.conf b/modules/i3/files/i3.conf
index 14d43de..719eca8 100644
--- a/modules/i3/files/i3.conf
+++ b/modules/i3/files/i3.conf
@@ -4,10 +4,6 @@ font pango:monospace 8
 
 floating_modifier $mod
 
-# Window Config
-for_window [class=".*"] border pixel 2
-
-
 # i3 shortcuts
 bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
@@ -64,12 +60,6 @@ bindsym $mod+e layout toggle split
 bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
-# Gaps
-bindsym $mod+i gaps inner all plus 5
-bindsym $mod+Shift+i gaps inner all minus 5
-bindsym $mod+o gaps outer all plus 5
-bindsym $mod+Shift+o gaps outer all minus 5
-
 # Workspaces
 bindsym $mod+1 workspace 1
 bindsym $mod+2 workspace 2
@@ -103,6 +93,22 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
+# Gaps
+mode "gaps" {
+    bindsym b border pixel 2
+    bindsym Shift+b border normal
+
+    bindsym Up gaps inner all plus 5
+    bindsym Down gaps inner all minus 5
+
+    bindsym Left gaps outer all minus 5
+    bindsym Right gaps outer all plus 5
+
+    bindsym Escape mode "default"
+}
+bindsym $mod+g mode "gaps"
+
+
 # Autostart
 exec dex -as ~/.config/autostart