diff --git a/src/Controller/ContentElement/ContaoClickskeksController.php b/src/Controller/ContentElement/ContaoClickskeksController.php
new file mode 100644
index 0000000..d97a4c0
--- /dev/null
+++ b/src/Controller/ContentElement/ContaoClickskeksController.php
@@ -0,0 +1,50 @@
+<?php
+
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Contao Clickskeks Bundle.
+ *
+ * (c) Stefan Schulz-Lauterbach (https://clickpress.de)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Clickpress\ContaoClickskeksBundle\Controller\ContentElement;
+
+use Contao\CoreBundle\Controller\ContentElement\AbstractContentElementController;
+use Contao\CoreBundle\ServiceAnnotation\ContentElement;
+use Contao\ContentModel;
+use Contao\BackendTemplate;
+use Contao\PageModel;
+use Contao\System;
+use Contao\Template;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * @ContentElement(category="texts")
+ */
+class ContaoClickskeksController extends AbstractContentElementController
+{
+    protected string $strDisclaimerUrl = 'https://static.clickskeks.at/%s/%s/%s/disclaimer.js';
+
+    protected function getResponse(Template $template, ContentModel $model, Request $request): ?Response
+    {
+        global $objPage;
+        $objRootPage = PageModel::findByPk($objPage->rootId);
+        $html = sprintf(
+            $this->strDisclaimerUrl,
+            substr($objRootPage->clickskeks_api_key, 0, 2),
+            substr($objRootPage->clickskeks_api_key, 2, 2),
+            $objRootPage->clickskeks_api_key
+        );
+        
+        $template->clickskeks_disclaimer_url = $html;
+        dump($model);
+
+        return $template->getResponse();
+    }
+}
diff --git a/src/Elements/ContaoClickskeksElement.php b/src/Elements/ContaoClickskeksElement.php
deleted file mode 100644
index a4047b6..0000000
--- a/src/Elements/ContaoClickskeksElement.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-
-declare(strict_types=1);
-
-/*
- * This file is part of Contao Clickskeks Bundle.
- *
- * (c) Stefan Schulz-Lauterbach (https://clickpress.de)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Clickpress\ContaoClickskeksBundle\Elements;
-
-use Contao\BackendTemplate;
-use Contao\ContentElement;
-use Contao\PageModel;
-use Contao\System;
-
-class ContaoClickskeksElement extends ContentElement
-{
-    protected $strTemplate = 'ce_clickskeks_disclaimer';
-    protected string $strDisclaimerUrl = 'https://static.clickskeks.at/%s/%s/%s/disclaimer.js';
-
-    /**
-     * Compile the content element.
-     */
-    public function compile(): void
-    {
-        $request = System::getContainer()->get('request_stack')->getCurrentRequest();
-
-        if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request)) {
-            $this->strTemplate = 'be_wildcard';
-            $this->Template = new BackendTemplate($this->strTemplate);
-            $this->Template->title = 'Clickskeks disclaimer element';
-        } else {
-
-            global $objPage;
-            $objRootPage = PageModel::findByPk($objPage->rootId);
-
-            if (null === $objRootPage || null === $objRootPage->clickskeks_active || null === $objRootPage->clickskeks_api_key) {
-                return;
-            }
-
-            $html = sprintf(
-                $this->strDisclaimerUrl,
-                substr($objRootPage->clickskeks_api_key, 0, 2),
-                substr($objRootPage->clickskeks_api_key, 2, 2),
-                $objRootPage->clickskeks_api_key
-            );
-
-            $this->Template->clickskeks_diclaimer_url = $html;
-        }
-    }
-}
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
index 4a3c22a..3188da5 100644
--- a/src/Resources/config/services.yml
+++ b/src/Resources/config/services.yml
@@ -1,3 +1,9 @@
 services:
-  Clickpress\ContaoClickskeksBundle\EventListener\ContaoClickskeksListener:
-    tags: ['terminal42_service_annotation']
\ No newline at end of file
+    _defaults:
+        autoconfigure: true
+
+    Clickpress\ContaoClickskeksBundle\EventListener\ContaoClickskeksListener:
+        tags: ["terminal42_service_annotation"]
+
+    Clickpress\ContaoClickskeksBundle\Controller\ContentElement\ContaoClickskeksController:
+        tags: ["terminal42_service_annotation"]
diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
deleted file mode 100644
index a9c9e8d..0000000
--- a/src/Resources/contao/config/config.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-declare(strict_types=1);
-
-/*
- * This file is part of Contao Clickskeks Bundle.
- *
- * (c) Stefan Schulz-Lauterbach (https://clickpress.de)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Content elements
- */
-$GLOBALS['TL_CTE']['texts']['clickskeks_disclaimer'] = 'Clickpress\ContaoClickskeksBundle\Elements\ContaoClickskeksElement';
diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php
index 3e64b06..c0c974c 100644
--- a/src/Resources/contao/dca/tl_content.php
+++ b/src/Resources/contao/dca/tl_content.php
@@ -12,4 +12,4 @@
  * file that was distributed with this source code.
  */
 
-$GLOBALS['TL_DCA']['tl_content']['palettes']['clickskeks_disclaimer'] = '{type_legend},type;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,sliderCustomOptions;{invisible_legend:hide},invisible,start,stop';
+$GLOBALS['TL_DCA']['tl_content']['palettes']['contao_clickskeks'] = '{type_legend},type;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests;{invisible_legend:hide},invisible,start,stop';
diff --git a/src/Resources/contao/languages/de/default.php b/src/Resources/contao/languages/de/default.php
index 6f020a4..0ae0376 100644
--- a/src/Resources/contao/languages/de/default.php
+++ b/src/Resources/contao/languages/de/default.php
@@ -9,5 +9,5 @@
  * file that was distributed with this source code.
  */
 
-$GLOBALS['TL_LANG']['CTE']['clickskeks_disclaimer'][0] = 'Clickskeks Disclaimer';
-$GLOBALS['TL_LANG']['CTE']['clickskeks_disclaimer'][1] = 'Clickskeks Disclaimer';
+$GLOBALS['TL_LANG']['CTE']['contao_clickskeks'][0] = 'Clickskeks Disclaimer';
+$GLOBALS['TL_LANG']['CTE']['contao_clickskeks'][1] = 'Clickskeks Disclaimer';
diff --git a/src/Resources/contao/languages/en/default.php b/src/Resources/contao/languages/en/default.php
index 6f020a4..0ae0376 100644
--- a/src/Resources/contao/languages/en/default.php
+++ b/src/Resources/contao/languages/en/default.php
@@ -9,5 +9,5 @@
  * file that was distributed with this source code.
  */
 
-$GLOBALS['TL_LANG']['CTE']['clickskeks_disclaimer'][0] = 'Clickskeks Disclaimer';
-$GLOBALS['TL_LANG']['CTE']['clickskeks_disclaimer'][1] = 'Clickskeks Disclaimer';
+$GLOBALS['TL_LANG']['CTE']['contao_clickskeks'][0] = 'Clickskeks Disclaimer';
+$GLOBALS['TL_LANG']['CTE']['contao_clickskeks'][1] = 'Clickskeks Disclaimer';
diff --git a/src/Resources/contao/templates/ce_clickskeks_disclaimer.html5 b/src/Resources/contao/templates/ce_contao_clickskeks.html5
similarity index 50%
rename from src/Resources/contao/templates/ce_clickskeks_disclaimer.html5
rename to src/Resources/contao/templates/ce_contao_clickskeks.html5
index 64fd8c0..12407f7 100644
--- a/src/Resources/contao/templates/ce_clickskeks_disclaimer.html5
+++ b/src/Resources/contao/templates/ce_contao_clickskeks.html5
@@ -1,2 +1,2 @@
 
-<script id="clickskeks-disclaimer-script" src="<?= $this->clickskeks_diclaimer_url ?>" type="application/javascript"></script>
\ No newline at end of file
+<script id="clickskeks-disclaimer-script" src="<?= $this->clickskeks_disclaimer_url ?>" type="application/javascript"></script>
\ No newline at end of file