Applying new template rules.
Moving all analyses to new style and new convention for variable escpaing in jinja.