WIP: Update templates

See Issue #79