diff --git a/content/events/bitcoin_themenabend.md b/content/events/bitcoin_themenabend.md
index 7357e75..8d65b6a 100644
--- a/content/events/bitcoin_themenabend.md
+++ b/content/events/bitcoin_themenabend.md
@@ -5,11 +5,12 @@ description: Crypto!
 draft: false
 showmetadates: false
 showmetalinks: false
+event:
+  weekly:
+    weekday: Mittwoch
+    begin: '20.00'
+    finish: '23.30'
+    interval: ersten
 ---
 
-{{< event_weekly
-    weekday="Mittwoch"
-    interval="1"
-    begin="20.00"
-    finish="23.30"
->}}
+{{< event_weekly >}}
diff --git a/content/events/chaostreff.md b/content/events/chaostreff.md
index 767fbc9..beb006c 100644
--- a/content/events/chaostreff.md
+++ b/content/events/chaostreff.md
@@ -7,9 +7,10 @@ showmetadates: false
 showmetalinks: false
 aliases:
 - /termine/freitag
+event:
+  weekly:
+    weekday: Freitag
+    begin: '19.00'
 ---
 
-{{< event_weekly
-    weekday="Freitag"
-    begin="19.00"
->}}
+{{< event_weekly >}}
diff --git a/content/events/elektronikrunde.md b/content/events/elektronikrunde.md
index 4b2d1ee..66ad2a6 100644
--- a/content/events/elektronikrunde.md
+++ b/content/events/elektronikrunde.md
@@ -7,10 +7,11 @@ showmetadates: false
 showmetalinks: false
 aliases:
 - /termine/dienstag
+event:
+  weekly:
+    weekday: Dienstag
+    begin: '19.30'
+    finish: '22.30'
 ---
 
-{{< event_weekly
-    weekday="Dienstag"
-    begin="19.30"
-    finish="22.30"
->}}
+{{< event_weekly >}}
diff --git a/content/events/freifunk.md b/content/events/freifunk.md
index ef5d2ba..a5ec333 100644
--- a/content/events/freifunk.md
+++ b/content/events/freifunk.md
@@ -5,9 +5,10 @@ description: Router mit Antennen!
 draft: false
 showmetadates: false
 showmetalinks: false
+event:
+  weekly:
+    weekday: Donnerstag
+    begin: '19.30'
 ---
 
-{{< event_weekly
-    weekday="Donnerstag"
-    begin="19.30"
->}}
+{{< event_weekly >}}
diff --git a/content/events/hw4f_computerausgabe.md b/content/events/hw4f_computerausgabe.md
index 3bc92ee..80908c9 100644
--- a/content/events/hw4f_computerausgabe.md
+++ b/content/events/hw4f_computerausgabe.md
@@ -7,11 +7,12 @@ showmetadates: false
 showmetalinks: false
 aliases:
 - /termine/mittwoch
+event:
+  weekly:
+    weekday: Mittwoch
+    begin: '17.00'
+    finish: '20.00'
+    annotation: nur bei Bedarf & auf Einladung
 ---
 
-{{< event_weekly
-    weekday="Mittwoch"
-    note="nur bei Bedarf & auf Einladung"
-    begin="17.00"
-    finish="20.00"
->}}
+{{< event_weekly >}}
diff --git a/content/events/programmierrunde.md b/content/events/programmierrunde.md
index 74af04f..520535c 100644
--- a/content/events/programmierrunde.md
+++ b/content/events/programmierrunde.md
@@ -7,10 +7,11 @@ showmetadates: false
 showmetalinks: false
 aliases:
 - /termine/montag
+event:
+  weekly:
+    weekday: Montag
+    begin: '19.30'
+    finish: '22.00'
 ---
 
-{{< event_weekly
-    weekday="Montag"
-    begin="19.30"
-    finish="22.00"
->}}
+{{< event_weekly >}}
diff --git a/content/events/techniksprechstunde.md b/content/events/techniksprechstunde.md
index bbda2c8..9aea865 100644
--- a/content/events/techniksprechstunde.md
+++ b/content/events/techniksprechstunde.md
@@ -7,10 +7,11 @@ showmetadates: false
 showmetalinks: false
 aliases:
 - /termine/donnerstag
+event:
+  weekly:
+    weekday: Donnerstag
+    begin: '19.00'
+    finish: '21.30'
 ---
 
-{{< event_weekly
-    weekday="Donnerstag"
-    begin="19.00"
-    finish="22.00"
->}}
+{{< event_weekly >}}
diff --git a/layouts/shortcodes/event_weekly.html b/layouts/shortcodes/event_weekly.html
index 53d03ab..5a9195d 100644
--- a/layouts/shortcodes/event_weekly.html
+++ b/layouts/shortcodes/event_weekly.html
@@ -1,4 +1,14 @@
-{{- $weekday := .Get "weekday" }}
+{{- $weekday := $.Page.Param "event.weekly.weekday" }}
+{{- if not $weekday }}
+{{- errorf "missing value for 'event.weekly.weekday': %s" .Position }}
+{{- end }}
+{{- $begin := $.Page.Param "event.weekly.begin" }}
+{{- if not $begin }}
+{{- errorf "missing value for 'event.weekly.begin': %s" .Position }}
+{{- end }}
+{{- $finish := $.Page.Param "event.weekly.finish" }}
+{{- $interval := $.Page.Param "event.weekly.interval" }}
+{{- $annotation := $.Page.Param "event.weekly.annotation" }}
 <p></p>
 <div class="purge-g">
   <div class="pure-u-1-24">
@@ -22,14 +32,14 @@
     <tr>
       <td>
         Jeden
-        {{ with .Get "interval" }}
-          {{ . }}.
+        {{ with $interval }}
+          {{ . }}
           {{ $weekday }}
           im Monat
         {{ else }}
           {{ $weekday }}
         {{ end }}
-        {{ with .Get "note" }}
+        {{ with $annotation }}
           <br>
           <small>
             ({{ . }})
@@ -37,11 +47,11 @@
         {{ end }}
       </td>
       <td>
-        {{ .Get "begin" }}
+        {{ $begin }}
         Uhr
       </td>
       <td>
-        {{ with .Get "finish" }}
+        {{ with $finish }}
           {{ . }}
           Uhr
         {{ else }}