Fixed output templates (switch to mustache.js)