diff --git a/theme/templates/macros/renderers.html b/theme/templates/macros/renderers.html
index 7bf4d293735a9974bc815c093ff20c4365d41fa7..56775135ace19daeca07ec346a620d50f3ef444a 100644
--- a/theme/templates/macros/renderers.html
+++ b/theme/templates/macros/renderers.html
@@ -13,9 +13,7 @@
 
 {%- macro section_tag(s, lang) -%}
 	{%- if s.title is not defined -%}
-		<header>
-			<h2 {% if s.id is defined -%}id="{{ s.id }}"{%- endif %}>{{ common.softbreak_span(s.tag.title) }}</h2>
-		</header>
+		{{ common.render_header(s.tag.title, 2, {"id": s.id}, lang) }}
 	{%- endif -%}
 	{{ cards.cards_from_pages(s.tag.pages, lang, max=s.num|d(None)) }}
 	
@@ -26,9 +24,7 @@
 
 {%- macro section(s, lang) -%}
 	{%- if s.title is defined -%}
-		<header>
-			<h2 {% if s.id is defined -%}id="{{ s.id }}"{%- endif %}>{{ common.softbreak_span(s.title[lang]) }}</h2>
-		</header>
+		{{ common.render_header(s.title[lang], 2, {"id": s.id}, lang) }}
 	{%- endif -%}
 	{%- if s.type == "news" -%}
 		{{ section_news(s, lang) }}