diff --git a/Classes/Backend/Preview/ContentPreviewRenderer.php b/Classes/Backend/Preview/ContentPreviewRenderer.php
new file mode 100644
index 0000000..d6904fd
--- /dev/null
+++ b/Classes/Backend/Preview/ContentPreviewRenderer.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace B13\Codeblock\Backend\Preview;
+
+/*
+ * This file is part of TYPO3 CMS-extension codeblock 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\View\BackendLayout\Grid\GridColumnItem;
+
+class ContentPreviewRenderer extends \TYPO3\CMS\Backend\Preview\StandardContentPreviewRenderer
+{
+    public function renderPageModulePreviewContent(GridColumnItem $item): string
+    {
+        $record = $item->getRecord();
+        if (trim($record['bodytext'] ?? '') !== '') {
+            return $this->linkEditContent(nl2br(htmlentities($record['bodytext'])), $record) . '<br />';
+        }
+        return parent::renderPageModulePreviewContent($item);
+    }
+}
diff --git a/Classes/DataProcessing/HighlightProcessor.php b/Classes/DataProcessing/HighlightProcessor.php
index 0706928..b88292e 100644
--- a/Classes/DataProcessing/HighlightProcessor.php
+++ b/Classes/DataProcessing/HighlightProcessor.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace B13\Codeblock\DataProcessing;
@@ -22,14 +23,11 @@
  */
 class HighlightProcessor implements DataProcessorInterface
 {
-    /**
-     * @var ContentDataProcessor
-     */
-    protected $contentDataProcessor;
+    protected ContentDataProcessor $contentDataProcessor;
 
-    public function __construct()
+    public function __construct(ContentDataProcessor $contentDataProcessor)
     {
-        $this->contentDataProcessor = GeneralUtility::makeInstance(ContentDataProcessor::class);
+        $this->contentDataProcessor = $contentDataProcessor;
     }
 
     /**
@@ -49,7 +47,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
         $highlight = GeneralUtility::makeInstance(Highlighter::class);
 
         // Let highlight.php decide which code language to use from all registered if "detect automatically" is selected.
-        if (!$processedData['data']['code_language']) {
+        if (!($processedData['data']['code_language'] ?? true)) {
             $languages = $highlight->listLanguages();
             $highlight->setAutodetectLanguages($languages);
             $highlighted = $highlight->highlightAuto($processedData['data'][$fieldName]);
diff --git a/Classes/DataProvider/CodeLanguages.php b/Classes/DataProvider/CodeLanguages.php
index 13c461a..715d84a 100644
--- a/Classes/DataProvider/CodeLanguages.php
+++ b/Classes/DataProvider/CodeLanguages.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace B13\Codeblock\DataProvider;
diff --git a/Classes/Hooks/CodeblockPreviewRenderer.php b/Classes/Hooks/CodeblockPreviewRenderer.php
index 449321d..2bf3378 100644
--- a/Classes/Hooks/CodeblockPreviewRenderer.php
+++ b/Classes/Hooks/CodeblockPreviewRenderer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace B13\Codeblock\Hooks;
 
 /*
@@ -11,6 +12,7 @@
 
 use TYPO3\CMS\Backend\View\PageLayoutView;
 use TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface;
+use TYPO3\CMS\Core\Configuration\Features;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -37,10 +39,12 @@ public function preProcess(
         if ($row['CType'] === 'codeblock') {
             if ($row['bodytext']) {
                 $bodytext = GeneralUtility::fixed_lgd_cs($row['bodytext'], 1000);
-                $itemContent .= $parentObject->linkEditContent(nl2br(htmlentities($bodytext)), $row) . '<br />';
+                $row['bodytext'] = $bodytext;
+                if ((GeneralUtility::makeInstance(Features::class))->isFeatureEnabled('fluidBasedPageModule') === false) {
+                    $itemContent .= $parentObject->linkEditContent(nl2br(htmlentities($bodytext)), $row) . '<br />';
+                    $drawItem = false;
+                }
             }
-
-            $drawItem = false;
         }
     }
 }
diff --git a/Classes/Listener/PageContentPreviewRendering.php b/Classes/Listener/PageContentPreviewRendering.php
new file mode 100644
index 0000000..988576e
--- /dev/null
+++ b/Classes/Listener/PageContentPreviewRendering.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace B13\Codeblock\Listener;
+
+/*
+ * This file is part of TYPO3 CMS-extension codeblock 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\View\Event\PageContentPreviewRenderingEvent;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+class PageContentPreviewRendering
+{
+    public function __invoke(PageContentPreviewRenderingEvent $event): void
+    {
+        $record = $event->getRecord();
+        if (($record['CType'] ?? '') === 'codeblock' && trim($record['bodytext'] ?? '') !== '') {
+            $record['bodytext'] = GeneralUtility::fixed_lgd_cs($record['bodytext'], 1000);
+            $event->setRecord($record);
+        }
+    }
+}
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
new file mode 100644
index 0000000..2d566c5
--- /dev/null
+++ b/Configuration/Services.yaml
@@ -0,0 +1,15 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+
+    B13\Codeblock\:
+        resource: '../Classes/*'
+
+    B13\Codeblock\DataProcessing\HighlightProcessor:
+        public: true
+    B13\Codeblock\Listener\PageContentPreviewRendering:
+      tags:
+        - name: event.listener
+          identifier: 'b13/codeblock/page-content-preview-rendering'
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index b28f2ef..3cfdb1c 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('TYPO3') or die();
+
 call_user_func(static function () {
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
@@ -37,7 +39,7 @@
                     'fixedFont' => true,
                 ],
             ],
-        ]
+        ],
     ];
 
     $additionalColumns = [
@@ -60,4 +62,7 @@
         'codeblock',
         'before:bodytext'
     );
+
+    // for fluidBasedPageModule enabled (always for TYPO3 > 11)
+    $GLOBALS['TCA']['tt_content']['types']['codeblock']['previewRenderer'] = \B13\Codeblock\Backend\Preview\ContentPreviewRenderer::class;
 });
diff --git a/composer.json b/composer.json
index 83d7e25..f82ed60 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,9 @@
 	"homepage": "https://github.com/b13/codeblock",
 	"license": ["GPL-2.0-or-later"],
 	"require": {
-		"scrivo/highlight.php": "^9.15"
+		"scrivo/highlight.php": "^9.15",
+		"php": "^7.4 || ~8.0",
+		"typo3/cms-core": "^10.4 || ^11.5 || ^12.0"
 	},
 	"replace": {
 		"b13/codeblock": "self.version"
diff --git a/ext_emconf.php b/ext_emconf.php
index c62f5a7..a18d580 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -9,10 +9,10 @@
     'author_company' => 'b13 GmbH',
     'state' => 'stable',
     'clearCacheOnLoad' => true,
-    'version' => '1.4.0',
+    'version' => '2.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.0-11.99.99',
+            'typo3' => '10.4.0-12.99.99',
         ],
     ],
 ];
diff --git a/ext_localconf.php b/ext_localconf.php
index 8ea3eb9..1abc979 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,9 +1,12 @@
 <?php
-defined('TYPO3_MODE') or die();
+
+defined('TYPO3') or die();
 
 call_user_func(static function () {
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem']['codeblock'] =
-        \B13\Codeblock\Hooks\CodeblockPreviewRenderer::class;
+    if ((\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class))->getMajorVersion() < 12) {
+        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem']['codeblock'] =
+            \B13\Codeblock\Hooks\CodeblockPreviewRenderer::class;
+    }
 
     $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
     $iconRegistry->registerIcon(