diff --git a/omz b/omz
index 740a412c8..a6e4a39eb 100644
--- a/omz
+++ b/omz
@@ -25,16 +25,20 @@ omz() {
       # load lib
       for config_file ({$ZSH/lib,$OMZ}/*.zsh(N))
         source $config_file
-
+      omz plugin
+      omz theme
+      ;;
+    "plugin")
       # load plugins
       for plugin ($plugins); do
         files=({$OMZ,$ZSH}/plugins/$plugin/$(basename $plugin).plugin.zsh(N))
         source $files[1] || omz_log_msg "$plugin not found."
       done
-
+      ;;
+    "theme")
       local theme
       zstyle -a :omz:style theme theme
-      set_theme $theme
+      set_theme ${2:-$theme}
       ;;
     *)
       echo "$0: invalid command $1" 2>&1