diff --git a/themes/hugo-casper3/layouts/_default/baseof.html b/themes/hugo-casper3/layouts/_default/baseof.html
index 8758200..82abbad 100644
--- a/themes/hugo-casper3/layouts/_default/baseof.html
+++ b/themes/hugo-casper3/layouts/_default/baseof.html
@@ -9,7 +9,7 @@
     <title>{{ $title }}</title>
 
     <meta property="og:site_name" content="{{ .Site.Title }}">
-    <meta name="twitter:domain" property="twitter:domain" content="{{ .Site.BaseURL }}">
+    <meta name="twitter:domain" property="twitter:domain" content="/">
     <meta name="og:title" property="og:title" content="{{ .Site.Title }}">
     <meta property="og:description" content="{{ $.Site.Params.description }}">
     <meta name="twitter:description" property="twitter:description" content="{{ $.Site.Params.description }}">
@@ -33,13 +33,13 @@
 
         <footer class="site-footer outer">
             <div class="site-footer-content inner">
-                <section class="copyright"><a href="{{ .Site.BaseURL }}">&copy; 2016 – {{ now.Format "2006" }} {{ .Site.Title }}</a></section>
+                <section class="copyright"><a href="/">&copy; 2016 – {{ now.Format "2006" }} {{ .Site.Title }}</a></section>
                 <img src="/gmgpin.gif"></img>
                 <img src="/linuxnow2.gif"></img>
                 <nav class="site-footer-nav">
-                    <a href="{{ .Site.BaseURL }}tos">Terms of Service</a>
+                    <a href="/tos">Terms of Service</a>
                     <a href="https://git.gianmarco.ga/gianmarco/gmgsite">Source Code</a>
-                    <a href="{{ .Site.BaseURL }}extras">Extras</a>
+                    <a href="/extras">Extras</a>
                 </nav>
             </div>
         </footer>
diff --git a/themes/hugo-casper3/layouts/partials/site-nav.html b/themes/hugo-casper3/layouts/partials/site-nav.html
index 57d9d61..3b5cbce 100644
--- a/themes/hugo-casper3/layouts/partials/site-nav.html
+++ b/themes/hugo-casper3/layouts/partials/site-nav.html
@@ -1,9 +1,9 @@
 <nav class="site-nav">
     <div class="site-nav-left">
         {{ if eq $.Site.Params.logo "thisshouldfail" }}
-            <a class="site-nav-logo" href="{{ $.Site.BaseURL }}"><img src="{{ $.Site.Params.logo }}" alt="{{ $.Site.Title }}" /></a>
+            <a class="site-nav-logo" href="/"><img src="{{ $.Site.Params.logo }}" alt="{{ $.Site.Title }}" /></a>
         {{ else }}
-            <a class="site-nav-logo" href="{{ $.Site.BaseURL }}">‣ {{ $.Site.Title }} <blink> ⁣⁣</blink></a>
+            <a class="site-nav-logo" href="/">‣ {{ $.Site.Title }} <blink> ⁣⁣</blink></a>
         {{ end }}
         
         <div class="site-nav-content">