diff --git a/source/_partials/nav.html.twig b/source/_partials/nav.html.twig
deleted file mode 100644
index e69de29b..00000000
diff --git a/source/_partials/sidebar.html.twig b/source/_partials/sidebar.html.twig
deleted file mode 100644
index e69de29b..00000000
diff --git a/source/_partials/speakerdeck.html.twig b/source/_partials/speakerdeck.html.twig
deleted file mode 100644
index 9fd51d7d..00000000
--- a/source/_partials/speakerdeck.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/source/_partials/talks-table-row.html.twig b/source/_partials/talks-table-row.html.twig
deleted file mode 100644
index 0aba9541..00000000
--- a/source/_partials/talks-table-row.html.twig
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- {{ row.event.date|date(row.event.fuzzy_date ? 'F Y' : 'j F Y') }}
-
- {% if row.event.time is defined %}
-
- {{ row.event.time }}
-
- {% endif %}
- |
-
- {% if not talk_page %}
-
- {% if row.talk.url is not empty %}
-
- {{ row.talk.title }}
-
- {% else %}
- {{ row.talk.title }}
- {% endif %}
-
-
- {% if row.talk.type %}
- {{ row.talk.type }}
- {% else %}
- {{ row.event.type|default('Talk') }}
- {% endif %}
-
- |
- {% endif %}
-
-
- {% if row.event.website is not empty %}
-
- {{ row.event.name }}
-
- {% else %}
- {{ row.event.name }}
- {% endif %}
-
- {% if row.event.location is defined %}
-
- {{ row.event.location }}
-
- {% endif %}
- |
-
- {% if not upcoming %}
-
- {% if row.event.joindin and row.event.date <= today %}
-
- joind.in
-
- {% endif %}
- |
- {% endif %}
-
diff --git a/source/_partials/talks-table.html.twig b/source/_partials/talks-table.html.twig
index 4dd604a3..b35be735 100644
--- a/source/_partials/talks-table.html.twig
+++ b/source/_partials/talks-table.html.twig
@@ -16,10 +16,68 @@
- {% for row in talks %}
- {% include "talks-table-row" with {
- today: 'today'|date('Y-m-d')
- } %}
+ {% for talk in talks %}
+
+
+ {{ talk.event.date|date(talk.event.fuzzy_date ? 'F Y' : 'j F Y') }}
+
+ {% if talk.event.time is defined %}
+
+ {{ talk.event.time }}
+
+ {% endif %}
+ |
+
+ {% if not talk_page %}
+
+ {% if talk.talk.url is not empty %}
+
+ {{ talk.talk.title }}
+
+ {% else %}
+ {{ talk.talk.title }}
+ {% endif %}
+
+
+ {% if talk.talk.type %}
+ {{ talk.talk.type }}
+ {% else %}
+ {{ talk.event.type|default('Talk') }}
+ {% endif %}
+
+ |
+ {% endif %}
+
+
+ {% if talk.event.website is not empty %}
+
+ {{ talk.event.name }}
+
+ {% else %}
+ {{ talk.event.name }}
+ {% endif %}
+
+ {% if talk.event.location is defined %}
+
+ {{ talk.event.location }}
+
+ {% endif %}
+ |
+
+ {% if not upcoming %}
+
+ {% if talk.event.joindin and talk.event.date <= 'today'|date('Y-m-d') %}
+
+ joind.in
+
+ {% endif %}
+ |
+ {% endif %}
+
{% endfor %}
diff --git a/source/_partials/tweet.html.twig b/source/_partials/tweet.html.twig
deleted file mode 100644
index a6fd2b0d..00000000
--- a/source/_partials/tweet.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-