diff --git a/lib/base.sh b/lib/base.sh
index 0736481..cc92e91 100644
--- a/lib/base.sh
+++ b/lib/base.sh
@@ -214,14 +214,14 @@ bigfind() {
 #   ii:  display useful host related informaton
 #   -------------------------------------------------------------------
     ii() {
-      echo -e "\\nYou are logged on ${_omb_term_red}$HOST"
+      echo -e "\\nYou are logged on ${_omb_term_brown}$HOST"
       echo -e "\\nAdditionnal information:$NC " ; uname -a
-      echo -e "\\n${_omb_term_red}Users logged on:$NC " ; w -h
-      echo -e "\\n${_omb_term_red}Current date :$NC " ; date
-      echo -e "\\n${_omb_term_red}Machine stats :$NC " ; uptime
-      [[ "$OSTYPE" == darwin* ]] && echo -e "\\n${_omb_term_red}Current network location :$NC " ; scselect
-      echo -e "\\n${_omb_term_red}Public facing IP Address :$NC " ;myip
-      [[ "$OSTYPE" == darwin* ]] && echo -e "\\n${_omb_term_red}DNS Configuration:$NC " ; scutil --dns
+      echo -e "\\n${_omb_term_brown}Users logged on:$NC " ; w -h
+      echo -e "\\n${_omb_term_brown}Current date :$NC " ; date
+      echo -e "\\n${_omb_term_brown}Machine stats :$NC " ; uptime
+      [[ "$OSTYPE" == darwin* ]] && echo -e "\\n${_omb_term_brown}Current network location :$NC " ; scselect
+      echo -e "\\n${_omb_term_brown}Public facing IP Address :$NC " ;myip
+      [[ "$OSTYPE" == darwin* ]] && echo -e "\\n${_omb_term_brown}DNS Configuration:$NC " ; scutil --dns
       echo
     }
 
@@ -233,12 +233,12 @@ bigfind() {
 #   batch_chmod: Batch chmod for all files & sub-directories in the current one
 #   -------------------------------------------------------------------
     batch_chmod() {
-      echo -ne "${_omb_term_bold_blue}Applying 0755 permission for all directories..."
+      echo -ne "${_omb_term_bold_navy}Applying 0755 permission for all directories..."
       (find . -type d -print0 | xargs -0 chmod 0755) &
       spinner
       echo -ne "${_omb_term_normal}"
       
-      echo -ne "${_omb_term_bold_blue}Applying 0644 permission for all files..."
+      echo -ne "${_omb_term_bold_navy}Applying 0644 permission for all files..."
       (find . -type f -print0 | xargs -0 chmod 0644) &
       spinner
       echo -ne "${_omb_term_normal}"
diff --git a/lib/omb-deprecate.sh b/lib/omb-deprecate.sh
index d89b7ba..d95405f 100644
--- a/lib/omb-deprecate.sh
+++ b/lib/omb-deprecate.sh
@@ -2,12 +2,12 @@
 
 function _omb_deprecate_warning {
   local level=$1 msg=$2
-  local sep=$_omb_term_cyan:
-  local src=$_omb_term_magenta${BASH_SOURCE[level+1]}
+  local sep=$_omb_term_teal:
+  local src=$_omb_term_purple${BASH_SOURCE[level+1]}
   local line=$_omb_term_green${BASH_LINENO[level]}
   local func=${FUNCNAME[level+1]}
   if [[ $func && $func != source ]]; then
-    func=" $_omb_term_cyan($_omb_term_blue$func$_omb_term_cyan)"
+    func=" $_omb_term_teal($_omb_term_navy$func$_omb_term_teal)"
   else
     func=
   fi
@@ -18,8 +18,8 @@ function _omb_deprecate_function__notify {
   local old=$1 new=$2
   local v=__omb_deprecate_Function_$old; v=${v//[!a-zA-Z0-9_]/'_'}
   [[ ${!v+set} ]] && return 0
-  local esc_old=$_omb_term_bold_red$old$_omb_term_reset
-  local esc_new=$_omb_term_bold_blue$new$_omb_term_reset
+  local esc_old=$_omb_term_bold_brown$old$_omb_term_reset
+  local esc_new=$_omb_term_bold_navy$new$_omb_term_reset
   _omb_deprecate_warning 2 "The function '$esc_old' is deprecated. Please use '$esc_new'." >&2
   printf -v "$v" notified
 }
@@ -96,8 +96,8 @@ if ((_omb_bash_version >= 40300)); then
     local __msg=$data
     local count=${_omb_deprecate_declare_counter[$__index,${BASH_SOURCE[1]},${BASH_LINENO[0]}]:-0}
     if ((count == 0)); then
-      local esc_old=$_omb_term_bold_red$__old$_omb_term_reset
-      local esc_new=$_omb_term_bold_blue$__new$_omb_term_reset
+      local esc_old=$_omb_term_bold_brown$__old$_omb_term_reset
+      local esc_new=$_omb_term_bold_navy$__new$_omb_term_reset
       if [[ $__new ]]; then
         _omb_deprecate_warning 1 "The variable '$esc_old' has been renamed to '$esc_new'. Please use '$esc_new'."
       else
@@ -149,8 +149,8 @@ else
       # Notify deprecation when the variable 'old_name' has been first changed.
       if [[ ${!__old+set} && ${!__old} != "$__value" && ${_omb_deprecate_declare_notify[__index]} ]]; then
         _omb_deprecate_declare_notify[__index]=
-        local esc_old=$_omb_term_bold_red$__old$_omb_term_reset
-        local esc_new=$_omb_term_bold_blue$__new$_omb_term_reset
+        local esc_old=$_omb_term_bold_brown$__old$_omb_term_reset
+        local esc_new=$_omb_term_bold_navy$__new$_omb_term_reset
         if [[ $__new ]]; then
           printf '%s\n' "oh-my-bash: The variable '$esc_old' is changed but has been renamed to '$esc_new'.  Please use '$esc_new'."
         else
@@ -211,7 +211,7 @@ if ((_omb_bash_version >= 40300)); then
     if [[ ${!__ref-} == "$__value" ]]; then
       local count=${_omb_deprecate_const_counter[$__index,${BASH_SOURCE[1]},${BASH_LINENO[0]}]:-0}
       if ((count == 0)); then
-        local esc_old=$_omb_term_bold_red$__old$_omb_term_reset
+        local esc_old=$_omb_term_bold_brown$__old$_omb_term_reset
         _omb_deprecate_warning 1 "The variable '$esc_old' has been deprecated.${__msg+ $__msg}" >&2
       fi
     fi
@@ -244,7 +244,7 @@ else
   }
 fi
 
-_omb_deprecate_msg_please_use="Please use '$_omb_term_bold_blue%s$_omb_term_reset'."
+_omb_deprecate_msg_please_use="Please use '$_omb_term_bold_navy%s$_omb_term_reset'."
 
 #------------------------------------------------------------------------------
 # deprecate functions and variables
@@ -274,18 +274,18 @@ _omb_deprecate_const 20000 ncolors   "$_omb_term_colors"    "${_omb_deprecate_ms
 _omb_deprecate_const 20000 bold      "$_omb_term_bold"      "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold}"
 _omb_deprecate_const 20000 underline "$_omb_term_underline" "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline}"
 _omb_deprecate_const 20000 reset     "$_omb_term_reset"     "${_omb_deprecate_msg_please_use/'%s'/_omb_term_reset}"
-_omb_deprecate_const 20000 tan       "$_omb_term_yellow"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_yellow}"
+_omb_deprecate_const 20000 tan       "$_omb_term_olive"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_olive}"
 
-_omb_deprecate_red=${_omb_term_red:+$'\1'$_omb_term_red$'\2'}
+_omb_deprecate_red=${_omb_term_brown:+$'\1'$_omb_term_brown$'\2'}
 _omb_deprecate_green=${_omb_term_green:+$'\1'$_omb_term_green$'\2'}
-_omb_deprecate_yellow=${_omb_term_yellow:+$'\1'$_omb_term_yellow$'\2'}
-_omb_deprecate_blue=${_omb_term_blue:+$'\1'$_omb_term_blue$'\2'}
-_omb_deprecate_magenta=${_omb_term_magenta:+$'\1'$_omb_term_magenta$'\2'}
-_omb_deprecate_const 20000 red       "$_omb_deprecate_red"     "Please use '${_omb_term_bold_blue}_omb_term_red$_omb_term_reset' or '${_omb_term_bold_blue}_omb_prompt_red$_omb_term_reset'."
-_omb_deprecate_const 20000 green     "$_omb_deprecate_green"   "Please use '${_omb_term_bold_blue}_omb_term_green$_omb_term_reset' or '${_omb_term_bold_blue}_omb_prompt_green$_omb_term_reset'."
-_omb_deprecate_const 20000 yellow    "$_omb_deprecate_yellow"  "Please use '${_omb_term_bold_blue}_omb_term_yellow$_omb_term_reset' or '${_omb_term_bold_blue}_omb_prompt_yellow$_omb_term_reset'."
-_omb_deprecate_const 20000 blue      "$_omb_deprecate_blue"    "Please use '${_omb_term_bold_blue}_omb_term_blue$_omb_term_reset' or '${_omb_term_bold_blue}_omb_prompt_blue$_omb_term_reset'."
-_omb_deprecate_const 20000 purple    "$_omb_deprecate_magenta" "Please use '${_omb_term_bold_blue}_omb_term_magenta$_omb_term_reset' or '${_omb_term_bold_blue}_omb_prompt_magenta$_omb_term_reset'."
+_omb_deprecate_yellow=${_omb_term_olive:+$'\1'$_omb_term_olive$'\2'}
+_omb_deprecate_blue=${_omb_term_navy:+$'\1'$_omb_term_navy$'\2'}
+_omb_deprecate_magenta=${_omb_term_purple:+$'\1'$_omb_term_purple$'\2'}
+_omb_deprecate_const 20000 red       "$_omb_deprecate_red"     "Please use '${_omb_term_bold_navy}_omb_term_brown$_omb_term_reset' or '${_omb_term_bold_navy}_omb_prompt_brown$_omb_term_reset'."
+_omb_deprecate_const 20000 green     "$_omb_deprecate_green"   "Please use '${_omb_term_bold_navy}_omb_term_green$_omb_term_reset' or '${_omb_term_bold_navy}_omb_prompt_green$_omb_term_reset'."
+_omb_deprecate_const 20000 yellow    "$_omb_deprecate_yellow"  "Please use '${_omb_term_bold_navy}_omb_term_olive$_omb_term_reset' or '${_omb_term_bold_navy}_omb_prompt_olive$_omb_term_reset'."
+_omb_deprecate_const 20000 blue      "$_omb_deprecate_blue"    "Please use '${_omb_term_bold_navy}_omb_term_navy$_omb_term_reset' or '${_omb_term_bold_navy}_omb_prompt_navy$_omb_term_reset'."
+_omb_deprecate_const 20000 purple    "$_omb_deprecate_magenta" "Please use '${_omb_term_bold_navy}_omb_term_purple$_omb_term_reset' or '${_omb_term_bold_navy}_omb_prompt_purple$_omb_term_reset'."
 
 _omb_deprecate_function 20000 e_header    _omb_log_header
 _omb_deprecate_function 20000 e_arrow     _omb_log_arrow
@@ -299,7 +299,7 @@ _omb_deprecate_function 20000 e_note      _omb_log_note
 # plugins/bashmarks/bashmarks.plugin.sh [ This anyway conflicts with
 #   variables defined by themes (axin, mairan, sexy, etc.) so do not
 #   define fallbacks and warnings. ]
-#_omb_deprecate_const RED   "0;31m" "${_omb_deprecate_msg_please_use/'%s'/\${_omb_term_red:2}}"
+#_omb_deprecate_const RED   "0;31m" "${_omb_deprecate_msg_please_use/'%s'/\${_omb_term_brown:2}}"
 #_omb_deprecate_const GREEN "0;33m" "${_omb_deprecate_msg_please_use/'%s'/\${_omb_term_green:2}}"
 
 # themes/*
diff --git a/lib/omb-prompt-base.sh b/lib/omb-prompt-base.sh
index fd90702..447ecb4 100644
--- a/lib/omb-prompt-base.sh
+++ b/lib/omb-prompt-base.sh
@@ -555,7 +555,7 @@ function prompt_char {
 
 function battery_char {
     if [[ "${THEME_BATTERY_PERCENTAGE_CHECK}" = true ]]; then
-        echo -e "${_omb_prompt_bold_red}$(battery_percentage)%"
+        echo -e "${_omb_prompt_bold_brown}$(battery_percentage)%"
     fi
 }
 
diff --git a/lib/omb-prompt-colors.sh b/lib/omb-prompt-colors.sh
index 47aa840..b2d6947 100644
--- a/lib/omb-prompt-colors.sh
+++ b/lib/omb-prompt-colors.sh
@@ -81,92 +81,53 @@ function _omb_theme_color_echo {
   echo "\033[${out}m"
 }
 
-_omb_prompt_red='\[\e[0;31m\]'
+_omb_prompt_brown='\[\e[0;31m\]'
 _omb_prompt_green='\[\e[0;32m\]'
-_omb_prompt_yellow='\[\e[0;33m\]'
-_omb_prompt_blue='\[\e[0;34m\]'
-_omb_prompt_magenta='\[\e[0;35m\]'
+_omb_prompt_olive='\[\e[0;33m\]'
+_omb_prompt_navy='\[\e[0;34m\]'
+_omb_prompt_purple='\[\e[0;35m\]'
 _omb_prompt_black='\[\e[0;30m\]'
-_omb_prompt_cyan='\[\e[0;36m\]'
+_omb_prompt_teal='\[\e[0;36m\]'
 _omb_prompt_white='\[\e[0;37m\]'
-_omb_prompt_orange='\[\e[0;91m\]'
+_omb_prompt_red='\[\e[0;91m\]'
 
 _omb_prompt_bold_black='\[\e[30;1m\]'
-_omb_prompt_bold_red='\[\e[31;1m\]'
+_omb_prompt_bold_brown='\[\e[31;1m\]'
 _omb_prompt_bold_green='\[\e[32;1m\]'
-_omb_prompt_bold_yellow='\[\e[33;1m\]'
-_omb_prompt_bold_blue='\[\e[34;1m\]'
-_omb_prompt_bold_magenta='\[\e[35;1m\]'
-_omb_prompt_bold_cyan='\[\e[36;1m\]'
+_omb_prompt_bold_olive='\[\e[33;1m\]'
+_omb_prompt_bold_navy='\[\e[34;1m\]'
+_omb_prompt_bold_purple='\[\e[35;1m\]'
+_omb_prompt_bold_teal='\[\e[36;1m\]'
 _omb_prompt_bold_white='\[\e[37;1m\]'
-_omb_prompt_bold_orange='\[\e[91;1m\]'
+_omb_prompt_bold_red='\[\e[91;1m\]'
 
 _omb_prompt_underline_black='\[\e[30;4m\]'
-_omb_prompt_underline_red='\[\e[31;4m\]'
+_omb_prompt_underline_brown='\[\e[31;4m\]'
 _omb_prompt_underline_green='\[\e[32;4m\]'
-_omb_prompt_underline_yellow='\[\e[33;4m\]'
-_omb_prompt_underline_blue='\[\e[34;4m\]'
-_omb_prompt_underline_magenta='\[\e[35;4m\]'
-_omb_prompt_underline_cyan='\[\e[36;4m\]'
+_omb_prompt_underline_olive='\[\e[33;4m\]'
+_omb_prompt_underline_navy='\[\e[34;4m\]'
+_omb_prompt_underline_purple='\[\e[35;4m\]'
+_omb_prompt_underline_teal='\[\e[36;4m\]'
 _omb_prompt_underline_white='\[\e[37;4m\]'
-_omb_prompt_underline_orange='\[\e[91;4m\]'
+_omb_prompt_underline_red='\[\e[91;4m\]'
 
 _omb_prompt_background_black='\[\e[40m\]'
-_omb_prompt_background_red='\[\e[41m\]'
+_omb_prompt_background_brown='\[\e[41m\]'
 _omb_prompt_background_green='\[\e[42m\]'
-_omb_prompt_background_yellow='\[\e[43m\]'
-_omb_prompt_background_blue='\[\e[44m\]'
-_omb_prompt_background_magenta='\[\e[45m\]'
-_omb_prompt_background_cyan='\[\e[46m\]'
+_omb_prompt_background_olive='\[\e[43m\]'
+_omb_prompt_background_navy='\[\e[44m\]'
+_omb_prompt_background_purple='\[\e[45m\]'
+_omb_prompt_background_teal='\[\e[46m\]'
 _omb_prompt_background_white='\[\e[47;1m\]'
-_omb_prompt_background_orange='\[\e[101m\]'
+_omb_prompt_background_red='\[\e[101m\]'
 
 _omb_prompt_normal='\[\e[0m\]'
 _omb_prompt_reset_color='\[\e[39m\]'
 
 # These colors are intended to be used with `echo`
 
-# These variables are defined in lib/utils.sh
-#
-# _omb_term_black=$'\e[0;30m'
-# _omb_term_red=$'\e[0;31m'
-# _omb_term_green=$'\e[0;32m'
-# _omb_term_yellow=$'\e[0;33m'
-# _omb_term_blue=$'\e[0;34m'
-# _omb_term_magenta=$'\e[0;35m'
-# _omb_term_cyan=$'\e[0;36m'
-# _omb_term_white=$'\e[0;37;1m'
-_omb_term_orange=$'\e[0;91m'
-
-# _omb_term_bold_black=$'\e[30;1m'
-# _omb_term_bold_red=$'\e[31;1m'
-# _omb_term_bold_green=$'\e[32;1m'
-# _omb_term_bold_yellow=$'\e[33;1m'
-# _omb_term_bold_blue=$'\e[34;1m'
-# _omb_term_bold_magenta=$'\e[35;1m'
-# _omb_term_bold_cyan=$'\e[36;1m'
-# _omb_term_bold_white=$'\e[37;1m'
-_omb_term_bold_orange=$'\e[91;1m'
-
-_omb_term_underline_black=$'\e[30;4m'
-_omb_term_underline_red=$'\e[31;4m'
-_omb_term_underline_green=$'\e[32;4m'
-_omb_term_underline_yellow=$'\e[33;4m'
-_omb_term_underline_blue=$'\e[34;4m'
-_omb_term_underline_magenta=$'\e[35;4m'
-_omb_term_underline_cyan=$'\e[36;4m'
-_omb_term_underline_white=$'\e[37;4m'
-_omb_term_underline_orange=$'\e[91;4m'
-
-_omb_term_background_black=$'\e[40m'
-_omb_term_background_red=$'\e[41m'
-_omb_term_background_green=$'\e[42m'
-_omb_term_background_yellow=$'\e[43m'
-_omb_term_background_blue=$'\e[44m'
-_omb_term_background_magenta=$'\e[45m'
-_omb_term_background_cyan=$'\e[46m'
-_omb_term_background_white=$'\e[47;1m'
-_omb_term_background_orange=$'\e[101m'
+# These variables are defined in "lib/utils.sh"
+# - _omb_term_{,_bold,_underline,_background}{<basic8>,red,white,violet}
 
 _omb_term_normal=$'\e[0m'
 _omb_term_reset_color=$'\e[39m'
@@ -177,83 +138,83 @@ _omb_prompt_bold='\[\e[1m\]'
 _omb_deprecate_function 20000 color      _omb_theme_color_prompt
 _omb_deprecate_function 20000 echo_color _omb_theme_color_echo
 
-_omb_deprecate_const 20000 black             "$_omb_prompt_black"              "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_black}"
-_omb_deprecate_const 20000 cyan              "$_omb_prompt_cyan"               "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_cyan}"
-_omb_deprecate_const 20000 white             "$_omb_prompt_white"              "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_white}"
-_omb_deprecate_const 20000 orange            "$_omb_prompt_orange"             "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_orange}"
+_omb_deprecate_const 20000 black             "$_omb_prompt_black"             "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_black}"
+_omb_deprecate_const 20000 cyan              "$_omb_prompt_teal"              "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_teal}"
+_omb_deprecate_const 20000 white             "$_omb_prompt_white"             "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_white}"
+_omb_deprecate_const 20000 orange            "$_omb_prompt_red"               "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_red}"
 
-_omb_deprecate_const 20000 bold_black        "$_omb_prompt_bold_black"         "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_black}"
-_omb_deprecate_const 20000 bold_red          "$_omb_prompt_bold_red"           "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_red}"
-_omb_deprecate_const 20000 bold_green        "$_omb_prompt_bold_green"         "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_green}"
-_omb_deprecate_const 20000 bold_yellow       "$_omb_prompt_bold_yellow"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_yellow}"
-_omb_deprecate_const 20000 bold_blue         "$_omb_prompt_bold_blue"          "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_blue}"
-_omb_deprecate_const 20000 bold_purple       "$_omb_prompt_bold_magenta"       "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_magenta}"
-_omb_deprecate_const 20000 bold_cyan         "$_omb_prompt_bold_cyan"          "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_cyan}"
-_omb_deprecate_const 20000 bold_white        "$_omb_prompt_bold_white"         "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_white}"
-_omb_deprecate_const 20000 bold_orange       "$_omb_prompt_bold_orange"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_orange}"
+_omb_deprecate_const 20000 bold_black        "$_omb_prompt_bold_black"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_black}"
+_omb_deprecate_const 20000 bold_red          "$_omb_prompt_bold_brown"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_brown}"
+_omb_deprecate_const 20000 bold_green        "$_omb_prompt_bold_green"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_green}"
+_omb_deprecate_const 20000 bold_yellow       "$_omb_prompt_bold_olive"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_olive}"
+_omb_deprecate_const 20000 bold_blue         "$_omb_prompt_bold_navy"         "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_navy}"
+_omb_deprecate_const 20000 bold_purple       "$_omb_prompt_bold_purple"       "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_purple}"
+_omb_deprecate_const 20000 bold_cyan         "$_omb_prompt_bold_teal"         "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_teal}"
+_omb_deprecate_const 20000 bold_white        "$_omb_prompt_bold_white"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_white}"
+_omb_deprecate_const 20000 bold_orange       "$_omb_prompt_bold_red"          "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_bold_red}"
 
-_omb_deprecate_const 20000 underline_black   "$_omb_prompt_underline_black"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_black}"
-_omb_deprecate_const 20000 underline_red     "$_omb_prompt_underline_red"      "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_red}"
-_omb_deprecate_const 20000 underline_green   "$_omb_prompt_underline_green"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_green}"
-_omb_deprecate_const 20000 underline_yellow  "$_omb_prompt_underline_yellow"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_yellow}"
-_omb_deprecate_const 20000 underline_blue    "$_omb_prompt_underline_blue"     "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_blue}"
-_omb_deprecate_const 20000 underline_purple  "$_omb_prompt_underline_magenta"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_magenta}"
-_omb_deprecate_const 20000 underline_cyan    "$_omb_prompt_underline_cyan"     "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_cyan}"
-_omb_deprecate_const 20000 underline_white   "$_omb_prompt_underline_white"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_white}"
-_omb_deprecate_const 20000 underline_orange  "$_omb_prompt_underline_orange"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_orange}"
+_omb_deprecate_const 20000 underline_black   "$_omb_prompt_underline_black"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_black}"
+_omb_deprecate_const 20000 underline_red     "$_omb_prompt_underline_brown"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_brown}"
+_omb_deprecate_const 20000 underline_green   "$_omb_prompt_underline_green"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_green}"
+_omb_deprecate_const 20000 underline_yellow  "$_omb_prompt_underline_olive"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_olive}"
+_omb_deprecate_const 20000 underline_blue    "$_omb_prompt_underline_navy"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_navy}"
+_omb_deprecate_const 20000 underline_purple  "$_omb_prompt_underline_purple"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_purple}"
+_omb_deprecate_const 20000 underline_cyan    "$_omb_prompt_underline_teal"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_teal}"
+_omb_deprecate_const 20000 underline_white   "$_omb_prompt_underline_white"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_white}"
+_omb_deprecate_const 20000 underline_orange  "$_omb_prompt_underline_red"     "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_underline_red}"
 
-_omb_deprecate_const 20000 background_black  "$_omb_prompt_background_black"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_black}"
-_omb_deprecate_const 20000 background_red    "$_omb_prompt_background_red"     "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_red}"
-_omb_deprecate_const 20000 background_green  "$_omb_prompt_background_green"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_green}"
-_omb_deprecate_const 20000 background_yellow "$_omb_prompt_background_yellow"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_yellow}"
-_omb_deprecate_const 20000 background_blue   "$_omb_prompt_background_blue"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_blue}"
-_omb_deprecate_const 20000 background_purple "$_omb_prompt_background_magenta" "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_magenta}"
-_omb_deprecate_const 20000 background_cyan   "$_omb_prompt_background_cyan"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_cyan}"
-_omb_deprecate_const 20000 background_white  "$_omb_prompt_background_white"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_white}"
-_omb_deprecate_const 20000 background_orange "$_omb_prompt_background_orange"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_orange}"
+_omb_deprecate_const 20000 background_black  "$_omb_prompt_background_black"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_black}"
+_omb_deprecate_const 20000 background_red    "$_omb_prompt_background_brown"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_brown}"
+_omb_deprecate_const 20000 background_green  "$_omb_prompt_background_green"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_green}"
+_omb_deprecate_const 20000 background_yellow "$_omb_prompt_background_olive"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_olive}"
+_omb_deprecate_const 20000 background_blue   "$_omb_prompt_background_navy"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_navy}"
+_omb_deprecate_const 20000 background_purple "$_omb_prompt_background_purple" "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_purple}"
+_omb_deprecate_const 20000 background_cyan   "$_omb_prompt_background_teal"   "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_teal}"
+_omb_deprecate_const 20000 background_white  "$_omb_prompt_background_white"  "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_white}"
+_omb_deprecate_const 20000 background_orange "$_omb_prompt_background_red"    "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_background_red}"
 
-_omb_deprecate_const 20000 normal            "$_omb_prompt_normal"             "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_normal}"
-_omb_deprecate_const 20000 reset_color       "$_omb_prompt_reset_color"        "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_reset_color}"
+_omb_deprecate_const 20000 normal            "$_omb_prompt_normal"            "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_normal}"
+_omb_deprecate_const 20000 reset_color       "$_omb_prompt_reset_color"       "${_omb_deprecate_msg_please_use/'%s'/_omb_prompt_reset_color}"
 
-_omb_deprecate_const 20000 echo_black             "$_omb_term_black"              "${_omb_deprecate_msg_please_use/'%s'/_omb_term_black}"
-_omb_deprecate_const 20000 echo_red               "$_omb_term_red"                "${_omb_deprecate_msg_please_use/'%s'/_omb_term_red}"
-_omb_deprecate_const 20000 echo_green             "$_omb_term_green"              "${_omb_deprecate_msg_please_use/'%s'/_omb_term_green}"
-_omb_deprecate_const 20000 echo_yellow            "$_omb_term_yellow"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_yellow}"
-_omb_deprecate_const 20000 echo_blue              "$_omb_term_blue"               "${_omb_deprecate_msg_please_use/'%s'/_omb_term_blue}"
-_omb_deprecate_const 20000 echo_purple            "$_omb_term_magenta"            "${_omb_deprecate_msg_please_use/'%s'/_omb_term_magenta}"
-_omb_deprecate_const 20000 echo_cyan              "$_omb_term_cyan"               "${_omb_deprecate_msg_please_use/'%s'/_omb_term_cyan}"
-_omb_deprecate_const 20000 echo_white             "$_omb_term_white"              "${_omb_deprecate_msg_please_use/'%s'/_omb_term_white}"
-_omb_deprecate_const 20000 echo_orange            "$_omb_term_orange"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_orange}"
+_omb_deprecate_const 20000 echo_black             "$_omb_term_black"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_black}"
+_omb_deprecate_const 20000 echo_red               "$_omb_term_brown"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_brown}"
+_omb_deprecate_const 20000 echo_green             "$_omb_term_green"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_green}"
+_omb_deprecate_const 20000 echo_yellow            "$_omb_term_olive"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_olive}"
+_omb_deprecate_const 20000 echo_blue              "$_omb_term_navy"              "${_omb_deprecate_msg_please_use/'%s'/_omb_term_navy}"
+_omb_deprecate_const 20000 echo_purple            "$_omb_term_purple"            "${_omb_deprecate_msg_please_use/'%s'/_omb_term_purple}"
+_omb_deprecate_const 20000 echo_cyan              "$_omb_term_teal"              "${_omb_deprecate_msg_please_use/'%s'/_omb_term_teal}"
+_omb_deprecate_const 20000 echo_white             "$_omb_term_white"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_white}"
+_omb_deprecate_const 20000 echo_orange            "$_omb_term_red"               "${_omb_deprecate_msg_please_use/'%s'/_omb_term_red}"
 
-_omb_deprecate_const 20000 echo_bold_black        "$_omb_term_bold_black"         "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_black}"
-_omb_deprecate_const 20000 echo_bold_red          "$_omb_term_bold_red"           "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_red}"
-_omb_deprecate_const 20000 echo_bold_green        "$_omb_term_bold_green"         "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_green}"
-_omb_deprecate_const 20000 echo_bold_yellow       "$_omb_term_bold_yellow"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_yellow}"
-_omb_deprecate_const 20000 echo_bold_blue         "$_omb_term_bold_blue"          "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_blue}"
-_omb_deprecate_const 20000 echo_bold_purple       "$_omb_term_bold_magenta"       "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_magenta}"
-_omb_deprecate_const 20000 echo_bold_cyan         "$_omb_term_bold_cyan"          "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_cyan}"
-_omb_deprecate_const 20000 echo_bold_white        "$_omb_term_bold_white"         "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_white}"
-_omb_deprecate_const 20000 echo_bold_orange       "$_omb_term_bold_orange"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_orange}"
+_omb_deprecate_const 20000 echo_bold_black        "$_omb_term_bold_black"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_black}"
+_omb_deprecate_const 20000 echo_bold_red          "$_omb_term_bold_brown"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_brown}"
+_omb_deprecate_const 20000 echo_bold_green        "$_omb_term_bold_green"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_green}"
+_omb_deprecate_const 20000 echo_bold_yellow       "$_omb_term_bold_olive"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_olive}"
+_omb_deprecate_const 20000 echo_bold_blue         "$_omb_term_bold_navy"         "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_navy}"
+_omb_deprecate_const 20000 echo_bold_purple       "$_omb_term_bold_purple"       "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_purple}"
+_omb_deprecate_const 20000 echo_bold_cyan         "$_omb_term_bold_teal"         "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_teal}"
+_omb_deprecate_const 20000 echo_bold_white        "$_omb_term_bold_white"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_white}"
+_omb_deprecate_const 20000 echo_bold_orange       "$_omb_term_bold_red"          "${_omb_deprecate_msg_please_use/'%s'/_omb_term_bold_red}"
 
-_omb_deprecate_const 20000 echo_underline_black   "$_omb_term_underline_black"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_black}"
-_omb_deprecate_const 20000 echo_underline_red     "$_omb_term_underline_red"      "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_red}"
-_omb_deprecate_const 20000 echo_underline_green   "$_omb_term_underline_green"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_green}"
-_omb_deprecate_const 20000 echo_underline_yellow  "$_omb_term_underline_yellow"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_yellow}"
-_omb_deprecate_const 20000 echo_underline_blue    "$_omb_term_underline_blue"     "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_blue}"
-_omb_deprecate_const 20000 echo_underline_purple  "$_omb_term_underline_magenta"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_magenta}"
-_omb_deprecate_const 20000 echo_underline_cyan    "$_omb_term_underline_cyan"     "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_cyan}"
-_omb_deprecate_const 20000 echo_underline_white   "$_omb_term_underline_white"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_white}"
-_omb_deprecate_const 20000 echo_underline_orange  "$_omb_term_underline_orange"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_orange}"
+_omb_deprecate_const 20000 echo_underline_black   "$_omb_term_underline_black"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_black}"
+_omb_deprecate_const 20000 echo_underline_red     "$_omb_term_underline_brown"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_brown}"
+_omb_deprecate_const 20000 echo_underline_green   "$_omb_term_underline_green"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_green}"
+_omb_deprecate_const 20000 echo_underline_yellow  "$_omb_term_underline_olive"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_olive}"
+_omb_deprecate_const 20000 echo_underline_blue    "$_omb_term_underline_navy"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_navy}"
+_omb_deprecate_const 20000 echo_underline_purple  "$_omb_term_underline_purple"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_purple}"
+_omb_deprecate_const 20000 echo_underline_cyan    "$_omb_term_underline_teal"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_teal}"
+_omb_deprecate_const 20000 echo_underline_white   "$_omb_term_underline_white"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_white}"
+_omb_deprecate_const 20000 echo_underline_orange  "$_omb_term_underline_red"     "${_omb_deprecate_msg_please_use/'%s'/_omb_term_underline_red}"
 
-_omb_deprecate_const 20000 echo_background_black  "$_omb_term_background_black"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_black}"
-_omb_deprecate_const 20000 echo_background_red    "$_omb_term_background_red"     "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_red}"
-_omb_deprecate_const 20000 echo_background_green  "$_omb_term_background_green"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_green}"
-_omb_deprecate_const 20000 echo_background_yellow "$_omb_term_background_yellow"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_yellow}"
-_omb_deprecate_const 20000 echo_background_blue   "$_omb_term_background_blue"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_blue}"
-_omb_deprecate_const 20000 echo_background_purple "$_omb_term_background_magenta" "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_magenta}"
-_omb_deprecate_const 20000 echo_background_cyan   "$_omb_term_background_cyan"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_cyan}"
-_omb_deprecate_const 20000 echo_background_white  "$_omb_term_background_white"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_white}"
-_omb_deprecate_const 20000 echo_background_orange "$_omb_term_background_orange"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_orange}"
+_omb_deprecate_const 20000 echo_background_black  "$_omb_term_background_black"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_black}"
+_omb_deprecate_const 20000 echo_background_red    "$_omb_term_background_brown"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_brown}"
+_omb_deprecate_const 20000 echo_background_green  "$_omb_term_background_green"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_green}"
+_omb_deprecate_const 20000 echo_background_yellow "$_omb_term_background_olive"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_olive}"
+_omb_deprecate_const 20000 echo_background_blue   "$_omb_term_background_navy"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_navy}"
+_omb_deprecate_const 20000 echo_background_purple "$_omb_term_background_purple" "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_purple}"
+_omb_deprecate_const 20000 echo_background_cyan   "$_omb_term_background_teal"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_teal}"
+_omb_deprecate_const 20000 echo_background_white  "$_omb_term_background_white"  "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_white}"
+_omb_deprecate_const 20000 echo_background_orange "$_omb_term_background_red"    "${_omb_deprecate_msg_please_use/'%s'/_omb_term_background_red}"
 
-_omb_deprecate_const 20000 echo_normal            "$_omb_term_normal"             "${_omb_deprecate_msg_please_use/'%s'/_omb_term_normal}"
-_omb_deprecate_const 20000 echo_reset_color       "$_omb_term_reset_color"        "${_omb_deprecate_msg_please_use/'%s'/_omb_term_reset_color}"
+_omb_deprecate_const 20000 echo_normal            "$_omb_term_normal"            "${_omb_deprecate_msg_please_use/'%s'/_omb_term_normal}"
+_omb_deprecate_const 20000 echo_reset_color       "$_omb_term_reset_color"       "${_omb_deprecate_msg_please_use/'%s'/_omb_term_reset_color}"
diff --git a/lib/spectrum.sh b/lib/spectrum.sh
index 40b99dc..4b1f74b 100644
--- a/lib/spectrum.sh
+++ b/lib/spectrum.sh
@@ -33,7 +33,7 @@ if ((_omb_bash_version >= 40000)); then
   _omb_spectrum__initialize
 
   declare -gA FX FG BG
-  _omb_deprecate_const 20000 _RED "$_omb_term_red"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_red}"
+  _omb_deprecate_const 20000 _RED "$_omb_term_brown"   "${_omb_deprecate_msg_please_use/'%s'/_omb_term_brown}"
   _omb_deprecate_const 20000 _NC  "$_omb_term_reset" "${_omb_deprecate_msg_please_use/'%s'/_omb_term_reset}"
   function _omb_spectrum__deprecate() {
     local key
diff --git a/lib/spinner.sh b/lib/spinner.sh
index 1141d54..92b9a09 100644
--- a/lib/spinner.sh
+++ b/lib/spinner.sh
@@ -5,7 +5,7 @@
 #
 # Examples
 #
-# echo -ne "${_omb_term_red}I am running..."
+# echo -ne "${_omb_term_brown}I am running..."
 # ( my_long_task_running ) &
 # spinner
 # echo -ne "...${_omb_term_reset} ${_omb_term_green}DONE${_omb_term_reset}"
diff --git a/lib/utils.sh b/lib/utils.sh
index 6ed903b..8961dda 100644
--- a/lib/utils.sh
+++ b/lib/utils.sh
@@ -125,72 +125,132 @@ _omb_util_function_exists() {
 #
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-_omb_term_colors=
 if [[ ! -t 1 ]]; then
+  _omb_term_colors=
   _omb_term_bold=
   _omb_term_underline=
   _omb_term_reset=
+
   _omb_term_black=
-  _omb_term_red=
+  _omb_term_brown=
   _omb_term_green=
-  _omb_term_yellow=
-  _omb_term_blue=
-  _omb_term_magenta=
-  _omb_term_cyan=
-  _omb_term_white=
+  _omb_term_olive=
+  _omb_term_navy=
   _omb_term_purple=
-elif _omb_util_binary_exists tput &&
-    _omb_term_colors=$(tput colors 2>/dev/null || tput Co 2>/dev/null) &&
-    ((_omb_term_colors >= 8))
-then
-  _omb_term_bold=$(tput bold 2>/dev/null || tput md 2>/dev/null)
-  _omb_term_underline=$(tput smul 2>/dev/null || tput ul 2>/dev/null)
-  _omb_term_reset=$(tput sgr0 2>/dev/null || tput me 2>/dev/null)
-  _omb_term_black=$(tput setaf 0 2>/dev/null || tput AF 0 2>/dev/null)
-  _omb_term_red=$(tput setaf 1 2>/dev/null || tput AF 1 2>/dev/null)
-  _omb_term_green=$(tput setaf 2 2>/dev/null || tput AF 2 2>/dev/null)
-  _omb_term_yellow=$(tput setaf 3 2>/dev/null || tput AF 3 2>/dev/null)
-  _omb_term_blue=$(tput setaf 4 2>/dev/null || tput AF 4 2>/dev/null)
-  _omb_term_magenta=$(tput setaf 5 2>/dev/null || tput AF 5 2>/dev/null)
-  _omb_term_cyan=$(tput setaf 6 2>/dev/null || tput AF 6 2>/dev/null)
-  _omb_term_white=$(tput setaf 7 2>/dev/null || tput AF 7 2>/dev/null)
-  _omb_term_purple=$(tput setaf 171 2>/dev/null || tput AF 171 2>/dev/null)
+  _omb_term_teal=
+  _omb_term_silver=
+
+  _omb_term_background_black=
+  _omb_term_background_brown=
+  _omb_term_background_green=
+  _omb_term_background_olive=
+  _omb_term_background_navy=
+  _omb_term_background_purple=
+  _omb_term_background_teal=
+  _omb_term_background_silver=
+
+  _omb_term_red=
+  _omb_term_white=
+  _omb_term_violet=
 else
-  _omb_term_bold=$'\e[1m'
-  _omb_term_underline=$'\e[4m'
-  _omb_term_reset=$'\e[0m'
-  _omb_term_black=$'\e[30m'
-  _omb_term_red=$'\e[31m'
-  _omb_term_green=$'\e[32m'
-  _omb_term_yellow=$'\e[33m'
-  _omb_term_blue=$'\e[34m'
-  _omb_term_magenta=$'\e[35m'
-  _omb_term_cyan=$'\e[36m'
-  _omb_term_white=$'\e[37m'
-  _omb_term_purple=$'\e[38;5;171m'
+  if _omb_util_binary_exists tput; then
+    _omb_term_colors=$(tput colors 2>/dev/null || tput Co 2>/dev/null)
+    _omb_term_bold=$(tput bold 2>/dev/null || tput md 2>/dev/null)
+    _omb_term_underline=$(tput smul 2>/dev/null || tput ul 2>/dev/null)
+    _omb_term_reset=$(tput sgr0 2>/dev/null || tput me 2>/dev/null)
+  else
+    _omb_term_colors=
+    _omb_term_bold=$'\e[1m'
+    _omb_term_underline=$'\e[4m'
+    _omb_term_reset=$'\e[0m'
+  fi
+
+  if ((_omb_term_colors >= 8)); then
+    _omb_term_black=$(tput setaf 0 2>/dev/null || tput AF 0 2>/dev/null)
+    _omb_term_brown=$(tput setaf 1 2>/dev/null || tput AF 1 2>/dev/null)
+    _omb_term_green=$(tput setaf 2 2>/dev/null || tput AF 2 2>/dev/null)
+    _omb_term_olive=$(tput setaf 3 2>/dev/null || tput AF 3 2>/dev/null)
+    _omb_term_navy=$(tput setaf 4 2>/dev/null || tput AF 4 2>/dev/null)
+    _omb_term_purple=$(tput setaf 5 2>/dev/null || tput AF 5 2>/dev/null)
+    _omb_term_teal=$(tput setaf 6 2>/dev/null || tput AF 6 2>/dev/null)
+    _omb_term_silver=$(tput setaf 7 2>/dev/null || tput AF 7 2>/dev/null)
+  else
+    _omb_term_black=$'\e[30m'
+    _omb_term_brown=$'\e[31m'
+    _omb_term_green=$'\e[32m'
+    _omb_term_olive=$'\e[33m'
+    _omb_term_navy=$'\e[34m'
+    _omb_term_purple=$'\e[35m'
+    _omb_term_teal=$'\e[36m'
+    _omb_term_silver=$'\e[37m'
+  fi
+
+  _omb_term_background_black=$'\e[40m'
+  _omb_term_background_brown=$'\e[41m'
+  _omb_term_background_green=$'\e[42m'
+  _omb_term_background_olive=$'\e[43m'
+  _omb_term_background_navy=$'\e[44m'
+  _omb_term_background_purple=$'\e[45m'
+  _omb_term_background_teal=$'\e[46m'
+  _omb_term_background_silver=$'\e[47m'
+
+  if ((_omb_term_colors >= 16)); then
+    _omb_term_red=$(tput setaf 9 2>/dev/null || tput AF 9 2>/dev/null)
+    _omb_term_white=$(tput setaf 15 2>/dev/null || tput AF 15 2>/dev/null)
+    _omb_term_background_red=$_omb_term_background_brown$'\e[101m'
+    _omb_term_background_white=$_omb_term_background_silver$'\e[107m'
+  else
+    _omb_term_red=$_omb_term_bold$_omb_term_brown
+    _omb_term_white=$_omb_term_bold$_omb_term_silver
+    _omb_term_background_red=$_omb_term_bold$_omb_term_background_brown
+    _omb_term_background_white=$_omb_term_bold$_omb_term_background_silver
+  fi
+
+  if ((_omb_term_colors == 256)); then
+    _omb_term_violet=$(tput setaf 171 2>/dev/null || tput AF 171 2>/dev/null)
+    _omb_term_background_violet=$'\e[48;5;171m'
+  else
+    _omb_term_violet=$_omb_term_purple
+    _omb_term_background_violet=$_omb_term_background_purple
+  fi
 fi
 
 _omb_term_bold_black=$_omb_term_bold$_omb_term_black
-_omb_term_bold_red=$_omb_term_bold$_omb_term_red
+_omb_term_bold_brown=$_omb_term_bold$_omb_term_brown
 _omb_term_bold_green=$_omb_term_bold$_omb_term_green
-_omb_term_bold_yellow=$_omb_term_bold$_omb_term_yellow
-_omb_term_bold_blue=$_omb_term_bold$_omb_term_blue
-_omb_term_bold_magenta=$_omb_term_bold$_omb_term_magenta
-_omb_term_bold_cyan=$_omb_term_bold$_omb_term_cyan
-_omb_term_bold_white=$_omb_term_bold$_omb_term_white
+_omb_term_bold_olive=$_omb_term_bold$_omb_term_olive
+_omb_term_bold_navy=$_omb_term_bold$_omb_term_navy
 _omb_term_bold_purple=$_omb_term_bold$_omb_term_purple
+_omb_term_bold_teal=$_omb_term_bold$_omb_term_teal
+_omb_term_bold_silver=$_omb_term_bold$_omb_term_silver
+_omb_term_bold_red=$_omb_term_bold$_omb_term_red
+_omb_term_bold_white=$_omb_term_bold$_omb_term_white
+_omb_term_bold_violet=$_omb_term_bold$_omb_term_violet
+
+_omb_term_underline_black=$_omb_term_underline$_omb_term_black
+_omb_term_underline_brown=$_omb_term_underline$_omb_term_brown
+_omb_term_underline_green=$_omb_term_underline$_omb_term_green
+_omb_term_underline_olive=$_omb_term_underline$_omb_term_olive
+_omb_term_underline_navy=$_omb_term_underline$_omb_term_navy
+_omb_term_underline_purple=$_omb_term_underline$_omb_term_purple
+_omb_term_underline_teal=$_omb_term_underline$_omb_term_teal
+_omb_term_underline_silver=$_omb_term_underline$_omb_term_silver
+_omb_term_underline_red=$_omb_term_underline$_omb_term_red
+_omb_term_underline_white=$_omb_term_underline$_omb_term_white
+_omb_term_underline_violet=$_omb_term_underline$_omb_term_violet
+
 
 #
 # Headers and Logging
 #
-_omb_log_header()    { printf "\n${_omb_term_bold}${_omb_term_magenta}==========  %s  ==========${_omb_term_reset}\n" "$@"; }
+_omb_log_header()    { printf "\n${_omb_term_bold}${_omb_term_violet}==========  %s  ==========${_omb_term_reset}\n" "$@"; }
 _omb_log_arrow()     { printf "➜ %s\n" "$@"; }
 _omb_log_success()   { printf "${_omb_term_green}✔ %s${_omb_term_reset}\n" "$@"; }
-_omb_log_error()     { printf "${_omb_term_red}✖ %s${_omb_term_reset}\n" "$@"; }
-_omb_log_warning()   { printf "${_omb_term_yellow}➜ %s${_omb_term_reset}\n" "$@"; }
+_omb_log_error()     { printf "${_omb_term_brown}✖ %s${_omb_term_reset}\n" "$@"; }
+_omb_log_warning()   { printf "${_omb_term_olive}➜ %s${_omb_term_reset}\n" "$@"; }
 _omb_log_underline() { printf "${_omb_term_underline}${_omb_term_bold}%s${_omb_term_reset}\n" "$@"; }
 _omb_log_bold()      { printf "${_omb_term_bold}%s${_omb_term_reset}\n" "$@"; }
-_omb_log_note()      { printf "${_omb_term_underline}${_omb_term_bold}${_omb_term_blue}Note:${_omb_term_reset}  ${_omb_term_yellow}%s${_omb_term_reset}\n" "$@"; }
+_omb_log_note()      { printf "${_omb_term_underline}${_omb_term_bold}${_omb_term_navy}Note:${_omb_term_reset}  ${_omb_term_olive}%s${_omb_term_reset}\n" "$@"; }
 
 #
 # USAGE FOR SEEKING CONFIRMATION
diff --git a/plugins/bashmarks/bashmarks.plugin.sh b/plugins/bashmarks/bashmarks.plugin.sh
index 8f56c3f..3888512 100644
--- a/plugins/bashmarks/bashmarks.plugin.sh
+++ b/plugins/bashmarks/bashmarks.plugin.sh
@@ -122,9 +122,9 @@ function _goto_bookmark {
     if [ -d "$target" ]; then
         cd "$target"
     elif [ ! -n "$target" ]; then
-        printf '%s\n' "${_omb_term_red}WARNING: '${1}' bashmark does not exist${_omb_term_reset}"
+        printf '%s\n' "${_omb_term_brown}WARNING: '${1}' bashmark does not exist${_omb_term_reset}"
     else
-        printf '%s\n' "${_omb_term_red}WARNING: '${target}' does not exist${_omb_term_reset}"
+        printf '%s\n' "${_omb_term_brown}WARNING: '${target}' does not exist${_omb_term_reset}"
     fi
 }
 
diff --git a/plugins/battery/battery.plugin.sh b/plugins/battery/battery.plugin.sh
index f97730a..db514a6 100644
--- a/plugins/battery/battery.plugin.sh
+++ b/plugins/battery/battery.plugin.sh
@@ -139,8 +139,8 @@ battery_charge(){
   local D_C='▹'
   local DEPLETED_COLOR="${_omb_prompt_normal}"
   local FULL_COLOR="${_omb_prompt_green}"
-  local HALF_COLOR="${_omb_prompt_yellow}"
-  local DANGER_COLOR="${_omb_prompt_red}"
+  local HALF_COLOR="${_omb_prompt_olive}"
+  local DANGER_COLOR="${_omb_prompt_brown}"
   local BATTERY_OUTPUT="${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${D_C}"
   local BATTERY_PERC=$(battery_percentage)
 
diff --git a/themes/90210/90210.theme.sh b/themes/90210/90210.theme.sh
index 8db4d48..3967429 100644
--- a/themes/90210/90210.theme.sh
+++ b/themes/90210/90210.theme.sh
@@ -1,17 +1,17 @@
 #! bash oh-my-bash.module
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
 # Nicely formatted terminal prompt
 function _omb_theme_PROMPT_COMMAND(){
-  export PS1="\n${_omb_prompt_bold_black}[${_omb_prompt_blue}\@${_omb_prompt_bold_black}]-${_omb_prompt_bold_black}[${_omb_prompt_green}\u${_omb_prompt_yellow}@${_omb_prompt_green}\h${_omb_prompt_bold_black}]-${_omb_prompt_bold_black}[${_omb_prompt_magenta}\w${_omb_prompt_bold_black}]-$(scm_prompt_info)\n${_omb_prompt_reset_color}\$ "
+  export PS1="\n${_omb_prompt_bold_black}[${_omb_prompt_navy}\@${_omb_prompt_bold_black}]-${_omb_prompt_bold_black}[${_omb_prompt_green}\u${_omb_prompt_olive}@${_omb_prompt_green}\h${_omb_prompt_bold_black}]-${_omb_prompt_bold_black}[${_omb_prompt_purple}\w${_omb_prompt_bold_black}]-$(scm_prompt_info)\n${_omb_prompt_reset_color}\$ "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/bakke/bakke.theme.sh b/themes/bakke/bakke.theme.sh
index a1bdeb0..a388b24 100644
--- a/themes/bakke/bakke.theme.sh
+++ b/themes/bakke/bakke.theme.sh
@@ -1,10 +1,10 @@
 #! bash oh-my-bash.module
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -13,10 +13,10 @@ RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="|"
 
 function _omb_theme_PROMPT_COMMAND() {
-    #PS1="${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_magenta}$(_omb_prompt_print_ruby_env) ${_omb_prompt_yellow}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
-    #PS1="\n${_omb_prompt_magenta}\h: ${_omb_prompt_reset_color} ${_omb_prompt_green}\w\n${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
-    #PS1="\n${_omb_prompt_cyan}\h: ${_omb_prompt_reset_color} ${_omb_prompt_yellow}\w\n${_omb_prompt_red}$(scm_char)${_omb_prompt_red}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
-    PS1="\n${_omb_prompt_cyan}\h: ${_omb_prompt_reset_color} ${_omb_prompt_yellow}\w ${_omb_prompt_green}$(scm_prompt_info)\n${_omb_prompt_reset_color}→ "
+    #PS1="${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_purple}$(_omb_prompt_print_ruby_env) ${_omb_prompt_olive}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    #PS1="\n${_omb_prompt_purple}\h: ${_omb_prompt_reset_color} ${_omb_prompt_green}\w\n${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    #PS1="\n${_omb_prompt_teal}\h: ${_omb_prompt_reset_color} ${_omb_prompt_olive}\w\n${_omb_prompt_brown}$(scm_char)${_omb_prompt_brown}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    PS1="\n${_omb_prompt_teal}\h: ${_omb_prompt_reset_color} ${_omb_prompt_olive}\w ${_omb_prompt_green}$(scm_prompt_info)\n${_omb_prompt_reset_color}→ "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/binaryanomaly/binaryanomaly.theme.sh b/themes/binaryanomaly/binaryanomaly.theme.sh
index b099641..fafe19d 100644
--- a/themes/binaryanomaly/binaryanomaly.theme.sh
+++ b/themes/binaryanomaly/binaryanomaly.theme.sh
@@ -30,10 +30,10 @@ function set_host_color() {
 function set_user_color() {
   case $(id -u) in
     0)
-      printf "${_omb_prompt_red}"
+      printf "${_omb_prompt_brown}"
       ;;
     *)
-      printf "${_omb_prompt_cyan}"
+      printf "${_omb_prompt_teal}"
       ;;
   esac
 }
@@ -73,7 +73,7 @@ function _omb_theme_PROMPT_COMMAND() {
   ps_uh_separator="${dark_grey}@${_omb_prompt_normal}"
   ps_hostname="$(set_host_color)\h${_omb_prompt_normal}"
 
-  ps_path="${_omb_prompt_yellow}\w${_omb_prompt_normal}"
+  ps_path="${_omb_prompt_olive}\w${_omb_prompt_normal}"
   ps_scm_prompt="${light_grey}$(scm_prompt)"
 
   ps_user_mark="${_omb_prompt_normal} ${_omb_prompt_normal}"
@@ -92,10 +92,10 @@ THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$dark_grey"}
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${light_grey}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${light_grey}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓${light_grey}"
 SCM_GIT_CHAR="${_omb_prompt_green}±${light_grey}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${light_grey}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${light_grey}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${light_grey}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${light_grey}"
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/bobby-python/bobby-python.theme.sh b/themes/bobby-python/bobby-python.theme.sh
index e29c777..f91cd12 100644
--- a/themes/bobby-python/bobby-python.theme.sh
+++ b/themes/bobby-python/bobby-python.theme.sh
@@ -1,10 +1,10 @@
 #! bash oh-my-bash.module
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -12,8 +12,8 @@ GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 CONDAENV_THEME_PROMPT_SUFFIX="|"
 
 function _omb_theme_PROMPT_COMMAND() {
-    #PS1="${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_magenta}$(_omb_prompt_print_ruby_env) ${_omb_prompt_yellow}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
-    PS1="\n${_omb_prompt_yellow}$(python_version_prompt) ${_omb_prompt_magenta}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    #PS1="${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_purple}$(_omb_prompt_print_ruby_env) ${_omb_prompt_olive}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    PS1="\n${_omb_prompt_olive}$(python_version_prompt) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/bobby/bobby.theme.sh b/themes/bobby/bobby.theme.sh
index 1b28d9a..deb661f 100644
--- a/themes/bobby/bobby.theme.sh
+++ b/themes/bobby/bobby.theme.sh
@@ -1,11 +1,11 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -22,13 +22,13 @@ __bobby_clock() {
 }
 
 function _omb_theme_PROMPT_COMMAND() {
-    #PS1="${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_magenta}$(_omb_prompt_print_ruby_env) ${_omb_prompt_yellow}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
-    PS1="\n$(battery_char) $(__bobby_clock)${_omb_prompt_yellow}$(_omb_prompt_print_ruby_env) ${_omb_prompt_magenta}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_cyan}$(scm_prompt_char_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    #PS1="${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_purple}$(_omb_prompt_print_ruby_env) ${_omb_prompt_olive}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    PS1="\n$(battery_char) $(__bobby_clock)${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_teal}$(scm_prompt_char_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
 }
 
 THEME_SHOW_CLOCK_CHAR=${THEME_SHOW_CLOCK_CHAR:-"true"}
-THEME_CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:-"$_omb_prompt_red"}
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_bold_cyan"}
+THEME_CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:-"$_omb_prompt_brown"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_bold_teal"}
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%Y-%m-%d %H:%M:%S"}
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/brainy/brainy.theme.sh b/themes/brainy/brainy.theme.sh
index 4e67a90..a44a267 100644
--- a/themes/brainy/brainy.theme.sh
+++ b/themes/brainy/brainy.theme.sh
@@ -88,10 +88,10 @@ ____brainy_bottom() {
 ##############
 
 ___brainy_prompt_user_info() {
-	color=$_omb_prompt_bold_blue
+	color=$_omb_prompt_bold_navy
 	if [ "${THEME_SHOW_SUDO}" == "true" ]; then
 		if [ $(sudo -n id -u 2>&1 | grep 0) ]; then
-			color=$_omb_prompt_bold_red
+			color=$_omb_prompt_bold_brown
 		fi
 	fi
 	box="[|]"
@@ -104,7 +104,7 @@ ___brainy_prompt_user_info() {
 }
 
 ___brainy_prompt_dir() {
-	color=$_omb_prompt_bold_yellow
+	color=$_omb_prompt_bold_olive
 	box="[|]"
 	info="\w"
 	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_white}" "${box}"
@@ -120,10 +120,10 @@ ___brainy_prompt_scm() {
 
 ___brainy_prompt_python() {
 	[ "${THEME_SHOW_PYTHON}" != "true" ] && return
-	color=$_omb_prompt_bold_yellow
+	color=$_omb_prompt_bold_olive
 	box="[|]"
 	info="$(python_version_prompt)"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_blue}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_navy}" "${box}"
 }
 
 ___brainy_prompt_ruby() {
@@ -131,7 +131,7 @@ ___brainy_prompt_ruby() {
 	color=$_omb_prompt_bold_white
 	box="[|]"
 	info="rb-$(_omb_prompt_print_ruby_env)"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_red}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_brown}" "${box}"
 }
 
 ___brainy_prompt_todo() {
@@ -148,7 +148,7 @@ ___brainy_prompt_clock() {
 	color=$THEME_CLOCK_COLOR
 	box="[|]"
 	info="$(date +"${THEME_CLOCK_FORMAT}")"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_magenta}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${_omb_prompt_bold_purple}" "${box}"
 }
 
 ___brainy_prompt_battery() {
@@ -157,9 +157,9 @@ ___brainy_prompt_battery() {
 	info=$(battery_percentage)
 	color=$_omb_prompt_bold_green
 	if [ "$info" -lt 50 ]; then
-		color=$_omb_prompt_bold_yellow
+		color=$_omb_prompt_bold_olive
 	elif [ "$info" -lt 25 ]; then
-		color=$_omb_prompt_bold_red
+		color=$_omb_prompt_bold_brown
 	fi
 	box="[|]"
 	ac_adapter_connected && info+="+"
@@ -169,7 +169,7 @@ ___brainy_prompt_battery() {
 
 ___brainy_prompt_exitcode() {
 	[ "${THEME_SHOW_EXITCODE}" != "true" ] && return
-	color=$_omb_prompt_bold_magenta
+	color=$_omb_prompt_bold_purple
 	[ "$exitcode" -ne 0 ] && printf "%s|%s" "${color}" "${exitcode}"
 }
 
@@ -250,7 +250,7 @@ export RBFU_THEME_PROMPT_SUFFIX=""
 export RVM_THEME_PROMPT_PREFIX=""
 export RVM_THEME_PROMPT_SUFFIX=""
 
-export SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+export SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 export SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 
 THEME_SHOW_SUDO=${THEME_SHOW_SUDO:-"true"}
diff --git a/themes/brunton/brunton.theme.sh b/themes/brunton/brunton.theme.sh
index 5503c93..f7731ad 100644
--- a/themes/brunton/brunton.theme.sh
+++ b/themes/brunton/brunton.theme.sh
@@ -3,16 +3,16 @@
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${_omb_prompt_bold_green}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 is_vim_shell() {
 	if [ ! -z "$VIMRUNTIME" ]
 	then
-		echo "[${_omb_prompt_cyan}vim shell${_omb_prompt_normal}]"
+		echo "[${_omb_prompt_teal}vim shell${_omb_prompt_normal}]"
 	fi
 }
 
@@ -27,10 +27,10 @@ scm_prompt() {
 }
 
 _omb_theme_PROMPT_COMMAND() {
-  PS1="${_omb_prompt_white}${_omb_prompt_background_blue} \u${_omb_prompt_normal}${_omb_prompt_background_blue}@${_omb_prompt_red}${_omb_prompt_background_blue}\h $(clock_prompt) ${_omb_prompt_reset_color}${_omb_prompt_normal} $(battery_charge)\n${_omb_prompt_bold_black}${_omb_prompt_background_white} \w ${_omb_prompt_normal}$(scm_prompt)$(is_vim_shell)\n${_omb_prompt_white}>${_omb_prompt_normal} "
+  PS1="${_omb_prompt_white}${_omb_prompt_background_navy} \u${_omb_prompt_normal}${_omb_prompt_background_navy}@${_omb_prompt_brown}${_omb_prompt_background_navy}\h $(clock_prompt) ${_omb_prompt_reset_color}${_omb_prompt_normal} $(battery_charge)\n${_omb_prompt_bold_black}${_omb_prompt_background_white} \w ${_omb_prompt_normal}$(scm_prompt)$(is_vim_shell)\n${_omb_prompt_white}>${_omb_prompt_normal} "
 }
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_blue$_omb_prompt_background_white"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_navy$_omb_prompt_background_white"}
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-" %H:%M:%S"}
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/candy/candy.theme.sh b/themes/candy/candy.theme.sh
index 05ad326..c11efe7 100644
--- a/themes/candy/candy.theme.sh
+++ b/themes/candy/candy.theme.sh
@@ -1,10 +1,10 @@
 #! bash oh-my-bash.module
 
 function _omb_theme_PROMPT_COMMAND() {
-    PS1="${_omb_prompt_green}\u@\h $(clock_prompt) ${_omb_prompt_reset_color}${_omb_prompt_white}\w${_omb_prompt_reset_color}$(scm_prompt_info)${_omb_prompt_blue} →${_omb_prompt_bold_blue} ${_omb_prompt_reset_color} ";
+    PS1="${_omb_prompt_green}\u@\h $(clock_prompt) ${_omb_prompt_reset_color}${_omb_prompt_white}\w${_omb_prompt_reset_color}$(scm_prompt_info)${_omb_prompt_navy} →${_omb_prompt_bold_navy} ${_omb_prompt_reset_color} ";
 }
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_blue"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_navy"}
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"}
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/clean/clean.theme.sh b/themes/clean/clean.theme.sh
index 90b1361..03a69d7 100644
--- a/themes/clean/clean.theme.sh
+++ b/themes/clean/clean.theme.sh
@@ -1,9 +1,9 @@
 #! bash oh-my-bash.module
 # git theming
-ZSH_THEME_GIT_PROMPT_PREFIX="${_omb_prompt_bold_blue}(${_omb_prompt_yellow}%B"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%b${_omb_prompt_bold_blue})${_omb_prompt_reset_color} "
+ZSH_THEME_GIT_PROMPT_PREFIX="${_omb_prompt_bold_navy}(${_omb_prompt_olive}%B"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%b${_omb_prompt_bold_navy})${_omb_prompt_reset_color} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_DIRTY="${_omb_prompt_bold_red}✗"
+ZSH_THEME_GIT_PROMPT_DIRTY="${_omb_prompt_bold_brown}✗"
 
 
 # LS colors, made with http://geoff.greer.fm/lscolors/
@@ -12,9 +12,9 @@ export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40
 
 function _omb_theme_PROMPT_COMMAND() {
 
-    if [ "$(whoami)" = root ]; then no_color=$_omb_prompt_red; else no_color=$_omb_prompt_white; fi
+    if [ "$(whoami)" = root ]; then no_color=$_omb_prompt_brown; else no_color=$_omb_prompt_white; fi
 
-    PS1="${no_color}\u${_omb_prompt_reset_color}:${_omb_prompt_blue}\W/${_omb_prompt_reset_color} \[\$(scm_prompt_info)\]$ "
+    PS1="${no_color}\u${_omb_prompt_reset_color}:${_omb_prompt_navy}\W/${_omb_prompt_reset_color} \[\$(scm_prompt_info)\]$ "
     RPROMPT='[\t]'
 }
 
diff --git a/themes/cooperkid/cooperkid.theme.sh b/themes/cooperkid/cooperkid.theme.sh
index 48170c2..05ae618 100644
--- a/themes/cooperkid/cooperkid.theme.sh
+++ b/themes/cooperkid/cooperkid.theme.sh
@@ -5,12 +5,12 @@
 #      BASED ON: Mr Briggs by Matt Brigg (matt@mattbriggs.net)      #
 # ------------------------------------------------------------------#
 
-SCM_THEME_PROMPT_DIRTY="${_omb_prompt_red} ✗${_omb_prompt_reset_color}"
-SCM_THEME_PROMPT_AHEAD="${_omb_prompt_yellow} ↑${_omb_prompt_reset_color}"
+SCM_THEME_PROMPT_DIRTY="${_omb_prompt_brown} ✗${_omb_prompt_reset_color}"
+SCM_THEME_PROMPT_AHEAD="${_omb_prompt_olive} ↑${_omb_prompt_reset_color}"
 SCM_THEME_PROMPT_CLEAN="${_omb_prompt_green} ✓${_omb_prompt_reset_color}"
 SCM_THEME_PROMPT_PREFIX=" "
 SCM_THEME_PROMPT_SUFFIX=""
-GIT_SHA_PREFIX="${_omb_prompt_blue}"
+GIT_SHA_PREFIX="${_omb_prompt_navy}"
 GIT_SHA_SUFFIX="${_omb_prompt_reset_color}"
 
 function git_short_sha() {
@@ -19,11 +19,11 @@ function git_short_sha() {
 
 function _omb_theme_PROMPT_COMMAND() {
     local return_status=""
-    local ruby="${_omb_prompt_red}$(_omb_prompt_print_ruby_env)${_omb_prompt_reset_color}"
+    local ruby="${_omb_prompt_brown}$(_omb_prompt_print_ruby_env)${_omb_prompt_reset_color}"
     local user_host="${_omb_prompt_green}\h @ \w${_omb_prompt_reset_color}"
-    local git_branch="$(git_short_sha)${_omb_prompt_cyan}$(scm_prompt_info)${_omb_prompt_reset_color}"
+    local git_branch="$(git_short_sha)${_omb_prompt_teal}$(scm_prompt_info)${_omb_prompt_reset_color}"
     local prompt_symbol=' '
-    local prompt_char="${_omb_prompt_magenta}>_${_omb_prompt_reset_color} "
+    local prompt_char="${_omb_prompt_purple}>_${_omb_prompt_reset_color} "
 
     PS1="\n${user_host}${prompt_symbol}${ruby} ${git_branch} ${return_status}\n${prompt_char}"
 }
diff --git a/themes/cupcake/cupcake.theme.sh b/themes/cupcake/cupcake.theme.sh
index 855adde..cefaffe 100644
--- a/themes/cupcake/cupcake.theme.sh
+++ b/themes/cupcake/cupcake.theme.sh
@@ -19,10 +19,10 @@ VIRTUALENV_THEME_PROMPT_SUFFIX=""
 # SCM prompts
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR="[±] "
-SCM_GIT_BEHIND_CHAR="${_omb_prompt_red}↓${_omb_prompt_normal}"
+SCM_GIT_BEHIND_CHAR="${_omb_prompt_brown}↓${_omb_prompt_normal}"
 SCM_GIT_AHEAD_CHAR="${_omb_prompt_bold_green}↑${_omb_prompt_normal}"
 SCM_GIT_UNTRACKED_CHAR="⌀"
-SCM_GIT_UNSTAGED_CHAR="${_omb_prompt_bold_yellow}•${_omb_prompt_normal}"
+SCM_GIT_UNSTAGED_CHAR="${_omb_prompt_bold_olive}•${_omb_prompt_normal}"
 SCM_GIT_STAGED_CHAR="${_omb_prompt_bold_green}+${_omb_prompt_normal}"
 
 SCM_THEME_PROMPT_DIRTY=""
@@ -31,7 +31,7 @@ SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
 # Git status prompts
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗${_omb_prompt_normal}"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗${_omb_prompt_normal}"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 GIT_THEME_PROMPT_PREFIX=""
 GIT_THEME_PROMPT_SUFFIX=""
@@ -63,7 +63,7 @@ function winname {
 
 # Displays the current prompt
 function _omb_theme_PROMPT_COMMAND() {
-  PS1="\n${icon_start}$(_omb_prompt_print_python_venv)${icon_user}${_omb_prompt_bold_red}\u${_omb_prompt_normal}${icon_host}${_omb_prompt_bold_cyan}\h${_omb_prompt_normal}${icon_directory}${_omb_prompt_bold_magenta}\W${_omb_prompt_normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch}  \")${_omb_prompt_white}$(scm_prompt_info)${_omb_prompt_normal}\n${icon_end}"
+  PS1="\n${icon_start}$(_omb_prompt_print_python_venv)${icon_user}${_omb_prompt_bold_brown}\u${_omb_prompt_normal}${icon_host}${_omb_prompt_bold_teal}\h${_omb_prompt_normal}${icon_directory}${_omb_prompt_bold_purple}\W${_omb_prompt_normal}\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on ${icon_branch}  \")${_omb_prompt_white}$(scm_prompt_info)${_omb_prompt_normal}\n${icon_end}"
   PS2="${icon_end}"
 }
 
diff --git a/themes/demula/demula.theme.sh b/themes/demula/demula.theme.sh
index be4d300..201082a 100644
--- a/themes/demula/demula.theme.sh
+++ b/themes/demula/demula.theme.sh
@@ -35,15 +35,15 @@
 # ----------------------------------------------------------------- COLOR CONF
 D_DEFAULT_COLOR="${_omb_prompt_normal}"
 D_INTERMEDIATE_COLOR="${_omb_prompt_white}"
-D_USER_COLOR="${_omb_prompt_magenta}"
-D_SUPERUSER_COLOR="${_omb_prompt_red}"
-D_MACHINE_COLOR="${_omb_prompt_cyan}"
+D_USER_COLOR="${_omb_prompt_purple}"
+D_SUPERUSER_COLOR="${_omb_prompt_brown}"
+D_MACHINE_COLOR="${_omb_prompt_teal}"
 D_DIR_COLOR="${_omb_prompt_green}"
-D_SCM_COLOR="${_omb_prompt_yellow}"
-D_BRANCH_COLOR="${_omb_prompt_yellow}"
+D_SCM_COLOR="${_omb_prompt_olive}"
+D_BRANCH_COLOR="${_omb_prompt_olive}"
 D_CHANGES_COLOR="${_omb_prompt_white}"
-D_CMDFAIL_COLOR="${_omb_prompt_red}"
-D_VIMSHELL_COLOR="${_omb_prompt_cyan}"
+D_CMDFAIL_COLOR="${_omb_prompt_brown}"
+D_VIMSHELL_COLOR="${_omb_prompt_teal}"
 
 # ------------------------------------------------------------------ FUNCTIONS
 case $TERM in
diff --git a/themes/doubletime/doubletime.theme.sh b/themes/doubletime/doubletime.theme.sh
index 5b985e2..02b7aa9 100644
--- a/themes/doubletime/doubletime.theme.sh
+++ b/themes/doubletime/doubletime.theme.sh
@@ -2,15 +2,15 @@
 
 SCM_THEME_PROMPT_DIRTY=''
 SCM_THEME_PROMPT_CLEAN=''
-SCM_GIT_CHAR="${_omb_prompt_bold_cyan}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_GIT_CHAR="${_omb_prompt_bold_teal}±${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 if [ ! -z $RVM_THEME_PROMPT_COLOR ]; then
     RVM_THEME_PROMPT_COLOR=$(eval echo $`echo ${RVM_THEME_PROMPT_COLOR}`);
 else
-    RVM_THEME_PROMPT_COLOR="${_omb_prompt_red}"
+    RVM_THEME_PROMPT_COLOR="${_omb_prompt_brown}"
 fi
 RVM_THEME_PROMPT_PREFIX="(${RVM_THEME_PROMPT_COLOR}rb${_omb_prompt_normal}: "
 RVM_THEME_PROMPT_SUFFIX=") "
@@ -25,7 +25,7 @@ VIRTUALENV_THEME_PROMPT_SUFFIX=") "
 if [ ! -z $THEME_PROMPT_HOST_COLOR ]; then
     THEME_PROMPT_HOST_COLOR=$(eval echo $`echo ${THEME_PROMPT_HOST_COLOR}`);
 else
-    THEME_PROMPT_HOST_COLOR="$_omb_prompt_blue"
+    THEME_PROMPT_HOST_COLOR="$_omb_prompt_navy"
 fi
 
 doubletime_scm_prompt() {
@@ -57,11 +57,11 @@ git_prompt_status() {
   local git_status_output
   git_status_output=$(git status 2> /dev/null )
   if [ -n "$(echo $git_status_output | grep 'Changes not staged')" ]; then
-    git_status="${_omb_prompt_bold_red}$(scm_prompt_info) ✗"
+    git_status="${_omb_prompt_bold_brown}$(scm_prompt_info) ✗"
   elif [ -n "$(echo $git_status_output | grep 'Changes to be committed')" ]; then
-     git_status="${_omb_prompt_bold_yellow}$(scm_prompt_info) ^"
+     git_status="${_omb_prompt_bold_olive}$(scm_prompt_info) ^"
   elif [ -n "$(echo $git_status_output | grep 'Untracked files')" ]; then
-     git_status="${_omb_prompt_bold_cyan}$(scm_prompt_info) +"
+     git_status="${_omb_prompt_bold_teal}$(scm_prompt_info) +"
   elif [ -n "$(echo $git_status_output | grep 'nothing to commit')" ]; then
      git_status="${_omb_prompt_bold_green}$(scm_prompt_info) ${_omb_prompt_green}✓"
   else
diff --git a/themes/dulcie/dulcie.theme.sh b/themes/dulcie/dulcie.theme.sh
index 15bc5ec..a66b98d 100644
--- a/themes/dulcie/dulcie.theme.sh
+++ b/themes/dulcie/dulcie.theme.sh
@@ -53,7 +53,7 @@ _omb_theme_PROMPT_COMMAND() {
     DULCIE_WORKINGDIR="${color_workingdir}\W${_omb_prompt_reset_color}"
     DULCIE_PROMPTCHAR="${color_user}"'\$'"${_omb_prompt_reset_color}"
 
-    SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗${_omb_prompt_reset_color}"
+    SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗${_omb_prompt_reset_color}"
     SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
     DULCIE_SCM_BACKGROUND="${background_scm}"
     DULCIE_SCM_DIR_COLOR="${color_rootdir}"
diff --git a/themes/duru/duru.theme.sh b/themes/duru/duru.theme.sh
index 98357cb..0bb26d9 100644
--- a/themes/duru/duru.theme.sh
+++ b/themes/duru/duru.theme.sh
@@ -1,15 +1,15 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_PREFIX="${_omb_prompt_cyan} on ${_omb_prompt_green}"
+SCM_THEME_PROMPT_PREFIX="${_omb_prompt_teal} on ${_omb_prompt_green}"
 SCM_THEME_PROMPT_SUFFIX=""
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}with changes"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}with changes"
 SCM_THEME_PROMPT_CLEAN=""
 
 venv() {
   if [ ! -z "$VIRTUAL_ENV" ]
   then
     local env=$VIRTUAL_ENV
-    echo "${gray} in ${_omb_prompt_orange}${env##*/} "
+    echo "${gray} in ${_omb_prompt_red}${env##*/} "
   fi
 }
 
@@ -18,7 +18,7 @@ last_two_dirs() {
 }
 
 _omb_theme_PROMPT_COMMAND() {
-  PS1="${_omb_prompt_yellow}# ${_omb_prompt_reset_color}$(last_two_dirs)$(scm_prompt_info)${_omb_prompt_reset_color}$(venv)${_omb_prompt_reset_color} ${_omb_prompt_cyan}\n> ${_omb_prompt_reset_color}"
+  PS1="${_omb_prompt_olive}# ${_omb_prompt_reset_color}$(last_two_dirs)$(scm_prompt_info)${_omb_prompt_reset_color}$(venv)${_omb_prompt_reset_color} ${_omb_prompt_teal}\n> ${_omb_prompt_reset_color}"
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/emperor/emperor.theme.sh b/themes/emperor/emperor.theme.sh
index 4ebb375..c906c0a 100644
--- a/themes/emperor/emperor.theme.sh
+++ b/themes/emperor/emperor.theme.sh
@@ -1,11 +1,11 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -14,16 +14,16 @@ RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="|"
 
 function get_hour_color {
-    hour_color=$_omb_prompt_red
+    hour_color=$_omb_prompt_brown
     min=$(date +%M)
     if [ "$min" -lt "15" ]; then
         hour_color=$_omb_prompt_white
     elif [ "$min" -lt "30" ]; then
         hour_color=$_omb_prompt_green
     elif [ "$min" -lt "45" ]; then
-        hour_color=$_omb_prompt_yellow
+        hour_color=$_omb_prompt_olive
     else
-        hour_color=$_omb_prompt_red
+        hour_color=$_omb_prompt_brown
     fi
     echo "$hour_color"
 }
@@ -34,7 +34,7 @@ __emperor_clock() {
 }
 
 function _omb_theme_PROMPT_COMMAND() {
-    PS1="\n$(__emperor_clock)${_omb_prompt_magenta}\h ${_omb_prompt_reset_color}in ${prompt_color}\w\n${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    PS1="\n$(__emperor_clock)${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${prompt_color}\w\n${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
 }
 
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H "}
diff --git a/themes/envy/envy.theme.sh b/themes/envy/envy.theme.sh
index a793b89..1ce9e88 100644
--- a/themes/envy/envy.theme.sh
+++ b/themes/envy/envy.theme.sh
@@ -1,16 +1,16 @@
 #! bash oh-my-bash.module
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
 function _omb_theme_PROMPT_COMMAND() {
-    PS1="\n${_omb_prompt_yellow}$(_omb_prompt_print_ruby_env) ${_omb_prompt_magenta}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/font/font.theme.sh b/themes/font/font.theme.sh
index 649f833..c4fdc7d 100644
--- a/themes/font/font.theme.sh
+++ b/themes/font/font.theme.sh
@@ -22,7 +22,7 @@
 #
 
 SCM_NONE_CHAR=''
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=""
 SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}|"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -31,7 +31,7 @@ SCM_GIT_SHOW_MINIMAL_INFO=true
 CLOCK_THEME_PROMPT_PREFIX=''
 CLOCK_THEME_PROMPT_SUFFIX=' '
 THEME_SHOW_CLOCK=${THEME_SHOW_CLOCK:-"true"}
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_bold_blue"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_bold_navy"}
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"}
 
 VIRTUALENV_THEME_PROMPT_PREFIX='('
@@ -49,13 +49,13 @@ function _omb_theme_PROMPT_COMMAND() {
     if [[ ${RC} == 0 ]]; then
         ret_status="${_omb_prompt_bold_green}"
     else
-        ret_status="${_omb_prompt_bold_red}"
+        ret_status="${_omb_prompt_bold_brown}"
     fi
 
     # Append new history lines to history file
     history -a
 
-    PS1="$(clock_prompt)$python_venv${hostname} ${_omb_prompt_bold_cyan}\W $(scm_prompt_char_info)${ret_status}→ ${_omb_prompt_normal}"
+    PS1="$(clock_prompt)$python_venv${hostname} ${_omb_prompt_bold_teal}\W $(scm_prompt_char_info)${ret_status}→ ${_omb_prompt_normal}"
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/gallifrey/gallifrey.theme.sh b/themes/gallifrey/gallifrey.theme.sh
index 9f54d18..bd1fba8 100644
--- a/themes/gallifrey/gallifrey.theme.sh
+++ b/themes/gallifrey/gallifrey.theme.sh
@@ -1,6 +1,6 @@
 #! bash oh-my-bash.module
 # scm theming
-SCM_THEME_PROMPT_PREFIX="${_omb_prompt_yellow}("
+SCM_THEME_PROMPT_PREFIX="${_omb_prompt_olive}("
 SCM_THEME_PROMPT_SUFFIX=")${_omb_prompt_normal}"
 
 SCM_THEME_PROMPT_DIRTY="*"
diff --git a/themes/garo/garo.theme.sh b/themes/garo/garo.theme.sh
index b8cbcd9..d42a10e 100644
--- a/themes/garo/garo.theme.sh
+++ b/themes/garo/garo.theme.sh
@@ -22,7 +22,7 @@
 #
 
 export SCM_NONE_CHAR=''
-export SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+export SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 export SCM_THEME_PROMPT_CLEAN=""
 export SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}|"
 export SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -43,13 +43,13 @@ function _omb_theme_PROMPT_COMMAND() {
     if [[ ${RC} == 0 ]]; then
         ret_status="${_omb_prompt_bold_green}"
     else
-        ret_status="${_omb_prompt_bold_red}"
+        ret_status="${_omb_prompt_bold_brown}"
     fi
 
     # Append new history lines to history file
     history -a
 
-    PS1="$python_venv${hostname} ${_omb_prompt_bold_cyan}\w $(scm_prompt_char_info)${ret_status}→ ${_omb_prompt_normal}"
+    PS1="$python_venv${hostname} ${_omb_prompt_bold_teal}\w $(scm_prompt_char_info)${ret_status}→ ${_omb_prompt_normal}"
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/half-life/half-life.theme.sh b/themes/half-life/half-life.theme.sh
index de44f3b..eeb7d84 100644
--- a/themes/half-life/half-life.theme.sh
+++ b/themes/half-life/half-life.theme.sh
@@ -7,14 +7,14 @@ OSH_THEME_GIT_PROMPT_CLEAN="✓"
 _omb_theme_half_way_prompt_scm() {
   local CHAR=$(scm_char)
   if [[ $CHAR != "$SCM_NONE_CHAR" ]]; then
-    printf '%s' " on ${_omb_prompt_blue}$(git_current_branch)$(parse_git_dirty)${_omb_prompt_normal} "
+    printf '%s' " on ${_omb_prompt_navy}$(git_current_branch)$(parse_git_dirty)${_omb_prompt_normal} "
   fi
 }
 
 _omb_theme_PROMPT_COMMAND() {
-  local ps_username="${_omb_prompt_magenta}\u${_omb_prompt_normal}"
+  local ps_username="${_omb_prompt_purple}\u${_omb_prompt_normal}"
   local ps_path="${_omb_prompt_green}\w${_omb_prompt_normal}"
-  local ps_user_mark="${_omb_prompt_orange}λ${_omb_prompt_normal}"
+  local ps_user_mark="${_omb_prompt_red}λ${_omb_prompt_normal}"
 
   PS1="$ps_username in $ps_path$(_omb_theme_half_way_prompt_scm) $ps_user_mark "
 }
diff --git a/themes/hawaii50/hawaii50.theme.sh b/themes/hawaii50/hawaii50.theme.sh
index def00a8..fe4c8bb 100644
--- a/themes/hawaii50/hawaii50.theme.sh
+++ b/themes/hawaii50/hawaii50.theme.sh
@@ -44,19 +44,19 @@ ORANGE='\[\e[0;33m\]'
 
 DEFAULT_COLOR="${_omb_prompt_white}"
 
-USER_COLOR="${_omb_prompt_magenta}"
-SUPERUSER_COLOR="${_omb_prompt_red}"
+USER_COLOR="${_omb_prompt_purple}"
+SUPERUSER_COLOR="${_omb_prompt_brown}"
 MACHINE_COLOR=$ORANGE
 IP_COLOR=$ORANGE
 DIRECTORY_COLOR="${_omb_prompt_green}"
 
-VE_COLOR="${_omb_prompt_cyan}"
-RVM_COLOR="${_omb_prompt_cyan}"
+VE_COLOR="${_omb_prompt_teal}"
+RVM_COLOR="${_omb_prompt_teal}"
 
-REF_COLOR="${_omb_prompt_magenta}"
+REF_COLOR="${_omb_prompt_purple}"
 
 # SCM prompts
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_THEME_PROMPT_PREFIX=' on '
 SCM_THEME_PROMPT_SUFFIX=''
diff --git a/themes/iterate/iterate.theme.sh b/themes/iterate/iterate.theme.sh
index 2d90554..b32a651 100644
--- a/themes/iterate/iterate.theme.sh
+++ b/themes/iterate/iterate.theme.sh
@@ -3,17 +3,17 @@ SCM_GIT_CHAR="± "
 SCM_HG_CHAR="☿ "
 SCM_SVN_CHAR="⑆ "
 SCM_NONE_CHAR=""
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="|"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}| "
 SCM_GIT_AHEAD_CHAR="${_omb_prompt_green}+"
-SCM_GIT_BEHIND_CHAR="${_omb_prompt_red}-"
+SCM_GIT_BEHIND_CHAR="${_omb_prompt_brown}-"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
-GIT_THEME_PROMPT_PREFIX="${_omb_prompt_cyan}|"
-GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_cyan}| "
+GIT_THEME_PROMPT_PREFIX="${_omb_prompt_teal}|"
+GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_teal}| "
 
 RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="| "
@@ -34,7 +34,7 @@ function git_prompt_info {
 
 LAST_PROMPT=""
 function _omb_theme_PROMPT_COMMAND() {
-    local new_PS1="${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_yellow}$(_omb_prompt_print_ruby_env)${_omb_prompt_green}\w $(scm_prompt_info)"
+    local new_PS1="${_omb_prompt_bold_teal}$(scm_char)${_omb_prompt_olive}$(_omb_prompt_print_ruby_env)${_omb_prompt_green}\w $(scm_prompt_info)"
     local new_prompt=$(PS1="$new_PS1" "$BASH" --norc -i </dev/null 2>&1 | sed -n '${s/^\(.*\)exit$/\1/p;}')
 
     if [ "$LAST_PROMPT" = "$new_prompt" ]; then
diff --git a/themes/kitsune/kitsune.theme.sh b/themes/kitsune/kitsune.theme.sh
index 5a08a74..5bcbfd8 100644
--- a/themes/kitsune/kitsune.theme.sh
+++ b/themes/kitsune/kitsune.theme.sh
@@ -21,23 +21,23 @@ function _omb_theme_PROMPT_COMMAND() {
 
   local SC
   if ((status == 0)); then
-    SC="$_omb_prompt_cyan-$_omb_prompt_bold_green(${_omb_prompt_green}^_^$_omb_prompt_bold_green)";
+    SC="$_omb_prompt_teal-$_omb_prompt_bold_green(${_omb_prompt_green}^_^$_omb_prompt_bold_green)";
   else
-    SC="$_omb_prompt_cyan-$_omb_prompt_bold_green(${_omb_prompt_red}T_T$_omb_prompt_bold_green)";
+    SC="$_omb_prompt_teal-$_omb_prompt_bold_green(${_omb_prompt_brown}T_T$_omb_prompt_bold_green)";
   fi
 
   local BC=$(battery_percentage)
   [[ $BC == no && $BC == -1 ]] && BC=
-  BC=${BC:+${_omb_prompt_cyan}-${_omb_prompt_green}($BC%)}
+  BC=${BC:+${_omb_prompt_teal}-${_omb_prompt_green}($BC%)}
 
-  PS1=$TITLEBAR"\n${_omb_prompt_cyan}┌─${_omb_prompt_bold_white}[\u@\h]${_omb_prompt_cyan}─${_omb_prompt_bold_yellow}(\w)$(scm_prompt_info)\n${_omb_prompt_cyan}└─${_omb_prompt_bold_green}[\A]$SC$BC${_omb_prompt_cyan}-${_omb_prompt_bold_cyan}[${_omb_prompt_green}${_omb_prompt_bold_green}\$${_omb_prompt_bold_cyan}]${_omb_prompt_green} "
+  PS1=$TITLEBAR"\n${_omb_prompt_teal}┌─${_omb_prompt_bold_white}[\u@\h]${_omb_prompt_teal}─${_omb_prompt_bold_olive}(\w)$(scm_prompt_info)\n${_omb_prompt_teal}└─${_omb_prompt_bold_green}[\A]$SC$BC${_omb_prompt_teal}-${_omb_prompt_bold_teal}[${_omb_prompt_green}${_omb_prompt_bold_green}\$${_omb_prompt_bold_teal}]${_omb_prompt_green} "
 }
 
 # scm theming
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
-SCM_THEME_PROMPT_PREFIX="${_omb_prompt_bold_cyan}("
-SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_bold_cyan})${_omb_prompt_reset_color}"
+SCM_THEME_PROMPT_PREFIX="${_omb_prompt_bold_teal}("
+SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_bold_teal})${_omb_prompt_reset_color}"
 
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/luan/luan.theme.sh b/themes/luan/luan.theme.sh
index 47cf776..27a3128 100644
--- a/themes/luan/luan.theme.sh
+++ b/themes/luan/luan.theme.sh
@@ -1,13 +1,13 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
-SCM_THEME_PROMPT_PREFIX="(${_omb_prompt_yellow}"
+SCM_THEME_PROMPT_PREFIX="(${_omb_prompt_olive}"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_normal})"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
-GIT_THEME_PROMPT_PREFIX="(${_omb_prompt_yellow}"
+GIT_THEME_PROMPT_PREFIX="(${_omb_prompt_olive}"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_normal})"
 
 RVM_THEME_PROMPT_PREFIX=""
@@ -15,9 +15,9 @@ RVM_THEME_PROMPT_SUFFIX=""
 
 function _omb_theme_PROMPT_COMMAND() {
     dtime="$(clock_prompt)"
-    user_host="${_omb_prompt_green}\u@${_omb_prompt_cyan}\h${_omb_prompt_normal}"
-    current_dir="${_omb_prompt_bold_blue}\w${_omb_prompt_normal}"
-    rvm_ruby="${_omb_prompt_bold_red}$(_omb_prompt_print_ruby_env)${_omb_prompt_normal}"
+    user_host="${_omb_prompt_green}\u@${_omb_prompt_teal}\h${_omb_prompt_normal}"
+    current_dir="${_omb_prompt_bold_navy}\w${_omb_prompt_normal}"
+    rvm_ruby="${_omb_prompt_bold_brown}$(_omb_prompt_print_ruby_env)${_omb_prompt_normal}"
     git_branch="$(scm_prompt_info)${_omb_prompt_normal}"
     prompt="${_omb_prompt_bold_green}\$${_omb_prompt_normal} "
     arrow="${_omb_prompt_bold_white}▶${_omb_prompt_normal} "
@@ -27,7 +27,7 @@ function _omb_theme_PROMPT_COMMAND() {
       $arrow $prompt"
 }
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_yellow"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_olive"}
 THEME_CLOCK_FORMAT=${THEME_TIME_FORMAT:-"%I:%M:%S "}
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/mairan/mairan.theme.sh b/themes/mairan/mairan.theme.sh
index 6d4c5b3..7674d28 100644
--- a/themes/mairan/mairan.theme.sh
+++ b/themes/mairan/mairan.theme.sh
@@ -35,11 +35,11 @@ BRACKET_COLOR=$ORANGE
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${_omb_prompt_bold_green}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 #Mysql Prompt
 export MYSQL_PS1="(\u@\h) [\d]> "
@@ -66,7 +66,7 @@ __my_rvm_ruby_version() {
 is_vim_shell() {
         if [ ! -z "$VIMRUNTIME" ]
         then
-                echo "[${_omb_prompt_cyan}vim shell${_omb_prompt_normal}]"
+                echo "[${_omb_prompt_teal}vim shell${_omb_prompt_normal}]"
         fi
 }
 
@@ -84,7 +84,7 @@ modern_scm_prompt() {
 chroot(){
     if [ -n "$debian_chroot" ]
     then
-        my_ps_chroot="${_omb_prompt_bold_cyan}$debian_chroot${_omb_prompt_normal}";
+        my_ps_chroot="${_omb_prompt_bold_teal}$debian_chroot${_omb_prompt_normal}";
         echo "($my_ps_chroot)";
     fi
     }
@@ -93,7 +93,7 @@ chroot(){
 my_ve(){
     if [ -n "$VIRTUAL_ENV" ]
     then
-        my_ps_ve="${_omb_prompt_bold_magenta}$ve${_omb_prompt_normal}";
+        my_ps_ve="${_omb_prompt_bold_purple}$ve${_omb_prompt_normal}";
         echo "($my_ps_ve)";
     fi
     echo "";
@@ -106,7 +106,7 @@ _omb_theme_PROMPT_COMMAND() {
     my_ps_host_root="$ORANGE\h${_omb_prompt_normal}";
 
     my_ps_user="$BOLD$GREEN\u${_omb_prompt_normal}"
-    my_ps_root="${_omb_prompt_bold_red}\u${_omb_prompt_normal}";
+    my_ps_root="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}";
 
     if [ -n "$VIRTUAL_ENV" ]
     then
diff --git a/themes/mbriggs/mbriggs.theme.sh b/themes/mbriggs/mbriggs.theme.sh
index 669dea5..aa30119 100644
--- a/themes/mbriggs/mbriggs.theme.sh
+++ b/themes/mbriggs/mbriggs.theme.sh
@@ -5,12 +5,12 @@
 #      BASED ON: smt by Stephen Tudor (stephen@tudorstudio.com)     #
 # ------------------------------------------------------------------#
 
-SCM_THEME_PROMPT_DIRTY="${_omb_prompt_red}⚡${_omb_prompt_reset_color}"
-SCM_THEME_PROMPT_AHEAD="${_omb_prompt_red}!${_omb_prompt_reset_color}"
+SCM_THEME_PROMPT_DIRTY="${_omb_prompt_brown}⚡${_omb_prompt_reset_color}"
+SCM_THEME_PROMPT_AHEAD="${_omb_prompt_brown}!${_omb_prompt_reset_color}"
 SCM_THEME_PROMPT_CLEAN="${_omb_prompt_green}✓${_omb_prompt_reset_color}"
 SCM_THEME_PROMPT_PREFIX=" "
 SCM_THEME_PROMPT_SUFFIX=""
-GIT_SHA_PREFIX=" ${_omb_prompt_yellow}"
+GIT_SHA_PREFIX=" ${_omb_prompt_olive}"
 GIT_SHA_SUFFIX="${_omb_prompt_reset_color}"
 
 function git_short_sha() {
@@ -19,7 +19,7 @@ function git_short_sha() {
 
 function _omb_theme_PROMPT_COMMAND() {
     local return_status=""
-    local ruby="${_omb_prompt_red}$(_omb_prompt_print_ruby_env)${_omb_prompt_reset_color}"
+    local ruby="${_omb_prompt_brown}$(_omb_prompt_print_ruby_env)${_omb_prompt_reset_color}"
     local user_host="${_omb_prompt_green}\h${_omb_prompt_reset_color}"
     local current_path="\w"
     local n_commands="\!"
diff --git a/themes/minimal/minimal.theme.sh b/themes/minimal/minimal.theme.sh
index af008b9..d8621e8 100644
--- a/themes/minimal/minimal.theme.sh
+++ b/themes/minimal/minimal.theme.sh
@@ -1,12 +1,12 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_PREFIX="${_omb_prompt_cyan}(${_omb_prompt_green}"
-SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_cyan})"
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_PREFIX="${_omb_prompt_teal}(${_omb_prompt_green}"
+SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_teal})"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓"
 
 _omb_theme_PROMPT_COMMAND() {
-  PS1="$(scm_prompt_info)${_omb_prompt_reset_color} ${_omb_prompt_cyan}\W${_omb_prompt_reset_color} "
+  PS1="$(scm_prompt_info)${_omb_prompt_reset_color} ${_omb_prompt_teal}\W${_omb_prompt_reset_color} "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/modern-t/modern-t.theme.sh b/themes/modern-t/modern-t.theme.sh
index 273ab5b..c7b31b8 100644
--- a/themes/modern-t/modern-t.theme.sh
+++ b/themes/modern-t/modern-t.theme.sh
@@ -2,11 +2,11 @@
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${_omb_prompt_bold_green}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 case $TERM in
 	xterm*)
@@ -22,7 +22,7 @@ PS3=">> "
 is_vim_shell() {
 	if [ ! -z "$VIMRUNTIME" ]
 	then
-		echo "[${_omb_prompt_cyan}vim shell${_omb_prompt_normal}]"
+		echo "[${_omb_prompt_teal}vim shell${_omb_prompt_normal}]"
 	fi
 }
 
@@ -42,10 +42,10 @@ _omb_theme_PROMPT_COMMAND() {
 		# Yes, the indenting on these is weird, but it has to be like
 		# this otherwise it won't display properly.
 
-		PS1="${TITLEBAR}${_omb_prompt_bold_red}┌─[${_omb_prompt_cyan}$(t | wc -l | sed -e's/ *//')${_omb_prompt_reset_color}]${_omb_prompt_reset_color}$(modern_scm_prompt)[${_omb_prompt_cyan}\W${_omb_prompt_normal}]$(is_vim_shell)
-${_omb_prompt_bold_red}└─▪${_omb_prompt_normal} "
+		PS1="${TITLEBAR}${_omb_prompt_bold_brown}┌─[${_omb_prompt_teal}$(t | wc -l | sed -e's/ *//')${_omb_prompt_reset_color}]${_omb_prompt_reset_color}$(modern_scm_prompt)[${_omb_prompt_teal}\W${_omb_prompt_normal}]$(is_vim_shell)
+${_omb_prompt_bold_brown}└─▪${_omb_prompt_normal} "
 	else
-		PS1="${TITLEBAR}┌─[${_omb_prompt_cyan}$(t | wc -l | sed -e's/ *//')${_omb_prompt_reset_color}]$(modern_scm_prompt)[${_omb_prompt_cyan}\W${_omb_prompt_normal}]$(is_vim_shell)
+		PS1="${TITLEBAR}┌─[${_omb_prompt_teal}$(t | wc -l | sed -e's/ *//')${_omb_prompt_reset_color}]$(modern_scm_prompt)[${_omb_prompt_teal}\W${_omb_prompt_normal}]$(is_vim_shell)
 └─▪ "
 	fi
 }
diff --git a/themes/modern/modern.theme.sh b/themes/modern/modern.theme.sh
index 972455a..a9df981 100644
--- a/themes/modern/modern.theme.sh
+++ b/themes/modern/modern.theme.sh
@@ -2,11 +2,11 @@
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${_omb_prompt_bold_green}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 case $TERM in
 	xterm*)
@@ -22,7 +22,7 @@ PS3=">> "
 is_vim_shell() {
 	if [ ! -z "$VIMRUNTIME" ]
 	then
-		echo "[${_omb_prompt_cyan}vim shell${_omb_prompt_normal}]"
+		echo "[${_omb_prompt_teal}vim shell${_omb_prompt_normal}]"
 	fi
 }
 
@@ -42,10 +42,10 @@ _omb_theme_PROMPT_COMMAND() {
 		# Yes, the indenting on these is weird, but it has to be like
 		# this otherwise it won't display properly.
 
-    PS1="${TITLEBAR}${_omb_prompt_bold_red}┌─${_omb_prompt_reset_color}$(modern_scm_prompt)[${_omb_prompt_cyan}\W${_omb_prompt_normal}][$(battery_charge)]$(is_vim_shell)
-${_omb_prompt_bold_red}└─▪${_omb_prompt_normal} "
+    PS1="${TITLEBAR}${_omb_prompt_bold_brown}┌─${_omb_prompt_reset_color}$(modern_scm_prompt)[${_omb_prompt_teal}\W${_omb_prompt_normal}][$(battery_charge)]$(is_vim_shell)
+${_omb_prompt_bold_brown}└─▪${_omb_prompt_normal} "
 	else
-		PS1="${TITLEBAR}┌─$(modern_scm_prompt)[${_omb_prompt_cyan}\W${_omb_prompt_normal}][$(battery_charge)]$(is_vim_shell)
+		PS1="${TITLEBAR}┌─$(modern_scm_prompt)[${_omb_prompt_teal}\W${_omb_prompt_normal}][$(battery_charge)]$(is_vim_shell)
 └─▪ "
 	fi
 }
diff --git a/themes/morris/morris.theme.sh b/themes/morris/morris.theme.sh
index 3c9b7f8..94d1e63 100644
--- a/themes/morris/morris.theme.sh
+++ b/themes/morris/morris.theme.sh
@@ -20,7 +20,7 @@ function _omb_theme_PROMPT_COMMAND() {
 }
 
 # scm theming
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="${_omb_prompt_green}("
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green})${_omb_prompt_reset_color}"
diff --git a/themes/n0qorg/n0qorg.theme.sh b/themes/n0qorg/n0qorg.theme.sh
index 59aff58..6db7c5b 100644
--- a/themes/n0qorg/n0qorg.theme.sh
+++ b/themes/n0qorg/n0qorg.theme.sh
@@ -6,17 +6,17 @@
 # for example:
 # ananas ~/Code/bash-it/themes (master*)»
 function _omb_theme_PROMPT_COMMAND() {
-    PS1="${_omb_prompt_bold_blue}[$(hostname)]${_omb_prompt_normal} \w${_omb_prompt_normal} ${_omb_prompt_bold_white}[$(git_prompt_info)]${_omb_prompt_normal}» "
+    PS1="${_omb_prompt_bold_navy}[$(hostname)]${_omb_prompt_normal} \w${_omb_prompt_normal} ${_omb_prompt_bold_white}[$(git_prompt_info)]${_omb_prompt_normal}» "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
 
 ## git-theme
 # feel free to change git chars.
-GIT_THEME_PROMPT_DIRTY="${_omb_prompt_bold_blue}*${_omb_prompt_bold_white}"
+GIT_THEME_PROMPT_DIRTY="${_omb_prompt_bold_navy}*${_omb_prompt_bold_white}"
 GIT_THEME_PROMPT_CLEAN=""
-GIT_THEME_PROMPT_PREFIX="${_omb_prompt_bold_blue}(${_omb_prompt_bold_white}"
-GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_bold_blue})"
+GIT_THEME_PROMPT_PREFIX="${_omb_prompt_bold_navy}(${_omb_prompt_bold_white}"
+GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_bold_navy})"
 
 ## alternate chars
 # 
diff --git a/themes/nwinkler/nwinkler.theme.sh b/themes/nwinkler/nwinkler.theme.sh
index a261bb7..6fc165f 100644
--- a/themes/nwinkler/nwinkler.theme.sh
+++ b/themes/nwinkler/nwinkler.theme.sh
@@ -17,7 +17,7 @@
 
 
 PROMPT_END_CLEAN="${_omb_prompt_green}→${_omb_prompt_reset_color}"
-PROMPT_END_DIRTY="${_omb_prompt_red}→${_omb_prompt_reset_color}"
+PROMPT_END_DIRTY="${_omb_prompt_brown}→${_omb_prompt_reset_color}"
 
 function prompt_end() {
   echo -e "$PROMPT_END"
@@ -32,14 +32,14 @@ _omb_theme_PROMPT_COMMAND() {
   #history -a
   #history -c
   #history -r
-  PS1="($(clock_prompt)) $(scm_char) [${_omb_prompt_blue}\u${_omb_prompt_reset_color}@${_omb_prompt_green}\H${_omb_prompt_reset_color}] ${_omb_prompt_yellow}\w${_omb_prompt_reset_color}$(scm_prompt_info) ${_omb_prompt_reset_color}\n$(prompt_end) "
+  PS1="($(clock_prompt)) $(scm_char) [${_omb_prompt_navy}\u${_omb_prompt_reset_color}@${_omb_prompt_green}\H${_omb_prompt_reset_color}] ${_omb_prompt_olive}\w${_omb_prompt_reset_color}$(scm_prompt_info) ${_omb_prompt_reset_color}\n$(prompt_end) "
   PS2='> '
   PS4='+ '
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_THEME_PROMPT_PREFIX=" ("
 SCM_THEME_PROMPT_SUFFIX=")"
diff --git a/themes/nwinkler_random_colors/nwinkler_random_colors.theme.sh b/themes/nwinkler_random_colors/nwinkler_random_colors.theme.sh
index 5d0dd4d..7edebd2 100644
--- a/themes/nwinkler_random_colors/nwinkler_random_colors.theme.sh
+++ b/themes/nwinkler_random_colors/nwinkler_random_colors.theme.sh
@@ -22,34 +22,34 @@ function randomize_nwinkler {
 
   AVAILABLE_COLORS=(
     "$_omb_prompt_black"
-    "$_omb_prompt_red"
+    "$_omb_prompt_brown"
     "$_omb_prompt_green"
-    "$_omb_prompt_yellow"
-    "$_omb_prompt_blue"
-    "$_omb_prompt_magenta"
-    "$_omb_prompt_cyan"
+    "$_omb_prompt_olive"
+    "$_omb_prompt_navy"
+    "$_omb_prompt_purple"
+    "$_omb_prompt_teal"
     "$_omb_prompt_white"
-    "$_omb_prompt_orange"
+    "$_omb_prompt_red"
     "$_omb_prompt_bold_black"
-    "$_omb_prompt_bold_red"
+    "$_omb_prompt_bold_brown"
     "$_omb_prompt_bold_green"
-    "$_omb_prompt_bold_yellow"
-    "$_omb_prompt_bold_blue"
-    "$_omb_prompt_bold_magenta"
-    "$_omb_prompt_bold_cyan"
+    "$_omb_prompt_bold_olive"
+    "$_omb_prompt_bold_navy"
+    "$_omb_prompt_bold_purple"
+    "$_omb_prompt_bold_teal"
     "$_omb_prompt_bold_white"
-    "$_omb_prompt_bold_orange"
+    "$_omb_prompt_bold_red"
 
     # # Uncomment these to allow underlines:
     # "$_omb_prompt_underline_black"
-    # "$_omb_prompt_underline_red"
+    # "$_omb_prompt_underline_brown"
     # "$_omb_prompt_underline_green"
-    # "$_omb_prompt_underline_yellow"
-    # "$_omb_prompt_underline_blue"
-    # "$_omb_prompt_underline_magenta"
-    # "$_omb_prompt_underline_cyan"
+    # "$_omb_prompt_underline_olive"
+    # "$_omb_prompt_underline_navy"
+    # "$_omb_prompt_underline_purple"
+    # "$_omb_prompt_underline_teal"
     # "$_omb_prompt_underline_white"
-    # "$_omb_prompt_underline_orange"
+    # "$_omb_prompt_underline_red"
   )
 
   USERNAME_COLOR=${AVAILABLE_COLORS[$RANDOM % ${#AVAILABLE_COLORS[@]} ]}
@@ -84,7 +84,7 @@ else
 fi
 
 PROMPT_END_CLEAN="${_omb_prompt_green}→${_omb_prompt_reset_color}"
-PROMPT_END_DIRTY="${_omb_prompt_red}→${_omb_prompt_reset_color}"
+PROMPT_END_DIRTY="${_omb_prompt_brown}→${_omb_prompt_reset_color}"
 
 function prompt_end() {
   echo -e "$PROMPT_END"
@@ -106,7 +106,7 @@ _omb_theme_PROMPT_COMMAND() {
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_THEME_PROMPT_PREFIX=" ("
 SCM_THEME_PROMPT_SUFFIX=")"
diff --git a/themes/pete/pete.theme.sh b/themes/pete/pete.theme.sh
index adbe614..cc34705 100644
--- a/themes/pete/pete.theme.sh
+++ b/themes/pete/pete.theme.sh
@@ -5,7 +5,7 @@ _omb_theme_PROMPT_COMMAND() {
   history -a
   history -c
   history -r
-  PS1="($(clock_prompt)) $(scm_char) [$_omb_prompt_blue\u$_omb_prompt_reset_color@$_omb_prompt_green\H$_omb_prompt_reset_color] $_omb_prompt_yellow\w${_omb_prompt_reset_color}$(scm_prompt_info)$(_omb_prompt_print_ruby_env) $_omb_prompt_reset_color "
+  PS1="($(clock_prompt)) $(scm_char) [$_omb_prompt_navy\u$_omb_prompt_reset_color@$_omb_prompt_green\H$_omb_prompt_reset_color] $_omb_prompt_olive\w${_omb_prompt_reset_color}$(scm_prompt_info)$(_omb_prompt_print_ruby_env) $_omb_prompt_reset_color "
   PS2='> '
   PS4='+ '
 }
diff --git a/themes/primer/primer.theme.sh b/themes/primer/primer.theme.sh
index 5d20de4..a98c02f 100644
--- a/themes/primer/primer.theme.sh
+++ b/themes/primer/primer.theme.sh
@@ -2,10 +2,10 @@
 
 # based of the candy theme, but minimized by odbol
 function _omb_theme_PROMPT_COMMAND() {
-    PS1="$(clock_prompt) ${_omb_prompt_reset_color}${_omb_prompt_white}\w${_omb_prompt_reset_color}$(scm_prompt_info)${_omb_prompt_blue} →${_omb_prompt_bold_blue} ${_omb_prompt_reset_color} ";
+    PS1="$(clock_prompt) ${_omb_prompt_reset_color}${_omb_prompt_white}\w${_omb_prompt_reset_color}$(scm_prompt_info)${_omb_prompt_navy} →${_omb_prompt_bold_navy} ${_omb_prompt_reset_color} ";
 }
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_blue"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_navy"}
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%I:%M:%S"}
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/pro/pro.theme.sh b/themes/pro/pro.theme.sh
index 3e56ac7..5557d31 100644
--- a/themes/pro/pro.theme.sh
+++ b/themes/pro/pro.theme.sh
@@ -1,11 +1,11 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓"
-SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_blue}scm:( "
-SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_blue} )"
+SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_navy}scm:( "
+SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_navy} )"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓"
 GIT_THEME_PROMPT_PREFIX="${_omb_prompt_green}git:( "
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green} )"
diff --git a/themes/pure/pure.theme.sh b/themes/pure/pure.theme.sh
index 22b24b3..2ae8960 100644
--- a/themes/pure/pure.theme.sh
+++ b/themes/pure/pure.theme.sh
@@ -3,11 +3,11 @@
 SCM_THEME_PROMPT_PREFIX="|"
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${_omb_prompt_green}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 ### TODO: openSUSE has already colors enabled, check if those differs from stock
 # LS colors, made with http://geoff.greer.fm/lscolors/
@@ -25,12 +25,12 @@ scm_prompt() {
 }
 
 _omb_theme_PROMPT_COMMAND() {
-    ps_host="${_omb_prompt_bold_blue}\h${_omb_prompt_normal}";
+    ps_host="${_omb_prompt_bold_navy}\h${_omb_prompt_normal}";
     ps_user="${_omb_prompt_green}\u${_omb_prompt_normal}";
     ps_user_mark="${_omb_prompt_green} $ ${_omb_prompt_normal}";
-    ps_root="${_omb_prompt_red}\u${_omb_prompt_red}";
-    ps_root_mark="${_omb_prompt_red} # ${_omb_prompt_normal}"
-    ps_path="${_omb_prompt_yellow}\w${_omb_prompt_normal}";
+    ps_root="${_omb_prompt_brown}\u${_omb_prompt_brown}";
+    ps_root_mark="${_omb_prompt_brown} # ${_omb_prompt_normal}"
+    ps_path="${_omb_prompt_olive}\w${_omb_prompt_normal}";
 
     # make it work
     case $(id -u) in
diff --git a/themes/purity/purity.theme.sh b/themes/purity/purity.theme.sh
index e4004c7..2b5f6bb 100644
--- a/themes/purity/purity.theme.sh
+++ b/themes/purity/purity.theme.sh
@@ -1,21 +1,21 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}⊘${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}⊘${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_THEME_PROMPT_PREFIX="${_omb_prompt_reset_color}( "
 SCM_THEME_PROMPT_SUFFIX=" ${_omb_prompt_reset_color})"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}⊘${_omb_prompt_normal}"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}⊘${_omb_prompt_normal}"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 GIT_THEME_PROMPT_PREFIX="${_omb_prompt_reset_color}( "
 GIT_THEME_PROMPT_SUFFIX=" ${_omb_prompt_reset_color})"
 
-STATUS_THEME_PROMPT_BAD="${_omb_prompt_bold_red}❯${_omb_prompt_reset_color}${_omb_prompt_normal} "
+STATUS_THEME_PROMPT_BAD="${_omb_prompt_bold_brown}❯${_omb_prompt_reset_color}${_omb_prompt_normal} "
 STATUS_THEME_PROMPT_OK="${_omb_prompt_bold_green}❯${_omb_prompt_reset_color}${_omb_prompt_normal} "
 
 function _omb_theme_PROMPT_COMMAND() {
     local ret_status="$( [ $? -eq 0 ] && echo -e "$STATUS_THEME_PROMPT_OK" || echo -e "$STATUS_THEME_PROMPT_BAD")"
-    PS1="\n${_omb_prompt_blue}\w $(scm_prompt_info)\n${ret_status} "
+    PS1="\n${_omb_prompt_navy}\w $(scm_prompt_info)\n${ret_status} "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/rainbowbrite/rainbowbrite.theme.sh b/themes/rainbowbrite/rainbowbrite.theme.sh
index 4bcbd84..2f76888 100644
--- a/themes/rainbowbrite/rainbowbrite.theme.sh
+++ b/themes/rainbowbrite/rainbowbrite.theme.sh
@@ -11,9 +11,9 @@ _omb_theme_PROMPT_COMMAND() {
   history -c
   history -r
   # displays user@server in purple
-  # PS1="$_omb_prompt_red$(scm_char) $_omb_prompt_magenta\u@\h$_omb_prompt_reset_color:$_omb_prompt_blue\w$_omb_prompt_yellow$(scm_prompt_info)$(_omb_prompt_print_ruby_env) $_omb_prompt_black\$$_omb_prompt_reset_color "
+  # PS1="$_omb_prompt_brown$(scm_char) $_omb_prompt_purple\u@\h$_omb_prompt_reset_color:$_omb_prompt_navy\w$_omb_prompt_olive$(scm_prompt_info)$(_omb_prompt_print_ruby_env) $_omb_prompt_black\$$_omb_prompt_reset_color "
   # no user@server
-  PS1="$_omb_prompt_red$(scm_char) $_omb_prompt_blue\w$_omb_prompt_yellow$(scm_prompt_info)$(_omb_prompt_print_ruby_env) $_omb_prompt_black\$$_omb_prompt_reset_color "
+  PS1="$_omb_prompt_brown$(scm_char) $_omb_prompt_navy\w$_omb_prompt_olive$(scm_prompt_info)$(_omb_prompt_print_ruby_env) $_omb_prompt_black\$$_omb_prompt_reset_color "
   PS2='> '
   PS4='+ '
 }
@@ -21,9 +21,9 @@ _omb_theme_PROMPT_COMMAND() {
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
 
 SCM_NONE_CHAR='·'
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓"
 SCM_THEME_PROMPT_PREFIX=" ("
-SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_yellow})"
+SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_olive})"
 RVM_THEME_PROMPT_PREFIX=" ("
 RVM_THEME_PROMPT_SUFFIX=")"
diff --git a/themes/rjorgenson/rjorgenson.theme.sh b/themes/rjorgenson/rjorgenson.theme.sh
index 8fa66a5..828c29a 100644
--- a/themes/rjorgenson/rjorgenson.theme.sh
+++ b/themes/rjorgenson/rjorgenson.theme.sh
@@ -3,17 +3,17 @@
 
 # set colors for use throughout the prompt
 # i like things consistent
-OMB_THEME_BRACKET_COLOR="${OMB_THEME_BRACKET_COLOR-${_omb_prompt_blue}}"
+OMB_THEME_BRACKET_COLOR="${OMB_THEME_BRACKET_COLOR-${_omb_prompt_navy}}"
 OMB_THEME_STRING_COLOR="${OMB_THEME_STRING_COLOR-${_omb_prompt_green}}"
 
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${OMB_THEME_STRING_COLOR}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 PROMPT_CHAR="${OMB_THEME_BRACKET_COLOR}➞ ${_omb_prompt_normal}"
 if [[ $OSTYPE == *darwin* ]]; then
@@ -81,7 +81,7 @@ _omb_theme_PROMPT_COMMAND() {
     # nice prompt
     case "$(id -u)" in
         0)
-          my_user="${_omb_prompt_bold_red}\u${_omb_prompt_normal}";
+          my_user="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}";
           line2="${bracket_c}└─${PROMPT_CHAR}"
         ;;
     esac
diff --git a/themes/roderik/roderik.theme.sh b/themes/roderik/roderik.theme.sh
index d90840c..e273b46 100644
--- a/themes/roderik/roderik.theme.sh
+++ b/themes/roderik/roderik.theme.sh
@@ -8,9 +8,9 @@ export PROMPT_DIRTRIM=3
 
 function _omb_theme_PROMPT_COMMAND() {
     if [[ ${EUID} == 0 ]] ; then
-        PS1="[$(clock_prompt)]${_omb_prompt_yellow}[${_omb_prompt_red}\u@\h ${_omb_prompt_green}\w${_omb_prompt_yellow}]${_omb_prompt_red}$(__git_ps1 "(%s)")${_omb_prompt_normal}\\$ "
+        PS1="[$(clock_prompt)]${_omb_prompt_olive}[${_omb_prompt_brown}\u@\h ${_omb_prompt_green}\w${_omb_prompt_olive}]${_omb_prompt_brown}$(__git_ps1 "(%s)")${_omb_prompt_normal}\\$ "
     else
-        PS1="[$(clock_prompt)]${_omb_prompt_yellow}[${_omb_prompt_cyan}\u@\h ${_omb_prompt_green}\w${_omb_prompt_yellow}]${_omb_prompt_red}$(__git_ps1 "(%s)")${_omb_prompt_normal}\\$ "
+        PS1="[$(clock_prompt)]${_omb_prompt_olive}[${_omb_prompt_teal}\u@\h ${_omb_prompt_green}\w${_omb_prompt_olive}]${_omb_prompt_brown}$(__git_ps1 "(%s)")${_omb_prompt_normal}\\$ "
     fi
 }
 
diff --git a/themes/simple/simple.theme.sh b/themes/simple/simple.theme.sh
index 10e21e6..cac9bc0 100644
--- a/themes/simple/simple.theme.sh
+++ b/themes/simple/simple.theme.sh
@@ -13,7 +13,7 @@ case $TERM in
 esac
 
 function _omb_theme_PROMPT_COMMAND() {
-	PS1="${TITLEBAR}${_omb_prompt_orange}${_omb_prompt_reset_color}${_omb_prompt_green}\w${_omb_prompt_bold_blue}\[\$(scm_prompt_info)\]${_omb_prompt_normal} "
+	PS1="${TITLEBAR}${_omb_prompt_red}${_omb_prompt_reset_color}${_omb_prompt_green}\w${_omb_prompt_bold_navy}\[\$(scm_prompt_info)\]${_omb_prompt_normal} "
 }
 
 # scm themeing
diff --git a/themes/sirup/sirup.theme.sh b/themes/sirup/sirup.theme.sh
index 95ae026..14cbfb8 100644
--- a/themes/sirup/sirup.theme.sh
+++ b/themes/sirup/sirup.theme.sh
@@ -15,7 +15,7 @@ function _omb_theme_sirup_rubygem {
  
 function _omb_theme_PROMPT_COMMAND {
   # Check http://github.com/Sirupsen/dotfiles for screenshot
-  PS1="$_omb_prompt_blue\W/$_omb_prompt_bold_blue$(_omb_theme_sirup_rubygem)$_omb_prompt_bold_green$(__git_ps1 " (%s)") ${_omb_prompt_normal}$ "
+  PS1="$_omb_prompt_navy\W/$_omb_prompt_bold_navy$(_omb_theme_sirup_rubygem)$_omb_prompt_bold_green$(__git_ps1 " (%s)") ${_omb_prompt_normal}$ "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/slick/slick.theme.sh b/themes/slick/slick.theme.sh
index 438e71d..d6e4195 100644
--- a/themes/slick/slick.theme.sh
+++ b/themes/slick/slick.theme.sh
@@ -2,11 +2,11 @@
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
-SCM_GIT_CHAR="${_omb_prompt_bold_cyan}±${_omb_prompt_normal}"
+SCM_GIT_CHAR="${_omb_prompt_bold_teal}±${_omb_prompt_normal}"
 SCM_SVN_CHAR="${_omb_prompt_bold_green}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 #Mysql Prompt
 export MYSQL_PS1="(\u@\h) [\d]> "
@@ -33,14 +33,14 @@ __my_rvm_ruby_version() {
 __my_venv_prompt() {
   if [ ! -z "$VIRTUAL_ENV" ]
   then
-    echo "[${_omb_prompt_blue}@${_omb_prompt_normal}${VIRTUAL_ENV##*/}]"
+    echo "[${_omb_prompt_navy}@${_omb_prompt_normal}${VIRTUAL_ENV##*/}]"
   fi
 }
 
 is_vim_shell() {
         if [ ! -z "$VIMRUNTIME" ]
         then
-                echo "[${_omb_prompt_cyan}vim shell${_omb_prompt_normal}]"
+                echo "[${_omb_prompt_teal}vim shell${_omb_prompt_normal}]"
         fi
 }
 
@@ -59,7 +59,7 @@ _omb_theme_PROMPT_COMMAND() {
    case $HOSTNAME in
     "clappy"* ) my_ps_host="${_omb_prompt_green}\h${_omb_prompt_normal}";
             ;;
-    "icekernel") my_ps_host="${_omb_prompt_red}\h${_omb_prompt_normal}";
+    "icekernel") my_ps_host="${_omb_prompt_brown}\h${_omb_prompt_normal}";
             ;;
     * ) my_ps_host="${_omb_prompt_green}\h${_omb_prompt_normal}";
             ;;
@@ -71,10 +71,10 @@ _omb_theme_PROMPT_COMMAND() {
 
     # nice prompt
     case "`id -u`" in
-        0) PS1="${TITLEBAR}[$my_ps_root][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${_omb_prompt_cyan}\w${_omb_prompt_normal}]$(is_vim_shell)
+        0) PS1="${TITLEBAR}[$my_ps_root][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${_omb_prompt_teal}\w${_omb_prompt_normal}]$(is_vim_shell)
 $ "
         ;;
-      *) PS1="${TITLEBAR}[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)$(__my_venv_prompt)[${_omb_prompt_cyan}\w${_omb_prompt_normal}]$(is_vim_shell)
+      *) PS1="${TITLEBAR}[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)$(__my_venv_prompt)[${_omb_prompt_teal}\w${_omb_prompt_normal}]$(is_vim_shell)
 $ "
         ;;
     esac
diff --git a/themes/standard/standard.theme.sh b/themes/standard/standard.theme.sh
index 9006428..fd14ee4 100644
--- a/themes/standard/standard.theme.sh
+++ b/themes/standard/standard.theme.sh
@@ -19,7 +19,7 @@ case $TERM in
 esac
 
 function _omb_theme_PROMPT_COMMAND() {
-    PROMPT='${_omb_prompt_green}\u${_omb_prompt_normal}@${_omb_prompt_green}\h${_omb_prompt_normal}:${_omb_prompt_blue}\w${_omb_prompt_normal}${_omb_prompt_red}$(prompt_char)$(git_prompt_info)${_omb_prompt_normal}\$ '
+    PROMPT='${_omb_prompt_green}\u${_omb_prompt_normal}@${_omb_prompt_green}\h${_omb_prompt_normal}:${_omb_prompt_navy}\w${_omb_prompt_normal}${_omb_prompt_brown}$(prompt_char)$(git_prompt_info)${_omb_prompt_normal}\$ '
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/tonotdo/tonotdo.theme.sh b/themes/tonotdo/tonotdo.theme.sh
index bcfa8fe..8022789 100644
--- a/themes/tonotdo/tonotdo.theme.sh
+++ b/themes/tonotdo/tonotdo.theme.sh
@@ -1,13 +1,13 @@
 #! bash oh-my-bash.module
 
-SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_magenta}"
+SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_purple}"
 SCM_THEME_PROMPT_SUFFIX=" ${_omb_prompt_normal}"
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓"
 SCM_GIT_SHOW_DETAILS="false"
 
 function _omb_theme_PROMPT_COMMAND() {
-  PS1="${_omb_prompt_yellow}\u${_omb_prompt_normal}${_omb_prompt_cyan}@\h${_omb_prompt_normal}${_omb_prompt_magenta} ${_omb_prompt_normal}${_omb_prompt_green}\w${_omb_prompt_normal}$(scm_prompt_info)> "
+  PS1="${_omb_prompt_olive}\u${_omb_prompt_normal}${_omb_prompt_teal}@\h${_omb_prompt_normal}${_omb_prompt_purple} ${_omb_prompt_normal}${_omb_prompt_green}\w${_omb_prompt_normal}$(scm_prompt_info)> "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/tylenol/tylenol.theme.sh b/themes/tylenol/tylenol.theme.sh
index a5712ef..16e476f 100644
--- a/themes/tylenol/tylenol.theme.sh
+++ b/themes/tylenol/tylenol.theme.sh
@@ -3,10 +3,10 @@
 # Based on 'bobby' theme with the addition of python_venv
 #
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_green}✓"
-SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_yellow}|${_omb_prompt_reset_color}"
-SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_yellow}|"
+SCM_THEME_PROMPT_PREFIX=" ${_omb_prompt_olive}|${_omb_prompt_reset_color}"
+SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_olive}|"
 
 RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="|"
@@ -14,7 +14,7 @@ VIRTUALENV_THEME_PROMPT_PREFIX='|'
 VIRTUALENV_THEME_PROMPT_SUFFIX='|'
 
 function _omb_theme_PROMPT_COMMAND() {
-    PS1="\n${_omb_prompt_green}$(_omb_prompt_print_python_venv)${_omb_prompt_red}$(_omb_prompt_print_ruby_env) ${_omb_prompt_reset_color}\h ${_omb_prompt_orange}in ${_omb_prompt_reset_color}\w\n${_omb_prompt_yellow}$(scm_char)$(scm_prompt_info) ${_omb_prompt_yellow}→${_omb_prompt_white} "
+    PS1="\n${_omb_prompt_green}$(_omb_prompt_print_python_venv)${_omb_prompt_brown}$(_omb_prompt_print_ruby_env) ${_omb_prompt_reset_color}\h ${_omb_prompt_red}in ${_omb_prompt_reset_color}\w\n${_omb_prompt_olive}$(scm_char)$(scm_prompt_info) ${_omb_prompt_olive}→${_omb_prompt_white} "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/wanelo/wanelo.theme.sh b/themes/wanelo/wanelo.theme.sh
index 95f6e8a..b514034 100644
--- a/themes/wanelo/wanelo.theme.sh
+++ b/themes/wanelo/wanelo.theme.sh
@@ -1,10 +1,10 @@
 #! bash oh-my-bash.module
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"
 SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
 
-GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
+GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_brown}✗"
 GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
 GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
 GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
@@ -18,9 +18,9 @@ function _omb_theme_PROMPT_COMMAND() {
     else
       status=💔
     fi
-    PS1="\n${_omb_prompt_yellow}$(_omb_prompt_print_ruby_env) ${_omb_prompt_magenta}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n${_omb_prompt_bold_cyan} ${_omb_prompt_blue}|$(clock_prompt)|${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
+    PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n${_omb_prompt_bold_teal} ${_omb_prompt_navy}|$(clock_prompt)|${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
 }
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_blue"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_navy"}
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/zitron/zitron.theme.sh b/themes/zitron/zitron.theme.sh
index 9f3d7f6..8b19605 100644
--- a/themes/zitron/zitron.theme.sh
+++ b/themes/zitron/zitron.theme.sh
@@ -3,7 +3,7 @@
 
 ## git-theme
 # feel free to change git chars.
-GIT_THEME_PROMPT_DIRTY="${_omb_prompt_bold_yellow}*${_omb_prompt_normal}"
+GIT_THEME_PROMPT_DIRTY="${_omb_prompt_bold_olive}*${_omb_prompt_normal}"
 GIT_THEME_PROMPT_CLEAN=""
 GIT_THEME_PROMPT_PREFIX=""
 GIT_THEME_PROMPT_SUFFIX=""
@@ -18,7 +18,7 @@ function _omb_theme_PROMPT_COMMAND() {
     # user:host:pwd git-branch(*)$
     # for example:
     # noqqe:deathstar:themes master*$
-    PS1="${no_color}\u:$(hostname)${_omb_prompt_normal}:${_omb_prompt_bold_yellow}\W/${_omb_prompt_normal} $(git_prompt_info)${_omb_prompt_reset_color}$ "
+    PS1="${no_color}\u:$(hostname)${_omb_prompt_normal}:${_omb_prompt_bold_olive}\W/${_omb_prompt_normal} $(git_prompt_info)${_omb_prompt_reset_color}$ "
 }
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
diff --git a/themes/zork/zork.theme.sh b/themes/zork/zork.theme.sh
index 0ee65fc..949b1f6 100644
--- a/themes/zork/zork.theme.sh
+++ b/themes/zork/zork.theme.sh
@@ -2,11 +2,11 @@
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗${_omb_prompt_normal}"
+SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_brown}✗${_omb_prompt_normal}"
 SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓${_omb_prompt_normal}"
 SCM_GIT_CHAR="${_omb_prompt_bold_green}±${_omb_prompt_normal}"
-SCM_SVN_CHAR="${_omb_prompt_bold_cyan}⑆${_omb_prompt_normal}"
-SCM_HG_CHAR="${_omb_prompt_bold_red}☿${_omb_prompt_normal}"
+SCM_SVN_CHAR="${_omb_prompt_bold_teal}⑆${_omb_prompt_normal}"
+SCM_HG_CHAR="${_omb_prompt_bold_brown}☿${_omb_prompt_normal}"
 
 #Mysql Prompt
 export MYSQL_PS1="(\u@\h) [\d]> "
@@ -33,7 +33,7 @@ __my_rvm_ruby_version() {
 is_vim_shell() {
         if [ ! -z "$VIMRUNTIME" ]
         then
-                echo "[${_omb_prompt_cyan}vim shell${_omb_prompt_normal}]"
+                echo "[${_omb_prompt_teal}vim shell${_omb_prompt_normal}]"
         fi
 }
 
@@ -51,7 +51,7 @@ modern_scm_prompt() {
 chroot(){
     if [ -n "$debian_chroot" ]
     then 
-        my_ps_chroot="${_omb_prompt_bold_cyan}$debian_chroot${_omb_prompt_normal}";
+        my_ps_chroot="${_omb_prompt_bold_teal}$debian_chroot${_omb_prompt_normal}";
         echo "($my_ps_chroot)";
     fi
     }
@@ -60,7 +60,7 @@ chroot(){
 my_ve(){
     if [ -n "$VIRTUAL_ENV" ]
     then 
-        my_ps_ve="${_omb_prompt_bold_magenta}$ve${_omb_prompt_normal}";
+        my_ps_ve="${_omb_prompt_bold_purple}$ve${_omb_prompt_normal}";
         echo "($my_ps_ve)";
     fi
     echo "";
@@ -73,7 +73,7 @@ _omb_theme_PROMPT_COMMAND() {
     my_ps_host_root="${_omb_prompt_green}\h${_omb_prompt_normal}";
  
     my_ps_user="${_omb_prompt_bold_green}\u${_omb_prompt_normal}"
-    my_ps_root="${_omb_prompt_bold_red}\u${_omb_prompt_normal}";
+    my_ps_root="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}";
 
     if [ -n "$VIRTUAL_ENV" ]
     then
@@ -82,10 +82,10 @@ _omb_theme_PROMPT_COMMAND() {
 
     # nice prompt
     case "`id -u`" in
-        0) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_root][$my_ps_host_root]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${_omb_prompt_cyan}\w${_omb_prompt_normal}]$(is_vim_shell)
+        0) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_root][$my_ps_host_root]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${_omb_prompt_teal}\w${_omb_prompt_normal}]$(is_vim_shell)
 └─▪ "
         ;;
-        *) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${_omb_prompt_cyan}\w${_omb_prompt_normal}]$(is_vim_shell)
+        *) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${_omb_prompt_teal}\w${_omb_prompt_normal}]$(is_vim_shell)
 └─▪ "
         ;;
     esac