diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0a024531..21a7125b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <div class="row">
       <div class="col-lg-8">
diff --git a/layouts/abiturienten/single.html b/layouts/abiturienten/single.html
index 771c4a4b..eddfa198 100644
--- a/layouts/abiturienten/single.html
+++ b/layouts/abiturienten/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4">
     <div class="content text-justify">
diff --git a/layouts/about/list.html b/layouts/about/list.html
index 26ddbab3..fbc1a772 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 <section class="section">
   <div class="container">
     {{ with .Params.image }}
@@ -31,5 +32,6 @@
 {{ end }}
 
 {{ partial "info" . }}
+</main>
 
 {{ end }}
diff --git a/layouts/alumninetzwerk/list.html b/layouts/alumninetzwerk/list.html
index 697934c1..0574990e 100644
--- a/layouts/alumninetzwerk/list.html
+++ b/layouts/alumninetzwerk/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <form
       action="https://php.cantorgymnasium.de/formtools/process.php"
diff --git a/layouts/anmeldeformular/list.html b/layouts/anmeldeformular/list.html
index dfafc53e..be9c9647 100644
--- a/layouts/anmeldeformular/list.html
+++ b/layouts/anmeldeformular/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <div class="row">
       <div class="col-lg-8 mb-4 mb-lg-0">
diff --git a/layouts/anmeldung/list.html b/layouts/anmeldung/list.html
index dbe29120..6e4079e6 100644
--- a/layouts/anmeldung/list.html
+++ b/layouts/anmeldung/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <div class="content text-justify">
       {{ .Content }}
diff --git a/layouts/author/list.html b/layouts/author/list.html
index 5ee51d4b..76d330b0 100644
--- a/layouts/author/list.html
+++ b/layouts/author/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     {{ range .Pages }}
     <div class="card mb-4">
diff --git a/layouts/author/single.html b/layouts/author/single.html
index e9e23744..fc09fe53 100644
--- a/layouts/author/single.html
+++ b/layouts/author/single.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 <section class="section">
   <div class="container">
 		<div class="text-center">
@@ -33,5 +34,6 @@
     </div>
   </div>
 </section>
+</main>
 
 {{ end }}
diff --git a/layouts/begabte/single.html b/layouts/begabte/single.html
index d81be7c8..15f0a746 100644
--- a/layouts/begabte/single.html
+++ b/layouts/begabte/single.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 {{ partial "header-contest" . }}
 
 <section class="section pt-0">
@@ -12,5 +13,6 @@
     </div>
   </div>
 </section>
+</main>
 
 {{ end }}
diff --git a/layouts/cantorfora/single.html b/layouts/cantorfora/single.html
index e6d493fb..bc653278 100644
--- a/layouts/cantorfora/single.html
+++ b/layouts/cantorfora/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <img src="{{ .Params.Image | relURL }}" class="img-fluid w-100 mb-4">
     <div class="content text-justify">
diff --git a/layouts/cantorpreis/single.html b/layouts/cantorpreis/single.html
index 5e00df8e..34e92176 100644
--- a/layouts/cantorpreis/single.html
+++ b/layouts/cantorpreis/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <div class="row">
       <div class="col-sm-5 mb-4">
diff --git a/layouts/forms/single.html b/layouts/forms/single.html
index 01338d17..8e67c518 100644
--- a/layouts/forms/single.html
+++ b/layouts/forms/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <h2 class="mb-4">{{ .Title }}</h2>
     <div class="content text-justify">
diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html
index b00918f6..6391c293 100644
--- a/layouts/ganztagsangebote/single.html
+++ b/layouts/ganztagsangebote/single.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 <section class="section">
   <div class="container">
     <img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4">
@@ -29,5 +30,6 @@
     </div>
   </div>
 </section>
+</main>
 
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index cf8c2e85..8f9a2358 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
+
 {{ $data := .Site.Data }}
 
 {{ if $data.homepage.slider.enable }}
@@ -287,4 +289,6 @@
 {{ end }}
 {{ end }}
 
+</main>
+
 {{ end }}
diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html
index 3ab7b970..05d5b5ea 100644
--- a/layouts/kontakt/list.html
+++ b/layouts/kontakt/list.html
@@ -4,6 +4,7 @@
 
 <script src="https://unpkg.com/leaflet@^1.7.1/dist/leaflet.js"></script>
 
+<main data-pagefind-body>
 <section class="section pb-0">
   <div class="container">
     <div class="row">
@@ -61,5 +62,6 @@
     });
   </script>
 </div>
+</main>
 
 {{ end }}
diff --git a/layouts/pages/single.html b/layouts/pages/single.html
index 289b95ab..34d44ad5 100644
--- a/layouts/pages/single.html
+++ b/layouts/pages/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <div class="content text-justify">
       {{ .Content }}
diff --git a/layouts/partials/pagefind.html b/layouts/partials/pagefind.html
new file mode 100644
index 00000000..e69de29b
diff --git a/layouts/projektwoche/single.html b/layouts/projektwoche/single.html
index a50442c2..8399c557 100644
--- a/layouts/projektwoche/single.html
+++ b/layouts/projektwoche/single.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 {{ partial "tile-modals" . }}
+</main>
 
 {{ end }}
\ No newline at end of file
diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html
index 630a1272..71f243bf 100644
--- a/layouts/schulchronik/single.html
+++ b/layouts/schulchronik/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <!-- TODO: everything -->
   <div class="container">
     {{ if or .Params.cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }}
diff --git a/layouts/superhaufen/single.html b/layouts/superhaufen/single.html
index a50442c2..8399c557 100644
--- a/layouts/superhaufen/single.html
+++ b/layouts/superhaufen/single.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 {{ partial "tile-modals" . }}
+</main>
 
 {{ end }}
\ No newline at end of file
diff --git a/layouts/termine/list.html b/layouts/termine/list.html
index 9595ee37..dabb22eb 100644
--- a/layouts/termine/list.html
+++ b/layouts/termine/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section">
+<section class="section" data-pagefind-body>
   <div class="container">
     <ul class="list-inline text-center filter-controls mb-4">
       <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>
diff --git a/layouts/wettbewerbe/single.html b/layouts/wettbewerbe/single.html
index 99dd44af..7ccc0967 100644
--- a/layouts/wettbewerbe/single.html
+++ b/layouts/wettbewerbe/single.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 
+<main data-pagefind-body>
 {{ partial "header-contest" . }}
 
 <section class="section pt-0">
@@ -14,5 +15,6 @@
     </div>
   </div>
 </section>
+</main>
 
 {{ end }}