Tweaks to color formatting in lots of places