diff --git a/Classes/EventListener/ModifyPageLayoutContentEventListener.php b/Classes/EventListener/ModifyPageLayoutContentEventListener.php
new file mode 100644
index 0000000..a9147fa
--- /dev/null
+++ b/Classes/EventListener/ModifyPageLayoutContentEventListener.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace B13\Collapse\EventListener;
+
+use TYPO3\CMS\Backend\Controller\Event\ModifyPageLayoutContentEvent;
+use TYPO3\CMS\Core\Page\PageRenderer;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+final class ModifyPageLayoutContentEventListener
+{
+    public function __invoke(ModifyPageLayoutContentEvent $event): void
+    {
+        GeneralUtility::makeInstance(PageRenderer::class)
+            ->loadRequireJsModule('TYPO3/CMS/Collapse/PageModuleCollapse');
+    }
+}
\ No newline at end of file
diff --git a/Classes/PageModuleModifier.php b/Classes/PageModuleModifier.php
deleted file mode 100644
index f054348..0000000
--- a/Classes/PageModuleModifier.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace B13\Collapse;
-
-/*
- * This file is part of TYPO3 CMS-based extension "collapse" by b13.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- */
-
-use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Backend\View\BackendLayout\Grid\GridColumnItem;
-use TYPO3\CMS\Backend\View\PageLayoutView;
-use TYPO3\CMS\Core\Imaging\Icon;
-use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Page\PageRenderer;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-class PageModuleModifier
-{
-    protected PageRenderer $pageRenderer;
-    protected IconFactory $iconFactory;
-
-    public function __construct(PageRenderer $pageRenderer, IconFactory $iconFactory)
-    {
-        $this->pageRenderer = $pageRenderer;
-        $this->iconFactory = $iconFactory;
-    }
-
-    public function addCollapseButton(array $parameters, $parentObject): string
-    {
-        if ($parentObject instanceof PageLayoutView || $parentObject instanceof GridColumnItem) {
-            $contentElementId = (int)$parameters[1];
-            $row = $parameters[2];
-            $recordTitle = BackendUtility::getRecordTitle('tt_content', $row);
-            $typeLabel = $this->getTypeLabel($row);
-            $isCollapsed = in_array($contentElementId, $this->getCollapsedItems(), true);
-            return '<button type="button" aria-expanded="' . ($isCollapsed ? 'false' : 'true') . '" data-bs-toggle="collapse" data-bs-target="#element-tt_content-' . $contentElementId . ' > .t3-page-ce-dragitem > .t3-page-ce-body > .t3-page-ce-body-inner" class="btn btn-default btn-sm" data-b13-collapse="' . $contentElementId . '" data-b13-title="' . GeneralUtility::jsonEncodeForHtmlAttribute(['title' => $recordTitle, 'type' => $typeLabel]) . '">'
-                . $this->iconFactory->getIcon('actions-chevron-up', Icon::SIZE_SMALL)->render()
-                . $this->iconFactory->getIcon('actions-chevron-down', Icon::SIZE_SMALL)->render()
-            . '</button>';
-        }
-        return '';
-    }
-
-    public function addJavaScript(): string
-    {
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Collapse/PageModuleCollapse');
-        return '';
-    }
-
-    public function getCollapsedItems(): array
-    {
-        $result = $GLOBALS['BE_USER']->uc['B13']['Collapse'] ?? '';
-        $collapsedItems = GeneralUtility::intExplode(',', $result);
-        return array_filter($collapsedItems);
-    }
-
-    protected function getTypeLabel(array $row): string
-    {
-        $typeValue = BackendUtility::getTCAtypeValue('tt_content', $row);
-        $label = '';
-        foreach ($GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'] as $itm) {
-            if ($itm[1] == $typeValue) {
-                $label = $itm[0];
-                break;
-            }
-        }
-        if ($label !== '') {
-            return $GLOBALS['LANG']->sL($label);
-        }
-        return '';
-    }
-}
diff --git a/Classes/ViewHelpers/Collapse/CollapsibleViewHelper.php b/Classes/ViewHelpers/Collapse/CollapsibleViewHelper.php
new file mode 100644
index 0000000..db18508
--- /dev/null
+++ b/Classes/ViewHelpers/Collapse/CollapsibleViewHelper.php
@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+namespace B13\Collapse\ViewHelpers\Collapse;
+
+use B13\Container\Backend\Grid\ContainerGridColumnItem;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\AbstractGridObject;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\GridColumnItem;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+
+abstract class CollapsibleViewHelper extends AbstractViewHelper
+{
+
+    protected $escapeOutput = false;
+
+    public function getCollapsedItems(): array
+    {
+        $result = $GLOBALS['BE_USER']->uc['B13']['Collapse'] ?? '';
+        $collapsedItems = GeneralUtility::trimExplode(',', $result);
+
+        return array_filter($collapsedItems);
+    }
+}
diff --git a/Classes/ViewHelpers/Collapse/ColumnViewHelper.php b/Classes/ViewHelpers/Collapse/ColumnViewHelper.php
new file mode 100644
index 0000000..4f80c81
--- /dev/null
+++ b/Classes/ViewHelpers/Collapse/ColumnViewHelper.php
@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+namespace B13\Collapse\ViewHelpers\Collapse;
+
+use B13\Container\Backend\Grid\ContainerGridColumnItem;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\AbstractGridObject;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\GridColumn;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\GridColumnItem;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+
+class ColumnViewHelper extends CollapsibleViewHelper
+{
+
+    protected $escapeOutput = false;
+
+    public function initializeArguments(): void
+    {
+        parent::initializeArguments();
+        $this->registerArgument('page', 'array', 'Page record array', true);
+        $this->registerArgument('column', GridColumn::class, '', true);
+    }
+
+    public function render(): string
+    {
+        $page = $this->arguments['page'];
+        /** @var GridColumn $column */
+        $column = $this->arguments['column'];
+
+        $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
+
+        if ($column instanceof GridColumn) {
+            $identifier = sprintf('column_%s_%s', $column->getColumnNumber(), $page['uid']);
+            $isCollapsed = in_array($identifier, $this->getCollapsedItems(), true);
+
+            return '<button type="button" 
+            aria-expanded="' . ($isCollapsed ? 'false' : 'true') . '" 
+            data-bs-toggle="collapse" 
+            data-bs-target=".t3-page-column-' . $column->getColumnNumber() .' > .t3-page-ce-wrapper" 
+            class="btn btn-default btn-borderless" 
+            data-b13-collapse="' . $identifier . '">'
+                . $iconFactory->getIcon('actions-chevron-up', Icon::SIZE_SMALL)->render()
+                . $iconFactory->getIcon('actions-chevron-down', Icon::SIZE_SMALL)->render()
+                . '</button>';
+        }
+
+        return '';
+    }
+
+}
diff --git a/Classes/ViewHelpers/Collapse/ContentViewHelper.php b/Classes/ViewHelpers/Collapse/ContentViewHelper.php
new file mode 100644
index 0000000..c8119ae
--- /dev/null
+++ b/Classes/ViewHelpers/Collapse/ContentViewHelper.php
@@ -0,0 +1,78 @@
+<?php
+declare(strict_types=1);
+namespace B13\Collapse\ViewHelpers\Collapse;
+
+use B13\Container\Backend\Grid\ContainerGridColumnItem;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\AbstractGridObject;
+use TYPO3\CMS\Backend\View\BackendLayout\Grid\GridColumnItem;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+
+class ContentViewHelper extends CollapsibleViewHelper
+{
+
+    protected $escapeOutput = false;
+
+    public function initializeArguments(): void
+    {
+        parent::initializeArguments();
+        $this->registerArgument('row', 'array', 'Content record array', true);
+        $this->registerArgument('type', AbstractGridObject::class, '', true);
+    }
+
+    public function render(): string
+    {
+        $type = $this->arguments['type'];
+        $row = $this->arguments['row'];
+        $contentElementId = $row['uid'];
+        $identifier = 'tt_content_' . $contentElementId;
+
+        $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
+
+        if ($type instanceof GridColumnItem && !$type instanceof ContainerGridColumnItem) {
+            $recordTitle = BackendUtility::getRecordTitle('tt_content', $row);
+            $typeLabel = $this->getTypeLabel($row);
+
+            $isCollapsed = in_array($identifier, $this->getCollapsedItems(), true);
+
+            return '<button type="button" 
+            aria-expanded="' . ($isCollapsed ? 'false' : 'true') . '" 
+            data-bs-toggle="collapse" 
+            data-bs-target="#element-tt_content-' . $contentElementId . ' > .t3-page-ce-dragitem > .t3-page-ce-body > .element-preview" 
+            class="btn btn-default btn-borderless" 
+            data-b13-collapse="' . $identifier . '">'
+                . $iconFactory->getIcon('actions-chevron-up', Icon::SIZE_SMALL)->render()
+                . $iconFactory->getIcon('actions-chevron-down', Icon::SIZE_SMALL)->render()
+                . '</button>';
+        }
+
+        return '';
+    }
+
+    public function getCollapsedItems(): array
+    {
+        $collapsedItems = parent::getCollapsedItems();
+        return array_map(fn(int|string $item) => str_starts_with((string) $item, 'tt_content_') ? (string) $item : 'tt_content_' . $item, $collapsedItems);
+    }
+
+    protected function getTypeLabel(array $row): string
+    {
+        $typeValue = BackendUtility::getTCAtypeValue('tt_content', $row);
+        $label = '';
+        foreach ($GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'] as $itm) {
+            if ($itm['value'] == $typeValue) {
+                $label = $itm['label'];
+                break;
+            }
+        }
+        if ($label !== '') {
+            return $GLOBALS['LANG']->sL($label);
+        }
+
+        return '';
+    }
+}
diff --git a/Configuration/JavaScriptModules.php b/Configuration/JavaScriptModules.php
new file mode 100644
index 0000000..10958cc
--- /dev/null
+++ b/Configuration/JavaScriptModules.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'dependencies' => ['backend'],
+    'imports' => [
+        'b13/collapse' => 'EXT:collapse/Resources/Public/JavaScript/',
+    ],
+];
\ No newline at end of file
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index ae726ff..148f409 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -9,3 +9,8 @@ services:
 
   B13\Collapse\PageModuleModifier:
     public: true
+
+  B13\Collapse\EventListener\ModifyPageLayoutContentEventListener:
+    tags:
+      - name: event.listener
+        identifier: 'paste-reference/backend/modify-page-layout-content'
\ No newline at end of file
diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig
new file mode 100644
index 0000000..3d7dcad
--- /dev/null
+++ b/Configuration/page.tsconfig
@@ -0,0 +1,3 @@
+templates.typo3/cms-backend {
+    1691683586 = b13/collapse:Resources/Private/TemplateOverrides
+}
\ No newline at end of file
diff --git a/Resources/Private/TemplateOverrides/Partials/PageLayout/Grid/ColumnHeader.html b/Resources/Private/TemplateOverrides/Partials/PageLayout/Grid/ColumnHeader.html
new file mode 100644
index 0000000..44f5a57
--- /dev/null
+++ b/Resources/Private/TemplateOverrides/Partials/PageLayout/Grid/ColumnHeader.html
@@ -0,0 +1,44 @@
+<html
+        xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+        xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+        xmlns:c="http://typo3.org/ns/B13/Collapse/ViewHelpers"
+        data-namespace-typo3-fluid="true"
+>
+
+<div class="t3-page-column-header">
+    <f:if condition="{column.active}">
+        <f:then>
+            <div class="t3-page-column-header-icons">
+                <f:if condition="{allowEditContent} && {column.editUrl}">
+                    <a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}">
+                        <core:icon identifier="actions-document-open" />
+                    </a>
+                </f:if>
+                <c:collapse.column column="{column}" page="{context.pageRecord}" />
+
+            </div>
+            {column.title}
+        </f:then>
+        <f:else if="{column.unused}">
+            <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
+        </f:else>
+        <f:else if="{column.unassigned}">
+            {column.titleUnassigned}
+        </f:else>
+        <f:else>
+            {column.titleInaccessible}
+        </f:else>
+    </f:if>
+</div>
+<f:format.raw>{column.beforeSectionMarkup}</f:format.raw>
+<f:if condition="{allowEditContent} && {column.contentEditable} && {column.context.allowNewContent} && {column.active}">
+    <div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}" id="{column.uniqueId}">
+        <div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{column.columnNumber}-page-{column.context.pageId}-{column.uniqueId}">
+            <typo3-backend-new-content-element-wizard-button class="btn btn-default btn-sm" url="{column.newContentUrl}" subject="{newContentTitle}">
+                <core:icon identifier="actions-plus" />
+                {newContentTitleShort}
+            </typo3-backend-new-content-element-wizard-button>
+        </div>
+        <div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available"></div>
+    </div>
+</f:if>
diff --git a/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html b/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html
new file mode 100644
index 0000000..4ed25b4
--- /dev/null
+++ b/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html
@@ -0,0 +1,57 @@
+<html
+        xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+        xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+        xmlns:c="http://typo3.org/ns/B13/Collapse/ViewHelpers"
+        data-namespace-typo3-fluid="true"
+>
+
+<div class="t3-page-ce-header {f:if(condition: '{allowEditContent} && {item.dragAndDropAllowed}', then: 't3-page-ce-header-draggable t3js-page-ce-draghandle')}">
+    <div class="t3-page-ce-header-left">
+        {item.icons -> f:format.raw()}
+        <f:if condition="{item.siteLanguage.flagIdentifier}">
+			<span class="t3-page-ce-header-icon-flag t3js-flag" title="{item.siteLanguage.title}">
+				<core:icon identifier="{item.siteLanguage.flagIdentifier}" />
+			</span>
+        </f:if>
+    </div>
+    <div class="t3-page-ce-header-title">
+        {item.contentTypeLabel}
+    </div>
+    <div class="t3-page-ce-header-right">
+        <f:if condition="{item.editable} && {allowEditContent}">
+            <div class="btn-toolbar">
+                <div class="btn-group btn-group-sm">
+                    <a href="{item.editUrl}" class="btn btn-default btn-borderless" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
+                        <core:icon identifier="actions-open" />
+                    </a>
+                    <f:if condition="{item.visibilityToggling}">
+                        <a class="btn btn-default btn-borderless" href="{item.visibilityToggleUrl}" title="{item.visibilityToggleTitle}">
+                            <core:icon identifier="actions-edit-{item.visibilityToggleIconName}" />
+                        </a>
+                    </f:if>
+                    <f:if condition="{item.delible}">
+                        <a class="btn btn-default btn-borderless t3js-modal-trigger"
+                           href="{item.deleteUrl}"
+                           data-severity="warning"
+                           data-title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
+                           data-bs-content="{item.deleteMessage}"
+                           data-button-close-text="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}"
+                           data-button-ok-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:delete')}"
+                           title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteItem')}">
+                            <core:icon identifier="actions-edit-delete" size="small" />
+                        </a>
+                    </f:if>
+                    <button aria-haspopup="true"
+                            aria-controls="contentMenu0" aria-label="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:advancedFunctions')}"
+                            class="btn btn-default btn-borderless btn-sm"
+                            data-contextmenu-trigger="click"
+                            data-contextmenu-table="tt_content"
+                            data-contextmenu-uid="{item.record.uid}">
+                        <core:icon identifier="actions-menu-alternative" />
+                    </button>
+                </div>
+                <c:collapse.content row="{item.record}" type="{item}" />
+            </div>
+        </f:if>
+    </div>
+</div>
diff --git a/Resources/Public/Css/pagemodule.css b/Resources/Public/Css/pagemodule.css
index 8300a98..cb5264f 100644
--- a/Resources/Public/Css/pagemodule.css
+++ b/Resources/Public/Css/pagemodule.css
@@ -1,10 +1,10 @@
-.t3-page-ce-header-icons-left button[data-b13-collapse] {
+.t3-page-ce-header-right button[data-b13-collapse][aria-expanded=false] > span:first-child,
+.t3-page-column-header button[data-b13-collapse][aria-expanded=false] > span:first-child
+{
     display: none;
 }
-
-.t3-page-ce-header-icons-right button[data-b13-collapse][aria-expanded=false] > span:first-child {
-    display: none;
-}
-.t3-page-ce-header-icons-right button[data-b13-collapse][aria-expanded=true] > span:last-child {
+.t3-page-ce-header-right button[data-b13-collapse][aria-expanded=true] > span:last-child,
+.t3-page-column-header button[data-b13-collapse][aria-expanded=true] > span:last-child
+{
     display: none;
 }
diff --git a/Resources/Public/JavaScript/PageModuleCollapse.js b/Resources/Public/JavaScript/PageModuleCollapse.js
index d434cbb..d4c0c04 100644
--- a/Resources/Public/JavaScript/PageModuleCollapse.js
+++ b/Resources/Public/JavaScript/PageModuleCollapse.js
@@ -6,42 +6,42 @@ define([
   'TYPO3/CMS/Backend/Storage/Persistent',
 ], function (DocumentService, PersistentStorage) {
     let selectors = {
-      button: 'button[data-b13-collapse]',
+      contentButton: '.t3-page-ce-header button[data-b13-collapse]',
       toolbarContainer: '.t3-page-ce-header',
-      rightToolbarContainer: '.t3-page-ce-header-icons-right > .btn-toolbar'
+      rightToolbarContainer: '.t3-page-ce-header-right > .btn-toolbar .btn-group',
+      columnButton: '.t3-page-column-header button[data-b13-collapse]'
+    };
+
+    let initialize = (btn) => {
+      // Update the correct status as we are unable to modify the templates
+      document.querySelector(btn.dataset.bsTarget).classList.add('collapse');
+
+      if (btn.ariaExpanded == 'true') {
+        document.querySelector(btn.dataset.bsTarget).classList.add('show');
+      }
+      // Add event handles to update BE_USERs->uc when collapse/show is used
+      // The CE is expanded again
+      document.querySelector(btn.dataset.bsTarget).addEventListener('show.bs.collapse', () => {
+        PersistentStorage.removeFromList('B13.Collapse', btn.dataset.b13Collapse);
+      });
+      // The CE is about to be collapsed
+      document.querySelector(btn.dataset.bsTarget).addEventListener('hide.bs.collapse', () => {
+        PersistentStorage.addToList('B13.Collapse', btn.dataset.b13Collapse);
+      });
     };
 
     DocumentService.ready().then(() => {
-      document.querySelectorAll(selectors.button).forEach((btn) => {
-        const substituteContent = JSON.parse(btn.dataset.b13Title);
-        // move each element to the right spot first.
+      document.querySelectorAll(selectors.contentButton).forEach((btn) => {
         let toolbar = btn.closest(selectors.toolbarContainer);
         btn.remove();
         toolbar.querySelector(selectors.rightToolbarContainer).append(btn);
-        const substituteNode = document.createElement('div');
-        substituteNode.innerHTML = '<strong>' + substituteContent['title'] + '</strong>' + ' ' + substituteContent['type'];
-        substituteNode.classList.add('p-2');
 
-        // Update the correct status as we are unable to modify the templates
-        document.querySelector(btn.dataset.bsTarget).classList.add('collapse');
-        if (btn.ariaExpanded == 'true') {
-          document.querySelector(btn.dataset.bsTarget).classList.add('show');
-          substituteNode.classList.add('d-none');
-        }
-        // Add event handles to update BE_USERs->uc when collapse/show is used
-        // The CE is expanded again
-        document.querySelector(btn.dataset.bsTarget).addEventListener('show.bs.collapse', () => {
-          PersistentStorage.removeFromList('B13.Collapse', btn.dataset.b13Collapse);
-          substituteNode.classList.add('d-none');
-        });
-        // The CE is about to be collapsed
-        document.querySelector(btn.dataset.bsTarget).addEventListener('hide.bs.collapse', () => {
-          PersistentStorage.addToList('B13.Collapse', btn.dataset.b13Collapse);
-          substituteNode.classList.remove('d-none');
-        });
+        initialize(btn);
+      });
+
 
-        // Add the substitute content
-        document.querySelector(btn.dataset.bsTarget).parentNode.prepend(substituteNode);
+      document.querySelectorAll(selectors.columnButton).forEach((btn) => {
+        initialize(btn);
       });
     });
 });
diff --git a/composer.json b/composer.json
index 05142f9..2583168 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "GPL-2.0-or-later"
     ],
     "require": {
-        "typo3/cms-backend": "^11.5"
+        "typo3/cms-backend": "^12.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 38cfb37..74e21e1 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -11,7 +11,7 @@
     'version' => '1.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.5.0-11.5.99',
+            'typo3' => '12.4.0-12.4.99',
         ],
         'conflicts' => [],
         'suggests' => [],
diff --git a/ext_localconf.php b/ext_localconf.php
deleted file mode 100644
index fe3b597..0000000
--- a/ext_localconf.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-defined('TYPO3') or die('Access denied.');
-
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/db_layout.php']['drawHeaderHook']['collapse'] = \B13\Collapse\PageModuleModifier::class . '->addJavaScript';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['recStatInfoHooks']['collapse'] = \B13\Collapse\PageModuleModifier::class . '->addCollapseButton';