diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
index d8d8882..be10a7e 100644
--- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
@@ -26,9 +26,9 @@
 
             {# ... add short description #}
             {% block zen_page_product_detail_short_description %}
-                {% if page.product.translated.metaDescription and theme_config('zen-product-details-short-description') %}
+                {% if page.product.customFields.custom_description_small_description and theme_config('zen-product-details-short-description') %}
                     <div class="product-detail-short-description">
-                        {{ page.product.translated.metaDescription|raw }}
+                        {{ page.product.customFields.custom_description_small_description|trans|sw_sanitize }}
                     </div>
                 {% endif %}
             {% endblock %}
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig
new file mode 100644
index 0000000..30b5db4
--- /dev/null
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig
@@ -0,0 +1,9 @@
+{% sw_extends '@Storefront/storefront/layout/meta.html.twig' %}
+
+{% block layout_head_title %}
+    <title itemprop="name">{% apply spaceless %}
+        {% block layout_head_title_inner %}
+            {{ metaTitle }} | diaeko.de
+        {% endblock %}
+    {% endapply %}</title>
+{% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/account/order-history/order-item.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/account/order-history/order-item.html.twig
new file mode 100644
index 0000000..51a13f0
--- /dev/null
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/account/order-history/order-item.html.twig
@@ -0,0 +1,16 @@
+{% sw_extends '@Storefront/storefront/page/account/order-history/order-item.html.twig' %}
+
+{% block page_account_order_item_context_menu_content_change_payment_button %}
+{% endblock %}
+
+{% block page_account_order_item_order_table_header_cell_shipping_status %}
+{% endblock %}
+
+{% block page_account_order_item_order_table_header_cell_payment_status %}
+{% endblock %}
+
+{% block page_account_order_item_order_table_body_cell_shipping_status %}
+{% endblock %}
+
+{% block page_account_order_item_order_table_body_cell_payment_status %}
+{% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/.DS_Store b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/.DS_Store
index 4496245..ff9aa33 100644
Binary files a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/.DS_Store and b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/.DS_Store differ
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-favicon.png b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-favicon.png
new file mode 100644
index 0000000..53572b6
Binary files /dev/null and b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-favicon.png differ
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-logo-light.svg b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-logo-light.svg
new file mode 100644
index 0000000..4af444b
--- /dev/null
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-logo-light.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="205.523px" height="91px" viewBox="0 0 205.523 91" enable-background="new 0 0 205.523 91" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M11.466,62.599c-1.753-0.841-3.144-2.068-4.173-3.681c-1.026-1.612-1.541-3.472-1.541-5.573
+		c0-3.461,1.367-6.218,4.102-8.277c2.736-2.056,6.743-3.084,12.025-3.084h8.486v-0.562c0-3.084-0.762-5.305-2.28-6.661
+		c-1.521-1.355-3.892-2.032-7.118-2.032c-1.776,0-3.354,0.138-4.732,0.42c-1.379,0.281-2.909,0.701-4.591,1.262
+		c-0.376,0.093-0.68,0.14-0.913,0.14c-0.701,0-1.309-0.257-1.822-0.771c-0.516-0.513-0.77-1.145-0.77-1.892
+		c0-1.264,0.604-2.15,1.82-2.665c3.974-1.684,8.019-2.525,12.131-2.525c3.227,0,5.949,0.656,8.17,1.963
+		c2.221,1.309,3.856,3.005,4.908,5.084c1.052,2.081,1.578,4.337,1.578,6.767v19.844c0,0.888-0.315,1.637-0.947,2.244
+		c-0.631,0.606-1.391,0.912-2.279,0.912c-0.89,0-1.638-0.305-2.243-0.912c-0.607-0.606-0.911-1.355-0.911-2.244v-1.824
+		c-3.461,3.554-7.855,5.33-13.184,5.33C15.124,63.86,13.219,63.44,11.466,62.599z M25.526,56.744
+		c1.916-1.005,3.529-2.254,4.838-3.751v-5.891h-7.645c-7.06,0-10.588,1.848-10.588,5.539c0,1.685,0.572,3.041,1.718,4.067
+		c1.146,1.028,3.051,1.543,5.716,1.543C21.621,58.252,23.609,57.75,25.526,56.744z"/>
+	<path fill="#FFFFFF" d="M48.734,54.606v-21.74h-4.979c-0.374,0-0.688-0.126-0.944-0.384c-0.26-0.257-0.388-0.573-0.388-0.946
+		c0-0.467,0.211-0.865,0.632-1.193l9.535-9.326c0.42-0.421,0.817-0.631,1.192-0.631c0.374,0,0.689,0.14,0.947,0.42
+		c0.257,0.282,0.385,0.609,0.385,0.982v5.61h7.924c0.794,0,1.447,0.257,1.963,0.77c0.517,0.514,0.771,1.169,0.771,1.964
+		c0,0.748-0.256,1.392-0.771,1.928c-0.516,0.538-1.169,0.805-1.963,0.805h-7.924v21.178c0,1.822,0.433,2.979,1.298,3.472
+		c0.865,0.49,1.95,0.736,3.261,0.736c0.935,0,1.87-0.141,2.806-0.421c0.185-0.046,0.384-0.093,0.594-0.142
+		c0.211-0.043,0.479-0.068,0.809-0.068c0.653,0,1.237,0.246,1.751,0.734c0.516,0.492,0.771,1.088,0.771,1.789
+		c0,1.076-0.538,1.894-1.612,2.455c-1.824,0.84-3.763,1.262-5.818,1.262C52.148,63.86,48.734,60.774,48.734,54.606z"/>
+	<path fill="#FFFFFF" d="M74.328,62.599c-0.606-0.605-0.912-1.354-0.912-2.244V30.274c0-0.888,0.306-1.648,0.912-2.28
+		c0.607-0.631,1.355-0.946,2.245-0.946c0.887,0,1.646,0.315,2.278,0.946c0.63,0.631,0.946,1.392,0.946,2.28v2.875
+		c1.308-1.87,2.887-3.411,4.733-4.627c1.846-1.216,4.242-1.824,7.188-1.824c2.619,0,4.861,0.702,6.73,2.103
+		c1.87,1.403,3.203,3.109,3.998,5.12c2.898-4.814,7.198-7.223,12.902-7.223c2.617,0,4.804,0.656,6.557,1.963
+		c1.753,1.309,3.05,2.994,3.891,5.05c0.844,2.057,1.264,4.206,1.264,6.45v20.195c0,0.888-0.315,1.637-0.946,2.244
+		c-0.63,0.606-1.392,0.912-2.277,0.912c-0.89,0-1.638-0.305-2.245-0.912c-0.607-0.606-0.91-1.355-0.91-2.244V41.422
+		c0-3.038-0.538-5.27-1.614-6.696c-1.074-1.426-2.922-2.138-5.538-2.138c-2.385,0-4.36,0.62-5.927,1.859
+		c-1.565,1.237-2.957,2.862-4.171,4.872v21.036c0,0.889-0.315,1.638-0.946,2.244c-0.631,0.607-1.393,0.912-2.278,0.912
+		c-0.888,0-1.638-0.304-2.244-0.912c-0.608-0.605-0.913-1.354-0.913-2.244V41.422c0-3.038-0.538-5.27-1.611-6.696
+		c-1.076-1.426-2.921-2.138-5.54-2.138c-2.384,0-4.359,0.62-5.925,1.859c-1.566,1.237-2.957,2.862-4.172,4.872v21.036
+		c0,0.889-0.316,1.638-0.946,2.244c-0.631,0.607-1.392,0.912-2.278,0.912C75.684,63.511,74.936,63.207,74.328,62.599z"/>
+	<path fill="#FFFFFF" d="M144.094,61.547c-2.707-1.542-4.803-3.728-6.272-6.557c-1.473-2.826-2.206-6.065-2.206-9.712
+		c0-3.645,0.733-6.881,2.206-9.711c1.471-2.827,3.565-5.014,6.272-6.557c2.712-1.542,5.866-2.313,9.473-2.313
+		c3.55,0,6.681,0.771,9.396,2.313c2.709,1.543,4.813,3.729,6.31,6.557c1.496,2.83,2.246,6.066,2.246,9.711
+		c0,3.647-0.75,6.886-2.246,9.712c-1.496,2.829-3.601,5.015-6.31,6.557c-2.715,1.543-5.846,2.313-9.396,2.313
+		C149.961,63.86,146.806,63.09,144.094,61.547z M159.067,56.709c1.752-0.888,3.2-2.291,4.351-4.206
+		c1.144-1.917,1.714-4.35,1.714-7.293c0-2.898-0.57-5.306-1.714-7.223c-1.149-1.917-2.599-3.307-4.351-4.172
+		c-1.754-0.864-3.588-1.297-5.5-1.297c-1.968,0-3.826,0.434-5.576,1.297c-1.756,0.866-3.189,2.256-4.315,4.172
+		c-1.119,1.917-1.682,4.324-1.682,7.223c0,2.943,0.563,5.376,1.682,7.293c1.126,1.916,2.561,3.318,4.315,4.206
+		c1.75,0.888,3.608,1.332,5.576,1.332C155.479,58.041,157.313,57.599,159.067,56.709z"/>
+	<path fill="#FFFFFF" d="M179.224,60.706c-0.79-0.563-1.192-1.333-1.192-2.314c0-0.746,0.258-1.402,0.772-1.963
+		c0.514-0.562,1.17-0.842,1.968-0.842c0.42,0,0.84,0.096,1.26,0.281c1.493,0.654,2.991,1.169,4.486,1.544
+		c1.496,0.374,3.181,0.562,5.054,0.562c5.188,0,7.779-1.66,7.779-4.979c0-1.075-0.598-1.894-1.789-2.454
+		c-1.188-0.563-3.142-1.191-5.854-1.893c-2.76-0.655-5.038-1.334-6.84-2.035c-1.799-0.701-3.342-1.764-4.626-3.19
+		c-1.287-1.426-1.928-3.306-1.928-5.645c0-3.272,1.18-5.936,3.543-7.993c2.354-2.059,5.735-3.086,10.134-3.086
+		c3.598,0,6.984,0.585,10.162,1.753c0.658,0.188,1.16,0.539,1.513,1.052c0.346,0.516,0.524,1.051,0.524,1.612
+		c0,0.749-0.271,1.402-0.809,1.963c-0.539,0.562-1.205,0.842-1.994,0.842c-0.236,0-0.539-0.046-0.914-0.141
+		c-2.711-0.841-5.377-1.262-7.993-1.262c-2.526,0-4.502,0.456-5.932,1.368c-1.421,0.91-2.137,2.092-2.137,3.54
+		c0,1.404,0.656,2.431,1.963,3.086c1.311,0.656,3.346,1.286,6.104,1.893c2.758,0.702,5.002,1.392,6.729,2.068
+		c1.734,0.678,3.215,1.741,4.457,3.19c1.237,1.45,1.858,3.39,1.858,5.819c0,2.994-1.184,5.471-3.54,7.435
+		c-2.363,1.963-5.695,2.944-9.993,2.944C187.316,63.86,183.06,62.81,179.224,60.706z"/>
+</g>
+<rect x="73.738" y="87" fill="#D9AB98" width="53" height="4"/>
+</svg>
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-logo.svg b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-logo.svg
new file mode 100644
index 0000000..ca08ce3
--- /dev/null
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/assets/logo/demo-atmos-set-1-logo.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="205.523px" height="91px" viewBox="0 0 205.523 91" enable-background="new 0 0 205.523 91" xml:space="preserve">
+<g>
+	<path fill="#333333" d="M11.466,62.599c-1.753-0.841-3.144-2.068-4.173-3.681c-1.026-1.612-1.541-3.472-1.541-5.573
+		c0-3.461,1.367-6.218,4.102-8.277c2.736-2.056,6.743-3.084,12.025-3.084h8.486v-0.562c0-3.084-0.762-5.305-2.28-6.661
+		c-1.521-1.355-3.892-2.032-7.118-2.032c-1.776,0-3.354,0.138-4.732,0.42c-1.379,0.281-2.909,0.701-4.591,1.262
+		c-0.376,0.093-0.68,0.14-0.913,0.14c-0.701,0-1.309-0.257-1.822-0.771c-0.516-0.513-0.77-1.145-0.77-1.892
+		c0-1.264,0.604-2.15,1.82-2.665c3.974-1.684,8.019-2.525,12.131-2.525c3.227,0,5.949,0.656,8.17,1.963
+		c2.221,1.309,3.856,3.005,4.908,5.084c1.052,2.081,1.578,4.337,1.578,6.767v19.844c0,0.888-0.315,1.637-0.947,2.244
+		c-0.631,0.606-1.391,0.912-2.279,0.912c-0.89,0-1.638-0.305-2.243-0.912c-0.607-0.606-0.911-1.355-0.911-2.244v-1.824
+		c-3.461,3.554-7.855,5.33-13.184,5.33C15.124,63.86,13.219,63.44,11.466,62.599z M25.526,56.744
+		c1.916-1.005,3.529-2.254,4.838-3.751v-5.891h-7.645c-7.06,0-10.588,1.848-10.588,5.539c0,1.685,0.572,3.041,1.718,4.067
+		c1.146,1.028,3.051,1.543,5.716,1.543C21.621,58.252,23.609,57.75,25.526,56.744z"/>
+	<path fill="#333333" d="M48.734,54.606v-21.74h-4.979c-0.374,0-0.688-0.126-0.944-0.384c-0.26-0.257-0.388-0.573-0.388-0.946
+		c0-0.467,0.211-0.865,0.632-1.193l9.535-9.326c0.42-0.421,0.817-0.631,1.192-0.631c0.374,0,0.689,0.14,0.947,0.42
+		c0.257,0.282,0.385,0.609,0.385,0.982v5.61h7.924c0.794,0,1.447,0.257,1.963,0.77c0.517,0.514,0.771,1.169,0.771,1.964
+		c0,0.748-0.256,1.392-0.771,1.928c-0.516,0.538-1.169,0.805-1.963,0.805h-7.924v21.178c0,1.822,0.433,2.979,1.298,3.472
+		c0.865,0.49,1.95,0.736,3.261,0.736c0.935,0,1.87-0.141,2.806-0.421c0.185-0.046,0.384-0.093,0.594-0.142
+		c0.211-0.043,0.479-0.068,0.809-0.068c0.653,0,1.237,0.246,1.751,0.734c0.516,0.492,0.771,1.088,0.771,1.789
+		c0,1.076-0.538,1.894-1.612,2.455c-1.824,0.84-3.763,1.262-5.818,1.262C52.148,63.86,48.734,60.774,48.734,54.606z"/>
+	<path fill="#333333" d="M74.328,62.599c-0.606-0.605-0.912-1.354-0.912-2.244V30.274c0-0.888,0.306-1.648,0.912-2.28
+		c0.607-0.631,1.355-0.946,2.245-0.946c0.887,0,1.646,0.315,2.278,0.946c0.63,0.631,0.946,1.392,0.946,2.28v2.875
+		c1.308-1.87,2.887-3.411,4.733-4.627c1.846-1.216,4.242-1.824,7.188-1.824c2.619,0,4.861,0.702,6.73,2.103
+		c1.87,1.403,3.203,3.109,3.998,5.12c2.898-4.814,7.198-7.223,12.902-7.223c2.617,0,4.804,0.656,6.557,1.963
+		c1.753,1.309,3.05,2.994,3.891,5.05c0.844,2.057,1.264,4.206,1.264,6.45v20.195c0,0.888-0.315,1.637-0.946,2.244
+		c-0.63,0.606-1.392,0.912-2.277,0.912c-0.89,0-1.638-0.305-2.245-0.912c-0.607-0.606-0.91-1.355-0.91-2.244V41.422
+		c0-3.038-0.538-5.27-1.614-6.696c-1.074-1.426-2.922-2.138-5.538-2.138c-2.385,0-4.36,0.62-5.927,1.859
+		c-1.565,1.237-2.957,2.862-4.171,4.872v21.036c0,0.889-0.315,1.638-0.946,2.244c-0.631,0.607-1.393,0.912-2.278,0.912
+		c-0.888,0-1.638-0.304-2.244-0.912c-0.608-0.605-0.913-1.354-0.913-2.244V41.422c0-3.038-0.538-5.27-1.611-6.696
+		c-1.076-1.426-2.921-2.138-5.54-2.138c-2.384,0-4.359,0.62-5.925,1.859c-1.566,1.237-2.957,2.862-4.172,4.872v21.036
+		c0,0.889-0.316,1.638-0.946,2.244c-0.631,0.607-1.392,0.912-2.278,0.912C75.684,63.511,74.936,63.207,74.328,62.599z"/>
+	<path fill="#333333" d="M144.094,61.547c-2.707-1.542-4.803-3.728-6.272-6.557c-1.473-2.826-2.206-6.065-2.206-9.712
+		c0-3.645,0.733-6.881,2.206-9.711c1.471-2.827,3.565-5.014,6.272-6.557c2.712-1.542,5.866-2.313,9.473-2.313
+		c3.55,0,6.681,0.771,9.396,2.313c2.709,1.543,4.813,3.729,6.31,6.557c1.496,2.83,2.246,6.066,2.246,9.711
+		c0,3.647-0.75,6.886-2.246,9.712c-1.496,2.829-3.601,5.015-6.31,6.557c-2.715,1.543-5.846,2.313-9.396,2.313
+		C149.961,63.86,146.806,63.09,144.094,61.547z M159.067,56.709c1.752-0.888,3.2-2.291,4.351-4.206
+		c1.144-1.917,1.714-4.35,1.714-7.293c0-2.898-0.57-5.306-1.714-7.223c-1.149-1.917-2.599-3.307-4.351-4.172
+		c-1.754-0.864-3.588-1.297-5.5-1.297c-1.968,0-3.826,0.434-5.576,1.297c-1.756,0.866-3.189,2.256-4.315,4.172
+		c-1.119,1.917-1.682,4.324-1.682,7.223c0,2.943,0.563,5.376,1.682,7.293c1.126,1.916,2.561,3.318,4.315,4.206
+		c1.75,0.888,3.608,1.332,5.576,1.332C155.479,58.041,157.313,57.599,159.067,56.709z"/>
+	<path fill="#333333" d="M179.224,60.706c-0.79-0.563-1.192-1.333-1.192-2.314c0-0.746,0.258-1.402,0.772-1.963
+		c0.514-0.562,1.17-0.842,1.968-0.842c0.42,0,0.84,0.096,1.26,0.281c1.493,0.654,2.991,1.169,4.486,1.544
+		c1.496,0.374,3.181,0.562,5.054,0.562c5.188,0,7.779-1.66,7.779-4.979c0-1.075-0.598-1.894-1.789-2.454
+		c-1.188-0.563-3.142-1.191-5.854-1.893c-2.76-0.655-5.038-1.334-6.84-2.035c-1.799-0.701-3.342-1.764-4.626-3.19
+		c-1.287-1.426-1.928-3.306-1.928-5.645c0-3.272,1.18-5.936,3.543-7.993c2.354-2.059,5.735-3.086,10.134-3.086
+		c3.598,0,6.984,0.585,10.162,1.753c0.658,0.188,1.16,0.539,1.513,1.052c0.346,0.516,0.524,1.051,0.524,1.612
+		c0,0.749-0.271,1.402-0.809,1.963c-0.539,0.562-1.205,0.842-1.994,0.842c-0.236,0-0.539-0.046-0.914-0.141
+		c-2.711-0.841-5.377-1.262-7.993-1.262c-2.526,0-4.502,0.456-5.932,1.368c-1.421,0.91-2.137,2.092-2.137,3.54
+		c0,1.404,0.656,2.431,1.963,3.086c1.311,0.656,3.346,1.286,6.104,1.893c2.758,0.702,5.002,1.392,6.729,2.068
+		c1.734,0.678,3.215,1.741,4.457,3.19c1.237,1.45,1.858,3.39,1.858,5.819c0,2.994-1.184,5.471-3.54,7.435
+		c-2.363,1.963-5.695,2.944-9.993,2.944C187.316,63.86,183.06,62.81,179.224,60.706z"/>
+</g>
+<rect x="73.738" y="87" fill="#D9AB98" width="53" height="4"/>
+</svg>