diff --git a/allianceauth/eveonline/templatetags/examples.html b/allianceauth/eveonline/templatetags/examples.html
index 486394c8..69482457 100644
--- a/allianceauth/eveonline/templatetags/examples.html
+++ b/allianceauth/eveonline/templatetags/examples.html
@@ -16,7 +16,7 @@ Needs to be called with a context containing three objects:
 {% block content %}
 
     <div class="col-lg-12">
-        <h1 class="page-header text-center">Evelinks templatetags examples</h1>
+        <h1 class="page-header text-center mb-3">Evelinks templatetags examples</h1>
         <div class="col-lg-12 container">
 
             <h2>profile URLs</h2>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
index a61d8afa..0a6ed580 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
@@ -1,15 +1,21 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 {% load navactive %}
 
-{% block page_title %}{{ group }} {% translate "Audit Log" %}{% endblock page_title %}
-{% block header_nav_brand %}{% translate "Audit Log" %} - {{ group.name }}{% endblock header_nav_brand %}
+{% block page_title %}
+    {{ group }} {% translate "Audit Log" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Audit Log" %} - {{ group.name }}
+{% endblock header_nav_brand %}
 
 {% block header_nav_collapse_left %}
-<li class="nav-item ">
-    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
-</li>
+    <li class="nav-item">
+        <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
+    </li>
 {% endblock %}
 
 {% block content %}
@@ -65,7 +71,7 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
     {% include 'bundles/moment-js.html' with locale=True %}
-    {% include 'bundles/filterdropdown-js.html' %}
+{#    {% include 'bundles/filterdropdown-js.html' %}#}
 
     <script>
         $.fn.dataTable.moment = (format, locale) => {
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
index 60fed8a2..3a8fc64f 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
@@ -14,7 +14,7 @@
 {% endblock header_nav_brand %}
 
 {% block header_nav_collapse_left %}
-    <li class="nav-item ">
+    <li class="nav-item">
         <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
     </li>
 {% endblock %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
index 44d20f2a..cf67ba5a 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@@ -9,7 +9,7 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block header_nav_collapse_left %}
-<li class="nav-item ">
+<li class="nav-item">
     <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Join/Leave Requests" %}</a>
 </li>
 {% endblock header_nav_collapse_left %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index f06275b2..f46c8515 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -1,21 +1,28 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Available Groups" %}{% endblock page_title %}
-{% block header_nav_brand %}{% translate "Available Groups" %}{% endblock header_nav_brand %}
+{% block page_title %}
+    {% translate "Available Groups" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Available Groups" %}
+{% endblock header_nav_brand %}
 
 {% if manager_perms %}
-{% block header_nav_collapse_left %}
-<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>
-        {% endif %}
-    </a>
-</li>
-{% endblock %}
+    {% block header_nav_collapse_left %}
+        <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>
+                {% endif %}
+            </a>
+        </li>
+    {% endblock %}
 {% endif %}
+
 {% block content %}
     {% if groups %}
         <table class="table" id="groupsTable" >
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index 681e252a..f7016c4d 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -11,8 +11,6 @@
     {% translate "HR Application Management" %}
 {% endblock header_nav_brand %}
 
-{% block extra_css %}{% endblock extra_css %}
-
 {% block content %}
     <div>
         <h1 class="page-header text-center mb-3">{% translate "Personal Applications" %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index 2885aa41..41077232 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -11,8 +11,6 @@
     {% translate "HR Application Management" %}
 {% endblock header_nav_brand %}
 
-{% block extra_css %}{% endblock extra_css %}
-
 {% block content %}
     <div>
         {% if perms.auth.human_resources %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 3b056df4..9b621bb4 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -11,8 +11,6 @@
     {% translate "HR Application Management" %}
 {% endblock header_nav_brand %}
 
-{% block extra_css %}{% endblock extra_css %}
-
 {% block content %}
     <div>
         <h1 class="page-header text-center mb-3">{% translate "View Application" %}</h1>
diff --git a/allianceauth/menu/templates/menu/menu-item-bs5.html b/allianceauth/menu/templates/menu/menu-item-bs5.html
index c8d5b2f0..152d0946 100644
--- a/allianceauth/menu/templates/menu/menu-item-bs5.html
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load navactive %}
+
 {% if not item.hide %}
     <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
         <i class="nav-link {{ item.classes }} fa-fw align-self-center me-3 {% if item.navactive %}{% navactive request item.navactive|join:' ' %}{% endif %}" {% if item.items|length %} type="button" data-bs-toggle="collapse" data-bs-target="#id-{{ item.text|slugify }}" aria-expanded="false" aria-controls="" {% endif %}></i>
@@ -7,6 +8,7 @@
             href="{% if item.url_name %}{% url item.url_name %}{% else %}{{ item.url }}{% endif %}">
             {% translate item.text %}
         </a>
+
         {% if item.count >= 1 %}
             <span class="badge bg-primary m-2 align-self-center {% if item.items|length == 0 %}me-4{% endif %}">
                 {{ item.count }}
@@ -14,13 +16,16 @@
         {% elif item.url %}
             <span class="pill m-2 me-4 align-self-center fas fa-external-link-alt"></span>
         {% endif %}
+
         {% if item.items|length > 0 %}
-            <span class="pill m-2 me-4 align-self-center fas fa-solid fa-chevron-down"
+            <span
+                class="pill m-2 me-4 align-self-center fas fa-solid fa-chevron-down"
                 type="button"
                 data-bs-toggle="collapse"
                 data-bs-target="#id-{{ item.text|slugify }}"
                 aria-expanded="false"
-                aria-controls=""></span>
+                aria-controls="">
+            </span>
             <!--<hr class="m-0 w-100">-->
             <ul class="collapse ps-1 w-100 border-start rounded-start border-light border-3" id="id-{{ item.text|slugify }}">
                 {% for sub_item in item.items %}
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index efffebdd..8e8da669 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -9,6 +9,7 @@
                 <div class="p-2 position-relative m-2">
                     <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
                     <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
+
                     {% if main.alliance_id %}
                         <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
                     {% elif main.faction_id %}
diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index a9c0ed04..8da4b3d8 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -2,10 +2,10 @@
 {% load navactive %}
 {% load menu_menu_items %}
 
-<div class="col-auto px-0 " >
-    <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar" >
+<div class="col-auto px-0">
+    <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div style="width: 350px;">
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo" >
+            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo">
                 {% if user.is_authenticated %}
                     <ul style="z-index:5;"  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">
@@ -14,6 +14,7 @@
                                 {% translate "Dashboard" %}
                             </a>
                         </li>
+
                         {% sorted_menu_items %}
                     </ul>
                 {% endif %}
diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html
index 49eacce5..b2e771b2 100644
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@@ -1,4 +1,5 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 
@@ -17,6 +18,7 @@
             <span class="badge 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" %}
@@ -31,6 +33,7 @@
             <i class="fa-solid fa-check-double"></i>
         </a>
     </li>
+
     <li class="nav-item">
         <a href="{% url 'notifications:delete_all_read' %}" class="nav-link" title="{% translate 'Delete all read notifications' %}">
             <i class="fa-solid fa-trash-can"></i>
diff --git a/allianceauth/notifications/templates/notifications/list_partial.html b/allianceauth/notifications/templates/notifications/list_partial.html
index 8cb16f41..607e3500 100644
--- a/allianceauth/notifications/templates/notifications/list_partial.html
+++ b/allianceauth/notifications/templates/notifications/list_partial.html
@@ -7,6 +7,7 @@
             <th>{% translate "Title" %}</th>
             <th class="text-end">{% translate "Action" %}</th>
         </tr>
+
         {% for notif in notifications %}
             <tr class="table-{{ notif.level }}">
                 <td>{{ notif.timestamp }}</td>
@@ -15,6 +16,7 @@
                     <a href="{% url 'notifications:view' notif.id %}" class="btn btn-primary btn-sm" title="View">
                         <span class="fa-solid fa-eye"></span>
                     </a>
+
                     <a href="{% url 'notifications:remove' notif.id %}" class="btn btn-danger btn-sm" title="Remove">
                         <span class="fa-solid fa-trash-can"></span>
                     </a>
diff --git a/allianceauth/optimer/templates/optimer/dashboard.ops.html b/allianceauth/optimer/templates/optimer/dashboard.ops.html
index 212f89e6..a21e6306 100644
--- a/allianceauth/optimer/templates/optimer/dashboard.ops.html
+++ b/allianceauth/optimer/templates/optimer/dashboard.ops.html
@@ -5,6 +5,7 @@
     <div class="card h-100">
         <div class="card-body">
             <h4 class="card-title text-center">{% translate "Upcoming Fleets" %}</h4>
+
             <div class="card-body">
                 <div style="height: 300px; overflow-y:auto;">
                     <table class="table">
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
index 8a04dfb9..4407ff9e 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
@@ -90,7 +90,7 @@
                         page: 'current'
                     }).data().each((group, i) => {
                         if (last !== group) {
-                            $(rows).eq(i).before(`<tr class="h5 table-secondary"><td colspan="3">${group}</td></tr>`);
+                            $(rows).eq(i).before(`<tr class="h5 table-primary"><td colspan="3">${group}</td></tr>`);
 
                             last = group;
                         }
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
index 9c5f0b4d..8dbace83 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
@@ -100,7 +100,7 @@
                         page: 'current'
                     }).data().each((group, i) => {
                         if (last !== group) {
-                            $(rows).eq(i).before(`<tr class="h5 table-secondary"><td colspan="6">${group}</td></tr>`);
+                            $(rows).eq(i).before(`<tr class="h5 table-primary"><td colspan="6">${group}</td></tr>`);
 
                             last = group;
                         }
diff --git a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html
index 49df399f..8850de11 100644
--- a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html
+++ b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html
@@ -1,11 +1,13 @@
 {% extends "admin/change_list.html" %}
+
 {% load i18n %}
 
 {% block object-tools-items %}
+
 {{ block.super }}
-<li>
-    <a href="{% url 'teamspeak3:admin_update_ts3_groups' %}" class="btn btn-high">
-        {% translate "Update TeamSpeak3 groups" %}
-    </a>
-</li>
+    <li>
+        <a href="{% url 'teamspeak3:admin_update_ts3_groups' %}" class="btn btn-high">
+            {% translate "Update TeamSpeak3 groups" %}
+        </a>
+    </li>
 {% endblock %}
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html
index a55d2c6d..fe5d8873 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html
@@ -1,4 +1,5 @@
 {% extends "services/services_ctrl_base.html" %}
+
 {% load i18n %}
 
 {% block title %}
@@ -35,5 +36,5 @@
         <a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?nickname={{ authinfo.teamspeak3_uid }}" title="Connect" class="btn btn-success">
             <i class="fa-solid fa-arrow-right fa-fw"></i>
         </a>
-        {% endif %}
+    {% endif %}
 {% endblock %}
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index 716c82eb..3a72d034 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -1,24 +1,29 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Verify TeamSpeak3" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Verify TeamSpeak3 Identity" %}</h1>
-        <div class="container-fluid">
-            <div class="col-md-4 col-md-offset-4">
+        <h1 class="page-header text-center mb-3">
+            {% translate "Verify TeamSpeak3 Identity" %}
+        </h1>
+
+        <div class="row justify-content-center">
+            <div class="col-md-4">
                 <a href="ts3server://{{ public_url }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% translate "Join Server" %}</a>
                 <br>
                 <form class="form-signin" role="form" action="{% url 'teamspeak3:verify' %}" method="POST">
                     {% csrf_token %}
+
                     {% bootstrap_form form %}
+
                     <br>
                     <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Continue" %}</button>
                 </form>
-                </div>
+            </div>
         </div>
     </div>
 {% endblock %}
diff --git a/allianceauth/services/templates/public/menuitem.html b/allianceauth/services/templates/public/menuitem.html
index 6a758db7..ac03fc9f 100644
--- a/allianceauth/services/templates/public/menuitem.html
+++ b/allianceauth/services/templates/public/menuitem.html
@@ -4,6 +4,7 @@
 <li>
     <a class="{% navactive request item.navactive|join:' ' %}" href="{% url item.url_name %}">
         <i class="{{ item.classes }}"></i> {% translate item.text %}
+
         {% if item.count != None %}
             <span class="badge">{{ item.count }}</span>
         {% endif %}
diff --git a/allianceauth/services/templates/services/service_confirm_delete.html b/allianceauth/services/templates/services/service_confirm_delete.html
index 224065f7..a8975223 100644
--- a/allianceauth/services/templates/services/service_confirm_delete.html
+++ b/allianceauth/services/templates/services/service_confirm_delete.html
@@ -1,29 +1,32 @@
 {% extends "allianceauth/base-bs5.html" %}
-{% load i18n %}
 
+{% load i18n %}
 
 {% block page_title %}
     {% blocktranslate with service_name=view.service_name|title %}Delete {{ service_name }} Account?{% endblocktranslate %}
 {% endblock page_title %}
 
+{% block header_nav_brand %}
+    {% translate "Available Services" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">
+    <div>
+        <h1 class="page-header text-center mb-3">
             {% blocktranslate with service_name=view.service_name|title %}Delete {{ service_name }} Account?{% endblocktranslate %}
         </h1>
-        <div class="container">
-            <div class="row justify-content-center">
-                <div class="col-md-4 align-self-center">
-                    <form action="" method="post">
-                        {% csrf_token %}
-                        <p>
-                            {% blocktranslate trimmed with service_name=view.service_name|title %}
+
+        <div class="row justify-content-center">
+            <div class="col-md-4 align-self-center">
+                <form action="" method="post">
+                    {% csrf_token %}
+                    <p>
+                        {% blocktranslate trimmed with service_name=view.service_name|title %}
                             Are you sure you want to delete your {{ service_name }} account {{ object }}?
-                            {% endblocktranslate %}
-                        </p>
-                        <input class="btn btn-danger btn-block" type="submit" value="Confirm">
-                    </form>
-                </div>
+                        {% endblocktranslate %}
+                    </p>
+                    <input class="btn btn-danger btn-block" type="submit" value="Confirm">
+                </form>
             </div>
         </div>
     </div>
diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html
index bb65410c..24e99a58 100644
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@@ -1,25 +1,33 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
 
-{% block page_title %}{% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}{% endblock page_title %}
+{% block page_title %}
+    {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Available Services" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}</h1>
-        <div class="container">
-            <div class="row justify-content-center">
-                <div class="col-md-4 align-self-center">
-                    <form>
-                        {% for key, value in credentials.items %}
-                            <div class="mb-3">
-                                <label class="form-label" for="id_{{ key }}">{{ key|capfirst }}</label>
-                                <input class="form-control" value="{{ value }}" id="id_{{ key }}" readonly>
-                            </div>
-                        {% endfor %}
-                    </form>
+        <h1 class="page-header text-center mb-3">
+            {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}
+        </h1>
 
-                    <a href="{% url 'services:services' %}" class="btn btn-lg btn-block btn-primary" title="Continue">{% translate "Continue" %}</a>
-                </div>
+        <div class="row justify-content-center">
+            <div class="col-md-4 align-self-center">
+                <form>
+                    {% for key, value in credentials.items %}
+                        <div class="mb-3">
+                            <label class="form-label" for="id_{{ key }}">{{ key|capfirst }}</label>
+                            <input class="form-control" value="{{ value }}" id="id_{{ key }}" readonly>
+                        </div>
+                    {% endfor %}
+                </form>
+
+                <a href="{% url 'services:services' %}" class="btn btn-lg btn-block btn-primary" title="Continue">{% translate "Continue" %}</a>
             </div>
         </div>
     </div>
diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html
index baea4173..02a88bb0 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -1,22 +1,30 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block page_title %}{% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktranslate %}{% endblock page_title %}
+{% block page_title %}
+    {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktranslate %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Available Services" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate with service_name=view.service_name|title %}Set {{service_name}} Password{% endblocktranslate %}</h1>
-        <div class="container">
-            <div class="row justify-content-center">
-                <div class="col-md-4 align-self-center">
-                    <form role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
-                        {% csrf_token %}
-                        {% bootstrap_form form %}
-                        <br>
-                        <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Set Password" %}</button>
-                    </form>
-                </div>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% blocktranslate with service_name=view.service_name|title %}Set {{service_name}} Password{% endblocktranslate %}
+        </h1>
+
+        <div class="row justify-content-center">
+            <div class="col-md-4 align-self-center">
+                <form role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
+                    {% csrf_token %}
+                    {% bootstrap_form form %}
+                    <br>
+                    <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Set Password" %}</button>
+                </form>
             </div>
         </div>
     </div>
diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html
index faa3ea4f..9a1fe104 100644
--- a/allianceauth/services/templates/services/services.html
+++ b/allianceauth/services/templates/services/services.html
@@ -1,11 +1,13 @@
 {% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Services Management" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
-
-{% block header_nav_brand %}{% translate "Available Services" %}{% endblock header_nav_brand %}
+{% block page_title %}
+    {% translate "Services Management" %}
+{% endblock page_title %}
 
+{% block header_nav_brand %}
+    {% translate "Available Services" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
     <div class="d-flex py-2 pt-0 bd-highlight justify-content-center flex-wrap">
diff --git a/allianceauth/services/templates/services/services_ctrl.html b/allianceauth/services/templates/services/services_ctrl.html
index 9da4a975..442522b9 100644
--- a/allianceauth/services/templates/services/services_ctrl.html
+++ b/allianceauth/services/templates/services/services_ctrl.html
@@ -1,4 +1,5 @@
 {% extends "services/services_ctrl_base.html" %}
+
 {% load i18n %}
 
 {% block title %}
@@ -12,25 +13,27 @@
 {% block controls %}
     {% if username == "" %}
         {% if urls.auth_activate %}
-        <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
-            <i class="fa-solid fa-check fa-fw"></i>
-        </a>
+            <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
+                <i class="fa-solid fa-check fa-fw"></i>
+            </a>
         {% endif %}
     {% else %}
         {% if urls.auth_set_password %}
-        <a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
-            <i class="fa-solid fa-pen-to-square"></i>
-        </a>
+            <a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
+                <i class="fa-solid fa-pen-to-square"></i>
+            </a>
         {% endif %}
+
         {% if urls.auth_reset_password %}
-        <a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
-            <i class="fa-solid fa-rotate fa-fw"></i>
-        </a>
+            <a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
+                <i class="fa-solid fa-rotate fa-fw"></i>
+            </a>
         {% endif %}
+
         {% if urls.auth_deactivate %}
-        <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
-            <i class="fa-solid fa-xmark fa-fw"></i>
-        </a>
+            <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
+                <i class="fa-solid fa-xmark fa-fw"></i>
+            </a>
         {% endif %}
     {% endif %}
 {% endblock %}
diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html
index 526f345b..d039db03 100644
--- a/allianceauth/services/templates/services/services_ctrl_base.html
+++ b/allianceauth/services/templates/services/services_ctrl_base.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<div class="card text-center m-4" style="min-width: 18rem; min-height: 18rem;">
+<div class="card text-center m-3" style="min-width: 18rem; min-height: 18rem;">
     <div class="card-body">
         <h5 class="card-title">{% block title %}{% endblock title %}</h5>
 
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index a1552bf8..d649cdc2 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -183,7 +183,7 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
 
             $.fn.editable.defaults.mode = 'inline';
             $.fn.editable.defaults.showbuttons = false;
-            $.fn.editable.defaults.highlight = "#AAFF80";
+            $.fn.editable.defaults.highlight = "rgb(170 255 128)";
 
             $.fn.dataTable.moment = (format, locale) => {
                 const types = $.fn.dataTable.ext.type;
diff --git a/allianceauth/templates/allianceauth/error.html b/allianceauth/templates/allianceauth/error.html
index e48f5391..50ef031d 100644
--- a/allianceauth/templates/allianceauth/error.html
+++ b/allianceauth/templates/allianceauth/error.html
@@ -1,27 +1,31 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% block page_title %}
-{{ error_title }}
+    {{ error_title }}
 {% endblock page_title %}
+
 {% block content %}
-<div class="col-lg-12">
-    <h1 class="page-header text-center">{{ error_title }}</h1>
-    <div class="text-center">
-        <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="150"
-            height="150"
-            fill="currentColor"
-            class="bi bi-exclamation-triangle"
-            viewBox="0 0 16 16"
-        >
-            <path
-                d="M7.938 2.016A.13.13 0 0 1 8.002 2a.13.13 0 0 1 .063.016.146.146 0 0 1 .054.057l6.857 11.667c.036.06.035.124.002.183a.163.163 0 0 1-.054.06.116.116 0 0 1-.066.017H1.146a.115.115 0 0 1-.066-.017.163.163 0 0 1-.054-.06.176.176 0 0 1 .002-.183L7.884 2.073a.147.147 0 0 1 .054-.057zm1.044-.45a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566z"
-            />
-            <path
-                d="M7.002 12a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 5.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995z"
-            />
-        </svg>
+    <div class="col-lg-12">
+        <h1 class="page-header text-center mb-3">{{ error_title }}</h1>
+
+        <div class="text-center">
+            <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="150"
+                height="150"
+                fill="currentColor"
+                class="bi bi-exclamation-triangle"
+                viewBox="0 0 16 16"
+            >
+                <path
+                    d="M7.938 2.016A.13.13 0 0 1 8.002 2a.13.13 0 0 1 .063.016.146.146 0 0 1 .054.057l6.857 11.667c.036.06.035.124.002.183a.163.163 0 0 1-.054.06.116.116 0 0 1-.066.017H1.146a.115.115 0 0 1-.066-.017.163.163 0 0 1-.054-.06.176.176 0 0 1 .002-.183L7.884 2.073a.147.147 0 0 1 .054-.057zm1.044-.45a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566z"
+                />
+                <path
+                    d="M7.002 12a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 5.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995z"
+                />
+            </svg>
+        </div>
+
+        <p class="text-center">{{ error_message }}</p>
     </div>
-    <p class="text-center">{{ error_message }}</p>
-</div>
 {% endblock content %}
diff --git a/allianceauth/templates/allianceauth/icons.html b/allianceauth/templates/allianceauth/icons.html
index 10b058a2..1dc706f5 100644
--- a/allianceauth/templates/allianceauth/icons.html
+++ b/allianceauth/templates/allianceauth/icons.html
@@ -7,6 +7,7 @@
 <link rel="manifest" href="{% static 'allianceauth/icons/site.webmanifest' %}">
 <link rel="mask-icon" href="{% static 'allianceauth/icons/safari-pinned-tab.svg' %}" color="#5bbad5">
 <link rel="shortcut icon" type="image/png" href="{% static 'allianceauth/icons/favicon.ico' %}">
+
 <meta name="msapplication-TileColor" content="#2d89ef">
 <meta name="msapplication-config" content="{% static 'allianceauth/icons/browserconfig.xml' %}">
 <meta name="theme-color" content="#ffffff">
diff --git a/allianceauth/templates/allianceauth/messages-bs5.html b/allianceauth/templates/allianceauth/messages-bs5.html
index 1f1a6bb5..17592623 100644
--- a/allianceauth/templates/allianceauth/messages-bs5.html
+++ b/allianceauth/templates/allianceauth/messages-bs5.html
@@ -1,16 +1,17 @@
+{% load i18n %}
+
 {% if messages %}
     {% for message in messages %}
-        <div class="alert alert-{{ message.level_tag }} alert-dismissible d-flex align-items-center fade show" role="alert">
-
+        <div class="alert alert-{{ message.level_tag }} alert-dismissible d-flex fade show" role="alert">
             <div>
                 {% if message.level_tag == "info" %}
-                    <i class="fa-solid fa-info-circle"></i>
+                    <i class="fa-solid fa-info-circle fa-xl"></i>
                 {% elif message.level_tag == "success" %}
-                    <i class="fa-solid fa-check-circle"></i>
+                    <i class="fa-solid fa-check-circle fa-xl"></i>
                 {% elif message.level_tag == "warning" %}
-                    <i class="fa-solid fa-exclamation-circle"></i>
+                    <i class="fa-solid fa-exclamation-circle fa-xl"></i>
                 {% elif "danger" in message.level_tag %}
-                    <i class="fa-solid fa-exclamation-triangle"></i>
+                    <i class="fa-solid fa-exclamation-triangle fa-xl"></i>
                 {% endif %}
             </div>
 
@@ -18,7 +19,7 @@
                 {{ message }}
             </div>
 
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{% translate 'Close' %}"></button>
         </div>
     {% endfor %}
 {% endif %}
diff --git a/allianceauth/templates/allianceauth/messages.html b/allianceauth/templates/allianceauth/messages.html
index dff04389..8303a33c 100644
--- a/allianceauth/templates/allianceauth/messages.html
+++ b/allianceauth/templates/allianceauth/messages.html
@@ -1,8 +1,9 @@
+{% load i18n %}
+
 {% if messages %}
-    <br>
     {% for message in messages %}
         <div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" data-dismiss="alert" aria-label="{% translate 'Close' %}">
                 <span aria-hidden="true">&times;</span>
             </button>
 
diff --git a/allianceauth/templates/allianceauth/side-menu.html b/allianceauth/templates/allianceauth/side-menu.html
index fdaac059..77c2715b 100644
--- a/allianceauth/templates/allianceauth/side-menu.html
+++ b/allianceauth/templates/allianceauth/side-menu.html
@@ -7,7 +7,7 @@
         <ul class="nav nav-pills nav-stacked gray-icon-color" id="side-menu">
             <li>
                 <a class="{% navactive request 'authentication:dashboard' %}" href="{% url 'authentication:dashboard' %}">
-                    <i class="fa-solid fa-gauge-high fa-fw"></i></i> {% translate "Dashboard" %}
+                    <i class="fa-solid fa-gauge-high fa-fw"></i> {% translate "Dashboard" %}
                 </a>
             </li>
             <li>
diff --git a/allianceauth/templates/allianceauth/top-menu-rh-default.html b/allianceauth/templates/allianceauth/top-menu-rh-default.html
index 19e57a77..70529809 100644
--- a/allianceauth/templates/allianceauth/top-menu-rh-default.html
+++ b/allianceauth/templates/allianceauth/top-menu-rh-default.html
@@ -1,8 +1,14 @@
 {% load i18n %}
 
 <li class="nav-item active">
-    <a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}"><i class="fa-solid fa-plus"></i><span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span></a>
+    <a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}">
+        <i class="fa-solid fa-plus"></i>
+        <span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span>
+    </a>
 </li>
 <li class="nav-item">
-    <a href="{% url 'authentication:change_main_character' %}" class="nav-link" title="{% translate 'Change Main' %}"><i class="fa-solid fa-shuffle"></i><span class="d-lg-none d-md-inline m-2">{% translate "Change Main" %}</span></a>
+    <a href="{% url 'authentication:change_main_character' %}" class="nav-link" title="{% translate 'Change Main' %}">
+        <i class="fa-solid fa-shuffle"></i>
+        <span class="d-lg-none d-md-inline m-2">{% translate "Change Main" %}</span>
+    </a>
 </li>
diff --git a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
index 5a1119ac..be01c3e7 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
@@ -17,8 +17,8 @@
             {% include "timerboard/index_button.html" %}
         </h1>
 
-        <div class="container-fluid">
-            <div class="col-md-2 col-md-offset-5">
+        <div class="row justify-content-center">
+            <div class="col-md-2">
                 <div class="row">
                     <form action="" method="post">
                         {% csrf_token %}