diff --git a/gitconfig b/gitconfig
index fc81678..2aa60b0 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,7 +3,7 @@
 	ignorecase = false
 [user]
 	name = Jan Wirth
-	email = jan.wirth@mercedes-benz.io
+	email = jan@scalab.app
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
diff --git a/i3 b/i3
new file mode 100644
index 0000000..368e530
--- /dev/null
+++ b/i3
@@ -0,0 +1,172 @@
+# 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)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+
+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:monospace 8
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec i3-sensible-terminal
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+s exec dmenu_run
+# 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.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+n focus left
+bindsym $mod+e focus down
+bindsym $mod+i focus up
+bindsym $mod+o focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+N move left
+bindsym $mod+Shift+E move down
+bindsym $mod+Shift+I move up
+bindsym $mod+Shift+O 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
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+t fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+r layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+f layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+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
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+P restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+F 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'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # 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 n resize shrink width 10 px or 10 ppt
+        bindsym e resize grow height 10 px or 10 ppt
+        bindsym i resize shrink height 10 px or 10 ppt
+        bindsym o resize grow width 10 px or 10 ppt
+
+        # 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+p mode "default"
+}
+
+bindsym $mod+p mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command i3status
+}
+exec_always "setxkbmap -layout us -variant colemak -option caps:escape"
+exec_always "xmodmap ~/.Xmodmap"
diff --git a/install.conf.yaml b/install.conf.yaml
index 5c1f165..daa59e8 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -19,6 +19,10 @@
       path: chunkwmrc
     ~/.xinitrc:
       path: xinitrc
+    ~/.Xmodmap:
+      path: xmodmap
+    ~/.config/i3/config:
+      path: i3
     ~/.spectrwm.conf:
       path: spectrwm.conf
     ~/.keymap.xkb:
diff --git a/kakrc b/kakrc
index 7ef88f4..1e13ff2 100644
--- a/kakrc
+++ b/kakrc
@@ -19,6 +19,7 @@ hook global NormalKey y|d|c %{ nop %sh{
 }}
 
 map global user p '<a-!>xsel <minus><minus>clipboard<ret>'
+map global user n '<esc>:buffer-next<ret>'
 
 
 # paste large stuff from clipboard
@@ -46,4 +47,14 @@ define-command trim-whitespaces -docstring "Remove trailing whitespace from ever
     }
 }
 
+colorscheme gruvbox
+
 source ~/dotfiles/find.kak
+source "%val{config}/plugins/plug.kak/rc/plug.kak"
+
+plug "ul/kak-lsp" do %{
+    cargo build --release --locked
+    cargo install --force
+}
+
+eval %sh{kak-lsp --kakoune -s $kak_session}
diff --git a/xmodmap b/xmodmap
new file mode 100644
index 0000000..0ce5db4
--- /dev/null
+++ b/xmodmap
@@ -0,0 +1,4 @@
+clear mod1
+clear control
+add mod1 = Control_L
+add control = Alt_L Control_R
diff --git a/zshrc b/zshrc
index 853449f..5852f18 100644
--- a/zshrc
+++ b/zshrc
@@ -152,9 +152,11 @@ alias decompress='7z x $@'
 alias ns='npm start'
 export PATH="/usr/local/opt/imagemagick@6/bin:$PATH"
 
+export APPSPATH=$HOME/apps
 export GOPATH=$HOME/goprojects
 
 export PATH=$PATH:$GOPATH/bin
+export PATH=$PATH:$APPSPATH/bin
 
 # usage: transfer some_file another_file
 # will transfer changes from some_file to another_file
@@ -195,4 +197,4 @@ alias gitrefine="git rebase -i HEAD~10"
 [[ -f /home/jan/tuna-backend/node_modules/tabtab/.completions/serverless.zsh ]] && . /home/jan/tuna-backend/node_modules/tabtab/.completions/serverless.zsh
 # tabtab source for sls package
 # uninstall by removing these lines or running `tabtab uninstall sls`
-[[ -f /home/jan/tuna-backend/node_modules/tabtab/.completions/sls.zsh ]] && . /home/jan/tuna-backend/node_modules/tabtab/.completions/sls.zsh
\ No newline at end of file
+[[ -f /home/jan/tuna-backend/node_modules/tabtab/.completions/sls.zsh ]] && . /home/jan/tuna-backend/node_modules/tabtab/.completions/sls.zsh