From e7e86d9a7266a6c4318c138e820b0dcf9ea6b7b6 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 22 May 2015 21:10:03 +0200
Subject: [PATCH 01/10] Added some flexibility regarding colors: Now you can
 specify the foreground and background colors for every segment by setting
 variables like POWERLEVEL9K_TIME_FOREGROUND="green".

---
 powerlevel9k.zsh-theme | 81 +++++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index d1e927c8..3e97ad44 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -126,16 +126,29 @@ fi
 # Takes two arguments, background and foreground. Both can be omitted,
 # rendering default background/foreground.
 left_prompt_segment() {
+# Unfortunately that doesn't work..
+#  local BG_COLOR_MODIFIER=${(P)POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND}
+
+  # Overwrite given background-color by user defined variable for this segment.
+  local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
+  local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
+  [[ -n $BG_COLOR_MODIFIER ]] && 2=$BG_COLOR_MODIFIER
+
+  # Overwrite given foreground-color by user defined variable for this segment.
+  local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
+  local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
+  [[ -n $FG_COLOR_MODIFIER ]] && 3=$FG_COLOR_MODIFIER
+
   local bg fg
-  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
-  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
-  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
+  [[ -n $2 ]] && bg="%K{$2}" || bg="%k"
+  [[ -n $3 ]] && fg="%F{$3}" || fg="%f"
+  if [[ $CURRENT_BG != 'NONE' && $2 != $CURRENT_BG ]]; then
     echo -n "%{$bg%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR%{$fg%} "
   else
     echo -n "%{$bg%}%{$fg%} "
   fi
-  CURRENT_BG=$1
-  [[ -n $3 ]] && echo -n $3
+  CURRENT_BG=$2
+  [[ -n $4 ]] && echo -n $4
 }
 
 # End the left prompt, closing any open segments
@@ -154,11 +167,21 @@ left_prompt_end() {
 # rendering default background/foreground. No ending for the right prompt
 # segment is needed (unlike the left prompt, above).
 right_prompt_segment() {
+  # Overwrite given background-color by user defined variable for this segment.
+  local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
+  local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
+  [[ -n $BG_COLOR_MODIFIER ]] && 2=$BG_COLOR_MODIFIER
+
+  # Overwrite given foreground-color by user defined variable for this segment.
+  local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
+  local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
+  [[ -n $FG_COLOR_MODIFIER ]] && 3=$FG_COLOR_MODIFIER
+
   local bg fg
-  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
-  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
-    echo -n " %f%F{$1}$RIGHT_SEGMENT_SEPARATOR%f%{$bg%}%{$fg%} "
-  [[ -n $3 ]] && echo -n $3
+  [[ -n $2 ]] && bg="%K{$2}" || bg="%k"
+  [[ -n $3 ]] && fg="%F{$3}" || fg="%f"
+    echo -n " %f%F{$2}$RIGHT_SEGMENT_SEPARATOR%f%{$bg%}%{$fg%} "
+  [[ -n $4 ]] && echo -n $4
 }
 
 ################################################################
@@ -169,9 +192,9 @@ prompt_vcs() {
 
   if [[ -n $vcs_prompt ]]; then
     if [[ "$VCS_WORKDIR_DIRTY" == true ]]; then
-      $1_prompt_segment yellow $DEFAULT_COLOR
+      $1_prompt_segment $0_MODIFIED yellow $DEFAULT_COLOR
     else
-      $1_prompt_segment green $DEFAULT_COLOR
+      $1_prompt_segment $0 green $DEFAULT_COLOR
     fi
 
     echo -n "%F{$DEFAULT_COLOR}%f$vcs_prompt"
@@ -267,7 +290,7 @@ prompt_aws() {
   local aws_profile=$AWS_DEFAULT_PROFILE
   if [[ -n $aws_profile ]]; 
   then
-    $1_prompt_segment red white "AWS: $aws_profile"
+    $1_prompt_segment $0 red white "AWS: $aws_profile"
   fi
 }
 
@@ -275,18 +298,18 @@ prompt_aws() {
 # Note that if $DEFAULT_USER is not set, this prompt segment will always print
 prompt_context() {
   if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    $1_prompt_segment $DEFAULT_COLOR "011" "%(!.%{%F{yellow}%}.)$USER@%m"
+    $1_prompt_segment $0 $DEFAULT_COLOR "011" "%(!.%{%F{yellow}%}.)$USER@%m"
   fi
 }
 
 # Dir: current working directory
 prompt_dir() {
-  $1_prompt_segment blue $DEFAULT_COLOR '%~'
+  $1_prompt_segment $0 blue $DEFAULT_COLOR '%~'
 }
 
 # Command number (in local history)
 prompt_history() {
-  $1_prompt_segment "244" $DEFAULT_COLOR '%h'
+  $1_prompt_segment $0 "244" $DEFAULT_COLOR '%h'
 }
 
 # Right Status: (return code, root status, background jobs)
@@ -307,13 +330,13 @@ prompt_longstatus() {
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
 
-  [[ -n "$symbols" ]] && $1_prompt_segment $bg $DEFAULT_COLOR "$symbols"
+  [[ -n "$symbols" ]] && $1_prompt_segment $0 $bg $DEFAULT_COLOR "$symbols"
 }
 
 # rbenv information
 prompt_rbenv() {
   if [[ -n "$RBENV_VERSION" ]]; then
-    $1_prompt_segment red $DEFAULT_COLOR "$RBENV_VERSION"
+    $1_prompt_segment $0 red $DEFAULT_COLOR "$RBENV_VERSION"
   fi
 }
 
@@ -323,7 +346,7 @@ prompt_rspec_stats() {
     local code_amount=$(ls -1 app/**/*.rb | wc -l)
     local tests_amount=$(ls -1 spec/**/*.rb | wc -l)
 
-    build_test_stats $1 $code_amount $tests_amount "RSpec"
+    build_test_stats $1 $0 $code_amount $tests_amount "RSpec"
   fi
 }
 
@@ -332,7 +355,7 @@ prompt_rvm() {
   local rvm_prompt
   rvm_prompt=`rvm-prompt`
   if [ "$rvm_prompt" != "" ]; then
-    $1_prompt_segment "240" $DEFAULT_COLOR "$rvm_prompt "
+    $1_prompt_segment $0 "240" $DEFAULT_COLOR "$rvm_prompt "
   fi
 }
 
@@ -345,7 +368,7 @@ prompt_status() {
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
 
-  [[ -n "$symbols" ]] && $1_prompt_segment $DEFAULT_COLOR default "$symbols"
+  [[ -n "$symbols" ]] && $1_prompt_segment $0 $DEFAULT_COLOR default "$symbols"
 }
 
 # Symfony2-PHPUnit test ratio
@@ -354,23 +377,23 @@ prompt_symfony2_tests() {
     local code_amount=$(ls -1 src/**/*.php | grep -v Tests | wc -l)
     local tests_amount=$(ls -1 src/**/*.php | grep Tests | wc -l)
 
-    build_test_stats $1 $code_amount $tests_amount "SF2-Tests"
+    build_test_stats $1 $0 $code_amount $tests_amount "SF2-Tests"
   fi
 }
 
 # Show a ratio of tests vs code
 build_test_stats() {
-  local code_amount=$2
-  local tests_amount=$3+0.00001
-  local headline=$4
+  local code_amount=$3
+  local tests_amount=$4+0.00001
+  local headline=$5
 
   # Set float precision to 2 digits:
   typeset -F 2 ratio
   local ratio=$(( (tests_amount/code_amount) * 100 ))
 
-  [[ ratio -ge 0.75 ]] && $1_prompt_segment cyan $DEFAULT_COLOR "$headline: $ratio%%"
-  [[ ratio -ge 0.5 && ratio -lt 0.75 ]] && $1_prompt_segment yellow $DEFAULT_COLOR "$headline: $ratio%%"
-  [[ ratio -lt 0.5 ]] && $1_prompt_segment red $DEFAULT_COLOR "$headline: $ratio%%"
+  [[ ratio -ge 0.75 ]] && $1_prompt_segment ${2}_GOOD cyan $DEFAULT_COLOR "$headline: $ratio%%"
+  [[ ratio -ge 0.5 && ratio -lt 0.75 ]] && $1_prompt_segment $2_AVG yellow $DEFAULT_COLOR "$headline: $ratio%%"
+  [[ ratio -lt 0.5 ]] && $1_prompt_segment $2_BAD red $DEFAULT_COLOR "$headline: $ratio%%"
 }
 
 # System time
@@ -380,7 +403,7 @@ prompt_time() {
     time_format=$POWERLEVEL9K_TIME_FORMAT
   fi
 
-  $1_prompt_segment $DEFAULT_COLOR_INVERTED $DEFAULT_COLOR "$time_format "
+  $1_prompt_segment $0 $DEFAULT_COLOR_INVERTED $DEFAULT_COLOR "$time_format "
 }
 
 # Virtualenv: current working virtualenv
@@ -389,7 +412,7 @@ prompt_time() {
 prompt_virtualenv() {
   local virtualenv_path="$VIRTUAL_ENV"
   if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
-    $1_prompt_segment blue $DEFAULT_COLOR "(`basename $virtualenv_path`)"
+    $1_prompt_segment $0 blue $DEFAULT_COLOR "(`basename $virtualenv_path`)"
   fi
 }
 

From cdad420b32be18ba491a4199f60b9532757c78e7 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 22 May 2015 21:34:27 +0200
Subject: [PATCH 02/10] Update README.md

Added Documentation.
---
 README.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/README.md b/README.md
index 2c3f2a2d..3ed6a945 100644
--- a/README.md
+++ b/README.md
@@ -182,6 +182,40 @@ Light'](https://github.com/altercation/solarized) users. Check it out:
 
 ![](http://bhilburn.org/content/images/2015/03/solarized-light.png)
 
+#### Further color customizations
+
+For every segment you can specify foreground and background color by setting them in your `~/.zshrc`:
+
+    POWERLEVEL9K_TIME_FOREGROUND='red'
+    POWERLEVEL9K_TIME_BACKGROUND='blue'
+
+This will change the appearance of the `time` segment. Take the segment names from the Chapter `Segment Customization`.
+Some of the Segments have special color variables, as they change the colors according some internal rules. These Segments are `vcs`, `rspec_stats`, `symfony2_tests`:
+
+    POWERLEVEL9K_VCS_FOREGROUND='blue'
+    POWERLEVEL9K_VCS_BACKGROUND='green'
+    # If VCS changes are detected:
+    POWERLEVEL9K_VCS_MODIFIED_FOREGROUND='red'
+    POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='cyan'
+    # rspec_stats for good test coverage
+    POWERLEVEL9K_RSPEC_STATS_GOOD_FOREGROUND='blue'
+    POWERLEVEL9K_RSPEC_STATS_GOOD_BACKGROUND='green'
+    # rspec_stats for average test coverage
+    POWERLEVEL9K_RSPEC_STATS_AVG_FOREGROUND='black'
+    POWERLEVEL9K_RSPEC_STATS_AVG_BACKGROUND='cyan'
+    # rspec_stats for poor test coverage
+    POWERLEVEL9K_RSPEC_STATS_BAD_FOREGROUND='red'
+    POWERLEVEL9K_RSPEC_STATS_BAD_BACKGROUND='white'
+    # symfony2_tests for good test coverage
+    POWERLEVEL9K_SYMFONY2_TESTS_GOOD_FOREGROUND='blue'
+    POWERLEVEL9K_SYMFONY2_TESTS_GOOD_BACKGROUND='green'
+    # symfony2_tests for average test coverage
+    POWERLEVEL9K_SYMFONY2_TESTS_AVG_FOREGROUND='black'
+    POWERLEVEL9K_SYMFONY2_TESTS_AVG_BACKGROUND='cyan'
+    # symfony2_tests for poor test coverage
+    POWERLEVEL9K_SYMFONY2_TESTS_BAD_FOREGROUND='red'
+    POWERLEVEL9K_SYMFONY2_TESTS_BAD_BACKGROUND='white'
+
 ### Troubleshooting
 
 Here are some fixes to some common problems.

From cb8549aed94f8e3fa75f649ac70d82b7c87656b7 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 22 May 2015 21:58:46 +0200
Subject: [PATCH 03/10] A bit more documentation.

---
 powerlevel9k.zsh-theme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 3e97ad44..867b93aa 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -126,7 +126,8 @@ fi
 # Takes two arguments, background and foreground. Both can be omitted,
 # rendering default background/foreground.
 left_prompt_segment() {
-# Unfortunately that doesn't work..
+# Unfortunately that doesn't work. But it should. The Example in
+# http://zsh.sourceforge.net/FAQ/zshfaq03.html#l39 is quite similar.
 #  local BG_COLOR_MODIFIER=${(P)POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND}
 
   # Overwrite given background-color by user defined variable for this segment.

From 3aba9e20e5aacdceb018451c82848395e39ca65c Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 23 May 2015 00:09:30 +0200
Subject: [PATCH 04/10] VCS-Info should be affected by foreground color
 settings of the user.

---
 powerlevel9k.zsh-theme | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 867b93aa..8ca0263e 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -70,6 +70,19 @@ else
   DEFAULT_COLOR_DARK="236"
 fi
 
+# Unfortunately the foreground colors for the VCS segment have
+# to be overwritten at this point.
+# Overwrite given foreground-color by user defined variable for this segment.
+local VCS_FOREGROUND_COLOR=$DEFAULT_COLOR
+local VCS_FOREGROUND_USER_VARIABLE=POWERLEVEL9K_VCS_FOREGROUND
+local VCS_FG_COLOR_MODIFIER=${(P)VCS_FOREGROUND_USER_VARIABLE}
+[[ -n $VCS_FG_COLOR_MODIFIER ]] && VCS_FOREGROUND_COLOR=$VCS_FG_COLOR_MODIFIER
+
+local VCS_FOREGROUND_COLOR_DARK=$DEFAULT_COLOR_DARK
+local VCS_FOREGROUND_USER_VARIABLE_DARK=POWERLEVEL9K_VCS_DARK_FOREGROUND
+local VCS_FG_DARK_COLOR_MODIFIER=${(P)VCS_FOREGROUND_USER_VARIABLE_DARK}
+[[ -n $VCS_FG_DARK_COLOR_MODIFIER ]] && VCS_FOREGROUND_COLOR_DARK=$VCS_FG_DARK_COLOR_MODIFIER
+
 ################################################################
 # VCS Information Settings
 ################################################################
@@ -86,17 +99,17 @@ if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
     VCS_CHANGESET_HASH_LENGTH=$POWERLEVEL9K_CHANGESET_HASH_LENGTH
   fi
 
-  VCS_CHANGESET_PREFIX="%F{$DEFAULT_COLOR_DARK}%0.$VCS_CHANGESET_HASH_LENGTH""i@%f"
+  VCS_CHANGESET_PREFIX="%F{$VCS_FOREGROUND_COLOR_DARK}%0.$VCS_CHANGESET_HASH_LENGTH""i@%f"
 fi
 
 zstyle ':vcs_info:*' enable git hg
 zstyle ':vcs_info:*' check-for-changes true
 
-zstyle ':vcs_info:*' formats " $VCS_CHANGESET_PREFIX%F{$DEFAULT_COLOR}%b%c%u%m%f"
+zstyle ':vcs_info:*' formats " $VCS_CHANGESET_PREFIX%F{$VCS_FOREGROUND_COLOR}%b%c%u%m%f"
 zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%f"
 
-zstyle ':vcs_info:*' stagedstr " %F{$DEFAULT_COLOR}$VCS_STAGED_ICON%f"
-zstyle ':vcs_info:*' unstagedstr " %F{$DEFAULT_COLOR}$VCS_UNSTAGED_ICON%f"
+zstyle ':vcs_info:*' stagedstr " %F{$VCS_FOREGROUND_COLOR}$VCS_STAGED_ICON%f"
+zstyle ':vcs_info:*' unstagedstr " %F{$VCS_FOREGROUND_COLOR}$VCS_UNSTAGED_ICON%f"
 
 zstyle ':vcs_info:git*+set-message:*' hooks git-untracked git-aheadbehind git-stash git-remotebranch git-tagname
 
@@ -198,14 +211,14 @@ prompt_vcs() {
       $1_prompt_segment $0 green $DEFAULT_COLOR
     fi
 
-    echo -n "%F{$DEFAULT_COLOR}%f$vcs_prompt"
+    echo -n "%F{$VCS_FOREGROUND_COLOR}%f$vcs_prompt"
   fi
 }
 
 function +vi-git-untracked() {
     if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' && \
             $(git ls-files --others --exclude-standard | sed q | wc -l | tr -d ' ') != 0 ]]; then
-        hook_com[unstaged]+=" %F{$DEFAULT_COLOR}?%f"
+        hook_com[unstaged]+=" %F{$VCS_FOREGROUND_COLOR}?%f"
     fi
 }
 
@@ -218,12 +231,12 @@ function +vi-git-aheadbehind() {
     # for git prior to 1.7
     # ahead=$(git rev-list origin/${branch_name}..HEAD | wc -l)
     ahead=$(git rev-list ${branch_name}@{upstream}..HEAD 2>/dev/null | wc -l | tr -d ' ')
-    (( $ahead )) && gitstatus+=( " %F{$DEFAULT_COLOR}↑${ahead// /}%f" )
+    (( $ahead )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}↑${ahead// /}%f" )
 
     # for git prior to 1.7
     # behind=$(git rev-list HEAD..origin/${branch_name} | wc -l)
     behind=$(git rev-list HEAD..${branch_name}@{upstream} 2>/dev/null | wc -l | tr -d ' ')
-    (( $behind )) && gitstatus+=( " %F{$DEFAULT_COLOR}↓${behind// /}%f" )
+    (( $behind )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}↓${behind// /}%f" )
 
     hook_com[misc]+=${(j::)gitstatus}
 }
@@ -235,12 +248,12 @@ function +vi-git-remotebranch() {
     remote=${$(git rev-parse --verify HEAD@{upstream} --symbolic-full-name 2>/dev/null)/refs\/(remotes|heads)\/}
     branch_name=${$(git symbolic-ref --short HEAD 2>/dev/null)}
 
-    hook_com[branch]="%F{$DEFAULT_COLOR}${hook_com[branch]}%f"
+    hook_com[branch]="%F{$VCS_FOREGROUND_COLOR}${hook_com[branch]}%f"
     # Always show the remote
     #if [[ -n ${remote} ]] ; then
     # Only show the remote if it differs from the local
     if [[ -n ${remote} && ${remote#*/} != ${branch_name} ]] ; then
-        hook_com[branch]+="%F{$DEFAULT_COLOR}→%f%F{$DEFAULT_COLOR}${remote// /}%f"
+        hook_com[branch]+="%F{$VCS_FOREGROUND_COLOR}→%f%F{$VCS_FOREGROUND_COLOR}${remote// /}%f"
     fi
 }
 
@@ -248,7 +261,7 @@ function +vi-git-tagname() {
     local tag
 
     tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
-    [[ -n ${tag} ]] && hook_com[branch]=" %F{$DEFAULT_COLOR}${tag}%f"
+    [[ -n ${tag} ]] && hook_com[branch]=" %F{$VCS_FOREGROUND_COLOR}${tag}%f"
 }
 
 # Show count of stashed changes
@@ -258,7 +271,7 @@ function +vi-git-stash() {
 
   if [[ -s $(git rev-parse --git-dir)/refs/stash ]] ; then
     stashes=$(git stash list 2>/dev/null | wc -l)
-    hook_com[misc]+=" %F{$DEFAULT_COLOR}⍟${stashes// /}%f"
+    hook_com[misc]+=" %F{$VCS_FOREGROUND_COLOR}⍟${stashes// /}%f"
   fi
 }
 

From 6cca2c339ebbf66428dc8ae90da1fec573f18fb1 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 23 May 2015 00:15:25 +0200
Subject: [PATCH 05/10] Code documentation.

---
 powerlevel9k.zsh-theme | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 8ca0263e..7ad3e49f 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -144,6 +144,11 @@ left_prompt_segment() {
 #  local BG_COLOR_MODIFIER=${(P)POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND}
 
   # Overwrite given background-color by user defined variable for this segment.
+	# We get as first Parameter the function name, which called this function. 
+	# From the given function name, we strip the "prompt_"-prefix and uppercase it.
+	# This is, prefixed with "POWERLEVEL9K_" and suffixed with either "_BACKGROUND"
+	# of "_FOREGROUND", our variable name. So each new Segment should automatically
+	# be overwritable by a variable following this naming convention.
   local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
   local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
   [[ -n $BG_COLOR_MODIFIER ]] && 2=$BG_COLOR_MODIFIER

From dca6b2908947873f31c9d8c63bf0caae8c13e826 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 23 May 2015 01:37:40 +0200
Subject: [PATCH 06/10] More Documentation.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3ed6a945..03297815 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ This will change the appearance of the `time` segment. Take the segment names fr
 Some of the Segments have special color variables, as they change the colors according some internal rules. These Segments are `vcs`, `rspec_stats`, `symfony2_tests`:
 
     POWERLEVEL9K_VCS_FOREGROUND='blue'
+    POWERLEVEL9K_VCS_DARK_FOREGROUND='black'
     POWERLEVEL9K_VCS_BACKGROUND='green'
     # If VCS changes are detected:
     POWERLEVEL9K_VCS_MODIFIED_FOREGROUND='red'

From 16856268b373692a63296af3ffabd7e1fd530dd9 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 23 May 2015 22:23:38 +0200
Subject: [PATCH 07/10] Cleaned indentation.

---
 powerlevel9k.zsh-theme | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 7ad3e49f..c45e5542 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -144,11 +144,11 @@ left_prompt_segment() {
 #  local BG_COLOR_MODIFIER=${(P)POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND}
 
   # Overwrite given background-color by user defined variable for this segment.
-	# We get as first Parameter the function name, which called this function. 
-	# From the given function name, we strip the "prompt_"-prefix and uppercase it.
-	# This is, prefixed with "POWERLEVEL9K_" and suffixed with either "_BACKGROUND"
-	# of "_FOREGROUND", our variable name. So each new Segment should automatically
-	# be overwritable by a variable following this naming convention.
+  # We get as first Parameter the function name, which called this function. 
+  # From the given function name, we strip the "prompt_"-prefix and uppercase it.
+  # This is, prefixed with "POWERLEVEL9K_" and suffixed with either "_BACKGROUND"
+  # of "_FOREGROUND", our variable name. So each new Segment should automatically
+  # be overwritable by a variable following this naming convention.
   local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
   local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
   [[ -n $BG_COLOR_MODIFIER ]] && 2=$BG_COLOR_MODIFIER
@@ -281,15 +281,15 @@ function +vi-git-stash() {
 }
 
 function +vi-hg-bookmarks() {
-	if [[ -n "${hgbmarks[@]}" ]]; then
-		hook_com[hg-bookmark-string]=" ☿ ${hgbmarks[@]}"
+  if [[ -n "${hgbmarks[@]}" ]]; then
+    hook_com[hg-bookmark-string]=" ☿ ${hgbmarks[@]}"
 
-		# And to signal, that we want to use the sting we just generated,
-		# set the special variable `ret' to something other than the default
-		# zero:
-		ret=1
-		return 0
-	fi
+    # And to signal, that we want to use the sting we just generated,
+    # set the special variable `ret' to something other than the default
+    # zero:
+    ret=1
+    return 0
+  fi
 }
 
 function +vi-vcs-detect-changes() {

From 9b0e11173b4fb243fa849f7f02b6b1cf2fbe1063 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Thu, 4 Jun 2015 00:47:27 +0200
Subject: [PATCH 08/10] More documentation.

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 03297815..cac1e000 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,12 @@ Some of the Segments have special color variables, as they change the colors acc
     POWERLEVEL9K_SYMFONY2_TESTS_BAD_FOREGROUND='red'
     POWERLEVEL9K_SYMFONY2_TESTS_BAD_BACKGROUND='white'
 
+You could also use a colorcode as value. Example:
+
+    POWERLEVEL9K_VCS_FOREGROUND='021' # Dark blue
+
+For a full list of supported colors just type `spectrum_ls` in your terminal to see all possibilities. 
+
 ### Troubleshooting
 
 Here are some fixes to some common problems.

From 23e8a039ad5fcb10f45ea68ae982c6400cfd39d9 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <ben.hilburn@ettus.com>
Date: Wed, 3 Jun 2015 16:27:39 -0700
Subject: [PATCH 09/10] README: bit of cleanup

---
 README.md | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index cac1e000..dc8798fe 100644
--- a/README.md
+++ b/README.md
@@ -110,14 +110,6 @@ elements (it is by default), and define a `DEFAULT_USER` in your `~/.zshrc`:
 
     export DEFAULT_USER=<your username>
 
-#### Test ratio
-
-The `symfony2_tests` and `rspec_tests` segments show both a ratio of "real" classes
-vs test classes. This is just a very simple ratio, and does not show your code
-coverage or any sophisticated stats. All this does is just to count your files
-and test files and calculate the ratio between them. Not more, but is may give
-a quick overview about the test situation of the project you are dealing with.
-
 #### The 'time' segment
 
 By default the time is show in 'H:M:S' format. If you want to change it, 
@@ -126,6 +118,15 @@ just set another format in your `~/.zshrc`:
     # Reversed time format
     POWERLEVEL9K_TIME_FORMAT='%D{%S:%M:%H}' 
 
+#### Unit Test Ratios
+
+The `symfony2_tests` and `rspec_tests` segments both show a ratio of "real"
+classes vs test classes in your source code. This is just a very simple ratio,
+and does not show your code coverage or any sophisticated stats. All this does
+is count your source files and test files, and calculate the ratio between them.
+Just enough to give you a quick overview about the test situation of the project
+you are dealing with.
+
 #### The 'vcs' Segment
 
 By default, the `vcs` segment will provide quite a bit of information. If you
@@ -184,20 +185,25 @@ Light'](https://github.com/altercation/solarized) users. Check it out:
 
 #### Further color customizations
 
-For every segment you can specify foreground and background color by setting them in your `~/.zshrc`:
+For each segment in your prompt, you can specify a foreground and background
+color by setting them in your `~/.zshrc`. For example, to change the appearance
+of the `time` segment, you would use:
 
     POWERLEVEL9K_TIME_FOREGROUND='red'
     POWERLEVEL9K_TIME_BACKGROUND='blue'
 
-This will change the appearance of the `time` segment. Take the segment names from the Chapter `Segment Customization`.
-Some of the Segments have special color variables, as they change the colors according some internal rules. These Segments are `vcs`, `rspec_stats`, `symfony2_tests`:
+Use the segment names from the above section `Segment Customization`.  Some of
+the Segments have special color variables, as they change the colors according
+to some internal rules. These Segments are `vcs`, `rspec_stats`, `symfony2_tests`:
 
+    # General VCS color segments:
     POWERLEVEL9K_VCS_FOREGROUND='blue'
     POWERLEVEL9K_VCS_DARK_FOREGROUND='black'
     POWERLEVEL9K_VCS_BACKGROUND='green'
     # If VCS changes are detected:
     POWERLEVEL9K_VCS_MODIFIED_FOREGROUND='red'
     POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='cyan'
+
     # rspec_stats for good test coverage
     POWERLEVEL9K_RSPEC_STATS_GOOD_FOREGROUND='blue'
     POWERLEVEL9K_RSPEC_STATS_GOOD_BACKGROUND='green'
@@ -207,6 +213,7 @@ Some of the Segments have special color variables, as they change the colors acc
     # rspec_stats for poor test coverage
     POWERLEVEL9K_RSPEC_STATS_BAD_FOREGROUND='red'
     POWERLEVEL9K_RSPEC_STATS_BAD_BACKGROUND='white'
+
     # symfony2_tests for good test coverage
     POWERLEVEL9K_SYMFONY2_TESTS_GOOD_FOREGROUND='blue'
     POWERLEVEL9K_SYMFONY2_TESTS_GOOD_BACKGROUND='green'
@@ -217,11 +224,12 @@ Some of the Segments have special color variables, as they change the colors acc
     POWERLEVEL9K_SYMFONY2_TESTS_BAD_FOREGROUND='red'
     POWERLEVEL9K_SYMFONY2_TESTS_BAD_BACKGROUND='white'
 
-You could also use a colorcode as value. Example:
+You could also use a colorcode value. Example:
 
     POWERLEVEL9K_VCS_FOREGROUND='021' # Dark blue
 
-For a full list of supported colors just type `spectrum_ls` in your terminal to see all possibilities. 
+For a full list of supported colors, run the `spectrum_ls` program in your
+terminal.
 
 ### Troubleshooting
 

From 77cbe9a6f07a81602e47eeab107c34ba6c7b8990 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <ben.hilburn@ettus.com>
Date: Wed, 3 Jun 2015 17:09:14 -0700
Subject: [PATCH 10/10] simplifying user-defined color logic for VCS segment

---
 powerlevel9k.zsh-theme | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index c624a072..f65143a1 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -70,18 +70,16 @@ else
   DEFAULT_COLOR_DARK="236"
 fi
 
-# Unfortunately the foreground colors for the VCS segment have
-# to be overwritten at this point.
-# Overwrite given foreground-color by user defined variable for this segment.
 local VCS_FOREGROUND_COLOR=$DEFAULT_COLOR
-local VCS_FOREGROUND_USER_VARIABLE=POWERLEVEL9K_VCS_FOREGROUND
-local VCS_FG_COLOR_MODIFIER=${(P)VCS_FOREGROUND_USER_VARIABLE}
-[[ -n $VCS_FG_COLOR_MODIFIER ]] && VCS_FOREGROUND_COLOR=$VCS_FG_COLOR_MODIFIER
-
 local VCS_FOREGROUND_COLOR_DARK=$DEFAULT_COLOR_DARK
-local VCS_FOREGROUND_USER_VARIABLE_DARK=POWERLEVEL9K_VCS_DARK_FOREGROUND
-local VCS_FG_DARK_COLOR_MODIFIER=${(P)VCS_FOREGROUND_USER_VARIABLE_DARK}
-[[ -n $VCS_FG_DARK_COLOR_MODIFIER ]] && VCS_FOREGROUND_COLOR_DARK=$VCS_FG_DARK_COLOR_MODIFIER
+
+# If user has defined custom colors for the `vcs` segment, override the defaults
+if [[ -n $POWERLEVEL9K_VCS_FOREGROUND ]]; then
+  VCS_FOREGROUND_COLOR=$POWERLEVEL9K_VCS_FOREGROUND
+fi
+if [[ -n $POWERLEVEL9K_VCS_DARK_FOREGROUND ]]; then
+  VCS_FOREGROUND_COLOR_DARK=$POWERLEVEL9K_VCS_DARK_FOREGROUND
+fi
 
 ################################################################
 # VCS Information Settings
@@ -140,10 +138,6 @@ fi
 # Takes two arguments, background and foreground. Both can be omitted,
 # rendering default background/foreground.
 left_prompt_segment() {
-# Unfortunately that doesn't work. But it should. The Example in
-# http://zsh.sourceforge.net/FAQ/zshfaq03.html#l39 is quite similar.
-#  local BG_COLOR_MODIFIER=${(P)POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND}
-
   # Overwrite given background-color by user defined variable for this segment.
   # We get as first Parameter the function name, which called this function. 
   # From the given function name, we strip the "prompt_"-prefix and uppercase it.