diff --git a/webapp/.eslintignore b/webapp/.eslintignore
index be90fc8e3..a90a66efa 100644
--- a/webapp/.eslintignore
+++ b/webapp/.eslintignore
@@ -1,5 +1,5 @@
 node_modules
-build
+dist
 .nuxt
 styleguide/
 **/*.min.js
diff --git a/webapp/assets/_new/styles/mixins/buttonStates.css b/webapp/assets/_new/styles/mixins/buttonStates.css
deleted file mode 100644
index 27b24b9ce..000000000
--- a/webapp/assets/_new/styles/mixins/buttonStates.css
+++ /dev/null
@@ -1 +0,0 @@
-/*# sourceMappingURL=buttonStates.css.map */
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/mixins/buttonStates.css.map b/webapp/assets/_new/styles/mixins/buttonStates.css.map
deleted file mode 100644
index aa1b02a29..000000000
--- a/webapp/assets/_new/styles/mixins/buttonStates.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"buttonStates.css"}
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/resets.css b/webapp/assets/_new/styles/resets.css
deleted file mode 100644
index b9aeaa72e..000000000
--- a/webapp/assets/_new/styles/resets.css
+++ /dev/null
@@ -1,29 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-button {
-  padding: 0;
-  background: transparent;
-  border: none;
-  font-family: inherit;
-  font-size: inherit;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-li {
-  margin: 0;
-}
-
-ol,
-ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}/*# sourceMappingURL=resets.css.map */
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/resets.css.map b/webapp/assets/_new/styles/resets.css.map
deleted file mode 100644
index e759c9680..000000000
--- a/webapp/assets/_new/styles/resets.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["resets.scss","resets.css"],"names":[],"mappings":"AAAA;EACE,sBAAA;ACCF;;ADEA;EACE,UAAA;EACA,uBAAA;EACA,YAAA;EACA,oBAAA;EACA,kBAAA;ACCF;;ADEA;;;;;;;;EAQE,SAAA;ACCF;;ADEA;;EAEE,qBAAA;EACA,SAAA;EACA,UAAA;ACCF","file":"resets.css"}
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/tokens.css b/webapp/assets/_new/styles/tokens.css
deleted file mode 100644
index 45bac6085..000000000
--- a/webapp/assets/_new/styles/tokens.css
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * @tokens Color Brand
- * @presenter Color
- */
-/**
- * @tokens Color Neutral
- * @presenter Color
- */
-/**
- * @tokens Color Text
- * @presenter Color
- */
-/**
- * @tokens Color Background
- * @presenter Color
- */
-/**
- * @tokens Color Border
- * @presenter Color
- */
-/**
- * @tokens Border Size
- * @presenter Border
- */
-/**
- * @tokens Border Radius
- * @presenter BorderRadius
- */
-/**
- * @tokens Font Size
- * @presenter FontSize
- */
-/**
- * @tokens Font Space
- * @presenter Spacing
- */
-/**
- * @tokens Font Family
- * @presenter FontFamily
- */
-/**
- * @tokens Font Weight
- * @presenter FontWeight
- */
-/**
- * @tokens Line Height
- * @presenter LineHeight
- */
-/**
- * @tokens Letter Spacing
- * @presenter Spacing
- */
-/**
- * @tokens Opacity
- * @presenter Opacity
- */
-/**
- * @tokens Space
- * @presenter Spacing
- */
-/**
- * @tokens Size Height
- * @presenter Spacing
- */
-/**
- * @tokens Size Width
- * @presenter Spacing
- */
-/**
- * @tokens Size Avatar
- * @presenter Spacing
- */
-/**
- * @tokens Size Buttons
- * @presenter Spacing
- */
-/**
- * @tokens Size Images
- * @presenter Spacing
- */
-/**
- * @tokens Size Icons
- * @presenter Spacing
- */
-/**
- * @tokens Shadow
- * @presenter Shadow
- */
-/**
- * @tokens Effects
- */
-/**
- * @tokens Animation Duration
- */
-/**
- * @tokens Animation Ease
- * @presenter Easing
- */
-/**
- * @tokens Z-Index
- */
-/**
- * @tokens Media Query
- */
-/** 
- * @tokens Background Images
- */
-/** 
- * @tokens Header Color
- */
-/** 
- * @tokens Footer Color
- */
-/** 
- * @tokens Locale Menu Color
- */
-/** 
- * @tokens Donation Bar Color
- */
-/** 
- * @tokens Toast Color
- *//*# sourceMappingURL=tokens.css.map */
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/tokens.css.map b/webapp/assets/_new/styles/tokens.css.map
deleted file mode 100644
index 5111f4b00..000000000
--- a/webapp/assets/_new/styles/tokens.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["tokens.scss"],"names":[],"mappings":"AAAA;;;EAAA;AA4BA;;;EAAA;AAmBA;;;EAAA;AAuBA;;;EAAA;AAgCA;;;EAAA;AAeA;;;EAAA;AASA;;;EAAA;AAYA;;;EAAA;AAgBA;;;EAAA;AAgBA;;;EAAA;AAUA;;;EAAA;AAQA;;;EAAA;AAUA;;;EAAA;AAWA;;;EAAA;AASA;;;EAAA;AAgBA;;;EAAA;AAaA;;;EAAA;AASA;;;EAAA;AASA;;;EAAA;AASA;;;EAAA;AAUA;;;EAAA;AAQA;;;EAAA;AAcA;;EAAA;AAMA;;EAAA;AAUA;;;EAAA;AAWA;;EAAA;AAaA;;EAAA;AAUA;;EAAA;AAIA;;EAAA;AAMA;;EAAA;AAOA;;EAAA;AAMA;;EAAA;AAOA;;EAAA","file":"tokens.css"}
\ No newline at end of file
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 51efbc6a4..997a25341 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -67,10 +67,11 @@
                   type="datetime"
                   value-type="format"
                   :minute-step="15"
-                  formmat="DD-MM-YYYY HH:mm"
+                  Xformat="DD-MM-YYYY HH:mm"
                   style="z-index: 20"
                   :placeholder="$t('post.viewEvent.eventStart')"
                   :disabled-date="notBeforeToday"
+                  :disabled-time="notBeforeNow"
                   :show-second="false"
                 ></date-picker>
               </div>
@@ -86,12 +87,14 @@
               <date-picker
                 v-model="formData.eventEnd"
                 type="datetime"
+                value-type="format"
                 :minute-step="15"
                 :seconds-step="0"
-                formmat="DD MM YYYY HH:mm"
+                Xformat="DD-MM-YYYY HH:mm"
                 :placeholder="$t('post.viewEvent.eventEnd')"
                 style="font-size: larger"
-                :disabled-date="notBeforeToday"
+                :disabled-date="notBeforeEventDay"
+                :disabled-time="notBeforeEvent"
                 :show-second="false"
               ></date-picker>
             </ds-grid-item>
@@ -152,7 +155,7 @@
         <ds-flex class="buttons-footer" gutter="xxx-small">
           <ds-flex-item width="3.5" style="margin-right: 16px; margin-bottom: 6px">
             <!-- eslint-disable vue/no-v-text-v-html-on-component -->
-            <!-- TODO => remove v-html! only text ! no html! secrurity first! -->
+            <!-- TODO => remove v-html! only text ! no html! security first! -->
             <ds-text
               v-if="showGroupHint"
               v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
@@ -316,7 +319,16 @@ export default {
   },
   methods: {
     notBeforeToday(date) {
-      return date < new Date(new Date().setHours(0, 0, 0, 0))
+      return date < new Date().setHours(0, 0, 0, 0)
+    },
+    notBeforeNow(date) {
+      return date < new Date()
+    },
+    notBeforeEventDay(date) {
+      return date < new Date(this.formData.eventStart).setHours(0, 0, 0, 0)
+    },
+    notBeforeEvent(date) {
+      return date <= new Date(this.formData.eventStart)
     },
     submit() {
       let image = null
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index c8419d08f..199cc14a4 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -11,7 +11,7 @@
                   ghost
                   fullwidth
                   size="x-large"
-                  style="background-color: #ff000000; color: whitesmoke"
+                  class="inactive-tab-button"
                 >
                   {{ $t('post.createNewPost.title') }}
                 </ds-button>
@@ -30,7 +30,7 @@
                   size="x-large"
                   v-if="creatEvent"
                   hover
-                  style="background-color: #ff000000; color: whitesmoke"
+                  class="inactive-tab-button"
                 >
                   {{ $t('post.createNewEvent.title') }}
                 </ds-button>
@@ -41,7 +41,7 @@
             </ds-card>
           </ds-flex-item>
         </ds-flex>
-        <div v-if="group" style="font-size: 30px; text-align: center">
+        <div v-if="group" class="group-create-title">
           {{ $t('post.createNewPost.forGroup.title', { name: group.name }) }}
         </div>
       </ds-flex-item>
@@ -100,3 +100,13 @@ export default {
   },
 }
 </script>
+<style lang="scss">
+.inactive-tab-button {
+  background-color: #ff000000 !important;
+  color: 'whitesmoke' !important;
+}
+.group-create-title {
+  font-size: 30px;
+  text-align: center;
+}
+</style>