diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index aa36cc670..edf6c733a 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -36,7 +36,7 @@ end" >$__fish_config_dir/config.fish
         # visible in whatever terminal setup.
         #
         __init_uvar fish_color_normal normal
-        __init_uvar fish_color_command blue
+        __init_uvar fish_color_command normal
         __init_uvar fish_color_param cyan
         __init_uvar fish_color_redirection cyan --bold
         __init_uvar fish_color_comment red
diff --git a/share/tools/web_config/themes/fish default.theme b/share/tools/web_config/themes/fish default.theme
index d6cacbf5e..40644b9c8 100644
--- a/share/tools/web_config/themes/fish default.theme	
+++ b/share/tools/web_config/themes/fish default.theme	
@@ -4,7 +4,7 @@
 # visible in whatever terminal setup.
 
 fish_color_normal normal
-fish_color_command blue
+fish_color_command normal
 fish_color_quote yellow
 fish_color_redirection cyan --bold
 fish_color_end green
@@ -30,6 +30,6 @@ fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
 fish_pager_color_selected_background -r
 fish_color_option cyan
-fish_color_keyword blue
+fish_color_keyword normal
 fish_color_host_remote yellow
 fish_color_status red