diff --git a/functions/colors.zsh b/functions/colors.zsh
index 9309a225..b94258a5 100755
--- a/functions/colors.zsh
+++ b/functions/colors.zsh
@@ -50,20 +50,12 @@ function getColor() {
 
 # empty paramenter resets (stops) background color
 function backgroundColor() {
-  if [[ -z $1 ]]; then
-    echo -n "%k"
-  else
-    echo -n "%K{$(getColor $1)}"
-  fi
+  echo -n "%K{$(getColor $1)}"
 }
 
 # empty paramenter resets (stops) foreground color
 function foregroundColor() {
-  if [[ -z $1 ]]; then
-    echo -n "%f"
-  else
-    echo -n "%F{$(getColor $1)}"
-  fi
+  echo -n "%F{$(getColor $1)}"
 }
 
 # Get numerical color codes. That way we translate ANSI codes
@@ -346,12 +338,12 @@ function getColorCode() {
     if [[ "$1" == "foreground"  ]]; then
         # call via `getColorCode foreground`
         for i in "${(k@)codes}"; do
-            print -P "$(foregroundColor $i)$(getColor $i) - $i$(foregroundColor)"
+            print -P "$(foregroundColor $i)$(getColor $i) - $i%f"
         done
     elif [[ "$1" == "background"  ]]; then
         # call via `getColorCode background`
         for i in "${(k@)codes}"; do
-            print -P "$(backgroundColor $i)$(getColor $i) - $i$(backgroundColor)"
+            print -P "$(backgroundColor $i)$(getColor $i) - $i%k"
         done
     else
         #[[ -n "$1" ]] bg="%K{$1}" || bg="%k"
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 3e425c48..97bddc30 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -127,8 +127,8 @@ left_prompt_segment() {
   [[ -n $FG_COLOR_MODIFIER ]] && 4="$FG_COLOR_MODIFIER"
 
   local bg fg
-  [[ -n "$3" ]] && bg="$(backgroundColor $3)" || bg="$(backgroundColor)"
-  [[ -n "$4" ]] && fg="$(foregroundColor $4)" || fg="$(foregroundColor)"
+  [[ -n "$3" ]] && bg="$(backgroundColor $3)" || bg="%k"
+  [[ -n "$4" ]] && fg="$(foregroundColor $4)" || fg="%f"
 
   if [[ $CURRENT_BG != 'NONE' ]] && ! isSameColor "$3" "$CURRENT_BG"; then
     echo -n "$bg%F{$CURRENT_BG}"
@@ -220,8 +220,8 @@ right_prompt_segment() {
   [[ -n $FG_COLOR_MODIFIER ]] && 4="$FG_COLOR_MODIFIER"
 
   local bg fg
-  [[ -n "$3" ]] && bg="$(backgroundColor $3)" || bg="$(backgroundColor)"
-  [[ -n "$4" ]] && fg="$(foregroundColor $4)" || fg="$(foregroundColor)"
+  [[ -n "$3" ]] && bg="$(backgroundColor $3)" || bg="%k"
+  [[ -n "$4" ]] && fg="$(foregroundColor $4)" || fg="%f"
 
   # If CURRENT_RIGHT_BG is "NONE", we are the first right segment.