diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 4dc08140..7961e8c0 100644
--- a/oh-my-zsh.sh
+++ b/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" = ""  ]
-  then
-    source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+  if [[ -f "$ZSH/themes/$ZSH_THEME/$ZSH_THEME.theme.zsh" ]]; then
+    source "$ZSH/themes/$ZSH_THEME/$ZSH_THEME.theme.zsh"
   fi
 fi
 
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah/Soliah.theme.zsh
similarity index 100%
rename from themes/Soliah.zsh-theme
rename to themes/Soliah/Soliah.theme.zsh
diff --git a/themes/afowler.zsh-theme b/themes/afowler/afowler.theme.zsh
similarity index 100%
rename from themes/afowler.zsh-theme
rename to themes/afowler/afowler.theme.zsh
diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody/alanpeabody.theme.zsh
similarity index 100%
rename from themes/alanpeabody.zsh-theme
rename to themes/alanpeabody/alanpeabody.theme.zsh
diff --git a/themes/arrow.zsh-theme b/themes/arrow/arrow.theme.zsh
similarity index 100%
rename from themes/arrow.zsh-theme
rename to themes/arrow/arrow.theme.zsh
diff --git a/themes/aussiegeek.zsh-theme b/themes/aussiegeek/aussiegeek.theme.zsh
similarity index 100%
rename from themes/aussiegeek.zsh-theme
rename to themes/aussiegeek/aussiegeek.theme.zsh
diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda/awesomepanda.theme.zsh
similarity index 100%
rename from themes/awesomepanda.zsh-theme
rename to themes/awesomepanda/awesomepanda.theme.zsh
diff --git a/themes/bira.zsh-theme b/themes/bira/bira.theme.zsh
similarity index 100%
rename from themes/bira.zsh-theme
rename to themes/bira/bira.theme.zsh
diff --git a/themes/candy.zsh-theme b/themes/candy/candy.theme.zsh
similarity index 100%
rename from themes/candy.zsh-theme
rename to themes/candy/candy.theme.zsh
diff --git a/themes/clean.zsh-theme b/themes/clean/clean.theme.zsh
similarity index 100%
rename from themes/clean.zsh-theme
rename to themes/clean/clean.theme.zsh
diff --git a/themes/cloud.zsh-theme b/themes/cloud/cloud.theme.zsh
similarity index 100%
rename from themes/cloud.zsh-theme
rename to themes/cloud/cloud.theme.zsh
diff --git a/themes/cypher.zsh-theme b/themes/cypher/cypher.theme.zsh
similarity index 100%
rename from themes/cypher.zsh-theme
rename to themes/cypher/cypher.theme.zsh
diff --git a/themes/dallas.zsh-theme b/themes/dallas/dallas.theme.zsh
similarity index 100%
rename from themes/dallas.zsh-theme
rename to themes/dallas/dallas.theme.zsh
diff --git a/themes/darkblood.zsh-theme b/themes/darkblood/darkblood.theme.zsh
similarity index 100%
rename from themes/darkblood.zsh-theme
rename to themes/darkblood/darkblood.theme.zsh
diff --git a/themes/daveverwer.zsh-theme b/themes/daveverwer/daveverwer.theme.zsh
similarity index 100%
rename from themes/daveverwer.zsh-theme
rename to themes/daveverwer/daveverwer.theme.zsh
diff --git a/themes/dieter.zsh-theme b/themes/dieter/dieter.theme.zsh
similarity index 100%
rename from themes/dieter.zsh-theme
rename to themes/dieter/dieter.theme.zsh
diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk/dogenpunk.theme.zsh
similarity index 100%
rename from themes/dogenpunk.zsh-theme
rename to themes/dogenpunk/dogenpunk.theme.zsh
diff --git a/themes/dst.zsh-theme b/themes/dst/dst.theme.zsh
similarity index 100%
rename from themes/dst.zsh-theme
rename to themes/dst/dst.theme.zsh
diff --git a/themes/dstufft.zsh-theme b/themes/dstufft/dstufft.theme.zsh
similarity index 100%
rename from themes/dstufft.zsh-theme
rename to themes/dstufft/dstufft.theme.zsh
diff --git a/themes/duellj.zsh-theme b/themes/duellj/duellj.theme.zsh
similarity index 100%
rename from themes/duellj.zsh-theme
rename to themes/duellj/duellj.theme.zsh
diff --git a/themes/eastwood.zsh-theme b/themes/eastwood/eastwood.theme.zsh
similarity index 100%
rename from themes/eastwood.zsh-theme
rename to themes/eastwood/eastwood.theme.zsh
diff --git a/themes/edvardm.zsh-theme b/themes/edvardm/edvardm.theme.zsh
similarity index 100%
rename from themes/edvardm.zsh-theme
rename to themes/edvardm/edvardm.theme.zsh
diff --git a/themes/evan.zsh-theme b/themes/evan/evan.theme.zsh
similarity index 100%
rename from themes/evan.zsh-theme
rename to themes/evan/evan.theme.zsh
diff --git a/themes/example.zsh-theme b/themes/example/example.theme.zsh
similarity index 100%
rename from themes/example.zsh-theme
rename to themes/example/example.theme.zsh
diff --git a/themes/fishy.zsh-theme b/themes/fishy/fishy.theme.zsh
similarity index 100%
rename from themes/fishy.zsh-theme
rename to themes/fishy/fishy.theme.zsh
diff --git a/themes/flazz.zsh-theme b/themes/flazz/flazz.theme.zsh
similarity index 100%
rename from themes/flazz.zsh-theme
rename to themes/flazz/flazz.theme.zsh
diff --git a/themes/fletcherm.zsh-theme b/themes/fletcherm/fletcherm.theme.zsh
similarity index 100%
rename from themes/fletcherm.zsh-theme
rename to themes/fletcherm/fletcherm.theme.zsh
diff --git a/themes/frisk.zsh-theme b/themes/frisk/frisk.theme.zsh
similarity index 100%
rename from themes/frisk.zsh-theme
rename to themes/frisk/frisk.theme.zsh
diff --git a/themes/funky.zsh-theme b/themes/funky/funky.theme.zsh
similarity index 100%
rename from themes/funky.zsh-theme
rename to themes/funky/funky.theme.zsh
diff --git a/themes/fwalch.zsh-theme b/themes/fwalch/fwalch.theme.zsh
similarity index 100%
rename from themes/fwalch.zsh-theme
rename to themes/fwalch/fwalch.theme.zsh
diff --git a/themes/gallifrey.zsh-theme b/themes/gallifrey/gallifrey.theme.zsh
similarity index 100%
rename from themes/gallifrey.zsh-theme
rename to themes/gallifrey/gallifrey.theme.zsh
diff --git a/themes/gallois.zsh-theme b/themes/gallois/gallois.theme.zsh
similarity index 100%
rename from themes/gallois.zsh-theme
rename to themes/gallois/gallois.theme.zsh
diff --git a/themes/garyblessington.zsh-theme b/themes/garyblessington/garyblessington.theme.zsh
similarity index 100%
rename from themes/garyblessington.zsh-theme
rename to themes/garyblessington/garyblessington.theme.zsh
diff --git a/themes/gentoo.zsh-theme b/themes/gentoo/gentoo.theme.zsh
similarity index 100%
rename from themes/gentoo.zsh-theme
rename to themes/gentoo/gentoo.theme.zsh
diff --git a/themes/geoffgarside.zsh-theme b/themes/geoffgarside/geoffgarside.theme.zsh
similarity index 100%
rename from themes/geoffgarside.zsh-theme
rename to themes/geoffgarside/geoffgarside.theme.zsh
diff --git a/themes/gozilla.zsh-theme b/themes/gozilla/gozilla.theme.zsh
similarity index 100%
rename from themes/gozilla.zsh-theme
rename to themes/gozilla/gozilla.theme.zsh
diff --git a/themes/humza.zsh-theme b/themes/humza/humza.theme.zsh
similarity index 100%
rename from themes/humza.zsh-theme
rename to themes/humza/humza.theme.zsh
diff --git a/themes/imajes.zsh-theme b/themes/imajes/imajes.theme.zsh
similarity index 100%
rename from themes/imajes.zsh-theme
rename to themes/imajes/imajes.theme.zsh
diff --git a/themes/jbergantine.zsh-theme b/themes/jbergantine/jbergantine.theme.zsh
similarity index 100%
rename from themes/jbergantine.zsh-theme
rename to themes/jbergantine/jbergantine.theme.zsh
diff --git a/themes/jispwoso.zsh-theme b/themes/jispwoso/jispwoso.theme.zsh
similarity index 100%
rename from themes/jispwoso.zsh-theme
rename to themes/jispwoso/jispwoso.theme.zsh
diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe/jnrowe.theme.zsh
similarity index 100%
rename from themes/jnrowe.zsh-theme
rename to themes/jnrowe/jnrowe.theme.zsh
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan/jonathan.theme.zsh
similarity index 100%
rename from themes/jonathan.zsh-theme
rename to themes/jonathan/jonathan.theme.zsh
diff --git a/themes/josh.zsh-theme b/themes/josh/josh.theme.zsh
similarity index 100%
rename from themes/josh.zsh-theme
rename to themes/josh/josh.theme.zsh
diff --git a/themes/jreese.zsh-theme b/themes/jreese/jreese.theme.zsh
similarity index 100%
rename from themes/jreese.zsh-theme
rename to themes/jreese/jreese.theme.zsh
diff --git a/themes/jtriley.zsh-theme b/themes/jtriley/jtriley.theme.zsh
similarity index 100%
rename from themes/jtriley.zsh-theme
rename to themes/jtriley/jtriley.theme.zsh
diff --git a/themes/juanghurtado.zsh-theme b/themes/juanghurtado/juanghurtado.theme.zsh
similarity index 100%
rename from themes/juanghurtado.zsh-theme
rename to themes/juanghurtado/juanghurtado.theme.zsh
diff --git a/themes/kardan.zsh-theme b/themes/kardan/kardan.theme.zsh
similarity index 100%
rename from themes/kardan.zsh-theme
rename to themes/kardan/kardan.theme.zsh
diff --git a/themes/kennethreitz.zsh-theme b/themes/kennethreitz/kennethreitz.theme.zsh
similarity index 100%
rename from themes/kennethreitz.zsh-theme
rename to themes/kennethreitz/kennethreitz.theme.zsh
diff --git a/themes/kolo.zsh-theme b/themes/kolo/kolo.theme.zsh
similarity index 100%
rename from themes/kolo.zsh-theme
rename to themes/kolo/kolo.theme.zsh
diff --git a/themes/kphoen.zsh-theme b/themes/kphoen/kphoen.theme.zsh
similarity index 100%
rename from themes/kphoen.zsh-theme
rename to themes/kphoen/kphoen.theme.zsh
diff --git a/themes/lambda.zsh-theme b/themes/lambda/lambda.theme.zsh
similarity index 100%
rename from themes/lambda.zsh-theme
rename to themes/lambda/lambda.theme.zsh
diff --git a/themes/linuxonly b/themes/linuxonly/linuxonly
similarity index 100%
rename from themes/linuxonly
rename to themes/linuxonly/linuxonly
diff --git a/themes/lukerandall.zsh-theme b/themes/lukerandall/lukerandall.theme.zsh
similarity index 100%
rename from themes/lukerandall.zsh-theme
rename to themes/lukerandall/lukerandall.theme.zsh
diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby/macovsky-ruby.theme.zsh
similarity index 100%
rename from themes/macovsky-ruby.zsh-theme
rename to themes/macovsky-ruby/macovsky-ruby.theme.zsh
diff --git a/themes/macovsky.zsh-theme b/themes/macovsky/macovsky.theme.zsh
similarity index 100%
rename from themes/macovsky.zsh-theme
rename to themes/macovsky/macovsky.theme.zsh
diff --git a/themes/maran.zsh-theme b/themes/maran/maran.theme.zsh
similarity index 100%
rename from themes/maran.zsh-theme
rename to themes/maran/maran.theme.zsh
diff --git a/themes/mgutz.zsh-theme b/themes/mgutz/mgutz.theme.zsh
similarity index 100%
rename from themes/mgutz.zsh-theme
rename to themes/mgutz/mgutz.theme.zsh
diff --git a/themes/mikeh.zsh-theme b/themes/mikeh/mikeh.theme.zsh
similarity index 100%
rename from themes/mikeh.zsh-theme
rename to themes/mikeh/mikeh.theme.zsh
diff --git a/themes/miloshadzic.zsh-theme b/themes/miloshadzic/miloshadzic.theme.zsh
similarity index 100%
rename from themes/miloshadzic.zsh-theme
rename to themes/miloshadzic/miloshadzic.theme.zsh
diff --git a/themes/minimal.zsh-theme b/themes/minimal/minimal.theme.zsh
similarity index 100%
rename from themes/minimal.zsh-theme
rename to themes/minimal/minimal.theme.zsh
diff --git a/themes/mrtazz.zsh-theme b/themes/mrtazz/mrtazz.theme.zsh
similarity index 100%
rename from themes/mrtazz.zsh-theme
rename to themes/mrtazz/mrtazz.theme.zsh
diff --git a/themes/murilasso.zsh-theme b/themes/murilasso/murilasso.theme.zsh
similarity index 100%
rename from themes/murilasso.zsh-theme
rename to themes/murilasso/murilasso.theme.zsh
diff --git a/themes/muse.zsh-theme b/themes/muse/muse.theme.zsh
similarity index 100%
rename from themes/muse.zsh-theme
rename to themes/muse/muse.theme.zsh
diff --git a/themes/nanotech.zsh-theme b/themes/nanotech/nanotech.theme.zsh
similarity index 100%
rename from themes/nanotech.zsh-theme
rename to themes/nanotech/nanotech.theme.zsh
diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos/nebirhos.theme.zsh
similarity index 100%
rename from themes/nebirhos.zsh-theme
rename to themes/nebirhos/nebirhos.theme.zsh
diff --git a/themes/nicoulaj.zsh-theme b/themes/nicoulaj/nicoulaj.theme.zsh
similarity index 100%
rename from themes/nicoulaj.zsh-theme
rename to themes/nicoulaj/nicoulaj.theme.zsh
diff --git a/themes/obraun.zsh-theme b/themes/obraun/obraun.theme.zsh
similarity index 100%
rename from themes/obraun.zsh-theme
rename to themes/obraun/obraun.theme.zsh
diff --git a/themes/philips.zsh-theme b/themes/philips/philips.theme.zsh
similarity index 100%
rename from themes/philips.zsh-theme
rename to themes/philips/philips.theme.zsh
diff --git a/themes/pmcgee.zsh-theme b/themes/pmcgee/pmcgee.theme.zsh
similarity index 100%
rename from themes/pmcgee.zsh-theme
rename to themes/pmcgee/pmcgee.theme.zsh
diff --git a/themes/re5et.zsh-theme b/themes/re5et/re5et.theme.zsh
similarity index 100%
rename from themes/re5et.zsh-theme
rename to themes/re5et/re5et.theme.zsh
diff --git a/themes/rgm.zsh-theme b/themes/rgm/rgm.theme.zsh
similarity index 100%
rename from themes/rgm.zsh-theme
rename to themes/rgm/rgm.theme.zsh
diff --git a/themes/risto.zsh-theme b/themes/risto/risto.theme.zsh
similarity index 100%
rename from themes/risto.zsh-theme
rename to themes/risto/risto.theme.zsh
diff --git a/themes/rixius.zsh-theme b/themes/rixius/rixius.theme.zsh
similarity index 100%
rename from themes/rixius.zsh-theme
rename to themes/rixius/rixius.theme.zsh
diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell/robbyrussell.theme.zsh
similarity index 100%
rename from themes/robbyrussell.zsh-theme
rename to themes/robbyrussell/robbyrussell.theme.zsh
diff --git a/themes/simple.zsh-theme b/themes/simple/simple.theme.zsh
similarity index 100%
rename from themes/simple.zsh-theme
rename to themes/simple/simple.theme.zsh
diff --git a/themes/skaro.zsh-theme b/themes/skaro/skaro.theme.zsh
similarity index 100%
rename from themes/skaro.zsh-theme
rename to themes/skaro/skaro.theme.zsh
diff --git a/themes/smt.zsh-theme b/themes/smt/smt.theme.zsh
similarity index 100%
rename from themes/smt.zsh-theme
rename to themes/smt/smt.theme.zsh
diff --git a/themes/sorin.zsh-theme b/themes/sorin/sorin.theme.zsh
similarity index 100%
rename from themes/sorin.zsh-theme
rename to themes/sorin/sorin.theme.zsh
diff --git a/themes/sporty_256.zsh-theme b/themes/sporty_256/sporty_256.theme.zsh
similarity index 100%
rename from themes/sporty_256.zsh-theme
rename to themes/sporty_256/sporty_256.theme.zsh
diff --git a/themes/steeef.zsh-theme b/themes/steeef/steeef.theme.zsh
similarity index 100%
rename from themes/steeef.zsh-theme
rename to themes/steeef/steeef.theme.zsh
diff --git a/themes/sunaku.zsh-theme b/themes/sunaku/sunaku.theme.zsh
similarity index 100%
rename from themes/sunaku.zsh-theme
rename to themes/sunaku/sunaku.theme.zsh
diff --git a/themes/takashiyoshida.zsh-theme b/themes/takashiyoshida/takashiyoshida.theme.zsh
similarity index 100%
rename from themes/takashiyoshida.zsh-theme
rename to themes/takashiyoshida/takashiyoshida.theme.zsh
diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler/theunraveler.theme.zsh
similarity index 100%
rename from themes/theunraveler.zsh-theme
rename to themes/theunraveler/theunraveler.theme.zsh
diff --git a/themes/tjkirch.zsh-theme b/themes/tjkirch/tjkirch.theme.zsh
similarity index 100%
rename from themes/tjkirch.zsh-theme
rename to themes/tjkirch/tjkirch.theme.zsh
diff --git a/themes/tonotdo.zsh-theme b/themes/tonotdo/tonotdo.theme.zsh
similarity index 100%
rename from themes/tonotdo.zsh-theme
rename to themes/tonotdo/tonotdo.theme.zsh
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r/trapd00r.theme.zsh
similarity index 100%
rename from themes/trapd00r.zsh-theme
rename to themes/trapd00r/trapd00r.theme.zsh
diff --git a/themes/wezm+.zsh-theme b/themes/wezm+/wezm+.theme.zsh
similarity index 100%
rename from themes/wezm+.zsh-theme
rename to themes/wezm+/wezm+.theme.zsh
diff --git a/themes/wezm.zsh-theme b/themes/wezm/wezm.theme.zsh
similarity index 100%
rename from themes/wezm.zsh-theme
rename to themes/wezm/wezm.theme.zsh
diff --git a/themes/xiong-chiamiov-plus.zsh-theme b/themes/xiong-chiamiov-plus/xiong-chiamiov-plus.theme.zsh
similarity index 100%
rename from themes/xiong-chiamiov-plus.zsh-theme
rename to themes/xiong-chiamiov-plus/xiong-chiamiov-plus.theme.zsh
diff --git a/themes/xiong-chiamiov.zsh-theme b/themes/xiong-chiamiov/xiong-chiamiov.theme.zsh
similarity index 100%
rename from themes/xiong-chiamiov.zsh-theme
rename to themes/xiong-chiamiov/xiong-chiamiov.theme.zsh