updated templates and config