Templates: update (master)