Templates: update
Various: update against templates (master)