diff --git a/git-prompt-colors.sh b/git-prompt-colors.sh
index aa76a49..654fb1e 100644
--- a/git-prompt-colors.sh
+++ b/git-prompt-colors.sh
@@ -1,44 +1,40 @@
 # These are the color definitions used by gitprompt.sh
 
-declare -g GIT_PROMPT_PREFIX
-declare -g GIT_PROMPT_SUFFIX
-declare -g GIT_PROMPT_SEPARATOR
-declare -g GIT_PROMPT_BRANCH
-declare -g GIT_PROMPT_STAGED
-declare -g GIT_PROMPT_CONFLICTS
-declare -g GIT_PROMPT_CHANGED
-declare -g GIT_PROMPT_REMOTE
-declare -g GIT_PROMPT_UNTRACKED
-declare -g GIT_PROMPT_STASHED
-declare -g GIT_PROMPT_CLEAN
-
-local Time12a="\$(date +%H:%M)"
-local PathShort="\w"
+define_git_prompt_colors() {
+
+  Time12a="\$(date +%H:%M)"
+  PathShort="\w"
+
+  # These are the color definitions used by gitprompt.sh
+  GIT_PROMPT_PREFIX="["                 # start of the git info string
+  GIT_PROMPT_SUFFIX="]"                 # the end of the git info string
+  GIT_PROMPT_SEPARATOR="|"              # separates each item
+
+  GIT_PROMPT_BRANCH="${Magenta}"        # the git branch that is active in the current directory
+  GIT_PROMPT_STAGED="${Red}●"           # the number of staged files/directories
+  GIT_PROMPT_CONFLICTS="${Red}✖ "       # the number of files in conflict
+  GIT_PROMPT_CHANGED="${Blue}✚ "        # the number of changed files
+
+  GIT_PROMPT_REMOTE=" "                 # the remote branch name (if any) and the symbols for ahead and behind
+  GIT_PROMPT_UNTRACKED="${Cyan}…"       # the number of untracked files/dirs
+  GIT_PROMPT_STASHED="${BoldBlue}⚑ "    # the number of stashed files/dir
+  GIT_PROMPT_CLEAN="${BoldGreen}✔"      # a colored flag indicating a "clean" repo
+
+  GIT_PROMPT_COMMAND_OK="${Green}✔ "    # indicator if the last command returned with an exit code of 0
+  GIT_PROMPT_COMMAND_FAIL="${Red}✘ "   # indicator if the last command returned with an exit code of other than 0
+
+  GIT_PROMPT_START_USER="${Yellow}${PathShort}${ResetColor}"
+  GIT_PROMPT_START_ROOT="${Yellow}${PathShort}${ResetColor}"
+  GIT_PROMPT_END_USER=" \n${White}${Time12a}${ResetColor} $ "
+  GIT_PROMPT_END_ROOT=" \n${White}${Time12a}${ResetColor} # "
+
+  # Please do not add colors to these symbols
+  GIT_PROMPT_SYMBOLS_AHEAD="↑·"         # The symbol for "n versions ahead of origin"
+  GIT_PROMPT_SYMBOLS_BEHIND="↓·"        # The symbol for "n versions behind of origin"
+  GIT_PROMPT_SYMBOLS_PREHASH=":"        # Written before hash of commit, if no name could be found
+}
+
+if [[ -z "$GIT_PROMPT_SEPARATOR" || -z "$GIT_PROMPT_COMMAND_OK" ]]; then
+  define_git_prompt_colors
+fi
 
-# These are the color definitions used by gitprompt.sh
-GIT_PROMPT_PREFIX="["                 # start of the git info string
-GIT_PROMPT_SUFFIX="]"                 # the end of the git info string
-GIT_PROMPT_SEPARATOR="|"              # separates each item
-
-GIT_PROMPT_BRANCH="${Magenta}"        # the git branch that is active in the current directory
-GIT_PROMPT_STAGED="${Red}●"           # the number of staged files/directories
-GIT_PROMPT_CONFLICTS="${Red}✖ "       # the number of files in conflict
-GIT_PROMPT_CHANGED="${Blue}✚ "        # the number of changed files
-
-GIT_PROMPT_REMOTE=" "                 # the remote branch name (if any) and the symbols for ahead and behind
-GIT_PROMPT_UNTRACKED="${Cyan}…"       # the number of untracked files/dirs
-GIT_PROMPT_STASHED="${BoldBlue}⚑ "    # the number of stashed files/dir
-GIT_PROMPT_CLEAN="${BoldGreen}✔"      # a colored flag indicating a "clean" repo
-
-GIT_PROMPT_COMMAND_OK="${Green}✔ "    # indicator if the last command returned with an exit code of 0
-GIT_PROMPT_COMMAND_FAIL="${Red}✘ "   # indicator if the last command returned with an exit code of other than 0
-
-GIT_PROMPT_START_USER="${Yellow}${PathShort}${ResetColor}"
-GIT_PROMPT_START_ROOT="${Yellow}${PathShort}${ResetColor}"
-GIT_PROMPT_END_USER=" \n${White}${Time12a}${ResetColor} $ "
-GIT_PROMPT_END_ROOT=" \n${White}${Time12a}${ResetColor} # "
-
-# Please do not add colors to these symbols
-GIT_PROMPT_SYMBOLS_AHEAD="↑·"         # The symbol for "n versions ahead of origin"
-GIT_PROMPT_SYMBOLS_BEHIND="↓·"        # The symbol for "n versions behind of origin"
-GIT_PROMPT_SYMBOLS_PREHASH=":"        # Written before hash of commit, if no name could be found