Moved each theme under its own directory and changed the file extension.

oh-my-zsh.sh

@@ -29,15 +29,14 @@ done
 
 # Load the theme.
 if [[ "$ZSH_THEME" == "random" ]]; then
-  themes=($ZSH/themes/*.zsh-theme)
+  themes=($ZSH/themes/**/*.theme.zsh)
   theme_index=${#themes[@]}
   (( theme_index=((RANDOM % theme_index) + 1) ))
   random_theme="${themes[$theme_index]}"
   source "$random_theme"
 else
-  if [ ! "$ZSH_THEME" = ""  ]
+  if [[ -f "$ZSH/themes/$ZSH_THEME/$ZSH_THEME.theme.zsh" ]]; then
-  then
+    source "$ZSH/themes/$ZSH_THEME/$ZSH_THEME.theme.zsh"
-    source "$ZSH/themes/$ZSH_THEME.zsh-theme"
   fi
 fi