diff --git a/layouts/partials/paige/figure.html b/layouts/partials/paige/figure.html
index 573281dd..bea98cc2 100644
--- a/layouts/partials/paige/figure.html
+++ b/layouts/partials/paige/figure.html
@@ -3,7 +3,7 @@
 {{ $compact := .compact }}
 {{ $content := .content | markdownify }}
 {{ $float := .float }}
-{{ $gap := .gap | default "2" }}
+{{ $gap := .gap }}
 {{ $height := .height }}
 {{ $maxheight := .maxheight }}
 {{ $maxwidth := .maxwidth }}
@@ -78,7 +78,7 @@
         {{ end }}
         <div class="text-{{ $align }}">{{ $content }}</div>
         {{ with $caption }}
-            <figcaption class="figure-caption mt-{{ $gap }} text-{{ $align }}" {{ if $table }} style="caption-side: bottom; display: table-caption" {{ end }}>{{ . }}</figcaption>
+            <figcaption class="figure-caption {{ with $gap }} mt-{{ . }} {{ end }} text-{{ $align }}" {{ if $table }} style="caption-side: bottom; display: table-caption" {{ end }}>{{ . }}</figcaption>
         {{ end }}
         {{ if $table }}
             </div>
diff --git a/layouts/shortcodes/paige/code.html b/layouts/shortcodes/paige/code.html
index e7b95334..4cf58703 100644
--- a/layouts/shortcodes/paige/code.html
+++ b/layouts/shortcodes/paige/code.html
@@ -15,6 +15,7 @@
     "caption" $caption
     "content" $content
     "float" $float
+    "gap" 2
     "height" $height
     "maxheight" $maxheight
     "maxwidth" $maxwidth
diff --git a/layouts/shortcodes/paige/figure.html b/layouts/shortcodes/paige/figure.html
index 4096afaa..27997c7a 100644
--- a/layouts/shortcodes/paige/figure.html
+++ b/layouts/shortcodes/paige/figure.html
@@ -12,6 +12,7 @@
     "caption" $caption
     "content" $content
     "float" $float
+    "gap" 2
     "height" $height
     "maxheight" $maxheight
     "maxwidth" $maxwidth
diff --git a/layouts/shortcodes/paige/gallery.html b/layouts/shortcodes/paige/gallery.html
index 4521a5ba..5905db7f 100644
--- a/layouts/shortcodes/paige/gallery.html
+++ b/layouts/shortcodes/paige/gallery.html
@@ -28,6 +28,7 @@
         {{ partial "paige/image-figure.html" (dict
             "caption" $caption
             "compact" true
+            "gap" 2
             "height" $height
             "link" $link
             "maxheight" $maxheight
diff --git a/layouts/shortcodes/paige/image.html b/layouts/shortcodes/paige/image.html
index 6d0058cd..7d19cbb4 100644
--- a/layouts/shortcodes/paige/image.html
+++ b/layouts/shortcodes/paige/image.html
@@ -18,6 +18,7 @@
     "alt" $alt
     "caption" $caption
     "float" $float
+    "gap" 2
     "height" $height
     "link" $link
     "maxheight" $maxheight
diff --git a/layouts/shortcodes/paige/quote.html b/layouts/shortcodes/paige/quote.html
index d2ebb8d8..4c75a045 100644
--- a/layouts/shortcodes/paige/quote.html
+++ b/layouts/shortcodes/paige/quote.html
@@ -14,7 +14,6 @@
     "caption" $caption
     "content" $content
     "float" $float
-    "gap" "0"
     "height" $height
     "maxheight" $maxheight
     "maxwidth" $maxwidth