diff --git a/content/dates/2021-12-12-PalaisDeJustice.md b/content/dates/2021-12-12-PalaisDeJustice.md
index 3540d5a..6d61be7 100644
--- a/content/dates/2021-12-12-PalaisDeJustice.md
+++ b/content/dates/2021-12-12-PalaisDeJustice.md
@@ -5,3 +5,7 @@ date: 2021-12-12T00:00:00+01:00
 latitude: "45.761727"
 longitude: "4.829074"
 ---
+{{<load-photoswipe>}}
+
+### Photos
+{{<gallery class="galleryMarginHorizontal" dir="images/2021-12-12" boxClass="twoTilesBoxes"/>}}
\ No newline at end of file
diff --git a/content/dates/2022-07-30-Gazafonds.md b/content/dates/2022-07-30-Gazafonds.md
index 8877030..7b4dc13 100644
--- a/content/dates/2022-07-30-Gazafonds.md
+++ b/content/dates/2022-07-30-Gazafonds.md
@@ -11,8 +11,4 @@ Festival Rock à Fond organisé par les Gazafond à Manziat (01570)
 {{<load-photoswipe>}}
 
 ### Photos
-{{<gallery>}}
-  {{<figure src="/images/2022-07-30/IMG_20220730_200333.jpg">}}
-  {{<figure src="/images/2022-07-30/IMG_20220730_202412.jpg">}}
-  {{<figure src="/images/2022-07-30/IMG_20220730_202417.jpg">}}
-{{</gallery>}}
\ No newline at end of file
+{{<gallery class="galleryMarginHorizontal" dir="/images/2022-07-30/"/>}}
\ No newline at end of file
diff --git a/content/dates/2022-10-11-MatinaleOzK.md b/content/dates/2022-10-11-MatinaleOzK.md
index e6c51ad..70e85fb 100644
--- a/content/dates/2022-10-11-MatinaleOzK.md
+++ b/content/dates/2022-10-11-MatinaleOzK.md
@@ -15,16 +15,8 @@ Matinale Musicale de 7:00 à 8:00 place Charles Hernu à Charpennes, sur une id
 {{<load-photoswipe>}}
 
 ### Photos
-{{< gallery >}}
-  {{<figure src="/images/2022-10-11/20221011_073144.jpg">}}
-  {{<figure src="/images/2022-10-11/20221011_073424.jpg">}}
-  {{<figure src="/images/2022-10-11/20221011_075118.jpg">}}
-  {{<figure src="/images/2022-10-11/20221011_075123.jpg">}}
-  {{<figure src="/images/2022-10-11/20221011_075127.jpg">}}
-  {{<figure src="/images/2022-10-11/20221011_075131.jpg">}}
-  {{<figure src="/images/2022-10-11/20221011_075140.jpg">}}
-{{< /gallery >}}
+{{<gallery class="galleryMarginHorizontal" dir="/images/2022-10-11/"/>}}
 
-## Vidéo
+### Vidéo
 {{< peertube class="marginHorizontal" src="https://tube.pustule.org/videos/embed/7c3bd887-bf16-4acd-bc6b-baa581311b87?warningTitle=0&p2p=0" >}}
 
diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html
index 1a361f8..3e5ed2e 100644
--- a/layouts/shortcodes/gallery.html
+++ b/layouts/shortcodes/gallery.html
@@ -6,10 +6,11 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 {{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href={{ "css/hugo-easy-gallery.css" | relURL }} />{{ end }}
 {{- $.Page.Scratch.Add "figurecount" 1 }}
 {{ $baseURL := .Site.BaseURL }}
-<div class="gallery {{ with .Get "class"}}{{.}}{{end}}  caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
+<div class="gallery {{ with .Get "class"}}{{.}}{{end}}  caption-position-{{ with .Get "caption-position" | default "none" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
 	{{- with (.Get "dir") -}}
 		<!-- If a directory was specified, generate figures for all of the images in the directory -->
 		{{- $files := readDir (print "/static/" .) }}
+		{{- $boxClass := $.Get "boxClass" | default "threeTilesBoxes" }}
 		{{- range $files -}}
 			<!-- skip files that aren't images, or that include the thumb suffix in their name -->
 			{{- $thumbext := $.Get "thumb" | default "-thumb" }}
@@ -21,7 +22,7 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 				{{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }}<!-- filename of thumbnail image -->
 				{{- $thumbexists := where $files "Name" $thumb }}<!-- does a thumbnail image exist? --> 
 				{{- $thumbURL := print $baseURL ($.Get "dir") "/" $thumb | absURL }}<!-- absolute URL to thumbnail image -->
-				<div class="{{ with .Get "boxClass" | default "threeTilesBoxes" }}{{.}}{{end}}">
+				<div class="{{ $boxClass }}">
 				  <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
 				    <div class="img" style="background-image: url('{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}');" >
 				      <img itemprop="thumbnail" src="{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}" alt="{{ $caption }}" /><!-- <img> hidden if in .gallery -->