diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 732a403b7..f25aab835 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,13 +13,19 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
+
+# Set ZSH_LOCAL_CUSTOM path where your custom config files
+# and plugins exists, or else we will use the default ~/.zsh/
+if [[ -z "$ZSH_LOCAL" ]]; then
+    ZSH_LOCAL="$HOME/.zsh/"
+fi
+
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
 if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -29,7 +35,9 @@ is_plugin() {
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
 for plugin ($plugins); do
-  if is_plugin $ZSH_CUSTOM $plugin; then
+  if is_plugin $ZSH_LOCAL $plugin; then
+    fpath=($ZSH_LOCAL/plugins/$plugin $fpath)
+  elif is_plugin $ZSH_CUSTOM $plugin; then
     fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
   elif is_plugin $ZSH $plugin; then
     fpath=($ZSH/plugins/$plugin $fpath)
@@ -43,7 +51,9 @@ compinit -i
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+  if [ -f $ZSH_LOCAL/plugins/$plugin/$plugin.plugin.zsh ]; then
+    source $ZSH_LOCAL/plugins/$plugin/$plugin.plugin.zsh
+  elif [ -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
@@ -52,6 +62,8 @@ done
 
 # Load all of your custom configurations from custom/
 for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
+# Load all of your custom configurations from local
+for config_file ($ZSH_LOCAL/*.zsh) source $config_file
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]
@@ -65,9 +77,10 @@ then
 else
   if [ ! "$ZSH_THEME" = ""  ]
   then
-    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
-    then
-      source "$ZSH/custom/$ZSH_THEME.zsh-theme"
+    if [ -f "$ZSH_LOCAL/$ZSH_THEME.zsh-theme" ]; then
+      source "$ZSH_LOCAL/$ZSH_THEME.zsh-theme"
+    elif [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
     else
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"
     fi