diff --git a/i3/config.d/autostart b/i3/config.d/autostart
index 87a9887..991a3b4 100644
--- a/i3/config.d/autostart
+++ b/i3/config.d/autostart
@@ -2,4 +2,5 @@
 exec nextcloud
 
 ### Make things a little easier easier on the eyes.
-exec redshift
\ No newline at end of file
+exec redshift
+
diff --git a/i3/config.d/bar b/i3/config.d/bar
new file mode 100644
index 0000000..c692860
--- /dev/null
+++ b/i3/config.d/bar
@@ -0,0 +1,6 @@
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command polybar example
+}
+
diff --git a/i3/config.d/config b/i3/config.d/config
index 8f94d65..fa74fcf 100644
--- a/i3/config.d/config
+++ b/i3/config.d/config
@@ -1,14 +1,7 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
 
-# i3 config file (v4)
+### Variables
 #
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
+# Logo key. Use Mod1 for Alt.
 set $mod Mod4
 # Home row direction keys, like vim
 set $left h
@@ -18,11 +11,17 @@ set $right l
 # Your preferred terminal emulator
 set $term kitty
 
-set $menu rofi --show
+################################################################################
+# Your preferred application launcher
+# Note: it's recommended that you pass the final command to sway
+set $menu bash ~/.config/sway/scripts/menu
+set $gopass_menu bash ~/.config/sway/scripts/menu_gopass
+set $clipman_menu bash ~/.config/sway/scripts/menu_clipman
+set $printscreen bash ~/.config/sway/scripts/printscreen
+set $mod Mod4
+
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Fira Code 9
-
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -39,13 +38,15 @@ font pango:Fira Code 9
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec $term
 
 # kill focused window
-bindsym $mod+Shift+q kill
+bindsym $mod+q kill
 
-# start dmenu (a program launcher)
-bindsym $mod+d exec $menu
+# start your launcher
+bindsym $mod+space exec $menu
+# gopass prompt
+bindsym $mod+backslash exec $gopass_menu
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -59,7 +60,9 @@ bindsym $mod+$left focus left
 bindsym $mod+$down focus down
 bindsym $mod+$up focus up
 bindsym $mod+$right focus right
-# or use $mod+[up|down|left|right]
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
 bindsym $mod+Up focus up
@@ -70,14 +73,16 @@ bindsym $mod+Shift+$left move left
 bindsym $mod+Shift+$down move down
 bindsym $mod+Shift+$up move up
 bindsym $mod+Shift+$right move right
-# ditto, with arrow keys
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
 bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+h split h
+bindsym $mod+b split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -91,10 +96,10 @@ bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
 # toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
+bindsym $mod+- floating toggle
 
 # change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
+bindsym $mod+d focus mode_toggle
 
 # focus the parent container
 bindsym $mod+a focus parent
@@ -140,7 +145,7 @@ bindsym $mod+Shift+9 move container to workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws10
 
 # reload the configuration file
-bindsym $mod+Shift+c reload
+bindsym $mod+Shift+c exec "make -C ~/.config/i3/ update"
 # 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)
@@ -148,31 +153,28 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
+        # These bindings trigger as soon as you enter the resize mode
 
-    # ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym $left resize shrink width 10px
+        bindsym $down resize grow height 10px
+        bindsym $up resize shrink height 10px
+        bindsym $right resize grow width 10px
 
-    # return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-    bindsym $mod+r mode "default"
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
 }
 
 bindsym $mod+r mode "resize"
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-        status_command i3status
-}
\ No newline at end of file
diff --git a/i3/config.d/input b/i3/config.d/input
new file mode 100644
index 0000000..495e906
--- /dev/null
+++ b/i3/config.d/input
@@ -0,0 +1,3 @@
+# Map ctrl to caps.
+exec setxkbmap -option ctrl:swapcaps
+
diff --git a/i3/config.d/ui b/i3/config.d/ui
new file mode 100644
index 0000000..6cdb32b
--- /dev/null
+++ b/i3/config.d/ui
@@ -0,0 +1,13 @@
+### Font
+font pango:Fira Code 9
+
+gaps inner 10
+gaps outer 0
+
+### Colors
+# class                 border  backgr  text    indicator child_border
+client.focused          #12e689 #12e689 #1f212e #12e689 #12e689
+client.focused_inactive #1f212e #1f212e #aab5c6 #1f212e #1f212e
+client.unfocused        #161720 #161720 #aab5c6 #161720 #161720
+client.urgent           #ff4551 #ff4551 #1f212e #ff4551 #ff4551
+