diff --git a/exampleSite/content/blog/figure-shortcode.md b/exampleSite/content/blog/figure-shortcode.md
index fe112551..57d20f45 100644
--- a/exampleSite/content/blog/figure-shortcode.md
+++ b/exampleSite/content/blog/figure-shortcode.md
@@ -97,7 +97,27 @@ Michael was having brunch with Sally Sitwell at a restaurant called Skip Church'
 Code:
 
 ```go-text-template
-{{</* paige/figure caption="Hickory Dickory Dock" */>}}
+{{</* paige/figure caption="Hickory Dickory Dock" align="start" */>}}
+<div style="white-space: pre">
+Hickory dickory dock.
+The mouse ran up the clock.
+The clock struck one,
+The mouse ran down,
+Hickory dickory dock.
+</div>
+{{</* /paige/figure */>}}
+
+{{</* paige/figure caption="Hickory Dickory Dock" align="center" */>}}
+<div style="white-space: pre">
+Hickory dickory dock.
+The mouse ran up the clock.
+The clock struck one,
+The mouse ran down,
+Hickory dickory dock.
+</div>
+{{</* /paige/figure */>}}
+
+{{</* paige/figure caption="Hickory Dickory Dock" align="end" */>}}
 <div style="white-space: pre">
 Hickory dickory dock.
 The mouse ran up the clock.
@@ -110,7 +130,27 @@ Hickory dickory dock.
 
 Result:
 
-{{< paige/figure caption="Hickory Dickory Dock" >}}
+{{< paige/figure caption="Hickory Dickory Dock" align="start" >}}
+<div style="white-space: pre">
+Hickory dickory dock.
+The mouse ran up the clock.
+The clock struck one,
+The mouse ran down,
+Hickory dickory dock.
+</div>
+{{< /paige/figure >}}
+
+{{< paige/figure caption="Hickory Dickory Dock" align="center" >}}
+<div style="white-space: pre">
+Hickory dickory dock.
+The mouse ran up the clock.
+The clock struck one,
+The mouse ran down,
+Hickory dickory dock.
+</div>
+{{< /paige/figure >}}
+
+{{< paige/figure caption="Hickory Dickory Dock" align="end" >}}
 <div style="white-space: pre">
 Hickory dickory dock.
 The mouse ran up the clock.
diff --git a/layouts/partials/paige/figure.html b/layouts/partials/paige/figure.html
index be5e1db8..7a236d1a 100644
--- a/layouts/partials/paige/figure.html
+++ b/layouts/partials/paige/figure.html
@@ -82,7 +82,7 @@
         {{ if $table }}
             <div class="d-table">
         {{ end }}
-        <div>{{ $content }}</div>
+        <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>
         {{ end }}
diff --git a/layouts/shortcodes/paige/quote.html b/layouts/shortcodes/paige/quote.html
index 1e0c6d24..7e2bbf64 100644
--- a/layouts/shortcodes/paige/quote.html
+++ b/layouts/shortcodes/paige/quote.html
@@ -7,7 +7,7 @@
 {{ $maxwidth := .Get "maxwidth" }}
 {{ $width := .Get "width" }}
 
-{{ $content = printf `<blockquote class="blockquote mb-0 text-%v">%v</blockquote>` $align $content | safeHTML }}
+{{ $content = printf `<blockquote class="blockquote mb-0">%v</blockquote>` $content | safeHTML }}
 
 {{ partial "paige/figure.html" (dict
     "align" $align