All: update against templates (2.0)