diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index b2f83079..203decca 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -16,76 +16,15 @@
   {{ partial "partials/header/basic.html" . }}
   {{ end }}
   {{ if .IsHome }}
-    {{ if .Site.Params.homePageVideo }}
-    <style>
-      @media screen and (min-width: 1023px) {
-        .video-margin {
-          margin-top: 97vh;
-        }
-      }
-    </style>
-  <div class="lg:absolute inset-0 w-full lg:w-screen h-screen">
-    <video class="h-full mx-auto object-cover" autoplay loop muted>
-      <source src="{{ .Site.Params.homePageVideo }}" data-src="{{ .Site.Params.homePageVideo }}" type="video/mp4">
-    </video>
-  </div>
-    {{ end }}
+    {{- partial "video.html" . -}}
   {{ end }}
-  <!-- <div id="the-top" class="absolute flex self-center">
-    <a class="px-3 py-1 text-sm -translate-y-8 rounded-b-lg bg-primary-200 focus:translate-y-0 dark:bg-neutral-600"
-      href="#main-content"><span
-        class="font-bold text-primary-600 ltr:pr-2 rtl:pl-2 dark:text-primary-400">&darr;</span>{{ i18n
-      "nav.skip_to_main" }}</a> -->
   </div>
   <div class="relative flex flex-col grow">
-    <main id="main-content" class="grow video-margin">
+    <main id="main-content" class="grow">
     {{ if .IsHome }}
-      <h2 class="mt-8 text-2xl font-extrabold mb-10">Sponsors</h2>
-      {{ $images := .Site.Params.sponsors }}
-      <link rel="stylesheet" href="css/infinite.css">
-      <script src="js/main.js"></script>
-      <div class="marquee-wrapper" style="user-select: none;">
-        <div class="marquee-content scrollingX">
-          {{ $num := 0 }}
-          {{ range $images }}
-          <div class="card-testimonial flex items-center">
-            <article>
-              <picture>
-                {{ if .site }}
-                  <a href="{{ .site }}" target="_blank"><img src="{{ .img }}" alt="{{ .img }}"></a>
-                {{ else }}
-                  <img src="{{ .img }}" alt="{{ .img }}">
-                {{ end }}
-              </picture>
-              {{ if .name }}
-                <article class="short-description"><p class="text-center mt-1">{{ .name }}</p></article>
-              {{ end }}
-            </article>
-          </div>
-          {{ $num = add $num 1 }}
-          {{ end }}
-          {{ $num := 0 }}
-          {{ range $images }}
-          <div class="card-testimonial flex items-center">
-            <article>
-              <picture>
-                {{ if .site }}
-                <a href="{{ .site }}" target="_blank"><img src="{{ .img }}" alt="{{ .img }}"></a>
-                {{ else }}
-                <img src="{{ .img }}" alt="{{ .img }}">
-                {{ end }}
-              </picture>
-              {{ if .name }}
-              <article class="short-description">
-                <p class="text-center mt-1">{{ .name }}</p>
-              </article>
-              {{ end }}
-            </article>
-          </div>
-          {{ $num = add $num 1 }}
-          {{ end }}
-        </div>
-      </div>
+      {{- partial "sponsors.html" . -}}
+      {{- partial "next-match.html" . -}}
+      {{- partial "last-match.html" . -}}
     {{ end }}
     {{ block "main" . }}{{ end }}
     {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 1) }}
diff --git a/layouts/partials/last-match.html b/layouts/partials/last-match.html
new file mode 100644
index 00000000..a0b0f891
--- /dev/null
+++ b/layouts/partials/last-match.html
@@ -0,0 +1,35 @@
+<h2 class="mt-8 text-2xl font-extrabold mb-10">Ultima Partita</h2>
+{{ $match := .Site.Params.last_match }}
+<section class="flex flex-col flex-nowrap items-center gap-5 sm:flex-row">
+    <div class="h-full text-center flex flex-1 flex-grow justify-center">
+        <img src="./teams/{{ $match.home_logo }}" alt="" width="80rem"/>
+    </div>
+
+    <div class="h-full text-center flex-1 flex-grow p-6">
+        {{ if strings.Contains $match.home "Saviors" }}
+            <h1 class="text-2xl font-extrabold" style="color: #1c8a37">{{ $match.home }}</h2>
+        {{ else }}
+            <h1 class="text-2xl font-extrabold">{{ $match.home }}</h2>
+        {{ end }}
+    </div>
+
+    <div class="h-full text-center flex-1 flex-grow">
+        <h1 class="text-2xl not-italic font-extrabold" style="color: #95c11f">{{ $match.result }}</h1>
+    </div>
+
+    <div class="h-full text-center flex-1 flex-grow p-6">
+        {{ if strings.Contains $match.visitors "Saviors" }}
+            <h1 class="text-2xl font-extrabold" style="color: #1c8a37">{{ $match.visitors }}</h2>
+        {{ else }}
+            <h1 class="text-2xl font-extrabold">{{ $match.visitors }}</h2>
+        {{ end }}
+    </div>
+
+    <div class="h-full text-center flex flex-1 flex-grow justify-center">
+        <img src="./teams/{{ $match.visitors_logo }}" alt="" width="80rem"/>
+    </div>
+</section>
+<div style="background-color: #1c8a37" class="h-[2px] mt-2 mb-2"></div>
+<div class="flex items-center justify-center">
+    <p class="text-sm h-full text-center">{{ $match.when_where }}</p>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/next-match.html b/layouts/partials/next-match.html
new file mode 100644
index 00000000..4c8e9dca
--- /dev/null
+++ b/layouts/partials/next-match.html
@@ -0,0 +1,35 @@
+<h2 class="mt-8 text-2xl font-extrabold mb-10">Prossima Partita</h2>
+{{ $match := .Site.Params.next_match }}
+<section class="flex flex-col flex-nowrap items-center gap-5 sm:flex-row">
+    <div class="h-full text-center flex flex-1 flex-grow justify-center">
+        <img src="./teams/{{ $match.home_logo }}" alt="" class="h-16 w-16" width="80rem"/>
+    </div>
+
+    <div class="h-full text-center flex-1 flex-grow p-6">
+        {{ if strings.Contains $match.home "Saviors" }}
+            <h1 class="text-2xl font-extrabold" style="color: #1c8a37">{{ $match.home }}</h2>
+        {{ else }}
+            <h1 class="text-2xl font-extrabold">{{ $match.home }}</h2>
+        {{ end }}
+    </div>
+
+    <div class="h-full text-center flex-1 flex-grow">
+        <h1 class="text-2xl not-italic font-extrabold" style="color: #95c11f">{{ $match.result }}</h1>
+    </div>
+
+    <div class="h-full text-center flex-1 flex-grow p-6">
+        {{ if strings.Contains $match.visitors "Saviors" }}
+            <h1 class="text-2xl font-extrabold" style="color: #1c8a37">{{ $match.visitors }}</h2>
+        {{ else }}
+            <h1 class="text-2xl font-extrabold">{{ $match.visitors }}</h2>
+        {{ end }}
+    </div>
+
+    <div class="h-full text-center flex flex-1 flex-grow justify-center">
+        <img src="./teams/{{ $match.visitors_logo }}" alt="" width="80rem"/>
+    </div>
+</section>
+<div style="background-color: #1c8a37" class="h-[2px] mt-2 mb-2"></div>
+<div class="flex items-center justify-center">
+    <p class="text-sm h-full text-center">{{ $match.when_where }}</p>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/sponsors.html b/layouts/partials/sponsors.html
new file mode 100644
index 00000000..daee3916
--- /dev/null
+++ b/layouts/partials/sponsors.html
@@ -0,0 +1,47 @@
+<h2 class="mt-8 text-2xl font-extrabold mb-10">Sponsors</h2>
+{{ $images := .Site.Params.sponsors }}
+<link rel="stylesheet" href="css/infinite.css" />
+<script src="js/main.js"></script>
+<div class="marquee-wrapper" style="user-select: none">
+  <div class="marquee-content scrollingX">
+    {{ $num := 0 }} {{ range $images }}
+    <div class="card-testimonial flex items-center">
+      <article>
+        <picture>
+          {{ if .site }}
+          <a href="{{ .site }}" target="_blank"
+            ><img src="{{ .img }}" alt="{{ .img }}"
+          /></a>
+          {{ else }}
+          <img src="{{ .img }}" alt="{{ .img }}" />
+          {{ end }}
+        </picture>
+        {{ if .name }}
+        <article class="short-description">
+          <p class="text-center mt-1">{{ .name }}</p>
+        </article>
+        {{ end }}
+      </article>
+    </div>
+    {{ $num = add $num 1 }} {{ end }} {{ $num := 0 }} {{ range $images }}
+    <div class="card-testimonial flex items-center">
+      <article>
+        <picture>
+          {{ if .site }}
+          <a href="{{ .site }}" target="_blank"
+            ><img src="{{ .img }}" alt="{{ .img }}"
+          /></a>
+          {{ else }}
+          <img src="{{ .img }}" alt="{{ .img }}" />
+          {{ end }}
+        </picture>
+        {{ if .name }}
+        <article class="short-description">
+          <p class="text-center mt-1">{{ .name }}</p>
+        </article>
+        {{ end }}
+      </article>
+    </div>
+    {{ $num = add $num 1 }} {{ end }}
+  </div>
+</div>
diff --git a/layouts/partials/video.html b/layouts/partials/video.html
new file mode 100644
index 00000000..53d2446e
--- /dev/null
+++ b/layouts/partials/video.html
@@ -0,0 +1,19 @@
+{{ if .Site.Params.homePageVideo }}
+<style>
+  @media screen and (min-width: 1023px) {
+    .video-margin {
+      margin-top: 97vh;
+    }
+  }
+</style>
+<div class="lg:absolute inset-0 w-full lg:w-screen h-screen">
+  <video class="h-full mx-auto object-cover" autoplay loop muted>
+    <source
+      src="{{ .Site.Params.homePageVideo }}"
+      data-src="{{ .Site.Params.homePageVideo }}"
+      type="video/mp4"
+    />
+  </video>
+</div>
+<div class="relative video-margin"></div>
+{{ end }}