diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 4a39f60..8515210 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,13 +1,14 @@
-{{ $home := relLangURL "/" }}
-{{ $currentSection := .Section }}
-{{ $currentID := .UniqueID }}
+{{ $home := relLangURL "/" -}}
+{{ $currentSection := .Section -}}
+{{ $currentID := "" -}}
+{{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <nav class="main-menu layout__navigation">
 <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
 <ul class="navbar">
 <li><a class="{{ if .IsHome }}active{{ end }}" href="{{ $home }}">{{ i18n "menu_home" }}</a></li>
 {{ range where .Site.Pages "Section" "" -}}
 {{ if ne .RelPermalink (string $home) -}}
-<li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+<li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
 {{ end -}}
 {{ range $.Site.Home.Sections -}}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 5e042a5..14adc1d 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,4 +1,4 @@
-{{ .Hugo.Generator }}
+{{ hugo.Generator }}
 {{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
 <meta name="msapplication-TileColor" content="{{ $.Param "themecolor" | default "#ffffff" }}">
 <meta name="theme-color" content="{{ $.Param "themecolor" | default "#ffffff" }}">
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index 9c4fa76..3a38855 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -1,3 +1,7 @@
+{{ $home := relLangURL "/" -}}
+{{ $currentSection := .Section -}}
+{{ $currentID := "" -}}
+{{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <div class="mobile-nav" dir="ltr">
   <div class="mobile-nav__cover"></div>
   <a href="#navigation" class="mobile-nav__toggle" aria-haspopup="true" role="button">{{ i18n "menu_mobile" }}</a>
@@ -6,16 +10,13 @@
     {{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end }}
     {{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}
     </div>
-    {{ $home := relLangURL "/" }}
-    {{ $currentSection := .Section }}
-    {{ $currentID := .UniqueID }}
     <nav class="mobile-nav__main-menu">
     <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
     <ul class="mobile-nav__navbar">
     <li><a class="{{ if .IsHome }}active{{ end }}" href="{{ $home }}">{{ i18n "menu_home" }}</a></li>
     {{ range where .Site.Pages "Section" "" -}}
     {{ if ne .RelPermalink (string $home) -}}
-    <li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+    <li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
     {{ end -}}
     {{ end -}}
     {{ range $.Site.Home.Sections -}}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index e16b9d5..88e6297 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,11 +1,13 @@
-{{ $currentID := .UniqueID }}
+{{ $currentSection := .Section -}}
+{{ $currentID := "" -}}
+{{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <aside class="sidebar layout__second-sidebar">
 {{ range $.Site.Home.Sections -}}
 <section>
-<h4 class="menu"><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></h4>
+<h4 class="menu"><a class="{{ if eq $currentSection .Section }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></h4>
 <ul class="menu">
 {{ range .Pages -}}
-<li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+<li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
 </ul>
 </section>
diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html
index 1b512b1..99b4aca 100644
--- a/layouts/partials/styles.html
+++ b/layouts/partials/styles.html
@@ -4,7 +4,7 @@
 {{ $main_style := resources.Get "sass/styles.scss" | toCSS $main_options | fingerprint -}}
 {{ $mobile_style := resources.Get "sass/mobile.scss" | toCSS $mobile_options | fingerprint -}}
 {{ $print_style := resources.Get "sass/print.scss" | toCSS $print_options | fingerprint -}}
-{{ if eq .Hugo.Environment "dev" -}}
+{{ if eq hugo.Environment "dev" -}}
 {{ $main_options = (dict "targetPath" "css/styles.css" "outputStyle" "nested" "enableSourceMap" true "includePaths" (slice "assets/lib/typey/stylesheets")) -}}
 {{ $mobile_options = (dict "targetPath" "css/mobile.css" "outputStyle" "nested" "enableSourceMap" true "includePaths" (slice "assets/lib/typey/stylesheets")) -}}
 {{ $print_options = (dict "targetPath" "css/print.css" "outputStyle" "nested" "enableSourceMap" true "includePaths" (slice "assets/lib/typey/stylesheets")) -}}