6e7ac0544e71c7b777746cb50f70de68c6495b86

 1diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
 2index b48bac56a26d3abb99e9043a55647f2215a7e18e..adeffe8c2b6dc24bb03b4c09d1f6797213e787ba 100644
 3--- a/themes/agnoster.zsh-theme
 4+++ b/themes/agnoster.zsh-theme
 5@@ -35,8 +35,14 @@
 6 CURRENT_BG='NONE'
 7 
 8 case ${SOLARIZED_THEME:-dark} in
 9-    light) CURRENT_FG='white';;
10-    *)     CURRENT_FG='black';;
11+    light)
12+      CURRENT_FG='white'
13+      CURRENT_DEFAULT_FG='white'
14+      ;;
15+    *)
16+      CURRENT_FG='black'
17+      CURRENT_DEFAULT_FG='default'
18+      ;;
19 esac
20 
21 ### Theme Configuration Initialization
22@@ -48,7 +54,7 @@ esac
23 : ${AGNOSTER_DIR_BG:=blue}
24 
25 # user@host
26-: ${AGNOSTER_CONTEXT_FG:=white}
27+: ${AGNOSTER_CONTEXT_FG:=${CURRENT_DEFAULT_FG}}
28 : ${AGNOSTER_CONTEXT_BG:=black}
29 
30 # Git related
31@@ -85,7 +91,7 @@ esac
32 : ${AGNOSTER_STATUS_RETVAL_FG:=red}
33 : ${AGNOSTER_STATUS_ROOT_FG:=yellow}
34 : ${AGNOSTER_STATUS_JOB_FG:=cyan}
35-: ${AGNOSTER_STATUS_FG:=white}
36+: ${AGNOSTER_STATUS_FG:=${CURRENT_DEFAULT_FG}}
37 : ${AGNOSTER_STATUS_BG:=black}
38 
39 ## Non-Color settings - set to 'true' to enable