The template plugin needed some love...