diff --git a/layouts/_default/_markup/render-image.html.example b/layouts/_default/_markup/render-image.html.example
index d9ad768..77731f4 100644
--- a/layouts/_default/_markup/render-image.html.example
+++ b/layouts/_default/_markup/render-image.html.example
@@ -11,7 +11,7 @@
 {{ $realheight := 0 -}}
 {{ $resource := false -}}
 {{ $src := .Destination -}}
-{{ $srcsetw := (slice) }}
+{{ $srcsetw := (slice) -}}
 {{ $static := false -}}
 
 {{ if and $src (fileExists (path.Join "/static" $src)) -}}
@@ -38,7 +38,7 @@
     {{ $width = $image.Width -}}
     {{ $height = $image.Height -}}
     {{ if $srcset -}}
-      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $src (strings.TrimRight "x" $size)) }}
+      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $src (strings.TrimRight "x" $size)) -}}
     {{ end -}}
   {{ else -}}
     {{ $src = $resource.RelPermalink -}}
@@ -48,7 +48,7 @@
   {{ if $srcset -}}
     {{ range $set := split $srcset " " -}}
       {{ $image := $resource.Resize (printf "%sx" $set) -}}
-      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) }}
+      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) -}}
     {{ end }}
     {{ $width = "" -}}
     {{ $height = "" -}}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 9a068f6..09b04cc 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -30,7 +30,7 @@
     {{ with .OutputFormats.Get "RSS" -}}
       {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{ end -}}
-    {{ range $pages }}
+    {{ range $pages -}}
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
@@ -41,6 +41,6 @@
       <guid>{{ .Permalink }}</guid>
       <description>{{ .Content | html }}</description>
     </item>
-    {{ end }}
+    {{ end -}}
   </channel>
 </rss>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 04d3edf..29deb34 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -17,4 +17,4 @@
 </div>
 </article>
 </main>
-{{ end }}
+{{ end -}}
diff --git a/layouts/index.html b/layouts/index.html
index 319c2d9..846a1f4 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -16,4 +16,4 @@
 
 {{ partial "pagination.html" . }}
 </main>
-{{ end }}
+{{ end -}}
diff --git a/layouts/micro/list.html b/layouts/micro/list.html
index de935cb..e0b57de 100644
--- a/layouts/micro/list.html
+++ b/layouts/micro/list.html
@@ -16,4 +16,4 @@
 
 {{ partial "pagination.html" . }}
 </main>
-{{ end }}
+{{ end -}}
diff --git a/layouts/micro/rss.xml b/layouts/micro/rss.xml
index 18473c7..2c91536 100644
--- a/layouts/micro/rss.xml
+++ b/layouts/micro/rss.xml
@@ -22,13 +22,13 @@
     {{ with .OutputFormats.Get "RSS" -}}
       {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{ end -}}
-    {{ range .Pages }}
+    {{ range .Pages -}}
     <item>
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       <guid>{{ .Permalink }}</guid>
       <description>{{ .Content | html }}</description>
     </item>
-    {{ end }}
+    {{ end -}}
   </channel>
 </rss>
diff --git a/layouts/micro/single.html b/layouts/micro/single.html
index b133d78..b4835dd 100644
--- a/layouts/micro/single.html
+++ b/layouts/micro/single.html
@@ -12,4 +12,4 @@
 </div>
 </article>
 </main>
-{{ end }}
+{{ end -}}
diff --git a/layouts/partials/language-selector.html b/layouts/partials/language-selector.html
index fb7ca83..85157b3 100644
--- a/layouts/partials/language-selector.html
+++ b/layouts/partials/language-selector.html
@@ -5,12 +5,12 @@
 </svg>
 <ul class="navbar">
 {{ if .IsTranslated -}}
-{{ range .Translations }}
+{{ range .Translations -}}
 <li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Site.LanguageCode | default .Lang }}" lang="{{ .Site.LanguageCode | default .Lang }}">{{ .Language.LanguageName }}</a></li>
 {{ end -}}
 {{ else -}}
 {{ range site.Languages -}}
-{{ if ne site.Language.Lang .Lang }}
+{{ if ne site.Language.Lang .Lang -}}
 <li><a rel="alternate" href="{{ .Lang | relURL }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .LanguageName }}</a></li>
 {{ end -}}
 {{ end -}}
diff --git a/layouts/podcast/single.html b/layouts/podcast/single.html
index df91e96..be4f03a 100644
--- a/layouts/podcast/single.html
+++ b/layouts/podcast/single.html
@@ -12,4 +12,4 @@
 </div>
 </article>
 </main>
-{{ end }}
+{{ end -}}
diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html
index 9878ca6..c4592dc 100644
--- a/layouts/shortcodes/audio.html
+++ b/layouts/shortcodes/audio.html
@@ -35,5 +35,7 @@
 <audio controls preload="{{ $preload }}">
 <source src="{{ $src }}" {{ with $type }}type="{{ . }}"{{ end }}>
 </audio>
-{{ with $caption }}<figcaption>{{ . | markdownify }}</figcaption>{{ end }}
+{{ with $caption -}}
+<figcaption>{{ . | markdownify }}</figcaption>
+{{ end -}}
 </figure>
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index b357b27..8ed3f41 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -15,7 +15,7 @@
 {{ $realwidth := 0 -}}
 {{ $realheight := 0 -}}
 {{ $resource := false -}}
-{{ $srcsetw := (slice) }}
+{{ $srcsetw := (slice) -}}
 {{ $static := false -}}
 
 {{ if and $src (fileExists (path.Join "/static" $src)) -}}
@@ -42,7 +42,7 @@
     {{ $width = $image.Width -}}
     {{ $height = $image.Height -}}
     {{ if $srcset -}}
-      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $src (strings.TrimRight "x" $size)) }}
+      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $src (strings.TrimRight "x" $size)) -}}
     {{ end -}}
   {{ else -}}
     {{ $src = $resource.RelPermalink -}}
@@ -52,8 +52,8 @@
   {{ if $srcset -}}
     {{ range $set := split $srcset " " -}}
       {{ $image := $resource.Resize (printf "%sx" $set) -}}
-      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) }}
-    {{ end }}
+      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) -}}
+    {{ end -}}
     {{ $width = "" -}}
     {{ $height = "" -}}
   {{ end -}}
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index ebe47d2..9ae48e2 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -11,7 +11,7 @@
 {{ $realwidth := 0 -}}
 {{ $realheight := 0 -}}
 {{ $resource := false -}}
-{{ $srcsetw := (slice) }}
+{{ $srcsetw := (slice) -}}
 {{ $static := false -}}
 
 {{ if and $src (fileExists (path.Join "/static" $src)) -}}
@@ -38,7 +38,7 @@
     {{ $width = $image.Width -}}
     {{ $height = $image.Height -}}
     {{ if $srcset -}}
-      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $src (strings.TrimRight "x" $size)) }}
+      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $src (strings.TrimRight "x" $size)) -}}
     {{ end -}}
   {{ else -}}
     {{ $src = $resource.RelPermalink -}}
@@ -48,8 +48,8 @@
   {{ if $srcset -}}
     {{ range $set := split $srcset " " -}}
       {{ $image := $resource.Resize (printf "%sx" $set) -}}
-      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) }}
-    {{ end }}
+      {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) -}}
+    {{ end -}}
     {{ $width = "" -}}
     {{ $height = "" -}}
   {{ end -}}
diff --git a/layouts/shortcodes/svg.html b/layouts/shortcodes/svg.html
index 5c31cce..1b06cb3 100644
--- a/layouts/shortcodes/svg.html
+++ b/layouts/shortcodes/svg.html
@@ -13,7 +13,7 @@
 {{ if and $src (fileExists (path.Join "/static" $src)) -}}
   {{ $static = true -}}
   {{ $src = relURL $src -}}
-  {{ if $inline }}
+  {{ if $inline -}}
     {{ $src = readFile (path.Join "/static" $src) -}}
   {{ end -}}
 {{ else if $src -}}
diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html
index b54083e..558c110 100644
--- a/layouts/shortcodes/video.html
+++ b/layouts/shortcodes/video.html
@@ -27,7 +27,7 @@
 
 {{ if $resource -}}
   {{ $src = $resource.RelPermalink -}}
-  {{ $type = $resource.MediaType }}
+  {{ $type = $resource.MediaType -}}
 {{ end -}}
 
 {{ if and $poster (fileExists (path.Join "/static" $poster)) -}}
@@ -61,5 +61,7 @@
 <video controls preload="{{ $preload }}" {{ with $width }}width="{{ . }}"{{ end }} {{ with $poster }}poster="{{ . }}"{{ end }} {{ with $autoplay }}autoplay="{{ . }}"{{ end }} {{ with $loop }}loop="{{ . }}"{{ end }}>
 <source src="{{ $src }}" {{ with $type }}type="{{ . }}"{{ end }}>
 </video>
-{{ with $caption }}<figcaption>{{ . | markdownify }}</figcaption>{{ end }}
+{{ with $caption -}}
+<figcaption>{{ . | markdownify }}</figcaption>
+{{ end -}}
 </figure>