diff --git a/ephios/api/templates/api/access_token_list.html b/ephios/api/templates/api/access_token_list.html
index 7966a1a76..2c3833d39 100644
--- a/ephios/api/templates/api/access_token_list.html
+++ b/ephios/api/templates/api/access_token_list.html
@@ -24,7 +24,7 @@ <h2>
                             <h5 class="card-title">
                                 {{ token.application.name }}
                             </h5>
-                            <p class="text-muted">
+                            <p class="text-body-secondary">
                             </p>
                         </div>
                         <div class="col-12 col-lg">
@@ -73,7 +73,7 @@ <h2>
                         <h5 class="card-title">
                             {{ token.description|rich_text }}
                         </h5>
-                        <p class="text-muted">
+                        <p class="text-body-secondary">
                             {% blocktranslate trimmed with created=token.created %}
                                 created on {{ created }}
                             {% endblocktranslate %}
diff --git a/ephios/core/templates/core/disposition/disposition.html b/ephios/core/templates/core/disposition/disposition.html
index b2d135ada..e65a56c95 100644
--- a/ephios/core/templates/core/disposition/disposition.html
+++ b/ephios/core/templates/core/disposition/disposition.html
@@ -16,7 +16,7 @@
 {% block content %}
     <div class="page-header text-break pb-3">
         <h1>{{ shift.event }}</h1>
-        <h3 class="subtitle text-muted">
+        <h3 class="subtitle text-body-secondary">
             {{ shift.get_datetime_display }}
         </h3>
     </div>
diff --git a/ephios/core/templates/core/event_detail.html b/ephios/core/templates/core/event_detail.html
index 952eb95ed..ed591cb00 100644
--- a/ephios/core/templates/core/event_detail.html
+++ b/ephios/core/templates/core/event_detail.html
@@ -91,15 +91,15 @@ <h1 class="card-title fw-bold fs-1">
                 {% endif %}
                 {{ event.title }}
             </h1>
-            <h5 class="card-subtitle mb-2 text-muted fw-bolder lh-base">
+            <h5 class="card-subtitle mb-2 text-body-secondary fw-bolder lh-base">
                 <span class="me-1 badge eventtype-{{ event.type.pk }}-color">{{ event.type }}</span>
-                <span class="text-muted me-1 d-inline-block">
+                <span class="text-body-secondary me-1 d-inline-block">
                     <i class="fas fa-map-marker-alt"></i>
                                 {{ event.location }}
                 </span>
                 {% with start_time=event.get_start_time end_time=event.get_end_time %}
                     {% if start_time %}
-                        <span class="text-muted d-inline-block">
+                        <span class="text-body-secondary d-inline-block">
                             <i class="far fa-calendar"></i>
                             {{ start_time|date:"D" }},
                             {% if not event.is_multi_day %}
@@ -115,7 +115,7 @@ <h5 class="card-subtitle mb-2 text-muted fw-bolder lh-base">
                     {% endif %}
                 {% endwith %}
             </h5>
-            <div class="card-text text-muted">
+            <div class="card-text text-body-secondary">
                 {{ event.description|rich_text:"h1,h2" }}
             </div>
             <div class="event-plugin-content">
diff --git a/ephios/core/templates/core/event_list.html b/ephios/core/templates/core/event_list.html
index 8bd8eb19b..38af9ba5c 100644
--- a/ephios/core/templates/core/event_list.html
+++ b/ephios/core/templates/core/event_list.html
@@ -159,7 +159,7 @@ <h1>{% translate "Events" %}
                                         {% elif counter|get:ParticipationStates.USER_DECLINED > 0 and counter|length == 1 %}
                                             <span class="text-danger fa fa-user-minus ps-2"></span>
                                         {% else %}
-                                            <span class="text-muted far fa-user ps-2"></span>
+                                            <span class="text-body-secondary far fa-user ps-2"></span>
                                         {% endif %}
                                     </div>
                                     {% if perms.core.add_event %}
@@ -177,7 +177,7 @@ <h5 class="mb-0 text-break">
                                                 {{ event.title }}
 
                                             </h5>
-                                            <span class="w-100 text-muted text-break">
+                                            <span class="w-100 text-body-secondary text-break">
                                             {{ event.location }}
                                         </span>
                                         </div>
diff --git a/ephios/core/templates/core/event_notification.html b/ephios/core/templates/core/event_notification.html
index 83a71b1a6..d66cc262f 100644
--- a/ephios/core/templates/core/event_notification.html
+++ b/ephios/core/templates/core/event_notification.html
@@ -14,7 +14,7 @@
 {% block content %}
     <div class="page-header">
         <h1>{% translate "Event notifications" %}</h1>
-        <h4 class="text-muted">{{ event.title }} ({{ event.get_start_time }} - {{ event.get_end_time }})</h4>
+        <h4 class="text-body-secondary">{{ event.title }} ({{ event.get_start_time }} - {{ event.get_end_time }})</h4>
     </div>
     {% crispy form %}
 {% endblock %}
diff --git a/ephios/core/templates/core/fragments/shift_box_big.html b/ephios/core/templates/core/fragments/shift_box_big.html
index 3a1ffae80..643ace7b9 100644
--- a/ephios/core/templates/core/fragments/shift_box_big.html
+++ b/ephios/core/templates/core/fragments/shift_box_big.html
@@ -40,7 +40,7 @@
                         {{ shift.end_time|time }}
                     {% endif %}
                     </span>
-                <small class="fw-bold text-muted d-inline-block">
+                <small class="fw-bold text-body-secondary d-inline-block">
                     <span class="d-inline-block">
                         {{ shift.meeting_time|time }} {% translate "Meetup" %}
                     </span>
@@ -99,7 +99,7 @@
                             </span>
                         </div>
                     {% elif not can_sign_up or not can_decline %}
-                        <div class="text-muted mb-1">
+                        <div class="text-body-secondary mb-1">
                             {% for error in request|signup_errors:shift %}
                                 <span>{{ error.message }}</span>
                             {% endfor %}
diff --git a/ephios/core/templates/core/fragments/shift_box_small.html b/ephios/core/templates/core/fragments/shift_box_small.html
index fc0c4e8b6..2968f52a4 100644
--- a/ephios/core/templates/core/fragments/shift_box_small.html
+++ b/ephios/core/templates/core/fragments/shift_box_small.html
@@ -2,7 +2,7 @@
 
 <div class="card mb-2 {% if shift == editing_shift %}border-info{% endif %}">
     <div class="card-body">
-        <h5 class="card-subtitle mb-2 text-muted">
+        <h5 class="card-subtitle mb-2 text-body-secondary">
             {% trans "Shift" %}
             {% if can_change and not shift == editing_shift %}
                 <small class="float-end">
diff --git a/ephios/core/templates/core/fragments/signup_method_missing.html b/ephios/core/templates/core/fragments/signup_method_missing.html
index 49174a651..72d6795b7 100644
--- a/ephios/core/templates/core/fragments/signup_method_missing.html
+++ b/ephios/core/templates/core/fragments/signup_method_missing.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 
-<p class="text-muted">
+<p class="text-body-secondary">
     {% translate "We're sorry! There is a problem displaying the state of the shift." %}
 </p>
\ No newline at end of file
diff --git a/ephios/core/templates/core/home.html b/ephios/core/templates/core/home.html
index 207551e30..a20de3d9b 100644
--- a/ephios/core/templates/core/home.html
+++ b/ephios/core/templates/core/home.html
@@ -61,7 +61,7 @@ <h5 class="card-title mb-0">{% trans "Your upcoming events" %}</h5>
                     </li>
                 {% empty %}
                     <li class="list-group-item d-flex flex-column align-items-center justify-content-center">
-                        <span class="pb-1 text-muted">{% translate "None yet" context "empty list of upcoming shifts" %}</span>
+                        <span class="pb-1 text-body-secondary">{% translate "None yet" context "empty list of upcoming shifts" %}</span>
                         <a class="btn btn-sm btn-primary" href="{% url "core:event_list" %}">{% translate "View events" %}</a>
                     </li>
 
diff --git a/ephios/core/templates/core/shift_form.html b/ephios/core/templates/core/shift_form.html
index 42bf4891c..2492775d1 100644
--- a/ephios/core/templates/core/shift_form.html
+++ b/ephios/core/templates/core/shift_form.html
@@ -80,7 +80,7 @@ <h5 class="card-title">
             {% if not object %}
                 <div class="card mb-2 border-info">
                     <div class="card-body">
-                        <h5 class="card-subtitle mb-2 text-muted">{% trans "Shift" %}</h5>
+                        <h5 class="card-subtitle mb-2 text-body-secondary">{% trans "Shift" %}</h5>
                         <p class="card-text">{% trans "You are currently adding this shift" %}</p>
                 </div>
             {% endif %}
diff --git a/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html b/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html
index e50f4d144..342c81a68 100644
--- a/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html
+++ b/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html
@@ -33,7 +33,7 @@
 </div>
 
 <a class="badge
-{% if participation.state == participation.States.CONFIRMED %}bg-secondary text-dark{% else %}bg-light text-muted{% endif %}
+{% if participation.state == participation.States.CONFIRMED %}bg-secondary text-dark{% else %}bg-light text-body-secondary{% endif %}
 {% if participation.participant.is_minor %}participation-card-minor{% endif %}
 "
    tabindex="0"
diff --git a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html
index feb6ba8dd..1ca6c07ec 100644
--- a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html
+++ b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html
@@ -11,7 +11,7 @@
 
 {% block participation_detail %}
     {% if form.preferred_section %}
-        <small class="text-muted">
+        <small class="text-body-secondary">
             <br> {% translate "prefers" %}
             {{ form.preferred_section.title }}
         </small>
diff --git a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_state.html b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_state.html
index 34f136a3c..08e7c8dc2 100644
--- a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_state.html
+++ b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_state.html
@@ -7,7 +7,7 @@
             {{ section.stats.confirmed_count }}{% if section.stats.max_count %}/{{ section.stats.max_count }}{% endif %}
         </strong>
             {{ section.title }}
-            <span class="text-muted float-end">{{ section.qualifications_label }}</span>
+            <span class="text-body-secondary float-end">{{ section.qualifications_label }}</span>
         </span>
 
         <div class="mb-4">
diff --git a/ephios/plugins/guests/templates/guests/event_detail.html b/ephios/plugins/guests/templates/guests/event_detail.html
index 7d57bcb45..f41e0f823 100644
--- a/ephios/plugins/guests/templates/guests/event_detail.html
+++ b/ephios/plugins/guests/templates/guests/event_detail.html
@@ -5,6 +5,6 @@
 {% load i18n %}
 
 {% block content %}
-    <h6 class="text-muted"><b>{{ object.as_participant }}</b></h6>
+    <h6 class="text-body-secondary"><b>{{ object.as_participant }}</b></h6>
     {{ block.super }}
 {% endblock %}
diff --git a/ephios/plugins/guests/templates/guests/guestuser_form.html b/ephios/plugins/guests/templates/guests/guestuser_form.html
index 9f0aaeb1c..adaa76562 100644
--- a/ephios/plugins/guests/templates/guests/guestuser_form.html
+++ b/ephios/plugins/guests/templates/guests/guestuser_form.html
@@ -11,7 +11,7 @@
     <div class="page-header">
         <h1>{{ event }}</h1>
         {% if event.shifts.exists %}
-            <h4 class="text-muted">{{ event.get_start_time }} {% trans "to" %} {{ event.get_end_time }}</h4>
+            <h4 class="text-body-secondary">{{ event.get_start_time }} {% trans "to" %} {{ event.get_end_time }}</h4>
         {% endif %}
         <h2>{% trans "Register as guest" %}</h2>
     </div>
diff --git a/ephios/plugins/qualification_management/templates/core/qualificationcategories_form.html b/ephios/plugins/qualification_management/templates/core/qualificationcategories_form.html
index 3ea15348c..897be27f0 100644
--- a/ephios/plugins/qualification_management/templates/core/qualificationcategories_form.html
+++ b/ephios/plugins/qualification_management/templates/core/qualificationcategories_form.html
@@ -35,7 +35,7 @@ <h2>{% trans "Edit qualification categories" %}</h2>
                                                     data-formset-delete-button><span
                                                     class="fas fa-trash-alt"></span> {% trans "Delete" %}</button>
                                         {% else %}
-                                            <p class="text-muted">
+                                            <p class="text-body-secondary">
                                                 {% translate "cannot delete, has qualifications" %}
                                             </p>
                                         {% endif %}
diff --git a/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html b/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
index 53df30c34..8e5afc259 100644
--- a/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
+++ b/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
@@ -39,7 +39,7 @@ <h1>{% trans "Edit resource categories" %}</h1>
                                                     data-formset-delete-button><span
                                                     class="fas fa-trash-alt"></span> {% trans "Delete" %}</button>
                                         {% else %}
-                                            <p class="text-muted">
+                                            <p class="text-body-secondary">
                                                 {% translate "cannot delete, has resources" %}
                                             </p>
                                         {% endif %}
diff --git a/ephios/static/ephios/scss/ephios_bootstrap_variables.scss b/ephios/static/ephios/scss/ephios_bootstrap_variables.scss
index 8da5c701f..03782bf82 100644
--- a/ephios/static/ephios/scss/ephios_bootstrap_variables.scss
+++ b/ephios/static/ephios/scss/ephios_bootstrap_variables.scss
@@ -49,7 +49,7 @@ $card-bg: $gray-100;
 $card-cap-bg: $gray-100;
 $list-group-bg: $gray-100;
 
-$text-muted: $gray-550;
+$body-secondary-color: $gray-550;
 
 $enable-negative-margins: true;
 
diff --git a/ephios/templates/base.html b/ephios/templates/base.html
index 1dd9b781d..62cb6670f 100644
--- a/ephios/templates/base.html
+++ b/ephios/templates/base.html
@@ -163,7 +163,7 @@
                 {% for label, url in footer.items %}
                     <a href="{{ url }}">{{ label }}</a> ·
                 {% endfor %}
-                <span class="text-muted">
+                <span class="text-body-secondary">
                     {% blocktranslate with brand='<a href="https://ephios.de/" rel="noreferrer" target="_blank">ephios</a>' %}
                         powered by {{ brand }}
                     {% endblocktranslate %}