Clean up rules + add twig specific ones