update settings
update settings and add templates
reindent :|