Updated templates to a new format.