Continuing with migration of templates into 2.0