diff --git a/content/events.md b/content/events.md
index 477f519..5daa83c 100755
--- a/content/events.md
+++ b/content/events.md
@@ -35,9 +35,11 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli
   *Event link:* [2022 FIRST Cyber Threat Intelligence Symposium | #FIRSTCTI22](https://www.first.org/events/symposium/berlin2022/program)
 
 ### Public MISP trainings 
+<script type="text/javascript" src="https://www.xing-events.com/resources/js/amiandoExport.js"></script>
 
 - #### MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals
-  *When:* 13th September 2022 14:00-17:00 UTC
+
+  *When:* {{< time-and-date-event `13th September 2022 14:00-17:00 UTC` `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` `20220913T14` `3` >}}</a>
 
   *Where:* Remote (Zoom and online MISP traning instance)
 
@@ -48,10 +50,13 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli
     - Encoding a report
     - Making use of the various tools in MISP from an analyst perspective
 
-  *Event link:* [Register for this event](https://IMKNUTR.xing-events.com/IMKNUTR.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true)
+  *Event link:* {{< collapse-event `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` >}}
+      <iframe title="Ticket shop" src="https://IMKNUTR.xing-events.com/IMKNUTR.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true" frameborder="1" width="650px" id="_amiandoIFrame5078466">
+      <p>This page requires frame support. Please use a frame compatible browser to see the ticket sales module.</p></iframe>
+  {{< /collapse-event >}}
 
 - #### MISP Training - Administration and Deployment of MISP software
-  *When:* 14th September 2022 14:00-17:00 UTC
+  *When:* {{< time-and-date-event `14th September 2022 14:00-17:00 UTC` `MISP Training - Administration and Deployment of MISP software` `20220914T14` `3` >}}</a>
 
   *Where:* Remote (Zoom and online MISP traning instance)
 
@@ -61,12 +66,14 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli
     - Deploying / running your MISP, i.e.
       - Configuration
       - Installation
-      - Community management
+      - <span class="border border-success">Community management</span>
 
-  *Event link:* [Register for this event](https://BVJBEEU.xing-events.com/BVJBEEU.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true)
+  *Event link:* {{< collapse-event `MISP Training - Administration and Deployment of MISP software` >}}
+      <iframe title="Ticket shop" src="https://BVJBEEU.xing-events.com/BVJBEEU.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true" width="650px" id="_amiandoIFrame5078473"><p>This page requires frame support. Please use a frame compatible browser to see the ticket sales module.</p></iframe>
+  {{< /collapse-event >}}
 
 - #### MISP Training - Advanced Developer session from API to MISP internals
-  *When:* 15th September 2022 14:00-17:00 UTC
+  *When:* {{< time-and-date-event `15th September 2022 14:00-17:00 UTC` `MISP Training - Advanced Developer session from API to MISP internals` `20220915T14` `3` >}}
 
   *Where:* Remote (Zoom and online MISP traning instance)
 
@@ -77,7 +84,9 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli
     - Supporting dev libraries
     - Session on development of MISP internals
 
-  *Event link:* [Register for this event](https://IMGQRQQ.xing-events.com/IMGQRQQ.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true)
+  *Event link:* {{< collapse-event `MISP Training - Advanced Developer session from API to MISP internals` >}}
+      <iframe title="Ticket shop" src="https://IMGQRQQ.xing-events.com/IMGQRQQ.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true" width="650px" id="_amiandoIFrame5078480"><p>This page requires frame support. Please use a frame compatible browser to see the ticket sales module.</p></iframe>
+    {{< /collapse-event >}}
 
 ### Past events
 
diff --git a/layouts/shortcodes/collapse-event.html b/layouts/shortcodes/collapse-event.html
new file mode 100644
index 0000000..909ea68
--- /dev/null
+++ b/layouts/shortcodes/collapse-event.html
@@ -0,0 +1,18 @@
+{{/*
+  Parameters:
+   Parameter 0: Will be used to render "Register for <0>"
+   Parameter 1: Will replace the link text "Register for this event"
+   Parameter 2: Will replace the whole "Register for " header. Parameter 0 is thus void.
+  Example usage: 
+
+  {{< collapse-event `MISP Training - Advanced Developer session from API to MISP internals` >}}
+    < insert xing iframe code here >
+  {{< /collapse-event >}}
+
+*/}}{{ $collapse_id := md5 .Inner }}<a data-toggle="collapse" href="#collapse{{ $collapse_id }}" role="button" aria-expanded="false" aria-controls="collapse{{ $collapse_id }}">{{ if (len (.Get 1)) }}{{ .Get 1 }}{{ else }}Register for this event{{ end }}</a>
+<div class="collapse border" id="collapse{{ $collapse_id }}">
+  <div class="card card-body border">
+	  <b>{{ if (len (.Get 2)) }}{{ .Get 2 }}{{ else }}Register for {{ .Get 0 }}{{ end }}</b>
+	{{ .Inner }}
+  </div>
+</div>
diff --git a/layouts/shortcodes/time-and-date-event.html b/layouts/shortcodes/time-and-date-event.html
new file mode 100644
index 0000000..7d1fe25
--- /dev/null
+++ b/layouts/shortcodes/time-and-date-event.html
@@ -0,0 +1,13 @@
+{{/*
+  Parameters:
+   Parameter 0: Human readable time and date
+   Parameter 1: Title of event
+   Parameter 2: ISO time for event (UTC), i.e 20220802T21
+   Parameter 3: Duration (optional)
+
+   Example usage: 
+
+   {{< time-and-date-event `15th September 2022 14:00-17:00 UTC` `MISP Training - Advanced Developer session from API to MISP internals` `20220915T14` `3` >}}
+
+*/}}
+<a href="https://www.timeanddate.com/worldclock/fixedtime.html?{{ (querify "msg" (.Get 1)) | safeURL }}&iso={{ .Get 2 }}&p1=1440{{ if .Get 3 }}&{{ (querify "ah" (.Get 3)) | safeURL }}{{ end }}">{{ .Get 0 }}</a>