diff --git a/.zshrc b/.zshrc
index 38a3ef75..19dd5bae 100644
--- a/.zshrc
+++ b/.zshrc
@@ -51,13 +51,6 @@ DISABLE_AUTO_UPDATE="true"
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(colored-man)
 
-# User configuration
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
-if [ -e ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]
-then
-source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-fi
-
 # Extend my $PATH to $PATH/bin
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH:$HOME/bin
 
@@ -65,35 +58,17 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH:$HOME/bin
 HISTSIZE=100000
 SAVEHIST=100000
 HISTFILE=~/.zsh_history
-
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# Load oh-my-zsh stuff
 source $ZSH/oh-my-zsh.sh
 
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# ssh
-# export SSH_KEY_PATH="~/.ssh/dsa_id"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
+# Stuff thats needs to be done after sourcing oh-my-zsh
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
+if [ -e ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]
+then
+source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi
 
 # Now source some stuff that should not be public
 if [ -e ~/.zshprivate ]