From 266d8ad50804da51f8a86bd0481a824e4b14020b Mon Sep 17 00:00:00 2001
From: Pankaj Parashar <pankajpr@adobe.com>
Date: Thu, 23 Nov 2023 09:31:37 +0530
Subject: [PATCH] Replacing foundation text/image components by core components
 and policy updates

---
 .../settings/wcm/policies/.content.xml        | 45 ++++++++++---------
 .../initial/.content.xml                      |  4 +-
 .../policies/.content.xml                     |  4 +-
 .../benefits-enrollment/initial/.content.xml  |  4 +-
 .../benefits-enrollment/policies/.content.xml |  4 +-
 .../consent-form/initial/.content.xml         |  4 +-
 .../consent-form/policies/.content.xml        |  4 +-
 .../initial/.content.xml                      |  4 +-
 .../policies/.content.xml                     |  4 +-
 .../contact-us-form/initial/.content.xml      |  4 +-
 .../contact-us-form/policies/.content.xml     |  4 +-
 .../give-feedback/initial/.content.xml        |  4 +-
 .../give-feedback/policies/.content.xml       |  4 +-
 .../log-service-request/initial/.content.xml  |  4 +-
 .../log-service-request/policies/.content.xml |  4 +-
 .../purchase-request/initial/.content.xml     |  4 +-
 .../purchase-request/policies/.content.xml    |  4 +-
 .../initial/.content.xml                      |  4 +-
 .../policies/.content.xml                     |  4 +-
 .../initial/.content.xml                      |  4 +-
 .../policies/.content.xml                     |  4 +-
 .../safety-inspection/initial/.content.xml    |  4 +-
 .../safety-inspection/policies/.content.xml   |  4 +-
 23 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
index 8f6170cb5..03ba250ad 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
@@ -405,6 +405,28 @@
                         </assetToComponentMapping>
                     </cq:authoring>
                 </policy_1575040440977>
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y")
+                <cc-af-header-policy
+                    jcr:lastModified="{Date}2023-06-07T15:48:33.506+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Core Component Adaptive Form Header Policy"
+                    jcr:description="Includes only Core Component Adaptive Form header component."
+                    sling:resourceType="wcm/core/components/policy/policy"
+                    components="/apps/${appId}/components/adaptiveForm/pageheader">
+                    <jcr:content jcr:primaryType="nt:unstructured"/>
+                </cc-af-header-policy>
+                <cc-af-footer-policy
+                    jcr:lastModified="{Date}2022-07-12T11:41:57.902+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Core Component Adaptive Form Footer Policy"
+                    jcr:description="Includes only Core Component Adaptive Form footer component."
+                    sling:resourceType="wcm/core/components/policy/policy"
+                    components="/apps/${appId}/components/adaptiveForm/footer">
+                    <jcr:content jcr:primaryType="nt:unstructured"/>
+                </cc-af-footer-policy>
+    #end                
             </container>
             <teaser jcr:primaryType="nt:unstructured">
                 <policy_1575031387650
@@ -684,28 +706,7 @@
                         <jcr:content jcr:primaryType="nt:unstructured"/>
                     </policy_1518118565779>
     #end
-    #if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y")
-                    <cc-af-header-policy
-                        jcr:lastModified="{Date}2023-06-07T15:48:33.506+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Core Component Adaptive Form Header Policy"
-                        jcr:description="Includes only Core Component Adaptive Form header component."
-                        sling:resourceType="wcm/core/components/policy/policy"
-                        components="/apps/${appId}/components/adaptiveForm/pageheader">
-                        <jcr:content jcr:primaryType="nt:unstructured"/>
-                    </cc-af-header-policy>
-                    <cc-af-footer-policy
-                        jcr:lastModified="{Date}2022-07-12T11:41:57.902+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Core Component Adaptive Form Footer Policy"
-                        jcr:description="Includes only Core Component Adaptive Form footer component."
-                        sling:resourceType="wcm/core/components/policy/policy"
-                        components="/apps/${appId}/components/adaptiveForm/footer">
-                        <jcr:content jcr:primaryType="nt:unstructured"/>
-                    </cc-af-footer-policy>
-    #end
+    
                 </responsivegrid>
             </components>
         </foundation>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/initial/.content.xml
index 7f88d5b06..a1b0055c9 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/initial/.content.xml
@@ -242,7 +242,7 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Employee Benefits Summary&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -263,7 +263,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/policies/.content.xml
index 6c3a86305..fb5e1b19c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/initial/.content.xml
index be2b2543f..f803afa6f 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/initial/.content.xml
@@ -709,7 +709,7 @@
                     jcr:lastModified="{Date}2023-04-24T17:45:54.421Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Benefits Enrollment Form&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -730,7 +730,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/policies/.content.xml
index cd1be79f3..9664109e2 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/initial/.content.xml
index bac567e70..14fbdff65 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/initial/.content.xml
@@ -392,7 +392,7 @@
                     jcr:lastModified="{Date}2023-05-12T07:14:19.173Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Consent Form&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -413,7 +413,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/policies/.content.xml
index a50e21d70..ef91a79b5 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/initial/.content.xml
index 0d705eae1..4215d6fe7 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/initial/.content.xml
@@ -332,7 +332,7 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Contact Details Update&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -353,7 +353,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/policies/.content.xml
index 6c3a86305..fb5e1b19c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/initial/.content.xml
index b6f268d16..7b03ca0df 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/initial/.content.xml
@@ -170,7 +170,7 @@
                     jcr:lastModified="{Date}2023-05-02T05:51:14.026Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Contact Us&lt;/p>&#xd;&#xa;&lt;p>&amp;nbsp;&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -191,7 +191,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/policies/.content.xml
index a5a810fc6..94c9bef02 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/initial/.content.xml
index 7bd7eb45b..b45d77364 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/initial/.content.xml
@@ -314,7 +314,7 @@
                     jcr:lastModified="{Date}2023-05-08T08:24:23.532Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Give Feedback&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -335,7 +335,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/policies/.content.xml
index 77fe7241e..bec2f0dee 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/initial/.content.xml
index 0e0cb57e8..e1d453e9c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/initial/.content.xml
@@ -281,7 +281,7 @@
                     jcr:lastModified="{Date}2023-05-08T08:15:41.360Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Log Service Request&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -302,7 +302,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/policies/.content.xml
index 572faadba..6daabce04 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/initial/.content.xml
index 20a5ece8f..7824327a3 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/initial/.content.xml
@@ -411,7 +411,7 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Purchase Request Form&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -432,7 +432,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/policies/.content.xml
index 6c3a86305..fb5e1b19c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/initial/.content.xml
index 503dfadb4..a2bb939bd 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/initial/.content.xml
@@ -480,7 +480,7 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Quality Control Inspection&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -501,7 +501,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/policies/.content.xml
index 6c3a86305..fb5e1b19c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/initial/.content.xml
index 36b8bad1e..14eadde80 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/initial/.content.xml
@@ -233,7 +233,7 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Request for Account Statement&lt;/p>&#xd;&#xa;&lt;p>&amp;nbsp;&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -254,7 +254,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/policies/.content.xml
index 6c3a86305..fb5e1b19c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/initial/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/initial/.content.xml
index f4cd5667f..536da0303 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/initial/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/initial/.content.xml
@@ -743,7 +743,7 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Safety Inspection Form&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
@@ -764,7 +764,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/policies/.content.xml
index 6c3a86305..fb5e1b19c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/policies/.content.xml
@@ -8,7 +8,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
         <container1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
@@ -16,7 +16,7 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <container2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>