diff --git a/themes/gohugoioTheme/layouts/_default/baseof.html b/themes/gohugoioTheme/layouts/_default/baseof.html
index 6c579fcfc..2411b1348 100644
--- a/themes/gohugoioTheme/layouts/_default/baseof.html
+++ b/themes/gohugoioTheme/layouts/_default/baseof.html
@@ -12,7 +12,7 @@
     <title>{{ block "title" . }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
 
     <meta name="viewport" content="width=device-width,minimum-scale=1">
-     {{ .Hugo.Generator }}
+     {{ hugo.Generator }}
 
       {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production")  }}
         <META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
diff --git a/themes/gohugoioTheme/layouts/news/single.html b/themes/gohugoioTheme/layouts/news/single.html
index 33a0043d8..200daa70a 100644
--- a/themes/gohugoioTheme/layouts/news/single.html
+++ b/themes/gohugoioTheme/layouts/news/single.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  {{ $currentPageUrl := .URL }}
+  {{ $currentPageUrl := .RelPermalink }}
 
   <article class="cf ph4 pv3 pv5-ns">
       <!-- header spans the full width -->
@@ -13,7 +13,7 @@
       {{end}}
 
       <h1 class="lh-title fw9 mb7 mv0 pt3">
-        <a href="{{ .URL }}" class="link primary-color dim">
+        <a href="{{ .RelPermalink }}" class="link primary-color dim">
           {{ .Title }}
         </a>
       </h1>
@@ -66,9 +66,9 @@
             <ul class="list dib nested-links ml0 pl0">
               <li class="dib mb2 mr2">Related:</li>
               {{ range $tags.Pages }}
-                {{ if ne .URL $currentPageUrl }}
+                {{ if ne .RelPermalink $currentPageUrl }}
                   <li class="mb2 mr3">
-                     <a href="{{ .URL }}" class="link">
+                     <a href="{{ .RelPermalink }}" class="link">
                        {{ .LinkTitle }}
                      </a>
                    </li>
diff --git a/themes/gohugoioTheme/layouts/partials/boxes-section-summaries.html b/themes/gohugoioTheme/layouts/partials/boxes-section-summaries.html
index d1683d3c9..b7e37c47c 100644
--- a/themes/gohugoioTheme/layouts/partials/boxes-section-summaries.html
+++ b/themes/gohugoioTheme/layouts/partials/boxes-section-summaries.html
@@ -8,7 +8,7 @@
     {{ end }}
 
     <h1 class="near-black f3">
-      <a href="{{ .context.URL }}" class="link primary-color dim">
+      <a href="{{ .context.RelPermalink }}" class="link primary-color dim">
       {{- if eq .context.Section "functions" -}}
         {{ .context.LinkTitle }}
       {{- else -}}
diff --git a/themes/gohugoioTheme/layouts/partials/boxes-small-news.html b/themes/gohugoioTheme/layouts/partials/boxes-small-news.html
index 0d89f057f..39b0dcf6d 100644
--- a/themes/gohugoioTheme/layouts/partials/boxes-small-news.html
+++ b/themes/gohugoioTheme/layouts/partials/boxes-small-news.html
@@ -6,7 +6,7 @@
     {{ range first 4 ( sort (where .Pages "Section" "news") "Date" "desc" ) }}
       <!-- only show 2 boxes on mobile -->
       {{ $.Scratch.Add "i" 1 }}{{ $i := $.Scratch.Get "i" }}
-      <a href="{{ .URL }}" class="link lh-copy light-gray f6 w-100 w-50-m w-25-l bg-animate hover-bg-accent-color hover-white pv3 pv4-ns ph3 ph4-ns{{ if ge $i 3 }} dn dib-l{{ else }} dib{{ end }}">
+      <a href="{{ .RelPermalink }}" class="link lh-copy light-gray f6 w-100 w-50-m w-25-l bg-animate hover-bg-accent-color hover-white pv3 pv4-ns ph3 ph4-ns{{ if ge $i 3 }} dn dib-l{{ else }} dib{{ end }}">
         <span class="f6 gray pb1 db">
           {{ .Date.Format "January 2, 2006" }}
         </span>
diff --git a/themes/gohugoioTheme/layouts/partials/entry-summary.html b/themes/gohugoioTheme/layouts/partials/entry-summary.html
index 0f140cf70..d9cd9c68f 100644
--- a/themes/gohugoioTheme/layouts/partials/entry-summary.html
+++ b/themes/gohugoioTheme/layouts/partials/entry-summary.html
@@ -2,7 +2,7 @@
   <div class="bg-white mb3 pa4 gray overflow-hidden">
     <span class="f6 db">{{ humanize .Section }}</span>
     <h1 class="f3 near-black">
-      <a href="{{ .URL }}" class="link black dim">
+      <a href="{{ .RelPermalink }}" class="link black dim">
         {{ .Title }}
       </a>
     </h1>
diff --git a/themes/gohugoioTheme/layouts/partials/page-header.html b/themes/gohugoioTheme/layouts/partials/page-header.html
index 0de292738..dcc96242f 100644
--- a/themes/gohugoioTheme/layouts/partials/page-header.html
+++ b/themes/gohugoioTheme/layouts/partials/page-header.html
@@ -1,5 +1,5 @@
 {{ $currentPage := . }}
-{{ $currentURL := .URL }}
+{{ $currentURL := .RelPermalink }}
 <header class="ph4 flex pv4 bg-light-gray">
   <ul class="list ma0 pa0 ">
       <!-- TODO: Active classes -->
diff --git a/themes/gohugoioTheme/layouts/partials/tags.html b/themes/gohugoioTheme/layouts/partials/tags.html
index 075c462df..59e3e51a0 100644
--- a/themes/gohugoioTheme/layouts/partials/tags.html
+++ b/themes/gohugoioTheme/layouts/partials/tags.html
@@ -1,4 +1,4 @@
-{{ $currentPageUrl := .URL }}
+{{ $currentPageUrl := .RelPermalink }}
 {{ if and .Params.tags .Site.Taxonomies.tags }}
   {{ $name := index .Params.tags 0 }}
   {{ $name := $name | urlize }}
@@ -24,9 +24,9 @@
             Related entries:
           </li>
         {{ end }}
-        {{ if ne .URL $currentPageUrl }}
+        {{ if ne .RelPermalink $currentPageUrl }}
           <li class="db dib-l mb2 mr3">
-            <a href="{{ .URL }}" class="link">
+            <a href="{{ .RelPermalink }}" class="link">
               {{ .LinkTitle }}
             </a>
           </li>