diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 0a1e264b7..e3caafa37 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -33,15 +33,21 @@ DISABLE_VENV_CD="1"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git tmux debian python pythonbrew vim-override virtualenvwrapper)
-
-source $ZSH/oh-my-zsh.sh
+plugins=(git tmux debian python virtualenvwrapper)
 
 # Customize to your needs...
 if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
 if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
 if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
-unsetopt correctall
+if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
 
 [ "$TERM" = "xterm" ] && TERM="xterm-256color"
+
+# Aliases
+alias ta='tmux attach -t'
+alias tl='tmux list-session'
+alias ts='tmux new-session'
+
+source $ZSH/oh-my-zsh.sh
+unsetopt correctall
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index 0299b62c8..961c00908 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -33,15 +33,13 @@ DISABLE_VENV_CD="1"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git postgres python pythonbrew vim-override virtualenvwrapper)
+plugins=(git postgres tmux python vim-override virtualenvwrapper)
 
 # User configuration
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 export EDITOR='vim'
 
-# tmux configuration
-export ZSH_TMUX_AUTOCONNECT=false
-export ZSH_TMUX_ITERM2=true
+# Aliases
 alias ta='tmux attach -t'
 alias tl='tmux list-session'
 alias ts='tmux new-session'