From 25cf329a501e28dc0bec35ac159e22f63df4131e Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Mon, 14 Apr 2025 20:14:54 +0200
Subject: [PATCH] [FIX] BG color classes

Use `text-bg-*` instead of just `bg-*` to make use of Bootstraps native text color selection for those backgrounds.
---
 .../templates/authentication/tokens.html      |  2 +-
 .../templates/corputils/corpstats.html        |  8 +++----
 .../corputils/templates/corputils/search.html |  2 +-
 .../fatlinkpersonalmonthlystatisticsview.html |  2 +-
 .../fleetactivitytracking/fatlinkview.html    |  2 +-
 .../groupmanagement/groupmembership.html      |  6 ++---
 .../templates/groupmanagement/groups.html     | 10 ++++-----
 .../templates/groupmanagement/index.html      |  4 ++--
 .../templates/hrapplications/management.html  | 22 +++++++++----------
 .../templates/hrapplications/searchview.html  |  6 ++---
 .../templates/hrapplications/view.html        |  4 ++--
 .../menu/templates/menu/menu-item-bs5.html    |  2 +-
 .../templates/menu/sortable-side-menu.html    |  2 +-
 .../templates/notifications/list.html         |  4 ++--
 .../templates/notifications/view.html         |  2 +-
 .../optimer/templates/optimer/management.html |  2 +-
 .../discourse/discourse_service_ctrl.html     |  2 +-
 allianceauth/srp/templates/srp/data.html      |  8 +++----
 .../srp/templates/srp/management.html         | 14 ++++++------
 .../admin-status/celery_bar_partial.html      |  2 +-
 .../allianceauth/admin-status/overview.html   | 10 ++++-----
 .../templates/allianceauth/base-bs5.html      |  2 +-
 .../timerboard/dashboard.timers.html          |  6 ++---
 .../templates/timerboard/timertable.html      | 10 ++++-----
 .../timerboard/templates/timerboard/view.html |  2 +-
 25 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/allianceauth/authentication/templates/authentication/tokens.html b/allianceauth/authentication/templates/authentication/tokens.html
index fc9b9c35..3fb54b06 100644
--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@@ -31,7 +31,7 @@
                     <tr>
                         <td style="white-space:initial;">
                             {% for s in t.scopes.all %}
-                                <span class="badge bg-secondary">{{ s.name }}</span>
+                                <span class="badge text-bg-secondary">{{ s.name }}</span>
                             {% endfor %}
                         </td>
 
diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html
index 777b3c61..c464fed5 100644
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@@ -138,7 +138,7 @@
                                                                 <td style="width: 30%;">{{ alt.corporation_name }}</td>
                                                                 <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
                                                                 <td style="width: 5%;">
-                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                                         {% translate "Killboard" %}
                                                                     </a>
                                                                 </td>
@@ -175,7 +175,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
                                                 <td>{{ member }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                 </td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
@@ -188,7 +188,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                 </td>
                                                 <td></td>
                                                 <td></td>
@@ -219,7 +219,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                         {% translate "Killboard" %}
                                                     </a>
                                                 </td>
diff --git a/allianceauth/corputils/templates/corputils/search.html b/allianceauth/corputils/templates/corputils/search.html
index 2e2181f9..c23ae03d 100644
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@@ -28,7 +28,7 @@
                             <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
                             <td>{{ result.1.character_name }}</td>
                             <td >{{ result.0.corp.corporation_name }}</td>
-                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
                             <td>{{ result.1.main_character.character_name }}</td>
                             <td>{{ result.1.main_character.corporation_name }}</td>
                             <td>{{ result.1.main_character.alliance_name }}</td>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index 486851d2..872b5559 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -80,7 +80,7 @@
                         {% for link in created_fats %}
                             <tr>
                                 <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">
                                         {{ link.fleet }}
                                     </a>
                                 </td>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
index 519374ce..57eb3351 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@@ -97,7 +97,7 @@
                         {% for link in fatlinks %}
                             <tr>
                                 <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a>
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">{{ link.fleet }}</a>
                                 </td>
                                 <td class="text-center">{{ link.creator.username }}</td>
                                 <td class="text-center">{{ link.fleet }}</td>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
index cf67ba5a..b0fdae1e 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@@ -39,12 +39,12 @@
 
                             <td>
                                 {% if group.authgroup.hidden %}
-                                    <span class="badge bg-info">{% translate "Hidden" %}</span>
+                                    <span class="badge text-bg-info">{% translate "Hidden" %}</span>
                                 {% endif %}
                                 {% if group.authgroup.open %}
-                                    <span class="badge bg-success">{% translate "Open" %}</span>
+                                    <span class="badge text-bg-success">{% translate "Open" %}</span>
                                 {% else %}
-                                    <span class="badge bg-secondary">{% translate "Requestable" %}</span>
+                                    <span class="badge text-bg-secondary">{% translate "Requestable" %}</span>
                                 {% endif %}
                             </td>
 
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index 378a64d9..02ed1535 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -17,7 +17,7 @@
         <li class="nav-item">
             <a class="nav-link" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}
                 {% if req_count %}
-                    <span class="badge bg-secondary">{{ req_count }}</span>
+                    <span class="badge text-bg-secondary">{{ req_count }}</span>
                 {% endif %}
             </a>
         </li>
@@ -33,8 +33,8 @@
                     <th>{% translate "Description" %}</th>
                     <th>
                         {% translate "Leaders" %}<br>
-                        <span class="my-1 me-1 fw-lighter badge bg-primary">{% translate "User" %}</span>
-                        <span class="my-1 me-1 fw-lighter badge bg-secondary">{% translate "Group" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge text-bg-primary">{% translate "User" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge text-bg-secondary">{% translate "Group" %}</span>
                     </th>
                     <th></th>
                 </tr>
@@ -53,13 +53,13 @@
                             {% if g.group.authgroup.group_leaders.all.count %}
                                 {% for leader in g.group.authgroup.group_leaders.all %}
                                     {% if leader.profile.main_character %}
-                                        <span class="my-1 me-1 badge bg-primary">{{leader.profile.main_character}}</span>
+                                        <span class="my-1 me-1 badge text-bg-primary">{{leader.profile.main_character}}</span>
                                     {% endif %}
                                 {% endfor %}
                             {% endif %}
                             {% if g.group.authgroup.group_leader_groups.all.count %}
                                 {% for group in g.group.authgroup.group_leader_groups.all %}
-                                    <span class="my-1 me-1 badge bg-secondary">{{group.name}}</span>
+                                    <span class="my-1 me-1 badge text-bg-secondary">{{group.name}}</span>
                                 {% endfor %}
                             {% endif %}
                         </td>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html
index 7cde5bf0..3171b055 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@@ -19,7 +19,7 @@
             {% translate "Join Requests" %}
 
             {% if acceptrequests %}
-                <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
+                <span class="badge text-bg-secondary">{{ acceptrequests|length }}</span>
             {% endif %}
         </a>
     </li>
@@ -30,7 +30,7 @@
                 {% translate "Leave Requests" %}
 
                 {% if leaverequests %}
-                    <span class="badge bg-secondary">{{ leaverequests|length }}</span>
+                    <span class="badge text-bg-secondary">{{ leaverequests|length }}</span>
                 {% endif %}
             </a>
         </li>
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index 370b6300..36bf592e 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -43,11 +43,11 @@
                                 <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
                                 <td class="text-center">
                                     {% if personal_app.approved == None %}
-                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                     {% elif personal_app.approved == True %}
-                                        <div class="badge bg-success">{% translate "Approved" %}</div>
+                                        <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                     {% else %}
-                                        <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                        <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                     {% endif %}
                                 </td>
                                 <td class="text-center">
@@ -133,14 +133,14 @@
                                             <td class="text-center">
                                                 {% if app.approved == None %}
                                                     {% if app.reviewer_str %}
-                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                     {% else %}
-                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                                     {% endif %}
                                                 {% elif app.approved == True %}
-                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                                 {% else %}
-                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                                 {% endif %}
                                             </td>
                                             <td class="text-center">
@@ -177,14 +177,14 @@
                                             <td class="text-center">
                                                 {% if app.approved == None %}
                                                     {% if app.reviewer_str %}
-                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                     {% else %}
-                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                                     {% endif %}
                                                 {% elif app.approved == True %}
-                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                                 {% else %}
-                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                                 {% endif %}
                                             </td>
                                             <td class="text-center">
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index c667e95c..bb446f22 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -43,11 +43,11 @@
                             <td>{{ app.form.corp }}</td>
                             <td class="text-center">
                                 {% if app.approved == None %}
-                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                    <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                 {% elif app.approved == True %}
-                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-end">
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 4b01a27f..d88009b4 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -31,7 +31,7 @@
         </div>
 
         <div class="card mb-3">
-            <div class="card-header bg-info">
+            <div class="card-header text-bg-info">
                 <div class="card-title mb-0">{% translate "Applicant" %}</div>
             </div>
 
@@ -50,7 +50,7 @@
         </div>
 
         <div class="card mb-3">
-            <div class="card-header bg-info">
+            <div class="card-header text-bg-info">
                 <div class="card-title mb-0">{% translate "Characters" %}</div>
             </div>
 
diff --git a/allianceauth/menu/templates/menu/menu-item-bs5.html b/allianceauth/menu/templates/menu/menu-item-bs5.html
index 82edd7d3..e0e7dbda 100644
--- a/allianceauth/menu/templates/menu/menu-item-bs5.html
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@@ -27,7 +27,7 @@
     </a>
 
     {% if item.count >= 1 %}
-        <span class="badge bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
+        <span class="badge text-bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
             {{ item.count }}
         </span>
     {% elif item.url %}
diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index c010a3ce..dd6d4b02 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -5,7 +5,7 @@
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div>
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
+            <div class="nav-padding navbar-dark text-bg-dark px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
                     <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                         <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html
index b2e771b2..3384bf54 100644
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@@ -15,14 +15,14 @@
     <li class="nav-item">
         <a class="nav-link active" id="unread-tab" data-bs-toggle="tab" data-bs-target="#unread" type="button" role="tab" aria-controls="unread" aria-selected="true">
             {% translate "Unread" %}
-            <span class="badge bg-secondary">{{ unread|length }}</span>
+            <span class="badge text-bg-secondary">{{ unread|length }}</span>
         </a>
     </li>
 
     <li class="nav-item">
         <a class="nav-link" id="read-tab" data-bs-toggle="tab" data-bs-target="#read" type="button" role="tab" aria-controls="read" aria-selected="false">
             {% translate "Read" %}
-            <span class="badge bg-secondary">{{ read|length }}</span>
+            <span class="badge text-bg-secondary">{{ read|length }}</span>
         </a>
     </li>
 {% endblock %}
diff --git a/allianceauth/notifications/templates/notifications/view.html b/allianceauth/notifications/templates/notifications/view.html
index 9f63fbdf..89bba3cc 100644
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@@ -17,7 +17,7 @@
     </div>
 
     <div class="card border-{{ notif.level }}">
-        <div class="card-header bg-{{ notif.level }}">
+        <div class="card-header text-bg-{{ notif.level }}">
             {{ notif.timestamp }}
             {{ notif.title }}
         </div>
diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html
index ac96c711..5cfeb20d 100644
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@@ -24,7 +24,7 @@
 {% block content %}
     <div>
         <div class="text-center mb-3">
-            <div class="badge bg-primary text-start">
+            <div class="badge text-bg-primary text-start">
                 <b>{% translate "Current EVE time:" %}</b>
                 <span id="current-time"></span>
             </div>
diff --git a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
index 70acdf28..a3b3f091 100644
--- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
+++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block active %}
-    <span class="badge bg-success">
+    <span class="badge text-bg-success">
         {% translate "SSO login active" %}
     </span>
 {% endblock %}
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 5628008a..462c9147 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -96,7 +96,7 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                 </td>
                                 <td>
                                     <a href="{{ srpfleetrequest.killboard_link }}"
-                                    target="_blank" class="badge bg-warning">{% translate "Link" %}</a>
+                                    target="_blank" class="badge text-bg-warning">{% translate "Link" %}</a>
                                 </td>
                                 <td>{{ srpfleetrequest.additional_info }}</td>
                                 <td>{{ srpfleetrequest.srp_ship_name }}</td>
@@ -105,15 +105,15 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                 <td data-sort="{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}">{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }}</td>
                                 <td>
                                     {% if srpfleetrequest.srp_status == "Approved" %}
-                                        <div class="badge bg-success">
+                                        <div class="badge text-bg-success">
                                             {% translate "Approved" %}
                                         </div>
                                     {% elif srpfleetrequest.srp_status == "Rejected" %}
-                                        <div class="badge bg-danger">
+                                        <div class="badge text-bg-danger">
                                             {% translate "Rejected" %}
                                         </div>
                                     {% else %}
-                                        <div class="badge bg-warning">
+                                        <div class="badge text-bg-warning">
                                             {% translate "Pending" %}
                                         </div>
                                     {% endif %}
diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html
index 5cb250bb..5918673f 100644
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@@ -61,20 +61,20 @@
                             <td>{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
                             <td>{{ srpfleet.fleet_doctrine }}</td>
                             <td>
-                                <div class="badge bg-success">
+                                <div class="badge text-bg-success">
                                     {{ srpfleet.fleet_commander.character_name }}
                                 </div>
                             </td>
                             <td>
                                 {% if srpfleet.fleet_srp_aar_link %}
-                                    <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge bg-primary">{% translate "Link" %}</a>
+                                    <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge text-bg-primary">{% translate "Link" %}</a>
                                 {% endif %}
                             </td>
                             <td>
                                 {% if srpfleet.fleet_srp_code %}
-                                    <a class="badge bg-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
+                                    <a class="badge text-bg-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
                                 {% else %}
-                                    <div class="badge bg-danger">
+                                    <div class="badge text-bg-danger">
                                         {% translate "Disabled" %}
                                     </div>
                                 {% endif %}
@@ -83,17 +83,17 @@
 
                             <td>
                                 {% if srpfleet.fleet_srp_status == "" %}
-                                    <div class="badge bg-warning">
+                                    <div class="badge text-bg-warning">
                                         {% translate "Pending" %}
                                     </div>
                                 {% else %}
-                                    <div class="badge bg-success">
+                                    <div class="badge text-bg-success">
                                         {% translate "Completed" %}
                                     </div>
                                 {% endif %}
                             </td>
                             <td>
-                                <div class="badge bg-warning">{{ srpfleet.pending_requests }}</div>
+                                <div class="badge text-bg-warning">{{ srpfleet.pending_requests }}</div>
                             </td>
                             <td class="text-end text-nowrap">
                                 <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary btn-sm m-1" title="View">
diff --git a/allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html b/allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html
index d322bba4..b926917f 100644
--- a/allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html
+++ b/allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html
@@ -2,7 +2,7 @@
 {% load admin_status %}
 
 <div
-    class="progress-bar bg-{{ level }} task-status-progress-bar"
+    class="progress-bar text-bg-{{ level }} task-status-progress-bar"
     role="progressbar"
     aria-valuenow="{% decimal_widthratio tasks_count tasks_total 100 %}"
     aria-valuemin="0"
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index f765ecd8..17bf0012 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -12,7 +12,7 @@
                     <ul class="list-group">
                         {% for notif in notifications %}
                             <li class="list-group-item">
-                                <span class="badge bg-success me-2">{% translate "Open" %}</span>
+                                <span class="badge text-bg-success me-2">{% translate "Open" %}</span>
                                 <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
                             </li>
                         {% empty %}
@@ -24,13 +24,13 @@
 
                     <div class="text-end pt-3">
                         <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" class="me-1 text-decoration-none">
-                            <span class="badge" style="background-color: rgb(230 83 40);">
+                            <span class="badge text-bg-danger">
                                 <i class="fab fa-gitlab" aria-hidden="true"></i>
                                 {% translate 'Powered by GitLab' %}
                             </span>
                         </a>
                         <a href="https://discord.com/invite/fjnHAmk" target="_blank" class="text-decoration-none">
-                            <span class="badge" style="background-color: rgb(110 133 211);">
+                            <span class="badge text-bg-info">
                                 <i class="fab fa-discord" aria-hidden="true"></i>
                                 {% translate 'Support Discord' %}
                             </span>
@@ -58,7 +58,7 @@
                             </div>
                         </li>
 
-                        <li class="list-group-item bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
+                        <li class="list-group-item text-bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
                             <a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_patch_version }}">
                                 <h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>
 
@@ -71,7 +71,7 @@
                         </li>
 
                         {% if latest_beta %}
-                            <li class="list-group-item bg-info w-100">
+                            <li class="list-group-item text-bg-info w-100">
                                 <a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_beta_version }}">
                                     <h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>
 
diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html
index d0f6178a..2302e6b3 100644
--- a/allianceauth/templates/allianceauth/base-bs5.html
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@@ -39,7 +39,7 @@
 
     <body>
         <!-- Top Menu, Blocks don't work in "include" tagged views -->
-        <nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-primary">
+        <nav class="navbar navbar-expand-lg navbar-dark fixed-top text-bg-primary">
             <div class="container-fluid justify-content-start">
                 <a class="navbar-brand" data-bs-toggle="collapse" data-bs-target="#sidebar" role="button">
                     <i class="fa-solid fa-bars ms-2 me-2"></i>
diff --git a/allianceauth/timerboard/templates/timerboard/dashboard.timers.html b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
index ebdb1a9b..53f288c6 100644
--- a/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
+++ b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
@@ -30,17 +30,17 @@
                                 </td>
                                 <td class="text-center" nowrap>
                                     {% if timer.objective == "Hostile" %}
-                                        <div class="badge bg-danger">
+                                        <div class="badge text-bg-danger">
                                             {% translate "Hostile" %}
                                         </div>
                                     {% endif %}
                                     {% if timer.objective == "Friendly" %}
-                                        <div class="badge bg-primary">
+                                        <div class="badge text-bg-primary">
                                             {% translate "Friendly" %}
                                         </div>
                                     {% endif %}
                                     {% if timer.objective == "Neutral" %}
-                                        <div class="badge bg-secondary">
+                                        <div class="badge text-bg-secondary">
                                             {% translate "Neutral" %}
                                         </div>
                                     {% endif %}
diff --git a/allianceauth/timerboard/templates/timerboard/timertable.html b/allianceauth/timerboard/templates/timerboard/timertable.html
index 4e97ae6e..9028e1c4 100644
--- a/allianceauth/timerboard/templates/timerboard/timertable.html
+++ b/allianceauth/timerboard/templates/timerboard/timertable.html
@@ -21,7 +21,7 @@
 
         <tbody>
             {% for timer in timers %}
-                <tr class="{% if timer.important == True %}bg-danger bg-opacity-25{% else %}bg-info bg-opacity-25{% endif %}">
+                <tr class="{% if timer.important == True %}text-bg-danger bg-opacity-50{% else %}text-bg-info bg-opacity-50{% endif %}">
                     <td style="width: 150px;" class="text-center">
                         {{ timer.details }}
 
@@ -34,15 +34,15 @@
                     <td class="text-center">
                         {% comment %} Objective: Hostile (BG: Danger) {% endcomment %}
                         {% if timer.objective == "Hostile" %}
-                            <div class="badge bg-danger">
+                            <div class="badge text-bg-danger">
 
                         {% comment %} Objective: Friendly (BG: Primare) {% endcomment %}
                         {% elif timer.objective == "Friendly" %}
-                            <div class="badge bg-primary">
+                            <div class="badge text-bg-primary">
 
                         {% comment %} Objective: Neutral (BG: Secondary) {% endcomment %}
                         {% elif timer.objective == "Neutral" %}
-                            <div class="badge bg-secondary">
+                            <div class="badge text-bg-secondary">
                         {% endif %}
 
                             {{ timer.get_objective_display }}
@@ -54,7 +54,7 @@
                     </td>
 
                     <td class="text-center">
-                        <div class="badge bg-{{ timer.bg_modifier }}">
+                        <div class="badge text-bg-{{ timer.bg_modifier }}">
                             {{ timer.get_structure_display }}
                         </div>
                     </td>
diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html
index ae977a5f..9aa742cd 100644
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@@ -28,7 +28,7 @@
 {% block content %}
     <div class="allianceauth-timerboard">
         <div class="col-lg-12 text-center mb-3">
-            <div class="badge bg-primary text-start">
+            <div class="badge text-bg-primary text-start">
                 <span>{% translate "Current EVE time:" %}</span>
                 <span id="current-time"></span>
             </div>