Updated remaining templates to handlebars