diff --git a/content/evenementen/nluug/najaarsconferentie-2023/index.md b/content/evenementen/nluug/najaarsconferentie-2023/index.md
index 0b64bd9..5a8499c 100644
--- a/content/evenementen/nluug/najaarsconferentie-2023/index.md
+++ b/content/evenementen/nluug/najaarsconferentie-2023/index.md
@@ -20,6 +20,9 @@ event_address:
   postal_code: "3526 KV"
   city: "Utrecht"
   country_name: "The Netherlands"
+event_cfp_start_date: 2023-05-11
+event_cfp_close_date: 2023-09-28
+event_cfp_link: https://cfp.nluug.nl/nluug-najaarsconferentie-2023/cfp
 event_members_only: true
 event_register_start_date: 2023-07-01
 event_register_end_date: 2023-11-29
diff --git a/themes/nluug/layouts/evenementen/schedule-event.html b/themes/nluug/layouts/evenementen/schedule-event.html
index b06a9e7..5d4e431 100644
--- a/themes/nluug/layouts/evenementen/schedule-event.html
+++ b/themes/nluug/layouts/evenementen/schedule-event.html
@@ -4,21 +4,68 @@
   {{ if isset .Params "event_start" }}
 
     {{ $event_start := .Params.event_start | time }}
-    <div class="highlight-box highlight-box-nluug">
-      <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>
 
     {{ if le now $event_start }}
+      {{ if .Params.event_cfp_link }}
+        <h2>Call for Proposals</h2>
+        <p>Een goed programma is afhankelijk van sprekers met interessante lezingen. Wil je bijdragen aan dit programma, dan verwelkomen we graag je inzending(en)!</p>
+        {{ if .Params.event_cfp_start_date }}
+          {{ $event_cfp_start_date := .Params.event_cfp_start_date | time }}
+          {{ if le now $event_cfp_start_date }}
+            <p>De Call for Proposals opent op {{ .Params.event_cfp_start_date | time.Format ":date_full" }}.</p>
+          {{ else }}
+            {{ if .Params.event_cfp_end_date }}
+              {{ $event_cfp_end_date := .Params.event_cfp_end_date | time }}
+              {{ if ge now $event_cfp_end_date }}
+              <p>De Call for Proposals is gesloten na {{ $event_cfp_end_date }}. Mocht je toch nog een inzending hebben, neem dan contact op met de programmacommissie.</p>
+              {{ else }}
+                <a href="{{ .Params.event_cfp_link }}" class="button">Naar CFP</a>
+              {{ end }}
+            {{ else }}
+              <a href="{{ .Params.event_cfp_link }}" class="button">Naar CFP</a>
+            {{ end }}
+          {{ end }}
+        {{ else }}
+          <p>Fout: Er ontbreekt een datum wanneer de CFP open gaat (event_cfp_start).</p>
+        {{ end }}
+      {{ else }}
+        <p>Fout: Er ontbreekt een link voor de Call for Proposals (event_cfp_link).</p>
+      {{ end }}
+    {{ end }}
+
+
+    <h2>Locatie, datum en tijden</h2>
+    <div class="highlight-box highlight-box-nluug">
+      <h3>{{ .Params.event_location }}</h3>
+      <p>{{ .Params.event_address.street_address }}<br>{{ .Params.event_address.postal_code }}, {{ .Params.event_address.city }}<br>{{ .Params.event_address.country_name }}</p>
+
+      {{ $compare_event_start_date := .Params.event_start | time.Format "2006-01-02" }}
+      {{ $compare_event_end_date := .Params.event_end | time.Format "2006-01-02" }}
+      {{ if eq $compare_event_start_date $compare_event_end_date }}
+        <h3>Datum en tijd</h3>
+        <p>Dit evenement vindt plaats op {{ .Params.event_start | time.Format ":date_full" }} ({{ .Params.event_start | time.Format "15:04" }}-{{ .Params.event_end | time.Format "15:04" }}).</p>
+      {{ else }}
+        <h3>Data</h3>
+        <ul>
+          <li>Start evenement: {{ .Params.event_start | time.Format "2006-01-02 15:04" }}</li>
+          <li>Einde evenement: {{ .Params.event_end | time.Format "2006-01-02 15:04" }}</li>
+        </ul>
+      {{ end }}
+    </div>
+
+
+    {{ if le now $event_start }}
+      <h2>Kalender</h2>
+      <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>
+
       {{ if .Params.event_register_link }}
-        <h3>Inschrijven</h3>
+        <h2>Inschrijven</h2>
         <p>Om deel te nemen aan dit evenement is inschrijving vereist.</p>
         {{ if .Params.event_register_start_date }}
           {{ $event_register_start_date := .Params.event_register_start_date | time }}
@@ -42,17 +89,8 @@
       {{ else }}
         <p>Fout: Er ontbreekt een link om in te schrijven.</p>
       {{ 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 }}
-      <h3>Presentaties, foto's en opnames</h3>
+      <h2>Presentaties, foto's en opnames</h2>
       <p>Na de conferentie verzamelen we de opnames en foto's. Nadat ze beschikbaar komen zijn ze te raadplegen via de pagina's in onderstaand programma.</p>
     {{ end }}
 
@@ -60,6 +98,7 @@
     <p>Waarschuwing: dit evenement mist gegevens zoals start en einddatum.</p>
   {{ end }}
 
+
   <!-- TODO
   <h2>Sprekers</h2>
   Nog in te vullen