updated settings files and mis-merged templates.js