diff --git a/content/eventos/2022-09-17-software-freedom-day/_agenda.png b/content/eventos/2022-09-17-software-freedom-day/_agenda.png
new file mode 100644
index 0000000..576612b
Binary files /dev/null and b/content/eventos/2022-09-17-software-freedom-day/_agenda.png differ
diff --git a/content/eventos/2022-09-17-software-freedom-day/cover.png b/content/eventos/2022-09-17-software-freedom-day/cover.png
index 4d61820..7b444c2 100644
Binary files a/content/eventos/2022-09-17-software-freedom-day/cover.png and b/content/eventos/2022-09-17-software-freedom-day/cover.png differ
diff --git a/content/eventos/2022-09-17-software-freedom-day/index.md b/content/eventos/2022-09-17-software-freedom-day/index.md
index 6b079b3..b1258b2 100644
--- a/content/eventos/2022-09-17-software-freedom-day/index.md
+++ b/content/eventos/2022-09-17-software-freedom-day/index.md
@@ -3,7 +3,7 @@ layout: evento
 title: Software Freedom Day 2022
 metadata:
   event:
-    location: Espaço Musas, Porto
+    location: Espaço Musas, Rua do Bonjardim, Porto
     date:
       start: 2022-09-17 14:30:00
       finish: 2022-09-17 18:00:00
@@ -14,14 +14,15 @@ aliases:
 O [Dia do Software Livre (Software Freedom Day)](https://www.softwarefreedomday.org) vai acontecer o dia 17 de Setembro de 2022. A ANSOL vai celebrar a data com uma sessão de apresentações curtas, com intervalos generosos, onde será privilegiada a vertente social nos "corredores" do evento.
 O dia terminará com um jantar convívio num restaurante próximo do local.
 
+Inscrições para o jantar: contacto@ansol.org
+
+![](_agenda.png)
+
 Agenda:
 
-14h30 - Abertura (ANSOL)
-15h00 - Governança Open Source no Ember.js (Ricardo Mendes)
-16h00 - Software Livre: pagar para quê? (Rui Teixeira)
-17h00 - O Open Source ganhou. O Software Livre perdeu. E agora? (Ricardo Lafuente)
-18h00 - Encerramento (ANSOL)
-19h30 - Jantar de convívio
-
-Inscrições para o jantar: contacto [arroba] ansol [ponto] org
-
+- 14h30 - Abertura (ANSOL)
+- 15h00 - Governança Open Source no Ember.js (Ricardo Mendes)
+- 16h00 - Software Livre: pagar para quê? (Rui Teixeira)
+- 17h00 - O Open Source ganhou. O Software Livre perdeu. E agora? (Ricardo Lafuente)
+- 18h00 - Encerramento (ANSOL)
+- 19h30 - Jantar de convívio
diff --git a/themes/academic/layouts/index.html b/themes/academic/layouts/index.html
index 5c8fb76..b0dc5b5 100644
--- a/themes/academic/layouts/index.html
+++ b/themes/academic/layouts/index.html
@@ -79,15 +79,7 @@
 
         {{ range $post := $query }}
         <li>
-          <a class="img" href="{{ .Permalink }}">
-            {{ $cover := (index (.Resources.ByType "image") 0) }}
-            {{ if not $cover }}
-              {{ $cover = resources.Get "images/default-events-cover.png" }}
-            {{ end }}
-            {{ with $cover }}
-              <img class='event-cover' src="{{ .Permalink }}" />
-            {{ end }}
-          </a>
+          {{ partial "thumbnail" . }}
           <div class="text">
             <p class="headline">
               <a class="title" href="{{ .Permalink }}">{{ .Title }}</a>
diff --git a/themes/academic/layouts/partials/evento.html b/themes/academic/layouts/partials/evento.html
index 52be41d..9f5e1e5 100644
--- a/themes/academic/layouts/partials/evento.html
+++ b/themes/academic/layouts/partials/evento.html
@@ -1,10 +1,4 @@
-<a class="img" href="{{ .Permalink }}">
-  {{ $cover := (index (.Resources.ByType "image") 0) }}
-  {{ if not $cover }}
-    {{ $cover = resources.Get "images/default-events-cover.png" }}
-  {{ end }}
-  <img class='event-cover' src="{{ $cover.Permalink }}" />
-</a>
+{{ partial "thumbnail" . }}
 <div class="text">
   <p class="headline">
     <a class="title" href="{{ .Permalink }}">{{ .Title }}</a>
diff --git a/themes/academic/layouts/partials/thumbnail.html b/themes/academic/layouts/partials/thumbnail.html
new file mode 100644
index 0000000..f9d8f6d
--- /dev/null
+++ b/themes/academic/layouts/partials/thumbnail.html
@@ -0,0 +1,12 @@
+<a class="img" href="{{ .Permalink }}">
+  {{ $cover := (.Resources.GetMatch "cover.*") }}
+  {{ if not $cover }}
+    {{ $cover := (index (.Resources.ByType "image") 0) }}
+    {{ if not $cover }}
+      {{ $cover = resources.Get "images/default-events-cover.png" }}
+    {{ end }}
+  {{ end }}
+  {{ with $cover }}
+    <img class='event-cover' src="{{ .Permalink }}" />
+  {{ end }}
+</a>