From eaaff9e2cf95bd05e0554bed2996b3e8252edba7 Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Sat, 13 Jan 2024 20:33:21 -0500
Subject: themes/default/layouts/partials: base -> head

---
 themes/default/layouts/_default/baseof.html        |  8 +--
 themes/default/layouts/_default/home.archives.html |  2 +-
 themes/default/layouts/_default/home.settings.html |  2 +-
 themes/default/layouts/_default/home.xslt.rss.xsl  |  2 +-
 .../default/layouts/_default/home.xslt.sitemap.xsl |  2 +-
 themes/default/layouts/_default/index.html         |  2 +-
 themes/default/layouts/_default/rss.xml            |  4 +-
 .../default/layouts/_default/section.drafts.html   |  2 +-
 themes/default/layouts/_default/section.feeds.html |  2 +-
 themes/default/layouts/_default/section.html       |  2 +-
 themes/default/layouts/_default/section.marks.html |  2 +-
 themes/default/layouts/_default/single.embed.html  |  2 +-
 themes/default/layouts/_default/taxonomy.html      |  2 +-
 themes/default/layouts/_default/term.html          |  2 +-
 .../default/layouts/partials/base-canonical.html   | 15 -----
 themes/default/layouts/partials/base-csp.html      | 19 ------
 themes/default/layouts/partials/base-css.html      | 18 ------
 .../default/layouts/partials/base-description.html |  8 ---
 .../default/layouts/partials/base-discovery.html   | 62 -------------------
 themes/default/layouts/partials/base-embed.html    |  4 --
 themes/default/layouts/partials/base-footer.html   | 14 -----
 themes/default/layouts/partials/base-head.html     | 72 ----------------------
 themes/default/layouts/partials/base-js.html       |  8 ---
 themes/default/layouts/partials/base-manifest.html | 58 -----------------
 themes/default/layouts/partials/base-search.html   |  5 --
 themes/default/layouts/partials/base-title.html    | 20 ------
 themes/default/layouts/partials/footer.html        | 14 +++++
 .../default/layouts/partials/head-canonical.html   | 15 +++++
 themes/default/layouts/partials/head-csp.html      | 19 ++++++
 themes/default/layouts/partials/head-css.html      | 18 ++++++
 .../default/layouts/partials/head-description.html |  8 +++
 .../default/layouts/partials/head-discovery.html   | 62 +++++++++++++++++++
 themes/default/layouts/partials/head-embed.html    |  4 ++
 themes/default/layouts/partials/head-js.html       |  8 +++
 themes/default/layouts/partials/head-manifest.html | 58 +++++++++++++++++
 themes/default/layouts/partials/head-search.html   |  5 ++
 themes/default/layouts/partials/head-title.html    | 20 ++++++
 themes/default/layouts/partials/head.html          | 72 ++++++++++++++++++++++
 38 files changed, 321 insertions(+), 321 deletions(-)
 delete mode 100644 themes/default/layouts/partials/base-canonical.html
 delete mode 100644 themes/default/layouts/partials/base-csp.html
 delete mode 100644 themes/default/layouts/partials/base-css.html
 delete mode 100644 themes/default/layouts/partials/base-description.html
 delete mode 100644 themes/default/layouts/partials/base-discovery.html
 delete mode 100644 themes/default/layouts/partials/base-embed.html
 delete mode 100644 themes/default/layouts/partials/base-footer.html
 delete mode 100644 themes/default/layouts/partials/base-head.html
 delete mode 100644 themes/default/layouts/partials/base-js.html
 delete mode 100644 themes/default/layouts/partials/base-manifest.html
 delete mode 100644 themes/default/layouts/partials/base-search.html
 delete mode 100644 themes/default/layouts/partials/base-title.html
 create mode 100644 themes/default/layouts/partials/footer.html
 create mode 100644 themes/default/layouts/partials/head-canonical.html
 create mode 100644 themes/default/layouts/partials/head-csp.html
 create mode 100644 themes/default/layouts/partials/head-css.html
 create mode 100644 themes/default/layouts/partials/head-description.html
 create mode 100644 themes/default/layouts/partials/head-discovery.html
 create mode 100644 themes/default/layouts/partials/head-embed.html
 create mode 100644 themes/default/layouts/partials/head-js.html
 create mode 100644 themes/default/layouts/partials/head-manifest.html
 create mode 100644 themes/default/layouts/partials/head-search.html
 create mode 100644 themes/default/layouts/partials/head-title.html
 create mode 100644 themes/default/layouts/partials/head.html

(limited to 'themes/default/layouts')

diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html
index fa386be..c277115 100644
--- a/themes/default/layouts/_default/baseof.html
+++ b/themes/default/layouts/_default/baseof.html
@@ -18,10 +18,10 @@
   <head>
     <title>
       {{- block "title" . -}}{{- end -}}
-      {{- partial "base-title.html" . -}}
+      {{- partial "head-title.html" . -}}
     </title>
-    <meta name="description" content="{{- partial "base-description.html" . -}}" />
-    {{- partial "base-head.html" . -}}
+    <meta name="description" content="{{- partial "head-description.html" . -}}" />
+    {{- partial "head.html" . -}}
     {{- block "styles" . -}}{{- end -}}
   </head>
   <body>
@@ -41,7 +41,7 @@
         {{- end -}}
       </main>
       {{- block "footer" . -}}
-        {{- partial "base-footer.html" . -}}
+        {{- partial "footer.html" . -}}
       {{- end -}}
     </column-base>
 
diff --git a/themes/default/layouts/_default/home.archives.html b/themes/default/layouts/_default/home.archives.html
index d098a21..f443583 100644
--- a/themes/default/layouts/_default/home.archives.html
+++ b/themes/default/layouts/_default/home.archives.html
@@ -59,7 +59,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/home.settings.html b/themes/default/layouts/_default/home.settings.html
index 44b3399..84e8080 100644
--- a/themes/default/layouts/_default/home.settings.html
+++ b/themes/default/layouts/_default/home.settings.html
@@ -24,7 +24,7 @@
 {{- end -}}
 
 {{- define "footer" -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl
index 9d5e8ee..f828f4f 100644
--- a/themes/default/layouts/_default/home.xslt.rss.xsl
+++ b/themes/default/layouts/_default/home.xslt.rss.xsl
@@ -13,7 +13,7 @@
         {{ printf `<title><xsl:value-of select="/rss/channel/title" /> Web Feed</title>` | safeHTML }}
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-        {{- partial "base-css.html" . -}}
+        {{- partial "head-css.html" . -}}
       </head>
       <body>
         <column-base position="left"></column-base>
diff --git a/themes/default/layouts/_default/home.xslt.sitemap.xsl b/themes/default/layouts/_default/home.xslt.sitemap.xsl
index 67a4459..335ce09 100644
--- a/themes/default/layouts/_default/home.xslt.sitemap.xsl
+++ b/themes/default/layouts/_default/home.xslt.sitemap.xsl
@@ -11,7 +11,7 @@
         <title>{{ $.Site.Title }} Site Map</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
-        {{- partial "base-css.html" . -}}
+        {{- partial "head-css.html" . -}}
       </head>
       <body>
         <column-base position="left"></column-base>
diff --git a/themes/default/layouts/_default/index.html b/themes/default/layouts/_default/index.html
index 1de28d6..f25cabf 100644
--- a/themes/default/layouts/_default/index.html
+++ b/themes/default/layouts/_default/index.html
@@ -26,7 +26,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml
index 78161da..5f9877e 100644
--- a/themes/default/layouts/_default/rss.xml
+++ b/themes/default/layouts/_default/rss.xml
@@ -14,8 +14,8 @@
   {{- $lastBuildDate = .Date | time.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML -}}
 {{- end -}}
 
-{{- $title := partial "base-title.html" . -}}
-{{- $description := partial "base-title.html" . -}}
+{{- $title := partial "head-title.html" . -}}
+{{- $description := partial "head-title.html" . -}}
 {{- $author := partial "function-authors-data.html" . -}}
 
 {{- if (eq .Page.Kind "section") -}}
diff --git a/themes/default/layouts/_default/section.drafts.html b/themes/default/layouts/_default/section.drafts.html
index 7a2cdf6..bb7485c 100644
--- a/themes/default/layouts/_default/section.drafts.html
+++ b/themes/default/layouts/_default/section.drafts.html
@@ -50,7 +50,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/section.feeds.html b/themes/default/layouts/_default/section.feeds.html
index 406f667..e239928 100644
--- a/themes/default/layouts/_default/section.feeds.html
+++ b/themes/default/layouts/_default/section.feeds.html
@@ -45,7 +45,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/section.html b/themes/default/layouts/_default/section.html
index 4de0f9c..901ca1f 100644
--- a/themes/default/layouts/_default/section.html
+++ b/themes/default/layouts/_default/section.html
@@ -48,7 +48,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/section.marks.html b/themes/default/layouts/_default/section.marks.html
index 5b6cea0..def6c94 100644
--- a/themes/default/layouts/_default/section.marks.html
+++ b/themes/default/layouts/_default/section.marks.html
@@ -50,7 +50,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/single.embed.html b/themes/default/layouts/_default/single.embed.html
index 6169772..73a3add 100644
--- a/themes/default/layouts/_default/single.embed.html
+++ b/themes/default/layouts/_default/single.embed.html
@@ -21,6 +21,6 @@
 {{- end -}}
 
 {{- if $modified -}}
-  {{- partial "base-embed.html" . -}}
+  {{- partial "head-embed.html" . -}}
   {{- .Render "summary" -}}
 {{- end -}}
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index 6a8325b..5c8e2ba 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -63,7 +63,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/term.html b/themes/default/layouts/_default/term.html
index 6455b40..4f0d92a 100644
--- a/themes/default/layouts/_default/term.html
+++ b/themes/default/layouts/_default/term.html
@@ -26,7 +26,7 @@
 
 {{- define "footer" -}}
   {{- partial "pagination.html" . -}}
-  {{- partial "base-footer.html" . -}}
+  {{- partial "footer.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/partials/base-canonical.html b/themes/default/layouts/partials/base-canonical.html
deleted file mode 100644
index 051e450..0000000
--- a/themes/default/layouts/partials/base-canonical.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- $canonical := .Permalink -}}
-
-{{- with .Site.Params.site.canonical -}}
-  {{- $canonical = print $.Site.Params.site.canonical $.RelPermalink -}}
-{{- end -}}
-
-{{- with .Params.feed -}}
-  {{- $canonical = $.Params.feed.link -}}
-{{- end -}}
-
-{{- with .Params.canonical -}}
-  {{- $canonical = $.Params.canonical -}}
-{{- end -}}
-
-<link rel="canonical" href="{{ $canonical }}" />
diff --git a/themes/default/layouts/partials/base-csp.html b/themes/default/layouts/partials/base-csp.html
deleted file mode 100644
index d34043e..0000000
--- a/themes/default/layouts/partials/base-csp.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-<meta name="referrer" content="{{ .Site.Params.site.referrer }}" />
-
-{{ with .Site.Params.csp -}}
-<meta http-equiv="Content-Security-Policy"
-{{- printf ` content="` | safeHTMLAttr }}
-{{ range $policy, $list := . -}}
-{{- if reflect.IsSlice $list -}}
-{{- print $policy | safeHTMLAttr }}
-{{- range $list -}}
-{{ print " " . | safeHTMLAttr }}
-{{- end }};
-{{ else }}
-{{- print $policy ";" | safeHTMLAttr }}
-{{ end }}
-{{- end -}}
-{{- printf `"` | safeHTMLAttr -}}
-/>
-{{ end -}}
diff --git a/themes/default/layouts/partials/base-css.html b/themes/default/layouts/partials/base-css.html
deleted file mode 100644
index 662aa6b..0000000
--- a/themes/default/layouts/partials/base-css.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- $default := resources.Get "css/default.css" -}}
-{{- $syntax  := resources.Get "css/default-syntax.css" -}}
-{{- $simple  := resources.Get "css/default-simple.css" -}}
-
-{{- $css :=
-  slice $default $syntax |
-  resources.Concat "css/bundle.css" |
-  resources.Minify |
-  fingerprint |
--}}
-
-{{ if .Site.Params.site.production }}
-<link rel="stylesheet" href="{{ $css.Permalink }}"     title="Default" />
-{{ else }}
-<link rel="stylesheet" href="{{ $default.Permalink }}" title="Default" />
-<link rel="stylesheet" href="{{ $syntax.Permalink }}"                  />
-<link rel="alternate stylesheet" href="{{ $simple.Permalink }}"        />
-{{ end }}
diff --git a/themes/default/layouts/partials/base-description.html b/themes/default/layouts/partials/base-description.html
deleted file mode 100644
index 94b10c2..0000000
--- a/themes/default/layouts/partials/base-description.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- if .Params.summary -}}
-  {{ .Params.summary }}
-{{- else if .Summary -}}
-  {{ .Summary }}
-{{- else -}}
-  {{- block "description" . -}}{{- end -}}
-  {{- partial "base-title.html" . -}}
-{{- end -}}
diff --git a/themes/default/layouts/partials/base-discovery.html b/themes/default/layouts/partials/base-discovery.html
deleted file mode 100644
index 8c7272f..0000000
--- a/themes/default/layouts/partials/base-discovery.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{{- $author := partial "function-authors-data.html" . -}}
-
-{{- with (eq .Page.Kind "home") -}}
-<link
-  rel="alternate"
-  type="application/rss+xml"
-  title="{{ $.Site.Title }} Feed"
-  href="{{ "" | absURL }}/rss.xml"
-/>
-
-  {{- range $author := $.Site.Sections }}
-    <link
-      rel="alternate"
-      type="application/rss+xml"
-      title="{{ $author.Page.Type }}'s Feed"
-      href="{{ print $author.Permalink "rss.xml" | absURL }}"
-    />
-  {{ end }}
-{{- end -}}
-
-{{- with (eq .Page.Kind "section") -}}
-<link
-  rel="alternate"
-  type="application/rss+xml"
-  title="{{ $author.name }}'s Feed"
-  href="{{ print  ("" | absURL) "/" $.Section  }}/rss.xml"
-/>
-
-{{- with $author.feeds.rss }}
-  {{ range $author.feeds.rss }}
-    {{ $data := split . " " }}
-    {{- $url := delimit (first 1 $data) "" -}}
-    {{- $retitle := trim (delimit (after 1 $data) " ") " " -}}
-    {{- $retitle := and $retitle (print $retitle "'s Feed") -}}
-
-    <link
-      rel="alternate"
-      type="application/rss+xml"
-      title="{{ or $retitle $url }}"
-      href="{{ $url }}"
-    />
-  {{ end }}
-{{ end }}
-{{- end -}}
-
-{{- with (eq .Page.Kind "taxonomy") -}}
-<link
-  rel="alternate"
-  type="application/rss+xml"
-  title="{{ $.Title }} Feed"
-  href="{{ $.Permalink }}rss.xml"
-/>
-{{- end -}}
-
-{{- with (eq .Page.Kind "term") -}}
-<link
-  rel="alternate"
-  type="application/rss+xml"
-  title="#{{ lower $.Title }} Tag Feed"
-  href="{{ $.Permalink }}rss.xml"
-/>
-{{- end }}
diff --git a/themes/default/layouts/partials/base-embed.html b/themes/default/layouts/partials/base-embed.html
deleted file mode 100644
index c6f3174..0000000
--- a/themes/default/layouts/partials/base-embed.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<head>
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  {{- partial "base-css.html" . -}}
-</head>
diff --git a/themes/default/layouts/partials/base-footer.html b/themes/default/layouts/partials/base-footer.html
deleted file mode 100644
index cae0cbf..0000000
--- a/themes/default/layouts/partials/base-footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- $kind := in (slice "home" "taxonomy" "term") .Page.Kind -}}
-{{- $author := index .Site.Data.authors .Section -}}
-
-<footer>
-  {{- if $kind -}}
-    {{- with $footer := (and $kind .Site.Author.default.footer) -}}
-      {{ $footer | markdownify }} &middot;
-      Copyright &copy; {{ now | time.Format "2006"}} &middot;
-    {{- end -}}
-  {{- else -}}
-    {{ or $author.default.footer $author.title | markdownify }} &middot;
-  {{- end }}
-  <a href="/sitemap.xml" >Site Map</a>
-</footer>
diff --git a/themes/default/layouts/partials/base-head.html b/themes/default/layouts/partials/base-head.html
deleted file mode 100644
index a32b08d..0000000
--- a/themes/default/layouts/partials/base-head.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{{- $noindex := "" -}}
-{{- $image := "" -}}
-{{- $author := .Section -}}
-{{- $kind    := in (slice "home" "taxonomy" "term") .Page.Kind -}}
-
-{{- if not $kind -}}
-  {{- $image = print ("" | absURL) "/data/media/" $author "/" $author "-profile.png" -}}
-{{- end -}}
-
-{{- with or .Params.Feed .Params.Unlisted .Params.ExpiryDate -}}
-  {{- $noindex = "noindex,nofollow" -}}
-{{- end }}
-
-<!-- HTML Meta Tags -->
-<meta charset="utf-8" />
-<meta name="author" content="{{ or $author $.Site.Title -}}" />
-<meta name="robots" content="{{ or $noindex .Site.Params.site.robots "index,follow" }}" />
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta name="keywords" content="{{- partial "base-title.html" . -}}" />
-<meta name="generator" content="Hugo {{ hugo.Version }}" />
-
-<!-- Search Engine Tags -->
-<meta itemprop="name" content="{{ partial "base-title.html" . -}}" />
-<meta itemprop="description" content="{{- partial "base-description.html" . -}}" />
-<meta itemprop="image" content="{{ $image }}" />
-
-<!-- Open Graph Meta Tags -->
-<meta property="og:title" content="{{ partial "base-title.html" . -}}" />
-<meta property="og:description" content="{{- partial "base-description.html" . -}}" />
-<meta property="og:url" content="{{ .Permalink }}" />
-<meta property="og:image" content="{{ $image }}" />
-<meta property="og:type" content="website" />
-<meta property="article:published_time" content="{{ (or .Params.PublishDate now.UTC) | time.Format "2006-01-02T15:04:05Z" }}" />
-<meta property="article:modified_time " content="{{ (or .Params.LastMod now.UTC) | time.Format "2006-01-02T15:04:05Z" }}" />
-
-<!-- Twitter Meta Tags -->
-<meta name="twitter:card" content="summary_large_image" />
-<meta name="twitter:title" content="{{ partial "base-title.html" . -}}" />
-<meta name="twitter:description" content="{{- partial "base-description.html" . -}}" />
-<meta name="twitter:image" content="{{ $image }}" />
-
-<!-- Extra Meta Tags -->
-<meta name='base-url' content="{{ "" | absURL }}" />
-<meta name='last-modified' content="{{ now.UTC.Format "Mon, 02 Jan 2006 15:04:05 GMT" }}" />
-
-<!-- Search Verification -->
-{{- partial "base-search.html" . -}}
-
-<!-- Feed Discovery -->
-{{- partial "base-discovery.html" . -}}
-
-<!-- Canonicalization -->
-{{- partial "base-canonical.html" . -}}
-
-<!-- Styles -->
-{{- partial "base-css.html" . -}}
-
-<!-- Scripts -->
-{{- partial "base-js.html" . -}}
-
-<!-- Progressive Enhancement -->
-{{- partial "base-manifest.html" . -}}
-
-<!-- Content Security Policy -->
-{{- partial "base-csp.html" . -}}
-
-<!-- No Scripts  -->
-<noscript>
-  <style>
-    {{ safeCSS (readFile "assets/css/noscript.css") }}
-  </style>
-</noscript>
diff --git a/themes/default/layouts/partials/base-js.html b/themes/default/layouts/partials/base-js.html
deleted file mode 100644
index a491eee..0000000
--- a/themes/default/layouts/partials/base-js.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- $index := resources.Get "js/index.js" -}}
-{{- $js := $index | resources.Minify | fingerprint -}}
-
-{{ if .Site.Params.site.production }}
-<script src="{{ $js.Permalink }}"></script>
-{{ else }}
-<script src="{{ $index.Permalink }}"></script>
-{{ end }}
diff --git a/themes/default/layouts/partials/base-manifest.html b/themes/default/layouts/partials/base-manifest.html
deleted file mode 100644
index 52be1f9..0000000
--- a/themes/default/layouts/partials/base-manifest.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{{- $author  := .Section -}}
-{{- $home    := or ("" | absURL) "/" -}}
-{{- $kind    := in (slice "home" "taxonomy" "term") .Page.Kind -}}
-{{- $logo    := .Site.Params.webmanifest.logo -}}
-{{- $profile := print "public/data/media/" $author "/" $author "-profile" -}}
-
-{{- if not $kind -}}
-  {{- $home = print ("" | absURL) "/" $author "/" -}}
-  {{- if fileExists (print $profile ".gif")  -}} {{- $logo = (print $profile ".gif")  -}} {{- end -}}
-  {{- if fileExists (print $profile ".webp") -}} {{- $logo = (print $profile ".webp") -}} {{- end -}}
-  {{- if fileExists (print $profile ".png")  -}} {{- $logo = (print $profile ".png")  -}} {{- end -}}
-{{- end -}}
-
-{{- with $logo = resources.Get $logo -}}
-
-{{- $16  := $logo.Fit "16x16" -}}
-{{- $32  := $logo.Fit "32x32" -}}
-{{- $180 := $logo.Fit "180x180" -}}
-{{- $192 := $logo.Fit "192x192" -}}
-{{- $512 := $logo.Fit "512x512" -}}
-
-{{- if (eq $.Page.Kind "home") -}}
-  {{- $writeToFile := ($32.Content | resources.FromString "/favicon.ico").Permalink -}}
-{{- end -}}
-
-<link rel="icon"             type="image/x-icon"         sizes="32x32"   href="data:image/ico;base64,{{ $32.Content | base64Encode }}" />
-<link rel="icon"             type="{{ $16.MediaType }}"  sizes="16x16"   href="data:{{ $16.MediaType }};base64,{{ $16.Content | base64Encode }}" />
-<link rel="icon"             type="{{ $32.MediaType }}"  sizes="32x32"   href="data:{{ $32.MediaType }};base64,{{ $32.Content | base64Encode }}" />
-<link rel="apple-touch-icon" type="{{ $180.MediaType }}" sizes="180x180" href="data:{{ $180.MediaType }};base64,{{ $180.Content | base64Encode }}" />
-
-<link rel="home" href="{{ $home }}" />
-
-{{ "" -}} <!-- Newline -->
-
-{{- with $manifest := $.Site.Params.webmanifest -}}
-<link rel="manifest" href='data:application/manifest+json,{{ merge $manifest (dict
-  "start_url" $home
-  "icons"     (slice
-                (dict
-                  "sizes" "192x192"
-                  "src"   (print "data:" $192.MediaType ";base64," ($192.Content | base64Encode))
-                  "type"  (print $192.MediaType))
-                (dict
-                  "sizes" "512x512"
-                  "src"   (print "data:" $512.MediaType ";base64," ($512.Content | base64Encode))
-                  "type"  (print $512.MediaType))))
-  | jsonify
-  | urlquery
-}}'>
-
-<meta name="msapplication-TileColor"         content="#da532c" />
-<meta name="msapplication-config"            content="none" />
-<meta name="msapplication-square70x70logo"   content="none" />
-<meta name="msapplication-square150x150logo" content="data:{{ $180.MediaType }};base64,{{ $180.Content | base64Encode }}" />
-<meta name="msapplication-square310x310logo" content="none" />
-<meta name="msapplication-wide310x150logo"   content="none" />
-{{- end -}}
-{{- end -}}
diff --git a/themes/default/layouts/partials/base-search.html b/themes/default/layouts/partials/base-search.html
deleted file mode 100644
index 89113ab..0000000
--- a/themes/default/layouts/partials/base-search.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{- with .Site.Params.search.verification -}}
-{{- range $name, $content := . }}
-<meta name="{{ $name }}" content="{{ $content }}" />
-{{- end }}
-{{ end }}
diff --git a/themes/default/layouts/partials/base-title.html b/themes/default/layouts/partials/base-title.html
deleted file mode 100644
index fff4530..0000000
--- a/themes/default/layouts/partials/base-title.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- $author := index .Site.Data.authors .Section -}}
-
-{{- if not (eq .Title $.Site.Title) -}}
-  {{- with $title := or .Title .Summary -}}
-    {{ $title }} &mdash;
-  {{ end }}
-{{- end -}}
-
-{{- with $title := $.Site.Title -}}
-  {{- if (in (slice
-      "home"
-      "taxonomy"
-      "term"
-    ) $.Page.Kind)
-  -}}
-    {{ $title }}
-  {{- else -}}
-    {{ $author.title }}
-  {{- end -}}
-{{- end -}}
diff --git a/themes/default/layouts/partials/footer.html b/themes/default/layouts/partials/footer.html
new file mode 100644
index 0000000..cae0cbf
--- /dev/null
+++ b/themes/default/layouts/partials/footer.html
@@ -0,0 +1,14 @@
+{{- $kind := in (slice "home" "taxonomy" "term") .Page.Kind -}}
+{{- $author := index .Site.Data.authors .Section -}}
+
+<footer>
+  {{- if $kind -}}
+    {{- with $footer := (and $kind .Site.Author.default.footer) -}}
+      {{ $footer | markdownify }} &middot;
+      Copyright &copy; {{ now | time.Format "2006"}} &middot;
+    {{- end -}}
+  {{- else -}}
+    {{ or $author.default.footer $author.title | markdownify }} &middot;
+  {{- end }}
+  <a href="/sitemap.xml" >Site Map</a>
+</footer>
diff --git a/themes/default/layouts/partials/head-canonical.html b/themes/default/layouts/partials/head-canonical.html
new file mode 100644
index 0000000..051e450
--- /dev/null
+++ b/themes/default/layouts/partials/head-canonical.html
@@ -0,0 +1,15 @@
+{{- $canonical := .Permalink -}}
+
+{{- with .Site.Params.site.canonical -}}
+  {{- $canonical = print $.Site.Params.site.canonical $.RelPermalink -}}
+{{- end -}}
+
+{{- with .Params.feed -}}
+  {{- $canonical = $.Params.feed.link -}}
+{{- end -}}
+
+{{- with .Params.canonical -}}
+  {{- $canonical = $.Params.canonical -}}
+{{- end -}}
+
+<link rel="canonical" href="{{ $canonical }}" />
diff --git a/themes/default/layouts/partials/head-csp.html b/themes/default/layouts/partials/head-csp.html
new file mode 100644
index 0000000..d34043e
--- /dev/null
+++ b/themes/default/layouts/partials/head-csp.html
@@ -0,0 +1,19 @@
+
+<meta name="referrer" content="{{ .Site.Params.site.referrer }}" />
+
+{{ with .Site.Params.csp -}}
+<meta http-equiv="Content-Security-Policy"
+{{- printf ` content="` | safeHTMLAttr }}
+{{ range $policy, $list := . -}}
+{{- if reflect.IsSlice $list -}}
+{{- print $policy | safeHTMLAttr }}
+{{- range $list -}}
+{{ print " " . | safeHTMLAttr }}
+{{- end }};
+{{ else }}
+{{- print $policy ";" | safeHTMLAttr }}
+{{ end }}
+{{- end -}}
+{{- printf `"` | safeHTMLAttr -}}
+/>
+{{ end -}}
diff --git a/themes/default/layouts/partials/head-css.html b/themes/default/layouts/partials/head-css.html
new file mode 100644
index 0000000..662aa6b
--- /dev/null
+++ b/themes/default/layouts/partials/head-css.html
@@ -0,0 +1,18 @@
+{{- $default := resources.Get "css/default.css" -}}
+{{- $syntax  := resources.Get "css/default-syntax.css" -}}
+{{- $simple  := resources.Get "css/default-simple.css" -}}
+
+{{- $css :=
+  slice $default $syntax |
+  resources.Concat "css/bundle.css" |
+  resources.Minify |
+  fingerprint |
+-}}
+
+{{ if .Site.Params.site.production }}
+<link rel="stylesheet" href="{{ $css.Permalink }}"     title="Default" />
+{{ else }}
+<link rel="stylesheet" href="{{ $default.Permalink }}" title="Default" />
+<link rel="stylesheet" href="{{ $syntax.Permalink }}"                  />
+<link rel="alternate stylesheet" href="{{ $simple.Permalink }}"        />
+{{ end }}
diff --git a/themes/default/layouts/partials/head-description.html b/themes/default/layouts/partials/head-description.html
new file mode 100644
index 0000000..89e4691
--- /dev/null
+++ b/themes/default/layouts/partials/head-description.html
@@ -0,0 +1,8 @@
+{{- if .Params.summary -}}
+  {{ .Params.summary }}
+{{- else if .Summary -}}
+  {{ .Summary }}
+{{- else -}}
+  {{- block "description" . -}}{{- end -}}
+  {{- partial "head-title.html" . -}}
+{{- end -}}
diff --git a/themes/default/layouts/partials/head-discovery.html b/themes/default/layouts/partials/head-discovery.html
new file mode 100644
index 0000000..8c7272f
--- /dev/null
+++ b/themes/default/layouts/partials/head-discovery.html
@@ -0,0 +1,62 @@
+{{- $author := partial "function-authors-data.html" . -}}
+
+{{- with (eq .Page.Kind "home") -}}
+<link
+  rel="alternate"
+  type="application/rss+xml"
+  title="{{ $.Site.Title }} Feed"
+  href="{{ "" | absURL }}/rss.xml"
+/>
+
+  {{- range $author := $.Site.Sections }}
+    <link
+      rel="alternate"
+      type="application/rss+xml"
+      title="{{ $author.Page.Type }}'s Feed"
+      href="{{ print $author.Permalink "rss.xml" | absURL }}"
+    />
+  {{ end }}
+{{- end -}}
+
+{{- with (eq .Page.Kind "section") -}}
+<link
+  rel="alternate"
+  type="application/rss+xml"
+  title="{{ $author.name }}'s Feed"
+  href="{{ print  ("" | absURL) "/" $.Section  }}/rss.xml"
+/>
+
+{{- with $author.feeds.rss }}
+  {{ range $author.feeds.rss }}
+    {{ $data := split . " " }}
+    {{- $url := delimit (first 1 $data) "" -}}
+    {{- $retitle := trim (delimit (after 1 $data) " ") " " -}}
+    {{- $retitle := and $retitle (print $retitle "'s Feed") -}}
+
+    <link
+      rel="alternate"
+      type="application/rss+xml"
+      title="{{ or $retitle $url }}"
+      href="{{ $url }}"
+    />
+  {{ end }}
+{{ end }}
+{{- end -}}
+
+{{- with (eq .Page.Kind "taxonomy") -}}
+<link
+  rel="alternate"
+  type="application/rss+xml"
+  title="{{ $.Title }} Feed"
+  href="{{ $.Permalink }}rss.xml"
+/>
+{{- end -}}
+
+{{- with (eq .Page.Kind "term") -}}
+<link
+  rel="alternate"
+  type="application/rss+xml"
+  title="#{{ lower $.Title }} Tag Feed"
+  href="{{ $.Permalink }}rss.xml"
+/>
+{{- end }}
diff --git a/themes/default/layouts/partials/head-embed.html b/themes/default/layouts/partials/head-embed.html
new file mode 100644
index 0000000..e9c44d7
--- /dev/null
+++ b/themes/default/layouts/partials/head-embed.html
@@ -0,0 +1,4 @@
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  {{- partial "head-css.html" . -}}
+</head>
diff --git a/themes/default/layouts/partials/head-js.html b/themes/default/layouts/partials/head-js.html
new file mode 100644
index 0000000..a491eee
--- /dev/null
+++ b/themes/default/layouts/partials/head-js.html
@@ -0,0 +1,8 @@
+{{- $index := resources.Get "js/index.js" -}}
+{{- $js := $index | resources.Minify | fingerprint -}}
+
+{{ if .Site.Params.site.production }}
+<script src="{{ $js.Permalink }}"></script>
+{{ else }}
+<script src="{{ $index.Permalink }}"></script>
+{{ end }}
diff --git a/themes/default/layouts/partials/head-manifest.html b/themes/default/layouts/partials/head-manifest.html
new file mode 100644
index 0000000..52be1f9
--- /dev/null
+++ b/themes/default/layouts/partials/head-manifest.html
@@ -0,0 +1,58 @@
+{{- $author  := .Section -}}
+{{- $home    := or ("" | absURL) "/" -}}
+{{- $kind    := in (slice "home" "taxonomy" "term") .Page.Kind -}}
+{{- $logo    := .Site.Params.webmanifest.logo -}}
+{{- $profile := print "public/data/media/" $author "/" $author "-profile" -}}
+
+{{- if not $kind -}}
+  {{- $home = print ("" | absURL) "/" $author "/" -}}
+  {{- if fileExists (print $profile ".gif")  -}} {{- $logo = (print $profile ".gif")  -}} {{- end -}}
+  {{- if fileExists (print $profile ".webp") -}} {{- $logo = (print $profile ".webp") -}} {{- end -}}
+  {{- if fileExists (print $profile ".png")  -}} {{- $logo = (print $profile ".png")  -}} {{- end -}}
+{{- end -}}
+
+{{- with $logo = resources.Get $logo -}}
+
+{{- $16  := $logo.Fit "16x16" -}}
+{{- $32  := $logo.Fit "32x32" -}}
+{{- $180 := $logo.Fit "180x180" -}}
+{{- $192 := $logo.Fit "192x192" -}}
+{{- $512 := $logo.Fit "512x512" -}}
+
+{{- if (eq $.Page.Kind "home") -}}
+  {{- $writeToFile := ($32.Content | resources.FromString "/favicon.ico").Permalink -}}
+{{- end -}}
+
+<link rel="icon"             type="image/x-icon"         sizes="32x32"   href="data:image/ico;base64,{{ $32.Content | base64Encode }}" />
+<link rel="icon"             type="{{ $16.MediaType }}"  sizes="16x16"   href="data:{{ $16.MediaType }};base64,{{ $16.Content | base64Encode }}" />
+<link rel="icon"             type="{{ $32.MediaType }}"  sizes="32x32"   href="data:{{ $32.MediaType }};base64,{{ $32.Content | base64Encode }}" />
+<link rel="apple-touch-icon" type="{{ $180.MediaType }}" sizes="180x180" href="data:{{ $180.MediaType }};base64,{{ $180.Content | base64Encode }}" />
+
+<link rel="home" href="{{ $home }}" />
+
+{{ "" -}} <!-- Newline -->
+
+{{- with $manifest := $.Site.Params.webmanifest -}}
+<link rel="manifest" href='data:application/manifest+json,{{ merge $manifest (dict
+  "start_url" $home
+  "icons"     (slice
+                (dict
+                  "sizes" "192x192"
+                  "src"   (print "data:" $192.MediaType ";base64," ($192.Content | base64Encode))
+                  "type"  (print $192.MediaType))
+                (dict
+                  "sizes" "512x512"
+                  "src"   (print "data:" $512.MediaType ";base64," ($512.Content | base64Encode))
+                  "type"  (print $512.MediaType))))
+  | jsonify
+  | urlquery
+}}'>
+
+<meta name="msapplication-TileColor"         content="#da532c" />
+<meta name="msapplication-config"            content="none" />
+<meta name="msapplication-square70x70logo"   content="none" />
+<meta name="msapplication-square150x150logo" content="data:{{ $180.MediaType }};base64,{{ $180.Content | base64Encode }}" />
+<meta name="msapplication-square310x310logo" content="none" />
+<meta name="msapplication-wide310x150logo"   content="none" />
+{{- end -}}
+{{- end -}}
diff --git a/themes/default/layouts/partials/head-search.html b/themes/default/layouts/partials/head-search.html
new file mode 100644
index 0000000..89113ab
--- /dev/null
+++ b/themes/default/layouts/partials/head-search.html
@@ -0,0 +1,5 @@
+{{- with .Site.Params.search.verification -}}
+{{- range $name, $content := . }}
+<meta name="{{ $name }}" content="{{ $content }}" />
+{{- end }}
+{{ end }}
diff --git a/themes/default/layouts/partials/head-title.html b/themes/default/layouts/partials/head-title.html
new file mode 100644
index 0000000..fff4530
--- /dev/null
+++ b/themes/default/layouts/partials/head-title.html
@@ -0,0 +1,20 @@
+{{- $author := index .Site.Data.authors .Section -}}
+
+{{- if not (eq .Title $.Site.Title) -}}
+  {{- with $title := or .Title .Summary -}}
+    {{ $title }} &mdash;
+  {{ end }}
+{{- end -}}
+
+{{- with $title := $.Site.Title -}}
+  {{- if (in (slice
+      "home"
+      "taxonomy"
+      "term"
+    ) $.Page.Kind)
+  -}}
+    {{ $title }}
+  {{- else -}}
+    {{ $author.title }}
+  {{- end -}}
+{{- end -}}
diff --git a/themes/default/layouts/partials/head.html b/themes/default/layouts/partials/head.html
new file mode 100644
index 0000000..0d0fb32
--- /dev/null
+++ b/themes/default/layouts/partials/head.html
@@ -0,0 +1,72 @@
+{{- $noindex := "" -}}
+{{- $image := "" -}}
+{{- $author := .Section -}}
+{{- $kind    := in (slice "home" "taxonomy" "term") .Page.Kind -}}
+
+{{- if not $kind -}}
+  {{- $image = print ("" | absURL) "/data/media/" $author "/" $author "-profile.png" -}}
+{{- end -}}
+
+{{- with or .Params.Feed .Params.Unlisted .Params.ExpiryDate -}}
+  {{- $noindex = "noindex,nofollow" -}}
+{{- end }}
+
+<!-- HTML Meta Tags -->
+<meta charset="utf-8" />
+<meta name="author" content="{{ or $author $.Site.Title -}}" />
+<meta name="robots" content="{{ or $noindex .Site.Params.site.robots "index,follow" }}" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="keywords" content="{{- partial "head-title.html" . -}}" />
+<meta name="generator" content="Hugo {{ hugo.Version }}" />
+
+<!-- Search Engine Tags -->
+<meta itemprop="name" content="{{ partial "head-title.html" . -}}" />
+<meta itemprop="description" content="{{- partial "head-description.html" . -}}" />
+<meta itemprop="image" content="{{ $image }}" />
+
+<!-- Open Graph Meta Tags -->
+<meta property="og:title" content="{{ partial "head-title.html" . -}}" />
+<meta property="og:description" content="{{- partial "head-description.html" . -}}" />
+<meta property="og:url" content="{{ .Permalink }}" />
+<meta property="og:image" content="{{ $image }}" />
+<meta property="og:type" content="website" />
+<meta property="article:published_time" content="{{ (or .Params.PublishDate now.UTC) | time.Format "2006-01-02T15:04:05Z" }}" />
+<meta property="article:modified_time " content="{{ (or .Params.LastMod now.UTC) | time.Format "2006-01-02T15:04:05Z" }}" />
+
+<!-- Twitter Meta Tags -->
+<meta name="twitter:card" content="summary_large_image" />
+<meta name="twitter:title" content="{{ partial "head-title.html" . -}}" />
+<meta name="twitter:description" content="{{- partial "head-description.html" . -}}" />
+<meta name="twitter:image" content="{{ $image }}" />
+
+<!-- Extra Meta Tags -->
+<meta name='head-url' content="{{ "" | absURL }}" />
+<meta name='last-modified' content="{{ now.UTC.Format "Mon, 02 Jan 2006 15:04:05 GMT" }}" />
+
+<!-- Search Verification -->
+{{- partial "head-search.html" . -}}
+
+<!-- Feed Discovery -->
+{{- partial "head-discovery.html" . -}}
+
+<!-- Canonicalization -->
+{{- partial "head-canonical.html" . -}}
+
+<!-- Styles -->
+{{- partial "head-css.html" . -}}
+
+<!-- Scripts -->
+{{- partial "head-js.html" . -}}
+
+<!-- Progressive Enhancement -->
+{{- partial "head-manifest.html" . -}}
+
+<!-- Content Security Policy -->
+{{- partial "head-csp.html" . -}}
+
+<!-- No Scripts  -->
+<noscript>
+  <style>
+    {{ safeCSS (readFile "assets/css/noscript.css") }}
+  </style>
+</noscript>
-- 
cgit v1.2.3