diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 047744ba49ef5a992ec6108d6a24fbe0ad286cce..53eb36550a3c10aa2efc397e76e00e3ed07deb3b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,7 +5,7 @@
   <ul class="laundry-list">
     {{ range .Data.Pages }}
     <li>
-      <a href="{{ .URL }}">{{ .Title }}</a>
+      <a href="{{ .RelPermalink }}">{{ .Title }}</a>
       <div class="meta">By {{ .Params.author }} on <time datetime="{{ .Date }}" class="date">{{ .Date.Format "Monday, January 2, 2006" }}</time></div>
     </li>
     {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index f2bc38c033eb0def4977b691cc16e3239adf6194..5116aa0eb905a40d619ed4d96414de1c0dae0c65 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,6 +1,6 @@
 {{ partial "head.html" . }}
 {{ partial "menu.html" . }}
 {{ range .Data.Pages }}
-{{if eq .URL "/home" }} {{.Content}} {{end}}
+{{if eq .Params.url "/home" }} {{.Content}} {{end}}
 {{ end }}
 {{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index eaafca1c73839a76a57dd96020ad20aea4d765ac..6d8bc7ce127a0e16c7ce6bcd40bdf22770b6479e 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,9 +1,9 @@
 <footer class="copyright">
     <p>
-        <a style="color: inherit; margin-right: 2em;" href="{{ .URL }}">{{ .Language.LanguageName }}</a>
+        <a style="color: inherit; margin-right: 2em;" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
         {{ if .IsTranslated }}
           {{ range .Translations }}
-            <a style="color: inherit; margin-right: 2em;" href="{{ .URL }}">{{ .Language.LanguageName }}</a>
+            <a style="color: inherit; margin-right: 2em;" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
           {{ end}}
         {{ end }}
     </p>