Change templates to their own kind to prevent confusion
Release v2.0.7