Update templates

Closes #53