diff --git a/_includes/nav-header.html b/_includes/nav-header.html
index 766532e07f58331949d8c86862d4928ac4bf75a1..4e49b330ff42c8b5add7fd141be688988604582b 100644
--- a/_includes/nav-header.html
+++ b/_includes/nav-header.html
@@ -72,12 +72,14 @@ function spaceopen() {
 
 function nextevent() {
     if($("#nextevent").text().trim().length) {
-      $("#event_soon").css( "border", "3px solid orange");
+      $("#event_soon").css( "border", "3px solid #E94E1B");
+      $("#event_soon").append("<div style='text-align: right;'><a href='https://chaotikum.org/events/' target='_blank' style='color: #EAEAEA;'>Kalender</a></div>");
     } else {
       $("event_soon").hide();
     }
     if($("#nextevent_mobile").text().trim().length) {
-      $("#event_soon_mobile").css( "border", "3px solid orange");
+      $("#event_soon_mobile").css( "border", "3px solid #E94E1B");
+      $("#event_soon_mobile").append("<div style='text-align: right;'><a href='https://chaotikum.org/events/' target='_blank' style='color: #EAEAEA;'>Kalender</a></div>");
     } else {
       $("event_soon_mobile").hide();
     }
diff --git a/_includes/space-status-mobile.html b/_includes/space-status-mobile.html
index efcd9ce565743ad921bb611d493f880b4869b851..d4e82fc8c1bad26c8ff977ba68c76a1dd55e2973 100644
--- a/_includes/space-status-mobile.html
+++ b/_includes/space-status-mobile.html
@@ -5,7 +5,7 @@
 {% capture nowunix %}{{'now' | date: '%s'}}{% endcapture -%}
 <b>Demnächst:</b>
 {% for e in site.events -%}
-    {% capture event_start_plus %}{{e.eventdate  | date: '%s' | minus: 86400 }}{% endcapture -%}
+    {% capture event_start_plus %}{{e.eventdate  | date: '%s' | minus: 259200 }}{% endcapture -%}
     {% capture event_start %}{{e.eventdate  | date: '%s' }}{% endcapture -%}
     {% if event_start_plus < nowunix and event_start > nowunix -%}
       <p id="nextevent_mobile"> {{ e.eventdate | date: "%d.%m.%Y %H:%M" }}: {{e.title}}</p>
diff --git a/_includes/space-status.html b/_includes/space-status.html
index bbd3c1078d151766ecc2ddf62c82704847f3cd50..c5adf11e40822fc07a48e7897208591de4b1f31f 100644
--- a/_includes/space-status.html
+++ b/_includes/space-status.html
@@ -1,13 +1,13 @@
 <div id="event_soon"  style="margin-top: 5px;">
-{% capture nowunix %}{{'now' | date: '%s'}}{% endcapture -%}
-<b>Demnächst:</b>
-{% for e in site.events -%}
-    {% capture event_start_plus %}{{e.eventdate  | date: '%s' | minus: 86400 }}{% endcapture -%}
-    {% capture event_start %}{{e.eventdate  | date: '%s' }}{% endcapture -%}
-    {% if event_start_plus < nowunix and event_start > nowunix -%}
-      <p id="nextevent"> {{ e.eventdate | date: "%d.%m.%Y %H:%M" }}: {{e.title}}</p>
-    {% endif -%}
-{% endfor -%}
+{%- capture nowunix %}{{'now' | date: '%s'}}{% endcapture -%}
+{%- assign show_event = 2 -%}
+{%- for e in site.events -%}
+    {%- capture event_start_plus %}{{e.eventdate  | date: '%s' | minus: 259200 }}{% endcapture -%}
+    {%- capture event_start %}{{e.eventdate  | date: '%s' }}{% endcapture -%}
+    {%- if event_start_plus < nowunix and event_start > nowunix and show_event > 1 -%}
+      <b>Demnächst:</b>
+      {%- assign show_event = 0 - %}<p id="nextevent"> {{ e.eventdate | date: "%d.%m.%Y %H:%M" }}: {{e.title}}</p>{% endif -%}
+{%- endfor -%}
 </div>
 <div id="spaceopen" class="chaotikum-about">
   Ob der Nobreakspace offen ist siehst du <a href='https://status.nobreakspace.org' target='_blank'>hier</a><p>Oder aktiviere Javascript</p>
diff --git a/_sass/_normalize.scss b/_sass/_normalize.scss
index c0df485a9d1660ce959a15ede17965d63f9e7f8e..b54eadd8943359d6f2213ff150770ed9ccaa17c8 100644
--- a/_sass/_normalize.scss
+++ b/_sass/_normalize.scss
@@ -192,6 +192,20 @@ figcaption {
   text-align: center;
 }
 
+#event_soon_mobile {
+  background-color: #fafafa;
+  padding: 2%;
+  text-align: center;
+  margin-top: 2px;
+}
+
+#event_soon {
+  background-color: #fafafa;
+  padding: 2%;
+  text-align: center;
+  margin-top: 2px;
+}
+
 #spaceopen:a {
   background-color: #ff0000;
   text-align: left;