diff --git a/clone_and_link_mac.sh b/clone_and_link_mac.sh
new file mode 100755
index 0000000..6d4c087
--- /dev/null
+++ b/clone_and_link_mac.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+#
+# clone_and_link.sh
+# Copyright (C) 2016 fabian <fabian@fabi-laptop-arch>
+#
+# Distributed under terms of the MIT license.
+#
+
+
+git submodule update --init --recursive
+echo "ln -s $PWD/vim $HOME/.vim"
+ln -sv $PWD/vim $HOME/.vim
+ln -sv ~/.vim/.vimrc $HOME/.vimrc
+ln -sv $PWD/zsh $HOME/.zsh
+ln -sv ~/.zsh/.zshrc $HOME/.zshrc
+ln -sv $PWD/tmux $HOME/.tmux
+ln -sv ~/.tmux/.tmux.conf $HOME/.tmux.conf
+
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 04a9e7c..800a2bb 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -6,7 +6,8 @@ set -g history-limit 999999999
 unbind C-b
 set-option -g prefix C-a
 bind-key C-a send-prefix
-bind-key -n C-b send-prefix
+bind-key -n C-b send-keys C-b
+#bind-key -n C-b send-prefix
 
 setw -g mode-keys vi
 set-option -g status-keys vi
diff --git a/vim/.vimrc b/vim/.vimrc
index ecb2059..e0eeb36 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -185,7 +185,7 @@ nmap <C-]> <C-w><C-]><C-w>T
 let g:ycm_collect_identifiers_from_tags_files = 1 " Read from tag files
 let g:ycm_global_ycm_extra_conf = '~/.vim/.ycm_extra_conf.py' " Standard conf
 let g:ycm_enable_diagnostic_signs = 0 " Do not show semantic error bar
-let g:ycm_server_python_interpreter = '/usr/bin/python2'
+let g:ycm_server_python_interpreter = '/usr/bin/python'
 let g:ycm_key_list_select_completion   = ['<C-j>', '<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-k>', '<C-p>', '<Up>']
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9e70254..771a5d2 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,5 +1,6 @@
 # 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
@@ -28,7 +29,7 @@ antigen theme bhilburn/powerlevel9k powerlevel9k
 
 antigen bundle git
 antigen bundle heroku
-antigen bundle command-not-found
+#antigen bundle command-not-found
 antigen bundle go
 
 # antigen bundle tmuxinator
@@ -48,3 +49,7 @@ antigen bundle virtualenv
 antigen apply
 alias vim=nvim
 export EDITOR='nvim'
+export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
+
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
diff --git a/zsh/antigen b/zsh/antigen
index 1359b99..74aa897 160000
--- a/zsh/antigen
+++ b/zsh/antigen
@@ -1 +1 @@
-Subproject commit 1359b9966689e5afb666c2c31f5ca177006ce710
+Subproject commit 74aa89757038e42d472db22cb5b5bc6cbd4edb93