Merge "Refactor Settings theme colors." into nyc-mr1-dev