Included set of templates fixed up by mario