Merge "Remove DayNight theme" into nyc-dev