Switched to using the jinja's DictLoader to manage layouts (means that blocks work)