From 34df6f407f0770e50ee24aed3ca1cc1ee3ccc285 Mon Sep 17 00:00:00 2001
From: Muskan Gupta <muskgupta@Muskans-MacBook-Pro.local>
Date: Fri, 10 Apr 2026 16:32:21 +0530
Subject: [PATCH 1/6] Updating style selectors for theme editor

---
 .../v1/accordion/_cq_styleConfig/.content.xml |  59 +++++++-
 .../v2/reset/_cq_styleConfig/.content.xml     |  57 +++-----
 .../v2/submit/_cq_styleConfig/.content.xml    |  57 +++-----
 .../v2/button/_cq_styleConfig/.content.xml    |  60 +++++---
 .../v1/checkbox/_cq_styleConfig/.content.xml  |  57 +++++---
 .../_cq_styleConfig/.content.xml              | 111 ++++++++-------
 .../v2/container/_cq_themeConfig/.content.xml |   8 +-
 .../datepicker/_cq_styleConfig/.content.xml   |  29 ++--
 .../v1/dropdown/_cq_styleConfig/.content.xml  |  33 +++--
 .../emailinput/_cq_styleConfig/.content.xml   |  23 ++-
 .../v3/fileinput/_cq_styleConfig/.content.xml |  79 +++++++++--
 .../v4/fileinput/_cq_styleConfig/.content.xml |  65 ++++++++-
 .../v1/footer/_cq_styleConfig/.content.xml    |   7 +
 .../v1/image/_cq_styleConfig/.content.xml     |   7 +
 .../numberinput/_cq_styleConfig/.content.xml  |  29 ++--
 .../_cq_styleConfig/.content.xml              |  23 ++-
 .../radiobutton/_cq_styleConfig/.content.xml  | 118 ++++++++--------
 .../v1/review/_cq_styleConfig/.content.xml    |  15 ++
 .../v1/switch/_cq_styleConfig/.content.xml    |  79 +++++++++--
 .../v1/tabsontop/_cq_styleConfig/.content.xml |  55 +++++++-
 .../_cq_styleConfig/.content.xml              |  29 ++--
 .../_cq_styleConfig/.content.xml              | 118 ++++++++++++++--
 .../v1/textinput/_cq_styleConfig/.content.xml |  29 ++--
 .../v2/title/_cq_styleConfig/.content.xml     |   7 +
 .../verticaltabs/_cq_styleConfig/.content.xml |  65 ++++++++-
 .../v2/wizard/_cq_styleConfig/.content.xml    | 131 +++++++++++++++++-
 26 files changed, 997 insertions(+), 353 deletions(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml
index 057cbf08dc..42d590cc1f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml
@@ -23,25 +23,25 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Label"
                                 id="af2_accordionlabel"
-                                cssSelector=".cmp-accordion__label"
+                                cssSelector=".cmp-accordion__label-container .cmp-accordion__label"
                                 longTitle="Accordion Label"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                             <states jcr:primaryType="nt:unstructured">
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-accordion__label:hover"/>
+                                        cssSelector=".cmp-accordion__label-container .cmp-accordion__label:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-accordion__label:focus"/>
+                                        cssSelector=".cmp-accordion__label-container .cmp-accordion__label:focus"/>
                             </states>
                         </accordionLabel>
                         <accordionHelpIcon
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Help Icon"
                                 id="af2_accordionhelpicon"
-                                cssSelector=".cmp-accordion__questionmark"
+                                cssSelector=".cmp-accordion__label-container .cmp-accordion__questionmark"
                                 longTitle="Accordion Help Icon"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                 secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -49,15 +49,15 @@
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-accordion__questionmark:focus"/>
+                                        cssSelector=".cmp-accordion__label-container .cmp-accordion__questionmark:focus"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-accordion__questionmark:hover"/>
+                                        cssSelector=".cmp-accordion__label-container .cmp-accordion__questionmark:hover"/>
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector=".cmp-accordion__questionmark:disabled"/>
+                                        cssSelector=".cmp-accordion__label-container .cmp-accordion__questionmark:disabled"/>
                             </states>
                         </accordionHelpIcon>
                     </items>
@@ -91,6 +91,15 @@
                         cssSelector=".cmp-accordion__longdescription"
                         longTitle="Accordion Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <accordionDescriptionLongParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_accordiondescriptionlongparagraph"
+                                cssSelector=".cmp-accordion__longdescription p"
+                                longTitle="Accordion Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -170,6 +179,14 @@
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
                                                 cssSelector=".cmp-accordion__icon:hover"/>
+                                        <rtl
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="RTL"
+                                                cssSelector="[dir=&quot;rtl&quot;] .cmp-accordion__icon"/>
+                                        <expanded
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Expanded"
+                                                cssSelector=".cmp-accordion__button.cmp-accordion__button--expanded .cmp-accordion__icon"/>
                                     </states>
                                 </accordionHeaderIcon>
                             </items>
@@ -200,6 +217,10 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
                                         cssSelector=".cmp-accordion__panel:hover"/>
+                                <hidden
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Hidden"
+                                        cssSelector=".cmp-accordion__panel--hidden"/>
                             </states>
                         </accordionPanelWidget>
                     </items>
@@ -214,6 +235,30 @@
                                 cssSelector=".cmp-accordion__item:hover"/>
                     </states>
                 </accordionPanelItem>
+                <accordionRepeatableButtons
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Repeatable Buttons"
+                        id="af2_accordionrepeatablebuttons"
+                        cssSelector=".cmp-accordion__repeatable-buttons"
+                        longTitle="Accordion Repeatable Buttons"
+                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <accordionAddButton
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Add Button"
+                                id="af2_accordionaddbutton"
+                                cssSelector=".cmp-accordion__add-button"
+                                longTitle="Accordion Add Button"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                        <accordionRemoveButton
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Remove Button"
+                                id="af2_accordionremovebutton"
+                                cssSelector=".cmp-accordion__remove-button"
+                                longTitle="Accordion Remove Button"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
+                </accordionRepeatableButtons>
             </items>
         </accordionPanel>
     </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml
index 49cdbcb0b5..c8208df2aa 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml
@@ -3,6 +3,13 @@
     jcr:primaryType="nt:unstructured"
     jcr:title="Button">
     <items jcr:primaryType="nt:unstructured">
+        <buttonRoot
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Reset Button Container"
+            id="af2_resetbuttonroot"
+            cssSelector=".reset .cmp-adaptiveform-button"
+            longTitle="Reset Button Container"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
         <button
             jcr:primaryType="nt:unstructured"
             jcr:title="Reset"
@@ -54,6 +61,15 @@
                         cssSelector=".reset .cmp-adaptiveform-button__longdescription"
                         longTitle="Reset Button Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <buttonDescriptionLongParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_resetbuttondescriptionlongparagraph"
+                                cssSelector=".reset .cmp-adaptiveform-button__longdescription p"
+                                longTitle="Reset Button Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -65,43 +81,6 @@
                                 cssSelector=".reset .cmp-adaptiveform-button__longdescription:required"/>
                     </states>
                 </buttonDescriptionLong>
-                <buttonHelpContainer
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Help Container"
-                        id="af2_resetbuttonhelpcontainer"
-                        cssSelector=".reset .cmp-adaptiveform-button__help-container"
-                        longTitle="Reset Button Help Container"
-                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
-                    <states jcr:primaryType="nt:unstructured">
-                        <focus
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Focus"
-                                cssSelector=".reset .cmp-adaptiveform-button__help-container:focus"/>
-                        <hover
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Hover"
-                                cssSelector=".reset .cmp-adaptiveform-button__help-container:hover"/>
-                    </states>
-                </buttonHelpContainer>
-                <buttonHelpIcon
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Help Icon"
-                        id="af2_resetbuttonhelpicon"
-                        cssSelector=".reset .cmp-adaptiveform-button__questionmark"
-                        longTitle="Reset Button Help Icon"
-                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
-                        secondarySelectors="af2_guideContainer:af2_helpicon">
-                    <states jcr:primaryType="nt:unstructured">
-                        <focus
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Focus"
-                                cssSelector=".reset .cmp-adaptiveform-button__questionmark:focus"/>
-                        <hover
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Hover"
-                                cssSelector=".reset .cmp-adaptiveform-button__questionmark:hover"/>
-                    </states>
-                </buttonHelpIcon>
             </items>
             <states jcr:primaryType="nt:unstructured">
                 <focus
@@ -120,6 +99,10 @@
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Hover"
                         cssSelector=".reset .cmp-adaptiveform-button__widget:hover"/>
+                <componentDisabled
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Component Disabled"
+                        cssSelector=".reset [data-cmp-enabled]:not([data-cmp-enabled=true]) .cmp-adaptiveform-button__widget"/>
                 <error
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Error"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml
index 52d96a18ea..0ff549a006 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml
@@ -3,6 +3,13 @@
     jcr:primaryType="nt:unstructured"
     jcr:title="Button">
     <items jcr:primaryType="nt:unstructured">
+        <buttonRoot
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Submit Button Container"
+            id="af2_submitbuttonroot"
+            cssSelector=".submit .cmp-adaptiveform-button"
+            longTitle="Submit Button Container"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
         <button
             jcr:primaryType="nt:unstructured"
             jcr:title="Submit"
@@ -54,6 +61,15 @@
                         cssSelector=".submit .cmp-adaptiveform-button__longdescription"
                         longTitle="Submit Button Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <buttonDescriptionLongParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_submitbuttondescriptionlongparagraph"
+                                cssSelector=".submit .cmp-adaptiveform-button__longdescription p"
+                                longTitle="Submit Button Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -65,43 +81,6 @@
                                 cssSelector=".submit .cmp-adaptiveform-button__longdescription:required"/>
                     </states>
                 </buttonDescriptionLong>
-                <buttonHelpContainer
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Help Container"
-                        id="af2_submitbuttonhelpcontainer"
-                        cssSelector=".submit .cmp-adaptiveform-button__help-container"
-                        longTitle="Submit Button Help Container"
-                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
-                    <states jcr:primaryType="nt:unstructured">
-                        <focus
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Focus"
-                                cssSelector=".submit .cmp-adaptiveform-button__help-container:focus"/>
-                        <hover
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Hover"
-                                cssSelector=".submit .cmp-adaptiveform-button__help-container:hover"/>
-                    </states>
-                </buttonHelpContainer>
-                <buttonHelpIcon
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Help Icon"
-                        id="af2_submitbuttonhelpicon"
-                        cssSelector=".submit .cmp-adaptiveform-button__questionmark"
-                        longTitle="Submit Button Help Icon"
-                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
-                        secondarySelectors="af2_guideContainer:af2_helpicon">
-                    <states jcr:primaryType="nt:unstructured">
-                        <focus
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Focus"
-                                cssSelector=".submit .cmp-adaptiveform-button__questionmark:focus"/>
-                        <hover
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Hover"
-                                cssSelector=".submit .cmp-adaptiveform-button__questionmark:hover"/>
-                    </states>
-                </buttonHelpIcon>
             </items>
             <states jcr:primaryType="nt:unstructured">
                 <focus
@@ -120,6 +99,10 @@
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Hover"
                         cssSelector=".submit .cmp-adaptiveform-button__widget:hover"/>
+                <componentDisabled
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Component Disabled"
+                        cssSelector=".submit [data-cmp-enabled]:not([data-cmp-enabled=true]) .cmp-adaptiveform-button__widget"/>
                 <error
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Error"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml
index 9c73f74dc3..951a9d5d16 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml
@@ -3,6 +3,13 @@
     jcr:primaryType="nt:unstructured"
     jcr:title="Button">
     <items jcr:primaryType="nt:unstructured">
+        <buttonRoot
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Button Container"
+            id="af2_buttonroot"
+            cssSelector=".cmp-adaptiveform-button"
+            longTitle="Button Container"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
         <button
             jcr:primaryType="nt:unstructured"
             jcr:title="All Buttons"
@@ -52,6 +59,15 @@
                         cssSelector=".cmp-adaptiveform-button__longdescription"
                         longTitle="Button Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <buttonDescriptionLongParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_buttondescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-button__longdescription p"
+                                longTitle="Button Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -70,6 +86,27 @@
                         cssSelector=".cmp-adaptiveform-button__help-container"
                         longTitle="Button Help Container"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <buttonHelpIcon
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Help Icon"
+                                id="af2_buttonhelpicon"
+                                cssSelector=".cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark"
+                                longTitle="Button Help Icon"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+                                secondarySelectors="af2_guideContainer:af2_helpicon">
+                            <states jcr:primaryType="nt:unstructured">
+                                <focus
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Focus"
+                                        cssSelector=".cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark:focus"/>
+                                <hover
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Hover"
+                                        cssSelector=".cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark:hover"/>
+                            </states>
+                        </buttonHelpIcon>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -81,25 +118,6 @@
                                 cssSelector=".cmp-adaptiveform-button__help-container:hover"/>
                     </states>
                 </buttonHelpContainer>
-                <buttonHelpIcon
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Help Icon"
-                        id="af2_buttonhelpicon"
-                        cssSelector=".cmp-adaptiveform-button__questionmark"
-                        longTitle="Button Help Icon"
-                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
-                        secondarySelectors="af2_guideContainer:af2_helpicon">
-                    <states jcr:primaryType="nt:unstructured">
-                        <focus
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Focus"
-                                cssSelector=".cmp-adaptiveform-button__questionmark:focus"/>
-                        <hover
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Hover"
-                                cssSelector=".cmp-adaptiveform-button__questionmark:hover"/>
-                    </states>
-                </buttonHelpIcon>
             </items>
             <states jcr:primaryType="nt:unstructured">
                 <focus
@@ -118,6 +136,10 @@
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Hover"
                         cssSelector=".cmp-adaptiveform-button__widget:hover"/>
+                <componentDisabled
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Component Disabled"
+                        cssSelector="[data-cmp-enabled]:not([data-cmp-enabled=true]) .cmp-adaptiveform-button__widget"/>
                 <error
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Error"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml
index c417d038a4..9a0b1cd959 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml
@@ -90,6 +90,15 @@
                                         cssSelector=".cmp-adaptiveform-checkbox__longdescription"
                                         longTitle="Checkbox Long Description"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Checkbox Long Description Paragraph"
+                                id="af2_checkboxdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-checkbox__longdescription p"
+                                longTitle="Checkbox Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                                     <states jcr:primaryType="nt:unstructured">
                                         <focus
                                             jcr:primaryType="nt:unstructured"
@@ -108,6 +117,31 @@
                                         cssSelector=".cmp-adaptiveform-checkbox__help-container"
                                         longTitle="Checkbox Help Container"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <items jcr:primaryType="nt:unstructured">
+                                        <checkBoxHelpIcon
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Help Icon"
+                                                id="af2_checkboxhelpicon"
+                                                cssSelector=".cmp-adaptiveform-checkbox__help-container .cmp-adaptiveform-checkbox__questionmark"
+                                                longTitle="Checkbox Help Icon"
+                                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+                                                secondarySelectors="af2_guideContainer:af2_helpicon">
+                                            <states jcr:primaryType="nt:unstructured">
+                                                <focus
+                                                        jcr:primaryType="nt:unstructured"
+                                                        jcr:title="Focus"
+                                                        cssSelector=".cmp-adaptiveform-checkbox__help-container .cmp-adaptiveform-checkbox__questionmark:focus"/>
+                                                <hover
+                                                        jcr:primaryType="nt:unstructured"
+                                                        jcr:title="Hover"
+                                                        cssSelector=".cmp-adaptiveform-checkbox__help-container .cmp-adaptiveform-checkbox__questionmark:hover"/>
+                                                <disabled
+                                                        jcr:primaryType="nt:unstructured"
+                                                        jcr:title="Disabled"
+                                                        cssSelector=".cmp-adaptiveform-checkbox__help-container .cmp-adaptiveform-checkbox__questionmark:disabled"/>
+                                            </states>
+                                        </checkBoxHelpIcon>
+                                    </items>
                                     <states jcr:primaryType="nt:unstructured">
                                         <focus
                                             jcr:primaryType="nt:unstructured"
@@ -123,29 +157,6 @@
                                             cssSelector=".cmp-adaptiveform-checkbox__help-container:disabled"/>
                                     </states>
                                 </checkBoxHelpContainer>
-                                <checkBoxHelpIcon
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="Help Icon"
-                                        id="af2_checkboxhelpicon"
-                                        cssSelector=".cmp-adaptiveform-checkbox__questionmark"
-                                        longTitle="Checkbox Help Icon"
-                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
-                                        secondarySelectors="af2_guideContainer:af2_helpicon">
-                                    <states jcr:primaryType="nt:unstructured">
-                                        <focus
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Focus"
-                                            cssSelector=".cmp-adaptiveform-checkbox__questionmark:focus"/>
-                                        <hover
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Hover"
-                                            cssSelector=".cmp-adaptiveform-checkbox__questionmark:hover"/>
-                                        <disabled
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Disabled"
-                                            cssSelector=".cmp-adaptiveform-checkbox__questionmark:disabled"/>
-                                    </states>
-                                </checkBoxHelpIcon>
                             </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml
index 03374683ac..82a6bd26e2 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml
@@ -30,25 +30,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_checkboxgrouplabel"
-                                        cssSelector=".cmp-adaptiveform-checkboxgroup__label"
+                                        cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__label"
                                         longTitle="Checkbox Group Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Hover"
-                                            cssSelector=".cmp-adaptiveform-checkboxgroup__label:hover"/>
+                                            cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__label:hover"/>
                                         <focus
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Focus"
-                                            cssSelector=".cmp-adaptiveform-checkboxgroup__label:focus"/>
+                                            cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__label:focus"/>
                                     </states>
                                 </checkBoxGroupLabel>
                                 <checkBoxGroupHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_checkboxgrouphelpicon"
-                                        cssSelector=".cmp-adaptiveform-checkboxgroup__questionmark"
+                                        cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__questionmark"
                                         longTitle="Checkbox Group Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -56,15 +56,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__label-container .cmp-adaptiveform-checkboxgroup__questionmark:disabled"/>
                                     </states>
                                 </checkBoxGroupHelpIcon>
                             </items>
@@ -216,69 +216,69 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Checkbox Item"
                                         id="af2_checkboxgroupitemhorizontal"
-                                        cssSelector=".cmp-adaptiveform-checkboxgroup-item"
-                                        longTitle="Checkbox Group Item"
+                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup-item"
+                                        longTitle="Checkbox Group Horizontal Layout Item"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <items jcr:primaryType="nt:unstructured">
                                         <checkBoxGroupItemLabelContainerHorizontal
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Checkbox Item Label Container"
                                                 id="af2_checkboxgroupitemlabelcontainerhorizontal"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label"
-                                                longTitle="Checkbox Group Item Label Container"
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label"
+                                                longTitle="Checkbox Group Item Label Container (Horizontal)"
                                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                             <items jcr:primaryType="nt:unstructured">
                                                 <checkBoxGroupItemLabelHorizontal
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Label"
                                                         id="af2_checkboxgroupitemlabelhorizontal"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span"
-                                                        longTitle="Checkbox Group Item Label"
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label span"
+                                                        longTitle="Checkbox Group Item Label (Horizontal)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span:hover"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label span:hover"/>
                                                         <focus
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Focus"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span:focus"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label span:focus"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label input[type='checkbox']:checked + span"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label input[type='checkbox']:checked + span"/>
                                                         <mandatory
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Mandatory"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup[data-cmp-required='true'] .cmp-adaptiveform-checkboxgroup__option-label span"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup[data-cmp-required='true'] .cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label span"/>
                                                     </states>
                                                 </checkBoxGroupItemLabelHorizontal>
                                                 <checkBoxWidgetAndTextHorizontal
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Checkbox"
                                                         id="af2_checkboxgroupwidgetandtexthorizontal"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget"
-                                                        longTitle="Checkbox Group Item Widget"
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option__widget"
+                                                        longTitle="Checkbox Group Item Widget (Horizontal)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                                         secondarySelectors="af2_guideContainer:af2_widgetAndText">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <focus
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Focus"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:focus"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option__widget:focus"/>
                                                         <disabled
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Disabled"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:hover"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option__widget:hover"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
                                                     </states>
                                                 </checkBoxWidgetAndTextHorizontal>
                                             </items>
@@ -286,11 +286,11 @@
                                                 <hover
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Hover"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option-label:hover"/>
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label:hover"/>
                                                 <focus
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Focus"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option-label:focus"/>
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup__option-label:focus"/>
                                             </states>
                                         </checkBoxGroupItemLabelContainerHorizontal>
                                     </items>
@@ -298,19 +298,19 @@
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item:hover"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup-item:hover"/>
                                         <checked
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Selected"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item:focus"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.HORIZONTAL .cmp-adaptiveform-checkboxgroup-item:focus"/>
                                     </states>
                                 </checkBoxGroupItemHorizontal>
                             </items>
@@ -337,69 +337,69 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Checkbox Item"
                                         id="af2_checkboxgroupitemvertical"
-                                        cssSelector=".cmp-adaptiveform-checkboxgroup-item"
-                                        longTitle="Checkbox Group Item"
+                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup-item"
+                                        longTitle="Checkbox Group Vertical Layout Item"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <items jcr:primaryType="nt:unstructured">
                                         <checkBoxGroupItemLabelContainerVertical
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Checkbox Item Label Container"
                                                 id="af2_checkboxgroupitemlabelcontainervertical"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label"
-                                                longTitle="Checkbox Group Item Label Container"
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label"
+                                                longTitle="Checkbox Group Item Label Container (Vertical)"
                                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                             <items jcr:primaryType="nt:unstructured">
                                                 <checkBoxGroupItemLabelVertical
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Label"
                                                         id="af2_checkboxgroupitemlabelvertical"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span"
-                                                        longTitle="Checkbox Group Item Label"
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label span"
+                                                        longTitle="Checkbox Group Item Label (Vertical)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span:hover"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label span:hover"/>
                                                         <focus
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Focus"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span:focus"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label span:focus"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option-label input[type='checkbox']:checked + span"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label input[type='checkbox']:checked + span"/>
                                                         <mandatory
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Mandatory"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup[data-cmp-required='true'] .cmp-adaptiveform-checkboxgroup__option-label span"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup[data-cmp-required='true'] .cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label span"/>
                                                     </states>
                                                 </checkBoxGroupItemLabelVertical>
                                                 <checkBoxWidgetAndTextVertical
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Checkbox"
                                                         id="af2_checkboxgroupwidgetandtextvertical"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget"
-                                                        longTitle="Checkbox Group Item Widget"
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option__widget"
+                                                        longTitle="Checkbox Group Item Widget (Vertical)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                                         secondarySelectors="af2_guideContainer:af2_widgetAndText">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <focus
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Focus"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:focus"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option__widget:focus"/>
                                                         <disabled
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Disabled"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:hover"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option__widget:hover"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
+                                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
                                                     </states>
                                                 </checkBoxWidgetAndTextVertical>
                                             </items>
@@ -407,11 +407,11 @@
                                                 <hover
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Hover"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option-label:hover"/>
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label:hover"/>
                                                 <focus
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Focus"
-                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__option-label:focus"/>
+                                                        cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup__option-label:focus"/>
                                             </states>
                                         </checkBoxGroupItemLabelContainerVertical>
                                     </items>
@@ -419,19 +419,19 @@
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item:hover"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup-item:hover"/>
                                         <checked
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Selected"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup-item .cmp-adaptiveform-checkboxgroup__option__widget:checked"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-checkboxgroup-item:focus"/>
+                                                cssSelector=".cmp-adaptiveform-checkboxgroup__widget.VERTICAL .cmp-adaptiveform-checkboxgroup-item:focus"/>
                                     </states>
                                 </checkBoxGroupItemVertical>
                             </items>
@@ -461,6 +461,15 @@
                                 cssSelector=".cmp-adaptiveform-checkboxgroup__longdescription"
                                 longTitle="Checkbox Group Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_checkboxgroupdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-checkboxgroup__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
index d46f6f129c..661b198aff 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
@@ -85,6 +85,9 @@
                         <datePickerWidgetAndText
                             jcr:primaryType="nt:unstructured"
                             target="/mnt/override/libs/core/fd/components/form/datepicker/v1/datepicker/cq:styleConfig/items/field/items/widgetAndText"/>
+                        <dateTimeWidgetAndText
+                            jcr:primaryType="nt:unstructured"
+                            target="/mnt/override/libs/core/fd/components/form/datetime/v1/datetime/cq:styleConfig/items/field/items/widgetAndText"/>
                         <checkBoxWidgetAndText
                             jcr:primaryType="nt:unstructured"
                             target="/mnt/override/libs/core/fd/components/form/checkbox/v1/checkbox/cq:styleConfig/items/field/items/widgetAndText"/>
@@ -99,7 +102,10 @@
                             target="/mnt/override/libs/core/fd/components/form/switch/v1/switch/cq:styleConfig/items/field/items/widgetAndText"/>
                         <fileUploadButton
                             jcr:primaryType="nt:unstructured"
-                            target="/mnt/override/libs/core/fd/components/form/fileinput/v3/fileinput/cq:styleConfig/items/field/items/widgetAndText"/>
+                            target="/mnt/override/libs/core/fd/components/form/fileinput/v4/fileinput/cq:styleConfig/items/field/items/widgetAndText"/>
+                        <scribbleWidgetAndText
+                            jcr:primaryType="nt:unstructured"
+                            target="/mnt/override/libs/core/fd/components/form/scribble/v1/scribble/cq:styleConfig/items/field/items/widgetAndText"/>
                         <tncWidgetAndText
                             jcr:primaryType="nt:unstructured"
                             target="/mnt/override/libs/core/fd/components/form/termsandconditions/v1/termsandconditions/cq:styleConfig/items/field/items/widgetAndText"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml
index 3cbb08fe79..62ffa46593 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_datepickerlabel"
-                                        cssSelector=".cmp-adaptiveform-datepicker__label"
+                                        cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__label"
                                         longTitle="Datepicker Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-datepicker__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-datepicker__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__label:focus"/>
                                     </states>
                                 </datepickerLabel>
                                 <datepickerHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_datepickerhelpicon"
-                                        cssSelector=".cmp-adaptiveform-datepicker__questionmark"
+                                        cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__questionmark"
                                         longTitle="Datepicker Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-datepicker__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-datepicker__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-datepicker__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-datepicker__label-container .cmp-adaptiveform-datepicker__questionmark:disabled"/>
                                     </states>
                                 </datepickerHelpIcon>
                             </items>
@@ -73,15 +73,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-datepicker__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-datepicker__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-datepicker__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-datepicker__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-datepicker__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-datepicker__label-container:focus"/>
                             </states>
                         </datepickerLabelContainer>
                         <datepickerWidgetAndText
@@ -126,6 +126,15 @@
                                 cssSelector=".cmp-adaptiveform-datepicker__longdescription"
                                 longTitle="Datepicker Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_datepickerdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-datepicker__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml
index a4615a1e22..20363595a6 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_dropdownlabel"
-                                        cssSelector=".cmp-adaptiveform-dropdown__label"
+                                        cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__label"
                                         longTitle="Dropdown Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-dropdown__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-dropdown__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__label:focus"/>
                                     </states>
                                 </dropdownLabel>
                                 <dropdownHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_dropdownhelpicon"
-                                        cssSelector=".cmp-adaptiveform-dropdown__questionmark"
+                                        cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__questionmark"
                                         longTitle="Dropdown Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-dropdown__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-dropdown__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-dropdown__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-dropdown__label-container .cmp-adaptiveform-dropdown__questionmark:disabled"/>
                                     </states>
                                 </dropdownHelpIcon>
                             </items>
@@ -73,15 +73,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-dropdown__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-dropdown__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-dropdown__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-dropdown__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-dropdown__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-dropdown__label-container:focus"/>
                             </states>
                         </dropdownLabelContainer>
                         <dropdownWidgetAndText
@@ -109,6 +109,10 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Mandatory"
                                         cssSelector=".cmp-adaptiveform-dropdown__widget:required"/>
+                                <multiple
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Multiple"
+                                        cssSelector=".cmp-adaptiveform-dropdown__widget[multiple='multiple']"/>
                             </states>
                         </dropdownWidgetAndText>
                         <dropdownDescriptionShort
@@ -126,6 +130,15 @@
                                 cssSelector=".cmp-adaptiveform-dropdown__longdescription"
                                 longTitle="Dropdown Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_dropdowndescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-dropdown__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml
index 9cec5398bb..7fe3ae4aa9 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml
@@ -26,25 +26,25 @@
                                     jcr:primaryType="nt:unstructured"
                                     jcr:title="Label"
                                     id="af2_emaillabel"
-                                    cssSelector=".cmp-adaptiveform-emailinput__label"
+                                    cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__label"
                                     longTitle="Email Label"
                                     propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Hover"
-                                            cssSelector=".cmp-adaptiveform-emailinput__label:hover"/>
+                                            cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__label:hover"/>
                                         <focus
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Focus"
-                                            cssSelector=".cmp-adaptiveform-emailinput__label:focus"/>
+                                            cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__label:focus"/>
                                     </states>
                                 </emailLabel>
                                 <emailHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_emailhelpicon"
-                                        cssSelector=".cmp-adaptiveform-emailinput__questionmark"
+                                        cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__questionmark"
                                         longTitle="Email Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -52,15 +52,15 @@
                                         <focus
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Focus"
-                                            cssSelector=".cmp-adaptiveform-emailinput__questionmark:focus"/>
+                                            cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__questionmark:focus"/>
                                         <hover
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Hover"
-                                            cssSelector=".cmp-adaptiveform-emailinput__questionmark:hover"/>
+                                            cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__questionmark:hover"/>
                                         <disabled
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Disabled"
-                                            cssSelector=".cmp-adaptiveform-emailinput__questionmark:disabled"/>
+                                            cssSelector=".cmp-adaptiveform-emailinput__label-container .cmp-adaptiveform-emailinput__questionmark:disabled"/>
                                     </states>
                                 </emailHelpIcon>
                             </items>
@@ -121,6 +121,15 @@
                                 cssSelector=".cmp-adaptiveform-emailinput__longdescription"
                                 longTitle="Email Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_emaildescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-emailinput__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                     jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
index 9a5537c5d7..c4f8211797 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_fileinputlabel"
-                                        cssSelector=".cmp-adaptiveform-fileinput__label"
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__label"
                                         longTitle="File Input Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-fileinput__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-fileinput__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__label:focus"/>
                                     </states>
                                 </fileinputLabel>
                                 <fileinputHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_fileinputhelpicon"
-                                        cssSelector=".cmp-adaptiveform-fileinput__questionmark"
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark"
                                         longTitle="File Input Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-fileinput__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-fileinput__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-fileinput__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark:disabled"/>
                                     </states>
                                 </fileinputHelpIcon>
                             </items>
@@ -73,15 +73,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-fileinput__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-fileinput__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-fileinput__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container:focus"/>
                             </states>
                         </fileinputLabelContainer>
                         <fileinputWidgetAndText
@@ -193,6 +193,24 @@
                                                 cssSelector=".cmp-adaptiveform-fileinput__widgetlabel:required"/>
                                     </states>
                                 </fileinputWidget>
+                                <fileinputNativeWidget
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Native File Input"
+                                        id="af2_fileinputnativewidget"
+                                        cssSelector=".cmp-adaptiveform-fileinput__widget"
+                                        longTitle="File Input Native Widget"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <states jcr:primaryType="nt:unstructured">
+                                        <webkitUploadButton
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="WebKit Upload Button"
+                                                cssSelector=".cmp-adaptiveform-fileinput__widget::-webkit-file-upload-button"/>
+                                        <before
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Before Pseudo"
+                                                cssSelector=".cmp-adaptiveform-fileinput__widget::before"/>
+                                    </states>
+                                </fileinputNativeWidget>
                             </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
@@ -213,6 +231,38 @@
                                         cssSelector=".cmp-adaptiveform-fileinput__container:required"/>
                             </states>
                         </fileinputWidgetAndText>
+                        <fileinputFileList
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="File List"
+                                id="af2_fileinputfilelist"
+                                cssSelector=".cmp-adaptiveform-fileinput__filelist"
+                                longTitle="File Input File List"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                            <items jcr:primaryType="nt:unstructured">
+                                <fileinputFileItem
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="File Item"
+                                        id="af2_fileinputfileitem"
+                                        cssSelector=".cmp-adaptiveform-fileinput__fileitem"
+                                        longTitle="File Input File Item"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                </fileinputFileItem>
+                                <fileinputFileName
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="File Name"
+                                        id="af2_fileinputfilename"
+                                        cssSelector=".cmp-adaptiveform-fileinput__filename"
+                                        longTitle="File Input File Name"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <fileinputFileDelete
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="File Delete"
+                                        id="af2_fileinputfiledelete"
+                                        cssSelector=".cmp-adaptiveform-fileinput__filedelete"
+                                        longTitle="File Input File Delete"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                            </items>
+                        </fileinputFileList>
                         <fileinputDescriptionShort
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Short Description"
@@ -228,6 +278,15 @@
                                 cssSelector=".cmp-adaptiveform-fileinput__longdescription"
                                 longTitle="File Input Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_fileinputdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-fileinput__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                     jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml
index 5359b00a27..def44b005c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_fileinputlabel"
-                                        cssSelector=".cmp-adaptiveform-fileinput__label"
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__label"
                                         longTitle="File Input Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-fileinput__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-fileinput__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__label:focus"/>
                                     </states>
                                 </fileinputLabel>
                                 <fileinputHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_fileinputhelpicon"
-                                        cssSelector=".cmp-adaptiveform-fileinput__questionmark"
+                                        cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark"
                                         longTitle="File Input Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-fileinput__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-fileinput__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-fileinput__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-fileinput__label-container .cmp-adaptiveform-fileinput__questionmark:disabled"/>
                                     </states>
                                 </fileinputHelpIcon>
                             </items>
@@ -130,6 +130,24 @@
                                                 cssSelector=".cmp-adaptiveform-fileinput__widgetlabel:disabled"/>
                                     </states>
                                 </fileinputWidgetlabel>
+                                <fileinputNativeWidget
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Native File Input"
+                                        id="af2_fileinputnativewidget"
+                                        cssSelector=".cmp-adaptiveform-fileinput__widget"
+                                        longTitle="File Input Native Widget"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <states jcr:primaryType="nt:unstructured">
+                                        <webkitUploadButton
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="WebKit Upload Button"
+                                                cssSelector=".cmp-adaptiveform-fileinput__widget::-webkit-file-upload-button"/>
+                                        <before
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Before Pseudo"
+                                                cssSelector=".cmp-adaptiveform-fileinput__widget::before"/>
+                                    </states>
+                                </fileinputNativeWidget>
                                 <fileinputFilelist
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="File List"
@@ -137,6 +155,30 @@
                                         cssSelector=".cmp-adaptiveform-fileinput__filelist"
                                         longTitle="File Input File List"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <items jcr:primaryType="nt:unstructured">
+                                        <fileinputFileItem
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="File Item"
+                                                id="af2_fileinputfileitem"
+                                                cssSelector=".cmp-adaptiveform-fileinput__fileitem"
+                                                longTitle="File Input File Item"
+                                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                        </fileinputFileItem>
+                                        <fileinputFileName
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="File Name"
+                                                id="af2_fileinputfilename"
+                                                cssSelector=".cmp-adaptiveform-fileinput__filename"
+                                                longTitle="File Input File Name"
+                                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                        <fileinputFileDelete
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="File Delete"
+                                                id="af2_fileinputfiledelete"
+                                                cssSelector=".cmp-adaptiveform-fileinput__filedelete"
+                                                longTitle="File Input File Delete"
+                                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                    </items>
                                 </fileinputFilelist>
                             </items>
                         </fileinputContainer>
@@ -155,6 +197,15 @@
                                 cssSelector=".cmp-adaptiveform-fileinput__longdescription"
                                 longTitle="File Input Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_fileinputdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-fileinput__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml
index 25e690c4b9..5201916999 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml
@@ -11,6 +11,13 @@
             cssSelector=".cmp-adaptiveform-footer"
             propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
             <items jcr:primaryType="nt:unstructured">
+                <footerTextPlain
+                    longTitle="Footer Text"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Footer Text (Plain)"
+                    id="af2_footertextplain"
+                    cssSelector=".cmp-adaptiveform-footer__text"
+                    propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
                 <footerText
                     longTitle="Footer Text"
                     jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml
index aadc3fe504..9b20772ced 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml
@@ -3,6 +3,13 @@
     jcr:primaryType="nt:unstructured"
     jcr:title="image">
     <items jcr:primaryType="nt:unstructured">
+        <imageRoot
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Image Container"
+            id="af2_imageroot"
+            cssSelector=".cmp-image"
+            longTitle="Image Container"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
         <Image
             jcr:primaryType="nt:unstructured"
             jcr:title="Image"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml
index 66a38169cb..661f041028 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_numberinputlabel"
-                                        cssSelector=".cmp-adaptiveform-numberinput__label"
+                                        cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__label"
                                         longTitle="Number Input Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-numberinput__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-numberinput__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__label:focus"/>
                                     </states>
                                 </numberinputLabel>
                                 <numberinputHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_numberinputhelpicon"
-                                        cssSelector=".cmp-adaptiveform-numberinput__questionmark"
+                                        cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__questionmark"
                                         longTitle="Number Input Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-numberinput__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-numberinput__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-numberinput__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-numberinput__label-container .cmp-adaptiveform-numberinput__questionmark:disabled"/>
                                     </states>
                                 </numberinputHelpIcon>
                             </items>
@@ -73,15 +73,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-numberinput__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-numberinput__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-numberinput__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-numberinput__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-numberinput__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-numberinput__label-container:focus"/>
                             </states>
                         </numberinputLabelContainer>
                         <numberinputWidgetAndText
@@ -126,6 +126,15 @@
                                 cssSelector=".cmp-adaptiveform-numberinput__longdescription"
                                 longTitle="Number Input Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_numberinputdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-numberinput__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml
index 97242cf488..a01deaa87f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml
@@ -23,25 +23,25 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Label"
                                 id="af2_panellabel"
-                                cssSelector=".cmp-container__label"
+                                cssSelector=".cmp-container__label-container .cmp-container__label"
                                 longTitle="Panel Label"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                             <states jcr:primaryType="nt:unstructured">
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-container__label:hover"/>
+                                        cssSelector=".cmp-container__label-container .cmp-container__label:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-container__label:focus"/>
+                                        cssSelector=".cmp-container__label-container .cmp-container__label:focus"/>
                             </states>
                         </panelLabel>
                         <panelHelpIcon
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Help Icon"
                                 id="af2_panelhelpicon"
-                                cssSelector=".cmp-container__questionmark"
+                                cssSelector=".cmp-container__label-container .cmp-container__questionmark"
                                 longTitle="Panel Help Icon"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                 secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -49,15 +49,15 @@
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-container__questionmark:focus"/>
+                                        cssSelector=".cmp-container__label-container .cmp-container__questionmark:focus"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-container__questionmark:hover"/>
+                                        cssSelector=".cmp-container__label-container .cmp-container__questionmark:hover"/>
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector=".cmp-container__questionmark:disabled"/>
+                                        cssSelector=".cmp-container__label-container .cmp-container__questionmark:disabled"/>
                             </states>
                         </panelHelpIcon>
                     </items>
@@ -91,6 +91,15 @@
                         cssSelector=".cmp-container__longdescription"
                         longTitle="Panel Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_paneldescriptionlongparagraph"
+                                cssSelector=".cmp-container__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml
index 0763225207..545e636d5c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml
@@ -16,7 +16,8 @@
                     id="af2_radiobuttonwidgetandtext"
                     cssSelector=".cmp-adaptiveform-radiobutton"
                     longTitle="Radio Button Group Widget"
-                    propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+                    secondarySelectors="af2_guideContainer:af2_widgetAndText">
                     <items jcr:primaryType="nt:unstructured">
                         <radioButtonLabelContainer
                                 jcr:primaryType="nt:unstructured"
@@ -30,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_radiobuttonlabel"
-                                        cssSelector=".cmp-adaptiveform-radiobutton__label"
+                                        cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__label"
                                         longTitle="Radio Button Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__label:focus"/>
                                     </states>
                                 </radioButtonLabel>
                                 <radioButtonHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_radiobuttonhelpicon"
-                                        cssSelector=".cmp-adaptiveform-radiobutton__questionmark"
+                                        cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__questionmark"
                                         longTitle="Radio Button Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -56,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__label-container .cmp-adaptiveform-radiobutton__questionmark:disabled"/>
                                     </states>
                                 </radioButtonHelpIcon>
                             </items>
@@ -220,73 +221,73 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Radio Button Item"
                                         id="af2_radiobuttonitemhorizontal"
-                                        cssSelector=".cmp-adaptiveform-radiobutton__option"
-                                        longTitle="Radio Button Item"
+                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option"
+                                        longTitle="Radio Button Horizontal Layout Item"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <items jcr:primaryType="nt:unstructured">
                                         <radioButtonItemLabelContainerHorizontal
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Radio Button Item Label Container"
                                                 id="af2_radiobuttonitemlabelcontainerhorizontal"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option-label"
-                                                longTitle="Radio Button Item Label Container"
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label"
+                                                longTitle="Radio Button Item Label Container (Horizontal)"
                                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                             <items jcr:primaryType="nt:unstructured">
                                                 <radioButtonLabelHorizontal
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Label"
                                                         id="af2_radiobuttonitemlabelhorizontal"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option-label span"
-                                                        longTitle="Radio Button Item Label"
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label span"
+                                                        longTitle="Radio Button Item Label (Horizontal)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <disabled
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Disabled"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option-label input[disabled] + span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label input[disabled] + span"/>
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option-label:hover span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label:hover span"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option input[type='radio']:checked + span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label input[type='radio']:checked + span"/>
                                                         <mandatory
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Mandatory"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__option-label span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label span"/>
                                                     </states>
                                                 </radioButtonLabelHorizontal>
                                                 <radioButtonWidgetAndTextHorizontal
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Radio Button"
                                                         id="af2_radiobuttonwidgethorizontal"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option__widget"
-                                                        longTitle="Radio Button Item Widget"
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option__widget"
+                                                        longTitle="Radio Button Item Widget (Horizontal)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                                         secondarySelectors="af2_guideContainer:af2_widgetAndText">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <focus
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Focus"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:focus"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option__widget:focus"/>
                                                         <disabled
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Disabled"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:disabled"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option__widget:disabled"/>
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:hover"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option__widget:hover"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:checked"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option__widget:checked"/>
                                                         <mandatory
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Mandatory"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:required"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option__widget:required"/>
                                                     </states>
                                                 </radioButtonWidgetAndTextHorizontal>
                                             </items>
@@ -294,11 +295,11 @@
                                                 <hover
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Hover"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option-label:hover"/>
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label:hover"/>
                                                 <focus
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Focus"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option-label:focus"/>
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option-label:focus"/>
                                             </states>
                                         </radioButtonItemLabelContainerHorizontal>
                                     </items>
@@ -306,19 +307,19 @@
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option input[disabled] + span"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option input[disabled] + span"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option:hover"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option:focus"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option:focus"/>
                                         <mandatory
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Mandatory"
-                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__option"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__widget.HORIZONTAL .cmp-adaptiveform-radiobutton__option"/>
                                     </states>
                                 </radioButtonItemHorizontal>
                             </items>
@@ -345,73 +346,73 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Radio Button Item"
                                         id="af2_radiobuttonitemvertical"
-                                        cssSelector=".cmp-adaptiveform-radiobutton__option"
-                                        longTitle="Radio Button Item"
+                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option"
+                                        longTitle="Radio Button Vertical Layout Item"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <items jcr:primaryType="nt:unstructured">
                                         <radioButtonItemLabelContainerVertical
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Radio Button Item Label Container"
                                                 id="af2_radiobuttonitemlabelcontainervertical"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option-label"
-                                                longTitle="Radio Button Item Label Container"
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label"
+                                                longTitle="Radio Button Item Label Container (Vertical)"
                                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                             <items jcr:primaryType="nt:unstructured">
                                                 <radioButtonLabelVertical
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Label"
                                                         id="af2_radiobuttonitemlabelvertical"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option-label span"
-                                                        longTitle="Radio Button Item Label"
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label span"
+                                                        longTitle="Radio Button Item Label (Vertical)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <disabled
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Disabled"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option-label input[disabled] + span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label input[disabled] + span"/>
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option-label:hover span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label:hover span"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option input[type='radio']:checked + span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label input[type='radio']:checked + span"/>
                                                         <mandatory
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Mandatory"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__option-label span"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label span"/>
                                                     </states>
                                                 </radioButtonLabelVertical>
                                                 <radioButtonWidgetAndTextVertical
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Radio Button"
                                                         id="af2_radiobuttonwidgetvertical"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option__widget"
-                                                        longTitle="Radio Button Item Widget"
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option__widget"
+                                                        longTitle="Radio Button Item Widget (Vertical)"
                                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                                         secondarySelectors="af2_guideContainer:af2_widgetAndText">
                                                     <states jcr:primaryType="nt:unstructured">
                                                         <focus
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Focus"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:focus"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option__widget:focus"/>
                                                         <disabled
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Disabled"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:disabled"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option__widget:disabled"/>
                                                         <hover
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Hover"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:hover"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option__widget:hover"/>
                                                         <checked
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Selected"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:checked"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option__widget:checked"/>
                                                         <mandatory
                                                                 jcr:primaryType="nt:unstructured"
                                                                 jcr:title="Mandatory"
-                                                                cssSelector=".cmp-adaptiveform-radiobutton__option__widget:required"/>
+                                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option__widget:required"/>
                                                     </states>
                                                 </radioButtonWidgetAndTextVertical>
                                             </items>
@@ -419,11 +420,11 @@
                                                 <hover
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Hover"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option-label:hover"/>
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label:hover"/>
                                                 <focus
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Focus"
-                                                        cssSelector=".cmp-adaptiveform-radiobutton__option-label:focus"/>
+                                                        cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option-label:focus"/>
                                             </states>
                                         </radioButtonItemLabelContainerVertical>
                                     </items>
@@ -431,19 +432,19 @@
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option input[disabled] + span"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option input[disabled] + span"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option:hover"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-radiobutton__option:focus"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option:focus"/>
                                         <mandatory
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Mandatory"
-                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__option"/>
+                                                cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true'] .cmp-adaptiveform-radiobutton__widget.VERTICAL .cmp-adaptiveform-radiobutton__option"/>
                                     </states>
                                 </radioButtonItemVertical>
                             </items>
@@ -473,6 +474,15 @@
                                 cssSelector=".cmp-adaptiveform-radiobutton__longdescription"
                                 longTitle="Radio Button Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_radiobuttondescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-radiobutton__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml
index 5d8c4ef29b..8306ccaade 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml
@@ -87,6 +87,10 @@
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
                                                 cssSelector=".cmp-adaptiveform-review__edit-button:disabled"/>
+                                        <htmlDisabled
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Disabled (HTML)"
+                                                cssSelector=".cmp-adaptiveform-review__edit-button[disabled=&quot;true&quot;]"/>
                                     </states>
                                 </reviewEditButton>
                             </items>
@@ -113,6 +117,13 @@
                                         longTitle="Review Panel Label Container"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <items jcr:primaryType="nt:unstructured">
+                                        <reviewPanelLabelInLabelContainer
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Label"
+                                                id="af2_reviewpanellabel"
+                                                cssSelector=".cmp-adaptiveform-review__label-container .cmp-adaptiveform-review__label"
+                                                longTitle="Review Label"
+                                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
                                         <reviewPanelLabel
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Label"
@@ -151,6 +162,10 @@
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Disabled"
                                                         cssSelector=".cmp-adaptiveform-review__panel .cmp-adaptiveform-review__edit-button:disabled"/>
+                                                <htmlDisabled
+                                                        jcr:primaryType="nt:unstructured"
+                                                        jcr:title="Disabled (HTML)"
+                                                        cssSelector=".cmp-adaptiveform-review__panel .cmp-adaptiveform-review__edit-button[disabled=&quot;true&quot;]"/>
                                             </states>
                                         </reviewPanelEditButton>
                                     </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml
index 3b72c321e8..1b9af1bba4 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_switchlabel"
-                                        cssSelector=".cmp-adaptiveform-switch__label"
+                                        cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__label"
                                         longTitle="Switch Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-switch__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-switch__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__label:focus"/>
                                     </states>
                                 </switchLabel>
                                 <switchHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_switchhelpicon"
-                                        cssSelector=".cmp-adaptiveform-switch__questionmark"
+                                        cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__questionmark"
                                         longTitle="Switch Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,19 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-switch__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-switch__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-switch__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__questionmark:disabled"/>
+                                        <rtl
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="RTL"
+                                                cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-switch__label-container .cmp-adaptiveform-switch__questionmark"/>
                                     </states>
                                 </switchHelpIcon>
                             </items>
@@ -73,15 +77,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-switch__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-switch__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-switch__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-switch__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-switch__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-switch__label-container:focus"/>
                             </states>
                         </switchLabelContainer>
                         <switchContainer
@@ -108,13 +112,47 @@
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Focus"
                                             cssSelector=".cmp-adaptiveform-switch__option:focus"/>
+                                        <hideLabelsOn
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="Hide Labels (On)"
+                                            cssSelector=".cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--on"/>
+                                        <hideLabelsOff
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="Hide Labels (Off)"
+                                            cssSelector=".cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--off"/>
+                                        <unhideLabelsOn
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="Unhide Labels (On)"
+                                            cssSelector=".cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--on"/>
+                                        <unhideLabelsOff
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="Unhide Labels (Off)"
+                                            cssSelector=".cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--off"/>
                                     </states>
                                 </switchOption>
+                                <switchWidgetInput
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Widget Input"
+                                        id="af2_switchwidgetinput"
+                                        cssSelector=".cmp-adaptiveform-switch__widget"
+                                        longTitle="Switch Widget Input"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <states jcr:primaryType="nt:unstructured">
+                                        <focus
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Focus"
+                                                cssSelector="input:focus + .cmp-adaptiveform-switch__widget-slider"/>
+                                        <checked
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Selected"
+                                                cssSelector="input:checked + .cmp-adaptiveform-switch__widget-slider"/>
+                                    </states>
+                                </switchWidgetInput>
                                 <switchWidget
                                         jcr:primaryType="nt:unstructured"
-                                        jcr:title="Widget"
+                                        jcr:title="Widget Label"
                                         id="af2_switchwidget"
-                                        cssSelector=".adaptiveform-switch__widget-label"
+                                        cssSelector=".cmp-adaptiveform-switch__widget-label"
                                         longTitle="Switch Widget"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
@@ -156,6 +194,14 @@
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Selected"
                                                 cssSelector=".cmp-adaptiveform-switch__widget:checked + .cmp-adaptiveform-switch__widget-slider .cmp-adaptiveform-switch__circle-indicator"/>
+                                        <filled
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Filled"
+                                                cssSelector=".cmp-adaptiveform-switch--filled .cmp-adaptiveform-switch__circle-indicator"/>
+                                        <filledRtl
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Filled RTL"
+                                                cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-switch--filled .cmp-adaptiveform-switch__circle-indicator"/>
                                     </states>
                                 </switchHandle>
                                 <switchSlider
@@ -201,6 +247,15 @@
                                 cssSelector=".cmp-adaptiveform-switch__longdescription"
                                 longTitle="Switch Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_switchdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-switch__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml
index 7023e602b1..0995cd8b1b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml
@@ -23,25 +23,25 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Label"
                                 id="af2_tabsOnToplabel"
-                                cssSelector=".cmp-tabs__label"
+                                cssSelector=".cmp-tabs__label-container .cmp-tabs__label"
                                 longTitle="Tabs On Top Label"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                             <states jcr:primaryType="nt:unstructured">
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-tabs__label:hover"/>
+                                        cssSelector=".cmp-tabs__label-container .cmp-tabs__label:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-tabs__label:focus"/>
+                                        cssSelector=".cmp-tabs__label-container .cmp-tabs__label:focus"/>
                             </states>
                         </tabsOnTopLabel>
                         <tabsOnTopHelpIcon
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Help Icon"
                                 id="af2_tabsOnTophelpicon"
-                                cssSelector=".cmp-tabs__questionmark"
+                                cssSelector=".cmp-tabs__label-container .cmp-tabs__questionmark"
                                 longTitle="Tabs On Top Help Icon"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                 secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -49,15 +49,15 @@
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-tabs__questionmark:focus"/>
+                                        cssSelector=".cmp-tabs__label-container .cmp-tabs__questionmark:focus"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-tabs__questionmark:hover"/>
+                                        cssSelector=".cmp-tabs__label-container .cmp-tabs__questionmark:hover"/>
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector=".cmp-tabs__questionmark:disabled"/>
+                                        cssSelector=".cmp-tabs__label-container .cmp-tabs__questionmark:disabled"/>
                             </states>
                         </tabsOnTopHelpIcon>
                     </items>
@@ -91,6 +91,15 @@
                         cssSelector=".cmp-tabs__longdescription"
                         longTitle="Tabs On Top Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_tabsOnTopdescriptionlongparagraph"
+                                cssSelector=".cmp-tabs__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -122,6 +131,14 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Active"
                                         cssSelector=".cmp-tabs__tab--active"/>
+                                <activeCompound
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Active (Compound)"
+                                        cssSelector=".cmp-tabs__tab.cmp-tabs__tab--active"/>
+                                <activeCompoundHover
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Active Hover (Compound)"
+                                        cssSelector=".cmp-tabs__tab.cmp-tabs__tab--active:hover"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
@@ -150,6 +167,30 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Disabled"
                                 cssSelector=".cmp-tabs__tablist:disabled"/>
+                        <tablistMarkerDefault
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List Marker"
+                                cssSelector=".cmp-tabs__tablist &gt; li::before"/>
+                        <tablistMarkerActive
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List Marker (Active)"
+                                cssSelector=".cmp-tabs__tablist &gt; li.cmp-tabs__tab--active::before"/>
+                        <tablistMarkerStepped
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List Marker (Stepped)"
+                                cssSelector=".cmp-tabs__tablist &gt; li.cmp-tabs__tab--stepped::before"/>
+                        <tablistMarkerActiveStepped
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List Marker (Active Stepped)"
+                                cssSelector=".cmp-tabs__tablist &gt; li.cmp-tabs__tab--active.cmp-tabs__tab--stepped::before"/>
+                        <tablistItemStepped
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List Item (Stepped)"
+                                cssSelector=".cmp-tabs__tablist &gt; li.cmp-tabs__tab--stepped"/>
+                        <tablistItem
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List Item"
+                                cssSelector=".cmp-tabs__tablist &gt; li"/>
                     </states>
                 </tabsOnTopTabList>
             </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml
index 1565e3b8be..5c6cae3714 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml
@@ -26,25 +26,25 @@
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Label"
                                             id="af2_telephoneinputlabel"
-                                            cssSelector=".cmp-adaptiveform-telephoneinput__label"
+                                            cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__label"
                                             longTitle="Telephone Input Label"
                                             propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                         <states jcr:primaryType="nt:unstructured">
                                             <hover
                                                     jcr:primaryType="nt:unstructured"
                                                     jcr:title="Hover"
-                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label:hover"/>
+                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__label:hover"/>
                                             <focus
                                                     jcr:primaryType="nt:unstructured"
                                                     jcr:title="Focus"
-                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label:focus"/>
+                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__label:focus"/>
                                         </states>
                                     </telephoneinputLabel>
                                     <telephoneinputHelpIcon
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Help Icon"
                                             id="af2_telephoneinputhelpicon"
-                                            cssSelector=".cmp-adaptiveform-telephoneinput__questionmark"
+                                            cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__questionmark"
                                             longTitle="Telephone Input Help Icon"
                                             propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                             secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -52,15 +52,15 @@
                                             <focus
                                                     jcr:primaryType="nt:unstructured"
                                                     jcr:title="Focus"
-                                                    cssSelector=".cmp-adaptiveform-telephoneinput__questionmark:focus"/>
+                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__questionmark:focus"/>
                                             <hover
                                                     jcr:primaryType="nt:unstructured"
                                                     jcr:title="Hover"
-                                                    cssSelector=".cmp-adaptiveform-telephoneinput__questionmark:hover"/>
+                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__questionmark:hover"/>
                                             <disabled
                                                     jcr:primaryType="nt:unstructured"
                                                     jcr:title="Disabled"
-                                                    cssSelector=".cmp-adaptiveform-telephoneinput__questionmark:disabled"/>
+                                                    cssSelector=".cmp-adaptiveform-telephoneinput__label-container .cmp-adaptiveform-telephoneinput__questionmark:disabled"/>
                                         </states>
                                     </telephoneinputHelpIcon>
                                 </items>
@@ -68,15 +68,15 @@
                                     <disabled
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Disabled"
-                                            cssSelector="cmp-adaptiveform-telephoneinput__label-container:disabled"/>
+                                            cssSelector=".cmp-adaptiveform-telephoneinput__label-container:disabled"/>
                                     <hover
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Hover"
-                                            cssSelector="cmp-adaptiveform-telephoneinput__label-container:hover"/>
+                                            cssSelector=".cmp-adaptiveform-telephoneinput__label-container:hover"/>
                                     <focus
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Focus"
-                                            cssSelector="cmp-adaptiveform-telephoneinput__label-container:focus"/>
+                                            cssSelector=".cmp-adaptiveform-telephoneinput__label-container:focus"/>
                                 </states>
                             </telephoneinputLabelContainer>
                             <telephoneinputWidgetAndText
@@ -121,6 +121,15 @@
                                     cssSelector=".cmp-adaptiveform-telephoneinput__longdescription"
                                     longTitle="Telephone Input Long Description"
                                     propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_telephoneinputdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-telephoneinput__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                                 <states jcr:primaryType="nt:unstructured">
                                     <focus
                                             jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml
index 5f0b230d23..7078bea6d2 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_tnclabel"
-                                        cssSelector=".cmp-adaptiveform-termsandcondition__label"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__label"
                                         longTitle="Terms and Conditions Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-termsandcondition__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-termsandcondition__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__label:focus"/>
                                     </states>
                                 </tncLabel>
                                 <tncHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_tnchelpicon"
-                                        cssSelector=".cmp-adaptiveform-termsandcondition__questionmark"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__questionmark"
                                         longTitle="Terms and Conditions Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-termsandcondition__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-termsandcondition__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-termsandcondition__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-termsandcondition__label-container .cmp-adaptiveform-termsandcondition__questionmark:disabled"/>
                                     </states>
                                 </tncHelpIcon>
                             </items>
@@ -73,15 +73,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-termsandcondition__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-termsandcondition__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-termsandcondition__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__label-container:focus"/>
                             </states>
                         </tncLabelContainer>
                         <tncContentContainer
@@ -122,6 +122,95 @@
                                         cssSelector=".cmp-adaptiveform-termsandcondition__content-container:focus"/>
                             </states>
                         </tncContentContainer>
+                        <tncModalContentContainer
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Modal Content Container"
+                                id="af2_tncmodalcontainer"
+                                cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal"
+                                longTitle="Terms Modal Content Container"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                            <items jcr:primaryType="nt:unstructured">
+                                <tncModalText
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Modal Text"
+                                        id="af2_tncmodaltext"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__text"
+                                        longTitle="Terms Modal Text"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <tncModalBody
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Modal Body"
+                                        id="af2_tncmodalbody"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__body"
+                                        longTitle="Terms Modal Body"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <tncModalHeader
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Modal Header"
+                                        id="af2_tncmodalheader"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__header"
+                                        longTitle="Terms Modal Header"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <items jcr:primaryType="nt:unstructured">
+                                        <tncModalHeaderH3
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Modal Header Title"
+                                                id="af2_tncmodalheaderh3"
+                                                cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__header h3"
+                                                longTitle="Terms Modal Header Title"
+                                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                    </items>
+                                </tncModalHeader>
+                                <tncModalCloseButton
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Modal Close Button"
+                                        id="af2_tncmodalclose"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__close-button"
+                                        longTitle="Terms Modal Close Button"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <tncModalInnerContent
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Modal Inner Content"
+                                        id="af2_tncmodalinnercontent"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__content"
+                                        longTitle="Terms Modal Inner Content"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                            </items>
+                        </tncModalContentContainer>
+                        <tncStandaloneText
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Terms Text"
+                                id="af2_tncstandalonetext"
+                                cssSelector=".cmp-adaptiveform-termsandcondition__text"
+                                longTitle="Terms Text"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                        <tncLink
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Terms Link"
+                                id="af2_tnclink"
+                                cssSelector=".cmp-adaptiveform-termsandcondition__link"
+                                longTitle="Terms Link"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                            <items jcr:primaryType="nt:unstructured">
+                                <tncLinkCheckboxGroupValid
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Link with Valid Checkbox Group"
+                                        id="af2_tnclinkcbvalid"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__link .cmp-adaptiveform-checkboxgroup[data-cmp-valid='true']"
+                                        longTitle="Terms Link Checkbox Group Valid"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                            </items>
+                            <states jcr:primaryType="nt:unstructured">
+                                <link
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Link"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__link a:link"/>
+                                <visited
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Visited"
+                                        cssSelector=".cmp-adaptiveform-termsandcondition__link a:visited"/>
+                            </states>
+                        </tncLink>
                         <tncConsentArea
                             jcr:primaryType="nt:unstructured"
                             jcr:title="Consent Area"
@@ -206,6 +295,15 @@
                                 cssSelector=".cmp-adaptiveform-termsandcondition__longdescription"
                                 longTitle="Terms And Conditions Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_tncdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-termsandcondition__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml
index 20ce99c843..1a6ffe882a 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml
@@ -31,25 +31,25 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Label"
                                         id="af2_textinputlabel"
-                                        cssSelector=".cmp-adaptiveform-textinput__label"
+                                        cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__label"
                                         longTitle="Text Input Label"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                                     <states jcr:primaryType="nt:unstructured">
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-textinput__label:hover"/>
+                                                cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__label:hover"/>
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-textinput__label:focus"/>
+                                                cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__label:focus"/>
                                     </states>
                                 </textinputLabel>
                                 <textinputHelpIcon
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Help Icon"
                                         id="af2_textinputhelpicon"
-                                        cssSelector=".cmp-adaptiveform-textinput__questionmark"
+                                        cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__questionmark"
                                         longTitle="Text Input Help Icon"
                                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                         secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -57,15 +57,15 @@
                                         <focus
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Focus"
-                                                cssSelector=".cmp-adaptiveform-textinput__questionmark:focus"/>
+                                                cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__questionmark:focus"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
-                                                cssSelector=".cmp-adaptiveform-textinput__questionmark:hover"/>
+                                                cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__questionmark:hover"/>
                                         <disabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled"
-                                                cssSelector=".cmp-adaptiveform-textinput__questionmark:disabled"/>
+                                                cssSelector=".cmp-adaptiveform-textinput__label-container .cmp-adaptiveform-textinput__questionmark:disabled"/>
                                     </states>
                                 </textinputHelpIcon>
                             </items>
@@ -73,15 +73,15 @@
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector="cmp-adaptiveform-textinput__label-container:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-textinput__label-container:disabled"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector="cmp-adaptiveform-textinput__label-container:hover"/>
+                                        cssSelector=".cmp-adaptiveform-textinput__label-container:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector="cmp-adaptiveform-textinput__label-container:focus"/>
+                                        cssSelector=".cmp-adaptiveform-textinput__label-container:focus"/>
                             </states>
                         </textinputLabelContainer>
                         <textinputWidgetAndText
@@ -126,6 +126,15 @@
                                 cssSelector=".cmp-adaptiveform-textinput__longdescription"
                                 longTitle="Text Input Long Description"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_textinputdescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-textinput__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
                                         jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v2/title/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v2/title/_cq_styleConfig/.content.xml
index 6208ac2aac..8016d9aa2a 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v2/title/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v2/title/_cq_styleConfig/.content.xml
@@ -3,6 +3,13 @@
     jcr:primaryType="nt:unstructured"
     jcr:title="FormTitle">
     <items jcr:primaryType="nt:unstructured">
+        <formTitleText
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Title Text"
+            id="af2_formtitletext"
+            cssSelector=".cmp-title__text"
+            longTitle="Form Title Text"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
         <formTitle
             jcr:primaryType="nt:unstructured"
             jcr:title="Title"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml
index 488eaabf16..615cdb63d6 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml
@@ -23,25 +23,25 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Label"
                                 id="af2_verticalTabslabel"
-                                cssSelector=".cmp-verticaltabs__label"
+                                cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__label"
                                 longTitle="Vertical Tabs Label"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                             <states jcr:primaryType="nt:unstructured">
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-verticaltabs__label:hover"/>
+                                        cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__label:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-verticaltabs__label:focus"/>
+                                        cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__label:focus"/>
                             </states>
                         </verticalTabsLabel>
                         <verticalTabsHelpIcon
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Help Icon"
                                 id="af2_verticalTabshelpicon"
-                                cssSelector=".cmp-verticaltabs__questionmark"
+                                cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__questionmark"
                                 longTitle="Vertical Tabs Help Icon"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                 secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -49,15 +49,15 @@
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-verticaltabs__questionmark:focus"/>
+                                        cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__questionmark:focus"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-verticaltabs__questionmark:hover"/>
+                                        cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__questionmark:hover"/>
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector=".cmp-verticaltabs__questionmark:disabled"/>
+                                        cssSelector=".cmp-verticaltabs__label-container .cmp-verticaltabs__questionmark:disabled"/>
                             </states>
                         </verticalTabsHelpIcon>
                     </items>
@@ -91,6 +91,15 @@
                         cssSelector=".cmp-verticaltabs__longdescription"
                         longTitle="Vertical Tabs Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_verticalTabsdescriptionlongparagraph"
+                                cssSelector=".cmp-verticaltabs__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -102,6 +111,20 @@
                                 cssSelector=".cmp-verticaltabs__longdescription:hover"/>
                     </states>
                 </verticalTabsDescriptionLong>
+                <verticalTabsTabPanel
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Tab Panel"
+                        id="af2_verticalTabstabpanel"
+                        cssSelector=".cmp-verticaltabs__tabpanel"
+                        longTitle="Vertical Tabs Tab Panel"
+                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <states jcr:primaryType="nt:unstructured">
+                        <active
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Active"
+                                cssSelector=".cmp-verticaltabs__tabpanel--active"/>
+                    </states>
+                </verticalTabsTabPanel>
                 <verticalTabsTabContainer
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Tab Container"
@@ -130,6 +153,10 @@
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Active"
                                                 cssSelector=".cmp-verticaltabs__tab--active"/>
+                                        <activeCompound
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Active (Compound)"
+                                                cssSelector=".cmp-verticaltabs__tab.cmp-verticaltabs__tab--active"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
@@ -158,6 +185,30 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
                                         cssSelector=".cmp-verticaltabs__tablist:disabled"/>
+                                <tablistMarkerDefault
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker"
+                                        cssSelector=".cmp-verticaltabs__tablist &gt; li::before"/>
+                                <tablistMarkerActive
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker (Active)"
+                                        cssSelector=".cmp-verticaltabs__tablist &gt; li.cmp-verticaltabs__tab--active::before"/>
+                                <tablistMarkerStepped
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker (Stepped)"
+                                        cssSelector=".cmp-verticaltabs__tablist &gt; li.cmp-verticaltabs__tab--stepped::before"/>
+                                <tablistMarkerActiveStepped
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker (Active Stepped)"
+                                        cssSelector=".cmp-verticaltabs__tablist &gt; li.cmp-verticaltabs__tab--active.cmp-verticaltabs__tab--stepped::before"/>
+                                <tablistItemStepped
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Item (Stepped)"
+                                        cssSelector=".cmp-verticaltabs__tablist &gt; li.cmp-verticaltabs__tab--stepped"/>
+                                <tablistItem
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Item"
+                                        cssSelector=".cmp-verticaltabs__tablist &gt; li"/>
                             </states>
                         </verticalTabsTabList>
                     </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml
index 9f2acc53ac..05920d80d4 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml
@@ -11,6 +11,13 @@
             longTitle="Wizard Panel Container"
             propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
             <items jcr:primaryType="nt:unstructured">
+                <wizardRoot
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Wizard Root"
+                        id="af2_wizardroot"
+                        cssSelector=".cmp-adaptiveform-wizard"
+                        longTitle="Wizard Root"
+                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
                 <wizardLabelContainer
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Label Container"
@@ -23,25 +30,25 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Label"
                                 id="af2_wizardlabel"
-                                cssSelector=".cmp-adaptiveform-wizard__label"
+                                cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__label"
                                 longTitle="Wizard Label"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                             <states jcr:primaryType="nt:unstructured">
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-adaptiveform-wizard__label:hover"/>
+                                        cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__label:hover"/>
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-adaptiveform-wizard__label:focus"/>
+                                        cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__label:focus"/>
                             </states>
                         </wizardLabel>
                         <wizardHelpIcon
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Help Icon"
                                 id="af2_wizardhelpicon"
-                                cssSelector=".cmp-adaptiveform-wizard__questionmark"
+                                cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__questionmark"
                                 longTitle="Wizard Help Icon"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
                                 secondarySelectors="af2_guideContainer:af2_helpicon">
@@ -49,15 +56,15 @@
                                 <focus
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Focus"
-                                        cssSelector=".cmp-adaptiveform-wizard__questionmark:focus"/>
+                                        cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__questionmark:focus"/>
                                 <hover
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
-                                        cssSelector=".cmp-adaptiveform-wizard__questionmark:hover"/>
+                                        cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__questionmark:hover"/>
                                 <disabled
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Disabled"
-                                        cssSelector=".cmp-adaptiveform-wizard__questionmark:disabled"/>
+                                        cssSelector=".cmp-adaptiveform-wizard__label-container .cmp-adaptiveform-wizard__questionmark:disabled"/>
                             </states>
                         </wizardHelpIcon>
                     </items>
@@ -91,6 +98,15 @@
                         cssSelector=".cmp-adaptiveform-wizard__longdescription"
                         longTitle="Wizard Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <longDescriptionParagraph
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Long Description Paragraph"
+                                id="af2_wizarddescriptionlongparagraph"
+                                cssSelector=".cmp-adaptiveform-wizard__longdescription p"
+                                longTitle="Long Description Paragraph"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                    </items>
                     <states jcr:primaryType="nt:unstructured">
                         <focus
                                 jcr:primaryType="nt:unstructured"
@@ -110,6 +126,61 @@
                     longTitle="Wizard Widget"
                     propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                     <items jcr:primaryType="nt:unstructured">
+                        <wizardWidgetV2Compound
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Widget (V2 Compound)"
+                                id="af2_wizardwidgetv2compound"
+                                cssSelector=".cmp-adaptiveform-wizard__widget--v2.cmp-adaptiveform-wizard__widget"
+                                longTitle="Wizard Widget V2 Compound"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                        <wizardWizardPanel
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Wizard Panel"
+                                id="af2_wizardwizardpanel"
+                                cssSelector=".cmp-adaptiveform-wizard__wizardpanel"
+                                longTitle="Wizard Content Panel"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                            <states jcr:primaryType="nt:unstructured">
+                                <v2Compound
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="V2 Compound"
+                                        cssSelector=".cmp-adaptiveform-wizard__wizardpanel--v2.cmp-adaptiveform-wizard__wizardpanel"/>
+                            </states>
+                        </wizardWizardPanel>
+                        <wizardTabList
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Tab List"
+                                id="af2_wizardtablist"
+                                cssSelector=".cmp-adaptiveform-wizard__tabList"
+                                longTitle="Wizard Tab List"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                            <states jcr:primaryType="nt:unstructured">
+                                <tablistMarkerDefault
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker"
+                                        cssSelector=".cmp-adaptiveform-wizard__tabList &gt; li::before"/>
+                                <tablistMarkerActive
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker (Active)"
+                                        cssSelector=".cmp-adaptiveform-wizard__tabList &gt; li.cmp-adaptiveform-wizard__tab--active::before"/>
+                                <tablistMarkerStepped
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker (Stepped)"
+                                        cssSelector=".cmp-adaptiveform-wizard__tabList &gt; li.cmp-adaptiveform-wizard__tab--stepped::before"/>
+                                <tablistMarkerActiveStepped
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Marker (Active Stepped)"
+                                        cssSelector=".cmp-adaptiveform-wizard__tabList &gt; li.cmp-adaptiveform-wizard__tab--active.cmp-adaptiveform-wizard__tab--stepped::before"/>
+                                <tablistItemStepped
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Item (Stepped)"
+                                        cssSelector=".cmp-adaptiveform-wizard__tabList &gt; li.cmp-adaptiveform-wizard__tab--stepped"/>
+                                <tablistItem
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Tab List Item"
+                                        cssSelector=".cmp-adaptiveform-wizard__tabList &gt; li"/>
+                            </states>
+                        </wizardTabList>
                         <wizardPanelNavigationGroup
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Wizard Navigation Group"
@@ -130,10 +201,26 @@
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Active"
                                                 cssSelector=".cmp-adaptiveform-wizard__tab:active"/>
+                                        <activeBem
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Active (BEM)"
+                                                cssSelector=".cmp-adaptiveform-wizard__tab--active"/>
+                                        <scopedTab
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Tab (Scoped)"
+                                                cssSelector=".cmp-adaptiveform-wizard .cmp-adaptiveform-wizard__tab"/>
+                                        <scopedActive
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Active Tab (Scoped)"
+                                                cssSelector=".cmp-adaptiveform-wizard .cmp-adaptiveform-wizard__tab--active"/>
                                         <stepped
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Visited"
                                                 cssSelector=".cmp-adaptiveform-wizard__tab.stepped"/>
+                                        <steppedBem
+                                                jcr:primaryType="nt:unstructured"
+                                                jcr:title="Visited (BEM)"
+                                                cssSelector=".cmp-adaptiveform-wizard__tab--stepped"/>
                                         <hover
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Hover"
@@ -168,6 +255,14 @@
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Hover"
                                         cssSelector=".cmp-adaptiveform-wizard__nav--next:hover"/>
+                                    <rtl
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="RTL"
+                                        cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-wizard__nav--next"/>
+                                    <rtlHover
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="RTL Hover"
+                                        cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-wizard__nav--next:hover"/>
                                 </states>
                                 </panelNextScroll>
                                 <panelPreviousScroll
@@ -182,8 +277,30 @@
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Hover"
                                             cssSelector=".cmp-adaptiveform-wizard__nav--previous:hover"/>
+                                        <rtl
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="RTL"
+                                            cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-wizard__nav--previous"/>
+                                        <rtlHover
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="RTL Hover"
+                                            cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-wizard__nav--previous:hover"/>
                                     </states>
                                 </panelPreviousScroll>
+                                <wizardNav
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Navigation"
+                                        id="af2_wizardnav"
+                                        cssSelector=".cmp-adaptiveform-wizard__nav"
+                                        longTitle="Wizard Navigation"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                                    <states jcr:primaryType="nt:unstructured">
+                                        <rtl
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="RTL"
+                                            cssSelector="[dir=&quot;rtl&quot;] .cmp-adaptiveform-wizard__nav"/>
+                                    </states>
+                                </wizardNav>
                             </items>
                         </wizardPanelScrollers>
                     </items>

From 21e83f293a4b8b7a3ad68768dea0ceb95c1c4ded Mon Sep 17 00:00:00 2001
From: Muskan Gupta <muskgupta@Muskans-MacBook-Pro.local>
Date: Wed, 29 Apr 2026 14:44:45 +0530
Subject: [PATCH 2/6] Updating style selectors further

---
 .../v1/accordion/_cq_styleConfig/.content.xml |  2 +-
 .../v2/reset/_cq_styleConfig/.content.xml     | 41 ++++++++++++-
 .../v2/submit/_cq_styleConfig/.content.xml    | 41 ++++++++++++-
 .../v2/button/_cq_styleConfig/.content.xml    |  2 +-
 .../v2/container/_cq_themeConfig/.content.xml | 60 ++++++++++++++++---
 .../v3/fileinput/_cq_styleConfig/.content.xml | 18 ------
 .../v1/review/_cq_styleConfig/.content.xml    |  4 +-
 .../v1/switch/_cq_styleConfig/.content.xml    | 44 +++++++++-----
 .../_cq_styleConfig/.content.xml              |  2 +-
 9 files changed, 165 insertions(+), 49 deletions(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml
index 42d590cc1f..41cd8f33f1 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml
@@ -92,7 +92,7 @@
                         longTitle="Accordion Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                     <items jcr:primaryType="nt:unstructured">
-                        <accordionDescriptionLongParagraph
+                        <longDescriptionParagraph
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Long Description Paragraph"
                                 id="af2_accordiondescriptionlongparagraph"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml
index c8208df2aa..8138daa9c4 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v2/reset/_cq_styleConfig/.content.xml
@@ -62,7 +62,7 @@
                         longTitle="Reset Button Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                     <items jcr:primaryType="nt:unstructured">
-                        <buttonDescriptionLongParagraph
+                        <longDescriptionParagraph
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Long Description Paragraph"
                                 id="af2_resetbuttondescriptionlongparagraph"
@@ -81,6 +81,45 @@
                                 cssSelector=".reset .cmp-adaptiveform-button__longdescription:required"/>
                     </states>
                 </buttonDescriptionLong>
+                <buttonHelpContainer
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Help Container"
+                        id="af2_resetbuttonhelpcontainer"
+                        cssSelector=".reset .cmp-adaptiveform-button__help-container"
+                        longTitle="Reset Button Help Container"
+                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <buttonHelpIcon
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Help Icon"
+                                id="af2_resetbuttonhelpicon"
+                                cssSelector=".reset .cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark"
+                                longTitle="Reset Button Help Icon"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+                                secondarySelectors="af2_guideContainer:af2_helpicon">
+                            <states jcr:primaryType="nt:unstructured">
+                                <focus
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Focus"
+                                        cssSelector=".reset .cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark:focus"/>
+                                <hover
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Hover"
+                                        cssSelector=".reset .cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark:hover"/>
+                            </states>
+                        </buttonHelpIcon>
+                    </items>
+                    <states jcr:primaryType="nt:unstructured">
+                        <focus
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Focus"
+                                cssSelector=".reset .cmp-adaptiveform-button__help-container:focus"/>
+                        <hover
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Hover"
+                                cssSelector=".reset .cmp-adaptiveform-button__help-container:hover"/>
+                    </states>
+                </buttonHelpContainer>
             </items>
             <states jcr:primaryType="nt:unstructured">
                 <focus
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml
index 0ff549a006..3f2bb690fd 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml
@@ -62,7 +62,7 @@
                         longTitle="Submit Button Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                     <items jcr:primaryType="nt:unstructured">
-                        <buttonDescriptionLongParagraph
+                        <longDescriptionParagraph
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Long Description Paragraph"
                                 id="af2_submitbuttondescriptionlongparagraph"
@@ -81,6 +81,45 @@
                                 cssSelector=".submit .cmp-adaptiveform-button__longdescription:required"/>
                     </states>
                 </buttonDescriptionLong>
+                <buttonHelpContainer
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Help Container"
+                        id="af2_submitbuttonhelpcontainer"
+                        cssSelector=".submit .cmp-adaptiveform-button__help-container"
+                        longTitle="Submit Button Help Container"
+                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+                    <items jcr:primaryType="nt:unstructured">
+                        <buttonHelpIcon
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Help Icon"
+                                id="af2_submitbuttonhelpicon"
+                                cssSelector=".submit .cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark"
+                                longTitle="Submit Button Help Icon"
+                                propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+                                secondarySelectors="af2_guideContainer:af2_helpicon">
+                            <states jcr:primaryType="nt:unstructured">
+                                <focus
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Focus"
+                                        cssSelector=".submit .cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark:focus"/>
+                                <hover
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Hover"
+                                        cssSelector=".submit .cmp-adaptiveform-button__help-container .cmp-adaptiveform-button__questionmark:hover"/>
+                            </states>
+                        </buttonHelpIcon>
+                    </items>
+                    <states jcr:primaryType="nt:unstructured">
+                        <focus
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Focus"
+                                cssSelector=".submit .cmp-adaptiveform-button__help-container:focus"/>
+                        <hover
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Hover"
+                                cssSelector=".submit .cmp-adaptiveform-button__help-container:hover"/>
+                    </states>
+                </buttonHelpContainer>
             </items>
             <states jcr:primaryType="nt:unstructured">
                 <focus
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml
index 951a9d5d16..8ac584313b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml
@@ -60,7 +60,7 @@
                         longTitle="Button Long Description"
                         propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
                     <items jcr:primaryType="nt:unstructured">
-                        <buttonDescriptionLongParagraph
+                        <longDescriptionParagraph
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Long Description Paragraph"
                                 id="af2_buttondescriptionlongparagraph"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
index 661b198aff..8a0b163e48 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
@@ -103,9 +103,6 @@
                         <fileUploadButton
                             jcr:primaryType="nt:unstructured"
                             target="/mnt/override/libs/core/fd/components/form/fileinput/v4/fileinput/cq:styleConfig/items/field/items/widgetAndText"/>
-                        <scribbleWidgetAndText
-                            jcr:primaryType="nt:unstructured"
-                            target="/mnt/override/libs/core/fd/components/form/scribble/v1/scribble/cq:styleConfig/items/field/items/widgetAndText"/>
                         <tncWidgetAndText
                             jcr:primaryType="nt:unstructured"
                             target="/mnt/override/libs/core/fd/components/form/termsandconditions/v1/termsandconditions/cq:styleConfig/items/field/items/widgetAndText"/>
@@ -137,9 +134,29 @@
                     target="/mnt/override/libs/core/fd/components/form/base/v1/base/cq:styleConfig/items/field/items/errorMessage"/>
             </items>
         </base>
+        <review
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Review"
+            id="af2_review"
+            cssSelector=".cmp-adaptiveform-review"
+            longTitle="Review"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+            target="/mnt/override/libs/core/fd/components/form/review/v1/review/cq:styleConfig/items/field/items/widgetAndText"/>
+        <scribble
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Scribble"
+            id="af2_scribble"
+            cssSelector=".cmp-adaptiveform-scribble"
+            longTitle="Scribble"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+            target="/mnt/override/libs/core/fd/components/form/scribble/v1/scribble/cq:styleConfig/items/field/items/widgetAndText"/>
         <button
             jcr:primaryType="nt:unstructured"
-            jcr:title="Button">
+            jcr:title="Button"
+            id="af2_button"
+            cssSelector=".cmp-adaptiveform-button"
+            longTitle="Button"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
             <items jcr:primaryType="nt:unstructured">
                 <allButton
                     jcr:primaryType="nt:unstructured"
@@ -154,7 +171,11 @@
         </button>
         <panel
             jcr:primaryType="nt:unstructured"
-            jcr:title="Panel">
+            jcr:title="Panel"
+            id="af2_panel"
+            cssSelector=".cmp-adaptiveform-panel"
+            longTitle="Panel"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
             <items jcr:primaryType="nt:unstructured">
                 <responsivePanel
                     jcr:primaryType="nt:unstructured"
@@ -175,12 +196,35 @@
         </panel>
         <Image
             jcr:primaryType="nt:unstructured"
-            target="/mnt/override/libs/core/fd/components/form/image/v1/image/cq:styleConfig/items/Image"/>
+            jcr:title="Image"
+            id="af2_image"
+            cssSelector=".cmp-adaptiveform-image"
+            longTitle="Image"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
+            <items jcr:primaryType="nt:unstructured">
+                <imageRoot
+                    jcr:primaryType="nt:unstructured"
+                    target="/mnt/override/libs/core/fd/components/form/image/v1/image/cq:styleConfig/items/Image/items/imageRoot"/>
+                <image
+                    jcr:primaryType="nt:unstructured"
+                    target="/mnt/override/libs/core/fd/components/form/image/v1/image/cq:styleConfig/items/Image/items/image"/>
+            </items>
+        </Image>
         <hcaptcha
             jcr:primaryType="nt:unstructured"
+            jcr:title="HCaptcha"
+            id="af2_hcaptcha"
+            cssSelector=".cmp-adaptiveform-hcaptcha"
+            longTitle="HCaptcha"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
             target="/mnt/override/libs/core/fd/components/form/hcaptcha/v1/hcaptcha/cq:styleConfig/items/field/items/captcha"/>
         <recaptcha
-                jcr:primaryType="nt:unstructured"
-                target="/mnt/override/libs/core/fd/components/form/recaptcha/v1/recaptcha/cq:styleConfig/items/field/items/captcha"/>
+            jcr:primaryType="nt:unstructured"
+            jcr:title="reCaptcha"
+            id="af2_recaptcha"
+            cssSelector=".cmp-adaptiveform-recaptcha"
+            longTitle="reCaptcha"
+            propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"
+            target="/mnt/override/libs/core/fd/components/form/recaptcha/v1/recaptcha/cq:styleConfig/items/field/items/captcha"/>
     </items>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
index c4f8211797..3b8753c173 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
@@ -193,24 +193,6 @@
                                                 cssSelector=".cmp-adaptiveform-fileinput__widgetlabel:required"/>
                                     </states>
                                 </fileinputWidget>
-                                <fileinputNativeWidget
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="Native File Input"
-                                        id="af2_fileinputnativewidget"
-                                        cssSelector=".cmp-adaptiveform-fileinput__widget"
-                                        longTitle="File Input Native Widget"
-                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
-                                    <states jcr:primaryType="nt:unstructured">
-                                        <webkitUploadButton
-                                                jcr:primaryType="nt:unstructured"
-                                                jcr:title="WebKit Upload Button"
-                                                cssSelector=".cmp-adaptiveform-fileinput__widget::-webkit-file-upload-button"/>
-                                        <before
-                                                jcr:primaryType="nt:unstructured"
-                                                jcr:title="Before Pseudo"
-                                                cssSelector=".cmp-adaptiveform-fileinput__widget::before"/>
-                                    </states>
-                                </fileinputNativeWidget>
                             </items>
                             <states jcr:primaryType="nt:unstructured">
                                 <focus
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml
index 8306ccaade..74ab15484f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml
@@ -90,7 +90,7 @@
                                         <htmlDisabled
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Disabled (HTML)"
-                                                cssSelector=".cmp-adaptiveform-review__edit-button[disabled=&quot;true&quot;]"/>
+                                                cssSelector=".cmp-adaptiveform-review__edit-button[disabled]"/>
                                     </states>
                                 </reviewEditButton>
                             </items>
@@ -165,7 +165,7 @@
                                                 <htmlDisabled
                                                         jcr:primaryType="nt:unstructured"
                                                         jcr:title="Disabled (HTML)"
-                                                        cssSelector=".cmp-adaptiveform-review__panel .cmp-adaptiveform-review__edit-button[disabled=&quot;true&quot;]"/>
+                                                        cssSelector=".cmp-adaptiveform-review__panel .cmp-adaptiveform-review__edit-button[disabled]"/>
                                             </states>
                                         </reviewPanelEditButton>
                                     </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml
index 1b9af1bba4..19ef2e548e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml
@@ -112,24 +112,36 @@
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Focus"
                                             cssSelector=".cmp-adaptiveform-switch__option:focus"/>
-                                        <hideLabelsOn
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Hide Labels (On)"
-                                            cssSelector=".cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--on"/>
-                                        <hideLabelsOff
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Hide Labels (Off)"
-                                            cssSelector=".cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--off"/>
-                                        <unhideLabelsOn
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Unhide Labels (On)"
-                                            cssSelector=".cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--on"/>
-                                        <unhideLabelsOff
-                                            jcr:primaryType="nt:unstructured"
-                                            jcr:title="Unhide Labels (Off)"
-                                            cssSelector=".cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--off"/>
                                     </states>
                                 </switchOption>
+                                <switchHideLabelsOn
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Hide Labels (On)"
+                                        id="af2_switchhidelabelson"
+                                        cssSelector=".cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--on"
+                                        longTitle="Switch Hide Labels On Option"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <switchHideLabelsOff
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Hide Labels (Off)"
+                                        id="af2_switchhidelabelsoff"
+                                        cssSelector=".cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--off"
+                                        longTitle="Switch Hide Labels Off Option"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <switchUnhideLabelsOn
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Unhide Labels (On)"
+                                        id="af2_switchunhidelabelson"
+                                        cssSelector=".cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--on"
+                                        longTitle="Switch Unhide Labels On Option"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
+                                <switchUnhideLabelsOff
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Unhide Labels (Off)"
+                                        id="af2_switchunhidelabelsoff"
+                                        cssSelector=".cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--off"
+                                        longTitle="Switch Unhide Labels Off Option"
+                                        propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
                                 <switchWidgetInput
                                         jcr:primaryType="nt:unstructured"
                                         jcr:title="Widget Input"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml
index 7078bea6d2..a3099bc0aa 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml
@@ -181,7 +181,7 @@
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Terms Text"
                                 id="af2_tncstandalonetext"
-                                cssSelector=".cmp-adaptiveform-termsandcondition__text"
+                                cssSelector=".cmp-adaptiveform-termsandcondition__content-container:not(.cmp-adaptiveform-termsandcondition__content-container--modal) .cmp-adaptiveform-termsandcondition__text"
                                 longTitle="Terms Text"
                                 propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
                         <tncLink

From 6b26ab273559e52a1afe1b2d7af088c899a3e4fe Mon Sep 17 00:00:00 2001
From: Varun Dua <vdua@adobe.com>
Date: Sun, 3 May 2026 22:59:56 -0700
Subject: [PATCH 3/6] Merge pull request #1872 from
 adobe/fix/FORMS-25246-fieldtype-containers

feat(dialog): add fieldType hidden field to container component dialogs
---
 .../accordion/v1/accordion/_cq_dialog/.content.xml  | 13 +++++++++++++
 .../fragment/v1/fragment/_cq_dialog/.content.xml    | 13 +++++++++++++
 .../v1/panelcontainer/_cq_dialog/.content.xml       | 13 +++++++++++++
 .../tabsontop/v1/tabsontop/_cq_dialog/.content.xml  | 13 +++++++++++++
 .../form/wizard/v1/wizard/_cq_dialog/.content.xml   | 13 +++++++++++++
 5 files changed, 65 insertions(+)

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..2afe4d6111 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
@@ -104,6 +104,19 @@
                                                     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/readonly-typehint"/>
+                                            <fieldType
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    name="./fieldType"
+                                                    required="{Boolean}true"
+                                                    granite:hidden="true">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <item jcr:primaryType="nt:unstructured"
+                                                          text="Panel"
+                                                          value="panel"
+                                                          selected="{Boolean}true"/>
+                                                </items>
+                                            </fieldType>
                                         </items>
                                     </column>
                                 </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fragment/v1/fragment/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fragment/v1/fragment/_cq_dialog/.content.xml
index 85d9c3b7dc..5fb605eb92 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fragment/v1/fragment/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fragment/v1/fragment/_cq_dialog/.content.xml
@@ -54,6 +54,19 @@
                                             <unboundFormElement
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:hideResource="{Boolean}true"/>
+                                            <fieldType
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    name="./fieldType"
+                                                    required="{Boolean}true"
+                                                    granite:hidden="true">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <item jcr:primaryType="nt:unstructured"
+                                                          text="Panel"
+                                                          value="panel"
+                                                          selected="{Boolean}true"/>
+                                                </items>
+                                            </fieldType>
                                         </items>
                                     </column>
                                 </items>
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 41c0c86631..1b76737b6d 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
@@ -152,6 +152,19 @@
                                                     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/readonly-typehint"/>
+                                            <fieldType
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    name="./fieldType"
+                                                    required="{Boolean}true"
+                                                    granite:hidden="true">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <item jcr:primaryType="nt:unstructured"
+                                                          text="Panel"
+                                                          value="panel"
+                                                          selected="{Boolean}true"/>
+                                                </items>
+                                            </fieldType>
                                         </items>
                                     </column>
                                 </items>
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..768d463be4 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
@@ -104,6 +104,19 @@
                                                     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/readonly-typehint"/>
+                                            <fieldType
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    name="./fieldType"
+                                                    required="{Boolean}true"
+                                                    granite:hidden="true">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <item jcr:primaryType="nt:unstructured"
+                                                          text="Panel"
+                                                          value="panel"
+                                                          selected="{Boolean}true"/>
+                                                </items>
+                                            </fieldType>
                                         </items>
                                     </column>
                                 </items>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_dialog/.content.xml
index 8424731caf..8c4f73de46 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_dialog/.content.xml
@@ -99,6 +99,19 @@
                                                     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/readonly-typehint"/>
+                                            <fieldType
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    name="./fieldType"
+                                                    required="{Boolean}true"
+                                                    granite:hidden="true">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <item jcr:primaryType="nt:unstructured"
+                                                          text="Panel"
+                                                          value="panel"
+                                                          selected="{Boolean}true"/>
+                                                </items>
+                                            </fieldType>
                                         </items>
                                     </column>
                                 </items>

From 672b1a47047c01dbd8ddfb1f49acbb2cd1e8f5d5 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <69448117+rismehta@users.noreply.github.com>
Date: Fri, 29 May 2026 10:06:35 +0530
Subject: [PATCH 4/6] fix(checkbox): guard against null uncheckedValue when JCR
 property is absent (#1892)

When enableUncheckedValue=true but uncheckedValue is not stored in JCR
(e.g. because the content push mechanism skipped an empty-string value),
AbstractCheckboxImpl built an enum array with null as the second element.
The AFB runtime calls .toString() on every enum value at init time, so
enum: [".", null] caused TypeError: Cannot read properties of null
(reading 'toString') in createFormInstance / RuleEngineWorker, crashing
the form before any screen rendered.

Fix: default safeUncheckedValue to "" when the JCR property is absent.
Add a regression test with a fixture that omits uncheckedValue from JCR.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../core/components/util/AbstractCheckboxImpl.java     |  6 +++++-
 .../internal/models/v1/form/CheckBoxImplTest.java      | 10 ++++++++++
 .../src/test/resources/form/checkbox/test-content.json | 10 ++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java
index 6ea1c9dfac..e159eb3b4f 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java
@@ -46,7 +46,11 @@ public void initBaseCheckboxModel() {
             checkedValue = String.valueOf(getEnums()[0]);
             uncheckedValue = getEnums().length > 1 ? String.valueOf(getEnums()[1]) : null;
         }
-        enums = (checkedValue != null) ? (Boolean.TRUE.equals(enableUncheckedValue)) ? new String[] { checkedValue, uncheckedValue }
+        // Guard against null uncheckedValue: when enableUncheckedValue is true the JCR property
+        // may be absent (e.g. because the push mechanism skipped an empty-string value), which
+        // would put null into the enum array and crash the runtime on .toString() at init time.
+        String safeUncheckedValue = uncheckedValue != null ? uncheckedValue : "";
+        enums = (checkedValue != null) ? (Boolean.TRUE.equals(enableUncheckedValue)) ? new String[] { checkedValue, safeUncheckedValue }
             : new String[] { checkedValue } : null;
     }
 
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 a03844aee0..234ecc34be 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
@@ -58,6 +58,7 @@ public class CheckBoxImplTest {
 
     private static final String PATH_CHECKBOX_ENABLEUNCHECKEDOFF = CONTENT_ROOT + "/checkbox-enableUncheckedValueFalse";
     private static final String PATH_CHECKBOX_WITHOUT_FIELDTYPE = CONTENT_ROOT + "/checkbox-without-fieldtype";
+    private static final String PATH_CHECKBOX_ENABLEUNCHECKED_MISSING = CONTENT_ROOT + "/checkbox-enableUncheckedValueMissingFromJcr";
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
     @BeforeEach
@@ -350,6 +351,15 @@ void shouldOnlyHaveOnEnumIfEnableUncheckedValueOff() {
         assertArrayEquals(new String[] { "on" }, checkbox.getEnums());
     }
 
+    @Test
+    void shouldUseEmptyStringWhenUncheckedValueMissingFromJcr() {
+        // Regression: when enableUncheckedValue=true but the uncheckedValue JCR property is absent
+        // (e.g. because the content push mechanism skipped an empty-string value), the enum array
+        // must not contain null — null.toString() in the AFB runtime crashes the form at init time.
+        CheckBox checkbox = getCheckBoxUnderTest(PATH_CHECKBOX_ENABLEUNCHECKED_MISSING);
+        assertArrayEquals(new String[] { ".", "" }, checkbox.getEnums());
+    }
+
     private CheckBox getCheckBoxUnderTest(String resourcePath) {
         context.currentResource(resourcePath);
         MockSlingHttpServletRequest request = context.request();
diff --git a/bundles/af-core/src/test/resources/form/checkbox/test-content.json b/bundles/af-core/src/test/resources/form/checkbox/test-content.json
index 778507bcac..486d3a5eff 100644
--- a/bundles/af-core/src/test/resources/form/checkbox/test-content.json
+++ b/bundles/af-core/src/test/resources/form/checkbox/test-content.json
@@ -94,6 +94,16 @@
       "jcr:primaryType": "nt:unstructured"
     }
   },
+  "checkbox-enableUncheckedValueMissingFromJcr" : {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType"    : "core/fd/components/form/checkbox/v1/checkbox",
+    "name" : "abc",
+    "jcr:title" : "def",
+    "type" : "string",
+    "checkedValue":  ".",
+    "enableUncheckedValue": true,
+    "fieldType": "checkbox"
+  },
   "checkbox-without-fieldtype" : {
     "id": "checkbox-wo-fieldtype1",
     "jcr:primaryType": "nt:unstructured",

From 1a0476d8130065eb054e1bfca31ee7a00cabc0dc Mon Sep 17 00:00:00 2001
From: Prateek Awasthi <prateek1497@gmail.com>
Date: Fri, 29 May 2026 12:19:45 +0530
Subject: [PATCH 5/6] feat(af-core): FORMS-25463 expose cq:annotations parallel
 to fd:dor (#1883)

* feat(af-core): FORMS-25463 expose cq:annotations parallel to fd:dor

Add getCqAnnotations() on AbstractFormComponentImpl that reads the
cq:annotations child resource (a sibling of fd:dorContainer on the
component node) and exposes its child annotations as a per-annotation
map keyed by node name. Each entry carries color, text, x, y, optional
state/resolvedBy/resolvedAt and the JCR audit fields. Null fields are
stripped so the serialised shape matches the JCR content exactly.

Wire the call into getProperties() so the resulting map is placed
under properties.cq:annotations -- parallel to fd:dor / fd:path /
fd:associate -- not nested inside dorContainer. Returns null when no
cq:annotations child exists; Jackson then omits the key, keeping the
output non-breaking for forms without annotations.

* fix(af-core): FORMS-25463 exclude cq:annotations from getCustomProperties

getCustomProperties() reads all non-reserved JCR properties from the
resource ValueMap and includes them as raw Strings. cq:annotations is
not in the excluded-prefix list ("fd:", "jcr:", "sling:"), so a stale
String-typed cq:annotations property on the node was leaking through and
appearing as a double-serialised JSON string in the GET IC response.

Adding an explicit key exclusion for CUSTOM_ANNOTATIONS_PROPERTY_WRAPPER
ensures the property is handled exclusively by getCqAnnotations(), which
returns it as Map<String,Object> and produces proper nested JSON.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat(af-core): FORMS-25463 ic annotations in authoring crispr only

* style(af-core): FORMS-25463 apply formatter to AbstractFormComponentImpl

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat(af-core): FORMS-25463 ic annotations in authoring crispr only

* fix(af-core): FORMS-25463 remove formatting changes, keep only cq:annotations feature

* FORMS-25463: blocking publish of cq:annotations

* FORMS-25463: adding tests

* FORMS-25463: adding more tests for codecov

* FORMS-25463: formatting fix

* FORMS-25463: PR comments incorporate plus tests

---------

Co-authored-by: Prateek Awasthi <prateekawast@adobe.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../internal/form/ReservedProperties.java     |   2 +
 .../util/AbstractFormComponentImpl.java       |  35 +++++
 .../util/AbstractFormComponentImplTest.java   | 121 ++++++++++++++++++
 .../form/componentswithrule/test-content.json |  48 +++++++
 4 files changed, 206 insertions(+)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
index 4fe402686a..9e1a49ea24 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
@@ -176,6 +176,8 @@ private ReservedProperties() {
 
     public static final String FD_DRAFT_ID = "fd:draftId";
 
+    public static final String PN_CQ_ANNOTATIONS = "cq:annotations";
+
     // Begin: Form submission related properties
     public static final String FD_SUBMIT_PROPERTIES = "fd:submit";
     public static final String PN_SUBMIT_ACTION_TYPE = "actionType";
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java
index cee76ce602..cbaa589879 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java
@@ -314,6 +314,8 @@ protected boolean getEditMode() {
 
     public static final String CUSTOM_RULE_PROPERTY_WRAPPER = "fd:rules";
 
+    public static final String CUSTOM_ANNOTATIONS_PROPERTY_WRAPPER = "cq:annotations";
+
     /**
      * Predicate to check if a map entry is non empty
      * return true if and only if
@@ -337,6 +339,10 @@ protected boolean getEditMode() {
         if (!getDorProperties().isEmpty()) {
             properties.put(CUSTOM_DOR_PROPERTY_WRAPPER, getDorProperties());
         }
+        Map<String, Object> annotations = getCqAnnotations();
+        if (annotations != null) {
+            properties.put(CUSTOM_ANNOTATIONS_PROPERTY_WRAPPER, annotations);
+        }
         properties.put(CUSTOM_JCR_PATH_PROPERTY_WRAPPER, getPath());
         if (isAuthorMode(request) || FormConstants.CHANNEL_PRINT.equals(this.channel)) {
             Map<String, Object> rulesProperties = getRulesProperties();
@@ -740,4 +746,33 @@ public Map<String, Object> getDorContainer() {
         return null;
     }
 
+    /**
+     * Returns the reviewer annotations stored under the component's {@code cq:annotations} child resource,
+     * keyed by annotation node name. Scoped to the print channel; returns null when no annotations exist
+     * so callers can omit the property.
+     */
+    @JsonIgnore
+    private Map<String, Object> getCqAnnotations() {
+        if (!FormConstants.CHANNEL_PRINT.equals(this.channel) || resource == null) {
+            return null;
+        }
+        Resource annotationsResource = resource.getChild(CUSTOM_ANNOTATIONS_PROPERTY_WRAPPER);
+        if (annotationsResource == null) {
+            return null;
+        }
+        Map<String, Object> result = new LinkedHashMap<>();
+        for (Resource child : annotationsResource.getChildren()) {
+            ValueMap vm = child.getValueMap();
+            Map<String, Object> ann = vm.entrySet().stream()
+                .filter(e -> isAllowedType(e.getValue())
+                    && !e.getKey().startsWith("jcr:")
+                    && !e.getKey().startsWith("sling:"))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, LinkedHashMap::new));
+            if (!ann.isEmpty()) {
+                result.put(child.getName(), ann);
+            }
+        }
+        return result.isEmpty() ? null : result;
+    }
+
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java
index 9e7f0579c3..4d93a7c50e 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java
@@ -57,6 +57,8 @@ public class AbstractFormComponentImplTest {
     private static final String PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentinvalid";
     private static final String PATH_COMPONENT_WITH_NO_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentnone";
     private static final String PATH_COMPONENT_WITH_RULES = CONTENT_ROOT + "/textinputWithPrintRule";
+    private static final String PATH_COMPONENT_WITH_PRINT_ANNOTATIONS = CONTENT_ROOT + "/textinputWithPrintAnnotations";
+    private static final String PATH_COMPONENT_WITH_EMPTY_ANNOTATIONS = CONTENT_ROOT + "/textinputWithEmptyAnnotations";
     private static final String AF_PATH = "/content/forms/af/testAf";
     private static final String PAGE_PATH = "/content/testPage";
 
@@ -273,6 +275,124 @@ public void testPrintChannelRule() {
         assertNotNull(formReadyRule);
     }
 
+    @Test
+    public void testPrintChannelAnnotationsExcludedForWebChannel() {
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_PRINT_ANNOTATIONS);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "web");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        assertNull(properties.get("cq:annotations"),
+            "cq:annotations should not appear for non-print channel");
+    }
+
+    @Test
+    public void testPrintChannelAnnotationsIncluded() {
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_PRINT_ANNOTATIONS);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        Map<String, Object> annotations = (Map<String, Object>) properties.get("cq:annotations");
+        assertNotNull(annotations, "cq:annotations should appear for print channel");
+        Map<String, Object> annotation = (Map<String, Object>) annotations.get("annotation-1");
+        assertNotNull(annotation);
+        assertEquals("review note", annotation.get("text"));
+    }
+
+    @Test
+    public void testAnnotationPropertiesIncludeAllowedTypes() {
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_PRINT_ANNOTATIONS);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        Map<String, Object> annotations = (Map<String, Object>) properties.get("cq:annotations");
+        assertNotNull(annotations);
+        Map<String, Object> annotation = (Map<String, Object>) annotations.get("annotation-1");
+        assertNotNull(annotation);
+        // String and Long
+        assertEquals("review note", annotation.get("text"));
+        assertEquals(11L, annotation.get("x"));
+        assertEquals(22L, annotation.get("y"));
+        // Boolean
+        assertEquals(Boolean.FALSE, annotation.get("resolved"));
+        // String[]
+        Object tags = annotation.get("tags");
+        assertNotNull(tags);
+        assertTrue(tags instanceof String[], "tags should be exported as String[]");
+        assertEquals(2, ((String[]) tags).length);
+    }
+
+    @Test
+    public void testAnnotationPropertiesExcludeJcrAndSlingPrefixes() {
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_PRINT_ANNOTATIONS);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        Map<String, Object> annotations = (Map<String, Object>) properties.get("cq:annotations");
+        assertNotNull(annotations);
+        Map<String, Object> annotation = (Map<String, Object>) annotations.get("annotation-1");
+        assertNotNull(annotation);
+        assertNull(annotation.get("jcr:primaryType"), "jcr:primaryType must not leak into annotation output");
+        assertNull(annotation.get("jcr:createdBy"), "jcr:createdBy must not leak into annotation output");
+        assertNull(annotation.get("sling:resourceType"), "sling:* must not leak into annotation output");
+    }
+
+    @Test
+    public void testNoAnnotationsResource() {
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_NO_RULE);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        assertNull(properties.get("cq:annotations"),
+            "cq:annotations should not appear when no annotations resource exists");
+    }
+
+    @Test
+    public void testAnnotationsAllChildEntriesFilteredOut() {
+        // Child node contains only jcr:/sling: properties -> filtered map is empty,
+        // child is skipped, and overall annotations map ends up empty -> getProperties
+        // omits cq:annotations entirely. Covers the `!ann.isEmpty()` false branch and
+        // the `result.isEmpty() ? null` true branch in getCqAnnotations().
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_EMPTY_ANNOTATIONS);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        assertNull(properties.get("cq:annotations"),
+            "cq:annotations should be omitted when every child has only jcr:/sling: properties");
+    }
+
+    @Test
+    public void testAnnotationsWithNullResourceAndPrintChannel() {
+        // channel=print but resource never set: must short-circuit and return null,
+        // not NPE. Covers the `resource == null` branch in getCqAnnotations().
+        AbstractFormComponentImpl abstractFormComponentImpl = new AbstractFormComponentImpl();
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Method getCqAnnotations = Utils.getPrivateMethod(AbstractFormComponentImpl.class, "getCqAnnotations");
+        try {
+            Object result = getCqAnnotations.invoke(abstractFormComponentImpl);
+            assertNull(result, "getCqAnnotations should return null when resource is null");
+        } catch (Exception e) {
+            fail("getCqAnnotations should not throw when resource is null: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testAnnotationsAbsentInDefaultWebChannel() {
+        // No channel set (defaults to non-print): annotations must not appear.
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_PRINT_ANNOTATIONS);
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        assertNull(properties.get("cq:annotations"),
+            "cq:annotations should not appear when channel is not print");
+    }
+
+    @Test
+    public void testMultipleAnnotations() {
+        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_PRINT_ANNOTATIONS);
+        Utils.setInternalState(abstractFormComponentImpl, "channel", "print");
+        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
+        Map<String, Object> annotations = (Map<String, Object>) properties.get("cq:annotations");
+        assertNotNull(annotations);
+        assertEquals(2, annotations.size(), "Should have 2 annotations");
+        assertNotNull(annotations.get("annotation-1"));
+        assertNotNull(annotations.get("annotation-2"));
+        Map<String, Object> annotation2 = (Map<String, Object>) annotations.get("annotation-2");
+        assertEquals("second review note", annotation2.get("text"));
+        assertEquals("resolved", annotation2.get("state"));
+    }
+
     @Test
     public void testAssociateProperties() {
         Resource resource = Mockito.mock(Resource.class);
@@ -283,6 +403,7 @@ public void testAssociateProperties() {
         ValueMap valueMap = new MockValueMap(resource);
         Mockito.doReturn(valueMap).when(resource).getValueMap();
         Mockito.doReturn(null).when(resource).getChild("fd:dorContainer");
+        Mockito.doReturn(null).when(resource).getChild("cq:annotations");
         Resource associateResource = Mockito.mock(Resource.class);
         Mockito.doReturn(associateResource).when(resource).getChild("fd:associate");
         Map<String, Object> properties = abstractFormComponentImpl.getProperties();
diff --git a/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json b/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json
index 49d0ccab46..f833afe238 100644
--- a/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json
+++ b/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json
@@ -65,5 +65,53 @@
       "jcr:primaryType": "nt:unstructured",
       "fd:formReady": ["form Ready"]
     }
+  },
+  "textinputWithPrintAnnotations": {
+    "jcr:primaryType": "nt:unstructured",
+    "name": "nameWithAnnotations",
+    "sling:resourceType": "forms-components-examples/components/form/textinput",
+    "fieldType": "text-input",
+    "fd:channel": "print",
+    "cq:annotations": {
+      "jcr:primaryType": "nt:unstructured",
+      "annotation-1": {
+        "jcr:primaryType": "nt:unstructured",
+        "jcr:createdBy": "admin",
+        "sling:resourceType": "cq/annotations",
+        "text": "review note",
+        "x": 11,
+        "y": 22,
+        "state": "open",
+        "reviewedBy": "icreviewer",
+        "reviewedAt": "2026-05-25T17:40:04.204Z",
+        "resolved": false,
+        "tags": ["urgent", "review"]
+      },
+      "annotation-2": {
+        "jcr:primaryType": "nt:unstructured",
+        "text": "second review note",
+        "x": 100,
+        "y": 200,
+        "state": "resolved",
+        "reviewedBy": "icreviewer",
+        "reviewedAt": "2026-05-25T17:41:00.000Z",
+        "resolvedBy": "admin",
+        "resolvedAt": "2026-05-25T18:00:00.000Z"
+      }
+    }
+  },
+  "textinputWithEmptyAnnotations": {
+    "jcr:primaryType": "nt:unstructured",
+    "name": "nameWithEmptyAnnotations",
+    "sling:resourceType": "forms-components-examples/components/form/textinput",
+    "fieldType": "text-input",
+    "fd:channel": "print",
+    "cq:annotations": {
+      "jcr:primaryType": "nt:unstructured",
+      "annotation-only-jcr": {
+        "jcr:primaryType": "nt:unstructured",
+        "jcr:createdBy": "admin"
+      }
+    }
   }
 }

From bacee5b4860dcf1f879288efc1c9f1d7936d059e Mon Sep 17 00:00:00 2001
From: Rajat Khurana <30727855+rajatofficial@users.noreply.github.com>
Date: Thu, 11 Jun 2026 13:06:52 +0530
Subject: [PATCH 6/6] File input extension support in v4 and reset fileInput on
 resetting  (#1849)

* file input extension suppport in v4 and reset fileput on resetting

* test cases added

* test case fixed

---------

Co-authored-by: Rajat Khurana <rajatkhurana@adobe.com>
---
 .../models/v3/form/FileInputImplV3.java       | 22 ++++---
 .../models/v3/form/FileInputImplV3Test.java   |  2 +-
 .../exporter-fileinput-customized.json        |  4 +-
 .../fileinput/fileinputv4/basic/.content.xml  |  9 +++
 .../v4/fileinput/_cq_dialog/.content.xml      |  2 +-
 .../clientlibs/site/js/fileinputwidget.js     | 66 +++++++++++--------
 .../fileinput/v4/fileinput/fileinput.html     |  2 +-
 ui.frontend/src/view/FormFileInputWidget.js   |  4 ++
 ui.tests/test-module/libs/fixtures/sample.ifc |  1 +
 .../specs/fileinput/fileinputv4.runtime.cy.js | 21 +++++-
 10 files changed, 89 insertions(+), 44 deletions(-)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3.java
index 5438940599..20ed3556c7 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3.java
@@ -18,11 +18,11 @@
 
 package com.adobe.cq.forms.core.components.internal.models.v3.form;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
@@ -70,14 +70,18 @@ public String getDragDropText() {
 
     @Override
     public List<String> getAcceptExtensions() {
-        // adding . in front of the accept extensions
-        if (acceptExtensions != null) {
-            for (int i = 0; i < acceptExtensions.length; i++) {
-                acceptExtensions[i] = "." + acceptExtensions[i];
-            }
+        if (acceptExtensions == null) {
+            return Collections.emptyList();
         }
-        return Optional.ofNullable(acceptExtensions)
-            .map(Arrays::asList)
-            .orElse(Collections.emptyList());
+        return Arrays.stream(acceptExtensions)
+            .map(ext -> "." + ext)
+            .collect(java.util.stream.Collectors.toList());
+    }
+
+    @Override
+    public List<String> getAccept() {
+        List<String> combined = new ArrayList<>(super.getAccept());
+        combined.addAll(getAcceptExtensions()); // adds .pdf, .docx etc.
+        return combined;
     }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3Test.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3Test.java
index 30aff48d5c..b0a4478c95 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3Test.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v3/form/FileInputImplV3Test.java
@@ -262,7 +262,7 @@ void testGetMaxFileSize() {
     @Test
     void testGetAccept() {
         FileInput fileInput = Utils.getComponentUnderTest(PATH_FILEINPUT_CUSTOMIZED, FileInput.class, context);
-        assertThat(Arrays.asList("audio/*", "video/*", "image/*"), is(fileInput.getAccept()));
+        assertThat(Arrays.asList("audio/*", "video/*", "image/*", ".jpg", ".png"), is(fileInput.getAccept()));
         FileInput fileInputMock = Mockito.mock(FileInput.class);
         Mockito.when(fileInputMock.getAccept()).thenCallRealMethod();
         assertThat(FileInput.DEFAULT_ACCEPT, is(fileInputMock.getAccept()));
diff --git a/bundles/af-core/src/test/resources/form/fileinputv3/exporter-fileinput-customized.json b/bundles/af-core/src/test/resources/form/fileinputv3/exporter-fileinput-customized.json
index 07f0d3be50..9ccef68b84 100644
--- a/bundles/af-core/src/test/resources/form/fileinputv3/exporter-fileinput-customized.json
+++ b/bundles/af-core/src/test/resources/form/fileinputv3/exporter-fileinput-customized.json
@@ -21,7 +21,9 @@
   "accept": [
     "audio/*",
     "video/*",
-    "image/*"
+    "image/*",
+    ".jpg",
+    ".png"
   ],
   "dataRef": "a.b",
   "events": {
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
index cbac1049d2..fd4851bff2 100644
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
@@ -103,6 +103,15 @@
                     maxFileSize="2"
                     type="file[]"
                     visible="{Boolean}true"/>
+             <fileinput7
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="File Input - 7"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
+                    accept="[audio/*, video/*, image/*, text/*, application/pdf,.ifc]"
+                    fieldType="file-input"
+                    readOnly="{Boolean}false"
+                    name="fileinput7"
+                    type="file"/>
             <submit
                     jcr:lastModified="{Date}2023-01-17T16:28:58.844+05:30"
                     jcr:lastModifiedBy="admin"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_dialog/.content.xml
index e6a6b2ba61..d902094338 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_dialog/.content.xml
@@ -2,7 +2,7 @@
     jcr:primaryType="nt:unstructured"
     jcr:title="Adaptive Form File Attachment"
     sling:resourceType="cq/gui/components/authoring/dialog"
-    extraClientlibs="[core.forms.components.fileinput.v1.editor]"
+    extraClientlibs="[core.forms.components.fileinput.v3.editor]"
     helpPath="https://www.adobe.com/go/aem_af_cmp_fileinput_v2"
     sling:resourceSuperType="core/fd/components/form/fileinput/v3/fileinput/cq:dialog"
     trackingFeature="core-components:adaptiveform-fileinput:v4"/>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js
index 3b2c271576..91708f50f0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js
@@ -93,32 +93,6 @@ if (typeof window.FileInputWidget === 'undefined') {
             fileItem.appendChild(fileEndContainer);
             return fileItem;
         }
-        validateFile(file, invalidFilesByType) {
-            let currFileName = file.name.split("\\").pop();
-            let size = file.size / 1024 / 1024;
-            if (file.size === 0) {
-                invalidFilesByType.SIZE_ZERO.push(currFileName);
-                return false;
-            } else if (size > parseFloat(this.options.maxFileSize)) {
-                invalidFilesByType.SIZE.push(currFileName);
-                return false;
-            } else if (!FileInputWidget.isValid(currFileName)) {
-                invalidFilesByType.NAME.push(currFileName);
-                return false;
-            } else {
-                let isMatch = false;
-                let extension = currFileName.split('.').pop();
-                let mimeType = (file.type) ? file.type : this.extensionToMimeTypeMap[extension];
-                if (mimeType && mimeType.trim().length > 0) {
-                    isMatch = this.regexMimeTypeList.some(rx => rx.test(mimeType));
-                }
-                if (!isMatch) {
-                    invalidFilesByType.MIMETYPE.push(currFileName);
-                    return false;
-                }
-            }
-            return true;
-        }
         handleChange(filesUploaded) {
             if (!this.isFileUpdate) {
                 let self = this,
@@ -128,12 +102,46 @@ if (typeof window.FileInputWidget === 'undefined') {
                 if (typeof files !== "undefined") {
                     let invalidFilesIndexes = [];
                     Array.from(files).forEach(function (file, fileIndex) {
-                        if (self.validateFile(file, invalidFilesByType)) {
+                        let currFileName = file.name.split("\\").pop();
+                        let size = file.size / 1024 / 1024;
+                        let isCurrentInvalid = false;
+                        if (file.size === 0) {
+                            invalidFilesByType.SIZE_ZERO.push(currFileName);
+                            isCurrentInvalid = true;
+                        } else if (size > parseFloat(this.options.maxFileSize)) {
+                            invalidFilesByType.SIZE.push(currFileName);
+                            isCurrentInvalid = true;
+                        } else if (!FileInputWidget.isValid(currFileName)) {
+                            invalidFilesByType.NAME.push(currFileName);
+                            isCurrentInvalid = true;
+                        } else {
+                            let isMatch = false;
+                            let extension = currFileName.split('.').pop().toLowerCase();
+                            let mimeType = file.type || this.extensionToMimeTypeMap[extension];
+                            // If no MIME type is detected, check if the file extension is in the accept list
+                            if (!mimeType && this.options.acceptExtensions) {
+                                isMatch = this.options.acceptExtensions.some(function(acceptPattern) {
+                                    if (!acceptPattern) {
+                                        return false;
+                                    }
+                                    // Remove leading dot if present and convert to lowercase
+                                    let cleanPattern = acceptPattern.replace(/^\./, '').toLowerCase();
+                                    return cleanPattern === extension;
+                                });
+                            } else {
+                                isMatch = this.regexMimeTypeList.some(rx => rx.test(mimeType));
+                            }
+                            if (!isMatch) {
+                                invalidFilesByType.MIMETYPE.push(currFileName);
+                                isCurrentInvalid = true;
+                            }
+                        }
+                        if (!isCurrentInvalid) {
                             if (self.isMultiSelect()) {
-                                self.values.push(file.name.split("\\").pop());
+                                self.values.push(currFileName);
                                 self.fileArr.push(file);
                             } else {
-                                self.values = [file.name.split("\\").pop()];
+                                self.values = [currFileName];
                                 self.fileArr = [file];
                             }
                         } else {
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/fileinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/fileinput.html
index 72ed4886a9..272c37e753 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/fileinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/fileinput.html
@@ -50,7 +50,7 @@
              name="${file.name}"
              disabled="${!file.enabled}"
              required="${file.required}"
-             accept="${file.accept}"
+             accept="${[file.accept, file.acceptExtensions] @ join=','}"
              type="file"
              data-cmp-data-layer="${file.data.json}"
         />
diff --git a/ui.frontend/src/view/FormFileInputWidget.js b/ui.frontend/src/view/FormFileInputWidget.js
index 0c94e1df7d..cf56f43166 100644
--- a/ui.frontend/src/view/FormFileInputWidget.js
+++ b/ui.frontend/src/view/FormFileInputWidget.js
@@ -134,6 +134,10 @@ import FormFileInputWidgetBase from "./FormFileInputWidgetBase";
                         return fileName;
                     });
                     this.fileArr = [...value];
+                } else {
+                    this.values = [];
+                    this.fileArr = [];
+                    this.widget.value = '';
                 }
             }
         }
diff --git a/ui.tests/test-module/libs/fixtures/sample.ifc b/ui.tests/test-module/libs/fixtures/sample.ifc
index e69de29bb2..f865c07137 100644
--- a/ui.tests/test-module/libs/fixtures/sample.ifc
+++ b/ui.tests/test-module/libs/fixtures/sample.ifc
@@ -0,0 +1 @@
+sample ifc content
diff --git a/ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js b/ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js
index 999b5b9147..11f3290c36 100644
--- a/ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js
+++ b/ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js
@@ -278,6 +278,23 @@ describe('Click on button tag (V-4)', () => {
         cy.attachFile(fileInput, [sampleFileNames[0]]);
         cy.get('.cmp-adaptiveform-fileinput__filesize').should('contain.text', '508 bytes');
         cy.attachFile(fileInput, [sampleFileNames[0]]);
-        cy.get('.cmp-adaptiveform-fileinput__filesize').should('contain.text', '508 bytes'); 
+        cy.get('.cmp-adaptiveform-fileinput__filesize').should('contain.text', '508 bytes');
+    });
+
+    it(`file input should not support extension which are not in accept property`, () => {
+        const fileInput7 = "input[name='fileinput7']";
+        cy.attachFile(fileInput7, ['sample.afe']);
+        cy.get('.cmp-adaptiveform-fileinput__filelist')
+            .children()
+            .should('have.length', 0);
+    });
+
+    it(`fileinput should support custom file extensions`, () => {
+        const fileInput7 = "input[name='fileinput7']";
+        cy.attachFile(fileInput7, ['sample.ifc']);
+        cy.get('.cmp-adaptiveform-fileinput__filelist')
+            .children()
+            .should('have.length', 1)
+            .and('contain.text', 'sample.ifc');
     });
-}); 
\ No newline at end of file
+});
\ No newline at end of file