Color Tweaks

Change-Id: I6d8643fb4c058b40cbc3f60c143967de311c71bc