From fb9a20591f72b967d35bff6b1e2c27bb508f6f3e Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 3 Sep 2012 16:08:39 -0400
Subject: [PATCH] [Fix #197] Rebrand as Prezto

Conflicts:
	README.md
	runcoms/zshenv
---
 README.md                                    | 36 +++++-----
 helper.zsh                                   | 50 ++++++-------
 init.zsh                                     | 21 +++---
 modules/archive/README.md                    |  2 +-
 modules/command-not-found/README.md          |  2 +-
 modules/completion/README.md                 |  2 +-
 modules/completion/init.zsh                  |  2 +-
 modules/directory/README.md                  |  2 +-
 modules/dpkg/README.md                       |  2 +-
 modules/editor/init.zsh                      | 34 ++++-----
 modules/environment/README.md                |  2 +-
 modules/environment/init.zsh                 |  4 +-
 modules/git/functions/git-info               | 74 ++++++++++----------
 modules/gnu-utility/README.md                |  4 +-
 modules/gnu-utility/init.zsh                 |  2 +-
 modules/gpg-agent/README.md                  |  2 +-
 modules/haskell/README.md                    |  2 +-
 modules/history-substring-search/README.md   |  8 +--
 modules/history-substring-search/init.zsh    |  8 +--
 modules/history/README.md                    |  2 +-
 modules/macports/README.md                   |  2 +-
 modules/node/README.md                       |  2 +-
 modules/osx/README.md                        |  2 +-
 modules/pacman/README.md                     |  6 +-
 modules/pacman/init.zsh                      |  2 +-
 modules/pacman/yaourt.zsh                    |  2 +-
 modules/perl/README.md                       |  2 +-
 modules/prompt/README.md                     |  4 +-
 modules/prompt/functions/prompt_sorin_setup  | 36 +++++-----
 modules/prompt/functions/prompt_steeef_setup |  2 +-
 modules/prompt/init.zsh                      |  2 +-
 modules/python/README.md                     |  4 +-
 modules/python/functions/python-info         |  2 +-
 modules/rails/README.md                      |  2 +-
 modules/rsync/README.md                      |  2 +-
 modules/ruby/README.md                       |  2 +-
 modules/screen/README.md                     |  4 +-
 modules/screen/init.zsh                      |  2 +-
 modules/ssh-agent/README.md                  |  6 +-
 modules/ssh-agent/init.zsh                   |  4 +-
 modules/syntax-highlighting/README.md        |  8 +--
 modules/syntax-highlighting/init.zsh         |  6 +-
 modules/terminal/README.md                   |  4 +-
 modules/terminal/init.zsh                    |  4 +-
 modules/tmux/README.md                       | 10 +--
 modules/tmux/init.zsh                        |  4 +-
 modules/trap/README.md                       |  2 +-
 modules/utility/README.md                    | 10 +--
 modules/utility/functions/diff               |  2 +-
 modules/utility/functions/make               |  2 +-
 modules/utility/functions/wdiff              |  2 +-
 modules/utility/init.zsh                     |  6 +-
 modules/wakeonlan/README.md                  |  2 +-
 modules/yum/README.md                        |  2 +-
 modules/z/README.md                          |  4 +-
 runcoms/README.md                            |  4 +-
 runcoms/zshenv                               |  5 +-
 runcoms/zshrc                                | 26 +++----
 58 files changed, 229 insertions(+), 225 deletions(-)

diff --git a/README.md b/README.md
index cab3ed05..617d086b 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,36 @@
-Oh My Zsh
-=========
+Prezto — Instantly Awesome Zsh
+==============================
 
-OMZ is a configuration framework for [Zsh][1] that enriches the command line
+Prezto is the configuration framework for [Zsh][1]; it enriches the command line
 interface environment with sane defaults, aliases, functions, auto completion,
 and prompt themes.
 
 Installation
 ------------
 
-Oh My Zsh will work with any recent release of Zsh, but the minimum recommended
+Prezto will work with any recent release of Zsh, but the minimum recommended
 version is 4.3.10.
 
-  1. Clone the repository:
+  1. Launch Zsh:
 
-        git clone --recursive https://github.com/sorin-ionescu/prezto.git ~/.oh-my-zsh
+        zsh
 
-  2. Create a new Zsh configuration by copying the Zsh configuration file
-     runcoms provided:
+  2. Clone the repository:
 
-        for rcfile in ~/.oh-my-zsh/runcoms/z{shenv,shrc,login,logout}; do
-          cp -f $rcfile ~/.$rcfile:t
+        git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+
+  3. Create a new Zsh configuration by copying the Zsh configuration files
+     provided:
+
+        for rcfile in "${ZDOTDIR:-$HOME}/.zprezto/runcoms/z"{shenv,shrc,login,logout}; do
+          cp -f "$rcfile" "$ZDOTDIR/.$rcfile:t"
         done
 
-  3. Set Zsh as your default shell:
+  4. Set Zsh as your default shell:
 
         chsh -s /bin/zsh
 
-  4. Open a new Zsh terminal window or tab.
+  5. Open a new Zsh terminal window or tab.
 
 ### Mac OS X
 
@@ -49,14 +53,14 @@ directories end up at the tail of the array.
 
 ### Troubleshooting
 
-If you are not able to find certain commands after switching to *Oh My Zsh*,
+If you are not able to find certain commands after switching to *Prezto*,
 modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
 window or tab.
 
 Usage
 -----
 
-Oh My Zsh has many features disabled by default. Read the source code and
+Prezto has many features disabled by default. Read the source code and
 accompanying README files to learn of what is available.
 
 ### Modules
@@ -149,14 +153,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 [1]: http://www.zsh.org
-[2]: http://i.imgur.com/aipDQ.png "sorin theme"
+[2]: http://i.imgur.com/4CeOj.png "sorin theme"
 [3]: http://git-scm.com
 [4]: https://github.com
 [5]: http://gitimmersion.com
 [6]: http://gitref.org
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html
-[9]: https://github.com/sorin-ionescu/oh-my-zsh/contributors
+[9]: https://github.com/sorin-ionescu/prezto/contributors
 [10]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
 [11]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [12]: https://help.github.com/articles/using-pull-requests
diff --git a/helper.zsh b/helper.zsh
index ef152599..0682d252 100644
--- a/helper.zsh
+++ b/helper.zsh
@@ -30,62 +30,62 @@ function autoloadable {
   ( unfunction $1 ; autoload -U +X $1 ) &> /dev/null
 }
 
-# Loads Oh My Zsh modules.
-function omodload {
-  local -a omodules
-  local omodule
-  local ofunction_glob='^([_.]*|prompt_*_setup|README*)(.N:t)'
+# Loads Prezto modules.
+function pmodload {
+  local -a pmodules
+  local pmodule
+  local pfunction_glob='^([_.]*|prompt_*_setup|README*)(.N:t)'
 
   # $argv is overridden in the anonymous function.
-  omodules=("$argv[@]")
+  pmodules=("$argv[@]")
 
   # Add functions to $fpath.
-  fpath=(${omodules:+${OMZ}/modules/${^omodules}/functions(/FN)} $fpath)
+  fpath=(${pmodules:+${PREZTO}/modules/${^pmodules}/functions(/FN)} $fpath)
 
   function {
-    local ofunction
+    local pfunction
 
     # Extended globbing is needed for listing autoloadable function directories.
     setopt LOCAL_OPTIONS EXTENDED_GLOB
 
-    # Load Oh My Zsh functions.
-    for ofunction in $OMZ/modules/${^omodules}/functions/$~ofunction_glob; do
-      autoload -Uz "$ofunction"
+    # Load Prezto functions.
+    for pfunction in $PREZTO/modules/${^pmodules}/functions/$~pfunction_glob; do
+      autoload -Uz "$pfunction"
     done
   }
 
-  # Load Oh My Zsh modules.
-  for omodule in "$omodules[@]"; do
-    if zstyle -t ":omz:module:$omodule" loaded; then
+  # Load Prezto modules.
+  for pmodule in "$pmodules[@]"; do
+    if zstyle -t ":prezto:module:$pmodule" loaded; then
       continue
-    elif [[ ! -d "$OMZ/modules/$omodule" ]]; then
-      print "$0: no such module: $omodule" >&2
+    elif [[ ! -d "$PREZTO/modules/$pmodule" ]]; then
+      print "$0: no such module: $pmodule" >&2
       continue
     else
-      if [[ -s "$OMZ/modules/$omodule/init.zsh" ]]; then
-        source "$OMZ/modules/$omodule/init.zsh"
+      if [[ -s "$PREZTO/modules/$pmodule/init.zsh" ]]; then
+        source "$PREZTO/modules/$pmodule/init.zsh"
       fi
 
       if (( $? == 0 )); then
-        zstyle ":omz:module:$omodule" loaded 'yes'
+        zstyle ":prezto:module:$pmodule" loaded 'yes'
       else
         # Remove the $fpath entry.
-        fpath[(r)$OMZ/modules/${omodule}/functions]=()
+        fpath[(r)$PREZTO/modules/${pmodule}/functions]=()
 
         function {
-          local ofunction
+          local pfunction
 
           # Extended globbing is needed for listing autoloadable function
           # directories.
           setopt LOCAL_OPTIONS EXTENDED_GLOB
 
-          # Unload Oh My Zsh functions.
-          for ofunction in $OMZ/modules/$omodule/functions/$~ofunction_glob; do
-            unfunction "$ofunction"
+          # Unload Prezto functions.
+          for pfunction in $PREZTO/modules/$pmodule/functions/$~pfunction_glob; do
+            unfunction "$pfunction"
           done
         }
 
-        zstyle ":omz:module:$omodule" loaded 'no'
+        zstyle ":prezto:module:$pmodule" loaded 'no'
       fi
     fi
   done
diff --git a/init.zsh b/init.zsh
index 9b466450..7e74bbd5 100644
--- a/init.zsh
+++ b/init.zsh
@@ -1,40 +1,39 @@
 #
-# Initializes Oh My Zsh.
+# Initializes Prezto.
 #
 # Authors:
-#   Robby Russell <robby@planetargon.com>
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
 # Check for the minimum supported version.
 min_zsh_version='4.3.10'
 if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
-  print "omz: old shell detected, minimum required: $min_zsh_version" >&2
+  print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
   return 1
 fi
 unset min_zsh_version
 
 # Disable color and theme in dumb terminals.
 if [[ "$TERM" == 'dumb' ]]; then
-  zstyle ':omz:*:*' color 'no'
-  zstyle ':omz:module:prompt' theme 'off'
+  zstyle ':prezto:*:*' color 'no'
+  zstyle ':prezto:module:prompt' theme 'off'
 fi
 
 # Load Zsh modules.
-zstyle -a ':omz:load' zmodule 'zmodules'
+zstyle -a ':prezto:load' zmodule 'zmodules'
 for zmodule ("$zmodules[@]") zmodload "zsh/${(z)zmodule}"
 unset zmodule{s,}
 
 # Autoload Zsh functions.
-zstyle -a ':omz:load' zfunction 'zfunctions'
+zstyle -a ':prezto:load' zfunction 'zfunctions'
 for zfunction ("$zfunctions[@]") autoload -Uz "$zfunction"
 unset zfunction{s,}
 
 # Source files (the order matters).
 source "${0:h}/helper.zsh"
 
-# Source modules defined in ~/.zshrc.
-zstyle -a ':omz:load' omodule 'omodules'
-omodload "$omodules[@]"
-unset omodules
+# Source Prezto modules defined in ~/.zshrc.
+zstyle -a ':prezto:load' pmodule 'pmodules'
+pmodload "$pmodules[@]"
+unset pmodules
 
diff --git a/modules/archive/README.md b/modules/archive/README.md
index c997ddb2..398d0037 100644
--- a/modules/archive/README.md
+++ b/modules/archive/README.md
@@ -37,5 +37,5 @@ Authors
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/command-not-found/README.md b/modules/command-not-found/README.md
index c92e66d2..91a67f25 100644
--- a/modules/command-not-found/README.md
+++ b/modules/command-not-found/README.md
@@ -11,5 +11,5 @@ Authors
   - [Joseph Booker](https://github.com/sargas)
 
 [1]: https://code.launchpad.net/command-not-found
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/completion/README.md b/modules/completion/README.md
index 1cee4244..83034b5d 100644
--- a/modules/completion/README.md
+++ b/modules/completion/README.md
@@ -20,5 +20,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/zsh-users/zsh-completions
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh
index 230dcd35..9b214a0d 100644
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@@ -42,7 +42,7 @@ zstyle ':completion::complete:*' use-cache on
 zstyle ':completion::complete:*' cache-path "$HOME/.zcompcache"
 
 # Case-insensitive (all), partial-word, and then substring completion.
-if zstyle -t ':omz:module:completion:*' case-sensitive; then
+if zstyle -t ':prezto:module:completion:*' case-sensitive; then
   zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
   setopt CASE_GLOB
 else
diff --git a/modules/directory/README.md b/modules/directory/README.md
index 59a8698e..6572bb72 100644
--- a/modules/directory/README.md
+++ b/modules/directory/README.md
@@ -32,5 +32,5 @@ Authors
   - [James Cox](https://github.com/imajes)
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/dpkg/README.md b/modules/dpkg/README.md
index 6824b8dc..d871f599 100644
--- a/modules/dpkg/README.md
+++ b/modules/dpkg/README.md
@@ -38,5 +38,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://wiki.debian.org/Teams/Dpkg
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 5e6295c1..24323cca 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -8,36 +8,36 @@
 #   To enable key bindings, add the following to zshrc, and replace 'map' with
 #   'emacs' or 'vi.
 #
-#     zstyle ':omz:module:editor' keymap 'map'
+#     zstyle ':prezto:module:editor' keymap 'map'
 #
 #   To enable the auto conversion of .... to ../.., add the following to zshrc.
 #
-#     zstyle ':omz:module:editor' dot-expansion 'yes'
+#     zstyle ':prezto:module:editor' dot-expansion 'yes'
 #
 #   To indicate when the editor is in the primary keymap (emacs or viins), add
 #   the following to your theme prompt setup function.
 #
-#     zstyle ':omz:module:editor:keymap' primary '>>>'
+#     zstyle ':prezto:module:editor:keymap' primary '>>>'
 #
 #   To indicate when the editor is in the primary keymap (emacs or viins) insert
 #   mode, add the following to your theme prompt setup function.
 #
-#     zstyle ':omz:module:editor:keymap:primary' insert 'I'
+#     zstyle ':prezto:module:editor:keymap:primary' insert 'I'
 #
 #   To indicate when the editor is in the primary keymap (emacs or viins)
 #   overwrite mode, add the following to your theme prompt setup function.
 #
-#     zstyle ':omz:module:editor:keymap:primary' overwrite 'O'
+#     zstyle ':prezto:module:editor:keymap:primary' overwrite 'O'
 #
 #   To indicate when the editor is in the alternate keymap (vicmd), add the
 #   following to your theme prompt setup function.
 #
-#     zstyle ':omz:module:editor:keymap' alternate '<<<'
+#     zstyle ':prezto:module:editor:keymap' alternate '<<<'
 #
 #   To indicate when the editor is completing, add the following to your theme
 #   prompt setup function.
 #
-#     zstyle ':omz:module:editor' completing '...'
+#     zstyle ':prezto:module:editor' completing '...'
 #
 
 # Return if requirements are not found.
@@ -96,7 +96,7 @@ key_info=(
 # Do not bind any keys if there are empty values in $key_info.
 for key in "$key_info[@]"; do
   if [[ -z "$key" ]]; then
-    print "omz: one or more keys are non-bindable" >&2
+    print "prezto: one or more keys are non-bindable" >&2
     return 1
   fi
 done
@@ -112,17 +112,17 @@ function editor-info {
   typeset -gA editor_info
 
   if [[ "$KEYMAP" == 'vicmd' ]]; then
-    zstyle -s ':omz:module:editor:keymap' alternate 'REPLY'
+    zstyle -s ':prezto:module:editor:keymap' alternate 'REPLY'
     editor_info[keymap]="$REPLY"
   else
-    zstyle -s ':omz:module:editor:keymap' primary 'REPLY'
+    zstyle -s ':prezto:module:editor:keymap' primary 'REPLY'
     editor_info[keymap]="$REPLY"
 
     if [[ "$ZLE_STATE" == *overwrite* ]]; then
-      zstyle -s ':omz:module:editor:keymap:primary' overwrite 'REPLY'
+      zstyle -s ':prezto:module:editor:keymap:primary' overwrite 'REPLY'
       editor_info[overwrite]="$REPLY"
     else
-      zstyle -s ':omz:module:editor:keymap:primary' insert 'REPLY'
+      zstyle -s ':prezto:module:editor:keymap:primary' insert 'REPLY'
       editor_info[overwrite]="$REPLY"
     fi
   fi
@@ -199,7 +199,7 @@ zle -N expand-dot-to-parent-directory-path
 # Displays an indicator when completing.
 function expand-or-complete-with-indicator {
   local indicator
-  zstyle -s ':omz:module:editor' completing 'indicator'
+  zstyle -s ':prezto:module:editor' completing 'indicator'
   print -Pn "$indicator"
   zle expand-or-complete
   zle redisplay
@@ -313,7 +313,7 @@ for keymap in 'emacs' 'viins'; do
   bindkey -M "$keymap" "$key_info[Control]I" expand-or-complete
 
   # Expand .... to ../..
-  if zstyle -t ':omz:module:editor' dot-expansion; then
+  if zstyle -t ':prezto:module:editor' dot-expansion; then
     bindkey -M "$keymap" "." expand-dot-to-parent-directory-path
   fi
 
@@ -326,7 +326,7 @@ for keymap in 'emacs' 'viins'; do
 done
 
 # Do not expand .... to ../.. during incremental search.
-if zstyle -t ':omz:module:editor' dot-expansion; then
+if zstyle -t ':prezto:module:editor' dot-expansion; then
   bindkey -M isearch . self-insert 2> /dev/null
 fi
 
@@ -335,13 +335,13 @@ fi
 #
 
 # Set the key layout.
-zstyle -s ':omz:module:editor' keymap 'keymap'
+zstyle -s ':prezto:module:editor' keymap 'keymap'
 if [[ "$keymap" == (emacs|) ]]; then
   bindkey -e
 elif [[ "$keymap" == vi ]]; then
   bindkey -v
 else
-  print "omz: invalid keymap: $keymap" >&2
+  print "prezto: invalid keymap: $keymap" >&2
 fi
 
 unset key{map,}
diff --git a/modules/environment/README.md b/modules/environment/README.md
index 01a2ec1b..02918611 100644
--- a/modules/environment/README.md
+++ b/modules/environment/README.md
@@ -22,5 +22,5 @@ Authors
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh
index 74eb73d3..79eba54d 100644
--- a/modules/environment/init.zsh
+++ b/modules/environment/init.zsh
@@ -35,7 +35,7 @@ unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.
 # Grep
 #
 
-if zstyle -t ':omz:environment:grep' color; then
+if zstyle -t ':prezto:environment:grep' color; then
   export GREP_COLOR='37;45'
   export GREP_OPTIONS='--color=auto'
 fi
@@ -44,7 +44,7 @@ fi
 # Termcap
 #
 
-if zstyle -t ':omz:environment:termcap' color; then
+if zstyle -t ':prezto:environment:termcap' color; then
   export LESS_TERMCAP_mb=$'\E[01;31m'      # Begins blinking.
   export LESS_TERMCAP_md=$'\E[01;31m'      # Begins bold.
   export LESS_TERMCAP_me=$'\E[0m'          # Ends mode.
diff --git a/modules/git/functions/git-info b/modules/git/functions/git-info
index d4e70e6a..ead65074 100644
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@@ -8,64 +8,64 @@
 #   Define the following styles in a prompt theme setup function.
 #
 #     # %s - Special action name (am, merge, rebase).
-#     zstyle ':omz:module:git' action 'action:%s'
+#     zstyle ':prezto:module:git' action 'action:%s'
 #
 #     # %a - Indicator to notify of added files.
-#     zstyle ':omz:module:git' added 'added:%a'
+#     zstyle ':prezto:module:git' added 'added:%a'
 #
 #     # %A - Indicator to notify of ahead branch.
-#     zstyle ':omz:module:git' ahead 'ahead:%A'
+#     zstyle ':prezto:module:git' ahead 'ahead:%A'
 #
 #     # %B - Indicator to notify of behind branch.
-#     zstyle ':omz:module:git' behind 'behind:%B'
+#     zstyle ':prezto:module:git' behind 'behind:%B'
 #
 #     # %b - Branch name.
-#     zstyle ':omz:module:git' branch 'branch:%b'
+#     zstyle ':prezto:module:git' branch 'branch:%b'
 #
 #     # %C - Indicator to notify of a clean working directory.
-#     zstyle ':omz:module:git' clean 'clean'
+#     zstyle ':prezto:module:git' clean 'clean'
 #
 #     # %c - SHA-1 hash.
-#     zstyle ':omz:module:git' commit 'commit:%c'
+#     zstyle ':prezto:module:git' commit 'commit:%c'
 #
 #     # %d - Indicator to notify of deleted files.
-#     zstyle ':omz:module:git' deleted 'deleted:%d'
+#     zstyle ':prezto:module:git' deleted 'deleted:%d'
 #
 #     # %D - Indicator to notify of dirty files.
-#     zstyle ':omz:module:git' dirty 'dirty:%D'
+#     zstyle ':prezto:module:git' dirty 'dirty:%D'
 #
 #     # %m - Indicator to notify of modified files.
-#     zstyle ':omz:module:git' modified 'modified:%m'
+#     zstyle ':prezto:module:git' modified 'modified:%m'
 #
 #     # %p - HEAD position in relation to the nearest branch, remote, tag.
-#     zstyle ':omz:module:git' position 'position:%p'
+#     zstyle ':prezto:module:git' position 'position:%p'
 #
 #     # %R - Remote name.
-#     zstyle ':omz:moduleit' remote 'remote:%R'
+#     zstyle ':prezto:moduleit' remote 'remote:%R'
 #
 #     # %r - Indicator to notify of renamed files.
-#     zstyle ':omz:module:git' renamed 'renamed:%r'
+#     zstyle ':prezto:module:git' renamed 'renamed:%r'
 #
 #     # %S - Indicator to notify of stashed files.
-#     zstyle ':omz:module:git' stashed 'stashed:%S'
+#     zstyle ':prezto:module:git' stashed 'stashed:%S'
 #
 #     # %U - Indicator to notify of unmerged files.
-#     zstyle ':omz:module:git' unmerged 'unmerged:%U'
+#     zstyle ':prezto:module:git' unmerged 'unmerged:%U'
 #
 #     # %u - Indicator to notify of untracked files.
-#     zstyle ':omz:module:git' untracked 'untracked:%u'
+#     zstyle ':prezto:module:git' untracked 'untracked:%u'
 #
 #     # Ignore submodule when it is 'dirty', 'untracked', 'all', or 'none'.
-#     zstyle ':omz:module:git:ignore' submodule ''
+#     zstyle ':prezto:module:git:ignore' submodule ''
 #
 #     # Prompts.
-#     zstyle ':omz:module:git' info \
+#     zstyle ':prezto:module:git' info \
 #       'prompt'  ' git:(%b%C%D)' \
 #       'rprompt' ''
 #
 
 # Load dependencies.
-omodload 'trap'
+pmodload 'trap'
 
 # Gets the Git special action (am, bisect, cherry, merge, rebase).
 # Borrowed from vcs_info and edited.
@@ -261,7 +261,7 @@ function git-info {
   ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
 
   # Ignore submodule status.
-  zstyle -s ':omz:module:git:ignore' submodule 'ignore_submodule'
+  zstyle -s ':prezto:module:git:ignore' submodule 'ignore_submodule'
   if [[ -n "$ignore_submodule" ]]; then
     status_cmd+=" --ignore-submodules=${ignore_submodule}"
   fi
@@ -269,21 +269,21 @@ function git-info {
   # Format commit.
   commit="$(git rev-parse HEAD 2> /dev/null)"
   if [[ -n "$commit" ]]; then
-    zstyle -s ':omz:module:git' commit 'commit_format'
+    zstyle -s ':prezto:module:git' commit 'commit_format'
     zformat -f commit_formatted "$commit_format" "c:$commit"
   fi
 
   # Format stashed.
   if [[ -f "$(git-dir)/refs/stash" ]]; then
     stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
-    zstyle -s ':omz:module:git' stashed 'stashed_format'
+    zstyle -s ':prezto:module:git' stashed 'stashed_format'
     zformat -f stashed_formatted "$stashed_format" "S:$stashed"
   fi
 
   # Format action.
   action="$(_git-action)"
   if [[ -n "$action" ]]; then
-    zstyle -s ':omz:module:git' action 'action_format'
+    zstyle -s ':prezto:module:git' action 'action_format'
     zformat -f action_formatted "$action_format" "s:$action"
   fi
 
@@ -304,13 +304,13 @@ function git-info {
   # Format branch.
   branch="${$(git symbolic-ref -q HEAD)##refs/heads/}"
   if [[ -n "$branch" ]]; then
-    zstyle -s ':omz:module:git' branch 'branch_format'
+    zstyle -s ':prezto:module:git' branch 'branch_format'
     zformat -f branch_formatted "$branch_format" "b:$branch"
 
     # Format remote.
     remote="${$(${(z)remote_cmd} 2> /dev/null)##refs/remotes/}"
     if [[ -n "$remote" ]]; then
-      zstyle -s ':omz:module:git' remote 'remote_format'
+      zstyle -s ':prezto:module:git' remote 'remote_format'
       zformat -f remote_formatted "$remote_format" "R:$remote"
 
       # Get ahead and behind counts.
@@ -319,14 +319,14 @@ function git-info {
       # Format ahead.
       ahead="$ahead_and_behind[(w)1]"
       if (( $ahead > 0 )); then
-        zstyle -s ':omz:module:git' ahead 'ahead_format'
+        zstyle -s ':prezto:module:git' ahead 'ahead_format'
         zformat -f ahead_formatted "$ahead_format" "A:$ahead"
       fi
 
       # Format behind.
       behind="$ahead_and_behind[(w)2]"
       if (( $behind > 0 )); then
-        zstyle -s ':omz:module:git' behind 'behind_format'
+        zstyle -s ':prezto:module:git' behind 'behind_format'
         zformat -f behind_formatted "$behind_format" "B:$behind"
       fi
     fi
@@ -334,57 +334,57 @@ function git-info {
     # Format position.
     position="$(git describe --contains --all HEAD 2> /dev/null)"
     if [[ -n "$position" ]]; then
-      zstyle -s ':omz:module:git' position 'position_format'
+      zstyle -s ':prezto:module:git' position 'position_format'
       zformat -f position_formatted "$position_format" "p:$position"
     fi
   fi
 
   # Format added.
   if (( $added > 0 )); then
-    zstyle -s ':omz:module:git' added 'added_format'
+    zstyle -s ':prezto:module:git' added 'added_format'
     zformat -f added_formatted "$added_format" "a:$added_format"
   fi
 
   # Format deleted.
   if (( $deleted > 0 )); then
-    zstyle -s ':omz:module:git' deleted 'deleted_format'
+    zstyle -s ':prezto:module:git' deleted 'deleted_format'
     zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
   fi
 
   # Format modified.
   if (( $modified > 0 )); then
-    zstyle -s ':omz:module:git' modified 'modified_format'
+    zstyle -s ':prezto:module:git' modified 'modified_format'
     zformat -f modified_formatted "$modified_format" "m:$modified"
   fi
 
   # Format renamed.
   if (( $renamed > 0 )); then
-    zstyle -s ':omz:module:git' renamed 'renamed_format'
+    zstyle -s ':prezto:module:git' renamed 'renamed_format'
     zformat -f renamed_formatted "$renamed_format" "r:$renamed"
   fi
 
   # Format unmerged.
   if (( $unmerged > 0 )); then
-    zstyle -s ':omz:module:git' unmerged 'unmerged_format'
+    zstyle -s ':prezto:module:git' unmerged 'unmerged_format'
     zformat -f unmerged_formatted "$unmerged_format" "U:$unmerged"
   fi
 
   # Format untracked.
   if (( $untracked > 0 )); then
-    zstyle -s ':omz:module:git' untracked 'untracked_format'
+    zstyle -s ':prezto:module:git' untracked 'untracked_format'
     zformat -f untracked_formatted "$untracked_format" "u:$untracked"
   fi
 
   # Format dirty and clean.
   if (( $dirty > 0 )); then
-    zstyle -s ':omz:module:git' dirty 'dirty_format'
+    zstyle -s ':prezto:module:git' dirty 'dirty_format'
     zformat -f dirty_formatted "$dirty_format" "D:$dirty"
   else
-    zstyle -s ':omz:module:git' clean 'clean_formatted'
+    zstyle -s ':prezto:module:git' clean 'clean_formatted'
   fi
 
   # Format info.
-  zstyle -a ':omz:module:git' info 'info_formats'
+  zstyle -a ':prezto:module:git' info 'info_formats'
   for info_format in ${(k)info_formats}; do
     zformat -f REPLY "$info_formats[$info_format]" \
       "A:$ahead_formatted" \
diff --git a/modules/gnu-utility/README.md b/modules/gnu-utility/README.md
index da352506..eac6d37d 100644
--- a/modules/gnu-utility/README.md
+++ b/modules/gnu-utility/README.md
@@ -20,7 +20,7 @@ Settings
 To use a different prefix, add the following to *zshrc*, and replace 'g' with
 the desired prefix:
 
-    zstyle ':omz:module:gnu-utility' prefix 'g'
+    zstyle ':prezto:module:gnu-utility' prefix 'g'
 
 Authors
 -------
@@ -29,5 +29,5 @@ Authors
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/gnu-utility/init.zsh b/modules/gnu-utility/init.zsh
index 482bc36e..a3812314 100644
--- a/modules/gnu-utility/init.zsh
+++ b/modules/gnu-utility/init.zsh
@@ -6,7 +6,7 @@
 #
 
 # Get the prefix or use the default.
-zstyle -s ':omz:module:gnu-utility' prefix '_gnu_utility_p' || _gnu_utility_p='g'
+zstyle -s ':prezto:module:gnu-utility' prefix '_gnu_utility_p' || _gnu_utility_p='g'
 
 # Return if requirements are not found.
 if (( ! ${+commands[${_gnu_utility_p}whoami]} )); then
diff --git a/modules/gpg-agent/README.md b/modules/gpg-agent/README.md
index 3107c805..e1fc158d 100644
--- a/modules/gpg-agent/README.md
+++ b/modules/gpg-agent/README.md
@@ -12,5 +12,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://linux.die.net/man/1/gpg-agent
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/haskell/README.md b/modules/haskell/README.md
index 5382f929..512350d5 100644
--- a/modules/haskell/README.md
+++ b/modules/haskell/README.md
@@ -25,5 +25,5 @@ Authors
   - [Sebastian Wiesner](https://github.com/lunaryorn)
 
 [1]: http://www.haskell.org/cabal/
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/history-substring-search/README.md b/modules/history-substring-search/README.md
index a587bf5e..280cbda2 100644
--- a/modules/history-substring-search/README.md
+++ b/modules/history-substring-search/README.md
@@ -1,7 +1,7 @@
 History Substring Search
 ========================
 
-Integrates [zsh-history-substring-search][1] into Oh My Zsh, which implements
+Integrates [zsh-history-substring-search][1] into Prezto, which implements
 the [Fish shell][2]'s history search feature, where the user can type in any
 part of a previously entered command and press up and down to cycle through
 matching commands.
@@ -24,7 +24,7 @@ Settings
 To enable case-sensitivity for this module only, add the following line to
 *zshrc*:
 
-    zstyle ':omz:module:history-substring-search' case-sensitive 'yes'
+    zstyle ':prezto:module:history-substring-search' case-sensitive 'yes'
 
 ### Highlighting
 
@@ -33,7 +33,7 @@ positive results.
 
 To enable highlighting for this module only, add the following line to *zshrc*:
 
-    zstyle ':omz:module:history-substring-search' color 'yes'
+    zstyle ':prezto:module:history-substring-search' color 'yes'
 
 Authors
 -------
@@ -45,5 +45,5 @@ Authors
 
 [1]: https://github.com/zsh-users/zsh-history-substring-search
 [2]: http://fishshell.com
-[3]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[3]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 4c944d7a..842ee1c5 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -1,5 +1,5 @@
 #
-# Integrates history-substring-search into Oh My Zsh.
+# Integrates history-substring-search into Prezto.
 #
 # Authors:
 #   Suraj N. Kurapati <sunaku@gmail.com>
@@ -7,7 +7,7 @@
 #
 
 # Load dependencies.
-omodload 'editor'
+pmodload 'editor'
 
 # Source module files.
 source "${0:h}/external/zsh-history-substring-search.zsh"
@@ -16,11 +16,11 @@ source "${0:h}/external/zsh-history-substring-search.zsh"
 # Styles
 #
 
-if zstyle -t ':omz:module:history-substring-search' case-sensitive; then
+if zstyle -t ':prezto:module:history-substring-search' case-sensitive; then
   unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
 fi
 
-if ! zstyle -t ':omz:module:history-substring-search' color; then
+if ! zstyle -t ':prezto:module:history-substring-search' color; then
   unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_{FOUND,NOT_FOUND}
 fi
 
diff --git a/modules/history/README.md b/modules/history/README.md
index 0402a622..7875ca58 100644
--- a/modules/history/README.md
+++ b/modules/history/README.md
@@ -40,5 +40,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/macports/README.md b/modules/macports/README.md
index 7a9681ae..9145d489 100644
--- a/modules/macports/README.md
+++ b/modules/macports/README.md
@@ -22,5 +22,5 @@ Authors
   - [Matt Cable](https://github.com/curiousstranger)
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/node/README.md b/modules/node/README.md
index 4ebbde97..58f2b082 100644
--- a/modules/node/README.md
+++ b/modules/node/README.md
@@ -19,5 +19,5 @@ Authors
 [1]: http://nodejs.org
 [2]: http://npmjs.org
 [3]: http://nodejs.org/api
-[4]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[4]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/osx/README.md b/modules/osx/README.md
index 7a53d94f..bb74ef55 100644
--- a/modules/osx/README.md
+++ b/modules/osx/README.md
@@ -32,5 +32,5 @@ Authors
 [1]: http://www.apple.com/macosx/
 [2]: http://bruji.com/bwana/
 [3]: http://www.iterm2.com/
-[4]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[4]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/pacman/README.md b/modules/pacman/README.md
index e8e4a815..981a3b90 100644
--- a/modules/pacman/README.md
+++ b/modules/pacman/README.md
@@ -10,14 +10,14 @@ Settings
 To enable a Pacman frontend, for example, [Yaourt][2], add the following line to
 *zshrc*:
 
-    zstyle ':omz:module:pacman' frontend 'yaourt'
+    zstyle ':prezto:module:pacman' frontend 'yaourt'
 
 If you have enabled color globally in *zshrc*, you may disable it for certain
 commands.
 
 To disable `yaourt` highlighting, add the following line to *zshrc*:
 
-    zstyle ':omz:module:pacman:yaourt' color 'no'
+    zstyle ':prezto:module:pacman:yaourt' color 'no'
 
 Aliases
 -------
@@ -62,5 +62,5 @@ Authors
 
 [1]: http://www.archlinux.org/pacman/
 [2]: http://archlinux.fr/yaourt-en
-[3]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[3]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/pacman/init.zsh b/modules/pacman/init.zsh
index 165b51ce..c6fdc451 100644
--- a/modules/pacman/init.zsh
+++ b/modules/pacman/init.zsh
@@ -19,7 +19,7 @@ fi
 #
 
 # Get the Pacman frontend.
-zstyle -s ':omz:module:pacman' frontend '_pacman_frontend'
+zstyle -s ':prezto:module:pacman' frontend '_pacman_frontend'
 
 if (( $+commands[$_pacman_frontend] )); then
   alias pacman="$_pacman_frontend"
diff --git a/modules/pacman/yaourt.zsh b/modules/pacman/yaourt.zsh
index b17424e9..fb2a8dc2 100644
--- a/modules/pacman/yaourt.zsh
+++ b/modules/pacman/yaourt.zsh
@@ -10,7 +10,7 @@
 #
 
 # Disable color.
-if ! zstyle -t ':omz:module:pacman:yaourt' color; then
+if ! zstyle -t ':prezto:module:pacman:yaourt' color; then
   alias pacman='pacman --nocolor'
 fi
 
diff --git a/modules/perl/README.md b/modules/perl/README.md
index 90434eb1..eabdc5cb 100644
--- a/modules/perl/README.md
+++ b/modules/perl/README.md
@@ -60,5 +60,5 @@ Authors
 
 [1]: http://www.perl.org
 [2]: http://perlbrew.pl
-[3]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[3]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/prompt/README.md b/modules/prompt/README.md
index 98cd1e33..db2d26cb 100644
--- a/modules/prompt/README.md
+++ b/modules/prompt/README.md
@@ -10,7 +10,7 @@ To select a prompt theme, add the following to *zshrc*, and replace **name**
 with the name of the theme you wish to load. Setting it to **random** will load
 a random theme.
 
-    zstyle ':omz:module:prompt' theme 'name'
+    zstyle ':prezto:module:prompt' theme 'name'
 
 Authors
 -------
@@ -20,5 +20,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup
index d1db67c2..b4bbc4d3 100644
--- a/modules/prompt/functions/prompt_sorin_setup
+++ b/modules/prompt/functions/prompt_sorin_setup
@@ -5,7 +5,7 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 # Screenshots:
-#   http://i.imgur.com/aipDQ.png
+#   http://i.imgur.com/4CeOj.png
 #
 
 function prompt_sorin_precmd {
@@ -28,23 +28,23 @@ function prompt_sorin_setup {
   # Add hook for calling git-info before each command.
   add-zsh-hook precmd prompt_sorin_precmd
 
-  zstyle ':omz:module:editor' completing '%B%F{red}...%f%b'
-  zstyle ':omz:module:editor:keymap:primary' overwrite ' %F{red}♺%f'
-  zstyle ':omz:module:editor:keymap' alternate ' %F{yellow}❮%f%B%F{red}❮%f%b%F{red}❮%f'
-  zstyle ':omz:module:git' action ':%%B%F{yellow}%s%f%%b'
-  zstyle ':omz:module:git' added ' %%B%F{green}✚%f%%b'
-  zstyle ':omz:module:git' ahead ' %%B%F{yellow}⬆%f%%b'
-  zstyle ':omz:module:git' behind ' %%B%F{yellow}⬇%f%%b'
-  zstyle ':omz:module:git' branch ':%F{red}%b%f'
-  zstyle ':omz:module:git' commit ':%F{green}%.7c%f'
-  zstyle ':omz:module:git' deleted ' %%B%F{red}✖%f%%b'
-  zstyle ':omz:module:git' modified ' %%B%F{blue}✱%f%%b'
-  zstyle ':omz:module:git' position ':%F{green}%p%f'
-  zstyle ':omz:module:git' renamed ' %%B%F{magenta}➜%f%%b'
-  zstyle ':omz:module:git' stashed ' %%B%F{cyan}✭%f%%b'
-  zstyle ':omz:module:git' unmerged ' %%B%F{yellow}═%f%%b'
-  zstyle ':omz:module:git' untracked ' %%B%F{white}◼%f%%b'
-  zstyle ':omz:module:git' info \
+  zstyle ':prezto:module:editor' completing '%B%F{red}...%f%b'
+  zstyle ':prezto:module:editor:keymap:primary' overwrite ' %F{red}♺%f'
+  zstyle ':prezto:module:editor:keymap' alternate ' %F{yellow}❮%f%B%F{red}❮%f%b%F{red}❮%f'
+  zstyle ':prezto:module:git' action ':%%B%F{yellow}%s%f%%b'
+  zstyle ':prezto:module:git' added ' %%B%F{green}✚%f%%b'
+  zstyle ':prezto:module:git' ahead ' %%B%F{yellow}⬆%f%%b'
+  zstyle ':prezto:module:git' behind ' %%B%F{yellow}⬇%f%%b'
+  zstyle ':prezto:module:git' branch ':%F{red}%b%f'
+  zstyle ':prezto:module:git' commit ':%F{green}%.7c%f'
+  zstyle ':prezto:module:git' deleted ' %%B%F{red}✖%f%%b'
+  zstyle ':prezto:module:git' modified ' %%B%F{blue}✱%f%%b'
+  zstyle ':prezto:module:git' position ':%F{green}%p%f'
+  zstyle ':prezto:module:git' renamed ' %%B%F{magenta}➜%f%%b'
+  zstyle ':prezto:module:git' stashed ' %%B%F{cyan}✭%f%%b'
+  zstyle ':prezto:module:git' unmerged ' %%B%F{yellow}═%f%%b'
+  zstyle ':prezto:module:git' untracked ' %%B%F{white}◼%f%%b'
+  zstyle ':prezto:module:git' info \
     'prompt'  ' %F{blue}git%f$(coalesce "%b" "%p" "%c")%s' \
     'rprompt' '%A%B%S%a%d%m%r%U%u'
 
diff --git a/modules/prompt/functions/prompt_steeef_setup b/modules/prompt/functions/prompt_steeef_setup
index 5cde90fd..08cae7e7 100644
--- a/modules/prompt/functions/prompt_steeef_setup
+++ b/modules/prompt/functions/prompt_steeef_setup
@@ -82,7 +82,7 @@ function prompt_steeef_setup {
   zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
 
   # Set python-info parameters.
-  zstyle ':omz:module:python' virtualenv '(%v)'
+  zstyle ':prezto:module:python' virtualenv '(%v)'
 
   # Define prompts.
   PROMPT="
diff --git a/modules/prompt/init.zsh b/modules/prompt/init.zsh
index a92eb233..de1b44bf 100644
--- a/modules/prompt/init.zsh
+++ b/modules/prompt/init.zsh
@@ -9,7 +9,7 @@
 autoload -Uz promptinit && promptinit
 
 # Load the prompt theme.
-zstyle -a ':omz:module:prompt' theme 'prompt_argv'
+zstyle -a ':prezto:module:prompt' theme 'prompt_argv'
 if (( $#prompt_argv > 0 )); then
   prompt "$prompt_argv[@]"
 else
diff --git a/modules/python/README.md b/modules/python/README.md
index ecbbbfdc..abdbf661 100644
--- a/modules/python/README.md
+++ b/modules/python/README.md
@@ -67,7 +67,7 @@ To display the name of the current virtual enviroment in a prompt, define the
 following style in the `prompt_theme_setup` function.
 
     # %v - virtualenv name.
-    zstyle ':omz:module:python' virtualenv 'virtualenv:%v'
+    zstyle ':prezto:module:python' virtualenv 'virtualenv:%v'
 
 Then add `$python_info[virtualenv]` to `$PROMPT` or `$RPROMPT` and call
 `python-info` in the `prompt_theme_preexec` hook function.
@@ -105,5 +105,5 @@ Authors
 [2]: http://www.doughellmann.com/projects/virtualenvwrapper/
 [3]: http://pypi.python.org/pypi/virtualenv
 [4]: http://saghul.github.com/pythonz/
-[5]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[5]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/python/functions/python-info b/modules/python/functions/python-info
index 0bca3c10..703c8ada 100644
--- a/modules/python/functions/python-info
+++ b/modules/python/functions/python-info
@@ -14,7 +14,7 @@ typeset -gA python_info
 
 # Format virtualenv.
 if [[ -n "$VIRTUAL_ENV" ]]; then
-  zstyle -s ':omz:module:python' virtualenv 'virtualenv_format'
+  zstyle -s ':prezto:module:python' virtualenv 'virtualenv_format'
   zformat -f virtualenv_formatted "$virtualenv_format" "v:${VIRTUAL_ENV:t}"
   python_info[virtualenv]="$virtualenv_formatted"
 fi
diff --git a/modules/rails/README.md b/modules/rails/README.md
index 5a597a93..239a1d18 100644
--- a/modules/rails/README.md
+++ b/modules/rails/README.md
@@ -31,5 +31,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://rubyonrails.org
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/rsync/README.md b/modules/rsync/README.md
index 8ad42350..2d2e6566 100644
--- a/modules/rsync/README.md
+++ b/modules/rsync/README.md
@@ -24,5 +24,5 @@ Authors
 
 [1]: http://rsync.samba.org
 [2]: http://www.bombich.com/rsync.html
-[3]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[3]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/ruby/README.md b/modules/ruby/README.md
index 71fa340f..984b1a19 100644
--- a/modules/ruby/README.md
+++ b/modules/ruby/README.md
@@ -67,5 +67,5 @@ Authors
 [2]: https://rvm.io
 [3]: https://github.com/sstephenson/rbenv
 [4]: http://gembundler.com
-[5]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[5]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/screen/README.md b/modules/screen/README.md
index f67878d3..871e1cf2 100644
--- a/modules/screen/README.md
+++ b/modules/screen/README.md
@@ -12,7 +12,7 @@ Starts a GNU Screen session automatically when Zsh is launched.
 
 To enable this feature, add the following line to *zshrc*:
 
-    zstyle ':omz:module:screen' auto-start 'yes'
+    zstyle ':prezto:module:screen' auto-start 'yes'
 
 Aliases
 -------
@@ -30,5 +30,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://www.gnu.org/software/screen/
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/screen/init.zsh b/modules/screen/init.zsh
index d712c2f4..424f6584 100644
--- a/modules/screen/init.zsh
+++ b/modules/screen/init.zsh
@@ -14,7 +14,7 @@ fi
 # Auto Start
 #
 
-if [[ -z "$STY" ]] && zstyle -t ':omz:module:screen' auto-start; then
+if [[ -z "$STY" ]] && zstyle -t ':prezto:module:screen' auto-start; then
   session="$(
     screen -list 2> /dev/null \
       | sed '1d;$d' \
diff --git a/modules/ssh-agent/README.md b/modules/ssh-agent/README.md
index 4836f613..2f4a0a90 100644
--- a/modules/ssh-agent/README.md
+++ b/modules/ssh-agent/README.md
@@ -10,13 +10,13 @@ Settings
 
 To enable ssh-agent forwarding, add the following line to *zshrc*:
 
-    zstyle ':omz:module:ssh-agent' forwarding 'yes'
+    zstyle ':prezto:module:ssh-agent' forwarding 'yes'
 
 ### Identities
 
 To load multiple identities, add the following line to *zshrc*:
 
-    zstyle ':omz:module:ssh-agent' identities 'id_rsa' 'id_rsa2' 'id_github'
+    zstyle ':prezto:module:ssh-agent' identities 'id_rsa' 'id_rsa2' 'id_github'
 
 Authors
 -------
@@ -32,5 +32,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-agent&sektion=1
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/ssh-agent/init.zsh b/modules/ssh-agent/init.zsh
index 0d83e483..906c831a 100644
--- a/modules/ssh-agent/init.zsh
+++ b/modules/ssh-agent/init.zsh
@@ -29,7 +29,7 @@ function _ssh-agent-start {
   source "${_ssh_agent_env}" > /dev/null
 
   # Load identities.
-  zstyle -a ':omz:module:ssh-agent' identities 'identities'
+  zstyle -a ':prezto:module:ssh-agent' identities 'identities'
 
   if (( ${#identities} > 0 )); then
     ssh-add "${HOME}/.ssh/${^identities[@]}"
@@ -39,7 +39,7 @@ function _ssh-agent-start {
 }
 
 # Test if agent-forwarding is enabled.
-zstyle -b ':omz:module:ssh-agent' forwarding '_ssh_agent_forwarding'
+zstyle -b ':prezto:module:ssh-agent' forwarding '_ssh_agent_forwarding'
 if is-true "${_ssh_agent_forwarding}" && [[ -n "$SSH_AUTH_SOCK" ]]; then
   # Add a nifty symlink for screen/tmux if agent forwarding.
   [[ -L "$SSH_AUTH_SOCK" ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
diff --git a/modules/syntax-highlighting/README.md b/modules/syntax-highlighting/README.md
index a1de615e..12caf8f7 100644
--- a/modules/syntax-highlighting/README.md
+++ b/modules/syntax-highlighting/README.md
@@ -1,7 +1,7 @@
 Syntax Highlighting
 ===================
 
-Integrates [zsh-syntax-highlighting][1] into Oh My Zsh.
+Integrates [zsh-syntax-highlighting][1] into Prezto.
 
 This module should be loaded *second to last*, where last is the *prompt*
 module, unless used in conjuncture with the *history-substring-search* module
@@ -21,7 +21,7 @@ Settings
 
 To enable highlighting for this module only, add the following line to *zshrc*:
 
-    zstyle ':omz:module:syntax-highlighting' color 'yes'
+    zstyle ':prezto:module:syntax-highlighting' color 'yes'
 
 ### Highlighters
 
@@ -30,7 +30,7 @@ enables the *main*, *brackets*, and *cursor* highlighters by default.
 
 To enable all highlighters, add the following to *zshrc*:
 
-    zstyle ':omz:module:syntax-highlighting' highlighters \
+    zstyle ':prezto:module:syntax-highlighting' highlighters \
       'main' \
       'brackets' \
       'pattern' \
@@ -46,5 +46,5 @@ Authors
 
 [1]: https://github.com/zsh-users/zsh-syntax-highlighting
 [2]: https://github.com/zsh-users/zsh-syntax-highlighting/tree/master/highlighters
-[3]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[3]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/syntax-highlighting/init.zsh b/modules/syntax-highlighting/init.zsh
index d988b58c..d9bd414b 100644
--- a/modules/syntax-highlighting/init.zsh
+++ b/modules/syntax-highlighting/init.zsh
@@ -1,12 +1,12 @@
 #
-# Integrates zsh-syntax-highlighting into Oh My Zsh.
+# Integrates zsh-syntax-highlighting into Prezto.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
 # Return if requirements are not found.
-if ! zstyle -t ':omz:module:syntax-highlighting' color; then
+if ! zstyle -t ':prezto:module:syntax-highlighting' color; then
   return 1
 fi
 
@@ -14,7 +14,7 @@ fi
 source "${0:h}/external/zsh-syntax-highlighting.zsh"
 
 # Set the highlighters.
-zstyle -a ':omz:module:syntax-highlighting' highlighters 'ZSH_HIGHLIGHT_HIGHLIGHTERS'
+zstyle -a ':prezto:module:syntax-highlighting' highlighters 'ZSH_HIGHLIGHT_HIGHLIGHTERS'
 if (( ${#ZSH_HIGHLIGHT_HIGHLIGHTERS[@]} == 0 )); then
   ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor)
 fi
diff --git a/modules/terminal/README.md b/modules/terminal/README.md
index 136b82fa..751da030 100644
--- a/modules/terminal/README.md
+++ b/modules/terminal/README.md
@@ -11,7 +11,7 @@ Settings
 To auto set the terminal window and tab titles with the current command or
 directory, add the following to *zshrc*:
 
-    zstyle ':omz:module:terminal' auto-title 'yes'
+    zstyle ':prezto:module:terminal' auto-title 'yes'
 
 Authors
 -------
@@ -21,5 +21,5 @@ Authors
   - [James Cox](https://github.com/imajes)
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/terminal/init.zsh b/modules/terminal/init.zsh
index 326ec661..436463aa 100644
--- a/modules/terminal/init.zsh
+++ b/modules/terminal/init.zsh
@@ -78,7 +78,7 @@ autoload -Uz add-zsh-hook
 
 # Sets the tab and window titles before the prompt is displayed.
 function set-title-precmd {
-  if zstyle -t ':omz:module:terminal' auto-title; then
+  if zstyle -t ':prezto:module:terminal' auto-title; then
     if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]]; then
       # Set the current working directory in Apple Terminal.
       printf '\e]7;%s\a' "file://$HOST${PWD// /%20}"
@@ -95,7 +95,7 @@ add-zsh-hook precmd set-title-precmd
 
 # Sets the tab and window titles before command execution.
 function set-title-preexec {
-  if zstyle -t ':omz:module:terminal' auto-title; then
+  if zstyle -t ':prezto:module:terminal' auto-title; then
     if [[ "$TERM_PROGRAM" != 'Apple_Terminal' ]]; then
       set-title-by-command "$2"
     fi
diff --git a/modules/tmux/README.md b/modules/tmux/README.md
index d77c3379..f88103b1 100644
--- a/modules/tmux/README.md
+++ b/modules/tmux/README.md
@@ -12,10 +12,10 @@ Starts a tmux session automatically when Zsh is launched.
 
 To enable this feature, add the following line to *zshrc*:
 
-    zstyle ':omz:module:tmux' auto-start 'yes'
+    zstyle ':prezto:module:tmux' auto-start 'yes'
 
-It will create a background session named _#OMZ_ and attach every new shell to
-it.
+It will create a background session named _#Prezto_ and attach every new shell
+to it.
 
 To avoid keeping open sessions, this module sets `destroy-unattached off` on
 the background session and `destroy-unattached on` on every other session
@@ -38,7 +38,7 @@ following to *tmux.conf*:
    set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
 
 Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion
-about this and OMZ has already been [opened][2].
+about this and Prezto has already been [opened][2].
 
 Authors
 -------
@@ -52,5 +52,5 @@ Authors
 [2]: http://git.io/jkPqHg
 [3]: ChrisJohnsen/tmux-MacOSX-pasteboard
 [4]: mxcl/homebrew
-[5]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[5]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh
index 95bddd81..a4648276 100644
--- a/modules/tmux/init.zsh
+++ b/modules/tmux/init.zsh
@@ -15,8 +15,8 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" ]] && zstyle -t ':omz:module:tmux' auto-start; then
-  tmux_session='#OMZ'
+if [[ -z "$TMUX" ]] && zstyle -t ':prezto:module:tmux' auto-start; then
+  tmux_session='#Prezto'
 
   if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
     # Disable the destruction of unattached sessions globally.
diff --git a/modules/trap/README.md b/modules/trap/README.md
index 97763c00..ae0ea951 100644
--- a/modules/trap/README.md
+++ b/modules/trap/README.md
@@ -17,5 +17,5 @@ Authors
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/utility/README.md b/modules/utility/README.md
index cddd01d3..d1503503 100644
--- a/modules/utility/README.md
+++ b/modules/utility/README.md
@@ -14,19 +14,19 @@ commands.
 To disable `ls` color, add the following line to *zshrc*; when coloring is
 disabled, type indicators (\*, /, =>, @, =, |, %) will be appended to entries.
 
-    zstyle ':omz:module:utility:ls' color 'no'
+    zstyle ':prezto:module:utility:ls' color 'no'
 
 To disable `diff` highlighting, add the following line to *zshrc*:
 
-    zstyle ':omz:module:utility:diff' color 'no'
+    zstyle ':prezto:module:utility:diff' color 'no'
 
 To disable `wdiff` highlighting, add the following line to *zshrc*:
 
-    zstyle ':omz:module:utility:wdiff' color 'no'
+    zstyle ':prezto:module:utility:wdiff' color 'no'
 
 To disable `make` highlighting, add the following line to *zshrc*:
 
-    zstyle ':omz:module:utility:make' color 'no'
+    zstyle ':prezto:module:utility:make' color 'no'
 
 Aliases
 -------
@@ -154,5 +154,5 @@ Authors
   - [Suraj N. Kurapati](https://github.com/sunaku)
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/utility/functions/diff b/modules/utility/functions/diff
index c41773d0..e749c232 100644
--- a/modules/utility/functions/diff
+++ b/modules/utility/functions/diff
@@ -6,7 +6,7 @@
 #
 
 function diff {
-  if zstyle -t ':omz:module:utility:diff' color; then
+  if zstyle -t ':prezto:module:utility:diff' color; then
     if (( $+commands[colordiff] )); then
       command diff --unified "$@" | colordiff --difftype diffu
     elif (( $+commands[git] )); then
diff --git a/modules/utility/functions/make b/modules/utility/functions/make
index 08783e9f..a2225731 100644
--- a/modules/utility/functions/make
+++ b/modules/utility/functions/make
@@ -6,7 +6,7 @@
 #
 
 function make {
-  if zstyle -t ':omz:module:utility:make' color; then
+  if zstyle -t ':prezto:module:utility:make' color; then
     if (( $+commands[colormake] )); then
       colormake "$@"
     else
diff --git a/modules/utility/functions/wdiff b/modules/utility/functions/wdiff
index a2d49d77..1855cb33 100644
--- a/modules/utility/functions/wdiff
+++ b/modules/utility/functions/wdiff
@@ -6,7 +6,7 @@
 #
 
 function wdiff {
-  if zstyle -t ':omz:module:utility:wdiff' color; then
+  if zstyle -t ':prezto:module:utility:wdiff' color; then
     if (( $+commands[wdiff] )); then
       command wdiff \
         --avoid-wraps \
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index c3618df6..464f4d44 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -8,7 +8,7 @@
 #
 
 # Load dependencies.
-omodload 'spectrum'
+pmodload 'spectrum'
 
 # Correct commands.
 setopt CORRECT
@@ -63,7 +63,7 @@ if is-callable 'dircolors'; then
   # GNU Core Utilities
   alias ls='ls --group-directories-first'
 
-  if zstyle -t ':omz:module:utility:ls' color; then
+  if zstyle -t ':prezto:module:utility:ls' color; then
     if [[ -s "$HOME/.dir_colors" ]]; then
       eval "$(dircolors "$HOME/.dir_colors")"
     else
@@ -75,7 +75,7 @@ if is-callable 'dircolors'; then
   fi
 else
   # BSD Core Utilities
-  if zstyle -t ':omz:module:utility:ls' color; then
+  if zstyle -t ':prezto:module:utility:ls' color; then
     export LSCOLORS="exfxcxdxbxegedabagacad"
     alias ls="ls -G"
   else
diff --git a/modules/wakeonlan/README.md b/modules/wakeonlan/README.md
index 66cbe852..54fc683c 100644
--- a/modules/wakeonlan/README.md
+++ b/modules/wakeonlan/README.md
@@ -33,5 +33,5 @@ Authors
 
 [1]: http://gsd.di.uminho.pt/jpo/software/wakeonlan/
 [2]: http://man.cx/wakeonlan
-[3]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[3]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/yum/README.md b/modules/yum/README.md
index 23ce93ef..9743c872 100644
--- a/modules/yum/README.md
+++ b/modules/yum/README.md
@@ -25,5 +25,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://yum.baseurl.org
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/modules/z/README.md b/modules/z/README.md
index 8b8fc0b5..e17aa0ec 100644
--- a/modules/z/README.md
+++ b/modules/z/README.md
@@ -1,7 +1,7 @@
 Z
 =
 
-Integrates [z][1] into Oh My Zsh, which maintains a frequently used directory
+Integrates [z][1] into Prezto, which maintains a frequently used directory
 list for fast directory changes.
 
 Aliases
@@ -17,5 +17,5 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/rupa/z
-[2]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[2]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/runcoms/README.md b/runcoms/README.md
index 2f26fc9d..9b27ca79 100644
--- a/runcoms/README.md
+++ b/runcoms/README.md
@@ -45,7 +45,7 @@ zprofile and zlogin are not meant to be used concurrently but can be done so.
 This file is sourced by interactive shells. It should define aliases,
 functions, shell options, and key bindings.
 
-This is the main Oh My Zsh configuration file.
+This is the main Prezto configuration file.
 
 ### zlogin
 
@@ -71,5 +71,5 @@ Authors
 [1]: http://www.kornshell.com
 [2]: http://en.wikipedia.org/wiki/Fortune_(Unix)
 [3]: http://www.manpagez.com/man/1/msgs
-[4]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[4]: https://github.com/sorin-ionescu/prezto/issues
 
diff --git a/runcoms/zshenv b/runcoms/zshenv
index ffa2ae96..d23533be 100644
--- a/runcoms/zshenv
+++ b/runcoms/zshenv
@@ -5,8 +5,9 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Set the path to Oh My Zsh.
-export OMZ="$HOME/.oh-my-zsh"
+# Set the path to Prezto.
+export ZDOTDIR="${ZDOTDIR:-$HOME}"
+export PREZTO="$ZDOTDIR/.zprezto"
 
 #
 # Browser
diff --git a/runcoms/zshrc b/runcoms/zshrc
index 641d0275..0f869eb5 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -1,34 +1,34 @@
 #
-# Sets Oh My Zsh options.
+# Sets Prezto options.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
 # Set the key mapping style to 'emacs' or 'vi'.
-zstyle ':omz:module:editor' keymap 'emacs'
+zstyle ':prezto:module:editor' keymap 'emacs'
 
 # Auto convert .... to ../..
-zstyle ':omz:module:editor' dot-expansion 'no'
+zstyle ':prezto:module:editor' dot-expansion 'no'
 
 # Set case-sensitivity for completion, history lookup, etc.
-zstyle ':omz:*:*' case-sensitive 'no'
+zstyle ':prezto:*:*' case-sensitive 'no'
 
 # Color output (auto set to 'no' on dumb terminals).
-zstyle ':omz:*:*' color 'yes'
+zstyle ':prezto:*:*' color 'yes'
 
 # Auto set the tab and window titles.
-zstyle ':omz:module:terminal' auto-title 'yes'
+zstyle ':prezto:module:terminal' auto-title 'yes'
 
 # Set the Zsh modules to load (man zshmodules).
-# zstyle ':omz:load' zmodule 'attr' 'stat'
+# zstyle ':prezto:load' zmodule 'attr' 'stat'
 
 # Set the Zsh functions to load (man zshcontrib).
-# zstyle ':omz:load' zfunction 'zargs' 'zmv'
+# zstyle ':prezto:load' zfunction 'zargs' 'zmv'
 
-# Set the Oh My Zsh modules to load (browse modules).
+# Set the Prezto modules to load (browse modules).
 # The order matters.
-zstyle ':omz:load' omodule \
+zstyle ':prezto:load' pmodule \
   'environment' \
   'terminal' \
   'editor' \
@@ -42,10 +42,10 @@ zstyle ':omz:load' omodule \
 # Set the prompt theme to load.
 # Setting it to 'random' loads a random theme.
 # Auto set to 'off' on dumb terminals.
-zstyle ':omz:module:prompt' theme 'sorin'
+zstyle ':prezto:module:prompt' theme 'sorin'
 
-# This will make you shout: OH MY ZSHELL!
-source "$OMZ/init.zsh"
+# Source Prezto.
+source "$PREZTO/init.zsh"
 
 # Customize to your needs...