Some of the templates where not correct (6 & 11) Fixed them.