diff --git a/.editorconfig b/.editorconfig
index 6528b8a..449f420 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,10 @@ trim_trailing_whitespace = true
 indent_size = 4
 indent_style = space
 
+[*.html]
+indent_size = 2
+indent_style = space
+
 [*.md]
 indent_size = 4
 indent_style = space
diff --git a/content/events/bitcoin_themenabend.md b/content/events/bitcoin_themenabend.md
new file mode 100644
index 0000000..7357e75
--- /dev/null
+++ b/content/events/bitcoin_themenabend.md
@@ -0,0 +1,15 @@
+---
+title: Bitcoin Themenabend
+slug: bitcoin-themenabend
+description: Crypto!
+draft: false
+showmetadates: false
+showmetalinks: false
+---
+
+{{< event_weekly
+    weekday="Mittwoch"
+    interval="1"
+    begin="20.00"
+    finish="23.30"
+>}}
diff --git a/content/events/chaostreff.md b/content/events/chaostreff.md
new file mode 100644
index 0000000..767fbc9
--- /dev/null
+++ b/content/events/chaostreff.md
@@ -0,0 +1,15 @@
+---
+title: Chaostreff Leipzig
+slug: chaostreff
+description: Open Chaos!
+draft: false
+showmetadates: false
+showmetalinks: false
+aliases:
+- /termine/freitag
+---
+
+{{< event_weekly
+    weekday="Freitag"
+    begin="19.00"
+>}}
diff --git a/content/events/elektronikrunde.md b/content/events/elektronikrunde.md
new file mode 100644
index 0000000..4b2d1ee
--- /dev/null
+++ b/content/events/elektronikrunde.md
@@ -0,0 +1,16 @@
+---
+title: Elektronikrunde
+slug: elektronikrunde
+description: Energie!
+draft: false
+showmetadates: false
+showmetalinks: false
+aliases:
+- /termine/dienstag
+---
+
+{{< event_weekly
+    weekday="Dienstag"
+    begin="19.30"
+    finish="22.30"
+>}}
diff --git a/content/events/freifunk.md b/content/events/freifunk.md
new file mode 100644
index 0000000..ef5d2ba
--- /dev/null
+++ b/content/events/freifunk.md
@@ -0,0 +1,13 @@
+---
+title: Freifunk Leipzig
+slug: freifunk
+description: Router mit Antennen!
+draft: false
+showmetadates: false
+showmetalinks: false
+---
+
+{{< event_weekly
+    weekday="Donnerstag"
+    begin="19.30"
+>}}
diff --git a/content/events/hw4f_computerausgabe.md b/content/events/hw4f_computerausgabe.md
new file mode 100644
index 0000000..3bc92ee
--- /dev/null
+++ b/content/events/hw4f_computerausgabe.md
@@ -0,0 +1,17 @@
+---
+title: HW4F Computerausgabe
+slug: hw4f-computerausgabe
+description: Hardware!
+draft: false
+showmetadates: false
+showmetalinks: false
+aliases:
+- /termine/mittwoch
+---
+
+{{< event_weekly
+    weekday="Mittwoch"
+    note="nur bei Bedarf & auf Einladung"
+    begin="17.00"
+    finish="20.00"
+>}}
diff --git a/content/events/programmierrunde.md b/content/events/programmierrunde.md
new file mode 100644
index 0000000..74af04f
--- /dev/null
+++ b/content/events/programmierrunde.md
@@ -0,0 +1,16 @@
+---
+title: Programmierrunde
+slug: programmierrunde
+description: Bugs!
+draft: false
+showmetadates: false
+showmetalinks: false
+aliases:
+- /termine/montag
+---
+
+{{< event_weekly
+    weekday="Montag"
+    begin="19.30"
+    finish="22.00"
+>}}
diff --git a/content/events/techniksprechstunde.md b/content/events/techniksprechstunde.md
new file mode 100644
index 0000000..bbda2c8
--- /dev/null
+++ b/content/events/techniksprechstunde.md
@@ -0,0 +1,16 @@
+---
+title: Techniksprechstunde
+slug: techniksprechstunde
+description: Kaputt!
+draft: false
+showmetadates: false
+showmetalinks: false
+aliases:
+- /termine/donnerstag
+---
+
+{{< event_weekly
+    weekday="Donnerstag"
+    begin="19.00"
+    finish="22.00"
+>}}
diff --git a/content/termine.md b/content/termine.md
index 9fe3424..436d24f 100644
--- a/content/termine.md
+++ b/content/termine.md
@@ -10,7 +10,6 @@ categories:
 showmetadates: false
 showmetalinks: false
 aliases:
-- /events
 - /kalender
 ---
 
diff --git a/layouts/shortcodes/event_weekly.html b/layouts/shortcodes/event_weekly.html
new file mode 100644
index 0000000..53d03ab
--- /dev/null
+++ b/layouts/shortcodes/event_weekly.html
@@ -0,0 +1,58 @@
+{{- $weekday := .Get "weekday" }}
+<p></p>
+<div class="purge-g">
+  <div class="pure-u-1-24">
+  </div>
+  <div class="pure-u-1-22">
+<table class="pure-table pure-table-horizontal centered">
+  <thead>
+    <tr>
+      <th>
+        Wochentag
+      </th>
+      <th>
+        von
+      </th>
+      <th>
+        bis
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        Jeden
+        {{ with .Get "interval" }}
+          {{ . }}.
+          {{ $weekday }}
+          im Monat
+        {{ else }}
+          {{ $weekday }}
+        {{ end }}
+        {{ with .Get "note" }}
+          <br>
+          <small>
+            ({{ . }})
+          </small>
+        {{ end }}
+      </td>
+      <td>
+        {{ .Get "begin" }}
+        Uhr
+      </td>
+      <td>
+        {{ with .Get "finish" }}
+          {{ . }}
+          Uhr
+        {{ else }}
+          open end
+        {{ end }}
+      </td>
+    </tr>
+  </tbody>
+</table>
+  </div>
+  <div class="pure-u-1-24">
+  </div>
+</div>
+<p></p>