Merge master (bring in flat theme)