From 816f717aba76b7a346855ced2f206f8937983d13 Mon Sep 17 00:00:00 2001
From: Ben Mitchell <ben.mitchell@apple.com>
Date: Sun, 12 Feb 2012 14:58:36 -0800
Subject: [PATCH 1/2] Theme loading should use $ZSH_CUSTOM rather than
 $ZSH/custom.

---
 oh-my-zsh.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 732a403b7..b00a746ea 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -65,11 +65,11 @@ then
 else
   if [ ! "$ZSH_THEME" = ""  ]
   then
-    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
     then
-      source "$ZSH/custom/$ZSH_THEME.zsh-theme"
+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
     else
-      source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
     fi
   fi
 fi

From b369a52132ef1a666cc9f5d012ab3714c4547d6d Mon Sep 17 00:00:00 2001
From: Ben Mitchell <ben.mitchell@apple.com>
Date: Mon, 27 Feb 2012 23:35:05 -0800
Subject: [PATCH 2/2] Fix mistaken removal of one too many $ZSHes. We now fall
 back to $ZSH/themes/ if $ZSH_CUSTOM/$ZSH_THEME.zsh-theme does not exist.

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index b00a746ea..4122810fe 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -69,7 +69,7 @@ else
     then
       source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
     else
-      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
+      source "$ZSH/themes/$ZSH_THEME.zsh-theme"
     fi
   fi
 fi