Made some updates to the way Twig fetches templates