Reformatting templates to reflect changes to templating in wraith