diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java
index f1358b939c..a7106b9f97 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java
@@ -21,10 +21,21 @@
 /**
  * Interface for a label
  *
- * @since com.adobe.cq.forms.core.components.models.form 5.4.0
+ * @since com.adobe.cq.forms.core.components.models.form 0.0.1
  */
 @ConsumerType
-public interface Label extends TextContent {
+public interface Label {
+
+    /**
+     * Returns {@code true} if label is rich text, otherwise {@code false}.
+     *
+     * @return {@code true} if label is rich text, otherwise {@code false}
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    @Nullable
+    default Boolean isRichText() {
+        return null;
+    }
 
     /**
      * Returns {@code true} if label should be visible, otherwise {@code false}.
@@ -37,4 +48,15 @@ default Boolean isVisible() {
         return null;
     }
 
+    /**
+     * Returns the value of this label.
+     *
+     * @return the value of this label
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    @Nullable
+    default String getValue() {
+        return null;
+    }
+
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java
index da35adad08..2b949352d7 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java
@@ -17,7 +17,6 @@
 
 import org.osgi.annotation.versioning.ProviderType;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -58,17 +57,5 @@ default boolean isEnforceEnum() {
      * @return the list of enum names
      * @since com.adobe.cq.forms.core.components.models.form 0.0.1
      */
-    @Deprecated
-    @JsonIgnore
     String[] getEnumNames();
-
-    /**
-     * Returns a list of RichText to be displayed to the end user.
-     * The length of enum and enumNames array must match
-     *
-     * @return the list of enum names
-     * @since com.adobe.cq.forms.core.components.models.form 5.4.0
-     */
-    @JsonProperty("enumNames")
-    TextContent[] getEnumNamesAsTextContent();
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TextContent.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TextContent.java
deleted file mode 100644
index 248c78b9eb..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TextContent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.models.form;
-
-import org.jetbrains.annotations.Nullable;
-import org.osgi.annotation.versioning.ProviderType;
-
-/**
- * Interface to represent text as rich content
- *
- * @since com.adobe.cq.forms.core.components.models.form 5.4.0
- */
-@ProviderType
-public interface TextContent {
-
-    /**
-     * Returns {@code true} if text is rich, otherwise {@code false}.
-     *
-     * @return {@code true} if text is rich, otherwise {@code false}
-     * @since com.adobe.cq.forms.core.components.models.form 5.4.0
-     */
-    @Nullable
-    default Boolean isRichText() {
-        return null;
-    }
-
-    /**
-     * Returns a user friendly text to display for the possible options to be shown to the end user.
-     *
-     * @return the content of this text
-     * @since com.adobe.cq.forms.core.components.models.form 5.4.0
-     */
-    @Nullable
-    default String getValue() {
-        return null;
-    }
-
-}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
index e68a93b679..1ed91396cf 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
@@ -34,7 +34,7 @@
  * version, is bound to this proxy component resource type.
  * </p>
  */
-@Version("5.4.0") // aligning this with release/650 since af2-rest-api is compiled with 5.2.0 in release/650
+@Version("5.3.0") // aligning this with release/650 since af2-rest-api is compiled with 5.2.0 in release/650
 package com.adobe.cq.forms.core.components.models.form;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java
index 10dabbbd46..90fe5ba473 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java
@@ -29,9 +29,6 @@
 
 import com.adobe.cq.forms.core.components.models.form.Field;
 import com.adobe.cq.forms.core.components.models.form.OptionsConstraint;
-import com.adobe.cq.forms.core.components.models.form.TextContent;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * Abstract class which can be used as base class for options {@link Field} implementations.
@@ -52,10 +49,6 @@ public abstract class AbstractOptionsFieldImpl extends AbstractFieldImpl impleme
     @Nullable
     protected String[] enumNames;
 
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "areOptionsRichText")
-    @Nullable
-    private Boolean areOptionsRichText;
-
     @Override
     public boolean isEnforceEnum() {
         return enforceEnum;
@@ -102,8 +95,6 @@ public Object[] getEnums() {
     }
 
     @Override
-    @Deprecated
-    @JsonIgnore
     public String[] getEnumNames() {
         if (enumNames != null) {
             Map<Object, String> map = removeDuplicates();
@@ -117,29 +108,6 @@ public String[] getEnumNames() {
         return null;
     }
 
-    @Override
-    public TextContent[] getEnumNamesAsTextContent() {
-        if (enumNames != null) {
-            Map<Object, String> map = removeDuplicates();
-            String[] enumName = map.values().toArray(new String[0]);
-            return Arrays.stream(enumName)
-                .map(p -> new TextContent() {
-                    @Override
-                    @JsonInclude(JsonInclude.Include.NON_NULL)
-                    public @Nullable Boolean isRichText() {
-                        return areOptionsRichText;
-                    }
-
-                    @Override
-                    public @Nullable String getValue() {
-                        return translate("enumNames", p);
-                    }
-                })
-                .toArray(TextContent[]::new);
-        }
-        return null;
-    }
-
     @Override
     public Object[] getDefault() {
         Object[] typedDefaultValue = null;
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
index f58a06bb78..3d4eb5bc59 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
@@ -25,7 +25,6 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -297,44 +296,6 @@ void testGetType() {
     void testGetEnumNames() {
         CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP);
         assertArrayEquals(new String[] { "m", "f", "o" }, checkboxGroup.getEnumNames());
-        TextContent textContent1 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "m";
-            }
-        };
-        TextContent textContent2 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "f";
-            }
-        };
-        TextContent textContent3 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "o";
-            }
-        };
-        TextContent[] textContent = new TextContent[] { textContent1, textContent2, textContent3 };
-        for (int i = 0; i < checkboxGroup.getEnumNamesAsTextContent().length; i++) {
-            assertEquals(textContent[i].getValue(), checkboxGroup.getEnumNamesAsTextContent()[i].getValue());
-            assertEquals(textContent[i].isRichText(), checkboxGroup.getEnumNamesAsTextContent()[i].isRichText());
-        }
     }
 
     @Test
@@ -345,9 +306,6 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("1", "Item 2");
         map.put("0", "Item 3");
         assertArrayEquals(map.values().toArray(new String[0]), checkboxGroup.getEnumNames());
-        String[] checkboxGroupValues = Arrays.stream(checkboxGroup.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[checkboxGroup.getEnumNamesAsTextContent().length]);
-        assertArrayEquals(map.values().toArray(new String[0]), checkboxGroupValues);
     }
 
     @Test
@@ -428,8 +386,5 @@ void testInsertionOrderForEnumNames() {
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
         assertArrayEquals(set.toArray(new String[0]), checkboxGroup.getEnumNames());
-        String[] checkboxGroupValues = Arrays.stream(checkboxGroup.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[checkboxGroup.getEnumNamesAsTextContent().length]);
-        assertArrayEquals(set.toArray(new String[0]), checkboxGroupValues);
     }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
index 799140e3a4..6abf20efb1 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
@@ -27,8 +27,12 @@
 
 import com.adobe.cq.forms.core.Utils;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.*;
+import com.adobe.cq.forms.core.components.models.form.Base;
+import com.adobe.cq.forms.core.components.models.form.CheckBox;
 import com.adobe.cq.forms.core.components.models.form.CheckBox.Orientation;
+import com.adobe.cq.forms.core.components.models.form.ConstraintType;
+import com.adobe.cq.forms.core.components.models.form.FieldType;
+import com.adobe.cq.forms.core.components.models.form.Label;
 import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
 import com.adobe.cq.wcm.style.ComponentStyleInfo;
 import io.wcm.testing.mock.aem.junit5.AemContext;
@@ -305,16 +309,6 @@ void testGetEnum() {
 
     }
 
-    @Test
-    void testGetNullEnumNames() {
-        CheckBox checkbox = getCheckBoxUnderTest(PATH_CHECKBOX);
-        assertNull(checkbox.getEnumNamesAsTextContent());
-        assertNull(checkbox.getEnumNames());
-        CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM);
-        assertNull(noEnumCheckbox.getEnumNamesAsTextContent());
-        assertNull(noEnumCheckbox.getEnumNames());
-    }
-
     @Test
     void testGetNullEnum() {
         CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM);
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
index ef616b8a48..e0dea4e10c 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
@@ -25,7 +25,6 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -380,44 +379,6 @@ void testGetMultiSelectMaxItems() {
     void testGetEnumNames() {
         DropDown dropdown = Utils.getComponentUnderTest(PATH_DROPDOWN_1, DropDown.class, context);
         assertArrayEquals(new String[] { "m", "f", "o" }, dropdown.getEnumNames());
-        TextContent textContent1 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "m";
-            }
-        };
-        TextContent textContent2 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "f";
-            }
-        };
-        TextContent textContent3 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "o";
-            }
-        };
-        TextContent[] textContent = new TextContent[] { textContent1, textContent2, textContent3 };
-        for (int i = 0; i < dropdown.getEnumNamesAsTextContent().length; i++) {
-            assertEquals(textContent[i].getValue(), dropdown.getEnumNamesAsTextContent()[i].getValue());
-            assertEquals(textContent[i].isRichText(), dropdown.getEnumNamesAsTextContent()[i].isRichText());
-        }
     }
 
     @Test
@@ -428,10 +389,6 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("1", "Item 2");
         map.put("0", "Item 3");
         assertArrayEquals(map.values().toArray(new String[0]), dropdown.getEnumNames());
-        String[] dropdownValues = Arrays.stream(dropdown.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[dropdown
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(map.values().toArray(new String[0]), dropdownValues);
     }
 
     @Test
@@ -481,9 +438,5 @@ void testInsertionOrderForEnumNames() {
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
         assertArrayEquals(set.toArray(new String[0]), dropdown.getEnumNames());
-        String[] dropdownValues = Arrays.stream(dropdown.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[dropdown
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(set.toArray(new String[0]), dropdownValues);
     }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
index f2760c231c..b016e1975c 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
@@ -24,7 +24,6 @@
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -308,42 +307,10 @@ void testGetType() {
         assertEquals(BaseConstraint.Type.STRING, radioButtonMock.getType());
     }
 
-    @Test
-    void testDeprecatedGetEnumNames() {
-        RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_CUSTOMIZED);
-        assertArrayEquals(new String[] { "<p>Item 1</p>", "<p>Item 2</p>" }, radioButton.getEnumNames());
-    }
-
     @Test
     void testGetEnumNames() {
         RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_CUSTOMIZED);
-        TextContent textContent1 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return true;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "<p>Item 1</p>";
-            }
-        };
-        TextContent textContent2 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return true;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "<p>Item 2</p>";
-            }
-        };
-        TextContent[] textContent = new TextContent[] { textContent1, textContent2 };
-        for (int i = 0; i < radioButton.getEnumNamesAsTextContent().length; i++) {
-            assertEquals(textContent[i].getValue(), radioButton.getEnumNamesAsTextContent()[i].getValue());
-            assertEquals(textContent[i].isRichText(), radioButton.getEnumNamesAsTextContent()[i].isRichText());
-        }
+        assertArrayEquals(new String[] { "Item 1", "Item 2" }, radioButton.getEnumNames());
     }
 
     @Test
@@ -354,10 +321,6 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("1", "Item 2");
         map.put("0", "Item 3");
         assertArrayEquals(map.values().toArray(new String[0]), radioButton.getEnumNames());
-        String[] radioButtonValues = Arrays.stream(radioButton.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[radioButton
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(map.values().toArray(new String[0]), radioButtonValues);
     }
 
     @Test
@@ -426,9 +389,5 @@ void testInsertionOrderForEnumNames() {
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
         assertArrayEquals(set.toArray(new String[0]), radioButton.getEnumNames());
-        String[] radioButtonValues = Arrays.stream(radioButton.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[radioButton
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(set.toArray(new String[0]), radioButtonValues);
     }
 }
diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
index de77a5d84f..986b3f2b6a 100644
--- a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
+++ b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
@@ -9,12 +9,8 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "Cat Person"
-    },
-    {
-      "value": "Dog Person"
-    }
+    "Cat Person",
+    "Dog Person"
   ],
   "label": {
     "value": "Personality"
diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json
index f82ba6229a..b71aa10538 100644
--- a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json
+++ b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json
@@ -16,15 +16,9 @@
   "readOnly": true,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
+    "m",
+    "f",
+    "o"
   ],
   "default": [
     0,
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json
index b20398a150..60987e7d27 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json
@@ -15,15 +15,9 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
+    "m",
+    "f",
+    "o"
   ],
   "label": {
     "visible": true,
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
index f02d9514a7..4b7d3b72e6 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
@@ -9,12 +9,8 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "Owl"
-    },
-    {
-      "value": "Wolf"
-    }
+    "Owl",
+    "Wolf"
   ],
   "label": {
     "value": "Favorite Animal"
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
index 64e232f04e..7ecce9aa4e 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
@@ -4,17 +4,7 @@
   "name": "abc",
   "type": "string",
   "enforceEnum": true,
-  "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
-  ],
+  "enumNames": ["m", "f", "o"],
   "enum": ["0", "1", "2"],
   "label": {
     "value": "def"
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json
index 9547715155..43860b3db0 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json
@@ -15,15 +15,9 @@
   },
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
+    "m",
+    "f",
+    "o"
   ],
   "default": [
     0,
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json
index 7225f64b53..988424436a 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json
@@ -16,14 +16,8 @@
   },
   "enforceEnum": true,
   "enumNames": [
-    {
-      "richText": true,
-      "value": "<p>Item 1</p>"
-    },
-    {
-      "richText": true,
-      "value": "<p>Item 2</p>"
-    }
+    "Item 1",
+    "Item 2"
   ],
   "default": "0",
   "screenReaderText": "'custom text'",
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
index 870734a41e..6662d77b6d 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
@@ -9,12 +9,8 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "Male"
-    },
-    {
-      "value": "Female"
-    }
+    "Male",
+    "Female"
   ],
   "label": {
     "value": "Gender"
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json
index 9fd2561296..078687521f 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json
@@ -5,14 +5,8 @@
   "type": "string",
   "enforceEnum": true,
   "enumNames": [
-    {
-      "richText": true,
-      "value": "<p>Item 1</p>"
-    },
-    {
-      "richText": true,
-      "value": "<p>Item 2</p>"
-    }
+    "Item 1",
+    "Item 2"
   ],
   "label": {
     "value": "Radio Button"
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/test-content.json b/bundles/af-core/src/test/resources/form/radiobutton/test-content.json
index 076198ea4c..d68b10d0c8 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/test-content.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/test-content.json
@@ -8,14 +8,13 @@
     "orientation": "vertical",
     "jcr:lastModifiedBy": "admin",
     "jcr:created": "Tue Sep 13 2022 15:17:35 GMT+0530",
-    "areOptionsRichText": true,
     "enum": [
       "0",
       "1"
     ],
     "enumNames": [
-      "<p>Item 1</p>",
-      "<p>Item 2</p>"
+      "Item 1",
+      "Item 2"
     ],
     "jcr:lastModified": "Tue Sep 13 2022 15:18:50 GMT+0530",
     "fieldType": "radio-group"
@@ -38,15 +37,14 @@
     "dorColspan": "4",
     "assistPriority": "custom",
     "jcr:created": "Tue Sep 13 2022 15:17:35 GMT+0530",
-    "areOptionsRichText": true,
     "enum": [
       "0",
       "1"
     ],
     "type": "string",
     "enumNames": [
-      "<p>Item 1</p>",
-      "<p>Item 2</p>"
+      "Item 1",
+      "Item 2"
     ],
     "visible": false,
     "readOnly": true,
diff --git a/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json b/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json
index f928d561d6..e396b33edc 100644
--- a/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json
+++ b/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json
@@ -38,12 +38,8 @@
     "1"
   ],
   "enumNames": [
-    {
-      "value": "OFF"
-    },
-    {
-      "value": "ON"
-    }
+    "OFF",
+    "ON"
   ],
   ":type": "core/fd/components/form/switch/v1/switch"
 }
diff --git a/bundles/af-core/src/test/resources/form/switch/exporter-switch.json b/bundles/af-core/src/test/resources/form/switch/exporter-switch.json
index 4a173cf3d5..8bb6d68eab 100644
--- a/bundles/af-core/src/test/resources/form/switch/exporter-switch.json
+++ b/bundles/af-core/src/test/resources/form/switch/exporter-switch.json
@@ -11,12 +11,8 @@
     "1"
   ],
   "enumNames": [
-    {
-      "value": "OFF"
-    },
-    {
-      "value": "ON"
-    }
+    "OFF",
+    "ON"
   ],
   "events": {
     "custom:setProperty": [
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
index b7a56e1246..a2e0b6ead3 100644
--- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
+++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
@@ -23,6 +23,7 @@
     "approvalcheckbox",
     "link"
   ],
+  ":type": "core/fd/components/form/termsandconditions/v1/termsandconditions",
   ":items": {
     "approvalcheckbox": {
       "id": "checkbox-9d01a4893a",
@@ -56,6 +57,9 @@
       "name": "link1694159323342",
       "type": "string",
       "enforceEnum": true,
+      "enumNames": [
+        "label for the link"
+      ],
       "label": {
         "value": ""
       },
@@ -76,13 +80,7 @@
       "enum": [
         "yourlink"
       ],
-      ":type": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
-      "enumNames": [
-        {
-          "value": "label for the link"
-        }
-      ]
+      ":type": "core/fd/components/form/checkboxgroup/v1/checkboxgroup"
     }
-  },
-  ":type": "core/fd/components/form/termsandconditions/v1/termsandconditions"
+  }
 }
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml
index 0184cfce56..04ee0e1ebd 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml
@@ -129,21 +129,6 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="Zauberer"/>
-    <_x0039_6b6493f-b93e-4b2d-8b38-3633a3fe6286
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Tier auswählen&lt;/b>&lt;/p>"/>
-    <fba2a273-8ffd-4286-87c8-120bab383d9e
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Hund&lt;/i>&lt;/p>"/>
-    <_x0037_c44f84b-8830-4270-ba63-8aa9de935572
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Katze&lt;/u>&lt;/p>"/>
     <bb998be9-c330-493c-a5d3-e252a9ab8cc7
         jcr:mixinTypes="[sling:Message]"
         jcr:primaryType="nt:folder"
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml
index 3f3e47fd7c..40699222b0 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml
@@ -129,21 +129,6 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="Hechicero"/>
-    <a6492758-b569-4c76-aaa1-29bf4b30cdfd
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Seleccionar animal&lt;/b>&lt;/p>"/>
-    <f51e320e-140a-4850-a65f-296944b9fabe
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Perro&lt;/i>&lt;/p>"/>
-    <_x0031_33de41e-050d-4628-8b22-34b8b6dfa9fa
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Gato&lt;/u>&lt;/p>"/>
     <bb998be9-c330-493c-a5d3-e252a9ab8cc7
         jcr:mixinTypes="[sling:Message]"
         jcr:primaryType="nt:folder"
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml
index 8e78a152f9..ec11165358 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="Sorcier"/>
-    <bf783b29-c90f-440c-a14b-11684a87ca79
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Sélectionner un animal&lt;/b>&lt;/p>"/>
-    <_x0037_e28c9de-7712-4f7b-969d-0c90f92935af
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Chien&lt;/i>&lt;/p>"/>
-    <_x0032_869e60b-f2eb-4e35-8d17-0673f7d870bc
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Chat&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml
index 9ab5e0f0b2..81f80c0637 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="जादूगर"/>
-    <_x0035_3786ca1-ac18-4151-8e13-db1ec440cb44
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>पशु का चयन करें&lt;/b>&lt;/p>"/>
-    <a420bd56-ad98-43df-9477-75e455bc0103
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>कुत्ता&lt;/i>&lt;/p>"/>
-    <f733b6f8-a8d1-4025-9f6c-7cbde7accc0e
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>बिल्ली&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml
index 06a9c39887..88d4a55147 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="mago"/>
-    <_x0038_fa19b1d-324d-453f-895f-60c86adb001c
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Seleziona animale&lt;/b>&lt;/p>"/>
-    <_x0030_ac73bc4-9c29-470f-9a99-a1c7f685a5b9
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Cane&lt;/i>&lt;/p>"/>
-    <_x0038_23d3ccb-d875-4a8d-9ff9-2a2859d7bdbd
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Gatto&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml
index 10e9a6fce7..5ade060385 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="魔法使い"/>
-    <_x0030_9640d23-a956-457d-82fa-671bf0750fce
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>動物を選択&lt;/b>&lt;/p>"/>
-    <cf37cd4a-00e4-4e91-886a-7c428b34c28f
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>犬&lt;/i>&lt;/p>"/>
-    <_x0038_a1f5c5f-4a24-4c48-a433-ce761870bbb1
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>猫&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml
index c68ecb7698..4650cd9bff 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="마법사"/>
-    <_x0030_d52109d-2260-4962-b0a4-a589fceb42cd
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>동물 선택&lt;/b>&lt;/p>"/>
-    <_x0030_ab74673-ed86-4d13-853e-86fbcb638588
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>개&lt;/i>&lt;/p>"/>
-    <b74e28f6-aa6a-4823-b87b-c45b0058d67d
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>고양이&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml
index 6f41b8ee49..59242cfbb7 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="mago"/>
-    <f680e4d1-ff1f-48f6-872d-cebd53fec33e
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Selecione Animal&lt;/b>&lt;/p>"/>
-    <_x0031_b25629c-4816-4847-a9d1-63e421b47930
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Cão&lt;/i>&lt;/p>"/>
-    <f0f38a3c-c391-4924-ba80-98bf8ec5e749
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Gato&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml
index 67653db508..855f673d2b 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="колдун"/>
-    <cdf88ca7-c079-4f65-878d-0228f951d247
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Выберите животное&lt;/b>&lt;/p>"/>
-    <cfcca183-f863-4d22-bc1f-2feffccda805
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Собака&lt;/i>&lt;/p>"/>
-    <_x0038_d8b15a1-c3c9-4816-abd6-7e69bc3c477a
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Кошка&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml
index edd3fd1865..ff03638494 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="巫师"/>
-    <_x0034_6fd8a2d-db44-4204-aca8-a4e8ecb178f7
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>选择动物&lt;/b>&lt;/p>"/>
-    <d2603a98-dd4b-4adf-a2b2-df99a7d8c00b
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>狗&lt;/i>&lt;/p>"/>
-    <_x0037_79cf790-b54b-429e-b5b2-ebed6ea0cbb7
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>猫&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml
index d317556721..fd7a76f7e6 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="巫師"/>
-    <_x0036_0c96847-776f-406a-9de3-a669f70ca113
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>選擇動物&lt;/b>&lt;/p>"/>
-    <_x0037_75e6e65-0828-4020-95f6-355249b69aaf
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>狗&lt;/i>&lt;/p>"/>
-    <_x0030_a911e93-4cd9-416d-ac7a-1f348014bbed
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>貓&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
index 228fda67fc..e47fefc6db 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
@@ -48,7 +48,7 @@
                 enum="[0,1]"
                 enumNames="[Item 1, Item 2]"
                 fieldType="checkbox-group"
-                name="checkboxgroup1"
+                name="checkboxgroup1678442866069"
                 type="number[]"/>
             <datepicker
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##datepicker##jcr:title##9506&quot;}"
@@ -215,29 +215,6 @@
                 sling:resourceType="forms-components-examples/components/form/wizard"
                 fieldType="panel"
                 name="wizard1678442986146"/>
-            <checkboxgroup7
-                    fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##checkboxgroup7##jcr:title##3329&quot;,&quot;enumNames&quot;:&quot;guideContainer##checkboxgroup7##enumNames##7570&quot;}"
-                    jcr:created="{Date}2023-10-06T11:32:51.920+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-06T11:33:40.225+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
-                    areOptionsRichText="true"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[&lt;p>&lt;i>Dog&lt;/i>&lt;/p>,&lt;p> &lt;u>Cat&lt;/u>&lt;/p>]"
-                    fieldType="checkbox-group"
-                    hideTitle="false"
-                    isTitleRichText="true"
-                    name="checkboxgroup2"
-                    orientation="horizontal"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true,true,true,true]"
-                    type="number[]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
         </guideContainer>
     </jcr:content>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
index 9dc2b02920..30e1d78040 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
@@ -153,28 +153,6 @@
                     textIsRich="[true,true]"
                     type="number[]"
                     visible="{Boolean}true"/>
-            <checkboxgroup7
-                    jcr:created="{Date}2023-10-06T11:32:51.920+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-06T11:33:40.225+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
-                    areOptionsRichText="true"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[&lt;p>&lt;i>Dog&lt;/i>&lt;/p>,&lt;p> &lt;u>Cat&lt;/u>&lt;/p>]"
-                    fieldType="checkbox-group"
-                    hideTitle="false"
-                    isTitleRichText="true"
-                    name="checkboxgroup_19427271491696572172217"
-                    orientation="horizontal"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true,true,true,true]"
-                    type="number[]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
         </guideContainer>
     </jcr:content>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
index fc040d93fc..735577ac08 100644
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
@@ -118,7 +118,7 @@
                     sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
                     enabled="{Boolean}true"
                     enum="http://localhost"
-                    enumNames="label for the link"
+                    enumNames="[label for the link]"
                     fieldType="checkbox-group"
                     hideTitle="false"
                     name="link1695211072051"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html
index 823bd9bd9b..07f79c829e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html
@@ -1,4 +1,4 @@
-<template data-sly-template.label="${@ componentId, labelValue, labelVisible, labelRichText, bemBlock}">
+<template data-sly-template.label="${@ componentId, labelValue, labelVisible, bemBlock}">
   <label for="${componentId}" class="${bemBlock}__label"
-         data-sly-test="${labelValue && (labelVisible==null || labelVisible==true)}" data-richtext="${labelRichText}">${labelValue @ context = labelRichText ? 'html' : 'text'}</label>
+         data-sly-test="${labelValue && (labelVisible==null || labelVisible==true)}">${labelValue}</label>
 </template>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_dialog/.content.xml
index 51a4506234..07f6d4f972 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_dialog/.content.xml
@@ -53,14 +53,6 @@
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
                                                     path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html
index 8d42a320a4..f899530489 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html
@@ -30,7 +30,7 @@
      data-placeholder-text="${wcmmode.edit && 'Please drag Accordion item components here' @ i18n}">
 
     <div class="cmp-accordion__label-container">
-      <div data-sly-call="${label.label @componentId=accordion.id, labelValue=accordion.label.value, labelVisible=accordion.label.visible, labelRichText=accordion.label.richText, bemBlock='cmp-accordion'}"
+      <div data-sly-call="${label.label @componentId=accordion.id, labelValue=accordion.label.value, labelVisible=accordion.label.visible, bemBlock='cmp-accordion'}"
           data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=accordion.id, longDescription=accordion.description, bemBlock='cmp-accordion'}"
           data-sly-unwrap></div>
@@ -53,7 +53,7 @@
                     aria-controls="${accordion.exportedItems[item].id}-panel"
                     type="button"
                     data-cmp-hook-adaptiveFormAccordion="button">
-                <span class="cmp-accordion__title">${accordion.exportedItems[item].label.value @ context = accordion.exportedItems[item].label.richText ? 'html' : 'text'}</span>
+                <span class="cmp-accordion__title">${accordion.exportedItems[item].label.value}</span>
                 <span class="cmp-accordion__icon"></span>
             </button>
           <div
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
index 3d0a30abb2..3bde75e10c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
@@ -18,7 +18,7 @@
     jcr:primaryType="nt:unstructured"
     jcr:title=""
     sling:resourceType="cq/gui/components/authoring/dialog"
-    extraClientlibs="[core.forms.components.base.v1.editor]">
+    extraClientLibs="[core.forms.components.base.v1.editor]">
     <content
         jcr:primaryType="nt:unstructured"
         sling:resourceType="granite/ui/components/coral/foundation/container">
@@ -55,132 +55,11 @@
                                                         jcr:primaryType="nt:unstructured"
                                                         node-name-validation=""/>
                                             </name>
-                                            <title jcr:primaryType="nt:unstructured"
-                                                   granite:class="cmp-adaptiveform-base__title"
-                                                   sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                   fieldLabel="Title"
-                                                   name="./jcr:title"/>
-                                            <richTextTitle jcr:primaryType="nt:unstructured"
-                                                           wrapperClass="cmp-adaptiveform-base__richtexttitle"
-                                                           sling:resourceType="cq/gui/components/authoring/dialog/richtext"
-                                                           fieldLabel="Title"
-                                                           name="richTextTitle"
-                                                           useFixedInlineToolbar="{Boolean}true">
-                                                <rtePlugins jcr:primaryType="nt:unstructured">
-                                                    <links jcr:primaryType="nt:unstructured">
-                                                        <linkDialogConfig
-                                                                jcr:primaryType="nt:unstructured"
-                                                                height="{Long}316">
-                                                            <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                                                                <linkAdvanced
-                                                                        jcr:primaryType="cq:Widget"
-                                                                        collapsed="{Boolean}true"
-                                                                        collapsible="{Boolean}true"
-                                                                        inputValue="advanced"
-                                                                        name="./linkdialog/cq:adhocLinkTrackingTab"
-                                                                        title="Link tracking">
-                                                                    <items jcr:primaryType="cq:WidgetCollection">
-                                                                        <enable
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                attribute="enabletracking"
-                                                                                fieldDescription="override analytics framework settings."
-                                                                                fieldLabel="Custom link tracking"
-                                                                                name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                                                                xtype="checkbox">
-                                                                            <listeners
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                                                        </enable>
-                                                                        <events
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                attribute="adhocevents"
-                                                                                fieldDescription="e.g.: event2, event7."
-                                                                                fieldLabel="Include SiteCatalyst events"
-                                                                                name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                                                                xtype="textfield"/>
-                                                                        <evars
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                attribute="adhocevars"
-                                                                                fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                                                                fieldLabel="Include SiteCatalyst variables"
-                                                                                name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                                                                xtype="textfield"/>
-                                                                    </items>
-                                                                </linkAdvanced>
-                                                            </linkAttributes>
-                                                        </linkDialogConfig>
-                                                    </links>
-                                                    <misctools
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <edit
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <findreplace
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <format
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <undo
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <subsuperscript
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <lists
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <justify
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <paraformat
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <fullscreen
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                </rtePlugins>
-                                                <uiSettings jcr:primaryType="nt:unstructured">
-                                                    <cui jcr:primaryType="nt:unstructured">
-                                                        <inline
-                                                                jcr:primaryType="nt:unstructured"
-                                                                toolbar="[#format,-,#justify,-,#lists,-,fullscreen#start]">
-                                                            <popovers jcr:primaryType="nt:unstructured">
-                                                                <justify
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                                                        ref="justify"/>
-                                                                <lists
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                                                        ref="lists"/>
-                                                                <format
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="[format#bold,format#italic,format#underline]"
-                                                                        ref="format"/>
-                                                            </popovers>
-                                                        </inline>
-                                                        <fullscreen
-                                                                jcr:primaryType="nt:unstructured"
-                                                                toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                                                            <popovers jcr:primaryType="nt:unstructured">
-                                                                <paraformat
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="paraformat:getFormats:paraformat-pulldown"
-                                                                        ref="paraformat"/>
-                                                            </popovers>
-                                                        </fullscreen>
-                                                    </cui>
-                                                </uiSettings>
-                                            </richTextTitle>
-                                            <isTitleRichText
+                                            <title
                                                     jcr:primaryType="nt:unstructured"
-                                                    granite:class="cmp-adaptiveform-base__istitlerichtext"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                                    name="./isTitleRichText"
-                                                    text="Allow Rich Text for Title"
-                                                    value="true"/>
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                    fieldLabel="Title"
+                                                    name="./jcr:title"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
@@ -222,121 +101,6 @@
                                                                         fieldLabel="Display text"
                                                                         fieldDescription="Specify the content to display in the adaptive form."
                                                                         required="{Boolean}false"/>
-                                                                <richTextEnumNames jcr:primaryType="nt:unstructured"
-                                                                                   sling:resourceType="cq/gui/components/authoring/dialog/richtext"
-                                                                                   wrapperClass="cmp-adaptiveform-base__richTextEnumNames"
-                                                                                   name="richTextEnumNames"
-                                                                                   fieldLabel="Display text"
-                                                                                   fieldDescription="Specify the content to display in the adaptive form."
-                                                                                   useFixedInlineToolbar="{Boolean}true">
-                                                                    <rtePlugins jcr:primaryType="nt:unstructured">
-                                                                        <links jcr:primaryType="nt:unstructured">
-                                                                            <linkDialogConfig
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    height="{Long}316">
-                                                                                <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                                                                                    <linkAdvanced
-                                                                                            jcr:primaryType="cq:Widget"
-                                                                                            collapsed="{Boolean}true"
-                                                                                            collapsible="{Boolean}true"
-                                                                                            inputValue="advanced"
-                                                                                            name="./linkdialog/cq:adhocLinkTrackingTab"
-                                                                                            title="Link tracking">
-                                                                                        <items jcr:primaryType="cq:WidgetCollection">
-                                                                                            <enable
-                                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                                    attribute="enabletracking"
-                                                                                                    fieldDescription="override analytics framework settings."
-                                                                                                    fieldLabel="Custom link tracking"
-                                                                                                    name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                                                                                    xtype="checkbox">
-                                                                                                <listeners
-                                                                                                        jcr:primaryType="nt:unstructured"
-                                                                                                        check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                                                                            </enable>
-                                                                                            <events
-                                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                                    attribute="adhocevents"
-                                                                                                    fieldDescription="e.g.: event2, event7."
-                                                                                                    fieldLabel="Include SiteCatalyst events"
-                                                                                                    name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                                                                                    xtype="textfield"/>
-                                                                                            <evars
-                                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                                    attribute="adhocevars"
-                                                                                                    fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                                                                                    fieldLabel="Include SiteCatalyst variables"
-                                                                                                    name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                                                                                    xtype="textfield"/>
-                                                                                        </items>
-                                                                                    </linkAdvanced>
-                                                                                </linkAttributes>
-                                                                            </linkDialogConfig>
-                                                                        </links>
-                                                                        <misctools
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <edit
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <findreplace
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <format
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <undo
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <subsuperscript
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <lists
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <justify
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <paraformat
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <fullscreen
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                    </rtePlugins>
-                                                                    <uiSettings jcr:primaryType="nt:unstructured">
-                                                                        <cui jcr:primaryType="nt:unstructured">
-                                                                            <inline
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    toolbar="[#format,-,#justify,fullscreen#start]">
-                                                                                <popovers jcr:primaryType="nt:unstructured">
-                                                                                    <justify
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                                                                            ref="justify"/>
-                                                                                    <lists
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                                                                            ref="lists"/>
-                                                                                    <format
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="[format#bold,format#italic,format#underline]"
-                                                                                            ref="format"/>
-                                                                                </popovers>
-                                                                            </inline>
-                                                                            <fullscreen
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                                                                                <popovers jcr:primaryType="nt:unstructured">
-                                                                                    <paraformat
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="paraformat:getFormats:paraformat-pulldown"
-                                                                                            ref="paraformat"/>
-                                                                                </popovers>
-                                                                            </fullscreen>
-                                                                        </cui>
-                                                                    </uiSettings>
-                                                                </richTextEnumNames>
                                                             </items>
                                                         </field>
                                                     </enumOptions>
@@ -349,13 +113,6 @@
                                                                granite:class="cmp-adaptiveform-base__enumNamesHidden"
                                                                granite:hidden="true"/>
                                                     </enumNames>
-                                                    <areOptionsRichText
-                                                            jcr:primaryType="nt:unstructured"
-                                                            granite:class="cmp-adaptiveform-base__areOptionsRichText"
-                                                            sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                                            name="./areOptionsRichText"
-                                                            text="Allow Rich Text for Options"
-                                                            value="true"/>
                                                 </items>
                                             </enums>
                                             <bindref
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
index fc6d62c32d..2781716db4 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
@@ -28,128 +28,10 @@
             jcr:primaryType="cq:InplaceEditingConfig"
             active="{Boolean}true"
             configPath="inplaceEditingConfig"
-            editorType="text">
+            editorType="plaintext">
         <inplaceEditingConfig
                 jcr:primaryType="nt:unstructured"
                 editElementQuery="label:first"
-                textPropertyName="jcr:title">
-            <rtePlugins jcr:primaryType="nt:unstructured">
-                <footnoteplugin
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <links jcr:primaryType="nt:unstructured">
-                    <linkDialogConfig
-                            jcr:primaryType="nt:unstructured"
-                            height="{Long}316">
-                        <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                            <linkAdvanced
-                                    jcr:primaryType="cq:Widget"
-                                    collapsed="{Boolean}true"
-                                    collapsible="{Boolean}true"
-                                    inputValue="advanced"
-                                    name="./linkdialog/cq:adhocLinkTrackingTab"
-                                    title="Link tracking">
-                                <items jcr:primaryType="cq:WidgetCollection">
-                                    <enable
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="enabletracking"
-                                            fieldDescription="override analytics framework settings."
-                                            fieldLabel="Custom link tracking"
-                                            name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                            xtype="checkbox">
-                                        <listeners
-                                                jcr:primaryType="nt:unstructured"
-                                                check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                    </enable>
-                                    <events
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevents"
-                                            fieldDescription="e.g.: event2, event7."
-                                            fieldLabel="Include SiteCatalyst events"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                            xtype="textfield"/>
-                                    <evars
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevars"
-                                            fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                            fieldLabel="Include SiteCatalyst variables"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                            xtype="textfield"/>
-                                </items>
-                            </linkAdvanced>
-                        </linkAttributes>
-                    </linkDialogConfig>
-                </links>
-                <misctools
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <edit
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <findreplace
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <format
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <undo
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <subsuperscript
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <lists
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <justify
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <paraformat
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-            </rtePlugins>
-            <uiSettings jcr:primaryType="nt:unstructured">
-                <cui jcr:primaryType="nt:unstructured">
-                    <inline
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[#format,-,#justify,-,#lists,-,links#modifylink,links#unlink,-,footnoteplugin#footnotecommand,-,fullscreen#start,-,control#close,control#save]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <justify
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                    ref="justify"/>
-                            <lists
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                    ref="lists"/>
-                            <format
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[format#bold,format#italic,format#underline]"
-                                    ref="format"/>
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[paraformat:getFormats:paraformat-pulldown]"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </inline>
-                    <fullscreen
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,footnoteplugin#footnotecommand,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="paraformat:getFormats:paraformat-pulldown"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </fullscreen>
-                    <additionalClasses jcr:primaryType="nt:unstructured">
-                        <footnotecommand
-                                jcr:primaryType="nt:unstructured"
-                                classes="rte--trigger"
-                                command="footnoteplugin#footnotecommand"/>
-                    </additionalClasses>
-                </cui>
-            </uiSettings>
-        </inplaceEditingConfig>
+                textPropertyName="jcr:title"/>
     </cq:inplaceEditing>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/css/base.less b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/css/base.less
index 27d86480e2..a99493ca10 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/css/base.less
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/css/base.less
@@ -55,7 +55,7 @@
 /**
  * overriding default height of rte editor text area
  */
-[class*='cmp-button__editdialog'] .cq-RichText-editable, [class*='cmp-adaptiveform'] .cq-RichText-editable {
+[class*='cmp-adaptiveform'] .cq-RichText-editable {
     height: 6.1rem;
     max-height: 6.1rem;
     overflow-y: auto;
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js
index 48a804c114..f9f17028ec 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-(function($, ns, channel) {
+(function($, ns, channel, Coral) {
     "use strict";
 
-    let EDIT_DIALOG = ".cmp-adaptiveform-base__editdialogbasic",
+    var EDIT_DIALOG = ".cmp-adaptiveform-base__editdialogbasic",
         BASE_REQUIRED = ".cmp-adaptiveform-base__required",
         BASE_ASSISTPRIORITY = ".cmp-adaptiveform-base__assistpriority",
         BASE_VISIBLE = ".cmp-adaptiveform-base__visible",
@@ -25,20 +25,9 @@
         BASE_ENUMNAMES_VISIBLE = ".cmp-adaptiveform-base__enumNames",
         BASE_ENUMNAMES_HIDDEN = ".cmp-adaptiveform-base__enumNamesHidden",
         BASE_ASSISTPRIORITY_CUSTOMTEXT = ".cmp-adaptiveform-base__assistpriority-customtext",
-        BASE_TITLE = ".cmp-adaptiveform-base__title",
-        BASE_RICH_TEXT_TITLE_NAME = "cmp-adaptiveform-base__richtexttitle",
-        BASE_RICH_TEXT_TITLE = "."+ BASE_RICH_TEXT_TITLE_NAME,
-        BASE_WRAPPER_INPUT_RICH_TEXT_TITLE = "[data-cq-richtext-input='true'][data-wrapperclass='" + BASE_RICH_TEXT_TITLE_NAME + "']",
-        BASE_WRAPPER_VALUE_RICH_TEXT_TITLE = "[data-cq-richtext-editable='true'][data-wrapperclass='" + BASE_RICH_TEXT_TITLE_NAME + "']",
-        BASE_IS_TITLE_RICH_TEXT = ".cmp-adaptiveform-base__istitlerichtext",
-        BASE_RICH_TEXT_ENUMNAMES_NAME = "cmp-adaptiveform-base__richTextEnumNames",
-        BASE_RICH_TEXT_ENUMNAMES = "." + BASE_RICH_TEXT_ENUMNAMES_NAME,
-        BASE_WRAPPER_INPUT_RICH_TEXT_ENUMNAMES = "[data-cq-richtext-input='true'][data-wrapperclass='" + BASE_RICH_TEXT_ENUMNAMES_NAME + "']",
-        BASE_WRAPPER_VALUE_RICH_TEXT_ENUMNAMES = "[data-cq-richtext-editable='true'][data-wrapperclass='" + BASE_RICH_TEXT_ENUMNAMES_NAME + "']",
-        BASE_ARE_OPTIONS_RICH_TEXT = ".cmp-adaptiveform-base__areOptionsRichText",
+        BASE_DORBINDREF = ".cmp-adaptiveform-base__dorBindRef",
         V2_ADAPTIVE_FORM_CONTAINER_COMPONENT_ATTRIBUTE = "form[data-cmp-is='adaptiveFormContainer']",
         V2_ADAPTIVE_FORM_CONTAINER_COMPONENT_PATH_ATTRIBUTE = "data-cmp-path",
-        BASE_ENUM_MULTIFIELD_ADD_BUTTON = "coral-multifield[data-granite-coral-multifield-name='./enum'] button[coral-multifield-add]",
         Utils = window.CQ.FormsCoreComponents.Utils.v1;
 
 
@@ -166,72 +155,6 @@
         }
     }
 
-    /**
-     * hides the RTE/plain text field on the basis of rich text checkbox and
-     * resolves it's value.
-     *
-     * @param {HTMLElement} dialog The dialog on which the operation is to be performed.
-     * @param isTitleRichText is rich text checkbox selected.
-     * @param isToggled is this function being called on toggle of rich text checkbox.
-     */
-    function resolveRichText(dialog, isTitleRichText, isToggled) {
-        let title = dialog.find(BASE_TITLE)[0],
-            richTextTitle = dialog.find(BASE_RICH_TEXT_TITLE)[0],
-            richTextTitleDiv = dialog.find(BASE_WRAPPER_VALUE_RICH_TEXT_TITLE)[0];
-        if(isTitleRichText.checked){
-            Utils.hideComponent(title, "div");
-            Utils.showComponent(richTextTitle, "div");
-            copyTextValueToRte(title, richTextTitleDiv);
-        } else {
-            Utils.hideComponent(richTextTitle, "div");
-            Utils.showComponent(title, "div");
-            if(isToggled){
-                title.value = $('<div>').html(richTextTitleDiv.innerHTML).text();
-            }
-        }
-    }
-
-    /**
-     * hides the RTE/plain text field on the basis of rich text checkbox and
-     * resolves it's value for enumNAmes/Options.
-     *
-     * @param {HTMLElement} dialog The dialog on which the operation is to be performed.
-     * @param areOptionsRichText is rich text checkbox selected.
-     * @param isToggled is this function being called on toggle of rich text checkbox.
-     */
-    function resolveRichTextOptions(dialog, areOptionsRichText, isToggled) {
-        let enumNames = dialog.find(BASE_ENUMNAMES_VISIBLE),
-            richTextEnumNames = dialog.find(BASE_RICH_TEXT_ENUMNAMES),
-            richTextEnumNamesInput = dialog.find(BASE_WRAPPER_INPUT_RICH_TEXT_ENUMNAMES),
-            richTextEnumNamesDiv = dialog.find(BASE_WRAPPER_VALUE_RICH_TEXT_ENUMNAMES);
-        if(areOptionsRichText != null && areOptionsRichText.checked){
-            for (let i = 0; i < richTextEnumNames.length; i++) {
-                Utils.hideComponent(enumNames[i], "div");
-                Utils.showComponent(richTextEnumNames[i], "div");
-                copyTextValueToRte(enumNames[i], richTextEnumNamesDiv[i]);
-                richTextEnumNamesInput[i].value = enumNames[i].value;
-            }
-        } else {
-            for (let i = 0; i < richTextEnumNames.length; i++) {
-                Utils.hideComponent(richTextEnumNames[i], "div");
-                Utils.showComponent(enumNames[i], "div");
-                if(isToggled){
-                    enumNames[i].value = $('<div>').html(richTextEnumNamesDiv[i].innerHTML).text();
-                }
-            }
-        }
-    }
-
-    function copyTextValueToRte (textElem, richTextElem) {
-        richTextElem.innerHTML = Utils.encodeScriptableTags(textElem.value);
-    }
-
-    function changeTextValue(textValue, richTextValue) {
-        if(textValue && richTextValue) {
-            textValue.value = Utils.encodeScriptableTags(richTextValue.value);
-        }
-    }
-
     /**
      * Initialise the conditional display of the various elements of the dialog.
      *
@@ -239,9 +162,7 @@
      */
     function initialise(dialog) {
         dialog = $(dialog);
-        let baseRequired = dialog.find(BASE_REQUIRED)[0],
-            isTitleRichText = dialog.find(BASE_IS_TITLE_RICH_TEXT)[0],
-            areOptionsRichText = dialog.find(BASE_ARE_OPTIONS_RICH_TEXT)[0];
+        var baseRequired = dialog.find(BASE_REQUIRED)[0];
         if (baseRequired) {
             handleRequired(dialog, baseRequired);
             baseRequired.on("change", function() {
@@ -253,69 +174,14 @@
         showHideDoRBindRefField(dialog);
         validateName();
         handleDialogSubmit(dialog);
-        if (isTitleRichText) {
-            resolveRichText(dialog, isTitleRichText, false);
-            isTitleRichText.on("change", function() {
-                resolveRichText(dialog, isTitleRichText, true);
-            });
-        }
-        if (areOptionsRichText) {
-            resolveRichTextOptions(dialog, areOptionsRichText, false);
-            areOptionsRichText.on("change", function() {
-                resolveRichTextOptions(dialog, areOptionsRichText, true);
-            });
-        }
     }
 
-    /**
-     * whenever RTE value of enumName is changed, we save it's value corresponding to text value field.
-     */
-    function updateEnumNamesOnChange(){
-        channel.on("change", BASE_WRAPPER_VALUE_RICH_TEXT_ENUMNAMES, function (e) {
-            let richTextValue = channel.find(BASE_WRAPPER_INPUT_RICH_TEXT_ENUMNAMES),
-                textValue = channel.find(BASE_ENUMNAMES_VISIBLE);
-            for(let i=0; i<textValue.length; i++){
-                if(textValue[i] && richTextValue[i]){
-                    changeTextValue(textValue[i], richTextValue[i]);
-                }
-            }
-        });
-    };
-
-    /**
-     * whenever RTE value of richTextTitle is changed, we save it's value to corresponding text value field.
-     */
-    function updateRichTextTitleOnChange() {
-        channel.on("change", BASE_WRAPPER_VALUE_RICH_TEXT_TITLE, function (e) {
-            var richTextValue = channel.find(BASE_WRAPPER_INPUT_RICH_TEXT_TITLE)[0],
-                textValue = channel.find(BASE_TITLE)[0];
-            changeTextValue(textValue, richTextValue);
-        });
-    };
-
-    /**
-     * whenever we add a new option for enums,
-     * we want to hide it's RTE/plain text field on the basis rich text checkbox.
-     */
-    function updateEnumNamesOnAdd() {
-        channel.on("click", BASE_ENUM_MULTIFIELD_ADD_BUTTON, function (e) {
-            let areOptionsRichText = $(BASE_ARE_OPTIONS_RICH_TEXT)[0],
-                enumNames = $(BASE_ENUMNAMES_VISIBLE),
-                richTextEnumNames = $(BASE_RICH_TEXT_ENUMNAMES);
-            if(areOptionsRichText != null && areOptionsRichText.checked){
-                for (let i = 0; i < richTextEnumNames.length; i++) {
-                    Utils.hideComponent(enumNames[i], "div");
-                    Utils.showComponent(richTextEnumNames[i], "div");
-                }
-            } else {
-                for (let i = 0; i < richTextEnumNames.length; i++) {
-                    Utils.hideComponent(richTextEnumNames[i], "div");
-                    Utils.showComponent(enumNames[i], "div");
-                }
-            }
-        });
-    };
-
-    Utils.initializeEditDialog(EDIT_DIALOG)(initialise, updateRichTextTitleOnChange, updateEnumNamesOnAdd, updateEnumNamesOnChange);
+    channel.on("foundation-contentloaded", function(e) {
+        if ($(e.target).find(EDIT_DIALOG).length > 0) {
+            Coral.commons.ready(e.target, function(component) {
+                initialise(component);
+            });
+        }
+    });
 
-})(jQuery, Granite.author, jQuery(document));
\ No newline at end of file
+})(jQuery, Granite.author, jQuery(document), Coral);
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml
index 7b8aa8e96a..0d53a69346 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml
@@ -18,7 +18,6 @@
   jcr:primaryType="nt:unstructured"
   jcr:title="Adaptive Form Button"
   sling:resourceType="cq/gui/components/authoring/dialog"
-  extraClientlibs="[core.forms.components.base.v1.editor]"
   helpPath="https://www.adobe.com/go/aem_af_cmp_button_v1"
   trackingFeature="core-components:adaptiveform-button:v1">
   <content
@@ -38,7 +37,8 @@
               jcr:title="Basic"
               sling:resourceType="granite/ui/components/coral/foundation/container">
               <items 
-                jcr:primaryType="nt:unstructured">
+                jcr:primaryType="nt:unstructured"
+                sling:hideChildren="[hideTitle,placeholder]">
                 <columns
                         jcr:primaryType="nt:unstructured"
                         sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
@@ -47,8 +47,7 @@
                     <column
                             jcr:primaryType="nt:unstructured"
                             sling:resourceType="granite/ui/components/coral/foundation/container">
-                      <items jcr:primaryType="nt:unstructured"
-                             sling:hideChildren="[hideTitle,placeholder]">
+                      <items jcr:primaryType="nt:unstructured">
                         <value
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml
index 3e6675c4ea..63c5560daa 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml
@@ -28,128 +28,10 @@
             jcr:primaryType="cq:InplaceEditingConfig"
             active="{Boolean}true"
             configPath="inplaceEditingConfig"
-            editorType="text">
+            editorType="plaintext">
         <inplaceEditingConfig
                 jcr:primaryType="nt:unstructured"
                 editElementQuery="span:first"
-                textPropertyName="jcr:title">
-            <rtePlugins jcr:primaryType="nt:unstructured">
-                <footnoteplugin
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <links jcr:primaryType="nt:unstructured">
-                    <linkDialogConfig
-                            jcr:primaryType="nt:unstructured"
-                            height="{Long}316">
-                        <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                            <linkAdvanced
-                                    jcr:primaryType="cq:Widget"
-                                    collapsed="{Boolean}true"
-                                    collapsible="{Boolean}true"
-                                    inputValue="advanced"
-                                    name="./linkdialog/cq:adhocLinkTrackingTab"
-                                    title="Link tracking">
-                                <items jcr:primaryType="cq:WidgetCollection">
-                                    <enable
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="enabletracking"
-                                            fieldDescription="override analytics framework settings."
-                                            fieldLabel="Custom link tracking"
-                                            name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                            xtype="checkbox">
-                                        <listeners
-                                                jcr:primaryType="nt:unstructured"
-                                                check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                    </enable>
-                                    <events
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevents"
-                                            fieldDescription="e.g.: event2, event7."
-                                            fieldLabel="Include SiteCatalyst events"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                            xtype="textfield"/>
-                                    <evars
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevars"
-                                            fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                            fieldLabel="Include SiteCatalyst variables"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                            xtype="textfield"/>
-                                </items>
-                            </linkAdvanced>
-                        </linkAttributes>
-                    </linkDialogConfig>
-                </links>
-                <misctools
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <edit
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <findreplace
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <format
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <undo
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <subsuperscript
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <lists
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <justify
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <paraformat
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-            </rtePlugins>
-            <uiSettings jcr:primaryType="nt:unstructured">
-                <cui jcr:primaryType="nt:unstructured">
-                    <inline
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[#format,-,#justify,-,#lists,-,links#modifylink,links#unlink,-,footnoteplugin#footnotecommand,-,fullscreen#start,-,control#close,control#save]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <justify
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                    ref="justify"/>
-                            <lists
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                    ref="lists"/>
-                            <format
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[format#bold,format#italic,format#underline]"
-                                    ref="format"/>
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[paraformat:getFormats:paraformat-pulldown]"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </inline>
-                    <fullscreen
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,footnoteplugin#footnotecommand,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="paraformat:getFormats:paraformat-pulldown"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </fullscreen>
-                    <additionalClasses jcr:primaryType="nt:unstructured">
-                        <footnotecommand
-                                jcr:primaryType="nt:unstructured"
-                                classes="rte--trigger"
-                                command="footnoteplugin#footnotecommand"/>
-                    </additionalClasses>
-                </cui>
-            </uiSettings>
-        </inplaceEditingConfig>
+                textPropertyName="jcr:title"/>
     </cq:inplaceEditing>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html
index 80e5376592..67ac6e522b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html
@@ -39,7 +39,7 @@
       data-cmp-data-layer="${button.data.json}"
       aria-label="${button.label.visible != false ? '' : button.label.value}">
     <sly data-sly-call="${iconTemplate.icon @ icon=button.icon}"></sly>
-    <span data-sly-test="${button.label.value && button.label.visible != false}" class="cmp-adaptiveform-button__text" data-richtext="${button.label.richText}">${button.label.value @ context = button.label.richText ? 'html' : 'text'}</span>
+    <span data-sly-test="${button.label.value && button.label.visible != false}" class="cmp-adaptiveform-button__text">${button.label.value}</span>
   </button>
   <div data-sly-call="${shortDescription.shortDescription @componentId=button.id, shortDescriptionVisible=button.tooltipVisible, shortDescription=button.tooltip, bemBlock='cmp-adaptiveform-button'}" data-sly-unwrap>
   </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html
index f5316ce0dc..97e2c2f912 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html
@@ -44,7 +44,7 @@
             value="${checkbox.default[0]}"
             disabled="${!checkbox.enabled}" />
 
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkbox.label.value, labelVisible=checkbox.label.visible, labelRichText=checkbox.label.richText, bemBlock='cmp-adaptiveform-checkbox'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkbox.label.value, labelVisible=checkbox.label.visible, bemBlock='cmp-adaptiveform-checkbox'}" data-sly-unwrap></div>
     </div>
 
     <div data-sly-call="${shortDescription.shortDescription @componentId=checkbox.id, shortDescriptionVisible=checkbox.tooltipVisible, shortDescription=checkbox.tooltip, bemBlock='cmp-adaptiveform-checkbox'}" data-sly-unwrap>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
index 3c524e065c..500d0965ce 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
@@ -35,7 +35,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[checkboxgroup.id, 'widget']}">
     <div class="cmp-adaptiveform-checkboxgroup__label-container">
-        <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, labelRichText=checkboxgroup.label.richText, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+        <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
         <div data-sly-call="${questionMark.questionMark @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
     </div>
     <sly data-sly-call="${widget.widget @ checkboxgroup = checkboxgroup}"></sly>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
index 211de57194..65d6b54424 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
@@ -25,7 +25,7 @@
                  checked="${checkboxgroup.enums[itemList.index] in checkboxgroup.default }"
                  disabled="${!checkboxgroup.enabled || checkboxgroup.readOnly}"
                  aria-readonly="${checkboxgroup.readOnly ? 'true' : ''}"/>
-          <span>${checkboxgroup.enumNamesAsTextContent[itemList.index].value @ context = checkboxgroup.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}</span>
+          <span>${checkboxgroup.enumNames[itemList.index]}</span>
         </label>
       </div>
     </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
index 40008b700d..bd72121afc 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
@@ -20,6 +20,5 @@ componentutils.js
 replacehook.js
 dorhook.js
 copypastehook.js
-toolbaractionhook.js
 qualifiedNameHook.js
 panelselect.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
deleted file mode 100644
index 9610ad0139..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-(function (ns) {
-    "use strict";
-    let superSitesEditorAppendButton = ns.edit.Toolbar.prototype.appendButton;
-
-    /**
-     * @override
-     */
-    ns.edit.Toolbar.prototype.appendButton = function (editable, name, action) {
-        correctEditableEditorType(editable, name);
-        superSitesEditorAppendButton.apply(this, [editable, name, action]);
-    };
-
-    /**
-     * @override
-     * In case of forms editor we are overriding sites toolbar actions and has a custom toolbar implementation.
-     * Therefore, needs a special handling.
-     */
-    if(window.guidelib){
-        var superFormsEditorAppendButton = window.guidelib.touchlib.editToolbar.prototype.appendButton;
-        window.guidelib.touchlib.editToolbar.prototype.appendButton = function (editable, name, action) {
-            //adding this check because we don't want to change editorType for v1 forms.
-            if(window.guidelib.touchlib.utils.checkIfCoreComponentsBasedForm()){
-                correctEditableEditorType(editable, name);
-            }
-            superFormsEditorAppendButton.apply(this, [editable, name, action]);
-        };
-    };
-
-    const correctEditableEditorType = function (editable, name) {
-        if (name == "EDIT") {
-            var hasRichTextLabel = editable.dom.find("[class$='__label']")[0] && editable.dom.find("[class$='__label']")[0].getAttribute("data-richtext") != null,
-                hasRichTextAttribute = editable.dom.find("[class$='__text']")[0] && editable.dom.find("[class$='__text']")[0].getAttribute("data-richtext") != null;
-            // We are checking for data-richtext in component to decide whether open rich-text inplace editor or plain text editor
-            if(!(hasRichTextLabel || hasRichTextAttribute)){
-                editable.config.editConfig.inplaceEditingConfig.editorType="plaintext";
-            }
-        }
-    };
-
-}(Granite.author));
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html
index 4326e7e89d..b4f64bfcc0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html
@@ -32,7 +32,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[datePicker.id, 'widget']}">
      <div class="cmp-adaptiveform-datepicker__label-container">
-        <div data-sly-call="${label.label @componentId=widgetId, labelValue=datePicker.label.value, labelVisible=datePicker.label.visible, labelRichText=datePicker.label.richText, bemBlock='cmp-adaptiveform-datepicker'}" data-sly-unwrap></div>
+        <div data-sly-call="${label.label @componentId=widgetId, labelValue=datePicker.label.value, labelVisible=datePicker.label.visible, bemBlock='cmp-adaptiveform-datepicker'}" data-sly-unwrap></div>
         <div data-sly-call="${questionMark.questionMark @componentId=datePicker.id, longDescription=datePicker.description, bemBlock='cmp-adaptiveform-datepicker'}" data-sly-unwrap></div>
      </div>
      <input type="date"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml
index b641f450df..d9a5236366 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml
@@ -69,53 +69,10 @@
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
                                                     name="./type"/>
                                             <enums jcr:primaryType="nt:unstructured"
-                                                   sling:resourceType="granite/ui/components/coral/foundation/container"
-                                                   sling:orderBefore="bindref">
-                                                <items jcr:primaryType="nt:unstructured">
-                                                    <enumOptions jcr:primaryType="nt:unstructured"
-                                                                 sling:orderBefore="bindref"
-                                                                 sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                                 fieldDescription="Provide the pair of enum (data value) and enumName (display text) for each option."
-                                                                 fieldLabel="Options">
-                                                        <field jcr:primaryType="nt:unstructured"
-                                                               sling:resourceType="granite/ui/components/coral/foundation/container"
-                                                               name="./enum">
-                                                            <items jcr:primaryType="nt:unstructured">
-                                                                <enum jcr:primaryType="nt:unstructured"
-                                                                      sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                                      granite:class="cmp-adaptiveform-base__enum"
-                                                                      name="./enum"
-                                                                      fieldLabel="Data value"
-                                                                      fieldDescription="Specify the content to submit, when the option is selected."
-                                                                      required="{Boolean}true"/>
-                                                                <enumNames
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                                        granite:class="cmp-adaptiveform-base__enumNames"
-                                                                        name="./enumNames"
-                                                                        fieldLabel="Display text"
-                                                                        fieldDescription="Specify the content to display in the adaptive form."
-                                                                        required="{Boolean}false"/>
-                                                                <richTextEnumNames
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        sling:hideResource="{Boolean}true"/>
-                                                            </items>
-                                                        </field>
-                                                    </enumOptions>
-                                                    <enumNames jcr:primaryType="nt:unstructured"
-                                                               sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                               granite:hidden="true">
-                                                        <field jcr:primaryType="nt:unstructured"
-                                                               sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                               name="./enumNames"
-                                                               granite:class="cmp-adaptiveform-base__enumNamesHidden"
-                                                               granite:hidden="true"/>
-                                                    </enumNames>
-                                                    <areOptionsRichText
-                                                            jcr:primaryType="nt:unstructured"
-                                                            sling:hideResource="true"/>
-                                                </items>
-                                            </enums>
+                                                   sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                   path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/enums"
+                                                   sling:orderBefore="placeholder"
+                                                   sling:hideResource="{Boolean}false"/>
                                             <multiSelect
                                                     granite:class="cmp-adaptiveform-dropdown__allowmultiselect"
                                                     jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html
index b9b5255483..399af2569e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[dropdown.id, 'widget']}">
     <div class="cmp-adaptiveform-dropdown__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=dropdown.label.value, labelVisible=dropdown.label.visible, labelRichText=dropdown.label.richText, bemBlock='cmp-adaptiveform-dropdown'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=dropdown.label.value, labelVisible=dropdown.label.visible, bemBlock='cmp-adaptiveform-dropdown'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=dropdown.id, longDescription=dropdown.description, bemBlock='cmp-adaptiveform-dropdown'}" data-sly-unwrap></div>
     </div>
     <select class="cmp-adaptiveform-dropdown__widget"
@@ -48,11 +48,11 @@
         <div data-sly-test.isPlaceHolderSet="${dropdown.placeHolder != null}" data-sly-unwrap></div>
         <option data-sly-test="${!isPlaceHolderSet}" role="none" style="display: none;"></option>
         <option data-sly-test="${isPlaceHolderSet}" value="" disabled selected>${dropdown.placeHolder}</option>
-        <div data-sly-list.enumName="${dropdown.enumNamesAsTextContent}" data-sly-unwrap>
-            <div data-sly-test="${dropdown.enums[enumNameList.index] != null}" data-sly-unwrap>
+        <div data-sly-list.enumName="${dropdown.enumNames}" data-sly-unwrap>
+            <div data-sly-test="${enumName != null && dropdown.enums[enumNameList.index] != null}" data-sly-unwrap>
                 <option value="${dropdown.enums[enumNameList.index].toString}"
                         class="cmp-adaptiveform-dropdown__option"
-                        data-sly-attribute.selected="${dropdown.enums[enumNameList.index] in dropdown.default ? 'selected' : ''}">${enumName.value}</option>
+                        data-sly-attribute.selected="${dropdown.enums[enumNameList.index] in dropdown.default ? 'selected' : ''}">${enumName}</option>
             </div>
         </div>
     </select>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html
index b352146248..4d7cad4cde 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[email.id, 'widget']}">
     <div class="cmp-adaptiveform-emailinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=email.label.value, labelVisible=email.label.visible, labelRichText=email.label.richText, bemBlock='cmp-adaptiveform-emailinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=email.label.value, labelVisible=email.label.visible, bemBlock='cmp-adaptiveform-emailinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=email.id, longDescription=email.description, bemBlock='cmp-adaptiveform-emailinput'}" data-sly-unwrap></div>
     </div>
     <input title="${email.tooltipVisible ? '' : email.tooltipText}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html
index 60659eb879..ccce82d709 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html
@@ -31,7 +31,7 @@
      data-cmp-readonly="${file.readOnly ? 'true' : 'false'}"
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
     <div class="cmp-adaptiveform-fileinput__label-container">
-      <div data-sly-call="${label.label @componentId=file.id, labelValue=file.label.value, labelVisible=file.label.visible, labelRichText=file.label.richText, bemBlock='cmp-adaptiveform-fileinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=file.id, labelValue=file.label.value, labelVisible=file.label.visible, bemBlock='cmp-adaptiveform-fileinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=file.id, longDescription=file.description, bemBlock='cmp-adaptiveform-fileinput'}" data-sly-unwrap></div>
     </div>
     </br>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
index 975e60a987..fbd9b14375 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
@@ -32,12 +32,6 @@
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:hideResource="true"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:hideResource="true"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:hideResource="true"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html
index d1cf01778c..c5060e8bde 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[numberinput.id, 'widget']}">
     <div class="cmp-adaptiveform-numberinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=numberinput.label.value, labelVisible=numberinput.label.visible, labelRichText=numberinput.label.richText, bemBlock='cmp-adaptiveform-numberinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=numberinput.label.value, labelVisible=numberinput.label.visible, bemBlock='cmp-adaptiveform-numberinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=numberinput.id, longDescription=numberinput.description, bemBlock='cmp-adaptiveform-numberinput'}" data-sly-unwrap></div>
     </div>
     <input
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
index 6dbbf022db..90177bda0c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
@@ -56,14 +56,6 @@
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
                                                     path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html
index 022b328ec6..88dcec3492 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html
@@ -24,7 +24,7 @@
          role="${container.roleAttribute}"
          style="${container.backgroundStyle @ context='styleString'}">
         <div class="cmp-container__label-container">
-          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-container'}" data-sly-unwrap></div>
+          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-container'}" data-sly-unwrap></div>
           <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-container'}" data-sly-unwrap></div>
         </div>
         <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-container'}" data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html
index 66a5c455ad..0706fda01e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html
@@ -26,7 +26,7 @@
          role="${container.roleAttribute}"
          style="${container.backgroundStyle @ context='styleString'}">
         <div class="cmp-container__label-container">
-          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-container'}" data-sly-unwrap></div>
+          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-container'}" data-sly-unwrap></div>
           <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-container'}" data-sly-unwrap></div>
         </div>
         <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-container'}" data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
index a6eab594a4..539bb16a29 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
@@ -34,7 +34,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[radioButton.id, 'widget']}">
     <div class="cmp-adaptiveform-radiobutton__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=radioButton.label.value, labelVisible=radioButton.label.visible, labelRichText=radioButton.label.richText, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=radioButton.label.value, labelVisible=radioButton.label.visible, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=radiobutton.id, longDescription=radioButton.description, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
     </div>
     <div class="cmp-adaptiveform-radiobutton__widget ${radioButton.orientation}" id="${widgetId}">
@@ -49,7 +49,7 @@
                         disabled="${!radioButton.enabled || radioButton.readOnly}"
                         checked="${radioButton.enums[itemList.index] == radioButton.default[0]}"
                         aria-readonly="${radioButton.readOnly ? 'true' : ''}"/>
-                  <span>${radioButton.enumNamesAsTextContent[itemList.index].value @ context = radioButton.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}</span>
+                  <span>${radioButton.enumNames[itemList.index]}</span>
               </label>
           </div>
       </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_dialog/.content.xml
index aa38acb23d..791e8a7fe7 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_dialog/.content.xml
@@ -53,14 +53,6 @@
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
                                                     path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html
index ab946ee8f5..3bd5ab2abc 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html
@@ -29,7 +29,7 @@
   data-placeholder-text="${wcmmode.edit && 'Please drag Tab components here' @ i18n}"
   data-sly-test.widgetId="${'{0}-{1}' @ format=[panel.id, 'widget']}">
      <div class="cmp-tabs__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
      </div>
      <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
@@ -49,7 +49,7 @@
          title="${panel.tooltipVisible ? '' : panel.tooltipText}"
          aria-controls="${tab.id}__tabpanel"
          tabindex="${isActive ? '0' : '-1'}"
-         data-cmp-hook-adaptiveFormTabs="tab">${tab.label.value @ context = tab.label.richText ? 'html' : 'text'}</li>
+         data-cmp-hook-adaptiveFormTabs="tab">${tab.label.value}</li>
  </ol>
  <div data-sly-repeat.item="${tabs.items}"
       data-sly-resource="${item.name @ decorationTagName='div'}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html
index 3b04de89ce..697a8e3134 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[telText.id, 'widget']}">
     <div class="cmp-adaptiveform-telephoneinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetIdd, labelValue=telText.label.value, labelVisible=telText.label.visible, labelRichText=telText.label.richText, bemBlock='cmp-adaptiveform-telephoneinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetIdd, labelValue=telText.label.value, labelVisible=telText.label.visible, bemBlock='cmp-adaptiveform-telephoneinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=telText.id, longDescription=telText.description, bemBlock='cmp-adaptiveform-telephoneinput'}" data-sly-unwrap></div>
     </div>
     <input title="${telText.tooltipVisible ? '' : telText.tooltipText}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
index 8bc40a2fd8..a47003a1ce 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
@@ -60,14 +60,6 @@
                                               jcr:primaryType="nt:unstructured"
                                               sling:resourceType="granite/ui/components/coral/foundation/include"
                                               path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <showApprovalOption
                                               jcr:primaryType="nt:unstructured"
                                               sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
@@ -96,6 +88,14 @@
                                               sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
                                               name="./showLink@TypeHint"
                                               value="Boolean"/>
+                                            <richTextTitle
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
+                                            <isTitleRichText
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <hideTitle
                                               jcr:primaryType="nt:unstructured"
                                               sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html
index b07c2e6ed9..9ebfcd21cf 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html
@@ -22,8 +22,7 @@
      data-cmp-data-layer="${textModel.data.json}"
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-cmp-visible="${textModel.visible}"
-     class="cmp-adaptiveform-text cmp-adaptiveform-text__label"
-     data-richtext>
+     class="cmp-adaptiveform-text">
     <div
          data-sly-test.text="${textModel.value}"
          tabindex="0">
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
index 23e41392be..18133bc449 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[text.id, 'widget']}">
     <div class="cmp-adaptiveform-textinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=text.label.value, labelVisible=text.label.visible, labelRichText=text.label.richText, bemBlock='cmp-adaptiveform-textinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=text.label.value, labelVisible=text.label.visible, bemBlock='cmp-adaptiveform-textinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=text.id, longDescription=text.description, bemBlock='cmp-adaptiveform-textinput'}" data-sly-unwrap></div>
     </div>
     <textarea data-sly-test.useTextarea="${text.multiLine}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
index 052452aecc..e637c8af16 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
@@ -27,7 +27,7 @@
                  disabled="${!checkboxgroup.enabled || checkboxgroup.readOnly}"
                  aria-readonly="${checkboxgroup.readOnly ? 'true' : ''}"/>
           <a class="cmp-adaptiveform-checkboxgroup__links" title="${checkboxgroup.enumNames[itemList.index]}" href="${checkboxgroup.enums[itemList.index].toString@context='uri'}" target="_blank">
-            ${checkboxgroup.enumNamesAsTextContent[itemList.index].value @ context = checkboxgroup.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}
+            <span>${checkboxgroup.enumNames[itemList.index]}</span>
           </a>
         </label>
       </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_dialog/.content.xml
index 2448eb319c..2ea10bb224 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_dialog/.content.xml
@@ -53,14 +53,6 @@
                                               jcr:primaryType="nt:unstructured"
                                               sling:resourceType="granite/ui/components/coral/foundation/include"
                                               path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <hideTitle
                                               jcr:primaryType="nt:unstructured"
                                               sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/verticaltabs.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/verticaltabs.html
index e6c810e3df..4565ab4007 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/verticaltabs.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/verticaltabs.html
@@ -29,7 +29,7 @@
   data-placeholder-text="${wcmmode.edit && 'Please drag Vertical Tabs components here' @ i18n}"
   data-sly-test.widgetId="${'{0}-{1}' @ format=[panel.id, 'widget']}">
      <div class="cmp-verticaltabs__label-container">
-        <div data-sly-call="${label.label @componentId=widgetId, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-verticaltabs'}" data-sly-unwrap></div>
+        <div data-sly-call="${label.label @componentId=widgetId, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-verticaltabs'}" data-sly-unwrap></div>
         <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-verticaltabs'}" data-sly-unwrap></div>
      </div>
      <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-verticaltabs'}" data-sly-unwrap></div>
@@ -48,7 +48,7 @@
          title="${panel.tooltipVisible ? '' : panel.tooltipText}"
          aria-controls="${tab.id}__tabpanel"
          tabindex="${isActive ? '0' : '-1'}"
-         data-cmp-hook-adaptiveFormVerticalTabs="tab">${tab.label.value @ context = tab.label.richText ? 'html' : 'text'}</li>
+         data-cmp-hook-adaptiveFormVerticalTabs="tab">${tab.label.value}</li>
  </ol>
  <div data-sly-repeat.item="${tabs.items}"
       data-sly-resource="${item.name @ decorationTagName='div'}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html
index 460f4550bb..664ba4d52c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html
@@ -32,7 +32,7 @@
         data-placeholder-text="${'Please drag Wizard components here' @ i18n}"
         data-sly-test.widgetId="${'{0}-{1}' @ format=[wizard.id, 'widget']}">
         <div class="cmp-adaptiveform-wizard__label-container">
-          <div data-sly-call="${label.label @componentId=widgetId, labelValue=wizard.label.value, labelVisible=wizard.label.visible, labelRichText=wizard.label.richText, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
+          <div data-sly-call="${label.label @componentId=widgetId, labelValue=wizard.label.value, labelVisible=wizard.label.visible, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
           <div data-sly-call="${questionMark.questionMark @componentId=wizard.id, longDescription=wizard.description, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
         </div>
         <div data-sly-call="${shortDescription.shortDescription @componentId=wizard.id, shortDescriptionVisible=wizard.tooltipVisible, shortDescription=wizard.tooltip, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
@@ -51,7 +51,7 @@
                         aria-controls="${wizardItem.id}__wizardpanel"
                         tabindex="0"
                         data-cmp-hook-adaptiveFormWizard="tab">
-                        ${wizardItem.label.value @ context = wizardItem.label.richText ? 'html' : 'text'}
+                        ${wizardItem.label.value}
                     </li>
             </ol>
         </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/wizard.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/wizard.html
index 5181ca4fbc..19d0a1b397 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/wizard.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/wizard.html
@@ -32,7 +32,7 @@
   data-placeholder-text="${'Please drag Wizard components here' @ i18n}"
   data-sly-test.widgetId="${'{0}-{1}' @ format=[wizard.id, 'widget']}">
   <div class="cmp-adaptiveform-wizard__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=wizard.label.value, labelVisible=wizard.label.visible, labelRichText=wizard.label.richText, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
+    <div data-sly-call="${label.label @componentId=widgetId, labelValue=wizard.label.value, labelVisible=wizard.label.visible, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
     <div data-sly-call="${questionMark.questionMark @componentId=wizard.id, longDescription=wizard.description, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
   </div>
   <div data-sly-call="${shortDescription.shortDescription @componentId=wizard.id, shortDescriptionVisible=wizard.tooltipVisible, shortDescription=wizard.tooltip, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
@@ -51,7 +51,7 @@
                   aria-controls="${wizardItem.id}__wizardpanel"
                   tabindex="0"
                   data-cmp-hook-adaptiveFormWizard="tab">
-                  ${wizardItem.label.value @ context = wizardItem.label.richText ? 'html' : 'text'}
+                  ${wizardItem.label.value}
               </li>
       </ol>
   </div>
diff --git a/ui.tests/test-module/libs/commons/localeDataSets.js b/ui.tests/test-module/libs/commons/localeDataSets.js
index 317249caf7..c8fe10f4c5 100644
--- a/ui.tests/test-module/libs/commons/localeDataSets.js
+++ b/ui.tests/test-module/libs/commons/localeDataSets.js
@@ -1,10 +1,8 @@
 const selectors = {
     ACCORDION: '.cmp-accordion > .cmp-accordion__label-container > label',
     BUTTON: '.button.base:not(.submit):not(.reset) span',
-    CHECK_BOX1: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup1) .cmp-adaptiveform-checkboxgroup__label-container > label',
-    CHECK_BOX1_ITEM1: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup1) > div > div > label > span',
-    CHECK_BOX2: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup2) .cmp-adaptiveform-checkboxgroup__label-container > label',
-    CHECK_BOX2_ITEM1: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup2) > div > div > label > span',
+    CHECK_BOX: '.cmp-adaptiveform-checkboxgroup .cmp-adaptiveform-checkboxgroup__label-container > label',
+    CHECK_BOX_ITEM1: '.cmp-adaptiveform-checkboxgroup > div > div > label > span',
     DATE_INPUT: '.cmp-adaptiveform-datepicker label',
     DROPDOWN: '.cmp-adaptiveform-dropdown label',
     EMAIL_INPUT: '.cmp-adaptiveform-emailinput__label',
@@ -28,10 +26,8 @@ const languages = [
         TRANSLATION: {
             ACCORDION: 'Accordion',
             BUTTON: 'Button',
-            CHECK_BOX1: 'Check Box Group',
-            CHECK_BOX1_ITEM1: 'Item 1',
-            CHECK_BOX2: 'Select Animal',
-            CHECK_BOX2_ITEM1: 'Dog',
+            CHECK_BOX: 'Check Box Group',
+            CHECK_BOX_ITEM1: 'Item 1',
             DATE_INPUT: 'Date Input',
             DROPDOWN: 'Dropdown',
             EMAIL_INPUT: 'Email Input',
@@ -58,10 +54,8 @@ const languages = [
         LANGUAGE: 'German', LOCALE: 'de', TRANSLATION: {
             ACCORDION: 'Akkordeon',
             BUTTON: 'Knopf',
-            CHECK_BOX1: 'Kontrollkästchengruppe',
-            CHECK_BOX1_ITEM1: 'Punkt 1',
-            CHECK_BOX2: 'Tier auswählen',
-            CHECK_BOX2_ITEM1: 'Hund',
+            CHECK_BOX: 'Kontrollkästchengruppe',
+            CHECK_BOX_ITEM1: 'Punkt 1',
             DATE_INPUT: 'Datumseingabe',
             DROPDOWN: 'Dropdown-Menü',
             EMAIL_INPUT: 'E-Mail-Eingabe',
@@ -88,10 +82,8 @@ const languages = [
         LANGUAGE: 'Japanese', LOCALE: 'ja', TRANSLATION: {
             ACCORDION: 'アコーディオン',
             BUTTON: 'ボタン',
-            CHECK_BOX1: 'チェック ボックス グループ',
-            CHECK_BOX1_ITEM1: 'アイテム1',
-            CHECK_BOX2: '動物を選択',
-            CHECK_BOX2_ITEM1: '犬',
+            CHECK_BOX: 'チェック ボックス グループ',
+            CHECK_BOX_ITEM1: 'アイテム1',
             DATE_INPUT: '日付入力',
             DROPDOWN: 'ドロップダウン',
             EMAIL_INPUT: 'メール入力',
@@ -118,10 +110,8 @@ const languages = [
         LANGUAGE: 'Italian', LOCALE: 'it', TRANSLATION: {
             ACCORDION: 'Fisarmonica',
             BUTTON: 'Bottone',
-            CHECK_BOX1: 'Gruppo di caselle di controllo',
-            CHECK_BOX1_ITEM1: 'Articolo 1',
-            CHECK_BOX2: 'Seleziona animale',
-            CHECK_BOX2_ITEM1: 'Cane',
+            CHECK_BOX: 'Gruppo di caselle di controllo',
+            CHECK_BOX_ITEM1: 'Articolo 1',
             DATE_INPUT: 'Inserimento data',
             DROPDOWN: 'Menù a discesa',
             EMAIL_INPUT: 'Inserisci e-mail',
@@ -148,10 +138,8 @@ const languages = [
         LANGUAGE: 'French', LOCALE: 'fr', TRANSLATION: {
             ACCORDION: 'Accordéon',
             BUTTON: 'Bouton',
-            CHECK_BOX1: 'Groupe de cases à cocher',
-            CHECK_BOX1_ITEM1: 'Point 1 de l’ordre du jour',
-            CHECK_BOX2: 'Sélectionner un animal',
-            CHECK_BOX2_ITEM1: 'Chien',
+            CHECK_BOX: 'Groupe de cases à cocher',
+            CHECK_BOX_ITEM1: 'Point 1 de l’ordre du jour',
             DATE_INPUT: 'Saisie de la date',
             DROPDOWN: 'Liste déroulante',
             EMAIL_INPUT: 'Saisie par e-mail',
@@ -178,10 +166,8 @@ const languages = [
         LANGUAGE: 'Spanish', LOCALE: 'es', TRANSLATION: {
             ACCORDION: 'Acordeón',
             BUTTON: 'Botón',
-            CHECK_BOX1: 'Grupo de casillas de verificación',
-            CHECK_BOX1_ITEM1: 'Tema 1',
-            CHECK_BOX2: 'Seleccionar animal',
-            CHECK_BOX2_ITEM1: 'Perro',
+            CHECK_BOX: 'Grupo de casillas de verificación',
+            CHECK_BOX_ITEM1: 'Tema 1',
             DATE_INPUT: 'Entrada de fecha',
             DROPDOWN: 'Menú desplegable',
             EMAIL_INPUT: 'Entrada de correo electrónico',
@@ -208,10 +194,8 @@ const languages = [
         LANGUAGE: 'Korean', LOCALE: 'ko-kr', TRANSLATION: {
             ACCORDION: '아코디언',
             BUTTON: '단추',
-            CHECK_BOX1: '확인란 그룹',
-            CHECK_BOX1_ITEM1: '항목 1',
-            CHECK_BOX2: '동물 선택',
-            CHECK_BOX2_ITEM1: '개',
+            CHECK_BOX: '확인란 그룹',
+            CHECK_BOX_ITEM1: '항목 1',
             DATE_INPUT: '날짜 입력',
             DROPDOWN: '드롭다운',
             EMAIL_INPUT: '이메일 입력',
@@ -238,10 +222,8 @@ const languages = [
         LANGUAGE: 'Chinese Traditional', LOCALE: 'zh-tw', TRANSLATION: {
             ACCORDION: '手風琴',
             BUTTON: '按鈕',
-            CHECK_BOX1: '複選框組',
-            CHECK_BOX1_ITEM1: '專案1',
-            CHECK_BOX2: '選擇動物',
-            CHECK_BOX2_ITEM1: '狗',
+            CHECK_BOX: '複選框組',
+            CHECK_BOX_ITEM1: '專案1',
             DATE_INPUT: '日期輸入',
             DROPDOWN: '下拉清單',
             EMAIL_INPUT: '電子郵件輸入',
@@ -269,10 +251,8 @@ const languages = [
         LANGUAGE: 'Chinese Simplified', LOCALE: 'zh-cn', TRANSLATION: {
             ACCORDION: '手风琴',
             BUTTON: '按钮',
-            CHECK_BOX1: '复选框组',
-            CHECK_BOX1_ITEM1: '项目1',
-            CHECK_BOX2: '选择动物',
-            CHECK_BOX2_ITEM1: '狗',
+            CHECK_BOX: '复选框组',
+            CHECK_BOX_ITEM1: '项目1',
             DATE_INPUT: '日期输入',
             DROPDOWN: '下拉列表',
             EMAIL_INPUT: '电子邮件输入',
@@ -299,10 +279,8 @@ const languages = [
         LANGUAGE: 'Portuguese', LOCALE: 'pt-br', TRANSLATION: {
             ACCORDION: 'Acordeão',
             BUTTON: 'Botão',
-            CHECK_BOX1: 'Grupo de caixas de seleção',
-            CHECK_BOX1_ITEM1: 'Ponto 1',
-            CHECK_BOX2: 'Selecione Animal',
-            CHECK_BOX2_ITEM1: 'Cão',
+            CHECK_BOX: 'Grupo de caixas de seleção',
+            CHECK_BOX_ITEM1: 'Ponto 1',
             DATE_INPUT: 'Entrada de data',
             DROPDOWN: 'Menu suspenso',
             EMAIL_INPUT: 'Entrada de e-mail',
@@ -330,10 +308,8 @@ const languages = [
         LANGUAGE: 'Russian - Custom Locale added via overlay', LOCALE: 'ru-ru', TRANSLATION: {
             ACCORDION: 'Аккордеон',
             BUTTON: 'Пуговица',
-            CHECK_BOX1: 'Группа флажков',
-            CHECK_BOX1_ITEM1: 'Пункт 1',
-            CHECK_BOX2: 'Выберите животное',
-            CHECK_BOX2_ITEM1: 'Собака',
+            CHECK_BOX: 'Группа флажков',
+            CHECK_BOX_ITEM1: 'Пункт 1',
             DATE_INPUT: 'Ввод даты',
             DROPDOWN: 'Выпадающий список',
             EMAIL_INPUT: 'Ввод электронной почты',
@@ -361,10 +337,8 @@ const languages = [
         LANGUAGE: 'Hindi - Custom Locale added via clientlib', LOCALE: 'hi', TRANSLATION: {
             ACCORDION: 'अकॉर्डियन',
             BUTTON: 'बटन',
-            CHECK_BOX1: 'चेक बॉक्स समूह',
-            CHECK_BOX1_ITEM1: 'आइटम 1',
-            CHECK_BOX2: 'पशु का चयन करें',
-            CHECK_BOX2_ITEM1: 'कुत्ता',
+            CHECK_BOX: 'चेक बॉक्स समूह',
+            CHECK_BOX_ITEM1: 'आइटम 1',
             DATE_INPUT: 'दिनांक इनपुट',
             DROPDOWN: 'ड्रॉपडाउन',
             EMAIL_INPUT: 'ईमेल इनपुट',
diff --git a/ui.tests/test-module/specs/LocaleTest.spec.js b/ui.tests/test-module/specs/LocaleTest.spec.js
index 99913c4ea4..1dcf13889c 100644
--- a/ui.tests/test-module/specs/LocaleTest.spec.js
+++ b/ui.tests/test-module/specs/LocaleTest.spec.js
@@ -47,7 +47,7 @@ describe('Verify constants are changing for each language', function () {
                 cy.openPage(languageUrl + currentLang).then(waitForLangDataToLoad);
             }
             Object.entries(currLanguage.TRANSLATION).forEach(component => {
-                if(component[0] === 'CHECK_BOX1_ITEM1' || component[0] === 'CHECK_BOX2_ITEM1') {
+                if(component[0] === 'CHECK_BOX_ITEM1') {
                     cy.get(dataSet.selectors[component[0]]).eq(0).invoke('text').should('eq', component[1]);
                 }
                 else {
diff --git a/ui.tests/test-module/specs/button/button.authoring.spec.js b/ui.tests/test-module/specs/button/button.authoring.spec.js
index f9b1e355d7..c0da98e3df 100644
--- a/ui.tests/test-module/specs/button/button.authoring.spec.js
+++ b/ui.tests/test-module/specs/button/button.authoring.spec.js
@@ -48,7 +48,7 @@ describe('Button - Authoring', function () {
             .its('0.contentDocument.body').should('not.be.empty')
             .then(cy.wrap)
       }
-
+    
     const testButtonBehaviour = function(buttonEditPathSelector, buttonDrop, isSites) {
         if (isSites) {
             dropButtonInSites();
@@ -115,28 +115,8 @@ describe('Button - Authoring', function () {
                 testButtonBehaviourInilineEdit(buttonEditPathSelector, buttonDrop);
                 cy.deleteComponentByPath(buttonDrop);
             });
-        });
-
-        it('check rich text support for label', function(){
-            dropButtonInContainer();
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + buttonEditPathSelector);
-            cy.invokeEditableAction("[data-action='CONFIGURE']");
-            cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-            // check rich text selector and see if RTE is visible.
-            cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-            cy.get("div[name='richTextTitle']").should('be.visible');
-            cy.get('.cq-dialog-submit').click();
-        });
-
-        it('check rich text inline editor is present', function(){
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + buttonEditPathSelector);
-            cy.invokeEditableAction("[data-action='EDIT']");
-            cy.get(".rte-toolbar").should('be.visible');
-            cy.get('.rte-toolbar-item[title="Close"]').should('be.visible').click();
-            cy.deleteComponentByPath(buttonDrop);
-        });
-    });
+        })
+    })
 
     context('Open Sites Editor', function () {
         const   pagePath = "/content/core-components-examples/library/adaptive-form/button",
diff --git a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js
index f69aaf6ff7..cfe2586070 100644
--- a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js
@@ -49,15 +49,6 @@ describe('Page - Authoring', function () {
         .then(cy.wrap)
   }
 
-  const getRuleEditorIframe = () => {
-      // get the iframe > document > body
-      // and retry until the body element is not empty
-      return cy
-          .get('iframe#af-rule-editor')
-          .its('0.contentDocument.body').should('not.be.empty')
-          .then(cy.wrap)
-  }
-
   const testCheckBoxGroupBehaviour = function(checkBoxGroupEditPathSelector, checkBoxGroupDrop, isSites) {
     if (isSites) {
       dropTextInputInSites();
@@ -171,71 +162,8 @@ describe('Page - Authoring', function () {
         cy.deleteComponentByPath(checkBoxGroupDrop);
     });
 
-    it('check rich text support for label', function(){
-        dropCheckBoxGroupInContainer();
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + checkBoxGroupEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']");
-        cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-        // check rich text selector and see if RTE is visible for title.
-        cy.get('.cmp-adaptiveform-base__istitlerichtext').should('exist').click();
-        cy.get("div[name='richTextTitle']").scrollIntoView();
-        cy.get("div[name='richTextTitle']").should('be.visible');
-
-        // check rich text selector and see if RTE is visible for enum names.
-        cy.get(".cmp-adaptiveform-base__richTextEnumNames").first().should('not.be.visible');
-        cy.get('.cmp-adaptiveform-base__areOptionsRichText').should('exist').click();
-        cy.get("div[name='richTextEnumNames']").then(($el) => {
-            $el[0].scrollIntoView();
-        })
-        cy.get("[data-cq-richtext-editable='true'][data-wrapperclass='cmp-adaptiveform-base__richTextEnumNames']").eq(0).focus().clear().type("Select 1");
-        cy.get("div[name='richTextEnumNames']").first().should('be.visible');
-        cy.get(".cmp-adaptiveform-base__richTextEnumNames").first().should('be.visible');
-        cy.get('.cq-dialog-submit').click();
-        getPreviewIframeBody().find('.cmp-adaptiveform-checkboxgroup-item').should('have.length',2);
-        getPreviewIframeBody().find('.cmp-adaptiveform-checkboxgroup').parent().parent().contains('Select 1');
-        getPreviewIframeBody().find('.cmp-adaptiveform-checkboxgroup').parent().parent().contains('Item 2');
-    });
-
-    it('check rich text inline editor is present', function(){
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + checkBoxGroupEditPathSelector);
-        cy.invokeEditableAction("[data-action='EDIT']");
-        cy.get(".rte-toolbar").should('be.visible');
-        cy.get('.rte-toolbar-item[title="Close"]').should('be.visible').click();
-    });
 
-    it('rule editor is working with rich text enum names', function(){
-        if(cy.af.isLatestAddon()){
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + checkBoxGroupEditPathSelector);
-            cy.invokeEditableAction("[data-action='editexpression']");
-            cy.get("#af-rule-editor").should("be.visible");
-            getRuleEditorIframe().find("#objectNavigationTree").should("be.visible");
-            getRuleEditorIframe().find("#create-rule-button").click();
-            getRuleEditorIframe().find('#create-rule-button').then(($el) => {
-                $el[0].click();
-                getRuleEditorIframe().find('.child-choice-name').click();
-                getRuleEditorIframe().find('coral-selectlist-item[value="EVENT_SCRIPTS"]').then(($el) => {
-                    $el[0].scrollIntoView();
-                    $el[0].click();
-                    getRuleEditorIframe().find('.EVENT_AND_COMPARISON_OPERATOR').then(($el) => {
-                        $el[0].click();
-                        getRuleEditorIframe().find('coral-selectlist-item[value="CONTAINS"]').then(($el) => {
-                            $el[0].click();
-                            getRuleEditorIframe().find('.PRIMITIVE_EXPRESSION .NUMERIC_LITERAL button').then(($el) => {
-                                $el[0].click();
-                                getRuleEditorIframe().find('[handle="selectList"] coral-list-item-content').first().should("have.text", "Select 1");
-                            });
-                        });
-                    });
-                });
-                getRuleEditorIframe().find('.exp-Close-Button').then(($el) => {
-                    $el[0].click();
-                });
-            });
-        }
-        cy.deleteComponentByPath(checkBoxGroupDrop);
-    });
-  });
+  })
 /*
   context('Open Sites Editor', function () {
     const   pagePath = "/content/core-components-examples/library/adaptive-form/textinput",
diff --git a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js
index e7db896471..fc7f3ad919 100644
--- a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js
@@ -190,14 +190,6 @@ describe("Form Runtime with CheckBoxGroup Input", () => {
 
     })
 
-    it("rich text should render correctly", () => {
-        const [checkBox7, checkBox7FieldView] = Object.entries(formContainer._fields)[6];
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup-item").should('have.length', 2);
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__label").contains('Select Animal').should('have.css', 'font-weight', '700');
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__option-label span").contains('Dog').should('have.css', 'font-style', 'italic');
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__option-label span").contains('Cat').should('have.css', 'text-decoration', 'underline solid rgb(50, 50, 50)');
-    });
-
     it("decoration element should not have same class name", () => {
         expect(formContainer, "formcontainer is initialized").to.not.be.null;
         cy.wrap().then(() => {
diff --git a/ui.tests/test-module/specs/image/image.authoring.spec.js b/ui.tests/test-module/specs/image/image.authoring.spec.js
index 7e9f52c4ba..c848330507 100644
--- a/ui.tests/test-module/specs/image/image.authoring.spec.js
+++ b/ui.tests/test-module/specs/image/image.authoring.spec.js
@@ -81,19 +81,8 @@ describe('Page - Authoring', function () {
 
     it ('open edit dialog of Image', function(){
       testImageBehaviour(imageEditPathSelector, imageDrop);
-    });
-
-    it('check rich text support for label', function(){
-      dropImageInContainer();
-      cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + imageEditPathSelector);
-      cy.invokeEditableAction("[data-action='CONFIGURE']");
-      //rich text shouldn't be present in image component
-      cy.get("div[name='richTextTitle']").should('not.exist');
-      cy.get('.cmp-adaptiveform-base__istitlerichtext').should('not.exist');
-      cy.get('.cq-dialog-cancel').click();
-      cy.deleteComponentByPath(imageDrop);
-    });
-  });
+    })
+  })
 
   context('Open Sites Editor', function () {
     const pagePath = "/content/core-components-examples/library/adaptive-form/image",
diff --git a/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js b/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js
index b1473b7167..ef37b396f4 100644
--- a/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js
+++ b/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js
@@ -94,20 +94,7 @@ describe('Page - Authoring', function () {
 
         it('open edit dialog of Panel', function () {
             testPanelBehaviour(panelContainerPathSelector, panelEditPath);
-        });
-
-        it('check rich text support for label', function(){
-            dropPanelInContainer();
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + panelContainerPathSelector);
-            cy.invokeEditableAction("[data-action='CONFIGURE']");
-            cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-            // check rich text selector and see if RTE is visible.
-            cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-            cy.get("div[name='richTextTitle']").should('be.visible');
-            cy.get('.cq-dialog-cancel').click();
-            cy.deleteComponentByPath(panelEditPath);
-        });
+        })
     })
 
     context('Open Sites Editor', function () {
diff --git a/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js b/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js
index f8e95466b8..0f119a8883 100644
--- a/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js
+++ b/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js
@@ -103,26 +103,6 @@ describe('Page - Authoring', function () {
         });
     });
 
-    it('check rich text support for label', function(){
-        dropRadioButtonInGuideContainer();
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + radioButtonEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']");
-        cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-        // check rich text selector and see if RTE is visible.
-        cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-        cy.get("div[name='richTextTitle']").scrollIntoView().should('be.visible');
-        cy.get('.cq-dialog-submit').click();
-    });
-
-    it('check rich text inline editor is present', function(){
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + radioButtonEditPathSelector);
-        cy.invokeEditableAction("[data-action='EDIT']");
-        cy.get(".rte-toolbar").should('be.visible');
-        cy.get('.rte-toolbar-item[title="Close"]').should('be.visible').click();
-        cy.deleteComponentByPath(radioButtonDrop);
-    });
-
     it ('check value type validations', function() {
         cy.cleanTest(radioButtonDrop).then(function() {
             // For Number Type
diff --git a/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js b/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
index e18919fb8b..16a4f53a94 100644
--- a/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
+++ b/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
@@ -63,8 +63,6 @@ describe('Page - Authoring', function () {
         })
     });
 
-    cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-    cy.get("div[name='richTextTitle']").should('be.visible');
 
     cy.get('.cq-dialog-cancel').click();
     cy.deleteComponentByPath(tncDrop);
diff --git a/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js b/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js
index f8799b436d..e2a6490d7e 100644
--- a/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js
+++ b/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js
@@ -65,29 +65,6 @@ describe('Page - Authoring', function () {
         })
     }
 
-    const testRichTextDialog = function (textInputEditPathSelector, textInputDrop, isSites) {
-        if (isSites) {
-            dropTextInputInSites();
-        } else {
-            dropTextInputInContainer();
-        }
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textInputEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']");
-        cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-        // check rich text selector and see if RTE is visible.
-        cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-        cy.get("div[name='richTextTitle']").scrollIntoView().should('be.visible');
-        cy.get('.cq-dialog-submit').click();
-        cy.reload();
-
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textInputEditPathSelector);
-        cy.invokeEditableAction("[data-action='EDIT']");
-        cy.get(".rte-toolbar").should('be.visible');
-        cy.get('.rte-toolbar-item[title="Close"]').scrollIntoView().should('be.visible').click();
-        cy.deleteComponentByPath(textInputDrop);
-    };
-
     const testCopyPasteComponent = function (textInputEditPathSelector, textInputEditPathSelectorCopy, textInputDrop) {
         dropTextInputInContainer();
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textInputEditPathSelector);
@@ -143,15 +120,11 @@ describe('Page - Authoring', function () {
 
         it('open edit dialog of TextInput', function () {
             testTextInputBehaviour(textInputEditPathSelector, textInputDrop);
-        });
+        })
 
         it.skip('pasted component should have unique name', function () {
             testCopyPasteComponent(textInputEditPathSelector, textInputEditPathSelectorCopy, textInputDrop);
-        });
-
-        it('check rich text support for label', function(){
-            testRichTextDialog(textInputEditPathSelector, textInputDrop);
-        });
+        })
     })
 
   context('Open Sites Editor', function () {
@@ -176,10 +149,6 @@ describe('Page - Authoring', function () {
       testTextInputBehaviour(textInputEditPathSelector, textInputDrop, true);
     });
 
-    it('check rich text support for label in sites', function(){
-        testRichTextDialog(textInputEditPathSelector, textInputDrop, true);
-    });
-
     // conditionally run the test on latest addon
     //if (cy.af.isLatestAddon()) {
         it('Test z-index of Rule editor iframe', function () {