Color Tweaks #2

Change-Id: Idcbe125259aa71836c2b8841c33db228bc09c79b