Fixing some overlooked templates and manage files.