diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py
index 9ddb3833a..ebcc605cd 100644
--- a/ietf/doc/templatetags/ballot_icon.py
+++ b/ietf/doc/templatetags/ballot_icon.py
@@ -212,9 +212,9 @@ def state_age_colored(doc):
             goal1 = 14
             goal2 = 28
         if days > goal2:
-            class_name = "bg-danger"
+            class_name = "text-bg-danger"
         elif days > goal1:
-            class_name = "bg-warning"
+            class_name = "text-bg-warning"
         else:
             # don't show a badge when things are in the green; clutters display
             # class_name = "text-success"
@@ -247,6 +247,6 @@ def auth48_alert_badge(doc):
 
     rfced_state = doc.get_state_slug('draft-rfceditor')
     if rfced_state == 'auth48':
-        return mark_safe('<span class="badge rounded-pill bg-info" title="AUTH48">AUTH48</span>')
+        return mark_safe('<span class="badge rounded-pill text-bg-info" title="AUTH48">AUTH48</span>')
 
     return ''
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index 1c5836328..bc1141bb9 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -704,10 +704,10 @@ def action_holder_badge(action_holder):
     ''
 
     >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=16)))
-    '<span class="badge rounded-pill bg-danger" title="In state for 16 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 16</span>'
+    '<span class="badge rounded-pill text-bg-danger" title="In state for 16 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 16</span>'
 
     >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=30)))
-    '<span class="badge rounded-pill bg-danger" title="In state for 30 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 30</span>'
+    '<span class="badge rounded-pill text-bg-danger" title="In state for 30 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 30</span>'
 
     >>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit
     """
@@ -715,7 +715,7 @@ def action_holder_badge(action_holder):
     age = (timezone.now() - action_holder.time_added).days
     if age > age_limit:
         return mark_safe(
-            '<span class="badge rounded-pill bg-danger" title="In state for %d day%s; goal is &lt;%d days."><i class="bi bi-clock-fill"></i> %d</span>'
+            '<span class="badge rounded-pill text-bg-danger" title="In state for %d day%s; goal is &lt;%d days."><i class="bi bi-clock-fill"></i> %d</span>'
             % (age, "s" if age != 1 else "", age_limit, age)
         )
     else:
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index 5a949b091..babd07d62 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -434,8 +434,8 @@ class SearchTests(TestCase):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(len(q('td.doc')),3)
-        self.assertTrue(q('td.status span.bg-warning[title*="%s"]' % "for 15 days"))
-        self.assertTrue(q('td.status span.bg-danger[title*="%s"]' % "for 29 days"))
+        self.assertTrue(q('td.status span.text-bg-warning[title*="%s"]' % "for 15 days"))
+        self.assertTrue(q('td.status span.text-bg-danger[title*="%s"]' % "for 29 days"))
         for ah in [draft.action_holders.first() for draft in drafts]:
             self.assertContains(r, escape(ah.name))
 
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index 672d18c8f..cc90c4477 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -478,13 +478,13 @@ class GroupPagesTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(q('.badge.bg-warning').text(),"Concluded WG")
+        self.assertEqual(q('.badge.text-bg-warning').text(),"Concluded WG")
         replaced_group = GroupFactory(state_id='replaced')
         url = urlreverse("ietf.group.views.history",kwargs={'acronym':replaced_group.acronym})
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(q('.badge.bg-warning').text(),"Replaced WG")
+        self.assertEqual(q('.badge.text-bg-warning').text(),"Replaced WG")
 
 
 class GroupEditTests(TestCase):
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index bce7e5a21..322dac6b6 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -1485,7 +1485,7 @@ class FeedbackLastSeenTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 4 )
+        self.assertEqual( len(q('.text-bg-success')), 4 )
 
         f = self.nc.feedback_set.first()
         f.time = self.hour_ago
@@ -1495,20 +1495,20 @@ class FeedbackLastSeenTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 3 )
+        self.assertEqual( len(q('.text-bg-success')), 3 )
 
         FeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 1 )
+        self.assertEqual( len(q('.text-bg-success')), 1 )
 
         TopicFeedbackLastSeen.objects.create(reviewer=self.member,topic=self.topic)
         TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
     def test_feedback_nominee_badges(self):
         url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
@@ -1517,7 +1517,7 @@ class FeedbackLastSeenTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 3 )
+        self.assertEqual( len(q('.text-bg-success')), 3 )
 
         f = self.nc.feedback_set.first()
         f.time = self.hour_ago
@@ -1527,13 +1527,13 @@ class FeedbackLastSeenTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 2 )
+        self.assertEqual( len(q('.text-bg-success')), 2 )
 
         FeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
     def test_feedback_topic_badges(self):
         url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id})
@@ -1542,7 +1542,7 @@ class FeedbackLastSeenTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 1 )
+        self.assertEqual( len(q('.text-bg-success')), 1 )
 
         f = self.topic.feedback_set.first()
         f.time = self.hour_ago
@@ -1552,13 +1552,13 @@ class FeedbackLastSeenTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
         TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
 class NewActiveNomComTests(TestCase):
 
diff --git a/ietf/static/js/password_strength.js b/ietf/static/js/password_strength.js
index eaeed2e1c..4df5c1443 100644
--- a/ietf/static/js/password_strength.js
+++ b/ietf/static/js/password_strength.js
@@ -30,7 +30,7 @@
 
             widget
                 .find(".label-danger")
-                .addClass("bg-danger")
+                .addClass("text-bg-danger")
                 .removeClass("label-danger");
 
             widget
@@ -64,13 +64,13 @@
                             .val());
 
                         if (result.score < 3) {
-                            password_strength_bar.removeClass('bg-success')
-                                .addClass('bg-warning');
+                            password_strength_bar.removeClass('text-bg-success')
+                                .addClass('text-bg-warning');
                             password_strength_info.find('.badge')
                                 .removeClass('d-none');
                         } else {
-                            password_strength_bar.removeClass('bg-warning')
-                                .addClass('bg-success');
+                            password_strength_bar.removeClass('text-bg-warning')
+                                .addClass('text-bg-success');
                             password_strength_info.find('.badge')
                                 .addClass('d-none');
                         }
@@ -86,8 +86,8 @@
                             .html(result.crack_times_display.offline_slow_hashing_1e4_per_second);
                         password_strength_offline_info.removeClass('d-none');
                     } else {
-                        password_strength_bar.removeClass('bg-success')
-                            .addClass('bg-warning');
+                        password_strength_bar.removeClass('text-bg-success')
+                            .addClass('text-bg-warning');
                         password_strength_bar.width('0%')
                             .attr('aria-valuenow', 0);
                         password_strength_info.addClass('d-none');
@@ -186,4 +186,4 @@
     // Call the init for backwards compatibility
     djangoPasswordStrength.init();
 
-})(jQuery, window, document);
\ No newline at end of file
+})(jQuery, window, document);
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index c284e44da..fc5f26ac0 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -35,7 +35,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 fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle navbar-light{% else %}navbar-dark bg-secondary{% endif %}">
+        <nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary{% endif %}">
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
                     <img alt="IETF Logo" class="me-2"
diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html
index 54bd68a41..d39180407 100644
--- a/ietf/templates/doc/charter/submit.html
+++ b/ietf/templates/doc/charter/submit.html
@@ -39,7 +39,7 @@
                 <th scope="row">State</th>
                 <td>
                     {{ group.state.name }}
-                    {% if requested_close %}<div class="badge rounded-pill bg-info">In the process of being closed</div>{% endif %}
+                    {% if requested_close %}<div class="badge rounded-pill text-bg-info">In the process of being closed</div>{% endif %}
                 </td>
             </tr>
         </tbody>
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index 6a12fe9a0..803ed84a3 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -104,7 +104,7 @@
                     </div>
                     {% if p.pos.blocking and p.discuss %}
                         <div class="card border-danger {% if p.comment %} mb-2{% endif %}">
-                            <div class="card-header bg-danger text-light">
+                            <div class="card-header text-bg-danger">
                                 <div>
                                     <b>{{ p.pos.name }}</b>
                                     ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision and p.get_dochistory.rev %}{% if p.discuss_time %} {% endif %}for -{{ p.get_dochistory.rev }}{% endif %})
@@ -180,7 +180,7 @@
                     <div class="h5 d-flex mt-4"
                          id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
                         <div class="flex-fill text-body-secondary">
-                            {{ p.balloter.plain_name }} <span class="badge rounded-pill bg-secondary">Former IESG member</span>
+                            {{ p.balloter.plain_name }} <span class="badge rounded-pill text-bg-secondary">Former IESG member</span>
                         </div>
                         <div class="flex-fill text-end">
                             {% if p.old_positions %}<span class="text-body-secondary small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html
index 9fb4030b9..cbf64c148 100644
--- a/ietf/templates/doc/document_bofreq.html
+++ b/ietf/templates/doc/document_bofreq.html
@@ -21,7 +21,7 @@
                 <td class="edit"></td>
                 <td>
                     {{ doc.get_state.slug|capfirst }} BOF request
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index df5d702e4..08584849d 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -59,7 +59,7 @@
                 <th scope="row">
                     {{ group.name }} {{ group.type.name }}
                     <a href="{{ group.about_url }}">({{ group.acronym }})</a>
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </th>
             </tr>
             <tr>
@@ -94,8 +94,8 @@
                     {% else %}
                         No document state
                     {% endif %}
-                    {% if chartering == "initial" %}<span class="badge rounded-pill bg-info">Initial chartering</span>{% endif %}
-                    {% if chartering == "rechartering" %}<span class="badge rounded-pill bg-info">Rechartering</span>{% endif %}
+                    {% if chartering == "initial" %}<span class="badge rounded-pill text-bg-info">Initial chartering</span>{% endif %}
+                    {% if chartering == "rechartering" %}<span class="badge rounded-pill text-bg-info">Rechartering</span>{% endif %}
                 </td>
             </tr>
         </tbody>
diff --git a/ietf/templates/doc/document_chatlog.html b/ietf/templates/doc/document_chatlog.html
index 4e4738250..7c97471e6 100644
--- a/ietf/templates/doc/document_chatlog.html
+++ b/ietf/templates/doc/document_chatlog.html
@@ -26,7 +26,7 @@
                         <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
                         {{ doc.group.type.name }}
                     {% endif %}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index ccdaa9a13..d530bbbb9 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -29,8 +29,8 @@
                 <td>
                     <a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.canonical_name %}">
                         {% if conflictdoc.get_state_slug == 'rfc' %}{{ conflictdoc.canonical_name|prettystdname }}{% else %}{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endif %}</a>
-                    <span class="badge rounded-pill bg-info">{{ conflictdoc.stream }} stream</span>
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    <span class="badge rounded-pill text-bg-info">{{ conflictdoc.stream }} stream</span>
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 62c4120f2..15555096a 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -224,7 +224,7 @@
                                    href="{% url 'ietf.doc.views_doc.document_shepherd_writeup' name=doc.name %}">
                                     Show
                                 </a>
-                                <span class="badge rounded-pill bg-secondary">Last changed {{ shepherd_writeup.time|date:"Y-m-d" }}</span>
+                                <span class="badge rounded-pill text-bg-secondary">Last changed {{ shepherd_writeup.time|date:"Y-m-d" }}</span>
                             {% else %}
                                 <span class="text-body-secondary">
                                     (None)
@@ -644,7 +644,7 @@
                 </i>
                 IPR
                 {% if doc.related_ipr %}
-                    <span class="badge rounded-pill">
+                    <span class="badge rounded-pill text-bg-secondary">
                         {{ doc.related_ipr|length }}
                     </span>
                 {% endif %}
@@ -786,7 +786,7 @@
             {% endif %}
         {% else %}
             <div class="card border-warning mt-5">
-                <div class="card-header bg-warning">
+                <div class="card-header text-bg-warning">
                     <p><b>This Internet-Draft is no longer active. A copy of
                     the expired Internet-Draft is available in these formats:</b></p>
 
diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html
index fcfde7f96..b16b84417 100644
--- a/ietf/templates/doc/document_info.html
+++ b/ietf/templates/doc/document_info.html
@@ -26,7 +26,7 @@
                 {% endif %}
                 {% if document_html %}<br>{% endif %}
                 {% if has_verified_errata or has_errata %}
-                    <a class="{% if document_html %}btn btn-primary btn-sm my-1{% else %}badge rounded-pill bg-danger text-decoration-none text-light{% endif %}"
+                    <a class="{% if document_html %}btn btn-primary btn-sm my-1{% else %}badge rounded-pill text-bg-danger text-decoration-none{% endif %}"
                        href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}" title="Click to view errata." rel="nofollow">
                         {% if document_html %}View errata{% else %}Errata{% endif %}
                     </a>
@@ -40,7 +40,7 @@
                     </a>
                 {% endif %}
                 {% if doc.related_ipr %}
-                    <a title="Click to view IPR declarations." class="{% if document_html %}btn btn-warning btn-sm my-1{% else %}badge rounded-pill bg-warning text-decoration-none text-light{% endif %}" href="{% url 'ietf.ipr.views.search' %}?submit=draft&amp;id={{ doc.name }}">IPR</a>
+                    <a title="Click to view IPR declarations." class="{% if document_html %}btn btn-warning btn-sm my-1{% else %}badge rounded-pill text-bg-warning text-decoration-none{% endif %}" href="{% url 'ietf.ipr.views.search' %}?submit=draft&amp;id={{ doc.name }}">IPR</a>
                 {% endif %}
                 {% if obsoleted_by %}<div>Obsoleted by {{ obsoleted_by|urlize_related_source_list:document_html|join:", " }}</div>{% endif %}
                 {% if updated_by %}<div>Updated by {{ updated_by|urlize_related_source_list:document_html|join:", " }}</div>{% endif %}
@@ -72,7 +72,7 @@
                 {% endif %}
             {% endif %}
             {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %}
-                <div class="badge rounded-pill bg-warning{% if not document_html %} float-end{% endif %}">
+                <div class="badge rounded-pill text-bg-warning{% if not document_html %} float-end{% endif %}">
                     Expired &amp; archived
                 </div>
             {% endif %}
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index a52dcd07b..189c635ce 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -26,7 +26,7 @@
                         <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
                         {{ doc.group.type.name }}
                     {% endif %}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
diff --git a/ietf/templates/doc/document_polls.html b/ietf/templates/doc/document_polls.html
index 3254f64eb..06ddc31b0 100644
--- a/ietf/templates/doc/document_polls.html
+++ b/ietf/templates/doc/document_polls.html
@@ -26,7 +26,7 @@
                         <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
                         {{ doc.group.type.name }}
                     {% endif %}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index 958108bdd..e8260ab3d 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -44,7 +44,7 @@
                             <a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
                             {% if ref.target.name != alias_name %}
                                 <br>
-                                <span class="badge rounded-pill bg-info">As {{ ref.target.name }}</span>
+                                <span class="badge rounded-pill text-bg-info">As {{ ref.target.name }}</span>
                             {% endif %}
                         </td>
                         <td>
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 87e0384b7..bfb52a49f 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -35,7 +35,7 @@
                 </td>
                 <th scope="row">
                     {{ doc.title }}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </th>
             </tr>
             <tr>
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index 14bdd3bee..e391f90aa 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -221,7 +221,7 @@
                         {{ assignment.state.name }}
                     </span>
                     {% if snapshot %}
-                        <span class="badge rounded-pill bg-warning">
+                        <span class="badge rounded-pill text-bg-warning">
                             Snapshot
                         </span>
                     {% endif %}
diff --git a/ietf/templates/doc/review_assignment_summary.html b/ietf/templates/doc/review_assignment_summary.html
index b45c27da6..f1ebfeb2d 100644
--- a/ietf/templates/doc/review_assignment_summary.html
+++ b/ietf/templates/doc/review_assignment_summary.html
@@ -10,10 +10,10 @@
                 -{{ review_assignment.reviewed_rev }}){% endif %}
             by {{ review_assignment.reviewer.person.plain_name }}</a>
         {% if review_assignment.state_id == "part-completed" %}
-            <span class="badge rounded-pill ms-1 bg-secondary">Partially completed</span>
+            <span class="badge rounded-pill text-bg-secondary ms-1">Partially completed</span>
         {% endif %}
         {% if review_assignment.result %}
-            <span class="badge rounded-pill ms-1 {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% else %}bg-info{% endif %}">
+            <span class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}text-bg-success{% else %}text-bg-info{% endif %} ms-1">
                 {{ review_assignment.result.name }}
             </span>
         {% endif %}
@@ -21,7 +21,7 @@
         <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">
+        <span class="badge rounded-pill text-bg-secondary ms-1">
             Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}
         </span>
     {% endif %}
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 57632651f..b67d4ca58 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -85,12 +85,12 @@
             {% endcomment %}
             <b>{{ doc.title }}</b>
             {% if doc.has_verified_errata %}
-                <a class="badge rounded-pill bg-danger text-decoration-none text-light float-end"
+                <a class="badge rounded-pill text-bg-danger text-decoration-none float-end"
                    href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">
                     Errata
                 </a>
             {% elif doc.has_errata %}
-                <a class="badge rounded-pill bg-warning text-decoration-none text-light float-end"
+                <a class="badge rounded-pill text-bg-warning text-decoration-none float-end"
                    href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">
                     Errata
                 </a>
@@ -124,19 +124,19 @@
                 {% if doc.latest_revision_date|timesince_days|new_enough:request %}
                     <br>
                     <div class="float-end">
-                        <span class="badge rounded-pill bg-success">New</span>
+                        <span class="badge rounded-pill text-bg-success">New</span>
                     </div>
                 {% endif %}
                 {% if doc.get_state_slug == "active" and doc.expirable and doc.expires|timesince_days|expires_soon:request %}
                     <br>
-                    <span class="badge rounded-pill bg-warning">Expires soon</span>
+                    <span class="badge rounded-pill text-bg-warning">Expires soon</span>
                 {% endif %}
             </td>
             {% include "doc/search/status_columns.html" %}
             <td class="text-center d-none d-sm-table-cell">
                 {% if doc.related_ipr %}
                     <a href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}">
-                        <span class="badge rounded-pill bg-info">{{ doc.related_ipr|length }}</span>
+                        <span class="badge rounded-pill text-bg-info">{{ doc.related_ipr|length }}</span>
                     </a>
                 {% endif %}
             </td>
diff --git a/ietf/templates/doc/search/status_columns.html b/ietf/templates/doc/search/status_columns.html
index 556cbb799..5e5c7b5d4 100644
--- a/ietf/templates/doc/search/status_columns.html
+++ b/ietf/templates/doc/search/status_columns.html
@@ -52,9 +52,9 @@
             {% for review_assignment in doc.review_assignments %}
                 {% if review_assignment.state_id == "completed" or review_assignment.state_id == "part-completed" %}
                     <span title="{{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} review {% if review_assignment.reviewed_rev and review_assignment.reviewed_rev != current_rev or review_assignment.review_request.doc.name != current_doc_name %}of {% if review_assignment.review_request.doc.name != current_doc_name %}{{ review_assignment.review_request.doc.name }}{% endif %}-{{ review_assignment.reviewed_rev }}{% endif %}: {{review_assignment.result}}"
-                    class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% elif review_assignment.result.name|slice:9|slugify == 'not-ready' %}bg-danger{% elif review_assignment.result.name|slice:10|slugify == 'has-issues' %}bg-warning{% else %}bg-info{% endif %}">
+                    class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}text-bg-success{% elif review_assignment.result.name|slice:9|slugify == 'not-ready' %}text-bg-danger{% elif review_assignment.result.name|slice:10|slugify == 'has-issues' %}text-bg-warning{% else %}text-bg-info{% endif %}">
                     {% else %}
-                        <span title="Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}" class="badge rounded-pill bg-secondary">
+                        <span title="Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}" class="badge rounded-pill text-bg-secondary">
                     {% endif %}
                     <a class="text-reset text-decoration-none" href="{% if review_assignment.review %}{% url 'ietf.doc.views_doc.document_main' review_assignment.review.name %}{% else %}{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}{% endif %}">
                         {{ review_assignment.review_request.team.acronym }}
@@ -92,4 +92,4 @@
             <span class="text-body-secondary">Updated by {{ doc.updated_by_list|join:", "|urlize_ietf_docs }}</span>
         {% endif %}
     {% endif %}
-</td>
+</td>
\ No newline at end of file
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index 1dc301e0c..0e581ea7c 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -26,7 +26,7 @@
                 {% for ad in area.ads_and_pre_ads %}
                     <li>
                         {% person_link ad.person %}
-                        {% if ad.name == "pre-ad" %}<span class="badge rounded-pill bg-info">Incoming AD</span>{% endif %}
+                        {% if ad.name == "pre-ad" %}<span class="badge rounded-pill text-bg-info">Incoming AD</span>{% endif %}
                     </li>
                 {% endfor %}
             </ul>
diff --git a/ietf/templates/group/all_status.html b/ietf/templates/group/all_status.html
index c480dac5f..7a4c6b651 100644
--- a/ietf/templates/group/all_status.html
+++ b/ietf/templates/group/all_status.html
@@ -17,7 +17,7 @@
                 <div class="card-header">
                     {{ rpt.group.acronym }}
                     {% if rpt.group.state.slug != "active" %}
-                        <span class="badge rounded-pill bg-success">{{ rpt.group.state.slug|upper }}</span>
+                        <span class="badge rounded-pill text-bg-success">{{ rpt.group.state.slug|upper }}</span>
                     {% endif %}
                     {{ rpt.time|date:"Y-m-d" }}
                 </div>
@@ -33,7 +33,7 @@
             <div class="card-header">
                 {{ rpt.group.acronym }}
                 {% if rpt.group.state.slug != "active" %}
-                    <span class="badge rounded-pill bg-success">{{ rpt.group.state.slug|upper }}</span>
+                    <span class="badge rounded-pill text-bg-success">{{ rpt.group.state.slug|upper }}</span>
                 {% endif %}
                 {{ rpt.time|date:"Y-m-d" }}
             </div>
diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html
index 5334c6a89..e0904d2f4 100644
--- a/ietf/templates/group/customize_workflow.html
+++ b/ietf/templates/group/customize_workflow.html
@@ -49,7 +49,7 @@
                             {{ state.name }}
                         </span>
                         {% 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 %}
+                        {% if state.mandatory %}<span class="badge rounded-pill text-bg-success">Mandatory</span>{% endif %}
                     </td>
                     <td class="next-states">
                         {% if state.used_next_states %}
@@ -79,7 +79,7 @@
                                     <input class="form-check-input" type="checkbox" name="next_states" value="{{ s.pk }}" id="id-{{ s.pk }}-{{ state.pk }}" {% if checked %} checked{% endif %}>
                                     <label class="form-check-label" for="id-{{ s.pk }}-{{ state.pk }}">
                                         {{ s.name }}
-                                        {% if default %}<span class="badge rounded-pill bg-secondary">Default</span>{% endif %}
+                                        {% if default %}<span class="badge rounded-pill text-bg-secondary">Default</span>{% endif %}
                                     </label>
                                 </div>
                             {% endfor %}
diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html
index 36a4a714c..297b92501 100644
--- a/ietf/templates/group/edit_milestones.html
+++ b/ietf/templates/group/edit_milestones.html
@@ -65,7 +65,7 @@
                     <div class="row milestone{% if form.delete.data %} delete{% endif %}">
                         <div class="due handle col-md-2 col-form-label col-form-label-md">
                             {% if form.milestone.resolved %}
-                                <span class="badge rounded-pill bg-success">{{ form.milestone.resolved }}</span>
+                                <span class="badge rounded-pill text-bg-success">{{ form.milestone.resolved }}</span>
                             {% elif group.uses_milestone_dates and form.milestone.due %}
                                 <b>{{ form.milestone.due|date:"M Y" }}</b>
                             {% endif %}
@@ -74,12 +74,12 @@
                             <b>{{ form.milestone.desc|urlize_ietf_docs }}</b>
                             {% if form.needs_review %}
                                 <span title="This milestone is not active yet, awaiting {{ reviewer }} acceptance"
-                                      class="badge rounded-pill bg-warning">
+                                      class="badge rounded-pill text-bg-warning">
                                     Awaiting accept
                                 </span>
                             {% endif %}
-                            {% if form.changed %}<span class="badge rounded-pill bg-info">Changed</span>{% endif %}
-                            {% if form.delete.data %}<span class="badge rounded-pill bg-danger">Deleted</span>{% endif %}
+                            {% if form.changed %}<span class="badge rounded-pill text-bg-info">Changed</span>{% endif %}
+                            {% if form.delete.data %}<span class="badge rounded-pill text-bg-danger">Deleted</span>{% endif %}
                             {% for d in form.docs_names %}<div class="doc">{{ d }}</div>{% endfor %}
                         </div>
                     </div>
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index 7e986c11c..27ebab35c 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -67,7 +67,7 @@ height: 100vh;
                 </td>
                 <td>
                     <span class="{% if group.state.name|slugify == 'active' %}text-success{% elif group.state.name|slugify == 'concluded' %}text-danger{% endif %}">{{ group.state.name }}</span>
-                    {% if requested_close %}<div class="badge rounded-pill bg-info">Being closed</div>{% endif %}
+                    {% if requested_close %}<div class="badge rounded-pill text-bg-info">Being closed</div>{% endif %}
                 </td>
             </tr>
             {% if group.features.has_chartering_process %}
@@ -80,7 +80,7 @@ height: 100vh;
                             <a href="{% url "ietf.doc.views_doc.document_main" name=group.charter.name %}">
                                 {{ group.charter.name }}-{{ group.charter.rev }}</a>
                             {% if group.charter.get_state.name %}
-                                <span class="badge rounded-pill bg-info">{{ group.charter.get_state.name }}</span>
+                                <span class="badge rounded-pill text-bg-info">{{ group.charter.get_state.name }}</span>
                             {% endif %}
                         {% else %}
                             <span class="text-body-secondary">(None)</span>
@@ -112,7 +112,7 @@ height: 100vh;
                                href="{% url "ietf.group.views.group_about_status" acronym=group.acronym %}">
                                 Show
                             </a>
-                            <span class="badge rounded-pill bg-secondary">
+                            <span class="badge rounded-pill text-bg-secondary">
                                 Changed {{ status_update.time|date:"Y-m-d" }}
                             </span>
                         {% else %}
diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html
index b6c3f99ba..f6dcc8cdd 100644
--- a/ietf/templates/group/group_base.html
+++ b/ietf/templates/group/group_base.html
@@ -10,10 +10,10 @@
     {% origin %}
     <h1>
         {% if group.state_id == "dormant" or group.state_id == "conclude" %}
-            <span class="badge rounded-pill bg-warning float-end ms-3">Concluded {{ group.type.name }}</span>
+            <span class="badge rounded-pill text-bg-warning float-end ms-3">Concluded {{ group.type.name }}</span>
         {% endif %}
-        {% if group.state_id == "replaced" %}<span class="badge rounded-pill bg-warning float-end ms-3">Replaced {{ group.type.name }}</span>{% endif %}
-        {% if group.state_id == "proposed" %}<span class="badge rounded-pill bg-info float-end ms-3">Proposed {{ group.type.name }}</span>{% endif %}
+        {% if group.state_id == "replaced" %}<span class="badge rounded-pill text-bg-warning float-end ms-3">Replaced {{ group.type.name }}</span>{% endif %}
+        {% if group.state_id == "proposed" %}<span class="badge rounded-pill text-bg-info float-end ms-3">Proposed {{ group.type.name }}</span>{% endif %}
         {{ group.name }} ({{ group.acronym }})
     </h1>
     <ul class="nav nav-tabs my-3">
diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html
index 4087ebfe8..609c65018 100644
--- a/ietf/templates/group/index.html
+++ b/ietf/templates/group/index.html
@@ -27,7 +27,7 @@
                     <td>
                         {% with stream.get_chair as role %}
                             {% person_link role.person %}
-                            {% if role %}<span class="badge rounded-pill bg-info">{{ role.name }}</span>{% endif %}
+                            {% if role %}<span class="badge rounded-pill text-bg-info">{{ role.name }}</span>{% endif %}
                         {% endwith %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index edb12a2ee..99b23c138 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -36,7 +36,7 @@
                                 {{ r.type.name }}
                             {% endif %}
                             deadline {{ r.deadline|date:"Y-m-d" }}
-                            {% if r.due %}<span class="badge rounded-pill bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
+                            {% if r.due %}<span class="badge rounded-pill text-bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
                         </span>
                         <a href="{% if r.requested_rev %}{% url "ietf.doc.views_doc.document_main" name=r.doc.name rev=r.requested_rev %}{% else %}{% url "ietf.doc.views_doc.document_main" name=r.doc.name %}{% endif %}?include_text=1">
                             {{ r.doc.name }}-
@@ -63,7 +63,7 @@
                                     {% endif %}
                                     <br>
                                 {% else %}
-                                    <span class="badge rounded-pill bg-info">Auto-suggested</span>
+                                    <span class="badge rounded-pill text-bg-info">Auto-suggested</span>
                                     <br>
                                 {% endif %}
                                 {% if r.doc.authors %}
@@ -135,10 +135,10 @@
                                     {% endfor %}
                                 {% endif %}
                                 <div>
-                                    <span class="badge rounded-pill bg-secondary">{{ r.doc.pages }} page{{ r.doc.pages|pluralize }}</span>
-                                    <span class="badge rounded-pill bg-info">{{ r.doc.friendly_state }}</span>
+                                    <span class="badge rounded-pill text-bg-secondary">{{ r.doc.pages }} page{{ r.doc.pages|pluralize }}</span>
+                                    <span class="badge rounded-pill text-bg-info">{{ r.doc.friendly_state }}</span>
                                 </div>
-                                {% if r.doc.telechat_date %}<span class="badge rounded-pill bg-warning">IESG telechat {{ r.doc.telechat_date }}</span>{% endif %}
+                                {% if r.doc.telechat_date %}<span class="badge rounded-pill text-bg-warning">IESG telechat {{ r.doc.telechat_date }}</span>{% endif %}
                                 {% if r.comment %}<pre class="border p-3 pasted">{{ r.comment }}</pre>{% endif %}
                             </div>
                             <div class="col-sm-6">
@@ -169,8 +169,8 @@
                                             title="Click to reassign reviewer">
                                         {% person_link r.reviewer.person %}
                                     </button>
-                                    {% if r.state_id == "accepted" %}<span class="badge rounded-pill bg-secondary">Accepted</span>{% endif %}
-                                    {% if r.reviewer_unavailable %}<span class="badge rounded-pill bg-danger">Unavailable</span>{% endif %}
+                                    {% if r.state_id == "accepted" %}<span class="badge rounded-pill text-bg-secondary">Accepted</span>{% endif %}
+                                    {% if r.reviewer_unavailable %}<span class="badge rounded-pill text-bg-danger">Unavailable</span>{% endif %}
                                 {% else %}
                                     <button type="button"
                                             class="btn btn-sm btn-primary btn-success"
diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html
index 2bfb8fe3e..8ab6fb512 100644
--- a/ietf/templates/group/materials.html
+++ b/ietf/templates/group/materials.html
@@ -39,7 +39,7 @@
                                 {% for p in past_pres_list %}
                                     {{ p.grouper }}
                                     {% if p.list|length > 1 %}
-                                        <span class="badge rounded-pill bg-info">{{ p.list|length }} sessions</span>
+                                        <span class="badge rounded-pill text-bg-info">{{ p.list|length }} sessions</span>
                                     {% else %}
                                         {% for pr in p.list %}
                                             {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
@@ -52,7 +52,7 @@
                                 {% for p in meeting_pres_list %}
                                     {{ p.grouper }}
                                     {% if p.list|length > 1 %}
-                                        <span class="badge rounded-pill bg-info">{{ p.list|length }} sessions</span>
+                                        <span class="badge rounded-pill text-bg-info">{{ p.list|length }} sessions</span>
                                     {% else %}
                                         {% for pr in p.list %}
                                             {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
diff --git a/ietf/templates/group/milestones.html b/ietf/templates/group/milestones.html
index 8375a51e8..2aac1fed9 100644
--- a/ietf/templates/group/milestones.html
+++ b/ietf/templates/group/milestones.html
@@ -36,7 +36,7 @@
                 <tr>
                     <td>
                         {% if milestone.resolved %}
-                            <span class="badge rounded-pill bg-success">{{ milestone.resolved }}</span>
+                            <span class="badge rounded-pill text-bg-success">{{ milestone.resolved }}</span>
                         {% else %}
                             {% if group.uses_milestone_dates %}
                                 {{ milestone.due|date:"M Y" }}
diff --git a/ietf/templates/group/reset_charter_milestones.html b/ietf/templates/group/reset_charter_milestones.html
index 903d4e113..79f26e3e3 100644
--- a/ietf/templates/group/reset_charter_milestones.html
+++ b/ietf/templates/group/reset_charter_milestones.html
@@ -30,7 +30,7 @@
                     <label class="form-check-label" for="id-{{ milestone.id }}">
                         {{ milestone.desc }}
                     </label>
-                    <span class="badge rounded-pill {% if milestone.resolved %}bg-success{% else %}bg-info{% endif %}">
+                    <span class="badge rounded-pill {% if milestone.resolved %}text-bg-success{% else %}text-bg-info{% endif %}">
                         {% if milestone.resolved %}
                             {{ milestone.resolved }}
                         {% else %}
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index ac5fd987c..4c6de5a1d 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -48,13 +48,13 @@
                                 {% if r.pk %}
                                     {{ r.time|date:"Y-m-d" }} by {% person_link r.requested_by %}
                                 {% else %}
-                                    <span class="badge rounded-pill bg-info">Auto-suggested</span>
+                                    <span class="badge rounded-pill text-bg-info">Auto-suggested</span>
                                 {% endif %}
                             </td>
                             <td>
                                 {{ r.deadline|date:"Y-m-d" }}
                                 {% if r.due %}
-                                    <span class="badge rounded-pill bg-warning"
+                                    <span class="badge rounded-pill text-bg-warning"
                                           title="{{ r.due }} day{{ r.due|pluralize }} past deadline">{{ r.due }} day{{ r.due|pluralize }}</span>
                                 {% endif %}
                             </td>
@@ -96,14 +96,14 @@
                             <td>
                                 {{ a.review_request.deadline|date:"Y-m-d" }}
                                 {% if a.due %}
-                                    <span class="badge rounded-pill bg-warning"
+                                    <span class="badge rounded-pill text-bg-warning"
                                           title="{{ a.due }} day{{ a.due|pluralize }} past deadline">{{ a.due }} day{{ a.due|pluralize }}</span>
                                 {% endif %}
                             </td>
                             <td>
                                 {% person_link a.reviewer.person %}
-                                {% if a.state_id == "accepted" %}<span class="badge rounded-pill bg-success">Accepted</span>{% endif %}
-                                {% if a.reviewer_unavailable %}<span class="badge rounded-pill bg-danger">Unavailable</span>{% endif %}
+                                {% if a.state_id == "accepted" %}<span class="badge rounded-pill text-bg-success">Accepted</span>{% endif %}
+                                {% if a.reviewer_unavailable %}<span class="badge rounded-pill text-bg-danger">Unavailable</span>{% endif %}
                             </td>
                             <td>{{ a.review_request.doc.friendly_state }}</td>
                             <td>
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index 39ba7606a..6e56ee2e4 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -88,7 +88,7 @@
                                                 <a href="{% url 'ietf.doc.views_review.review_request' name=doc_name request_id=req_pk %}">{{ deadline|date }}</a>
                                             </td>
                                             <td>
-                                                <span class="badge rounded-pill bg-{% if state.slug == 'completed' or state.slug == 'part-completed' %}success{% elif state.slug == 'no-response' %}danger{% elif state.slug == 'overtaken' %}warning{% elif state.slug == 'requested' or state.slug == 'accepted' %}primary{% else %}secondary{% endif %}">{{ state.name }}</span>
+                                                <span class="badge rounded-pill text-bg-{% if state.slug == 'completed' or state.slug == 'part-completed' %}success{% elif state.slug == 'no-response' %}danger{% elif state.slug == 'overtaken' %}warning{% elif state.slug == 'requested' or state.slug == 'accepted' %}primary{% else %}secondary{% endif %}">{{ state.name }}</span>
                                             </td>
                                             <td>
                                                 {% if assignment_to_closure_days != None %}
diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html
index 65a451c7a..a91761bbe 100644
--- a/ietf/templates/ietfauth/review_overview.html
+++ b/ietf/templates/ietfauth/review_overview.html
@@ -51,7 +51,7 @@
                         <td>{{ r.review_request.type.name }}</td>
                         <td>
                             {{ r.review_request.deadline|date:"Y-m-d" }}
-                            {% if r.due %}<span class="badge rounded-pill bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
+                            {% if r.due %}<span class="badge rounded-pill text-bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
                         </td>
                     </tr>
                 {% endfor %}
@@ -98,10 +98,10 @@
                         <td>{{ r.review_request.type.name }}</td>
                         <td>
                             {{ r.review_request.deadline|date:"Y-m-d" }}
-                            {% if r.due %}<span class="badge rounded-pill bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
+                            {% if r.due %}<span class="badge rounded-pill text-bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
                         </td>
                         <td>
-                            <span class="{% if r.state_id == "completed" or r.state_id == "part-completed" %}bg-success{% endif %}">{{ r.state.name }}</span>
+                            <span class="badge rounded-pill {% if r.state_id == "completed" or r.state_id == "part-completed" %}text-bg-success{% else %}text-bg-secondary{% endif %}">{{ r.state.name }}</span>
                         </td>
                         <td>
                             {% if r.result %}{{ r.result.name }}{% endif %}
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index d5ec45e8a..11730741b 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -51,7 +51,7 @@
                         <td>{% person_link e.by %}</td>
                         <td class="text-break">
                             {% if e.message %}
-                                {% if e.response_due %}<span class="badge rounded-pill bg-info">Response due {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
+                                {% if e.response_due %}<span class="badge rounded-pill text-bg-info">Response due {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
                                 {# FIXME: can't do format_history_text, because that inserts a <div> into the <pre>, which is illegal. Need to rework the snippeting. #}
                                 <pre>{{ e.message|render_message_for_history|urlize_ietf_docs|linkify }}</pre>
                             {% else %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index 8f52724c6..ff1652473 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -28,7 +28,7 @@
                     <tr>
                         <td>{{ ipr.time|date:"Y-m-d" }}</td>
                         <td>{{ ipr.id }}</td>
-                        <td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a>{% if ipr.state_id == 'removed' %}<span class="badge rounded-pill bg-info">Removed</span>{% endif %}
+                        <td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a>{% if ipr.state_id == 'removed' %}<span class="badge rounded-pill text-bg-info">Removed</span>{% endif %}
                             {% if ipr.updates %} <br>(Updates ID#: {% for upd in ipr.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
                         </td>
                     </tr>
diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html
index 03c9b36b7..e74b08f21 100644
--- a/ietf/templates/liaisons/liaison_table.html
+++ b/ietf/templates/liaisons/liaison_table.html
@@ -24,9 +24,9 @@
                             <span title="{{ liaison.is_outgoing|yesno:'Outgoing,Incoming' }} liaison"
                                   class="badge rounded-pill
                                          {% if liaison.is_outgoing %}
-                                             bg-warning
+                                             text-bg-warning
                                          {% else %}
-                                             bg-info
+                                             text-bg-info
                                          {% endif %}">Action needed</span>
                         {% endif %}
                     </td>
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 ada5f7ada..5f08d3d4b 100644
--- a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
+++ b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
@@ -36,7 +36,7 @@
                              data-day="{{ day.day.isoformat }}">
                             <div class="room-label" title="{{ room.name }}">
                                 <strong>{{ room.name }}</strong>
-                                {% if room.capacity %}<span class="badge rounded-pill bg-secondary">{{ room.capacity }}</span>{% endif %}
+                                {% if room.capacity %}<span class="badge rounded-pill text-bg-secondary">{{ room.capacity }}</span>{% endif %}
                             </div>
                             <div class="timeline">
                                 <!-- [html-validate-disable-block no-inline-style -- FIXME: should style this better] -->
diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html
index 095b0fb5d..52e77d83a 100644
--- a/ietf/templates/meeting/group_materials.html
+++ b/ietf/templates/meeting/group_materials.html
@@ -12,13 +12,13 @@
                 <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">{{ entry.group.acronym }}</a>
             </div>
             {% if entry.group.state.slug == "bof" %}
-                <span class="badge rounded-pill bg-success">{{ entry.group.state.slug|upper }}</span>
+                <span class="badge rounded-pill text-bg-success">{{ entry.group.state.slug|upper }}</span>
             {% endif %}
         {% endif %}
     </td>
     {% if entry.canceled %}
         <td colspan="{% if user|has_role:'Secretariat' or user_groups %}6{% else %}5{% endif %}">
-            <span class="badge rounded-pill bg-danger">Session cancelled</span>
+            <span class="badge rounded-pill text-bg-danger">Session cancelled</span>
         </td>
     {% else %}
         <td>
@@ -32,7 +32,7 @@
                 </a>
                 <br>
             {% empty %}
-                {% if show_agenda == "True" %}<span class="badge rounded-pill bg-warning">No agenda</span>{% endif %}
+                {% if show_agenda == "True" %}<span class="badge rounded-pill text-bg-warning">No agenda</span>{% endif %}
             {% endfor %}
         </td>
         <td>
@@ -42,7 +42,7 @@
                 </a>
                 <br>
             {% empty %}
-                {% if show_agenda == "True" %}<span class="badge rounded-pill bg-warning">No minutes</span>{% endif %}
+                {% if show_agenda == "True" %}<span class="badge rounded-pill text-bg-warning">No minutes</span>{% endif %}
             {% endfor %}
             {% if entry.session.type_id == 'regular' and show_agenda == "True" %}
                 {% for bluesheet in entry.bluesheets %}
@@ -54,7 +54,7 @@
                     </a>
                     <br>
                 {% empty %}
-                    <span class="badge rounded-pill bg-warning">No bluesheets</span>
+                    <span class="badge rounded-pill text-bg-warning">No bluesheets</span>
                 {% endfor %}
             {% endif %}
         </td>
@@ -67,7 +67,7 @@
                     <a href="{{ slide.material|meeting_href:meeting }}">{{ slide.material.title|clean_whitespace }}</a>
                     <br>
                 {% empty %}
-                    <span class="badge rounded-pill bg-warning">No slides</span>
+                    <span class="badge rounded-pill text-bg-warning">No slides</span>
                 {% endfor %}
         </td>
         <td>
@@ -81,7 +81,7 @@
                     </a>
                     <br>
                 {% empty %}
-                    <span class="badge rounded-pill bg-warning">No Internet-Drafts</span>
+                    <span class="badge rounded-pill text-bg-warning">No Internet-Drafts</span>
                 {% endfor %}
         </td>
         <td>
diff --git a/ietf/templates/meeting/group_proceedings.html b/ietf/templates/meeting/group_proceedings.html
index d0a56b5b5..92fe04675 100644
--- a/ietf/templates/meeting/group_proceedings.html
+++ b/ietf/templates/meeting/group_proceedings.html
@@ -11,14 +11,14 @@
             <div id="{{ entry.group.acronym }}">
                 <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">{{ entry.group.acronym }}</a>
             </div>
-            {% if entry.group.state_id == "bof" %}<span class="badge rounded-pill bg-success">BOF</span>{% endif %}
+            {% if entry.group.state_id == "bof" %}<span class="badge rounded-pill text-bg-success">BOF</span>{% endif %}
         {% else %}
             <h1>{{ entry.group }}</h1>
         {% endif %}
     </td>
     {% if entry.canceled %}
         <td colspan="4">
-            <span class="badge rounded-pill bg-danger">Session cancelled</span>
+            <span class="badge rounded-pill text-bg-danger">Session cancelled</span>
         </td>
     {% else %}
         {# artifacts #}
@@ -31,7 +31,7 @@
                 <br>
             {% empty %}
                 {% if show_agenda and not meeting.proceedings_final %}
-                    <span class="badge rounded-pill bg-warning">No agenda</span>
+                    <span class="badge rounded-pill text-bg-warning">No agenda</span>
                     <br>
                 {% endif %}
             {% endfor %}
@@ -43,7 +43,7 @@
                 <br>
             {% empty %}
                 {% if show_agenda and not meeting.proceedings_final %}
-                    <span class="badge rounded-pill bg-warning">No minutes</span>
+                    <span class="badge rounded-pill text-bg-warning">No minutes</span>
                     <br>
                 {% endif %}
             {% endfor %}
@@ -71,7 +71,7 @@
                 <a href="{{ slide.material|meeting_href:meeting }}">{{ slide.material.title|clean_whitespace }}</a>
                 <br>
             {% empty %}
-                {% if not meeting.proceedings_final %}<span class="badge rounded-pill bg-warning">No slides</span>{% endif %}
+                {% if not meeting.proceedings_final %}<span class="badge rounded-pill text-bg-warning">No slides</span>{% endif %}
             {% endfor %}
         </td>
         {# drafts #}
@@ -82,7 +82,7 @@
                 </a>
                 <br>
             {% empty %}
-                {% if not meeting.proceedings_final %}<span class="badge rounded-pill bg-warning">No Internet-Drafts</span>{% endif %}
+                {% if not meeting.proceedings_final %}<span class="badge rounded-pill text-bg-warning">No Internet-Drafts</span>{% endif %}
             {% endfor %}
         </td>
     {% endif %}
diff --git a/ietf/templates/meeting/interim_pending.html b/ietf/templates/meeting/interim_pending.html
index 7fbc4347b..b702f6458 100644
--- a/ietf/templates/meeting/interim_pending.html
+++ b/ietf/templates/meeting/interim_pending.html
@@ -31,11 +31,11 @@
                             <a class="interim-meeting-link"
                                href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">
                                 {{ meeting.number }}
-                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill bg-warning ms-1">Cancelled</span>{% endif %}
+                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill text-bg-warning ms-1">Cancelled</span>{% endif %}
                             </a>
                         </td>
                         <td>
-                            {% if meeting.can_approve %}<span class="badge rounded-pill bg-success">Can be approved</span>{% endif %}
+                            {% if meeting.can_approve %}<span class="badge rounded-pill text-bg-success">Can be approved</span>{% endif %}
                         </td>
                     </tr>
                 {% endfor %}
diff --git a/ietf/templates/meeting/materials_editable_groups.html b/ietf/templates/meeting/materials_editable_groups.html
index d91e6f214..5c8645ecf 100644
--- a/ietf/templates/meeting/materials_editable_groups.html
+++ b/ietf/templates/meeting/materials_editable_groups.html
@@ -14,7 +14,7 @@
                             {% if g|has_sessions:meeting_num %}
                                 <a href="{% url 'ietf.meeting.views.session_details' num=meeting_num acronym=g.acronym %}">{{ g.acronym }}</a>
                             {% else %}
-                                {{ g.acronym }} <span class="badge rounded-pill bg-info ms-2">No session requested</span>
+                                {{ g.acronym }} <span class="badge rounded-pill text-bg-info ms-2">No session requested</span>
                             {% endif %}
                         </li>
                     {% endfor %}
diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html
index 6de44b80b..2b92c311d 100644
--- a/ietf/templates/meeting/past.html
+++ b/ietf/templates/meeting/past.html
@@ -37,7 +37,7 @@
                         <td>
                             {% if meeting.type_id == "interim" %}
                                 <a href="{% url 'ietf.meeting.views.session_details' num=meeting.number acronym=meeting.responsible_group.acronym %}">{{ meeting.number }}</a>
-                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill bg-warning">Cancelled</span>{% endif %}
+                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill text-bg-warning">Cancelled</span>{% endif %}
                             {% else %}
                                 <a href="{% url 'agenda' num=meeting.number %}">IETF-{{ meeting.number }}</a>
                             {% endif %}
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index 7c70ee0b0..1fc7e4149 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -155,7 +155,7 @@
                                 {{ session.group.acronym }}
                             </a>
                             {% if session.purpose_id != "regular" %}
-                                <br><span class="badge rounded-pill bg-info">{{session.purpose}}</span>
+                                <br><span class="badge rounded-pill text-bg-info">{{session.purpose}}</span>
                             {% endif %}
                             {% if session.joint_with_groups.count %}joint with {{ session.joint_with_groups_acronyms|join:' ' }}{% endif %}
                             {% if session.requested_duration %}
@@ -169,7 +169,7 @@
                                 </div>
                             {% endif %}
                             {% if session.group.state.slug != "active" %}
-                                <br><span class="badge rounded-pill bg-success">{{ session.group.state.name }}</span>
+                                <br><span class="badge rounded-pill text-bg-success">{{ session.group.state.name }}</span>
                             {% endif %}
                         </td>
                         <td class="d-none d-lg-table-cell">
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
index d85e770b2..1de121a6b 100644
--- a/ietf/templates/meeting/schedule_list.html
+++ b/ietf/templates/meeting/schedule_list.html
@@ -70,16 +70,16 @@
                             <td>{{ schedule.notes|linebreaksbr }}</td>
                             <td>
                                 {% if schedule.visible %}
-                                    <div class="badge rounded-pill bg-success">Visible</div>
+                                    <div class="badge rounded-pill text-bg-success">Visible</div>
                                 {% else %}
-                                    <div class="badge rounded-pill bg-warning">Hidden</div>
+                                    <div class="badge rounded-pill text-bg-warning">Hidden</div>
                                 {% endif %}
                             </td>
                             <td>
                                 {% if schedule.public %}
-                                    <div class="badge rounded-pill bg-success">Public</div>
+                                    <div class="badge rounded-pill text-bg-success">Public</div>
                                 {% else %}
-                                    <div class="badge rounded-pill bg-warning">Private</div>
+                                    <div class="badge rounded-pill text-bg-warning">Private</div>
                                 {% endif %}
                             </td>
                             <td>
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 855fc60cf..3a10f317a 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -21,7 +21,7 @@
                     {% if time.tzinfo.zone != "UTC" %}<span class="small">({{ time|utc|dateformat:"H:i T" }})</span>{% endif %}
                 {% endfor %}
                 {% if session.cancelled %}
-                    <small class="badge rounded-pill bg-warning">Cancelled</small>
+                    <small class="badge rounded-pill text-bg-warning">Cancelled</small>
                 {% else %}
                     {{ session.status }}
                 {% endif %}
diff --git a/ietf/templates/meeting/session_materials.html b/ietf/templates/meeting/session_materials.html
index 198bb1140..40d02fb63 100644
--- a/ietf/templates/meeting/session_materials.html
+++ b/ietf/templates/meeting/session_materials.html
@@ -18,10 +18,10 @@
             <h4 class="mt-4">Agenda</h4>
             <div class="agenda-frame" data-src="{{ agenda.get_href }}"></div>
         {% else %}
-            <span class="badge rounded-pill bg-info">Agenda submitted as {{ agenda.file_extension|upper }}</span>
+            <span class="badge rounded-pill text-bg-info">Agenda submitted as {{ agenda.file_extension|upper }}</span>
         {% endif %}
     {% else %}
-        <span class="badge rounded-pill bg-warning">No agenda submitted</span>
+        <span class="badge rounded-pill text-bg-warning">No agenda submitted</span>
     {% endif %}
 {% endwith %}
 {% if item.session.slides %}
@@ -41,10 +41,10 @@
             <h4 class="mt-4">Minutes</h4>
             <div class="minutes-frame" data-src="{{ minutes.get_href }}"></div>
         {% else %}
-            <span class="badge rounded-pill bg-info">Minutes submitted as {{ minutes.file_extension|upper }}</span>
+            <span class="badge rounded-pill text-bg-info">Minutes submitted as {{ minutes.file_extension|upper }}</span>
         {% endif %}
     {% else %}
-        <span class="badge rounded-pill bg-warning">No minutes submitted</span>
+        <span class="badge rounded-pill text-bg-warning">No minutes submitted</span>
     {% endif %}
 {% endwith %}
     </body>
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index 815698dbf..802b1b03c 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -86,7 +86,7 @@
                                 </td>
                                 {% if session.current_status == 'canceled' %}
                                     <td class="text-end">
-                                        <span class="badge rounded-pill bg-warning">Cancelled</span>
+                                        <span class="badge rounded-pill text-bg-warning">Cancelled</span>
                                     </td>
                                 {% else %}
                                     <td class="text-end">{% include "meeting/interim_session_buttons.html" with show_agenda=True use_notes=meeting.uses_notes %}</td>
@@ -94,7 +94,7 @@
                             {% endwith %}
                         {% else %}
                             <td>
-                                <span class="badge rounded-pill bg-warning">Unexpected entry type: {{ entry|classname }}</span>
+                                <span class="badge rounded-pill text-bg-warning">Unexpected entry type: {{ entry|classname }}</span>
                             </td>
                             <td></td>
                             <td></td>
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
index 2ab8d5e0d..4ef18fc5f 100644
--- a/ietf/templates/nomcom/feedback.html
+++ b/ietf/templates/nomcom/feedback.html
@@ -41,7 +41,7 @@
                                     {% with count=counts|lookup:np.position.id|lookup:np.nominee.id %}
                                        title="{% if count %}{{ count }} earlier comment{{ count|pluralize }} from you {% else %}You have not yet provided feedback {% endif %} on {{ np.nominee.email.address }} as {{ np.position }}">
                                         {{ np.nominee.name }}
-                                        <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
+                                        <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill text-bg-danger">
                                             {{ count | default:"0" }}
                                         </span>
                                     {% endwith %}
@@ -60,7 +60,7 @@
                            title="{% if count %}{{ count }} earlier comment{{ count|pluralize }} from you {% else %}You have not yet provided feedback {% endif %} on {{ t.subject }}">
                             {{ t.subject }}
                             {% with count=topic_counts|lookup:t.id %}
-                                <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
+                                <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill text-bg-danger">
                                     {{ count | default:"0" }}
                                 </span>
                             {% endwith %}
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index dcf1edc97..7f7829915 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -11,7 +11,7 @@
     {% origin %}
     <h1>
         NomCom {{ year }}
-        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill bg-info">Concluded</span>{% endif %}
+        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
         <br>
         <small class="text-body-secondary">Private area
             {% if is_chair_task %}- Chair/Advisors only{% endif %}
@@ -55,7 +55,7 @@
                 <a class="nav-link {% if selected == "feedback_pending" %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">
                     Pending emails
-                    {% if nomcom.pending_email_count %}<span class="badge rounded-pill bg-primary">{{ nomcom.pending_email_count }}</span>{% endif %}
+                    {% if nomcom.pending_email_count %}<span class="badge rounded-pill text-bg-primary">{{ nomcom.pending_email_count }}</span>{% endif %}
                 </a>
             </li>
             <li class="nav-item dropdown">
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index 9e575a59e..d369b28fc 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -11,7 +11,7 @@
     {% origin %}
     <h1>
         NomCom {{ year }}
-        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill bg-info">Concluded</span>{% endif %}
+        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
index d1b7f77e4..7506c3504 100644
--- a/ietf/templates/nomcom/view_feedback.html
+++ b/ietf/templates/nomcom/view_feedback.html
@@ -47,7 +47,7 @@
                         </td>
                         {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
                             <td>
-                                {% if fbtype_newflag %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                                {% if fbtype_newflag %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                                 {{ fbtype_count }}
                             </td>
                         {% endfor %}
@@ -86,7 +86,7 @@
                     </td>
                     {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
                         <td>
-                            {% if fbtype_newflag %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                            {% if fbtype_newflag %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                             {{ fbtype_count }}
                         </td>
                     {% endfor %}
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index 7ead9f477..2a54435d9 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -26,13 +26,13 @@
                     {% if feedback.type.slug == ft.slug %}
                         <dl class="row">
                             <dt class="col-sm-2">
-                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                                 From
                             </dt>
                             <dd class="col-sm-10">
                                 {{ feedback.author|formatted_email|default:"Anonymous"|linkify }}
                                 {% if ft.slug == "nomina" and feedback.nomination_set.first.share_nominator %}
-                                    <span class="badge rounded-pill bg-info">OK to share name with nominee</span>
+                                    <span class="badge rounded-pill text-bg-info">OK to share name with nominee</span>
                                 {% endif %}
                             </dd>
                             <dt class="col-sm-2">
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index 890bf0d75..6f3839267 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -42,7 +42,7 @@
                             Type
                         </dt>
                         <dd class="col-sm-10">
-                            <span class="badge rounded-pill bg-info">{{ form.feedback_type }}</span>
+                            <span class="badge rounded-pill text-bg-info">{{ form.feedback_type }}</span>
                         </dd>
                         <dt class="col-sm-2">
                             Feedback
diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
index a7282691f..2fc38959f 100644
--- a/ietf/templates/nomcom/view_feedback_topic.html
+++ b/ietf/templates/nomcom/view_feedback_topic.html
@@ -26,7 +26,7 @@
                     {% if feedback.type.slug == ft.slug %}
                         <dl class="row">
                             <dt class="col-sm-2">
-                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                                 From
                             </dt>
                             <dd class="col-sm-10">
diff --git a/ietf/templates/person/person_info.html b/ietf/templates/person/person_info.html
index a9e11462b..5d3994db7 100644
--- a/ietf/templates/person/person_info.html
+++ b/ietf/templates/person/person_info.html
@@ -11,7 +11,7 @@
     </dt>
     <dd class="col-md-9">
         {% if person.user %}
-            {{ person.user }} <span class="badge rounded-pill bg-info"> Last login
+            {{ person.user }} <span class="badge rounded-pill text-bg-info"> Last login
             {% if person.user.last_login %}
                 {{ person.user.last_login|date:"Y-m-d" }}
             {% else %}
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index feebf8fad..2d166b5df 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -373,7 +373,7 @@
                             <div>
                                 {{ res.name.name }}: {{ res.value }}
                                 {% if res.display_name %}(as &quot;{{ res.display_name }}&quot;){% endif %}
-                            {% if external_resources.show_changes and added %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                            {% if external_resources.show_changes and added %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                             </div>
                         {% endwith %}
                     {% empty %}
@@ -392,7 +392,7 @@
                                 <div>
                                     {{ res.name.name }}: {{ res.value }}
                                     {% if res.display_name %}(as &quot;{{ res.display_name }}&quot;){% endif %}
-                                {% if removed %}<span class="badge rounded-pill bg-warning">Removed</span>{% endif %}
+                                {% if removed %}<span class="badge rounded-pill text-bg-warning">Removed</span>{% endif %}
                                 </div>
                             {% endwith %}
                         {% empty %}