diff --git a/zsh/colors.zsh b/zsh/colors.zsh
index e58c22f..2eb0c88 100644
--- a/zsh/colors.zsh
+++ b/zsh/colors.zsh
@@ -1,17 +1,5 @@
 autoload colors; colors
 
-# The variables are wrapped in \%\{\%\}. This should be the case for every
-# variable that does not contain space.
-for COLOR in RED GREEN YELLOW BLUE MAGENTA CYAN BLACK WHITE; do
-	eval PR_$COLOR='%{$fg_no_bold[${(L)COLOR}]%}'
-    eval PR_BOLD_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
-done
-
-eval RESET='$reset_color'
-export PR_RED PR_GREEN PR_YELLOW PR_BLUE PR_WHITE PR_BLACK
-export PR_BOLD_RED PR_BOLD_GREEN PR_BOLD_YELLOW PR_BOLD_BLUE 
-export PR_BOLD_WHITE PR_BOLD_BLACK
-
 # Clear LSCOLORS
 unset LSCOLORS
 
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 2c76672..39d3716 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -45,26 +45,26 @@ function setprompt {
     ###
     # Finally, the prompt.
 
-    PROMPT='$PR_CYAN$PR_ULCORNER$PR_BLUE$PR_HBAR(\
-$PR_MAGENTA%$PR_PWDLEN<...<%~%<<$\
-PR_BLUE)$PR_HBAR$PR_CYAN$PR_HBAR${(e)PR_FILLBAR}$PR_BLUE$PR_HBAR(\
-$PR_GREEN%n@%m$PR_BLUE\
-$PR_BLUE)$PR_HBAR$PR_CYAN$PR_URCORNER\
+    PROMPT='%F{cyan}$PR_ULCORNER%F{blue}$PR_HBAR(\
+%F{magenta}%$PR_PWDLEN<...<%~%<<\
+%F{blue})$PR_HBAR%F{cyan}$PR_HBAR${(e)PR_FILLBAR}%F{blue}$PR_HBAR(\
+%F{green}%n@%m%F{blue}\
+%F{blue})$PR_HBAR%F{cyan}$PR_URCORNER\
 
-$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
-$PR_YELLOW%D{%H:%M}\
-$PR_BLUE)$PR_HBAR$PR_CYAN$PR_HBAR\
-$PR_RESET '
+%F{cyan}$PR_LLCORNER%F{blue}$PR_HBAR(\
+%F{yellow}%D{%H:%M}\
+%F{blue})$PR_HBAR%F{cyan}$PR_HBAR\
+%f '
 
-	RPROMPT='$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR(\
-$PR_YELLOW$(show_battery)\
-$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER\
-$PR_RESET'
+	RPROMPT='%F{cyan}$PR_HBAR%F{blue}$PR_HBAR(\
+%F{yellow}$(show_battery)\
+%F{blue})$PR_HBAR%F{cyan}$PR_LRCORNER\
+%f'
 
-    PS2='$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR(\
-$PR_LIGHT_GREEN%_
-$PR_BLUE)$PR_HBAR$PR_CYAN$PR_HBAR\
-$PR_RESET '
+    PS2='%F{cyan}$PR_HBAR%F{blue}$PR_HBAR(\
+%F{green}%_
+%F{blue})$PR_HBAR%F{cyan}$PR_HBAR\
+%f '
 }
 
 setprompt