diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 6ef75ac0c..d7a9efe50 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -62,10 +62,18 @@ 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
+if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi
 if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
-unsetopt correctall
 
 # source .profile is any (proxy settings,...)
 [ -f $HOME/.profile ] && source $HOME/.profile
 
 [ "$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 fe4ec0eba..b0b215011 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -40,12 +40,15 @@ source $ZSH/oh-my-zsh.sh
 
 zstyle ':completion:*:descriptions' format '%B%d%b'
 
-# Customize to your needs...
+# Aliases
+alias ta='tmux attach -t'
+alias tl='tmux list-session'
+alias ts='tmux new-session'
 
-if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
-if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
 
-if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+source $ZSH/oh-my-zsh.sh
 unsetopt correctall
 
 if [ -e ~/.profile ]; then source ~/.profile; fi
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 174537534..1c7d5eaae 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -50,7 +50,6 @@ plugins=(git)
 source $ZSH/oh-my-zsh.sh
 
 zstyle ':completion:*:descriptions' format '%B%d%b'
-
 # User configuration
 
 export PATH=$HOME/bin:/usr/local/bin:$PATH
@@ -73,4 +72,4 @@ if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
 
 if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
-unsetopt correctall
+unsetopt correctall
\ No newline at end of file