Merge "The lights go down on dark theme" into nyc-dev