diff --git a/.gitmodules b/.gitmodules
index 00d10ec..e4266e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "vim/bundle/gundo"]
 	path = vim/bundle/gundo
 	url = git://github.com/sjl/gundo.vim
+[submodule "oh-my-zsh"]
+	path = oh-my-zsh
+	url = git://github.com/robbyrussell/oh-my-zsh
diff --git a/oh-my-zsh b/oh-my-zsh
new file mode 160000
index 0000000..757fa33
--- /dev/null
+++ b/oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit 757fa3314d1c041ab715dbda838f3e9b2ff9ce17
diff --git a/zshrc b/zshrc
index 7ed7f3b..146ce70 100644
--- a/zshrc
+++ b/zshrc
@@ -1,18 +1,34 @@
-HISTFILE=~/.histfile
-HISTSIZE=1000
-SAVEHIST=1000
-bindkey -v
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/dotfiles/oh-my-zsh
 
-zstyle :compinstall filename '/home/dustinswan/.zshrc'
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="robbyrussell"
 
-autoload -Uz compinit && compinit
-# zstyle ':completion:*' menu select
-# setopt completealiases
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
 
-alias vi=vim
-# alias grep='grep --color=auto'
-# alias ls='ls --color=auto'
+# Comment this out to disable weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+COMPLETION_WAITING_DOTS="true"
 
-# export TERM="xterm-256color"
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git archlinux brew github npm vi-mode node osx)
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
+alias vi=vim
 export TERM="screen-256color"
 export EDITOR=vim