diff --git a/site/content/docs/0.0/content/reboot.md b/site/content/docs/0.0/content/reboot.md
index b9bfa0a81d..3b1bc001c3 100644
--- a/site/content/docs/0.0/content/reboot.md
+++ b/site/content/docs/0.0/content/reboot.md
@@ -146,8 +146,8 @@ The `<hr>` element has been simplified. Similar to browser defaults, `<hr>`s are
   <hr>
 </div>
 
-<hr class="border border-danger border-2 opacity-50">
-<hr class="border border-primary border-3 opacity-75">-->
+<hr class="border border-danger border-medium opacity-medium">
+<hr class="border border-primary border-thick opacity-strong">-->
 
 <!-- ## Lists
 
diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html
index 97211e4b64..0db857fb50 100644
--- a/site/layouts/partials/docs-navbar.html
+++ b/site/layouts/partials/docs-navbar.html
@@ -22,7 +22,7 @@
         <span class="navbar-toggler-icon"></span>
       </button>
 
-      <div id="bd-navbar1" class="navbar-collapse collapse me-lg-auto bd-navbar mb-none border-0">
+      <div id="bd-navbar1" class="navbar-collapse collapse me-lg-auto bd-navbar mb-none border-none">
         <ul class="navbar-nav">
           <li class="nav-item">
             <a class="nav-link{{ if .IsHome }} active" aria-current="page{{ end }}" href="/" onclick="dataLayer.push({'event': 'clic', 'site_name':'accessibility-boosted', 'phase':'prod', 'track_category':'navbar', 'track_name':'home'});">Home</a>
@@ -35,7 +35,7 @@
           </li>
         </ul>
       </div>
-      <div id="bd-navbar2" class="navbar-collapse collapse bd-navbar border-0">
+      <div id="bd-navbar2" class="navbar-collapse collapse bd-navbar border-none">
         <ul class="navbar-nav flex-row me-lg-tall">
           <li class="nav-item">
             <a class="nav-link nav-icon" href="{{ .Site.Params.repo }}" target="_blank" rel="noopener">
diff --git a/site/layouts/shortcodes/example.html b/site/layouts/shortcodes/example.html
index 72406d1392..e4a0fe5b64 100644
--- a/site/layouts/shortcodes/example.html
+++ b/site/layouts/shortcodes/example.html
@@ -22,7 +22,7 @@
 <div class="bd-example-snippet bd-code-snippet">
   {{- if eq $show_preview true }}
   <!-- OUDS mod: added `order-first` to handle the focus order -->
-  <div{{ with $id }} id="{{ . }}"{{ end }} class="bd-example order-first m-none border-0{{ with $class }} {{ . }}{{ end }}">
+  <div{{ with $id }} id="{{ . }}"{{ end }} class="bd-example order-first m-none border-none{{ with $class }} {{ . }}{{ end }}">
     {{ $content }}
   </div>
   {{- end }}
@@ -37,7 +37,7 @@
 
     {{- if eq $show_preview true -}}
       <!-- OUDS mod: added `order-first` to handle the focus order -->
-      <div class="d-flex order-first align-items-center highlight-toolbar ps-tall pe-short py-shortest border-0 border-top border-bottom border-subtle border-1">
+      <div class="d-flex order-first align-items-center highlight-toolbar ps-tall pe-short py-shortest border-none border-top border-bottom border-subtle border-thin">
         <small class="font-monospace text-body-secondary text-uppercase">{{ $lang }}</small>
         <div class="d-flex ms-auto">
           <button type="button" class="btn-edit text-nowrap"{{ with $stackblitz_add_js }} data-sb-js-snippet="{{ $stackblitz_add_js }}"{{ end }} title="Try it on StackBlitz">
diff --git a/site/layouts/shortcodes/js-docs.html b/site/layouts/shortcodes/js-docs.html
index ba4397b075..35acff13ca 100644
--- a/site/layouts/shortcodes/js-docs.html
+++ b/site/layouts/shortcodes/js-docs.html
@@ -33,8 +33,8 @@
   {{- end -}}
 
   <div class="bd-example-snippet bd-code-snippet bd-file-ref">
-    <!-- OUDS mod: added `.border-1` and `.border-subtle` -->
-    <div class="d-flex align-items-center highlight-toolbar ps-tall pe-short py-shortest border-bottom border-1 border-subtle">
+    <!-- OUDS mod: added `.border-thin` and `.border-subtle` -->
+    <div class="d-flex align-items-center highlight-toolbar ps-tall pe-short py-shortest border-bottom border-thin border-subtle">
       <!-- OUDS mod: added `me-5` -->
       <a class="me-huge font-monospace link-body-emphasis link-underline-secondary link-underline-opacity-0 link-underline-opacity-100-hover small" href="{{ .Site.Params.repo }}/blob/v{{ .Site.Params.current_version }}/{{ $file | replaceRE `\\` "/" }}">
         {{- $file -}}
diff --git a/site/layouts/shortcodes/scss-docs.html b/site/layouts/shortcodes/scss-docs.html
index 1bc2d0c6c5..4ab2418a17 100644
--- a/site/layouts/shortcodes/scss-docs.html
+++ b/site/layouts/shortcodes/scss-docs.html
@@ -46,8 +46,8 @@
   {{- end -}}
 
   <div class="bd-example-snippet bd-code-snippet bd-file-ref">
-    <!-- OUDS mod: added `.border-1` and `.border-subtle` -->
-    <div class="d-flex align-items-center highlight-toolbar ps-tall pe-short py-shortest border-bottom border-1 border-subtle">
+    <!-- OUDS mod: added `.border-thin` and `.border-subtle` -->
+    <div class="d-flex align-items-center highlight-toolbar ps-tall pe-short py-shortest border-bottom border-thin border-subtle">
       <!-- OUDS mod: added `me-5` -->
       <a class="me-huge font-monospace link-body-emphasis link-underline-secondary link-underline-opacity-0 link-underline-opacity-100-hover small" href="{{ .Site.Params.repo }}/blob/v{{ .Site.Params.current_version }}/{{ $file | replaceRE `\\` "/" }}">
         {{- $file -}}