diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index ed062e5..ed58332 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -4,11 +4,11 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
 <title>{{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }}</title>
-{{ block "meta" . }}{{ end }}
-{{- partial "meta.html" . -}}
-{{- partialCached "styles.html" . -}}
-{{ block "header" . }}{{ end }}
-{{ partial "scripts.html" . -}}
+{{ partial "meta.html" . }}
+{{ partialCached "styles.html" . }}
+{{- block "head" . }}{{ end }}
+{{ partial "meta_json_ld.html" . }}
+{{ partial "scripts.html" . }}
 {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "matomo.html" . }}{{ end -}}
 </head>
 
@@ -20,8 +20,8 @@
 <a href="{{ "/" | relLangURL }}" title="Home" class="header__site-link" rel="home"><span>{{ .Site.Title }}</span></a>
 </h1>
 <div class="region header__region">
-{{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end }}
-{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}
+{{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end -}}
+{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end -}}
 </div>
 </header>
 
@@ -29,7 +29,7 @@
 
 {{ block "main" . }}{{ end }}
 
-{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . -}}{{ end }}
+{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . }}{{ end -}}
 
 <footer class="footer layout__footer">
 {{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a4f569a..d1221fa 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "section_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "section_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <h1 class="title">{{ .Title }}</h1>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1031cea..4c891f7 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "single_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "single_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
diff --git a/layouts/index.html b/layouts/index.html
index ed078c8..6b34404 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,15 +1,5 @@
 {{ define "title" }}{{ .Site.Title }}{{ end }}
 
-{{ define "meta" }}
-{{- partial "section_meta.html" . -}}
-{{- partial "single_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "section_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
diff --git a/layouts/micro/list.html b/layouts/micro/list.html
index a21921e..4dc41c8 100644
--- a/layouts/micro/list.html
+++ b/layouts/micro/list.html
@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "section_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "section_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <h1 class="title">Micro posts</h1>
diff --git a/layouts/micro/single.html b/layouts/micro/single.html
index 9f50952..7fefe59 100644
--- a/layouts/micro/single.html
+++ b/layouts/micro/single.html
@@ -1,11 +1,3 @@
-{{ define "meta" }}
-{{- partial "single_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "single_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index d3676df..7d5ed08 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,3 +1,14 @@
+{{ range .AlternativeOutputFormats -}}
+<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
+{{ end -}}
+<meta name="description" content="{{ if .IsPage }}{{ .Description | default (replaceRE "\n" " " .Summary) }}{{ else }}{{ $.Param "description" }}{{ end }}">
+<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
+<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
+{{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}
+<meta property="og:site_name" content="{{ .Site.Title }}">
+<meta property="og:title" content="{{ .Title }}">
+<meta property="og:url" content="{{ .Permalink }}">
+{{ with $.Param "image" }}<meta name="og:image" content="{{ . | absURL }}">{{ end }}
 {{ hugo.Generator }}
 {{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
 <meta name="msapplication-TileColor" content="{{ $.Param "themecolor" | default "#ffffff" }}">
diff --git a/layouts/partials/single_json_ld.html b/layouts/partials/meta_json_ld.html
similarity index 84%
rename from layouts/partials/single_json_ld.html
rename to layouts/partials/meta_json_ld.html
index e1fa49f..3c2d3c3 100644
--- a/layouts/partials/single_json_ld.html
+++ b/layouts/partials/meta_json_ld.html
@@ -1,18 +1,27 @@
 <script type="application/ld+json">
   {
     "@context": "https://schema.org",
+    {{ if .IsPage -}}
     "@type": {{ if or (eq .Section "blog") (eq .Section "post") }}"BlogPosting"{{ else }}"WebPage"{{ end }},
     "headline": {{ .Title }},
     "datePublished": {{ .Date.Format "2006-01-02T15:04:05Z07:00" }},
     "dateModified": {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }},
     "url" : {{ .Permalink }},
     "description": {{ with (.Description | default (replaceRE "\n" " " .Summary)) }}{{ . }}{{ end }},
-    {{ with $.Param "image" -}}
-    "image" : {{ . | absURL }},
-    {{ end -}}
     {{ with .Params.tags -}}
     "keywords": {{ . }},
     {{ end -}}
+    {{ else -}}
+    "@type": "WebPage",
+    "url" : {{ .Permalink }},
+    "name": {{ .Title }},
+    {{ with $.Param "description" -}}
+    "description": {{ . }},
+    {{ end -}}
+    {{ end -}}
+    {{ with $.Param "image" -}}
+    "image" : {{ . | absURL }},
+    {{ end -}}
     {{ with $.Param "author" -}}
     "author": {
       "@type": "Person",
diff --git a/layouts/partials/opengraph_meta.html b/layouts/partials/opengraph_meta.html
deleted file mode 100644
index 45983fc..0000000
--- a/layouts/partials/opengraph_meta.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ if .IsPage -}}
-<meta name="description" content="{{ .Description | default (replaceRE "\n" " " .Summary) }}">
-{{ else -}}
-<meta name="description" content="{{ $.Param "description" }}">
-{{ end -}}
-<meta property="og:site_name" content="{{ .Site.Title }}">
-<meta property="og:title" content="{{ .Title }}">
-<meta property="og:url" content="{{ .Permalink }}">
-{{ with $.Param "image" }}<meta name="og:image" content="{{ . | absURL }}">{{ end }}
diff --git a/layouts/partials/section_json_ld.html b/layouts/partials/section_json_ld.html
deleted file mode 100644
index 236b3a0..0000000
--- a/layouts/partials/section_json_ld.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "WebPage",
-    "url" : {{ .Permalink }},
-    "name": {{ .Title }},
-    {{ with $.Param "description" -}}
-    "description": {{ . }},
-    {{ end -}}
-    {{ with $.Param "image" -}}
-    "image" : {{ . | absURL }},
-    {{ end -}}
-    {{ with $.Param "author" -}}
-    "author": {
-      "@type": "Person",
-      "name": {{ . }}
-    },
-    {{ end -}}
-    "mainEntityOfPage": {
-      "@type": "WebPage",
-      "@id": {{ .Site.BaseURL }}
-    },
-    "publisher": {
-      "@type": "Organization",
-      "name": {{ .Site.Title }},
-      {{ with $.Param "icon" -}}
-      "logo" : {
-        "@type": "ImageObject",
-        "url": {{ . | absURL }}
-      },
-      {{ end -}}
-      "url": {{ .Site.BaseURL }}
-    }
-  }
-</script>
diff --git a/layouts/partials/section_meta.html b/layouts/partials/section_meta.html
deleted file mode 100644
index 78805c6..0000000
--- a/layouts/partials/section_meta.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ range .AlternativeOutputFormats -}}
-<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
-{{ end -}}
diff --git a/layouts/partials/single_meta.html b/layouts/partials/single_meta.html
deleted file mode 100644
index 9e3c134..0000000
--- a/layouts/partials/single_meta.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
-<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
-{{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}
diff --git a/layouts/podcast/single.html b/layouts/podcast/single.html
index 0a351bd..7f4db97 100644
--- a/layouts/podcast/single.html
+++ b/layouts/podcast/single.html
@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "single_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "single_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">