diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index a6a6af3..2904d74 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,20 +1,5 @@
 <?php
 
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * 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.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -110,75 +95,6 @@
     'before:editlock',
 );
 
-// Create various FE plugins to demonstrate FlexForms definition
-// USAGE: TCA Reference > $TCA array reference > ['columns'][fieldname]['config'] / TYPE: "flex"
-
-// Add the plugins to the list of plugins
-ExtensionManagementUtility::addPlugin(
-    [
-        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi2',
-        'examples_pi2',
-    ],
-    'list_type',
-    'examples',
-);
-ExtensionManagementUtility::addPlugin(
-    [
-        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi3',
-        'examples_pi3',
-    ],
-    'list_type',
-    'examples',
-);
-ExtensionManagementUtility::addPlugin(
-    [
-        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi4',
-        'examples_pi4',
-    ],
-    'list_type',
-    'examples',
-);
-
-// Register the "error" plugin
-ExtensionUtility::registerPlugin(
-    'Examples',
-    'Error',
-    'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pierror',
-    null,
-    'plugins',
-    'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:pierror_wizard_description',
-);
-// Register the FAL example plugin
-ExtensionUtility::registerPlugin(
-    'Examples',
-    'FalExamples',
-    'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:falexample_plugin_title',
-);
-
-// Disable the display of layout and select_key fields for the plugins
-// provided by the extension
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_pi1'] = 'layout,select_key,pages';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_pi2'] = 'layout,select_key,pages';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_pi3'] = 'layout,select_key,pages';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_pi4'] = 'layout,select_key,pages';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_error'] = 'layout,select_key,pages';
-
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['examples_pi2'] = 'pi_flexform';
-ExtensionManagementUtility::addPiFlexFormValue(
-    'examples_pi2',
-    'FILE:EXT:examples/Configuration/Flexforms/flexform_ds2.xml',
-);
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['examples_pi3'] = 'pi_flexform';
-ExtensionManagementUtility::addPiFlexFormValue(
-    'examples_pi3',
-    'FILE:EXT:examples/Configuration/Flexforms/flexform_ds3.xml',
-);
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['examples_pi4'] = 'pi_flexform';
-ExtensionManagementUtility::addPiFlexFormValue(
-    'examples_pi4',
-    'FILE:EXT:examples/Configuration/Flexforms/flexform_ds4.xml',
-);
-
 $standardTabs = '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
             --palette--;;frames,
             --palette--;;appearanceLinks,
@@ -259,28 +175,6 @@
     ],
 ];
 
-ExtensionManagementUtility::addTcaSelectItem(
-    'tt_content',
-    'CType',
-    [
-        'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocdb_title',
-        'value' => 'examples_dataprocdb',
-        'icon' => 'mimetypes-x-content-table',
-        'group' => 'dataProcessingExamples',
-        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocdb_description',
-    ],
-);
-
-$GLOBALS['TCA']['tt_content']['types']['examples_dataprocdb'] = [
-    'showitem' => '
-        --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
-            --palette--;;general,
-            --palette--;;headers,
-            pages,
-            recursive,
-    ' . $standardTabs,
-];
-
 ExtensionManagementUtility::addTcaSelectItem(
     'tt_content',
     'CType',
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_falexamples.php b/Configuration/TCA/Overrides/tt_content_plugin_falexamples.php
new file mode 100644
index 0000000..9ea7837
--- /dev/null
+++ b/Configuration/TCA/Overrides/tt_content_plugin_falexamples.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * 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.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+defined('TYPO3') or die();
+use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
+
+// Register the FAL example plugin
+ExtensionUtility::registerPlugin(
+    'Examples',
+    'FalExamples',
+    'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:falexample_plugin_title',
+);
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_haiku_detail.php b/Configuration/TCA/Overrides/tt_content_plugin_haiku_detail.php
index 8f02af1..c58532c 100644
--- a/Configuration/TCA/Overrides/tt_content_plugin_haiku_detail.php
+++ b/Configuration/TCA/Overrides/tt_content_plugin_haiku_detail.php
@@ -13,38 +13,35 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Schema\Struct\SelectItem;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * 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.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
 defined('TYPO3') or die();
 
+$pluginSignature = 'examples_haiku_detail';
+
 ExtensionManagementUtility::addPlugin(
-    [
+    new SelectItem(
+        'select',
         'LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:detail.title',
-        'examples_haiku_detail',
+        $pluginSignature,
         'tx_examples-haiku',
-    ],
-    'list_type',
+        'plugins',
+        'LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:detail.description',
+    ),
+    'CType',
     'examples',
 );
 
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_haiku_detail'] = 'pages,layout,select_key,recursive';
-
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['examples_haiku_detail'] = 'pi_flexform';
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
+    $pluginSignature,
+    'after:subheader',
+);
 
 ExtensionManagementUtility::addPiFlexFormValue(
-    'examples_haiku_detail',
+    '*',
     'FILE:EXT:examples/Configuration/Flexforms/PluginHaikuDetail.xml',
+    $pluginSignature,
 );
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_haiku_list.php b/Configuration/TCA/Overrides/tt_content_plugin_haiku_list.php
index a1af8b2..1afae80 100644
--- a/Configuration/TCA/Overrides/tt_content_plugin_haiku_list.php
+++ b/Configuration/TCA/Overrides/tt_content_plugin_haiku_list.php
@@ -13,6 +13,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Schema\Struct\SelectItem;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 /*
@@ -30,21 +31,30 @@
 
 defined('TYPO3') or die();
 
+$pluginSignature = 'examples_haiku_list';
+
 ExtensionManagementUtility::addPlugin(
-    [
+    new SelectItem(
+        'select',
         'LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:list.title',
-        'examples_haiku_list',
+        $pluginSignature,
         'tx_examples-haiku',
-    ],
-    'list_type',
+        'plugins',
+        'LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:list.description',
+    ),
+    'CType',
     'examples',
 );
 
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['examples_haiku_list'] = 'pages,layout,select_key,recursive';
-
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['examples_haiku_list'] = 'pi_flexform';
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
+    $pluginSignature,
+    'after:subheader',
+);
 
 ExtensionManagementUtility::addPiFlexFormValue(
-    'examples_haiku_list',
+    '*',
     'FILE:EXT:examples/Configuration/Flexforms/PluginHaikuList.xml',
+    $pluginSignature,
 );
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_htmlparser.php b/Configuration/TCA/Overrides/tt_content_plugin_htmlparser.php
index 89fc691..69b6d5c 100644
--- a/Configuration/TCA/Overrides/tt_content_plugin_htmlparser.php
+++ b/Configuration/TCA/Overrides/tt_content_plugin_htmlparser.php
@@ -29,15 +29,16 @@
     $pluginTitle,
 );
 
-// $pluginSignature == "examples_htmlparser"
-
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$pluginSignature]
-    = 'layout,select_key,pages';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature]
-    = 'pi_flexform';
+// Activate the display of the plug-in flexform field and set FlexForm definition
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
+    $pluginSignature,
+    'after:subheader',
+);
 
-// Configure FlexForm
 ExtensionManagementUtility::addPiFlexFormValue(
-    $pluginSignature,
+    '*',
     'FILE:EXT:examples/Configuration/Flexforms/HtmlParser.xml',
+    $pluginSignature,
 );
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_pi1.php b/Configuration/TCA/Overrides/tt_content_plugin_pi1.php
index 172c035..55db121 100644
--- a/Configuration/TCA/Overrides/tt_content_plugin_pi1.php
+++ b/Configuration/TCA/Overrides/tt_content_plugin_pi1.php
@@ -15,26 +15,34 @@
 
 defined('TYPO3') or die();
 
+use TYPO3\CMS\Core\Schema\Struct\SelectItem;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 $pluginSignature = 'examples_pi1';
-$pluginTitle = 'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi1';
-$extensionKey = 'examples';
 
 // Add the plugins to the list of plugins
 ExtensionManagementUtility::addPlugin(
-    [ $pluginTitle, $pluginSignature],
-    'list_type',
-    $extensionKey,
+    new SelectItem(
+        'select',
+        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.examples_pi1',
+        $pluginSignature,
+        '',
+        'plugins',
+    ),
+    'CType',
+    'examples',
 );
 
-// Disable the display of layout and select_key fields for the plugin
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$pluginSignature]
-    = 'layout,select_key,pages';
-
 // Activate the display of the plug-in flexform field and set FlexForm definition
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['examples_pi1'] = 'pi_flexform';
-ExtensionManagementUtility::addPiFlexFormValue(
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
     $pluginSignature,
+    'after:subheader',
+);
+
+ExtensionManagementUtility::addPiFlexFormValue(
+    '*',
     'FILE:EXT:examples/Configuration/Flexforms/flexform_ds1.xml',
+    $pluginSignature,
 );
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_pi2.php b/Configuration/TCA/Overrides/tt_content_plugin_pi2.php
new file mode 100644
index 0000000..b1a0d5e
--- /dev/null
+++ b/Configuration/TCA/Overrides/tt_content_plugin_pi2.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * 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.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+defined('TYPO3') or die();
+
+use TYPO3\CMS\Core\Schema\Struct\SelectItem;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+$pluginSignature = 'examples_pi2';
+
+// Add the plugins to the list of plugins
+ExtensionManagementUtility::addPlugin(
+    new SelectItem(
+        'select',
+        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.examples_pi2',
+        $pluginSignature,
+        '',
+        'plugins',
+    ),
+    'CType',
+    'examples',
+);
+
+// Activate the display of the plug-in flexform field and set FlexForm definition
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
+    $pluginSignature,
+    'after:subheader',
+);
+
+ExtensionManagementUtility::addPiFlexFormValue(
+    '*',
+    'FILE:EXT:examples/Configuration/Flexforms/flexform_ds2.xml',
+    $pluginSignature,
+);
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_pi3.php b/Configuration/TCA/Overrides/tt_content_plugin_pi3.php
new file mode 100644
index 0000000..a3ecfac
--- /dev/null
+++ b/Configuration/TCA/Overrides/tt_content_plugin_pi3.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * 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.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+defined('TYPO3') or die();
+
+use TYPO3\CMS\Core\Schema\Struct\SelectItem;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+$pluginSignature = 'examples_pi3';
+
+// Add the plugins to the list of plugins
+ExtensionManagementUtility::addPlugin(
+    new SelectItem(
+        'select',
+        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.examples_pi3',
+        $pluginSignature,
+        '',
+        'plugins',
+    ),
+    'CType',
+    'examples',
+);
+
+// Activate the display of the plug-in flexform field and set FlexForm definition
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
+    $pluginSignature,
+    'after:subheader',
+);
+
+ExtensionManagementUtility::addPiFlexFormValue(
+    '*',
+    'FILE:EXT:examples/Configuration/Flexforms/flexform_ds3.xml',
+    $pluginSignature,
+);
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_pi4.php b/Configuration/TCA/Overrides/tt_content_plugin_pi4.php
new file mode 100644
index 0000000..e789ea1
--- /dev/null
+++ b/Configuration/TCA/Overrides/tt_content_plugin_pi4.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * 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.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+defined('TYPO3') or die();
+
+use TYPO3\CMS\Core\Schema\Struct\SelectItem;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+$pluginSignature = 'examples_pi4';
+
+// Add the plugins to the list of plugins
+ExtensionManagementUtility::addPlugin(
+    new SelectItem(
+        'select',
+        'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.examples_pi4',
+        $pluginSignature,
+        '',
+        'plugins',
+    ),
+    'CType',
+    'examples',
+);
+
+// Activate the display of the plug-in flexform field and set FlexForm definition
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;Configuration,pi_flexform,',
+    $pluginSignature,
+    'after:subheader',
+);
+
+ExtensionManagementUtility::addPiFlexFormValue(
+    '*',
+    'FILE:EXT:examples/Configuration/Flexforms/flexform_ds4.xml',
+    $pluginSignature,
+);
diff --git a/Configuration/TCA/Overrides/tt_content_plugin_pierror.php b/Configuration/TCA/Overrides/tt_content_plugin_pierror.php
new file mode 100644
index 0000000..6e3056e
--- /dev/null
+++ b/Configuration/TCA/Overrides/tt_content_plugin_pierror.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * 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.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+defined('TYPO3') or die();
+use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
+
+// Register the "error" plugin
+ExtensionUtility::registerPlugin(
+    'Examples',
+    'Error',
+    'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.example_pierror',
+    null,
+    'plugins',
+    'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:pierror_wizard_description',
+);
diff --git a/Configuration/TsConfig/Page/PluginHaiku.tsconfig b/Configuration/TsConfig/Page/PluginHaiku.tsconfig
deleted file mode 100644
index e8ba8f7..0000000
--- a/Configuration/TsConfig/Page/PluginHaiku.tsconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-mod.wizards.newContentElement.wizardItems {
-    plugins {
-        elements {
-            examples_haiku_list {
-                iconIdentifier = tx_examples-haiku
-                title = LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:list.title
-                description = LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:list.description
-                tt_content_defValues {
-                    CType = list
-                    list_type = examples_haiku_list
-                }
-            }
-            examples_haiku_detail {
-                iconIdentifier = tx_examples-haiku
-                title = LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:detail.title
-                description = LLL:EXT:examples/Resources/Private/Language/PluginHaiku/locallang_db.xlf:detail.description
-                tt_content_defValues {
-                    CType = list
-                    list_type = examples_haiku_detail
-                }
-            }
-        }
-        show := addToList(examples_haiku_list,examples_haiku_detail)
-    }
-}
diff --git a/Configuration/TypoScript/PluginHaiku/setup.typoscript b/Configuration/TypoScript/PluginHaiku/setup.typoscript
index d2d77c4..3e8d39a 100644
--- a/Configuration/TypoScript/PluginHaiku/setup.typoscript
+++ b/Configuration/TypoScript/PluginHaiku/setup.typoscript
@@ -15,10 +15,10 @@ plugin.tx_examples_haiku_list < temp.tx_examples_haiku
 plugin.tx_examples_haiku_list {
     userFunc = T3docs\Examples\Controller\Haiku\ListController->main
 }
-tt_content.list.20.examples_haiku_list =< plugin.tx_examples_haiku_list
+tt_content.examples_haiku_list < plugin.tx_examples_haiku_list
 
 plugin.tx_examples_haiku_detail < temp.tx_examples_haiku
 plugin.tx_examples_haiku_detail {
     userFunc = T3docs\Examples\Controller\Haiku\DetailController->main
 }
-tt_content.list.20.examples_haiku_detail =< plugin.tx_examples_haiku_detail
+tt_content.examples_haiku_detail < plugin.tx_examples_haiku_detail
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 1467e98..ff50912 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -45,19 +45,19 @@
 			<trans-unit id="pages.tx_examples_related_pages" resname="pages.tx_examples_related_pages">
 				<source>Related pages</source>
 			</trans-unit>
-			<trans-unit id="tt_content.list_type_pi1" resname="tt_content.list_type_pi1">
+			<trans-unit id="tt_content.examples_pi1" resname="tt_content.examples_pi1">
 				<source>Examples: simple FlexForm</source>
 			</trans-unit>
-			<trans-unit id="tt_content.list_type_pi2" resname="tt_content.list_type_pi2">
+			<trans-unit id="tt_content.examples_pi2" resname="tt_content.examples_pi2">
 				<source>Examples: advanced FlexForm</source>
 			</trans-unit>
-			<trans-unit id="tt_content.list_type_pi3" resname="tt_content.list_type_pi3">
+			<trans-unit id="tt_content.examples_pi3" resname="tt_content.examples_pi3">
 				<source>Examples: advanced FlexForm with localization type 1</source>
 			</trans-unit>
-			<trans-unit id="tt_content.list_type_pi4" resname="tt_content.list_type_pi4">
+			<trans-unit id="tt_content.examples_pi4" resname="tt_content.examples_pi4">
 				<source>Examples: advanced FlexForm with localization type 2</source>
 			</trans-unit>
-			<trans-unit id="tt_content.list_type_pierror" resname="tt_content.list_type_pierror">
+			<trans-unit id="tt_content.examples_pierror" resname="tt_content.examples_pierror">
 				<source>Examples: error handling</source>
 			</trans-unit>
 			<trans-unit id="tt_content.tx_examples_main_category" resname="tt_content.tx_examples_main_category">
diff --git a/ext_localconf.php b/ext_localconf.php
index 2663556..0045191 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -127,6 +127,7 @@
         [
             ErrorController::class => 'index',
         ],
+        ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT,
     );
 
     // Configure the HTML parser plugin
@@ -136,6 +137,8 @@
         [
             HtmlParserController::class => 'index',
         ],
+        [],
+        ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT,
     );
 
     // Register the FAL examples plugin
@@ -149,6 +152,7 @@
         [
             FalExampleController::class => 'index,listFiles,collection',
         ],
+        ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT,
     );
 
     // Add custom translations overriding default labels