diff --git a/omz b/omz
index 9f8c1564f..e712d84b3 100644
--- a/omz
+++ b/omz
@@ -44,14 +44,15 @@ omz() {
       compinit -i
 
       # load plugins (TODO: Make this slimmer and better)
-      for plugin ($plugins); do
-        plugin_sub=$(echo $plugin|cut -d'/' -f2)
-        if [[ -f $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
-        source $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh
-        elif [[ -f $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
-        source $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh
-        fi
-      done
+      for plugin ($fpath/*.plugin.zsh(N)) source $plugin
+    #  for plugin ($plugins); do
+    #    plugin_sub=$(echo $plugin|cut -d'/' -f2)
+    #    if [[ -f $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
+    #    source $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh
+    #    elif [[ -f $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
+    #    source $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh
+    #    fi
+    #  done
 
       local theme
       zstyle -a :omz:style theme theme