diff --git a/.Xmodmap b/.Xmodmap
new file mode 100644
index 0000000..050a87f
--- /dev/null
+++ b/.Xmodmap
@@ -0,0 +1,6 @@
+clear lock 
+keysym Caps_Lock = Mode_switch
+keysym h = h H Left
+keysym l = l L Right
+keysym k = k K Up
+keysym j = j J Down
diff --git a/i3/config b/i3/config
index 45128cd..c81fe1c 100644
--- a/i3/config
+++ b/i3/config
@@ -60,8 +60,8 @@ bindsym $mod+d exec --no-startup-id dmenu_run
 
 # change focus
 bindsym $mod+h focus left
-bindsym $mod+j focus up
-bindsym $mod+k focus down
+bindsym $mod+k focus up
+bindsym $mod+j focus down
 bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
@@ -72,8 +72,8 @@ bindsym $mod+Right focus right
 
 # move focused window
 bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move up
-bindsym $mod+Shift+k move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+j move down
 bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
@@ -83,7 +83,7 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+g split h
+bindsym $mod+semicolon split h
 
 # split in vertical orientation
 bindsym $mod+v split v
diff --git a/i3/i3status.conf.desktop b/i3/i3status.conf.desktop
index c9cac17..95318a3 100644
--- a/i3/i3status.conf.desktop
+++ b/i3/i3status.conf.desktop
@@ -19,13 +19,13 @@ order += "memory"
 order += "volume master"
 order += "tztime local"
 
-ethernet tun0 {
-	format_up = "VPN: %ip (%speed)"
+wireless tun0 {
+	format_up = "VPN: %ip"
 	format_down = "VPN: down"
 }
 
 ethernet _first_ {
-        format_up = "Ethernet: %ip (%speed)"
+        format_up = "Ethernet: %ip" 
         format_down = "Ethernet: down"
 }
 
diff --git a/.vimrc b/vim/.vimrc
similarity index 100%
rename from .vimrc
rename to vim/.vimrc
diff --git a/vim/init.vim b/vim/init.vim
new file mode 100644
index 0000000..9a5afa5
--- /dev/null
+++ b/vim/init.vim
@@ -0,0 +1,55 @@
+" Smart indent and and better tab length
+set formatoptions-=cro
+set tabstop=3 softtabstop=3
+set shiftwidth=3
+set expandtab
+set smartindent
+
+set nu
+set relativenumber
+set nohlsearch
+set hidden
+set incsearch
+set scrolloff=8
+set signcolumn=yes
+
+" Remove arrow keys to train my fingers
+noremap <Up>   <Nop>
+noremap <Down>   <Nop>
+noremap <Left>   <Nop>
+noremap <Right>   <Nop>
+
+" Set <leader> to space
+nnoremap <SPACE> <Nop>
+let mapleader=" "
+
+" Add key bindings for fuzzy finder
+nnoremap <leader>pf <cmd>Telescope find_files<cr>
+nnoremap <leader>pg <cmd>Telescope live_grep<cr>
+nnoremap <leader>pb <cmd>Telescope buffers<cr>
+nnoremap <leader>ph <cmd>Telescope help_tags<cr>
+
+call plug#begin('~/.vim/plugged')
+" Syntax correcting and autocomplete for nvim
+Plug 'neovim/nvim-lspconfig'
+Plug 'nvim-lua/completion-nvim'
+
+" Nvim fuzzy finder
+Plug 'nvim-lua/popup.nvim'
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-telescope/telescope.nvim'
+
+" Gruvbox colorscheme
+Plug 'morhetz/gruvbox'
+call plug#end()
+
+" Load the clangd server as the interpreter
+set completeopt=menuone,noinsert,noselect
+let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy']
+lua require'lspconfig'.clangd.setup{on_attach=require'completion'.on_attach}
+lua require'lspconfig'.pyls.setup{on_attach=require'completion'.on_attach}
+
+" Set colorscheme
+colorscheme gruvbox
+set background=dark
+hi Normal guibg=NONE ctermbg=NONE
diff --git a/xinitrc b/xinitrc
new file mode 100644
index 0000000..3ba0932
--- /dev/null
+++ b/xinitrc
@@ -0,0 +1,35 @@
+#!/bin/sh
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+if [ -f $sysresources ]; then
+   xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+   xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+   xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+   xmodmap "$usermodmap"
+   xcape -e "Mode_switch=Escape"
+fi
+
+# start some nice programs
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+   for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+      [ -x "$f" ] && . "$f"
+   done
+   unset f
+fi
+
+nitrogen --restore &
+flameshot &
+$HOME/.screenlayout/launch.sh &
+exec i3	
diff --git a/zsh/.zshrc b/zsh/.zshrc
index bd615ce..00c0b6f 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -216,6 +216,7 @@ source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 alias open='xdg-open'
 alias cewl='ruby -W0 /opt/CeWL/cewl.rb'
 alias up='sudo python -m http.server 80'
+alias vim='nvim'
 
 # Wordlists
 export directorylist="~/Wordlists/directory-list.txt"