changed color helpers, and other things