merging in latest templates.js