diff --git a/content-packages/sample-content/jcr_root/.content.xml b/content-packages/sample-content/jcr_root/.content.xml
index 8ea9f2ae..fb94eac6 100644
--- a/content-packages/sample-content/jcr_root/.content.xml
+++ b/content-packages/sample-content/jcr_root/.content.xml
@@ -1,5 +1,5 @@
 <?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:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable,rep:RepoAccessControllable]"
     jcr:primaryType="rep:root"
     sling:resourceType="sling:redirect"
diff --git a/content-packages/sample-content/jcr_root/content/.content.xml b/content-packages/sample-content/jcr_root/content/.content.xml
index ab39e078..150190b2 100644
--- a/content-packages/sample-content/jcr_root/content/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/.content.xml
@@ -1,5 +1,5 @@
 <?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:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="sling:OrderedFolder">
     <cq:graphql/>
@@ -8,6 +8,7 @@
     <campaigns/>
     <projects/>
     <experience-fragments/>
+    <outbound-marketing/>
     <cq:tags/>
     <usergenerated/>
     <launches/>
diff --git a/content-packages/sample-content/jcr_root/content/dam/.content.xml b/content-packages/sample-content/jcr_root/content/dam/.content.xml
index 54084a82..1581aa34 100644
--- a/content-packages/sample-content/jcr_root/content/dam/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/.content.xml
@@ -1,4 +1,4 @@
 <?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:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="sling:Folder"/>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/.content.xml
index 8e104d4d..f1b4de5a 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/.content.xml
@@ -1,10 +1,8 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="sling:Folder">
     <jcr:content
-        cq:conf=""
         jcr:primaryType="nt:unstructured"
-        jcr:title=""
         processingProfile="None">
         <folderThumbnail/>
     </jcr:content>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/_jcr_content/folderThumbnail.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/_jcr_content/folderThumbnail.dir/.content.xml
index 0d0b5832..f545b6c0 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/_jcr_content/folderThumbnail.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/_jcr_content/folderThumbnail.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         dam:folderThumbnailPaths="[/content/dam/wcm-io-samples/content/user.png,/content/dam/wcm-io-samples/content/talk.png,/content/dam/wcm-io-samples/content/location.png]"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/.content.xml
index 0ed6c2b8..7699c98b 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/.content.xml
@@ -1,9 +1,8 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="sling:Folder"
     jcr:title="content">
     <jcr:content
-        cq:conf=""
         jcr:primaryType="nt:unstructured"
         processingProfile="None">
         <folderThumbnail/>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/_jcr_content/folderThumbnail.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/_jcr_content/folderThumbnail.dir/.content.xml
index 10d10648..10ea21e9 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/_jcr_content/folderThumbnail.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/_jcr_content/folderThumbnail.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         dam:folderThumbnailPaths="[/content/dam/adaptto/sample/content/user.png,/content/dam/adaptto/sample/content/talk.png,/content/dam/adaptto/sample/content/location.png]"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/.content.xml
index d4b2a7a4..f932b80f 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="e79aee3b-9465-49f6-9df8-d228047ba768">
     <jcr:content
         cq:name="archive.png"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -16,7 +18,7 @@
             dam:Physicalwidthindpi="{Long}72"
             dam:Physicalwidthininches="{Decimal}6.668185710906982"
             dam:Progressive="no"
-            dam:size="{Long}7461"
+            dam:size="{Long}9889"
             dam:writebackEnable="False"
             dc:format="image/png"
             jcr:primaryType="nt:unstructured"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
index 71108d2c..f8194f71 100644
Binary files a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/archive.png/_jcr_content/renditions/cq5dam.web.1280.1280.png differ
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/.content.xml
index d079f3b2..31268be0 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="25a9fc1c-4c47-4096-99fa-dd4cc4f20f3a">
     <jcr:content
         cq:name="location.png"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -16,7 +18,7 @@
             dam:Physicalwidthindpi="{Long}72"
             dam:Physicalwidthininches="{Decimal}6.668185710906982"
             dam:Progressive="no"
-            dam:size="{Long}6487"
+            dam:size="{Long}8503"
             dam:writebackEnable="False"
             dc:format="image/png"
             jcr:primaryType="nt:unstructured"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
index fb119ebc..33a7ebd4 100644
Binary files a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/location.png/_jcr_content/renditions/cq5dam.web.1280.1280.png differ
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/.content.xml
index 771735e9..0d5bb1a4 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="64bdcee7-801e-425e-b728-1147b65b3ca6">
     <jcr:content
         cq:name="provision-logo.png"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -16,7 +18,7 @@
             dam:Physicalwidthindpi="{Long}72"
             dam:Physicalwidthininches="{Decimal}5.556821346282959"
             dam:Progressive="no"
-            dam:size="{Long}19108"
+            dam:size="{Long}20682"
             dam:writebackEnable="False"
             dc:format="image/png"
             jcr:primaryType="nt:unstructured"
@@ -36,6 +38,10 @@
                 jcr:primaryType="nt:unstructured"
                 imageHeight="{Long}9"
                 imageWidth="{Long}48"/>
+            <cq5dam.thumbnail.319.319.png
+                jcr:primaryType="nt:unstructured"
+                imageHeight="{Long}65"
+                imageWidth="{Long}319"/>
         </renditionsMetadata>
     </jcr:content>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
index bd397f0d..504b86bd 100644
Binary files a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/provision-logo.png/_jcr_content/renditions/cq5dam.web.1280.1280.png differ
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/.content.xml
index 5b4a0ba3..759cb288 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:pdf="http://ns.adobe.com/pdf/1.3/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="29d0a27a-7c9f-4d62-bb2e-53b32c90d30a">
     <jcr:content jcr:primaryType="dam:AssetContent">
         <metadata
             dam:Author="Stefan Seifert"
@@ -16,9 +18,9 @@
             pdf:Producer="Microsoft® Word für Microsoft 365"
             xmp:CreateDate="{Date}2021-06-25T19:55:06.000+02:00"
             xmp:CreatorTool="Microsoft® Word für Microsoft 365"
-            xmp:ModifyDate="{Date}2021-06-25T19:55:06.000+02:00"
             xmpMM:DocumentID="uuid:B1C9FDB5-9863-4989-B880-D61874EED8D3"
-            xmpMM:InstanceID="uuid:B1C9FDB5-9863-4989-B880-D61874EED8D3"/>
+            xmpMM:InstanceID="uuid:B1C9FDB5-9863-4989-B880-D61874EED8D3"
+            xmp:ModifyDate="{Date}2021-06-25T19:55:06.000+02:00"/>
         <related jcr:primaryType="nt:unstructured"/>
         <renditionsMetadata jcr:primaryType="nt:unstructured">
             <cq5dam.thumbnail.140.100.png
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml
index ed6e59d0..82989b40 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content jcr:primaryType="oak:Resource"/>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cqdam.preview.png.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cqdam.preview.png.dir/.content.xml
index ed6e59d0..82989b40 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cqdam.preview.png.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/cqdam.preview.png.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content jcr:primaryType="oak:Resource"/>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/original.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/original.dir/.content.xml
index 80795aac..6daf2269 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/original.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/sample.pdf/_jcr_content/renditions/original.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="application/pdf"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/stageheader-outside2.jpg/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/stageheader-outside2.jpg/.content.xml
index a35b8414..9090ab0c 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/stageheader-outside2.jpg/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/stageheader-outside2.jpg/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="8a58c7f2-5756-4b2e-98fe-a2936c623dd7">
     <jcr:content
         cq:name="stageheader-outside2.jpg"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -17,9 +19,9 @@
             dam:Physicalwidthindpi="{Long}-1"
             dam:Physicalwidthininches="{Decimal}-1.0"
             dam:Progressive="no"
-            dam:size="{Long}102447"
+            dam:size="{Long}102541"
             dam:writebackEnable="False"
-            dc:creator="[Alexander Muthmann,Alexander Muthmann,Alexander Muthmann,Alexander Muthmann]"
+            dc:creator="[Alexander Muthmann,Alexander Muthmann]"
             dc:creator_xmpArrayType="rdf:Seq"
             dc:format="image/jpeg"
             jcr:primaryType="nt:unstructured"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/.content.xml
index fceec22b..c77aae8f 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="1433dbe9-4d21-4941-8caf-6a0f6cae3190">
     <jcr:content
         cq:name="talk.png"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -16,7 +18,7 @@
             dam:Physicalwidthindpi="{Long}72"
             dam:Physicalwidthininches="{Decimal}6.668185710906982"
             dam:Progressive="no"
-            dam:size="{Long}6652"
+            dam:size="{Long}8668"
             dam:writebackEnable="False"
             dc:format="image/png"
             jcr:primaryType="nt:unstructured"
@@ -36,6 +38,10 @@
                 jcr:primaryType="nt:unstructured"
                 imageHeight="{Long}179"
                 imageWidth="{Long}319"/>
+            <cq5dam.thumbnail.48.48.png
+                jcr:primaryType="nt:unstructured"
+                imageHeight="{Long}27"
+                imageWidth="{Long}48"/>
         </renditionsMetadata>
     </jcr:content>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
index 27b03744..e69f785a 100644
Binary files a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/talk.png/_jcr_content/renditions/cq5dam.web.1280.1280.png differ
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/.content.xml
index b4cced0e..a45059a1 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:creatorAtom="http://ns.adobe.com/creatorAtom/1.0/" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#" xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:creatorAtom="http://ns.adobe.com/creatorAtom/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/" xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#" xmlns:dam="http://www.day.com/dam/1.0" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="9efe504e-1850-4c10-b607-cb882650c207">
     <jcr:content jcr:primaryType="dam:AssetContent">
         <metadata
             dam:size="{Long}955481"
@@ -11,8 +13,6 @@
             tiff:ImageWidth="{Long}480"
             tiff:Orientation="{Long}1"
             xmp:CreateDate="{Date}2020-01-20T20:28:45.000Z"
-            xmp:MetadataDate="{Date}2020-01-20T21:28:45.000+01:00"
-            xmp:ModifyDate="{Date}2020-01-20T20:28:45.000Z"
             xmpDM:audioChannelType="Stereo"
             xmpDM:audioSampleRate="{Long}48000"
             xmpDM:audioSampleType="16Int"
@@ -21,9 +21,11 @@
             xmpDM:videoFieldOrder="Progressive"
             xmpDM:videoFrameRate="25.000000"
             xmpDM:videoPixelAspectRatio="1/1"
+            xmp:MetadataDate="{Date}2020-01-20T21:28:45.000+01:00"
             xmpMM:DocumentID="06f1c0a1-4545-ddbd-4a9a-784500000047"
             xmpMM:InstanceID="xmp.iid:5082d121-2487-bd4e-9132-1254346a94ad"
-            xmpMM:OriginalDocumentID="xmp.did:4cf4288f-df9b-6546-9eaf-85061bddee1e">
+            xmpMM:OriginalDocumentID="xmp.did:4cf4288f-df9b-6546-9eaf-85061bddee1e"
+            xmp:ModifyDate="{Date}2020-01-20T20:28:45.000Z">
             <xmpDM:projectRef
                 jcr:primaryType="nt:unstructured"
                 xmpDM:type="movie"
@@ -82,21 +84,6 @@
                     stEvt:when="{Date}2020-01-20T21:28:45.000+01:00"
                     xmpNodeType="xmpStruct"/>
             </xmpMM:History>
-            <xmpMM:Ingredients
-                jcr:primaryType="nt:unstructured"
-                xmpArraySize="{Long}1"
-                xmpArrayType="rdf:Bag"
-                xmpNodeType="xmpArray">
-                <_x0031_
-                    jcr:primaryType="nt:unstructured"
-                    stRef:documentID="cac0907d-f2ba-e0d4-c76c-8e0400000043"
-                    stRef:filePath="P1030651.MP4"
-                    stRef:fromPart="time:0d304819200000f254016000000"
-                    stRef:instanceID="a38656e7-d40c-1ada-1b9c-923e00000070"
-                    stRef:maskMarkers="None"
-                    stRef:toPart="time:0d304819200000f254016000000"
-                    xmpNodeType="xmpStruct"/>
-            </xmpMM:Ingredients>
             <xmpMM:Pantry
                 jcr:primaryType="nt:unstructured"
                 xmpArraySize="{Long}1"
@@ -107,10 +94,10 @@
                     tiff:Orientation="{Long}1"
                     xmp:CreateDate="{Date}2019-07-04T13:07:25.000Z"
                     xmp:MetadataDate="{Date}2020-01-20T21:28:21.000+01:00"
-                    xmp:ModifyDate="{Date}2020-01-20T21:28:21.000+01:00"
                     xmpMM:DocumentID="cac0907d-f2ba-e0d4-c76c-8e0400000043"
                     xmpMM:InstanceID="a38656e7-d40c-1ada-1b9c-923e00000070"
                     xmpMM:OriginalDocumentID="xmp.did:9a1b78ca-cd0d-4e48-8bdc-970928fee4e7"
+                    xmp:ModifyDate="{Date}2020-01-20T21:28:21.000+01:00"
                     xmpNodeType="xmpStruct">
                     <xmpDM:duration
                         jcr:primaryType="nt:unstructured"
@@ -149,6 +136,21 @@
                 creatorAtom:invocationAppleEvent="{Long}1129468018"
                 jcr:primaryType="nt:unstructured"
                 xmpNodeType="xmpStruct"/>
+            <xmpMM:Ingredients
+                jcr:primaryType="nt:unstructured"
+                xmpArraySize="{Long}1"
+                xmpArrayType="rdf:Bag"
+                xmpNodeType="xmpArray">
+                <_x0031_
+                    jcr:primaryType="nt:unstructured"
+                    stRef:documentID="cac0907d-f2ba-e0d4-c76c-8e0400000043"
+                    stRef:filePath="P1030651.MP4"
+                    stRef:fromPart="time:0d304819200000f254016000000"
+                    stRef:instanceID="a38656e7-d40c-1ada-1b9c-923e00000070"
+                    stRef:maskMarkers="None"
+                    stRef:toPart="time:0d304819200000f254016000000"
+                    xmpNodeType="xmpStruct"/>
+            </xmpMM:Ingredients>
         </metadata>
         <related jcr:primaryType="nt:unstructured"/>
         <renditionsMetadata jcr:primaryType="nt:unstructured">
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.firefoxhq.ogg.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.firefoxhq.ogg.dir/.content.xml
index 67a35d03..019d0c01 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.firefoxhq.ogg.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.firefoxhq.ogg.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="video/ogg"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.flv.320.240.flv.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.flv.320.240.flv.dir/.content.xml
index 0a54a268..e45e5a1c 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.flv.320.240.flv.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.flv.320.240.flv.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="video/x-flv"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.hq.m4v.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.hq.m4v.dir/.content.xml
index 51c1eaf4..0316bcee 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.hq.m4v.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.hq.m4v.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="video/x-m4v"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.iehq.mp4.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.iehq.mp4.dir/.content.xml
index 2509d1ff..525e6c0d 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.iehq.mp4.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/cq5dam.video.iehq.mp4.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="video/mp4"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/original.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/original.dir/.content.xml
index 512c7381..3b26651e 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/original.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/test-video.mp4/_jcr_content/renditions/original.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="video/mp4"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/.content.xml
index cd19d32b..2e0485d2 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="02a911eb-95c0-40e8-b45e-8dde7ee47e58">
     <jcr:content
         cq:name="twitter-icon.png"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -16,7 +18,7 @@
             dam:Physicalwidthindpi="{Long}72"
             dam:Physicalwidthininches="{Decimal}1.6670464277267456"
             dam:Progressive="no"
-            dam:size="{Long}7204"
+            dam:size="{Long}12394"
             dam:writebackEnable="False"
             dc:format="image/png"
             jcr:primaryType="nt:unstructured"
@@ -32,6 +34,14 @@
                 jcr:primaryType="nt:unstructured"
                 imageHeight="{Long}100"
                 imageWidth="{Long}100"/>
+            <cq5dam.thumbnail.48.48.png
+                jcr:primaryType="nt:unstructured"
+                imageHeight="{Long}48"
+                imageWidth="{Long}48"/>
+            <cq5dam.thumbnail.319.319.png
+                jcr:primaryType="nt:unstructured"
+                imageHeight="{Long}120"
+                imageWidth="{Long}120"/>
         </renditionsMetadata>
     </jcr:content>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
index 640b9cb5..1d7dd115 100644
Binary files a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/twitter-icon.png/_jcr_content/renditions/cq5dam.web.1280.1280.png differ
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/.content.xml
index 4cad67b1..3de8481b 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/.content.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="037a93d3-d869-4459-bbd0-381ef151b587">
     <jcr:content
         cq:name="user.png"
         cq:parentPath="/content/dam/wcm-io-samples/content"
@@ -16,7 +18,7 @@
             dam:Physicalwidthindpi="{Long}72"
             dam:Physicalwidthininches="{Decimal}6.668185710906982"
             dam:Progressive="no"
-            dam:size="{Long}4476"
+            dam:size="{Long}8096"
             dam:writebackEnable="False"
             dc:format="image/png"
             jcr:primaryType="nt:unstructured"
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
index 9a51afa2..05b05d65 100644
Binary files a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/user.png/_jcr_content/renditions/cq5dam.web.1280.1280.png differ
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/.content.xml
index d7e361dd..dffc9117 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/.content.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    jcr:mixinTypes="[mix:referenceable]"
+    jcr:primaryType="dam:Asset"
+    jcr:uuid="3771fcc0-76b8-4897-a82c-a2912e37d2fb">
     <jcr:content jcr:primaryType="dam:AssetContent">
         <metadata
-            dam:size="{Long}2332"
+            dam:size="{Long}2306"
             dc:format="image/svg+xml"
             jcr:primaryType="nt:unstructured"/>
         <related jcr:primaryType="nt:unstructured"/>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml
index ed6e59d0..82989b40 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/cq5dam.web.1280.1280.jpeg.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content jcr:primaryType="oak:Resource"/>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/original.dir/.content.xml b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/original.dir/.content.xml
index 908d1162..39caf50a 100644
--- a/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/original.dir/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/dam/wcm-io-samples/content/wcm-io.svg/_jcr_content/renditions/original.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mimeType="image/svg+xml"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/.content.xml
index 1980bb19..8377cbb3 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/.content.xml
@@ -1,5 +1,5 @@
 <?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"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="sling:OrderedFolder">
     <en/>
 </jcr:root>
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/.content.xml
index 10a56e9c..12d711e1 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:cloudserviceconfigs="[[]]"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/.content.xml
index a43f1313..0d521c60 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/content/content"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/call-for-papers/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/call-for-papers/.content.xml
index 72e77bdd..56471cea 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/call-for-papers/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/conference/call-for-papers/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/content/content"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/.content.xml
index 5bdbe4e3..4ad58757 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/structureElement"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/config/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/config/.content.xml
index 60a2dca6..6594ba52 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/config/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/config/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/configEditor"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/.content.xml
index 76883782..59c4e3c8 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/structureElement"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/.content.xml
index 079b66e2..2a5c0f36 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/structureElement"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/.content.xml
index d3d6f880..5a0bd032 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/structureElement"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2011/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2011/.content.xml
index c3ca6cfa..cdf3ab7e 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2011/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2011/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/redirect"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2012/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2012/.content.xml
index a023d34e..dd5d9578 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2012/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/archive/adaptto---2012/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/redirect"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/.content.xml
index f676fd5b..0c2264c7 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/structureElement"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/conference/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/conference/.content.xml
index 30aab0a9..087d75fe 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/conference/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/conference/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/redirect"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/schedule/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/schedule/.content.xml
index ec1376b4..3a71bd3c 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/schedule/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/schedule/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/redirect"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/tickets/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/tickets/.content.xml
index 7b998b66..9c18697d 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/tickets/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/conference/tickets/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/redirect"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/.content.xml
index 550c6a6f..809c0822 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/structureElement"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/venue/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/venue/.content.xml
index 5483eb87..3b71cb44 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/venue/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/footernav/venue/venue/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/admin/redirect"
diff --git a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/imprint/.content.xml b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/imprint/.content.xml
index c3d01c5b..5211007f 100644
--- a/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/imprint/.content.xml
+++ b/content-packages/sample-content/jcr_root/content/wcm-io-samples/en/tools/navigation/imprint/.content.xml
@@ -1,5 +1,5 @@
 <?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:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/apps/wcm-io-samples/core/templates/content/content"