MISC update
update config
Update templates