Templates: update to latest templates