diff --git a/omz b/omz
index a6e4a39eb..4ca3fbe9d 100644
--- a/omz
+++ b/omz
@@ -15,7 +15,7 @@ omz() {
       # add plugins to fpath
       for plugin ($plugins); do
         files=({$OMZ,$ZSH}/plugins/$plugin)
-        fpath+=$files[1]
+	fpath=($files[1] $fpath)
       done
 
       # Load and run compinit
@@ -38,7 +38,8 @@ omz() {
     "theme")
       local theme
       zstyle -a :omz:style theme theme
-      set_theme ${2:-$theme}
+      [[ -f {$OMZ,$ZSH}/themes/$2.zsh-theme(N) ]] && theme=$2 || omz_log_msg "Theme: $2 not found."
+      set_theme $theme
       ;;
     *)
       echo "$0: invalid command $1" 2>&1