All: update against templates