Merge "Fix a bunch of straggler themes." into nyc-mr1-dev