diff --git a/git-prompt-colors.sh b/git-prompt-colors.sh
deleted file mode 100644
index 9d6a7ed..0000000
--- a/git-prompt-colors.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-# These are the color definitions used by gitprompt.sh
-
-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
-
-  # For the command indicator, the placeholder _LAST_COMMAND_STATE_ 
-  # will be replaced with the exit code of the last command
-  # e.g.
-  # GIT_PROMPT_COMMAND_OK="${Green}✔-_LAST_COMMAND_STATE_ "    # indicator if the last command returned with an exit code of 0
-  # GIT_PROMPT_COMMAND_FAIL="${Red}✘-_LAST_COMMAND_STATE_ "    # indicator if the last command returned with an exit code of other than 0
-
-  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
-
-  # template for displaying the current virtual environment
-  # use the placeholder _VIRTUALENV_ will be replaced with 
-  # the name of the current virtual environment (currently CONDA and VIRTUAL_ENV)
-  GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) "
-  
-  # _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL
-  GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}"
-  GIT_PROMPT_START_ROOT="_LAST_COMMAND_INDICATOR_ ${GIT_PROMPT_START_USER}"
-  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
diff --git a/git-prompt-help.sh b/git-prompt-help.sh
index 8b9b390..d1fe751 100755
--- a/git-prompt-help.sh
+++ b/git-prompt-help.sh
@@ -3,8 +3,8 @@
 # being displayed.
 
 git_prompt_help() {
-  source prompt-colors.sh
-  source git-prompt-colors.sh
+  source ${__GIT_PROMPT_DIR}/prompt-colors.sh
+  source themes/Default.bgptheme
  cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\]//g'
 The git prompt format is [<BRANCH><TRACKING>|<LOCALSTATUS>]
 
diff --git a/themes/Default.bgptheme b/themes/Default.bgptheme
deleted file mode 120000
index 8e0b4a1..0000000
--- a/themes/Default.bgptheme
+++ /dev/null
@@ -1 +0,0 @@
-Original.bgptheme
\ No newline at end of file
diff --git a/themes/NoLastCommandIndicator.bgptheme b/themes/NoLastCommandIndicator.bgptheme
index b6309b3..751b7ed 100644
--- a/themes/NoLastCommandIndicator.bgptheme
+++ b/themes/NoLastCommandIndicator.bgptheme
@@ -1,4 +1,4 @@
-# These are the color definitions used by gitprompt.sh
+# This is the default theme for gitprompt.sh without the indicator of the last command state
 
 define_git_prompt_colors() {
   Time12a="\$(date +%H:%M)"
diff --git a/themes/Original.bgptheme b/themes/Original.bgptheme
deleted file mode 100644
index 9d6a7ed..0000000
--- a/themes/Original.bgptheme
+++ /dev/null
@@ -1,50 +0,0 @@
-# These are the color definitions used by gitprompt.sh
-
-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
-
-  # For the command indicator, the placeholder _LAST_COMMAND_STATE_ 
-  # will be replaced with the exit code of the last command
-  # e.g.
-  # GIT_PROMPT_COMMAND_OK="${Green}✔-_LAST_COMMAND_STATE_ "    # indicator if the last command returned with an exit code of 0
-  # GIT_PROMPT_COMMAND_FAIL="${Red}✘-_LAST_COMMAND_STATE_ "    # indicator if the last command returned with an exit code of other than 0
-
-  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
-
-  # template for displaying the current virtual environment
-  # use the placeholder _VIRTUALENV_ will be replaced with 
-  # the name of the current virtual environment (currently CONDA and VIRTUAL_ENV)
-  GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) "
-  
-  # _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL
-  GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}"
-  GIT_PROMPT_START_ROOT="_LAST_COMMAND_INDICATOR_ ${GIT_PROMPT_START_USER}"
-  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