diff --git a/.gitignore b/.gitignore
index cbf48cb..6ddaa2d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,12 @@
 \#*\#
 *.log
 .#*
+config/.ssh/known_hosts
+vim/.vim/.netrwhist
 vim/.vim/bundle/*
 emacs/.emacs.d/*
 config/.scripts/playstate
+config/.ssh/known_hosts
 !emacs/.emacs.d/snippets*
 !emacs/.emacs.d/config.org
 !emacs/.emacs.d/ledger.org
diff --git a/config/.config/i3/config b/config/.config/i3/config
index e059595..f75a312 100644
--- a/config/.config/i3/config
+++ b/config/.config/i3/config
@@ -97,7 +97,7 @@ for_window [title="^Steam Keyboard$"] floating enable
 ############################ Startup Applications #############################
 ###############################################################################
 
-exec --no-startup-id setxkbmap us,de; setxkbmap -option ctrl:nocaps 
+exec --no-startup-id setxkbmap us,de; setxkbmap -option ctrl:nocaps; setxkbmap -option grp:lalt_lshift_toggle
 exec --no-startup-id feh --randomize --bg-fill /usr/share/backgrounds/*
 exec --no-startup-id compton -b
 exec --no-startup-id nextcloud
diff --git a/config/.mozilla/firefox/profiles.ini b/config/.mozilla/firefox/profiles.ini
new file mode 100644
index 0000000..a969730
--- /dev/null
+++ b/config/.mozilla/firefox/profiles.ini
@@ -0,0 +1,9 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=2x4tnepw.default
+Default=1
+
diff --git a/config/.ssh/config b/config/.ssh/config
new file mode 100644
index 0000000..a32bf76
--- /dev/null
+++ b/config/.ssh/config
@@ -0,0 +1,23 @@
+Host mx
+    HostName 132.252.238.12
+    Port 22
+    User infra
+    IdentityFile /mnt/veracrypt1/fse
+
+Host helios
+    HostName 132.252.238.17
+    Port 22
+    User infra
+    IdentityFile /mnt/veracrypt1/fse
+
+Host infinity
+    HostName mos4.de
+    Port 22
+    User infinity
+    IdentityFile /mnt/veracrypt1/mos4.de
+
+Host github.com
+    Hostname github.com
+    Port 22
+    User git
+    IdentityFile /mnt/veracrypt1/git
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
deleted file mode 100644
index 60cba2f..0000000
--- a/vim/.vim/.netrwhist
+++ /dev/null
@@ -1,8 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =6
-let g:netrw_dirhist_1='/home/tuan/Nextcloud/Templates/LaTeX/Protokoll'
-let g:netrw_dirhist_2='/home/tuan/Nextcloud/Templates/LaTeX/Protokoll/INCL'
-let g:netrw_dirhist_3='/home/tuan/Nextcloud/Documents/Git/infrastruktur/mailing_lists'
-let g:netrw_dirhist_4='/home/tuan/.dotfiles/config/.config/termite'
-let g:netrw_dirhist_5='/home/tuan/Nextcloud/Protokolle/Rechenschaftsbericht'
-let g:netrw_dirhist_6='/etc/modules-load.d'
diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim
index 9067b6a..e69de29 100644
--- a/vim/.vim/ftplugin/java.vim
+++ b/vim/.vim/ftplugin/java.vim
@@ -1,4 +0,0 @@
-imap { {<Enter>}<Esc>kA
-imap ( ()<Esc>i
-imap () ()
-
diff --git a/vim/.vimrc b/vim/.vimrc
index 22d7cdd..1204947 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -69,15 +69,18 @@ nmap 0 ^
 inoremap ;date <C-R>=strftime("%Y/%m/%d")<Enter> 
 inoremap ;time <C-R>=strftime("%H:%M:%S")<Enter> 
 " Diaeresis for e.g. german
-inoremap ae ä
-inoremap oe ö
-inoremap ue ü
-inoremap Ae Ä
-inoremap Ue Ü
-inoremap Oe Ö
+inoremap a" ä
+inoremap o" ö
+inoremap u" ü
+inoremap A" Ä
+inoremap U" Ü
+inoremap O" Ö
+inoremap jk <Esc>
 inoremap <leader>s ß
 inoremap <leader>e €
 
+
+vnoremap jk <Esc>
 " This callback will be executed when the entire command is completed
 function! BackgroundCommandClose(channel)
     " Read the output from the command into the quickfix window
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 3c74c4b..35650b2 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -6,6 +6,7 @@ export GOPATH="$HOME/.go/"
 # Alias
 alias q="exit"
 alias ranger='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir`; cd "$LASTDIR"'
+alias pwgen='pwgen -y 20 1'
 alias xsel='xsel -ib'
 
 # Theme