diff --git a/themes/ccchh/layouts/_default/_markup/render-image.html b/themes/ccchh/layouts/_default/_markup/render-image.html
index 65122df..0172897 100644
--- a/themes/ccchh/layouts/_default/_markup/render-image.html
+++ b/themes/ccchh/layouts/_default/_markup/render-image.html
@@ -5,9 +5,9 @@
 
 {{- $page := .Page }}
 {{- if not $isBundle }}
-  {{ $page_dir := path.Dir .Page.File }}
-  {{ $pagebundle_path := path.Join "/" $page_dir }}
-  {{ $page = .Page.Site.GetPage $pagebundle_path }}
+  {{- $page_dir := path.Dir .Page.File }}
+  {{- $pagebundle_path := path.Join "/" $page_dir }}
+  {{- $page = .Page.Site.GetPage $pagebundle_path }}
 {{- end -}}
 
 {{- with $page.Resources.Get $imagename }}
diff --git a/themes/ccchh/layouts/_default/list.html b/themes/ccchh/layouts/_default/list.html
index 1818f69..4319b7b 100644
--- a/themes/ccchh/layouts/_default/list.html
+++ b/themes/ccchh/layouts/_default/list.html
@@ -5,11 +5,11 @@
     </header>
 
     <ul>
-      {{ range .Pages }}
+      {{- range .Pages }}
         <li>
           <a href="{{ .Permalink }}"><span style="font-variant-numeric: tabular-nums;">{{ .Date.Format "2006-01-02" }}</span> | {{ .Title }}</a>
         </li>
-      {{ end }}
+      {{- end }}
     </ul>
   </main>
 {{ end }}
diff --git a/themes/ccchh/layouts/_default/single.html b/themes/ccchh/layouts/_default/single.html
index acbb255..7521722 100644
--- a/themes/ccchh/layouts/_default/single.html
+++ b/themes/ccchh/layouts/_default/single.html
@@ -2,9 +2,9 @@
   <main class="container" aria-role="main">
     <header class="header">
       <h1>{{ .Title }}</h1>
-      {{ with .Params.subtitle }}
+      {{- with .Params.subtitle }}
       <span class="subtitle">{{ . }}</span>
-      {{ end }}
+      {{- end }}
     </header>
 
     <section class="content">
diff --git a/themes/ccchh/layouts/_default/term.html b/themes/ccchh/layouts/_default/term.html
index f7e2999..f890cdf 100644
--- a/themes/ccchh/layouts/_default/term.html
+++ b/themes/ccchh/layouts/_default/term.html
@@ -4,7 +4,7 @@
       <h1>{{ .Parent.Title }}: {{ .Title }}</h1>
     </header>
 
-    {{ range .Paginator.Pages }}
+    {{- range .Paginator.Pages }}
       {{ .Render "summary" }}
     {{- end }}
     {{ partial "pagination.html" . }}
diff --git a/themes/ccchh/layouts/blog/list.html b/themes/ccchh/layouts/blog/list.html
index 7794b7c..cd691a7 100644
--- a/themes/ccchh/layouts/blog/list.html
+++ b/themes/ccchh/layouts/blog/list.html
@@ -16,7 +16,7 @@
       </div>
     </header>
 
-    {{ range .Paginator.Pages }}
+    {{- range .Paginator.Pages }}
       {{ .Render "summary" }}
     {{- end }}
     {{ partial "pagination.html" . }}
diff --git a/themes/ccchh/layouts/partials/footer.html b/themes/ccchh/layouts/partials/footer.html
index 93f5f50..ab3859c 100644
--- a/themes/ccchh/layouts/partials/footer.html
+++ b/themes/ccchh/layouts/partials/footer.html
@@ -2,6 +2,6 @@
   <div class="clearfix"></div>
   <footer class="container">
     <nav class="menu">
-    {{- partial "menu.html" (dict "menuID" "footer" "page" . ) -}}
+    {{- partial "menu.html" (dict "menuID" "footer" "page" . ) }}
     </nav>
   </footer>
diff --git a/themes/ccchh/layouts/partials/head.html b/themes/ccchh/layouts/partials/head.html
index f3c74a4..2107397 100644
--- a/themes/ccchh/layouts/partials/head.html
+++ b/themes/ccchh/layouts/partials/head.html
@@ -16,7 +16,7 @@
 
   {{ range .AlternativeOutputFormats -}}
     {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
-  {{ end -}}
+  {{- end }}
 
   <title>{{ .Title }}</title>
   <!-- TODO: Favicon -->
diff --git a/themes/ccchh/layouts/partials/menu.html b/themes/ccchh/layouts/partials/menu.html
index d023e37..84dea8d 100644
--- a/themes/ccchh/layouts/partials/menu.html
+++ b/themes/ccchh/layouts/partials/menu.html
@@ -4,7 +4,7 @@
 
     <ul>
       {{- if compare.Eq $menuID "main" -}}
-      {{ $image := resources.Get "images/logo.svg" }}
+      {{- $image := resources.Get "images/logo.svg" }}
       <li><a href="/{{ .Site.Home.URL }}"><img src="{{ $image.RelPermalink }}" class="invert-on-light" width="150px" alt="CCCHH Icon"></a></li>
       {{- end }}
       {{- range $menuContent }}
@@ -21,12 +21,11 @@
         {{- end -}}
         >{{ or (T .Identifier) .Name | safeHTML }}</a></li>
       {{- end }}
-
     </ul>
-    {{- if compare.Eq $menuID "main" -}}
+    {{ if compare.Eq $menuID "main" -}}
     <ul>
       <li class="roomstate" id="roomstate">
         <span class="state">unbekannt</span><br><span class="duration">(seit&nbsp;)</span>
       </li>
     </ul>
-    {{- end }}
+    {{- end -}}
diff --git a/themes/ccchh/layouts/shortcodes/img-resize.html b/themes/ccchh/layouts/shortcodes/img-resize.html
index b77beb2..8078dfe 100644
--- a/themes/ccchh/layouts/shortcodes/img-resize.html
+++ b/themes/ccchh/layouts/shortcodes/img-resize.html
@@ -6,9 +6,9 @@
 
 {{- $page := .Page }}
 {{- if not $isBundle }}
-{{ $page_dir := path.Dir .Page.File }}
-{{ $pagebundle_path := path.Join "/" $page_dir }}
-{{ $page = .Site.GetPage $pagebundle_path }}
+{{- $page_dir := path.Dir .Page.File }}
+{{- $pagebundle_path := path.Join "/" $page_dir }}
+{{- $page = .Site.GetPage $pagebundle_path }}
 {{- if not $page.IsPage }}
   {{ $pagebundle_path := path.Join "/" .Page.Section }}
   {{ $page = .Site.GetPage $pagebundle_path }}