themes/default/layouts/partials/function-paths: Collect paths functions here

30 files changed, 63 insertions, 59 deletions

diff --git a/themes/default/layouts/_default/_markup/render-codeblock.html b/themes/default/layouts/_default/_markup/render-codeblock.html
index f5c0e13..7c2670f 100644
--- a/themes/default/layouts/_default/_markup/render-codeblock.html
+++ b/themes/default/layouts/_default/_markup/render-codeblock.html
@@ -7,7 +7,7 @@
   {{ .Type }}
   </language-label>
     <button>
-      {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/copy.svg")) }}
+      {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/copy.svg")) }}
       <span>Copy</span>
     </button>
   </header>
diff --git a/themes/default/layouts/_default/_markup/render-image.html b/themes/default/layouts/_default/_markup/render-image.html
index 189ab5a..28e6792 100644
--- a/themes/default/layouts/_default/_markup/render-image.html
+++ b/themes/default/layouts/_default/_markup/render-image.html
@@ -9,7 +9,7 @@
 {{- $author     := .Page.Section -}}
 {{- $relURL     := strings.TrimPrefix .Page.Site.BaseURL .Page.Permalink -}}
 {{- $immutable  := print ($relURL | humanize | urlize) "-" ($source | sha256 | truncate 8 "") -}}
-{{- $fileCache  := print (partial "function-paths-media.html") "/" $author "/" $immutable -}}
+{{- $fileCache  := print (partial "function-paths.html" "media") "/" $author "/" $immutable -}}
 
 {{- if not (and (fileExists (print "public/" $fileCache ".webp")) (fileExists (print "public/" $fileCache (path.Ext $source)))) -}}
   {{- with $remote := resources.GetRemote $source -}}
@@ -17,7 +17,7 @@
       {{- if fileExists $public -}}
         {{- $local = resources.Get $public -}}
         {{- with $local -}}
-          {{- $local = .Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base .)) -}}
+          {{- $local = .Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base .)) -}}
         {{- end -}}
         {{- $source = print ("" | absURL) $source -}}
       {{- else -}}
@@ -29,12 +29,12 @@
         {{- $source = $404image.RelPermalink -}}
       {{- end -}}
     {{- else -}}
-      {{- $cache = .Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base .)) -}}
+      {{- $cache = .Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base .)) -}}
     {{- end -}}
   {{- end -}}
 {{- else -}}
   {{- $exists = resources.Get (print "public/" $fileCache (path.Ext $source)) -}}
-  {{- $exists = $exists.Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base $exists)) -}}
+  {{- $exists = $exists.Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base $exists)) -}}
 {{ end }}
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
 <figure>
@@ -42,10 +42,10 @@
     <picture>
       {{- with $local }}
         {{- $local = .Fit (print $dimensions " webp") }}
-        {{- $local = $local | resources.Copy (print (partial "function-paths-media.html") "/" $author "/" $immutable ".webp") }}
+        {{- $local = $local | resources.Copy (print (partial "function-paths.html" "media") "/" $author "/" $immutable ".webp") }}
         <source srcset="{{- $local.RelPermalink -}}" type="image/webp" />
         {{- $local = .Fit $dimensions }}
-        {{- $local = $local | resources.Copy (print (partial "function-paths-media.html") "/" $author "/" $immutable (path.Ext $local)) }}
+        {{- $local = $local | resources.Copy (print (partial "function-paths.html" "media") "/" $author "/" $immutable (path.Ext $local)) }}
         {{- $width = $local.Width -}}
         {{- $height = $local.Height -}}
         {{- $writeToFile := $local.Permalink }}
@@ -55,7 +55,7 @@
         {{- $cache = $cache | resources.Copy (print $author "/media/" $immutable ".webp") }}
         <source srcset="{{- $cache.RelPermalink -}}" type="image/webp" />
         {{- $cache = .Fit $dimensions }}
-        {{- $cache = $cache | resources.Copy (print (partial "function-paths-media.html") "/" $author "/" $immutable (path.Ext $cache)) }}
+        {{- $cache = $cache | resources.Copy (print (partial "function-paths.html" "media") "/" $author "/" $immutable (path.Ext $cache)) }}
         {{- $width = $cache.Width -}}
         {{- $height = $cache.Height -}}
         {{- $cache = $cache.RelPermalink }}
diff --git a/themes/default/layouts/_default/home.rss-style.xsl b/themes/default/layouts/_default/home.rss-style.xsl
index b537d38..f2aeb43 100644
--- a/themes/default/layouts/_default/home.rss-style.xsl
+++ b/themes/default/layouts/_default/home.rss-style.xsl
@@ -23,7 +23,7 @@
           <nav>
             <icon-button>
               <a id="back" href="/">
-                {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/arrow-left.svg")) }}
+                {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/arrow-left.svg")) }}
                 <small>Back</small>
               </a>
             </icon-button>
@@ -36,7 +36,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-home" href="/">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/home.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/home.svg")) }}
                   <small>Home</small>
                 </a>
               </icon-button>
@@ -45,7 +45,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-tag" href="/tags/">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/tag.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/tag.svg")) }}
                   <small>Tags</small>
                 </a>
               </icon-button>
@@ -54,7 +54,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-clock" href="/archives/messages/">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/tabler/clock.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/tabler/clock.svg")) }}
                   <small>History</small>
                 </a>
               </icon-button>
@@ -63,7 +63,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-book-2" href="/archives/tags/">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/tabler/book-2.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/tabler/book-2.svg")) }}
                   <small>Records</small>
                 </a>
               </icon-button>
@@ -72,7 +72,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-users" href="/authors/">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/users.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/users.svg")) }}
                   <small>Authors</small>
                 </a>
               </icon-button>
@@ -81,7 +81,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-rss" href="/rss.xml">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/rss.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/rss.svg")) }}
                   <small>RSS</small>
                 </a>
               </icon-button>
@@ -90,7 +90,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-circle" href="/index.json">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/circle.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/circle.svg")) }}
                   <small>JSON</small>
                 </a>
               </icon-button>
@@ -99,7 +99,7 @@
             <icon-navigator hidden="">
               <icon-button>
                 <a id="nav-middle-git-commit" href="/sources/">
-                  {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/git-commit.svg")) }}
+                  {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/git-commit.svg")) }}
                   <small>Sources</small>
                 </a>
               </icon-button>
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index 4e47898..44619f3 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -12,7 +12,7 @@
             <micro-unsafe>
             <details>
               <summary>
-                {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/alert-circle.svg")) }}
+                {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/alert-circle.svg")) }}
                 <span>Danger: Unsafe Content. <b><u>Click here</u></b> to show/hide</span>
               </summary>
             </details>
diff --git a/themes/default/layouts/partials/author-card.html b/themes/default/layouts/partials/author-card.html
index 3e4bcca..7c88dfb 100644
--- a/themes/default/layouts/partials/author-card.html
+++ b/themes/default/layouts/partials/author-card.html
@@ -11,14 +11,14 @@
         <a title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/#">
           <picture>
             {{- with $image }}
-              {{- $image = .Content | resources.FromString (print (partial "function-paths-media.html") "/" $.Data.user "/" (path.Base .)) }}
+              {{- $image = .Content | resources.FromString (print (partial "function-paths.html" "media") "/" $.Data.user "/" (path.Base .)) }}
               <source srcset="{{- ($image.Fit (print $dimensions " webp")).RelPermalink -}}" type="image/webp" />
             {{- end }}
             <img
               alt="{{ .Data.name }}"
               {{- if fileExists $path }}
               {{ with $image }}
-              {{- $image = (.Content | resources.FromString (print (partial "function-paths-media.html") "/" $.Data.user "/" (path.Base .))).Fit $dimensions -}}
+              {{- $image = (.Content | resources.FromString (print (partial "function-paths.html" "media") "/" $.Data.user "/" (path.Base .))).Fit $dimensions -}}
               width="{{ $image.Width }}"
               height="{{ $image.Height }}"
               src="{{ $image.RelPermalink }}"
@@ -38,7 +38,7 @@
         <h3><a title="{{ .Data.name }}" href="{{ "" | absURL }}/{{ .Data.user }}/#">@{{ .Data.user }}</a></h3>
       </micro-header>
       <a title="Follow with RSS Reader" href="{{ "" | absURL }}/{{ .Data.user }}/rss.xml">
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/rss.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/rss.svg")) }}
         <span>Follow</span>
       </a>
     </micro-summary>
diff --git a/themes/default/layouts/partials/author-header.html b/themes/default/layouts/partials/author-header.html
index 9babf1d..6b2fca0 100644
--- a/themes/default/layouts/partials/author-header.html
+++ b/themes/default/layouts/partials/author-header.html
@@ -6,14 +6,14 @@
 {{- $author     := partial "author-user.html" . }}
 
 {{- with $image -}}
-  {{- $image = .Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base .)) -}}
+  {{- $image = .Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base .)) -}}
   <source srcset="{{- ($image.Resize (print $dimensions " webp")).RelPermalink -}}" type="image/webp" />
 {{- end -}}
 
 <img
   {{ if fileExists $path }}
   {{- with $image -}}
-  {{- $image = (.Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base .))).Resize $dimensions -}}
+  {{- $image = (.Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base .))).Resize $dimensions -}}
   width="{{ $image.Width }}"
   height="{{ $image.Height }}"
   src="{{ $image.RelPermalink }}"
diff --git a/themes/default/layouts/partials/author-picture.html b/themes/default/layouts/partials/author-picture.html
index c269efc..88d2918 100644
--- a/themes/default/layouts/partials/author-picture.html
+++ b/themes/default/layouts/partials/author-picture.html
@@ -8,7 +8,7 @@
 {{- with .Params.feed -}}
 {{- else -}}
   {{- with $image -}}
-    {{- $image = .Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base .)) -}}
+    {{- $image = .Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base .)) -}}
     <source srcset="{{- ($image.Fit (print $dimensions " webp")).RelPermalink -}}" type="image/webp" />
     {{- end -}}
 {{ end }}
@@ -23,7 +23,7 @@
   {{ else }}
   {{ if fileExists $path }}
   {{- with $image -}}
-  {{- $image = (.Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/" (path.Base .))).Fit $dimensions -}}
+  {{- $image = (.Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/" (path.Base .))).Fit $dimensions -}}
   width="{{ $image.Width }}"
   height="{{ $image.Height }}"
   src="{{ $image.RelPermalink }}"
diff --git a/themes/default/layouts/partials/card-meta.html b/themes/default/layouts/partials/card-meta.html
index 44a1a7b..83e8052 100644
--- a/themes/default/layouts/partials/card-meta.html
+++ b/themes/default/layouts/partials/card-meta.html
@@ -9,14 +9,14 @@
 
       {{ if .Weight }}
         <anchored-pinned>
-         {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/tabler/pinned.svg")) }}
+         {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/tabler/pinned.svg")) }}
          <span>Pinned</span>
         </anchored-pinned>
       {{ end }}
 
       {{ if .Params.Liked }}
         <anchored-liked>
-         {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/heart.svg")) }}
+         {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/heart.svg")) }}
          <span>Liked</span>
         </anchored-liked>
       {{ end }}
diff --git a/themes/default/layouts/partials/function-paths-markdown.html b/themes/default/layouts/partials/function-paths-markdown.html
deleted file mode 100644
index ab92b8d..0000000
--- a/themes/default/layouts/partials/function-paths-markdown.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ return "data/generates/content" }}
diff --git a/themes/default/layouts/partials/function-paths-media.html b/themes/default/layouts/partials/function-paths-media.html
deleted file mode 100644
index ce50a92..0000000
--- a/themes/default/layouts/partials/function-paths-media.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ return "data/media" }}
diff --git a/themes/default/layouts/partials/function-paths-static.html b/themes/default/layouts/partials/function-paths-static.html
deleted file mode 100644
index b34dbeb..0000000
--- a/themes/default/layouts/partials/function-paths-static.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ return "static" }}
diff --git a/themes/default/layouts/partials/function-paths.html b/themes/default/layouts/partials/function-paths.html
new file mode 100644
index 0000000..74d285c
--- /dev/null
+++ b/themes/default/layouts/partials/function-paths.html
@@ -0,0 +1,7 @@
+{{- $path := . -}}
+
+{{- if eq $path "markdown" -}} {{- $path := "data/generates/content" -}} {{- end -}}
+{{- if eq $path "media"    -}} {{- $path := "data/media"             -}} {{- end -}}
+{{- if eq $path "static"   -}} {{- $path := "static"                 -}} {{- end -}}
+
+{{- return $path -}}
diff --git a/themes/default/layouts/partials/gallery-walk.html b/themes/default/layouts/partials/gallery-walk.html
index 6dd9fbd..27293a9 100644
--- a/themes/default/layouts/partials/gallery-walk.html
+++ b/themes/default/layouts/partials/gallery-walk.html
@@ -68,10 +68,10 @@
     {{- range first 6 $files }}
        {{- if not .IsDir }}
         {{- with $image := resources.Get .Path -}}
-        {{- $image = (.Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/gallery-walker_" (path.Base .))).Fit (print $dimensions " webp") }}
+        {{- $image = (.Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/gallery-walker_" (path.Base .))).Fit (print $dimensions " webp") }}
           <picture>
             <source srcset="{{- $image.RelPermalink -}}" type="image/webp" />
-            {{- $image = (.Content | resources.FromString (print (partial "function-paths-media.html") "/" $author "/gallery-walker_" (path.Base .))).Fit (print $dimensions " png") }}
+            {{- $image = (.Content | resources.FromString (print (partial "function-paths.html" "media") "/" $author "/gallery-walker_" (path.Base .))).Fit (print $dimensions " png") }}
             <img
               alt="{{- .Name }}"
               title="{{- .Name }}"
diff --git a/themes/default/layouts/partials/generate-feeds.html b/themes/default/layouts/partials/generate-feeds.html
index 02164f9..67c9556 100644
--- a/themes/default/layouts/partials/generate-feeds.html
+++ b/themes/default/layouts/partials/generate-feeds.html
@@ -189,7 +189,7 @@
       {{- with .Err -}}
         {{- warnf "%s" . -}}
       {{- else -}}
-        {{- $imageContent := $image.Content | resources.FromString (print (partial "function-paths-media.html") "/" ($image | urlize)) -}}
+        {{- $imageContent := $image.Content | resources.FromString (print (partial "function-paths.html" "media") "/" ($image | urlize)) -}}
         {{- $imageSource = $imageContent.RelPermalink -}}
         {{- $imageTitle = $imageCanonicalURL -}}
       {{- end -}}
diff --git a/themes/default/layouts/partials/meta-date-time.html b/themes/default/layouts/partials/meta-date-time.html
index 6a29955..bb349e9 100644
--- a/themes/default/layouts/partials/meta-date-time.html
+++ b/themes/default/layouts/partials/meta-date-time.html
@@ -1,6 +1,6 @@
 <micro-metadata-datetime>
   {{- $author := index .Site.Data ((or .Params.author .Site.Author.default.user) | default "default") -}}
-  {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/calendar.svg")) -}}
+  {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/calendar.svg")) -}}
 
   {{- with .Params.feed.self -}}
   <a href="{{ $.Site.BaseURL }}/{{ . }}">
diff --git a/themes/default/layouts/partials/meta-draft.html b/themes/default/layouts/partials/meta-draft.html
index 7a8aacb..7513b3c 100644
--- a/themes/default/layouts/partials/meta-draft.html
+++ b/themes/default/layouts/partials/meta-draft.html
@@ -2,7 +2,7 @@
   <micro-metadata-draft>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     <em>
-      {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/edit.svg")) -}}
+      {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/edit.svg")) -}}
       <a href="{{ .Site.BaseURL }}/{{ .Type }}/drafts/">Draft</a>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     </em>
diff --git a/themes/default/layouts/partials/meta-expiry-date.html b/themes/default/layouts/partials/meta-expiry-date.html
index b04dd1f..a4ddeea 100644
--- a/themes/default/layouts/partials/meta-expiry-date.html
+++ b/themes/default/layouts/partials/meta-expiry-date.html
@@ -6,7 +6,7 @@
     <time
       datetime= "{{- .ExpiryDate | time.Format "2006-01-02T15:04:05Z" -}}"
       title="Self destructs within {{ $duration }} days ({{ .ExpiryDate | time.Format "Monday, January 2 2006 at 15:04:05 MST" }})">
-      {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/trash-2.svg")) -}}
+      {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/trash-2.svg")) -}}
       {{- .ExpiryDate | time.Format "Jan 2 2006" -}}
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     </time>
diff --git a/themes/default/layouts/partials/meta-handle.html b/themes/default/layouts/partials/meta-handle.html
index 459877a..2bb034d 100644
--- a/themes/default/layouts/partials/meta-handle.html
+++ b/themes/default/layouts/partials/meta-handle.html
@@ -6,7 +6,7 @@
 {{- end -}}
 
 <micro-metadata-handle>
-  {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/at-sign.svg")) -}}
+  {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/at-sign.svg")) -}}
   {{- with .Params.feed.domain -}}
   <a
     title="{{ . }}"
diff --git a/themes/default/layouts/partials/meta-link.html b/themes/default/layouts/partials/meta-link.html
index 5a5c04a..442e99f 100644
--- a/themes/default/layouts/partials/meta-link.html
+++ b/themes/default/layouts/partials/meta-link.html
@@ -1,5 +1,5 @@
 <micro-metadata-link>
-  {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/link.svg")) -}}
+  {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/link.svg")) -}}
 
   <cite>
     <a title="#{{ partial "card-id.html" . }}" href="#{{ partial "card-id.html" . }}">
diff --git a/themes/default/layouts/partials/meta-read-time.html b/themes/default/layouts/partials/meta-read-time.html
index 53e541f..2a5e395 100644
--- a/themes/default/layouts/partials/meta-read-time.html
+++ b/themes/default/layouts/partials/meta-read-time.html
@@ -6,7 +6,7 @@
     {{- $seconds = "1" -}}
   {{- end -}}
 
-  {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/clock.svg")) -}}
+  {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/clock.svg")) -}}
 
   <read-time title="Takes {{ $seconds }} second{{- if not (eq $seconds "1") -}}s{{- end }} to read">
     {{ $seconds }} sec
diff --git a/themes/default/layouts/partials/meta-source.html b/themes/default/layouts/partials/meta-source.html
index 94b3b01..ca6450c 100644
--- a/themes/default/layouts/partials/meta-source.html
+++ b/themes/default/layouts/partials/meta-source.html
@@ -2,15 +2,15 @@
   <micro-metadata-source>
     {{- $author := index .Site.Data ((or .Params.author .Site.Author.default.user) | default "default") -}}
     {{- $source := print $author.user "/messages/" .File.LogicalName -}}
-    {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/code.svg")) -}}
+    {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/code.svg")) -}}
 
     <cite>
       {{- with .Params.feed.raw -}}
       <a title="{{ $.Site.BaseURL }}/{{ . }}" href="{{ $.Site.BaseURL }}/{{ . }}">
       {{- else -}}
       <a
-        href="{{ .Site.BaseURL }}/{{ partial "function-paths-markdown.html" }}/{{ $source }}"
-        title="{{ .Site.BaseURL }}/{{ partial "function-paths-markdown.html" }}/{{ $source }}">
+        href="{{ .Site.BaseURL }}/{{ partial "function-paths.html" "markdown" }}/{{ $source }}"
+        title="{{ .Site.BaseURL }}/{{ partial "function-paths.html" "markdown" }}/{{ $source }}">
       {{- end -}}
         raw
       </a>
diff --git a/themes/default/layouts/partials/meta-unlisted.html b/themes/default/layouts/partials/meta-unlisted.html
index a82dad0..066a45c 100644
--- a/themes/default/layouts/partials/meta-unlisted.html
+++ b/themes/default/layouts/partials/meta-unlisted.html
@@ -1,6 +1,6 @@
 {{- if .Params.Unlisted -}}
   <unlisted-entry title="This message is off the record">
-   {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/eye-off.svg")) -}}
+   {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/eye-off.svg")) -}}
    <span>unlisted</span>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   </unlisted-entry>
diff --git a/themes/default/layouts/partials/meta-via.html b/themes/default/layouts/partials/meta-via.html
index 43278f3..c676e47 100644
--- a/themes/default/layouts/partials/meta-via.html
+++ b/themes/default/layouts/partials/meta-via.html
@@ -1,6 +1,6 @@
 {{- if .Params.feed -}}
 <anchored-via>
-  {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/rss.svg")) -}}
+  {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/rss.svg")) -}}
   <a data-hover
     title="{{ partial "author-user.html" . }}@{{ (urls.Parse .Site.BaseURL).Host }}"
     href="{{ .Site.BaseURL }}/{{ partial "author-user.html" . }}/feeds/#">
diff --git a/themes/default/layouts/partials/meta-word-count.html b/themes/default/layouts/partials/meta-word-count.html
index 1c44c78..6805563 100644
--- a/themes/default/layouts/partials/meta-word-count.html
+++ b/themes/default/layouts/partials/meta-word-count.html
@@ -3,7 +3,7 @@
   {{- $limit     := $author.wordlimit -}}
   {{- $wordLimit := gt  .WordCount $limit -}}
   {{- $overLimit := sub .WordCount $limit -}}
-  {{- safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/file-text.svg")) -}}
+  {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/file-text.svg")) -}}
 
   <word-limit title="{{- if $wordLimit -}} {{ $overLimit }} words over the limit {{- else -}} {{ .WordCount }} words {{- end -}}">
     <word-count>
diff --git a/themes/default/layouts/partials/navigator-left.html b/themes/default/layouts/partials/navigator-left.html
index 41aaa2e..32654e8 100644
--- a/themes/default/layouts/partials/navigator-left.html
+++ b/themes/default/layouts/partials/navigator-left.html
@@ -6,7 +6,7 @@
       <a id="nav-left-{{ path.Base .Identifier }}" href="{{ .URL | absURL }}">
         <span>{{ .Name }}</span>
         {{ with .Identifier }}
-          {{ $icon := print (partial "function-paths-static.html") "/icons/" . ".svg" }}
+          {{ $icon := print (partial "function-paths.html" "static") "/icons/" . ".svg" }}
           {{ safeHTML (readFile $icon) }}
         {{ end }}
       </a>
diff --git a/themes/default/layouts/partials/navigator-middle-walk.html b/themes/default/layouts/partials/navigator-middle-walk.html
index a0832a8..9971068 100644
--- a/themes/default/layouts/partials/navigator-middle-walk.html
+++ b/themes/default/layouts/partials/navigator-middle-walk.html
@@ -4,7 +4,7 @@
     <icon-button>
         <a id="nav-middle-{{ path.Base .Identifier }}" href="{{ .URL | absURL }}">
           {{ with .Identifier }}
-            {{ $icon := print (partial "function-paths-static.html") "/icons/" . ".svg" }}
+            {{ $icon := print (partial "function-paths.html" "static") "/icons/" . ".svg" }}
             {{ safeHTML (readFile $icon) }}
           {{ end }}
           <small>{{ delimit (first 1 (split .Name " ")) " " }}</small>
diff --git a/themes/default/layouts/partials/navigator-middle.html b/themes/default/layouts/partials/navigator-middle.html
index 418b237..8756ec9 100644
--- a/themes/default/layouts/partials/navigator-middle.html
+++ b/themes/default/layouts/partials/navigator-middle.html
@@ -8,9 +8,9 @@
       href="{{ or $href "#" }}"
      >
       {{ with .Icon }}
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/" . ".svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/" . ".svg")) }}
       {{ else }}
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/arrow-up.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/arrow-up.svg")) }}
       {{ end }}
       {{ with .IconLabel }}
         <small>{{ . }}</small>
@@ -46,7 +46,7 @@
         aria-label="search input"
       />
       <button id="search-submit">
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/search.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/search.svg")) }}
         <small>Search</small>
       </button>
       <ul hidden id="search-results"></ul>
diff --git a/themes/default/layouts/partials/pagination.html b/themes/default/layouts/partials/pagination.html
index d9360c4..cc4cc00 100644
--- a/themes/default/layouts/partials/pagination.html
+++ b/themes/default/layouts/partials/pagination.html
@@ -23,7 +23,7 @@
         aria-label="Back"
         title="Back"
         role="button">
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/arrow-left.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/arrow-left.svg")) }}
         Back
       </a>
     {{ else }}
@@ -31,7 +31,7 @@
         data-invisible
         title="Disabled"
         aria-label="Back">
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/arrow-left.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/arrow-left.svg")) }}
         Back
       </button>
     {{- end -}}
@@ -43,7 +43,7 @@
         title="Next"
         role="button">
         Next
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/arrow-right.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/arrow-right.svg")) }}
       </a>
     {{ else }}
       <button
@@ -51,7 +51,7 @@
         title="Disabled"
         aria-label="Next">
         Next
-        {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/arrow-right.svg")) }}
+        {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/arrow-right.svg")) }}
       </button>
     {{- end -}}
 
diff --git a/themes/default/layouts/partials/profile.html b/themes/default/layouts/partials/profile.html
index 1f01b23..139b172 100644
--- a/themes/default/layouts/partials/profile.html
+++ b/themes/default/layouts/partials/profile.html
@@ -28,21 +28,21 @@
 
   <footer>
     <p>
-      {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/map-pin.svg")) }}
+      {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/map-pin.svg")) }}
       <span>{{- $author.place | markdownify -}}</span>
     </p>
     <p>
-      {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/globe.svg")) }}
+      {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/globe.svg")) }}
       <a href="{{ $author.domain.url }}">
         {{- $author.domain.host | markdownify -}}
       </a>
     </p>
     <p>
-      {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/clock.svg")) }}
+      {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/clock.svg")) }}
       <span>{{- $author.epoch | markdownify -}}</span>
     </p>
     <p>
-      {{ safeHTML (readFile (print (partial "function-paths-static.html") "/icons/feather/user.svg")) }}
+      {{ safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/user.svg")) }}
       <span><b>{{ with $author.webring.rss }}{{ len . }}{{ else }} 0 {{ end }}</b> Following</span>
     </p>
   </footer>
diff --git a/themes/default/layouts/shortcodes/markdown.html b/themes/default/layouts/shortcodes/markdown.html
index 3bc8726..9efc859 100644
--- a/themes/default/layouts/shortcodes/markdown.html
+++ b/themes/default/layouts/shortcodes/markdown.html
@@ -1,4 +1,4 @@
-{{- $link  := default (print "/" (partial "function-paths-markdown.html") "/" .Page.File ) (.Get "link"  | default (.Get 0)) -}}
+{{- $link  := default (print "/" (partial "function-paths.html" "markdown") "/" .Page.File ) (.Get "link"  | default (.Get 0)) -}}
 {{- $text  := default (path.Base .Page.File)                                               (.Get "text"  | default (.Get 1)) -}}
 {{- $title := default ""                                                                   (.Get "title" | default (.Get 2)) -}}
 {{- $embed := default false                                                                (.Get "embed" | default (.Get 3)) -}}