diff --git a/Build/composer-unused/composer-unused.php b/Build/composer-unused/composer-unused.php
index b223e9bb..df912a7a 100644
--- a/Build/composer-unused/composer-unused.php
+++ b/Build/composer-unused/composer-unused.php
@@ -3,9 +3,8 @@
 declare(strict_types=1);
 
 use ComposerUnused\ComposerUnused\Configuration\Configuration;
-use ComposerUnused\ComposerUnused\Configuration\NamedFilter;
+
 
 return static function (Configuration $config): Configuration {
-    $config->addNamedFilter(NamedFilter::fromString('typo3/cms-fluid'));
     return $config;
 };
diff --git a/Build/phpstan/phpstan.neon b/Build/phpstan/phpstan.neon
index 594ff22d..7f336ba4 100644
--- a/Build/phpstan/phpstan.neon
+++ b/Build/phpstan/phpstan.neon
@@ -62,6 +62,10 @@ parameters:
         - '$_FILES'
         - '$_SERVER'
       message: 'Use PSR-7 API instead'
+  
+  excludePaths:
+    # We need this Class only for V12. So we exclude it here
+    - ../../Classes/Upgrades/AbstractListTypeToCTypeUpdate.php
 
   ignoreErrors:
     -
diff --git a/Configuration/Services.php b/Configuration/Services.php
index 1e95f19d..fb637ffe 100644
--- a/Configuration/Services.php
+++ b/Configuration/Services.php
@@ -11,7 +11,8 @@
         ->services()
         ->defaults()
         ->autowire()
-        ->autoconfigure();
+        ->autoconfigure()
+        ->public();
 
     $services
         ->load('TTN\\Tea\\', '../Classes/*')
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 8a35b8d8..93a3bb21 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,56 +1,68 @@
 <?php
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
 
 defined('TYPO3') || die();
 
 call_user_func(
     static function (): void {
-        // This makes the plugin selectable in the BE.
-        $indexPluginSignature = ExtensionUtility::registerPlugin(
-            // extension name, matching the PHP namespaces (but without the vendor)
-            'Tea',
-            // arbitrary, but unique plugin name (not visible in the BE)
-            'TeaIndex',
-            // plugin title, as visible in the drop-down in the BE
-            'LLL:EXT:tea/Resources/Private/Language/locallang.xlf:plugin.tea_index',
-            // the icon visible in the drop-down in the BE
-            'EXT:tea/Resources/Public/Icons/Extension.svg',
+        /**
+         * Add new select group for content element
+         */
+        ExtensionManagementUtility::addTcaSelectItemGroup(
+            'tt_content',
+            'CType',
+            'tea',
+            'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.pluginGroup',
+            'after:default'
         );
 
-        // These two commands add the flexform configuration for the plugin.
-        $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$indexPluginSignature] = 'pi_flexform';
-        ExtensionManagementUtility::addPiFlexFormValue(
-            $indexPluginSignature,
-            'FILE:EXT:tea/Configuration/FlexForms/TeaIndex.xml',
-        );
+        /**
+         * Register all plugins
+         */
+        $plugins = ['tea_index', 'tea_show', 'tea_front_end_editor'];
 
-        $showPluginSignature = ExtensionUtility::registerPlugin(
-            'Tea',
-            'TeaShow',
-            'LLL:EXT:tea/Resources/Private/Language/locallang.xlf:plugin.tea_show',
-            'EXT:tea/Resources/Public/Icons/Extension.svg',
-        );
+        foreach ($plugins as $contentType) {
+            // This makes the plugin selectable in the BE.
+            ExtensionUtility::registerPlugin(
+                // extension name, matching the PHP namespaces (but without the vendor)
+                'Tea',
+                // arbitrary, but unique plugin name (not visible in the BE)
+                GeneralUtility::underscoredToUpperCamelCase($contentType),
+                // plugin title, as visible in the drop-down in the BE
+                'LLL:EXT:tea/Resources/Private/Language/locallang.xlf:plugin.' . $contentType,
+                // the icon visible in the drop-down in the BE
+                'EXT:tea/Resources/Public/Icons/Extension.svg',
+                'tea'
+            );
 
-        $editorPluginSignature = ExtensionUtility::registerPlugin(
-            'Tea',
-            'TeaFrontEndEditor',
-            'LLL:EXT:tea/Resources/Private/Language/locallang.xlf:plugin.tea_frontend_editor',
-            'EXT:tea/Resources/Public/Icons/Extension.svg',
-        );
+        }
 
-        // These two commands add the flexform configuration for the plugin.
-        $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$editorPluginSignature] = 'pi_flexform';
+        // Add the FlexForm to the show item list
+        ExtensionManagementUtility::addToAllTCAtypes(
+            'tt_content',
+            '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.plugin, pi_flexform',
+            'tea_teaindex',
+            'after:palette:headers'
+        );
+        // Add the flexform configuration for the TeaIndex plugin.
+        ExtensionManagementUtility::addPiFlexFormValue(
+            '*',
+            'FILE:EXT:tea/Configuration/FlexForms/TeaIndex.xml',
+            'tea_teaindex'
+        );
+        // Add the flexform configuration for the FE editor plugin.
         ExtensionManagementUtility::addPiFlexFormValue(
-            $editorPluginSignature,
-            'FILE:EXT:tea/Configuration/FlexForms/FrontEndEditor.xml'
+            '*',
+            'FILE:EXT:tea/Configuration/FlexForms/FrontEndEditor.xml',
+            'tea_front_end_editor'
         );
 
-        // This removes the default controls from the plugins.
-        $controlsToRemove = 'recursive,pages';
-        $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$indexPluginSignature] = $controlsToRemove;
-        $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$showPluginSignature] = $controlsToRemove;
-        $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$editorPluginSignature] = $controlsToRemove;
-    },
+        /**
+         * Register TeaIndex as "Insert Record"
+         */
+        ExtensionManagementUtility::addToInsertRecords('tea_index');
+    }
 );
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index bae681d1..102d2b50 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -35,6 +35,18 @@
         <source>Visible</source>
         <target>Sichtbar</target>
       </trans-unit>
-    </body>
+    <trans-unit id="tx_tea_domain_model_tea.pluginGroup">
+				<source>Tea plugins</source>
+				<target>Tea</target>
+			</trans-unit>
+			<trans-unit id="plugin.tea_index.title">
+				<source>Tea Index</source>
+				<target>Teeliste</target>
+			</trans-unit>
+			<trans-unit id="plugin.tea_index.description">
+				<source>Tea plugin to show the listview.</source>
+				<target>Tea Plugin für eine Listenansicht.</target>
+			</trans-unit>
+		</body>
   </file>
 </xliff>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 2cb6e432..585e4768 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -27,6 +27,15 @@
       <trans-unit id="tx_tea_domain_model_tea.hidden">
         <source>Visible</source>
       </trans-unit>
-    </body>
+    <trans-unit id="tx_tea_domain_model_tea.pluginGroup">
+				<source>Tea</source>
+			</trans-unit>
+			<trans-unit id="plugin.tea_index.title">
+				<source>Tea Index</source>
+			</trans-unit>
+			<trans-unit id="plugin.tea_index.description">
+				<source>Tea plugin to show the listview.</source>
+			</trans-unit>
+		</body>
   </file>
 </xliff>
diff --git a/Tests/Functional/Controller/Fixtures/Database/FrontEndEditorController/ContentElement.csv b/Tests/Functional/Controller/Fixtures/Database/FrontEndEditorController/ContentElement.csv
index 9420a7c4..a5d8501f 100644
--- a/Tests/Functional/Controller/Fixtures/Database/FrontEndEditorController/ContentElement.csv
+++ b/Tests/Functional/Controller/Fixtures/Database/FrontEndEditorController/ContentElement.csv
@@ -1,14 +1,14 @@
 "tt_content"
-,"uid","pid","CType","header","list_type","pi_flexform"
-,1,1,"list","Tea FrontEnd Editor","tea_teafrontendeditor","<?xml version=""1.0"" encoding=""utf-8"" standalone=""yes"" ?>
-                                                           <T3FlexForms>
-                                                               <data>
-                                                                   <sheet index=""pagesAndFolders"">
-                                                                       <language index=""lDEF"">
-                                                                           <field index=""persistence.storagePid"">
-                                                                               <value index=""vDEF"">2</value>
-                                                                           </field>
-                                                                        </language>
-                                                                    </sheet>
-                                                               </data>
-                                                           </T3FlexForms>"
+,"uid","pid","CType","header","pi_flexform"
+,1,1,"tea_teafrontendeditor","Tea FrontEnd Editor","<?xml version=""1.0"" encoding=""utf-8"" standalone=""yes"" ?>
+                                                    <T3FlexForms>
+                                                        <data>
+                                                            <sheet index=""pagesAndFolders"">
+                                                                <language index=""lDEF"">
+                                                                    <field index=""persistence.storagePid"">
+                                                                        <value index=""vDEF"">2</value>
+                                                                    </field>
+                                                                 </language>
+                                                             </sheet>
+                                                        </data>
+                                                    </T3FlexForms>"
diff --git a/Tests/Functional/Controller/Fixtures/Database/TeaController/ContentElements.csv b/Tests/Functional/Controller/Fixtures/Database/TeaController/ContentElements.csv
index c4f2e612..61a86d7e 100644
--- a/Tests/Functional/Controller/Fixtures/Database/TeaController/ContentElements.csv
+++ b/Tests/Functional/Controller/Fixtures/Database/TeaController/ContentElements.csv
@@ -1,6 +1,6 @@
 "tt_content"
-,"uid","pid","CType","header","list_type","pi_flexform"
-,1,1,"list","Tea index","tea_teaindex","<?xml version=""1.0"" encoding=""utf-8"" standalone=""yes"" ?>
+,"uid","pid","CType","header","pi_flexform"
+,1,1,"tea_teaindex","Tea index","<?xml version=""1.0"" encoding=""utf-8"" standalone=""yes"" ?>
                                            <T3FlexForms>
                                                <data>
                                                    <sheet index=""pagesAndFolders"">
@@ -18,4 +18,4 @@
                                                     </sheet>
                                                </data>
                                            </T3FlexForms>"
-,2,3,"list","Tea show","tea_teashow",""
+,2,3,"tea_teashow","Tea show",""
diff --git a/composer.json b/composer.json
index 7d19062e..3d91fd17 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,6 @@
 		"psr/http-message": "^1.0.1",
 		"typo3/cms-core": "^12.4.41",
 		"typo3/cms-extbase": "^12.4.41 || ^13.4",
-		"typo3/cms-fluid": "^12.4.41 || ^13.4",
 		"typo3/cms-frontend": "^12.4.41 || ^13.4"
 	},
 	"require-dev": {
diff --git a/ext_localconf.php b/ext_localconf.php
index 76fb8c79..9296f0f6 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -4,6 +4,7 @@
 
 use TTN\Tea\Controller\FrontEndEditorController;
 use TTN\Tea\Controller\TeaController;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
 
 defined('TYPO3') or die('Access denied.');
@@ -21,7 +22,8 @@
     // non-cacheable actions
     [
         TeaController::class => '',
-    ]
+    ],
+    ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT
 );
 ExtensionUtility::configurePlugin(
     'Tea',
@@ -31,7 +33,8 @@
     ],
     [
         TeaController::class => '',
-    ]
+    ],
+    ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT
 );
 
 // This makes the plugin available for front-end rendering.
@@ -49,5 +52,8 @@
         // All actions need to be non-cacheable because they either contain dynamic data,
         // or because they are specific to the logged-in FE user (while FE content is cached by FE groups).
         FrontEndEditorController::class => 'index, edit, update, create, new, delete',
-    ]
+    ],
+    ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT
 );
+
+ExtensionManagementUtility::addPageTSConfig('@import \'EXT:tea/Configuration/TSconfig/Page/ContentElementWizard.tsconfig\'');