diff --git a/layouts/_default/content.html b/layouts/_default/content.html
index ca8259310c..193927abb1 100644
--- a/layouts/_default/content.html
+++ b/layouts/_default/content.html
@@ -2,20 +2,20 @@
 	<h1>{{ .Title }}</h1>
 	{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
 	<header class="article-meta">
-		{{ partial "taxonomy_terms_article_wrapper.html" . }}
-		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
-			{{ partial "reading-time.html" . }}
-		{{ end }}
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
 	</header>
 	{{ .Content }}
-	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
-	{{ end }}
-	{{ if (.Site.Params.DisqusShortname) }}
+	{{ end -}}
+	{{ if (.Site.Params.DisqusShortname) -}}
 		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
+		{{- partial "disqus-comment.html" . -}}
+	{{ end -}}
 	{{ partial "page-meta-lastmod.html" . }}
 </div>
 {{/**/ -}}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index b59a677d0e..ff6b8deef8 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -18,10 +18,10 @@ <h3><a href="{{ $manualLink }}"{{ with .Params.manualLinkTitle }} title="{{ . }}
           {{ end -}}
           <p>{{ .Description | markdownify }}</p>
           <header class="article-meta">
-            {{ partial "taxonomy_terms_article_wrapper.html" . }}
-            {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
-              {{ partial "reading-time.html" . }}
-            {{ end }}
+            {{ partial "taxonomy_terms_article_wrapper.html" . -}}
+            {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+              {{ partial "reading-time.html" . -}}
+            {{ end -}}
           </header>
         </article>
       {{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 0190198635..74af83e26e 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,8 +1,8 @@
-{{ define "main" }}
+{{ define "main" -}}
 <div class="td-content">
   <main class="taxonomy-terms-page">
     <h1>{{ .Title }}</h1>
-    {{ partial "taxonomy_terms_cloud.html" (dict "context" . "taxo" ( lower .Title ) ) }}
+    {{ partial "taxonomy_terms_cloud.html" (dict "context" . "taxo" ( lower .Title ) ) -}}
   </main>
 </div>
-{{ end }}
\ No newline at end of file
+{{- end }}
diff --git a/layouts/blog/content.html b/layouts/blog/content.html
index c74806a6f8..d95b8e00c7 100644
--- a/layouts/blog/content.html
+++ b/layouts/blog/content.html
@@ -6,17 +6,17 @@ <h1>{{ .Title }}</h1>
 		<time datetime="{{  $.Date.Format "2006-01-02" }}" class="text-muted">{{ $.Date.Format $.Site.Params.time_format_blog  }}</time>
 	</div>
 	<header class="article-meta">
-		{{ partial "taxonomy_terms_article_wrapper.html" . }}
-		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
-			{{ partial "reading-time.html" . }}
-		{{ end }}
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
 	</header>
 	{{ .Content }}
-	{{ if (.Site.Params.DisqusShortname) }}
+	{{ if (.Site.Params.DisqusShortname) -}}
 		<br />
-		{{ partial "disqus-comment.html" . }}
+		{{- partial "disqus-comment.html" . -}}
 		<br />
-	{{ end }}
+	{{ end -}}
 
 	{{ partial "pager.html" . }}
 </div>
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 4c95d2206f..8abbe1c6c9 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -8,10 +8,10 @@
 <div class="td-blog-posts">
   {{ if .Pages -}}
     {{ $pag := .Paginate (( $.Scratch.Get "blog-pages").GroupByDate "2006" ) -}}
-    {{ range $pag.PageGroups }}
+    {{ range $pag.PageGroups -}}
     <div class="h2">{{ T "post_posts_in" }} {{ .Key }}</div>
     <ul class="td-blog-posts-list">
-      {{ range .Pages }}
+      {{ range .Pages -}}
       <li class="td-blog-posts-list__item">
         <div class="td-blog-posts-list__body">
           <h5 class="mt-0 mb-1"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h5>
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index e2679fb2f9..376ed81cd4 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -3,21 +3,21 @@
 	<h1>{{ .Title }}</h1>
   {{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
 	<header class="article-meta">
-		{{ partial "taxonomy_terms_article_wrapper.html" . }}
-		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
-			{{ partial "reading-time.html" . }}
-		{{ end }}
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
 	</header>
 	{{ .Content }}
-        {{ partial "section-index.html" . }}
-	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
-		{{ partial "feedback.html" .Site.Params.ui.feedback }}
+  {{ partial "section-index.html" . -}}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
+		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
-	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ end -}}
+	{{ if (.Site.DisqusShortname) -}}
 		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
-	{{ partial "page-meta-lastmod.html" . }}
+		{{- partial "disqus-comment.html" . -}}
+	{{ end -}}
+	{{ partial "page-meta-lastmod.html" . -}}
 </div>
-{{ end }}
+{{ end -}}
diff --git a/layouts/partials/taxonomy_terms_article.html b/layouts/partials/taxonomy_terms_article.html
index c1684a5068..79ef364f74 100644
--- a/layouts/partials/taxonomy_terms_article.html
+++ b/layouts/partials/taxonomy_terms_article.html
@@ -1,12 +1,12 @@
-{{ $context := .context }}
-{{ $taxo := .taxo }}
-{{ if (gt (len ($context.GetTerms $taxo)) 0)}}
+{{ $context := .context -}}
+{{ $taxo := .taxo -}}
+{{ if (gt (len ($context.GetTerms $taxo)) 0) -}}
 <div class="taxonomy taxonomy-terms-article taxo-{{ urlize $taxo }}">
   <h5 class="taxonomy-title">{{ humanize $taxo }}:</h5>
   <ul class="taxonomy-terms">
-    {{ range ($context.GetTerms $taxo) }}
+    {{ range ($context.GetTerms $taxo) -}}
       <li><a class="taxonomy-term" href="{{ .Permalink }}" data-taxonomy-term="{{ urlize .LinkTitle }}"><span class="taxonomy-label">{{ .LinkTitle }}</span></a></li>
-    {{ end }}
+    {{ end -}}
   </ul>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end -}}
diff --git a/layouts/partials/taxonomy_terms_article_wrapper.html b/layouts/partials/taxonomy_terms_article_wrapper.html
index e20af69a89..a99ffc359c 100644
--- a/layouts/partials/taxonomy_terms_article_wrapper.html
+++ b/layouts/partials/taxonomy_terms_article_wrapper.html
@@ -1,16 +1,16 @@
-{{ $context := . }}
-{{ if .Site.Params.Taxonomy }}
-  {{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
-    {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
-      {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) }}
+{{ $context := . -}}
+{{ if .Site.Params.Taxonomy -}}
+  {{ if .Site.Params.Taxonomy.taxonomyPageHeader -}}
+    {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader -}}
+      {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) -}}
     {{ end }}
-  {{ else }}
-    {{ range $taxo, $taxo_map := .Site.Taxonomies }}
-      {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) }}
+  {{ else -}}
+    {{ range $taxo, $taxo_map := .Site.Taxonomies -}}
+      {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) -}}
     {{ end }}
+  {{ end -}}
+{{ else -}}
+  {{ range $taxo, $taxo_map := .Site.Taxonomies -}}
+    {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) -}}
   {{ end }}
-{{ else }}
-  {{ range $taxo, $taxo_map := .Site.Taxonomies }}
-    {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) }}
-  {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end -}}
diff --git a/layouts/partials/taxonomy_terms_cloud.html b/layouts/partials/taxonomy_terms_cloud.html
index 24e116f810..43656f5ed2 100644
--- a/layouts/partials/taxonomy_terms_cloud.html
+++ b/layouts/partials/taxonomy_terms_cloud.html
@@ -1,18 +1,18 @@
-{{ $context := .context }}
-{{ $taxo := .taxo }}
-{{ $title := .title }}
-{{ if isset $context.Site.Taxonomies (lower $taxo) }}
-  {{ $taxonomy := index $context.Site.Taxonomies (lower $taxo) }}
-  {{ if (gt (len $taxonomy) 0)}}
+{{ $context := .context -}}
+{{ $taxo := .taxo -}}
+{{ $title := .title -}}
+{{ if isset $context.Site.Taxonomies (lower $taxo) -}}
+  {{ $taxonomy := index $context.Site.Taxonomies (lower $taxo) -}}
+  {{ if (gt (len $taxonomy) 0) -}}
     <div class="taxonomy taxonomy-terms-cloud taxo-{{ urlize $taxo }}">
-      {{ with $title }}
+      {{ with $title -}}
         <h5 class="taxonomy-title">{{ . }}</h5>
-      {{ end }}
+      {{ end -}}
       <ul class="taxonomy-terms">
-        {{ range $taxonomy }}
+        {{ range $taxonomy -}}
           <li><a class="taxonomy-term" href="{{ .Page.Permalink }}" data-taxonomy-term="{{ urlize .Page.Title }}"><span class="taxonomy-label">{{ .Page.Title }}</span><span class="taxonomy-count">{{ .Count }}</span></a></li>
-        {{ end }}
+        {{ end -}}
       </ul>
     </div>
-  {{ end }}
-{{ end }}
\ No newline at end of file
+  {{ end -}}
+{{ end -}}
diff --git a/layouts/partials/taxonomy_terms_clouds.html b/layouts/partials/taxonomy_terms_clouds.html
index 472e5f0fc6..1588fb26db 100644
--- a/layouts/partials/taxonomy_terms_clouds.html
+++ b/layouts/partials/taxonomy_terms_clouds.html
@@ -1,21 +1,21 @@
-{{ $context := . }}
-{{ if .Site.Params.taxonomy }}
-	{{ if .Site.Params.Taxonomy.taxonomyCloud }}
-		{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyCloud }}
-			{{ if $.Site.Params.Taxonomy.taxonomyCloudTitle }}
-				{{ $.Scratch.Set "title" (index $.Site.Params.Taxonomy.taxonomyCloudTitle $index) }}
-			{{ else }}
-				{{ $.Scratch.Set "title" (humanize $taxo) }}
-			{{ end }}
-			{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" ($.Scratch.Get "title")) }}
+{{ $context := . -}}
+{{ if .Site.Params.taxonomy -}}
+	{{ if .Site.Params.Taxonomy.taxonomyCloud -}}
+		{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyCloud -}}
+			{{ if $.Site.Params.Taxonomy.taxonomyCloudTitle -}}
+				{{ $.Scratch.Set "title" (index $.Site.Params.Taxonomy.taxonomyCloudTitle $index) -}}
+			{{ else -}}
+				{{ $.Scratch.Set "title" (humanize $taxo) -}}
+			{{ end -}}
+			{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" ($.Scratch.Get "title")) -}}
 		{{ end }}
-	{{ else }}
-		{{ range $taxo, $taxo_map := .Site.Taxonomies }}
-			{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" (humanize $taxo)) }}
+	{{ else -}}
+		{{ range $taxo, $taxo_map := .Site.Taxonomies -}}
+			{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" (humanize $taxo)) -}}
 		{{ end }}
+	{{ end -}}
+{{ else -}}
+	{{ range $taxo, $taxo_map := .Site.Taxonomies -}}
+		{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" (humanize $taxo)) -}}
 	{{ end }}
-{{ else }}
-	{{ range $taxo, $taxo_map := .Site.Taxonomies }}
-		{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" (humanize $taxo)) }}
-	{{ end }}
-{{ end }}
\ No newline at end of file
+{{ end -}}
diff --git a/layouts/swagger/list.html b/layouts/swagger/list.html
index aa1d781909..d988ee8966 100644
--- a/layouts/swagger/list.html
+++ b/layouts/swagger/list.html
@@ -3,21 +3,21 @@
 	<h1>{{ .Title }}</h1>
 	{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
 	<header class="article-meta">
-		{{ partial "taxonomy_terms_article_wrapper.html" . }}
-		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
-			{{ partial "reading-time.html" . }}
-		{{ end }}
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" .- }}
+		{{ end -}}
 	</header>
 	{{ .Content }}
-        {{ partial "section-index.html" . }}
-	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
-		{{ partial "feedback.html" .Site.Params.ui.feedback }}
+  {{ partial "section-index.html" . -}}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
+		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
-	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ end -}}
+	{{ if (.Site.DisqusShortname) -}}
 		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
-	{{ partial "page-meta-lastmod.html" . }}
+		{{ partial "disqus-comment.html" . -}}
+	{{ end -}}
+	{{ partial "page-meta-lastmod.html" . -}}
 </div>
-{{ end }}
+{{ end -}}