Rewrote templates to use the newish format