Added missing template files and more templating...