added twig and themes support