Update templates and style