diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Detail.html
index c111748a..dc5bbd45 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Detail.html
@@ -7,7 +7,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="SubpageHeader" arguments="{images: city.headerImages, topline: city.headerSubtitle, headline: city.headerTitle, settings: settings}"/>
+        <f:render partial="SubpageHeader"
+                  arguments="{images: city.headerImages, topline: city.headerSubtitle, headline: city.headerTitle, settings: settings}"/>
         <f:cObject typoscriptObjectPath="lib.breadcrumb"/>
         <div class="container">
             <f:if condition="{teasers}">
@@ -21,7 +22,8 @@
                     </button>
                 </div>
             </f:if>
-            <f:render partial="Header/Header" arguments="{layout: 8, subheader: city.name, header: city.headline}"/>
+            <f:render partial="Header/Header"
+                      arguments="{layout: 8, subheader: city.name, header: city.headline}"/>
             <div class="grid grid-cols-3 gap-8">
                 <div class="col-span-3 lg:col-span-2">
                     <f:render partial="City/Details" arguments="{city: city}"/>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html
index fc2e0e5e..cd8c2a98 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html
@@ -8,11 +8,11 @@
     <f:section name="Main">
         <ep:container data="{data}">
             <f:if condition="{teasers}">
-                <div class="container"
-                     data-controller="teasergrid"
+                <div data-controller="teasergrid"
                      data-teasergrid-grid-class="grid-cols-2"
                      data-teasergrid-disabled-value="false">
-                    <f:render partial="Header/Header" arguments="{_all}"/>
+                    <f:render partial="Header/Header"
+                              arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
                     <div class="flex items-center space-x-1 mb-2 sm:hidden">
                         <button type="button"
                                 class="opacity-50"
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
index 2f4b16d9..46d0cdd2 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
@@ -6,7 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="SubpageHeader" arguments="{images: concept.headerImages, topline: concept.headerSubtitle, headline: concept.headerTitle, settings: settings}"/>
+        <f:render partial="SubpageHeader"
+                  arguments="{images: concept.headerImages, topline: concept.headerSubtitle, headline: concept.headerTitle, settings: settings}"/>
         <f:cObject typoscriptObjectPath="lib.breadcrumb"/>
         <div class="container">
             <f:if condition="{teasers}">
@@ -20,7 +21,8 @@
                     </button>
                 </div>
             </f:if>
-            <f:render partial="Header/Header" arguments="{layout: 8, subheader: concept.name, header: concept.headline}"/>
+            <f:render partial="Header/Header"
+                      arguments="{layout: 8, subheader: concept.name, header: concept.headline}"/>
             <div class="grid grid-cols-3 gap-8">
                 <div class="col-span-3 lg:col-span-2">
                     <div data-rte-content>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html
index bf2b2fb1..347cdcbb 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html
@@ -8,7 +8,8 @@
     <f:section name="Main">
         <f:if condition="{teasers}">
             <ep:container data="{data}">
-                <f:render partial="Header/Header" arguments="{_all}"/>
+                <f:render partial="Header/Header"
+                          arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
                 <div data-controller="teasergrid"
                      data-teasergrid-grid-class="grid-cols-2"
                      data-teasergrid-disabled-value="false">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html
index 7715063f..8a69a3d2 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html
@@ -6,7 +6,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-2 gap-8">
                 <f:for each="{children_300}" as="record">
                     {record.renderedContent -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html
index a2420a0e..a8d44422 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html
@@ -6,7 +6,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-2 lg:grid-cols-4 gap-4 md:gap-8">
                 <f:for each="{children_300}" as="record">
                     {record.renderedContent -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
index e9e03205..9c00ace7 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
@@ -9,7 +9,8 @@
                  data-controller="teasergrid"
                  data-teasergrid-grid-class="grid-cols-2"
                  data-teasergrid-disabled-value="false">
-                <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
+                <f:render partial="Header/Header"
+                          arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
                 <f:if condition="{children_300}">
                     <div class="flex items-center space-x-1 mb-2 sm:hidden">
                         <button type="button"
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html
index fa534d95..f03c3358 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html
@@ -6,7 +6,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
                 <f:for each="{children_300}" as="record">
                     {record.renderedContent -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html
index dcf846ad..7e2d7938 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Country/Detail.html
@@ -7,7 +7,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="SubpageHeader" arguments="{images: country.headerImages, topline: country.headerSubtitle, headline: country.headerTitle, settings: settings}"/>
+        <f:render partial="SubpageHeader"
+                  arguments="{images: country.headerImages, topline: country.headerSubtitle, headline: country.headerTitle, settings: settings}"/>
         <f:cObject typoscriptObjectPath="lib.breadcrumb"/>
         <div class="container">
             <f:if condition="{v:content.get(column: 1) -> f:count()} > 0">
@@ -21,7 +22,8 @@
                     </button>
                 </div>
             </f:if>
-            <f:render partial="Header/Header" arguments="{layout: 8, subheader: country.name, header: country.headline}"/>
+            <f:render partial="Header/Header"
+                      arguments="{layout: 8, subheader: country.name, header: country.headline}"/>
             <div class="grid grid-cols-3 gap-8">
                 <div class="col-span-3 lg:col-span-2" id="teasers">
                     <div data-rte-content>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Header.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Header.html
index 8e4bd716..f64bb96c 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Header.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Header.html
@@ -7,11 +7,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}">
-            <f:render partial="Header/Header" arguments="{
-                    header: data.header,
-                    subheader: data.subheader,
-                    layout: data.header_layout,
-                    link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
         </ep:container>
     </f:section>
 
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html
index 778f086d..d7a52a9f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html
@@ -7,7 +7,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-2 gap-8">
                 <div class="col-span-2 md:col-span-1">
                     {data.tx_gridelements_view_column_51 -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html
index ee6aeacc..43a4f10f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html
@@ -7,7 +7,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
                 <f:if condition="{data.tx_gridelements_view_column_21 -> v:format.trim()}">
                     <div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html
index edb46810..4ba7caff 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html
@@ -7,7 +7,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8">
                 {data.tx_gridelements_view_column_41 -> f:format.raw()}
                 {data.tx_gridelements_view_column_42 -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html
index 3e56970e..cbb4ec1a 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html
@@ -7,7 +7,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
                 {data.tx_gridelements_view_column_31 -> f:format.raw()}
                 {data.tx_gridelements_view_column_32 -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html
index 170bda63..3d349ce8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html
@@ -7,7 +7,8 @@
 
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
-            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-2 gap-8">
                 <div class="col-span-2 md:col-span-1">
                     <div class="grid grid-cols-2 gap-8">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html
index 92e630d1..b67b342b 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html
@@ -6,7 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="SubpageHeader" arguments="{images: hotel.headerImages, topline: hotel.headerSubtitle, headline: hotel.headerTitle, settings: settings}"/>
+        <f:render partial="SubpageHeader"
+                  arguments="{images: hotel.headerImages, topline: hotel.headerSubtitle, headline: hotel.headerTitle, settings: settings}"/>
         <f:cObject typoscriptObjectPath="lib.breadcrumb"/>
         <div class="container">
             <f:if condition="{v:content.get(column: 1) -> f:count()} > 0">
@@ -20,10 +21,12 @@
                     </button>
                 </div>
             </f:if>
-            <f:render partial="Header/Header" arguments="{layout: 8, subheader: hotel.name, header: hotel.headline}"/>
+            <f:render partial="Header/Header"
+                      arguments="{layout: 8, subheader: hotel.name, header: hotel.headline}"/>
             <div class="grid grid-cols-3 gap-8">
                 <div class="col-span-3 md:col-span-2">
-                    <f:render partial="Hotel/Details" arguments="{hotel: hotel, teasers: teasers, filterSettings: filterSettings, showNonBookableHint: 1}"/>
+                    <f:render partial="Hotel/Details"
+                              arguments="{hotel: hotel, teasers: teasers, filterSettings: filterSettings, showNonBookableHint: 1}"/>
                 </div>
                 <div class="col-span-3 md:col-span-1">
                     <f:if condition="{v:content.get(column: 1) -> f:count()} > 0">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html
index 57995973..6a8ee2f5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html
@@ -5,10 +5,12 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="Header/Header" arguments="{layout: 8, subheader: hotel.name, header: hotel.headline}"/>
+        <f:render partial="Header/Header"
+                  arguments="{layout: 8, subheader: hotel.name, header: hotel.headline}"/>
         <div class="grid grid-cols-2 gap-8">
             <div class="col-span-2 md:col-span-1">
-                <f:render partial="ImageGallery" arguments="{id: hotel.uid, images: hotel.images, thumbnails: 0}"/>
+                <f:render partial="ImageGallery"
+                          arguments="{id: hotel.uid, images: hotel.images, thumbnails: 0}"/>
             </div>
             <div class="col-span-2 md:col-span-1">
                 {hotel.description -> f:format.html()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Teasergroup.html
index 468df69a..2ea885c6 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Teasergroup.html
@@ -7,7 +7,8 @@
     <f:section name="Main">
         <f:if condition="{bookable} || {nonBookable}">
             <ep:container data="{data}">
-                <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
+                <f:render partial="Header/Header"
+                          arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
                 <div data-controller="teasergrid"
                      data-teasergrid-grid-class="grid-cols-2"
                      data-teasergrid-disabled-value="false">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
index 97ef17ea..8d969453 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
@@ -21,7 +21,8 @@
                     </f:else>
                 </f:if>
             >
-                <f:render partial="Header/Header" arguments="{layout: 8, subheader: '{product.region.name} / {product.name}', header: product.headline}"/>
+                <f:render partial="Header/Header"
+                          arguments="{layout: 8, subheader: '{product.region.name} / {product.name}', header: product.headline}"/>
                 <div class="flex flex-col lg:flex-row-reverse lg:items-start"
                      data-controller="tabs"
                      data-tabs-button-class="bg-ep-primary-dark"
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/HotelList.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/HotelList.html
index 444c647f..a7796b1a 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/HotelList.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/HotelList.html
@@ -8,7 +8,8 @@
         <f:render partial="Product/HeaderDetail" arguments="{_all}"/>
         <div class="py-8 bg-ep-primary-bg">
             <div class="container">
-                <f:render partial="Header/Header" arguments="{layout: 8, subheader: product.name, header: product.headline}"/>
+                <f:render partial="Header/Header"
+                          arguments="{layout: 8, subheader: product.name, header: product.headline}"/>
             </div>
             <div class="container grid grid-cols-3 gap-8">
                 <div class="col-span-3 lg:col-span-2">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
index edcc69ab..a2e2e00d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
@@ -7,7 +7,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="SubpageHeader" arguments="{images: region.headerImages, topline: region.headerSubtitle, headline: region.headerTitle, settings: settings, badge: badge}"/>
+        <f:render partial="SubpageHeader"
+                  arguments="{images: region.headerImages, topline: region.headerSubtitle, headline: region.headerTitle, settings: settings, badge: badge}"/>
         <f:cObject typoscriptObjectPath="lib.breadcrumb"/>
         <div class="container">
             <f:if condition="{teasers}">
@@ -21,7 +22,8 @@
                     </button>
                 </div>
             </f:if>
-            <f:render partial="Header/Header" arguments="{layout: 8, subheader: region.name, header: region.headline}"/>
+            <f:render partial="Header/Header"
+                      arguments="{layout: 8, subheader: region.name, header: region.headline}"/>
             <div class="grid grid-cols-3 gap-8">
                 <div class="col-span-3 lg:col-span-2">
                     <f:render partial="Region/Details" arguments="{region: region, teasers: teasers, filterSettings: filterSettings}"/>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Teasergroup.html
index 15a7bb51..e21d8ada 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Teasergroup.html
@@ -8,11 +8,11 @@
     <f:section name="Main">
         <ep:container data="{data}">
             <f:if condition="{teasers}">
-                <div class="container"
-                     data-controller="teasergrid"
+                <div data-controller="teasergrid"
                      data-teasergrid-grid-class="grid-cols-2"
                      data-teasergrid-disabled-value="false">
-                    <f:render partial="Header/Header" arguments="{_all}"/>
+                    <f:render partial="Header/Header"
+                              arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
                     <div class="flex items-center space-x-1 mb-2 sm:hidden">
                         <button type="button"
                                 class="opacity-50"
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
index fce21ecf..04d5c04d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
@@ -8,7 +8,8 @@
 
     <f:section name="Main">
         <div class="container">
-            <f:render partial="Header/Header" arguments="{header: header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
+            <f:render partial="Header/Header"
+                      arguments="{header: header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
             <div class="grid grid-cols-3 gap-8">
                 <div class="col-span-3 md:col-span-1">
                     <f:if condition="{member.image}">