diff --git a/assets/sass/photoswipe.scss b/assets/sass/photoswipe.scss
index f24904c..42fd567 100644
--- a/assets/sass/photoswipe.scss
+++ b/assets/sass/photoswipe.scss
@@ -1,5 +1,5 @@
 .pswp {
   --pswp-bg: var(--background);
   --pswp-icon-color: var(--text);
-  --pswp-icon-color-secondary: var(--text);
+  --pswp-icon-color-secondary: color-mix(in srgb, var(--text) 30%, var(--background));
 }
diff --git a/layouts/404.html b/layouts/404.html
index 1e9d5c4..4231423 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -4,7 +4,7 @@
       <h1>404</h1>
       <p>This is a dead link. Whatever was here, it&apos;s gone now.</p>
       <p>
-        <a href="{{ .Site.BaseURL }}">Let&apos;s pretend this never happened</a
+        <a href="{{- relURL "" -}}">Let&apos;s pretend this never happened</a
         >.
       </p>
     </div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e01fae3..7866816 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
 <footer class="footer">
   <div class="footer-container">
     <div class="copyright">
-      <a href="{{- "/" | relURL -}}">{{ .Site.Title }}</a> &copy;
+      <a href="{{- relURL "" -}}">{{ .Site.Title }}</a> &copy;
       {{ now.Year }}
     </div>
 
@@ -10,7 +10,7 @@
         {{ $len := len .Site.Params.footer }}
         {{ range $i, $el := .Site.Params.footer }}
           <li>
-            <a href="{{- $el.url -}}">{{ $el.name }}</a>
+            <a href="{{- $el.url | safeURL -}}">{{ $el.name }}</a>
           </li>
           {{ if lt (add $i 1) $len }}
             <span class="middot">&middot;</span>
diff --git a/layouts/partials/head/opengraph.html b/layouts/partials/head/opengraph.html
index e77c4af..0963c6e 100644
--- a/layouts/partials/head/opengraph.html
+++ b/layouts/partials/head/opengraph.html
@@ -58,12 +58,11 @@
   {{ end }}
 {{ end }}
 
-{{ $permalink := .Permalink }}
 {{ $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }}
   {{ range $name := . }}
     {{ $series := index $siteSeries $name }}
     {{ range $page := first 6 $series.Pages }}
-      {{ if ne $page.Permalink $permalink }}
+      {{ if ne $page.Permalink .Permalink }}
         <meta property="og:see_also" content="{{- $page.Permalink -}}" />
       {{ end }}
     {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index ef1fc29..d7828aa 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,7 +1,7 @@
 <header class="header">
   <div class="header-container">
     <div class="site-title">
-      <a href="{{- "/" | relURL -}}">{{ .Site.Title }}</a>
+      <a href="{{- relURL "" -}}">{{ .Site.Title }}</a>
     </div>
 
     <input
@@ -18,7 +18,7 @@
     <nav class="nav">
       <ul>
         {{ range .Site.Params.navigation }}
-          <li><a href="{{- .url -}}">{{ .name }}</a></li>
+          <li><a href="{{- .url | safeURL -}}">{{ .name }}</a></li>
         {{ end }}
       </ul>
     </nav>
diff --git a/layouts/partials/posts/list.html b/layouts/partials/posts/list.html
index 29bc0cc..48187a3 100644
--- a/layouts/partials/posts/list.html
+++ b/layouts/partials/posts/list.html
@@ -1,7 +1,7 @@
 <div class="posts-list">
   {{ range sort .Pages "Date" "desc" }}
     {{ if not .Params.private }}
-      <a href="{{ .Permalink }}" class="post">
+      <a href="{{- .RelPermalink -}}" class="post">
         <h1 class="title">{{ .Title }}</h1>
         <div class="summary">{{ .Summary }}</div>
         <div class="meta">