diff --git a/layouts/blog/section.html b/layouts/blog/section.html
index 6b8506e..01c0748 100644
--- a/layouts/blog/section.html
+++ b/layouts/blog/section.html
@@ -1,5 +1,6 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} | {{ .Site.Title }}
+  {{ .Page.Title | plainify }} |
+  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}--section layouts-blog-section{{ end }}
@@ -12,38 +13,60 @@
 
 {{ define "main-header" }}
   <header class="site-content__header">
-    <h2 class="page-title">{{ .Title | safeHTML }}
-    {{ if eq .Type "blog" }}
-       {{ with .GetPage "blog/posts" }}
+    <h2 class="page-title">
+      {{ .Title | safeHTML }}
+      {{ if eq .Type "blog" }}
+        {{ with .GetPage "blog/posts" }}
           {{ range .AlternativeOutputFormats -}}
-            <a href="{{ .RelPermalink }}" aria-label="{{ $.Title }} RSS feed">
-               <img class="feed-icon" alt="RSS feed" src="{{ $.Site.Params.feedIcon }}">
+            <a
+              href="{{ .RelPermalink }}"
+              aria-label="{{ $.Title }} RSS feed"
+            >
+              <img
+                class="feed-icon"
+                alt="RSS feed"
+                src="{{ $.Site.Params.feedIcon }}"
+              />
             </a>
           {{ end }}
-       {{ end }}
-    {{ else }}
-      {{ range .AlternativeOutputFormats -}}
-        <a href="{{ .RelPermalink }}" aria-label="{{ $.Title }} RSS feed">
-          <img class="feed-icon" alt="RSS feed" src="{{ $.Site.Params.feedIcon }}">
-        </a>
+        {{ end }}
+      {{ else }}
+        {{ range .AlternativeOutputFormats -}}
+          <a
+            href="{{ .RelPermalink }}"
+            aria-label="{{ $.Title }} RSS feed"
+          >
+            <img
+              class="feed-icon"
+              alt="RSS feed"
+              src="{{ $.Site.Params.feedIcon }}"
+            />
+          </a>
+        {{ end }}
       {{ end }}
-    {{ end }}
     </h2>
     {{ .Content }}
-    
+
+
     <nav class="page-header__minor-links">
       <ul class="minor-links__categories">
-          <li><a href="/series"><h3>Series’</h3></a> <p>({{ len .Site.Taxonomies.series }})</p></li>
-          {{ range .Site.Taxonomies.categories }}
-          <li><a href="{{ .Page.RelPermalink }}"><h3>{{ .Page.Title | safeHTML }}</h3></a> <p>({{ len . }})</p></li>  
-          {{ end }}
+        <li>
+          <a href="/series"><h3>Series’</h3></a>
+          <p>({{ len .Site.Taxonomies.series }})</p>
+        </li>
+        {{ range .Site.Taxonomies.categories }}
+          <li>
+            <a href="{{ .Page.RelPermalink }}"><h3>{{ .Page.Title | safeHTML }}</h3></a>
+            <p>({{ len . }})</p>
+          </li>
+        {{ end }}
       </ul>
       {{ if eq .Type "blog" }}
         {{ with .GetPage "blog/posts" }}
           {{ partial "years-list.html" . }}
         {{ end }}
       {{ else }}
-          {{ partial "years-list.html" . }}
+        {{ partial "years-list.html" . }}
       {{ end }}
     </nav>
   </header>
@@ -51,10 +74,10 @@
 
 {{ define "main-body" }}
   {{ if eq .Type "blog" }}
-     {{ with .GetPage "blog/posts" }}
-        {{ partial "items-grid.html" . }}
-     {{ end }}
-  {{ else }}
+    {{ with .GetPage "blog/posts" }}
       {{ partial "items-grid.html" . }}
+    {{ end }}
+  {{ else }}
+    {{ partial "items-grid.html" . }}
   {{ end }}
 {{ end }}
diff --git a/layouts/cv/organisations/section.html b/layouts/cv/organisations/section.html
index 6222d9d..c77b8f3 100644
--- a/layouts/cv/organisations/section.html
+++ b/layouts/cv/organisations/section.html
@@ -1,35 +1,40 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} | {{ .Site.Title }}
+  {{ .Page.Title | plainify }} |
+  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}--section layouts-cv-organisations-section{{ end }}
 
 {{ define "main-header" }}
-    {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }}
-        <header class="site-content__header">
-            <div class="article-header__featured-image"
-            {{ if .Params.featured_image }}
-                {{ with .Resources.GetMatch .Params.featured_image }}
-                style="background-image: url({{ .RelPermalink }})"
-                {{ end }}
-            {{ end }}>
-            <div class="article-header__title-wrapper{{ if .Params.title_in_logo }} article-header__title-wrapper--no-title{{ end }}">
-                <h2 class="article-header__title">{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</h2>
-            </div>
-            </div>
-        </header>
-    {{ else }}
-        <header class="site-content__header">
-            <h2 class="page-title">{{ .Title | safeHTML }}.</h2>
-            {{- .Content -}}
-        </header>
-    {{ end }}
+  {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }}
+    <header class="site-content__header">
+      <div
+        class="article-header__featured-image"
+        {{ if .Params.featured_image }}
+          {{ with .Resources.GetMatch .Params.featured_image }}
+            style="background-image: url({{ .RelPermalink }}); {{ with .Params.bg }}background-color: {{ . }};{{ end }}"
+          {{ end }}
+        {{ end }}
+      >
+        <div class="article-header__title-wrapper{{ if .Params.title_in_logo }}article-header__title-wrapper--no-title{{ end }}">
+          <h2 class="article-header__title">
+            {{ default .Title .Params.markup_title | .Page.RenderString }}
+          </h2>
+        </div>
+      </div>
+    </header>
+  {{ else }}
+    <header class="site-content__header">
+      <h2 class="page-title">{{ .Title | safeHTML }}.</h2>
+      {{- .Content -}}
+    </header>
+  {{ end }}
 {{ end }}
 
 {{ define "main-body" }}
-    {{ with .GetPage "cv/organisations" }}
-        {{ partial "cv/organisations/organisations-table.html" . }}
-    {{ end }}
+  {{ with .GetPage "cv/organisations" }}
+    {{ partial "cv/organisations/organisations-table.html" . }}
+  {{ end }}
 {{ end }}
 
 {{ define "main-footer" }}
diff --git a/layouts/cv/section.html b/layouts/cv/section.html
index a7176ca..312ff5a 100644
--- a/layouts/cv/section.html
+++ b/layouts/cv/section.html
@@ -118,14 +118,14 @@
 {{ define "main-header" }}
   {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }}
       <header class="site-content__header">
-          <div class="article-header__featured-image"
+          <div class="article-header__featured-image article-header__featured-image--fit"
           {{ if .Params.featured_image }}
               {{ with .Resources.GetMatch .Params.featured_image }}
-              style="background-image: url({{ .RelPermalink }})"
+              style="background-image: url({{ .RelPermalink }}); {{ with .Params.bg }}background-color: {{ . }};{{ end }}"
               {{ end }}
           {{ end }}>
             <div class="article-header__title-wrapper{{ if .Params.title_in_logo }} article-header__title-wrapper--no-title{{ end }}">
-                <h2 class="article-header__title">{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</h2>
+                <h2 class="article-header__title">{{ default .Title .Params.markup_title | .Page.RenderString  }}</h2>
             </div>
           </div>
           {{- with .Params.nka -}}<p>Now known as: {{ . }}</p>{{- end -}}
@@ -198,8 +198,8 @@
         {{ partial "cv/organisations/recursive-parents.html" ( dict "c" . "g" $ ) }}
         {{- $parents := partial "cv/organisations/reverse-slice.html" ( $.Scratch.Get "parents" ) -}}
 
-        {{- range $parents -}}<ul><li class="hierarchy-item hierarchy-item--parent"><a href="{{ .RelPermalink }}">{{ .Title | safeHTML }}</a>{{- end -}}
-        <ul><li class="hierarchy-item hierarchy-item--current">{{ .Title | safeHTML }}</li>
+        {{- range $parents -}}<ul><li class="hierarchy-item hierarchy-item--parent"><a href="{{ .RelPermalink }}">{{ default .Title .Params.markup_title | .Page.RenderString  }}</a>{{- end -}}
+        <ul><li class="hierarchy-item hierarchy-item--current">{{ default .Title .Params.markup_title | .Page.RenderString  }}</li>
           {{ range .Sections }}<ul>{{ partial "cv/organisations/recursive-children.html" . }}</ul>{{ end }}
         </ul>
         {{- range $parents -}}</li></ul>{{- end -}}
diff --git a/layouts/partials/cv/organisations/organisations-table.html b/layouts/partials/cv/organisations/organisations-table.html
index bb3d3b7..94cd0b7 100644
--- a/layouts/partials/cv/organisations/organisations-table.html
+++ b/layouts/partials/cv/organisations/organisations-table.html
@@ -29,13 +29,11 @@
             {{- end -}}
           {{- else -}}
             {{- if .Params.featured_image -}}
-              <img class="organisation-table__logo" loading="lazy" src="
-              {{- if .Resources.GetMatch .Params.featured_image -}}
-                {{- ( .Resources.GetMatch .Params.featured_image ).RelPermalink -}}
+              {{- with .Resources.GetMatch .Params.featured_image -}}
+                <img class="organisations-table__logo" loading="lazy" src="{{- .RelPermalink -}}" {{ with .Params.bg }}style="background-color: {{ . }}"{{ end }}>
               {{- else -}}
-                {{- .Params.featured_image -}}
+                <img class="organisations-table__logo" loading="lazy" src="{{- .Params.featured_image -}}">
               {{- end -}}
-              ">
             {{- end -}}
           {{- end -}}
         </td>
@@ -48,7 +46,7 @@
           {{- else -}}
             <a href="{{ .RelPermalink }}">
               {{- if .Params.TitleLang -}}<i lang="{{ .Params.TitleLang }}" title="{{ .Params.TitleTrans }}"}>{{- end -}}
-              {{- with .Params.markup_title -}}{{- . | safeHTML -}}{{- else -}}{{- $organisation_title | safeHTML -}}{{- end -}}
+              {{- with .Params.markup_title -}}{{- . | $.Page.RenderString -}}{{- else -}}{{- $organisation_title | $.Page.RenderString -}}{{- end -}}
               {{- if .Params.TitleLang -}}</i>{{- end -}}
             </a>
           {{- end -}}
diff --git a/layouts/partials/cv/organisations/recursive-children.html b/layouts/partials/cv/organisations/recursive-children.html
index 5b59cf6..34e8770 100644
--- a/layouts/partials/cv/organisations/recursive-children.html
+++ b/layouts/partials/cv/organisations/recursive-children.html
@@ -1,22 +1,18 @@
 {{- if ( not ( and ( .Params.redact ) ( ne $.Site.Params.redact "show" ) ) ) -}}
-<li class="hierarchy-item hierarchy-item--child">
+  <li class="hierarchy-item hierarchy-item--child">
     {{- if ( and ( .Params.redact ) ( ne $.Site.Params.redact "show" ) ) -}}
-        {{- if ( eq $.Site.Params.redact "black" ) -}}
-            {{- partialCached "redact-black.html" . -}}
-        {{- end -}}
+      {{- if ( eq $.Site.Params.redact "black" ) -}}
+        {{- partialCached "redact-black.html" . -}}
+      {{- end -}}
     {{- else -}}
-        <a href="{{ .RelPermalink }}">
-            {{- with .Params.markup_title }}
-                {{- . | safeHTML -}}
-            {{- else -}}
-                {{- .Title | safeHTML -}}
-            {{- end -}}
-        </a>
-        {{- range .Sections -}}
-            <ul>
-                {{- partialCached "cv/organisations/recursive-children.html" . .Title -}}
-            </ul>
-        {{- end -}}
+      <a href="{{ .RelPermalink }}">
+        {{ default .Title .Params.markup_title | .Page.RenderString }}
+      </a>
+      {{- range .Sections -}}
+        <ul>
+          {{- partialCached "cv/organisations/recursive-children.html" . .Title -}}
+        </ul>
+      {{- end -}}
     {{- end -}}
-</li>
+  </li>
 {{- end -}}
diff --git a/layouts/partials/item-tile.html b/layouts/partials/item-tile.html
index fcb3962..222d08d 100644
--- a/layouts/partials/item-tile.html
+++ b/layouts/partials/item-tile.html
@@ -1,33 +1,55 @@
 {{- if ( and ( .Params.redact ) ( ne $.Site.Params.redact "show" ) ) -}}
   {{- if ( eq $.Site.Params.redact "black" ) -}}
-    <article class="item-tile item-tile--redacted {{- with .Params.site }} item-tile--{{ . }}{{ end -}}">
+    <article class="item-tile item-tile--redacted {{- with .Params.site }}item-tile--{{ . }}{{ end -}}">
       <header class="item-tile__header">
-          <h2 class="p-name item-tile__title{{ if gt ( len ( .Title | plainify ) ) 40 }} item-tile__title--long{{ end }}" itemprop="name">
-            {{- partialCached "redact-black.html" . -}}
-          </h2>
-          <p style="display: none;">Published: <time class="dt-published" itemprop="datePublished" datetime="{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }}">{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00"}}</time></p>
+        <h2
+          class="p-name item-tile__title{{ if gt ( len ( .Title | plainify ) ) 40 }}item-tile__title--long{{ end }}"
+          itemprop="name"
+        >
+          {{- partialCached "redact-black.html" . -}}
+        </h2>
+        <p style="display: none;">
+          Published:
+          <time
+            class="dt-published"
+            itemprop="datePublished"
+            datetime="{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }}"
+            >{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }}</time
+          >
+        </p>
       </header>
     </article>
   {{- end -}}
 {{- else -}}
-  <a id="{{ .Title | urlize }}" class="h-entry u-url link--tile" href="{{ .RelPermalink }}" itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
-    <article class="item-tile lazy {{- with .Params.site }} item-tile--{{ . }}{{ end -}}"
-          {{ if .Params.featured_image }}
-            {{ with .Resources.GetMatch .Params.featured_image }}
-              {{ if eq .MediaType.SubType "svg" }}
-                style="background-image: url({{ .RelPermalink }})"
-              {{ else }}
-                {{ with .Resize "1000x webp" }}
-                  style="background-image: url({{ .RelPermalink }})"
-                {{ end }}
-              {{ end }}
-            {{ else }}
-              style="background-image: url({{ .Params.featured_image }})"
+  <a
+    id="{{ .Title | urlize }}"
+    class="h-entry u-url link--tile"
+    href="{{ .RelPermalink }}"
+    itemprop="blogPost"
+    itemscope
+    itemtype="https://schema.org/BlogPosting"
+  >
+    <article
+      class="item-tile lazy {{- with .Params.site }}item-tile--{{ . }}{{ end -}}"
+      {{ if .Params.featured_image }}
+        {{ with .Resources.GetMatch .Params.featured_image }}
+          {{ if eq .MediaType.SubType "svg" }}
+            style="background-image: url({{ .RelPermalink }})"
+          {{ else }}
+            {{ with .Resize "1000x webp" }}
+              style="background-image: url({{ .RelPermalink }})"
             {{ end }}
           {{ end }}
-      >
-        {{ if .Params.featured_image -}}
-          <img class="u-photo" style="display: none;" src="
+        {{ else }}
+          style="background-image: url({{ .Params.featured_image }})"
+        {{ end }}
+      {{ end }}
+    >
+      {{ if .Params.featured_image -}}
+        <img
+          class="u-photo"
+          style="display: none;"
+          src="
           {{- with .Resources.GetMatch .Params.featured_image -}}
             {{- if eq .MediaType.SubType "svg" -}}
               {{ .RelPermalink }}
@@ -39,30 +61,48 @@
           {{- else -}}
             {{ .Params.featured_image }}
           {{ end }}
-          " alt="
+          "
+          alt="
           {{- with .Resources.GetMatch .Params.featured_image -}}
             {{- .Params.alt -}}
           {{- end -}}
           "
-          />
-        {{- end }}
-        <header class="item-tile__header">
-          {{ if ( or .Params.series .Params.published_in ) }}
-          <span class="item-tile__banner item-tile__banner--{{ if .Params.series }}series{{ else if .Params.published_in }}published-in{{ end}}">
+        />
+      {{- end }}
+      <header class="item-tile__header">
+        {{ if ( or .Params.series .Params.published_in ) }}
+          <span
+            class="item-tile__banner item-tile__banner--{{ if .Params.series }}
+              series
+            {{ else if .Params.published_in }}
+              published-in
+            {{ end }}"
+          >
             {{- if .Params.series -}}
               {{ .Params.series | safeHTML }}
             {{- else if .Params.published_in -}}
               {{ .Params.published_in | safeHTML }}
             {{- end -}}
           </span>
-          {{ end }}
-          <h2 class="p-name item-tile__title{{ if gt ( len ( .Title | plainify ) ) 40 }} item-tile__title--long{{ end }}" itemprop="name">
-            {{ .Title | safeHTML }}
-          </h2>
-          {{ with .Params.subtitle }}
-            <p class="item-tile__subtitle">{{ . | safeHTML }}</p>
-          {{ end }}
-          <p style="display: none;">Published: <time class="dt-published" itemprop="datePublished" datetime="{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }}">{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00"}}</time></p>
+        {{ end }}
+        <h2
+          class="p-name item-tile__title {{ if gt ( len ( .Title | plainify ) ) 40 }}item-tile__title--long{{ end }}"
+          itemprop="name"
+        >
+          {{ default .Title .Params.markup_title | $.Page.RenderString }}
+        </h2>
+        {{ with .Params.subtitle }}
+          <p class="item-tile__subtitle">{{ . | $.Page.RenderString }}</p>
+        {{ end }}
+        <p style="display: none;">
+          Published:
+          <time
+            class="dt-published"
+            itemprop="datePublished"
+            datetime="{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }}"
+            >{{ .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }}</time
+          >
+        </p>
       </header>
     </article>
   </a>
diff --git a/layouts/partials/single/main-header/item-tile.html b/layouts/partials/single/main-header/item-tile.html
index 1f91270..d42b451 100644
--- a/layouts/partials/single/main-header/item-tile.html
+++ b/layouts/partials/single/main-header/item-tile.html
@@ -41,11 +41,11 @@
   <div class="article-header__title-wrapper">
     <a class="u-url u-uid" style="display: none" href="{{ .pc.Permalink }}"></a>
     <hgroup class="p-name" itemprop="name">
-      <h2 class="article-header__title{{ if gt ( len ( .pc.Title | plainify ) ) 40 }} article-header__title--long{{ end }}">
-        {{- .pc.Title | safeHTML -}}
+      <h2 class="article-header__title {{ if gt ( len ( .pc.Title | plainify ) ) 40 }}article-header__title--long{{ end }}">
+        {{- default .pc.Title .pc.Params.markup_title  | .pc.Page.RenderString -}}
       </h2>
       {{ with .pc.Params.subtitle }}
-        <p class="article-header__subtitle">{{ . | safeHTML }}</p>
+        <p class="article-header__subtitle">{{ . | $.pc.Page.RenderString }}</p>
       {{ end }}
     </hgroup>
   </div>
diff --git a/layouts/partials/single/post-meta/organisations.html b/layouts/partials/single/post-meta/organisations.html
index f5b090a..de92d67 100644
--- a/layouts/partials/single/post-meta/organisations.html
+++ b/layouts/partials/single/post-meta/organisations.html
@@ -24,7 +24,7 @@
         {{ end }}
       {{ else }}
         {{ erroridf "missing-organisation" "Could not find organisation %q (%q)" .Title $.sc.File.Path }}
-        <li>{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</li>
+        <li>{{ default .Title .Params.markup_title | .Page.RenderString }}</li>
       {{ end }}
     {{- end -}}
   </ul>