diff --git a/content/en/blog/bootstrap-elements.md b/content/en/blog/bootstrap-elements.md
index 9495f69f..05f74b9a 100644
--- a/content/en/blog/bootstrap-elements.md
+++ b/content/en/blog/bootstrap-elements.md
@@ -99,7 +99,7 @@ As an example, the following shortcode displays a stacked card with icon that li
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* card path="about" padding="3" class="w-50" color="tertiary" header="publication" footer="none" */>}}
+{{</* card path="about" padding="3" class="w-50" color="body-tertiary" header="publication" footer="none" */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
 
diff --git a/content/nl/blog/bootstrap-elements.md b/content/nl/blog/bootstrap-elements.md
index 9f59b401..a314aac9 100644
--- a/content/nl/blog/bootstrap-elements.md
+++ b/content/nl/blog/bootstrap-elements.md
@@ -99,7 +99,7 @@ De volgende shortcode toont een kaart met een icoon dat linkt naar de [over mij]
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* card path="about" padding="3" class="w-50" color="tertiary" header="publication" footer="none" */>}}
+{{</* card path="about" padding="3" class="w-50" color="body-tertiary" header="publication" footer="none" */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
 
diff --git a/layouts/partials/assets/card.html b/layouts/partials/assets/card.html
index c6b49ccd..83274f6f 100644
--- a/layouts/partials/assets/card.html
+++ b/layouts/partials/assets/card.html
@@ -8,8 +8,8 @@
     "href"          Required address for the button or hyperlink.
     "class"         Optional class attribute of the card element, e.g. “w-50”.
     "color":        Optional theme color of the card, either "primary", "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white", "black", "body", or "tertiary". By default, no color is
-                    specified.
+                    "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". By default, no
+                    color is specified.
     "padding":      Optional padding of the content, either "0", "1", "2", "3", "4", "5", or "auto" (default).
     "header"        Optional header components of the card, displayed in small caps. Supported values are "full"
                     (default), "publication", "tags", and "none".
@@ -82,7 +82,7 @@
 {{- $color := "" -}}
 {{- with .color }}{{ $color = . }}{{ end -}}
 {{- if $color -}}
-    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
     {{- if not (in $supportedColors $color) -}}
         {{- errorf "Invalid value for param 'color': %s" $color -}}
     {{- end -}}
diff --git a/layouts/partials/assets/navbar.html b/layouts/partials/assets/navbar.html
index 3e813a61..070c1f6e 100644
--- a/layouts/partials/assets/navbar.html
+++ b/layouts/partials/assets/navbar.html
@@ -5,8 +5,8 @@
     "size"          Optional size of the button, either "sm", "md" (default), or "lg".
     "fixed"         Optional flag to indicate the navbar should stick to the top, defaults to false.
     "color"         Optional background color of the navbar, either "primary", "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "tertiary". The default color is
-                    none.
+                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". The
+                    default color is none.
     "mode"          Optional flag to include a color mode switcher, default is "true" (if dark mode is enabled).
     "search"        Optional flag to include a search input, default is "true".
     "logo"          Optional address of the logo image, defaults to the parameter "logo" set in the "main" section of
@@ -84,7 +84,7 @@
 {{- $color := "" -}}
 {{- with .color -}}
     {{- $color = . -}}
-    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
     {{- if not (in $supportedColors $color) -}}
         {{- errorf "Invalid value for param 'color': %s" $color -}}
     {{- end -}}
diff --git a/layouts/partials/assets/persona.html b/layouts/partials/assets/persona.html
index eb12cb29..82351de5 100644
--- a/layouts/partials/assets/persona.html
+++ b/layouts/partials/assets/persona.html
@@ -8,8 +8,8 @@
     "href"          Optional address for the button or hyperlink.
     "class"         Optional class attribute of the card element, e.g. “w-50”.
     "color":        Optional theme color of the card, either "primary", "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white", "black", "body", or "tertiary". By default, no color is
-                    specified.
+                    "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". By default, no
+                    color is specified.
     "content"       Optional content of the card.
     "thumbnail"     Optional thumbnail image url, displayed on top or the left of the card.
 -->
@@ -41,7 +41,7 @@
 {{- $color := "" -}}
 {{- with .color }}{{ $color = . }}{{ end -}}
 {{- if $color -}}
-    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
     {{- if not (in $supportedColors $color) -}}
         {{- errorf "Invalid value for param 'color': %s" $color -}}
     {{- end -}}
diff --git a/layouts/partials/button.html b/layouts/partials/button.html
index d062e13d..2d0f8b99 100644
--- a/layouts/partials/button.html
+++ b/layouts/partials/button.html
@@ -6,7 +6,7 @@
     "state"         Optional state of the button, either "enabled" (default), "disabled", "active", or "inactive".
     "size"          Optional size of the button, either "sm", "md" (default), or "lg".
     "color"         Optional theme color of the element, either "primary" (default), "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "tertiary".
+                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary".
     "outline"       Optional flag indicating the button should be outlined, either "false" (default) or "true".
     "badge"         Optional positioned badge to display on top of the button.
     "aria-label"    Optional assistive label for the badge.
@@ -40,7 +40,7 @@
 
 {{ $color := "primary" -}}
 {{ with .color }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" $color -}}
 {{ end -}}
diff --git a/layouts/shortcodes/alert.html b/layouts/shortcodes/alert.html
index 52f61c3f..767a1fe1 100644
--- a/layouts/shortcodes/alert.html
+++ b/layouts/shortcodes/alert.html
@@ -1,14 +1,14 @@
 <!-- 
     Displays an alert. The shortcode supports the following arguments:
     "color":        Optional theme color of the alert, either "primary" (default), "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white" or "black", "body", or "tertiary".
+                    "warning", "info", "light", "dark", "white" or "black", "body", or "body-tertiary".
     "dismissible"   Optional flag to indicate the alert is dismissible, defaults to false.
     "icon"          Optional class and name of a Font Awesome icon to include.
 -->
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "body" "tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "body" "body-tertiary" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $color = "primary" -}}
diff --git a/layouts/shortcodes/button.html b/layouts/shortcodes/button.html
index 7131dd2c..f1476df5 100644
--- a/layouts/shortcodes/button.html
+++ b/layouts/shortcodes/button.html
@@ -6,7 +6,7 @@
     "state"         Optional state of the button, either "enabled" (default), "disabled", "active", or "inactive".
     "size"          Optional size of the button, either "sm", "md" (default), or "lg".
     "color":        Optional theme color of the element, either "primary" (default), "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "tertiary".
+                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary".
     "outline"       Optional flag indicating the button should be outlined, either "false" (default) or "true".
     "badge"         Optional positioned badge to display on top of the button.
     "aria-label"    Optional label for the badge.
@@ -42,7 +42,7 @@
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $error = true }}
diff --git a/layouts/shortcodes/card.html b/layouts/shortcodes/card.html
index 27b1679c..2da6bc1e 100644
--- a/layouts/shortcodes/card.html
+++ b/layouts/shortcodes/card.html
@@ -3,8 +3,8 @@
     "path"          Required path of the page.
     "class"         Optional class attribute of the card element, e.g. “w-50”.
     "color":        Optional theme color of the card, either "primary", "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white", "black", "body", or "tertiary". By default, no color is
-                    specified.
+                    "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". By default, no
+                    color is specified.
     "padding":      Optional padding of the content, either "0", "1", "2", "3", "4", "5", or "auto" (default).
     "header"        Optional header components of the card, displayed in small caps. Supported values are "full"
                     (default), "publication", "tags", and "none".
@@ -27,7 +27,7 @@
 {{ $color := "" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
 {{ if $color }}
-    {{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+    {{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
     {{ if not (in $supportedColors $color) -}}
         {{ errorf "Invalid value for param 'color': %s" .Position -}}
         {{ $error = true -}}
diff --git a/layouts/shortcodes/navbar.html b/layouts/shortcodes/navbar.html
index 700fc55c..4eae2edb 100644
--- a/layouts/shortcodes/navbar.html
+++ b/layouts/shortcodes/navbar.html
@@ -7,8 +7,8 @@
     "size"          Optional breakpoint of the navbar toggler, either "xs", "sm", "md" (default), "lg", or "xl".
     "style"         Optional style of the navbar, either "light" (default) or "dark".
     "color"         Optional background color of the navbar, either "primary", "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "tertiary". The default color is
-                    none.
+                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". The
+                    default color is none.
     "mode"          Optional flag to include a color mode switcher, default is "true" (if dark mode is enabled).
     "search"        Optional flag to include a search input, default is "true".
     "logo"          Optional address of the logo image.
@@ -16,7 +16,7 @@
 -->
 
 {{ $error := false }}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body" "tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body" "body-tertiary" -}}
 {{ $supportedFlags := slice "true" "false" -}}
 
 {{ $id := add .Ordinal 1 }}
diff --git a/layouts/shortcodes/persona.html b/layouts/shortcodes/persona.html
index 7888b840..66205166 100644
--- a/layouts/shortcodes/persona.html
+++ b/layouts/shortcodes/persona.html
@@ -3,8 +3,8 @@
     "path"          Required path of the page.
     "class"         Optional class attribute of the card element, e.g. “w-50”.
     "color":        Optional theme color of the card, either "primary", "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white",  "black", or "tertiary". By default, no color is
-                    specified.
+                    "warning", "info", "light", "dark", "white",  "black", or "body-tertiary". By default, no color
+                    is specified.
 -->
 
 {{- $error := false -}}
@@ -21,7 +21,7 @@
 {{- $color := "" -}}
 {{- with .Get "color" }}{{ $color = . }}{{ end -}}
 {{- if $color -}}
-    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "tertiary" -}}
+    {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body-tertiary" -}}
     {{- if not (in $supportedColors $color) -}}
         {{- errorf "Invalid value for param 'color': %s" .Position -}}
         {{- $error = true -}}
diff --git a/layouts/shortcodes/spinner.html b/layouts/shortcodes/spinner.html
index 9bbf920e..03b81b74 100644
--- a/layouts/shortcodes/spinner.html
+++ b/layouts/shortcodes/spinner.html
@@ -1,14 +1,14 @@
 <!-- 
     Displays a spinner. The shortcode supports the following arguments:
     "color":        Optional theme color of the alert, either "primary" (default), "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white", "black", "body", or "tertiary".
+                    "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary".
     "grow"          Optional flag to indicate the spinner is growing instead of rotating, defaults to false.
     "class":        Optional class attribute of the spinner wrapping element, e.g. “text-center”.
 -->
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $color = "primary" -}}
diff --git a/layouts/shortcodes/tooltip.html b/layouts/shortcodes/tooltip.html
index acf2ca25..0f9f3d22 100644
--- a/layouts/shortcodes/tooltip.html
+++ b/layouts/shortcodes/tooltip.html
@@ -1,7 +1,7 @@
 <!-- 
     Displays a tooltip for a link. The shortcode supports the following arguments:
     "color":        Optional theme color of the element, either "primary" (default), "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white",  "black", "body", or "tertiary".
+                    "danger", "warning", "info", "light", "dark", "white",  "black", "body", or "body-tertiary".
     "title"         Required text to display in the tooltip.
     "href"          Required address for the button or hyperlink.
     "placement"     Optional position of the tooltip: "top" (default), "bottom", "left", or "right". 
@@ -18,7 +18,7 @@
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $error = true }}