diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/externals/ace/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/externals/ace/.content.xml
index 864ef200d..6ad4d51d9 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/externals/ace/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/externals/ace/.content.xml
@@ -19,7 +19,8 @@
   ~ =========================LICENSE_END==================================
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="cq:ClientLibraryFolder"
   sling:resourceType="widgets/clientlib"
   categories="[apm-ace]"/>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/.content.xml
index 77632433d..af2333ff2 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/.content.xml
@@ -19,7 +19,8 @@
   ~ =========================LICENSE_END==================================
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="cq:ClientLibraryFolder"
   sling:resourceType="widgets/clientlib"
   categories="[apm-dashboard]"/>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/.content.xml
index c2cf9e3a7..86eaa2b01 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/.content.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="cq:ClientLibraryFolder"
   sling:resourceType="widgets/clientlib"
   categories="[apm-history]"/>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/moveItem/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/moveItem/.content.xml
index 284369674..35a32c72c 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/moveItem/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/moveItem/.content.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="cq:ClientLibraryFolder"
-    categories="[apm-move-item]"/>
+  jcr:primaryType="cq:ClientLibraryFolder"
+  categories="[apm-move-item]"/>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/.content.xml
index 4c44c653e..9e34b997b 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/.content.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="cq:ClientLibraryFolder"
   sling:resourceType="widgets/clientlib"
   categories="[apm.scripts]"/>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml
index 2b145c57d..c04de2e85 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml
@@ -1,63 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-          xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
-          granite:class="apm-editor-launcher hidden"
-          jcr:primaryType="nt:unstructured"
-          jcr:title="Launcher"
-          sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
-    <items jcr:primaryType="nt:unstructured">
-        <disabled
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                text="Disabled"
-                fieldLabel="Disabled"
-                fieldDescription="Script with disabled launcher can not be launched neither manually through UI, nor automatically. But it can be referenced by other scripts using IMPORT or RUN."
-                name="apm:launchEnabled"
-                value="false"
-                uncheckedValue="true"/>
-        <mode
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/select"
-                fieldLabel="Mode"
-                name="apm:launchMode">
-            <datasource
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="apm/datasource/launchModes"/>
-        </mode>
-        <environment
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/select"
-                fieldLabel="Environment"
-                name="apm:launchEnvironment">
-            <datasource
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="apm/datasource/launchEnvironments"/>
-        </environment>
-        <runModes
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                fieldLabel="Run Modes">
-            <field jcr:primaryType="nt:unstructured"
-                   sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                   name="apm:launchRunModes"/>
-        </runModes>
-        <hook
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                fieldLabel="Hook"
-                name="apm:launchHook"/>
-        <schedule
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/datepicker"
-                fieldLabel="Schedule"
-                name="apm:launchSchedule"
-                type="datetime"
-                valueFormat="YYYY-MM-DD[T]HH:mm:ss"/>
-        <cronExpression
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                fieldLabel="CRON expression"
-                name="apm:launchCronExpression"/>
-    </items>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+  xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+  granite:class="apm-editor-launcher hidden"
+  jcr:primaryType="nt:unstructured"
+  jcr:title="Launcher"
+  sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+  <items jcr:primaryType="nt:unstructured">
+    <disabled
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+      text="Disabled"
+      fieldLabel="Disabled"
+      fieldDescription="Script with disabled launcher can not be launched neither manually through UI, nor automatically. But it can be referenced by other scripts using IMPORT or RUN."
+      name="apm:launchEnabled"
+      value="false"
+      uncheckedValue="true"/>
+    <mode
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/select"
+      fieldLabel="Mode"
+      name="apm:launchMode">
+      <datasource
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="apm/datasource/launchModes"/>
+    </mode>
+    <environment
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/select"
+      fieldLabel="Environment"
+      name="apm:launchEnvironment">
+      <datasource
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="apm/datasource/launchEnvironments"/>
+    </environment>
+    <runModes
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+      fieldLabel="Run Modes">
+      <field jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+        name="apm:launchRunModes"/>
+    </runModes>
+    <hook
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+      fieldLabel="Hook"
+      name="apm:launchHook"/>
+    <schedule
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/datepicker"
+      fieldLabel="Schedule"
+      name="apm:launchSchedule"
+      type="datetime"
+      valueFormat="YYYY-MM-DD[T]HH:mm:ss"/>
+    <cronExpression
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+      fieldLabel="CRON expression"
+      name="apm:launchCronExpression"/>
+  </items>
 </jcr:root>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/dashboard/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/dashboard/.content.xml
index 05a0baade..b91038c60 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/dashboard/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/dashboard/.content.xml
@@ -75,4 +75,4 @@
       </items>
     </content>
   </jcr:content>
-</jcr:root>
\ No newline at end of file
+</jcr:root>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/editor/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/editor/.content.xml
index 9578354b6..17c535c80 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/editor/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/editor/.content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-  xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-  xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+  xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
   jcr:primaryType="cq:Page">
   <jcr:content
     jcr:mixinTypes="[sling:VanityPath]"
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/history/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/history/.content.xml
index 2cccff8f6..b573e496a 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/history/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/history/.content.xml
@@ -113,4 +113,4 @@
       </selection>
     </actions>
   </jcr:content>
-</jcr:root>
\ No newline at end of file
+</jcr:root>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/move/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/move/.content.xml
index 2af915df2..f9c42bfe6 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/move/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/move/.content.xml
@@ -1,92 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="cq:Page">
-    <jcr:content
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+  xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+  jcr:primaryType="cq:Page">
+  <jcr:content
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Move"
+    sling:resourceType="granite/ui/components/coral/foundation/page">
+    <head jcr:primaryType="nt:unstructured">
+      <viewport
         jcr:primaryType="nt:unstructured"
-        jcr:title="Move"
-        sling:resourceType="granite/ui/components/coral/foundation/page">
-        <head jcr:primaryType="nt:unstructured">
-            <viewport
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/admin/page/viewport"/>
-            <meta
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/meta"
-                content="chrome=1"
-                name="X-UA-Compatible"/>
-            <favicon
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/page/favicon"/>
-            <clientlibs
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="granite/ui/components/coral/foundation/includeclientlibs"
-                categories="[coralui3,granite.ui.coral.foundation,apm-move-item]"/>
-        </head>
-        <body
-            jcr:primaryType="nt:unstructured"
-            sling:resourceType="granite/ui/components/coral/foundation/page/body">
-            <items jcr:primaryType="nt:unstructured">
-                <form
-                    granite:id="cq-apmadmin-item-move-form"
+        sling:resourceType="granite/ui/components/coral/foundation/admin/page/viewport"/>
+      <meta
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/meta"
+        content="chrome=1"
+        name="X-UA-Compatible"/>
+      <favicon
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/page/favicon"/>
+      <clientlibs
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/includeclientlibs"
+        categories="[coralui3,granite.ui.coral.foundation,apm-move-item]"/>
+    </head>
+    <body
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/page/body">
+      <items jcr:primaryType="nt:unstructured">
+        <form
+          granite:id="cq-apmadmin-item-move-form"
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/form"
+          maximized="{Boolean}true"
+          method="post"
+          novalidate="{Boolean}true"
+          style="vertical">
+          <items jcr:primaryType="nt:unstructured">
+            <wizard
+              jcr:primaryType="nt:unstructured"
+              jcr:title="Move"
+              sling:resourceType="granite/ui/components/coral/foundation/wizard"
+              cancelHref="${empty header.Referer ? granite:encodeURIPath(requestPathInfo.suffix) : header.Referer}">
+              <items jcr:primaryType="nt:unstructured">
+                <renameStep
+                  jcr:primaryType="nt:unstructured"
+                  jcr:title="Rename"
+                  sling:resourceType="granite/ui/components/coral/foundation/container">
+                  <items jcr:primaryType="nt:unstructured">
+                    <fixedColumns
+                      jcr:primaryType="nt:unstructured"
+                      sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                      active="{Boolean}true"
+                      margin="{Boolean}true"
+                      maximized="{Boolean}true">
+                      <items jcr:primaryType="nt:unstructured">
+                        <fixedColumn1
+                          granite:id="references"
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/container">
+                          <items jcr:primaryType="nt:unstructured">
+                            <moveitem
+                              jcr:primaryType="nt:unstructured"
+                              sling:resourceType="apm/components/moveitem"/>
+                          </items>
+                        </fixedColumn1>
+                      </items>
+                    </fixedColumns>
+                  </items>
+                  <parentConfig
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="granite/ui/components/coral/foundation/form"
-                    maximized="{Boolean}true"
-                    method="post"
-                    novalidate="{Boolean}true"
-                    style="vertical">
-                    <items jcr:primaryType="nt:unstructured">
-                        <wizard
-                            jcr:primaryType="nt:unstructured"
-                            jcr:title="Move"
-                            sling:resourceType="granite/ui/components/coral/foundation/wizard"
-                            cancelHref="${empty header.Referer ? granite:encodeURIPath(requestPathInfo.suffix) : header.Referer}">
-                            <items jcr:primaryType="nt:unstructured">
-                                <renameStep
-                                    jcr:primaryType="nt:unstructured"
-                                    jcr:title="Rename"
-                                    sling:resourceType="granite/ui/components/coral/foundation/container">
-                                    <items jcr:primaryType="nt:unstructured">
-                                        <fixedColumns
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
-                                            active="{Boolean}true"
-                                            margin="{Boolean}true"
-                                            maximized="{Boolean}true">
-                                            <items jcr:primaryType="nt:unstructured">
-                                                <fixedColumn1
-                                                    granite:id="references"
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/container">
-                                                    <items jcr:primaryType="nt:unstructured">
-                                                        <moveitem
-                                                            jcr:primaryType="nt:unstructured"
-                                                            sling:resourceType="apm/components/moveitem"/>
-                                                    </items>
-                                                </fixedColumn1>
-                                            </items>
-                                        </fixedColumns>
-                                    </items>
-                                    <parentConfig
-                                        jcr:primaryType="nt:unstructured"
-                                        validation="{Boolean}false">
-                                        <next
-                                            granite:class="foundation-wizard-control"
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/coral/foundation/button"
-                                            text="Submit"
-                                            type="submit"
-                                            variant="primary">
-                                            <granite:data
-                                                jcr:primaryType="nt:unstructured"
-                                                foundation-wizard-control-action="next"/>
-                                        </next>
-                                    </parentConfig>
-                                </renameStep>
-                            </items>
-                        </wizard>
-                    </items>
-                </form>
-            </items>
-        </body>
-    </jcr:content>
+                    validation="{Boolean}false">
+                    <next
+                      granite:class="foundation-wizard-control"
+                      jcr:primaryType="nt:unstructured"
+                      sling:resourceType="granite/ui/components/coral/foundation/button"
+                      text="Submit"
+                      type="submit"
+                      variant="primary">
+                      <granite:data
+                        jcr:primaryType="nt:unstructured"
+                        foundation-wizard-control-action="next"/>
+                    </next>
+                  </parentConfig>
+                </renameStep>
+              </items>
+            </wizard>
+          </items>
+        </form>
+      </items>
+    </body>
+  </jcr:content>
 </jcr:root>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/references/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/references/.content.xml
index 4ec4e7b6d..9911b1b7e 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/references/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/references/.content.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-  xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="cq:Page">
   <jcr:content
     jcr:primaryType="nt:unstructured"
@@ -38,4 +37,4 @@
       </items>
     </content>
   </jcr:content>
-</jcr:root>
\ No newline at end of file
+</jcr:root>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/scripts/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/scripts/.content.xml
index fda2271cd..382c37b74 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/scripts/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/scripts/.content.xml
@@ -271,4 +271,4 @@
       </selection>
     </actions>
   </jcr:content>
-</jcr:root>
\ No newline at end of file
+</jcr:root>
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/summary/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/summary/.content.xml
index 2d3e967c2..a06f49181 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/summary/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/summary/.content.xml
@@ -41,4 +41,4 @@
       </items>
     </content>
   </jcr:content>
-</jcr:root>
\ No newline at end of file
+</jcr:root>
diff --git a/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/config.xml b/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/config.xml
index 57f088473..f394f7983 100644
--- a/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/config.xml
+++ b/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/config.xml
@@ -1,77 +1,77 @@
 <vaultfs version="1.1">
+  <!--
+      Defines the content aggregation. The order of the defined aggregates
+      is important for finding the correct aggregator.
+  -->
+  <aggregates>
     <!--
-        Defines the content aggregation. The order of the defined aggregates
-        is important for finding the correct aggregator.
+        Defines an aggregate that handles nt:file and nt:resource nodes.
     -->
-    <aggregates>
-        <!--
-            Defines an aggregate that handles nt:file and nt:resource nodes.
-        -->
-        <aggregate type="file" title="File Aggregate"/>
+    <aggregate type="file" title="File Aggregate"/>
 
-        <!--
-            Defines an aggregate that handles file/folder like nodes. It matches
-            all nt:hierarchyNode nodes that have or define a jcr:content
-            child node and excludes child nodes that are nt:hierarchyNodes.
-        -->
-        <aggregate type="filefolder" title="File/Folder Aggregate"/>
-
-        <!--
-            Defines an aggregate that handles nt:nodeType nodes and serializes
-            them into .cnd notation.
-        -->
-        <aggregate type="nodetype" title="Node Type Aggregate" />
-
-        <!--
-            Defines an aggregate that defines full coverage for certain node
-            types that cannot be covered by the default aggregator.
-        -->
-        <aggregate type="full" title="Full Coverage Aggregate">
-            <matches>
-                <include nodeType="rep:AccessControl" respectSupertype="true" />
-                <include nodeType="rep:Policy" respectSupertype="true" />
-                <include nodeType="cq:Widget" respectSupertype="true" />
-                <include nodeType="cq:EditConfig" respectSupertype="true" />
-                <include nodeType="cq:WorkflowModel" respectSupertype="true" />
-                <include nodeType="vlt:FullCoverage" respectSupertype="true" />
-                <include nodeType="mix:language" respectSupertype="true" />
-                <include nodeType="sling:OsgiConfig" respectSupertype="true" />
-            </matches>
-        </aggregate>
+    <!--
+        Defines an aggregate that handles file/folder like nodes. It matches
+        all nt:hierarchyNode nodes that have or define a jcr:content
+        child node and excludes child nodes that are nt:hierarchyNodes.
+    -->
+    <aggregate type="filefolder" title="File/Folder Aggregate"/>
 
-        <!--
-            Defines an aggregate that handles nt:folder like nodes.
-        -->
-        <aggregate type="generic" title="Folder Aggregate">
-            <matches>
-                <include nodeType="nt:folder" respectSupertype="true" />
-            </matches>
-            <contains>
-                <exclude isNode="true" />
-            </contains>
-        </aggregate>
+    <!--
+        Defines an aggregate that handles nt:nodeType nodes and serializes
+        them into .cnd notation.
+    -->
+    <aggregate type="nodetype" title="Node Type Aggregate"/>
 
-        <!--
-            Defines the default aggregate
-        -->
-        <aggregate type="generic" title="Default Aggregator" isDefault="true">
-            <matches>
-                <!-- all -->
-            </matches>
-            <contains>
-                <exclude nodeType="nt:hierarchyNode" respectSupertype="true" />
-            </contains>
-        </aggregate>
+    <!--
+        Defines an aggregate that defines full coverage for certain node
+        types that cannot be covered by the default aggregator.
+    -->
+    <aggregate type="full" title="Full Coverage Aggregate">
+      <matches>
+        <include nodeType="rep:AccessControl" respectSupertype="true"/>
+        <include nodeType="rep:Policy" respectSupertype="true"/>
+        <include nodeType="cq:Widget" respectSupertype="true"/>
+        <include nodeType="cq:EditConfig" respectSupertype="true"/>
+        <include nodeType="cq:WorkflowModel" respectSupertype="true"/>
+        <include nodeType="vlt:FullCoverage" respectSupertype="true"/>
+        <include nodeType="mix:language" respectSupertype="true"/>
+        <include nodeType="sling:OsgiConfig" respectSupertype="true"/>
+      </matches>
+    </aggregate>
 
-    </aggregates>
+    <!--
+        Defines an aggregate that handles nt:folder like nodes.
+    -->
+    <aggregate type="generic" title="Folder Aggregate">
+      <matches>
+        <include nodeType="nt:folder" respectSupertype="true"/>
+      </matches>
+      <contains>
+        <exclude isNode="true"/>
+      </contains>
+    </aggregate>
 
     <!--
-      defines the input handlers
+        Defines the default aggregate
     -->
-    <handlers>
-        <handler type="folder"/>
-        <handler type="file"/>
-        <handler type="nodetype"/>
-        <handler type="generic"/>
-    </handlers>
+    <aggregate type="generic" title="Default Aggregator" isDefault="true">
+      <matches>
+        <!-- all -->
+      </matches>
+      <contains>
+        <exclude nodeType="nt:hierarchyNode" respectSupertype="true"/>
+      </contains>
+    </aggregate>
+
+  </aggregates>
+
+  <!--
+    defines the input handlers
+  -->
+  <handlers>
+    <handler type="folder"/>
+    <handler type="file"/>
+    <handler type="nodetype"/>
+    <handler type="generic"/>
+  </handlers>
 </vaultfs>
diff --git a/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/filter.xml
index 0bc624b62..74c954454 100644
--- a/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/filter.xml
+++ b/app/aem/ui.apps.cloud/src/main/content/META-INF/vault/filter.xml
@@ -2,4 +2,4 @@
 <workspaceFilter version="1.0">
   <filter root="/apps/apm"/>
   <filter root="/apps/cq/core/content/nav/tools/security/apm"/>
-</workspaceFilter>
\ No newline at end of file
+</workspaceFilter>
diff --git a/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml
index 0bc624b62..74c954454 100644
--- a/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -2,4 +2,4 @@
 <workspaceFilter version="1.0">
   <filter root="/apps/apm"/>
   <filter root="/apps/cq/core/content/nav/tools/security/apm"/>
-</workspaceFilter>
\ No newline at end of file
+</workspaceFilter>
diff --git a/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml
index 6441a599b..354c74d9a 100644
--- a/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml
+++ b/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-    <filter root="/conf/apm" mode="merge"/>
+  <filter root="/conf/apm" mode="merge"/>
 </workspaceFilter>
diff --git a/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml
index cbe94d5fd..03ab9bec8 100644
--- a/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml
+++ b/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-    <filter root="/home/users/system/apm-system-user"/>
-    <filter root="/rep:policy"/>
+  <filter root="/home/users/system/apm-system-user"/>
+  <filter root="/rep:policy"/>
 </workspaceFilter>
diff --git a/app/aem/ui.system.user/src/main/content/jcr_root/_rep_policy.xml b/app/aem/ui.system.user/src/main/content/jcr_root/_rep_policy.xml
index 7e10adc25..6be5ce942 100644
--- a/app/aem/ui.system.user/src/main/content/jcr_root/_rep_policy.xml
+++ b/app/aem/ui.system.user/src/main/content/jcr_root/_rep_policy.xml
@@ -1,7 +1,7 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
   jcr:primaryType="rep:ACL">
-    <allow
-        jcr:primaryType="rep:GrantACE"
-        rep:principalName="apm-system-user"
-        rep:privileges="{Name}[jcr:all]"/>
+  <allow
+    jcr:primaryType="rep:GrantACE"
+    rep:principalName="apm-system-user"
+    rep:privileges="{Name}[jcr:all]"/>
 </jcr:root>
diff --git a/examples/src/main/content/META-INF/vault/filter.xml b/examples/src/main/content/META-INF/vault/filter.xml
index 860e74ed9..1fc69e3d0 100644
--- a/examples/src/main/content/META-INF/vault/filter.xml
+++ b/examples/src/main/content/META-INF/vault/filter.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
   <filter root="/conf/apm/scripts/examples"/>
-</workspaceFilter>
\ No newline at end of file
+</workspaceFilter>
diff --git a/gradle/META-INF/vault/definition/.content.xml b/gradle/META-INF/vault/definition/.content.xml
index 5aa45019b..ef6ad0958 100644
--- a/gradle/META-INF/vault/definition/.content.xml
+++ b/gradle/META-INF/vault/definition/.content.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="vlt:PackageDefinition"
-    sling:resourceType="cq/packaging/components/pack/definition"
-    providerName="Cognifide"
-    providerUrl="http://www.cognifide.com">
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+  xmlns:vlt="http://www.day.com/jcr/vault/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0"
+  jcr:primaryType="vlt:PackageDefinition"
+  sling:resourceType="cq/packaging/components/pack/definition"
+  providerName="Cognifide"
+  providerUrl="http://www.cognifide.com">
 </jcr:root>