diff --git a/clean-dead-symlinks.sh b/clean-dead-symlinks.sh
new file mode 100755
index 0000000..b5bba6b
--- /dev/null
+++ b/clean-dead-symlinks.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+find ~ -type l -exec test ! -e {} \; -delete
diff --git a/git/.gitconfig b/git/.gitconfig
index bb7ef42..2058d25 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,12 +3,20 @@
     email = ryan@andthensome.nl
 
 [core]
-    editor = vim
+    editor = nvim
 	excludesfile = /home/alrayyes/.gitignore_global
 
 [push]
     default = matching
 [user]
-	email = ryan@andthensome.nl
-	name = Ryan
+	email = alrayyes@gmail.com
+	name = Ryan Kes
 	signingkey = alrayyes@gmail.com
+[sendemail]
+    confirm = auto
+
+[sendemail]
+    smtpEncryption = tls
+    smtpServer = /usr/bin/msmtp
+    confirm = auto
+    chainreplyto = false
diff --git a/git/.gitignore_global b/git/.gitignore_global
new file mode 100644
index 0000000..a35426e
--- /dev/null
+++ b/git/.gitignore_global
@@ -0,0 +1,100 @@
+# Created by https://www.gitignore.io/api/phpstorm
+
+### PhpStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+.idea/
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### PhpStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# End of https://www.gitignore.io/api/phpstorm
+
+### WebStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources/
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### WebStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# End of https://www.gitignore.io/api/webstorm
+
+# php-cs-fixer
+php-cs-fixer
+.php_cs.cache
+
+# composer
+composer.phar
+
+.idea
+.idea/*
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
new file mode 100644
index 0000000..f182e5b
--- /dev/null
+++ b/nvim/.config/nvim/init.vim
@@ -0,0 +1,3 @@
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc
diff --git a/vim/.vimrc.before.local b/nvim/.vimrc.before.local
similarity index 100%
rename from vim/.vimrc.before.local
rename to nvim/.vimrc.before.local
diff --git a/nvim/.vimrc.bundles.local b/nvim/.vimrc.bundles.local
new file mode 100644
index 0000000..0bf6e93
--- /dev/null
+++ b/nvim/.vimrc.bundles.local
@@ -0,0 +1,4 @@
+Bundle 'ryanoasis/vim-devicons'
+Bundle 'shime/vim-livedown'
+UnBundle 'amirh/HTML-AutoCloseTag'
+UnBundle 'spf13/vim-preview'
diff --git a/nvim/.vimrc.local b/nvim/.vimrc.local
new file mode 100644
index 0000000..9deee4e
--- /dev/null
+++ b/nvim/.vimrc.local
@@ -0,0 +1,13 @@
+color molokai
+
+" vim-devicons
+set encoding=utf8
+
+" mutt
+au BufRead ~/.mutt/temp/mutt-* set tw=72
+
+" default previe browser
+let g:livedown_browser='firefox-developer-edition --class="firefox-developer"' 
+
+" toggle markdown preview
+nmap <leader>P :LivedownToggle<CR>
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
deleted file mode 100644
index 54f17f8..0000000
--- a/tmux/.tmux.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#example ripped from http://blog.hawkhost.com/2010/07/02/tmux-%E2%80%93-the-terminal-multiplexer-part-2/
-
-set -g status-bg black
-set -g status-fg white
-set -g status-left '#[fg=green bg=black]#(hostname -s)'
-
-# Highlight active window
-set-window-option -g window-status-current-bg red
-set -g status-right '#[fg=yellow bg=black]#(uptime | cut -d "," -f 2-)'
-
-#Set window notifications
-setw -g monitor-activity on
-set -g visual-activity on
-
-#automatically rename windows
-setw -g automatic-rename on
diff --git a/vim/.vimrc.bundles.local b/vim/.vimrc.bundles.local
deleted file mode 100644
index 93700d2..0000000
--- a/vim/.vimrc.bundles.local
+++ /dev/null
@@ -1 +0,0 @@
-Bundle 'ryanoasis/vim-devicons'
diff --git a/vim/.vimrc.local b/vim/.vimrc.local
deleted file mode 100644
index 17e883a..0000000
--- a/vim/.vimrc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-color molokai
-
-" vim-devicons
-set encoding=utf8
-
-" mutt
-au BufRead ~/.mutt/temp/mutt-* set tw=72
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 3c75833..387cd45 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,11 +1,11 @@
-# If you come from bash you might have to change your $PATH.
+# Ifkyou come from bash you might have to change your $PATH.
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Stop tmux bitching about 256 colours
-export TERM="xterm-256color"
+TERM="xterm-256color"
 
 # Path to your oh-my-zsh installation.
-export ZSH=/home/alrayyes/.oh-my-zsh
+ZSH="/home/alrayyes/.oh-my-zsh"
 
 # Set name of the theme to load. Optionally, if you set this to "random"
 # it'll load a random theme each time that oh-my-zsh is loaded.
@@ -55,7 +55,7 @@ ZSH_THEME="powerlevel9k/powerlevel9k"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(aws archlinux bower common-aliases composer docker git git-flow pass sudo symfony2 systemd tmux)
+plugins=(aws archlinux bower common-aliases composer docker git git-flow pass sudo symfony2 systemd tmux fzf gitignore )
 
 source $ZSH/oh-my-zsh.sh
 
@@ -88,14 +88,38 @@ source $ZSH/oh-my-zsh.sh
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
+# nvim alias
+alias vim="nvim"
+
+# ls alias
+alias ls="lsd"
+alias l="lsd -al"
+
+# vifm alias
+alias vifm="vifmrun"
+
+transfer() { if [ $# -eq 0 ]; then echo -e "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi
+tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://share.higherlearning.eu/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://share.higherlearning.eu/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; }
+transferats() { if [ $# -eq 0 ]; then echo -e "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi
+tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://share.andthensome.nl/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://share.andthensome.nl/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; }
+
 # Emberjs settings
-export PATH="$PATH:/home/alrayyes/.config/yarn/global/node_modules/.bin"
+export PATH="$PATH:/home/alrayyes/.config/yarn/global/node_modules/.bin:/home/alrayyes/.scripts"
 
 # Set GPG TTY
-export GPG_TTY=$(tty)
+export GPG_TTY="$(tty)"
 
 # Set default browser
-export BROWSER=firefox
+export BROWSER="firefox"
+
+# Set default terminal
+export TERMINAL="st"
+
+# pkg editor
+export VISUAL="vim"
+
+# Enable password store extensions
+export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
 
 # Refresh gpg-agent tty in case user switches into an X session
 gpg-connect-agent updatestartuptty /bye >/dev/null