More changes to tempaltes.