diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig b/public/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig
deleted file mode 100644
index 7efd2691..00000000
--- a/public/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Wizards/NewContentElement.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/RTE.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/TCEFORM.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/SHARED.tsconfig">
diff --git a/public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php b/public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php
index 55f29d51..271c0e60 100644
--- a/public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php
+++ b/public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php
@@ -133,4 +133,10 @@ call_user_func(function() {
             ],
         ],
     ];
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
+        'ep_events',
+        'Configuration/TSconfig/Page/Main.tsconfig',
+        'EP Events'
+    );
 });
diff --git a/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Main.tsconfig b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Main.tsconfig
new file mode 100644
index 00000000..bc1a1dd0
--- /dev/null
+++ b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Main.tsconfig
@@ -0,0 +1,5 @@
+@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig'
+@import 'EXT:ep_events/Configuration/TSconfig/Page/Wizards/NewContentElement.tsconfig'
+@import 'EXT:ep_events/Configuration/TSconfig/Page/RTE.tsconfig'
+@import 'EXT:ep_events/Configuration/TSconfig/Page/TCEFORM.tsconfig'
+@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'
diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/Mod/SHARED.tsconfig b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_events/Configuration/PageTS/Mod/SHARED.tsconfig
rename to public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig
diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig
rename to public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig
diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/RTE.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig
rename to public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/RTE.tsconfig
diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/TCEFORM.tsconfig b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/TCEFORM.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_events/Configuration/PageTS/TCEFORM.tsconfig
rename to public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/TCEFORM.tsconfig
diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/Wizards/NewContentElement.tsconfig b/public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Wizards/NewContentElement.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_events/Configuration/PageTS/Wizards/NewContentElement.tsconfig
rename to public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Wizards/NewContentElement.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig
deleted file mode 100644
index 48aa3659..00000000
--- a/public/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Extensions/GridElements.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/RTE.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/TCEFORM.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/TCEMAIN.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/SHARED.tsconfig">
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/pages.php b/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/pages.php
index 557274a0..42215776 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/pages.php
+++ b/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/pages.php
@@ -128,7 +128,7 @@ call_user_func(function() {
 
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
         'ep_theme',
-        'Configuration/TypoScript/pageTSconfig.ts',
+        'Configuration/TSconfig/Page/Main.tsconfig',
         'EP Theme'
     );
 
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/Extensions/GridElements.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/Extensions/GridElements.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Main.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Main.tsconfig
new file mode 100644
index 00000000..10ac263b
--- /dev/null
+++ b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Main.tsconfig
@@ -0,0 +1,7 @@
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig'
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig'
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/RTE.tsconfig'
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig'
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig'
+@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/SHARED.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/SHARED.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/SHARED.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/SHARED.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/RTE.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/RTE.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig
similarity index 100%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig
diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEMAIN.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig
similarity index 69%
rename from public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEMAIN.tsconfig
rename to public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig
index 729f6975..50ea6421 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEMAIN.tsconfig
+++ b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig
@@ -1,5 +1,6 @@
 TCEMAIN.permissions {
     groupid = 1
+    user = show, editcontent, edit, new, delete
     group = show, edit, delete, new, editcontent
     everybody = show
 }