diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js b/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js
index a9c3325..8c1b14f 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js
@@ -11,6 +11,11 @@ const inputDPD = $("#shippingMethod8c6d913e29c14c3cb3c6429724efaab8");
 const inputVorkasse = $("#paymentMethod31bc923a38bc435a80d49d4d40368081");
 
 $(document).ready(function() {
+    // Add Class for Promotion Modal Box
+    if ($(".swag-custom-notification-info-modal__content").length) {
+        $(".swag-custom-notification-info-modal__content").parents(".modal").addClass("spwn-swag-custom-notification-info");
+    }    
+    
     let dpInput = $(".confirm-delivery-date #dtgs-datepicker-inputfield");
     if (dpInput.length) {
         fp = document.querySelector("#dtgs-datepicker-inputfield")._flatpickr;
diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss
index 76ae002..27c12f1 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss
@@ -129,8 +129,10 @@
         z-index: 500;
     }
 }
-
+.navigation-flyout-categories.is-level-0 > .navigation-flyout-col {
+    margin-bottom: 15px;
+}
 .navigation-flyout .container>.navigation-flyout-content:first-child {
-    padding-top: 60px;
-    padding-bottom: 40px;
+    padding-top: 30px;
+    padding-bottom: 15px;
 }
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss
index 57b573c..69113c9 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss
@@ -114,10 +114,17 @@ input.custom-number[type=number] {
     margin-bottom: 20px;
     align-items: center;
   }
+  #spwn-dp-input,
   #dtgs-datepicker-inputfield {
     width: 308px;
     padding-left: 10px;
   }
+  #dtgs-datepicker-inputfield {
+    display: none;
+  }
+  .flatpickr-time {
+    display: none;
+  }
   #spwn-remove-date {
     margin-left: 10px;
     cursor: pointer;
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js
index 1c4d0e5..82ed5d9 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js
@@ -11,12 +11,18 @@ const inputDPD = $("#shippingMethod8c6d913e29c14c3cb3c6429724efaab8");
 const inputVorkasse = $("#paymentMethod31bc923a38bc435a80d49d4d40368081");
 
 $(document).ready(function() {
+    // Add Class for Promotion Modal Box
+    if ($(".swag-custom-notification-info-modal__content").length) {
+        $(".swag-custom-notification-info-modal__content").parents(".modal").addClass("spwn-swag-custom-notification-info");
+    }
+
     let dpInput = $(".confirm-delivery-date #dtgs-datepicker-inputfield");
     if (dpInput.length) {
         fp = document.querySelector("#dtgs-datepicker-inputfield")._flatpickr;
         dpInput.prop('disabled', true);
         dpInput.wrap('<div class="spwn-date-wrapper"></div>');
         $("<span id='spwn-remove-date' title='Zurücksetzen'></span>").insertAfter(dpInput);
+        $("<input type='text' value='' id='spwn-dp-input' />").insertAfter(dpInput);
         let doNotShow = $(".do-not-show").length ? " class='do-not-show'" : "";
         $("<div id='spwn-delivery'" + doNotShow + "><p></p><div class='spwn-delivery--time'></div></div>").insertAfter(".confirm-delivery-date");
         fp.config.onChange.push(function() {
@@ -38,11 +44,24 @@ $(document).ready(function() {
         });
 
         /* Set first selectable day selected */
-
-        spawnDateInputValue = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val();
+        // remove hours
+        console.log("A");
+        console.log($(".confirm-delivery-date #dtgs-datepicker-inputfield").val());
+        console.log(spawnDateInputValue);
+        if ($(".confirm-delivery-date #dtgs-datepicker-inputfield").val().indexOf(":") !== -1) {
+            let inputTemp = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val();
+            spawnDateInputValue = inputTemp.substring(0, inputTemp.length - 6);
+            console.log("A2");
+            console.log(spawnDateInputValue);
+        } else {
+            spawnDateInputValue = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val();
+            console.log("3");
+            console.log(spawnDateInputValue);
+        }
         if (spawnDateInputValue === '') {
             setDateSelected();
         }
+        $("#spwn-dp-input").val(spawnDateInputValue);
 
         changeDelivery(fp);
     }
@@ -58,6 +77,7 @@ $(document).ready(function() {
     }
 
     $("body").on("click", "#spwn-remove-date", function() {
+        $(".confirm-delivery-date #spwn-dp-input").val("");
         $(".confirm-delivery-date #dtgs-datepicker-inputfield").val("");
         spawnDateInputValue = "";
     });
@@ -88,7 +108,20 @@ function easeOutCuaic(t){
 }
 
 function manipulateDateInputValue() {
-    spawnDateInputValue = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val();
+    // remove hours
+    console.log("B");
+    console.log($(".confirm-delivery-date #dtgs-datepicker-inputfield").val());
+    console.log(spawnDateInputValue);
+    if ($(".confirm-delivery-date #dtgs-datepicker-inputfield").val().indexOf(":") !== -1) {
+        let inputTemp = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val();
+        spawnDateInputValue = inputTemp.substring(0, inputTemp.length - 6);
+        console.log("B2");
+        console.log(spawnDateInputValue);
+    } else {
+        spawnDateInputValue = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val();
+        console.log("B3");
+        console.log(spawnDateInputValue);
+    }
     if (inputSameDayDelivery.is(':checked')) {
         // If same day delivery is checked, select time
         $("#spwn-delivery .spwn-delivery--time span.active").trigger("click");
@@ -116,7 +149,8 @@ function changeDelivery(fp) {
     $("body").on("click", "#spwn-delivery .spwn-delivery--time span", function() {
         $("#spwn-delivery .spwn-delivery--time span").removeClass("active");
         $(this).addClass("active");
-        $(".confirm-delivery-date #dtgs-datepicker-inputfield").val(spawnDateInputValue + " " + $(this).text());
+        $(".confirm-delivery-date #spwn-dp-input").val(spawnDateInputValue + " " + $(this).text());
+        $(".confirm-delivery-date #dtgs-datepicker-inputfield").val(spawnDateInputValue + " " + $(this).attr('data-time'));
     });
 
     let daysToAdd = 0;
@@ -128,12 +162,14 @@ function changeDelivery(fp) {
         if (inputShopPickup.is(':checked')) {
             // Abholung im Ladengeschäft
             console.log("Abholung");
-            $(".confirm-delivery-date #dtgs-datepicker-inputfield").val('Abholung im Ladengeschäft');
+            $(".confirm-delivery-date #spwn-dp-input").val('Abholung im Ladengeschäft');
+            $(".confirm-delivery-date #dtgs-datepicker-inputfield").val('9.9.1999 19:19');
             $(".confirm-delivery-date").hide();
             $("#spwn-delivery p").text("Die bestellten Produkte stehen zur Abholung in unserem Ladengeschäft in Hamburg für Sie bereit.");
         } else if (inputSameDayDelivery.is(':checked')) {
             // Abendzustellung
             console.log("Abendzustellung");
+            $(".confirm-delivery-date #spwn-dp-input").val('');
             $(".confirm-delivery-date #dtgs-datepicker-inputfield").val('');
             spwnIncludedDays = [1, 2, 3, 4, 5];
             if (daysToAdd === 0) {
@@ -141,13 +177,14 @@ function changeDelivery(fp) {
             }
             setIncludedDays("evening", fp, daysToAdd);
             $("#spwn-delivery p").text("Abendzustellung gewählt. Bitte wählen Sie nun eine Wunsch-Zeit:");
-            $("#spwn-delivery .spwn-delivery--time").append("<span class='active'>18 - 20 Uhr</span><span>19 - 21 Uhr</span><span>20 - 22 Uhr</span>");
+            $("#spwn-delivery .spwn-delivery--time").append("<span class='active' data-time='18:00'>18 - 20 Uhr</span><span data-time='19:00'>19 - 21 Uhr</span><span data-time='20:00'>20 - 22 Uhr</span>");
             // If not date from DPD days
             if (!$(".flatpickr-day").hasClass("selected")) {
                 setDateSelected();
             }
             if ($(".flatpickr-day").hasClass("selected")) {
-                if (spawnDateInputValue === "" || spawnDateInputValue.indexOf("Uhr") === -1) {
+                // || spawnDateInputValue.indexOf(":00") === -1
+                if (spawnDateInputValue === "") {
                     manipulateDateInputValue();
                 }
             } else {
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss
index e2d45ba..5d68c2d 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss
@@ -122,13 +122,46 @@ input.custom-number[type=number] {
 
 /* Wunschliefertermin Datepicker */
 .confirm-delivery-date {
+  .spwn-date-wrapper {
+    display: flex;
+    justify-content: flex-start;
+    margin-bottom: 20px;
+    align-items: center;
+  }
+  #spwn-dp-input,
   #dtgs-datepicker-inputfield {
     width: 308px;
-    margin-bottom: 20px;
     padding-left: 10px;
   }
+  #dtgs-datepicker-inputfield {
+    display: none;
+  }
+  .flatpickr-time {
+    display: none;
+  }
   #spwn-remove-date {
-
+    margin-left: 10px;
+    cursor: pointer;
+    position: relative;
+    width: 16px;
+    height: 16px;
+    display: block;
+    &:before,
+    &:after {
+      content: "";
+      position: absolute;
+      left: 0;
+      top: 8px;
+      width: 16px;
+      height: 2px;
+      background: #33548c;
+    }
+    &:before {
+      transform: rotate(-45deg);
+    }
+    &:after {
+      transform: rotate(45deg);
+    }
   }
   .flatpickr-day.selected, .flatpickr-day.startRange, .flatpickr-day.endRange, .flatpickr-day.selected.inRange, .flatpickr-day.startRange.inRange, .flatpickr-day.endRange.inRange, .flatpickr-day.selected:focus, .flatpickr-day.startRange:focus, .flatpickr-day.endRange:focus, .flatpickr-day.selected:hover, .flatpickr-day.startRange:hover, .flatpickr-day.endRange:hover, .flatpickr-day.selected.prevMonthDay, .flatpickr-day.startRange.prevMonthDay, .flatpickr-day.endRange.prevMonthDay, .flatpickr-day.selected.nextMonthDay, .flatpickr-day.startRange.nextMonthDay, .flatpickr-day.endRange.nextMonthDay {
     border-color: #86b04b;
@@ -171,11 +204,6 @@ input.custom-number[type=number] {
   display: none !important;
 }
 
-.confirm-delivery-date.do-not-show,
-#spwn-delivery.do-not-show {
-  display: none !important;
-}
-
 .swag-custom-notification-info-modal__content {
   padding-bottom: 40px;
   .row {