diff --git a/aemdesign-aem-common/filevault-export.ps1 b/aemdesign-aem-common/filevault-export.ps1
new file mode 100644
index 000000000..ef21a13d3
--- /dev/null
+++ b/aemdesign-aem-common/filevault-export.ps1
@@ -0,0 +1,160 @@
+Param(
+    #equivalent of using localhost in docker container
+    [string]$AEM_HOST = "localhost",
+    # TCP port SOURCE_CQ listens on
+    [string]$AEM_PORT = "4502",
+    # AEM Admin user for AEM_HOST
+    [string]$AEM_USER = "admin",
+    # AEM Admin password for AEM_HOST
+    [string]$AEM_PASSWORD = "admin",
+    # Server WebDav Path
+    #$AEM_WEBDAV_PATH = "/crx/server/crx.default/jcr:root/"
+    [string]$AEM_WEBDAV_PATH = "/crx",
+    [string]$AEM_SCHEMA = "http",
+    #to set additional flags if required
+    [string]$VLT_FLAGS = "--insecure -Xmx2g",
+    [string]$VLT_CMD = "../tools/vault-cli/bin/vlt",
+    # Root folder name for placing content
+    [string]$CONTENT_DESTINATION = ".\src\main\content",
+    [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
+    [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
+    [string[]]$ROOT_PATHS,
+    [switch]$Silent = $false,
+    [string]$LOG_PATH = (Resolve-Path -Path "..\logs" -Relative)
+)
+
+Function Format-XMLIndent
+{
+    [Cmdletbinding()]
+    [Alias("IndentXML")]
+    param
+    (
+        [Parameter(ValueFromPipeline)]
+        [xml]$Content,
+        [int]$Indent
+    )
+
+    # String Writer and XML Writer objects to write XML to string
+    $StringWriter = New-Object System.IO.StringWriter
+    $XmlWriter = New-Object System.XMl.XmlTextWriter $StringWriter
+
+    # Default = None, change Formatting to Indented
+    $xmlWriter.Formatting = "indented"
+
+    # Gets or sets how many IndentChars to write for each level in
+    # the hierarchy when Formatting is set to Formatting.Indented
+    $xmlWriter.Indentation = $Indent
+
+    $Content.WriteContentTo($XmlWriter)
+    $XmlWriter.Flush();$StringWriter.Flush()
+    $StringWriter.ToString()
+}
+
+
+Function GetFilterList
+{
+    [Cmdletbinding()]
+    [Alias("filterList")]
+    param
+    (
+        [Parameter(ValueFromPipeline)]
+        [string]$FILTER_FILE = ".\src\main\content\META-INF\vault\filter.xml"
+    )
+    $FILTER_PATHS = [System.Collections.ArrayList]::new()
+
+    $FILTER_XML = [xml](Get-Content $FILTER_FILE)
+    $FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+    $FILTER_XML_ITEMS = $FILTER_XML_CONTENT.SelectNodes('//filter')
+    $FILTER_XML_ITEMS | ForEach-Object {
+        [void]$FILTER_PATHS.Add($_.root)
+    }
+
+    return $FILTER_PATHS
+}
+
+if (-not($ROOT_PATHS)) {
+    $ROOT_PATHS = GetFilterList
+}
+
+Write-Output "------- CONFIG ----------"
+Write-Output "AEM_SCHEMA: $AEM_SCHEMA"
+Write-Output "AEM_HOST: $AEM_HOST"
+Write-Output "AEM_PORT: $AEM_PORT"
+Write-Output "AEM_USER: $AEM_USER"
+Write-Output "CONTENT_DESTINATION: $CONTENT_DESTINATION"
+Write-Output "ROOT_PATHS: $ROOT_PATHS"
+Write-Output "FILTER_FILE: $FILTER_FILE"
+Write-Output "Silent: $Silent"
+Write-Output "VLT_FLAGS: $VLT_FLAGS"
+Write-Output "VLT_CMD:"
+
+$ROOT_PATHS | ForEach-Object {
+    Write-Output "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:****** export -v ${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}${AEM_WEBDAV_PATH} $_ ${CONTENT_DESTINATION}"
+}
+
+if (-not($Silent))
+{
+    $START = Read-Host -Prompt 'Do you want to start export with these settings? (y/n)'
+
+    if ($START -ne "y")
+    {
+        Write-Output "Quiting..."
+        Exit
+    }
+}
+
+Write-Output "------- START Exporting content ----------"
+$ROOT_PATHS_LAST = $ROOT_PATHS | Select-Object -Last 1
+$ROOT_PATHS | ForEach-Object {
+    Write-Output "START Export $_"
+    $LOG_FILENAME = "$_".Replace("/","-")
+
+    Write-Output "Remove Filer..."
+    Copy-Item ".\src\main\content\META-INF\vault\filter-blank.xml" -Destination "$FILTER_FILE"
+
+    Write-Output "Create filter for: $_"
+    $FILTER_XML = [xml](Get-Content $FILTER_FILE)
+    $FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+    $FILTER_XML_DELETE = $FILTER_XML_CONTENT.SelectNodes('//filter')
+    $FILTER_XML_DELETE | ForEach-Object{
+        $DELETE_STATUS = $FILTER_XML_CONTENT.RemoveChild($_)
+    }
+    $FILTER_XML_CONTENT_NEW = $FILTER_XML.CreateNode("element","filter","")
+    $FILTER_XML_CONTENT_NEW.SetAttribute("root",$_)
+    $FILTER_XML_CONTENT_NEW_ADD = $FILTER_XML_CONTENT.AppendChild($FILTER_XML_CONTENT_NEW)
+    Write-Output "Saving..."
+    $FILTER_XML.OuterXml | IndentXML -Indent 4 | Out-File $FILTER_FILE -encoding "UTF8"
+    Write-Output "Done..."
+
+    Write-Output "Running VLT..."
+    Invoke-Expression -Command "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:${AEM_PASSWORD} export -v ${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}${AEM_WEBDAV_PATH} $_ ${CONTENT_DESTINATION}" | Tee-Object -FilePath "${LOG_PATH}\filevailt-export-$LOG_FILENAME.log"
+
+    Write-Output "END Export $_"
+}
+
+Write-Output "------- END Exporting content ----------"
+
+Write-Output "------- START Updating ${FILTER_FILE} ----------"
+
+$FILTER_XML = [xml](Get-Content $FILTER_FILE)
+Write-Output "Removing Existing Filters..."
+$FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+$FILTER_XML_DELETE = $FILTER_XML_CONTENT.SelectNodes('//filter')
+$FILTER_XML_DELETE | ForEach-Object{
+    $DELETE_STATUS = $FILTER_XML_CONTENT.RemoveChild($_)
+}
+Write-Output "Adding Exported Filters..."
+$ROOT_PATHS | ForEach-Object {
+    $FILTER_XML_CONTENT_NEW = $FILTER_XML.CreateNode("element","filter","")
+    $FILTER_XML_CONTENT_NEW.SetAttribute("root",$_)
+    $FILTER_XML_CONTENT_NEW_ADD = $FILTER_XML_CONTENT.AppendChild($FILTER_XML_CONTENT_NEW)
+}
+Write-Output "Saving..."
+$FILTER_XML.OuterXml | IndentXML -Indent 4 | Out-File $FILTER_FILE -encoding "UTF8"
+Write-Output "Done."
+Write-Output "------- DONE Updating ${FILTER_FILE} ----------"
+
+Write-Output "------- Revert Filter.xml ----------"
+git checkout HEAD src/main/content/META-INF/
+git clean -fx src/main/content/META-INF
+Write-Output "------- Revert Filter.xml ----------"
diff --git a/aemdesign-aem-common/filevault-import.ps1 b/aemdesign-aem-common/filevault-import.ps1
new file mode 100644
index 000000000..060a4af76
--- /dev/null
+++ b/aemdesign-aem-common/filevault-import.ps1
@@ -0,0 +1,225 @@
+Param(
+    #equivalent of using localhost in docker container
+    [string]$AEM_HOST = "localhost",
+    # TCP port SOURCE_CQ listens on
+    [string]$AEM_PORT = "4502",
+    # AEM Admin user for AEM_HOST
+    [string]$AEM_USER = "admin",
+    # AEM Admin password for AEM_HOST
+    [string]$AEM_PASSWORD = "admin",
+    # Root folder name for placing content
+    [string]$SOURCE_CONTENT_FOLDER = "localhost-author-export",
+    # Server WebDav Path
+    #$AEM_WEBDAV_PATH = "/crx/server/crx.default/jcr:root/"
+    [string]$AEM_WEBDAV_PATH = "/crx",
+    [string]$AEM_SCHEMA = "http",
+    #to set additional flags if required
+    [string]$VLT_FLAGS = "--insecure -Xmx2g",
+    [string]$VLT_CMD = "../tools/vault-cli/bin/vlt",
+    # Root folder name for placing content
+    [string]$CONTENT_DESTINATION = ".\src\main\content",
+    [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
+    [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
+    #which filter paths to import
+    [string[]]$ROOT_PATHS,
+    [string]$ROOT_PATH = "/",
+    [string]$CONTENT_SOURCE = (Resolve-Path -Path "src\main\content\jcr_root" -Relative),
+    # connection timeout
+    [string]$TIMEOUT = "5",
+    # host address
+    [string]$ADDRESS = "${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}",
+    # Disable services before import
+    [string[]]$SERVICES_TO_DISABLE = @(
+        "/system/console/bundles/com.day.cq.cq-mailer",
+        "/system/console/bundles/com.adobe.granite.workflow.core"
+    ),
+
+    [HashTable]$BODY_SERVICE_TO_DISABLE = @{
+        "action"="stop"
+    },
+    [HashTable]$BODY_SERVICE_TO_DISABLE_ENABLE = @{
+        "action"="start"
+    },
+    [switch]$Silent = $false,
+    [string]$LOG_PATH = (Resolve-Path -Path "..\logs" -Relative)
+)
+
+
+Function Format-XMLIndent
+{
+    [Cmdletbinding()]
+    [Alias("IndentXML")]
+    param
+    (
+        [Parameter(ValueFromPipeline)]
+        [xml]$Content,
+        [int]$Indent
+    )
+
+    # String Writer and XML Writer objects to write XML to string
+    $StringWriter = New-Object System.IO.StringWriter
+    $XmlWriter = New-Object System.XMl.XmlTextWriter $StringWriter
+
+    # Default = None, change Formatting to Indented
+    $xmlWriter.Formatting = "indented"
+
+    # Gets or sets how many IndentChars to write for each level in
+    # the hierarchy when Formatting is set to Formatting.Indented
+    $xmlWriter.Indentation = $Indent
+
+    $Content.WriteContentTo($XmlWriter)
+    $XmlWriter.Flush();$StringWriter.Flush()
+    $StringWriter.ToString()
+}
+
+
+function doSlingPost {
+    [CmdletBinding()]
+    Param (
+
+        [Parameter(Mandatory=$true)]
+        [string]$Url="http://localhost:4502",
+
+        [Parameter(Mandatory)]
+        [ValidateNotNullOrEmpty()]
+        [ValidateSet('Post','Delete')]
+        [string]$Method,
+
+        [Parameter(Mandatory=$false)]
+        [HashTable]$Body,
+
+        [Parameter(Mandatory=$false,
+                HelpMessage="Provide Basic Auth Credentials in following format: <user>:<pass>")]
+        [string]$BasicAuthCreds="",
+
+        [Parameter(Mandatory=$false)]
+        [string]$UserAgent="",
+
+        [Parameter(Mandatory=$false)]
+        [string]$Referer="",
+
+        [Parameter(Mandatory=$false)]
+        [string]$Timeout="5"
+
+    )
+
+
+
+    $HEADERS = @{
+    }
+
+    if (-not([string]::IsNullOrEmpty($UserAgent))) {
+        $HEADERS.add("User-Agent",$UserAgent)
+    }
+
+    if (-not([string]::IsNullOrEmpty($Referer))) {
+        $HEADERS.add("Referer",$Referer)
+    }
+
+
+    if (-not([string]::IsNullOrEmpty($BasicAuthCreds))) {
+        $BASICAUTH = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($BasicAuthCreds))
+        $HEADERS.add("Authorization","Basic $BASICAUTH")
+    }
+
+
+    Write-Output "Performing action $Method on $Url."
+
+    $Response = Invoke-WebRequest -Method Post -Headers $HEADERS -TimeoutSec $Timeout -Uri "$Url" -Form $Body -ContentType "application/x-www-form-urlencoded"
+
+}
+
+Write-Output "------- CONFIG ----------"
+Write-Output "AEM_SCHEMA: $AEM_SCHEMA"
+Write-Output "AEM_HOST: $AEM_HOST"
+Write-Output "AEM_PORT: $AEM_PORT"
+Write-Output "AEM_USER: $AEM_USER"
+Write-Output "CONTENT_SOURCE: $CONTENT_SOURCE"
+Write-Output "ROOT_PATH: $ROOT_PATH"
+Write-Output "FILTER_FILE: $FILTER_FILE"
+Write-Output "Silent: $Silent"
+Write-Output "VLT_FLAGS: $VLT_FLAGS"
+Write-Output "VLT_CMD: $VLT_CMD"
+Write-Output "ROOT_PATHS:"
+$ROOT_PATHS | ForEach-Object {
+    Write-Output " - $_"
+}
+Write-Output "SERVICES_TO_DISABLE:"
+$SERVICES_TO_DISABLE | ForEach-Object {
+    Write-Output " - $_"
+}
+
+if (-not($Silent))
+{
+    $START = Read-Host -Prompt 'Do you want to start import with these settings? (y/n)'
+
+    if ($START -ne "y")
+    {
+        Write-Output "Quiting..."
+        Exit
+    }
+}
+
+Write-Output "------- Revert META-INF ----------"
+git checkout HEAD src/main/content/META-INF/
+git clean -fx src/main/content/META-INF
+Write-Output "------- Revert META-INF ----------"
+
+if ($ROOT_PATHS)
+{
+    Write-Output "------- START Update filter ----------"
+    $ROOT_PATHS_LAST = $ROOT_PATHS | Select-Object -Last 1
+    $ROOT_PATHS | ForEach-Object {
+        $LOG_FILENAME = "$_".Replace("/","-")
+
+        Write-Output "Remove exiting Filer..."
+        Copy-Item ".\src\main\content\META-INF\vault\filter-blank.xml" -Destination "$FILTER_FILE"
+
+        Write-Output "Create filter for: $_"
+        $FILTER_XML = [xml](Get-Content $FILTER_FILE)
+        $FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+        $FILTER_XML_DELETE = $FILTER_XML_CONTENT.SelectNodes('//filter')
+        $FILTER_XML_DELETE | ForEach-Object{
+            $DELETE_STATUS = $FILTER_XML_CONTENT.RemoveChild($_)
+        }
+        $FILTER_XML_CONTENT_NEW = $FILTER_XML.CreateNode("element","filter","")
+        $FILTER_XML_CONTENT_NEW.SetAttribute("root",$_)
+        $FILTER_XML_CONTENT_NEW_ADD = $FILTER_XML_CONTENT.AppendChild($FILTER_XML_CONTENT_NEW)
+        Write-Output "Saving..."
+        $FILTER_XML.OuterXml | IndentXML -Indent 4 | Out-File $FILTER_FILE -encoding "UTF8"
+        Write-Output "Done..."
+    }
+
+    Write-Output "------- END Update filter ----------"
+}
+
+if ($SERVICES_TO_DISABLE)
+{
+    Write-Output "------- Disable Services ----------"
+    $SERVICES_TO_DISABLE | ForEach-Object {
+        Write-Output "Stopping service: $_"
+        doSlingPost -Method Post -Referer $ADDRESS -UserAgent "curl" -Body $BODY_SERVICE_TO_DISABLE -Url "${ADDRESS}$_" -BasicAuthCreds ${AEM_USER}:${AEM_PASSWORD} -Timeout $TIMEOUT
+    }
+}
+
+Write-Output "------- START Importing content ----------"
+Write-Output "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:****** import -v ${ADDRESS}${AEM_WEBDAV_PATH} ${CONTENT_SOURCE} ${ROOT_PATH}"
+
+Invoke-Expression -Command "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:${AEM_PASSWORD} import -v ${ADDRESS}${AEM_WEBDAV_PATH} ${CONTENT_SOURCE} ${ROOT_PATH} " | Tee-Object -FilePath "${LOG_PATH}\filevailt-import.log"
+
+Write-Output "------- END Importing content ----------"
+
+
+if ($SERVICES_TO_DISABLE)
+{
+    Write-Output "------- Enable Services ----------"
+    $SERVICES_TO_DISABLE | ForEach-Object {
+        Write-Output "Stopping service: $_"
+        doSlingPost -Method Post -Referer $ADDRESS -UserAgent "curl" -Body $BODY_SERVICE_TO_DISABLE_ENABLE -Url "${ADDRESS}$_" -BasicAuthCreds ${AEM_USER}:${AEM_PASSWORD} -Timeout $TIMEOUT
+    }
+}
+
+Write-Output "------- Revert META-INF ----------"
+git checkout HEAD src/main/content/META-INF/
+git clean -fx src/main/content/META-INF
+Write-Output "------- Revert META-INF ----------"
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippet/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippet/.content.xml
new file mode 100644
index 000000000..4b2a20fec
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippet/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root 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"
+    jcr:primaryType="cq:Component"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippet/genericsnippet.jsp b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippet/genericsnippet.jsp
new file mode 100644
index 000000000..efb74639a
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippet/genericsnippet.jsp
@@ -0,0 +1,20 @@
+<%@page session="false"
+			import="com.day.cq.wcm.webservicesupport.Configuration,
+              com.day.cq.wcm.webservicesupport.ConfigurationManager" %><%
+%><%@taglib prefix="cq" uri="http://www.day.com/taglibs/cq/1.0" %><%
+%><cq:defineObjects/><%
+
+String[] services = pageProperties.getInherited("cq:cloudserviceconfigs", new String[]{});
+ConfigurationManager cfgMgr = resource.getResourceResolver().adaptTo(ConfigurationManager.class);
+if(cfgMgr != null) {
+    String snippetCode = null;
+    Configuration cfg = cfgMgr.getConfiguration("generic-snippet", services);
+    if(cfg != null) {
+        snippetCode = cfg.get("snippetcode", null);
+    }
+
+    if(snippetCode != null) {
+    %><%= snippetCode %><%
+    }
+}
+%>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/.content.xml
new file mode 100644
index 000000000..5dfca36a8
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/.content.xml
@@ -0,0 +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"
+    cq:defaultView="html"
+    jcr:primaryType="cq:Component"
+    sling:resourceSuperType="cq/cloudserviceconfigs/components/configpage"
+    componentGroup="AEM.Design - Cloud Services"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/_cq_dialog/.content.xml
new file mode 100644
index 000000000..5f09a252a
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/_cq_dialog/.content.xml
@@ -0,0 +1,47 @@
+<?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:primaryType="nt:unstructured"
+    jcr:title="Generic Snippet Settings"
+    sling:resourceType="cq/gui/components/authoring/dialog">
+    <content
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/foundation/container">
+        <layout
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="granite/ui/components/foundation/layouts/tabs"
+            type="nav"/>
+        <items jcr:primaryType="nt:unstructured">
+            <configTab
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Config"
+                sling:resourceType="granite/ui/components/foundation/section">
+                <layout
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"
+                    margin="{Boolean}false"/>
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <variant
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Config"
+                                sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <snippet
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textarea"
+                                        fieldDescription="Enter snippet code to be added at the bottom of the page. This text will be added as-is to the bottom of the page."
+                                        fieldLabel="Snippet Code"
+                                        name="./snippetcode"
+                                        required="false"/>
+                                </items>
+                            </variant>
+                        </items>
+                    </column>
+                </items>
+            </configTab>
+        </items>
+    </content>
+</jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/content.jsp b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/content.jsp
new file mode 100644
index 000000000..7a0c5b058
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/content.jsp
@@ -0,0 +1,27 @@
+<%@page session="false"%>
+<%@page contentType="text/html"
+        pageEncoding="utf-8"
+        import="javax.jcr.Node"
+%><%@include file="/libs/foundation/global.jsp"
+%><%@include file="/libs/wcm/global.jsp"
+%><%@include file="/libs/cq/cloudserviceconfigs/components/configpage/init.jsp"
+%><% I18n i18n = new I18n(request); %>
+<cq:setContentBundle/>
+<%
+  if (currentPage.getParent().getProperties().get("componentReference","") == "") {
+    log.error("Generic Snippet config is missing componentReference, updating to aemdesign/components/cloudservices/genericsnippet.");
+    Node contentnode = currentPage.getParent().getContentResource().adaptTo(Node.class);
+    contentnode.setProperty("componentReference","aemdesign/components/cloudservices/genericsnippet");
+    Session resourceSession = resource.getResourceResolver().adaptTo(Session.class);
+    resourceSession.save();
+  }
+%>
+<div class="content">
+  <h3><fmt:message key="Generic Snippet Settings"/></h3>
+  <ul style="float: left; margin: 0px;">
+    <li><div class="li-bullet"><strong><fmt:message key="Snippet"/>: </strong><%= xssAPI.encodeForHTML(properties.get("snippetcode", "")).replaceAll("\\&\\#xa;","<br>") %></div></li>
+    <li class="config-successful-message when-config-successful" style="display: none">
+      <fmt:message key="Configuration is successful."/><br>
+    </li>
+  </ul>
+</div>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/dialog.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/dialog.xml
new file mode 100644
index 000000000..32988386a
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/cloudservices/genericsnippetpage/dialog.xml
@@ -0,0 +1,20 @@
+<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:Dialog"
+    xtype="dialog">
+    <items jcr:primaryType="cq:WidgetCollection">
+        <general
+            jcr:primaryType="nt:unstructured"
+            title="Generic Snippet Settings"
+            xtype="panel">
+            <items jcr:primaryType="cq:WidgetCollection">
+                <snippet
+                    jcr:primaryType="cq:Widget"
+                    fieldDescription="This text will be added as-is to the bottom of the page."
+                    fieldLabel="Snippet Code"
+                    name="./snippetcode"
+                    xtype="textarea"/>
+            </items>
+        </general>
+    </items>
+</jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/contact-details.footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/contact-details.footer.html
index fb45794e9..d067c03d2 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/contact-details.footer.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/contact-details.footer.html
@@ -1,5 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.showParsys}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/contact-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/contact-details.footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/contact-details.footer.html
index fb45794e9..d067c03d2 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/contact-details.footer.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/contact-details.footer.html
@@ -1,5 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.showParsys}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/contact-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
index 72bdad706..d0de818e0 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
@@ -1,5 +1,7 @@
 <template data-sly-template.field="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.showParsys : true)}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/generic-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
index 320df564c..9fc4f7c8b 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
@@ -1,5 +1,8 @@
 <template data-sly-template.field="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideDescription : true)}">
-        <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
+        <div class="card-text"
+             data-sly-test="${componentProperties.componentBadgeSelected}">${componentProperties.badgeDescription @ context = 'html'}</div>
+        <div class="card-text"
+             data-sly-test="${!componentProperties.componentBadgeSelected}">${componentProperties.description @ context = 'html'}</div>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
index 672466207..7e55f588d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
@@ -1,6 +1,10 @@
 <template data-sly-template.field="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideTitle : true)}">
-        <title class="card-title"
-               data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
+      <title class="card-title"
+             data-sly-test="${componentProperties.componentBadgeSelected}"
+             data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
+      <title class="card-title"
+             data-sly-test="${!componentProperties.componentBadgeSelected}"
+             data-sly-element="${componentProperties.titleType @ context='elementName'}" itemprop="name">${componentProperties.title @ context='html'}</title>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/titleformatted.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/titleformatted.html
index 1da398fb2..4d2c8db1e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/titleformatted.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/titleformatted.html
@@ -1,6 +1,9 @@
 <template data-sly-template.field="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideTitle : true)}">
-        <title class="card-title"
-               data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}">${componentProperties.titleFormatted @ context='html'}</title>
+      <title class="card-title"
+        data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.titleFormatted @ context='html'}</title>
+      <title class="card-title"
+        data-sly-test="${!componentProperties.componentBadgeSelected}"
+        data-sly-element="${componentProperties.titleType @ context='elementName'}" itemprop="name">${componentProperties.titleFormatted @ context='html'}</title>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/news-details.footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/news-details.footer.html
index fb45794e9..d80d4aaa1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/news-details.footer.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/news-details.footer.html
@@ -1,5 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.showParsys}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/news-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/news-details/news-details.footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/news-details/news-details.footer.html
index fb45794e9..d80d4aaa1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/news-details/news-details.footer.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/news-details/news-details.footer.html
@@ -1,5 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.showParsys}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/news-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/page-details.footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/page-details.footer.html
index fb45794e9..72515b8f5 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/page-details.footer.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/page-details.footer.html
@@ -1,5 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.showParsys}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/page-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/page-details/page-details.footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/page-details/page-details.footer.html
index fb45794e9..72515b8f5 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/page-details/page-details.footer.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/page-details/page-details.footer.html
@@ -1,5 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <sly data-sly-test="${componentProperties.showParsys}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/details/page-details */-->
+        <sly data-sly-use.container="../../layout/container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </sly>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/variant.default.html
index 0bc6b2cf0..e4c06ff24 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/variant.default.html
@@ -1,6 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <article style="${componentProperties.attr.data.style @ context = 'unsafe'}"
              data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/article */-->
+        <sly data-sly-use.container="../container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </article>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/variant.default.html
index e70214915..11b654d11 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/variant.default.html
@@ -1,6 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <aside style="${componentProperties.attr.data.style @ context = 'unsafe'}"
            data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+      <!--/* template path is this relative to aemdesign/components/layout/aside */-->
+      <sly data-sly-use.container="../container/par.html"
+           data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </aside>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecol.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecol.html
index 08a5c42c6..c436f1dfd 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecol.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecol.html
@@ -1,6 +1,6 @@
 <template data-sly-template.variant="${@ componentProperties}">
-    <!--/* INSERT EXTRA TAG FOR RESPONSIVE GRID TO CLOSE THE WRAPPER IN COLUMN RESPONSIVE GRID */ -->
+    <!--/* INSERT EXTRA TAG FOR RESPONSIVE GRID TO CLOSE THE WRAPPER IN COLUMN RESPONSIVE GRID */-->
     ${'</div>' @ context = 'unsafe'}
     <!--/* column end */-->
     ${'</div>' @ context = 'unsafe'}
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecols.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecols.html
index 0306a059a..7903fdec2 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecols.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/columns.closecols.html
@@ -1,6 +1,6 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <!--/* columns end */-->
     ${'</div>' @ context = 'unsafe'}
-    <!--/* INSERT EXTRA TAG FOR RESPONSIVE GRID TO CLOSE WRAPPER FOR COLUMNS */ -->
+    <!--/* INSERT EXTRA TAG FOR RESPONSIVE GRID TO CLOSE WRAPPER FOR COLUMNS */-->
     ${'</div>' @ context = 'unsafe'}
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml
index 53c28a559..3f76eff0c 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml
@@ -1,10 +1,9 @@
 <?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:description="Includes PARSYS or GRID as a container"
-          jcr:primaryType="cq:Component"
-          jcr:title="Container"
-          cq:isContainer="{Boolean}true"
-          cq:icon="code"
-          sling:resourceSuperType="wcm/foundation/components/responsivegrid"
-          componentGroup=".hidden"/>
+<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"
+    cq:icon="code"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Includes PARSYS or GRID as a container"
+    jcr:primaryType="cq:Component"
+    jcr:title="Container"
+    sling:resourceSuperType="wcm/foundation/components/responsivegrid"
+    componentGroup=".hidden"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/_cq_htmlTag/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/_cq_htmlTag/.content.xml
index a38c3bebe..12edb08ac 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/_cq_htmlTag/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/_cq_htmlTag/.content.xml
@@ -1,5 +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"
-          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-          jcr:primaryType="nt:unstructured"
-          class="responsivegrid"/>
+<jcr:root 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="nt:unstructured"
+    class="responsivegrid"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/par.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/par.html
new file mode 100644
index 000000000..3832c95d6
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/par.html
@@ -0,0 +1,4 @@
+<template data-sly-template.container="${@ componentProperties}">
+  <!--/* TODO: HTL does not allow for expression syntax in resourceType so tenant will need to override this. */-->
+	<sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container' }"></sly>
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/.content.xml
index e1f152103..00f22a2a8 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/.content.xml
@@ -1,8 +1,8 @@
 <?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"
-          cq:icon="mBox"
-          cq:isContainer="{Boolean}true"
-          jcr:description="Primary block for content"
-          jcr:primaryType="cq:Component"
-          jcr:title="Content Block (v2)"
-          componentGroup="hidden"/>
+    cq:icon="mBox"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Primary block for content"
+    jcr:primaryType="cq:Component"
+    jcr:title="Content Block (v2)"
+    componentGroup="hidden"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_design_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_design_dialog/.content.xml
index 88525d35f..cb6fc4b90 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_design_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_design_dialog/.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: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="nt:unstructured"
-          jcr:title="Content Block (Design)"
-          sling:resourceType="cq/gui/components/authoring/dialog">
+<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="nt:unstructured"
+    jcr:title="Content Block (Design)"
+    sling:resourceType="cq/gui/components/authoring/dialog">
     <content
         jcr:primaryType="nt:unstructured"
         sling:resourceType="granite/ui/components/coral/foundation/container">
@@ -13,7 +11,6 @@
                 jcr:primaryType="nt:unstructured"
                 sling:resourceType="granite/ui/components/coral/foundation/accordion">
                 <items jcr:primaryType="nt:unstructured">
-
                     <basic
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Basic"
@@ -26,25 +23,23 @@
                                 maximized="{Boolean}true">
                                 <items jcr:primaryType="nt:unstructured">
                                     <col1
-                                        jcr:primaryType="nt:unstructured"
                                         granite:class="foundation-layout-util-maximized-alt"
+                                        jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
                                             <basic
+                                                granite:class="js-cq-IPEPlugin-group"
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Basic"
-                                                granite:class="js-cq-IPEPlugin-group"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
                                                 path="/apps/aemdesign/components/layout/contentblock/v2/contentblock/cq:dialog/content/items/basicTab"
-                                                resourceType="granite/ui/components/coral/foundation/container"
-                                                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                                resourceType="granite/ui/components/coral/foundation/container"/>
                                         </items>
                                     </col1>
                                 </items>
                             </fixedcol>
                         </items>
                     </basic>
-
-
                     <layout
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Layout"
@@ -57,25 +52,23 @@
                                 maximized="{Boolean}true">
                                 <items jcr:primaryType="nt:unstructured">
                                     <col1
-                                        jcr:primaryType="nt:unstructured"
                                         granite:class="foundation-layout-util-maximized-alt"
+                                        jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
                                             <layout
+                                                granite:class="js-cq-IPEPlugin-group"
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Layout"
-                                                granite:class="js-cq-IPEPlugin-group"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
                                                 path="/apps/aemdesign/components/layout/contentblock/v2/contentblock/cq:dialog/content/items/layoutTab"
-                                                resourceType="granite/ui/components/coral/foundation/container"
-                                                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                                resourceType="granite/ui/components/coral/foundation/container"/>
                                         </items>
                                     </col1>
                                 </items>
                             </fixedcol>
                         </items>
                     </layout>
-
-
                     <linkLeft
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Left Links"
@@ -88,24 +81,23 @@
                                 maximized="{Boolean}true">
                                 <items jcr:primaryType="nt:unstructured">
                                     <col1
-                                        jcr:primaryType="nt:unstructured"
                                         granite:class="foundation-layout-util-maximized-alt"
+                                        jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
                                             <linkLeftTab
+                                                granite:class="js-cq-IPEPlugin-group"
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Left Links"
-                                                granite:class="js-cq-IPEPlugin-group"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
                                                 path="/apps/aemdesign/components/layout/contentblock/v2/contentblock/cq:dialog/content/items/linkLeftTab"
-                                                resourceType="granite/ui/components/coral/foundation/container"
-                                                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                                resourceType="granite/ui/components/coral/foundation/container"/>
                                         </items>
                                     </col1>
                                 </items>
                             </fixedcol>
                         </items>
                     </linkLeft>
-
                     <linkRight
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Right Links"
@@ -118,25 +110,23 @@
                                 maximized="{Boolean}true">
                                 <items jcr:primaryType="nt:unstructured">
                                     <col1
-                                        jcr:primaryType="nt:unstructured"
                                         granite:class="foundation-layout-util-maximized-alt"
+                                        jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
                                             <linkRightTab
+                                                granite:class="js-cq-IPEPlugin-group"
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Right Links"
-                                                granite:class="js-cq-IPEPlugin-group"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
                                                 path="/apps/aemdesign/components/layout/contentblock/v2/contentblock/cq:dialog/content/items/linkRightTab"
-                                                resourceType="granite/ui/components/coral/foundation/container"
-                                                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                                resourceType="granite/ui/components/coral/foundation/container"/>
                                         </items>
                                     </col1>
                                 </items>
                             </fixedcol>
                         </items>
                     </linkRight>
-
-
                     <imageBackgroundTab
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Background Image"
@@ -149,25 +139,23 @@
                                 maximized="{Boolean}true">
                                 <items jcr:primaryType="nt:unstructured">
                                     <col1
-                                        jcr:primaryType="nt:unstructured"
                                         granite:class="foundation-layout-util-maximized-alt"
+                                        jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
                                             <imageBackgroundTab
+                                                granite:class="js-cq-IPEPlugin-group"
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Background Image"
-                                                granite:class="js-cq-IPEPlugin-group"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
                                                 path="/apps/aemdesign/global/dialog/touch/asset_design/content/items/fixedcol/items/col1/items/imageBackgroundTab"
-                                                resourceType="granite/ui/components/coral/foundation/form/fieldset"
-                                                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                                resourceType="granite/ui/components/coral/foundation/form/fieldset"/>
                                         </items>
                                     </col1>
                                 </items>
                             </fixedcol>
                         </items>
                     </imageBackgroundTab>
-
-
                     <videoBackgroundTab
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Background Video"
@@ -180,42 +168,41 @@
                                 maximized="{Boolean}true">
                                 <items jcr:primaryType="nt:unstructured">
                                     <col1
-                                        jcr:primaryType="nt:unstructured"
                                         granite:class="foundation-layout-util-maximized-alt"
+                                        jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
                                             <videoBackgroundTab
+                                                granite:class="js-cq-IPEPlugin-group"
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Background Video"
-                                                granite:class="js-cq-IPEPlugin-group"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
                                                 path="/apps/aemdesign/global/dialog/touch/asset_design/content/items/fixedcol/items/col1/items/videoBackgroundTab"
-                                                resourceType="granite/ui/components/coral/foundation/form/fieldset"
-                                                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                                resourceType="granite/ui/components/coral/foundation/form/fieldset"/>
                                         </items>
                                     </col1>
                                 </items>
                             </fixedcol>
                         </items>
                     </videoBackgroundTab>
-
                     <style
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Style"
+                        sling:resourceType="granite/ui/components/coral/foundation/include"
                         path="/apps/aemdesign/global/dialog/touch/style_design/content"
-                        resourceType="granite/ui/components/coral/foundation/container"
-                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                        resourceType="granite/ui/components/coral/foundation/container"/>
                     <accessibility
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Accessibility"
+                        sling:resourceType="granite/ui/components/coral/foundation/include"
                         path="/apps/aemdesign/global/dialog/touch/accessibility_design/content"
-                        resourceType="granite/ui/components/coral/foundation/container"
-                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                        resourceType="granite/ui/components/coral/foundation/container"/>
                     <analytics
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Analytics"
+                        sling:resourceType="granite/ui/components/coral/foundation/include"
                         path="/apps/aemdesign/global/dialog/touch/analytics_design/content"
-                        resourceType="granite/ui/components/coral/foundation/container"
-                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                        resourceType="granite/ui/components/coral/foundation/container"/>
                 </items>
             </plugins>
         </items>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_dialog/.content.xml
index a1f5c3d97..df0ada7e8 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_dialog/.content.xml
@@ -1,30 +1,27 @@
 <?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="nt:unstructured"
-          jcr:title="Content Block"
-          helpPath="/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/layout/contentblock/v2/contentblock"
-          sling:resourceType="cq/gui/components/authoring/dialog"
-          extraClientlibs="[aem.design.components.coral.widgets.form.assetoptions]">
+<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="nt:unstructured"
+    jcr:title="Content Block"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[aem.design.components.coral.widgets.form.assetoptions]"
+    helpPath="/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/layout/contentblock/v2/contentblock">
     <content
         granite:id="dialog-contentblock"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="granite/ui/components/foundation/container">
         <layout
             jcr:primaryType="nt:unstructured"
-            type="nav"
-            sling:resourceType="granite/ui/components/foundation/layouts/tabs"/>
+            sling:resourceType="granite/ui/components/foundation/layouts/tabs"
+            type="nav"/>
         <items jcr:primaryType="nt:unstructured">
-
             <basicTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Basic"
                 sling:resourceType="granite/ui/components/foundation/section">
-
-                <layout jcr:primaryType="nt:unstructured"
-                        margin="{Boolean}false"
-                        sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+                <layout
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"
+                    margin="{Boolean}false"/>
                 <items jcr:primaryType="nt:unstructured">
                     <column
                         jcr:primaryType="nt:unstructured"
@@ -35,28 +32,25 @@
                                 jcr:title="Basic"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
-
                                     <title
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
                                         fieldLabel="Title"
                                         name="./title"/>
-
                                     <titleType
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                        emptyOption="{Boolean}true"
                                         fieldDescription="which paragraph tag to use for Title display"
                                         fieldLabel="Title Type"
                                         name="./titleType"
-                                        emptyOption="{Boolean}true"
                                         value="">
                                         <datasource
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                            variant="valuelist"
-                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/html/heading"/>
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/html/heading"
+                                            variant="valuelist"/>
                                     </titleType>
-
                                 </items>
                             </basic>
                             <advanced
@@ -71,47 +65,46 @@
                                         groups="[content-authors-advanced]"/>
                                 </granite:rendercondition>
                                 <items jcr:primaryType="nt:unstructured">
-
                                     <hideTitle
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                        emptyOption="{Boolean}true"
                                         fieldLabel="Hide Title"
                                         name="./hideTitle"
-                                        emptyOption="{Boolean}true"
                                         value="">
                                         <datasource
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                            variant="valuelist"
-                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"
+                                            variant="valuelist"/>
                                     </hideTitle>
                                     <hideTopLink
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                        emptyOption="{Boolean}true"
                                         fieldDescription="will hide link Back to Top at the bottom of section"
                                         fieldLabel="Hide Back to Top link"
                                         name="./hideTopLink"
-                                        emptyOption="{Boolean}true"
                                         value="">
                                         <datasource
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                            variant="valuelist"
-                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"
+                                            variant="valuelist"/>
                                     </hideTopLink>
                                     <hideInContentMenu
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                        emptyOption="{Boolean}true"
                                         fieldDescription="will hide this section from Content Block List"
                                         fieldLabel="Hide Title in content block menu"
                                         name="./hideInMenu"
-                                        emptyOption="{Boolean}true"
                                         value="">
                                         <datasource
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                            variant="valuelist"
-                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"
+                                            variant="valuelist"/>
                                     </hideInContentMenu>
                                 </items>
                             </advanced>
@@ -119,8 +112,6 @@
                     </column>
                 </items>
             </basicTab>
-
-
             <layoutTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Layout"
@@ -133,9 +124,10 @@
                         sling:resourceType="aemdesign/components/coral/renderconditions/iscurrentuseringroup"
                         groups="[content-authors-advanced]"/>
                 </granite:rendercondition>
-                <layout jcr:primaryType="nt:unstructured"
-                        margin="{Boolean}false"
-                        sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+                <layout
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"
+                    margin="{Boolean}false"/>
                 <items jcr:primaryType="nt:unstructured">
                     <column
                         jcr:primaryType="nt:unstructured"
@@ -149,55 +141,50 @@
                                     <variant
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/foundation/form/select"
-                                        fieldLabel="Variant"
-                                        name="./variant"
-                                        emptyOption="{Boolean}true"
                                         class="cq-dialog-dropdown-showhide"
                                         cq-dialog-dropdown-showhide-target=".variant-config-showhide-target"
+                                        emptyOption="{Boolean}true"
+                                        fieldLabel="Variant"
+                                        name="./variant"
                                         value="">
                                         <datasource
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                            variant="valuelist"
-                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/layout/contentblock/variant"/>
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/layout/contentblock/variant"
+                                            variant="valuelist"/>
                                     </variant>
-
                                     <variantConfig
                                         jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/foundation/container"
                                         class="hide variant-config-showhide-target foundation-layout-util-vmargin"
-                                        showhidetargetvalue="childsection"
-                                        sling:resourceType="granite/ui/components/foundation/container">
+                                        showhidetargetvalue="childsection">
                                         <items jcr:primaryType="nt:unstructured">
                                             <childsection
                                                 jcr:primaryType="nt:unstructured"
                                                 jcr:title="Parent Section"
                                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                                 <items jcr:primaryType="nt:unstructured">
-
                                                     <dataParent
                                                         jcr:primaryType="nt:unstructured"
                                                         sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
                                                         fieldLabel="Parent ID"
                                                         name="./dataParent"/>
-
                                                     <dataToggle
                                                         jcr:primaryType="nt:unstructured"
                                                         sling:resourceType="granite/ui/components/foundation/form/select"
                                                         emptyOption="{Boolean}true"
-                                                        fieldLabel="Data Toggle"
                                                         fieldDescription="data-toggle attribute"
+                                                        fieldLabel="Data Toggle"
                                                         name="./dataToggle"
                                                         value="">
                                                         <datasource
                                                             jcr:primaryType="nt:unstructured"
                                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                            variant="valuelist"
-                                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/html/toggle"/>
+                                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/html/toggle"
+                                                            variant="valuelist"/>
                                                     </dataToggle>
-
                                                 </items>
                                             </childsection>
-
                                         </items>
                                     </variantConfig>
                                 </items>
@@ -206,7 +193,6 @@
                     </column>
                 </items>
             </layoutTab>
-
             <linkLeftTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Left Links"
@@ -219,9 +205,10 @@
                         sling:resourceType="aemdesign/components/coral/renderconditions/iscurrentuseringroup"
                         groups="[content-authors-advanced]"/>
                 </granite:rendercondition>
-                <layout jcr:primaryType="nt:unstructured"
-                        margin="{Boolean}false"
-                        sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+                <layout
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"
+                    margin="{Boolean}false"/>
                 <items jcr:primaryType="nt:unstructured">
                     <column
                         jcr:primaryType="nt:unstructured"
@@ -247,8 +234,8 @@
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
                                             name="./linkPagesLeft"
-                                            rootPath="/content"
-                                            required="{Boolean}false"/>
+                                            required="{Boolean}false"
+                                            rootPath="/content"/>
                                     </linksLeft>
                                 </items>
                             </variant>
@@ -256,7 +243,6 @@
                     </column>
                 </items>
             </linkLeftTab>
-
             <linkRightTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Right Links"
@@ -269,9 +255,10 @@
                         sling:resourceType="aemdesign/components/coral/renderconditions/iscurrentuseringroup"
                         groups="[content-authors-advanced]"/>
                 </granite:rendercondition>
-                <layout jcr:primaryType="nt:unstructured"
-                        margin="{Boolean}false"
-                        sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+                <layout
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"
+                    margin="{Boolean}false"/>
                 <items jcr:primaryType="nt:unstructured">
                     <column
                         jcr:primaryType="nt:unstructured"
@@ -297,8 +284,8 @@
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
                                             name="./linkPagesRight"
-                                            rootPath="/content"
-                                            required="{Boolean}false"/>
+                                            required="{Boolean}false"
+                                            rootPath="/content"/>
                                     </linksRight>
                                 </items>
                             </variant>
@@ -306,40 +293,36 @@
                     </column>
                 </items>
             </linkRightTab>
-
-
             <imageBackgroundTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Background Image"
+                sling:resourceType="granite/ui/components/coral/foundation/include"
                 path="/apps/aemdesign/global/dialog/touch/asset/content/items/imageBackgroundTab"
-                resourceType="granite/ui/components/foundation/section"
-                sling:resourceType="granite/ui/components/coral/foundation/include"/>
-
+                resourceType="granite/ui/components/foundation/section"/>
             <videoBackgroundTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Background Video"
+                sling:resourceType="granite/ui/components/coral/foundation/include"
                 path="/apps/aemdesign/global/dialog/touch/asset/content/items/videoBackgroundTab"
-                resourceType="granite/ui/components/foundation/section"
-                sling:resourceType="granite/ui/components/coral/foundation/include"/>
-
+                resourceType="granite/ui/components/foundation/section"/>
             <styleTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Style"
+                sling:resourceType="granite/ui/components/coral/foundation/include"
                 path="/apps/aemdesign/global/dialog/touch/style/content/items/styleTab"
-                resourceType="granite/ui/components/foundation/section"
-                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                resourceType="granite/ui/components/foundation/section"/>
             <accessibilityTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Accessibility"
+                sling:resourceType="granite/ui/components/coral/foundation/include"
                 path="/apps/aemdesign/global/dialog/touch/accessibility/content/items/accessibilityTab"
-                resourceType="granite/ui/components/foundation/section"
-                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                resourceType="granite/ui/components/foundation/section"/>
             <analyticsTab
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Analytics"
+                sling:resourceType="granite/ui/components/coral/foundation/include"
                 path="/apps/aemdesign/global/dialog/touch/analytics/content/items/analyticsTab"
-                resourceType="granite/ui/components/foundation/section"
-                sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                resourceType="granite/ui/components/foundation/section"/>
         </items>
     </content>
 </jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_editConfig.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_editConfig.xml
index 8a2816fa4..ffc74a479 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_editConfig.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/_cq_editConfig.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"
-    jcr:primaryType="cq:EditConfig"
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     cq:actions="[text:Content Block,edit,-,copymove,-,delete,insert]"
+    cq:dialogMode="floating"
     cq:layout="editbar"
-    cq:dialogMode="floating">
-</jcr:root>
+    jcr:primaryType="cq:EditConfig"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.advsection.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.advsection.html
index ecbca691c..5fee2a226 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.advsection.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.advsection.html
@@ -42,7 +42,9 @@
                        data-sly-element="${componentProperties.titleType}">${componentProperties.title}</title>
             </div>
             <div class="contents">
-                <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+              <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+              <sly data-sly-use.container="../container/par.html"
+                   data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
             </div>
         </div>
         <a data-sly-test="${!componentProperties.hideTopLink}"
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html
index fed1b5bcc..b116c3f13 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html
@@ -12,7 +12,9 @@
              aria-labelledby="${componentProperties.componentId}-heading"
              data-parent="#${componentProperties.dataParent}">
             <div class="body">
-                <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+                <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+                <sly data-sly-use.container="../container/par.html"
+                     data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
             </div>
         </div>
     </div>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.componentConfig.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.componentConfig.html
index ada3b050e..57af00b87 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.componentConfig.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.componentConfig.html
@@ -42,7 +42,9 @@
                        data-sly-element="${componentProperties.titleType}">${componentProperties.title}</title>
             </div>
             <div class="contents">
-                <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+                <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+                <sly data-sly-use.container="../container/par.html"
+                     data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
                 <div data-sly-test="${componentProperties.firstComponentConfig}" class="firstComponentConfig">
                     <table>
                         <thead>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.container.html
index 58947a39c..435d34941 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.container.html
@@ -2,7 +2,9 @@
     <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <div class="container">
-            <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+            <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+            <sly data-sly-use.container="../container/par.html"
+                 data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.containerVideo.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.containerVideo.html
index b4cefbdf6..2266ba62a 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.containerVideo.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.containerVideo.html
@@ -4,6 +4,8 @@
         <!--/* print component background video */-->
         <sly data-sly-use.video="aemdesign/global/templates/component-video.html"
              data-sly-call="${video.variant @ componentId=componentProperties.componentId, assets=componentProperties.bgvideo.renditionsVideo, videoBooleanAttrs=componentProperties.videoBooleanAttrs}"></sly>
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+        <sly data-sly-use.container="../container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.default.html
index 08d2be5ce..ce2708605 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.default.html
@@ -1,6 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <section style="${componentProperties.attr.data.style @ context = 'unsafe'}"
              data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+        <sly data-sly-use.container="../container/par.html"
+        	data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </section>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.descriptionlist.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.descriptionlist.html
index f45dd4e0b..9ac4443fb 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.descriptionlist.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.descriptionlist.html
@@ -2,7 +2,9 @@
     <section style="${componentProperties.attr.data.style @ context = 'unsafe'}"
              data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <dl role="row">
-            <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+            <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+            <sly data-sly-use.container="../container/par.html"
+                 data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
         </dl>
     </section>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.fieldset.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.fieldset.html
index 6c04b442d..af16e5cbc 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.fieldset.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.fieldset.html
@@ -3,7 +3,9 @@
              data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <fieldset>
             <legend class="legend">${componentProperties.title}</legend>
-            <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+            <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+            <sly data-sly-use.container="../container/par.html"
+                 data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
         </fieldset>
     </section>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.floating.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.floating.html
index 3c6eee2da..83cca5345 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.floating.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.floating.html
@@ -2,7 +2,9 @@
     <section style="${componentProperties.attr.data.style @ context = 'unsafe'}"
              data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <div class="container">
-            <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
+            <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+            <sly data-sly-use.container="../container/par.html"
+                 data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
         </div>
     </section>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.parsys.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.parsys.html
index 4a480d09e..6635a23b1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.parsys.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.parsys.html
@@ -1,7 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-test="${wcmmode.edit}" data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/parsys'}"></sly>
-        <sly data-sly-test="${!wcmmode.edit}" data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/parsys'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/contentblock */-->
+        <sly data-sly-use.container="../container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/locked.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/locked.html
index 47a394fc3..5b16528ce 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/locked.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/locked.html
@@ -1 +1,3 @@
-<sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container'}"></sly>
\ No newline at end of file
+<!--/* template path is this relative to aemdesign/components/layout/contentblocklock */-->
+<sly data-sly-use.container="../container/par.html"
+     data-sly-call="${container.container}"></sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/variant.default.html
index ac47f0303..5ae14702d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/variant.default.html
@@ -1,6 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <footer style="${componentProperties.attr.data.style @ context = 'unsafe'}"
             data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/footer */-->
+        <sly data-sly-use.container="../container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </footer>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/variant.default.html
index f1acf7ac8..7dc2ebad7 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/variant.default.html
@@ -1,6 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <header style="${componentProperties.attr.data.style @ context = 'unsafe'}"
             data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/header */-->
+        <sly data-sly-use.container="../container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </header>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/variant.default.html
index 99e9f28ab..3837a7a73 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/variant.default.html
@@ -1,6 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties}">
     <nav style="${componentProperties.attr.data.style @ context = 'unsafe'}"
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
+        <!--/* template path is this relative to aemdesign/components/layout/navbar */-->
+        <sly data-sly-use.container="../container/par.html"
+             data-sly-call="${container.container @ componentProperties=componentProperties}"></sly>
     </nav>
-</template>
\ No newline at end of file
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/tab_config.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/tab_config.xml
index acaf9b3d6..7b149f478 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/tab_config.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/tab_config.xml
@@ -45,19 +45,30 @@
             fieldLabel="Token"
             name="./token"
             xtype="password"/>
+        <tokenencrypted
+            jcr:primaryType="cq:Widget"
+            name="./token@Encrypted"
+            xtype="hidden"/>
         <accesstoken
             jcr:primaryType="cq:Widget"
             fieldDescription="Client access token to be used while doing the post method"
             fieldLabel="Access Token"
             name="./accesstoken"
             xtype="password"/>
+        <accesstokenencrypted
+            jcr:primaryType="cq:Widget"
+            name="./accesstoken@Encrypted"
+            xtype="hidden"/>
         <secret
             jcr:primaryType="cq:Widget"
             fieldDescription="Client access token to be used while doing the post method"
             fieldLabel="Secret"
             name="./secret"
             xtype="password"/>
-
+        <secretencrypted
+            jcr:primaryType="cq:Widget"
+            name="./secret@Encrypted"
+            xtype="hidden"/>
         <protocol
             jcr:primaryType="cq:Widget"
             fieldDescription="Protocol to use for posts."
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/templates/cloudconfig/genericsnippet/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/templates/cloudconfig/genericsnippet/.content.xml
new file mode 100644
index 000000000..d304f7cb3
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/templates/cloudconfig/genericsnippet/.content.xml
@@ -0,0 +1,14 @@
+<?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"
+    jcr:description="Generic Snippet configuration"
+    jcr:primaryType="cq:Template"
+    jcr:title="Generic Snippet Configuration"
+    sling:resourceSuperType="cq/cloudserviceconfigs/templates/configpage"
+    allowedChildren="[/apps/aemdesign/templates/cloudconfig/genericsnippet]"
+    allowedPaths="[/etc/cloudservices/generic-snippet(/.*)?]"
+    ranking="{Long}90">
+    <jcr:content
+        cq:cloudservicename="genericsnippet"
+        jcr:primaryType="cq:PageContent"
+        sling:resourceType="aemdesign/components/cloudservices/genericsnippetpage"/>
+</jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/templates/cloudconfig/genericsnippet/thumbnail.png b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/templates/cloudconfig/genericsnippet/thumbnail.png
new file mode 100644
index 000000000..3be585fda
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/templates/cloudconfig/genericsnippet/thumbnail.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d398bc73c1bf1d4249dbc8168a3be1e4dc8f39586960744da248a6699576b64
+size 4519
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
index e2b1fd4bf..f042e344a 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
@@ -698,7 +698,7 @@ protected void populateStaticListItems() {
      * populate list items from only children of a root page.
      */
     protected void populateChildListItems() {
-        String path = componentProperties.get(PN_PARENT_PAGE, PN_PARENT_PAGE_DEFAULT);
+        String path = componentProperties.get(PN_PARENT_PAGE, getCurrentPage().getPath());
 
         populateChildListItems(path, true);
     }
@@ -707,7 +707,7 @@ protected void populateChildListItems() {
      * populate list items from descendants of a root page.
      */
     protected void populateDescendantsListItems() {
-        String path = componentProperties.get(ANCESTOR_PAGE_PROPERTY_NAME, PN_PARENT_PAGE_DEFAULT);
+        String path = componentProperties.get(ANCESTOR_PAGE_PROPERTY_NAME, getCurrentPage().getPath());
 
         populateChildListItems(path, false);
     }
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
index 0ec95b879..bb9c70230 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
@@ -53,10 +53,16 @@ public class CommonUtil {
     public static final String COMPONENT_DETAILS_SUFFIX = "-details";
     public static final String PATH_DEFAULT_CONTENT = "article/par";
     public static final String PATH_DEFAULT_CONTENT_BASIC = "root/responsivegrid";
+    public static final String PATH_DEFAULT_CONTENT_ROOT_ARTICLE = "root/article/par";
     public static final String DEFAULT_PAR_NAME = "par";
 
     public static final String[] DEFAULT_LIST_DETAILS_SUFFIX = new String[]{COMPONENT_DETAILS_SUFFIX}; //NOSONAR used by models
-    public static final String[] DEFAULT_LIST_PAGE_CONTENT = new String[]{DEFAULT_PAR_NAME, PATH_DEFAULT_CONTENT, PATH_DEFAULT_CONTENT_BASIC}; //NOSONAR used by models
+    public static final String[] DEFAULT_LIST_PAGE_CONTENT = new String[]{
+        DEFAULT_PAR_NAME,
+        PATH_DEFAULT_CONTENT,
+        PATH_DEFAULT_CONTENT_BASIC,
+        PATH_DEFAULT_CONTENT_ROOT_ARTICLE
+    }; //NOSONAR used by models
 
 
     public static final String DAM_LICENSE_FORMAT = "{4} {0} {1} {2} {3}";