Merge in old templates