Last minute changes to style and tpls