New templates (rapporter templates)
Template correction based on rapporter templates