diff --git a/CHANGELOG.md b/CHANGELOG.md
index aafb013da7..961295ed99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,10 @@ Useful links:
 
 For the full list of changes, see the [0.x.y] release notes.
 
-**Breaking changes**:
+**Potential breaking change**:
+
+- Removes shortcode `figure`, hugo's built-in shortcode `figure` can/will be
+  used instead.
 
 **New**:
 
@@ -122,8 +125,8 @@ this release are listed next.
   [path_base_for_github_subdir]. Projects will need to adjust the value of
   [path_base_for_github_subdir] to be relative to the file's physical location.
 
-- Class names to disable [repository links] were misnamed with a suffix of the
-  form `--KIND`. The new suffix is `__KIND`. For details, see [Disabling links].
+- Class names to disable [repository links] were misnamed with a suffix of the form
+  `--KIND`. The new suffix is `__KIND`. For details, see [Disabling links].
 
 - **Heading self-link** support has been reimplemented and projects must now
   explicitly enable the feature. For details, see [Heading self links].
@@ -173,9 +176,9 @@ For the full list of changes, see the [0.8.0] release notes.
 
 - Docsy is packaged as a **single Hugo module** ([#1120]). For details, see [Use
   Docsy as a Hugo Module].
-- **Important**: non-Hugo-module projects should be aware of the [Docsy NPM
-  install side-effect]. Also, for guidance on Hugo-reported "failed to load
-  modules" error, see [Docsy as an NPM package].
+- **Important**: non-Hugo-module projects should be aware of the [Docsy
+  NPM install side-effect]. Also, for guidance on Hugo-reported "failed to load modules"
+  error, see [Docsy as an NPM package].
 - **Page feedback**, or [User feedback]:
   - In support of projects configuring analytics outside of Docsy, feedback
     functionality is enabled regardless of whether
@@ -358,13 +361,12 @@ CHANGES** are documented below.
   as text.
 - **Display logo by default**. Most projects show their logo in the navbar. In
   support of this majority, Docsy now displays a logo by default. For details on
-  how to hide the logo (or your brand name), see [Styling your project logo and
-  name].
+  how to hide the logo (or your brand name), see [Styling your project logo and name].
 - **Upgraded Bootstrap** to v4.6.2 from v4.6.1, resulting in some style changes
   (such as an adjustment in the size of `small`). For details, see [v4.6.2
   release notes].
-- **[Upgraded FontAwesome]** to v6 from v5. While many icons were renamed, the
-  v5 names still work. For details about icon renames and more, see [What's
+- **[Upgraded FontAwesome]** to v6 from v5. While many icons were renamed, the v5
+  names still work. For details about icon renames and more, see [What's
   changed].
 - **Search-box**: the HTML structure and class names have changed, due to the
   Font Awesome upgrade, for both online and offline search. This may affect your
@@ -472,10 +474,9 @@ For the full list of changes, see the [0.2.0] release notes.
 
 **New**:
 
-- Add official Docsy support for [Hugo modules]. Many thanks to the dedicated
-  and patient efforts of [@deining], who researched, experimented, and
-  implemented this feature. Thanks to [@deining] and [@LisaFC] for the doc
-  updates.
+- Add official Docsy support for [Hugo modules]. Many thanks to the dedicated and
+  patient efforts of [@deining], who researched, experimented, and implemented this
+  feature. Thanks to [@deining] and [@LisaFC] for the doc updates.
 
   For details, see
   [Migrate to Hugo Modules](https://www.docsy.dev/docs/updating/convert-site-to-module/).
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
deleted file mode 100644
index 8d126f065d..0000000000
--- a/layouts/shortcodes/figure.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{{ $src := (.Page.Resources.GetMatch (printf "**%s*" (.Get "src"))) }}
-<figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
-    {{- if .Get "link" -}}
-        <a href="{{ .Get "link" }}"{{ with .Get "target" }} target="{{ . }}"{{ end }}{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
-    {{- end }}
-    <img src="{{ if $src }}{{ $src.RelPermalink }}{{ else }}{{ .Get "src" }}{{ end }}" 
-         {{- if or (.Get "alt") (.Get "caption") }}
-         alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}"
-         {{- end -}}
-         {{- with .Get "width" }} width="{{ . }}"{{ end -}}
-         {{- with .Get "height" }} height="{{ . }}"{{ end -}}
-    /> <!-- Closing img tag -->
-    {{- if .Get "link" }}</a>{{ end -}}
-    {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}}
-        <figcaption>
-            {{ with (.Get "title") -}}
-                <h4>{{ . }}</h4>
-            {{- end -}}
-            {{- if or (.Get "caption") (.Get "attr") -}}<p>
-                {{- .Get "caption" | markdownify -}}
-                {{- with .Get "attrlink" }}
-                    <a href="{{ . }}">
-                {{- end -}}
-                {{- .Get "attr" | markdownify -}}
-                {{- if .Get "attrlink" }}</a>{{ end }}</p>
-            {{- end }}
-        </figcaption>
-    {{- end }}
-</figure>