Finished migrating to new template