diff --git a/content/_data/platzhalter.yaml b/content/_data/platzhalter.yaml
index b43a8ced..6f5f8b67 100644
--- a/content/_data/platzhalter.yaml
+++ b/content/_data/platzhalter.yaml
@@ -1,55 +1,5 @@
 ---
 events:
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-01-08 19:30:00.000000000 +01:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-02-12 19:30:00.000000000 +01:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-03-12 19:30:00.000000000 +01:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-04-09 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-05-07 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-06-11 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-07-09 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-08-13 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-09-10 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
-- title: CCCS Vortragsreihe (Thema noch offen)
-  startdate: 2015-10-08 19:30:00.000000000 +02:00
-  duration: 2h
-  location:
-    location: bib
 - title: CCCS Vortragsreihe (Thema noch offen)
   startdate: 2015-11-12 19:30:00.000000000 +01:00
   duration: 2h
@@ -60,3 +10,63 @@ events:
   duration: 2h
   location:
     location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-01-14 19:30:00.000000000 +01:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-02-11 19:30:00.000000000 +01:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-03-10 19:30:00.000000000 +01:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-04-14 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-05-12 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-06-09 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-07-14 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-08-11 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-09-08 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-10-13 19:30:00.000000000 +02:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-11-10 19:30:00.000000000 +01:00
+  duration: 2h
+  location:
+    location: bib
+- title: CCCS Vortragsreihe (Thema noch offen)
+  startdate: 2016-12-08 19:30:00.000000000 +01:00
+  duration: 2h
+  location:
+    location: bib
diff --git a/content/_data/stammtisch.yaml b/content/_data/stammtisch.yaml
index 8695d591..d9b2368b 100644
--- a/content/_data/stammtisch.yaml
+++ b/content/_data/stammtisch.yaml
@@ -1,126 +1,5 @@
 ---
 events:
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-01-07 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-01-15 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-02-04 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-02-19 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-03-04 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-03-19 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-04-01 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-04-16 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-05-06 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-05-21 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-06-03 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-06-18 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-07-01 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-07-16 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-08-05 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-08-20 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-09-02 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-09-17 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-10-07 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-10-15 18:00:00.000000000 +02:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-11-04 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-11-19 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: shack
-- title: CCCS-Stammtisch (Zadu-Bar)
-  startdate: 2014-12-02 18:00:00.000000000 +01:00
-  duration: 4h
-  location:
-    location: zadu
-- title: CCCS-Stammtisch (shackspace)
-  startdate: 2014-12-17 18:00:00.000000000 +01:00
-  duration: 4h
-  url: https://www.cccs.de/about/stammtisch/
-  location:
-    location: shack
 - title: CCCS-Stammtisch (Zadu-Bar)
   startdate: 2015-01-06 18:00:00.000000000 +01:00
   duration: 4h
@@ -265,3 +144,147 @@ events:
   url: https://www.cccs.de/about/stammtisch/
   location:
     location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-01-05 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-01-20 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-02-02 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-02-17 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-03-01 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-03-16 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-04-05 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-04-20 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-05-03 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-05-18 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-06-07 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-06-15 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-07-05 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-07-20 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-08-02 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-08-17 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-09-06 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-09-21 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-10-04 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-10-19 18:00:00.000000000 +02:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-11-01 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-11-16 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2016-12-06 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: zadu
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2016-12-21 18:00:00.000000000 +01:00
+  duration: 4h
+  url: https://www.cccs.de/about/stammtisch/
+  location:
+    location: shack