Lots of updates to templates