diff --git a/themes/one-pager/layouts/_default/baseof.html b/themes/one-pager/layouts/_default/baseof.html
new file mode 100644
index 0000000..50a2fa7
--- /dev/null
+++ b/themes/one-pager/layouts/_default/baseof.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- SEO -->
+    {{ partial "seo.html" . }}
+
+    {{ $style := resources.Get "css/style.css" | resources.Minify | fingerprint }}
+    <link rel="stylesheet" href="{{ $style.RelPermalink }}">
+
+
+</head>
+<body>
+
+
+    {{ partial "header.html" . }}
+
+    <main>
+
+      {{ block "main" . }}{{ end }}
+
+    </main>
+
+    {{ partial "footer.html" . }}
+
+
+
+
+    {{ $js := resources.Get "js/scripts.js" | resources.Minify | fingerprint }}
+    <script src="{{ $js.RelPermalink }}"></script>
+
+
+</body>
+</html>
diff --git a/themes/one-pager/layouts/index.html b/themes/one-pager/layouts/_default/index.html
similarity index 74%
rename from themes/one-pager/layouts/index.html
rename to themes/one-pager/layouts/_default/index.html
index e98fd97..cd72782 100644
--- a/themes/one-pager/layouts/index.html
+++ b/themes/one-pager/layouts/_default/index.html
@@ -1,28 +1,4 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- SEO -->
-    {{ partial "seo.html" . }}
-
-
-    <meta name="robots" content="index" />
-    <meta name="geo.region" content="CH-GE" />
-    <meta name="geo.placename" content="Geneva" />
-    <meta name="geo.position" content="46.203918;6.133011" />
-    <meta name="ICBM" content="46.203918, 6.133011" />
-    <link rel="canonical" href="https://setto.basspistol.com" />
-    <link rel="alternate" hreflang="x-default" href="https://setto.basspistol.com" />
-    {{ $style := resources.Get "css/style.css" | resources.Minify | fingerprint }}
-    <link rel="stylesheet" href="{{ $style.RelPermalink }}">
-
-
-</head>
-<body>
-    {{ partial "header.html" . }}
-    
-    <main>
+{{ define "main" }}
 
         {{ partial "blog.html" . }}
 
@@ -32,11 +8,7 @@
 
         {{ partial "videos.html" . }}
 
-    </main>
-
-    {{ partial "footer.html" . }}
-
-    <!-- Custom Lightbox -->
+        <!-- Custom Lightbox -->
     <div class="custom-lightbox" id="customLightbox">
         <span class="custom-lightbox-close" id="lightboxClose">✕</span>
         <button class="custom-lightbox-prev" id="lightboxPrev">‹</button>
@@ -96,8 +68,4 @@
         </div>
     </div>
 
-
-    {{ $js := resources.Get "js/scripts.js" | resources.Minify | fingerprint }}
-    <script src="{{ $js.RelPermalink }}"></script>
-</body>
-</html>
+{{ end }}
diff --git a/themes/one-pager/layouts/partials/seo.html b/themes/one-pager/layouts/partials/seo.html
index b20bcf0..37ba8ea 100644
--- a/themes/one-pager/layouts/partials/seo.html
+++ b/themes/one-pager/layouts/partials/seo.html
@@ -88,6 +88,7 @@
 <meta name="twitter:url" content="{{ $permalink }}" />
 <meta name="twitter:title" content="{{ $escapedTitle }}" />
 <meta name="twitter:description" content="{{ $escapedDescription }}" />
+<link rel="alternate" hreflang="x-default" href="https://setto.basspistol.com" />
 {{ if $picture }}
 <meta name="twitter:image" content="{{ $escapedPicture }}" />
 <meta name="twitter:image:alt" content="{{ $escapedTitle }}" />
