Converting more templates to Combyne