diff --git a/config.yaml b/config.yaml
index 15c4c6412c7a7ebacec16b4fa3d0c16c87d05347..fa8733f4a06d13be3a29d58c30618d166d8531a1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -43,11 +43,15 @@ params:
     single:
       backlinks: false
   pages:
+    default_image: false
     index:
       truncate_description: 200 # Set to 0 to disable truncate
   papers:
+    default_image: false
     sidebar:
       direction: start
+  volumes:
+    default_image: false
   persons:
     index:
       layout: grid # grid | list
diff --git a/layouts/events/single.html b/layouts/events/single.html
index 853cd94fe4e7db53822968140acc495b42f2632f..f1c4debe5ba46368453b5b81f8d8c7e0c242af38 100644
--- a/layouts/events/single.html
+++ b/layouts/events/single.html
@@ -4,8 +4,8 @@
   <div class="document-content" itemscope itemtype="https://schema.org/Event">
     <meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
     <meta itemprop="url" content="{{ .Permalink }}">
-    {{ if .Params.summary }}<meta itemprop="abstract" content="{{ partial "PrepareText" .Params.summary }}">{{ end }}
-    {{ if .Summary }}<meta itemprop="description" content="{{ partial "PrepareText" .Summary }}">{{ end }}
+    {{ with .Params.summary }}<meta itemprop="abstract" content="{{ . | safeHTML }}">{{ end }}
+    {{ with .Summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
 
     {{ partial "events/sidebar.html" . }}
 
diff --git a/layouts/partials/CorrectPunctuation b/layouts/partials/CorrectPunctuation
deleted file mode 100644
index 4671b77feb466f3787cdcf0e56123bf5eb2d14e4..0000000000000000000000000000000000000000
--- a/layouts/partials/CorrectPunctuation
+++ /dev/null
@@ -1,6 +0,0 @@
-{{ $correct := . }}
-{{ $signs := slice ";" ":" "!" "?" }}
-{{ range $signs }}
-  {{ $correct = replace $correct (printf " %s" .) (printf "&#8239;%s" .) }}
-{{ end }}
-{{ return $correct }}
diff --git a/layouts/partials/GetTruncateContent b/layouts/partials/GetTruncateContent
index ab6ddc1081302ae2c5e29f45ca434816abff9b60..1c066b839efd7143ed47145cf526080ad5b5c6ec 100644
--- a/layouts/partials/GetTruncateContent
+++ b/layouts/partials/GetTruncateContent
@@ -6,4 +6,4 @@
   {{ $text = chomp (truncate $length "…" (safeHTML (plainify $text))) }}
 {{ end }}
 
-{{ return (partial "PrepareText" $text) }}
\ No newline at end of file
+{{ return safeHTML ($text) }}
\ No newline at end of file
diff --git a/layouts/partials/PrepareHTML b/layouts/partials/PrepareHTML
index 2d3f25ddfb724d20fa61e92c060b353106bed059..ea37d6018eee7bd33217ac4c51fc761d011b2b7c 100644
--- a/layouts/partials/PrepareHTML
+++ b/layouts/partials/PrepareHTML
@@ -1,10 +1,8 @@
-{{ return
-safeHTML (
-  chomp (
-    partial "CorrectPunctuation" (
-      partial "FilterIframeLazy" (
-        .
-      )
+{{ 
+return 
+  safeHTML (
+    partial "FilterIframeLazy" (
+      .
     )
-  )
-) }}
+  ) 
+}}
diff --git a/layouts/partials/PrepareText b/layouts/partials/PrepareText
deleted file mode 100644
index a4d0f064297d6f5092c821d24ef980f10e6fe540..0000000000000000000000000000000000000000
--- a/layouts/partials/PrepareText
+++ /dev/null
@@ -1,6 +0,0 @@
-{{ $text := . }}
-{{ $text = replace $text "\r\n" "\n" }}
-{{ $text = replace $text "\r" "\n" }}
-{{ $text = replace $text "\n" "<br/>" }}
-{{ $text = $text | safeHTML }}
-{{ return $text}}
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/definitions.html b/layouts/partials/blocks/templates/definitions.html
index 7cf7d62446f19b9a360cf44995ddb4dbf578eb16..64a79a9fc914fd145ad62fea0563e178eaaa8d5e 100644
--- a/layouts/partials/blocks/templates/definitions.html
+++ b/layouts/partials/blocks/templates/definitions.html
@@ -12,8 +12,8 @@
         <div class="definitions">
           {{- range .elements }}
             <details itemscope itemtype="https://schema.org/DefinedTerm">
-              <summary itemprop="name">{{ partial "PrepareText" .title }}</summary>
-              <p itemprop="description">{{ partial "PrepareText" .description }}</p>
+              <summary itemprop="name">{{ .title | safeHTML }}</summary>
+              <p itemprop="description">{{ .description | safeHTML }}</p>
             </details>
           {{ end -}}
         </div>
diff --git a/layouts/partials/blocks/templates/features.html b/layouts/partials/blocks/templates/features.html
index 76e172a7612686d21cd1b8e0e83909ad4eb77a9b..8f7f9f82ddd31eeeb86a64aedaebb940bd1aaa52 100644
--- a/layouts/partials/blocks/templates/features.html
+++ b/layouts/partials/blocks/templates/features.html
@@ -22,9 +22,9 @@
                   "attributes" "class='name' itemprop='name'"
                   ) -}}
                   {{ $heading_tag.open -}}
-                    {{ partial "PrepareText" .title }}
+                    {{ .title | safeHTML }}
                   {{ $heading_tag.close -}}
-                  <p>{{ partial "PrepareText" .description }}</p>
+                  <p>{{ .description | safeHTML }}</p>
                 </div>
                 {{- if .image -}}
                   <figure>
diff --git a/layouts/partials/blocks/templates/gallery/carousel.html b/layouts/partials/blocks/templates/gallery/carousel.html
index de6811bc510f8a9f02ba011f742855b85bb497ca..b1b5a396b11049866370b520d64b9a00ce9061f5 100644
--- a/layouts/partials/blocks/templates/gallery/carousel.html
+++ b/layouts/partials/blocks/templates/gallery/carousel.html
@@ -33,11 +33,11 @@
           {{ end }}
           {{ if or .text .credit }}
             <figcaption>
-              {{ if .text }}
-                <p>{{ partial "PrepareText" .text }}</p>
+              {{ with .text }}
+                <p>{{ . | safeHTML }}</p>
               {{ end }}
-              {{ if .credit }}
-                <div class="credit">{{ partial "PrepareText" .credit }}</div>
+              {{ with .credit }}
+                <div class="credit">{{ . | safeHTML }}</div>
               {{ end }}
             </figcaption>
           {{ end }}
diff --git a/layouts/partials/blocks/templates/gallery/grid.html b/layouts/partials/blocks/templates/gallery/grid.html
index 07c7d1a2a1d16a96891d4560985a905b8c5bd1f2..afffc61150c5e274c053a8019b729c94f261672b 100644
--- a/layouts/partials/blocks/templates/gallery/grid.html
+++ b/layouts/partials/blocks/templates/gallery/grid.html
@@ -33,9 +33,9 @@
           {{ if not site.Params.image_sizes.design_system.lightbox.disabled }}
             </a>
           {{ end }}
-          {{ if .text }}
+          {{ with .text }}
             <figcaption>
-              <p>{{- partial "PrepareText" .text -}}</p>
+              <p>{{- . | safeHTML -}}</p>
             </figcaption>
           {{ end }}
         </figure>
diff --git a/layouts/partials/blocks/templates/pages/list.html b/layouts/partials/blocks/templates/pages/list.html
index 879d74d67904c9ebb5b2b26a0a39b6c8b2d5f0d5..0314906c6715a009eeeb5ec398ccc1e117bec5c7 100644
--- a/layouts/partials/blocks/templates/pages/list.html
+++ b/layouts/partials/blocks/templates/pages/list.html
@@ -36,7 +36,7 @@
                           "sizes"    site.Params.image_sizes.blocks.pages.list
                         ) -}}
                 {{- else -}}
-                  {{- partial "commons/image-default.html" -}}
+                  {{- partial "commons/image-default.html" "pages" -}}
                 {{- end -}}
               </div>
             {{ end }}
diff --git a/layouts/partials/blocks/templates/posts/large.html b/layouts/partials/blocks/templates/posts/large.html
index d0b66bde8f9865518eac54800e45d78e235dfd69..c76b4099268d0bcf105844a2e217d8e847e8ef25 100644
--- a/layouts/partials/blocks/templates/posts/large.html
+++ b/layouts/partials/blocks/templates/posts/large.html
@@ -48,12 +48,12 @@
         <div class="media">
           {{- if .Params.image -}}
             {{- partial "commons/image.html"
-                  (dict
-                    "image"    .Params.image
-                    "sizes"    site.Params.image_sizes.sections.posts.item
-                  ) -}}
-          {{- else if site.Params.posts.default_image -}}
-            {{- partial "commons/image-default.html" -}}
+                (dict
+                  "image"    .Params.image
+                  "sizes"    site.Params.image_sizes.sections.posts.item
+                ) -}}
+          {{- else -}}
+            {{- partial "commons/image-default.html" "posts" -}}
           {{- end -}}
         </div>
       </article>
diff --git a/layouts/partials/blocks/templates/sound.html b/layouts/partials/blocks/templates/sound.html
index b52ed91accea40ffc0ecb3b7c66c346736df3069..c6fc6f0259d7c9b55f5b40947539a27d01cb1bc8 100644
--- a/layouts/partials/blocks/templates/sound.html
+++ b/layouts/partials/blocks/templates/sound.html
@@ -14,7 +14,7 @@
           {{ if .file }}
             {{ $file := partial "GetMedia" .file.id }}
             {{ if $file }}
-              <audio src="{{ $file.direct_url }}" controls title="{{ partial "PrepareText" .title }}"></audio>
+              <audio src="{{ $file.direct_url }}" controls title="{{ .title | safeHTML }}"></audio>
             {{ end }}
           {{ end }}
 
diff --git a/layouts/partials/blocks/templates/timeline/horizontal.html b/layouts/partials/blocks/templates/timeline/horizontal.html
index 03e5c5ef0323fe8eca61c0d3e88f2b86c99ea464..d029f0918ec243f4c7170b778dfb1699ddee3e72 100644
--- a/layouts/partials/blocks/templates/timeline/horizontal.html
+++ b/layouts/partials/blocks/templates/timeline/horizontal.html
@@ -12,7 +12,7 @@
           <li class="timeline-event">
 
             {{ $heading_tag.open -}}
-              {{ partial "PrepareText" .title }}
+              {{ .title | safeHTML }}
             {{ $heading_tag.close -}}
             <div class="line"></div>
             <div class="description text">{{- partial "PrepareHTML" .text | markdownify -}}</div>
diff --git a/layouts/partials/blocks/templates/timeline/vertical.html b/layouts/partials/blocks/templates/timeline/vertical.html
index 77fbfdfda90bd6accf5b9e83dc66797f3e5a9c2c..1abf2727b8f18bf93d268dc7f7c57a21db7d3709 100644
--- a/layouts/partials/blocks/templates/timeline/vertical.html
+++ b/layouts/partials/blocks/templates/timeline/vertical.html
@@ -8,13 +8,13 @@
   <div class="timeline-events">
     {{ range .events -}}
       <article class="timeline-event">
-        {{ if .title }}
+        {{ with .title }}
           {{ $heading_tag.open -}}
-            {{ partial "PrepareText" .title }}
+            {{ . | safeHTML }}
           {{ $heading_tag.close -}}
         {{ end }}
-        {{ if .text }}
-          <p>{{ partial "PrepareText" .text }}</p>
+        {{ with .text }}
+          <p>{{ . | safeHTML }}</p>
         {{ end }}
       </article>
     {{ end -}}
diff --git a/layouts/partials/commons/image-default.html b/layouts/partials/commons/image-default.html
index 4b4847a8b7724b318efbbf0d19bf0cab0e477093..abd7e74a470b26a0083fb97255dd9b24deceb233 100644
--- a/layouts/partials/commons/image-default.html
+++ b/layouts/partials/commons/image-default.html
@@ -1,18 +1,15 @@
-{{- if os.FileExists "static/assets/images/default.png" -}}
-  {{ $file := "/assets/images/default.png" }}
-  {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }}
-  {{- $lazy := default true .lazy -}}
-  <img alt="" src="{{ $file }}" width="{{ index $fileDimensions 1 }}" height="{{ index $fileDimensions 0 }}"
-    {{- if .class }} class="{{ .class }}"{{- end -}}
-    {{- if $lazy }} loading="lazy"{{- end -}}
-    >
-{{ else if os.FileExists "static/assets/images/default.jpg" }}
-  {{ $file := "/assets/images/default.jpg" }}
-  {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }}
-  {{- $lazy := default true .lazy -}}
-  <img alt="" src="{{ $file }}" width="{{ index $fileDimensions 1 }}" height="{{ index $fileDimensions 0 }}"
-    {{- if .class }} class="{{ .class }}"{{- end -}}
-    {{- if $lazy }} loading="lazy"{{- end -}}
-    >
-{{- end -}}
+{{ $section_type := .}}
+{{ $use_default := (index site.Params $section_type).default_image}}
+{{ $image := site.Data.website.default_image }}
 
+{{ if and $use_default $image }}
+  {{ with index site.Params.image_sizes.sections $section_type }}
+    {{ $sizes := .items }}
+
+    {{- partial "commons/image.html"
+      (dict
+        "image"    $image
+        "sizes"    $sizes
+      ) -}}
+  {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/commons/summary-in-content.html b/layouts/partials/commons/summary-in-content.html
index 18bf1c32660f10864dd33b266a416b2add6dcd63..077e44e11640d83760ed894b5c91bd83c4d336bc 100644
--- a/layouts/partials/commons/summary-in-content.html
+++ b/layouts/partials/commons/summary-in-content.html
@@ -1,4 +1,4 @@
-{{ $summary := .summary | default (partial "PrepareText" .context.Params.summary) }}
+{{ $summary := .summary | default (.context.Params.summary | safeHTML) }}
 {{- if and (eq site.Params.summary.position "content") $summary -}}
   {{- if .block_wrapped -}}
   <div class="block block-summary">
diff --git a/layouts/partials/diplomas/diplomas.html b/layouts/partials/diplomas/diplomas.html
index aed223f94b3b370eb0c20090d28b0cf16419c2fe..0c15a8d06e4c969510d6100de26fdc6a3230a16d 100644
--- a/layouts/partials/diplomas/diplomas.html
+++ b/layouts/partials/diplomas/diplomas.html
@@ -11,7 +11,7 @@
       </a>
       <div class="content">
         <div class="description">
-          {{- partial "PrepareText" .Params.summary -}}
+          {{- .Params.summary | safeHTML -}}
         </div>
 
         <ol class="programs">
diff --git a/layouts/partials/diplomas/hero-single.html b/layouts/partials/diplomas/hero-single.html
index 39ed569800a6055a09f98db45ab338323867c449..c45f7fb492f4beff68e818d18d512630ca48d1ca 100644
--- a/layouts/partials/diplomas/hero-single.html
+++ b/layouts/partials/diplomas/hero-single.html
@@ -1,7 +1,7 @@
 {{- $breadcrumb_is_after_hero := eq site.Params.breadcrumb.position "after-hero" -}}
 {{- $title := or .Params.header_text .Title -}}
 {{ $subtitle := "" }}
-{{- $summary := partial "PrepareText" .Params.summary -}}
+{{- $summary := .Params.summary | safeHTML -}}
 {{ if and (eq site.Params.summary.position "hero") $summary }}
   {{ $subtitle = $summary }}
 {{ end }}
diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html
index 633b9adca87a19cbdab7b95ba0b46f477db26b7e..cc57c58597762a4ecb8d99815e4596e3117f08a2 100644
--- a/layouts/partials/events/event.html
+++ b/layouts/partials/events/event.html
@@ -48,7 +48,7 @@
           {{ else if eq .Params.dates.status "future" }}
             {{- i18n "blocks.events.future" -}}
           {{ else if eq .Params.dates.status "archive" }}
-              {{- i18n "blocks.events.archive" -}}
+            {{- i18n "blocks.events.archive" -}}
           {{ end }}
         </p>
       {{ end }}
@@ -81,12 +81,12 @@
     <div class="media">
       {{- if .Params.image -}}
         {{- partial "commons/image.html"
-              (dict
-                "image"    .Params.image
-                "sizes"    site.Params.image_sizes.sections.events.item
-              ) -}}
-      {{- else if site.Params.events.default_image -}}
-        {{- partial "commons/image-default.html" -}}
+            (dict
+              "image"    .Params.image
+              "sizes"    site.Params.image_sizes.sections.events.item
+            ) -}}
+      {{- else -}}
+        {{- partial "commons/image-default.html" "events" -}}
       {{- end -}}
     </div>
   </article>
diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html
index 2afeea0df6b88ea9977d1b2d9a3fc0c47ac8b11a..b812e410d9e4f8e34873723994928563667bb11d 100644
--- a/layouts/partials/head/seo.html
+++ b/layouts/partials/head/seo.html
@@ -11,7 +11,7 @@
 {{- else if .Params.description -}}
   {{- $seoDescription = partial "PrepareHTML" .Params.description -}} {{/*  LEGACY  */}}
 {{- else if .Params.summary -}}
-  {{- $seoDescription = partial "PrepareText" .Params.summary -}}
+  {{- $seoDescription = .Params.summary | safeHTML -}}
 {{- else if .Content -}}
   {{- $seoDescription = partial "GetTruncateContent" ( dict "text" .Content ) -}}
 {{- else if .Params.legacy_text -}}
@@ -90,5 +90,4 @@
 Limiter le tracking par le CDN
 https://framagit.org/chatons/CHATONS/-/issues/200#note_1987024
 */}}
-<meta name="referrer" content="no-referrer">
-  
\ No newline at end of file
+<meta name="referrer" content="no-referrer">
\ No newline at end of file
diff --git a/layouts/partials/header/hero.html b/layouts/partials/header/hero.html
index 65f8abf544eb021abe22180c8de0f4bd0a854cb4..78fe93990d0d4d01863efb7f7e72523f2d24b740 100644
--- a/layouts/partials/header/hero.html
+++ b/layouts/partials/header/hero.html
@@ -6,7 +6,7 @@
   {{- $direction = partial "GetImageDirection" .image -}}
 {{ end }}
 
-{{- $summary := partial "PrepareText" .context.Params.summary -}}
+{{- $summary := .context.Params.summary | safeHTML -}}
 {{- $subtitle_is_summary := false -}}
 
 {{ if not $subtitle }}
diff --git a/layouts/partials/pages/page-media.html b/layouts/partials/pages/page-media.html
index 1f6e6e063d9798a1990fd30e8ff43ace948b1847..06858736c6576750e7efa50fc87c181b3f35e366 100644
--- a/layouts/partials/pages/page-media.html
+++ b/layouts/partials/pages/page-media.html
@@ -6,6 +6,6 @@
             "sizes"    site.Params.image_sizes.sections.pages.item
           ) -}}
   {{- else -}}
-    {{- partial "commons/image-default.html" -}}
+    {{- partial "commons/image-default.html" "pages" -}}
   {{- end -}}
 </div>
diff --git a/layouts/partials/pages/page.html b/layouts/partials/pages/page.html
index d3ecfcf867cfed43f13ebcba2891b9fa42c25f64..6bc6d96e96d0cd0c8fb2898536b738ede143b849 100644
--- a/layouts/partials/pages/page.html
+++ b/layouts/partials/pages/page.html
@@ -16,8 +16,8 @@
         {{- partial "PrepareHTML" .Title -}}
       </a>
     {{- partial "PrepareHTML" (printf "</%s>" $heading) -}}
-    {{- if .Params.summary }}
-      <p>{{ partial "PrepareText" .Params.summary }}</p>
+    {{- with .Params.summary }}
+      <p>{{ . | safeHTML }}</p>
     {{ end -}}
   </div>
 </article>
diff --git a/layouts/partials/papers/abstract.html b/layouts/partials/papers/abstract.html
index 702fde2f40a1f4d71482d05bb259f9dd7e42c418..1b6a5cbc1ae77fd3c0785e3bc878f921d4238ee5 100644
--- a/layouts/partials/papers/abstract.html
+++ b/layouts/partials/papers/abstract.html
@@ -1,7 +1,7 @@
 <section class="paper-essentials" id="abstract">
   {{ with .Params.Abstract }}
     <h2>{{ i18n "papers.abstract" }}</h2>
-    <p itemprop="abstract">{{ partial "PrepareText" . }}</p>
+    <p itemprop="abstract">{{  . | safeHTML }}</p>
   {{ end }}
   {{ if .Params.Pdf }}
     <h2>{{ i18n "papers.download" }}</h2>
diff --git a/layouts/partials/papers/citations.html b/layouts/partials/papers/citations.html
index 508515cfeabf76dc7fa9712ebb1aa3a0a874050d..2675cef564a82dfb84c56eea0ad6ee5aa7343132 100644
--- a/layouts/partials/papers/citations.html
+++ b/layouts/partials/papers/citations.html
@@ -4,7 +4,13 @@
   <div>
     {{ range .Params.citations }}
       <div class="citation">
-        <a data-click-to-copy="{{- partial "PrepareText" .content -}}" role="button" title="{{ i18n "commons.click_to_copy.button_title" }}" aria-label="{{ i18n "commons.click_to_copy.aria_label" (dict "description" .label )}}" tabindex="0">{{ .label }}</a>
+        <a  data-click-to-copy="{{- .content | safeHTML -}}"
+            role="button" 
+            title="{{ i18n "commons.click_to_copy.button_title" }}" 
+            aria-label="{{ i18n "commons.click_to_copy.aria_label" (dict "description" .label )}}" 
+            tabindex="0">
+          {{ .label }}
+        </a>
         <p>{{ partial "PrepareHTML" .content }}</p>
       </div>
     {{ end }}
diff --git a/layouts/partials/papers/document-nav.html b/layouts/partials/papers/document-nav.html
index 1b9f6d5693fee74d700b593d0303e628433bfc90..a2f0211d51ca0d429d40b8fd4ce9989acf55f97b 100644
--- a/layouts/partials/papers/document-nav.html
+++ b/layouts/partials/papers/document-nav.html
@@ -15,8 +15,8 @@
                       "tablet"   "208x247"
                       "desktop"  "408x485"
                     ) -}}
-            {{- else if site.Params.default_image.url -}}
-              {{- partial "commons/image-default.html" -}}
+            {{- else -}}
+              {{- partial "commons/image-default.html" "papers" -}}
             {{- end -}}
           </div>
         </a>
diff --git a/layouts/partials/papers/sidebar.html b/layouts/partials/papers/sidebar.html
index 0c17ae332d1be1df0693db637bfd208484d4c17f..b8d07c36e12d76de8b5207044e16d43f7a84e1c6 100644
--- a/layouts/partials/papers/sidebar.html
+++ b/layouts/partials/papers/sidebar.html
@@ -17,8 +17,8 @@
                           "tablet"   "208x247"
                           "desktop"  "408x485"
                         ) -}}
-                {{- else if site.Params.default_image.url -}}
-                  {{- partial "commons/image-default.html" -}}
+                {{- else -}}
+                  {{- partial "commons/image-default.html" "papers" -}}
                 {{- end -}}
               </div>
             </a>
diff --git a/layouts/partials/papers/summary.html b/layouts/partials/papers/summary.html
index 45c401a2ced34930b5498a17b9ea91189e5c5e78..08de78ed0b494aa8dafdb3470c894882b58e54ec 100644
--- a/layouts/partials/papers/summary.html
+++ b/layouts/partials/papers/summary.html
@@ -1,4 +1,4 @@
-{{ $summary := (partial "PrepareText" .Params.summary) }}
+{{ $summary := .Params.summary | safeHTML }}
 {{- if and (eq site.Params.summary.position "content") $summary -}}
 <section>
   <h2 class="lead">{{ $summary }}</h2>
diff --git a/layouts/partials/persons/hero-single.html b/layouts/partials/persons/hero-single.html
index 36f55307da4b0b3f4f9aee8f62402b909ef4066a..da41ce5514a76c6bd68d4288dcb5467879e60f84 100644
--- a/layouts/partials/persons/hero-single.html
+++ b/layouts/partials/persons/hero-single.html
@@ -1,6 +1,6 @@
 {{- $breadcrumb_is_after_hero := eq site.Params.breadcrumb.position "after-hero"  -}}
 {{ $subtitle := "" }}
-{{- $summary := partial "PrepareText" .Params.summary -}}
+{{- $summary := .Params.summary | safeHTML -}}
 {{ if and (eq site.Params.summary.position "hero") $summary }}
   {{ $subtitle = $summary }}
 {{ end }}
diff --git a/layouts/partials/persons/list-item.html b/layouts/partials/persons/list-item.html
index 8f004ecad97f163238cfcac35d618fd13c9a17e9..dd7f669ca8db07eb2c963ba3e2b74fc03ed3df3d 100644
--- a/layouts/partials/persons/list-item.html
+++ b/layouts/partials/persons/list-item.html
@@ -1,6 +1,6 @@
 <li itemscope itemtype="https://schema.org/Person">
   <p itemprop="name"><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></p>
   {{- if partial "GetTextFromHTML" .Params.summary }}
-    <p itemprop="jobTitle">{{- partial "PrepareText" .Params.summary -}}</p>
+    <p itemprop="jobTitle">{{- .Params.summary | safeHTML -}}</p>
   {{ end -}}
 </li>
\ No newline at end of file
diff --git a/layouts/partials/persons/person.html b/layouts/partials/persons/person.html
index 2b709098481da6ad98ff1ab8d8c67670776f97a6..b047ff1e311e490b62ad7ed884a983bd293c2114 100644
--- a/layouts/partials/persons/person.html
+++ b/layouts/partials/persons/person.html
@@ -3,7 +3,7 @@
     {{- $title := partial "PrepareHTML" .Title }}
     <p class="name"><a href="{{ .Permalink }}">{{- $title -}}</a></p>
     {{- if partial "GetTextFromHTML" .Params.summary }}
-      <p>{{- partial "PrepareText" .Params.summary -}}</p>
+      <p>{{- .Params.summary | safeHTML -}}</p>
     {{ else if (partial "GetTextFromHTML" .Content) }}
       <p>{{- partial "GetTruncateContent" ( dict "text" .Content ) -}}</p>
     {{ end -}}
diff --git a/layouts/partials/posts/author.html b/layouts/partials/posts/author.html
index f0766546acc949643375f77b8c2218d66ddd53e4..6daa619974951a31e216458d7fc18c86fd82b79e 100644
--- a/layouts/partials/posts/author.html
+++ b/layouts/partials/posts/author.html
@@ -2,7 +2,7 @@
   {{- $person := site.GetPage (printf "/persons/%s" .Slug) -}}
   {{ with $person }}
     <div class="post-author" itemscope itemtype="https://schema.org/Person" itemprop="author">
-      <p itemprop="name">{{ partial "PrepareText" .Title }}</p>
+      <p itemprop="name">{{ .Title | safeHTML }}</p>
     </div>
   {{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html
index 0ee9eb496725a1ca2a0aad331867d77b6662ec5c..0137312c24227bf98f93550bec9aec4ead3f75d3 100644
--- a/layouts/partials/posts/post.html
+++ b/layouts/partials/posts/post.html
@@ -47,12 +47,12 @@
   <div class="media">
     {{- if .Params.image -}}
       {{- partial "commons/image.html"
-            (dict
-              "image"    .Params.image
-              "sizes"    site.Params.image_sizes.sections.posts.item
-            ) -}}
-    {{- else if site.Params.posts.default_image -}}
-      {{- partial "commons/image-default.html" -}}
+          (dict
+            "image"    .Params.image
+            "sizes"    site.Params.image_sizes.sections.posts.item
+          ) -}}
+    {{- else -}}
+      {{- partial "commons/image-default.html" "posts" -}}
     {{- end -}}
   </div>
 </article>
diff --git a/layouts/partials/programs/hero-single.html b/layouts/partials/programs/hero-single.html
index 652ebe208049c5f998659f873716d88f49432bf8..deb0f4ae2da54d0047773693e12b80cc92142c9d 100644
--- a/layouts/partials/programs/hero-single.html
+++ b/layouts/partials/programs/hero-single.html
@@ -1,7 +1,7 @@
 {{- $breadcrumb_is_after_hero := eq site.Params.breadcrumb.position "after-hero"  -}}
 {{- $title := or .Params.header_text .Title -}}
 {{ $subtitle := "" }}
-{{- $summary := partial "PrepareText" .Params.summary -}}
+{{- $summary := .Params.summary | safeHTML -}}
 {{ if and (eq site.Params.summary.position "hero") $summary }}
   {{ $subtitle = $summary }}
 {{ end }}
diff --git a/layouts/partials/publications/citations.html b/layouts/partials/publications/citations.html
index 559b6d8e941d3d99c9b294718e2ee4b67b9b7099..c98fb3315ff2d485b28566b63392ab58025aef76 100644
--- a/layouts/partials/publications/citations.html
+++ b/layouts/partials/publications/citations.html
@@ -4,7 +4,13 @@
   <div>
     {{ range .Params.citations }}
       <div class="citation">
-        <a data-click-to-copy="{{- partial "PrepareText" .content -}}" role="button" title="{{ i18n "commons.click_to_copy.button_title" }}" aria-label="{{ i18n "commons.click_to_copy.aria_label" (dict "description" .label )}}" tabindex="0">{{ .label }}</a>
+        <a  data-click-to-copy="{{- .content | safeHTML -}}" 
+            role="button" 
+            title="{{ i18n "commons.click_to_copy.button_title" }}" 
+            aria-label="{{ i18n "commons.click_to_copy.aria_label" (dict "description" .label )}}" 
+            tabindex="0">
+          {{ .label }}
+        </a>
         <p>{{ partial "PrepareHTML" .content }}</p>
       </div>
     {{ end }}
diff --git a/layouts/partials/volumes/volume.html b/layouts/partials/volumes/volume.html
index 285f8e63d390d830230255db949f9053f644e80f..2ff521816ad11ff47f33a8e972279017f04d6368 100644
--- a/layouts/partials/volumes/volume.html
+++ b/layouts/partials/volumes/volume.html
@@ -11,8 +11,8 @@
               "alt"      .Title
               "sizes"    site.Params.image_sizes.sections.volumes.item
             ) -}}
-    {{- else if site.Params.default_image.url -}}
-      {{- partial "commons/image-default.html" -}}
+    {{- else -}}
+      {{- partial "commons/image-default.html" "volumes" -}}
     {{- end -}}
   </div>
 </article>
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index b87446a425138d69c92b803fa4f134d670ce9846..5523950f11e3c1ff4e8a53d5aa63400e7ccabc66 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -4,9 +4,9 @@
   <div class="document-content" itemscope itemtype="https://schema.org/NewsArticle">
     <meta itemprop="headline" content="{{ partial "PrepareHTML" .Title }}">
     <meta itemprop="url" content="{{ .Permalink }}">
-    {{ if .Date }}<meta itemprop="datePublished" content="{{ .Date.Format "2006-01-02T15:04" }}">{{ end }}
-    {{ if .Params.summary }}<meta itemprop="abstract" content="{{ partial "PrepareText" .Params.summary }}">{{ end }}
-    {{ if .Summary }}<meta itemprop="description" content="{{ partial "PrepareText" .Summary }}">{{ end }}
+    {{ with .Date }}<meta itemprop="datePublished" content="{{ .Format "2006-01-02T15:04" }}">{{ end }}
+    {{ with .Params.summary }}<meta itemprop="abstract" content="{{ . | safeHTML }}">{{ end }}
+    {{ with .Summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
 
     {{ partial "posts/sidebar.html" . }}