Factor and consolidate style and color names.

Change-Id: I02d344a4e5528d58e57255a31fbf127402e8ea31
2 files changed