Fix all the templates!