diff --git a/src/assets/scss/templates/_kitchen-sink.scss b/src/assets/scss/templates/_kitchen-sink.scss
deleted file mode 100644
index ae8880e..0000000
--- a/src/assets/scss/templates/_kitchen-sink.scss
+++ /dev/null
@@ -1,84 +0,0 @@
-.kitchen-sink-header {
-  @include xy-cell(12);
-}
-
-
-.kitchen-sink-components {
-  hr {
-    margin: 3rem 0;
-  }
-
-  @include breakpoint(small) {
-    @include xy-cell(12);
-  }
-
-  @include breakpoint(large) {
-    @include xy-cell(9);
-  }
-}
-
-.kitchen-sink-nav {
-  @include breakpoint(small) {
-    display: none;
-  }
-
-  @include breakpoint(large) {
-    @include xy-cell(3);
-    display: block;
-    float: right;
-
-    .docs-sub-menu {
-      font-size: 0.85rem;
-      margin-top: 1rem;
-    }
-
-    .docs-menu-title {
-      text-transform: uppercase;
-      font-size: 0.75rem;
-      color: $dark-gray;
-      font-weight: bold;
-      line-height: 1;
-      padding-left: 0.9rem;
-      margin-bottom: 0.5rem;
-      border-top: 1px solid $medium-gray;
-      margin-top: 1rem;
-      padding-top: 1.5rem;
-    }
-
-    .docs-toc {
-      width: 100%;
-      padding-left: 4rem;
-      padding-right: 1rem;
-    }
-
-    .docs-toc .active {
-      background: #2199e8;
-      color: white;
-    }
-
-    .docs-toc .docs-sub-menu:first-child .docs-menu-title {
-      margin-top: 0;
-      border-top: 0;
-      padding-top: 0;
-    }
-  }
-}
-
-.kitchen-sink-grid {
-  .grid-x {
-    background: #d6ecfa;
-    font-size: 12px;
-    line-height: 2rem;
-    margin-bottom: 1.5rem;
-    
-    .cell,:nth-child(odd) {
-      background: #7bc1ef;
-      color: #0a0a0a;
-    }
-
-    .cell:nth-child(even) {
-      background: #1779ba;
-      color: #fefefe;
-    }
-  }
-}
diff --git a/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss b/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss
index 764601d..ea006c9 100644
--- a/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss
+++ b/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss
@@ -1,4 +1,4 @@
-/* hamburg-freifunk-wp-theme: adaption/overrides of all-in-one-event-calendar theme (2018) */
+/* hamburg-freifunk-wp-theme: adaption/overrides of all-in-one-event-calendar theme (2019) */
 
 $freifunk-color-magenta: rgb(220,0,103);
 $freifunk-color-yellow:  rgb(255,180,0);
@@ -60,6 +60,10 @@ $freifunk-color-blue: rgb(0,158,224);
   .ai1ec-subscribe-buttons-widget {
     padding: 0 0 0 0;
   }
+  .timely {
+    font-family: hk_groteskmedium,, inherit"Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 15px;
+  }
   .timely .ai1ec-btn {
     border: 1px solid transparent;
   }
diff --git a/src/assets/scss/templates/freifunk.scss b/src/assets/scss/templates/freifunk.scss
index c83c205..533693d 100644
--- a/src/assets/scss/templates/freifunk.scss
+++ b/src/assets/scss/templates/freifunk.scss
@@ -35,6 +35,9 @@ p, li, blockquote {
     font-size: 18px;
     line-height: 1.5;
     word-break: break-word;
+    @media screen and #{$medium-only} {
+      margin-bottom: .25rem;
+    }
     @media screen and #{$large-up} {
       font-size: 17px;
       line-height: 1.6;
@@ -306,7 +309,7 @@ header.site-header {
       list-style-type: none;
       margin: 0 0 3.5rem -1.5rem;
       li {
-        margin: 1.5rem 0;
+        margin: .5rem 0;
       }
       a  {
         padding: 1rem;
@@ -316,9 +319,11 @@ header.site-header {
         text-indent: -40px;
         margin-left: 40px;
         display: block !important;
-        margin-right: 50px;
-        padding: 0 10px !important;
 
+        padding: 0 10px !important;
+        @media screen and #{$large-up} {
+          margin-right: 50px;
+        }
 
       }
       a:hover {
@@ -333,13 +338,11 @@ header.site-header {
         transform: scale(0.5);
         vertical-align: -10px;
         width: 42px;
+        text-align: right;
         @media screen and #{$large-up} {
           transform: scale(0.6);
           vertical-align: -10px;
           width: 38px;
-
-          vertical-align: -12px;
-          text-align: right;
         }
       }
     }