diff --git a/layouts/partials/paige/list-item.html b/layouts/partials/paige/list-item.html
index ffda3b78..b32cfc31 100644
--- a/layouts/partials/paige/list-item.html
+++ b/layouts/partials/paige/list-item.html
@@ -60,61 +60,61 @@
 
     {{ with $keywords }}
         <p class="paige-page-keywords paige-row-short text-center text-secondary">
-            {{ range $i, $term := . -}}
-                {{- $kind := false -}}
+            {{ range $i, $term := . }}
+                {{ $kind := false }}
 
-                {{- if in $categories $term -}}
-                    {{- $kind = "category" -}}
-                {{- else -}}
-                    {{- $kind = "tag" -}}
-                {{- end -}}
+                {{ if in $categories $term }}
+                    {{ $kind = "category" }}
+                {{ else }}
+                    {{ $kind = "tag" }}
+                {{ end }}
 
-                {{- if $normal -}}
-                    {{- if gt $i 0 }} · {{ end -}}
+                {{ if $normal }}
+                    {{ if gt $i 0 }} · {{ end }}
 
                     {{ if .RelPermalink }}
                         <a class="link-secondary paige-page-keyword-{{ $kind }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
                     {{ else }}
                         <span class="text-secondary paige-page-keyword-{{ $kind }}">{{ .LinkTitle }}</span>
                     {{ end }}
-                {{- else -}}
-                    {{- if gt $i 0 }} {{ end -}}
+                {{ else }}
+                    {{ if gt $i 0 }} {{ end }}
 
                     {{ if .RelPermalink }}
                         <a class="badge paige-page-keyword-{{ $kind }} text-bg-secondary text-decoration-none" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
                     {{ else }}
                         <span class="badge paige-page-keyword-{{ $kind }} text-bg-secondary">{{ .LinkTitle }}</span>
                     {{ end }}
-                {{- end -}}
-            {{- end }}
+                {{ end }}
+            {{ end }}
         </p>
     {{ end }}
 
     {{ with $series }}
         <p class="paige-row-short paige-page-series text-center text-secondary">
-            {{ range $i, $series := . -}}
-                {{- if gt $i 0 }} · {{ end -}}
+            {{ range $i, $series := . }}
+                {{ if gt $i 0 }} · {{ end }}
 
                 {{ if .RelPermalink }}
                     <a class="link-secondary" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
                 {{ else }}
                     <span class="text-secondary">{{ .LinkTitle }}</span>
                 {{ end }}
-            {{- end }}
+            {{ end }}
         </p>
     {{ end }}
 
     {{ with $authors }}
         <p class="paige-page-authors text-center paige-row-short text-secondary">
-            {{ range $i, $author := . -}}
-                {{- if gt $i 0 }} · {{ end -}}
+            {{ range $i, $author := . }}
+                {{ if gt $i 0 }} · {{ end }}
 
                 {{ if .RelPermalink }}
                     <a class="link-secondary" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
                 {{ else }}
                     <span class="text-secondary">{{ .LinkTitle }}</span>
                 {{ end }}
-            {{- end }}
+            {{ end }}
         </p>
     {{ end }}
 
diff --git a/layouts/partials/paige/page-header.html b/layouts/partials/paige/page-header.html
index 60591151..9a478732 100644
--- a/layouts/partials/paige/page-header.html
+++ b/layouts/partials/paige/page-header.html
@@ -37,61 +37,61 @@
                 <div id="paige-page-metadata">
                     {{ with $keywords }}
                         <p class="{{ if $normal }} paige-row-short {{ end }} text-center {{ if $normal }} text-secondary {{ end }}" id="paige-page-keywords">
-                            {{ range $i, $term := . -}}
-                                {{- $kind := false -}}
+                            {{ range $i, $term := . }}
+                                {{ $kind := false }}
 
-                                {{- if in $categories $term -}}
-                                    {{- $kind = "category" -}}
-                                {{- else -}}
-                                    {{- $kind = "tag" -}}
-                                {{- end -}}
+                                {{ if in $categories $term }}
+                                    {{ $kind = "category" }}
+                                {{ else }}
+                                    {{ $kind = "tag" }}
+                                {{ end }}
 
-                                {{- if $normal -}}
-                                    {{- if gt $i 0 }} · {{ end -}}
+                                {{ if $normal }}
+                                    {{ if gt $i 0 }} · {{ end }}
 
-                                    {{- if .RelPermalink -}}
+                                    {{ if .RelPermalink }}
                                         <a class="link-secondary paige-page-keyword-{{ $kind }}" href="{{ .RelPermalink }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</a>
-                                    {{- else -}}
+                                    {{ else }}
                                         <span class="text-secondary paige-page-keyword-{{ $kind }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</span>
-                                    {{- end -}}
-                                {{- else -}}
-                                    {{- if gt $i 0 }} {{ end -}}
+                                    {{ end }}
+                                {{ else }}
+                                    {{ if gt $i 0 }} {{ end }}
 
-                                    {{- if .RelPermalink -}}
+                                    {{ if .RelPermalink }}
                                         <a class="badge paige-page-keyword-{{ $kind }} text-bg-secondary text-decoration-none" href="{{ .RelPermalink }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</a>
-                                    {{- else -}}
+                                    {{ else }}
                                         <span class="badge paige-page-keyword-{{ $kind }} text-bg-secondary" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</span>
-                                    {{- end -}}
-                                {{- end -}}
-                            {{- end }}
+                                    {{ end }}
+                                {{ end }}
+                            {{ end }}
                         </p>
                     {{ end }}
 
                     {{ with $series }}
                         <p class="paige-row-short text-center text-secondary" id="paige-page-series">
-                            {{ range $i, $series := . -}}
-                                {{- if gt $i 0 }} · {{ end -}}
+                            {{ range $i, $series := . }}
+                                {{ if gt $i 0 }} · {{ end }}
 
                                 {{ if .RelPermalink }}
                                     <a class="link-secondary" href="{{ .RelPermalink }}" {{ if $microdata }} itemprop="isPartOf" {{ end }}>{{ .LinkTitle }}</a>
                                 {{ else }}
                                     <span class="text-secondary" {{ if $microdata }} itemprop="isPartOf" {{ end }}>{{ .LinkTitle }}</span>
                                 {{ end }}
-                            {{- end }}
+                            {{ end }}
                         </p>
                     {{ end }}
 
                     {{ with $authors }}
                         <p class="paige-row-short text-center text-secondary" id="paige-page-authors">
-                            {{ range $i, $author := . -}}
-                                {{- if gt $i 0 }} · {{ end -}}
+                            {{ range $i, $author := . }}
+                                {{ if gt $i 0 }} · {{ end }}
 
                                 {{ if .RelPermalink }}
                                     <a class="link-secondary" href="{{ .RelPermalink }}" {{ if $microdata }} itemprop="author" {{ end }}>{{ .LinkTitle }}</a>
                                 {{ else }}
                                     <span class="text-secondary" {{ if $microdata }} itemprop="author" {{ end }}>{{ .LinkTitle }}</span>
                                 {{ end }}
-                            {{- end }}
+                            {{ end }}
                         </p>
                     {{ end }}