Jinja migration

More templates jinjafied.