diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0b5f63689..61431ea8d 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -36,6 +36,7 @@ alias lsa='ls -lah'
 #alias l='ls -la'
 alias ll='ls -l'
 alias la='ls -lA'
+alias l=la
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
diff --git a/plugins/vim-override/vim-override.plugin.zsh b/plugins/vim-override/vim-override.plugin.zsh
index e92ffbab0..ec5f6bbc6 100644
--- a/plugins/vim-override/vim-override.plugin.zsh
+++ b/plugins/vim-override/vim-override.plugin.zsh
@@ -1,7 +1,7 @@
 # try to replace OSX's default vim by MacVim's version
-RECENTVIM=`test -e /usr/local/Cellar/macvim && find /usr/local/Cellar/macvim -name Vim`
+MACVIM="/usr/local/bin/mvim"
 
 # if mode indicator wasn't setup by theme, define default
-if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then
-  alias vim="$RECENTVIM"
+if [[ "$OSTYPE" == darwin* && -e $MACVIM ]]; then
+  alias vim="$MACVIM -v"
 fi
diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 9c0633dcc..845c90e53 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -32,12 +32,17 @@ DISABLE_VENV_CD="true"
 # 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 python repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract common-aliases)
+plugins=(git python cp rsync git-remote-branch command-not-found debian dircycle encode64 lol extract common-aliases)
 
 source $ZSH/oh-my-zsh.sh
-# source `which virtualenvwrapper.sh`
 
 # Customize to your needs...
+zstyle ':completion:*:descriptions' format '%B%d%b'
+
+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
+
+[ "$TERM" = "xterm" ] && TERM="xterm-256color"
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c867871db..2a79e180d 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -27,7 +27,7 @@ DISABLE_AUTO_UPDATE="true"
 # DISABLE_AUTO_TITLE="true"
 
 # Uncomment following line if you want to disable command autocorrection
-# DISABLE_CORRECTION="true"
+DISABLE_CORRECTION="true"
 
 # Uncomment following line if you want red dots to be displayed while waiting for completion
 # COMPLETION_WAITING_DOTS="true"
@@ -40,10 +40,9 @@ DISABLE_AUTO_UPDATE="true"
 # 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 python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases vim-scp)
+plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
-source `which virtualenvwrapper.sh`
 
 zstyle ':completion:*:descriptions' format '%B%d%b'
 
@@ -53,6 +52,3 @@ if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
 if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
 unsetopt correctall
-
-# Themes override ls alias from aliases.zsh
-alias tmux='tmux -u2'