diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c2a542163..6b2c4c774 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -34,9 +34,10 @@
 
 CURRENT_BG='NONE'
 
+# Set CURRENT_FG unless already set in .zshenv
 case ${SOLARIZED_THEME:-dark} in
-    light) CURRENT_FG='white';;
-    *)     CURRENT_FG='black';;
+    light) CURRENT_FG=${CURRENT_FG:-white};;
+    *)     CURRENT_FG=${CURRENT_FG:-black};;
 esac
 
 # Special Powerline characters