diff --git a/hugo.yaml b/hugo.yaml
index 369dc8d8c4..19dbcca1ed 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -92,6 +92,10 @@ outputs:
   section:
     - html
     - markdown
+  taxonomy:
+    - html
+  term:
+    - html
 
 languages:
   en:
diff --git a/layouts/shortcodes/accordion.markdown.md b/layouts/shortcodes/accordion.markdown.md
new file mode 100644
index 0000000000..323631d5bb
--- /dev/null
+++ b/layouts/shortcodes/accordion.markdown.md
@@ -0,0 +1,5 @@
+{{ $title := .Get "title" -}}
+{{ $body := .InnerDeindent -}}
+**{{ $title }}**
+
+{{ $body }}
diff --git a/layouts/shortcodes/badge.markdown.md b/layouts/shortcodes/badge.markdown.md
new file mode 100644
index 0000000000..9bcae182a4
--- /dev/null
+++ b/layouts/shortcodes/badge.markdown.md
@@ -0,0 +1 @@
+{{ $text := .Get "text" }}\[{{ $text }}\]
diff --git a/layouts/shortcodes/button.markdown.md b/layouts/shortcodes/button.markdown.md
new file mode 100644
index 0000000000..345e6a1908
--- /dev/null
+++ b/layouts/shortcodes/button.markdown.md
@@ -0,0 +1,3 @@
+{{ $text := .Get "text" -}}
+{{ $url := .Get "url" -}}
+[{{ $text }}]({{ $url }})
diff --git a/layouts/shortcodes/card.markdown.md b/layouts/shortcodes/card.markdown.md
new file mode 100644
index 0000000000..3ee941a0a6
--- /dev/null
+++ b/layouts/shortcodes/card.markdown.md
@@ -0,0 +1 @@
+{{/* Card omitted from markdown output */}}
\ No newline at end of file
diff --git a/layouts/shortcodes/cta.markdown.md b/layouts/shortcodes/cta.markdown.md
new file mode 100644
index 0000000000..c2fc437f3d
--- /dev/null
+++ b/layouts/shortcodes/cta.markdown.md
@@ -0,0 +1 @@
+{{/* CTA omitted from markdown output */}}
\ No newline at end of file
diff --git a/layouts/shortcodes/desktop-install-v2.markdown.md b/layouts/shortcodes/desktop-install-v2.markdown.md
new file mode 100644
index 0000000000..880e00f6fa
--- /dev/null
+++ b/layouts/shortcodes/desktop-install-v2.markdown.md
@@ -0,0 +1,22 @@
+{{- $all := .Get "all" -}}
+{{- $win := .Get "win" -}}
+{{- $win_arm_release := .Get "win_arm_release" -}}
+{{- $mac := .Get "mac" -}}
+{{- $linux := .Get "linux" -}}
+{{- $build_path := .Get "build_path" -}}
+Download Docker Desktop:
+{{- if or $all $win }}
+- [Windows](https://desktop.docker.com/win/main/amd64{{ $build_path }}Docker%20Desktop%20Installer.exe)
+{{- end }}
+{{- if $win_arm_release }}
+- [Windows ARM {{ $win_arm_release }}](https://desktop.docker.com/win/main/arm64{{ $build_path }}Docker%20Desktop%20Installer.exe)
+{{- end }}
+{{- if or $all $mac }}
+- [Mac (Apple chip)](https://desktop.docker.com/mac/main/arm64{{ $build_path }}Docker.dmg)
+- [Mac (Intel chip)](https://desktop.docker.com/mac/main/amd64{{ $build_path }}Docker.dmg)
+{{- end }}
+{{- if or $all $linux }}
+- [Linux (Debian)](https://desktop.docker.com/linux/main/amd64{{ $build_path }}docker-desktop-amd64.deb)
+- [Linux (RPM)](https://desktop.docker.com/linux/main/amd64{{ $build_path }}docker-desktop-x86_64.rpm)
+- [Linux (Arch)](https://desktop.docker.com/linux/main/amd64{{ $build_path }}docker-desktop-x86_64.pkg.tar.zst)
+{{- end }}
diff --git a/layouts/shortcodes/experimental.markdown.md b/layouts/shortcodes/experimental.markdown.md
new file mode 100644
index 0000000000..9da71ee333
--- /dev/null
+++ b/layouts/shortcodes/experimental.markdown.md
@@ -0,0 +1,3 @@
+> **{{ .Get "title" | default (i18n "experimental") }}**
+>
+> {{ .InnerDeindent }}
diff --git a/layouts/shortcodes/grid.markdown.md b/layouts/shortcodes/grid.markdown.md
new file mode 100644
index 0000000000..8c88897104
--- /dev/null
+++ b/layouts/shortcodes/grid.markdown.md
@@ -0,0 +1 @@
+{{/* Grid omitted from markdown output */}}
\ No newline at end of file
diff --git a/layouts/shortcodes/inline-image.markdown.md b/layouts/shortcodes/inline-image.markdown.md
new file mode 100644
index 0000000000..26b12c9383
--- /dev/null
+++ b/layouts/shortcodes/inline-image.markdown.md
@@ -0,0 +1,4 @@
+{{ $src := .Get "src" }}
+{{ $alt := .Get "alt" }}
+{{ $title := .Get "title" }}
+![{{ $alt }}]({{ $src }}{{ with $title }} "{{ . }}"{{ end }})
\ No newline at end of file
diff --git a/layouts/shortcodes/restricted.markdown.md b/layouts/shortcodes/restricted.markdown.md
new file mode 100644
index 0000000000..dd18b991b6
--- /dev/null
+++ b/layouts/shortcodes/restricted.markdown.md
@@ -0,0 +1,3 @@
+> **{{ .Get "title" | default (i18n "restricted") }}**
+>
+> {{ .InnerDeindent }}
diff --git a/layouts/shortcodes/rss-button.markdown.md b/layouts/shortcodes/rss-button.markdown.md
new file mode 100644
index 0000000000..bf8eebe923
--- /dev/null
+++ b/layouts/shortcodes/rss-button.markdown.md
@@ -0,0 +1 @@
+{{/* RSS button omitted from markdown output */}}
\ No newline at end of file
diff --git a/layouts/shortcodes/summary-bar.markdown.md b/layouts/shortcodes/summary-bar.markdown.md
new file mode 100644
index 0000000000..1434bcbee6
--- /dev/null
+++ b/layouts/shortcodes/summary-bar.markdown.md
@@ -0,0 +1 @@
+{{/* Summary bar omitted from markdown output */}}
\ No newline at end of file
diff --git a/layouts/shortcodes/tabs.markdown.md b/layouts/shortcodes/tabs.markdown.md
new file mode 100644
index 0000000000..dc4f50c50f
--- /dev/null
+++ b/layouts/shortcodes/tabs.markdown.md
@@ -0,0 +1,6 @@
+{{ with .Inner }}{{/* don't do anything, just call it */}}{{ end -}}
+{{ range (.Store.Get "tabs") -}}
+**{{ .name }}**
+
+{{ .content }}
+{{- end -}}
diff --git a/layouts/shortcodes/youtube-embed.markdown.md b/layouts/shortcodes/youtube-embed.markdown.md
new file mode 100644
index 0000000000..3dde39c8c0
--- /dev/null
+++ b/layouts/shortcodes/youtube-embed.markdown.md
@@ -0,0 +1 @@
+{{/* YouTube embed omitted from markdown output */}}
\ No newline at end of file