Merge "More theming fixes." into nyc-mr1-dev