diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html
index 243bf42f..1d85150d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html
@@ -6,15 +6,13 @@
     <f:render partial="FacebookPixelCode" arguments="{viewContent: settings.facebookViewContentValues}"/>
     <f:render partial="Mainnav" section="Main" arguments="{_all}"/>
     <f:render partial="HeaderSliderSmall" arguments="{_all}"/>
-    <div class="container sidebar">
-        <f:render section="Header"/>
-        <div class="row">
-            <div class="col-md-8 col-md-push-4 column--main">
-                <f:render section="Content"/>
-            </div>
-            <div class="col-md-4 col-md-pull-8 column--sidebar">
-                <f:render section="Sidebar"/>
-            </div>
+    <f:render section="Header" optional="true"/>
+    <div class="container grid grid-cols-3 gap-8">
+        <div class="col-span-3 lg:col-span-1">
+            <f:render section="Sidebar"/>
+        </div>
+        <div class="col-span-3 lg:col-span-2">
+            <f:render section="Content"/>
         </div>
     </div>
     <f:render section="Teasers"/>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html
index c6d558b7..519d0238 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html
@@ -6,15 +6,13 @@
     <f:render partial="FacebookPixelCode" arguments="{viewContent: settings.facebookViewContentValues}"/>
     <f:render partial="Mainnav" section="Main" arguments="{_all}"/>
     <f:render partial="HeaderSliderSmall" arguments="{_all}"/>
-    <div class="container sidebar">
-        <f:render section="Header"/>
-        <div class="row">
-            <div class="col-md-4 col-md-push-8 column--sidebar">
-                <f:render section="Sidebar"/>
-            </div>
-            <div class="col-md-8 col-md-pull-4 column--main">
-                <f:render section="Content"/>
-            </div>
+    <f:render section="Header" optional="true"/>
+    <div class="container grid grid-cols-3 gap-8">
+        <div class="col-span-3 lg:col-span-2">
+            <f:render section="Content"/>
+        </div>
+        <div class="col-span-3 lg:col-span-1">
+            <f:render section="Sidebar"/>
         </div>
     </div>
     <f:render section="Teasers"/>