diff --git a/content/posts/my-blog-tweaks/index.md b/content/posts/my-blog-tweaks/index.md
index 697febf..238d0b2 100644
--- a/content/posts/my-blog-tweaks/index.md
+++ b/content/posts/my-blog-tweaks/index.md
@@ -230,12 +230,12 @@ License: MIT
 
 [Mermaid](https://mermaid.js.org/) is a JavaScript based diagramming and charting tool that uses Markdown-inspired text definitions and a renderer to create complex diagrams.  
 
-```mermaid
+{{< mermaid >}}
 sequenceDiagram
     Alice->>John: Hello John, how are you?
     John-->>Alice: Great!
     Alice-)John: See you later!
-```
+{{< /mermaid >}}
 
 License: MIT  
 
diff --git a/layouts/_default/_markup/render-codeblock-mermaid.html b/layouts/_default/_markup/render-codeblock-mermaid.html
index feb4940..99581b2 100644
--- a/layouts/_default/_markup/render-codeblock-mermaid.html
+++ b/layouts/_default/_markup/render-codeblock-mermaid.html
@@ -6,4 +6,4 @@
     {{- $result.Wrapped | safeHTML -}}
 </div>
 
-{{- .Page.Scratch.Set "hasMermaid" true -}}
+{{- .Page.Store.Set "hasMermaid" true -}}
diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html
index a41d232..19f8579 100644
--- a/layouts/_default/_markup/render-codeblock.html
+++ b/layouts/_default/_markup/render-codeblock.html
@@ -32,4 +32,4 @@
     {{- $result.Wrapped -}}
 {{- end -}}
 
-{{- .Page.Scratch.Set "hasCodeblock" true -}}
+{{- .Page.Store.Set "hasCodeblock" true -}}
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 02b9a46..9ff63cd 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -63,6 +63,6 @@
 {{/* end of local resources */}}
 {{- end -}}
 
-{{- .Page.Scratch.Set "hasImage" true -}}
+{{- .Page.Store.Set "hasImage" true -}}
 
 <!-- Cf. https://gohugo.io/content-management/image-processing/ -->
diff --git a/layouts/partials/head/css/chroma_css.html b/layouts/partials/head/css/chroma_css.html
index 81dedbd..79f874c 100644
--- a/layouts/partials/head/css/chroma_css.html
+++ b/layouts/partials/head/css/chroma_css.html
@@ -1,6 +1,7 @@
 {{/*  chroma css  */}}
 
-{{- if .Page.Scratch.Get "hasCodeblock" -}}
+{{/* {{- if .Page.Store.Get "hasCodeblock" -}} */}}
+{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search")) -}}
 
     {{/*  bundle chroma css  */}}
     {{- $chroma_dark            := (resources.Get "css/chroma/chroma_dark.css") -}}
diff --git a/layouts/partials/head/css/image_modal_css.html b/layouts/partials/head/css/image_modal_css.html
index 8bb55ed..5334a99 100644
--- a/layouts/partials/head/css/image_modal_css.html
+++ b/layouts/partials/head/css/image_modal_css.html
@@ -1,6 +1,7 @@
 {{/*  image modal css  */}}
 
-{{- if .Page.Scratch.Get "hasImage" -}}
+{{/* {{- if .Page.Store.Get "hasImage" -}} */}}
+{{- if true -}}
     <style>
         {{- with resources.Get "css/custom/image_modal.css" | toCSS | minify -}}
             {{- .Content | safeCSS -}}
diff --git a/layouts/partials/head/mermaid.html b/layouts/partials/head/mermaid.html
index 219f667..a63d0e3 100644
--- a/layouts/partials/head/mermaid.html
+++ b/layouts/partials/head/mermaid.html
@@ -1,4 +1,4 @@
-{{- if or (.Page.Scratch.Get "hasMermaid") (.HasShortcode "mermaid") -}}
+{{- if or (.Page.Store.Get "hasMermaid") (.HasShortcode "mermaid") -}}
 
     {{- $mermaid_license_body     := "/*\nSPDX-License-Identifier: MIT\nLicensed under the MIT license.\nhttps://github.com/mermaid-js/mermaid/blob/develop/LICENSE\nhttps://opensource.org/license/mit/\n*/\n" -}}
     {{- $mermaid_license_js       := $mermaid_license_body | resources.FromString "js/mermaid_license.js" -}}
diff --git a/layouts/partials/header/image_modal.html b/layouts/partials/header/image_modal.html
index f85ff6d..70b8cee 100644
--- a/layouts/partials/header/image_modal.html
+++ b/layouts/partials/header/image_modal.html
@@ -8,7 +8,8 @@
 
 */}}
 
-{{- if .Page.Scratch.Get "hasImage" -}}
+{{/* {{- if .Page.Store.Get "hasImage" -}} */}}
+{{- if true -}}
     <div id="image_modal" class="image_modal" onclick="close_image_modal()">
         <button class="image_modal_close" onclick="close_image_modal()">close</button>
         <div class="image_modal_content" onclick="close_image_modal()">