Updated templates and config files