I'm now using `$fish_color_normal` as well as the other suggested improvement.