diff --git a/oh-my-zsh.zsh b/oh-my-zsh.zsh
index 6aa016198..fa0864826 100644
--- a/oh-my-zsh.zsh
+++ b/oh-my-zsh.zsh
@@ -1,15 +1,19 @@
 # Initializes Oh My Zsh
+ZSH=${ZSH:-/usr/share/oh-my-zsh/}
 
 # add a function path
 fpath=($ZSH/functions $ZSH/completions $fpath)
+fpath=(~/.oh-my-zsh/functions ~/.oh-my-zsh/completions $fpath)
 
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
+for config_file (~/.oh-my-zsh/lib/*.zsh) source $config_file
 
 # Add all defined plugins to fpath
 plugin=${plugin:=()}
 for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
+for plugin ($plugins) fpath=(~/.oh-my-zsh/plugins/$plugin $fpath)
 
 # Load and run compinit
 autoload -U compinit
@@ -17,22 +21,22 @@ compinit -i
 
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
-if [ "$ZSH_CUSTOM" = ""  ]
-then
-    ZSH_CUSTOM="$ZSH/custom"
-fi
+# if [ "$ZSH_CUSTOM" = ""  ]
+# then
+#     ZSH_CUSTOM="$ZSH/custom"
+# fi
 
 # Load all of the plugins that were defined in ~/.zshrc
-for plugin ($plugins); do
-  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
-  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
-  fi
-done
+# for plugin ($plugins); do
+#   if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+#     source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
+#   elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+#     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+#   fi
+# done
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
+# for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]
@@ -49,4 +53,3 @@ else
     source "$ZSH/themes/$ZSH_THEME.zsh-theme"
   fi
 fi
-