Moving Twig things from common lib to render lib (continue)