Color Tweaks and Restore to Stock Style

Change-Id: I3fb81c8248e6e42205c5a3e56fa497b886561628