New auto template matching now matches Twig templates