diff --git a/Classes/Controller/FeedController.php b/Classes/Controller/FeedController.php
index b6410b9..9bae393 100755
--- a/Classes/Controller/FeedController.php
+++ b/Classes/Controller/FeedController.php
@@ -16,6 +16,7 @@
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * RSS display that will fetch the content of a RSS Feed and display it onto the Frontend.
@@ -68,7 +69,7 @@ public function showAction()
             $this->view->assign('title', $feed->get_title());
             $this->view->assign('items', $feed->get_items(0, (int)$this->settings['numberOfItems']));
             $this->view->assign('settings', $this->settings);
-            $cObj = $this->configurationManager->getContentObject();
+            $cObj = $this->request->getAttribute('currentContentObject');
             $this->view->assign('data', $cObj->data);
             $result = $this->view->render();
 
@@ -79,7 +80,7 @@ public function showAction()
             }
         }
 
-        return $result;
+        return $this->htmlResponse($result);
     }
 
     /**
@@ -106,7 +107,7 @@ protected function canFetchResultFromCache()
         $result = FALSE;
         if ($this->getPluginType() === self::PLUGIN_TYPE_USER_INT
             && $this->getCacheInstance()->has($this->getCacheIdentifier())
-            && !GeneralUtility::_GET('no_cache')
+            && !($this->request->getQueryParams()['no_cache'] ?? null)
         ) {
             $result = TRUE;
         }
diff --git a/Configuration/FlexForm/feed.xml b/Configuration/FlexForm/feed.xml
index 2bc7d89..ef937b1 100644
--- a/Configuration/FlexForm/feed.xml
+++ b/Configuration/FlexForm/feed.xml
@@ -39,7 +39,6 @@
 								<type>select</type>
 								<itemsProcFunc>Fab\RssDisplay\Backend\FlexformHelper->populateTemplatesList</itemsProcFunc>
 								<renderType>selectSingle</renderType>
-								<items></items>
 							</config>
 						</TCEforms>
 					</settings.template>
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
new file mode 100644
index 0000000..f32e8dc
--- /dev/null
+++ b/Configuration/Services.yaml
@@ -0,0 +1,12 @@
+services:
+  # general settings
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Fab\RssDisplay\:
+    resource: '../Classes/*'
+
+  Fab\RssDisplay\Controller\FeedController:
+    public: true
\ No newline at end of file
diff --git a/Configuration/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
similarity index 94%
rename from Configuration/Configuration/TCA/Overrides/tt_content.php
rename to Configuration/TCA/Overrides/tt_content.php
index 95942b8..6c8c381 100644
--- a/Configuration/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,12 +1,13 @@
 <?php
 
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'rss_display',
     'Pi1',
     'Fetch and display a RSS feed'
 );
+
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('rssdisplay_pi1', 'FILE:EXT:rss_display/Configuration/FlexForm/feed.xml');
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['rssdisplay_pi1'] = 'layout, select_key, pages, recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['rssdisplay_pi1'] = 'pi_flexform';
diff --git a/Configuration/TsConfig/ContentElementWizard.tsconfig b/Configuration/TsConfig/ContentElementWizard.tsconfig
new file mode 100644
index 0000000..2546a71
--- /dev/null
+++ b/Configuration/TsConfig/ContentElementWizard.tsconfig
@@ -0,0 +1,17 @@
+mod.wizards {
+    newContentElement.wizardItems {
+        plugins {
+            elements {
+                rss_display_pi1 {
+                    iconIdentifier = content-widget-rss
+                    title = RSS Feed Display
+                    description = Create a list of rss items
+                    tt_content_defValues {
+                        CType = list
+                        list_type = rss_display_pi1
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig
new file mode 100644
index 0000000..5e9e96e
--- /dev/null
+++ b/Configuration/page.tsconfig
@@ -0,0 +1 @@
+@import 'EXT:rss_display/Configuration/TsConfig/ContentElementWizard.tsconfig'
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 137f4b1..2b3341c 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "issues": "https://github.com/fabarea/rss_display/issues"
     },
     "require": {
-        "typo3/cms-core": "^10.4 || ^11.5",
+        "typo3/cms-core": "^10.4 || ^11.5 || ^12.4 || ^13.4 ",
         "simplepie/simplepie": "^1.5"
     },
     "autoload": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 9c67614..056113a 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -11,7 +11,7 @@
     'author_company' => 'Ecodev',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0-11.5.99',
+            'typo3' => '10.4.0-13.4.99',
         ],
     ],
 ];
diff --git a/ext_localconf.php b/ext_localconf.php
index 24d6226..e5c2820 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,5 +1,10 @@
 <?php
-if (!defined('TYPO3_MODE')) die ('Access denied.');
+declare(strict_types=1);
+
+if (!defined('TYPO3')) die ('Access denied.');
+
+
+use Fab\RssDisplay\Controller\FeedController;
 $typo3Version = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class);
 
 // Define whether USER or USER_INT.
@@ -30,8 +35,8 @@
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
         'rss_display',
         'Pi1',
-        [\Fab\RssDisplay\Controller\FeedController::class => 'show'],
-        $pluginType === 'USER_INT' ? [\Fab\RssDisplay\Controller\FeedController::class => 'show'] : [],
+        [FeedController::class => 'show'],
+        $pluginType === 'USER_INT' ? [FeedController::class => 'show'] : [],
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_PLUGIN
     );
 
diff --git a/ext_tables.php b/ext_tables.php
index 9615237..04f9081 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -1,5 +1,6 @@
 <?php
-if (!defined('TYPO3_MODE')) die ('Access denied.');
+if (!defined('TYPO3')) die ('Access denied.');
+$typo3Version = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class);
 
 
 // Possible Static TS loading
@@ -10,7 +11,10 @@
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('rss_display', 'Configuration/TypoScript', 'RSS Display: display a RSS / Atom feed');
 }
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'][\Fab\RssDisplay\Backend\Wizard::class] = \Fab\RssDisplay\Backend\Wizard::class;
+if ($typo3Version->getMajorVersion() < 12) {
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'][\Fab\RssDisplay\Backend\Wizard::class] = \Fab\RssDisplay\Backend\Wizard::class;
+}
+
 
 call_user_func(function () {
     /**