Refactor templates to use a base template.
Remembered to actually add the base template. :neutral_face: