diff --git a/layouts/partials/gallery.html b/layouts/partials/gallery.html
index d4e8fb6..1ea1e76 100644
--- a/layouts/partials/gallery.html
+++ b/layouts/partials/gallery.html
@@ -1,9 +1,9 @@
-{{ $imgs := .imgs }}
-{{ $galno := .galno }}
+{{- $imgs := .imgs -}}
+{{- $galno := .galno -}}
 <div class="snap-gallery" style="--columns:{{ default 4 .columns }};--min-width:{{ default "200px" .minwidth }};--gap:10px;--cursor:{{ .cursor }};">
-  {{ range $i, $img := $imgs }}
+  {{- range $i, $img := $imgs -}}
   <div class="snap-image">
     <img src="{{ $img }}" onclick="openLightbox({{ $galno }});openLightboxItem({{ $galno }}, {{ add $i 1 }});">
   </div>
-  {{ end }}
+  {{- end -}}
 </div>
diff --git a/layouts/partials/lightbox.html b/layouts/partials/lightbox.html
index 0945f64..5d13e96 100644
--- a/layouts/partials/lightbox.html
+++ b/layouts/partials/lightbox.html
@@ -1,12 +1,12 @@
-{{ $imgs := .imgs }}
-{{ $galno := .galno }}
+{{- $imgs := .imgs -}}
+{{- $galno := .galno -}}
 <div class="snap-lightbox" id="snap-lightbox-{{ $galno }}">
-  {{ range $i, $img := $imgs }}
+  {{- range $i, $img := $imgs }}
   <div class="snap-lightbox-inner">
     <div class="numbertext">{{ add $i 1 }} / {{ len $imgs }}</div>
     <img src="{{ $img }}" style="width:100%">
   </div>
-  {{ end }}
+  {{- end -}}
 
   <!-- Close and Next/previous controls -->
   <span class="snap-close" onclick="closeLightbox({{ $galno }})">&times;</span>
diff --git a/layouts/partials/slideshow.html b/layouts/partials/slideshow.html
index e9c9791..648e42d 100644
--- a/layouts/partials/slideshow.html
+++ b/layouts/partials/slideshow.html
@@ -1,12 +1,12 @@
-{{ $imgs := .imgs }}
-{{ $galno := .galno }}
+{{- $imgs := .imgs -}}
+{{- $galno := .galno -}}
 <div class="snap-slideshow" id="snap-slideshow-{{ $galno }}" style="--columns:1;--min-width:0px;--gap:0px;--slideshow-width:{{ default "100%" .width }};--cursor:{{ .cursor }};">
-  {{ range $i, $img := $imgs }}
+  {{- range $i, $img := $imgs }}
   <div class="snap-image">
     <div class="numbertext">{{ add $i 1 }} / {{ len $imgs }}</div>
     <img src="{{ $img }}" onclick="openLightbox({{ $galno }});openLightboxItem({{ $galno }}, {{ add $i 1 }});">
   </div>
-  {{ end }}
+  {{- end -}}
 
   <a class="snap-prev" onclick="moveSlideshowItem({{ $galno }}, -1)"><span>&#10094;</span></a>
   <a class="snap-next" onclick="moveSlideshowItem({{ $galno }}, 1)"><span>&#10095;</span></a>
diff --git a/layouts/shortcodes/snap-gallery.html b/layouts/shortcodes/snap-gallery.html
index 8c42d47..eed4342 100644
--- a/layouts/shortcodes/snap-gallery.html
+++ b/layouts/shortcodes/snap-gallery.html
@@ -1,68 +1,68 @@
 {{/*  Count number of gallery on page  */}}
 {{- $.Page.Scratch.Add "gallerycount" 1 -}}
-{{ $galno := $.Page.Scratch.Get "gallerycount" }}
+{{- $galno := $.Page.Scratch.Get "gallerycount" -}}
 
 {{/*  Load CSS/JS and make sure it is only loaded once  */}}
-{{- if eq ($.Page.Scratch.Get "gallerycount") 1 }}
-{{- with resources.Get "scss/snap-gallery.scss" | toCSS }}
+{{- if eq ($.Page.Scratch.Get "gallerycount") 1 -}}
+{{- with resources.Get "scss/snap-gallery.scss" | toCSS -}}
 <link rel="stylesheet" href="{{ .RelPermalink }}" crossorigin="anonymous">
-{{- end }}
+{{- end -}}
 <script src="/js/snap-gallery.js"></script>
-{{ end }}
+{{- end -}}
 
 {{/*  Initialise index of this gallery  */}}
 <script>imageIndex[{{ $galno }}] = 1;</script>
 
 {{/*  Initialise variables holding image paths and extension  */}}
-{{ $imgs_collect := slice }}
-{{ $imgs := slice }}
-{{ $img_exts := slice ".jpg" ".jpeg" ".png" ".gif" ".webp" ".tiff" }}
+{{- $imgs_collect := slice -}}
+{{- $imgs := slice -}}
+{{- $img_exts := slice ".jpg" ".jpeg" ".png" ".gif" ".webp" ".tiff" -}}
 
 {{/*  Get images from src Param, separated by comma  */}}
-{{ range (split .Params.src ",") }}
-  {{ $img := (trim . " ") }}
-  {{ $img_static := print "/static/" $img }}
+{{- range (split .Params.src ",") -}}
+  {{- $img := (trim . " ") -}}
+  {{- $img_static := print "/static/" $img -}}
   {{/*  Only proceed when path exists  */}}
-  {{ if os.FileExists $img_static }}
+  {{- if os.FileExists $img_static -}}
     {{/*  If current item is a directory, range each of them, and add with full path to the slice  */}}
-    {{ if (os.Stat $img_static).IsDir }}
+    {{- if (os.Stat $img_static).IsDir -}}
       {{- range readDir $img_static -}}
-        {{ $imgs_collect = $imgs_collect | append (path.Join $img .Name ) }}
-      {{ end }}
+        {{- $imgs_collect = $imgs_collect | append (path.Join $img .Name ) -}}
+      {{- end -}}
     {{/*  If a single file, just add it to the slice  */}}
-    {{ else }}
-      {{ $imgs_collect = $imgs_collect | append $img }}
-    {{ end }}
-  {{ end }}
-{{ end }}
+    {{- else -}}
+      {{- $imgs_collect = $imgs_collect | append $img -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
 
 {{/*  Filter collected files by whether they are an image. Throw others out  */}}
-{{ range $imgs_collect }}
-  {{ if in $img_exts (lower (path.Ext .)) }}
-    {{ $imgs = $imgs | append . }}
-  {{ end }}
-{{ end }}
+{{- range $imgs_collect -}}
+  {{- if in $img_exts (lower (path.Ext .)) -}}
+    {{- $imgs = $imgs | append . -}}
+  {{- end -}}
+{{- end -}}
 
 {{/*  Define cursor when hovering over images, depending on lightbox status  */}}
-{{ $lightbox := (default true .Params.lightbox) }}
-{{ $cursor := "auto" }}
-{{ if $lightbox }}{{ $cursor = "zoom-in" }}{{ end }}
+{{- $lightbox := (default true .Params.lightbox) -}}
+{{- $cursor := "auto" -}}
+{{- if $lightbox }}{{ $cursor = "zoom-in" }}{{ end -}}
 
 {{/*  Visible images in separate modes  */}}
-{{ $mode := default "gallery" .Params.mode }}
+{{- $mode := default "gallery" .Params.mode -}}
 {{/*  Gallery mode  */}}
-{{ if eq $mode "gallery" }}
-{{ partial "gallery" (dict "columns" .Params.columns "minwidth" .Params.minwidth "imgs" $imgs "galno" $galno "cursor" $cursor) }}
+{{- if eq $mode "gallery" -}}
+{{- partial "gallery" (dict "columns" .Params.columns "minwidth" .Params.minwidth "imgs" $imgs "galno" $galno "cursor" $cursor) -}}
 {{/*  Slideshow mode  */}}
-{{ else if eq $mode "slideshow" }}
-{{ partial "slideshow" (dict "imgs" $imgs "galno" $galno "width" .Params.slideshowwidth "cursor" $cursor) }}
+{{- else if eq $mode "slideshow" -}}
+{{- partial "slideshow" (dict "imgs" $imgs "galno" $galno "width" .Params.slideshowwidth "cursor" $cursor) -}}
 {{/*  Set autorotate timer for slideshow, if configured (default: yes)  */}}
-{{ if .Params.slideshowrotate }}
+{{- if .Params.slideshowrotate -}}
 <script>const autoSlideshow = setInterval(moveSlideshowItem, {{ default 5000 .Params.slideshowrotate_timer }}, {{ $galno }}, 1, "auto");</script>
-{{ end }}
-{{ end }}
+{{- end -}}
+{{- end -}}
 
 {{/*  The Modal/Lightbox  */}}
-{{ if $lightbox }}
-{{ partial "lightbox" (dict "galno" $galno "imgs" $imgs) }}
-{{ end }}
+{{- if $lightbox -}}
+{{- partial "lightbox" (dict "galno" $galno "imgs" $imgs) -}}
+{{- end -}}