diff --git a/admin/classes/reportbuilder/local/systemreports/users.php b/admin/classes/reportbuilder/local/systemreports/users.php
index c789a40da18..1171df0e93f 100644
--- a/admin/classes/reportbuilder/local/systemreports/users.php
+++ b/admin/classes/reportbuilder/local/systemreports/users.php
@@ -159,11 +159,11 @@ class users extends system_report {
                 ->add_callback(static function(string $fullname, \stdClass $row): string {
                     if ($row->suspended) {
                         $fullname .= ' ' . \html_writer::tag('span', get_string('suspended', 'moodle'),
-                            ['class' => 'badge badge-secondary ms-1']);
+                            ['class' => 'badge text-bg-secondary ms-1']);
                     }
                     if (!$row->confirmed) {
                         $fullname .= ' ' . \html_writer::tag('span', get_string('confirmationpending', 'admin'),
-                            ['class' => 'badge badge-danger ms-1']);
+                            ['class' => 'badge text-bg-danger ms-1']);
                     }
                     return $fullname;
                 });
diff --git a/admin/tool/componentlibrary/content/moodle/themes/colours.md b/admin/tool/componentlibrary/content/moodle/themes/colours.md
index a8481b9c1e8..7937a89d757 100644
--- a/admin/tool/componentlibrary/content/moodle/themes/colours.md
+++ b/admin/tool/componentlibrary/content/moodle/themes/colours.md
@@ -48,7 +48,7 @@ These colours are used throughout Moodle in text, buttons
 
 {{< example show_markup=false >}}
 <p>
-<span class="badge badge-success">Badges</span>
+<span class="badge text-bg-success">Badges</span>
 </p>
 <p>
 <button class="btn btn-success">Buttons</button>
diff --git a/admin/tool/generator/templates/stepsinformation.mustache b/admin/tool/generator/templates/stepsinformation.mustache
index 26d0dab6316..ac0f142f9c4 100644
--- a/admin/tool/generator/templates/stepsinformation.mustache
+++ b/admin/tool/generator/templates/stepsinformation.mustache
@@ -47,7 +47,7 @@
                     {{{given}}}
                     {{#example}}
                     <div class="alert alert-info mb-0 mt-2" role="alert" style="overflow: auto;">
-                        <div class="fw-bold mr-2 ">{{#str}} step_example, tool_generator {{/str}}</div>
+                        <div class="fw-bold me-2 ">{{#str}} step_example, tool_generator {{/str}}</div>
                         <pre class="mb-0">{{example}}</pre>
                     </div>
                     {{/example}}
diff --git a/ai/classes/table/aiprovider_management_table.php b/ai/classes/table/aiprovider_management_table.php
index 37130b26bff..1c4fdcc86b8 100644
--- a/ai/classes/table/aiprovider_management_table.php
+++ b/ai/classes/table/aiprovider_management_table.php
@@ -272,7 +272,7 @@ class aiprovider_management_table extends flexible_table implements dynamic_tabl
             ],
             'title' => $labelstr,
             'label' => $labelstr,
-            'labelclasses' => 'sr-only',
+            'labelclasses' => 'visually-hidden',
         ];
 
         return $OUTPUT->render_from_template('core_admin/setting_configtoggle', $params);
diff --git a/course/format/templates/local/overview/overviewtable.mustache b/course/format/templates/local/overview/overviewtable.mustache
index 6d9721950ac..e6536672955 100644
--- a/course/format/templates/local/overview/overviewtable.mustache
+++ b/course/format/templates/local/overview/overviewtable.mustache
@@ -26,7 +26,7 @@
             {
                 "key": "name",
                 "name": "Activity Name",
-                "textalign": "text-left"
+                "textalign": "text-start"
             },
             {
                 "key": "completion",
@@ -42,7 +42,7 @@
                         "overview": "name",
                         "value": "Assignment 1",
                         "content": "Assignment 1",
-                        "textalign": "text-left"
+                        "textalign": "text-start"
                     },
                     {
                         "overview": "completion",
@@ -61,7 +61,7 @@
                         "overview": "name",
                         "value": "Quiz 1",
                         "content": "Quiz 1",
-                        "textalign": "text-left"
+                        "textalign": "text-start"
                     },
                     {
                         "overview": "completion",
diff --git a/grade/penalty/duedate/templates/edit_penalty_rule_action_bar.mustache b/grade/penalty/duedate/templates/edit_penalty_rule_action_bar.mustache
index 3da94392b4e..8e6b9f73915 100644
--- a/grade/penalty/duedate/templates/edit_penalty_rule_action_bar.mustache
+++ b/grade/penalty/duedate/templates/edit_penalty_rule_action_bar.mustache
@@ -43,13 +43,13 @@
             {{{title}}}
         </div>
 
-        <div class="navitem ml-auto">
-            <div class="ml-1">
+        <div class="navitem ms-auto">
+            <div class="ms-1">
                 <button id="addrulebutton" type="button" class="btn btn-primary">{{# str }} addrule, gradepenalty_duedate {{/ str }}</button>
             </div>
 
             {{#deleteallrulebutton }}
-                <div id="deleteallrulesbuttoncontainer" class="ml-1">
+                <div id="deleteallrulesbuttoncontainer" class="ms-1">
                     {{>core/single_button}}
                 </div>
             {{/deleteallrulebutton }}
diff --git a/grade/penalty/duedate/templates/view_penalty_rule_action_bar.mustache b/grade/penalty/duedate/templates/view_penalty_rule_action_bar.mustache
index 94a02e9439f..5b2f57ea741 100644
--- a/grade/penalty/duedate/templates/view_penalty_rule_action_bar.mustache
+++ b/grade/penalty/duedate/templates/view_penalty_rule_action_bar.mustache
@@ -54,15 +54,15 @@
             {{{title}}}
         </div>
 
-        <div class="navitem ml-auto">
+        <div class="navitem ms-auto">
             {{#editbutton}}
-                <div class="ml-1">
+                <div class="ms-1">
                     {{>core/single_button}}
                 </div>
             {{/editbutton}}
 
             {{#resetbutton}}
-                <div class="ml-1">
+                <div class="ms-1">
                     {{>core/single_button}}
                 </div>
             {{/resetbutton}}
diff --git a/grade/templates/grades/grader/overridden_with_penalty.mustache b/grade/templates/grades/grader/overridden_with_penalty.mustache
index d1cd65ca01b..c6f4db01a26 100644
--- a/grade/templates/grades/grader/overridden_with_penalty.mustache
+++ b/grade/templates/grades/grader/overridden_with_penalty.mustache
@@ -36,16 +36,16 @@
 
 <div class="container">
     <div class="row">
-        <div class="mr-0">{{#str}}originalgrade, core_grades{{/str}}: </div>
+        <div class="me-0">{{#str}}originalgrade, core_grades{{/str}}: </div>
         {{>core_grades/grades/grader/input}}
     </div>
 
     <div class="row">
-        <div class="mr-0">{{#str}}currentgrade, core_grades{{/str}}: {{{effectivegrade}}}</div>
+        <div class="me-0">{{#str}}currentgrade, core_grades{{/str}}: {{{effectivegrade}}}</div>
     </div>
 
     <div class="row">
-        <div class="mr-0" title="{{exemptiontooltip}}">{{#str}}exemptpenalty, core_grades{{/str}}:</div>
+        <div class="me-0" title="{{exemptiontooltip}}">{{#str}}exemptpenalty, core_grades{{/str}}:</div>
         <label for="{{exemptionid}}" class="accesshide">{{{exemptionlabel}}}</label>
         <input type="checkbox" name="{{exemptionname}}"
                value="{{deductedmark}}" id="{{exemptionid}}"
diff --git a/lib/templates/datafilter/filtertypes/datetime_mode.mustache b/lib/templates/datafilter/filtertypes/datetime_mode.mustache
index 8d075c4d0a4..e8fbcf98af0 100644
--- a/lib/templates/datafilter/filtertypes/datetime_mode.mustache
+++ b/lib/templates/datafilter/filtertypes/datetime_mode.mustache
@@ -50,7 +50,7 @@
         ]
     }
 }}
-<label for="core-filter_row-{{filtertype}}-mode-{{uniqid}}" class="sr-only">{{label}}</label>
+<label for="core-filter_row-{{filtertype}}-mode-{{uniqid}}" class="visually-hidden">{{label}}</label>
 <select
     id="core-filter_row-{{filtertype}}-mode-{{uniqid}}"
     name="{{filtertype}}-mode"
diff --git a/lib/templates/datafilter/filtertypes/datetime_selector.mustache b/lib/templates/datafilter/filtertypes/datetime_selector.mustache
index 4a9f33a12f3..5a1e8ab5c33 100644
--- a/lib/templates/datafilter/filtertypes/datetime_selector.mustache
+++ b/lib/templates/datafilter/filtertypes/datetime_selector.mustache
@@ -41,7 +41,7 @@
 <div class="d-flex flex-column flex-md-row align-items-md-center" data-required="{{required}}">
     <span id="core-filter_row-{{filtertype}}-mode-{{uniqid}}"></span>
     <span class="{{filtertype}}-afterwrapper">
-        <label for="core-filter_row-{{filtertype}}-after-{{uniqid}}" class="sr-only">{{afterlabel}}</label>
+        <label for="core-filter_row-{{filtertype}}-after-{{uniqid}}" class="visually-hidden">{{afterlabel}}</label>
         <input
             id="core-filter_row-{{filtertype}}-after-{{uniqid}}"
             type="datetime-local"
@@ -57,7 +57,7 @@
         {{#str}} operator_and {{/str}}
     </span>
     <span class="{{filtertype}}-beforewrapper">
-        <label for="core-filter_row-{{filtertype}}-before-{{uniqid}}" class="sr-only">{{beforelabel}}</label>
+        <label for="core-filter_row-{{filtertype}}-before-{{uniqid}}" class="visually-hidden">{{beforelabel}}</label>
         <input
             id="core-filter_row-{{filtertype}}-before-{{uniqid}}"
             type="datetime-local"
diff --git a/message/output/email/templates/email_digest_html.mustache b/message/output/email/templates/email_digest_html.mustache
index cb09333f529..4875c7fcbed 100644
--- a/message/output/email/templates/email_digest_html.mustache
+++ b/message/output/email/templates/email_digest_html.mustache
@@ -70,10 +70,10 @@
             padding: 10px;
             vertical-align: top;
         }
-        .text-left {
+        .text-start {
             text-align: left;
         }
-        .text-right {
+        .text-end {
             text-align: right;
         }
         .float-right {
@@ -124,11 +124,11 @@
             <th width="40px">
                 <img src="{{{ grouppictureurl }}}" class="round" width="40px" height="40px"/>
             </th>
-            <th class="text-left">
+            <th class="text-start">
                 <strong>{{ groupname }}</strong><br>
                 {{ coursename }}
             </th>
-            <th class="nowrap text-right">
+            <th class="nowrap text-end">
                 <span class="badge">{{ numberofunreadmessages }}</span> <span class="gray-light">{{#str}} emaildigestunreadmessages, message_email {{/str}}</span>
             </th>
         </tr>
diff --git a/mod/data/classes/template.php b/mod/data/classes/template.php
index f81f0dac676..8bde97eeda8 100644
--- a/mod/data/classes/template.php
+++ b/mod/data/classes/template.php
@@ -480,7 +480,7 @@ class template {
             'classes' => 'recordcheckbox',
             'value' => $entry->id,
             'label' => get_string('selectfordeletion', 'data'),
-            'labelclasses' => 'sr-only',
+            'labelclasses' => 'visually-hidden',
         ]);
         return $OUTPUT->render($checkbox);
     }
diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php
index ef6cbdc98ae..2a66eeb9def 100644
--- a/mod/quiz/classes/output/edit_renderer.php
+++ b/mod/quiz/classes/output/edit_renderer.php
@@ -1079,7 +1079,7 @@ class edit_renderer extends \plugin_renderer_base {
             $output .= html_writer::span($title);
             $output .= html_writer::span(
                 get_string('invalidquestiontype', 'question', $question->originalqtype),
-                'badge bg-danger text-white ml-3'
+                'badge bg-danger text-white ms-3'
             );
         } else {
 
diff --git a/question/bank/managecategories/templates/addcategory.mustache b/question/bank/managecategories/templates/addcategory.mustache
index 6ebf0ee60ef..e2ccf615c79 100644
--- a/question/bank/managecategories/templates/addcategory.mustache
+++ b/question/bank/managecategories/templates/addcategory.mustache
@@ -31,7 +31,7 @@
         "courseid": "1234"
     }
 }}
-<div id="qbank_managecategories-addcategory" class="pl-3">
+<div id="qbank_managecategories-addcategory" class="ps-3">
     <button type="submit" data-action="addeditcategory" data-actiontype="add"
             data-contextid="{{contextid}}"
             data-cmid="{{cmid}}" data-courseid="{{courseid}}" class="btn btn-primary">
diff --git a/question/bank/managecategories/templates/categories.mustache b/question/bank/managecategories/templates/categories.mustache
index 01ad02b6f8f..88ab99e86c0 100644
--- a/question/bank/managecategories/templates/categories.mustache
+++ b/question/bank/managecategories/templates/categories.mustache
@@ -49,7 +49,7 @@
     }
 }}
 <div id="categoryroot"
-    class="editing col-11 col-md-12 mt-3 pl-0{{#showdescriptions}} showdescriptions{{/showdescriptions}}"
+    class="editing col-11 col-md-12 mt-3 ps-0{{#showdescriptions}} showdescriptions{{/showdescriptions}}"
     data-contextid="{{{contextid}}}">
     {{#categoriesrendered}}
         <h3 class="context-heading">{{heading}}</h3>
diff --git a/question/bank/managecategories/templates/categories_header.mustache b/question/bank/managecategories/templates/categories_header.mustache
index 64bb15c4687..24c89a92706 100644
--- a/question/bank/managecategories/templates/categories_header.mustache
+++ b/question/bank/managecategories/templates/categories_header.mustache
@@ -37,7 +37,7 @@
     }
 }}
 <div>
-    <div class="pl-3">
+    <div class="ps-3">
         {{{helpstringhead}}}
     </div>
 </div>
diff --git a/question/bank/managecategories/templates/category.mustache b/question/bank/managecategories/templates/category.mustache
index 82722a6f37d..b0eb894a972 100644
--- a/question/bank/managecategories/templates/category.mustache
+++ b/question/bank/managecategories/templates/category.mustache
@@ -52,7 +52,7 @@
     data-sortorder="{{sortorder}}">
     <div class="container{{#haschildren}} pb-0{{/haschildren}}">
         <div class="d-flex flex-wrap m-0">
-            <div class="p-2 mr-2 qbank_managecategories-handlecontainer">
+            <div class="p-2 me-2 qbank_managecategories-handlecontainer">
                 <span class="qbank_managecategories-draghandle">
                     <i class="fa fa-grip-vertical"></i>
                 </span>
diff --git a/question/bank/managecategories/templates/category_details.mustache b/question/bank/managecategories/templates/category_details.mustache
index 375f50f4d55..37a0cb7cbac 100644
--- a/question/bank/managecategories/templates/category_details.mustache
+++ b/question/bank/managecategories/templates/category_details.mustache
@@ -46,7 +46,7 @@
     <a title="{{#str}}editquestions, question{{/str}}" href="{{{questionbankurl}}}" role="button">
         {{categoryname}}
         {{#idnumber}}
-            <span class="badge badge-primary">
+            <span class="badge text-bg-primary">
                         <span class="accesshide">
                             {{#str}}idnumber, question{{/str}}
                         </span>
diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index e8a84f30f47..fe6c26f32ee 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -527,10 +527,6 @@ $message-day-color: color-contrast($message-app-bg) !default;
             &:hover {
                 color: $white;
                 background-color: $primary;
-                .badge-primary {
-                    background-color: $white;
-                    color: $primary;
-                }
             }
             &:first-child {
                 border-top: 0;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index c1e1dfcab4d..7980aa1d856 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -33589,10 +33589,6 @@ a.ygtvspacer:hover {
   color: #fff;
   background-color: #0f6cbf;
 }
-.message-app .list-group .list-group-item:hover .badge-primary {
-  background-color: #fff;
-  color: #0f6cbf;
-}
 .message-app .list-group .list-group-item:first-child {
   border-top: 0;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 4fee6887100..53b602abb88 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -33589,10 +33589,6 @@ a.ygtvspacer:hover {
   color: #fff;
   background-color: #0f6cbf;
 }
-.message-app .list-group .list-group-item:hover .badge-primary {
-  background-color: #fff;
-  color: #0f6cbf;
-}
 .message-app .list-group .list-group-item:first-child {
   border-top: 0;
 }