Lots of updates to various templates.