* Added back hard coded color, but removed the color theme ones so that we don't break contrast on half the themes.