Color Tweaks more

Change-Id: Icfbc603013e7ef36c7d2e8fecafa2862a57dba87