Merge "Style/color fixes to match UX spec." into nyc-andromeda-dev