Major revisions to again allow in file handlebars templates