diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4081a9a..a6a6470 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.Language }}">
+<html lang="{{ $.Site.Language }}">
 <head>
   {{ block "title" . }}
     <title>{{ if .IsHome }}{{ $.Site.Title }}{{ with $.Site.Params.Subtitle }} — {{ . }}{{ end }}{{ else }}{{ .Title }} :: {{ $.Site.Title }}{{ with $.Site.Params.Subtitle }} — {{ . }}{{ end }}{{ end }}</title>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9b41c04..d78107d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
   <div class="posts">
-    {{ $isntDefault := not (or (eq (trim .Site.Params.contentTypeName " ") "posts") (eq (trim .Site.Params.contentTypeName " ") "")) }}
-    {{ $contentTypeName := cond $isntDefault (string .Site.Params.contentTypeName) "posts" }}
+    {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
+    {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
     {{ $paginator := .Paginate (where .Data.Pages "Type" $contentTypeName) }}
 
     {{ range $paginator.Pages }}
@@ -35,7 +35,7 @@
           {{ end }}
         {{ end }}
       </div>
-      <div><a class="read-more button" href="{{.RelPermalink}}">{{ .Site.Params.ReadMore }} →</a></div>
+      <div><a class="read-more button" href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a></div>
     </div>
     {{ end }}
     {{ partial "pagination.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 371895a..2d69a06 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -26,7 +26,7 @@
     {{ if or .NextInSection .PrevInSection }}
       <div class="pagination">
         <div class="pagination__title">
-          <span class="pagination__title-h">{{ .Site.Params.ReadOtherPosts }}</span>
+          <span class="pagination__title-h">{{ $.Site.Params.ReadOtherPosts }}</span>
           <hr />
         </div>
         <div class="pagination__buttons">
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e4fd1d8..9efe999 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
 <footer class="footer">
   <div class="footer__inner">
-    {{ if .Site.Copyright }}
-      <div class="copyright copyright--user">{{ .Site.Copyright| safeHTML }}</div>
+    {{ if $.Site.Copyright }}
+      <div class="copyright copyright--user">{{ $.Site.Copyright | safeHTML }}</div>
     {{else}}
       <div class="copyright">
         <span>© {{ now.Year }} Powered by <a href="http://gohugo.io">Hugo</a></span>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index ea1c20d..5dbebcd 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,14 +1,14 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
 <meta name="description" content="{{ if .IsHome }}{{ .Site.Params.Subtitle }}{{ else }}{{ .Summary | plainify }}{{ end }}"/>
-<meta name="keywords" content="{{ .Site.Params.keywords }}"/>
+<meta name="keywords" content="{{ $.Site.Params.keywords }}"/>
 <meta name="robots" content="noodp"/>
 <link rel="canonical" href="{{ .Permalink }}" />
 
 <!-- Theme CSS -->
 <link rel="stylesheet" href="{{ "assets/style.css" | absURL }}">
 {{ if (ne $.Site.Params.ThemeColor "orange") }}
-  <link rel="stylesheet" href="{{ (printf "assets/%s.css" .Site.Params.ThemeColor) | absURL }}">
+  <link rel="stylesheet" href="{{ (printf "assets/%s.css" $.Site.Params.ThemeColor) | absURL }}">
 {{ end }}
 
 <!-- Custom CSS to override theme properties (/static/style.css) -->
@@ -24,7 +24,7 @@
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:title" content="{{ if .IsHome }}{{ $.Site.Title }} — {{ $.Site.Params.Subtitle }}{{ else }}{{ .Title }} :: {{ $.Site.Title }} — {{ $.Site.Params.Subtitle }}{{ end }}" />
 <meta name="twitter:description" content="{{ if .IsHome }}{{ $.Site.Params.tagline }}{{ else }}{{ .Summary | plainify }}{{ end }}" />
-<meta name="twitter:site" content="{{ .Site.BaseURL }}" />
+<meta name="twitter:site" content="{{ $.Site.BaseURL }}" />
 <meta name="twitter:creator" content="{{ .Params.Author }}" />
 <meta name="twitter:image" content="{{ with .Params.Cover }}{{ printf "img/%s" . | absURL }}{{ end }}">
 
@@ -43,10 +43,10 @@
 
 <!-- RSS -->
 {{ if .RSSLink }}
-<link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+<link href="{{ $.Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
 {{ end }}
 
 <!-- JSON Feed -->
 {{ if .OutputFormats.Get "json" }}
-<link href="{{ if .OutputFormats.Get "json" }}{{ "feed.json" | absURL }}{{ end }}" rel="alternate" type="application/json" title="{{ .Site.Title }}" />
+<link href="{{ if .OutputFormats.Get "json" }}{{ "feed.json" | absURL }}{{ end }}" rel="alternate" type="application/json" title="{{ $.Site.Title }}" />
 {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f3620ce..88db6a1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,7 +5,7 @@
     </div>
     <div class="menu-trigger">menu</div>
   </div>
-  {{ if len .Site.Menus }}
+  {{ if len $.Site.Menus }}
     {{ partial "menu.html" . }}
   {{ end }}
 </header>
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 61f804f..b26c43f 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,7 +1,7 @@
 <nav class="menu">
   <ul class="menu__inner">
-    {{ range .Site.Menus.main }}
+    {{ range $.Site.Menus.main }}
       <li><a href="{{ .URL }}">{{ .Name }}</a></li>
     {{ end }}
   </ul>
-</nav>
\ No newline at end of file
+</nav>
