upgrade to 7.21 and add twig support

Semi useful security update and twig.