diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json
index 7b127f685..c17bc3970 100644
--- a/ccm-cms/package-lock.json
+++ b/ccm-cms/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2022-05-03T181122",
+    "version": "7.0.0-SNAPSHOT.2022-05-04T171113",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@librecms/ccm-cms",
-            "version": "7.0.0-SNAPSHOT.2022-05-03T181122",
+            "version": "7.0.0-SNAPSHOT.2022-05-04T171113",
             "license": "LGPL-3.0-or-later",
             "dependencies": {
                 "@tiptap/core": "^2.0.0-beta.127",
diff --git a/ccm-cms/package.json b/ccm-cms/package.json
index a612702ec..154826494 100644
--- a/ccm-cms/package.json
+++ b/ccm-cms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2022-05-03T181122",
+    "version": "7.0.0-SNAPSHOT.2022-05-04T171113",
     "description": "JavaScript stuff for ccm-cms",
     "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
     "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml
index 3a342bb56..b23a93971 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml
@@ -36,7 +36,7 @@
         </ui:define>
 
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/event-info-step-eventdate.js"></script>
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
         </ui:define>
 
     </ui:composition>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml
index 5e6a66c2d..ddb9399a7 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml
@@ -36,7 +36,7 @@
         </ui:define>
 
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/event-info-step-eventtype.js"></script>
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
         </ui:define>
 
     </ui:composition>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml
index 70c79a86a..9bf98e694 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml
@@ -36,7 +36,7 @@
         </ui:define>
 
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/event-info-step-location.js"></script>
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
         </ui:define>
 
     </ui:composition>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml
index 0c05a6e32..4dff15b24 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml
@@ -36,7 +36,7 @@
         </ui:define>
 
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/event-info-step-maincontributor.js"></script>
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
         </ui:define>
 
     </ui:composition>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/mpa-section-edit-text.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/mpa-section-edit-text.xhtml
index c1a32d4e9..8cc1ce47a 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/mpa-section-edit-text.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/mpa-section-edit-text.xhtml
@@ -34,7 +34,7 @@
         </ui:define>
 
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/mpa-section-edit-text.js"></script>
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
         </ui:define>
 
     </ui:composition>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/news/news-text/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/news/news-text/edit.xhtml
index 2310070be..f7c1a0bac 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/news/news-text/edit.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/news/news-text/edit.xhtml
@@ -35,7 +35,7 @@
         </ui:define>
         
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/news-text-step.js"></script>
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
         </ui:define>
     </ui:composition>
 </html>