diff --git a/_data/nav.yml b/_data/nav.yml
index 727db62..ca455de 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -2,6 +2,8 @@
   path: /
 - title: Location
   path: /location
+- title: Programme
+  path: /programme
 - title: News
   path: https://gaiwan.co/tag/heart-of-clojure
 # - title: Speakers
diff --git a/_includes/speaker.html b/_includes/speaker.html
new file mode 100644
index 0000000..dd98733
--- /dev/null
+++ b/_includes/speaker.html
@@ -0,0 +1,32 @@
+<div class="avatar-socials">
+  <a href="{{talk.url}}">
+    <img class="avatar" src="{{speaker.img}}">
+  </a>
+  <div class="socials">
+    {% if speaker.personal-site-url %}
+    <a class="social" href="{{speaker.personal-site-url}}" title="{{speaker.personal-site-url}}">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+        <g fill="var(--pink-6)">
+          <path d="M20.437 2.69c-3.37 0-5.778 3.05-8.186 5.297.322 0 .804-.16 1.285-.16.803 0 1.605.16 2.408.48 1.284-1.283 2.568-2.727 4.494-2.727.963 0 2.087.48 2.89 1.123 1.605 1.605 1.605 4.174 0 5.78l-4.174 4.172c-.642.642-1.926 1.124-2.89 1.124-2.246 0-3.37-1.446-4.172-3.212l-2.086 2.087c1.284 2.408 3.21 4.173 6.1 4.173 1.926 0 3.69-.802 4.815-2.086l4.172-4.174c1.445-1.444 2.408-3.21 2.408-5.297-.32-3.53-3.53-6.58-7.063-6.58z"/>
+          <path d="M13.535 22.113l-1.444 1.444c-.64.642-1.925 1.124-2.89 1.124-.962 0-2.085-.48-2.888-1.123-1.605-1.605-1.605-4.334 0-5.778l4.174-4.175c.642-.642 1.926-1.123 2.89-1.123 2.246 0 3.37 1.605 4.172 3.21l2.087-2.087c-1.284-2.407-3.21-4.173-6.1-4.173-1.926 0-3.692.803-4.815 2.087L4.547 15.69c-2.73 2.73-2.73 7.063 0 9.63 2.568 2.57 7.062 2.73 9.47 0l3.05-3.05c-.482.162-.963.162-1.445.162-.803 0-1.445 0-2.087-.32z"/>
+	</g>
+      </svg>
+    </a>
+    {% endif %}
+    {% if speaker.mastodon %}
+    <a class="social" href="https://{{speaker.mastodon-instance}}/@{{speaker.mastodon-handle}}" title="{{speaker.mastodon}}">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976">
+        <path fill="#2b90d9" d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915"/>
+        <path fill="#fff" d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675"/>
+      </svg>
+    </a>
+    {% endif %}
+    {% if speaker.twitter %}
+    <a class="social" href="https://x.com/{{speaker.twitter}}" title="@{{speaker.twitter}}@twitter.com">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+        <path fill="#1DA1F2" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"/>
+      </svg>
+    </a>
+    {% endif %}
+  </div>
+</div>
diff --git a/_includes/talks_page_talk.html b/_includes/talks_page_talk.html
new file mode 100644
index 0000000..690efa9
--- /dev/null
+++ b/_includes/talks_page_talk.html
@@ -0,0 +1,22 @@
+<section class="talk">
+  <div class="details">
+    <h2><a href="{{talk.url}}">{{ talk.title }}</a></h2>
+    <div class="talk-type-label"><span>{{talk.type}}</span></div>
+    <p>{{ talk.abstract | markdownify}}</p>
+  </div>
+  <div class="speakers">
+    <ul>
+      {% for speaker in talk.speakers %}
+      <li class="speaker">
+          {% include speaker.html %}
+          <div class="speaker-name">
+            <a href="{{talk.url}}">
+              {{speaker.name}}
+            </a>
+          </div>
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+</section>
diff --git a/_layouts/talk.html b/_layouts/talk.html
index 0e5f6fb..5418a86 100644
--- a/_layouts/talk.html
+++ b/_layouts/talk.html
@@ -17,36 +17,7 @@ <h3>Speakers</h3>
     <ul>
       {% for speaker in page.speakers %}
       <li>
-        <div class="avatar-socials">
-          <img class="avatar" src="{{speaker.img}}">
-          <div class="socials">
-            {% if speaker.personal-site-url %}
-            <a class="social" href="{{speaker.personal-site-url}}" title="{{speaker.personal-site-url}}">
-              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-                <g fill="var(--pink-6)">
-                  <path d="M20.437 2.69c-3.37 0-5.778 3.05-8.186 5.297.322 0 .804-.16 1.285-.16.803 0 1.605.16 2.408.48 1.284-1.283 2.568-2.727 4.494-2.727.963 0 2.087.48 2.89 1.123 1.605 1.605 1.605 4.174 0 5.78l-4.174 4.172c-.642.642-1.926 1.124-2.89 1.124-2.246 0-3.37-1.446-4.172-3.212l-2.086 2.087c1.284 2.408 3.21 4.173 6.1 4.173 1.926 0 3.69-.802 4.815-2.086l4.172-4.174c1.445-1.444 2.408-3.21 2.408-5.297-.32-3.53-3.53-6.58-7.063-6.58z"/>
-                  <path d="M13.535 22.113l-1.444 1.444c-.64.642-1.925 1.124-2.89 1.124-.962 0-2.085-.48-2.888-1.123-1.605-1.605-1.605-4.334 0-5.778l4.174-4.175c.642-.642 1.926-1.123 2.89-1.123 2.246 0 3.37 1.605 4.172 3.21l2.087-2.087c-1.284-2.407-3.21-4.173-6.1-4.173-1.926 0-3.692.803-4.815 2.087L4.547 15.69c-2.73 2.73-2.73 7.063 0 9.63 2.568 2.57 7.062 2.73 9.47 0l3.05-3.05c-.482.162-.963.162-1.445.162-.803 0-1.445 0-2.087-.32z"/>
-	        </g>
-              </svg>
-            </a>
-            {% endif %}
-            {% if speaker.mastodon %}
-            <a class="social" href="https://{{speaker.mastodon-instance}}/@{{speaker.mastodon-handle}}" title="{{speaker.mastodon}}">
-              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976">
-                <path fill="#2b90d9" d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915"/>
-                <path fill="#fff" d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675"/>
-              </svg>
-            </a>
-            {% endif %}
-            {% if speaker.twitter %}
-            <a class="social" href="https://x.com/{{speaker.twitter}}" title="@{{speaker.twitter}}@twitter.com">
-              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-                <path fill="#1DA1F2" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"/>
-              </svg>
-            </a>
-            {% endif %}
-          </div>
-        </div>
+        {% include speaker.html %}
         <div>
           <h4>{{speaker.name}}</h4>
           <p>{{speaker.biography | markdownify}}</p>
diff --git a/css/basics.css b/css/basics.css
index 417651c..66ad402 100644
--- a/css/basics.css
+++ b/css/basics.css
@@ -13,13 +13,6 @@ header {
 }
 
 
-section {
-  margin: 0 auto;
-  margin-top: 2rem;
-  padding: 2rem;
-  text-align: center;
-}
-
 @media only screen and (max-width: 600px) {
   section {
     padding: 1rem;
diff --git a/css/front_page.css b/css/front_page.css
index 331dd17..3862ffc 100644
--- a/css/front_page.css
+++ b/css/front_page.css
@@ -1,3 +1,13 @@
+#front-page {
+
+  section {
+    margin: 0 auto;
+    margin-top: 2rem;
+    padding: 2rem;
+    text-align: center;
+  }
+
+}
 #speakers, #hosts {
   --avatar-size: 6rem;
   @media screen and (min-width: 80em) {
diff --git a/css/talks.css b/css/talks.css
index 7dc2877..af6f2ec 100644
--- a/css/talks.css
+++ b/css/talks.css
@@ -1,23 +1,25 @@
-.talk-page {
+.talk-page, .talks-page {
   --avatar-size: 10rem;
-  max-width: 800px;
   padding: 12px;
   margin: auto;
 
+  h1, h2, h3, h4, h5, .speaker-name {
+    a:not(:hover) {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+
   h1 {
     margin-top: 0;
     text-align: center;
-    & a:not(:hover) {
-      color: var(--black);
-      text-decoration: none;
-    }
   }
   .date-loc {
     margin-bottom: 4rem;
     text-align: center;
   }
 
-  h2 {
+  h2, h2 a {
       margin-bottom: 0;
       color: var(--pink-3);
   }
@@ -38,8 +40,6 @@
     .avatar-socials {
       flex-shrink: 0;
       flex-grow: 0;
-      margin-bottom: 2rem;
-      margin-right: 2rem;
     }
 
     .socials {
@@ -59,3 +59,33 @@
   }
 
 }
+
+.talk-page {
+  max-width: 800px;
+  .avatar-socials {
+    margin-bottom: 2rem;
+    margin-right: 2rem;
+  }
+}
+
+.talks-page {
+  max-width: 1200px;
+  @media screen and (min-width: 52em) {
+    .talk {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+  .speakers {
+    flex-grow: 0;
+    flex-shrink: 0;
+  }
+
+  .speaker {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+
+
+}
diff --git a/talks.html b/talks.html
index 204d8bd..c65a322 100644
--- a/talks.html
+++ b/talks.html
@@ -1,32 +1,21 @@
 ---
 layout: default
 title:  "Talks - Heart of Clojure"
-permalink: /talks
+permalink: /programme
 ---
-<div class="mv5">
-    <div class="lh-copy f4">
-        <h1 class="tc mw7 center">Talks - not yet finalised</h1>
-        <!-- <p class="tc mw7 center">Note that this list isn't yet complete, to stay in the loop, <a class="hoc-link" href="https://twitter.com/heartofclojure">follow @heartofclojure.</a></p>
-        -->
-
-        <div class="bg-white">
-            {% assign talks = site.talks %}
-            {% for talk in talks %}
-            <div class="cf mw8 center pt6" id="">
-                <div class="fl-m fl-l w-third-m w-third-l pa4">
-                    <span class="db pink-t60 b tc"></span>
-                </div>
-                <div class="fl-m fl-l w-two-thirds-m w-two-thirds-l pa3">
-                    <div class="bg-g{% cycle 1, 2, 3, 4 %}">
-                        <h2 class="mv0 blend-screen bg-white pr5-ns">
-                            <a href="{{talk.url}}">{{talk.title}}</a>
-                        </h2>
-                    </div>
-                    <p>{{talk.abstract}}</p>
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-
-    </div>
+<div class="talks-page">
+  <h1><a href="/">Heart of Clojure - Talks & Workshops</a></h1>
+  <div class="date-loc">September 18 & 19, Leuven, Belgium.</div>
+  {% for talk in site.talks %}
+  {% if talk.type == 'Keynote' %}
+  {% include talks_page_talk.html %}
+  {% endif %}
+  {% endfor %}
+  
+  {% for talk in site.talks %}
+  {% if talk.type != 'Keynote' %}
+  {% include talks_page_talk.html %}
+  {% endif %}
+  {% endfor %}
 </div>
+