Update templates (until new system in place)
Fixes. Also new template system