This takes the changes from 03b23dd1b659467c4f25b337a9aafa6910783ba2
and applies them to the .theme version as well.
(note: It's *possible* to just go through fish_config in future, but
we do not want to do that right now because that can have issues on
upgrade)
84e7fbd466