From e8504ac49a7cfd0f3bd979631091cf30f7ecbb89 Mon Sep 17 00:00:00 2001
From: Eric Nielsen <eric@amalgamar.com.br>
Date: Wed, 18 Dec 2019 21:07:30 -0500
Subject: [PATCH] Replace %{$fg[color]%} by %F{color} in themes

that only change the foreground color. %F works at least since Zsh 4.3.
---
 themes/alanpeabody.zsh-theme          | 28 +++++++++---------
 themes/arrow.zsh-theme                |  4 +--
 themes/crunch.zsh-theme               | 20 ++++++-------
 themes/dallas.zsh-theme               | 20 ++++++-------
 themes/daveverwer.zsh-theme           |  6 ++--
 themes/dpoggi.zsh-theme               | 18 ++++++------
 themes/funky.zsh-theme                |  6 ++--
 themes/geoffgarside.zsh-theme         |  6 ++--
 themes/humza.zsh-theme                |  6 ++--
 themes/imajes.zsh-theme               |  2 +-
 themes/itchy.zsh-theme                | 14 ++++-----
 themes/kardan.zsh-theme               |  4 +--
 themes/kphoen.zsh-theme               | 22 +++++++-------
 themes/lambda.zsh-theme               |  6 ++--
 themes/maran.zsh-theme                |  6 ++--
 themes/miloshadzic.zsh-theme          |  8 ++---
 themes/norm.zsh-theme                 | 10 +++----
 themes/pygmalion-virtualenv.zsh-theme | 12 ++++----
 themes/sammy.zsh-theme                |  2 +-
 themes/theunraveler.zsh-theme         | 16 +++++-----
 themes/wedisagree.zsh-theme           | 42 +++++++++++++--------------
 21 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody.zsh-theme
index 1de90e57b..0c532f2ac 100644
--- a/themes/alanpeabody.zsh-theme
+++ b/themes/alanpeabody.zsh-theme
@@ -1,24 +1,24 @@
 
-local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
-local pwd='%{$fg[blue]%}%~%{$reset_color%}'
-local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
-local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
+local user='%F{magenta}%n@%F{magenta}%m%f'
+local pwd='%F{blue}%~%f'
+local return_code='%(?..%F{red}%? ↵%f)'
+local git_branch='$(git_prompt_status)%f$(git_prompt_info)%f'
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{green}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+ZSH_THEME_GIT_PROMPT_ADDED="%F{green} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭"
 
-ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[green]%}‹"
-ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
+ZSH_THEME_RUBY_PROMPT_PREFIX="%F{green}‹"
+ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
 
 PROMPT="${user} ${pwd}$ "
 RPROMPT="${return_code} ${git_branch} \$(ruby_prompt_info)"
diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
index a3e77d65d..c3df77aec 100644
--- a/themes/arrow.zsh-theme
+++ b/themes/arrow.zsh-theme
@@ -1,7 +1,7 @@
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
 
-PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
-RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
+PROMPT='%F{$NCOLOR}%c ➤ %f'
+RPROMPT='%F{$NCOLOR}%p $(git_prompt_info)%f'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
index 8278661ab..6ef3b0b9b 100644
--- a/themes/crunch.zsh-theme
+++ b/themes/crunch.zsh-theme
@@ -13,13 +13,13 @@
 # Colors are at the top so you can mess with those separately if you like.
 # For the most part I stuck with Dallas's.
 
-CRUNCH_BRACKET_COLOR="%{$fg[white]%}"
-CRUNCH_TIME_COLOR="%{$fg[yellow]%}"
-CRUNCH_RVM_COLOR="%{$fg[magenta]%}"
-CRUNCH_DIR_COLOR="%{$fg[cyan]%}"
-CRUNCH_GIT_BRANCH_COLOR="%{$fg[green]%}"
-CRUNCH_GIT_CLEAN_COLOR="%{$fg[green]%}"
-CRUNCH_GIT_DIRTY_COLOR="%{$fg[red]%}"
+CRUNCH_BRACKET_COLOR="%F{white}"
+CRUNCH_TIME_COLOR="%F{yellow}"
+CRUNCH_RVM_COLOR="%F{magenta}"
+CRUNCH_DIR_COLOR="%F{cyan}"
+CRUNCH_GIT_BRANCH_COLOR="%F{green}"
+CRUNCH_GIT_CLEAN_COLOR="%F{green}"
+CRUNCH_GIT_DIRTY_COLOR="%F{red}"
 
 # These Git variables are used by the oh-my-zsh git_prompt_info helper:
 ZSH_THEME_GIT_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR:$CRUNCH_GIT_BRANCH_COLOR"
@@ -28,12 +28,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN=" $CRUNCH_GIT_CLEAN_COLOR✓"
 ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
 
 # Our elements:
-CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
+CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%f"
 ZSH_THEME_RUBY_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR"
-ZSH_THEME_RUBY_PROMPT_SUFFIX="$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
+ZSH_THEME_RUBY_PROMPT_SUFFIX="$CRUNCH_BRACKET_COLOR"]"%f"
 CRUNCH_RVM_='$(ruby_prompt_info)'
 CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
 CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
 
 # Put it all together!
-PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%{$reset_color%}"
+PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%f"
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
index d6c417fc3..6f17c1a0b 100644
--- a/themes/dallas.zsh-theme
+++ b/themes/dallas.zsh-theme
@@ -1,27 +1,27 @@
 # Personalized!
 
 # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
-DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
+DALLAS_CURRENT_TIME_="%F{white}{%F{yellow}%D %T%F{white}}%f"
 # Grab the current machine name: muscato
-DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
+DALLAS_CURRENT_MACH_="%F{green}%m%F{white}:%f"
 # Grab the current filepath, use shortcuts: ~/Desktop
 # Append the current git branch, if in a git repository: ~aw@master
-DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)"
+DALLAS_CURRENT_LOCA_="%F{cyan}%~\$(git_prompt_info)%f\$(parse_git_dirty)"
 # Grab the current username: dallas
-DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
+DALLAS_CURRENT_USER_="%F{red}%n%f"
 # Use a % for normal users and a # for privelaged (root) users.
-DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
+DALLAS_PROMPT_CHAR_="%F{white}%(!.#.%%)%f"
 # For the git prompt, use a white @ and blue text for the branch name
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{white}@%F{blue}"
 # Close it all off by resetting the color and styles.
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 # Do nothing if the branch is clean (no changes).
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 # Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗"
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{cyan}✗✗✗"
 
-ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[white]%}[%{$fg[magenta]%}"
-ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$fg[white]%}]%{$reset_color%}"
+ZSH_THEME_RUBY_PROMPT_PREFIX="%F{white}[%F{magenta}"
+ZSH_THEME_RUBY_PROMPT_SUFFIX="%F{white}]%f"
 
 # Put it all together!
 PROMPT="$DALLAS_CURRENT_TIME_\$(ruby_prompt_info)$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ "
diff --git a/themes/daveverwer.zsh-theme b/themes/daveverwer.zsh-theme
index 89aef926e..1553a5015 100644
--- a/themes/daveverwer.zsh-theme
+++ b/themes/daveverwer.zsh-theme
@@ -1,7 +1,7 @@
 # Copied and modified from the oh-my-zsh theme from geoffgarside
 # Red server name, green cwd, blue git status
 
-PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
+PROMPT='%F{red}%m%f:%F{green}%c%f$(git_prompt_info) %(!.#.$) '
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" %F{blue}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
diff --git a/themes/dpoggi.zsh-theme b/themes/dpoggi.zsh-theme
index 6469a2009..5c3383b7d 100644
--- a/themes/dpoggi.zsh-theme
+++ b/themes/dpoggi.zsh-theme
@@ -1,14 +1,14 @@
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
-local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+local return_code="%(?..%F{red}%? ↵%f)"
 
-PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\
-%{$reset_color%}:%{$fg[magenta]%}%~\
+PROMPT='%F{$NCOLOR}%n%f@%F{cyan}%m\
+%f:%F{magenta}%~\
 $(git_prompt_info) \
-%{$fg[red]%}%(!.#.»)%{$reset_color%} '
-PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+%F{red}%(!.#.»)%f '
+PROMPT2='%F{red}\ %f'
 RPS1='${return_code}'
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}○%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}⚡%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%})%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}("
+ZSH_THEME_GIT_PROMPT_CLEAN="%F{green}○%f"
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{red}⚡%f"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%F{yellow})%f"
diff --git a/themes/funky.zsh-theme b/themes/funky.zsh-theme
index 574538f88..3dec2353d 100644
--- a/themes/funky.zsh-theme
+++ b/themes/funky.zsh-theme
@@ -1,13 +1,13 @@
 # Taken from Tassilo's Blog
 # https://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/
 
-local blue_op="%{$fg[blue]%}[%{$reset_color%}"
-local blue_cp="%{$fg[blue]%}]%{$reset_color%}"
+local blue_op="%F{blue}[%f"
+local blue_cp="%F{blue}]%f"
 local path_p="${blue_op}%~${blue_cp}"
 local user_host="${blue_op}%n@%m${blue_cp}"
 local ret_status="${blue_op}%?${blue_cp}"
 local hist_no="${blue_op}%h${blue_cp}"
-local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})"
+local smiley="%(?,%F{green}:%)%f,%F{red}:(%f)"
 PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no}
 ╰─${blue_op}${smiley}${blue_cp} %# "
 local cur_cmd="${blue_op}%_${blue_cp}"
diff --git a/themes/geoffgarside.zsh-theme b/themes/geoffgarside.zsh-theme
index 675ec7206..2a7c7de07 100644
--- a/themes/geoffgarside.zsh-theme
+++ b/themes/geoffgarside.zsh-theme
@@ -1,5 +1,5 @@
 # PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) "
-PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
+PROMPT='[%*] %F{cyan}%n%f:%F{green}%c%f$(git_prompt_info) %(!.#.$) '
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}git:("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" %F{yellow}git:("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
diff --git a/themes/humza.zsh-theme b/themes/humza.zsh-theme
index 107886295..0bb0249c9 100644
--- a/themes/humza.zsh-theme
+++ b/themes/humza.zsh-theme
@@ -20,7 +20,7 @@ else
    suffix="Gb"
 fi
 
-PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) greetings, earthling %{$fg[green]%}[%{$reset_color%}%{$TotalSize%}%{$suffix%}%{$fg[green]%}]%{$fg[red]%}$%{$reset_color%} ☞ '
+PROMPT='%f%n %F{green}{%f%~%F{green}}%f$(git_prompt_info) greetings, earthling %F{green}[%f%{$TotalSize%}%{$suffix%}%F{green}]%F{red}$%f ☞ '
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}±("
-ZSH_THEME_GIT_PROMPT_SUFFIX=");%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{red}±("
+ZSH_THEME_GIT_PROMPT_SUFFIX=");%f"
diff --git a/themes/imajes.zsh-theme b/themes/imajes.zsh-theme
index 88c35b6d9..61964a62f 100644
--- a/themes/imajes.zsh-theme
+++ b/themes/imajes.zsh-theme
@@ -2,4 +2,4 @@
 #  http://zshwiki.org/home/config/prompt
 #
 
-PROMPT="%{$fg[red]%}%%%{$reset_color%} "
\ No newline at end of file
+PROMPT="%F{red}%%%f "
diff --git a/themes/itchy.zsh-theme b/themes/itchy.zsh-theme
index 41a42e88c..ad748577c 100644
--- a/themes/itchy.zsh-theme
+++ b/themes/itchy.zsh-theme
@@ -1,18 +1,18 @@
-local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
+local smiley="%(?,%F{green}☺%f,%F{red}☹%f)"
 
-local user="%{$fg[cyan]%}%n%{$reset_color%}"
-local host="%{$fg[cyan]%}@%m%{$reset_color%}"
-local pwd="%{$fg[yellow]%}%~%{$reset_color%}"
+local user="%F{cyan}%n%f"
+local host="%F{cyan}@%m%f"
+local pwd="%F{yellow}%~%f"
 
 PROMPT='${user}${host} ${pwd}
 ${smiley}  '
 
-RPROMPT='$(ruby_prompt_info) %{$fg[white]%}$(git_prompt_info)%{$reset_color%}'
+RPROMPT='$(ruby_prompt_info) %F{white}$(git_prompt_info)%f'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{red} ✗%f"
+ZSH_THEME_GIT_PROMPT_CLEAN="%F{green} ✔%f"
 
 ZSH_THEME_RUBY_PROMPT_PREFIX=""
 ZSH_THEME_RUBY_PROMPT_SUFFIX=""
diff --git a/themes/kardan.zsh-theme b/themes/kardan.zsh-theme
index 9a3d59109..2156da2cf 100644
--- a/themes/kardan.zsh-theme
+++ b/themes/kardan.zsh-theme
@@ -7,6 +7,6 @@ function get_host {
 PROMPT='> '
 RPROMPT='%~$(git_prompt_info)$(get_host)'
 
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}✗%f"
 ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
diff --git a/themes/kphoen.zsh-theme b/themes/kphoen.zsh-theme
index 8e8894a34..31905a41e 100644
--- a/themes/kphoen.zsh-theme
+++ b/themes/kphoen.zsh-theme
@@ -1,25 +1,25 @@
 # kphoen.zsh-theme
 
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
-    PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
+    PROMPT='[%F{red}%n%f@%F{magenta}%m%f:%F{blue}%~%f$(git_prompt_info)]
 %# '
 
-    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
-    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on %F{green}"
+    ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
     ZSH_THEME_GIT_PROMPT_DIRTY=""
     ZSH_THEME_GIT_PROMPT_CLEAN=""
 
     # display exitcode on the right when >0
-    return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+    return_code="%(?..%F{red}%? ↵%f)"
 
-    RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}'
+    RPROMPT='${return_code}$(git_prompt_status)%f'
 
-    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
-    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
-    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
-    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
-    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
-    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+    ZSH_THEME_GIT_PROMPT_ADDED="%F{green} ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue} ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta} ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow} ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭"
 else
     PROMPT='[%n@%m:%~$(git_prompt_info)]
 %# '
diff --git a/themes/lambda.zsh-theme b/themes/lambda.zsh-theme
index 6e67773ea..a0086d045 100644
--- a/themes/lambda.zsh-theme
+++ b/themes/lambda.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
+PROMPT='λ %~/ $(git_prompt_info)%f'
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{green}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
diff --git a/themes/maran.zsh-theme b/themes/maran.zsh-theme
index fddb7bc30..cc4070da5 100644
--- a/themes/maran.zsh-theme
+++ b/themes/maran.zsh-theme
@@ -1,6 +1,6 @@
 # Theme with full path names and hostname
 # Handy if you work on different servers all the time;
-PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%}$(git_prompt_info) %(!.#.$) '
+PROMPT='%F{cyan}%n%f@%F{yellow}%M:%F{green}%/%f$(git_prompt_info) %(!.#.$) '
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" %F{cyan}git:("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
diff --git a/themes/miloshadzic.zsh-theme b/themes/miloshadzic.zsh-theme
index ad5394423..a5f6f24a0 100644
--- a/themes/miloshadzic.zsh-theme
+++ b/themes/miloshadzic.zsh-theme
@@ -1,8 +1,8 @@
 # Yay! High voltage and arrows!
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%f%F{green}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-PROMPT='%{$fg[cyan]%}%1~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%} '
+PROMPT='%F{cyan}%1~%f%F{red}|%f$(git_prompt_info)%F{cyan}⇒%f '
diff --git a/themes/norm.zsh-theme b/themes/norm.zsh-theme
index bd7ca568a..e1f8efc0a 100644
--- a/themes/norm.zsh-theme
+++ b/themes/norm.zsh-theme
@@ -1,7 +1,7 @@
-PROMPT='%{$fg[yellow]%}λ %m %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)$(hg_prompt_info)%{$reset_color%}'
+PROMPT='%F{yellow}λ %m %F{green}%c %F{yellow}→ $(git_prompt_info)$(hg_prompt_info)%f'
 
-ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"
-ZSH_THEME_HG_PROMPT_PREFIX="λ %{$fg[blue]%}hg %{$fg[red]%}"
-ZSH_THEME_HG_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="λ %F{blue}git %F{red}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%F{yellow} → %f"
+ZSH_THEME_HG_PROMPT_PREFIX="λ %F{blue}hg %F{red}"
+ZSH_THEME_HG_PROMPT_SUFFIX="%F{yellow} → %f"
 
diff --git a/themes/pygmalion-virtualenv.zsh-theme b/themes/pygmalion-virtualenv.zsh-theme
index 605e3d10c..37e9016ad 100644
--- a/themes/pygmalion-virtualenv.zsh-theme
+++ b/themes/pygmalion-virtualenv.zsh-theme
@@ -5,7 +5,7 @@ function _virtualenv_prompt_info {
     if [[ -n "$(whence virtualenv_prompt_info)" ]]; then
         if [ -n "$(whence pyenv_prompt_info)" ]; then
             if [ "$1" = "inline" ]; then
-                ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=%{$fg[blue]%}"::%{$fg[red]%}"
+                ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=%F{blue}"::%F{red}"
                 ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX=""
                 virtualenv_prompt_info
             fi
@@ -17,13 +17,13 @@ function _virtualenv_prompt_info {
 }
 
 prompt_setup_pygmalion(){
-  ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-  ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
+  ZSH_THEME_GIT_PROMPT_PREFIX="%f%F{green}"
+  ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
+  ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
   ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-  base_prompt='$(_virtualenv_prompt_info)%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
-  post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
+  base_prompt='$(_virtualenv_prompt_info)%F{magenta}%n%f%F{cyan}@%f%F{yellow}%m%f%F{red}:%f%F{cyan}%0~%f%F{red}|%f'
+  post_prompt='%F{cyan}⇒%f  '
 
   base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
   post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
diff --git a/themes/sammy.zsh-theme b/themes/sammy.zsh-theme
index 52e6e4bb6..6a0820166 100644
--- a/themes/sammy.zsh-theme
+++ b/themes/sammy.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg[white]%}%c$(git_prompt_info)$ % %{$reset_color%}'
+PROMPT='%F{white}%c$(git_prompt_info)$ % %f'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler.zsh-theme
index e4bfb79c5..eed057e57 100644
--- a/themes/theunraveler.zsh-theme
+++ b/themes/theunraveler.zsh-theme
@@ -1,16 +1,16 @@
 # Comment
 
-PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
+PROMPT='%F{magenta}[%c] %f'
 
-RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
+RPROMPT='%F{magenta}$(git_prompt_info)%f $(git_prompt_status)%f'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_ADDED="%F{cyan} ✈"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%F{yellow} ✭"
+ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✗"
+ZSH_THEME_GIT_PROMPT_RENAMED="%F{blue} ➦"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%F{magenta} ✂"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{grey} ✱"
diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 07006ecd9..6abd7548b 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -21,35 +21,35 @@
 
 # The prompt
 
-PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
+PROMPT='%F{magenta}[%c] %f'
 
 # The right-hand prompt
 
-RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
+RPROMPT='${time} %F{magenta}$(git_prompt_info)%f$(git_prompt_status)%f$(git_prompt_ahead)%f'
 
 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
 # $(ruby_prompt_info) 
 
 # local time, color coded by last return code
-time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
-time_disabled="%{$fg[green]%}%*%{$reset_color%}"
+time_enabled="%(?.%F{green}.%F{red})%*%f"
+time_disabled="%F{green}%*%f"
 time=$time_enabled
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" ☁  %{$fg[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%} ☂" # Ⓓ
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" # ⓣ
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ☀" # Ⓞ
+ZSH_THEME_GIT_PROMPT_PREFIX=" ☁  %F{red}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow} ☂" # Ⓓ
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭" # ⓣ
+ZSH_THEME_GIT_PROMPT_CLEAN="%F{green} ☀" # Ⓞ
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✚" # ⓐ ⑃
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡"  # ⓜ ⑁
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊
-ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙"
+ZSH_THEME_GIT_PROMPT_ADDED="%F{cyan} ✚" # ⓐ ⑃
+ZSH_THEME_GIT_PROMPT_MODIFIED="%F{yellow} ⚡"  # ⓜ ⑁
+ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖" # ⓧ ⑂
+ZSH_THEME_GIT_PROMPT_RENAMED="%F{blue} ➜" # ⓡ ⑄
+ZSH_THEME_GIT_PROMPT_UNMERGED="%F{magenta} ♒" # ⓤ ⑊
+ZSH_THEME_GIT_PROMPT_AHEAD="%F{blue} 𝝙"
 
-ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[yellow]%}"
-ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_RUBY_PROMPT_PREFIX="%F{yellow}"
+ZSH_THEME_RUBY_PROMPT_SUFFIX="%f"
 
 # More symbols to choose from:
 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
@@ -60,7 +60,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
 function rvm_gemset() {
     GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
     if [[ -n $GEMSET ]]; then
-        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
+        echo "%F{yellow}$GEMSET%f|"
     fi 
 }
 
@@ -97,11 +97,11 @@ function git_time_since_commit() {
             fi
 
             if [ "$HOURS" -gt 24 ]; then
-                echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+                echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%f|"
             elif [ "$MINUTES" -gt 60 ]; then
-                echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+                echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%f|"
             else
-                echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
+                echo "($(rvm_gemset)$COLOR${MINUTES}m%f|"
             fi
         else
             COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"