diff --git a/themes/buildpacks/layouts/partials/header.html b/themes/buildpacks/layouts/partials/header.html
index c79545cb2..f7cddbc09 100644
--- a/themes/buildpacks/layouts/partials/header.html
+++ b/themes/buildpacks/layouts/partials/header.html
@@ -12,7 +12,7 @@
         {{ $current := . }}
         {{ range $.Site.Menus.main }}
           {{ $topLevel := replace .URL "/" "" }}
-          <li class="nav-item ms-lg-4 text-center text-lg-left {{ if or (eq $current.Permalink .URL) (eq $current.Type $topLevel) }}active{{end}}">
+          <li class="nav-item ms-lg-4 text-center text-lg-start {{ if or (eq $current.Permalink .URL) (eq $current.Type $topLevel) }}active{{end}}">
             <a class="nav-link py-2 py-lg-0 px-1" {{ if (hasPrefix .URL "https") }}target='_blank' rel="noopener noreferrer"{{ end }}
               href="{{ .URL }}">
               {{- if (hasPrefix .URL "https") -}}
diff --git a/themes/buildpacks/layouts/partials/sidebar.html b/themes/buildpacks/layouts/partials/sidebar.html
index f70634858..bf85ae864 100644
--- a/themes/buildpacks/layouts/partials/sidebar.html
+++ b/themes/buildpacks/layouts/partials/sidebar.html
@@ -16,7 +16,7 @@
   <ul>
     <li data-nav-id="{{.RelPermalink}}" class="dd-item depth-0">
       <a href="{{ .RelPermalink }}">{{ .Title }}</a>
-      <ul class="ml-2">
+      <ul class="ms-2">
         {{- $pages := where .Pages ".Params.getting-started" true -}}
         {{- range $pages.ByWeight }}
         {{- if (not .Params.hidden) }}
@@ -58,7 +58,7 @@
 
   {{- if ne $numberOfPages 0 }}
   {{- $depth = add (int $depth) 1 }}
-  <ul class="ml-2">
+  <ul class="ms-2">
     {{- $expand = (or .Params.expand $isCurrent) -}}
     {{- $pages := (.Pages | union .Sections) }}
     {{- range $pages.ByWeight }}
diff --git a/themes/buildpacks/layouts/shortcodes/calendar.html b/themes/buildpacks/layouts/shortcodes/calendar.html
index 7a593c67c..2169ad7ec 100644
--- a/themes/buildpacks/layouts/shortcodes/calendar.html
+++ b/themes/buildpacks/layouts/shortcodes/calendar.html
@@ -88,7 +88,7 @@
 <div id='calendar-view' class="calendar"></div>
 <div class="row pt-3 small">
     <div class='col-md-4'>
-        <span class="font-italic text-muted">
+        <span class="fst-italic text-muted">
             * Events displayed in local time.
         </span>
     </div>
@@ -96,7 +96,7 @@
         <span>
             Download events as <code>.ics</code>:
         </span>
-        <ul class="ml-0 d-inline">
+        <ul class="ms-0 d-inline">
             {{- range $calData := $.Site.Data.calendar.subcalendars }}
             <li class="d-inline text-white rounded px-2 py-1" style="background-color: {{ $calData.color }};">
                 <a style="text-decoration: none; white-space: nowrap;"
diff --git a/themes/buildpacks/layouts/shortcodes/talks.html b/themes/buildpacks/layouts/shortcodes/talks.html
index fad330534..525867ce1 100644
--- a/themes/buildpacks/layouts/shortcodes/talks.html
+++ b/themes/buildpacks/layouts/shortcodes/talks.html
@@ -163,13 +163,13 @@
 
   <div class="row p-2">
     <div>
-      <div class="font-weight-bold mb-2">Description</div>
+      <div class="fw-bold mb-2">Description</div>
       <div id="talk-description" class="text-muted"></div>
     </div>
   </div>
   <div class="row p-2">
     <div>
-      <div class="font-weight-bold mb-2">Resources</div>
+      <div class="fw-bold mb-2">Resources</div>
       <div id="talk-resources"></div>
     </div>
   </div>
@@ -241,7 +241,7 @@
         if (talk.resources && talk.resources.length > 0) {
           talk.resources.forEach(resource => {
             $talkResources.append(
-            '<a class="d-inline-block button-light button rounded border p-1 mt-2 mr-2" href="' + resource.url + '" target="_blank">' +
+            '<a class="d-inline-block button-light button rounded border p-1 mt-2 me-2" href="' + resource.url + '" target="_blank">' +
               '<i class="fas fa-' + resource.icon + '"></i> ' + resource.name +
             '</a>'
             );