diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 4ec9aa0..da5630c 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -5,79 +5,79 @@
         'tx_headertypes_headertype' => [
             'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:headertype',
             'config' => [
-                'default' => '0',
+                'default' => 0,
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.default',
-                        '0'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.default',
+                        'value' => 0,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h1',
-                        '1'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h1',
+                        'value' => 1,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h2',
-                        '2'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h2',
+                        'value' => 2,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h3',
-                        '3'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h3',
+                        'value' => 3,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h4',
-                        '4'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h4',
+                        'value' => 4,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h5',
-                        '5'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h5',
+                        'value' => 5,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h6',
-                        '6'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h6',
+                        'value' => 6,
                     ],
-                ]
-            ]
+                ],
+            ],
         ],
         'tx_headertypes_subheadertype' => [
             'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:subheadertype',
             'config' => [
-                'default' => '0',
+                'default' => 0,
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.default',
-                        '0'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.default',
+                        'value' => 0,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h1',
-                        '1'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h1',
+                        'value' => 1,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h2',
-                        '2'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h2',
+                        'value' => 2,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h3',
-                        '3'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h3',
+                        'value' => 3,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h4',
-                        '4'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h4',
+                        'value' => 4,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h5',
-                        '5'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h5',
+                        'value' => 5,
                     ],
                     [
-                        'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h6',
-                        '6'
+                        'label' => 'LLL:EXT:headertypes/Resources/Private/Language/locallang.xlf:type.I.h6',
+                        'value' => 6,
                     ],
-                ]
-            ]
-        ]
+                ],
+            ],
+        ],
     ];
 
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
diff --git a/composer.json b/composer.json
index b4257bf..21bf25f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,14 @@
 {
-	"name": "b13/headertypes",
-	"type": "typo3-cms-extension",
-	"description": "Add a separate header type field to tt_content for headers and subheaders",
-	"license": ["GPL-2.0-or-later"],
-	"extra": {
-		"typo3/cms": {
-			"extension-key": "headertypes"
-		}
-	},
-	"autoload": {
-		"psr-4": {
-			"B13\\Headertypes\\": "Classes/"
-		}
-	}
+  "name": "b13/headertypes",
+  "type": "typo3-cms-extension",
+  "description": "Add a separate header type field to tt_content for headers and subheaders",
+  "license": ["GPL-2.0-or-later"],
+  "require": {
+    "typo3/cms-core": "^12.4 || ^13.0"
+  },
+  "extra": {
+    "typo3/cms": {
+      "extension-key": "headertypes"
+    }
+  }
 }
diff --git a/ext_emconf.php b/ext_emconf.php
index aef4d3b..4606f66 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -8,7 +8,5 @@
     'author_email' => 'typo3@b13.com',
     'author_company' => 'b13 GmbH, Stuttgart',
     'state' => 'stable',
-    'uploadfolder' => 0,
-    'clearCacheOnLoad' => 1,
-    'version' => '1.0.0'
+    'version' => '1.0.0',
 ];