From 9d5d9d5172c867de085610cb0d7f251f8b0c5da7 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Tue, 18 Jul 2023 20:22:28 +0300
Subject: [PATCH] fix: replace deprecated bootstrap things (#5858)

* text-muted -> text-body-secondary

* navbar-dark is deprecated

* Remove FIXME block, not an issue anymore

* Remove `navbar-light`
---
 client/agenda/Agenda.vue                      |   4 +-
 client/agenda/AgendaQuickAccess.vue           |   4 +-
 client/agenda/AgendaShareModal.vue            |   2 +-
 client/components/ChatLog.vue                 |   2 +-
 client/components/Polls.vue                   |   2 +-
 ietf/ietfauth/widgets.py                      |   4 +-
 ietf/static/css/document_html.scss            |   6 -
 ietf/static/js/edit-meeting-schedule.js       |  10 +-
 ietf/static/js/ietf.js                        |   2 +-
 ietf/static/js/password_strength.js           |   4 +-
 ietf/templates/base.html                      |   4 +-
 ietf/templates/community/subscription.html    |   2 +-
 ietf/templates/debug.html                     |   2 +-
 ietf/templates/doc/ad_count.html              |   8 +-
 ietf/templates/doc/add_comment.html           |   2 +-
 .../doc/add_sessionpresentation.html          |   2 +-
 ietf/templates/doc/ballot/approvaltext.html   |   2 +-
 ietf/templates/doc/ballot/approve_ballot.html |   2 +-
 .../doc/ballot/approve_downrefs.html          |   2 +-
 ietf/templates/doc/ballot/ballot_issued.html  |   2 +-
 ietf/templates/doc/ballot/clear_ballot.html   |   2 +-
 ietf/templates/doc/ballot/defer_ballot.html   |   2 +-
 ietf/templates/doc/ballot/edit_position.html  |   2 +-
 .../doc/ballot/irsg_ballot_approve.html       |   2 +-
 .../doc/ballot/irsg_ballot_close.html         |   2 +-
 ietf/templates/doc/ballot/lastcalltext.html   |   2 +-
 ietf/templates/doc/ballot/rfceditornote.html  |   2 +-
 .../doc/ballot/rsab_ballot_approve.html       |   2 +-
 .../doc/ballot/rsab_ballot_close.html         |   2 +-
 .../doc/ballot/send_ballot_comment.html       |   2 +-
 ietf/templates/doc/ballot/undefer_ballot.html |   2 +-
 ietf/templates/doc/ballot/writeupnotes.html   |   2 +-
 ietf/templates/doc/bofreq/change_editors.html |   2 +-
 .../doc/bofreq/change_responsible.html        |   2 +-
 ietf/templates/doc/bofreq/upload_content.html |   2 +-
 ietf/templates/doc/change_ad.html             |   2 +-
 ietf/templates/doc/change_shepherd.html       |   2 +-
 ietf/templates/doc/change_shepherd_email.html |   2 +-
 ietf/templates/doc/change_state.html          |   2 +-
 ietf/templates/doc/change_title.html          |   2 +-
 .../doc/charter/action_announcement_text.html |   2 +-
 ietf/templates/doc/charter/ballot_issued.html |   2 +-
 .../doc/charter/ballot_writeupnotes.html      |   2 +-
 ietf/templates/doc/charter/change_ad.html     |   2 +-
 .../doc/charter/review_announcement_text.html |   2 +-
 ietf/templates/doc/conflict_review/start.html |   2 +-
 .../templates/doc/conflict_review/submit.html |   2 +-
 .../doc/document_ballot_content.html          |  10 +-
 ietf/templates/doc/document_bofreq.html       |   2 +-
 ietf/templates/doc/document_charter.html      |   4 +-
 ietf/templates/doc/document_chatlog.html      |   2 +-
 .../doc/document_conflict_review.html         |   2 +-
 ietf/templates/doc/document_draft.html        |  34 ++--
 .../doc/document_format_buttons.html          |   2 +-
 ietf/templates/doc/document_html.html         |   2 +-
 ietf/templates/doc/document_info.html         |  10 +-
 ietf/templates/doc/document_material.html     |   6 +-
 ietf/templates/doc/document_polls.html        |   2 +-
 ietf/templates/doc/document_review.html       |   2 +-
 .../templates/doc/document_status_change.html |   2 +-
 ietf/templates/doc/document_top.html          |   2 +-
 ietf/templates/doc/document_writeup.html      |   2 +-
 .../doc/draft/add_iana_experts_comment.html   |   2 +-
 ietf/templates/doc/draft/adopt_draft.html     |   2 +-
 ietf/templates/doc/draft/change_ad.html       |   2 +-
 .../templates/doc/draft/change_consensus.html |   2 +-
 .../doc/draft/change_iana_state.html          |   2 +-
 .../doc/draft/change_intended_status.html     |   2 +-
 ietf/templates/doc/draft/change_replaces.html |   2 +-
 .../doc/draft/change_shepherd_writeup.html    |   2 +-
 ietf/templates/doc/draft/change_state.html    |   2 +-
 ietf/templates/doc/draft/change_stream.html   |   2 +-
 .../doc/draft/change_stream_state.html        |   2 +-
 ietf/templates/doc/draft/edit_iesg_note.html  |   2 +-
 ietf/templates/doc/draft/edit_info.html       |   2 +-
 ietf/templates/doc/draft/make_last_call.html  |   2 +-
 ietf/templates/doc/draft/release_draft.html   |   2 +-
 .../doc/draft/request_publication.html        |   2 +-
 .../doc/draft/request_resurrect.html          |   2 +-
 ietf/templates/doc/draft/resurrect.html       |   2 +-
 ietf/templates/doc/drafts_for_ad.html         |   4 +-
 .../templates/doc/drafts_in_iesg_process.html |   2 +-
 ietf/templates/doc/drafts_in_last_call.html   |   2 +-
 ietf/templates/doc/edit_action_holders.html   |   2 +-
 ietf/templates/doc/edit_authors.html          |   2 +-
 ietf/templates/doc/edit_field.html            |   2 +-
 ietf/templates/doc/edit_notify.html           |   2 +-
 .../doc/edit_sessionpresentation.html         |   2 +-
 ietf/templates/doc/edit_telechat_date.html    |   2 +-
 .../doc/material/all_presentations.html       |   2 +-
 .../doc/material/choose_material_type.html    |   2 +-
 .../templates/doc/material/edit_material.html |   2 +-
 ietf/templates/doc/recent_drafts.html         |   2 +-
 ietf/templates/doc/remind_action_holders.html |   2 +-
 .../doc/remove_sessionpresentation.html       |   2 +-
 .../templates/doc/review/assign_reviewer.html |   2 +-
 ietf/templates/doc/review/close_request.html  |   2 +-
 .../templates/doc/review/complete_review.html |   4 +-
 .../doc/review/edit_request_comment.html      |   2 +-
 .../doc/review/edit_request_deadline.html     |   2 +-
 .../mark_reviewer_assignment_no_response.html |   2 +-
 .../review/reject_reviewer_assignment.html    |   2 +-
 ietf/templates/doc/review/request_info.html   |   2 +-
 ietf/templates/doc/review/request_review.html |   2 +-
 ietf/templates/doc/review/review_request.html |   2 +-
 .../templates/doc/review/review_wish_add.html |   2 +-
 .../doc/review/review_wishes_remove.html      |   2 +-
 .../doc/review/submit_unsolicited_review.html |   2 +-
 .../review/withdraw_reviewer_assignment.html  |   2 +-
 .../doc/review_assignment_summary.html        |   2 +-
 .../doc/search/search_result_row.html         |   6 +-
 ietf/templates/doc/search/status_columns.html |   4 +-
 ietf/templates/doc/shepherd_writeup.html      |   2 +-
 ietf/templates/doc/status_change/approve.html |   2 +-
 .../doc/status_change/edit_relations.html     |   2 +-
 .../doc/status_change/last_call.html          |   2 +-
 .../doc/status_change/make_last_call.html     |   2 +-
 ietf/templates/doc/status_change/submit.html  |   2 +-
 ietf/templates/doc/submit_to_iesg.html        |   2 +-
 ietf/templates/group/active_wgs.html          |   2 +-
 ietf/templates/group/add_comment.html         |   2 +-
 .../group/change_reviewer_settings.html       |   2 +-
 ietf/templates/group/customize_workflow.html  |   6 +-
 ietf/templates/group/edit.html                |   2 +-
 ietf/templates/group/email_aliases.html       |   2 +-
 .../group/email_open_review_assignments.html  |   2 +-
 ietf/templates/group/group_about.html         |   6 +-
 ietf/templates/group/group_about_status.html  |   2 +-
 .../group/group_about_status_edit.html        |   2 +-
 .../group/manage_review_requests.html         |   2 +-
 .../group/reset_charter_milestones.html       |   2 +-
 ietf/templates/group/reset_next_reviewer.html |   2 +-
 ietf/templates/iesg/agenda.html               |   4 +-
 ietf/templates/iesg/agenda_documents.html     |   2 +-
 ietf/templates/iesg/discusses.html            |   2 +-
 ietf/templates/iesg/ietf_activity_report.html |   2 +-
 ietf/templates/iesg/past_documents.html       |   4 +-
 .../iesg/telechat_agenda_content_edit.html    |   2 +-
 ietf/templates/ietfauth/apikeys.html          |   2 +-
 ietf/templates/ietfauth/edit_field.html       |   2 +-
 ietf/templates/ietfauth/review_overview.html  |   2 +-
 ietf/templates/ipr/add_comment.html           |   2 +-
 ietf/templates/ipr/add_email.html             |   2 +-
 ietf/templates/ipr/admin_list.html            |   2 +-
 ietf/templates/ipr/details_history.html       |   2 +-
 ietf/templates/ipr/details_view.html          |   4 +-
 ietf/templates/ipr/email.html                 |   2 +-
 ietf/templates/ipr/notify.html                |   2 +-
 ietf/templates/ipr/search_doc_list.html       |   2 +-
 ietf/templates/ipr/search_doc_result.html     |   2 +-
 ietf/templates/ipr/state.html                 |   2 +-
 ietf/templates/liaisons/add_comment.html      |   2 +-
 ietf/templates/liaisons/detail.html           |   2 +-
 ietf/templates/liaisons/detail_history.html   |   2 +-
 ietf/templates/liaisons/edit.html             |   2 +-
 ietf/templates/liaisons/guide_from_ietf.html  |   2 +-
 ietf/templates/liaisons/guide_to_ietf.html    |   2 +-
 .../templates/meeting/add_session_drafts.html |   2 +-
 ietf/templates/meeting/agenda.html            |   2 +-
 .../meeting/approve_proposed_slides.html      |   2 +-
 ietf/templates/meeting/cancel_session.html    |   2 +-
 ietf/templates/meeting/delete_schedule.html   |   2 +-
 ietf/templates/meeting/diff_schedules.html    |   2 +-
 .../meeting/edit_meeting_schedule.html        |   2 +-
 ...t_meeting_timeslots_and_misc_sessions.html |   2 +-
 ietf/templates/meeting/edit_session.html      |   2 +-
 ietf/templates/meeting/edit_timeslot.html     |   2 +-
 .../templates/meeting/edit_timeslot_type.html |   2 +-
 ietf/templates/meeting/finalize.html          |   2 +-
 ietf/templates/meeting/group_materials.html   |   2 +-
 ietf/templates/meeting/important-dates.html   |   2 +-
 .../meeting/make_schedule_official.html       |   2 +-
 ietf/templates/meeting/proceedings.html       |   6 +-
 .../proceedings/edit_material_base.html       |   2 +-
 .../proceedings/edit_meetinghosts.html        |   2 +-
 .../meeting/proceedings/material_details.html |   4 +-
 .../meeting/proceedings/materials_table.html  |   2 +-
 .../meeting/proceedings/upload_material.html  |   2 +-
 ietf/templates/meeting/properties_edit.html   |   2 +-
 .../meeting/propose_session_slides.html       |   2 +-
 ietf/templates/meeting/request_minutes.html   |   2 +-
 ietf/templates/meeting/requests.html          |   4 +-
 ietf/templates/meeting/schedule_list.html     |   2 +-
 ietf/templates/meeting/session_details.html   |   2 +-
 ietf/templates/meeting/timeslot_edit.html     |   2 +-
 .../meeting/upload_session_agenda.html        |   2 +-
 .../meeting/upload_session_bluesheets.html    |   2 +-
 .../meeting/upload_session_minutes.html       |   2 +-
 .../meeting/upload_session_slides.html        |   2 +-
 ietf/templates/message/message.html           |   2 +-
 ietf/templates/nomcom/edit_nominee.html       |   2 +-
 ietf/templates/nomcom/edit_template.html      |   2 +-
 .../templates/nomcom/extract_email_lists.html |   2 +-
 ietf/templates/nomcom/feedback.html           |   4 +-
 ietf/templates/nomcom/history.html            | 152 +++++++++---------
 .../templates/nomcom/nomcom_private_base.html |   2 +-
 ietf/templates/nomcom/public_nominate.html    |   2 +-
 ietf/templates/person/person_link.html        |   4 +-
 ietf/templates/person/profile.html            |  10 +-
 ietf/templates/registration/edit_profile.html |   2 +-
 ietf/templates/stats/review_stats.html        |   2 +-
 ietf/templates/submit/email.html              |   2 +-
 ietf/templates/submit/submission_status.html  |   2 +-
 ietf/templates/sync/discrepancies.html        |   2 +-
 204 files changed, 339 insertions(+), 345 deletions(-)

diff --git a/client/agenda/Agenda.vue b/client/agenda/Agenda.vue
index 0504710d42..1cd1042f4f 100644
--- a/client/agenda/Agenda.vue
+++ b/client/agenda/Agenda.vue
@@ -9,7 +9,7 @@
       span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
   h4
     span {{agendaStore.meeting.city}}, {{ meetingDate }}
-    h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-muted Updated:] {{ meetingUpdated }}
+    h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-body-secondary Updated:] {{ meetingUpdated }}
 
   .agenda-topnav.my-3
     meeting-navigation
@@ -49,7 +49,7 @@
           n-popover(v-if='!agendaStore.infoNoteShown')
             template(#trigger)
               n-button.ms-2(text, @click='toggleInfoNote')
-                i.bi.bi-info-circle.text-muted
+                i.bi.bi-info-circle.text-body-secondary
             span Show Info Note
         .col-12.col-sm-auto.d-flex.align-items-center
           i.bi.bi-globe.me-2
diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
index d080e5dd48..ae23edcabb 100644
--- a/client/agenda/AgendaQuickAccess.vue
+++ b/client/agenda/AgendaQuickAccess.vue
@@ -58,7 +58,7 @@
             )
             i.bi.bi-x-square.me-2
             span Discard
-        n-divider: small.text-muted Calendar
+        n-divider: small.text-body-secondary Calendar
         n-button.mt-2(
           id='agenda-quickaccess-calview-btn'
           block
@@ -86,7 +86,7 @@
             i.bi.bi-calendar-check.me-2
             span {{ shortMode ? '.ics' : 'Add to your calendar...' }}
         template(v-if='agendaStore.meetingDays.length > 0')
-          n-divider: small.text-muted Jump to...
+          n-divider: small.text-body-secondary Jump to...
           ul.nav.nav-pills.flex-column.small.agenda-quickaccess-jumpto
             li.nav-item(v-if='agendaStore.isMeetingLive')
               a.nav-link(
diff --git a/client/agenda/AgendaShareModal.vue b/client/agenda/AgendaShareModal.vue
index 8cdbb291af..a71938673b 100644
--- a/client/agenda/AgendaShareModal.vue
+++ b/client/agenda/AgendaShareModal.vue
@@ -20,7 +20,7 @@ n-modal(v-model:show='modalShown')
         i.bi.bi-share
         span Share this view
     .agenda-share-content
-      .text-muted.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
+      .text-body-secondary.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
       n-input-group
         n-input(
           ref='filteredUrlIpt'
diff --git a/client/components/ChatLog.vue b/client/components/ChatLog.vue
index d393b18664..f9dc382bfe 100644
--- a/client/components/ChatLog.vue
+++ b/client/components/ChatLog.vue
@@ -15,7 +15,7 @@
       )
       template(#default)
         div(v-html='item.text')
-  span.text-muted(v-else)
+  span.text-body-secondary(v-else)
     em No chat log available.
 </template>
   
diff --git a/client/components/Polls.vue b/client/components/Polls.vue
index 72c8e1c633..f5023995a3 100644
--- a/client/components/Polls.vue
+++ b/client/components/Polls.vue
@@ -6,7 +6,7 @@
     :columns='columns'
     striped
     )
-  span.text-muted(v-else)
+  span.text-body-secondary(v-else)
     em No polls available.
 </template>
   
diff --git a/ietf/ietfauth/widgets.py b/ietf/ietfauth/widgets.py
index 6b01a67bd6..c9a0523402 100644
--- a/ietf/ietfauth/widgets.py
+++ b/ietf/ietfauth/widgets.py
@@ -41,7 +41,7 @@ def render(self, name, value, attrs=None, renderer=None):
             <div class="progress" style="margin-bottom: 10px;">
                 <div class="progress-bar progress-bar-warning password_strength_bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="5" style="width: 0%%"></div>
             </div>
-            <p class="text-muted password_strength_info hidden">
+            <p class="text-body-secondary password_strength_info hidden">
                 <span class="label label-danger">
                     %s
                 </span>
@@ -89,7 +89,7 @@ def render(self, name, value, attrs=None, renderer=None):
             
         confirmation_markup = """
         <div style="margin-top: 10px;" class="hidden password_strength_info">
-            <p class="text-muted">
+            <p class="text-body-secondary">
                 <span class="label label-danger">
                     %s
                 </span>
diff --git a/ietf/static/css/document_html.scss b/ietf/static/css/document_html.scss
index 1347ec0127..bc1c71db4e 100644
--- a/ietf/static/css/document_html.scss
+++ b/ietf/static/css/document_html.scss
@@ -1,11 +1,5 @@
 @use "sass:map";
 
-// FIXME: It's not clear why these three variables remain unset by bs5, but just
-// set them to placeholder values so the CSS embedded in the HTML validates.
-$btn-font-family: inherit !default;
-$nav-link-font-weight: inherit !default;
-$tooltip-margin: inherit !default;
-
 $font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 $font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 
diff --git a/ietf/static/js/edit-meeting-schedule.js b/ietf/static/js/edit-meeting-schedule.js
index 21fc284ca1..3f0afe0841 100644
--- a/ietf/static/js/edit-meeting-schedule.js
+++ b/ietf/static/js/edit-meeting-schedule.js
@@ -487,13 +487,13 @@ $(function () {
 
         // Disable a particular swap modal radio input
         let updateSwapRadios = function (labels, radios, disableValue, datePrecision) {
-            labels.removeClass('text-muted');
+            labels.removeClass('text-body-secondary');
             radios.prop('disabled', false);
             radios.prop('checked', false);
             // disable the input requested by value
             let disableInput = radios.filter('[value="' + disableValue + '"]');
             if (disableInput) {
-                disableInput.parent().addClass('text-muted');
+                disableInput.parent().addClass('text-body-secondary');
                 disableInput.prop('disabled', true);
             }
             if (officialSchedule) {
@@ -502,7 +502,7 @@ $(function () {
                 const past_radios = radios.filter(
                     (_, radio) => parseISOTimestamp(radio.closest('*[data-start]').dataset.start).isSameOrBefore(now, datePrecision)
                 );
-                past_radios.parent().addClass('text-muted');
+                past_radios.parent().addClass('text-body-secondary');
                 past_radios.prop('disabled', true);
             }
             return disableInput; // return the input that was specifically disabled, if any
@@ -859,10 +859,10 @@ $(function () {
                 .not('.hidden')
                 .length === 0) {
                 purpose_input.setAttribute('disabled', 'disabled');
-                purpose_input.closest('.session-purpose-toggle').classList.add('text-muted');
+                purpose_input.closest('.session-purpose-toggle').classList.add('text-body-secondary');
             } else {
                 purpose_input.removeAttribute('disabled');
-                purpose_input.closest('.session-purpose-toggle').classList.remove('text-muted');
+                purpose_input.closest('.session-purpose-toggle').classList.remove('text-body-secondary');
             }
         });
     }
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index dfd050b756..75cf1e359c 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -184,7 +184,7 @@ $(function () {
                 .after($(`
                  <div class="col-xl-2 ps-0 small">
                      <div id="righthand-panel" class="position-fixed col-xl-2 bg-light d-flex flex-column justify-content-between align-items-start">
-                         <nav id="righthand-nav" class="navbar navbar-light w-100 overflow-auto align-items-start flex-fill"></nav>
+                         <nav id="righthand-nav" class="navbar w-100 overflow-auto align-items-start flex-fill"></nav>
                      </div>
                  </div>
                  `));
diff --git a/ietf/static/js/password_strength.js b/ietf/static/js/password_strength.js
index fddcca7bea..eaeed2e1c4 100644
--- a/ietf/static/js/password_strength.js
+++ b/ietf/static/js/password_strength.js
@@ -34,9 +34,9 @@
                 .removeClass("label-danger");
 
             widget
-                .find(".text-muted")
+                .find(".text-body-secondary")
                 .addClass("form-text")
-                .removeClass("text-muted");
+                .removeClass("text-body-secondary");
 
             self.initListeners();
         },
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index dd8a491583..0d7ddc868f 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -33,7 +33,7 @@
           data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
         {% analytical_body_top %}
         <a class="visually-hidden visually-hidden-focusable" href="#content">Skip to main content</a>
-        <nav class="navbar navbar-expand-lg {% if server_mode and server_mode != "production" %} navbar-light bg-warning {% else %} navbar-dark bg-secondary {% endif %}  {% if navbar_mode %} {{ navbar_mode }} {% else %} fixed-top {% endif %}">
+        <nav class="navbar navbar-expand-lg {% if server_mode and server_mode != "production" %} bg-warning {% else %} bg-secondary {% endif %}  {% if navbar_mode %} {{ navbar_mode }} {% else %} fixed-top {% endif %}">
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
                     <img alt="IETF Logo" class="me-2"
@@ -126,7 +126,7 @@
                 <a href="https://www.rfc-editor.org/" class="p-3 text-nowrap">RFC Editor</a>
                 <a href="https://www.iana.org/" class="p-3">IANA</a>
                 <a href="https://www.ietf.org/privacy-statement/" class="p-3 text-nowrap">Privacy Statement</a>
-                <div class="small text-muted py-3">
+                <div class="small text-body-secondary py-3">
                     {% if version_num %}
                         <a class="mx-2" href="/release/about">About IETF Datatracker</a>
                         <span class="mx-2">
diff --git a/ietf/templates/community/subscription.html b/ietf/templates/community/subscription.html
index e8b562a47d..4b92a610e1 100644
--- a/ietf/templates/community/subscription.html
+++ b/ietf/templates/community/subscription.html
@@ -32,7 +32,7 @@ <h2>Existing subscriptions</h2>
         </p>
     {% endif %}
     <h2>Add new subscription</h2>
-    <p class="text-muted">
+    <p class="text-body-secondary">
         The email addresses you can choose between are those registered in
         <a href="{% url "ietf.ietfauth.views.profile" %}">your profile</a>.
     </p>
diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html
index f7788e776c..c459359d3e 100644
--- a/ietf/templates/debug.html
+++ b/ietf/templates/debug.html
@@ -103,7 +103,7 @@ <h4 class="modal-title" id="modal-title-{{ forloop.counter }}">QuerySet Origin f
             </div>
         </div>
     {% else %}
-        <small class="text-center text-muted">
+        <small class="text-center text-body-secondary">
             Add <code>ietf.context_processors.sql_debug</code> to <code>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</code> to turn on the SQL statement table.
         </small>
     {% endif %}
diff --git a/ietf/templates/doc/ad_count.html b/ietf/templates/doc/ad_count.html
index 38c585925d..f69b0cc838 100644
--- a/ietf/templates/doc/ad_count.html
+++ b/ietf/templates/doc/ad_count.html
@@ -2,7 +2,7 @@
 {% load ietf_filters %}
 
 {% if prev or count %}
-    <span{% if count == 0 %} class="text-muted"{% endif %}>{{ count }}</span>
+    <span{% if count == 0 %} class="text-body-secondary"{% endif %}>{{ count }}</span>
     {% if user|has_role:"Area Director,Secretariat" %}
         <i data-bs-toggle="popover"
             {% if count != prev %}
@@ -21,11 +21,11 @@
             {% endif %}
         {% with label.2 as up_is_good %}
             {% if prev < count %}
-                   class="bi bi-arrow-up-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-success,text-danger,text-muted' }}"
+                   class="bi bi-arrow-up-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-success,text-danger,text-body-secondary' }}"
             {% elif prev > count %}
-                   class="bi bi-arrow-down-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-danger,text-success,text-muted' }}"
+                   class="bi bi-arrow-down-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-danger,text-success,text-body-secondary' }}"
             {% else %}
-                   class="bi bi-arrow-right-circle text-muted"
+                   class="bi bi-arrow-right-circle text-body-secondary"
             {% endif %}
             ></i>
         {% endwith %}
diff --git a/ietf/templates/doc/add_comment.html b/ietf/templates/doc/add_comment.html
index 0783b2486c..01e12418d8 100644
--- a/ietf/templates/doc/add_comment.html
+++ b/ietf/templates/doc/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/add_sessionpresentation.html b/ietf/templates/doc/add_sessionpresentation.html
index a5bcf7096a..0bd751a465 100644
--- a/ietf/templates/doc/add_sessionpresentation.html
+++ b/ietf/templates/doc/add_sessionpresentation.html
@@ -8,7 +8,7 @@
     <h1>
         Add document to session
         <br>
-        <small class="text-muted">{{ doc.name }}
+        <small class="text-body-secondary">{{ doc.name }}
             <br>
         {{ doc.title }}</small>
     </h1>
diff --git a/ietf/templates/doc/ballot/approvaltext.html b/ietf/templates/doc/ballot/approvaltext.html
index 1b228ba375..cc47c17156 100644
--- a/ietf/templates/doc/ballot/approvaltext.html
+++ b/ietf/templates/doc/ballot/approvaltext.html
@@ -9,7 +9,7 @@
     <h1>
         Approval announcement writeup
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html
index a146acf4e9..ff8ab08946 100644
--- a/ietf/templates/doc/ballot/approve_ballot.html
+++ b/ietf/templates/doc/ballot/approve_ballot.html
@@ -8,7 +8,7 @@
     <h1>
         Approve ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/approve_downrefs.html b/ietf/templates/doc/ballot/approve_downrefs.html
index 67caf992c7..6dea10a335 100644
--- a/ietf/templates/doc/ballot/approve_downrefs.html
+++ b/ietf/templates/doc/ballot/approve_downrefs.html
@@ -8,7 +8,7 @@
     <h1>
         Approve downward references
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         The ballot for
diff --git a/ietf/templates/doc/ballot/ballot_issued.html b/ietf/templates/doc/ballot/ballot_issued.html
index 5549cd1189..baf428ee6b 100644
--- a/ietf/templates/doc/ballot/ballot_issued.html
+++ b/ietf/templates/doc/ballot/ballot_issued.html
@@ -7,7 +7,7 @@
     <h1>
         Ballot issued
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         Ballot for
diff --git a/ietf/templates/doc/ballot/clear_ballot.html b/ietf/templates/doc/ballot/clear_ballot.html
index d1f731ba70..1d5bc46005 100644
--- a/ietf/templates/doc/ballot/clear_ballot.html
+++ b/ietf/templates/doc/ballot/clear_ballot.html
@@ -8,7 +8,7 @@
     <h1>
         Clear ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/defer_ballot.html b/ietf/templates/doc/ballot/defer_ballot.html
index 85f887c9ab..43fdc82a5f 100644
--- a/ietf/templates/doc/ballot/defer_ballot.html
+++ b/ietf/templates/doc/ballot/defer_ballot.html
@@ -8,7 +8,7 @@
     <h1>
         Defer ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index e3cada526b..bf119236f5 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -8,7 +8,7 @@
     <h1>
         Change position for {{ balloter.plain_name }}
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     {% if ballot.ballot_type.question %}
         <div class="alert alert-warning my-3">
diff --git a/ietf/templates/doc/ballot/irsg_ballot_approve.html b/ietf/templates/doc/ballot/irsg_ballot_approve.html
index 8b28f04c3a..9eb0cc80be 100644
--- a/ietf/templates/doc/ballot/irsg_ballot_approve.html
+++ b/ietf/templates/doc/ballot/irsg_ballot_approve.html
@@ -12,7 +12,7 @@
     <h1>
         Issue ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="mt-3">
         {{ question }}
diff --git a/ietf/templates/doc/ballot/irsg_ballot_close.html b/ietf/templates/doc/ballot/irsg_ballot_close.html
index ab49ec79d7..22405df1c1 100644
--- a/ietf/templates/doc/ballot/irsg_ballot_close.html
+++ b/ietf/templates/doc/ballot/irsg_ballot_close.html
@@ -8,7 +8,7 @@
     <h1>
         Close ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         {{ question }}
diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html
index 5b49f6b372..c1d7bd70d8 100644
--- a/ietf/templates/doc/ballot/lastcalltext.html
+++ b/ietf/templates/doc/ballot/lastcalltext.html
@@ -9,7 +9,7 @@
     <h1 class="mb-3">
         Last call text
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/rfceditornote.html b/ietf/templates/doc/ballot/rfceditornote.html
index ff6ca7078c..b4cc9dadca 100644
--- a/ietf/templates/doc/ballot/rfceditornote.html
+++ b/ietf/templates/doc/ballot/rfceditornote.html
@@ -8,7 +8,7 @@
     <h1 class="mb-3">
         RFC Editor Note
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     {% bootstrap_messages %}
     <form method="post">
diff --git a/ietf/templates/doc/ballot/rsab_ballot_approve.html b/ietf/templates/doc/ballot/rsab_ballot_approve.html
index 43f43eafee..d607348722 100644
--- a/ietf/templates/doc/ballot/rsab_ballot_approve.html
+++ b/ietf/templates/doc/ballot/rsab_ballot_approve.html
@@ -9,7 +9,7 @@
     <h1>
         Issue ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="mt-3">
         {{ question }}
diff --git a/ietf/templates/doc/ballot/rsab_ballot_close.html b/ietf/templates/doc/ballot/rsab_ballot_close.html
index 2261c070b5..f6da3e052d 100644
--- a/ietf/templates/doc/ballot/rsab_ballot_close.html
+++ b/ietf/templates/doc/ballot/rsab_ballot_close.html
@@ -8,7 +8,7 @@
     <h1>
         Close ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         {{ question }}
diff --git a/ietf/templates/doc/ballot/send_ballot_comment.html b/ietf/templates/doc/ballot/send_ballot_comment.html
index 8f87bf51ad..ffd2d41191 100644
--- a/ietf/templates/doc/ballot/send_ballot_comment.html
+++ b/ietf/templates/doc/ballot/send_ballot_comment.html
@@ -9,7 +9,7 @@
     <h1>
         Send ballot position for {{ balloter }}
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/undefer_ballot.html b/ietf/templates/doc/ballot/undefer_ballot.html
index df2217fa2f..da74326a2f 100644
--- a/ietf/templates/doc/ballot/undefer_ballot.html
+++ b/ietf/templates/doc/ballot/undefer_ballot.html
@@ -8,7 +8,7 @@
     <h1>
         Undefer ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="undefer mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/ballot/writeupnotes.html b/ietf/templates/doc/ballot/writeupnotes.html
index 481e00e134..dbbd04dc20 100644
--- a/ietf/templates/doc/ballot/writeupnotes.html
+++ b/ietf/templates/doc/ballot/writeupnotes.html
@@ -8,7 +8,7 @@
     <h1>
         Ballot writeup and notes
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/bofreq/change_editors.html b/ietf/templates/doc/bofreq/change_editors.html
index 546ad7179b..98c4ddb3a0 100644
--- a/ietf/templates/doc/bofreq/change_editors.html
+++ b/ietf/templates/doc/bofreq/change_editors.html
@@ -9,7 +9,7 @@
     <h1>
         Change editors
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/bofreq/change_responsible.html b/ietf/templates/doc/bofreq/change_responsible.html
index 79ca29f22b..aabb0048e4 100644
--- a/ietf/templates/doc/bofreq/change_responsible.html
+++ b/ietf/templates/doc/bofreq/change_responsible.html
@@ -9,7 +9,7 @@
     <h1>
         Change Responsible Leadership
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/bofreq/upload_content.html b/ietf/templates/doc/bofreq/upload_content.html
index 902b2900a9..74827dd485 100644
--- a/ietf/templates/doc/bofreq/upload_content.html
+++ b/ietf/templates/doc/bofreq/upload_content.html
@@ -7,7 +7,7 @@
     <h1>
         Upload New Revision
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <form class="upload-content form-horizontal mt-3"
           method="post"
diff --git a/ietf/templates/doc/change_ad.html b/ietf/templates/doc/change_ad.html
index 701929f5d3..24e8089510 100644
--- a/ietf/templates/doc/change_ad.html
+++ b/ietf/templates/doc/change_ad.html
@@ -8,7 +8,7 @@
     <h1>
         Change responsible AD
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index a102ce24ee..755bd5d316 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -10,7 +10,7 @@
     <h1>
         Change document shepherd
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <p>
         The shepherd needs to have a Datatracker account. A new account can be
diff --git a/ietf/templates/doc/change_shepherd_email.html b/ietf/templates/doc/change_shepherd_email.html
index 36a8b44d15..b608c2d09a 100644
--- a/ietf/templates/doc/change_shepherd_email.html
+++ b/ietf/templates/doc/change_shepherd_email.html
@@ -8,7 +8,7 @@
     <h1>
         Change document shepherd email
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html
index d405e059b3..9d083e2f3c 100644
--- a/ietf/templates/doc/change_state.html
+++ b/ietf/templates/doc/change_state.html
@@ -8,7 +8,7 @@
     <h1>
         Change state
         <br>
-        <small class="text-muted">{{ doc.title }}</small>
+        <small class="text-body-secondary">{{ doc.title }}</small>
     </h1>
     <p>
         <a class="my-2 btn btn-info" href="{{ help_url }}">Help on states</a>
diff --git a/ietf/templates/doc/change_title.html b/ietf/templates/doc/change_title.html
index 4f419e1dd0..25026be351 100644
--- a/ietf/templates/doc/change_title.html
+++ b/ietf/templates/doc/change_title.html
@@ -8,7 +8,7 @@
     <h1>
         Change title
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/charter/action_announcement_text.html b/ietf/templates/doc/charter/action_announcement_text.html
index 5722b342a1..88a1b61412 100644
--- a/ietf/templates/doc/charter/action_announcement_text.html
+++ b/ietf/templates/doc/charter/action_announcement_text.html
@@ -11,7 +11,7 @@
     <h1>
         {{ charter.chartered_group.type.name }} action announcement writeup
         <br>
-        <small class="text-muted">{{ charter.chartered_group.acronym }}</small>
+        <small class="text-body-secondary">{{ charter.chartered_group.acronym }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/charter/ballot_issued.html b/ietf/templates/doc/charter/ballot_issued.html
index 5923c11599..99659aa923 100644
--- a/ietf/templates/doc/charter/ballot_issued.html
+++ b/ietf/templates/doc/charter/ballot_issued.html
@@ -7,7 +7,7 @@
     <h1>
         Ballot issued
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p>
         Ballot has been sent out.
diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html
index fa4c12b617..ba15f89741 100644
--- a/ietf/templates/doc/charter/ballot_writeupnotes.html
+++ b/ietf/templates/doc/charter/ballot_writeupnotes.html
@@ -8,7 +8,7 @@
     <h1>
         Ballot writeup and notes
         <br>
-        <small class="text-muted">{{ charter.chartered_group }}</small>
+        <small class="text-body-secondary">{{ charter.chartered_group }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/charter/change_ad.html b/ietf/templates/doc/charter/change_ad.html
index 1b33f9f6b6..1c5907d583 100644
--- a/ietf/templates/doc/charter/change_ad.html
+++ b/ietf/templates/doc/charter/change_ad.html
@@ -8,7 +8,7 @@
     <h1>
         Change responsible AD
         <br>
-        <small class="text-muted">{{ charter.canonical_name }}-{{ charter.rev }}</small>
+        <small class="text-body-secondary">{{ charter.canonical_name }}-{{ charter.rev }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/charter/review_announcement_text.html b/ietf/templates/doc/charter/review_announcement_text.html
index 1e2542edb4..c50f5956bf 100644
--- a/ietf/templates/doc/charter/review_announcement_text.html
+++ b/ietf/templates/doc/charter/review_announcement_text.html
@@ -9,7 +9,7 @@
     <h1>
         WG Review announcement writeup
         <br>
-        <small class="text-muted">{{ charter.chartered_group.acronym }}</small>
+        <small class="text-body-secondary">{{ charter.chartered_group.acronym }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html
index f1b33bc6b2..9b96ec6179 100644
--- a/ietf/templates/doc/conflict_review/start.html
+++ b/ietf/templates/doc/conflict_review/start.html
@@ -9,7 +9,7 @@
     <h1>
         Begin IETF conflict review
         <br>
-        <small class="text-muted">{{ doc_to_review.canonical_name }}-{{ doc_to_review.rev }}</small>
+        <small class="text-body-secondary">{{ doc_to_review.canonical_name }}-{{ doc_to_review.rev }}</small>
     </h1>
     {% if user|has_role:"Secretariat" %}
         <p class="my-3">
diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html
index a95a3c5776..586de93560 100644
--- a/ietf/templates/doc/conflict_review/submit.html
+++ b/ietf/templates/doc/conflict_review/submit.html
@@ -8,7 +8,7 @@
     <h1>
         Edit conflict review
         <br>
-        <small class="text-muted">{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}</small>
+        <small class="text-body-secondary">{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         The text will be submitted as <strong>{{ review.canonical_name }}-{{ next_rev }}</strong>
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index b2255c715a..6a12fe9a03 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -11,10 +11,10 @@
             </p>
             {% for p in positions %}
                 <div class="balloter-name mb-2">
-                    {% if p.is_old_pos %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
+                    {% if p.is_old_pos %}<span class="text-body-secondary">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
                 </div>
             {% empty %}
-                <span class="text-muted">(None)</span>
+                <span class="text-body-secondary">(None)</span>
             {% endfor %}
             <br>
         {% endfor %}
@@ -91,7 +91,7 @@
                             {{ p.balloter.plain_name }}
                         </div>
                         <div class="flex-fill text-end">
-                            {% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
+                            {% if p.old_positions %}<span class="text-body-secondary small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
                             <span class="badge rounded-pill {{ p.pos|pos_to_label_format }}">{{ p.pos }}</span>
                             {% if user|has_role:"Secretariat" %}
                                 <a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}"
@@ -179,11 +179,11 @@
                 {% if p.is_old_pos %}
                     <div class="h5 d-flex mt-4"
                          id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
-                        <div class="flex-fill text-muted">
+                        <div class="flex-fill text-body-secondary">
                             {{ p.balloter.plain_name }} <span class="badge rounded-pill bg-secondary">Former IESG member</span>
                         </div>
                         <div class="flex-fill text-end">
-                            {% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
+                            {% if p.old_positions %}<span class="text-body-secondary small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
                             <span class="badge rounded-pill {{ p.pos|pos_to_label_format }}">{{ p.pos }}</span>
                             {% if user|has_role:"Secretariat" %}
                                 <a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}"
diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html
index a3621bcc6b..9fb4030b9f 100644
--- a/ietf/templates/doc/document_bofreq.html
+++ b/ietf/templates/doc/document_bofreq.html
@@ -135,7 +135,7 @@
                     {% endif %}
                 </td>
                 <td>
-                    {{ doc.notify|default:'<span class="text-muted">(None)</span>' }}
+                    {{ doc.notify|default:'<span class="text-body-secondary">(None)</span>' }}
                 </td>
             </tr>
         </tbody>
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 4e2ab44846..df5d702e43 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -152,7 +152,7 @@
                     </td>
                     <td>
                         {% if not telechat %}
-                            <span class="text-muted">(None)</span>
+                            <span class="text-body-secondary">(None)</span>
                         {% else %}
                             On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                         {% endif %}
@@ -175,7 +175,7 @@
                     {% endif %}
                 </td>
                 <td>
-                    {{ doc.notify|default:'<span class="text-muted">(None)</span>' }}
+                    {{ doc.notify|default:'<span class="text-body-secondary">(None)</span>' }}
                 </td>
             </tr>
         </tbody>
diff --git a/ietf/templates/doc/document_chatlog.html b/ietf/templates/doc/document_chatlog.html
index e57c12c78f..4e47382509 100644
--- a/ietf/templates/doc/document_chatlog.html
+++ b/ietf/templates/doc/document_chatlog.html
@@ -32,7 +32,7 @@
             <tr>
                 <th scope="row">Title</th>
                 <td class="edit"></td>
-                <th scope="row">{{ doc.title|default:'<span class="text-muted">(None)</span>' }}</th>
+                <th scope="row">{{ doc.title|default:'<span class="text-body-secondary">(None)</span>' }}</th>
             </tr>
             <tr>
                 <th scope="row">Session</th>
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index c639cac865..ccdaa9a134 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -90,7 +90,7 @@
                     </td>
                     <td>
                         {% if not telechat %}
-                            <span class="text-muted">(None)</span>
+                            <span class="text-body-secondary">(None)</span>
                         {% else %}
                             On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                             {% if doc.returning_item %}(returning item){% endif %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 90796aa540..62c4120f22 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -73,7 +73,7 @@
                                 {{ stream_state }}
                             </span>
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -85,7 +85,7 @@
                             </div>
                         {% endif %}
                         {% if due_date %}
-                            <span class="text-muted">(Due date {{ due_date }})</span>
+                            <span class="text-body-secondary">(Due date {{ due_date }})</span>
                         {% endif %}
                     </td>
                 {% else %}
@@ -95,7 +95,7 @@
                     <td class="edit">
                     </td>
                     <td>
-                        <span class="text-muted">(No stream defined)</span>
+                        <span class="text-body-secondary">(No stream defined)</span>
                     </td>
                 {% endif %}
             </tr>
@@ -166,7 +166,7 @@
                                 {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -196,7 +196,7 @@
                         {% if doc.shepherd %}
                             {% person_link doc.shepherd.person %}
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                     (None)
                                 </span>
                         {% endif %}
@@ -226,7 +226,7 @@
                                 </a>
                                 <span class="badge rounded-pill bg-secondary">Last changed {{ shepherd_writeup.time|date:"Y-m-d" }}</span>
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -251,7 +251,7 @@
                         {% if doc.has_rfc_editor_note %}
                             (last changed {{ doc.has_rfc_editor_note|date:"Y-m-d" }})
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -327,7 +327,7 @@
                                         </a>
                                     {% endif %}
                                 {% else %}
-                                    <span class="text-muted">
+                                    <span class="text-body-secondary">
                                         (None)
                                     </span>
                                 {% endif %}
@@ -375,7 +375,7 @@
                                 On agenda of {{ telechat.telechat_date }} IESG telechat
                                 {% if telechat.returning_item %}(returning item){% endif %}
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -402,7 +402,7 @@
                             {% if doc.ad %}
                                 {% person_link doc.ad %}
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -427,7 +427,7 @@
                                     {% if doc.note %}
                                         {{ doc.note|linebreaksbr }}
                                     {% else %}
-                                        <span class="text-muted">
+                                        <span class="text-body-secondary">
                                             (None)
                                         </span>
                                     {% endif %}
@@ -452,7 +452,7 @@
                             {% if doc.notify %}
                                 {{ doc.notify|linkify }}
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -482,7 +482,7 @@
                             </td>
                             <td class="{% if iana_review_state|slugify|slice:7 != "iana-ok" %}text-danger{% else %}text-success{% endif %}">
                                 {% if not iana_review_state %}
-                                    <span class="text-muted">
+                                    <span class="text-body-secondary">
                                         (None)
                                     </span>
                                 {% else %}
@@ -511,7 +511,7 @@
                             </td>
                             <td>
                                 {% if not iana_action_state %}
-                                    <span class="text-muted">
+                                    <span class="text-body-secondary">
                                         (None)
                                     </span>
                                 {% else %}
@@ -540,7 +540,7 @@
                             </td>
                             <td class="{% if iana_experts_state|slugify|slice:"-2:" != "ok" %}text-danger{% else %}text-success{% endif %}">
                                 {% if not iana_experts_state %}
-                                    <span class="text-muted">
+                                    <span class="text-body-secondary">
                                         (None)
                                     </span>
                                 {% else %}
@@ -569,7 +569,7 @@
                             </td>
                             <td>
                                 {% if not iana_experts_comment %}
-                                    <span class="text-muted">
+                                    <span class="text-body-secondary">
                                         (None)
                                     </span>
                                 {% else %}
@@ -808,7 +808,7 @@
                             {% if not forloop.last %}<br>{% endif %}
                         {% endfor %}
                     </p>
-                    <p class="text-muted card-text">
+                    <p class="text-body-secondary card-text">
                         (Note: The e-mail addresses provided for the authors of this Internet-Draft may no longer be valid.)
                     </p>
                 </div>
diff --git a/ietf/templates/doc/document_format_buttons.html b/ietf/templates/doc/document_format_buttons.html
index 342cc4009d..2c79c92646 100644
--- a/ietf/templates/doc/document_format_buttons.html
+++ b/ietf/templates/doc/document_format_buttons.html
@@ -31,5 +31,5 @@
     {% endfor %}
 </div>
 {% else %}
-    <span class="text-muted">(not online)</span>
+    <span class="text-body-secondary">(not online)</span>
 {% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index e5cc457195..3b7e635689 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -61,7 +61,7 @@
                 title="Show metadata sidebar">
         <i class="bi bi-layout-sidebar-reverse"></i>
         </button>
-        <nav class="navbar navbar-light bg-light px-1 fixed-top d-print-none d-md-none">
+        <nav class="navbar bg-light px-1 fixed-top d-print-none d-md-none">
             <a class="nav-link ps-1"
                href="{% url 'ietf.doc.views_doc.document_main' name=doc.canonical_name %}">
                 {% if not snapshot and doc.get_state_slug == "rfc" %}
diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html
index c2bcdc42b2..e61d85a2bd 100644
--- a/ietf/templates/doc/document_info.html
+++ b/ietf/templates/doc/document_info.html
@@ -22,7 +22,7 @@
                 {% if published %}
                     {% if document_html %}<br>{% else %}({% endif %}{{ doc.pub_date|date:"F Y" }}{% if not document_html %}){% endif %}
                 {% else %}
-                    <span class="text-muted">(Publication date unknown)</span>
+                    <span class="text-body-secondary">(Publication date unknown)</span>
                 {% endif %}
                 {% if document_html %}<br>{% endif %}
                 {% if has_verified_errata or has_errata %}
@@ -127,7 +127,7 @@
         <td>
             {{ doc.time|date:"Y-m-d" }}
             {% if latest_revision and latest_revision.time|date:"Y-m-d" != doc.time|date:"Y-m-d" %}
-                <span class="text-muted">(Latest revision {{ latest_revision.time|date:"Y-m-d" }})</span>
+                <span class="text-body-secondary">(Latest revision {{ latest_revision.time|date:"Y-m-d" }})</span>
             {% endif %}
         </td>
     </tr>
@@ -150,7 +150,7 @@
                         {{ replaces|urlize_related_target_list:document_html|join:", " }}
                     {% endif %}
                 {% else %}
-                    <span class="text-muted">(None)</span>
+                    <span class="text-body-secondary">(None)</span>
                 {% endif %}
             </td>
         </tr>
@@ -231,7 +231,7 @@
                 </a>
             {% endif %}
         </td>
-        <td {% if stream_desc == "(None)" %}class="text-muted"{%endif%}>
+        <td {% if stream_desc == "(None)" %}class="text-body-secondary"{%endif%}>
             {% if stream_desc != "(None)" %}
                 {% if doc.stream.name|lower in 'iab,irtf,ise,editorial' %}
                     <a href="{% url 'ietf.group.views.stream_documents' acronym=doc.stream.name|lower %}">
@@ -281,7 +281,7 @@
                 {% if doc.intended_std_level %}
                     {{ doc.intended_std_level }}
                 {% else %}
-                    <span class="text-muted">
+                    <span class="text-body-secondary">
                         (None)
                     </span>
                 {% endif %}
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index bf25f7b4ac..a52dcd07b2 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -36,7 +36,7 @@
                         {% doc_edit_button 'ietf.doc.views_material.edit_material' name=doc.name action="title" %}
                     {% endif %}
                 </td>
-                <th scope="row">{{ doc.title|default:'<span class="text-muted">(None)</span>' }}</th>
+                <th scope="row">{{ doc.title|default:'<span class="text-body-secondary">(None)</span>' }}</th>
             </tr>
             {% if doc.abstract or doc.type_id == 'slides' and can_manage_material and not snapshot %}
                 <tr>
@@ -60,7 +60,7 @@
                     {% if doc.get_state.name %}
                         {{ doc.get_state.name }}
                     {% else %}
-                        <span class="text-muted">(None)</span>
+                        <span class="text-body-secondary">(None)</span>
                     {% endif %}
                 </td>
             </tr>
@@ -100,7 +100,7 @@
                                     {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                     </tr>
diff --git a/ietf/templates/doc/document_polls.html b/ietf/templates/doc/document_polls.html
index 69aefaac12..3254f64eb0 100644
--- a/ietf/templates/doc/document_polls.html
+++ b/ietf/templates/doc/document_polls.html
@@ -32,7 +32,7 @@
             <tr>
                 <th scope="row">Title</th>
                 <td class="edit"></td>
-                <th scope="row">{{ doc.title|default:'<span class="text-muted">(None)</span>' }}</th>
+                <th scope="row">{{ doc.title|default:'<span class="text-body-secondary">(None)</span>' }}</th>
             </tr>
             <tr>
                 <th scope="row">Session</th>
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index 113c407fe5..feb30ae93a 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -29,7 +29,7 @@
                             {% if doc.get_state.name %}
                                 {{ doc.get_state.name }}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                     </tr>
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 6b16f61459..87e0384b7f 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -89,7 +89,7 @@
                 </td>
                 <td>
                     {% if not telechat %}
-                        <span class="text-muted">(None)</span>
+                        <span class="text-body-secondary">(None)</span>
                     {% else %}
                         On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                         {% if doc.returning_item %}(returning item){% endif %}
diff --git a/ietf/templates/doc/document_top.html b/ietf/templates/doc/document_top.html
index 1fa2c22c2a..29af73d9d8 100644
--- a/ietf/templates/doc/document_top.html
+++ b/ietf/templates/doc/document_top.html
@@ -5,7 +5,7 @@
 <h1>
     {{ doc.title|default:"(Untitled)" }}
     <br>
-    <small class="text-muted">{{ name }}</small>
+    <small class="text-body-secondary">{{ name }}</small>
 </h1>
 <ul class="nav nav-tabs my-3">
     {% for name, t, url, active, tooltip in tabs %}
diff --git a/ietf/templates/doc/document_writeup.html b/ietf/templates/doc/document_writeup.html
index 30f9c3c905..583c17ed6d 100644
--- a/ietf/templates/doc/document_writeup.html
+++ b/ietf/templates/doc/document_writeup.html
@@ -12,7 +12,7 @@ <h2 class="my-3">
             {{ title|capfirst_allcaps }}
             {% if subtitle %}
                 <br>
-                <small class="text-muted">{{ subtitle|safe }}</small>
+                <small class="text-body-secondary">{{ subtitle|safe }}</small>
             {% endif %}
         </h2>
         {% for name, text, url in writeups %}
diff --git a/ietf/templates/doc/draft/add_iana_experts_comment.html b/ietf/templates/doc/draft/add_iana_experts_comment.html
index 4816f2f645..193e1ba7ee 100644
--- a/ietf/templates/doc/draft/add_iana_experts_comment.html
+++ b/ietf/templates/doc/draft/add_iana_experts_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add IANA Experts Review State comment
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/adopt_draft.html b/ietf/templates/doc/draft/adopt_draft.html
index b90c2c947a..0d41d0a8a5 100644
--- a/ietf/templates/doc/draft/adopt_draft.html
+++ b/ietf/templates/doc/draft/adopt_draft.html
@@ -8,7 +8,7 @@
     <h1>
         Manage Document Adoption
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         You can begin managing the group state of this Internet-Draft.
diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html
index efa1b27bfe..0eb0babacc 100644
--- a/ietf/templates/doc/draft/change_ad.html
+++ b/ietf/templates/doc/draft/change_ad.html
@@ -9,7 +9,7 @@
     <h1>
         Change responsible AD
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     {% with approved=doc|state:"draft-rfceditor" %}
     {% if approved %}
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index 870c115ae9..cf6348471b 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -8,7 +8,7 @@
     <h1>
         Change consensus
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html
index f83f271258..1b05624bd6 100644
--- a/ietf/templates/doc/draft/change_iana_state.html
+++ b/ietf/templates/doc/draft/change_iana_state.html
@@ -8,7 +8,7 @@
     <h1>
         Change IANA state
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html
index a2ea50174d..28f0121551 100644
--- a/ietf/templates/doc/draft/change_intended_status.html
+++ b/ietf/templates/doc/draft/change_intended_status.html
@@ -8,7 +8,7 @@
     <h1>
         Change intended status
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index f839b12874..a219449a29 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -10,7 +10,7 @@
     <h1>
         Change documents replaced by
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <h2>Instructions</h2>
     <form method="post">
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index 6a1362b959..4dec5e298c 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -8,7 +8,7 @@
     <h1>
         Edit shepherd writeup
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.canonical_name }}-{{ doc.rev }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index b3aa968c21..18d6dd083b 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -8,7 +8,7 @@
     <h1>
         Change state
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <a class="btn btn-info my-3"
        href="{% url 'ietf.doc.views_help.state_help' type="draft-iesg" %}">Help on states</a>
diff --git a/ietf/templates/doc/draft/change_stream.html b/ietf/templates/doc/draft/change_stream.html
index b8addc26c1..4141042336 100644
--- a/ietf/templates/doc/draft/change_stream.html
+++ b/ietf/templates/doc/draft/change_stream.html
@@ -8,7 +8,7 @@
     <h1>
         Change stream
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index b8dca253f1..0b13e02fdf 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -8,7 +8,7 @@
     <h1>
         Change {{ state_type.label }}
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     {% if next_states %}
         <a class="my-3 btn btn-info"
diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html
index 3be3987a60..ba7fbb1e70 100644
--- a/ietf/templates/doc/draft/edit_iesg_note.html
+++ b/ietf/templates/doc/draft/edit_iesg_note.html
@@ -8,7 +8,7 @@
     <h1>
         Edit IESG note
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 3071dd4bc3..67b7423cfb 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -9,7 +9,7 @@
     <h1>
         Edit info
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html
index 9a4d5aabad..fd90a3d70a 100644
--- a/ietf/templates/doc/draft/make_last_call.html
+++ b/ietf/templates/doc/draft/make_last_call.html
@@ -8,7 +8,7 @@
     <h1>
         Make last call
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         <b>Last call for:</b>
diff --git a/ietf/templates/doc/draft/release_draft.html b/ietf/templates/doc/draft/release_draft.html
index 0b8e8ab71a..0de4014a60 100644
--- a/ietf/templates/doc/draft/release_draft.html
+++ b/ietf/templates/doc/draft/release_draft.html
@@ -6,7 +6,7 @@
     <h1>
         Release Internet-Draft
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <div class="my-3 alert alert-warning">
         <b>Warning:</b>
diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html
index 000b419858..26cb09db13 100644
--- a/ietf/templates/doc/draft/request_publication.html
+++ b/ietf/templates/doc/draft/request_publication.html
@@ -8,7 +8,7 @@
     <h1>
         Request publication
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         Send a publication request to the RFC Editor for {{ doc }} and move it to the <i>{{ next_state.name }}</i> stream state.
diff --git a/ietf/templates/doc/draft/request_resurrect.html b/ietf/templates/doc/draft/request_resurrect.html
index 7b12ae4967..f9559f759e 100644
--- a/ietf/templates/doc/draft/request_resurrect.html
+++ b/ietf/templates/doc/draft/request_resurrect.html
@@ -8,7 +8,7 @@
     <h1>
         Request resurrection
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         Request resurrection of the Internet-Draft <b>{{ doc }}</b>?
diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html
index 8c1a8d17d3..196b787ceb 100644
--- a/ietf/templates/doc/draft/resurrect.html
+++ b/ietf/templates/doc/draft/resurrect.html
@@ -8,7 +8,7 @@
     <h1>
         Resurrect
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         Resurrect <b>{{ doc }}</b>?
diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html
index a8d88fc223..e02fed18c0 100644
--- a/ietf/templates/doc/drafts_for_ad.html
+++ b/ietf/templates/doc/drafts_for_ad.html
@@ -31,12 +31,12 @@ <h2 class="mt-4">Blocking positions held by {{ ad_name }}</h2>
                             {% if doc.ad %}
                                 {% person_link doc.ad %}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                         <td>
                             {% for p in doc.blocking_positions %}
-                                <span {% if p.is_old_pos %}class="text-muted"{% endif %}>
+                                <span {% if p.is_old_pos %}class="text-body-secondary"{% endif %}>
                                     {% if p.is_old_pos %}
                                         {% person_link p.balloter class="text-reset" %}
                                     {% else %}
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index def5e98cba..d28719c42c 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -67,7 +67,7 @@ <h1>{{ title }}</h1>
                             {% if doc.intended_std_level %}
                                 {{ doc.intended_std_level.name }}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                         <td>{% person_link doc.ad %}</td>
diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html
index 76dba79a15..d4cb6b19a9 100644
--- a/ietf/templates/doc/drafts_in_last_call.html
+++ b/ietf/templates/doc/drafts_in_last_call.html
@@ -11,7 +11,7 @@ <h1>
         Internet-Drafts in IETF Last Call
         {% if pages %}
             <br>
-            <small class="text-muted">{{ pages }} pages</small>
+            <small class="text-body-secondary">{{ pages }} pages</small>
         {% endif %}
     </h1>
     {% include "doc/search/search_results.html" with start_table=True end_table=True %}
diff --git a/ietf/templates/doc/edit_action_holders.html b/ietf/templates/doc/edit_action_holders.html
index 24ba4032d3..38b0de37fd 100644
--- a/ietf/templates/doc/edit_action_holders.html
+++ b/ietf/templates/doc/edit_action_holders.html
@@ -10,7 +10,7 @@
     <h1>
         Edit action holders
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html
index ed28855e40..597380ef2e 100644
--- a/ietf/templates/doc/edit_authors.html
+++ b/ietf/templates/doc/edit_authors.html
@@ -12,7 +12,7 @@
     <h1>
         Edit authors
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form enctype="multipart/form-data" method="post" id="authors-form">
         {% csrf_token %}
diff --git a/ietf/templates/doc/edit_field.html b/ietf/templates/doc/edit_field.html
index d1f4d96411..e0a83d7aad 100644
--- a/ietf/templates/doc/edit_field.html
+++ b/ietf/templates/doc/edit_field.html
@@ -8,7 +8,7 @@
     <h1>
         {{ title }}
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}</small>
+        <small class="text-body-secondary">{{ doc.canonical_name }}</small>
     </h1>
     <p class="alert alert-info my-3">
         {{ info|safe }}
diff --git a/ietf/templates/doc/edit_notify.html b/ietf/templates/doc/edit_notify.html
index 6701c58523..6869b69a83 100644
--- a/ietf/templates/doc/edit_notify.html
+++ b/ietf/templates/doc/edit_notify.html
@@ -8,7 +8,7 @@
     <h1>
         Edit notification addresses
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/edit_sessionpresentation.html b/ietf/templates/doc/edit_sessionpresentation.html
index 79508b7836..5cc8e2f566 100644
--- a/ietf/templates/doc/edit_sessionpresentation.html
+++ b/ietf/templates/doc/edit_sessionpresentation.html
@@ -8,7 +8,7 @@
     <h1>
         Change document revision for session
         <br>
-        <small class="text-muted">{{ sp.document.name }}</small>
+        <small class="text-body-secondary">{{ sp.document.name }}</small>
     </h1>
     <h2 class="mt-3">{{ sp.document.title }} at {{ sp.session }}</h2>
     {% if sp.session.is_material_submission_cutoff %}
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index b95b38936d..f3efc80144 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -8,7 +8,7 @@
     <h1>
         Set telechat date
         <br>
-        <small class="text-muted">{{ doc.name }} ({{ doc.pages }} page{{ doc.pages|pluralize }})</small>
+        <small class="text-body-secondary">{{ doc.name }} ({{ doc.pages }} page{{ doc.pages|pluralize }})</small>
     </h1>
     {% for warning in warnings %}<div class="alert alert-warning my-3">{{ warning }}</div>{% endfor %}
     <form method="post">
diff --git a/ietf/templates/doc/material/all_presentations.html b/ietf/templates/doc/material/all_presentations.html
index 4c0a8d698e..b5ea1f3718 100644
--- a/ietf/templates/doc/material/all_presentations.html
+++ b/ietf/templates/doc/material/all_presentations.html
@@ -10,7 +10,7 @@
     <h1>
         Sessions linked to
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     {% if user|has_role:"Secretariat,Area Director,WG Chair,WG Secretary,RG Chair,RG Secretary,IRTF Chair,Team Chair" %}
         <div class="buttonlist">
diff --git a/ietf/templates/doc/material/choose_material_type.html b/ietf/templates/doc/material/choose_material_type.html
index 041209bc6b..f76fcd8304 100644
--- a/ietf/templates/doc/material/choose_material_type.html
+++ b/ietf/templates/doc/material/choose_material_type.html
@@ -8,7 +8,7 @@
     <h1>
         Upload Material
         <br>
-        <small class="text-muted">{{ group.name }} ({{ group.acronym }})</small>
+        <small class="text-body-secondary">{{ group.name }} ({{ group.acronym }})</small>
     </h1>
     <p class="mt-3">
         Select what kind of material you wish to upload:
diff --git a/ietf/templates/doc/material/edit_material.html b/ietf/templates/doc/material/edit_material.html
index 1d64baf532..a613bc1e0b 100644
--- a/ietf/templates/doc/material/edit_material.html
+++ b/ietf/templates/doc/material/edit_material.html
@@ -25,7 +25,7 @@ <h1 class="mb-3">
         {% endif %}
         {{ material_type|lower }}
         <br>
-        <small class="text-muted">
+        <small class="text-body-secondary">
             {% if group is not None %}
                 {{ group.name }} ({{ group.acronym }})
             {% elif doc.meeting_related %}
diff --git a/ietf/templates/doc/recent_drafts.html b/ietf/templates/doc/recent_drafts.html
index 339bb3d3c4..9674ba8b66 100644
--- a/ietf/templates/doc/recent_drafts.html
+++ b/ietf/templates/doc/recent_drafts.html
@@ -13,7 +13,7 @@ <h1>
         Internet-Drafts submitted during the last {{ days|default:7 }} days
         {% if pages %}
             <br>
-            <small class="text-muted">{{ pages }} pages</small>
+            <small class="text-body-secondary">{{ pages }} pages</small>
         {% endif %}
     </h1>
     {% include "doc/search/search_results.html" with start_table=True end_table=True %}
diff --git a/ietf/templates/doc/remind_action_holders.html b/ietf/templates/doc/remind_action_holders.html
index be6a4ed46d..05a98b2273 100644
--- a/ietf/templates/doc/remind_action_holders.html
+++ b/ietf/templates/doc/remind_action_holders.html
@@ -10,7 +10,7 @@
     <h1>
         Send reminder to action holder{{ doc.action_holders.all|pluralize }}
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/remove_sessionpresentation.html b/ietf/templates/doc/remove_sessionpresentation.html
index 79bda98b78..b519b73b36 100644
--- a/ietf/templates/doc/remove_sessionpresentation.html
+++ b/ietf/templates/doc/remove_sessionpresentation.html
@@ -8,7 +8,7 @@
     <h1>
         Confirm removing from session
         <br>
-        <small class="text-muted">{{ sp.document.name }}</small>
+        <small class="text-body-secondary">{{ sp.document.name }}</small>
     </h1>
     {% if sp.session.is_material_submission_cutoff %}
         <p class="alert alert-warning my-3">
diff --git a/ietf/templates/doc/review/assign_reviewer.html b/ietf/templates/doc/review/assign_reviewer.html
index c4aca8d0f0..61b92b0de2 100644
--- a/ietf/templates/doc/review/assign_reviewer.html
+++ b/ietf/templates/doc/review/assign_reviewer.html
@@ -7,7 +7,7 @@
     <h1>
         Assign reviewer
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     <form method="post">
diff --git a/ietf/templates/doc/review/close_request.html b/ietf/templates/doc/review/close_request.html
index cf0a6d0908..2216756258 100644
--- a/ietf/templates/doc/review/close_request.html
+++ b/ietf/templates/doc/review/close_request.html
@@ -7,7 +7,7 @@
     <h1>
         Close review request
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     <p class="alert alert-info my-3">
diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html
index 561aa8ca09..40f8913ac7 100644
--- a/ietf/templates/doc/review/complete_review.html
+++ b/ietf/templates/doc/review/complete_review.html
@@ -26,7 +26,7 @@ <h1>
         {% endif %}
         review
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     {% if assignment %}
         <table class="my-3 table table-sm table-borderless">
@@ -129,7 +129,7 @@ <h1>
                 </div>
             {% else %}
                 <div class="mail-archive-search">
-                    <small class="text-muted">Mailing list does not have a recognized ietf.org archive. Auto-searching disabled.</small>
+                    <small class="text-body-secondary">Mailing list does not have a recognized ietf.org archive. Auto-searching disabled.</small>
                 </div>
             {% endif %}
         </div>
diff --git a/ietf/templates/doc/review/edit_request_comment.html b/ietf/templates/doc/review/edit_request_comment.html
index b2196cbcb5..420e4f038d 100644
--- a/ietf/templates/doc/review/edit_request_comment.html
+++ b/ietf/templates/doc/review/edit_request_comment.html
@@ -7,7 +7,7 @@
     <h1>
         Edit review request comment
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/review/edit_request_deadline.html b/ietf/templates/doc/review/edit_request_deadline.html
index a1ae542bd5..0f8f32550d 100644
--- a/ietf/templates/doc/review/edit_request_deadline.html
+++ b/ietf/templates/doc/review/edit_request_deadline.html
@@ -10,7 +10,7 @@
     <h1>
         Edit review request deadline
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html b/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html
index b2e8f1af75..be123f5a7c 100644
--- a/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html
+++ b/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html
@@ -7,7 +7,7 @@
     <h1>
         Review assignment: No-Response
         <br>
-        <small class="text-muted">{{ assignment.review_request.doc.name }}</small>
+        <small class="text-body-secondary">{{ assignment.review_request.doc.name }}</small>
     </h1>
     <p class="my-3">
         Mark review assignment for {% person_link assignment.reviewer.person %} as <strong>No Response</strong>.
diff --git a/ietf/templates/doc/review/reject_reviewer_assignment.html b/ietf/templates/doc/review/reject_reviewer_assignment.html
index eca2295579..73e1afe2cd 100644
--- a/ietf/templates/doc/review/reject_reviewer_assignment.html
+++ b/ietf/templates/doc/review/reject_reviewer_assignment.html
@@ -7,7 +7,7 @@
     <h1>
         Reject review assignment
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     {% if not review_request_past_deadline %}
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index 55caae9fa7..14bdd3bee0 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -27,7 +27,7 @@
                     No specific revision
                 {% endif %}
                 {% if review_req.reviewed_rev != review_req.doc.rev %}
-                    <span class="text-muted">(document currently at {{ review_req.doc.rev }})</span>
+                    <span class="text-body-secondary">(document currently at {{ review_req.doc.rev }})</span>
                 {% endif %}
             </td>
         </tr>
diff --git a/ietf/templates/doc/review/request_review.html b/ietf/templates/doc/review/request_review.html
index 220ca4fe90..d7980b1a56 100644
--- a/ietf/templates/doc/review/request_review.html
+++ b/ietf/templates/doc/review/request_review.html
@@ -11,7 +11,7 @@
     <h1>
         Request review
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3">
         Submit a request to have the document reviewed.
diff --git a/ietf/templates/doc/review/review_request.html b/ietf/templates/doc/review/review_request.html
index 6ae15b08a3..ccf3c18361 100644
--- a/ietf/templates/doc/review/review_request.html
+++ b/ietf/templates/doc/review/review_request.html
@@ -10,7 +10,7 @@
     <h1>
         Review request
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     {% if can_close_request %}
diff --git a/ietf/templates/doc/review/review_wish_add.html b/ietf/templates/doc/review/review_wish_add.html
index bd2df52ce8..73ce549288 100644
--- a/ietf/templates/doc/review/review_wish_add.html
+++ b/ietf/templates/doc/review/review_wish_add.html
@@ -7,7 +7,7 @@
     <h1>
         Add review wish
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3">
         You are a reviewer for multiple teams, and need to select a team first.
diff --git a/ietf/templates/doc/review/review_wishes_remove.html b/ietf/templates/doc/review/review_wishes_remove.html
index aadf3c5deb..ee30c3cfcc 100644
--- a/ietf/templates/doc/review/review_wishes_remove.html
+++ b/ietf/templates/doc/review/review_wishes_remove.html
@@ -8,7 +8,7 @@ <h1>
         Remove review wish
         {% if doc.name %}
             <br>
-            <small class="text-muted">{{ doc.name }}</small>
+            <small class="text-body-secondary">{{ doc.name }}</small>
         {% endif %}
     </h1>
     <form class="my-3" method="post">
diff --git a/ietf/templates/doc/review/submit_unsolicited_review.html b/ietf/templates/doc/review/submit_unsolicited_review.html
index 3f52c2bc75..615694f3e0 100644
--- a/ietf/templates/doc/review/submit_unsolicited_review.html
+++ b/ietf/templates/doc/review/submit_unsolicited_review.html
@@ -7,7 +7,7 @@
     <h1>
         Submit unsolicited review
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         You are submitting an <strong>unsolicited</strong> review for this document.
diff --git a/ietf/templates/doc/review/withdraw_reviewer_assignment.html b/ietf/templates/doc/review/withdraw_reviewer_assignment.html
index 6ff1f926b2..db598532f2 100644
--- a/ietf/templates/doc/review/withdraw_reviewer_assignment.html
+++ b/ietf/templates/doc/review/withdraw_reviewer_assignment.html
@@ -7,7 +7,7 @@
     <h1>
         Withdraw review assignment
         <br>
-        <small class="text-muted">{{ assignment.review_request.doc.name }}</small>
+        <small class="text-body-secondary">{{ assignment.review_request.doc.name }}</small>
     </h1>
     <p class="my-3 alert alert-warning">
         Withdraw review assignment for {% person_link assignment.reviewer.person %}.
diff --git a/ietf/templates/doc/review_assignment_summary.html b/ietf/templates/doc/review_assignment_summary.html
index 4685bdf1cd..b45c27da6a 100644
--- a/ietf/templates/doc/review_assignment_summary.html
+++ b/ietf/templates/doc/review_assignment_summary.html
@@ -18,7 +18,7 @@
             </span>
         {% endif %}
     {% else %}
-        <a class="text-muted"
+        <a class="text-body-secondary"
            href="{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}">
             {{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} Review</a>
         <span class="badge rounded-pill ms-1 bg-secondary">
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index d47dd4389c..57632651ff 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -46,7 +46,7 @@
         {% endfor %}
     </td>
     <td class="doc">
-        {% if doc.pages %}<small class="float-end text-muted d-none d-sm-block">{{ doc.pages }} page{{ doc.pages|pluralize }}</small>{% endif %}
+        {% if doc.pages %}<small class="float-end text-body-secondary d-none d-sm-block">{{ doc.pages }} page{{ doc.pages|pluralize }}</small>{% endif %}
         <div>
             <a href="{{ doc.get_absolute_url }}">
                 {% if doc.get_state_slug == "rfc" %}
@@ -55,7 +55,7 @@
                     {{ doc.name }}-{{ doc.rev }}
                 {% endif %}
             </a>
-            {% if doc.get_state_slug == "rfc" and "draft" in doc.name %}<i class="text-muted">(was {{ doc.name }})</i>{% endif %}
+            {% if doc.get_state_slug == "rfc" and "draft" in doc.name %}<i class="text-body-secondary">(was {{ doc.name }})</i>{% endif %}
             <br>
             {% comment %}
             <div class="float-end">
@@ -147,7 +147,7 @@
                     {% endif %}
                     <br>
                     {% if doc.shepherd %}
-                        {% email_person_link doc.shepherd title="Shepherd" class="small text-muted" %}
+                        {% email_person_link doc.shepherd title="Shepherd" class="small text-body-secondary" %}
                     {% endif %}
                 </td>
             {% endif %}
diff --git a/ietf/templates/doc/search/status_columns.html b/ietf/templates/doc/search/status_columns.html
index 91660f1dbb..556cbb799c 100644
--- a/ietf/templates/doc/search/status_columns.html
+++ b/ietf/templates/doc/search/status_columns.html
@@ -85,11 +85,11 @@
         {{ doc.std_level|safe }} RFC
         {% if doc.obsoleted_by_list %}
             <br>
-            <span class="text-muted">Obsoleted by {{ doc.obsoleted_by_list|join:", "|urlize_ietf_docs }}</span>
+            <span class="text-body-secondary">Obsoleted by {{ doc.obsoleted_by_list|join:", "|urlize_ietf_docs }}</span>
         {% endif %}
         {% if doc.updated_by_list %}
             <br>
-            <span class="text-muted">Updated by {{ doc.updated_by_list|join:", "|urlize_ietf_docs }}</span>
+            <span class="text-body-secondary">Updated by {{ doc.updated_by_list|join:", "|urlize_ietf_docs }}</span>
         {% endif %}
     {% endif %}
 </td>
diff --git a/ietf/templates/doc/shepherd_writeup.html b/ietf/templates/doc/shepherd_writeup.html
index 61f7284a50..0b7cc98c01 100644
--- a/ietf/templates/doc/shepherd_writeup.html
+++ b/ietf/templates/doc/shepherd_writeup.html
@@ -9,7 +9,7 @@
     <h1>
         Shepherd writeup
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}</small>
+        <small class="text-body-secondary">{{ doc.canonical_name }}</small>
     </h1>
     <pre class="border p-3 my-3">{{writeup|maybewordwrap|urlize_ietf_docs|linkify}}</pre>
     {% if can_edit %}
diff --git a/ietf/templates/doc/status_change/approve.html b/ietf/templates/doc/status_change/approve.html
index 7984329766..799b4a52ef 100644
--- a/ietf/templates/doc/status_change/approve.html
+++ b/ietf/templates/doc/status_change/approve.html
@@ -8,7 +8,7 @@
     <h1>
         Approve
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}</small>
+        <small class="text-body-secondary">{{ doc.canonical_name }}</small>
     </h1>
     <form class="my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/status_change/edit_relations.html b/ietf/templates/doc/status_change/edit_relations.html
index 5823cd21f5..697d844d61 100644
--- a/ietf/templates/doc/status_change/edit_relations.html
+++ b/ietf/templates/doc/status_change/edit_relations.html
@@ -9,7 +9,7 @@
     <h1>
         Edit RFCs affected by status change
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/status_change/last_call.html b/ietf/templates/doc/status_change/last_call.html
index 682a27b073..c81792e82a 100644
--- a/ietf/templates/doc/status_change/last_call.html
+++ b/ietf/templates/doc/status_change/last_call.html
@@ -9,7 +9,7 @@
     <h1>
         Last call text
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="my-3 edit-last-call-text" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index 2733363373..7554853875 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -12,7 +12,7 @@
     <h1>
         Make last call
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <div class="my-3">
         <label>Last call text</label>
diff --git a/ietf/templates/doc/status_change/submit.html b/ietf/templates/doc/status_change/submit.html
index 68e9e81230..85334d32a0 100644
--- a/ietf/templates/doc/status_change/submit.html
+++ b/ietf/templates/doc/status_change/submit.html
@@ -8,7 +8,7 @@
     <h1>
         Edit status change text
         <br>
-        <small class="text-muted">{{ doc.title }}</small>
+        <small class="text-body-secondary">{{ doc.title }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         The text will be submitted as <b>{{ doc.canonical_name }}-{{ next_rev }}</b>.
diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html
index d9e7cc6f68..7f4bb06250 100644
--- a/ietf/templates/doc/submit_to_iesg.html
+++ b/ietf/templates/doc/submit_to_iesg.html
@@ -8,7 +8,7 @@
     <h1>
         Publication request
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <p class="my-3">
         Please verify the following information:
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index 597d5e4e36..1dc301e0cf 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -34,7 +34,7 @@ <h3 class="mt-3 navskip">
         {% if area.groups %}
             <h3 class="mt-3 navskip">
                 {{ area.acronym|upper }} active WG{{ area.groups|pluralize }}
-                <span class="text-muted">({{ area.groups.count }})</span>
+                <span class="text-body-secondary">({{ area.groups.count }})</span>
             </h3>
             <table class="table table-sm table-striped tablesorter">
                 <thead>
diff --git a/ietf/templates/group/add_comment.html b/ietf/templates/group/add_comment.html
index 0aea914f02..05313edda0 100644
--- a/ietf/templates/group/add_comment.html
+++ b/ietf/templates/group/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ group }} ({{ group.acronym }})</small>
+        <small class="text-body-secondary">{{ group }} ({{ group.acronym }})</small>
     </h1>
     <form class="my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html
index 91964ff3c9..d18d523bab 100644
--- a/ietf/templates/group/change_reviewer_settings.html
+++ b/ietf/templates/group/change_reviewer_settings.html
@@ -13,7 +13,7 @@
     <h1>
         Change {{ group.acronym }} reviewer settings
         <br>
-        <small class="text-muted">{{ reviewer_email }}</small>
+        <small class="text-body-secondary">{{ reviewer_email }}</small>
     </h1>
     <h2 class="mt-5">Settings</h2>
     <form class="my-3 change-reviewer-settings" method="post">
diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html
index 8b329b855f..5334c6a89e 100644
--- a/ietf/templates/group/customize_workflow.html
+++ b/ietf/templates/group/customize_workflow.html
@@ -12,7 +12,7 @@
     <h1>
         Customize Workflow
         <br>
-        <small class="text-muted">{{ group.acronym }} {{ group.type.name }}</small>
+        <small class="text-body-secondary">{{ group.acronym }} {{ group.type.name }}</small>
     </h1>
     <p class="my-3">
         Below you can customize the Internet-Draft states and tags used in the
@@ -48,7 +48,7 @@ <h2 class="mt-5">States</h2>
                               title="{{ state.desc|striptags|truncatewords:40 }}">
                             {{ state.name }}
                         </span>
-                        {% if not state.used %}<span class="text-muted">(not used in {{ group.acronym }})</span>{% endif %}
+                        {% if not state.used %}<span class="text-body-secondary">(not used in {{ group.acronym }})</span>{% endif %}
                         {% if state.mandatory %}<span class="badge rounded-pill bg-success">Mandatory</span>{% endif %}
                     </td>
                     <td class="next-states">
@@ -124,7 +124,7 @@ <h2 class="mt-5">Tags</h2>
                 <tr>
                     <td class="name">
                         <span {% if not tag.used %}class="text-decoration-line-through"{% endif %}>{{ tag.name }}</span>
-                        {% if not tag.used %}<span class="text-muted">(not used in {{ group.acronym }})</span>{% endif %}
+                        {% if not tag.used %}<span class="text-body-secondary">(not used in {{ group.acronym }})</span>{% endif %}
                     </td>
                     <td>
                         <form class="set-tag text-end" method="post">
diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html
index 5544f862e2..1afe9116f7 100644
--- a/ietf/templates/group/edit.html
+++ b/ietf/templates/group/edit.html
@@ -18,7 +18,7 @@ <h1>
         {% if action == "edit" %}
             Edit {{ group.type.name }}
             <br>
-            <small class="text-muted">{{ group.acronym }}</small>
+            <small class="text-body-secondary">{{ group.acronym }}</small>
         {% elif action == "charter" %}
             Start chartering new group
         {% else %}
diff --git a/ietf/templates/group/email_aliases.html b/ietf/templates/group/email_aliases.html
index 415f9950c2..f36be7f0f3 100644
--- a/ietf/templates/group/email_aliases.html
+++ b/ietf/templates/group/email_aliases.html
@@ -14,7 +14,7 @@ <h1>
         Group email aliases
         {% if group %}
             <br>
-            <span class="text-muted">{{ group.acronym }}</span>
+            <span class="text-body-secondary">{{ group.acronym }}</span>
         {% endif %}
     </h1>
     {% regroup aliases|dictsort:"acronym" by acronym as alias_list %}
diff --git a/ietf/templates/group/email_open_review_assignments.html b/ietf/templates/group/email_open_review_assignments.html
index 4f72e1c80e..64b9c2e064 100644
--- a/ietf/templates/group/email_open_review_assignments.html
+++ b/ietf/templates/group/email_open_review_assignments.html
@@ -9,7 +9,7 @@
     <h1>
         Email summary of assigned review requests
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     {% if review_assignments %}
         <form class="my-3 email-open-review-assignments" method="post">
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index 1734b1f465..7e986c11c1 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -83,7 +83,7 @@
                                 <span class="badge rounded-pill bg-info">{{ group.charter.get_state.name }}</span>
                             {% endif %}
                         {% else %}
-                            <span class="text-muted">(None)</span>
+                            <span class="text-body-secondary">(None)</span>
                             {% if user|has_role:"Area Director,Secretariat" %}
                                 <a class="btn btn-warning btn-sm" href="{{ charter_submit_url }}">Submit charter</a>
                             {% endif %}
@@ -116,7 +116,7 @@
                                 Changed {{ status_update.time|date:"Y-m-d" }}
                             </span>
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -157,7 +157,7 @@
                                     </div>
                                     <div class="modal-footer">
                                         <div class="btn-group me-auto" role="group" aria-label="Pan and zoom the diagram">
-                                            <small class="text-muted">Pan and zoom the dependency
+                                            <small class="text-body-secondary">Pan and zoom the dependency
                                                 graph after the layout settles.</small>
                                         </div>
                                         <div class="form-check">
diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html
index 3caf24ba73..19f60d67f8 100644
--- a/ietf/templates/group/group_about_status.html
+++ b/ietf/templates/group/group_about_status.html
@@ -11,7 +11,7 @@
     <h1>
         Status update for {{ group.type.name }}
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     {% if can_provide_status_update %}
         <div class="my-3 alert alert-info">
diff --git a/ietf/templates/group/group_about_status_edit.html b/ietf/templates/group/group_about_status_edit.html
index 7b6df06f50..6406e536da 100644
--- a/ietf/templates/group/group_about_status_edit.html
+++ b/ietf/templates/group/group_about_status_edit.html
@@ -8,7 +8,7 @@
     <h1>
         Edit status update for {{ group.type.name }}
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     <div class="my-3 alert alert-info">
         <h2>About Status Updates</h2>
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index 175bfff5c9..edb12a2eed 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -12,7 +12,7 @@
     <h1>
         Manage {{ assignment_status }} open review requests
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     {% if newly_closed > 0 or newly_opened > 0 or newly_assigned > 0 %}
         <p class="alert alert-danger my-3">
diff --git a/ietf/templates/group/reset_charter_milestones.html b/ietf/templates/group/reset_charter_milestones.html
index 00f4917ef8..903d4e1133 100644
--- a/ietf/templates/group/reset_charter_milestones.html
+++ b/ietf/templates/group/reset_charter_milestones.html
@@ -8,7 +8,7 @@
     <h1>
         Reset Charter Milestones
         <br>
-        <small class="text-muted">{{ group.acronym }} {{ group.type.name }}</small>
+        <small class="text-body-secondary">{{ group.acronym }} {{ group.type.name }}</small>
     </h1>
     <p class="mt-3">
         Select which of the current {{ group.type.name }} milestones you would like to copy to the charter:
diff --git a/ietf/templates/group/reset_next_reviewer.html b/ietf/templates/group/reset_next_reviewer.html
index e543907895..ce8dde1de8 100644
--- a/ietf/templates/group/reset_next_reviewer.html
+++ b/ietf/templates/group/reset_next_reviewer.html
@@ -4,7 +4,7 @@
 {% origin %}
 {% load ietf_filters static django_bootstrap5 %}
 {% block content %}
-    <h1>Set next reviewer in queue<br><small class="text-muted">{{ group.acronym }}</small></h1>
+    <h1>Set next reviewer in queue<br><small class="text-body-secondary">{{ group.acronym }}</small></h1>
     <form class="my-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
index 1e3361c0b0..8567d5e357 100644
--- a/ietf/templates/iesg/agenda.html
+++ b/ietf/templates/iesg/agenda.html
@@ -9,7 +9,7 @@
     <h1>
         IESG agenda
         <br>
-        <small class="text-muted">{{ date }}</small>
+        <small class="text-body-secondary">{{ date }}</small>
     </h1>
     {% include "iesg/nav.html" with active="agenda" %}
     {% if user|has_role:"Secretariat" %}
@@ -106,7 +106,7 @@ <h4 class="mt-3" id="sec-{{ num|slugify }}">{{ num }} {{ section.title|safe }}</
                         {% include "iesg/agenda_charter.html" %}
                     {% endif %}
                 {% empty %}
-                    <p class="text-muted">
+                    <p class="text-body-secondary">
                         (None)
                     </p>
                 {% endfor %}
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 1935c44e03..c388c16baf 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -21,7 +21,7 @@ <h1>Documents on future IESG telechat agendas</h1>
             <h2>
                 IESG telechat {{ t.date }}
                 <br>
-                <small class="text-muted">{{ t.pages }} page{{ t.pages|pluralize }}</small>
+                <small class="text-body-secondary">{{ t.pages }} page{{ t.pages|pluralize }}</small>
             </h2>
             <div class="buttonlist">
                 <a class="btn btn-primary" role="button" href="{% url 'ietf.iesg.views.agenda' %}">
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index 8237b162d2..ca031e2bc2 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -60,7 +60,7 @@ <h1>IESG discuss positions</h1>
                     <td class="d-none d-sm-table-cell">{% person_link doc.ad %}</td>
                     <td>
                         {% for p in doc.blocking_positions %}
-                            {% if p.is_old_pos %}<span class="text-muted">{% endif %}
+                            {% if p.is_old_pos %}<span class="text-body-secondary">{% endif %}
                             {% person_link p.balloter %}
                             ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
                             <br>
diff --git a/ietf/templates/iesg/ietf_activity_report.html b/ietf/templates/iesg/ietf_activity_report.html
index 32bf9dc456..030110026a 100644
--- a/ietf/templates/iesg/ietf_activity_report.html
+++ b/ietf/templates/iesg/ietf_activity_report.html
@@ -3,7 +3,7 @@
 {% block title %}IETF Activity Report{% endblock %}
 {% block content %}
     <h1 class="mt-3">IETF Activity Report</h1>
-    <h2 class="mt-3"><small class="text-muted">{{ sdate|date:"F Y" }}</small></h2>
+    <h2 class="mt-3"><small class="text-body-secondary">{{ sdate|date:"F Y" }}</small></h2>
     
     <form action="." method="GET">
         <div class="row">
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 72d005d1a8..ee0a2f8288 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -12,7 +12,7 @@
     <h1>
         Documents on recent agendas
         <br>
-        <small class="text-muted">in states
+        <small class="text-body-secondary">in states
             {% for state in states %}
                 {{ state.name }}{% if not forloop.last %},{% endif %}
             {% endfor %}
@@ -49,7 +49,7 @@ <h1>
                         <td class="d-none d-sm-table-cell">{% person_link doc.ad %}</td>
                         <td>
                             {% for p in doc.blocking_positions %}
-                                {% if p.is_old_pos %}<span class="text-muted">{% endif %}
+                                {% if p.is_old_pos %}<span class="text-body-secondary">{% endif %}
                                 {% person_link p.balloter %}
                                 ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
                                 <br>
diff --git a/ietf/templates/iesg/telechat_agenda_content_edit.html b/ietf/templates/iesg/telechat_agenda_content_edit.html
index d748cd60a0..f24d81df98 100644
--- a/ietf/templates/iesg/telechat_agenda_content_edit.html
+++ b/ietf/templates/iesg/telechat_agenda_content_edit.html
@@ -9,7 +9,7 @@
     <h1>
         Edit Telechat Agenda Contents
         <br>
-        <small class="text-muted">{{ section }}</small>
+        <small class="text-body-secondary">{{ section }}</small>
     </h1>
     <form class="my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/ietfauth/apikeys.html b/ietf/templates/ietfauth/apikeys.html
index 5ac7f6f453..f4769d2d90 100644
--- a/ietf/templates/ietfauth/apikeys.html
+++ b/ietf/templates/ietfauth/apikeys.html
@@ -12,7 +12,7 @@
     <h1>
         API keys
         <br>
-        <small class="text-muted">{{ user.username }}</small>
+        <small class="text-body-secondary">{{ user.username }}</small>
     </h1>
     {% csrf_token %}
     {% if person.apikeys.all %}
diff --git a/ietf/templates/ietfauth/edit_field.html b/ietf/templates/ietfauth/edit_field.html
index 4e8c5177a7..23d1b71982 100644
--- a/ietf/templates/ietfauth/edit_field.html
+++ b/ietf/templates/ietfauth/edit_field.html
@@ -8,7 +8,7 @@
     <h1>
         {{ title }}
         <br>
-        <small class="text-muted">{{ person.plain_name }}</small>
+        <small class="text-body-secondary">{{ person.plain_name }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         {{ info|striptags }}
diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html
index 924089e358..65a451c7a2 100644
--- a/ietf/templates/ietfauth/review_overview.html
+++ b/ietf/templates/ietfauth/review_overview.html
@@ -12,7 +12,7 @@
     <h1>
         Review overview
         <br>
-        <small class="text-muted">{{ request.user }}</small>
+        <small class="text-body-secondary">{{ request.user }}</small>
     </h1>
     <h2 class="mt-4">Assigned reviews</h2>
     {% if open_review_assignments %}
diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html
index 7855224c43..18bc37c75c 100644
--- a/ietf/templates/ipr/add_comment.html
+++ b/ietf/templates/ipr/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <p>
         The comment will be added to the history trail of the disclosure.
diff --git a/ietf/templates/ipr/add_email.html b/ietf/templates/ipr/add_email.html
index 2d3940049a..e7be36f73b 100644
--- a/ietf/templates/ipr/add_email.html
+++ b/ietf/templates/ipr/add_email.html
@@ -8,7 +8,7 @@
     <h1>
         Add email
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <p>
         The email will be added to the history trail of the disclosure.
diff --git a/ietf/templates/ipr/admin_list.html b/ietf/templates/ipr/admin_list.html
index feb6c9d2f5..23e5883eaa 100644
--- a/ietf/templates/ipr/admin_list.html
+++ b/ietf/templates/ipr/admin_list.html
@@ -18,7 +18,7 @@
     <h1>
         IPR Admin
         <br>
-        <small class="text-muted">
+        <small class="text-body-secondary">
             {% for s in states %}
                 {{ s.name }}
                 {% if not forloop.last %}/{% endif %}
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index f796901938..d5ec45e8aa 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -11,7 +11,7 @@
     <h1>
         History for IPR disclosure
         <br>
-        <small class="text-muted">{{ ipr.title }}</small>
+        <small class="text-body-secondary">{{ ipr.title }}</small>
     </h1>
     {% include "ipr/details_tabs.html" %}
     {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %}
diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
index bdda164a62..aa695aeee7 100644
--- a/ietf/templates/ipr/details_view.html
+++ b/ietf/templates/ipr/details_view.html
@@ -12,7 +12,7 @@
     <h1>
         IPR Details
         <br>
-        <small class="text-muted">{{ ipr.title }}</small>
+        <small class="text-body-secondary">{{ ipr.title }}</small>
     </h1>
     {% include "ipr/details_tabs.html" %}
     <div class="buttonlist my-3">
@@ -455,7 +455,7 @@ <h2 class="mt-5">
         <h2 class="mt-5">
             {% cycle section %}. Disclosure of Patent Information
             <br>
-            <small class="text-muted">i.e., patents or patent applications required to be disclosed by {{ in_force_ipr_rfc|urlize_ietf_docs }}</small>
+            <small class="text-body-secondary">i.e., patents or patent applications required to be disclosed by {{ in_force_ipr_rfc|urlize_ietf_docs }}</small>
         </h2>
         <p>
             A. For granted patents or published pending patent applications, please provide the following information:
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index 9830c73113..1291247f90 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -12,7 +12,7 @@
     <h1>
         Email submitter
         <br>
-        <small class="text-muted">{{ ipr.title }}</small>
+        <small class="text-body-secondary">{{ ipr.title }}</small>
     </h1>
     <form method="post" class="my-3 show-required">
         {% csrf_token %}
diff --git a/ietf/templates/ipr/notify.html b/ietf/templates/ipr/notify.html
index 0ac966a5d8..7afb30add6 100644
--- a/ietf/templates/ipr/notify.html
+++ b/ietf/templates/ipr/notify.html
@@ -8,7 +8,7 @@
     <h1>
         Send Notification{{ formset|pluralize }}
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <form class="my-3 send-notification" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/ipr/search_doc_list.html b/ietf/templates/ipr/search_doc_list.html
index 24fbfd01ba..f67f1e4725 100644
--- a/ietf/templates/ipr/search_doc_list.html
+++ b/ietf/templates/ipr/search_doc_list.html
@@ -7,7 +7,7 @@
     <h1>
         IPR disclosures
         <br>
-        <small class="text-muted">Select Internet-Draft</small>
+        <small class="text-body-secondary">Select Internet-Draft</small>
     </h1>
     <p>
         Please select one of following I-Ds:
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index 5a0186c8fd..484027094a 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 
-{% block search_header %}Document IPR search results<br><small class="text-muted">{{doc}}</small>{% endblock %}
+{% block search_header %}Document IPR search results<br><small class="text-body-secondary">{{doc}}</small>{% endblock %}
 
 {% block search_result %}
     <p class="alert alert-info my-3">Total number of IPR disclosures found: <b>{{ iprs|length }}</b>.</p>
diff --git a/ietf/templates/ipr/state.html b/ietf/templates/ipr/state.html
index 259a007483..0b6391a782 100644
--- a/ietf/templates/ipr/state.html
+++ b/ietf/templates/ipr/state.html
@@ -8,7 +8,7 @@
     <h1>
         Change State
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <form class="add-comment my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/liaisons/add_comment.html b/ietf/templates/liaisons/add_comment.html
index 8497d4c2f3..0bf8bb59af 100644
--- a/ietf/templates/liaisons/add_comment.html
+++ b/ietf/templates/liaisons/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ liaison.title }}</small>
+        <small class="text-body-secondary">{{ liaison.title }}</small>
     </h1>
     <p>
         The comment will be added to the history trail of the statement.
diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html
index 1f3ae3fc00..4bf5b4d11b 100644
--- a/ietf/templates/liaisons/detail.html
+++ b/ietf/templates/liaisons/detail.html
@@ -11,7 +11,7 @@
     <h1>
         Liaison statement
         <br>
-        <small class="text-muted">{% include 'liaisons/liaison_title.html' %}</small>
+        <small class="text-body-secondary">{% include 'liaisons/liaison_title.html' %}</small>
     </h1>
     {% include "liaisons/liaison_desc.html" only %}
     {% include "liaisons/detail_tabs.html" %}
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
index fcb91e301f..635466ed3a 100644
--- a/ietf/templates/liaisons/detail_history.html
+++ b/ietf/templates/liaisons/detail_history.html
@@ -8,7 +8,7 @@
     <h1>
         History for Liaison Statement
         <br>
-        <small class="text-muted">{{ liaison.title }}</small>
+        <small class="text-body-secondary">{{ liaison.title }}</small>
     </h1>
     {% include "liaisons/detail_tabs.html" %}
     {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index c8023e50c2..1684425eb2 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -19,7 +19,7 @@
     {% origin %}
     <h1 class="mb-3">
         {% if liaison %}
-            Edit liaison<br><small class="text-muted">{{ liaison }}</small>
+            Edit liaison<br><small class="text-body-secondary">{{ liaison }}</small>
         {% else %}
             Send Liaison Statement
         {% endif %}
diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html
index 53568d1a4a..226c78d827 100644
--- a/ietf/templates/liaisons/guide_from_ietf.html
+++ b/ietf/templates/liaisons/guide_from_ietf.html
@@ -11,7 +11,7 @@
     <h1>
         Liaison statements from the IETF
         <br>
-        <small class="text-muted">Guidelines for completing the "Cc:" field</small>
+        <small class="text-body-secondary">Guidelines for completing the "Cc:" field</small>
     </h1>
     <p>
         The individuals copied on a liaison statement that is sent by the IETF to another Standards Development Organization (SDO) depend on the IETF entity that is sending the liaison statement.
diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html
index 4ff53dd6f5..0224443031 100644
--- a/ietf/templates/liaisons/guide_to_ietf.html
+++ b/ietf/templates/liaisons/guide_to_ietf.html
@@ -11,7 +11,7 @@
     <h1>
         Liaison statements to the IETF
         <br>
-        <small class="text-muted">Guidelines for completing the "To:" and "Cc:" fields</small>
+        <small class="text-body-secondary">Guidelines for completing the "To:" and "Cc:" fields</small>
     </h1>
     <p>
         The following table provides guidelines for completing the "To:" and "Cc:" fields of liaison statements that are sent to the IETF by other Standards Development Organizations (SDOs).
diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html
index 00358054a3..0dd0635d11 100644
--- a/ietf/templates/meeting/add_session_drafts.html
+++ b/ietf/templates/meeting/add_session_drafts.html
@@ -9,7 +9,7 @@ <h1>
         Add Internet-Drafts to  {{ session.meeting }}
         {% if session_number %}: Session {{ session_number }}{% endif %}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 4c71e7202f..41cccd8e21 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -83,7 +83,7 @@
     <div id="app"></div>
     <div id="app-loading">
         <div id="app-loading-footer">
-            <a class="btn btn-light text-muted mb-3" href="/meeting/{{ meetingData.meetingNumber }}/agenda.txt"><small>Switch to text-only version &#11166;</small></a>
+            <a class="btn btn-light text-body-secondary mb-3" href="/meeting/{{ meetingData.meetingNumber }}/agenda.txt"><small>Switch to text-only version &#11166;</small></a>
         </div>
     </div>
 {% endblock %}
diff --git a/ietf/templates/meeting/approve_proposed_slides.html b/ietf/templates/meeting/approve_proposed_slides.html
index 05d969bb8d..37fb523394 100644
--- a/ietf/templates/meeting/approve_proposed_slides.html
+++ b/ietf/templates/meeting/approve_proposed_slides.html
@@ -9,7 +9,7 @@
     <h1>
         Approve slides proposed for {{ submission.session.meeting }}
         <br>
-        <small class="text-muted">{{ submission.session.group.acronym }}
+        <small class="text-body-secondary">{{ submission.session.group.acronym }}
             {% if session.name %}: {{ submission.session.name }}{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/meeting/cancel_session.html b/ietf/templates/meeting/cancel_session.html
index 9811e786c5..9bf80e0c49 100644
--- a/ietf/templates/meeting/cancel_session.html
+++ b/ietf/templates/meeting/cancel_session.html
@@ -9,7 +9,7 @@
     <h1>
         Cancel session
         <br>
-        <small class="text-muted">{{ session }}</small>
+        <small class="text-body-secondary">{{ session }}</small>
     </h1>
     <form class="session-details-form my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/delete_schedule.html b/ietf/templates/meeting/delete_schedule.html
index 334479ba79..f5012d0f6b 100644
--- a/ietf/templates/meeting/delete_schedule.html
+++ b/ietf/templates/meeting/delete_schedule.html
@@ -12,7 +12,7 @@
     <h1>
         Delete IETF {{ meeting.number }} Schedule
         <br>
-        <small class="text-muted">{{ schedule.owner }}/{{ schedule.name }}</small>
+        <small class="text-body-secondary">{{ schedule.owner }}/{{ schedule.name }}</small>
     </h1>
     <form method="post" class="my-3" enctype="multipart/form-data">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/diff_schedules.html b/ietf/templates/meeting/diff_schedules.html
index 50d8b84208..67abbe5345 100644
--- a/ietf/templates/meeting/diff_schedules.html
+++ b/ietf/templates/meeting/diff_schedules.html
@@ -9,7 +9,7 @@
     <h1>
         Differences between Meeting Agendas
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}</small>
+        <small class="text-body-secondary">IETF {{ meeting.number }}</small>
     </h1>
     <form method="get" class="my-3">
         {% bootstrap_form form layout="horizontal" %}
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index 91c4260222..462f97715d 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -35,7 +35,7 @@
             <h1>
                 Agenda name: {{ schedule.name }}
                 <br>
-                <small class="text-muted">Owner: {{ schedule.owner }}</small>
+                <small class="text-body-secondary">Owner: {{ schedule.owner }}</small>
             </h1>
             <div class="my-3">
                 {% if can_edit_properties %}
diff --git a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
index 5e51ab5a86..ada5f7ada6 100644
--- a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
+++ b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
@@ -12,7 +12,7 @@
     <h1>
         IETF {{ meeting.number }} meeting agenda
         <br>
-        <small class="text-muted">{{ schedule.name }}</small>
+        <small class="text-body-secondary">{{ schedule.name }}</small>
     </h1>
     {% origin %}
     <div class="my-3 edit-meeting-timeslots-and-misc-sessions {% if not can_edit %}read-only{% endif %}"
diff --git a/ietf/templates/meeting/edit_session.html b/ietf/templates/meeting/edit_session.html
index 4e4ce094ca..90139b8180 100644
--- a/ietf/templates/meeting/edit_session.html
+++ b/ietf/templates/meeting/edit_session.html
@@ -10,7 +10,7 @@
     <h1>
         Edit session
         <br>
-        <small class="text-muted">{{ session|describe_with_tz }}</small>
+        <small class="text-body-secondary">{{ session|describe_with_tz }}</small>
     </h1>
     <form class="session-details-form my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/edit_timeslot.html b/ietf/templates/meeting/edit_timeslot.html
index a840adbc8c..c881cad994 100644
--- a/ietf/templates/meeting/edit_timeslot.html
+++ b/ietf/templates/meeting/edit_timeslot.html
@@ -9,7 +9,7 @@
     <h1>
         Edit {{ timeslot.meeting }} timeslot
         <br>
-        <small class="text-muted">{{ timeslot.name }}</small>
+        <small class="text-body-secondary">{{ timeslot.name }}</small>
     </h1>
     {% if sessions %}
         <div class="alert alert-warning my-3">
diff --git a/ietf/templates/meeting/edit_timeslot_type.html b/ietf/templates/meeting/edit_timeslot_type.html
index d19cbaaf15..d21e189e51 100644
--- a/ietf/templates/meeting/edit_timeslot_type.html
+++ b/ietf/templates/meeting/edit_timeslot_type.html
@@ -8,7 +8,7 @@
     <h1>
         Edit timeslot type
         <br>
-        <small class="text-muted">{{ timeslot }}</small>
+        <small class="text-body-secondary">{{ timeslot }}</small>
     </h1>
     {% if sessions %}
         <div class="alert alert-warning my-3">
diff --git a/ietf/templates/meeting/finalize.html b/ietf/templates/meeting/finalize.html
index 39fcecc9a7..ba218a91ce 100644
--- a/ietf/templates/meeting/finalize.html
+++ b/ietf/templates/meeting/finalize.html
@@ -8,7 +8,7 @@
     <h1>
         Finalize Proceedings
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}</small>
+        <small class="text-body-secondary">IETF {{ meeting.number }}</small>
     </h1>
     <p>
         This will make the proceedings for IETF {{ meeting.number }} final.
diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html
index 03ebeccccd..095b0fb5da 100644
--- a/ietf/templates/meeting/group_materials.html
+++ b/ietf/templates/meeting/group_materials.html
@@ -88,7 +88,7 @@
             {% if entry.last_update %}
                 {{ entry.last_update|utc|date:"Y-m-d" }}
                 <br>
-                <small class="text-muted">{{ entry.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
+                <small class="text-body-secondary">{{ entry.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
             {% endif %}
         </td>
         {% if user|has_role:"Secretariat" or user_groups %}
diff --git a/ietf/templates/meeting/important-dates.html b/ietf/templates/meeting/important-dates.html
index c7d086fece..1d786ebc88 100644
--- a/ietf/templates/meeting/important-dates.html
+++ b/ietf/templates/meeting/important-dates.html
@@ -22,7 +22,7 @@ <h1>Important Dates</h1>
             <h2 class="mt-5">
                 IETF {{ meeting.number }}
                 <br>
-                <small class="text-muted">{{ meeting.date }}, {{ meeting.city }}, {{ meeting.country }}</small>
+                <small class="text-body-secondary">{{ meeting.date }}, {{ meeting.city }}, {{ meeting.country }}</small>
             </h2>
             <table class="table table-striped tablesorter">
                 <thead>
diff --git a/ietf/templates/meeting/make_schedule_official.html b/ietf/templates/meeting/make_schedule_official.html
index 59bccaa967..a35dc7c7f8 100644
--- a/ietf/templates/meeting/make_schedule_official.html
+++ b/ietf/templates/meeting/make_schedule_official.html
@@ -10,7 +10,7 @@
     <h1>
         Make IETF {{ meeting.number }} Schedule Official
         <br>
-        <small class="text-muted">{{ schedule.owner }}/{{ schedule.name }}</small>
+        <small class="text-body-secondary">{{ schedule.owner }}/{{ schedule.name }}</small>
     </h1>
     <form method="post" enctype="multipart/form-data" class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 1c81c028fa..00ee18df62 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -46,7 +46,7 @@ <h2 class="mt-5" id="plenaries">Plenaries</h2>
     <!-- Working groups -->
     {% for area, meeting_groups, not_meeting_groups in ietf_areas %}
         <h2 class="mt-5" id="{{ area.acronym }}">
-            {{ area.acronym|upper }} <small class="text-muted">{{ area.name }}</small>
+            {{ area.acronym|upper }} <small class="text-body-secondary">{{ area.name }}</small>
         </h2>
         {% if meeting_groups %}
             <table class="table table-sm table-striped tablesorter">
@@ -118,7 +118,7 @@ <h2 class="mt-5" id="training">Training</h2>
     <!-- IAB Sessions -->
     {% if iab %}
         <h2 class="mt-5" id="iab">
-            IAB <small class="text-muted">Internet Architecture Board</small>
+            IAB <small class="text-body-secondary">Internet Architecture Board</small>
         </h2>
         <table class="table table-sm table-striped tablesorter">
             <thead>
@@ -150,7 +150,7 @@ <h2 class="mt-5" id="iab">
     <!-- IRTF Sessions -->
     {% if irtf.meeting_groups  %}
         <h2 class="mt-5" id="irtf">
-            IRTF <small class="text-muted">Internet Research Task Force</small>
+            IRTF <small class="text-body-secondary">Internet Research Task Force</small>
         </h2>
         <table class="table table-sm table-striped tablesorter">
             <thead>
diff --git a/ietf/templates/meeting/proceedings/edit_material_base.html b/ietf/templates/meeting/proceedings/edit_material_base.html
index 173e1d2360..be66fa3305 100644
--- a/ietf/templates/meeting/proceedings/edit_material_base.html
+++ b/ietf/templates/meeting/proceedings/edit_material_base.html
@@ -9,7 +9,7 @@ <h1>
         {% block content_header %}
             Edit Proceedings Material
             <br>
-            <small class="text-muted">{{ meeting }} {{ material_type.name }}</small>
+            <small class="text-body-secondary">{{ meeting }} {{ material_type.name }}</small>
         {% endblock %}
     </h1>
     {% if meeting.proceedings_final %}
diff --git a/ietf/templates/meeting/proceedings/edit_meetinghosts.html b/ietf/templates/meeting/proceedings/edit_meetinghosts.html
index 89e3eb25f3..68c684a2fa 100644
--- a/ietf/templates/meeting/proceedings/edit_meetinghosts.html
+++ b/ietf/templates/meeting/proceedings/edit_meetinghosts.html
@@ -8,7 +8,7 @@
     <h1>
         Edit Meeting Hosts
         <br>
-        <small class="text-muted">{{ meeting }}</small>
+        <small class="text-body-secondary">{{ meeting }}</small>
     </h1>
     {% if meeting.proceedings_final %}
         <div class="alert alert-warning my-3">The proceedings for this meeting have already been finalized.</div>
diff --git a/ietf/templates/meeting/proceedings/material_details.html b/ietf/templates/meeting/proceedings/material_details.html
index 0b5f048c99..aa2c45fde3 100644
--- a/ietf/templates/meeting/proceedings/material_details.html
+++ b/ietf/templates/meeting/proceedings/material_details.html
@@ -7,7 +7,7 @@
     <h1>
         {{ meeting }}
         <br>
-        <small class="text-muted">Proceedings Materials</small>
+        <small class="text-body-secondary">Proceedings Materials</small>
     </h1>
     {% if meeting.proceedings_final %}
         <div class="alert alert-warning my-3">The proceedings have been finalized for this meeting.</div>
@@ -43,7 +43,7 @@ <h1>
                             {% with timestamp=mat.document.time|utc %}
                                 {{ timestamp|date:"Y-m-d" }}
                                 <br>
-                                <small class="text-muted">{{ timestamp|date:"H:i:s" }}&nbsp;UTC</small>
+                                <small class="text-body-secondary">{{ timestamp|date:"H:i:s" }}&nbsp;UTC</small>
                             {% endwith %}
                         </td>
                     {% else %}
diff --git a/ietf/templates/meeting/proceedings/materials_table.html b/ietf/templates/meeting/proceedings/materials_table.html
index 25a1725225..d18f2ce8d7 100644
--- a/ietf/templates/meeting/proceedings/materials_table.html
+++ b/ietf/templates/meeting/proceedings/materials_table.html
@@ -26,7 +26,7 @@ <h2 class="mt-3" id="proceedings-materials">Proceedings Materials</h2>
                                 {% with timestamp=material.document.time|utc %}
                                     {{ timestamp|date:"Y-m-d" }}
                                     <br>
-                                    <small class="text-muted">{{ timestamp|date:"H:i:s" }} UTC</small>
+                                    <small class="text-body-secondary">{{ timestamp|date:"H:i:s" }} UTC</small>
                                 {% endwith %}
                             </td>
                         {% else %}
diff --git a/ietf/templates/meeting/proceedings/upload_material.html b/ietf/templates/meeting/proceedings/upload_material.html
index a581b987f0..4c97d5b366 100644
--- a/ietf/templates/meeting/proceedings/upload_material.html
+++ b/ietf/templates/meeting/proceedings/upload_material.html
@@ -6,7 +6,7 @@
 {% block content_header %}
     Upload Proceedings Material
     <br>
-    <small class="text-muted">{{ meeting }} {{ material_type.name }}</small>
+    <small class="text-body-secondary">{{ meeting }} {{ material_type.name }}</small>
 {% endblock %}
 {% block intro %}
     <p>
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index a6b6fc477f..57172d86c8 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -7,7 +7,7 @@
 {% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>IETF {{ meeting.number }} Schedule<br><small class="text-muted">
+    <h1>IETF {{ meeting.number }} Schedule<br><small class="text-body-secondary">
     {{ schedule.owner }}/{{ schedule.name }} ({{ schedule.official_token }})</small></h1>
     <div class="my-3">
         {% if not schedule.is_official %}
diff --git a/ietf/templates/meeting/propose_session_slides.html b/ietf/templates/meeting/propose_session_slides.html
index caa3a49af1..e5a0b451e6 100644
--- a/ietf/templates/meeting/propose_session_slides.html
+++ b/ietf/templates/meeting/propose_session_slides.html
@@ -7,7 +7,7 @@
     <h1>
         Propose Slides for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/meeting/request_minutes.html b/ietf/templates/meeting/request_minutes.html
index fc39c034f9..4231b8d12d 100644
--- a/ietf/templates/meeting/request_minutes.html
+++ b/ietf/templates/meeting/request_minutes.html
@@ -9,7 +9,7 @@
     <h1>
         Request Minutes
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}
+        <small class="text-body-secondary">IETF {{ meeting.number }}
             <br>
         {{ meeting.city }}, {{ meeting.country }} – {{ meeting.venue_name }}</small>
     </h1>
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index a70dc54eef..7c70ee0b02 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -11,7 +11,7 @@
     <h1 class="title">
         IETF {{ meeting.number }} timeslot requests
         <br>
-        <small class="text-muted">{{ meeting.city }}, {{ meeting.country }}
+        <small class="text-body-secondary">{{ meeting.city }}, {{ meeting.country }}
             {% if meeting.venue_name %}– {{ meeting.venue_name }}{% endif %}
         </small>
     </h1>
@@ -116,7 +116,7 @@ <h2 class="mt-3">Requests Summary</h2>
     {% for area in area_sessions %}
         <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
             {% if area.grouper is not None %}
-                {{ area.grouper.acronym|upper }} <small class="text-muted">{{ area.grouper.name }}</small>
+                {{ area.grouper.acronym|upper }} <small class="text-body-secondary">{{ area.grouper.name }}</small>
             {% else %}
                 Other Groups
             {% endif %}
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
index 2a1a829db2..d85e770b25 100644
--- a/ietf/templates/meeting/schedule_list.html
+++ b/ietf/templates/meeting/schedule_list.html
@@ -9,7 +9,7 @@
     <h1>
         Possible Meeting Agendas
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}</small>
+        <small class="text-body-secondary">IETF {{ meeting.number }}</small>
     </h1>
     {% if can_edit_timeslots %}
         <a class="btn btn-primary my-3"
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 7f1a825c42..7648f0b355 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -12,7 +12,7 @@
     <h1>
         {{ meeting }}
         <br>
-        <small class="text-muted">{{ acronym }}</small>
+        <small class="text-body-secondary">{{ acronym }}</small>
     </h1>
     {% if meeting.start_datetime >= thisweek %}
         <a class="regular float-end"
diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
index 8f161a3bb1..46b4eb946f 100644
--- a/ietf/templates/meeting/timeslot_edit.html
+++ b/ietf/templates/meeting/timeslot_edit.html
@@ -31,7 +31,7 @@
     <h1>
         IETF {{ meeting.number }} Meeting Agenda
         <br>
-        <small class="text-muted">Timeslots and Room Availability</small>
+        <small class="text-body-secondary">Timeslots and Room Availability</small>
     </h1>
     <div class="my-3">
         <a class="btn btn-primary"
diff --git a/ietf/templates/meeting/upload_session_agenda.html b/ietf/templates/meeting/upload_session_agenda.html
index 67a6bf79b8..1856a75bdb 100644
--- a/ietf/templates/meeting/upload_session_agenda.html
+++ b/ietf/templates/meeting/upload_session_agenda.html
@@ -19,7 +19,7 @@ <h1>
         {% endif %}
         Agenda for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/meeting/upload_session_bluesheets.html b/ietf/templates/meeting/upload_session_bluesheets.html
index c799346529..19af4847ad 100644
--- a/ietf/templates/meeting/upload_session_bluesheets.html
+++ b/ietf/templates/meeting/upload_session_bluesheets.html
@@ -19,7 +19,7 @@ <h1>
         {% endif %}
         Bluesheets for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/meeting/upload_session_minutes.html b/ietf/templates/meeting/upload_session_minutes.html
index fa6f7c15e2..30eadda277 100644
--- a/ietf/templates/meeting/upload_session_minutes.html
+++ b/ietf/templates/meeting/upload_session_minutes.html
@@ -19,7 +19,7 @@ <h1>
         {% endif %}
         Minutes for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/meeting/upload_session_slides.html b/ietf/templates/meeting/upload_session_slides.html
index 61b2422e42..8e3e064df3 100644
--- a/ietf/templates/meeting/upload_session_slides.html
+++ b/ietf/templates/meeting/upload_session_slides.html
@@ -19,7 +19,7 @@ <h1>
         {% endif %}
         slides for {{ session.meeting }}
         <br>
-        <small class="text-muted">
+        <small class="text-body-secondary">
             {{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
diff --git a/ietf/templates/message/message.html b/ietf/templates/message/message.html
index fba7ba4392..01d72e9638 100644
--- a/ietf/templates/message/message.html
+++ b/ietf/templates/message/message.html
@@ -8,7 +8,7 @@
     <h1>
         {{ message.subject }}
         <br>
-        <small class="text-muted">{{ message.time|date:"F j, Y" }}</small>
+        <small class="text-body-secondary">{{ message.time|date:"F j, Y" }}</small>
     </h1>
     <dl class="row my-3">
         <dt class="col-sm-1">
diff --git a/ietf/templates/nomcom/edit_nominee.html b/ietf/templates/nomcom/edit_nominee.html
index aa9f6a8046..7f20e204bb 100644
--- a/ietf/templates/nomcom/edit_nominee.html
+++ b/ietf/templates/nomcom/edit_nominee.html
@@ -9,7 +9,7 @@
     <h2>
         Edit email
         <br>
-        <small class="text-muted">{{ nominee }}</small>
+        <small class="text-body-secondary">{{ nominee }}</small>
     </h2>
     <form method="post" class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/nomcom/edit_template.html b/ietf/templates/nomcom/edit_template.html
index 5c6ba618df..b901104cf0 100644
--- a/ietf/templates/nomcom/edit_template.html
+++ b/ietf/templates/nomcom/edit_template.html
@@ -8,7 +8,7 @@
     <h2>
         Template
         <br>
-        <small class="text-muted">{{ template }}</small>
+        <small class="text-body-secondary">{{ template }}</small>
     </h2>
     <dl class="row mt-3">
         <dt class="col-sm-2">
diff --git a/ietf/templates/nomcom/extract_email_lists.html b/ietf/templates/nomcom/extract_email_lists.html
index b2a5fec493..b80119cf01 100644
--- a/ietf/templates/nomcom/extract_email_lists.html
+++ b/ietf/templates/nomcom/extract_email_lists.html
@@ -8,7 +8,7 @@
     <h2>
         Email lists
         <br>
-        <small class="text-muted">{{ nomcom.group }}</small>
+        <small class="text-body-secondary">{{ nomcom.group }}</small>
     </h2>
     {% with title='Nominees Pending Acceptance' list=pending heading="h3" %}
         {% include 'nomcom/email_list_panel.html' %}
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
index bbdc279727..2ab8d5e0df 100644
--- a/ietf/templates/nomcom/feedback.html
+++ b/ietf/templates/nomcom/feedback.html
@@ -78,7 +78,7 @@ <h2 class="navskip mt-4">Topics</h2>
                         <h2 class="navskip mt-4">
                             Provide feedback
                             <br>
-                            <small class="text-muted">{{ form.nominee.email.person.name }} for {{ form.position.name }}</small>
+                            <small class="text-body-secondary">{{ form.nominee.email.person.name }} for {{ form.position.name }}</small>
                         </h2>
                         <p class="mt-3">
                             Provide feedback about {% person_link form.nominee.person %}
@@ -88,7 +88,7 @@ <h2 class="navskip mt-4">
                         <h2 >
                             Provide feedback
                             <br>
-                            <small class="text-muted">{{ form.topic.subject }}</small>
+                            <small class="text-body-secondary">{{ form.topic.subject }}</small>
                         </h2>
                         <div class="card my-3">
                             <div class="card-header">Description: {{ form.topic.subject }}</div>
diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html
index 74e7efff7b..09cdeae98c 100644
--- a/ietf/templates/nomcom/history.html
+++ b/ietf/templates/nomcom/history.html
@@ -58,10 +58,10 @@ <h2 class="mt-5" id="y2012">2012/2013</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Marc Blanchet <span class="text-muted">(IAB Liaison)</span>,
-            Scott Bradner <span class="text-muted">(IAOC Liaison)</span>,
-            Sean Turner <span class="text-muted">(IESG Liaison)</span>,
-            Rudi Vansnick <span class="text-muted">(ISOC Liaison)</span>
+            Marc Blanchet <span class="text-body-secondary">(IAB Liaison)</span>,
+            Scott Bradner <span class="text-body-secondary">(IAOC Liaison)</span>,
+            Sean Turner <span class="text-body-secondary">(IESG Liaison)</span>,
+            Rudi Vansnick <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2011">2011/2012</h2>
@@ -77,7 +77,7 @@ <h2 class="mt-5" id="y2011">2011/2012</h2>
         </dt>
         <dd class="col-sm-10">
             Tom Walsh,
-            Henrik Levkowetz <span class="text-muted">(Tools Advisor)</span>
+            Henrik Levkowetz <span class="text-body-secondary">(Tools Advisor)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -98,10 +98,10 @@ <h2 class="mt-5" id="y2011">2011/2012</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Dave Thaler <span class="text-muted">(IAB Liaison)</span>,
-            Dave Crocker <span class="text-muted">(IAOC Liaison)</span>,
-            Ralph Droms <span class="text-muted">(IESG Liaison)</span>,
-            Jason Livingood <span class="text-muted">(ISOC Liaison)</span>
+            Dave Thaler <span class="text-body-secondary">(IAB Liaison)</span>,
+            Dave Crocker <span class="text-body-secondary">(IAOC Liaison)</span>,
+            Ralph Droms <span class="text-body-secondary">(IESG Liaison)</span>,
+            Jason Livingood <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2010">2010/2011</h2>
@@ -117,7 +117,7 @@ <h2 class="mt-5" id="y2010">2010/2011</h2>
         </dt>
         <dd class="col-sm-10">
             Mary Barnes,
-            Henrik Levkowetz <span class="text-muted">(Tools Advisor)</span>
+            Henrik Levkowetz <span class="text-body-secondary">(Tools Advisor)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -137,10 +137,10 @@ <h2 class="mt-5" id="y2010">2010/2011</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Spencer Dawkins <span class="text-muted">(IAB Liaison)</span>,
-            Ole Jacobsen <span class="text-muted">(IAOC Liaison)</span>,
-            Dan Romascanu <span class="text-muted">(IESG Liaison)</span>,
-            Eric Burger <span class="text-muted">(ISOC Liaison)</span>
+            Spencer Dawkins <span class="text-body-secondary">(IAB Liaison)</span>,
+            Ole Jacobsen <span class="text-body-secondary">(IAOC Liaison)</span>,
+            Dan Romascanu <span class="text-body-secondary">(IESG Liaison)</span>,
+            Eric Burger <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2009">2009/2010</h2>
@@ -156,7 +156,7 @@ <h2 class="mt-5" id="y2009">2009/2010</h2>
         </dt>
         <dd class="col-sm-10">
             Joel Halpern,
-            Henrik Levkowetz <span class="text-muted">(Tools Advisor)</span>
+            Henrik Levkowetz <span class="text-body-secondary">(Tools Advisor)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -177,10 +177,10 @@ <h2 class="mt-5" id="y2009">2009/2010</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Jon Peterson <span class="text-muted">(IAB Liaison)</span>,
-            Tim Polk <span class="text-muted">(IESG Liaison)</span>,
-            Henk Uijterwall <span class="text-muted">(IAOC liaison)</span>,
-            TBA <span class="text-muted">(ISOC Liaison)</span>
+            Jon Peterson <span class="text-body-secondary">(IAB Liaison)</span>,
+            Tim Polk <span class="text-body-secondary">(IESG Liaison)</span>,
+            Henk Uijterwall <span class="text-body-secondary">(IAOC liaison)</span>,
+            TBA <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2008">
@@ -218,9 +218,9 @@ <h2 class="mt-5" id="y2008">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Dave Oran <span class="text-muted">(IAB Liaison)</span>,
-            Ross Callon <span class="text-muted">(IESG Liaison)</span>,
-            Bert Wijnen <span class="text-muted">(ISOC Liaison)</span>
+            Dave Oran <span class="text-body-secondary">(IAB Liaison)</span>,
+            Ross Callon <span class="text-body-secondary">(IESG Liaison)</span>,
+            Bert Wijnen <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2007">
@@ -258,9 +258,9 @@ <h2 class="mt-5" id="y2007">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Danny McPherson <span class="text-muted">(IAB Liaison)</span>,
-            Lars Eggert <span class="text-muted">(IESG Liaison)</span>,
-            Fred Baker <span class="text-muted">(ISOC Liaison)</span>
+            Danny McPherson <span class="text-body-secondary">(IAB Liaison)</span>,
+            Lars Eggert <span class="text-body-secondary">(IESG Liaison)</span>,
+            Fred Baker <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2006">
@@ -277,7 +277,7 @@ <h2 class="mt-5" id="y2006">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Ralph Droms <span class="text-muted">(Previous Chair)</span>
+            Ralph Droms <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -298,9 +298,9 @@ <h2 class="mt-5" id="y2006">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Olaf Kolkman <span class="text-muted">(IAB Liaison)</span>,
-            Cullen Jennings <span class="text-muted">(IESG Liaison)</span>,
-            Fred Baker <span class="text-muted">(ISOC Liaison)</span>
+            Olaf Kolkman <span class="text-body-secondary">(IAB Liaison)</span>,
+            Cullen Jennings <span class="text-body-secondary">(IESG Liaison)</span>,
+            Fred Baker <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2005">
@@ -317,7 +317,7 @@ <h2 class="mt-5" id="y2005">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Danny McPherson <span class="text-muted">(Previous Chair)</span>
+            Danny McPherson <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -338,9 +338,9 @@ <h2 class="mt-5" id="y2005">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            David Meyer <span class="text-muted">(IAB Liaison)</span>,
-            Russ Housley <span class="text-muted">(IESG Liaison)</span>,
-            Steve Crocker <span class="text-muted">(ISOC Liaison)</span>
+            David Meyer <span class="text-body-secondary">(IAB Liaison)</span>,
+            Russ Housley <span class="text-body-secondary">(IESG Liaison)</span>,
+            Steve Crocker <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2004">
@@ -357,7 +357,7 @@ <h2 class="mt-5" id="y2004">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Richard Draves <span class="text-muted">(Previous Chair)</span>
+            Richard Draves <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -378,10 +378,10 @@ <h2 class="mt-5" id="y2004">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Eric Rescorla <span class="text-muted">(IAB Liaison)</span>,
-            Alex Zinin <span class="text-muted">(IESG Liaison)</span>,
-            Steve Crocker <span class="text-muted">(ISOC Liaison)</span>,
-            Richard Draves <span class="text-muted">(Previous Chair/Advisor)</span>
+            Eric Rescorla <span class="text-body-secondary">(IAB Liaison)</span>,
+            Alex Zinin <span class="text-body-secondary">(IESG Liaison)</span>,
+            Steve Crocker <span class="text-body-secondary">(ISOC Liaison)</span>,
+            Richard Draves <span class="text-body-secondary">(Previous Chair/Advisor)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2003">
@@ -398,7 +398,7 @@ <h2 class="mt-5" id="y2003">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Phil Roberts <span class="text-muted">(Previous Chair)</span>
+            Phil Roberts <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -419,8 +419,8 @@ <h2 class="mt-5" id="y2003">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Geoff Huston <span class="text-muted">(IAB Liaison)</span>,
-            Bill Fenner <span class="text-muted">(IESG liaison)</span>
+            Geoff Huston <span class="text-body-secondary">(IAB Liaison)</span>,
+            Bill Fenner <span class="text-body-secondary">(IESG liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2002">
@@ -437,7 +437,7 @@ <h2 class="mt-5" id="y2002">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Theodore Ts'o <span class="text-muted">(Previous Chair)</span>
+            Theodore Ts'o <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -458,8 +458,8 @@ <h2 class="mt-5" id="y2002">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Eric Rescorla <span class="text-muted">(IAB liaison)</span>,
-            Allison Mankin <span class="text-muted">(IETF liaison)</span>
+            Eric Rescorla <span class="text-body-secondary">(IAB liaison)</span>,
+            Allison Mankin <span class="text-body-secondary">(IETF liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2001">
@@ -476,7 +476,7 @@ <h2 class="mt-5" id="y2001">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Bernard Aboba <span class="text-muted">(Previous Chair)</span>
+            Bernard Aboba <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -497,8 +497,8 @@ <h2 class="mt-5" id="y2001">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Fred Baker <span class="text-muted">(IAB liaison)</span>,
-            Thomas Narten <span class="text-muted">(IESG Liaison)</span>
+            Fred Baker <span class="text-body-secondary">(IAB liaison)</span>,
+            Thomas Narten <span class="text-body-secondary">(IESG Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2000">
@@ -515,7 +515,7 @@ <h2 class="mt-5" id="y2000">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Avri Doria <span class="text-muted">(Previous Chair)</span>
+            Avri Doria <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -536,8 +536,8 @@ <h2 class="mt-5" id="y2000">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Leslie Daigle <span class="text-muted">(IAB Liaison)</span>,
-            Allison Mankin <span class="text-muted">(IESG Liaison)</span>
+            Leslie Daigle <span class="text-body-secondary">(IAB Liaison)</span>,
+            Allison Mankin <span class="text-body-secondary">(IESG Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y1999">
@@ -554,7 +554,7 @@ <h2 class="mt-5" id="y1999">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Donald E. Eastlake <span class="text-muted">(Previous Chair)</span>
+            Donald E. Eastlake <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -575,8 +575,8 @@ <h2 class="mt-5" id="y1999">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Geoff Huston <span class="text-muted">(IAB Liaison)</span>,
-            Thomas Narten <span class="text-muted">(IESG Liaison)</span>
+            Geoff Huston <span class="text-body-secondary">(IAB Liaison)</span>,
+            Thomas Narten <span class="text-body-secondary">(IESG Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y1998">
@@ -593,7 +593,7 @@ <h2 class="mt-5" id="y1998">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Michael St Johns <span class="text-muted">(Previous Chair)</span>
+            Michael St Johns <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -614,9 +614,9 @@ <h2 class="mt-5" id="y1998">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Steven Bellovin <span class="text-muted">(IAB Liaison)</span>,
-            Bert Wijnen <span class="text-muted">(IESG Liaison)</span>,
-            Michael St Johns <span class="text-muted">(Previous Chair)</span>
+            Steven Bellovin <span class="text-body-secondary">(IAB Liaison)</span>,
+            Bert Wijnen <span class="text-body-secondary">(IESG Liaison)</span>,
+            Michael St Johns <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y1997">
@@ -633,7 +633,7 @@ <h2 class="mt-5" id="y1997">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Geoff Huston <span class="text-muted">(Previous Chair)</span>
+            Geoff Huston <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -654,8 +654,8 @@ <h2 class="mt-5" id="y1997">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Tony Hain <span class="text-muted">(IAB Liaison)</span>,
-            Scott Bradner <span class="text-muted">(IESG Liaison)</span>,
+            Tony Hain <span class="text-body-secondary">(IAB Liaison)</span>,
+            Scott Bradner <span class="text-body-secondary">(IESG Liaison)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1996">
@@ -672,7 +672,7 @@ <h2 class="mt-5" id="y1996">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Guy Almes <span class="text-muted">(Previous Chair)</span>
+            Guy Almes <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -693,10 +693,10 @@ <h2 class="mt-5" id="y1996">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Radia Perlman <span class="text-muted">(IAB Liaison)</span>,
-            Joyce Reynolds <span class="text-muted">(IESG Liaison)</span>,
-            Christian Huitema <span class="text-muted">(ISOC Liaison)</span>,
-            Guy Almes <span class="text-muted">(Previous Chair)</span>,
+            Radia Perlman <span class="text-body-secondary">(IAB Liaison)</span>,
+            Joyce Reynolds <span class="text-body-secondary">(IESG Liaison)</span>,
+            Christian Huitema <span class="text-body-secondary">(ISOC Liaison)</span>,
+            Guy Almes <span class="text-body-secondary">(Previous Chair)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1995">
@@ -713,7 +713,7 @@ <h2 class="mt-5" id="y1995">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            John Curran <span class="text-muted">(Previous Chair)</span>
+            John Curran <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -734,8 +734,8 @@ <h2 class="mt-5" id="y1995">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Bob Moskowitz <span class="text-muted">(IAB Liaison)</span>,
-            Harald Alvestrand <span class="text-muted">(IESG Liaison)</span>,
+            Bob Moskowitz <span class="text-body-secondary">(IAB Liaison)</span>,
+            Harald Alvestrand <span class="text-body-secondary">(IESG Liaison)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1994">
@@ -752,7 +752,7 @@ <h2 class="mt-5" id="y1994">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Fred Baker <span class="text-muted">(Previous Chair)</span>
+            Fred Baker <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -796,9 +796,9 @@ <h2 class="mt-5" id="y1993">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Bob Braden <span class="text-muted">(IAB Liaison)</span>,
-            Stev Knowles <span class="text-muted">(IESG Liaison)</span>,
-            Jon Postel <span class="text-muted">(IRSG Liaison)</span>,
+            Bob Braden <span class="text-body-secondary">(IAB Liaison)</span>,
+            Stev Knowles <span class="text-body-secondary">(IESG Liaison)</span>,
+            Jon Postel <span class="text-body-secondary">(IRSG Liaison)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1992">
@@ -821,10 +821,10 @@ <h2 class="mt-5" id="y1992">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Barry Leiner <span class="text-muted">(IAB Liaison)</span>,
-            Erik Huizer <span class="text-muted">(IESG Liaison)</span>,
-            Jon Postel <span class="text-muted">(IRSG Liaison)</span>,
-            Geoff Huston <span class="text-muted">(ISOC Liaison)</span>,
+            Barry Leiner <span class="text-body-secondary">(IAB Liaison)</span>,
+            Erik Huizer <span class="text-body-secondary">(IESG Liaison)</span>,
+            Jon Postel <span class="text-body-secondary">(IRSG Liaison)</span>,
+            Geoff Huston <span class="text-body-secondary">(ISOC Liaison)</span>,
         </dd>
     </dl>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 2a0495fbe6..dcf1edc971 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -13,7 +13,7 @@ <h1>
         NomCom {{ year }}
         {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill bg-info">Concluded</span>{% endif %}
         <br>
-        <small class="text-muted">Private area
+        <small class="text-body-secondary">Private area
             {% if is_chair_task %}- Chair/Advisors only{% endif %}
         </small>
     </h1>
diff --git a/ietf/templates/nomcom/public_nominate.html b/ietf/templates/nomcom/public_nominate.html
index 084c1ee8d6..5320eb2acf 100644
--- a/ietf/templates/nomcom/public_nominate.html
+++ b/ietf/templates/nomcom/public_nominate.html
@@ -24,7 +24,7 @@ <h2>Nominate Candidate</h2>
                 <h2>
                     Nominees
                     <br>
-                    <small class="text-muted">who accepted nominations</small>
+                    <small class="text-body-secondary">who accepted nominations</small>
                 </h2>
                 {% for p in positions %}
                     {% if p.nomineeposition_set.accepted.not_duplicated %}
diff --git a/ietf/templates/person/person_link.html b/ietf/templates/person/person_link.html
index 32506501b5..74ab43b945 100644
--- a/ietf/templates/person/person_link.html
+++ b/ietf/templates/person/person_link.html
@@ -1,8 +1,8 @@
-{% if email and email == "system@datatracker.ietf.org" or name and name == "(System)" %}<span class="text-muted">(System)</span>{% else %}<span {% if class %}class="{{ class }}"
+{% if email and email == "system@datatracker.ietf.org" or name and name == "(System)" %}<span class="text-body-secondary">(System)</span>{% else %}<span {% if class %}class="{{ class }}"
       {% endif %}>{% if email or name %}<a {% if class %}class="text-reset"{% endif %}
            title="{% if title %}{{ title }}{% else %}Datatracker profile of {{ name }}.{% endif %}"
            {% if email %} href="{% url 'ietf.person.views.profile' email_or_name=email %}" {% else %} href="{% url 'ietf.person.views.profile' email_or_name=name %}" {% endif %}>{{ name }}</a>{% if email and with_email %} <a {% if class %}class="text-reset"{% endif %}
                href="mailto:{{ email|urlencode }}"
                aria-label="Compose email to {{ email }}."
                title="Compose email to {{ email }}.">
-                <i class="bi bi-envelope"></i></a>{% endif %}{% else %}<span class="text-muted">(None)</span>{% endif %}</span>{% endif %}
\ No newline at end of file
+                <i class="bi bi-envelope"></i></a>{% endif %}{% else %}<span class="text-body-secondary">(None)</span>{% endif %}</span>{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html
index f443debd9e..e597ef4b52 100644
--- a/ietf/templates/person/profile.html
+++ b/ietf/templates/person/profile.html
@@ -22,11 +22,11 @@ <h1>
             {{ person.name }}
             {% if person.ascii != person.name %}
                 <br>
-                <span class="text-muted fs-2">({{ person.ascii }})</span>
+                <span class="text-body-secondary fs-2">({{ person.ascii }})</span>
             {% endif %}
             {% if person.pronouns %}
                 <br>
-                <span class="text-muted fs-3">Pronouns: {{person.pronouns}}</span>
+                <span class="text-body-secondary fs-3">Pronouns: {{person.pronouns}}</span>
             {% endif %}
         </h1>
         <div class="bio-text">
@@ -87,7 +87,7 @@ <h2 class="mt-5" id="extresources-{{ forloop.counter }}">External Resources</h2>
             </table>
         {% endif %}
         <h2 class="mt-5" id="rfcs-{{ forloop.counter }}">
-            RFCs <small class="text-muted">({{ person.rfcs|length }})</small>
+            RFCs <small class="text-body-secondary">({{ person.rfcs|length }})</small>
         </h2>
         {% if person.rfcs %}
             <table class="table table-sm table-striped tablesorter">
@@ -126,7 +126,7 @@ <h2 class="mt-5" id="rfcs-{{ forloop.counter }}">
             {{ person.first_name }} has no RFCs as of {{ today|date:"Y-m-d" }}.
         {% endif %}
         <h2 class="mt-5" id="drafts-{{ forloop.counter }}">
-            Active Internet-Drafts <small class="text-muted">({{ person.active_drafts|length }})</small>
+            Active Internet-Drafts <small class="text-body-secondary">({{ person.active_drafts|length }})</small>
         </h2>
         {% if person.active_drafts.exists %}
             <ul>
@@ -140,7 +140,7 @@ <h2 class="mt-5" id="drafts-{{ forloop.counter }}">
             {{ person.first_name }} has no active Internet-Drafts as of {{ today|date:"Y-m-d" }}.
         {% endif %}
         <h2 class="mt-5">
-            Expired Internet-Drafts <small class="text-muted">({{ person.expired_drafts|length }})</small>
+            Expired Internet-Drafts <small class="text-body-secondary">({{ person.expired_drafts|length }})</small>
         </h2>
         {% if person.expired_drafts.exists %}
             <ul>
diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html
index 07783311df..1837016b15 100644
--- a/ietf/templates/registration/edit_profile.html
+++ b/ietf/templates/registration/edit_profile.html
@@ -229,7 +229,7 @@ <h1>Your account</h1>
                 $('<input class="form-control mb-1" name="new_email" placeholder="You will get a confirmation challenge. To add an address that cannot be confirmed this way, contact the secretariat.">')
                     .appendTo(container)
                     .trigger("focus");
-                $('<div class="float-end text-muted small mb-3">Remember to submit the form for the new email challenge to be sent.</div>')
+                $('<div class="float-end text-body-secondary small mb-3">Remember to submit the form for the new email challenge to be sent.</div>')
                     .appendTo(container);
             })
         });
diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html
index 0dbbcd835e..04dbf94807 100644
--- a/ietf/templates/stats/review_stats.html
+++ b/ietf/templates/stats/review_stats.html
@@ -297,7 +297,7 @@ <h2>
             </script>
         {% endif %}
         {% if stats_type != "time" %}
-            <p class="text-muted text-end">
+            <p class="text-body-secondary text-end">
                 Note:
                 {% if level == "team" %}
                     teams
diff --git a/ietf/templates/submit/email.html b/ietf/templates/submit/email.html
index 44f2729058..dde4fa50c1 100644
--- a/ietf/templates/submit/email.html
+++ b/ietf/templates/submit/email.html
@@ -12,7 +12,7 @@
     <h1>
         Email related to
         <br>
-        <small class="text-muted">{{ submission.name }}</small>
+        <small class="text-body-secondary">{{ submission.name }}</small>
     </h1>
     <form method="post" class="show-required my-3">
         {% csrf_token %}
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index 4235a4375a..feebf8fad1 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -293,7 +293,7 @@ <h2 class="mt-5">Meta-data from the submission</h2>
                         {% if author.country %}
                             {{ author.country }}
                             {% if author.cleaned_country and author.country != author.cleaned_country %}
-                                <span class="text-muted">(understood to be {{ author.cleaned_country }})</span>
+                                <span class="text-body-secondary">(understood to be {{ author.cleaned_country }})</span>
                             {% endif %}
                         {% else %}
                             <i>unknown country</i>
diff --git a/ietf/templates/sync/discrepancies.html b/ietf/templates/sync/discrepancies.html
index 9e50fd9bfc..7561e39a20 100644
--- a/ietf/templates/sync/discrepancies.html
+++ b/ietf/templates/sync/discrepancies.html
@@ -34,7 +34,7 @@ <h2>{{ title }}</h2>
                 </tbody>
             </table>
         {% else %}
-            <p class="text-muted">
+            <p class="text-body-secondary">
                 (None)
             </p>
         {% endif %}