diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..8b8ab6d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,11 @@
+[user]
+	email = tobias.manske@mailbox.org
+	name = Tobias Manske
+	signingkey = 978D99F12D4E041F
+[alias]
+    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+    cu = "!git branch --merged | grep -v '\\*' | grep -v master | xargs -n 1 git branch -d"
+[commit]
+	gpgsign = true
+[core]
+	autocrlf = input
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b8fd5ed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+# Created by https://www.gitignore.io/api/vim
+
+### Vim ###
+# swap
+vim/[._]*.s[a-v][a-z]
+vim/[._]*.sw[a-p]
+vim/[._]s[a-v][a-z]
+vim/[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+vim/.undo/*
+vim/.swp/*
+
+.sqlite
+# End of https://www.gitignore.io/api/vim
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e4c93a3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,93 @@
+[submodule "vim/plugins/emmet-vim"]
+	path = vim/plugins/emmet-vim
+	url = https://github.com/mattn/emmet-vim
+[submodule "vim/plugins/neco-vim"]
+	path = vim/plugins/neco-vim
+	url = https://github.com/Shougo/neco-vim
+[submodule "vim/plugins/nerdcommenter"]
+	path = vim/plugins/nerdcommenter
+	url = https://github.com/scrooloose/nerdcommenter
+[submodule "vim/plugins/supertab"]
+	path = vim/plugins/supertab
+	url = https://github.com/ervandew/supertab
+[submodule "vim/plugins/syntastic"]
+	path = vim/plugins/syntastic
+	url = https://github.com/vim-syntastic/syntastic.git
+[submodule "vim/plugins/vim-airline"]
+	path = vim/plugins/vim-airline
+	url = https://github.com/vim-airline/vim-airline.git
+[submodule "vim/plugins/vim-airline-themes"]
+	path = vim/plugins/vim-airline-themes
+	url = https://github.com/vim-airline/vim-airline-themes.git
+[submodule "vim/plugins/vim-better-whitespace"]
+	path = vim/plugins/vim-better-whitespace
+	url = git://github.com/ntpeters/vim-better-whitespace.git
+[submodule "vim/plugins/vim-easymotion"]
+	path = vim/plugins/vim-easymotion
+	url = https://github.com/easymotion/vim-easymotion
+[submodule "vim/plugins/vim-fugitive"]
+	path = vim/plugins/vim-fugitive
+	url = git://github.com/tpope/vim-fugitive.git
+[submodule "vim/plugins/vim-yankstack"]
+	path = vim/plugins/vim-yankstack
+	url = https://github.com/maxbrunsfeld/vim-yankstack
+[submodule "vim/plugins/indentline"]
+	path = vim/plugins/indentline
+	url = https://github.com/yggdroot/indentline
+[submodule "vim/plugins/simpylfold"]
+	path = vim/plugins/simpylfold
+	url = https://github.com/tmhedberg/simpylfold
+[submodule "vim/plugins/FastFold"]
+	path = vim/plugins/FastFold
+	url = https://github.com/Konfekt/fastfold.git
+[submodule "vim/plugins/vim-nerdtree-tabs"]
+	path = vim/plugins/vim-nerdtree-tabs
+	url = https://github.com/jistr/vim-nerdtree-tabs
+[submodule "vim/plugins/GoldenView"]
+	path = vim/plugins/GoldenView
+	url = git://github.com/zhaocai/GoldenView.Vim.git
+[submodule "vim/plugins/ultisnips"]
+	path = vim/plugins/ultisnips
+	url = https://github.com/SirVer/ultisnips.git
+[submodule "vim/snippets/vim-snippets"]
+	path = vim/snippets/vim-snippets
+	url = https://github.com/honza/vim-snippets
+[submodule "vim/snippets/bootstrap-snippets"]
+	path = vim/snippets/bootstrap-snippets
+	url = https://github.com/bonsaiben/bootstrap-snippets.git
+[submodule "vim/snippets/snipmate-snippets-bib"]
+	path = vim/snippets/snipmate-snippets-bib
+	url = https://github.com/rbonvall/snipmate-snippets-bib.git
+[submodule "vim/plugins/singlecompile"]
+	path = vim/plugins/singlecompile
+	url = https://github.com/xuhdev/singlecompile
+[submodule "vim/plugins/javacomplete"]
+	path = vim/plugins/javacomplete
+	url = https://github.com/vim-scripts/javacomplete
+[submodule "vim/plugins/pythonsyntax"]
+	path = vim/plugins/pythonsyntax
+	url = https://github.com/hdima/python-syntax
+[submodule "vim/plugins/vim-python-pep8-indent"]
+	path = vim/plugins/vim-python-pep8-indent
+	url = https://github.com/Vimjas/vim-python-pep8-indent
+[submodule "vim/plugins/auto-pairs"]
+	path = vim/plugins/auto-pairs
+	url = https://github.com/jiangmiao/auto-pairs.git
+[submodule "vim/plugins/kotlin-vim"]
+	path = vim/plugins/kotlin-vim
+	url = https://github.com/udalov/kotlin-vim.git
+[submodule "vim/plugins/vim-hug-neovim-rpc"]
+	path = vim/plugins/vim-hug-neovim-rpc
+	url = https://github.com/roxma/vim-hug-neovim-rpc
+[submodule "vim/plugins/deoplete.nvim"]
+	path = vim/plugins/deoplete.nvim
+	url = https://github.com/Shougo/deoplete.nvim.git
+[submodule "vim/plugins/nvim-yarp"]
+	path = vim/plugins/nvim-yarp
+	url = https://github.com/roxma/nvim-yarp
+[submodule "vim/plugins/deoplete-jedi"]
+	path = vim/plugins/deoplete-jedi
+	url = https://github.com/zchee/deoplete-jedi
+[submodule "vim/plugins/vim-latex-live-preview"]
+	path = vim/plugins/vim-latex-live-preview
+	url = https://github.com/xuhdev/vim-latex-live-preview
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..67bb554
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+tmux:
+	ln -s ~/.dotfiles/tmux ~/.tmux
+	ln -s ~/.dotfiles/tmux/tmux.conf ~/.tmux.conf
+
+vim:
+	ln -s ~/.dotfiles/vim ~/.vim
+	ln -s ~/.dotfiles/vim/.vimc ~/.vimrc
+	sudo pip3 uninstall greenlet
+	sudo pip3 install neovim
+	sudo pip2 uninstall greenlet
+	sudo pacman -S python-greenlet
+
+git:
+	ln -s ~/.dotfiles/.gitconfig ~/.gitconfig
+
+zsh:
+	ln -s ~/.dotfiles/zsh ~/.zim
+	zsh zimsetup.zsh
+	rm ~/.zimrc
+	ln -s ~/.dotfiles/zsh/.zimrc ~/.zimrc
+
+i3:
+	ln -s ~/.dotfiles/i3 ~/.config/i3
+
+.PHONY: clean zsh git vim tmux i3
+clean:
+	rm -rf ~/.vim ~/.vimrc ~/.tmux ~/.tmux.conf ~/.gitconfig ~/.config/i3
+	rm -rf ~/.zshrc ~/.zimrc ~/.zim ~/.zlogin
+
+all: clean tmux vim git zsh i3
diff --git a/i3/config b/i3/config
index 77d44f3..645f035 100644
--- a/i3/config
+++ b/i3/config
@@ -20,11 +20,15 @@
 
     # 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"
+    # Browser
+    set $ws1 "1 "
+    # Terminal
+    set $ws2 "2 "
+    # Work
+    set $ws3 "3 "
     set $ws4 "4"
-    set $ws5 "5"
+    # Mail
+    set $ws5 "5 "
     set $ws6 "6"
     set $ws7 "7"
     set $ws8 "8"
@@ -132,6 +136,9 @@ floating_modifier $mod
     # UNBIND F1
     bindsym F1 exec --no-startup-id echo > /dev/null
 
+    # Urgent window
+    bindsym $mod+x [urgent=latest] focus
+
 
     # MEDIA KEYS
     bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master 2%+
@@ -142,6 +149,13 @@ floating_modifier $mod
     bindsym XF86AudioPrev        exec --no-startup-id playerctl previous
     bindsym XF86AudioStop        exec --no-startup-id playerctl stop
 
+    # Screensaver || ThinkVantage
+    bindsym XF86ScreenSaver exec xscreensaver-command -lock
+    bindsym XF86Launch1     exec "xscreensaver-command -lock; sleep 1; xset dpms force off"
+
+    # Screenshot
+    bindsym Print exec ~/.config/i3/scripts/screenshot.sh
+
 
     # {{{ RESIZE MODE }}}
     mode "resize" {
@@ -199,6 +213,26 @@ bar {
     default_border none
     default_floating_border normal
 
+
+# {{{ WORKSPACES }}}
+
+    # Browser
+        workspace $ws1 gaps outer 0
+        workspace $ws1 gaps inner 0
+        assign [class="Firefox"] $ws1
+
+    # Terminal
+        assign [class="URxvt"]   $ws2
+
+    # Mail
+        workspace $ws5 gaps outer 0
+        workspace $ws5 gaps inner 0
+        assign [class="Thunderbird"] $ws5
+    # KeepassXC
+        assign [class="keepassxc"] $ws10
+
+
+
 # {{{ KEYBOARD MAP }}}
     exec_always setxkbmap de
 
diff --git a/i3/i3 b/i3/i3
new file mode 120000
index 0000000..f6e1774
--- /dev/null
+++ b/i3/i3
@@ -0,0 +1 @@
+/home/rad4day/.dotfiles/i3
\ No newline at end of file
diff --git a/i3/scripts/dmenu/database.sqlite b/i3/scripts/dmenu/database.sqlite
index 738d8b3..3473b14 100644
Binary files a/i3/scripts/dmenu/database.sqlite and b/i3/scripts/dmenu/database.sqlite differ
diff --git a/i3/scripts/screenshot.sh b/i3/scripts/screenshot.sh
new file mode 100755
index 0000000..9fb2177
--- /dev/null
+++ b/i3/scripts/screenshot.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+xfce4-screenshooter -o "/usr/bin/xclip -i -t image/png -selection clipboard" -r
diff --git a/vim b/vim
new file mode 160000
index 0000000..128636d
--- /dev/null
+++ b/vim
@@ -0,0 +1 @@
+Subproject commit 128636d8afc316fed0a686e2f5fbf427abb51981
diff --git a/zimsetup.zsh b/zimsetup.zsh
new file mode 100755
index 0000000..07b8035
--- /dev/null
+++ b/zimsetup.zsh
@@ -0,0 +1,11 @@
+#!/usr/bin/env zsh
+
+setopt EXTENDED_GLOB
+  for template_file ( ${ZDOTDIR:-${HOME}}/.zim/templates/* ); do
+    user_file="${ZDOTDIR:-${HOME}}/.${template_file:t}"
+    touch ${user_file}
+    ( print -rn "$(<${template_file})$(<${user_file})" >! ${user_file} ) 2>/dev/null
+  done
+chsh -s =zsh
+zsh -c 'source ${ZDOTDIR:-${HOME}}/.zlogin'
+
diff --git a/zsh b/zsh
new file mode 160000
index 0000000..1d21538
--- /dev/null
+++ b/zsh
@@ -0,0 +1 @@
+Subproject commit 1d215385075d855c3231df34dc803ca2a53fd28e