From 2bc3b09963f34e3f404556100f28b4bf4e904a92 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 25 Jul 2015 01:34:11 +0200
Subject: [PATCH 01/24] Implemented different ways to truncate  the directory
 path.

---
 README.md              | 12 ++++++++++++
 powerlevel9k.zsh-theme | 15 +++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 71dfceb2..4aec6745 100644
--- a/README.md
+++ b/README.md
@@ -272,6 +272,18 @@ to a certain length:
     # Limit to the last two folders
     POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
 
+To change the way how the current working directory is truncated, just set:
+
+    # truncate whole directories
+    POWERLEVEL9K_SHORTEN_STRATEGY="complete_directories"
+    # truncate from right, leaving the first X characters untouched
+    POWERLEVEL9K_SHORTEN_STRATEGY="truncate_from_right"
+    # default behaviour is to truncate the middle part of the directory
+
+In each case you have to specify the length you want to shorten the directory
+to. So in some cases `POWERLEVEL9K_SHORTEN_DIR_LENGTH` means characters, in 
+others whole directories.
+
 #### The 'time' segment
 
 By default the time is show in 'H:M:S' format. If you want to change it, 
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 69eee6e3..3e793d7e 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -450,8 +450,19 @@ prompt_context() {
 prompt_dir() {
   local current_path='%~'
   if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" ]]; then
-    # shorten path to $POWERLEVEL9K_SHORTEN_DIR_LENGTH
-    current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:.../:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
+
+    case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
+      complete_directories)
+        current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:.../:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
+      ;;
+      truncate_from_right)
+        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1\//g")
+      ;;
+      *)
+        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1\.\.\2\//g")
+      ;;
+    esac
+
   fi
 
   $1_prompt_segment "$0" "blue" "$DEFAULT_COLOR" "$current_path"

From 99504d4ad44ea88af8ec6f84c8c38415044e7557 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 29 Jul 2015 23:46:06 +0200
Subject: [PATCH 02/24] Add an indicator that directories were truncated.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 3e793d7e..da3e617b 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -456,7 +456,7 @@ prompt_dir() {
         current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:.../:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
       ;;
       truncate_from_right)
-        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1\//g")
+        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1..\//g")
       ;;
       *)
         current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1\.\.\2\//g")

From 2257026f9c1403bcaad767dad1d1ccf46505d1c4 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Tue, 4 Aug 2015 18:21:22 +0200
Subject: [PATCH 03/24] Reworked icons to a zsh array. That way we can easily
 print out all icons for debugging purposes. Also it opens up some clean up
 possibilities.

---
 powerlevel9k.zsh-theme | 348 ++++++++++++++++++++++-------------------
 1 file changed, 191 insertions(+), 157 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 8cc2d570..dd3e9968 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -44,163 +44,182 @@
 #zstyle ':vcs_info:*+*:*' debug true
 #set -o xtrace
 
-# The `CURRENT_BG` variable is used to remember what the last BG color used was
-# when building the left-hand prompt. Because the RPROMPT is created from
-# right-left but reads the opposite, this isn't necessary for the other side.
-CURRENT_BG='NONE'
+################################################################
+# Icons
+################################################################
 
 # These characters require the Powerline fonts to work properly. If see boxes or
 # bizarre characters below, your fonts are not correctly installed. If you
 # do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
 # `compatible`. This shows all icons in regular symbols.
+typeset -A icons
 case $POWERLEVEL9K_MODE in
   'flat')
     # Awesome-Patched Font required!
     # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
-    LEFT_SEGMENT_SEPARATOR=''
-    RIGHT_SEGMENT_SEPARATOR=''
-    ROOT_ICON="\UE801" # 
-    RUBY_ICON="\UE847" # 
-    AWS_ICON="\UE895" # 
-    BACKGROUND_JOBS_ICON="\UE82F " # 
-    TEST_ICON="\UE891" # 
-    OK_ICON="\U2713" # ✓
-    FAIL_ICON="\U2718" # ✘
-    SYMFONY_ICON="SF"
-    APPLE_ICON=$'\UF8FF' # 
-    FREEBSD_ICON=$'\U1F608 ' # 😈
-    LINUX_ICON=$'\U1F427 ' # 🐧
-    SUNOS_ICON=$'\U1F31E ' # 🌞
-    VCS_UNTRACKED_ICON="\UE16C" # 
-    VCS_UNSTAGED_ICON="\UE17C" # 
-    VCS_STAGED_ICON="\UE168" # 
-    VCS_STASH_ICON="\UE133 " # 
-    #VCS_INCOMING_CHANGES="\UE1EB " # 
-    #VCS_INCOMING_CHANGES="\UE80D " # 
-    VCS_INCOMING_CHANGES="\UE131 " # 
-    #VCS_OUTGOING_CHANGES="\UE1EC " # 
-    #VCS_OUTGOING_CHANGES="\UE80E " # 
-    VCS_OUTGOING_CHANGES="\UE132 " # 
-    VCS_TAG_ICON="\UE817 " # 
-    VCS_BOOKMARK_ICON="\UE87B" # 
-    VCS_COMMIT_ICON="\UE821 " # 
-    VCS_BRANCH_ICON=$'\UE220' # 
-    VCS_REMOTE_BRANCH_ICON=" \UE804 " # 
-    VCS_GIT_ICON="\UE20E  " # 
-    VCS_HG_ICON="\UE1C3  " # 
+    icons=(
+      LEFT_SEGMENT_SEPARATOR      ''
+      RIGHT_SEGMENT_SEPARATOR     ''
+      ROOT_ICON                   "\UE801" # 
+      RUBY_ICON                   "\UE847" # 
+      AWS_ICON                    "\UE895" # 
+      BACKGROUND_JOBS_ICON        "\UE82F " # 
+      TEST_ICON                   "\UE891" # 
+      OK_ICON                     "\U2713" # ✓
+      FAIL_ICON                   "\U2718" # ✘
+      SYMFONY_ICON                "SF"
+      APPLE_ICON                  $'\UF8FF' # 
+      FREEBSD_ICON                $'\U1F608 ' # 😈
+      LINUX_ICON                  $'\U1F427 ' # 🐧
+      SUNOS_ICON                  $'\U1F31E ' # 🌞
+      VCS_UNTRACKED_ICON          "\UE16C" # 
+      VCS_UNSTAGED_ICON           "\UE17C" # 
+      VCS_STAGED_ICON             "\UE168" # 
+      VCS_STASH_ICON              "\UE133 " # 
+      #VCS_INCOMING_CHANGES       "\UE1EB " # 
+      #VCS_INCOMING_CHANGES       "\UE80D " # 
+      VCS_INCOMING_CHANGES        "\UE131 " # 
+      #VCS_OUTGOING_CHANGES       "\UE1EC " # 
+      #VCS_OUTGOING_CHANGES       "\UE80E " # 
+      VCS_OUTGOING_CHANGES        "\UE132 " # 
+      VCS_TAG_ICON                "\UE817 " # 
+      VCS_BOOKMARK_ICON           "\UE87B" # 
+      VCS_COMMIT_ICON             "\UE821 " # 
+      VCS_BRANCH_ICON             $'\UE220' # 
+      VCS_REMOTE_BRANCH_ICON      " \UE804 " # 
+      VCS_GIT_ICON                "\UE20E  " # 
+      VCS_HG_ICON                 "\UE1C3  " # 
+    )
   ;;
   'compatible')
-    LEFT_SEGMENT_SEPARATOR="\U2B80" # ⮀
-    RIGHT_SEGMENT_SEPARATOR="\U2B82" # ⮂
-    ROOT_ICON="\U26A1" # ⚡
-    RUBY_ICON=''
-    AWS_ICON="AWS:"
-    BACKGROUND_JOBS_ICON="\U2699" # ⚙
-    TEST_ICON=''
-    OK_ICON="\U2713" # ✓
-    FAIL_ICON="\U2718" # ✘
-    SYMFONY_ICON="SF"
-    APPLE_ICON='OSX'
-    FREEBSD_ICON='BSD'
-    LINUX_ICON='Lx'
-    SUNOS_ICON='Sun'
-    VCS_UNTRACKED_ICON='?'
-    VCS_UNSTAGED_ICON="\U25CF" # ●
-    VCS_STAGED_ICON="\U271A" # ✚
-    VCS_STASH_ICON="\U235F" # ⍟
-    VCS_INCOMING_CHANGES="\U2193" # ↓
-    VCS_OUTGOING_CHANGES="\U2191" # ↑
-    VCS_TAG_ICON=''
-    VCS_BOOKMARK_ICON="\U263F" # ☿
-    VCS_COMMIT_ICON=''
-    VCS_BRANCH_ICON='@'
-    VCS_REMOTE_BRANCH_ICON="\U2192" # →
-    VCS_GIT_ICON='Git'
-    VCS_HG_ICON='HG'
+    icons=(
+      LEFT_SEGMENT_SEPARATOR      "\U2B80" # ⮀
+      RIGHT_SEGMENT_SEPARATOR     "\U2B82" # ⮂
+      ROOT_ICON                   "\U26A1" # ⚡
+      RUBY_ICON                   ''
+      AWS_ICON                    "AWS:"
+      BACKGROUND_JOBS_ICON        "\U2699" # ⚙
+      TEST_ICON                   ''
+      OK_ICON                     "\U2713" # ✓
+      FAIL_ICON                   "\U2718" # ✘
+      SYMFONY_ICON                "SF"
+      APPLE_ICON                  'OSX'
+      FREEBSD_ICON                'BSD'
+      LINUX_ICON                  'Lx'
+      SUNOS_ICON                  'Sun'
+      VCS_UNTRACKED_ICON          '?'
+      VCS_UNSTAGED_ICON           "\U25CF" # ●
+      VCS_STAGED_ICON             "\U271A" # ✚
+      VCS_STASH_ICON              "\U235F" # ⍟
+      VCS_INCOMING_CHANGES        "\U2193" # ↓
+      VCS_OUTGOING_CHANGES        "\U2191" # ↑
+      VCS_TAG_ICON                ''
+      VCS_BOOKMARK_ICON           "\U263F" # ☿
+      VCS_COMMIT_ICON             ''
+      VCS_BRANCH_ICON             '@'
+      VCS_REMOTE_BRANCH_ICON      "\U2192" # →
+      VCS_GIT_ICON                'Git'
+      VCS_HG_ICON                 'HG'
+    )
   ;;
   'awesome-patched')
     # Awesome-Patched Font required!
     # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
-    LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
-    RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
-    ROOT_ICON="\U26A1" # ⚡
-    RUBY_ICON="\UE847" # 
-    AWS_ICON="\UE895" # 
-    BACKGROUND_JOBS_ICON="\UE82F " # 
-    TEST_ICON="\UE891" # 
-    OK_ICON="\U2713" # ✓
-    FAIL_ICON="\U2718" # ✘
-    SYMFONY_ICON="SF"
-    APPLE_ICON=$'\UF8FF' # 
-    FREEBSD_ICON=$'\U1F608 ' # 😈
-    LINUX_ICON=$'\U1F427 ' # 🐧
-    SUNOS_ICON=$'\U1F31E ' # 🌞
-    VCS_UNTRACKED_ICON="\UE16C" # 
-    VCS_UNSTAGED_ICON="\UE17C" # 
-    VCS_STAGED_ICON="\UE168" # 
-    VCS_STASH_ICON="\UE133 " # 
-    #VCS_INCOMING_CHANGES="\UE1EB " # 
-    #VCS_INCOMING_CHANGES="\UE80D " # 
-    VCS_INCOMING_CHANGES="\UE131 " # 
-    #VCS_OUTGOING_CHANGES="\UE1EC " # 
-    #VCS_OUTGOING_CHANGES="\UE80E " # 
-    VCS_OUTGOING_CHANGES="\UE132 " # 
-    VCS_TAG_ICON="\UE817 " # 
-    VCS_BOOKMARK_ICON="\UE87B" # 
-    VCS_COMMIT_ICON="\UE821 " # 
-    VCS_BRANCH_ICON=$'\UE220' # 
-    VCS_REMOTE_BRANCH_ICON=" \UE804 " # 
-    VCS_GIT_ICON="\UE20E  " # 
-    VCS_HG_ICON="\UE1C3  " # 
+    icons=(
+      LEFT_SEGMENT_SEPARATOR      "\UE0B0" # 
+      RIGHT_SEGMENT_SEPARATOR     "\UE0B2" # 
+      ROOT_ICON                   "\UE801" # 
+      RUBY_ICON                   "\UE847" # 
+      AWS_ICON                    "\UE895" # 
+      BACKGROUND_JOBS_ICON        "\UE82F " # 
+      TEST_ICON                   "\UE891" # 
+      OK_ICON                     "\U2713" # ✓
+      FAIL_ICON                   "\U2718" # ✘
+      SYMFONY_ICON                "SF"
+      APPLE_ICON                  $'\UF8FF' # 
+      FREEBSD_ICON                $'\U1F608 ' # 😈
+      LINUX_ICON                  $'\U1F427 ' # 🐧
+      SUNOS_ICON                  $'\U1F31E ' # 🌞
+      VCS_UNTRACKED_ICON          "\UE16C" # 
+      VCS_UNSTAGED_ICON           "\UE17C" # 
+      VCS_STAGED_ICON             "\UE168" # 
+      VCS_STASH_ICON              "\UE133 " # 
+      #VCS_INCOMING_CHANGES       "\UE1EB " # 
+      #VCS_INCOMING_CHANGES       "\UE80D " # 
+      VCS_INCOMING_CHANGES        "\UE131 " # 
+      #VCS_OUTGOING_CHANGES       "\UE1EC " # 
+      #VCS_OUTGOING_CHANGES       "\UE80E " # 
+      VCS_OUTGOING_CHANGES        "\UE132 " # 
+      VCS_TAG_ICON                "\UE817 " # 
+      VCS_BOOKMARK_ICON           "\UE87B" # 
+      VCS_COMMIT_ICON             "\UE821 " # 
+      VCS_BRANCH_ICON             $'\UE220' # 
+      VCS_REMOTE_BRANCH_ICON      " \UE804 " # 
+      VCS_GIT_ICON                "\UE20E  " # 
+      VCS_HG_ICON                 "\UE1C3  " # 
+    )
   ;;
   *)
     # Powerline-Patched Font required!
     # See https://github.com/Lokaltog/powerline-fonts
-    LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
-    RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
-    ROOT_ICON="\U26A1" # ⚡
-    RUBY_ICON=''
-    AWS_ICON="AWS:"
-    BACKGROUND_JOBS_ICON="\U2699" # ⚙
-    TEST_ICON=''
-    OK_ICON="\U2713" # ✓
-    FAIL_ICON="\U2718" # ✘
-    SYMFONY_ICON="SF"
-    APPLE_ICON='OSX'
-    FREEBSD_ICON='BSD'
-    LINUX_ICON='Lx'
-    SUNOS_ICON='Sun'
-    VCS_UNTRACKED_ICON='?'
-    VCS_UNSTAGED_ICON="\U25CF" # ●
-    VCS_STAGED_ICON="\U271A" # ✚
-    VCS_STASH_ICON="\U235F" # ⍟
-    VCS_INCOMING_CHANGES="\U2193" # ↓
-    VCS_OUTGOING_CHANGES="\U2191" # ↑
-    VCS_TAG_ICON=''
-    VCS_BOOKMARK_ICON="\U263F" # ☿
-    VCS_COMMIT_ICON=''
-    VCS_BRANCH_ICON="\UE0A0 " # 
-    VCS_REMOTE_BRANCH_ICON="\U2192" # →
-    VCS_GIT_ICON=""
-    VCS_HG_ICON=""
+    icons=(
+      LEFT_SEGMENT_SEPARATOR      "\UE0B0" # 
+      RIGHT_SEGMENT_SEPARATOR     "\UE0B2" # 
+      ROOT_ICON                   "\U26A1" # ⚡
+      RUBY_ICON                   ''
+      AWS_ICON                    "AWS:"
+      BACKGROUND_JOBS_ICON        "\U2699" # ⚙
+      TEST_ICON                   ''
+      OK_ICON                     "\U2713" # ✓
+      FAIL_ICON                   "\U2718" # ✘
+      SYMFONY_ICON                "SF"
+      APPLE_ICON                  'OSX'
+      FREEBSD_ICON                'BSD'
+      LINUX_ICON                  'Lx'
+      SUNOS_ICON                  'Sun'
+      VCS_UNTRACKED_ICON          '?'
+      VCS_UNSTAGED_ICON           "\U25CF" # ●
+      VCS_STAGED_ICON             "\U271A" # ✚
+      VCS_STASH_ICON              "\U235F" # ⍟
+      VCS_INCOMING_CHANGES        "\U2193" # ↓
+      VCS_OUTGOING_CHANGES        "\U2191" # ↑
+      VCS_TAG_ICON                ''
+      VCS_BOOKMARK_ICON           "\U263F" # ☿
+      VCS_COMMIT_ICON             ''
+      VCS_BRANCH_ICON             "\UE0A0 " # 
+      VCS_REMOTE_BRANCH_ICON      "\U2192" # →
+      VCS_GIT_ICON                ""
+      VCS_HG_ICON                 ""
+    )
   ;;
 esac
 
+if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
+    $icons['VCS_BRANCH_ICON']=''
+fi
+
+function print_icon() {
+  local icon_name=$1
+  local ICON_USER_VARIABLE=POWERLEVEL9K_${icon_name}
+  local USER_ICON=${(P)ICON_USER_VARIABLE}
+  if [[ -n "$USER_ICON" ]]; then
+    echo -n $USER_ICON
+  else
+    echo -n ${icons[$icon_name]}
+  fi
+}
+
 # OS detection for the `os_icon` segment
 case $(uname) in
-    Darwin)     OS_ICON=$APPLE_ICON   ;;
-    FreeBSD)    OS_ICON=$FREEBSD_ICON ;;
-    OpenBSD)    OS_ICON=$FREEBSD_ICON ;;
-    DragonFly)  OS_ICON=$FREEBSD_ICON ;;
-    Linux)      OS_ICON=$LINUX_ICON   ;;
-    SunOS)      OS_ICON=$SUNOS_ICON   ;;
-    *)          OS_ICON=''            ;;
+  "Darwin")    OS_ICON=$(print_icon 'APPLE_ICON')   ;;
+  "FreeBSD")   OS_ICON=$(print_icon 'FREEBSD_ICON') ;;
+  "OpenBSD")   OS_ICON=$(print_icon 'FREEBSD_ICON') ;;
+  "DragonFly") OS_ICON=$(print_icon 'FREEBSD_ICON') ;;
+  "Linux")     OS_ICON=$(print_icon 'LINUX_ICON')   ;;
+  "SunOS")     OS_ICON=$(print_icon 'SUNOS_ICON')   ;;
+  *)           OS_ICON=''                           ;;
 esac
 
-if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
-    VCS_BRANCH_ICON=''
-fi
-
 ################################################################
 # color scheme
 ################################################################
@@ -242,26 +261,26 @@ if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
     VCS_CHANGESET_HASH_LENGTH="$POWERLEVEL9K_CHANGESET_HASH_LENGTH"
   fi
 
-  VCS_CHANGESET_PREFIX="%F{$VCS_FOREGROUND_COLOR_DARK}$VCS_COMMIT_ICON%0.$VCS_CHANGESET_HASH_LENGTH""i%f "
+  VCS_CHANGESET_PREFIX="%F{$VCS_FOREGROUND_COLOR_DARK}$(print_icon 'VCS_COMMIT_ICON')%0.$VCS_CHANGESET_HASH_LENGTH""i%f "
 fi
 
 zstyle ':vcs_info:*' enable git hg
 zstyle ':vcs_info:*' check-for-changes true
 
 VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%F{$VCS_FOREGROUND_COLOR}%b%c%u%m%f"
-zstyle ':vcs_info:git:*' formats "%F{$VCS_FOREGROUND_COLOR}$VCS_GIT_ICON%f$VCS_DEFAULT_FORMAT"
-zstyle ':vcs_info:hg:*' formats "%F{$VCS_FOREGROUND_COLOR}$VCS_HG_ICON%f$VCS_DEFAULT_FORMAT"
+zstyle ':vcs_info:git:*' formats "%F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_GIT_ICON')%f$VCS_DEFAULT_FORMAT"
+zstyle ':vcs_info:hg:*' formats "%F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_HG_ICON')%f$VCS_DEFAULT_FORMAT"
 
 zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%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:*' stagedstr " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_STAGED_ICON')%f"
+zstyle ':vcs_info:*' unstagedstr " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_UNSTAGED_ICON')%f"
 
 zstyle ':vcs_info:git*+set-message:*' hooks vcs-detect-changes git-untracked git-aheadbehind git-stash git-remotebranch git-tagname
 zstyle ':vcs_info:hg*+set-message:*' hooks vcs-detect-changes
 
 # For Hg, only show the branch name
-zstyle ':vcs_info:hg*:*' branchformat "$VCS_BRANCH_ICON%b"
+zstyle ':vcs_info:hg*:*' branchformat "$(print_icon 'VCS_BRANCH_ICON')%b"
 # The `get-revision` function must be turned on for dirty-check to work for Hg
 zstyle ':vcs_info:hg*:*' get-revision true
 zstyle ':vcs_info:hg*:*' get-bookmarks true
@@ -275,6 +294,11 @@ fi
 # Prompt Segment Constructors
 ################################################################
 
+# The `CURRENT_BG` variable is used to remember what the last BG color used was
+# when building the left-hand prompt. Because the RPROMPT is created from
+# right-left but reads the opposite, this isn't necessary for the other side.
+CURRENT_BG='NONE'
+
 # Begin a left prompt segment
 # Takes four arguments:
 #   * $1: Name of the function that was orginally invoked (mandatory).
@@ -304,7 +328,7 @@ left_prompt_segment() {
   [[ -n $3 ]] && fg="%F{$3}" || fg="%f"
   if [[ $CURRENT_BG != 'NONE' && $2 != $CURRENT_BG ]]; then
     # Middle segment
-    echo -n "%{$bg%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR%{$fg%} "
+    echo -n "%{$bg%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')%{$fg%} "
   else
     # First segment
     echo -n "%{$bg%}%{$fg%} "
@@ -316,7 +340,7 @@ left_prompt_segment() {
 # End the left prompt, closing any open segments
 left_prompt_end() {
   if [[ -n $CURRENT_BG ]]; then
-    echo -n "%{%k%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR"
+    echo -n "%{%k%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')"
   else
     echo -n "%{%k%}"
   fi
@@ -346,7 +370,7 @@ right_prompt_segment() {
   local bg fg
   [[ -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%} "
+  echo -n "%f%F{$2}$(print_icon 'RIGHT_SEGMENT_SEPARATOR')%f%{$bg%}%{$fg%} "
   [[ -n $4 ]] && echo -n "$4 "
 }
 
@@ -370,7 +394,7 @@ prompt_vcs() {
 function +vi-git-untracked() {
     if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' && \
             -n $(git ls-files --others --exclude-standard | sed q) ]]; then
-        hook_com[unstaged]+=" %F{$VCS_FOREGROUND_COLOR}$VCS_UNTRACKED_ICON%f"
+        hook_com[unstaged]+=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_UNTRACKED_ICON')%f"
     fi
 }
 
@@ -400,12 +424,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{$VCS_FOREGROUND_COLOR}$VCS_BRANCH_ICON${hook_com[branch]}%f"
+    hook_com[branch]="%F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_BRANCH_ICON')${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{$VCS_FOREGROUND_COLOR}$VCS_REMOTE_BRANCH_ICON%f%F{$VCS_FOREGROUND_COLOR}${remote// /}%f"
+        hook_com[branch]+="%F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_REMOTE_BRANCH_ICON')%f%F{$VCS_FOREGROUND_COLOR}${remote// /}%f"
     fi
 }
 
@@ -413,7 +437,7 @@ function +vi-git-tagname() {
     local tag
 
     tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
-    [[ -n "${tag}" ]] && hook_com[branch]=" %F{$VCS_FOREGROUND_COLOR}$VCS_TAG_ICON${tag}%f"
+    [[ -n "${tag}" ]] && hook_com[branch]=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_TAG_ICON')${tag}%f"
 }
 
 # Show count of stashed changes
@@ -423,13 +447,13 @@ 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{$VCS_FOREGROUND_COLOR}$VCS_STASH_ICON${stashes// /}%f"
+    hook_com[misc]+=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_STASH_ICON')${stashes// /}%f"
   fi
 }
 
 function +vi-hg-bookmarks() {
   if [[ -n "${hgbmarks[@]}" ]]; then
-    hook_com[hg-bookmark-string]=" %F{$VCS_FOREGROUND_COLOR}$VCS_BOOKMARK_ICON${hgbmarks[@]}%f"
+    hook_com[hg-bookmark-string]=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_BOOKMARK_ICON')${hgbmarks[@]}%f"
 
     # And to signal, that we want to use the sting we just generated,
     # set the special variable `ret' to something other than the default
@@ -461,7 +485,7 @@ prompt_aws() {
   local aws_profile="$AWS_DEFAULT_PROFILE"
   if [[ -n "$aws_profile" ]];
   then
-    $1_prompt_segment "$0" red white "$AWS_ICON $aws_profile"
+    $1_prompt_segment "$0" red white "$(print_icon 'AWS_ICON') $aws_profile"
   fi
 }
 
@@ -494,6 +518,16 @@ prompt_history() {
   $1_prompt_segment "$0" "244" "$DEFAULT_COLOR" '%h'
 }
 
+prompt_icons_test() {
+  for key in "${(@k)icons}"; do
+    # The lower color spectrum in ZSH makes big steps. Choosing
+    # the next color has enough contrast to read.
+    local random_color=$((RANDOM % 8))
+    local next_color=$((random_color+1))
+    $1_prompt_segment "$0" "$random_color" "$next_color" "$key: ${icons[$key]}"
+  done
+}
+
 # Right Status: (return code, root status, background jobs)
 # This creates a status segment for the *right* prompt. Exact same thing as
 # above - just other side.
@@ -505,12 +539,12 @@ prompt_longstatus() {
     symbols+="%F{226}%? ↵"
     bg="009"
   else
-    symbols+="%{%F{"046"}%}$OK_ICON"
+    symbols+="%{%F{"046"}%}$(print_icon 'OK_ICON')"
     bg="008"
   fi
 
-  [[ "$UID" -eq 0 ]] && symbols+="%{%F{yellow}%} $ROOT_ICON"
-  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$BACKGROUND_JOBS_ICON"
+  [[ "$UID" -eq 0 ]] && symbols+="%{%F{yellow}%} $(print_icon 'ROOT_ICON')"
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$(print_icon 'BACKGROUND_JOBS_ICON')"
 
   [[ -n "$symbols" ]] && $1_prompt_segment "$0" "$bg" "$DEFAULT_COLOR" "$symbols"
 }
@@ -542,7 +576,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" $0 "$code_amount" $tests_amount "RSpec $TEST_ICON"
+    build_test_stats "$1" $0 "$code_amount" $tests_amount "RSpec $(print_icon 'TEST_ICON')"
   fi
 }
 
@@ -551,7 +585,7 @@ prompt_rvm() {
   local rvm_prompt
   rvm_prompt=`rvm-prompt`
   if [ "$rvm_prompt" != "" ]; then
-    $1_prompt_segment "$0" "240" "$DEFAULT_COLOR" "$rvm_prompt $RUBY_ICON "
+    $1_prompt_segment "$0" "240" "$DEFAULT_COLOR" "$rvm_prompt $(print_icon 'RUBY_ICON') "
   fi
 }
 
@@ -560,9 +594,9 @@ prompt_rvm() {
 prompt_status() {
   local symbols
   symbols=()
-  [[ "$RETVAL" -ne 0 ]] && symbols+="%{%F{red}%}$FAIL_ICON"
-  [[ "$UID" -eq 0 ]] && symbols+="%{%F{yellow}%} $ROOT_ICON"
-  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$BACKGROUND_JOBS_ICON"
+  [[ "$RETVAL" -ne 0 ]] && symbols+="%{%F{red}%}$(print_icon 'FAIL_ICON')"
+  [[ "$UID" -eq 0 ]] && symbols+="%{%F{yellow}%} $(print_icon 'ROOT_ICON')"
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$(print_icon 'BACKGROUND_JOBS_ICON')"
 
   [[ -n "$symbols" ]] && $1_prompt_segment "$0" "$DEFAULT_COLOR" "default" "$symbols"
 }
@@ -573,7 +607,7 @@ 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" "$0" "$code_amount" "$tests_amount" "SF2 $TEST_ICON"
+    build_test_stats "$1" "$0" "$code_amount" "$tests_amount" "SF2 $(print_icon 'TEST_ICON')"
   fi
 }
 
@@ -581,7 +615,7 @@ prompt_symfony2_tests() {
 prompt_symfony2_version() {
   if [[ -f app/bootstrap.php.cache ]]; then
     local symfony2_version=$(grep " VERSION " app/bootstrap.php.cache | sed -e 's/[^.0-9]*//g')
-    $1_prompt_segment "$0" "240" "$DEFAULT_COLOR" "$SYMFONY_ICON $symfony2_version"
+    $1_prompt_segment "$0" "240" "$DEFAULT_COLOR" "$(print_icon 'SYMFONY_ICON') $symfony2_version"
   fi
 }
 

From 5777b7bb545e355590a70f26dbd6bf65652dc460 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Tue, 4 Aug 2015 18:47:44 +0200
Subject: [PATCH 04/24] Code cleanup. We don't need to define all icons for
 every mode any more.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index dd3e9968..bcb129b5 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -54,75 +54,7 @@
 # `compatible`. This shows all icons in regular symbols.
 typeset -A icons
 case $POWERLEVEL9K_MODE in
-  'flat')
-    # Awesome-Patched Font required!
-    # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
-    icons=(
-      LEFT_SEGMENT_SEPARATOR      ''
-      RIGHT_SEGMENT_SEPARATOR     ''
-      ROOT_ICON                   "\UE801" # 
-      RUBY_ICON                   "\UE847" # 
-      AWS_ICON                    "\UE895" # 
-      BACKGROUND_JOBS_ICON        "\UE82F " # 
-      TEST_ICON                   "\UE891" # 
-      OK_ICON                     "\U2713" # ✓
-      FAIL_ICON                   "\U2718" # ✘
-      SYMFONY_ICON                "SF"
-      APPLE_ICON                  $'\UF8FF' # 
-      FREEBSD_ICON                $'\U1F608 ' # 😈
-      LINUX_ICON                  $'\U1F427 ' # 🐧
-      SUNOS_ICON                  $'\U1F31E ' # 🌞
-      VCS_UNTRACKED_ICON          "\UE16C" # 
-      VCS_UNSTAGED_ICON           "\UE17C" # 
-      VCS_STAGED_ICON             "\UE168" # 
-      VCS_STASH_ICON              "\UE133 " # 
-      #VCS_INCOMING_CHANGES       "\UE1EB " # 
-      #VCS_INCOMING_CHANGES       "\UE80D " # 
-      VCS_INCOMING_CHANGES        "\UE131 " # 
-      #VCS_OUTGOING_CHANGES       "\UE1EC " # 
-      #VCS_OUTGOING_CHANGES       "\UE80E " # 
-      VCS_OUTGOING_CHANGES        "\UE132 " # 
-      VCS_TAG_ICON                "\UE817 " # 
-      VCS_BOOKMARK_ICON           "\UE87B" # 
-      VCS_COMMIT_ICON             "\UE821 " # 
-      VCS_BRANCH_ICON             $'\UE220' # 
-      VCS_REMOTE_BRANCH_ICON      " \UE804 " # 
-      VCS_GIT_ICON                "\UE20E  " # 
-      VCS_HG_ICON                 "\UE1C3  " # 
-    )
-  ;;
-  'compatible')
-    icons=(
-      LEFT_SEGMENT_SEPARATOR      "\U2B80" # ⮀
-      RIGHT_SEGMENT_SEPARATOR     "\U2B82" # ⮂
-      ROOT_ICON                   "\U26A1" # ⚡
-      RUBY_ICON                   ''
-      AWS_ICON                    "AWS:"
-      BACKGROUND_JOBS_ICON        "\U2699" # ⚙
-      TEST_ICON                   ''
-      OK_ICON                     "\U2713" # ✓
-      FAIL_ICON                   "\U2718" # ✘
-      SYMFONY_ICON                "SF"
-      APPLE_ICON                  'OSX'
-      FREEBSD_ICON                'BSD'
-      LINUX_ICON                  'Lx'
-      SUNOS_ICON                  'Sun'
-      VCS_UNTRACKED_ICON          '?'
-      VCS_UNSTAGED_ICON           "\U25CF" # ●
-      VCS_STAGED_ICON             "\U271A" # ✚
-      VCS_STASH_ICON              "\U235F" # ⍟
-      VCS_INCOMING_CHANGES        "\U2193" # ↓
-      VCS_OUTGOING_CHANGES        "\U2191" # ↑
-      VCS_TAG_ICON                ''
-      VCS_BOOKMARK_ICON           "\U263F" # ☿
-      VCS_COMMIT_ICON             ''
-      VCS_BRANCH_ICON             '@'
-      VCS_REMOTE_BRANCH_ICON      "\U2192" # →
-      VCS_GIT_ICON                'Git'
-      VCS_HG_ICON                 'HG'
-    )
-  ;;
-  'awesome-patched')
+  'flat'|'awesome-patched')
     # Awesome-Patched Font required!
     # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
     icons=(
@@ -194,6 +126,19 @@ case $POWERLEVEL9K_MODE in
   ;;
 esac
 
+# Second switch for overrides
+case $POWERLEVEL9K_MODE in
+  'flat')
+    icons[LEFT_SEGMENT_SEPARATOR]=''
+    icons[RIGHT_SEGMENT_SEPARATOR]=''
+  ;;
+  'compatible')
+    icons[LEFT_SEGMENT_SEPARATOR]="\U2B80" # ⮀
+    icons[RIGHT_SEGMENT_SEPARATOR]="\U2B82" # ⮂
+    icons[VCS_BRANCH_ICON]='@'
+  ;;
+esac
+
 if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
     $icons['VCS_BRANCH_ICON']=''
 fi

From b1dba08c9394aef7c99102b614d2ca01093ba981 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Tue, 4 Aug 2015 18:56:00 +0200
Subject: [PATCH 05/24] Multiline-Icons should be treated as icons as well.

---
 powerlevel9k.zsh-theme | 129 +++++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 64 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index bcb129b5..a31695b2 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -58,70 +58,74 @@ case $POWERLEVEL9K_MODE in
     # Awesome-Patched Font required!
     # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
     icons=(
-      LEFT_SEGMENT_SEPARATOR      "\UE0B0" # 
-      RIGHT_SEGMENT_SEPARATOR     "\UE0B2" # 
-      ROOT_ICON                   "\UE801" # 
-      RUBY_ICON                   "\UE847" # 
-      AWS_ICON                    "\UE895" # 
-      BACKGROUND_JOBS_ICON        "\UE82F " # 
-      TEST_ICON                   "\UE891" # 
-      OK_ICON                     "\U2713" # ✓
-      FAIL_ICON                   "\U2718" # ✘
-      SYMFONY_ICON                "SF"
-      APPLE_ICON                  $'\UF8FF' # 
-      FREEBSD_ICON                $'\U1F608 ' # 😈
-      LINUX_ICON                  $'\U1F427 ' # 🐧
-      SUNOS_ICON                  $'\U1F31E ' # 🌞
-      VCS_UNTRACKED_ICON          "\UE16C" # 
-      VCS_UNSTAGED_ICON           "\UE17C" # 
-      VCS_STAGED_ICON             "\UE168" # 
-      VCS_STASH_ICON              "\UE133 " # 
-      #VCS_INCOMING_CHANGES       "\UE1EB " # 
-      #VCS_INCOMING_CHANGES       "\UE80D " # 
-      VCS_INCOMING_CHANGES        "\UE131 " # 
-      #VCS_OUTGOING_CHANGES       "\UE1EC " # 
-      #VCS_OUTGOING_CHANGES       "\UE80E " # 
-      VCS_OUTGOING_CHANGES        "\UE132 " # 
-      VCS_TAG_ICON                "\UE817 " # 
-      VCS_BOOKMARK_ICON           "\UE87B" # 
-      VCS_COMMIT_ICON             "\UE821 " # 
-      VCS_BRANCH_ICON             $'\UE220' # 
-      VCS_REMOTE_BRANCH_ICON      " \UE804 " # 
-      VCS_GIT_ICON                "\UE20E  " # 
-      VCS_HG_ICON                 "\UE1C3  " # 
+      LEFT_SEGMENT_SEPARATOR         "\UE0B0" # 
+      RIGHT_SEGMENT_SEPARATOR        "\UE0B2" # 
+      ROOT_ICON                      "\UE801" # 
+      RUBY_ICON                      "\UE847" # 
+      AWS_ICON                       "\UE895" # 
+      BACKGROUND_JOBS_ICON           "\UE82F " # 
+      TEST_ICON                      "\UE891" # 
+      OK_ICON                        "\U2713" # ✓
+      FAIL_ICON                      "\U2718" # ✘
+      SYMFONY_ICON                   "SF"
+      MULTILINE_FIRST_PROMPT_PREFIX  "╭─"
+      MULTILINE_SECOND_PROMPT_PREFIX "╰─ "
+      APPLE_ICON                     $'\UF8FF' # 
+      FREEBSD_ICON                   $'\U1F608 ' # 😈
+      LINUX_ICON                     $'\U1F427 ' # 🐧
+      SUNOS_ICON                     $'\U1F31E ' # 🌞
+      VCS_UNTRACKED_ICON             "\UE16C" # 
+      VCS_UNSTAGED_ICON              "\UE17C" # 
+      VCS_STAGED_ICON                "\UE168" # 
+      VCS_STASH_ICON                 "\UE133 " # 
+      #VCS_INCOMING_CHANGES          "\UE1EB " # 
+      #VCS_INCOMING_CHANGES          "\UE80D " # 
+      VCS_INCOMING_CHANGES           "\UE131 " # 
+      #VCS_OUTGOING_CHANGES          "\UE1EC " # 
+      #VCS_OUTGOING_CHANGES          "\UE80E " # 
+      VCS_OUTGOING_CHANGES           "\UE132 " # 
+      VCS_TAG_ICON                   "\UE817 " # 
+      VCS_BOOKMARK_ICON              "\UE87B" # 
+      VCS_COMMIT_ICON                "\UE821 " # 
+      VCS_BRANCH_ICON                $'\UE220' # 
+      VCS_REMOTE_BRANCH_ICON         " \UE804 " # 
+      VCS_GIT_ICON                   "\UE20E  " # 
+      VCS_HG_ICON                    "\UE1C3  " # 
     )
   ;;
   *)
     # Powerline-Patched Font required!
     # See https://github.com/Lokaltog/powerline-fonts
     icons=(
-      LEFT_SEGMENT_SEPARATOR      "\UE0B0" # 
-      RIGHT_SEGMENT_SEPARATOR     "\UE0B2" # 
-      ROOT_ICON                   "\U26A1" # ⚡
-      RUBY_ICON                   ''
-      AWS_ICON                    "AWS:"
-      BACKGROUND_JOBS_ICON        "\U2699" # ⚙
-      TEST_ICON                   ''
-      OK_ICON                     "\U2713" # ✓
-      FAIL_ICON                   "\U2718" # ✘
-      SYMFONY_ICON                "SF"
-      APPLE_ICON                  'OSX'
-      FREEBSD_ICON                'BSD'
-      LINUX_ICON                  'Lx'
-      SUNOS_ICON                  'Sun'
-      VCS_UNTRACKED_ICON          '?'
-      VCS_UNSTAGED_ICON           "\U25CF" # ●
-      VCS_STAGED_ICON             "\U271A" # ✚
-      VCS_STASH_ICON              "\U235F" # ⍟
-      VCS_INCOMING_CHANGES        "\U2193" # ↓
-      VCS_OUTGOING_CHANGES        "\U2191" # ↑
-      VCS_TAG_ICON                ''
-      VCS_BOOKMARK_ICON           "\U263F" # ☿
-      VCS_COMMIT_ICON             ''
-      VCS_BRANCH_ICON             "\UE0A0 " # 
-      VCS_REMOTE_BRANCH_ICON      "\U2192" # →
-      VCS_GIT_ICON                ""
-      VCS_HG_ICON                 ""
+      LEFT_SEGMENT_SEPARATOR         "\UE0B0" # 
+      RIGHT_SEGMENT_SEPARATOR        "\UE0B2" # 
+      ROOT_ICON                      "\U26A1" # ⚡
+      RUBY_ICON                      ''
+      AWS_ICON                       "AWS:"
+      BACKGROUND_JOBS_ICON           "\U2699" # ⚙
+      TEST_ICON                      ''
+      OK_ICON                        "\U2713" # ✓
+      FAIL_ICON                      "\U2718" # ✘
+      SYMFONY_ICON                   "SF"
+      MULTILINE_FIRST_PROMPT_PREFIX  "╭─"
+      MULTILINE_SECOND_PROMPT_PREFIX "╰─ "
+      APPLE_ICON                     'OSX'
+      FREEBSD_ICON                   'BSD'
+      LINUX_ICON                     'Lx'
+      SUNOS_ICON                     'Sun'
+      VCS_UNTRACKED_ICON             '?'
+      VCS_UNSTAGED_ICON              "\U25CF" # ●
+      VCS_STAGED_ICON                "\U271A" # ✚
+      VCS_STASH_ICON                 "\U235F" # ⍟
+      VCS_INCOMING_CHANGES           "\U2193" # ↓
+      VCS_OUTGOING_CHANGES           "\U2191" # ↑
+      VCS_TAG_ICON                   ''
+      VCS_BOOKMARK_ICON              "\U263F" # ☿
+      VCS_COMMIT_ICON                ''
+      VCS_BRANCH_ICON                "\UE0A0 " # 
+      VCS_REMOTE_BRANCH_ICON         "\U2192" # →
+      VCS_GIT_ICON                   ""
+      VCS_HG_ICON                    ""
     )
   ;;
 esac
@@ -140,7 +144,7 @@ case $POWERLEVEL9K_MODE in
 esac
 
 if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
-    $icons['VCS_BRANCH_ICON']=''
+    icons[VCS_BRANCH_ICON]=''
 fi
 
 function print_icon() {
@@ -643,11 +647,8 @@ powerlevel9k_init() {
   add-zsh-hook precmd vcs_info
 
   if [[ "$POWERLEVEL9K_PROMPT_ON_NEWLINE" == true ]]; then
-    [[ -n $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX ]] || POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="╭─"
-    [[ -n $POWERLEVEL9K_MULTILINE_SECOND_PROMPT_PREFIX ]] || POWERLEVEL9K_MULTILINE_SECOND_PROMPT_PREFIX="╰─ "
-
-    PROMPT="$POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX%{%f%b%k%}"'$(build_left_prompt)'"
-$POWERLEVEL9K_MULTILINE_SECOND_PROMPT_PREFIX"
+    PROMPT="$(print_icon 'MULTILINE_FIRST_PROMPT_PREFIX')%{%f%b%k%}"'$(build_left_prompt)'"
+$(print_icon 'MULTILINE_SECOND_PROMPT_PREFIX')"
     # The right prompt should be on the same line as the first line of the left
     # prompt.  To do so, there is just a quite ugly workaround: Before zsh draws
     # the RPROMPT, we advise it, to go one line up. At the end of RPROMPT, we

From 33dba0f19fff80baeebf723bd828a714d43b7f24 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 5 Aug 2015 00:00:29 +0200
Subject: [PATCH 06/24] Define multiline icons as escape sequence.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index a31695b2..dadd1d1a 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -68,8 +68,8 @@ case $POWERLEVEL9K_MODE in
       OK_ICON                        "\U2713" # ✓
       FAIL_ICON                      "\U2718" # ✘
       SYMFONY_ICON                   "SF"
-      MULTILINE_FIRST_PROMPT_PREFIX  "╭─"
-      MULTILINE_SECOND_PROMPT_PREFIX "╰─ "
+      MULTILINE_FIRST_PROMPT_PREFIX  $'\U256D'$'\U2500'
+      MULTILINE_SECOND_PROMPT_PREFIX $'\U2570'$'\U2500 '
       APPLE_ICON                     $'\UF8FF' # 
       FREEBSD_ICON                   $'\U1F608 ' # 😈
       LINUX_ICON                     $'\U1F427 ' # 🐧
@@ -107,8 +107,8 @@ case $POWERLEVEL9K_MODE in
       OK_ICON                        "\U2713" # ✓
       FAIL_ICON                      "\U2718" # ✘
       SYMFONY_ICON                   "SF"
-      MULTILINE_FIRST_PROMPT_PREFIX  "╭─"
-      MULTILINE_SECOND_PROMPT_PREFIX "╰─ "
+      MULTILINE_FIRST_PROMPT_PREFIX  $'\U256D'$'\U2500'
+      MULTILINE_SECOND_PROMPT_PREFIX $'\U2570'$'\U2500 '
       APPLE_ICON                     'OSX'
       FREEBSD_ICON                   'BSD'
       LINUX_ICON                     'Lx'

From 754b648f372924214a32a09205cc4aca7f93af12 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 5 Aug 2015 00:21:09 +0200
Subject: [PATCH 07/24] Changed the default behaviour to truncate whole
 directories.

---
 README.md              | 6 +++---
 powerlevel9k.zsh-theme | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 787e98f6..0b130120 100644
--- a/README.md
+++ b/README.md
@@ -279,11 +279,11 @@ to a certain length:
 
 To change the way how the current working directory is truncated, just set:
 
-    # truncate whole directories
-    POWERLEVEL9K_SHORTEN_STRATEGY="complete_directories"
+    # truncate the middle part
+    POWERLEVEL9K_SHORTEN_STRATEGY="truncate_middle"
     # truncate from right, leaving the first X characters untouched
     POWERLEVEL9K_SHORTEN_STRATEGY="truncate_from_right"
-    # default behaviour is to truncate the middle part of the directory
+    # default behaviour is to truncate whole directories
 
 In each case you have to specify the length you want to shorten the directory
 to. So in some cases `POWERLEVEL9K_SHORTEN_DIR_LENGTH` means characters, in 
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 4ee919cc..7ce0a5f9 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -484,14 +484,14 @@ prompt_dir() {
   if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" ]]; then
 
     case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
-      complete_directories)
-        current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:.../:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
+      truncate_middle)
+        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1\.\.\2\//g")
       ;;
       truncate_from_right)
         current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1..\//g")
       ;;
       *)
-        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1\.\.\2\//g")
+        current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:.../:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
       ;;
     esac
 

From d07ee098aaf401f9f7cbfdbdac40f84a9b149630 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Thu, 6 Aug 2015 00:37:06 +0200
Subject: [PATCH 08/24] Updated URL to powerline-fonts repository.

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

diff --git a/README.md b/README.md
index 49c08127..5dc61568 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## powerlevel9k Theme for ZSH
 
 Powerlevel9k is a theme for ZSH which uses [Powerline
-Fonts](https://github.com/Lokaltog/powerline-fonts). It can be used with vanilla
+Fonts](https://github.com/powerline/fonts). It can be used with vanilla
 ZSH, [Oh-My-Zsh](https://github.com/robbyrussell/oh-my-zsh), or
 [Prezto](https://github.com/sorin-ionescu/prezto), and can also be installed
 using [antigen](https://github.com/zsh-users/antigen).

From 550c91e6ba78aca0d12cff87b7c3f9035fe49251 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Thu, 6 Aug 2015 00:38:36 +0200
Subject: [PATCH 09/24] Updated URL to agnosters-theme repository.

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

diff --git a/README.md b/README.md
index 5dc61568..424f130e 100644
--- a/README.md
+++ b/README.md
@@ -467,7 +467,7 @@ terminal, which should yield `256`. If you see something different, try setting
 #### Kudos
 
 This theme wouldn't have happened without inspiration from the original
-[agnoster](https://gist.github.com/agnoster/3712874) Oh-My-ZSH theme.
+[agnoster](https://github.com/agnoster/agnoster-zsh-theme) ZSH theme.
 
 Before creating this theme, I also tried [jeremyFreeAgent's
 theme](https://github.com/jeremyFreeAgent/oh-my-zsh-powerline-theme) and

From 329f60f19f3198cc799b8a1eded895794cbbe3a2 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 7 Aug 2015 18:59:49 +0200
Subject: [PATCH 10/24] Node icon should be customizable too.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index dadd1d1a..72314412 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -68,6 +68,7 @@ case $POWERLEVEL9K_MODE in
       OK_ICON                        "\U2713" # ✓
       FAIL_ICON                      "\U2718" # ✘
       SYMFONY_ICON                   "SF"
+      NODE_ICON                      $'\U2B22' # ⬢
       MULTILINE_FIRST_PROMPT_PREFIX  $'\U256D'$'\U2500'
       MULTILINE_SECOND_PROMPT_PREFIX $'\U2570'$'\U2500 '
       APPLE_ICON                     $'\UF8FF' # 
@@ -107,6 +108,7 @@ case $POWERLEVEL9K_MODE in
       OK_ICON                        "\U2713" # ✓
       FAIL_ICON                      "\U2718" # ✘
       SYMFONY_ICON                   "SF"
+      NODE_ICON                      $'\U2B22' # ⬢
       MULTILINE_FIRST_PROMPT_PREFIX  $'\U256D'$'\U2500'
       MULTILINE_SECOND_PROMPT_PREFIX $'\U2570'$'\U2500 '
       APPLE_ICON                     'OSX'
@@ -502,9 +504,8 @@ prompt_longstatus() {
 prompt_node_version() {
   local nvm_prompt=$(node -v 2>/dev/null)
   [[ -z "${nvm_prompt}" ]] && return
-  NODE_ICON=$'\U2B22' # ⬢
 
-  $1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON"
+  $1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $(print_icon 'NODE_ICON')"
 }
 
 # print a little OS icon

From d1832de888f4ff7008d8262561d5c7e15ebbf29a Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 7 Aug 2015 19:14:17 +0200
Subject: [PATCH 11/24] Added documentation.

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

diff --git a/README.md b/README.md
index 49c08127..c43232fb 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ this theme focus on four primary goals:
   - [Double-Lined Prompt](#double-lined-prompt)
   - [Disable Right Prompt](#disable-right-prompt)
   - [Light Color Theme](#light-color-theme)
+  - [Icon Customization](#icon-customization)
   - [Segment Color Customization](#segment-color-customization)
   - [Special Segment Colors](#special-segment-colors)
 - [Troubleshooting](#troubleshooting)
@@ -382,6 +383,24 @@ Light'](https://github.com/altercation/solarized) users. Check it out:
 
 ![](http://bhilburn.org/content/images/2015/03/solarized-light.png)
 
+#### Icon Customization
+
+Each icon used can be customized too by specifying a variable named like
+the icon and prefixed with 'POWERLEVEL9K'. If you want to use another icon
+as segment separators, you can easily do that:
+
+    POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR=$'\uE0B1'
+    POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR=$'\uE0B3'
+
+You could get a list of all icons defined in random colors, by adding the 
+special segment `icons_test` to your prompt:
+
+    POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(icons_test)
+
+This special prompt does not work on the right side, as it would be too long,
+and ZSH hides it automatically. Also have in mind, that the output depends on
+your `POWERLEVEL9K_MODE` settings.
+
 #### Segment Color Customization
 
 For each segment in your prompt, you can specify a foreground and background

From 0159559c6a5552822cc0cd1d9a8610db76a174cf Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sun, 9 Aug 2015 20:05:21 +0200
Subject: [PATCH 12/24] Added some hints about troubleshooting missing fonts.

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

diff --git a/README.md b/README.md
index 424f130e..41e00402 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ this theme focus on four primary goals:
 - [Troubleshooting](#troubleshooting)
   - [Gaps Between Segments](#gaps-between-segments)
   - [Segment Colors are Wrong](#segment-colors-are-wrong)
+  - [Strange Characters in prompt](#strange-characters-in-prompt)
 - [Meta](#meta)
   - [Kudos](#kudos)
   - [Developing](#developing)
@@ -462,6 +463,15 @@ terminal, which should yield `256`. If you see something different, try setting
 
     TERM=xterm-256color
 
+#### Strange Characters in prompt
+
+If your prompt shows strange character like this:
+
+![](https://cloud.githubusercontent.com/assets/1544760/9156161/e0e584e6-3ed0-11e5-897a-2318a8e32d35.png)
+
+it is most likely that you set `POWERLEVEL9K_MODE="awesome-patched"`, but
+did not install an [awesome-font](https://github.com/gabrielelana/awesome-terminal-fonts). For most other modes, you need a [powerline-patched](https://github.com/powerline/fonts) font.
+
 ### Meta
 
 #### Kudos

From 44db352e3512ff73f071e592868044d8ca8c5447 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 15 Aug 2015 15:49:22 +0200
Subject: [PATCH 13/24] Issue #64: Now the theme detects on OSX which sed is to
 use.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 7ce0a5f9..fffc470e 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -186,19 +186,49 @@ case $POWERLEVEL9K_MODE in
   ;;
 esac
 
+if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
+    VCS_BRANCH_ICON=''
+fi
+
 # OS detection for the `os_icon` segment
 case $(uname) in
-    Darwin)     OS_ICON=$APPLE_ICON   ;;
-    FreeBSD)    OS_ICON=$FREEBSD_ICON ;;
-    OpenBSD)    OS_ICON=$FREEBSD_ICON ;;
-    DragonFly)  OS_ICON=$FREEBSD_ICON ;;
-    Linux)      OS_ICON=$LINUX_ICON   ;;
-    SunOS)      OS_ICON=$SUNOS_ICON   ;;
-    *)          OS_ICON=''            ;;
+    Darwin)
+      OS='OSX'
+      OS_ICON=$APPLE_ICON
+      ;;
+    FreeBSD)
+      OS='BSD'
+      OS_ICON=$FREEBSD_ICON
+      ;;
+    OpenBSD)
+      OS='BSD'
+      OS_ICON=$FREEBSD_ICON
+      ;;
+    DragonFly)
+      OS='BSD'
+      OS_ICON=$FREEBSD_ICON
+      ;;
+    Linux)
+      OS='Linux'
+      OS_ICON=$LINUX_ICON
+      ;;
+    SunOS)
+      OS='Solaris'
+      OS_ICON=$SUNOS_ICON
+      ;;
+    *)
+      OS=''
+      OS_ICON=''
+      ;;
 esac
 
-if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
-    VCS_BRANCH_ICON=''
+# Determine the correct sed parameter.
+SED_EXTENDED_REGEX_PARAMETER="-r"
+if [[ "$OS" == 'OSX' ]]; then
+  local IS_BSD_SED=$(sed --version &>> /dev/null || echo "BSD sed")
+  if [[ -n "$IS_BSD_SED" ]]; then
+    SED_EXTENDED_REGEX_PARAMETER="-E"
+  fi
 fi
 
 ################################################################
@@ -485,10 +515,10 @@ prompt_dir() {
 
     case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
       truncate_middle)
-        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1\.\.\2\//g")
+        current_path=$(pwd | sed -e "s,^$HOME,~," | sed $SED_EXTENDED_REGEX_PARAMETER "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1\.\.\2\//g")
       ;;
       truncate_from_right)
-        current_path=$(pwd | sed -e "s,^$HOME,~," | sed -E "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1..\//g")
+        current_path=$(pwd | sed -e "s,^$HOME,~," | sed $SED_EXTENDED_REGEX_PARAMETER "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1..\//g")
       ;;
       *)
         current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:.../:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"

From 0831fa1041fa7b24ba09243723f5aa70c6a1411f Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 15 Aug 2015 16:09:31 +0200
Subject: [PATCH 14/24] Issue #74: Changed escape sequences for UTF-8
 characters to lowercase for `compatible` and default mode.

---
 powerlevel9k.zsh-theme | 54 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 8cc2d570..4773ac59 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -90,31 +90,31 @@ case $POWERLEVEL9K_MODE in
     VCS_HG_ICON="\UE1C3  " # 
   ;;
   'compatible')
-    LEFT_SEGMENT_SEPARATOR="\U2B80" # ⮀
-    RIGHT_SEGMENT_SEPARATOR="\U2B82" # ⮂
-    ROOT_ICON="\U26A1" # ⚡
+    LEFT_SEGMENT_SEPARATOR="\u2B80" # ⮀
+    RIGHT_SEGMENT_SEPARATOR="\u2B82" # ⮂
+    ROOT_ICON="\u26A1" # ⚡
     RUBY_ICON=''
     AWS_ICON="AWS:"
-    BACKGROUND_JOBS_ICON="\U2699" # ⚙
+    BACKGROUND_JOBS_ICON="\u2699" # ⚙
     TEST_ICON=''
-    OK_ICON="\U2713" # ✓
-    FAIL_ICON="\U2718" # ✘
+    OK_ICON="\u2713" # ✓
+    FAIL_ICON="\u2718" # ✘
     SYMFONY_ICON="SF"
     APPLE_ICON='OSX'
     FREEBSD_ICON='BSD'
     LINUX_ICON='Lx'
     SUNOS_ICON='Sun'
     VCS_UNTRACKED_ICON='?'
-    VCS_UNSTAGED_ICON="\U25CF" # ●
-    VCS_STAGED_ICON="\U271A" # ✚
-    VCS_STASH_ICON="\U235F" # ⍟
-    VCS_INCOMING_CHANGES="\U2193" # ↓
-    VCS_OUTGOING_CHANGES="\U2191" # ↑
+    VCS_UNSTAGED_ICON="\u25CF" # ●
+    VCS_STAGED_ICON="\u271A" # ✚
+    VCS_STASH_ICON="\u235F" # ⍟
+    VCS_INCOMING_CHANGES="\u2193" # ↓
+    VCS_OUTGOING_CHANGES="\u2191" # ↑
     VCS_TAG_ICON=''
-    VCS_BOOKMARK_ICON="\U263F" # ☿
+    VCS_BOOKMARK_ICON="\u263F" # ☿
     VCS_COMMIT_ICON=''
     VCS_BRANCH_ICON='@'
-    VCS_REMOTE_BRANCH_ICON="\U2192" # →
+    VCS_REMOTE_BRANCH_ICON="\u2192" # →
     VCS_GIT_ICON='Git'
     VCS_HG_ICON='HG'
   ;;
@@ -156,31 +156,31 @@ case $POWERLEVEL9K_MODE in
   *)
     # Powerline-Patched Font required!
     # See https://github.com/Lokaltog/powerline-fonts
-    LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
-    RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
-    ROOT_ICON="\U26A1" # ⚡
+    LEFT_SEGMENT_SEPARATOR="\uE0B0" # 
+    RIGHT_SEGMENT_SEPARATOR="\uE0B2" # 
+    ROOT_ICON="\u26A1" # ⚡
     RUBY_ICON=''
     AWS_ICON="AWS:"
-    BACKGROUND_JOBS_ICON="\U2699" # ⚙
+    BACKGROUND_JOBS_ICON="\u2699" # ⚙
     TEST_ICON=''
-    OK_ICON="\U2713" # ✓
-    FAIL_ICON="\U2718" # ✘
+    OK_ICON="\u2713" # ✓
+    FAIL_ICON="\u2718" # ✘
     SYMFONY_ICON="SF"
     APPLE_ICON='OSX'
     FREEBSD_ICON='BSD'
     LINUX_ICON='Lx'
     SUNOS_ICON='Sun'
     VCS_UNTRACKED_ICON='?'
-    VCS_UNSTAGED_ICON="\U25CF" # ●
-    VCS_STAGED_ICON="\U271A" # ✚
-    VCS_STASH_ICON="\U235F" # ⍟
-    VCS_INCOMING_CHANGES="\U2193" # ↓
-    VCS_OUTGOING_CHANGES="\U2191" # ↑
+    VCS_UNSTAGED_ICON="\u25CF" # ●
+    VCS_STAGED_ICON="\u271A" # ✚
+    VCS_STASH_ICON="\u235F" # ⍟
+    VCS_INCOMING_CHANGES="\u2193" # ↓
+    VCS_OUTGOING_CHANGES="\u2191" # ↑
     VCS_TAG_ICON=''
-    VCS_BOOKMARK_ICON="\U263F" # ☿
+    VCS_BOOKMARK_ICON="\u263F" # ☿
     VCS_COMMIT_ICON=''
-    VCS_BRANCH_ICON="\UE0A0 " # 
-    VCS_REMOTE_BRANCH_ICON="\U2192" # →
+    VCS_BRANCH_ICON="\uE0A0 " # 
+    VCS_REMOTE_BRANCH_ICON="\u2192" # →
     VCS_GIT_ICON=""
     VCS_HG_ICON=""
   ;;

From 5795442dbcdeb90cc1d5e8f445f019ce5621c12d Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Tue, 18 Aug 2015 23:44:21 +0200
Subject: [PATCH 15/24] Set icon-Array as global variable, so that it is
 visible in later functions. This is important to make the icon-override
 mechanism work in antigen.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 72314412..f52db572 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -52,7 +52,7 @@
 # bizarre characters below, your fonts are not correctly installed. If you
 # do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
 # `compatible`. This shows all icons in regular symbols.
-typeset -A icons
+typeset -gAH icons
 case $POWERLEVEL9K_MODE in
   'flat'|'awesome-patched')
     # Awesome-Patched Font required!

From 823c52b3eca833b99f45c5a9c815aee160c29691 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 19 Aug 2015 23:55:32 +0200
Subject: [PATCH 16/24] All Unicode-escape-characters should begin with an
 lowercase `\u` in the default-icons. The outgoing/incoming changes should use
 the `print_icon` function. Renamed VCS-Incoming/Outgoing icon variables.

---
 powerlevel9k.zsh-theme | 54 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index f52db572..c0ea83aa 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -79,12 +79,12 @@ case $POWERLEVEL9K_MODE in
       VCS_UNSTAGED_ICON              "\UE17C" # 
       VCS_STAGED_ICON                "\UE168" # 
       VCS_STASH_ICON                 "\UE133 " # 
-      #VCS_INCOMING_CHANGES          "\UE1EB " # 
-      #VCS_INCOMING_CHANGES          "\UE80D " # 
-      VCS_INCOMING_CHANGES           "\UE131 " # 
-      #VCS_OUTGOING_CHANGES          "\UE1EC " # 
-      #VCS_OUTGOING_CHANGES          "\UE80E " # 
-      VCS_OUTGOING_CHANGES           "\UE132 " # 
+      #VCS_INCOMING_CHANGES_ICON     "\UE1EB " # 
+      #VCS_INCOMING_CHANGES_ICON     "\UE80D " # 
+      VCS_INCOMING_CHANGES_ICON      "\UE131 " # 
+      #VCS_OUTGOING_CHANGES_ICON     "\UE1EC " # 
+      #VCS_OUTGOING_CHANGES_ICON     "\UE80E " # 
+      VCS_OUTGOING_CHANGES_ICON      "\UE132 " # 
       VCS_TAG_ICON                   "\UE817 " # 
       VCS_BOOKMARK_ICON              "\UE87B" # 
       VCS_COMMIT_ICON                "\UE821 " # 
@@ -98,34 +98,34 @@ case $POWERLEVEL9K_MODE in
     # Powerline-Patched Font required!
     # See https://github.com/Lokaltog/powerline-fonts
     icons=(
-      LEFT_SEGMENT_SEPARATOR         "\UE0B0" # 
-      RIGHT_SEGMENT_SEPARATOR        "\UE0B2" # 
-      ROOT_ICON                      "\U26A1" # ⚡
+      LEFT_SEGMENT_SEPARATOR         "\uE0B0" # 
+      RIGHT_SEGMENT_SEPARATOR        "\uE0B2" # 
+      ROOT_ICON                      "\u26A1" # ⚡
       RUBY_ICON                      ''
       AWS_ICON                       "AWS:"
-      BACKGROUND_JOBS_ICON           "\U2699" # ⚙
+      BACKGROUND_JOBS_ICON           "\u2699" # ⚙
       TEST_ICON                      ''
-      OK_ICON                        "\U2713" # ✓
-      FAIL_ICON                      "\U2718" # ✘
+      OK_ICON                        "\u2713" # ✓
+      FAIL_ICON                      "\u2718" # ✘
       SYMFONY_ICON                   "SF"
-      NODE_ICON                      $'\U2B22' # ⬢
-      MULTILINE_FIRST_PROMPT_PREFIX  $'\U256D'$'\U2500'
-      MULTILINE_SECOND_PROMPT_PREFIX $'\U2570'$'\U2500 '
+      NODE_ICON                      $'\u2B22' # ⬢
+      MULTILINE_FIRST_PROMPT_PREFIX  $'\u256D'$'\u2500'
+      MULTILINE_SECOND_PROMPT_PREFIX $'\u2570'$'\u2500 '
       APPLE_ICON                     'OSX'
       FREEBSD_ICON                   'BSD'
       LINUX_ICON                     'Lx'
       SUNOS_ICON                     'Sun'
       VCS_UNTRACKED_ICON             '?'
-      VCS_UNSTAGED_ICON              "\U25CF" # ●
-      VCS_STAGED_ICON                "\U271A" # ✚
-      VCS_STASH_ICON                 "\U235F" # ⍟
-      VCS_INCOMING_CHANGES           "\U2193" # ↓
-      VCS_OUTGOING_CHANGES           "\U2191" # ↑
+      VCS_UNSTAGED_ICON              "\u25CF" # ●
+      VCS_STAGED_ICON                "\u271A" # ✚
+      VCS_STASH_ICON                 "\u235F" # ⍟
+      VCS_INCOMING_CHANGES_ICON      "\u2193" # ↓
+      VCS_OUTGOING_CHANGES_ICON      "\u2191" # ↑
       VCS_TAG_ICON                   ''
-      VCS_BOOKMARK_ICON              "\U263F" # ☿
+      VCS_BOOKMARK_ICON              "\u263F" # ☿
       VCS_COMMIT_ICON                ''
-      VCS_BRANCH_ICON                "\UE0A0 " # 
-      VCS_REMOTE_BRANCH_ICON         "\U2192" # →
+      VCS_BRANCH_ICON                "\uE0A0 " # 
+      VCS_REMOTE_BRANCH_ICON         "\u2192" # →
       VCS_GIT_ICON                   ""
       VCS_HG_ICON                    ""
     )
@@ -139,8 +139,8 @@ case $POWERLEVEL9K_MODE in
     icons[RIGHT_SEGMENT_SEPARATOR]=''
   ;;
   'compatible')
-    icons[LEFT_SEGMENT_SEPARATOR]="\U2B80" # ⮀
-    icons[RIGHT_SEGMENT_SEPARATOR]="\U2B82" # ⮂
+    icons[LEFT_SEGMENT_SEPARATOR]="\u2B80" # ⮀
+    icons[RIGHT_SEGMENT_SEPARATOR]="\u2B82" # ⮂
     icons[VCS_BRANCH_ICON]='@'
   ;;
 esac
@@ -358,12 +358,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)
-    (( $ahead )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$VCS_OUTGOING_CHANGES${ahead// /}%f" )
+    (( $ahead )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_OUTGOING_CHANGES_ICON')${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)
-    (( $behind )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$VCS_INCOMING_CHANGES${behind// /}%f" )
+    (( $behind )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_INCOMING_CHANGES_ICON')${behind// /}%f" )
 
     hook_com[misc]+=${(j::)gitstatus}
 }

From b443c9be4a718a0b2d59902eb162c3906ee38735 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 26 Aug 2015 17:24:23 +0200
Subject: [PATCH 17/24] Moved `print_icon` to top in its own section "utility
 functions".

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index ae9da42a..b7b7858f 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -44,6 +44,21 @@
 #zstyle ':vcs_info:*+*:*' debug true
 #set -o xtrace
 
+################################################################
+# Utility functions
+################################################################
+
+function print_icon() {
+  local icon_name=$1
+  local ICON_USER_VARIABLE=POWERLEVEL9K_${icon_name}
+  local USER_ICON=${(P)ICON_USER_VARIABLE}
+  if [[ -n "$USER_ICON" ]]; then
+    echo -n $USER_ICON
+  else
+    echo -n ${icons[$icon_name]}
+  fi
+}
+
 ################################################################
 # Icons
 ################################################################
@@ -190,17 +205,6 @@ if [[ "$OS" == 'OSX' ]]; then
   fi
 fi
 
-function print_icon() {
-  local icon_name=$1
-  local ICON_USER_VARIABLE=POWERLEVEL9K_${icon_name}
-  local USER_ICON=${(P)ICON_USER_VARIABLE}
-  if [[ -n "$USER_ICON" ]]; then
-    echo -n $USER_ICON
-  else
-    echo -n ${icons[$icon_name]}
-  fi
-}
-
 ################################################################
 # color scheme
 ################################################################

From 7535f62746c9d172d14adfe437a8573e682a12da Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 26 Aug 2015 17:35:25 +0200
Subject: [PATCH 18/24] Added a new Icon to the dir-segment.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index b7b7858f..56ecb611 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -90,6 +90,7 @@ case $POWERLEVEL9K_MODE in
       FREEBSD_ICON                   $'\U1F608 ' # 😈
       LINUX_ICON                     $'\U1F427 ' # 🐧
       SUNOS_ICON                     $'\U1F31E ' # 🌞
+      HOME_ICON                      $'\UE12C' # 
       VCS_UNTRACKED_ICON             "\UE16C" # 
       VCS_UNSTAGED_ICON              "\UE17C" # 
       VCS_STAGED_ICON                "\UE168" # 
@@ -130,6 +131,7 @@ case $POWERLEVEL9K_MODE in
       FREEBSD_ICON                   'BSD'
       LINUX_ICON                     'Lx'
       SUNOS_ICON                     'Sun'
+      HOME_ICON                      ''
       VCS_UNTRACKED_ICON             '?'
       VCS_UNSTAGED_ICON              "\u25CF" # ●
       VCS_STAGED_ICON                "\u271A" # ✚
@@ -506,7 +508,7 @@ prompt_dir() {
 
   fi
 
-  $1_prompt_segment "$0" "blue" "$DEFAULT_COLOR" "$current_path"
+  $1_prompt_segment "$0" "blue" "$DEFAULT_COLOR" "$(print_icon 'HOME_ICON') $current_path"
 }
 
 # Command number (in local history)

From f42242d34cfdb106be4ab16736b1ec4aa4bdbbed Mon Sep 17 00:00:00 2001
From: John Koelndorfer <jkoelndorfer@gmail.com>
Date: Tue, 1 Sep 2015 17:18:09 -0500
Subject: [PATCH 19/24] Implement defined, set_default functions.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 56ecb611..ec8a859a 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -48,6 +48,14 @@
 # Utility functions
 ################################################################
 
+# Exits with 0 if a variable has been previously defined (even if empty)
+# Takes the name of a variable that should be checked.
+function defined() {
+  local varname="$1"
+
+  typeset -p "$varname" > /dev/null 2>&1
+}
+
 function print_icon() {
   local icon_name=$1
   local ICON_USER_VARIABLE=POWERLEVEL9K_${icon_name}
@@ -59,6 +67,18 @@ function print_icon() {
   fi
 }
 
+# Given the name of a variable and a default value, sets the variable
+# value to the default only if it has not been defined.
+#
+# typeset cannot set the value for an array, so this will only work
+# for scalar values.
+function set_default() {
+  local varname="$1"
+  local default_value="$2"
+
+  defined "$varname" || typeset -g "$varname"="$default_value"
+}
+
 ################################################################
 # Icons
 ################################################################

From b19de85c1622f4c3663f265226b7fb383160099d Mon Sep 17 00:00:00 2001
From: John Koelndorfer <jkoelndorfer@gmail.com>
Date: Tue, 1 Sep 2015 18:17:55 -0500
Subject: [PATCH 20/24] Use set_default to set VCS foreground and dark
 foreground.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index ec8a859a..0260285f 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -241,16 +241,8 @@ else
   DEFAULT_COLOR_DARK="236"
 fi
 
-VCS_FOREGROUND_COLOR=$DEFAULT_COLOR
-VCS_FOREGROUND_COLOR_DARK=$DEFAULT_COLOR_DARK
-
-# 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
+set_default POWERLEVEL9K_VCS_FOREGROUND "$DEFAULT_COLOR"
+set_default POWERLEVEL9K_VCS_DARK_FOREGROUND "$DEFAULT_COLOR_DARK"
 
 ################################################################
 # VCS Information Settings
@@ -268,20 +260,20 @@ if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
     VCS_CHANGESET_HASH_LENGTH="$POWERLEVEL9K_CHANGESET_HASH_LENGTH"
   fi
 
-  VCS_CHANGESET_PREFIX="%F{$VCS_FOREGROUND_COLOR_DARK}$(print_icon 'VCS_COMMIT_ICON')%0.$VCS_CHANGESET_HASH_LENGTH""i%f "
+  VCS_CHANGESET_PREFIX="%F{$POWERLEVEL9K_VCS_DARK_FOREGROUND}$(print_icon 'VCS_COMMIT_ICON')%0.$VCS_CHANGESET_HASH_LENGTH""i%f "
 fi
 
 zstyle ':vcs_info:*' enable git hg
 zstyle ':vcs_info:*' check-for-changes true
 
-VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%F{$VCS_FOREGROUND_COLOR}%b%c%u%m%f"
-zstyle ':vcs_info:git:*' formats "%F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_GIT_ICON')%f$VCS_DEFAULT_FORMAT"
-zstyle ':vcs_info:hg:*' formats "%F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_HG_ICON')%f$VCS_DEFAULT_FORMAT"
+VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%F{$POWERLEVEL9K_VCS_FOREGROUND}%b%c%u%m%f"
+zstyle ':vcs_info:git:*' formats "%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_GIT_ICON')%f$VCS_DEFAULT_FORMAT"
+zstyle ':vcs_info:hg:*' formats "%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_HG_ICON')%f$VCS_DEFAULT_FORMAT"
 
 zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%f"
 
-zstyle ':vcs_info:*' stagedstr " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_STAGED_ICON')%f"
-zstyle ':vcs_info:*' unstagedstr " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_UNSTAGED_ICON')%f"
+zstyle ':vcs_info:*' stagedstr " %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_STAGED_ICON')%f"
+zstyle ':vcs_info:*' unstagedstr " %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_UNSTAGED_ICON')%f"
 
 zstyle ':vcs_info:git*+set-message:*' hooks vcs-detect-changes git-untracked git-aheadbehind git-stash git-remotebranch git-tagname
 zstyle ':vcs_info:hg*+set-message:*' hooks vcs-detect-changes
@@ -394,14 +386,14 @@ prompt_vcs() {
       $1_prompt_segment "$0" "green" "$DEFAULT_COLOR"
     fi
 
-    echo -n "%F{$VCS_FOREGROUND_COLOR}%f$vcs_prompt "
+    echo -n "%F{$POWERLEVEL9K_VCS_FOREGROUND}%f$vcs_prompt "
   fi
 }
 
 function +vi-git-untracked() {
     if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' && \
             -n $(git ls-files --others --exclude-standard | sed q) ]]; then
-        hook_com[unstaged]+=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_UNTRACKED_ICON')%f"
+        hook_com[unstaged]+=" %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_UNTRACKED_ICON')%f"
     fi
 }
 
@@ -414,12 +406,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)
-    (( $ahead )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_OUTGOING_CHANGES_ICON')${ahead// /}%f" )
+    (( $ahead )) && gitstatus+=( " %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_OUTGOING_CHANGES_ICON')${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)
-    (( $behind )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_INCOMING_CHANGES_ICON')${behind// /}%f" )
+    (( $behind )) && gitstatus+=( " %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_INCOMING_CHANGES_ICON')${behind// /}%f" )
 
     hook_com[misc]+=${(j::)gitstatus}
 }
@@ -431,12 +423,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{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_BRANCH_ICON')${hook_com[branch]}%f"
+    hook_com[branch]="%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_BRANCH_ICON')${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{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_REMOTE_BRANCH_ICON')%f%F{$VCS_FOREGROUND_COLOR}${remote// /}%f"
+        hook_com[branch]+="%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_REMOTE_BRANCH_ICON')%f%F{$POWERLEVEL9K_VCS_FOREGROUND}${remote// /}%f"
     fi
 }
 
@@ -444,7 +436,7 @@ function +vi-git-tagname() {
     local tag
 
     tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
-    [[ -n "${tag}" ]] && hook_com[branch]=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_TAG_ICON')${tag}%f"
+    [[ -n "${tag}" ]] && hook_com[branch]=" %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_TAG_ICON')${tag}%f"
 }
 
 # Show count of stashed changes
@@ -454,13 +446,13 @@ 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{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_STASH_ICON')${stashes// /}%f"
+    hook_com[misc]+=" %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_STASH_ICON')${stashes// /}%f"
   fi
 }
 
 function +vi-hg-bookmarks() {
   if [[ -n "${hgbmarks[@]}" ]]; then
-    hook_com[hg-bookmark-string]=" %F{$VCS_FOREGROUND_COLOR}$(print_icon 'VCS_BOOKMARK_ICON')${hgbmarks[@]}%f"
+    hook_com[hg-bookmark-string]=" %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_BOOKMARK_ICON')${hgbmarks[@]}%f"
 
     # And to signal, that we want to use the sting we just generated,
     # set the special variable `ret' to something other than the default

From 893bfe243d853ccb63efb4144f9d91a5c20a0160 Mon Sep 17 00:00:00 2001
From: John Koelndorfer <jkoelndorfer@gmail.com>
Date: Tue, 1 Sep 2015 18:33:59 -0500
Subject: [PATCH 21/24] Use defined to set right, left prompt elements.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 0260285f..d5f77148 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -669,9 +669,7 @@ prompt_virtualenv() {
 
 # Main prompt
 build_left_prompt() {
-  if [[ "${#POWERLEVEL9K_LEFT_PROMPT_ELEMENTS}" == 0 ]]; then
-    POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
-  fi
+  defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
 
   for element in $POWERLEVEL9K_LEFT_PROMPT_ELEMENTS; do
     prompt_$element "left"
@@ -684,9 +682,7 @@ build_left_prompt() {
 build_right_prompt() {
   RETVAL=$?
 
-  if [[ "${#POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS}" == 0 ]]; then
-    POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(longstatus history time)
-  fi
+  defined POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS || POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(longstatus history time)
 
   for element in $POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS; do
     prompt_$element "right"

From 378b910af695ab641c3b448339d8d79b7a15acd7 Mon Sep 17 00:00:00 2001
From: John Koelndorfer <jkoelndorfer@gmail.com>
Date: Tue, 1 Sep 2015 18:55:14 -0500
Subject: [PATCH 22/24] Use defined to check if ICON_USER_VARIABLE is defined.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index d5f77148..3b89b1df 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -60,7 +60,7 @@ function print_icon() {
   local icon_name=$1
   local ICON_USER_VARIABLE=POWERLEVEL9K_${icon_name}
   local USER_ICON=${(P)ICON_USER_VARIABLE}
-  if [[ -n "$USER_ICON" ]]; then
+  if defined "$ICON_USER_VARIABLE"; then
     echo -n $USER_ICON
   else
     echo -n ${icons[$icon_name]}

From 6e4d24f50da4bacdaa56afb89b16472d6521697f Mon Sep 17 00:00:00 2001
From: Ben Hilburn <ben.hilburn@ettus.com>
Date: Thu, 3 Sep 2015 12:33:18 -0700
Subject: [PATCH 23/24] Theme code: Cleanup of comments

---
 powerlevel9k.zsh-theme | 72 ++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 44 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 2390438e..974273e7 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -12,35 +12,11 @@
 
 ################################################################
 # Please see the README file located in the source repository for full docs.
-# What follows is a brief list of the settings variables used by this theme.
-# You should define these variables in your `~/.zshrc`.
-#
-# Customize which segments appear in which prompts (below is also the default):
-#   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
-#   POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status history time)
-#
-# Set your Amazon Web Services profile for the `aws` segment:
-#   export AWS_DEFAULT_PROFILE=<profile_name>
-#
-# Set your username for the `context` segment:
-#   export DEFAULT_USER=<your username>
-#
-# Customize the format of the time segment. Example of reverse format:
-#   POWERLEVEL9K_TIME_FORMAT='%D{%S:%M:%H}'
-#
-# Show the hash/changeset string in the `vcs` segment:
-#   POWERLEVEL9K_SHOW_CHANGESET=true
-# Set the length of the hash/changeset if enabled in the `vcs` segment:
-#   POWERLEVEL9K_CHANGESET_HASH_LENGTH=6
-#
-# Make powerlevel9k a double-lined prompt:
-#   POWERLEVEL9K_PROMPT_ON_NEWLINE=true
-#
-# Set the colorscheme:
-#   POWERLEVEL9K_COLOR_SCHEME='light'
+# There are a lot of easy ways you can customize your prompt segments and
+# theming with simple variables defined in your `~/.zshrc`.
 ################################################################
 
-## Debugging
+## Turn on for Debugging
 #zstyle ':vcs_info:*+*:*' debug true
 #set -o xtrace
 
@@ -56,6 +32,8 @@ function defined() {
   typeset -p "$varname" > /dev/null 2>&1
 }
 
+# Safety function for printing icons
+# Prints the named icon, or if that icon is undefined, the string name.
 function print_icon() {
   local icon_name=$1
   local ICON_USER_VARIABLE=POWERLEVEL9K_${icon_name}
@@ -70,7 +48,7 @@ function print_icon() {
 # Given the name of a variable and a default value, sets the variable
 # value to the default only if it has not been defined.
 #
-# typeset cannot set the value for an array, so this will only work
+# Typeset cannot set the value for an array, so this will only work
 # for scalar values.
 function set_default() {
   local varname="$1"
@@ -83,10 +61,12 @@ function set_default() {
 # Icons
 ################################################################
 
-# These characters require the Powerline fonts to work properly. If see boxes or
-# bizarre characters below, your fonts are not correctly installed. If you
-# do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
+# These characters require the Powerline fonts to work properly. If you see
+# boxes or bizarre characters below, your fonts are not correctly installed. If
+# you do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
 # `compatible`. This shows all icons in regular symbols.
+
+# Initialize the icon list according to the user's `POWERLEVEL9K_MODE`.
 typeset -gAH icons
 case $POWERLEVEL9K_MODE in
   'flat'|'awesome-patched')
@@ -169,7 +149,7 @@ case $POWERLEVEL9K_MODE in
   ;;
 esac
 
-# Second switch for overrides
+# Override the above icon settings with any user-defined variables.
 case $POWERLEVEL9K_MODE in
   'flat')
     icons[LEFT_SEGMENT_SEPARATOR]=''
@@ -219,6 +199,8 @@ case $(uname) in
 esac
 
 # Determine the correct sed parameter.
+#
+# `sed` is unfortunately not consistent across OSes when it comes to flags.
 SED_EXTENDED_REGEX_PARAMETER="-r"
 if [[ "$OS" == 'OSX' ]]; then
   local IS_BSD_SED=$(sed --version &>> /dev/null || echo "BSD sed")
@@ -228,7 +210,7 @@ if [[ "$OS" == 'OSX' ]]; then
 fi
 
 ################################################################
-# color scheme
+# Color Scheme
 ################################################################
 
 if [[ "$POWERLEVEL9K_COLOR_SCHEME" == "light" ]]; then
@@ -291,6 +273,14 @@ fi
 
 ################################################################
 # Prompt Segment Constructors
+#
+# Methodology behind user-defined variables overwriting colors:
+#     The first parameter to the segment constructors is the calling function's
+#     name.  From this function name, we strip the "prompt_"-prefix and
+#     uppercase it.  This is then prefixed with "POWERLEVEL9K_" and suffixed
+#     with either "_BACKGROUND" or "_FOREGROUND", thus giving us the variable
+#     name. So each new segment is user-overwritable by a variable following
+#     this naming convention.
 ################################################################
 
 # The `CURRENT_BG` variable is used to remember what the last BG color used was
@@ -308,11 +298,6 @@ CURRENT_BG='NONE'
 # The latter three can be omitted,
 left_prompt_segment() {
   # 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
@@ -336,7 +321,7 @@ left_prompt_segment() {
   [[ -n $4 ]] && echo -n "$4 "
 }
 
-# End the left prompt, closing any open segments
+# End the left prompt, closes the final segment.
 left_prompt_end() {
   if [[ -n $CURRENT_BG ]]; then
     echo -n "%{%k%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')"
@@ -374,7 +359,7 @@ right_prompt_segment() {
 }
 
 ################################################################
-# The 'vcs' Segment and VCS_INFO hooks / helper functions
+# The `vcs` Segment and VCS_INFO hooks / helper functions
 ################################################################
 prompt_vcs() {
   local vcs_prompt="${vcs_info_msg_0_}"
@@ -454,9 +439,8 @@ function +vi-hg-bookmarks() {
   if [[ -n "${hgbmarks[@]}" ]]; then
     hook_com[hg-bookmark-string]=" %F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_BOOKMARK_ICON')${hgbmarks[@]}%f"
 
-    # 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:
+    # 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
@@ -471,7 +455,7 @@ function +vi-vcs-detect-changes() {
 }
 
 ################################################################
-# Prompt Segments
+# Prompt Segment Definitions
 ################################################################
 
 # The `CURRENT_BG` variable is used to remember what the last BG color used was

From c72cfb155a7d486c69d6376c4e4383796c225ca3 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 4 Sep 2015 17:20:00 +0200
Subject: [PATCH 24/24] Display a warning message, if the terminal supports
 less than 256 colors.

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

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 974273e7..abaaa983 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -676,6 +676,14 @@ build_right_prompt() {
 }
 
 powerlevel9k_init() {
+  # Display a warning, if the terminal does not support 256 colors
+  local term_colors
+  term_colors=$(tput colors)
+  if (( $term_colors < 256 )); then
+    print -P "%F{red}WARNING!%f Your terminal supports less than 256 colors!"
+    print "You should set TERM=xterm-256colors in your ~/.zshrc"
+  fi
+
   setopt LOCAL_OPTIONS
   unsetopt XTRACE KSH_ARRAYS
   prompt_opts=(cr percent subst)