diff --git a/layouts/partials/lightbox.html b/layouts/partials/lightbox.html
new file mode 100644
index 0000000..d4f84e0
--- /dev/null
+++ b/layouts/partials/lightbox.html
@@ -0,0 +1,22 @@
+{{/*  The Modal/Lightbox  */}}
+{{ $imgs := .imgs }}
+{{ $galno := .galno }}
+<div class="snap-lightbox" id="snap-lightbox-{{ $galno }}">
+  {{ 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 }}
+
+  <!-- Close and Next/previous controls -->
+  <span class="snap-close" onclick="closeModal({{ $galno }})">&times;</span>
+
+  <a class="snap-lightbox-prev" onclick="plusSlides({{ $galno }}, -1)"><i class="snap-lightbox-arrow"></i></a>
+  <a class="snap-lightbox-next" onclick="plusSlides({{ $galno }}, 1)"><i class="snap-lightbox-arrow"></i></a>
+
+  {{/*  <!-- Caption text -->
+  <div class="caption-container">
+    <p id="caption"></p>
+  </div>  */}}
+</div>
diff --git a/layouts/shortcodes/snap-gallery.html b/layouts/shortcodes/snap-gallery.html
index fa785ad..12286e5 100644
--- a/layouts/shortcodes/snap-gallery.html
+++ b/layouts/shortcodes/snap-gallery.html
@@ -23,32 +23,12 @@
 <div class="snap-wrapper" style="--columns:{{ default 4 .Params.columns }};--min-width:{{ default 200 .Params.minwidth }};">
 {{ range $i, $img := $imgs }}
   <div class="snap-image">
-    <img src="{{ $img }}" onclick="openModal({{ $galno }});currentSlide({{ $galno }}, {{ add $i 1 }});" class="hover-shadow">
+    <img src="{{ $img }}" onclick="openModal({{ $galno }});currentSlide({{ $galno }}, {{ add $i 1 }});">
   </div>
 {{ end }}
 </div>
 
-{{/*  The Modal/Lightbox  */}}
-<div class="snap-lightbox" id="snap-lightbox-{{ $galno }}">
-  {{ 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 }}
-
-  <!-- Close and Next/previous controls -->
-  <span class="snap-close" onclick="closeModal({{ $galno }})">&times;</span>
-
-  <a class="snap-lightbox-prev" onclick="plusSlides({{ $galno }}, -1)"><i class="snap-lightbox-arrow"></i></a>
-  <a class="snap-lightbox-next" onclick="plusSlides({{ $galno }}, 1)"><i class="snap-lightbox-arrow"></i></a>
-
-  {{/*  <!-- Caption text -->
-  <div class="caption-container">
-    <p id="caption"></p>
-  </div>  */}}
-</div>
-
+{{ partial "lightbox" (dict "galno" $galno "imgs" $imgs) }}
 
 {{/*  Load CSS/JS and make sure it is only loaded once  */}}
 {{- if eq ($.Page.Scratch.Get "gallerycount") 1 }}