diff --git a/Classes/Extension/InsertIcon.php b/Classes/Extension/InsertIcon.php
deleted file mode 100644
index 93e6428..0000000
--- a/Classes/Extension/InsertIcon.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-namespace Laxap\Iconfont\Extension;
-
-/*
- *
- *
- * 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.
- *
- *
- */
-
-use TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-
-/**
- * Insert Icon plugin for htmlArea RTE
- *
- */
-class InsertIcon extends RteHtmlAreaApi {
-
-	// The key of the extension that is extending htmlArea RTE
-	protected $extensionKey = 'iconfont';
-
-	// The name of the plugin registered by the extension
-	protected $pluginName = 'InsertIcon';
-
-	protected $pluginButtons = 'fonticon';
-
-	protected $convertToolbarForHtmlAreaArray = array(
-		'fonticon' => 'InsertIcon'
-	);
-
-	/**
-	 * Return JS configuration of the htmlArea plugins registered by the extension
-	 *
-	 * @param  integer	$RTEcounter		Relative id of the RTE editing area in the form
-	 * @return string					JS configuration for registered plugins
-	 */
-	public function buildJavascriptConfiguration($RTEcounter = 0) {
-		return parent::buildJavascriptConfiguration($RTEcounter);
-	}
-
-}
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
index 2d8ea38..8c16224 100644
--- a/Configuration/TypoScript/setup.txt
+++ b/Configuration/TypoScript/setup.txt
@@ -1,6 +1,6 @@
 
 # overwrite header partials
-lib.fluidContent.partialRootPaths.10 = EXT:iconfont/Resources/Private/Partials/
+lib.contentElement.partialRootPaths.10 = EXT:iconfont/Resources/Private/Partials/
 
 # load iconfont css in frontend
 page {
diff --git a/Configuration/TypoScript/tsconfig.ts b/Configuration/TypoScript/tsconfig.ts
deleted file mode 100644
index 07bcd66..0000000
--- a/Configuration/TypoScript/tsconfig.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/* --------------------
- * RTE.default
- */
-RTE.default {
-	# Tags allowed outside p & div
-	proc.allowTagsOutside := addToList(i)
-	# Do not remove i tags
-	proc.entryHTMLparser_db.tags.i >
-    # Enable the fonticon  button
-	showButtons := addToList(fonticon)
-	# Add at end (without the toolbarOrder the fonticon button would be on a single row on top of all other)
-	toolbarOrder (
-		bar, blockstylelabel, blockstyle, textstylelabel, textstyle,
-		linebreak,
-		bar, formattext, bold,  strong, italic, emphasis, big, small, insertedtext, deletedtext, citation, code,
-		definition, keyboard, monospaced, quotation, sample, variable, bidioverride, strikethrough, subscript, superscript, underline, span,
-		bar, fontstyle, fontsize, bar, formatblock, insertparagraphbefore, insertparagraphafter, blockquote, line,
-		bar, left, center, right, justifyfull,
-		bar, orderedlist, unorderedlist, definitionlist, definitionitem, outdent, indent,
-		bar, language, showlanguagemarks,lefttoright, righttoleft,
-		bar, textcolor, bgcolor, textindicator,
-		bar, editelement, showmicrodata,
-		bar, image, emoticon, insertcharacter, insertsofthyphen, abbreviation, user,
-		bar, link, unlink,
-		bar, table,
-		bar, findreplace, spellcheck,
-		bar, chMode, inserttag, removeformat, bar, copy, cut, paste, pastetoggle, pastebehaviour, bar, undo, redo, bar, about,
-		linebreak,
-		bar, toggleborders,
-		bar, tableproperties, tablerestyle, bar, rowproperties, rowinsertabove, rowinsertunder, rowdelete, rowsplit, bar,
-		columnproperties, columninsertbefore, columninsertafter, columndelete, columnsplit, bar,
-		cellproperties, cellinsertbefore, cellinsertafter, celldelete, cellsplit, cellmerge,
-		bar, fonticon
-	)
-}
diff --git a/Resources/Private/Partials/Header.html b/Resources/Private/Partials/Header.html
deleted file mode 100644
index dd98683..0000000
--- a/Resources/Private/Partials/Header.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:if condition="{data.header_layout} != 100">
-	<f:if condition="{data.header}">
-		<f:if condition="{data.subheader}">
-			<f:then>
-				<header>
-			</f:then>
-			<f:else>
-				<f:if condition="{data.date}">
-					<header>
-				</f:if>
-			</f:else>
-		</f:if>
-
-		<f:render partial="Header/Header" arguments="{
-			header: data.header,
-			layout: data.header_layout,
-			link: data.header_link,
-			icon: data.tx_iconfont_icon,
-			default: settings.defaultHeaderType}" />
-
-		<f:if condition="{data.subheader}">
-			<f:render partial="Header/SubHeader" arguments="{
-				subheader: data.subheader,
-				layout: data.header_layout,
-				default: settings.defaultHeaderType}" />
-		</f:if>
-
-		<f:render partial="Header/Date" arguments="{_all}" />
-
-		<f:if condition="{data.subheader}">
-			<f:then>
-				</header>
-			</f:then>
-			<f:else>
-				<f:if condition="{data.date}">
-					</header>
-				</f:if>
-			</f:else>
-		</f:if>
-	</f:if>
-</f:if>
-</html>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Header/All.html b/Resources/Private/Partials/Header/All.html
new file mode 100644
index 0000000..ac4cea1
--- /dev/null
+++ b/Resources/Private/Partials/Header/All.html
@@ -0,0 +1,23 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:if condition="{data.header_layout} != 100">
+	<f:if condition="{data.header} || {data.subheader} || {data.date}">
+		<header>
+			<f:render partial="Header/Header" arguments="{
+				header: data.header,
+				layout: data.header_layout,
+				positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
+				link: data.header_link,
+				icon: data.tx_iconfont_icon,
+				default: settings.defaultHeaderType}" />
+			<f:render partial="Header/SubHeader" arguments="{
+				subheader: data.subheader,
+				layout: data.header_layout,
+				positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
+				default: settings.defaultHeaderType}" />
+			<f:render partial="Header/Date" arguments="{
+				date: data.date,
+				positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}'}" />
+		</header>
+	</f:if>
+</f:if>
+</html>
diff --git a/Resources/Private/Partials/Header/Header.html b/Resources/Private/Partials/Header/Header.html
index c169130..9992657 100644
--- a/Resources/Private/Partials/Header/Header.html
+++ b/Resources/Private/Partials/Header/Header.html
@@ -1,34 +1,55 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:switch expression="{layout}">
-	<f:case value="1">
-		<h1><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h1>
-	</f:case>
-	<f:case value="2">
-		<h2><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h2>
-	</f:case>
-	<f:case value="3">
-		<h3><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h3>
-	</f:case>
-	<f:case value="4">
-		<h4><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h4>
-	</f:case>
-	<f:case value="5">
-		<h5><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h5>
-	</f:case>
-	<f:case value="6">
-		<h6><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h6>
-	</f:case>
-	<f:case value="100">
-		<f:comment> -- do not show header -- </f:comment>
-	</f:case>
-	<f:case default="true">
-		<f:if condition="{default}">
-			<f:render partial="Header/Header" arguments="{
-				header: header,
-				layout: default,
-				link: link,
-				icon: icon}" />
-		</f:if>
-	</f:case>
-</f:switch>
-</html>
\ No newline at end of file
+<f:if condition="{header}">
+    <f:switch expression="{layout}">
+        <f:case value="1">
+            <h1 class="{positionClass}">
+                <f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
+                <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+            </h1>
+        </f:case>
+        <f:case value="2">
+            <h2 class="{positionClass}">
+                <f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
+                <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+            </h2>
+        </f:case>
+        <f:case value="3">
+            <h3 class="{positionClass}">
+                <f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
+                <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+            </h3>
+        </f:case>
+        <f:case value="4">
+            <h4 class="{positionClass}">
+                <f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
+                <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+            </h4>
+        </f:case>
+        <f:case value="5">
+            <h5 class="{positionClass}">
+                <f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
+                <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+            </h5>
+        </f:case>
+        <f:case value="6">
+            <h6 class="{positionClass}">
+                <f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
+                <f:link.typolink parameter="{link}">{header}</f:link.typolink>
+            </h6>
+        </f:case>
+        <f:case value="100">
+            <f:comment> -- do not show header --</f:comment>
+        </f:case>
+        <f:defaultCase>
+            <f:if condition="{default}">
+                <f:render partial="Header/Header" arguments="{
+					header: header,
+					layout: default,
+					positionClass: positionClass,
+					link: link,
+					icon: icon}"/>
+            </f:if>
+        </f:defaultCase>
+    </f:switch>
+</f:if>
+</html>
diff --git a/composer.json b/composer.json
index 16e31a5..2ca35c9 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,15 @@
   "type": "typo3-cms-extension",
   "version": "0.9.0",
   "description": "Support for fontawesome or a custom icon font. Allows to show an icon besides headers and to add icons via RTE. RTE feature based on code from ext:fontawesome.",
-  "keywords": ["typo3", "TYPO3 CMS", "bootstrap", "bsdist", "fontawesome", "font awesome", "iconfont"],
+  "keywords": [
+    "typo3",
+    "TYPO3 CMS",
+    "bootstrap",
+    "bsdist",
+    "fontawesome",
+    "font awesome",
+    "iconfont"
+  ],
   "homepage": "http://www.bsdist.ch",
   "license": "GPL-2.0+",
   "authors": [
@@ -12,5 +20,15 @@
       "email": "typo3@bsdist.ch",
       "role": "Developer"
     }
-  ]
+  ],
+  "require": {
+    "typo3/cms-core": "^9.5",
+    "typo3/cms-backend": "^9.5",
+    "typo3/cms-frontend": "^9.5"
+  },
+  "autoload": {
+    "psr-4": {
+      "Laxap\\Iconfont\\": "Classes/"
+    }
+  }
 }
\ No newline at end of file
diff --git a/ext_emconf.php b/ext_emconf.php
index 1233ef3..f36c6c9 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -12,20 +12,20 @@
 	'author_email' => 'typo3@bsdist.ch',
 	'author_company' => '',
 	'state' => 'beta',
-	'shy' => '',
 	'priority' => '',
 	'module' => '',
-	'internal' => '',
-	'uploadfolder' => '0',
+	'uploadfolder' => false,
 	'createDirs' => '',
 	'modify_tables' => 'tt_content,pages',
 	'clearCacheOnLoad' => 1,
 	'lockType' => '',
 	'version' => '0.9.0',
 	'constraints' => array(
-		'depends' => array(
-			'typo3' => '7.6.0-7.6.99',
-		),
+        'depends' => [
+            'typo3' => '9.5.0-9.5.99',
+            'backend' => '9.5.0-9.5.99',
+            'frontend' => '9.5.0-9.5.99'
+        ],
 		'conflicts' => array(
 			'fontawesome' => '',
 		),
diff --git a/ext_localconf.php b/ext_localconf.php
index a7841a4..83bbcc2 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -24,24 +24,9 @@
 		break;
 }
 
-// --- Add RTE plugin --
-//
-if ( $pluginClass != '' ) {
-	$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon'] = array();
-	$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon']['objectReference'] = $pluginClass;
-	$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon']['addIconsToSkin'] = 1;
-	$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon']['disableInFE'] = 0;
-}
-
-
 // TypoScript constants
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptConstants('
 plugin.tx_iconfont {
     # cat=tx_iconfont/base/010; type=string; label=Path to icon font css file
     cssFile = ' . $fontCssFile . '
-}');
-
-
-// --- Load default page TSconfig ---
-//
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:iconfont/Configuration/TypoScript/tsconfig.ts">');
+}');
\ No newline at end of file