diff --git a/README.md b/README.md
index 66e2efa..7f39e11 100644
--- a/README.md
+++ b/README.md
@@ -109,14 +109,14 @@ If that doesn't work, move the OSX supplied ctags [like so](http://www.mattpolit
 sudo mv /usr/bin/ctags /usr/bin/ctags_original
 ```
 
-### [oh-my-zsh](https://github.com/sorin-ionescu/prezto)
+### [Prezto](https://github.com/sorin-ionescu/prezto)
 
 ```bash
 git clone --recursive git://github.com/sorin-ionescu/prezto.git ~/.oh-my-zsh
 ```
 
-We prefer the @sorin-ionescu rewrite of Oh My Zsh. It will eventually be shipped
-as a submodule of YADR, although you can use the original @robbyrussell version as well.
+For a more complete Zsh experience we use **[Prezto](http://github.com/sorin-ionescu/prezto)**. It will eventually be shipped
+as a submodule of YADR.
 
 You only need to do the one command above. The rest of the installation is done
 by YADR, which ships with a tie-in to sorin's OMZ.
@@ -127,6 +127,10 @@ fasd gives you handy shell commands `f`,`a`,`s`,`d`, and `z` to jump to recently
 Read more at the project's home page. Or just type `z` followed by a partial reference to
 a recent directory to see how it works.
 
+```bash
+brew install fasd
+```
+
 ## Installation
 
 Installation is automated via `rake` and the `yadr` command. To get
@@ -559,7 +563,7 @@ and other places for the cream of the crop of vim awesomeness.
  * https://github.com/tpope
  * https://github.com/scrooloose
  * https://github.com/kana
- * https://github.com/robbyrussell
+ * https://github.com/sorin-ionescu
  * https://github.com/nelstrom
 
 And everything that's in the modules included in vim/bundle of course.
@@ -570,6 +574,7 @@ Please explore these people's work.
 
  * Initial Version: @skwp
  * Cleanup, auto installer: @kylewest
+ * Switch from oh-my-zsh to Presto: @JeanMertz
 
 
 ### For more tips and tricks
diff --git a/Rakefile b/Rakefile
index afe1d59..6dfa6ce 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,11 +55,7 @@ end
 
 task :zsh_themes do
   if File.exist?("#{ENV['HOME']}/.oh-my-zsh/modules/prompt/functions")
-    puts "Detected prezto (oh-my-zsh @sorin-ionescu)."
     run %{ ln -nfs #{ENV["PWD"]}/oh-my-zsh/modules/prompt/functions/* $HOME/.oh-my-zsh/modules/prompt/functions/ } if want_to_install?('zsh themes')
-  elsif File.exist?("#{ENV['HOME']}/.oh-my-zsh")
-    puts "Detected oh-my-zsh @robbyrussell."
-    run %{ ln -nfs #{ENV["PWD"]}/oh-my-zsh/themes/* $HOME/.oh-my-zsh/themes/ } if want_to_install?('zsh themes')
   end
 end
 
diff --git a/oh-my-zsh/README b/oh-my-zsh/README
deleted file mode 100644
index 19c247f..0000000
--- a/oh-my-zsh/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The themes/ dir contains themes for oh-my-zsh Robby,
-while modules contains themes for oh-my-zsh Sorin Ionescu.
-
-The themes dir will eventually be deprecated in favor
-of Sorin's OMZ branch.
-
-See more at: https://github.com/sorin-ionescu/oh-my-zsh
diff --git a/oh-my-zsh/themes/kylewest.png b/oh-my-zsh/themes/kylewest.png
deleted file mode 100644
index d200b9a..0000000
Binary files a/oh-my-zsh/themes/kylewest.png and /dev/null differ
diff --git a/oh-my-zsh/themes/kylewest.zsh-theme b/oh-my-zsh/themes/kylewest.zsh-theme
deleted file mode 100644
index fd07546..0000000
--- a/oh-my-zsh/themes/kylewest.zsh-theme
+++ /dev/null
@@ -1,30 +0,0 @@
-function zle-line-init zle-keymap-select {
-    zle reset-prompt
-}
-zle -N zle-line-init
-zle -N zle-keymap-select
-
-bindkey -v
-
-local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}- %{$fg[yellow]%}["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$fg[yellow]%}"
-
-ZSH_THEME_VI_MODE_COMMAND="%{$fg_bold[magenta]%}<#%{$reset_color%}"
-ZSH_THEME_VI_MODE_INSERT="%{$fg_bold[green]%}$>%{$reset_color%}"
-
-vi_mode_prompt_info () {
-  if [[ ${KEYMAP} = 'vicmd' ]]
-  then
-    echo $ZSH_THEME_VI_MODE_COMMAND
-  else
-    echo $ZSH_THEME_VI_MODE_INSERT
-  fi
-}
-
-PROMPT='%{$fg[green]%}%c $(git_prompt_info)$(vi_mode_prompt_info) '
-PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
-RPS1='%{$fg[blue]%}%~%{$reset_color%} ${return_code} '
diff --git a/oh-my-zsh/themes/skwp.zsh-theme b/oh-my-zsh/themes/skwp.zsh-theme
deleted file mode 100644
index 0d93775..0000000
--- a/oh-my-zsh/themes/skwp.zsh-theme
+++ /dev/null
@@ -1,24 +0,0 @@
-# Simple theme with RVM prompt
-function preexec() {
-    typeset -gi CALCTIME=1
-    typeset -gi CMDSTARTTIME=SECONDS
-}
-function precmd() {
-    if (( CALCTIME )) ; then
-        typeset -gi ETIME=SECONDS-CMDSTARTTIME
-    fi
-    typeset -gi CALCTIME=0
-}
-function safe-rvm-prompt() {
-  if [[ -d ~/.rvm/ ]]; then
-    rvm-prompt
-  fi
-}
-
-PROMPT='%{$fg[blue]%}%~%{$fg_bold[yellow]%}$(git_prompt_info)%{$reset_color%}%{$fg[blue]%}➤ %{$reset_color%}'
-RPROMPT='%{$fg[blue]%}$(safe-rvm-prompt i v p g)  [${ETIME}s] %{$reset_color%}'
-
-ZSH_THEME_GIT_PROMPT_PREFIX=" "
-ZSH_THEME_GIT_PROMPT_SUFFIX=" "
-ZSH_THEME_GIT_PROMPT_DIRTY=" ✗"
-ZSH_THEME_GIT_PROMPT_CLEAN=" ✔"
diff --git a/oh-my-zsh/modules/prompt/functions/prompt_skwp_setup b/prezto/modules/prompt/functions/prompt_skwp_setup
similarity index 100%
rename from oh-my-zsh/modules/prompt/functions/prompt_skwp_setup
rename to prezto/modules/prompt/functions/prompt_skwp_setup
diff --git a/zsh/omz-sorin/omz-sorin.zsh b/zsh/prezto/prezto.zsh
similarity index 100%
rename from zsh/omz-sorin/omz-sorin.zsh
rename to zsh/prezto/prezto.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
index 87061ca..983f9ba 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -26,12 +26,8 @@ if [[ -d $HOME/.oh-my-zsh ]]; then
     for config_file ($yadr/custom/zsh/before/*) source $config_file
   fi
 
-  # Figure out if we have Robby's or Sorin's Oh-my-zsh
-  if [[ -f $ZSH/oh-my-zsh.sh ]]; then
-    source $ZSH/oh-my-zsh.sh # OMZ Robby Russell (https://github.com/robbyrussell/oh-my-zsh)
-  else
-    source $yadr/zsh/omz-sorin/omz-sorin.zsh # OMZ Sorin Ionescu (https://github.com/sorin-ionescu/oh-my-zsh)
-  fi
+  # Prezto (https://github.com/sorin-ionescu/prezto)
+  source $yadr/zsh/prezto/prezto.zsh
 fi
 
 # Configuration