diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml
index de2627a96..00ef8da51 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml
@@ -4,7 +4,7 @@
     <jcr:content jcr:primaryType="nt:unstructured">
         <metadata
             jcr:primaryType="nt:unstructured"
-            author="adobe"
+            author="adobe"            
             description="Reference Easel Theme"
             title="Reference Easel"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png
index a568319c4..07043be14 100644
Binary files a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png and b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/thumbnail.png differ
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml
index 182fdb21f..74532d823 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml
@@ -4,7 +4,7 @@
     <jcr:content jcr:primaryType="nt:unstructured">
         <metadata
             jcr:primaryType="nt:unstructured"
-            author="adobe"
+            author="adobe"            
             description="Reference WKND Theme"
             title="Reference WKND"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png
index 51358deb5..b3eca6b5a 100644
Binary files a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png and b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/thumbnail.png differ
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
index 6f64ce1ba..d096d85af 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
@@ -2,7 +2,7 @@
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page"
         jcr:primaryType="cq:PageContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml
index 28fdf3652..ffb244371 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml
@@ -2,16 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
-        cq:isDelivered="{Boolean}true"
+        author="adobe"        
         cq:lastModified="{Date}2023-07-03T10:40:00.760Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicated_publish="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="The Employee Benefits Summary form is used to gather essential details about an individual's benefits. It helps in evaluating coverage quickly and accurately, providing a comprehensive overview for efficient assistance and support."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml
index 7bb0cfbc9..56a47f5e2 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml
@@ -2,9 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:lastModified="{Date}2023-05-18T06:55:29.793Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Complete our enrollment form to apply for various benefits. "
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
index b80b1670f..9dbced881 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
@@ -2,9 +2,9 @@
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:lastModified="{Date}2022-05-27T13:57:01.856+05:30"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:primaryType="cq:PageContent"
         jcr:title="Blank With Core Components"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
index dee1f16d5..c9724498a 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
@@ -2,10 +2,11 @@
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page"
         jcr:primaryType="cq:PageContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
+        cq:lastModifiedBy="adobe"
         jcr:title="Blank"
         status="enabled"/>
 </jcr:root>
\ No newline at end of file
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml
index a94eb85ed..1ee64878d 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml
@@ -4,7 +4,7 @@
     <jcr:content
         author="adobe"
         cq:lastModified="{Date}2023-05-18T06:55:29.793Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Simply fill out our convenient consent form and let our team take care of your stay and travel.  | WKND Travels"
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml
index 823c85e2e..396657475 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml
@@ -2,16 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
-        cq:isDelivered="{Boolean}true"
+        author="adobe"        
         cq:lastModified="{Date}2023-07-03T10:40:32.282Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-06-13T09:26:45.829Z"
-        cq:lastReplicated_publish="{Date}2023-06-13T09:26:45.829Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="The Contact Details Update Form for address and contact details update is designed to assist you in updating your personal information related to your subscription or benefits to ensure seamless communication and uninterrupted access to the services or benefits you receive."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml
index e0b242e62..a8e05f30c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml
@@ -2,9 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:lastModified="{Date}2023-05-18T06:56:04.251Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Contact us today using our easy-to-use contact form. Whether you have questions about our products or services or want to provide feedback, our team is here to help. Fill out the form and we'll get back to you as soon as possible. Contacting us has never been easier than it is now!"
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml
index 42e753789..a6d2f64cc 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml
@@ -2,9 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:lastModified="{Date}2023-05-18T06:56:04.251Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A give feedback form template to help users input their service or product experience."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml
index 2eaf84159..4b5c24b9f 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml
@@ -2,9 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
+        author="adobe"        
         cq:lastModified="{Date}2023-05-18T06:56:04.251Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Customer satisfaction is our priority, use the complaint to raise your queries for timely assistance | WKND Travels&#xd;&#xa;"
         jcr:primaryType="cq:PageContent"
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 64b9f5526..c88510bbb 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
@@ -102,28 +102,6 @@
                             visible="requesttype == 'Other'"/>
                         <fd:events jcr:primaryType="nt:unstructured"/>
                     </textinput>
-                    <panelcontainer
-                        jcr:lastModified="{Date}2023-04-25T05:31:29.232Z"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="UploadPanel"
-                        sling:resourceType="${appId}/components/adaptiveForm/panelcontainer"
-                        enabled="{Boolean}true"
-                        fieldType="panel"
-                        hideTitle="true"
-                        layout="responsiveGrid"
-                        name="UploadPanel"
-                        readOnly="{Boolean}false"
-                        textIsRich="[true,true]"
-                        visible="{Boolean}true"
-                        wrapData="{Boolean}false">
-                        <fd:rules
-                            fd:visible="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SHOW_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop1682356649308.IssueDetails.UploadPanel&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;name&quot;:&quot;UploadPanel&quot;}}\,{&quot;nodeName&quot;:&quot;When&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;CONDITIONORALWAYS&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;BOOLEAN_BINARY_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop1682356649308.IssueDetails.requesttype&quot;\,&quot;displayName&quot;:&quot;Issue*&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;displayPath&quot;:&quot;FORM/Tabs on top/Issue Details/Issue*/&quot;\,&quot;name&quot;:&quot;requesttype&quot;\,&quot;parent&quot;:&quot;$form.tabsontop1682356649308.IssueDetails&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;1&quot;}}]}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;OR&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;BOOLEAN_BINARY_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop1682356649308.IssueDetails.requesttype&quot;\,&quot;displayName&quot;:&quot;Issue*&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;displayPath&quot;:&quot;FORM/Tabs on top/Issue Details/Issue*/&quot;\,&quot;name&quot;:&quot;requesttype&quot;\,&quot;parent&quot;:&quot;$form.tabsontop1682356649308.IssueDetails&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;2&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;OR&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;BOOLEAN_BINARY_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop1682356649308.IssueDetails.requesttype&quot;\,&quot;displayName&quot;:&quot;Issue*&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;displayPath&quot;:&quot;FORM/Tabs on top/Issue Details/Issue*/&quot;\,&quot;name&quot;:&quot;requesttype&quot;\,&quot;parent&quot;:&quot;$form.tabsontop1682356649308.IssueDetails&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;3&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;OR&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;BOOLEAN_BINARY_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop1682356649308.IssueDetails.requesttype&quot;\,&quot;displayName&quot;:&quot;Issue*&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;displayPath&quot;:&quot;FORM/Tabs on top/Issue Details/Issue*/&quot;\,&quot;name&quot;:&quot;requesttype&quot;\,&quot;parent&quot;:&quot;$form.tabsontop1682356649308.IssueDetails&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;4&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;OR&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop1682356649308.IssueDetails.requesttype&quot;\,&quot;displayName&quot;:&quot;Issue*&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;displayPath&quot;:&quot;FORM/Tabs on top/Issue Details/Issue*/&quot;\,&quot;name&quot;:&quot;requesttype&quot;\,&quot;parent&quot;:&quot;$form.tabsontop1682356649308.IssueDetails&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;Other&quot;}}]}\,&quot;nested&quot;:false}]}\,&quot;nested&quot;:false}]}\,&quot;nested&quot;:false}]}\,&quot;nested&quot;:false}]}}\,{&quot;nodeName&quot;:&quot;Else&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;DONOTHING_OR_HIDE&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;Hide&quot;\,&quot;value&quot;:null}}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:&quot;requesttype == '1' || requesttype == '2' || requesttype == '3' || requesttype == '4' || requesttype == 'Other'&quot;\,&quot;eventName&quot;:&quot;Visibility&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
-                            jcr:primaryType="nt:unstructured"
-                            validationStatus="valid"
-                            visible="requesttype == '1' || requesttype == '2' || requesttype == '3' || requesttype == '4' || requesttype == 'Other'"/>
-                        <fd:events jcr:primaryType="nt:unstructured"/>
-                    </panelcontainer>
                     <textinput_614717869
                         jcr:lastModified="{Date}2023-05-18T06:24:11.433Z"
                         jcr:lastModifiedBy="admin"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml
index 9896da4d1..60fd72ee1 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml
@@ -2,16 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
-        cq:isDelivered="{Boolean}true"
+        author="adobe"        
         cq:lastModified="{Date}2023-07-03T10:41:48.601Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-30T08:17:31.625Z"
-        cq:lastReplicated_publish="{Date}2023-05-30T08:17:31.625Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A Purchase Request Form to initiate the procurement process and allow employees to formally request the purchase of goods or services necessary for their work. The form captures essential details such as item description, quantity, preferred supplier (if applicable), budget allocation, justification for purchase, delivery information, and required approvals. The purpose of the form is to streamline and document the purchasing process, ensuring proper authorization and tracking of requested purchases."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml
index 81795fa3a..a045658c6 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml
@@ -2,16 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
-        cq:isDelivered="{Boolean}true"
+        author="adobe"        
         cq:lastModified="{Date}2023-07-03T10:41:17.673Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-31T09:42:40.501Z"
-        cq:lastReplicated_publish="{Date}2023-05-31T09:42:40.501Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A quality control inspection form to assess and document the visual appearance, dimensions, functionality, documentation, testing results, and overall quality of a product or item. It helps identify defects, non-conformances, and corrective actions necessary to ensure adherence to quality standards."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml
index 340e174c5..347035bcb 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml
@@ -2,16 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
-        cq:isDelivered="{Boolean}true"
+        author="adobe"        
         cq:lastModified="{Date}2023-07-03T10:40:14.970Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicated_publish="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A request for an account statement form to request a statement of transactions. This statement provides a detailed record of financial transactions, activities, or other relevant information about an individual. By completing this form, you can initiate the process of obtaining an accurate and up-to-date statement for your records."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml
index dce70c038..7bd0621a1 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml
@@ -2,16 +2,9 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        author="adobe"
-        cq:isDelivered="{Boolean}true"
+        author="adobe"        
         cq:lastModified="{Date}2023-07-03T10:41:32.790Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-27T04:40:20.107Z"
-        cq:lastReplicated_publish="{Date}2023-05-27T04:40:20.107Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="The Safety Inspection Form is for maintaining a safe work environment. By conducting regular inspections using this form, potential hazards can be identified. It covers various aspects such as emergency exits, fire safety, electrical safety, hazardous materials, personal protective equipment, workstation ergonomics, etc. for the safety and well-being of employees, visitors, and customers and creates a secure environment for all."
         jcr:primaryType="cq:PageContent"