Update template block vars for 3.1