diff --git a/layouts/404.html b/layouts/404.html
index 1d7d4531..853e8100 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -3,6 +3,8 @@
 {{ end }}
 
 {{ define "main"}}
-<h1>NOT FOUND</h1>
-<p>You just hit a route that doesn&#39;t exist...</p>
-{{ end }}
\ No newline at end of file
+<main class="wrapper" aria-label="Content">
+  <h1>NOT FOUND</h1>
+  <p>You just hit a route that doesn&#39;t exist...</p>
+</main>
+{{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 70a5a66a..131c3397 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -6,8 +6,8 @@
 
   <link rel="canonical" href="{{ .Permalink }}">
   {{- with .OutputFormats.Get "RSS" }}
-  <link href="{{ .Permalink }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}">
-  <link href="{{ .Permalink }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}">
+  <link href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}">
+  <link href="{{ .RelPermalink }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}">
   {{- end -}}
 
   {{/*  Styles  */}}
@@ -41,4 +41,4 @@
     {{ template "_internal/google_analytics.html" . }}
   {{- end -}}
 
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
\ No newline at end of file
+        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/layouts/partials/postCard.html b/layouts/partials/postCard.html
index f031d294..a1e41de7 100644
--- a/layouts/partials/postCard.html
+++ b/layouts/partials/postCard.html
@@ -1,10 +1,10 @@
 <article class="post-item">
-    <h4 class="post-item-title">
-        <a href="{{ .Permalink }}">{{ .Title }}</a>
-    </h4>
-    {{/*  format date string to create an ISO 8601 string  */}}
-    {{ $ISO_date := "2006-01-02T15:04:05Z0700" }}
-    <time class="post-item-meta" datetime="{{ dateFormat $ISO_date .Date }}">
-        {{ .Date | time.Format ":date_medium" }}
-    </time>
+  <h4 class="post-item-title">
+      <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+  </h4>
+  {{/*  format date string to create an ISO 8601 string  */}}
+  {{ $ISO_date := "2006-01-02T15:04:05Z0700" }}
+  <time class="post-item-meta" datetime="{{ dateFormat $ISO_date .Date }}">
+      {{ .Date | time.Format ":date_medium" }}
+  </time>
 </article>
diff --git a/layouts/partials/scriptsBodyEnd.html b/layouts/partials/scriptsBodyEnd.html
index 1f147b44..c9ede5b3 100644
--- a/layouts/partials/scriptsBodyEnd.html
+++ b/layouts/partials/scriptsBodyEnd.html
@@ -1,2 +1,2 @@
 {{ $script_main := resources.Get "js/themeSwitchnMenu.js" | minify | fingerprint }}
-<script src="{{ $script_main.Permalink }}"></script>
\ No newline at end of file
+<script src="{{ $script_main.RelPermalink }}"></script>
diff --git a/layouts/partials/scriptsBodyStart.html b/layouts/partials/scriptsBodyStart.html
index d1e0937a..d0c61193 100644
--- a/layouts/partials/scriptsBodyStart.html
+++ b/layouts/partials/scriptsBodyStart.html
@@ -1,2 +1,2 @@
 {{ $script_main := resources.Get "js/themeLoader.js" | minify | fingerprint }}
-<script src="{{ $script_main.Permalink }}"></script>
\ No newline at end of file
+<script src="{{ $script_main.RelPermalink }}"></script>