diff --git a/hugo_stats.json b/hugo_stats.json
index 8652c7d76a..bb6b3b8896 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -161,6 +161,7 @@
       "block",
       "border",
       "border-0",
+      "border-amber-light",
       "border-b-2",
       "border-b-4",
       "border-b-gray-light-400",
@@ -169,7 +170,9 @@
       "border-divider-light",
       "border-gray-light-100",
       "border-gray-light-200",
+      "border-l-2",
       "border-l-4",
+      "border-l-magenta-light",
       "bottom-0",
       "box-content",
       "build-push-action",
@@ -196,12 +199,14 @@
       "dark:bg-red-dark",
       "dark:bg-violet-dark",
       "dark:block",
+      "dark:border-amber-dark",
       "dark:border-b-blue-dark-600",
       "dark:border-b-gray-dark-400",
       "dark:border-b-green-dark-400",
       "dark:border-divider-dark",
       "dark:border-gray-dark-200",
       "dark:border-gray-dark-400",
+      "dark:border-l-magenta-dark",
       "dark:decoration-blue-dark",
       "dark:fill-blue-dark",
       "dark:focus:outline-blue-dark",
@@ -216,6 +221,7 @@
       "dark:outline-gray-dark",
       "dark:prose-invert",
       "dark:syntax-dark",
+      "dark:text-amber-dark",
       "dark:text-blue-dark",
       "dark:text-divider-dark",
       "dark:text-gray-dark",
@@ -223,6 +229,7 @@
       "dark:text-gray-dark-600",
       "dark:text-gray-dark-700",
       "dark:text-gray-dark-800",
+      "dark:text-magenta-dark",
       "dark:text-violet-dark",
       "dark:text-white",
       "dark:to-blue-dark-100",
@@ -291,7 +298,6 @@
       "icon-lg",
       "icon-sm",
       "icon-svg",
-      "important",
       "inline",
       "inset-0",
       "invertible",
@@ -382,6 +388,7 @@
       "p-[2px]",
       "pb-0",
       "pb-0.5",
+      "pb-1",
       "pb-2",
       "pb-32",
       "pb-4",
@@ -434,6 +441,7 @@
       "syntax-light",
       "systemd-networkd",
       "text-2xl",
+      "text-amber-light",
       "text-base",
       "text-black",
       "text-blue-light",
@@ -446,6 +454,7 @@
       "text-gray-light-800",
       "text-left",
       "text-lg",
+      "text-magenta-light",
       "text-sm",
       "text-violet-light",
       "text-white",
diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index caea937496..e96b19ff4f 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -48,26 +48,26 @@
     </table>
     {{ .Content }}
     {{ if $data.deprecated }}
-      <blockquote class="warning">
-        <p><strong>This command is deprecated</strong></p>
-        <p>
-          It may be removed in a future Docker version. For more information,
-          see the
-          <a href="https://github.com/docker/roadmap/issues/209"
-            >Docker roadmap</a
-          >
-        </p>
-      </blockquote>
+      {{ markdownify `
+> [!WARNING]
+> This command is deprecated
+>
+> It may be removed in a future Docker version. For more information, see the
+> [Docker roadmap](https://github.com/docker/roadmap/issues/209)`
+      }}
     {{ end }}
     {{ if or $data.experimental $data.experimentalcli }}
-      <blockquote class="important">
-        <p><strong>This command is experimental</strong></p>
-        <p>
-          Experimental features are intended for testing and feedback as their
-          functionality or design may change between releases without warning or
-          can be removed entirely in a future release.
-        </p>
-      </blockquote>
+      {{ markdownify `
+{{% experimental %}}
+
+**This command is experimental.**
+
+Experimental features are intended for testing and feedback as their
+functionality or design may change between releases without warning or
+can be removed entirely in a future release.
+
+{{% /experimental %}}`
+      }}
     {{ end }}
     {{ with $data.kubernetes }}
       <p>