Templates rejig

For the most part this is just tidying up.

Although would be good to get a :+1: on 38e51e0 and a sanity check that I'm not overlooking anything with 5700243 (eg was this intentional for some reason?)