diff --git a/themes/nluug/layouts/evenementen/list.html b/themes/nluug/layouts/evenementen/list.html
new file mode 100644
index 0000000..8e67086
--- /dev/null
+++ b/themes/nluug/layouts/evenementen/list.html
@@ -0,0 +1,15 @@
+{{ define "main" }}
+  <section>
+    <ul reversed class="list">
+      {{ range .Pages }}
+        <li>
+          <a class="link" href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</a>
+          <hr class="hr-list">
+          {{ if isset .Params "event_start" }}
+          <time class="g time" datetime="{{ dateFormat "02-01-2006" .Params.event_start }}">{{ dateFormat "02-01-2006" .Params.event_start }}</time>
+          {{ end }}
+        </li>
+        {{ end }}
+    </ul>
+  </section>
+{{ end }}
diff --git a/themes/nluug/layouts/evenementen/single.html b/themes/nluug/layouts/evenementen/single.html
index 7de47c8..1f06bb1 100644
--- a/themes/nluug/layouts/evenementen/single.html
+++ b/themes/nluug/layouts/evenementen/single.html
@@ -1,22 +1,22 @@
 {{ define "main" }}
-
-  <hr>
-  {{ .Content }}
+  {{ with .Params.event_title }}<h2>{{ . }}</h2>{{ end }}
+  <div>{{ .Content }}</div>
   {{ if isset .Params "event_start" }}
 
     {{ $event_start := .Params.event_start | time }}
-
     <div class="highlight-box">
+
+      <h3>Locatie</h3>
+      <strong>{{ .Params.event_location }}</strong>
+      <p>{{ .Params.event_address.street_address }}<br>{{ .Params.event_address.postal_code }}, {{ .Params.event_address.city }}<br>{{ .Params.event_address.country_name }}</p>
+
+      <h3>Datum en tijd</h3>
       <ul>
         <li>Start: {{ time.Format "02-01-2006 15:04" .Params.event_start }}</li>
         <li>Einde: {{ time.Format "02-01-2006 15:04" .Params.event_end }}</li>
       </ul>
     </div>
 
-    {{ with .OutputFormats.Get "calendarevent" }}
-      <a href="{{ .RelPermalink }}" class="button">Kalender (iCal-bestand)</a>
-    {{ end }}
-
     {{ with .Params.event_register_link }}
       {{ if le now $event_start }}
         <a href="{{ . }}" class="button">Inschrijven</a>
@@ -24,6 +24,17 @@
         <p>Dit evenement is al afgelopen, inschrijven is daarom niet meer mogelijk.</p>
       {{ end }}
     {{ end }}
+
+    <h3>Kalender</h3>
+    <p>Zet het event alvast in je agenda met onderstaande opties!</p>
+    <ul>
+    {{ with .OutputFormats.Get "calendarevent" }}
+      <li><a href="{{ .RelPermalink }}">Importeren via iCal-bestand</a></li>
+    {{ end }}
+    <li><a href="https://www.google.com/calendar/render?action=TEMPLATE&text={{ .Params.event_title | urlquery }}&details=Locatie:%20{{ .Params.event_location | urlquery }}&location={{ .Params.event_address.street_address }}%2c%20{{ .Params.event_address.postal_code }}%2c%20{{ .Params.event_address.city }}%2c%20{{ .Params.event_address.country_name }}&dates={{ time.Format "20060102T150405" .Params.event_start }}/{{ time.Format "20060102T150405" .Params.event_end }}&ctz={{ .Params.event_timezone }}">Importeren naar Google-kalender</a></li>
+    </ul>
+
+
   {{ else }}
     <p>Waarschuwing: dit evenement mist gegevens zoals start en einddatum.</p>
   {{ end }}
diff --git a/themes/nluug/layouts/evenementen/single.ics b/themes/nluug/layouts/evenementen/single.ics
index 2dbd8eb..38ca89e 100644
--- a/themes/nluug/layouts/evenementen/single.ics
+++ b/themes/nluug/layouts/evenementen/single.ics
@@ -1,6 +1,25 @@
 {{ if not (isset .Params "no-ics-file") }}BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:Europe/Amsterdam
+X-LIC-LOCATION:Europe/Amsterdam
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:{{ .Title }}
 DESCRIPTION:{{ trim (.Content | plainify) "\n" }} Voor meer informatie zie {{ .Site.Params.LiveSiteUrl }}{{ .Permalink }}