diff --git a/link_config.sh b/link_config.sh
index 0cdaa76..8334c3b 100755
--- a/link_config.sh
+++ b/link_config.sh
@@ -9,3 +9,5 @@
 for filename in .config/*; do
     ln -Ts $PWD/$filename $HOME/$filename
 done
+
+ln -Ts $PWD/nvim $HOME/.config/nvim
diff --git a/nvim/init.vim b/nvim/init.vim
index 5ca889a..22604e3 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -154,7 +154,7 @@ set ignorecase
 set smartcase
 
 " Line wrapping
-set tw=120 " set textwidth of 80 characters
+set tw=100 " set textwidth of 100 characters
 set formatoptions-=t " Don't wrap code
 set formatoptions+=c " Wrap comments
 set formatoptions+=mB " Don't break multibyte characters
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 800a2bb..7dd9453 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,3 +1,4 @@
+set-environment -g PATH "/usr/local/bin:/bin:/usr/bin"
 set -g default-terminal "screen-256color"
 
 set -g history-limit 999999999
@@ -81,4 +82,4 @@ set -g @themepack 'powerline/double/red'
 # set -g @plugin 'git@bitbucket.com/user/plugin'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run '~/.tmux/plugins/tpm/tpm >> /tmp/tpm_out 2>&1 >> /tmp/tpm_out'
+run '~/.tmux/plugins/tpm/tpm' # >> /tmp/tpm_out 2>&1 >> /tmp/tpm_out'
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
index 95f7833..26d9ace 160000
--- a/tmux/plugins/tpm
+++ b/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 95f78336c3972f3e6648b7b3db754f2224320a5e
+Subproject commit 26d9ace1b47f4591b2afdf333442a498311b6ace
diff --git a/zsh/.mac_config.example b/zsh/.mac_config.example
new file mode 100644
index 0000000..6a218b9
--- /dev/null
+++ b/zsh/.mac_config.example
@@ -0,0 +1,13 @@
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+export POWERLINE_CONFIG_COMMAND=/usr/local/bin/powerline-config
+export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+
+# Set path to work with pycharm ...
+[[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
+PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
+# Research
+export PATH="/Users/fabian/Labor/Research/code_signing/02-tools:$PATH"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 64f07e6..5396a10 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,7 +1,3 @@
-# Set path to work with pycharm ...
-[[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
-PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
-
 [[ -f ~/.zsh/.powerline_config ]] && source ~/.zsh/.powerline_config
 [[ -f ~/.zsh/.user_config ]] && source ~/.zsh/.user_config
 [[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh
@@ -32,6 +28,7 @@ antigen bundle go
 # antigen bundle tmuxinator
 antigen bundle zsh-users/zsh-syntax-highlighting
 antigen bundle zsh-users/zsh-autosuggestions
+antigen bundle urbainvaes/fzf-marks
 
 # For SSH, starting ssh-agent is annoying
 antigen bundle ssh-agent
@@ -43,8 +40,11 @@ antigen bundle virtualenv
 
 antigen bundle virtualenv
 
+antigen bundle "greymd/docker-zsh-completion"
+
 antigen apply
 alias vim=nvim
+alias sudo='sudo '
 export EDITOR='nvim'
 export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
 
@@ -56,3 +56,5 @@ PERL5LIB="/home/fabian/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LI
 PERL_LOCAL_LIB_ROOT="/home/fabian/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
 PERL_MB_OPT="--install_base \"/home/fabian/perl5\""; export PERL_MB_OPT;
 PERL_MM_OPT="INSTALL_BASE=/home/fabian/perl5"; export PERL_MM_OPT;
+alias ls="ls --color=always"
+alias delzip="unzip -Z -1 MacDown.app.zip |  xargs -I{} rm -rv {}"