Upgrade to New CodeKit