Migrate to new template