Improved theme color utilization.

Test: n/a
Bug: 67043057
Change-Id: I33697797e761ab7daecc5722f99952c2dd74bf7f
4 files changed