diff --git a/custom/zsh/README.markdown b/custom/zsh/README.markdown
new file mode 100644
index 0000000..e69de29
diff --git a/zsh/zshrc b/zsh/zshrc
index 88775bd..913d4c9 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,34 +1,50 @@
+# --------------------------------
+#
+# DO NOT EDIT THIS FILE.
+# If you want to make changes, do so in the custom/zsh directory.
+# Fork and send pull requests to add features and fix bugs. Thanks!
+#
+# ================================
+
+# Don't change. The following determines where YADR is installed.
+yadr=`find -L ~ -type file -maxdepth 2 -name .yadr | head | sed 's:\.yadr\/::'`
+
 # Source oh-my-zsh if it is installed.
 if [[ -d $HOME/.oh-my-zsh ]]; then
   # Path to your oh-my-zsh configuration.
   ZSH=$HOME/.oh-my-zsh
 
   # Set name of the theme to load.
-  ZSH_THEME="skwp"
+  ZSH_THEME="robbyrussell"
 
-  # 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 rvm ruby rails autojump)
+  # Default plugins.
+  plugins=(brew git github ruby)
 
-  # Load default oh-my-zsh stuff
+  # source every zsh file in user's custom/zsh/before. This is useful for setting theme and plugins.
+  if [[ -d $yadr/custom/zsh/before/ ]]; then
+    for config_file ($yadr/custom/zsh/before/**/*.zsh) source $config_file
+  fi
+
+  # Source oh-my-zsh
   source $ZSH/oh-my-zsh.sh
 fi
 
-# Don't change. The following determines where YADR is installed.
-yadr=`find -L ~ -type file -maxdepth 2 -name .yadr | head | sed 's:\.yadr\/::'`
-
 # Configuration
 source $yadr/zsh/aliases
 source $yadr/zsh/zsh_aliases
 
-# Things I don't want to publish to github
-source ~/.secrets
+# ------------------
+# zsh/after
+# ==================
+# source every zsh file in user's custom/zsh/after.
+if [[ -d $yadr/custom/zsh/after/ ]]; then
+  for config_file ($yadr/custom/zsh/after/**/*.zsh) source $config_file
+fi
 
-# Vim mode
-bindkey -v
-
-# Give me my bash style incremental search
-bindkey '^R' history-incremental-search-backward
+# Put secret configuration settings in ~/.secrets
+if [[ -a ~/.secrets ]] then
+  source ~/.secrets
+fi
 
 # Speed up git completion
 # http://talkings.org/post/5236392664/zsh-and-slow-git-completion
@@ -36,16 +52,3 @@ __git_files () {
   _wanted files expl 'local files' _files
 }
 
-# Always pushd when changing directory
-setopt auto_pushd
-
-# Fuzzy matching of completions for when you mistype them:
-zstyle ':completion:*' completer _complete _match _approximate
-zstyle ':completion:*:match:*' original only
-zstyle ':completion:*:approximate:*' max-errors 1 numeric
-
-# RVM
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-
-# Add path to our custom bins
-export PATH=$PATH:$yadr/bin:$yadr/bin/yadr