diff --git a/site/content/docs/4.3/examples/_index.md b/site/content/docs/4.3/examples/_index.md
index e063c7a8a3..e166a7bc0a 100644
--- a/site/content/docs/4.3/examples/_index.md
+++ b/site/content/docs/4.3/examples/_index.md
@@ -5,4 +5,24 @@ description: Quickly get a project started with any of our examples ranging from
aliases: "/examples/"
---
-{{< list-examples >}}
+{{< list-examples.inline >}}
+{{ range $entry := $.Site.Data.examples -}}
+
{{ $entry.category }}
+ {{ $entry.description }}
+
+ {{ range $i, $example := $entry.examples -}}
+ {{- $len := len $entry.examples -}}
+ {{ if (eq $i 0) }}{{ end }}
+
+ {{ if (eq (add $i 1) $len) }}
{{ end }}
+ {{ end -}}
+{{ end -}}
+{{< /list-examples.inline >}}
diff --git a/site/content/docs/versions.md b/site/content/docs/versions.md
index 52940566b9..67e04a70bf 100644
--- a/site/content/docs/versions.md
+++ b/site/content/docs/versions.md
@@ -3,4 +3,25 @@ title: Versions
description: An appendix of hosted documentation for nearly every release of Bootstrap, from v1 through v4.
---
-{{< list-versions >}}
+{{< list-versions.inline >}}
+
+ {{- range $release := (index $.Site.Data "docs-versions") }}
+
+
{{ $release.group }}
+
{{ $release.description }}
+ {{- $versions := sort $release.versions "v" "desc" -}}
+ {{- range $i, $version := $versions }}
+ {{- $len := len $versions -}}
+ {{ if (eq $i 0) }}
{{ end }}
+ {{ end -}}
+
+ {{ end -}}
+
+{{< /list-versions.inline >}}
diff --git a/site/layouts/shortcodes/list-examples.html b/site/layouts/shortcodes/list-examples.html
deleted file mode 100644
index 33b3c33c7d..0000000000
--- a/site/layouts/shortcodes/list-examples.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ range $entry := $.Site.Data.examples -}}
- {{ $entry.category }}
- {{ $entry.description }}
-
- {{ range $i, $example := $entry.examples -}}
- {{- $len := len $entry.examples -}}
- {{ if (eq $i 0) }}{{ end }}
-
- {{ if (eq (add $i 1) $len) }}
{{ end }}
- {{ end -}}
-{{ end -}}
diff --git a/site/layouts/shortcodes/list-versions.html b/site/layouts/shortcodes/list-versions.html
deleted file mode 100644
index 6ec61b438b..0000000000
--- a/site/layouts/shortcodes/list-versions.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
- {{- range $release := (index $.Site.Data "docs-versions") }}
-
-
{{ $release.group }}
-
{{ $release.description }}
- {{- $versions := sort $release.versions "v" "desc" -}}
- {{- range $i, $version := $versions }}
- {{- $len := len $versions -}}
- {{ if (eq $i 0) }}
{{ end }}
- {{ end -}}
-
- {{ end -}}
-