diff --git a/content/kittens/kittens-avatar.webp b/assets/photos/kittens-avatar.webp
similarity index 100%
rename from content/kittens/kittens-avatar.webp
rename to assets/photos/kittens-avatar.webp
diff --git a/content/kittens/_index.html b/content/kittens/_index.html
index 7e080bd..88c9851 100644
--- a/content/kittens/_index.html
+++ b/content/kittens/_index.html
@@ -1,23 +1,3 @@
 ---
 title: Kittens
-resources:
-  - name: photo
-    title: De Avatarkittens
-    src: kittens-avatar.webp
 ---
-
-{{< heading-block >}}
-<div class="lg:text-end">
-  <h1 class="mt-0">De kittens van Hamana</h1>
-  <p class="font-serif">Gefokt met liefde en kennis</p>
-
-  <div class="block">
-    <a
-      href="/nieuws"
-      class="whitespace-nowrap rounded-full bg-orange px-4 py-3 font-light text-white transition hover:bg-orange/75"
-    >
-      Het laatste nieuws
-    </a>
-  </div>
-</div>
-{{< /heading-block >}}
diff --git a/layouts/kittens/section.html b/layouts/kittens/section.html
index 462958c..54fda5d 100644
--- a/layouts/kittens/section.html
+++ b/layouts/kittens/section.html
@@ -1,6 +1,38 @@
 {{ define "main" }}
   <main>
-    {{ .Content }}
+    <div class="bg-beige">
+      <div class="mx-auto max-w-screen-xl lg:grid lg:grid-cols-2">
+        {{ with resources.Get "photos/kittens-avatar.webp" }}
+          <img
+            src="{{ .RelPermalink }}"
+            alt="De Avatarkittensk"
+            class="aspect-[21/9] w-full object-cover lg:hidden"
+          />
+
+          <div class="grid place-content-center lg:px-16">
+            <div class="py-20 lg:text-end">
+              <h1 class="mt-0">De kittens van Hamana</h1>
+              <p class="font-serif">Gefokt met liefde en kennis</p>
+
+              <div class="block">
+                <a
+                  href="/nieuws"
+                  class="whitespace-nowrap rounded-full bg-orange px-4 py-3 font-light text-white transition hover:bg-orange/75"
+                >
+                  Het laatste nieuws
+                </a>
+              </div>
+            </div>
+          </div>
+
+          <img
+            src="{{ .RelPermalink }}"
+            alt="De Avatarkittensk"
+            class="hidden aspect-[16/9] w-full object-cover lg:block"
+          />
+        {{ end }}
+      </div>
+    </div>
 
     {{ range .Paginator.Pages }}
       <div class="flex justify-center">
diff --git a/layouts/shortcodes/heading-block.html b/layouts/shortcodes/heading-block.html
deleted file mode 100644
index b342595..0000000
--- a/layouts/shortcodes/heading-block.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="bg-beige">
-  <div class="mx-auto max-w-screen-xl lg:grid lg:grid-cols-2">
-    <img
-      src="{{ ($.Page.Resources.GetMatch "photo").RelPermalink }}"
-      alt="{{ ($.Page.Resources.GetMatch "photo").Title }}"
-      class="aspect-[21/9] w-full object-cover lg:hidden"
-      style="{{ .Get "imageStyle" }}"
-    />
-
-    <div class="grid place-content-center lg:px-16">
-      {{ .Inner }}
-    </div>
-
-    <img
-      src="{{ ($.Page.Resources.GetMatch "photo").RelPermalink }}"
-      alt="{{ ($.Page.Resources.GetMatch "photo").Title }}"
-      class="hidden aspect-[16/9] w-full object-cover lg:block"
-      style="{{ .Get "imageStyle" }}"
-    />
-  </div>
-</div>
diff --git a/layouts/shortcodes/text-block.html b/layouts/shortcodes/text-block.html
deleted file mode 100644
index e97eed2..0000000
--- a/layouts/shortcodes/text-block.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="{{ .Get "outerClass" }} flex justify-center py-16">
-  <div class="{{ .Get "innerClass" }} max-w-screen-lg px-8 lg:px-0">
-    {{ .Inner }}
-  </div>
-</div>