diff --git a/doc_src/cmds/fish_config.rst b/doc_src/cmds/fish_config.rst
index cbd12e703..17e499127 100644
--- a/doc_src/cmds/fish_config.rst
+++ b/doc_src/cmds/fish_config.rst
@@ -77,7 +77,7 @@ The other lines are just like ``set variable value``, except that no expansions
 
 Any color variable fish knows about that the theme doesn't set will be set to empty when it is loaded, so the old theme is completely overwritten.
 
-Other than that, .theme files can contain any variable with a name that matches the regular expression ``'^fish_(?:pager_)?color.*$'`` - starts with ``fish_``, an optional ``pager_``, then ``color`` and then anything.
+Other than that, .theme files can contain any variable with a name that matches the regular expression ``'^fish_(?:pager_)?color_.*$'`` - starts with ``fish_``, an optional ``pager_``, then ``color_`` and then anything.
 
 Example
 -------
diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
index c8215d51b..ab7d230e4 100644
--- a/share/functions/fish_config.fish
+++ b/share/functions/fish_config.fish
@@ -51,7 +51,7 @@ function fish_config --description "Launch fish's web based configuration"
     end
 
     # Variables a theme is allowed to set
-    set -l theme_var_filter '^fish_(?:pager_)?color.*$'
+    set -l theme_var_filter '^fish_(?:pager_)?color_.*$'
 
     switch $cmd
         case prompt