Merge 'bare' and 'theme-xcode' repositories