More work updating some of the template files