diff --git a/.config/i3/config b/.config/i3/config
index d6b23c1..bc06d3e 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -148,7 +148,7 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-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'"
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Do you wish to logout?' -B 'Yes' 'i3-msg exit'"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -186,6 +186,9 @@ bindsym Ctrl+Mod1+l exec --no-startup-id loginctl lock-session
 bindsym $mod+Ctrl+Left move workspace to output left
 bindsym $mod+Ctrl+Right move workspace to output right
 
+# xkill
+bindsym $mod+Ctrl+q --release exec --no-startup-id xkill -display $DISPLAY
+
 # Screen brightness controls
 bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
 bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
@@ -210,6 +213,7 @@ bindsym Ctrl+Shift+Print exec --no-startup-id flameshot full -c
 #        status_command i3status
 #}
 
+# Startup
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh 2>&1
 exec_always --no-startup-id ~/.fehbg &
 exec_always --no-startup-id ~/.config/i3/customalways.sh 2>&1
@@ -232,10 +236,25 @@ exec --no-startup-id /usr/bin/bash ~/.screenlayout/default.sh 2>&1
 exec --no-startup-id xss-lock -- betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10 2>&1 &
 exec --no-startup-id ~/.config/i3/customonce.sh 2>&1
 
-default_border pixel 0
+# Borders
+default_border pixel 2
+for_window [class=".*"] border pixel 2
 
-for_window [class=".*"] border pixel 0
+focus_follows_mouse no
+binding_mode_indicator no
 
+# Gaps
 gaps inner 5
 gaps top 0
 gaps bottom 0
+
+# Colors
+
+# class                 border  bground text    indicator child_border
+client.focused          #4285F4 #4285F4 #FFFFFF #4285F4   #2F60B0
+client.focused_inactive #333333 #333333 #FFFFFF #333333   #5F676A
+client.unfocused        #2C2E33 #2C2E33 #CCCCCC #2C2E33   #222222
+client.urgent           #2F343A #900000 #FFFFFF #2F343A   #900000
+client.placeholder      #000000 #0C0C0C #FFFFFF #000000   #0C0C0C
+
+client.background       #FFFFFF