Updated templates with new handlebars style variables