Update dependencies
Split twig templates