diff --git a/content/hbsc-cal-1.en.md b/content/hbsc-cal-1.en.md
index 0a0207ee35..07be3d96cb 100644
--- a/content/hbsc-cal-1.en.md
+++ b/content/hbsc-cal-1.en.md
@@ -1,11 +1,10 @@
 Title: homebrewserver.club, calendars session 1
-Date: 2017-11-16
+Date: 2017-11-09
 Category: gathering
 Slug: hbsc-cal-1-en
 lang: en
-start: Thursday 16 November, 19:00
-event_start: 2017-11-05 19:30
-event_duration:4h
+event_start: 2017-11-16 19:00
+event_duration: 3h
 
 ![map preview](/images/cal.png)
 
diff --git a/content/hbsc-cal-1.nl.md b/content/hbsc-cal-1.nl.md
index 165f4aeee9..084fcf850b 100644
--- a/content/hbsc-cal-1.nl.md
+++ b/content/hbsc-cal-1.nl.md
@@ -1,9 +1,10 @@
 Title: homebrewserver.club, kalenders sessie 1
-Date: 2017-11-16
+Date: 2017-11-09
 Category: gathering
 Slug: hbsc-cal-1-nl
 lang: nl
-start: donderdag 16 november, 19:00
+event_start: 2017-11-16 19:00
+event_duration: 3h
 
 ![map preview](/images/cal.png)
 
diff --git a/content/hbsc-cal-2.en.md b/content/hbsc-cal-2.en.md
index 7acb9c8b4d..96b85ca487 100644
--- a/content/hbsc-cal-2.en.md
+++ b/content/hbsc-cal-2.en.md
@@ -1,9 +1,10 @@
 Title: homebrewserver.club, kalenders sessie 2
-Date: 2017-11-30
+Date: 2017-11-22
 Category: gathering
 Slug: hbsc-cal-2-en
 lang: en
-start: donderdag 30 november, 19:00
+event_start: 2017-11-30 19:00
+event_duration: 3h
 
 ![map preview](/images/cal2.png)
 
diff --git a/content/hbsc-cal-2.nl.md b/content/hbsc-cal-2.nl.md
index 8b021463dd..e3924eb647 100644
--- a/content/hbsc-cal-2.nl.md
+++ b/content/hbsc-cal-2.nl.md
@@ -1,9 +1,10 @@
 Title: homebrewserver.club, kalenders sessie 2
-Date: 2017-11-30
+Date: 2017-11-22
 Category: gathering
 Slug: hbsc-cal-2-nl
 lang: nl
-start: donderdag 30 november, 19:00
+event_start: 2017-11-30 19:00
+event_duration: 3h
 
 ![map preview](/images/cal2.png)
 
diff --git a/content/inox.en.md b/content/inox.en.md
index 1a48b8effc..66208b8dbd 100644
--- a/content/inox.en.md
+++ b/content/inox.en.md
@@ -1,9 +1,10 @@
 Title: Soup & Talk - Inox Kapell
-Date: 2017-12-16
+Date: 2017-11-26
 Category: event
 Slug: inox-kapell
 lang: en
-start: saturday 16 december, 19:00
+event_start: 2017-12-16 19:00
+event_duration:4h
 
 ![Inox Kapell](/images/insekt.jpg )
 
@@ -16,8 +17,8 @@ A few of his words:
 was ist es wenn die insekten sterben? was ist dann noch?
 alleine die inspiration, die dann geht, aber besonders der erdboden stirbt, dadurch unsere nahrung für unsere kindeskinder...
 
-video: https://www.youtube.com/watch?v=SHRijEJwdBQ
-web: http://www.inoxkapell.de/
+video: [link](https://www.youtube.com/watch?v=SHRijEJwdBQ)
+web: [www.inoxkapell.de](http://www.inoxkapell.de/)
 
 **16 december**
 
diff --git a/content/inox.nl.md b/content/inox.nl.md
index dbb76a8cca..6bbe37027b 100644
--- a/content/inox.nl.md
+++ b/content/inox.nl.md
@@ -1,8 +1,8 @@
 Title: Soep & Woorden - Inox Kapell
+Date: 2017-11-26
 Category: event
 Slug: inox-kapell
 lang: nl
-start: vrijdag 16 december
 event_start: 2017-12-16 19:00
 event_duration:4h
 
@@ -19,8 +19,8 @@ was ist es wenn die insekten sterben? was ist dann noch?
 alleine die inspiration, die dann geht, aber besonders der erdboden stirbt,
 dadurch unsere nahrung für unsere kindeskinder...
 
-video: https://www.youtube.com/watch?v=SHRijEJwdBQ
-web: http://www.inoxkapell.de/
+video: [link](https://www.youtube.com/watch?v=SHRijEJwdBQ)
+web: [www.inoxkapell.de](http://www.inoxkapell.de/)
 
 **16 december**
 
diff --git a/content/opening.en.md b/content/opening.en.md
index 5aefd34d07..aab2956b82 100644
--- a/content/opening.en.md
+++ b/content/opening.en.md
@@ -1,11 +1,10 @@
 Title: Opening Space
-Date: 2017-11-03
+Date: 2017-10-26
 Category: event
-Slug: opening-space
+Slug: opening
 lang: en
-event-start:2017-11-03 20:00
-event-duration:4h
-start: Friday 3 November, 20:00
+event-start: 2017-11-03 20:00
+event-duration: 4h
 
 ![map preview](/images/de_varia.png)
 
diff --git a/content/opening.nl.md b/content/opening.nl.md
index 8a21c50cd8..793c31d58c 100644
--- a/content/opening.nl.md
+++ b/content/opening.nl.md
@@ -1,15 +1,13 @@
 Title: Opening Ruimte
-Date: 2017-11-03
+Date: 2017-10-26
 Category: event
-Slug: opening-ruimte
+Slug: opening
 lang: nl
-start: vrijdag 3 november, 20:00
-event-start:2017-11-03 20:00
-event-duration:4h
+event-start: 2017-11-03 20:00
+event-duration: 4h
 
 ![folding chains](/images/de_varia.png)
 
-
 Na een paar weken hard werken openen we op vrijdag 3 november vanaf 20:00 voor het eerst de Varia voor een groter publiek. Kom hoi zeggen, drink een drankje en ontdek de krochten van het pand aan de hand van 'de_varia'; een voor de gelegenheid ontwikkeld counter strike level van de ruimte.
 
 
diff --git a/content/relearn.en.md b/content/relearn.en.md
index ec3acca292..31ee846db2 100644
--- a/content/relearn.en.md
+++ b/content/relearn.en.md
@@ -3,6 +3,9 @@ Date: 2017-08-29
 Category: projects
 Slug: relearn
 lang: en
+event_start: 2017-08-29 10:00
+event_end: 2017-09-02 19:30
+event_duration: 8h
 
 ![test image](/images/pg.jpg)
 
diff --git a/content/relearn.nl.md b/content/relearn.nl.md
index ce0971ce3a..fdfe1872c4 100644
--- a/content/relearn.nl.md
+++ b/content/relearn.nl.md
@@ -3,7 +3,9 @@ Date: 2017-08-29
 Category: projects
 Slug: relearn
 lang: nl
-featured_image: ![relearn](/images/pg.jpg)
+event_start: 2017-08-29 10:00
+event_end: 2017-09-02 19:30
+event_duration: 8h
 
 ![relearn](/images/pg.jpg)
 
diff --git a/content/samenscholing.en.md b/content/samenscholing.en.md
index a8726ddbe5..c3f8777c3b 100644
--- a/content/samenscholing.en.md
+++ b/content/samenscholing.en.md
@@ -4,6 +4,8 @@ Category: project
 Slug: samenscholing
 lang: en
 Status: draft
+event_start: 2017-12-31 19:30
+event_duration: 3h
 
 ![test image](/images/schoolbells.jpg)
 
diff --git a/content/samenscholing.nl.md b/content/samenscholing.nl.md
index 411f208678..22b055edaa 100644
--- a/content/samenscholing.nl.md
+++ b/content/samenscholing.nl.md
@@ -4,6 +4,8 @@ Category: projects
 Slug: samenscholing
 lang: nl
 Status: draft
+event_start: 2017-12-31 19:30
+event_duration: 3h
 
 ![test image](/images/schoolbells.jpg)
 
diff --git a/content/sounduncloud.en.md b/content/sounduncloud.en.md
index 65b6d6eaca..0fad23bc7a 100644
--- a/content/sounduncloud.en.md
+++ b/content/sounduncloud.en.md
@@ -1,11 +1,11 @@
 Title: Sounduncloud: A Rogue Archiving Workshop
-Date: 2017-12-01
 Category: curriculum
 Slug: sounduncloud
 lang: en
 curriculum: True
 event_start: 2017-12-01 12:00
 event_duration:6h
+status: draft
 
 ![Offline listening for days!](/images/offline_listening.png)
 
diff --git a/content/sounduncloud.nl.md b/content/sounduncloud.nl.md
index 9f84dc5bc1..c5efe9b275 100644
--- a/content/sounduncloud.nl.md
+++ b/content/sounduncloud.nl.md
@@ -1,10 +1,10 @@
 Title: Sounduncloud: A Rogue Archiving Workshop
-Date: 2017-12-01
 Category: curriculum
 Slug: sounduncloud
 lang: nl
 event_start: 2017-12-01 12:00
 event_duration: 6h
+status: draft
 
 ![Offline listening for days!](/images/offline_listening.png)
 
diff --git a/content/the-secret-life-seizoen-1.en.md b/content/the-secret-life-seizoen-1.en.md
index 21799b5221..a2fd964a59 100644
--- a/content/the-secret-life-seizoen-1.en.md
+++ b/content/the-secret-life-seizoen-1.en.md
@@ -1,10 +1,10 @@
 Title: Screening: The Secret Life Of Machines, season 1
-Date: 2017-11-05
+Date: 2017-10-29
 Category: screening
 Slug: the-secret-life-season-1
 lang: en
 event_start: 2017-11-05 19:30
-event_duration:4h
+event_duration:3h
 
 ![folding chains](/images/secret_life_chain.gif)
 
diff --git a/content/the-secret-life-seizoen-1.nl.md b/content/the-secret-life-seizoen-1.nl.md
index ccb1854056..377398a780 100644
--- a/content/the-secret-life-seizoen-1.nl.md
+++ b/content/the-secret-life-seizoen-1.nl.md
@@ -1,10 +1,10 @@
 Title: The Secret Life Of Machine screenings, seizoen 1
-Date: 2017-11-05
+Date: 2017-10-29
 Category: event
 Slug: the-secret-life-seizoen-1
 lang: nl
 event_start: 2017-11-05 19:30
-event_duration:4h
+event_duration:3h
 
 ![folding chains](/images/secret_life_chain.gif)
 
diff --git a/content/the-secret-life-seizoen-2.en.md b/content/the-secret-life-seizoen-2.en.md
index 6f3b791e24..7447a6237c 100644
--- a/content/the-secret-life-seizoen-2.en.md
+++ b/content/the-secret-life-seizoen-2.en.md
@@ -1,9 +1,8 @@
 Title: Screening: The Secret Life Of Machines, season 2
-Date: 2017-11-19
+Date: 2017-11-12
 Category: screening
-Slug: the-secret-life-screening-2
+Slug: the-secret-life-2
 lang: en
-start: Sunday 19 November, 16:30
 event_start: 2017-11-19 16:30
 event_duration: 4h
 
diff --git a/content/the-secret-life-seizoen-2.nl.md b/content/the-secret-life-seizoen-2.nl.md
index 0cc4ce21a4..b4210bd778 100644
--- a/content/the-secret-life-seizoen-2.nl.md
+++ b/content/the-secret-life-seizoen-2.nl.md
@@ -1,10 +1,10 @@
 Title: The Secret Life Of Machine screenings, seizoen 2
-Date: 2017-11-19
-Category: event
+Date: 2017-11-12
+Category: screening
 Slug: the-secret-life-2
 lang: nl
 event_start: 2017-11-19 16:30
-event_duration:4h
+event_duration: 4h
 
 ![folding chains](/images/fire.gif)
 
diff --git a/content/the-secret-life-seizoen-3.en.md b/content/the-secret-life-seizoen-3.en.md
index bb398c3745..996dbae5d4 100644
--- a/content/the-secret-life-seizoen-3.en.md
+++ b/content/the-secret-life-seizoen-3.en.md
@@ -1,5 +1,5 @@
 Title: Screening: The Secret Life Of Machines, season 3
-Date: 2017-12-10
+Date: 2017-11-23
 Category: screening
 Slug: the-secret-life-screening-3
 lang: en
diff --git a/content/the-secret-life-seizoen-3.nl.md b/content/the-secret-life-seizoen-3.nl.md
index ca1da42b83..85221de4f4 100644
--- a/content/the-secret-life-seizoen-3.nl.md
+++ b/content/the-secret-life-seizoen-3.nl.md
@@ -1,4 +1,5 @@
 Title: The Secret Life Of Machine screenings, seizoen 3
+Date: 2017-11-23
 Category: event
 Slug: the-secret-life-3
 lang: nl
diff --git a/pelicanconf.py b/pelicanconf.py
index e6d9840964..4d151ea5c8 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -10,7 +10,7 @@ PATH = 'content'
 TIMEZONE = 'Europe/Amsterdam'
 
 DEFAULT_LANG = u'nl'
-DEFAULT_DATE = u'fs'
+DEFAULT_DATE = 'fs'
 USE_FOLDER_AS_CATEGORY = True
 
 # Feed generation is usually not desired when developing
diff --git a/themes/cetcat/templates/article.html b/themes/cetcat/templates/article.html
index 9171318484..a005896758 100644
--- a/themes/cetcat/templates/article.html
+++ b/themes/cetcat/templates/article.html
@@ -36,14 +36,14 @@
 		{% if article.category %}
 		<div class="categories">
 			<span itemprop="articleSection">
-				→ <a href="{{ SITEURL }}/{{ article.category.url }}" rel="category">{{ article.category }}</a>
+				→ <a href="{{ article.category.url }}" rel="category">{{ article.category }}</a>
 			</span>
 		</div>
 		{% endif %}
 		{% if article.translations %}
 			<div id="article-translation">
 			{% for translation in article.translations %}
-				translation → <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+				→ <a href="{{ translation.url }}">{{ translation.lang }}</a>
 			{% endfor %}
 			</div>
 		{% endif %}