From 2e78aa5f262a79d14aff32b58e6bd9aea7f586c2 Mon Sep 17 00:00:00 2001
From: Aaron Kable <aaronkable@gmail.com>
Date: Sat, 7 Oct 2023 08:20:22 +0000
Subject: [PATCH] BS5 Theme

---
 allianceauth/apps.py                          |  25 ++
 allianceauth/authentication/auth_hooks.py     |  45 +++
 allianceauth/authentication/middleware.py     |   8 +
 .../migrations/0022_userprofile_theme.py      |  18 ++
 allianceauth/authentication/models.py         |   7 +
 .../authentication/dashboard.characters.html  |  41 +++
 .../authentication/dashboard.groups.html      |  20 ++
 .../templates/authentication/dashboard.html   | 193 +-----------
 .../templates/authentication/tokens.html      |  24 +-
 .../authentication/templates/public/base.html |   1 +
 allianceauth/authentication/views.py          |  35 ++-
 allianceauth/context_processors.py            |   2 +-
 allianceauth/corputils/auth_hooks.py          |   3 +-
 .../corputils/templates/corputils/base.html   |  13 +-
 .../templates/corputils/corpstats.html        |   8 +-
 .../corputils/templates/corputils/search.html |   2 +-
 .../eveonline/templatetags/examples.html      |  61 ++--
 .../fleetactivitytracking/auth_hooks.py       |   3 +-
 .../characternotexisting.html                 |  37 +--
 .../fatlinkformatter.html                     |  34 +--
 .../fleetactivitytracking/fatlinkmodify.html  |   4 +-
 .../fatlinkpersonalmonthlystatisticsview.html |   6 +-
 .../fatlinkpersonalstatisticsview.html        |  53 ++--
 .../fatlinkstatisticscorpview.html            |  74 ++---
 .../fatlinkstatisticsview.html                |  80 ++---
 .../fleetactivitytracking/fatlinkview.html    | 174 ++++++-----
 allianceauth/groupmanagement/auth_hooks.py    |  37 ++-
 .../templates/groupmanagement/audit.html      | 116 ++++---
 .../groupmanagement/groupmembers.html         | 143 ++++-----
 .../groupmanagement/groupmembership.html      | 132 ++++----
 .../templates/groupmanagement/groups.html     | 134 ++++++---
 .../templates/groupmanagement/index.html      | 284 +++++++++---------
 .../templates/groupmanagement/menu.html       |  29 +-
 allianceauth/groupmanagement/views.py         |  15 +-
 allianceauth/hooks.py                         |  16 +-
 allianceauth/hrapplications/auth_hooks.py     |   3 +-
 .../templates/hrapplications/corpchoice.html  |   2 +-
 .../templates/hrapplications/create.html      |   2 +-
 .../templates/hrapplications/management.html  |  26 +-
 .../templates/hrapplications/searchview.html  |   8 +-
 allianceauth/menu/__init__.py                 |   0
 allianceauth/menu/admin.py                    |   9 +
 allianceauth/menu/apps.py                     |  19 ++
 allianceauth/menu/hooks.py                    |  42 +++
 allianceauth/menu/migrations/0001_initial.py  |  28 ++
 ...2_alter_menuitem_hook_function_and_more.py |  28 ++
 ...03_menuitem_menu_menuit_rank_e880ab_idx.py |  17 ++
 ...de_alter_menuitem_icon_classes_and_more.py |  39 +++
 allianceauth/menu/migrations/__init__.py      |   0
 allianceauth/menu/models.py                   | 174 +++++++++++
 allianceauth/menu/providers.py                |  10 +
 .../menu/templates/menu/menu-block.html       |   7 +
 .../menu/templates/menu/menu-item-bs5.html    |  32 ++
 .../menu/menu-notification-block.html         |  19 ++
 .../menu/templates/menu/menu-user.html        |  51 ++++
 .../templates/menu/sortable-side-menu.html    |  21 ++
 allianceauth/menu/templatetags/__init__.py    |   0
 allianceauth/menu/templatetags/menu_items.py  |  35 +++
 .../templates/notifications/list.html         |  68 +++--
 .../templates/notifications/list_partial.html |  42 ++-
 .../templates/notifications/view.html         |   2 +-
 allianceauth/optimer/auth_hooks.py            |  18 +-
 .../templates/optimer/dashboard.ops.html      |  38 +++
 .../templates/optimer/fleetoptable.html       |   4 +-
 .../optimer/templates/optimer/management.html |   6 +-
 allianceauth/optimer/views.py                 |  15 +-
 allianceauth/permissions_tool/auth_hooks.py   |   3 +-
 .../templates/permissions_tool/audit.html     | 108 +++----
 .../templates/permissions_tool/audit_row.html |  26 +-
 .../templates/permissions_tool/overview.html  | 195 ++++++------
 .../project_name/settings/base.py             |   7 +
 .../project_name/settings/local.py            |   2 +-
 allianceauth/services/auth_hooks.py           |   4 +-
 allianceauth/services/hooks.py                |  34 +--
 .../discord/discord_service_ctrl.html         |  41 ++-
 .../discourse/discourse_service_ctrl.html     |  26 +-
 .../services/mumble/mumble_service_ctrl.html  |  50 +--
 .../services/modules/openfire/auth_hooks.py   |   3 +-
 .../teamspeak3/teamspeak3_service_ctrl.html   |  60 ++--
 .../services/fleetformattertool.html          |   2 +-
 .../services/templates/services/services.html |  57 ++--
 .../templates/services/services_ctrl.html     |  70 +++--
 .../services/services_ctrl_base.html          |  15 +
 allianceauth/srp/auth_hooks.py                |   3 +-
 allianceauth/srp/templates/srp/data.html      | 108 +++----
 .../srp/templates/srp/management.html         |  26 +-
 allianceauth/srp/templates/srp/request.html   |   2 +-
 allianceauth/srp/templates/srp/update.html    |   3 +-
 .../static/allianceauth/images/auth-logo.png  | Bin 0 -> 10836 bytes
 .../static/allianceauth/images/auth-logo.svg  |  56 ++++
 .../css/images/ui-icons_444444_256x240.png    | Bin 0 -> 7142 bytes
 .../css/images/ui-icons_555555_256x240.png    | Bin 0 -> 7126 bytes
 .../css/images/ui-icons_777620_256x240.png    | Bin 0 -> 4670 bytes
 .../css/images/ui-icons_777777_256x240.png    | Bin 0 -> 7163 bytes
 .../css/images/ui-icons_cc0000_256x240.png    | Bin 0 -> 4670 bytes
 .../css/images/ui-icons_ffffff_256x240.png    | Bin 0 -> 6539 bytes
 .../js/jquery-ui/1.13.2/css/jquery-ui.min.css |   6 +
 .../allianceauth/admin-status/overview.html   | 135 +++++----
 .../templates/allianceauth/base-bs5.html      | 123 ++++++++
 .../templates/allianceauth/error.html         |  27 ++
 .../templates/allianceauth/messages-bs5.html  |  26 ++
 .../allianceauth/top-menu-rh-default.html     |   8 +
 .../templates/bundles/auth-base-css.html      |   2 +-
 .../templates/bundles/bootstrap-css.html      |  13 +-
 .../templates/bundles/bootstrap-js.html       |   2 +-
 .../templates/bundles/checkbox-css.html       |   2 +-
 .../templates/bundles/clipboard-js.html       |   2 +-
 .../templates/bundles/datatables-css-bs5.html |   3 +
 .../templates/bundles/datatables-css.html     |   2 +-
 .../templates/bundles/datatables-js-bs5.html  |   4 +
 .../templates/bundles/datatables-js.html      |   4 +-
 .../templates/bundles/fontawesome.html        |   2 +-
 .../bundles/jquery-datetimepicker-css.html    |   2 +-
 allianceauth/templates/bundles/jquery-js.html |   3 +
 .../templates/bundles/jquery-ui-css.html      |   2 +-
 .../templates/bundles/jquery-ui-js.html       |   2 +-
 allianceauth/templates/bundles/moment-js.html |   4 +-
 .../templates/bundles/x-editable.css.html     |   2 +-
 allianceauth/theme/__init__.py                |   0
 allianceauth/theme/apps.py                    |   9 +
 allianceauth/theme/bootstrap/__init__.py      |   0
 allianceauth/theme/bootstrap/apps.py          |  11 +
 allianceauth/theme/bootstrap/auth_hooks.py    |  33 ++
 allianceauth/theme/bootstrap_dark/__init__.py |   0
 allianceauth/theme/bootstrap_dark/apps.py     |  11 +
 .../theme/bootstrap_dark/auth_hooks.py        |  34 +++
 allianceauth/theme/darkly/__init__.py         |   0
 allianceauth/theme/darkly/apps.py             |  11 +
 allianceauth/theme/darkly/auth_hooks.py       |  33 ++
 allianceauth/theme/flatly/__init__.py         |   0
 allianceauth/theme/flatly/apps.py             |  11 +
 allianceauth/theme/flatly/auth_hooks.py       |  33 ++
 allianceauth/theme/hooks.py                   |  47 +++
 allianceauth/theme/materia/__init__.py        |   0
 allianceauth/theme/materia/apps.py            |  11 +
 allianceauth/theme/materia/auth_hooks.py      |  33 ++
 allianceauth/theme/templates/__init__.py      |   0
 .../theme/templates/theme/__init__.py         |   0
 .../templates/theme/theme_imports_css.html    |  10 +
 .../templates/theme/theme_imports_js.html     |  10 +
 .../theme/templates/theme/theme_select.html   |   9 +
 allianceauth/theme/templatetags/__init__.py   |   0
 allianceauth/theme/templatetags/theme_tags.py |  73 +++++
 allianceauth/timerboard/auth_hooks.py         |  18 +-
 .../timerboard/dashboard.timers.html          |  58 ++++
 .../timerboard/templates/timerboard/form.html |   8 +-
 .../templates/timerboard/index_button.html    |   2 +-
 .../timerboard/timer_confirm_delete.html      |   6 +-
 .../timerboard/templates/timerboard/view.html | 146 ++++-----
 allianceauth/timerboard/views.py              |  15 +-
 allianceauth/urls.py                          |   5 +-
 allianceauth/views.py                         |  72 +++--
 docs/customizing/index.md                     |   2 +-
 docs/development/aa_core/documentation.md     |   3 +-
 docs/development/custom/custom-themes.md      |  19 ++
 docs/development/custom/index.md              |   3 +-
 .../custom/integrating-services.md            | 138 +++++----
 docs/development/custom/logging.md            |   5 +
 docs/development/custom/menu-hooks.md         |  40 +--
 docs/development/custom/url-hooks.md          |  13 +-
 docs/development/index.md                     |   2 +-
 161 files changed, 3198 insertions(+), 1655 deletions(-)
 create mode 100644 allianceauth/authentication/auth_hooks.py
 create mode 100644 allianceauth/authentication/migrations/0022_userprofile_theme.py
 create mode 100644 allianceauth/authentication/templates/authentication/dashboard.characters.html
 create mode 100644 allianceauth/authentication/templates/authentication/dashboard.groups.html
 create mode 100644 allianceauth/menu/__init__.py
 create mode 100644 allianceauth/menu/admin.py
 create mode 100644 allianceauth/menu/apps.py
 create mode 100644 allianceauth/menu/hooks.py
 create mode 100644 allianceauth/menu/migrations/0001_initial.py
 create mode 100644 allianceauth/menu/migrations/0002_alter_menuitem_hook_function_and_more.py
 create mode 100644 allianceauth/menu/migrations/0003_menuitem_menu_menuit_rank_e880ab_idx.py
 create mode 100644 allianceauth/menu/migrations/0004_alter_menuitem_hide_alter_menuitem_icon_classes_and_more.py
 create mode 100644 allianceauth/menu/migrations/__init__.py
 create mode 100644 allianceauth/menu/models.py
 create mode 100644 allianceauth/menu/providers.py
 create mode 100644 allianceauth/menu/templates/menu/menu-block.html
 create mode 100644 allianceauth/menu/templates/menu/menu-item-bs5.html
 create mode 100644 allianceauth/menu/templates/menu/menu-notification-block.html
 create mode 100644 allianceauth/menu/templates/menu/menu-user.html
 create mode 100644 allianceauth/menu/templates/menu/sortable-side-menu.html
 create mode 100644 allianceauth/menu/templatetags/__init__.py
 create mode 100644 allianceauth/menu/templatetags/menu_items.py
 create mode 100644 allianceauth/optimer/templates/optimer/dashboard.ops.html
 create mode 100644 allianceauth/services/templates/services/services_ctrl_base.html
 create mode 100644 allianceauth/static/allianceauth/images/auth-logo.png
 create mode 100644 allianceauth/static/allianceauth/images/auth-logo.svg
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_444444_256x240.png
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_555555_256x240.png
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_777620_256x240.png
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_777777_256x240.png
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_cc0000_256x240.png
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_ffffff_256x240.png
 create mode 100644 allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/jquery-ui.min.css
 create mode 100644 allianceauth/templates/allianceauth/base-bs5.html
 create mode 100644 allianceauth/templates/allianceauth/error.html
 create mode 100644 allianceauth/templates/allianceauth/messages-bs5.html
 create mode 100644 allianceauth/templates/allianceauth/top-menu-rh-default.html
 create mode 100644 allianceauth/templates/bundles/datatables-css-bs5.html
 create mode 100644 allianceauth/templates/bundles/datatables-js-bs5.html
 create mode 100644 allianceauth/templates/bundles/jquery-js.html
 create mode 100644 allianceauth/theme/__init__.py
 create mode 100644 allianceauth/theme/apps.py
 create mode 100644 allianceauth/theme/bootstrap/__init__.py
 create mode 100644 allianceauth/theme/bootstrap/apps.py
 create mode 100644 allianceauth/theme/bootstrap/auth_hooks.py
 create mode 100644 allianceauth/theme/bootstrap_dark/__init__.py
 create mode 100644 allianceauth/theme/bootstrap_dark/apps.py
 create mode 100644 allianceauth/theme/bootstrap_dark/auth_hooks.py
 create mode 100644 allianceauth/theme/darkly/__init__.py
 create mode 100644 allianceauth/theme/darkly/apps.py
 create mode 100644 allianceauth/theme/darkly/auth_hooks.py
 create mode 100644 allianceauth/theme/flatly/__init__.py
 create mode 100644 allianceauth/theme/flatly/apps.py
 create mode 100644 allianceauth/theme/flatly/auth_hooks.py
 create mode 100644 allianceauth/theme/hooks.py
 create mode 100644 allianceauth/theme/materia/__init__.py
 create mode 100644 allianceauth/theme/materia/apps.py
 create mode 100644 allianceauth/theme/materia/auth_hooks.py
 create mode 100644 allianceauth/theme/templates/__init__.py
 create mode 100644 allianceauth/theme/templates/theme/__init__.py
 create mode 100644 allianceauth/theme/templates/theme/theme_imports_css.html
 create mode 100644 allianceauth/theme/templates/theme/theme_imports_js.html
 create mode 100644 allianceauth/theme/templates/theme/theme_select.html
 create mode 100644 allianceauth/theme/templatetags/__init__.py
 create mode 100644 allianceauth/theme/templatetags/theme_tags.py
 create mode 100644 allianceauth/timerboard/templates/timerboard/dashboard.timers.html
 create mode 100644 docs/development/custom/custom-themes.md

diff --git a/allianceauth/apps.py b/allianceauth/apps.py
index 2e6bd289..053f71f8 100644
--- a/allianceauth/apps.py
+++ b/allianceauth/apps.py
@@ -1,5 +1,30 @@
 from django.apps import AppConfig
+from django.core.checks import Warning, Error, register
 
 
 class AllianceAuthConfig(AppConfig):
     name = 'allianceauth'
+
+
+@register()
+def check_settings(app_configs, **kwargs):
+    from django.conf import settings
+
+    errors = []
+    if hasattr(settings, "SITE_URL"):
+        if settings.SITE_URL[-1] == "/":
+            errors.append(Warning(
+                "'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth."))
+    else:
+        errors.append(Error(
+            "No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules."))
+    if hasattr(settings, "CSRF_TRUSTED_ORIGINS"):
+        if hasattr(settings, "SITE_URL"):
+            if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
+                errors.append(Warning(
+                    "'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified."))
+    else:
+        errors.append(Error(
+            "No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified"))
+
+    return errors
diff --git a/allianceauth/authentication/auth_hooks.py b/allianceauth/authentication/auth_hooks.py
new file mode 100644
index 00000000..abc22803
--- /dev/null
+++ b/allianceauth/authentication/auth_hooks.py
@@ -0,0 +1,45 @@
+from allianceauth.hooks import DashboardItemHook
+from allianceauth import hooks
+from .views import dashboard_characters, dashboard_groups, dashboard_admin
+
+
+class UserCharactersHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_characters,
+            5
+        )
+
+
+class UserGroupsHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_groups,
+            5
+        )
+
+
+class AdminHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_admin,
+            0
+        )
+
+
+@hooks.register('dashboard_hook')
+def register_character_hook():
+    return UserCharactersHook()
+
+
+@hooks.register('dashboard_hook')
+def register_groups_hook():
+    return UserGroupsHook()
+
+
+@hooks.register('dashboard_hook')
+def register_admin_hook():
+    return AdminHook()
diff --git a/allianceauth/authentication/middleware.py b/allianceauth/authentication/middleware.py
index 5e2f0409..f2fc8145 100644
--- a/allianceauth/authentication/middleware.py
+++ b/allianceauth/authentication/middleware.py
@@ -31,6 +31,7 @@ class UserSettingsMiddleware(MiddlewareMixin):
             except Exception as e:
                 logger.exception(e)
 
+            # AA v3 NIGHT_MODE
             # Set our Night mode flag from the DB
             # Null = hasnt been set by the user ever, dont act.
             #
@@ -42,4 +43,11 @@ class UserSettingsMiddleware(MiddlewareMixin):
             except Exception as e:
                 logger.exception(e)
 
+            # AA v4 Themes
+            try:
+                if request.user.profile.theme is not None:
+                    request.session["THEME"] = request.user.profile.theme
+            except Exception as e:
+                logger.exception(e)
+
         return response
diff --git a/allianceauth/authentication/migrations/0022_userprofile_theme.py b/allianceauth/authentication/migrations/0022_userprofile_theme.py
new file mode 100644
index 00000000..7dd64774
--- /dev/null
+++ b/allianceauth/authentication/migrations/0022_userprofile_theme.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.10 on 2023-10-07 07:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0021_alter_userprofile_language'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='theme',
+            field=models.CharField(blank=True, help_text='Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps', max_length=200, null=True, verbose_name='Theme'),
+        ),
+    ]
diff --git a/allianceauth/authentication/models.py b/allianceauth/authentication/models.py
index 6d7a06b8..068eab14 100644
--- a/allianceauth/authentication/models.py
+++ b/allianceauth/authentication/models.py
@@ -101,6 +101,13 @@ class UserProfile(models.Model):
         _("Night Mode"),
         blank=True,
         null=True)
+    theme = models.CharField(
+        _("Theme"),
+        max_length=200,
+        blank=True,
+        null=True,
+        help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
+    )
 
     def assign_state(self, state=None, commit=True):
         if not state:
diff --git a/allianceauth/authentication/templates/authentication/dashboard.characters.html b/allianceauth/authentication/templates/authentication/dashboard.characters.html
new file mode 100644
index 00000000..6b4f4d09
--- /dev/null
+++ b/allianceauth/authentication/templates/authentication/dashboard.characters.html
@@ -0,0 +1,41 @@
+{% load i18n %}
+<div class="col-12 col-xl-8 align-self-stretch p-2">
+    <div class="card">
+        <div class="card-body">
+            <div class="d-flex align-items-center">
+                <h4 class="ms-auto me-auto">
+                    {% translate "Characters" %}
+                </h4>
+            </div>
+            <div class="card-body">
+                <div style="height: 300px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
+                <div class="d-flex">
+                    <a href="{% url 'authentication:add_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Add Character' %}"><span class="d-md-inline m-2">{% translate 'Add Character' %}</span></a>
+                    <a href="{% url 'authentication:change_main_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Change Main' %}"></span><span class="d-md-inline m-2">{% translate 'Change Main' %}</span></a>
+                </div>
+                <table class="table" style="--bs-table-bg: transparent;">
+                    <thead>
+                        <tr>
+                            <th class="text-center"></th>
+                            <th class="text-center">{% translate "Name" %}</th>
+                            <th class="text-center">{% translate "Corp" %}</th>
+                            <th class="text-center">{% translate "Alliance" %}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for char in characters %}
+                            <tr>
+                                <td class="text-center"><img class="ra-avatar rounded-circle" src="{{ char.portrait_url_32 }}">
+                                </td>
+                                <td class="text-center">{{ char.character_name }}</td>
+                                <td class="text-center">{{ char.corporation_name }}</td>
+                                <td class="text-center">{{ char.alliance_name|default_if_none:"" }}</td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/allianceauth/authentication/templates/authentication/dashboard.groups.html b/allianceauth/authentication/templates/authentication/dashboard.groups.html
new file mode 100644
index 00000000..1a746a3b
--- /dev/null
+++ b/allianceauth/authentication/templates/authentication/dashboard.groups.html
@@ -0,0 +1,20 @@
+{% load i18n %}
+<div class="col-12 col-xl-4 align-self-stretch p-2">
+    <div class="card h-100">
+        <div class="card-body">
+            <h4 class="card-title text-center">{% translate "Membership" %}</h4>
+            <div class="card-body">
+                <div style="height: 300px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
+                    <h6 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h6>
+                    <table class="table" style="--bs-table-bg: transparent;">
+                        {% for group in groups %}
+                            <tr>
+                                <td class="text-center">{{ group.name }}</td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html
index 896dddfe..af1ece0d 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.html
@@ -1,190 +1,15 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Dashboard" %}{% endblock %}
-
+{% block header_nav_brand %}
+    {% translate "Dashboard" %}
+{% endblock %}
 {% block content %}
-    <h1 class="page-header text-center">{% translate "Dashboard" %}</h1>
-    {% if user.is_staff %}
-        {% include 'allianceauth/admin-status/include.html' %}
-    {% endif %}
-    <div class="col-sm-12">
-        <div class="row vertical-flexbox-row2">
-            <div class="col-sm-6 text-center">
-                <div class="panel panel-primary" style="height:100%">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            {% blocktranslate with state=request.user.profile.state %}
-                                Main Character (State: {{ state }})
-                            {% endblocktranslate %}
-                        </h3>
-                    </div>
-                    <div class="panel-body">
-                        {% if request.user.profile.main_character %}
-                            {% with request.user.profile.main_character as main %}
-                                <div class="hidden-xs">
-                                    <div class="col-lg-4 col-sm-2">
-                                        <table class="table">
-                                            <tr>
-                                                <td class="text-center">
-                                                    <img class="ra-avatar" src="{{ main.portrait_url_128 }}" alt="{{ main.character_name }}">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-center">{{ main.character_name }}</td>
-                                            </tr>
-                                        </table>
-                                    </div>
-                                    <div class="col-lg-4 col-sm-2">
-                                        <table class="table">
-                                            <tr>
-                                                <td class="text-center">
-                                                    <img class="ra-avatar" src="{{ main.corporation_logo_url_128 }}" alt="{{ main.corporation_name }}">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-center">{{ main.corporation_name }}</td>
-                                            </tr>
-                                        </table>
-                                    </div>
-                                    <div class="col-lg-4 col-sm-2">
-                                        {% if main.alliance_id %}
-                                            <table class="table">
-                                                <tr>
-                                                    <td class="text-center">
-                                                        <img class="ra-avatar" src="{{ main.alliance_logo_url_128 }}" alt="{{ main.alliance_name }}">
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="text-center">{{ main.alliance_name }}</td>
-                                                <tr>
-                                            </table>
-                                        {% elif main.faction_id %}
-                                            <table class="table">
-                                                <tr>
-                                                    <td class="text-center">
-                                                        <img class="ra-avatar" src="{{ main.faction_logo_url_128 }}" alt="{{ main.faction_name }}">
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="text-center">{{ main.faction_name }}</td>
-                                                <tr>
-                                            </table>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                                <div class="table visible-xs-block">
-                                    <p>
-                                        <img class="ra-avatar" src="{{ main.portrait_url_64 }}" alt="{{ main.corporation_name }}">
-                                        <img class="ra-avatar" src="{{ main.corporation_logo_url_64 }}" alt="{{ main.corporation_name }}">
-                                        {% if main.alliance_id %}
-                                            <img class="ra-avatar" src="{{ main.alliance_logo_url_64 }}" alt="{{ main.alliance_name }}">
-                                        {% endif %}
-                                        {% if main.faction_id %}
-                                            <img class="ra-avatar" src="{{ main.faction_logo_url_64 }}" alt="{{ main.faction_name }}">
-                                        {% endif %}
-                                    </p>
-                                    <p>
-                                        <strong>{{ main.character_name }}</strong><br>
-                                        {{ main.corporation_name }}<br>
-                                        {% if main.alliance_id %}
-                                            {{ main.alliance_name }}<br>
-                                        {% endif %}
-                                        {% if main.faction_id %}
-                                            {{ main.faction_name }}
-                                        {% endif %}
-                                    </p>
-                                </div>
-                            {% endwith %}
-                        {% else %}
-                            <div class="alert alert-danger" role="alert">
-                                {% translate "No main character set." %}
-                            </div>
-                        {% endif %}
-                        <div class="clearfix"></div>
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <p>
-                                    <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
-                                    title="Add Character">{% translate 'Add Character' %}</a>
-                                </p>
-                            </div>
-                            <div class="col-sm-6">
-                                <p>
-                                    <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
-                                    title="Change Main Character">{% translate "Change Main" %}</a>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6 text-center">
-                <div class="panel panel-success" style="height:100%">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">{% translate "Group Memberships" %}</h3>
-                    </div>
-                    <div class="panel-body">
-                        <div style="height: 240px;overflow-y:auto;">
-                            <table class="table table-aa">
-                                {% for group in groups %}
-                                    <tr>
-                                        <td>{{ group.name }}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="clearfix"></div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title text-center" style="text-align: center">
-                    {% translate 'Characters' %}
-                </h3>
-            </div>
-            <div class="panel-body">
-                <table class="table table-aa hidden-xs">
-                    <thead>
-                        <tr>
-                            <th class="text-center"></th>
-                            <th class="text-center">{% translate 'Name' %}</th>
-                            <th class="text-center">{% translate 'Corp' %}</th>
-                            <th class="text-center">{% translate 'Alliance' %}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for char in characters %}
-                            <tr>
-                                <td class="text-center">
-                                    <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
-                                </td>
-                                <td class="text-center">{{ char.character_name }}</td>
-                                <td class="text-center">{{ char.corporation_name }}</td>
-                                <td class="text-center">{{ char.alliance_name|default:"" }}</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                <table class="table table-aa visible-xs-block" style="width: 100%">
-                    <tbody>
-                        {% for char in characters %}
-                            <tr>
-                                <td class="text-center" style="vertical-align: middle">
-                                    <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
-                                </td>
-                                <td class="text-center" style="vertical-align: middle; width: 100%">
-                                    <strong>{{ char.character_name }}</strong><br>
-                                    {{ char.corporation_name }}<br>
-                                    {{ char.alliance_name|default:"" }}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
+    <div class="d-flex justify-content-around align-self-center flex-wrap">
+        {% for dash in views %}
+            {{ dash | safe }}
+        {% endfor %}
     </div>
 {% endblock %}
diff --git a/allianceauth/authentication/templates/authentication/tokens.html b/allianceauth/authentication/templates/authentication/tokens.html
index 11bb91ed..cb99e2c3 100644
--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@@ -1,7 +1,7 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Dashboard" %}{% endblock %}
+{% block page_title %}{% translate "Dashboard" %}{% endblock page_title %}
 
 {% block content %}
     <h1 class="page-header text-center">{% translate "Token Management" %}</h1>
@@ -10,7 +10,7 @@
             <thead>
                 <tr>
                     <th>{% translate "Scopes" %}</th>
-                    <th class="text-right">{% translate "Actions" %}</th>
+                    <th class="text-end">{% translate "Actions" %}</th>
                     <th>{% translate "Character" %}</th>
 
                 </tr>
@@ -18,24 +18,24 @@
             <tbody>
                 {% for t in tokens %}
                     <tr>
-                        <td styl="white-space:initial;">{% for s in t.scopes.all %}<span class="label label-default">{{s.name}}</span> {% endfor %}</td>
-                        <td nowrap class="text-right"><a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fas fa-trash"></i></a> <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fas fa-sync-alt"></i></a></td>
-                        <td>{{t.character_name}}</td>
+                        <td styl="white-space:initial;">{% for s in t.scopes.all %}<span class="badge badge-secondar">{{ s.name }}</span> {% endfor %}</td>
+                        <td nowrap class="text-end"><a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fas fa-trash"></i></a> <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fas fa-sync-alt"></i></a></td>
+                        <td>{{ t.character_name }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
         </table>
         {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
     </div>
-{% endblock %}
+{% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-{% endblock %}
+    {% include "bundles/datatables-js-bs5.html" %}
+{% endblock extra_javascript %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
+    {% include "bundles/datatables-css-bs5.html" %}
+{% endblock extra_css %}
 
 {% block extra_script %}
     $(document).ready(function(){
@@ -59,4 +59,4 @@
             "stateSave": true,
         });
     });
-{% endblock %}
+{% endblock extra_script %}
diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html
index 62529bda..f5cb128c 100644
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@@ -7,6 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="">
         <meta name="author" content="">
+        <!-- TODO Bundle all the site specific stuff up into its own template for easy overide -->
         <meta property="og:title" content="{{ SITE_NAME }}">
         <meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
         <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
diff --git a/allianceauth/authentication/views.py b/allianceauth/authentication/views.py
index 15c746c7..b6fa6411 100644
--- a/allianceauth/authentication/views.py
+++ b/allianceauth/authentication/views.py
@@ -1,4 +1,5 @@
 import logging
+from allianceauth.hooks import get_hooks
 
 from django_registration.backends.activation.views import (
     REGISTRATION_SALT, ActivationView as BaseActivationView,
@@ -42,23 +43,51 @@ def index(request):
     return redirect('authentication:dashboard')
 
 
-@login_required
-def dashboard(request):
+def dashboard_groups(request):
     groups = request.user.groups.all()
     if _has_auto_groups:
         groups = groups\
             .filter(managedalliancegroup__isnull=True)\
             .filter(managedcorpgroup__isnull=True)
     groups = groups.order_by('name')
+
+    context = {
+        'groups': groups,
+    }
+    return render_to_string('authentication/dashboard.groups.html', context=context, request=request)
+
+
+def dashboard_characters(request):
     characters = EveCharacter.objects\
         .filter(character_ownership__user=request.user)\
         .select_related()\
         .order_by('character_name')
 
     context = {
-        'groups': groups,
         'characters': characters
     }
+    return render_to_string('authentication/dashboard.characters.html', context=context, request=request)
+
+
+def dashboard_admin(request):
+    if request.user.is_superuser:
+        return render_to_string('allianceauth/admin-status/include.html', request=request)
+    else:
+        return ""
+
+
+@login_required
+def dashboard(request):
+    _dash_items = list()
+    hooks = get_hooks('dashboard_hook')
+    items = [fn() for fn in hooks]
+    items.sort(key=lambda i: i.order)
+    for item in items:
+        _dash_items.append(item.render(request))
+
+    context = {
+        'views': _dash_items,
+    }
     return render(request, 'authentication/dashboard.html', context)
 
 
diff --git a/allianceauth/context_processors.py b/allianceauth/context_processors.py
index 4feb243e..cafde2ea 100644
--- a/allianceauth/context_processors.py
+++ b/allianceauth/context_processors.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from .views import NightModeRedirectView
+from .views import NightModeRedirectView, ThemeRedirectView
 
 
 def auth_settings(request):
diff --git a/allianceauth/corputils/auth_hooks.py b/allianceauth/corputils/auth_hooks.py
index d90d7f3c..77bfae91 100644
--- a/allianceauth/corputils/auth_hooks.py
+++ b/allianceauth/corputils/auth_hooks.py
@@ -1,4 +1,5 @@
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
 from allianceauth.corputils import urls
diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html
index 17300d94..aff00288 100644
--- a/allianceauth/corputils/templates/corputils/base.html
+++ b/allianceauth/corputils/templates/corputils/base.html
@@ -1,6 +1,8 @@
-{% extends 'allianceauth/base.html' %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %}
+{% block page_title %}
+    {% translate "Corporation Member Data" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
@@ -26,12 +28,13 @@
                     </ul>
                     <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
                         <div class="form-group">
-                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate "Search all corporations..." %}{% endif %}">
+                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}">
                         </div>
                     </form>
                 </div>
             </nav>
-            {% block member_data %}{% endblock %}
+            {% block member_data %}
+            {% endblock member_data %}
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html
index d1d7cc16..9458bc25 100644
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@@ -87,7 +87,7 @@
                                                                         <td class="text-center" style="width:30%">{{ alt.corporation_name }}</td>
                                                                         <td class="text-center" style="width:30%">{{ alt.alliance_name }}</td>
                                                                         <td class="text-center" style="width:5%">
-                                                                            <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="label label-danger" target="_blank">
+                                                                            <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge badge-danger" target="_blank">
                                                                                 {% translate "Killboard" %}
                                                                             </a>
                                                                         </td>
@@ -122,7 +122,7 @@
                                                         <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
                                                         <td class="text-center">{{ member }}</td>
                                                         <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge badge-danger" target="_blank">{% translate "Killboard" %}</a>
                                                         </td>
                                                         <td class="text-center">{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                         <td class="text-center">{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
@@ -134,7 +134,7 @@
                                                         <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                         <td class="text-center">{{ member.character_name }}</td>
                                                         <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge badge-danger" target="_blank">{% translate "Killboard" %}</a>
                                                         </td>
                                                         <td class="text-center"></td>
                                                         <td class="text-center"></td>
@@ -163,7 +163,7 @@
                                                         <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                         <td class="text-center">{{ member.character_name }}</td>
                                                         <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge badge-danger" target="_blank">
                                                                 {% translate "Killboard" %}
                                                             </a>
                                                         </td>
diff --git a/allianceauth/corputils/templates/corputils/search.html b/allianceauth/corputils/templates/corputils/search.html
index 83c34802..d5d9c6c0 100644
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@@ -24,7 +24,7 @@
                             <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
                             <td class="text-center">{{ result.1.character_name }}</td>
                             <td class="text-center">{{ result.0.corp.corporation_name }}</td>
-                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge badge-danger" target="_blank">{% translate "Killboard" %}</a></td>
                             <td class="text-center">{{ result.1.main_character.character_name }}</td>
                             <td class="text-center">{{ result.1.main_character.corporation_name }}</td>
                             <td class="text-center">{{ result.1.main_character.alliance_name }}</td>
diff --git a/allianceauth/eveonline/templatetags/examples.html b/allianceauth/eveonline/templatetags/examples.html
index 180aa3f8..486394c8 100644
--- a/allianceauth/eveonline/templatetags/examples.html
+++ b/allianceauth/eveonline/templatetags/examples.html
@@ -8,10 +8,10 @@ Needs to be called with a context containing three objects:
 
 -->
 
-{% extends 'allianceauth/base.html' %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load evelinks %}
 
-{% block page_title %}Evelinks examples{% endblock %}
+{% block page_title %}Evelinks Examples{% endblock page_title %}
 
 {% block content %}
 
@@ -25,60 +25,57 @@ Needs to be called with a context containing three objects:
 
                 <div class="col-md-4">
                     <h3>evewho</h3>
-                    <p><a href="{{ my_character|evewho_character_url}}">character from character object</a></p>
-                    <p><a href="{{ my_corporation|evewho_corporation_url}}">corporation form corporation object</a></p>
-                    <p><a href="{{ my_character|evewho_corporation_url}}">corporation from charachter object</a></p>
-                    <p><a href="{{ my_alliance|evewho_alliance_url}}">alliance from alliance object</a></p>
-                    <p><a href="{{ my_character|evewho_alliance_url}}">alliance from character object</a></p>
+                    <p><a href="{{ my_character|evewho_character_url }}">character from character object</a></p>
+                    <p><a href="{{ my_corporation|evewho_corporation_url }}">corporation form corporation object</a></p>
+                    <p><a href="{{ my_character|evewho_corporation_url }}">corporation from charachter object</a></p>
+                    <p><a href="{{ my_alliance|evewho_alliance_url }}">alliance from alliance object</a></p>
+                    <p><a href="{{ my_character|evewho_alliance_url }}">alliance from character object</a></p>
                 </div>
 
                 <div class="col-md-4">
                     <h3>dotlan</h3>
-                    <p><a href="{{ my_character|dotlan_corporation_url}}">corporation form character object</a></p>
-                    <p><a href="{{ my_corporation|dotlan_corporation_url}}">corporation form corporation object</a></p>
-                    <p><a href="{{ my_character|dotlan_alliance_url}}">alliance from character object</a></p>
-                    <p><a href="{{ my_alliance|dotlan_alliance_url}}">alliance from alliance object</a></p>
-                    <p><a href="{{ 'Black Rise'|dotlan_region_url}}">region from name string</a></p>
-                    <p><a href="{{ 'Tama'|dotlan_solar_system_url}}">solar system from name string</a></p>
+                    <p><a href="{{ my_character|dotlan_corporation_url }}">corporation form character object</a></p>
+                    <p><a href="{{ my_corporation|dotlan_corporation_url }}">corporation form corporation object</a></p>
+                    <p><a href="{{ my_character|dotlan_alliance_url }}">alliance from character object</a></p>
+                    <p><a href="{{ my_alliance|dotlan_alliance_url }}">alliance from alliance object</a></p>
+                    <p><a href="{{ 'Black Rise'|dotlan_region_url }}">region from name string</a></p>
+                    <p><a href="{{ 'Tama'|dotlan_solar_system_url }}">solar system from name string</a></p>
                 </div>
 
                 <div class="col-md-4">
                     <h3>zkillboard</h3>
-                    <p><a href="{{ my_character|zkillboard_character_url}}">character from character object</a></p>
-                    <p><a href="{{ my_character|zkillboard_corporation_url}}">corporation from character object</a></p>
-                    <p><a href="{{ my_corporation|zkillboard_corporation_url}}">corporation form corporation object</a></p>
-                    <p><a href="{{ my_character|zkillboard_alliance_url}}">alliance from character object</a></p>
-                    <p><a href="{{ my_alliance|zkillboard_alliance_url}}">alliance from alliance object</a></p>
-                    <p><a href="{{ 10000069|zkillboard_region_url}}">region from ID</a></p>
-                    <p><a href="{{ 30002813|zkillboard_solar_system_url}}">solar sytem from ID</a></p>
+                    <p><a href="{{ my_character|zkillboard_character_url }}">character from character object</a></p>
+                    <p><a href="{{ my_character|zkillboard_corporation_url }}">corporation from character object</a></p>
+                    <p><a href="{{ my_corporation|zkillboard_corporation_url }}">corporation form corporation object</a></p>
+                    <p><a href="{{ my_character|zkillboard_alliance_url }}">alliance from character object</a></p>
+                    <p><a href="{{ my_alliance|zkillboard_alliance_url }}">alliance from alliance object</a></p>
+                    <p><a href="{{ 10000069|zkillboard_region_url }}">region from ID</a></p>
+                    <p><a href="{{ 30002813|zkillboard_solar_system_url }}">solar sytem from ID</a></p>
                 </div>
             </div>
-            </div>
 
             <h2>image URLs</h2>
 
             <div class="rows">
 
                 <div class="col-md-4">
-                    <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128}}"></p>
-                    <p>character from character object: <img src="{{ my_character|character_portrait_url:128}}"></p>
+                    <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128 }}"></p>
+                    <p>character from character object: <img src="{{ my_character|character_portrait_url:128 }}"></p>
                 </div>
 
                 <div class="col-md-4">
-                    <p>corporation from ID: <img src="{{ my_character.corporation_id|corporation_logo_url:128}}"></p>
-                    <p>corporation from character object: <img src="{{ my_character|corporation_logo_url:128}}"></p>
-                    <p>corporation from corporation object: <img src="{{ my_corporation|corporation_logo_url:128}}"></p>
+                    <p>corporation from ID: <img src="{{ my_character.corporation_id|corporation_logo_url:128 }}"></p>
+                    <p>corporation from character object: <img src="{{ my_character|corporation_logo_url:128 }}"></p>
+                    <p>corporation from corporation object: <img src="{{ my_corporation|corporation_logo_url:128 }}"></p>
                 </div>
 
                 <div class="col-md-4">
-                    <p>alliance from ID: <img src="{{ my_character.alliance_id|alliance_logo_url:128}}"></p>
-                    <p>alliance from character object: <img src="{{ my_character|alliance_logo_url:128}}"></p>
-                    <p>alliance from alliance object: <img src="{{ my_alliance|alliance_logo_url:128}}"></p>
+                    <p>alliance from ID: <img src="{{ my_character.alliance_id|alliance_logo_url:128 }}"></p>
+                    <p>alliance from character object: <img src="{{ my_character|alliance_logo_url:128 }}"></p>
+                    <p>alliance from alliance object: <img src="{{ my_alliance|alliance_logo_url:128 }}"></p>
                 </div>
-
             </div>
-
         </div>
     </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/allianceauth/fleetactivitytracking/auth_hooks.py b/allianceauth/fleetactivitytracking/auth_hooks.py
index 8d71fc13..4c68b340 100644
--- a/allianceauth/fleetactivitytracking/auth_hooks.py
+++ b/allianceauth/fleetactivitytracking/auth_hooks.py
@@ -1,7 +1,8 @@
+from allianceauth.menu.hooks import MenuItemHook
 from . import urls
 from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.services.hooks import UrlHook
 
 
 @hooks.register('menu_item_hook')
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
index d0b9d8ae..fe015866 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
@@ -1,27 +1,28 @@
-{% extends 'allianceauth/base.html' %}
+{% extends 'allianceauth/base-bs5.html' %}
 {% load i18n %}
-{% block page_title %}{% translate "Fleet Participation" %}{% endblock %}
-
+{% block page_title %}
+    {% translate "Fleet Participation" %}
+{% endblock %}
 {% block content %}
-<div class="col-lg-12">
-    <h1 class="page-header text-center">{% translate "Character not found!" %}</h1>
-    <div class="col-lg-12 container" id="example">
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">{{ character_name }}</div>
-                    <div class="panel-body">
-                        <div class="col-lg-2 col-sm-2">
-                            <img class="ra-avatar img-responsive" src="{{ character_portrait_url }}" alt="{{ character_name }}">
-                        </div>
-                        <div class="col-lg-10 col-sm-2">
-                            <div class="alert alert-danger" role="alert">{% translate "Character not registered!" %}</div>
-                            {% translate "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% translate "Add it here" %}</a> {% translate "before attempting to click fleet attendance links." %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% translate "Character not found!" %}</h1>
+        <div class="col-lg-12 container" id="example">
+            <div class="row">
+                <div class="col-lg-12">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">{{ character_name }}</div>
+                        <div class="panel-body">
+                            <div class="col-lg-2 col-sm-2">
+                                <img class="ra-avatar img-responsive" src="{{ character_portrait_url }}" alt="{{ character_name }}">
+                            </div>
+                            <div class="col-lg-10 col-sm-2">
+                                <div class="alert alert-danger" role="alert">{% translate "Character not registered!" %}</div>
+                                {% translate "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% translate "Add it here" %}</a> {% translate "before attempting to click fleet attendance links." %}
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 {% endblock %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
index 25f9656e..493bf9af 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
@@ -1,31 +1,31 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load bootstrap %}
 {% load i18n %}
-
-{% block page_title %}{% translate "Create Fatlink" %}{% endblock page_title %}
-
+{% block page_title %}
+    {% translate "Create Fatlink" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Create Fleet Operation" %}</h1>
-
         <div class="container-fluid">
             {% if badrequest %}
-            <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
+                <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
             {% endif %}
-            {% for message in errormessages %}
-            <div class="alert alert-danger" role="alert">{{ message }}</div>
-            {% endfor %}
-            <div class="col-md-4 col-md-offset-4">
+            {% for message in errormessages %}<div class="alert alert-danger" role="alert">{{ message }}</div>{% endfor %}
+            <div class="col-md-4 offset-md-4">
                 <div class="row">
-                        <form class="form-signin" role="form" action="" method="POST">
-                            {% csrf_token %}
-                            {{ form|bootstrap }}
-                            <br>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit" name="submit_fat">{% translate "Create fatlink" %}</button>
-                        </form>
+                    <form class="form-signin" role="form" action="" method="POST">
+                        {% csrf_token %}
+                        {{ form|bootstrap }}
+                        <br/>
+                        <button class="btn btn-lg btn-primary btn-block"
+                                type="submit"
+                                name="submit_fat">
+                            {% translate "Create fatlink" %}
+                        </button>
+                    </form>
                 </div>
             </div>
         </div>
     </div>
-
 {% endblock content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
index b794b646..5415cb54 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@@ -1,11 +1,11 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 {% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Edit fatlink" %} "{{ fatlink }}"
-            <div class="text-right">
+            <div class="text-end">
                 <form>
                     <button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True">
                         {% translate "Delete fat" %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index 738efeea..f7103a45 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
@@ -7,7 +7,7 @@
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
             {% if char_id %}
-            <div class="text-right">
+            <div class="text-end">
                 <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">{% translate "Previous month" %}</a>
                 <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">{% translate "Next month" %}</a>
             </div>
@@ -51,7 +51,7 @@
             </tr>
             {% for link in created_fats %}
             <tr>
-                <td class="text-center"><a href="{%  url 'fatlink:click' link.hash %}" class="label label-primary">{{ link.fleet }}</a></td>
+                <td class="text-center"><a href="{% url 'fatlink:click' link.hash %}" class="badge badge-primary">{{ link.fleet }}</a></td>
                 <td class="text-center">{{ link.creator.username }}</td>
                 <td class="text-center">{{ link.fatdatetime }}</td>
                 <td class="text-center">{{ link.duration }}</td>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
index bedde2d6..7ac8cfa4 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
@@ -1,35 +1,34 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
-{% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
-
+{% block page_title %}
+    {% translate "Personal fatlink statistics" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
-            <div class="text-right">
-                <a href="{% url 'fatlink:personal_statistics_year' previous_year %}" class="btn btn-info">{% translate "Previous year" %}</a>
-                {%  if next_year %}
-                <a href="{% url 'fatlink:personal_statistics_year' next_year  %}" class="btn btn-info">{% translate "Next year" %}</a>
-                {%  endif %}
+        <h1 class="page-header text-center">
+            {% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
+            <div class="text-end">
+                <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>
+                {% if next_year %}
+                    <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
+                {% endif %}
             </div>
         </h1>
-        <div class="col-lg-2 col-lg-offset-5">
-        <table class="table table-responsive">
-            <tr>
-                <th class="col-md-2 text-center">{% translate "Month" %}</th>
-                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
-            </tr>
-            {% for monthnr, month, n_fats in monthlystats %}
-            <tr>
-                <td class="text-center">
-                    <a href="{% url 'fatlink:personal_statistics_month' year monthnr %}">
-                        {{ month }}
-                    </a>
-                </td>
-                <td class="text-center">{{ n_fats }}</td>
-            </tr>
-            {% endfor %}
-        </table>
+        <div class="col-lg-2 offset-lg-5">
+            <table class="table table-responsive">
+                <tr>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Month" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
+                </tr>
+                {% for monthnr, month, n_fats in monthlystats %}
+                    <tr>
+                        <td class="text-center">
+                            <a href="{% url 'fatlink:personal_statistics_month' year monthnr %}">{{ month }}</a>
+                        </td>
+                        <td class="text-center">{{ n_fats }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
         </div>
     </div>
 {% endblock content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
index d90e97c9..3d18bf0d 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
@@ -1,46 +1,50 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
-{% block page_title %}{% translate "Fatlink Corp Statistics" %}{% endblock page_title %}
-
+{% block page_title %}
+    {% translate "Fatlink Corp Statistics" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-            <div class="text-right">
-                <a href="{% url 'fatlink:statistics_corp_month' corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                {%  if next_month %}
-                <a href="{% url 'fatlink:statistics_corp_month' corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
-                {%  endif %}
+        <h1 class="page-header text-center">
+            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+            <div class="text-end">
+                <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+                {% if next_month %}
+                    <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
+                {% endif %}
             </div>
         </h1>
         {% if fatStats %}
-        <table class="table table-responsive">
-            <tr>
-                <th class="col-md-1"></th>
-                <th class="col-md-2 text-center">{% translate "Main Character" %}</th>
-                <th class="col-md-2 text-center">{% translate "Characters" %}</th>
-                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
-                <th class="col-md-2 text-center">{% translate "Average fats" %}
-                    <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Fats ÷ Characters"></i>
-                </th>
-            </tr>
-            {% for memberStat in fatStats %}
-            <tr>
-                <td>
-                    <img src="{{ memberStat.mainchar.portrait_url_32 }}" class="ra-avatar img-responsive" alt="{{ memberStat.mainchar.character_name }}">
-                </td>
-                <td class="text-center">{{ memberStat.mainchar.character_name }}</td>
-                <td class="text-center">{{ memberStat.n_chars }}</td>
-                <td class="text-center">{{ memberStat.n_fats }}</td>
-                <td class="text-center">{{ memberStat.avg_fat }}</td>
-            </tr>
-            {% endfor %}
-        </table>
+        <div class="table-responsive">
+            <table class="table table-striped">
+                <tr>
+                    <th scope="col" class="col-md-1"></th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Main Character" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Characters" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
+                    <th scope="col" class="col-md-2 text-center">
+                        {% translate "Average fats" %}
+                        <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
+                    </th>
+                </tr>
+                {% for memberStat in fatStats %}
+                    <tr>
+                        <td>
+                            <img src="{{ memberStat.mainchar.portrait_url_32 }}" class="ra-avatar img-responsive" alt="{{ memberStat.mainchar.character_name }}">
+                        </td>
+                        <td class="text-center">{{ memberStat.mainchar.character_name }}</td>
+                        <td class="text-center">{{ memberStat.n_chars }}</td>
+                        <td class="text-center">{{ memberStat.n_fats }}</td>
+                        <td class="text-center">{{ memberStat.avg_fat }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
         {% endif %}
     </div>
 {% endblock content %}
 {% block extra_script %}
-$(document).ready(function () {
-    $("[rel=tooltip]").tooltip();
-});
+    $(document).ready(function () {
+        $("[rel=tooltip]").tooltip();
+    });
 {% endblock extra_script %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
index 69155f27..2d8d9c9e 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
@@ -1,48 +1,54 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
-{% block page_title %}{% translate "Fatlink statistics" %}{% endblock page_title %}
-
+{% block page_title %}
+    {% translate "Fatlink Statistics" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-            <div class="text-right">
-                <a href="{% url 'fatlink:statistics_month' previous_month|date:"Y" previous_month|date:"m"  %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                {%  if next_month %}
-                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
-                {%  endif %}
+        <h1 class="page-header text-center">
+            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+            <div class="text-end">
+                <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+                {% if next_month %}
+                    <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" wclass="btn btn-info">{% translate "Next month" %}</a>
+                {% endif %}
             </div>
         </h1>
         {% if fatStats %}
-        <table class="table table-responsive">
-            <tr>
-                <th class="col-md-1"></th>
-                <th class="col-md-2 text-center">{% translate "Ticker" %}</th>
-                <th class="col-md-5 text-center">{% translate "Corp" %}</th>
-                <th class="col-md-2 text-center">{% translate "Members" %}</th>
-                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
-                <th class="col-md-2 text-center">{% translate "Average fats" %}
-                    <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Fats ÷ Characters"></i>
-                </th>
-            </tr>
-            {% for corpStat in fatStats %}
-            <tr>
-                <td>
-                    <img src="{{ corpStat.corp.logo_url_32 }}" class="ra-avatar img-responsive" alt="{{ corpStat.corp.corporation_name }}">
-                </td>
-                <td class="text-center"><a href="{% url 'fatlink:statistics_corp' corpStat.corp.corporation_id %}">[{{ corpStat.corp.corporation_ticker }}]</a></td>
-                <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
-                <td class="text-center">{{ corpStat.corp.member_count }}</td>
-                <td class="text-center">{{ corpStat.n_fats }}</td>
-                <td class="text-center">{{ corpStat.avg_fat }}</td>
-            </tr>
-            {% endfor %}
-        </table>
+        <div class="table-responsive">
+            <table class="table table-striped">
+                <tr>
+                    <th scope="col" class="col-md-1"></th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Ticker" %}</th>
+                    <th scope="col" class="col-md-5 text-center">{% translate "Corp" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Members" %}</th>
+                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
+                    <th scope="col" class="col-md-2 text-center">
+                        {% translate "Average fats" %}
+                        <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
+                    </th>
+                </tr>
+                {% for corpStat in fatStats %}
+                    <tr>
+                        <td>
+                            <img src="{{ corpStat.corp.logo_url_32 }}" class="ra-avatar img-responsive" alt="{{ corpStat.corp.corporation_name }}"/>
+                        </td>
+                        <td class="text-center">
+                            <a href="{% url 'fatlink:statistics_corp' corpStat.corp.corporation_id %}">[{{ corpStat.corp.corporation_ticker }}]</a>
+                        </td>
+                        <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
+                        <td class="text-center">{{ corpStat.corp.member_count }}</td>
+                        <td class="text-center">{{ corpStat.n_fats }}</td>
+                        <td class="text-center">{{ corpStat.avg_fat }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
         {% endif %}
     </div>
 {% endblock content %}
 {% block extra_script %}
-$(document).ready(function () {
-    $("[rel=tooltip]").tooltip();
-});
+    $(document).ready(function () {
+        $("[rel=tooltip]").tooltip();
+    });
 {% endblock extra_script %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
index a472992c..9aa22d29 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@@ -1,99 +1,107 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
-{% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
-
+{% block page_title %}
+    {% translate "Fatlink view" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Participation data" %}</h1>
-        <table class="table">
-                <tr>
-                    <th class="col-md-11">
-                        <h4><b>{% translate "Most recent clicked fatlinks" %}</b>
-                        </h4>
-                    </th>
-                    <th class="col-md-1">
-                        <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info">
-                            {% translate "Personal statistics" %}
-                        </a>
-                    </th>
-                </tr>
-        </table>
-        {% if fats %}
-        <table class="table table-responsive">
-            <tr>
-                <th class="text-center">{% translate "Fleet" %}</th>
-                <th class="text-center">{% translate "Character" %}</th>
-                <th class="text-center">{% translate "System" %}</th>
-                <th class="text-center">{% translate "Ship" %}</th>
-                <th class="text-center">{% translate "Eve Time" %}</th>
-            </tr>
-            {% for fat in fats %}
-            <tr>
-                <td class="text-center">{{ fat.fatlink.fleet }}</td>
-                <td class="text-center">{{ fat.character.character_name }}</td>
-                {%  if fat.station != "No Station" %}
-                <td class="text-center">{% blocktranslate %}Docked in {% endblocktranslate %}{{ fat.system }}</td>
-                {% else %}
-                <td class="text-center">{{ fat.system }}</td>
-                {% endif %}
-                <td class="text-center">{{ fat.shiptype }}</td>
-                <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
-            </tr>
-            {% endfor %}
-        </table>
-        {% else %}
-        <div class="alert alert-warning text-center">{% translate "No fleet activity on record." %}</div>
-        {% endif %}
-
-        {% if perms.auth.fleetactivitytracking%}
-            <table class="table">
+        <div class="table-responsive">
+            <table class="table table-striped">
                 <tr>
                     <th class="col-md-10">
-                        <h4><b>{% translate "Most recent fatlinks" %}</b>
+                        <h4>
+                            <b>{% translate "Most recent clicked fatlinks" %}</b>
                         </h4>
                     </th>
-                    <th class="col-md-1">
-                        <a href="{% url 'fatlink:statistics' %}" class="btn btn-info">
-                            {% translate "View statistics" %}
-                        </a>
-                    </th>
-                    <th class="col-md-1">
-                        <a href="{% url 'fatlink:create' %}" class="btn btn-success">
-                            {% translate "Create fatlink" %}
-                        </a>
+                    <th class="col-md-2 align-self-end">
+                        <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info"><i class="fa-solid fa-circle-info fa-fw"></i>{% translate "Personal statistics" %}</a>
                     </th>
                 </tr>
             </table>
-        {% if fatlinks %}
-        <table class="table">
-            <tr>
-                <th class="text-center">{% translate "Name" %}</th>
-                <th class="text-center">{% translate "Creator" %}</th>
-                <th class="text-center">{% translate "Fleet" %}</th>
-                <th class="text-center">{% translate "Eve Time" %}</th>
-                <th class="text-center">{% translate "Duration" %}</th>
-                <th class="text-center">{% translate "Edit" %}</th>
-            </tr>
-            {% for link in fatlinks %}
-            <tr>
-                <td class="text-center"><a href="{%  url 'fatlink:click' link.hash %}" class="label label-primary">{{ link.fleet }}</a></td>
-                <td class="text-center">{{ link.creator.username }}</td>
-                <td class="text-center">{{ link.fleet }}</td>
-                <td class="text-center">{{ link.fatdatetime }}</td>
-                <td class="text-center">{{ link.duration }}</td>
-                <td class="text-center">
-                    <a href="{%  url 'fatlink:modify' link.hash %}" class="btn btn-info">
-                        <span class="glyphicon glyphicon-edit"></span>
-                    </a>
-                </td>
-            </tr>
-            {%  endfor %}
-
-        </table>
+        </div>
+        {% if fats %}
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <tr>
+                        <th scope="col" class="text-center">{% translate "Fleet" %}</th>
+                        <th scope="col" class="text-center">{% translate "Character" %}</th>
+                        <th scope="col" class="text-center">{% translate "System" %}</th>
+                        <th scope="col" class="text-center">{% translate "Ship" %}</th>
+                        <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
+                    </tr>
+                    {% for fat in fats %}
+                        <tr>
+                            <td class="text-center">{{ fat.fatlink.fleet }}</td>
+                            <td class="text-center">{{ fat.character.character_name }}</td>
+                            {% if fat.station != "No Station" %}
+                                <td class="text-center">{% translate "Docked in" %} {{ fat.system }}</td>
+                            {% else %}
+                                <td class="text-center">{{ fat.system }}</td>
+                            {% endif %}
+                            <td class="text-center">{{ fat.shiptype }}</td>
+                            <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
         {% else %}
-        <div class="alert alert-warning text-center">{% translate "No created fatlinks on record." %}</div>
+            <div class="alert alert-warning text-center">{% translate "No fleet activity on record." %}</div>
         {% endif %}
+        {% if perms.auth.fleetactivitytracking %}
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <tr>
+                        <th class="col-md-8">
+                            <h4>
+                                <b>{% translate "Most recent fatlinks" %}</b>
+                            </h4>
+                        </th>
+                        <th class="col-md-2 align-self-end">
+                            <a href="{% url 'fatlink:statistics' %}" class="btn btn-info"><i class="fa-solid fa-eye fa-fw"></i> {% translate "View statistics" %}</a>
+                        </th>
+                        <th class="col-md-2 align-self-end">
+                            <a href="{% url 'fatlink:create' %}" class="btn btn-success"><i class="fa-solid fa-plus fa-fw"></i> {% translate "Create fatlink" %}</a>
+                        </th>
+                    </tr>
+                </table>
+            </div>
+            {% if fatlinks %}
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <tr>
+                            <th scope="col" class="text-center">{% translate "Name" %}</th>
+                            <th scope="col" class="text-center">{% translate "Creator" %}</th>
+                            <th scope="col" class="text-center">{% translate "Fleet" %}</th>
+                            <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
+                            <th scope="col" class="text-center">{% translate "Duration" %}</th>
+                            <th scope="col" class="text-center">{% translate "Edit" %}</th>
+                        </tr>
+                        {% for link in fatlinks %}
+                            <tr>
+                                <td class="text-center">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge badge-primary">{{ link.fleet }}</a>
+                                </td>
+                                <td class="text-center">{{ link.creator.username }}</td>
+                                <td class="text-center">{{ link.fleet }}</td>
+                                <td class="text-center">{{ link.fatdatetime }}</td>
+                                <td class="text-center">
+                                    {{ link.duration }}
+                                </td>
+                                <td class="text-center">
+                                    <a href="{% url 'fatlink:modify' link.hash %}" class="btn btn-info">
+                                        <i class="fa-solid fa-pen-to-square fa-fw"></i>
+                                    </a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            {% else %}
+                <div class="alert alert-warning text-center">
+                    {% translate "No created fatlinks on record." %}
+                </div>
+            {% endif %}
         {% endif %}
     </div>
 {% endblock content %}
diff --git a/allianceauth/groupmanagement/auth_hooks.py b/allianceauth/groupmanagement/auth_hooks.py
index 45a90e25..211973ac 100644
--- a/allianceauth/groupmanagement/auth_hooks.py
+++ b/allianceauth/groupmanagement/auth_hooks.py
@@ -1,6 +1,7 @@
 from django.utils.translation import gettext_lazy as _
+from allianceauth.menu.hooks import MenuItemHook
 
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.services.hooks import UrlHook
 from allianceauth import hooks
 
 from . import urls
@@ -33,11 +34,43 @@ class GroupManagementMenuItem(MenuItemHook):
         return ""
 
 
+"""
+            <li class="d-flex m-2 p-2 pt-0 pb-0 mt-0 mb-0">
+                <i class="fas fa-users fa-fw align-self-center me-2"></i>
+                <a class="nav-link flex-fill align-self-center {% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
+                    {% translate "Groups" %}
+                </a>
+            </li>
+"""
+
+
+class GroupsMenuItem(MenuItemHook):
+    def __init__(self):
+        MenuItemHook.__init__(
+            self,
+            text=_("Groups"),
+            classes="fas fa-user fa-fw",
+            url_name="groupmanagement:groups",
+            order=25,
+            navactive=[
+                "groupmanagement:groups",  # group list view
+            ],
+        )
+
+    def render(self, request):
+        return MenuItemHook.render(self, request)
+
+
 @hooks.register("menu_item_hook")
-def register_menu():
+def register_manager_menu():
     return GroupManagementMenuItem()
 
 
+@hooks.register("menu_item_hook")
+def register_groups_menu():
+    return GroupsMenuItem()
+
+
 @hooks.register("url_hook")
 def register_urls():
     return UrlHook(urls, "group", r"^groups/")
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
index 735d13bd..e28ce904 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
@@ -1,85 +1,73 @@
-{% extends "allianceauth/base.html" %}
+{% 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 header_nav_collapse_left %}
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
+</li>
+{% endblock %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <br>
-        {% include 'groupmanagement/menu.html' %}
+    {% if entries %}
+        <div class="table-responsive">
+            <table class="table table-striped" id="log-entries">
+                <thead>
+                    <th scope="col">{% translate "Date/Time" %}</th>
+                    <th scope="col">{% translate "Requestor" %}</th>
+                    <th scope="col">{% translate "Character" %}</th>
+                    <th scope="col">{% translate "Corporation" %}</th>
+                    <th scope="col">{% translate "Type" %}</th>
+                    <th scope="col">{% translate "Action" %}</th>
+                    <th scope="col">{% translate "Actor" %}</th>
+                </thead>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                {{ group }} - {% translate "Audit Log" %}
-            </div>
+                <tbody>
+                    {% for entry in entries %}
+                        <tr>
+                            <td>{{ entry.date|date:"Y-M-d, H:i" }}</td>
+                            <td>{{ entry.requestor }}</td>
+                            <td>{{ entry.req_char }}</td>
+                            <td>{{ entry.req_char.corporation_name }}</td>
+                            <td>{{ entry.type_to_str }}</td>
 
-            <div class="panel-body">
-                <p>
-                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
-                        {% translate "Back" %}
-                    </a>
-                </p>
+                            {% if entry.request_type is None %}
+                                <td>{% translate "Removed" %}</td>
+                            {% else %}
+                                <td>{{ entry.action_to_str }}</td>
+                            {% endif %}
 
-                {% if entries %}
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="log-entries">
-                            <thead>
-                                <tr>
-                                    <th scope="col">{% translate "Date/Time" %}</th>
-                                    <th scope="col">{% translate "Requestor" %}</th>
-                                    <th scope="col">{% translate "Character" %}</th>
-                                    <th scope="col">{% translate "Corporation" %}</th>
-                                    <th scope="col">{% translate "Type" %}</th>
-                                    <th scope="col">{% translate "Action" %}</th>
-                                    <th scope="col">{% translate "Actor" %}</th>
-                                </tr>
-                            </thead>
+                            <td>{{ entry.request_actor }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
 
-                            <tbody>
-                                {% for entry in entries %}
-                                    <tr>
-                                        <td>{{ entry.date|date:"Y-M-d, H:i" }}</td>
-                                        <td>{{ entry.requestor }}</td>
-                                        <td>{{ entry.req_char }}</td>
-                                        <td>{{ entry.req_char.corporation_name }}</td>
-                                        <td>{{ entry.type_to_str }}</td>
-
-                                        {% if entry.request_type is None %}
-                                            <td>{% translate "Removed" %}</td>
-                                        {% else %}
-                                            <td>{{ entry.action_to_str }}</td>
-                                        {% endif %}
-
-                                        <td>{{ entry.request_actor }}</td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-
-                        <p class="text-muted">
-                            {% translate "All times displayed are EVE/UTC." %}
-                        </p>
-                    </div>
-                {% else %}
-                    <div class="clearfix"></div>
-                    <br>
-                    <div class="alert alert-warning text-center">
-                        {% translate "No entries found for this group." %}
-                    </div>
-                {% endif %}
-            </div>
+            <p class="text-muted">
+                {% translate "All times displayed are EVE/UTC." %}
+            </p>
         </div>
-    </div>
+    {% else %}
+        <div class="clearfix"></div>
+        <br>
+        <div class="alert alert-warning text-center">
+            {% translate "No entries found for this group." %}
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
+    {% include 'bundles/datatables-js-bs5.html' %}
     {% include 'bundles/moment-js.html' with locale=True %}
     {% include 'bundles/filterdropdown-js.html' %}
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
 
 {% block extra_script %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
index c0e8c71a..4496fc9a 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
@@ -1,97 +1,86 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 {% load evelinks %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Group Members" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Group Members" %} - {{ 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>
+{% endblock %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <br>
-        {% include 'groupmanagement/menu.html' %}
+    {% if group.user_set %}
+        <div class="table-responsive">
+            <table class="table table-aa" id="tab_group_members">
+                <thead>
+                    <tr>
+                        <th>{% translate "Character" %}</th>
+                        <th>{% translate "Organization" %}</th>
+                        <th></th>
+                    </tr>
+                </thead>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                {{ group.name }} - {% translate 'Members' %}
-            </div>
+                <tbody>
+                    {% for member in members %}
+                        <tr>
+                            <td>
+                                <img src="{{ member.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;">
+                                {% if member.main_char %}
+                                    <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
+                                        {{ member.main_char.character_name }}
+                                    </a>
+                                {% else %}
+                                    {{ member.user.username }}
+                                {% endif %}
 
-            <div class="panel-body">
-                <p>
-                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
-                        {% translate "Back" %}
-                    </a>
-                </p>
+                                {% if member.is_leader %}
+                                    <i class="fa-solid fa-star"> title="{% translate "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
+                                {% endif %}
+                            </td>
 
-                {% if group.user_set %}
-                    <div class="table-responsive">
-                        <table class="table table-aa" id="tab_group_members">
-                            <thead>
-                                <tr>
-                                    <th>{% translate "Character" %}</th>
-                                    <th>{% translate "Organization" %}</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-
-                            <tbody>
-                                {% for member in members %}
-                                    <tr>
-                                        <td>
-                                            <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ member.main_char.character_name }}">
-                                            {% if member.main_char %}
-                                                <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
-                                                    {{ member.main_char.character_name }}
-                                                </a>
-                                            {% else %}
-                                                {{ member.user.username }}
-                                            {% endif %}
-
-                                            {% if member.is_leader %}
-                                                <i class="fas fa-star" title="{% translate "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
-                                            {% endif %}
-                                        </td>
-
-                                        <td>
-                                            {% if member.main_char %}
-                                                <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
-                                                    {{ member.main_char.corporation_name }}
-                                                </a><br>
-                                                {{ member.main_char.alliance_name|default_if_none:"" }}
-                                            {% else %}
-                                                {% translate "(unknown)" %}
-                                            {% endif %}
-                                        </td>
-
-                                        <td class="text-right">
-                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% translate "Remove from group" %}">
-                                                <i class="glyphicon glyphicon-remove"></i>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-
-                        <p class="text-muted">
-                            <i class="fas fa-star"></i>: {% translate "Group leader" %}
-                        </p>
-                    </div>
-                {% else %}
-                    <div class="alert alert-warning text-center">
-                        {% translate "No group members to list." %}
-                    </div>
-                {% endif %}
-            </div>
+                            <td>
+                                {% if member.main_char %}
+                                    <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
+                                        {{ member.main_char.corporation_name }}
+                                    </a><br>
+                                    {{ member.main_char.alliance_name|default_if_none:"" }}
+                                {% else %}
+                                    {% translate "(unknown)" %}
+                                {% endif %}
+                            </td>
+                            <td class="text-end">
+                                <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% translate "Remove from group" %}">
+                                    <i class="fa-solid fa-xmark"></i>
+                                </a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
 
+            <p class="text-muted">
+                <i class="fa-solid fa-star"></i>: {% translate "Group leader" %}
+            </p>
         </div>
-    </div>
+    {% else %}
+        <div class="alert alert-warning text-center">
+            {% translate "No group members to list." %}
+        </div>
+    {% endif %}
+
 {% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
+    {% include 'bundles/datatables-js-bs5.html' %}
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
 
 {% block extra_script %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
index 12c89ed0..e50f3838 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@@ -1,88 +1,86 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Groups Membership" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Groups Membership" %}{% endblock header_nav_brand %}
+
 {% block extra_css %}{% endblock extra_css %}
 
+{% block header_nav_collapse_left %}
+<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 %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <br>
-        {% include 'groupmanagement/menu.html' %}
+    {% if groups %}
+        <div class="table-responsive">
+            <table class="table table-aa">
+                <thead>
+                    <tr>
+                        <th>{% translate "Name" %}</th>
+                        <th>{% translate "Description" %}</th>
+                        <th>{% translate "Status" %}</th>
+                        <th style="white-space: nowrap;" class="text-center">{% translate "Member Count" %}</th>
+                        <th style="min-width: 170px;"></th>
+                    </tr>
+                </thead>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                {% translate "Groups" %}
-            </div>
+                <tbody class="align-middle">
+                    {% for group in groups %}
+                        <tr>
+                            <td>
+                                <a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a>
+                            </td>
 
-            <div class="panel-body">
-                {% if groups %}
-                    <div class="table-responsive">
-                        <table class="table table-aa">
-                            <thead>
-                                <tr>
-                                    <th>{% translate "Name" %}</th>
-                                    <th>{% translate "Description" %}</th>
-                                    <th>{% translate "Status" %}</th>
-                                    <th style="white-space: nowrap;">{% translate "Member Count" %}</th>
-                                    <th style="min-width: 170px;"></th>
-                                </tr>
-                            </thead>
+                            <td>{{ group.authgroup.description|linebreaks|urlize }}</td>
 
-                            <tbody>
-                                {% for group in groups %}
-                                    <tr>
-                                        <td>
-                                            <a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a>
-                                        </td>
+                            <td>
+                                {% if group.authgroup.hidden %}
+                                    <span class="badge bg-info">{% translate "Hidden" %}</span>
+                                {% endif %}
+                                {% if group.authgroup.open %}
+                                    <span class="badge bg-success">{% translate "Open" %}</span>
+                                {% else %}
+                                    <span class="badge bg-secondary">{% translate "Requestable" %}</span>
+                                {% endif %}
+                            </td>
 
-                                        <td>{{ group.authgroup.description|linebreaks|urlize }}</td>
+                            <td class="text-center">
+                                {{ group.num_members }}
+                            </td>
 
-                                        <td>
-                                            {% if group.authgroup.hidden %}
-                                                <span class="label label-info">{% translate "Hidden" %}</span>
-                                            {% elif group.authgroup.open %}
-                                                <span class="label label-success">{% translate "Open" %}</span>
-                                            {% else %}
-                                                <span class="label label-default">{% translate "Requestable" %}</span>
-                                            {% endif %}
-                                        </td>
+                            <td class="text-end">
+                                <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
+                                    <i class="far fa-eye"></i>
+                                </a>
 
-                                        <td class="text-right">
-                                            {{ group.num_members }}
-                                        </td>
+                                <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
+                                    <i class="far fa-list-alt"></i>
+                                </a>
 
-                                        <td class="text-right">
-                                            <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
-                                                <i class="glyphicon glyphicon-eye-open"></i>
-                                            </a>
-
-                                            <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
-                                                <i class="glyphicon glyphicon-list-alt"></i>
-                                            </a>
-
-                                            <a id="clipboard-copy" data-clipboard-text="{{ SITE_URL }}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
-                                                <i class="glyphicon glyphicon-copy"></i>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                    </div>
-                {% else %}
-                    <div class="alert alert-warning text-center">
-                        {% translate "No groups to list." %}
-                    </div>
-                {% endif %}
-            </div>
+                                <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
+                                    <i class="far fa-clipboard"></i>
+                                </a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         </div>
-    </div>
+    {% else %}
+        <div class="alert alert-warning text-center">
+            {% translate "No groups to list." %}
+        </div>
+    {% endif %}
 {% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/clipboard-js.html' %}
+    {% include "bundles/clipboard-js.html" %}
 
     <script>
         new ClipboardJS('#clipboard-copy');
     </script>
-{% endblock %}
+{% endblock extra_javascript %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index 7b750f54..08733dec 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -1,62 +1,96 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Available Groups" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
+{% 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 %}
+{% endif %}
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Available Groups" %}</h1>
-        {% if groups %}
-            <table class="table table-aa">
-                <thead>
-                    <tr>
-                        <th>{% translate "Name" %}</th>
-                        <th>{% translate "Description" %}</th>
-                        <th></th>
-                    </tr>
-                </thead>
+    {% if groups %}
+        <table class="table" id="groupsTable" >
+            <thead>
+                <tr>
+                    <th>{% translate "Name" %}</th>
+                    <th>{% translate "Description" %}</th>
+                    <th>{% translate "Leaders" %}<span class="m-1 fw-lighter badge bg-primary">User</span><span class="m-1 fw-lighter badge bg-secondary ">Group</span></th>
+                    <th></th>
+                </tr>
+            </thead>
 
-                <tbody>
-                    {% for g in groups %}
-                        <tr>
-                            <td>{{ g.group.name }}</td>
-                            <td>{{ g.group.authgroup.description|linebreaks|urlize }}</td>
-                            <td class="text-right">
-                                {% if g.group in user.groups.all %}
-                                    {% if not g.request %}
-                                        <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
-                                            {% translate "Leave" %}
-                                        </a>
-                                    {% else %}
-                                        <button type="button" class="btn btn-primary" disabled>
-                                            {% translate "Pending" %}
-                                        </button>
-                                    {% endif %}
-                                {% elif not g.request %}
-                                    {% if g.group.authgroup.open %}
-                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
-                                            {% translate "Join" %}
-                                        </a>
-                                    {% else %}
-                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
-                                            {% translate "Request" %}
-                                        </a>
-                                    {% endif %}
+            <tbody class>
+                {% for g in groups %}
+                    <tr>
+                        <td>{{ g.group.name }}</td>
+                        <td>{{ g.group.authgroup.description|linebreaks|urlize }}</td>
+                        <td style="max-width: 30%;">
+                            {% if g.group.authgroup.group_leaders.all.count %}
+                                {% for leader in g.group.authgroup.group_leaders.all %}{% if leader.profile.main_character %}<span class="m-1 badge bg-primary">{{leader.profile.main_character}}</span>{% endif %}{% endfor %}
+                            {% endif %}
+                            {% if g.group.authgroup.group_leaders.all.count %}
+                                {% for group in g.group.authgroup.group_leader_groups.all %}<span class="badge bg-secondary">{{group.name}}</span>{% endfor %}
+                            {% endif %}
+                        </td>
+                        <td class="text-end">
+                            {% if g.group in user_groups %}
+                                {% if not g.request %}
+                                    <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
+                                        {% translate "Leave" %}
+                                    </a>
                                 {% else %}
                                     <button type="button" class="btn btn-primary" disabled>
                                         {% translate "Pending" %}
                                     </button>
                                 {% endif %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% else %}
-            <div class="alert alert-warning text-center">
-                {% translate "No groups available." %}
-            </div>
-        {% endif %}
-    </div>
+                            {% elif not g.request %}
+                                {% if g.group.authgroup.open %}
+                                    <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
+                                        {% translate "Join" %}
+                                    </a>
+                                {% else %}
+                                    <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
+                                        {% translate "Request" %}
+                                    </a>
+                                {% endif %}
+                            {% else %}
+                                <button type="button" class="btn btn-primary" disabled>
+                                    {% translate "Pending" %}
+                                </button>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+
+    {% else %}
+        <div class="alert alert-warning text-center">
+            {% translate "No groups available." %}
+        </div>
+    {% endif %}
 {% endblock content %}
+{% block extra_javascript %}
+    {% include 'bundles/datatables-js-bs5.html' %}
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css-bs5.html' %}
+{% endblock %}
+
+{% block extra_script %}
+
+    $(document).ready(function () {
+        $('#groupsTable').DataTable();
+    });
+
+{% endblock extra_script %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html
index 5a383501..da176b35 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@@ -1,166 +1,158 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 {% load evelinks %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Groups Management" %}{% endblock page_title %}
+{% block header_nav_brand %}{% translate "Groups Management" %}{% endblock header_nav_brand %}
 
 {% block extra_css %}
-    <style>
-        .nav-tabs > li.active > a {
-            background-color: rgb(236, 240, 241) !important;
-            color: rgb(44, 62, 80);
-        }
-    </style>
 {% endblock extra_css %}
 
-{% block content %}
-    <div class="col-lg-12">
-        <br>
-        {% include 'groupmanagement/menu.html' %}
+{% block header_nav_collapse_left %}
+<li class="active">
+    <a class="nav-link active" id="add-tab" data-bs-toggle="tab" data-bs-target="#add" type="button" role="tab" aria-controls="addd" aria-selected="true">
+        {% translate "Join Requests" %}
 
-        <ul class="nav nav-tabs">
-            <li class="active">
-                <a data-toggle="tab" href="#add">
-                    {% translate "Join Requests" %}
+        {% if acceptrequests %}
+            <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
+        {% endif %}
+    </a>
+</li>
 
-                    {% if acceptrequests %}
-                        <span class="badge">{{ acceptrequests|length }}</span>
-                    {% endif %}
-                </a>
-            </li>
+{%  if not auto_leave %}
+    <li>
+        <a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
+            {% translate "Leave Requests" %}
 
-            {%  if not auto_leave %}
-                <li>
-                    <a data-toggle="tab" href="#leave">
-                        {% translate "Leave Requests" %}
-
-                        {% if leaverequests %}
-                            <span class="badge">{{ leaverequests|length }}</span>
-                        {% endif %}
-                    </a>
-                </li>
+            {% if leaverequests %}
+                <span class="badge bg-secondary">{{ leaverequests|length }}</span>
             {% endif %}
-        </ul>
+        </a>
+    </li>
+{% endif %}
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
+</li>
 
-        <div class="panel panel-default panel-tabs-aa">
-            <div class="panel-body">
-                <div class="tab-content">
+{% endblock %}
 
-                    <div id="add" class="tab-pane active">
-                        {% if acceptrequests %}
-                            <div class="table-responsive">
-                                <table class="table table-aa">
-                                    <thead>
-                                        <tr>
-                                            <th>{% translate "Character" %}</th>
-                                            <th>{% translate "Organization" %}</th>
-                                            <th>{% translate "Group" %}</th>
-                                            <th></th>
-                                        </tr>
-                                    </thead>
 
-                                    <tbody>
-                                        {% for acceptrequest in acceptrequests %}
-                                            <tr>
-                                                <td>
-                                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ acceptrequest.main_char.character_name }}">
-                                                    {% if acceptrequest.main_char %}
-                                                        <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                                            {{ acceptrequest.main_char.character_name }}
-                                                        </a>
-                                                    {% else %}
-                                                        {{ acceptrequest.user.username }}
-                                                    {% endif %}
-                                                </td>
-                                                <td>
-                                                    {% if acceptrequest.main_char %}
-                                                        <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                            {{ acceptrequest.main_char.corporation_name }}
-                                                        </a><br>
-                                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                                    {% else %}
-                                                        {% translate "(unknown)" %}
-                                                    {% endif %}
-                                                </td>
-                                                <td>{{ acceptrequest.group.name }}</td>
-                                                <td class="text-right">
-                                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                                        {% translate "Accept" %}
-                                                    </a>
+{% block content %}
+<div class="tab-content">
+    <div id="add" class="tab-pane active">
+        {% if acceptrequests %}
+            <div class="table-responsive">
+                <table class="table table-aa">
+                    <thead>
+                        <tr>
+                            <th>{% translate "Character" %}</th>
+                            <th>{% translate "Organization" %}</th>
+                            <th>{% translate "Group" %}</th>
+                            <th></th>
+                        </tr>
+                    </thead>
 
-                                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                                        {% translate "Reject" %}
-                                                    </a>
-                                                </td>
-                                            </tr>
-                                        {% endfor %}
-                                    </tbody>
-                                </table>
-                            </div>
-                        {% else %}
-                            <div class="alert alert-warning text-center">{% translate "No group add requests." %}</div>
-                        {% endif %}
-                    </div>
+                    <tbody class="align-middle">
+                        {% for acceptrequest in acceptrequests %}
+                            <tr>
+                                <td>
+                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;">
+                                    {% if acceptrequest.main_char %}
+                                        <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                                            {{ acceptrequest.main_char.character_name }}
+                                        </a>
+                                    {% else %}
+                                        {{ acceptrequest.user.username }}
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if acceptrequest.main_char %}
+                                        <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                            {{ acceptrequest.main_char.corporation_name }}
+                                        </a><br>
+                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
+                                    {% else %}
+                                        {% translate "(unknown)" %}
+                                    {% endif %}
+                                </td>
+                                <td>{{ acceptrequest.group.name }}</td>
+                                <td class="text-end">
+                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                        {% translate "Accept" %}
+                                    </a>
 
-                    {%  if not auto_leave %}
-                        <div id="leave" class="tab-pane">
-                            {% if leaverequests %}
-                                <div class="table-responsive">
-                                    <table class="table table-aa">
-                                        <thead>
-                                            <tr>
-                                                <th>{% translate "Character" %}</th>
-                                                <th>{% translate "Organization" %}</th>
-                                                <th>{% translate "Group" %}</th>
-                                                <th></th>
-                                            </tr>
-                                        </thead>
-
-                                        <tbody>
-                                            {% for leaverequest in leaverequests %}
-                                                <tr>
-                                                    <td>
-                                                        <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ leaverequest.main_char.character_name }}">
-                                                        {% if leaverequest.main_char %}
-                                                            <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
-                                                                {{ leaverequest.main_char.character_name }}
-                                                            </a>
-                                                        {% else %}
-                                                            {{ leaverequest.user.username }}
-                                                        {% endif %}
-                                                    </td>
-                                                    <td>
-                                                        {% if leaverequest.main_char %}
-                                                            <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                                {{ leaverequest.main_char.corporation_name }}
-                                                            </a><br>
-                                                            {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
-                                                        {% else %}
-                                                            {% translate "(unknown)" %}
-                                                        {% endif %}
-                                                    </td>
-                                                    <td>{{ leaverequest.group.name }}</td>
-                                                    <td class="text-right">
-                                                        <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                                            {% translate "Accept" %}
-                                                        </a>
-
-                                                        <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                                            {% translate "Reject" %}
-                                                        </a>
-                                                    </td>
-                                                </tr>
-                                            {% endfor %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            {% else %}
-                                <div class="alert alert-warning text-center">{% translate "No group leave requests." %}</div>
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                </div>
+                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
+                                        {% translate "Reject" %}
+                                    </a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
             </div>
-        </div>
+        {% else %}
+            <div class="alert alert-warning text-center">{% translate "No group add requests." %}</div>
+        {% endif %}
     </div>
+
+    {%  if not auto_leave %}
+        <div id="leave" class="tab-pane">
+            {% if leaverequests %}
+                <div class="table-responsive">
+                    <table class="table table-aa">
+                        <thead>
+                            <tr>
+                                <th>{% translate "Character" %}</th>
+                                <th>{% translate "Organization" %}</th>
+                                <th>{% translate "Group" %}</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+
+                        <tbody class="align-middle">
+                            {% for leaverequest in leaverequests %}
+                                <tr>
+                                    <td>
+                                        <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;">
+                                        {% if leaverequest.main_char %}
+                                            <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                                {{ leaverequest.main_char.character_name }}
+                                            </a>
+                                        {% else %}
+                                            {{ leaverequest.user.username }}
+                                        {% endif %}
+                                    </td>
+                                    <td>
+                                        {% if leaverequest.main_char %}
+                                            <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                {{ leaverequest.main_char.corporation_name }}
+                                            </a><br>
+                                            {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                        {% else %}
+                                            {% translate "(unknown)" %}
+                                        {% endif %}
+                                    </td>
+                                    <td>{{ leaverequest.group.name }}</td>
+                                    <td class="text-end">
+                                        <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                            {% translate "Accept" %}
+                                        </a>
+
+                                        <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                            {% translate "Reject" %}
+                                        </a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            {% else %}
+                <div class="alert alert-warning text-center">{% translate "No group leave requests." %}</div>
+            {% endif %}
+        </div>
+    {% endif %}
+</div>
 {% endblock content %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/menu.html b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
index be84acb5..1adbdadd 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/menu.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
@@ -1,27 +1,10 @@
 {% load i18n %}
 {% load navactive %}
 
-<nav class="navbar navbar-default">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">{% translate "Toggle navigation" %}</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}</a>
-        </div>
 
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav">
-                <li class="{% navactive request 'groupmanagement:management' %}">
-                    <a href="{% url 'groupmanagement:management' %}">{% translate "Group Requests" %}</a>
-                </li>
-                <li class="{% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}">
-                    <a href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Group Requests" %}</a>
+</li>
+<li class="nav-item ">
+    <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
+</li>
diff --git a/allianceauth/groupmanagement/views.py b/allianceauth/groupmanagement/views.py
index 8ab1af22..b1c00498 100644
--- a/allianceauth/groupmanagement/views.py
+++ b/allianceauth/groupmanagement/views.py
@@ -87,7 +87,7 @@ def group_membership_audit(request, group_id):
 
     except ObjectDoesNotExist:
         raise Http404("Group does not exist")
-    render_items = {'group': group.name}
+    render_items = {'group': group}
     entries = RequestLog.objects.filter(group=group).order_by('-date')
     render_items['entries'] = entries
 
@@ -311,8 +311,10 @@ def groups_view(request):
     groups_qs = GroupManager.get_joinable_groups_for_user(
         request.user, include_hidden=False
     )
-    groups_qs = groups_qs.order_by('name')
+    groups_qs = groups_qs.order_by('name').select_related("authgroup").prefetch_related('authgroup__group_leaders', 'authgroup__group_leaders__profile__main_character', 'authgroup__group_leader_groups')
     groups = []
+
+    ## TODO see about making this faster
     for group in groups_qs:
         group_request = GroupRequest.objects\
             .filter(user=request.user)\
@@ -322,7 +324,14 @@ def groups_view(request):
             'request': group_request[0] if group_request else None
         })
 
-    context = {'groups': groups}
+    count = 0
+    perms = GroupManager.can_manage_groups(request.user)
+    if perms:
+        count = GroupManager.pending_requests_count_for_user(request.user)
+
+    user_groups_list = list(request.user.groups.all())
+    context = {'groups': groups, "manager_perms": perms, "req_count":count, "user_groups": user_groups_list}
+
     return render(request, 'groupmanagement/groups.html', context=context)
 
 
diff --git a/allianceauth/hooks.py b/allianceauth/hooks.py
index 773daa12..70ca3439 100644
--- a/allianceauth/hooks.py
+++ b/allianceauth/hooks.py
@@ -91,7 +91,7 @@ def get_app_modules():
 
 
 def get_app_submodules(module_name):
-    """
+    """pyt
     Get a specific sub module of the app
     :param module_name: module name to get
     :return: name, module tuple
@@ -122,3 +122,17 @@ def get_hooks(name):
     """
     register_all_hooks()
     return _hooks.get(name, [])
+
+
+class DashboardItemHook:
+    def __init__(self, view_function, order:int=10):
+        self.view_function = view_function
+        self.order = order
+
+    def render(self, request):
+        try:
+            logger.debug(f"Rendering {self.view_function} to dashboard")
+            return self.view_function(request)
+        except Exception as e:
+            logger.exception("Rendering {self.view_function} Failed!")
+            return ""
diff --git a/allianceauth/hrapplications/auth_hooks.py b/allianceauth/hrapplications/auth_hooks.py
index 9f32f8fc..d0af8a5b 100644
--- a/allianceauth/hrapplications/auth_hooks.py
+++ b/allianceauth/hrapplications/auth_hooks.py
@@ -1,7 +1,8 @@
 from django.utils.translation import gettext_lazy as _
 
 from allianceauth import hooks
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 
 from . import urls
 from .models import Application
diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
index ab97414b..e22ae52c 100644
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index 93507d46..e906109a 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index b9e7f260..6e8844c4 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -8,7 +8,7 @@
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Personal Applications" %}
-            <div class="text-right">
+            <div class="text-end">
                 {% if create %}
                     <a href="{% url 'hrapplications:create_view' %}">
                         <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
@@ -33,11 +33,11 @@
                             <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
                             <td class="text-center">
                                 {% if personal_app.approved == None %}
-                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
                                 {% elif  personal_app.approved == True %}
-                                    <div class="label label-success">{% translate "Approved" %}</div>
+                                    <div class="badge badge-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="label label-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge badge-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-center">
@@ -58,7 +58,7 @@
         {% endif %}
         {% if perms.auth.human_resources %}
             <h1 class="page-header text-center">{% translate "Application Management" %}
-                <div class="text-right">
+                <div class="text-end">
                     <!-- Button trigger modal -->
                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
                         {% translate "Search Applications" %}
@@ -91,14 +91,14 @@
                                         <td class="text-center">
                                             {% if app.approved == None %}
                                                 {% if app.reviewer_str %}
-                                                    <div class="label label-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    <div class="badge badge-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                 {% else %}
-                                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
                                                 {% endif %}
                                             {% elif  app.approved == True %}
-                                                <div class="label label-success">{% translate "Approved" %}</div>
+                                                <div class="badge badge-success">{% translate "Approved" %}</div>
                                             {% else %}
-                                                <div class="label label-danger">{% translate "Rejected" %}</div>
+                                                <div class="badge badge-danger">{% translate "Rejected" %}</div>
                                             {% endif %}
                                         </td>
                                         <td class="text-center">
@@ -135,14 +135,14 @@
                                         <td class="text-center">
                                             {% if app.approved == None %}
                                                 {% if app.reviewer_str %}
-                                                    <div class="label label-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    <div class="badge badge-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                 {% else %}
-                                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
                                                 {% endif %}
                                             {% elif  app.approved == True %}
-                                                <div class="label label-success">{% translate "Approved" %}</div>
+                                                <div class="badge badge-success">{% translate "Approved" %}</div>
                                             {% else %}
-                                                <div class="label label-danger">{% translate "Rejected" %}</div>
+                                                <div class="badge badge-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 bb8219a4..b1098da2 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -9,7 +9,7 @@
     <div class="col-lg-12">
         {% if perms.auth.human_resources %}
             <h1 class="page-header text-center">{% translate "Application Search Results" %}
-                <div class="text-right">
+                <div class="text-end">
                     <!-- Button trigger modal -->
                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
                         {% translate "Search Applications" %}
@@ -34,11 +34,11 @@
                             <td class="text-center">{{ app.form.corp }}</td>
                             <td class="text-center">
                                 {% if app.approved == None %}
-                                    <div class="label label-warning">{% translate "Pending" %}</div>
+                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
                                 {% elif  app.approved == True %}
-                                    <div class="label label-success">{% translate "Approved" %}</div>
+                                    <div class="badge badge-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="label label-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge badge-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-center">
diff --git a/allianceauth/menu/__init__.py b/allianceauth/menu/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/menu/admin.py b/allianceauth/menu/admin.py
new file mode 100644
index 00000000..0c81c669
--- /dev/null
+++ b/allianceauth/menu/admin.py
@@ -0,0 +1,9 @@
+from django.contrib import admin
+
+from . import models
+
+
+@admin.register(models.MenuItem)
+class MenuItemAdmin(admin.ModelAdmin):
+    list_display = ['text', 'hide', 'parent', 'url', 'icon_classes', 'rank']
+    ordering = ('rank',)
diff --git a/allianceauth/menu/apps.py b/allianceauth/menu/apps.py
new file mode 100644
index 00000000..1bea6e29
--- /dev/null
+++ b/allianceauth/menu/apps.py
@@ -0,0 +1,19 @@
+import logging
+
+from django.apps import AppConfig
+from django.db.utils import ProgrammingError, OperationalError
+
+logger = logging.getLogger(__name__)
+
+
+class MenuConfig(AppConfig):
+    name = "allianceauth.menu"
+    label = "menu"
+
+    def ready(self):
+        try:
+            logger.debug("Syncing MenuItem Hooks")
+            from allianceauth.menu.providers import MenuItem
+            MenuItem.sync_hook_models()
+        except (ProgrammingError, OperationalError):
+            logger.warning("Migrations not completed for MenuItems")
diff --git a/allianceauth/menu/hooks.py b/allianceauth/menu/hooks.py
new file mode 100644
index 00000000..5dde9359
--- /dev/null
+++ b/allianceauth/menu/hooks.py
@@ -0,0 +1,42 @@
+from django.template.loader import render_to_string
+
+
+from typing import List, Optional
+
+
+class MenuItemHook:
+    """
+    Auth Hook for generating Side Menu Items
+    """
+    def __init__(self, text: str, classes: List[str], url_name: str, order: Optional[int] = None, navactive: List = list([])):
+        """
+        :param text: The text shown as menu item, e.g. usually the name of the app.
+        :type text: str
+        :param classes: The classes that should be applied to the menu item icon
+        :type classes: List[str]
+        :param url_name: The name of the Django URL to use
+        :type url_name: str
+        :param order: An integer which specifies the order of the menu item, lowest to highest. Community apps are free to use any order above `1000`. Numbers below are served for Auth.
+        :type order: Optional[int], optional
+        :param navactive: A list of views or namespaces the link should be highlighted on. See [django-navhelper](https://github.com/geelweb/django-navhelper#navactive) for usage. Defaults to the supplied `url_name`.
+        :type navactive: List, optional
+        """
+
+        self.text = text
+        self.classes = classes
+        self.url_name = url_name
+        self.template = 'public/menuitem.html'
+        self.order = order if order is not None else 9999
+
+        # count is an integer shown next to the menu item as badge when count != None
+        # apps need to set the count in their child class, e.g. in render() method
+        self.count = None
+
+        navactive = navactive or []
+        navactive.append(url_name)
+        self.navactive = navactive
+
+    def render(self, request):
+        return render_to_string(self.template,
+                                {'item': self},
+                                request=request)
diff --git a/allianceauth/menu/migrations/0001_initial.py b/allianceauth/menu/migrations/0001_initial.py
new file mode 100644
index 00000000..05ab8143
--- /dev/null
+++ b/allianceauth/menu/migrations/0001_initial.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.0.2 on 2022-08-28 14:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MenuItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('hook_function', models.CharField(max_length=500)),
+                ('icon_classes', models.CharField(max_length=150)),
+                ('text', models.CharField(max_length=150)),
+                ('url', models.CharField(blank=True, default=None, max_length=2048, null=True)),
+                ('rank', models.IntegerField(default=1000)),
+                ('hide', models.BooleanField(default=False)),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='menu.menuitem')),
+            ],
+        ),
+    ]
diff --git a/allianceauth/menu/migrations/0002_alter_menuitem_hook_function_and_more.py b/allianceauth/menu/migrations/0002_alter_menuitem_hook_function_and_more.py
new file mode 100644
index 00000000..9bf03f2a
--- /dev/null
+++ b/allianceauth/menu/migrations/0002_alter_menuitem_hook_function_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.0.2 on 2022-08-28 14:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='menuitem',
+            name='hook_function',
+            field=models.CharField(blank=True, default=None, max_length=500, null=True),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='icon_classes',
+            field=models.CharField(blank=True, default=None, max_length=150, null=True),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='text',
+            field=models.CharField(blank=True, default=None, max_length=150, null=True),
+        ),
+    ]
diff --git a/allianceauth/menu/migrations/0003_menuitem_menu_menuit_rank_e880ab_idx.py b/allianceauth/menu/migrations/0003_menuitem_menu_menuit_rank_e880ab_idx.py
new file mode 100644
index 00000000..30c848bf
--- /dev/null
+++ b/allianceauth/menu/migrations/0003_menuitem_menu_menuit_rank_e880ab_idx.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.0.8 on 2023-02-05 07:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0002_alter_menuitem_hook_function_and_more'),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name='menuitem',
+            index=models.Index(fields=['rank'], name='menu_menuit_rank_e880ab_idx'),
+        ),
+    ]
diff --git a/allianceauth/menu/migrations/0004_alter_menuitem_hide_alter_menuitem_icon_classes_and_more.py b/allianceauth/menu/migrations/0004_alter_menuitem_hide_alter_menuitem_icon_classes_and_more.py
new file mode 100644
index 00000000..30112a71
--- /dev/null
+++ b/allianceauth/menu/migrations/0004_alter_menuitem_hide_alter_menuitem_icon_classes_and_more.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.0.10 on 2023-07-16 11:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0003_menuitem_menu_menuit_rank_e880ab_idx'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='menuitem',
+            name='hide',
+            field=models.BooleanField(default=False, help_text='Hide this menu item. If this item is a header all items under it will be hidden too.'),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='icon_classes',
+            field=models.CharField(blank=True, default=None, help_text='Font Awesome classes to show as icon on menu', max_length=150, null=True),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='parent',
+            field=models.ForeignKey(blank=True, help_text='Parent Header. (Optional)', null=True, on_delete=django.db.models.deletion.SET_NULL, to='menu.menuitem'),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='rank',
+            field=models.IntegerField(default=1000, help_text='Order of the menu. Lowest First.'),
+        ),
+        migrations.AlterField(
+            model_name='menuitem',
+            name='text',
+            field=models.CharField(blank=True, default=None, help_text='Text to show on menu', max_length=150, null=True),
+        ),
+    ]
diff --git a/allianceauth/menu/migrations/__init__.py b/allianceauth/menu/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/menu/models.py b/allianceauth/menu/models.py
new file mode 100644
index 00000000..81121408
--- /dev/null
+++ b/allianceauth/menu/models.py
@@ -0,0 +1,174 @@
+import logging
+from allianceauth.hooks import get_hooks
+
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from django.template.loader import render_to_string
+
+logger = logging.getLogger(__name__)
+
+
+class MenuItem(models.Model):
+    # Auto Generated model from an auth_hook
+    hook_function = models.CharField(
+        max_length=500, default=None, null=True, blank=True)
+
+    # User Made Model
+    icon_classes = models.CharField(
+        max_length=150, default=None, null=True, blank=True, help_text="Font Awesome classes to show as icon on menu")
+    text = models.CharField(
+        max_length=150, default=None, null=True, blank=True, help_text="Text to show on menu")
+    url = models.CharField(max_length=2048, default=None,
+                            null=True, blank=True)
+
+    # Put it under a header?
+    parent = models.ForeignKey(
+        'self', on_delete=models.SET_NULL, null=True, blank=True, help_text="Parent Header. (Optional)")
+
+    # Put it where? lowest first
+    rank = models.IntegerField(default=1000, help_text="Order of the menu. Lowest First.")
+
+    # Hide it fully? Hiding a parent will hide all it's children
+    hide = models.BooleanField(default=False, help_text="Hide this menu item. If this item is a header all items under it will be hidden too.")
+
+    class Meta:
+        indexes = [
+            models.Index(fields=['rank', ]),
+        ]
+
+    def __str__(self) -> str:
+        return self.text
+
+    @property
+    def classes(self):  # Helper function to make this model closer to the hook functions
+        return self.icon_classes
+
+    @staticmethod
+    def hook_to_name(mh):
+        return f"{mh.__class__.__module__}.{mh.__class__.__name__}"
+
+    @staticmethod
+    def sync_hook_models():
+        # TODO define aa way for hooks to predefine a "parent" to create a sub menu from modules
+        menu_hooks = get_hooks('menu_item_hook')
+        hook_functions = []
+        for hook in menu_hooks:
+            mh = hook()
+            cls = MenuItem.hook_to_name(mh)
+            try:
+                # if it exists update the text only
+                # Users can adjust ranks so lets not change it if they have.
+                mi = MenuItem.objects.get(hook_function=cls)
+                mi.text = getattr(mh, "text", mh.__class__.__name__)
+                mi.save()
+            except MenuItem.DoesNotExist:
+                # This is a new hook, Make the database model.
+                MenuItem.objects.create(
+                    hook_function=cls,
+                    rank=getattr(mh, "order", 500),
+                    text=getattr(mh, "text", mh.__class__.__name__)
+                )
+            hook_functions.append(cls)
+
+        # Get rid of any legacy hooks from modules removed
+        MenuItem.objects.filter(hook_function__isnull=False).exclude(
+            hook_function__in=hook_functions).delete()
+
+    @classmethod
+    def filter_items(cls, menu_item: dict):
+        """
+        filter any items with no valid children from a menu
+        """
+        count_items = len(menu_item['items'])
+        if count_items:  # if we have children confirm we can see them
+            for i in menu_item['items']:
+                if len(i['render']) == 0:
+                    count_items -= 1
+            if count_items == 0:  # no children left dont render header
+                return False
+            return True
+        else:
+            return True
+
+    @classmethod
+    def render_menu(cls, request):
+        """
+        Return the sorted side menu items with any items the user can't see removed.
+        """
+        # Override all the items to the bs5 theme
+        template = "menu/menu-item-bs5.html"
+        # TODO discuss permissions for user defined links
+
+        # Turn all the hooks into functions
+        menu_hooks = get_hooks('menu_item_hook')
+        items = {}
+        for fn in menu_hooks:
+            f = fn()
+            items[cls.hook_to_name(f)] = f
+
+        menu_items = MenuItem.objects.all().order_by("rank")
+
+        menu = {}
+        for mi in menu_items:
+            if mi.hide:
+                # hidden item, skip it completely
+                continue
+            try:
+                _cnt = 0
+                _render = None
+                if mi.hook_function:
+                    # This is a module hook, so we need to render it as the developer intended
+                    # TODO add a new attribute for apps that want to override it in the new theme
+                    items[mi.hook_function].template = template
+                    _render = items[mi.hook_function].render(request)
+                    _cnt = items[mi.hook_function].count
+                else:
+                    # This is a user defined menu item so we render it with defaults.
+                    _render = render_to_string(template,
+                                                {'item': mi},
+                                                request=request)
+
+                parent = mi.id
+                if mi.parent_id:  # Set it if present
+                    parent = mi.parent_id
+
+                if parent not in menu:  # this will cause the menu headers to be out of order
+                    menu[parent] = {"items": [],
+                                    "count": 0,
+                                    "render": None,
+                                    "text": "None",
+                                    "rank": 9999,
+                                    }
+                _mi = {
+                    "count": _cnt,
+                    "render": _render,
+                    "text": mi.text,
+                    "rank": mi.rank,
+                    "classes": (mi.icon_classes if mi.icon_classes != "" else "fas fa-folder"),
+                    "hide": mi.hide
+                }
+
+                if parent != mi.id:
+                    # this is a sub item
+                    menu[parent]["items"].append(_mi)
+                    if _cnt:
+                        #add its count to the header count
+                        menu[parent]["count"] += _cnt
+                else:
+                    if len(menu[parent]["items"]):
+                        # this is a top folder dont update the count.
+                        del(_mi["count"])
+                    menu[parent].update(_mi)
+            except Exception as e:
+                logger.exception(e)
+
+        # reset to list
+        menu = list(menu.values())
+
+        # sort the menu list as the parents may be out of order.
+        menu.sort(key=lambda i: i['rank'])
+
+        # ensure no empty groups
+        menu = filter(cls.filter_items, menu)
+
+        return menu
diff --git a/allianceauth/menu/providers.py b/allianceauth/menu/providers.py
new file mode 100644
index 00000000..578a63b3
--- /dev/null
+++ b/allianceauth/menu/providers.py
@@ -0,0 +1,10 @@
+from django.template.loader import render_to_string
+
+from allianceauth.hooks import get_hooks
+
+from .models import MenuItem
+
+
+class MenuProvider():
+    def __init__(self) -> None:
+        pass
diff --git a/allianceauth/menu/templates/menu/menu-block.html b/allianceauth/menu/templates/menu/menu-block.html
new file mode 100644
index 00000000..f7124bb1
--- /dev/null
+++ b/allianceauth/menu/templates/menu/menu-block.html
@@ -0,0 +1,7 @@
+{% for data in menu_items %}
+    {% if data.items|length > 0 %}
+        {% include "menu/menu-item-bs5.html" with item=data %}
+    {% else %}
+        {{ data.render }}
+    {% endif %}
+{% endfor %}
diff --git a/allianceauth/menu/templates/menu/menu-item-bs5.html b/allianceauth/menu/templates/menu/menu-item-bs5.html
new file mode 100644
index 00000000..27ff379a
--- /dev/null
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@@ -0,0 +1,32 @@
+{% 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>
+        <a class="nav-link flex-fill align-self-center" {% if item.items|length %} type="button" data-bs-toggle="collapse" data-bs-target="#id-{{ item.text|slugify }}" aria-expanded="false" aria-controls="" {% endif %}
+            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 rounded-pill m-2 align-self-center {% if item.items|length == 0 %}me-4{% endif %}">
+                {{ item.count }}
+            </span>
+        {% 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"
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#id-{{ item.text|slugify }}"
+                aria-expanded="false"
+                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 %}
+                    {{ sub_item.render }}
+                {% endfor %}
+            </ul>
+        {% endif %}
+    </li>
+{% endif %}
diff --git a/allianceauth/menu/templates/menu/menu-notification-block.html b/allianceauth/menu/templates/menu/menu-notification-block.html
new file mode 100644
index 00000000..c4e4a1c3
--- /dev/null
+++ b/allianceauth/menu/templates/menu/menu-notification-block.html
@@ -0,0 +1,19 @@
+{% load i18n %}
+{% load navactive %}
+{% load auth_notifications %}
+<li class="nav-item {% navactive request 'notifications:' %}"
+    id="menu_item_notifications">
+    <a class="nav-link"
+        href="{% url 'notifications:list' %}">
+        <span class="fa">
+            {% with unread_count=request.user|user_unread_notification_count %}
+            <i
+                class="fas fa-bell{% if unread_count %} text-danger{% endif %}"
+            ></i>
+            {% endwith %}
+        </span>
+        <span class="d-lg-none d-md-inline m-2">
+            {% translate "Notifications" %}
+        </span>
+    </a>
+</li>
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
new file mode 100644
index 00000000..52b2afeb
--- /dev/null
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -0,0 +1,51 @@
+{% load i18n %}
+{% load evelinks %}
+{% load theme_tags %}
+<div style="z-index:5;" class="w100 d-flex flex-column justify-content-center align-items-center text-center pb-2">
+
+    {% if request.user.profile.main_character %}
+        {% with request.user.profile.main_character as main %}
+            <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 %}
+                    <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}"/>
+                {% endif %}
+            </div>
+            <h5>{{ main.character_name }}</h5>
+        {% endwith %}
+    {% else %}
+        <img class="rounded-circle m-2" src="{{ 1|character_portrait_url:32 }}" alt="{% translate 'No Main Character!' %}"/>
+        <h5>{% translate "No Main Character!" %}</h5>
+    {% endif %}
+    {% if user.is_authenticated %}
+        {% theme_select %}
+    {% endif %}
+    <div class="btn-group m-2">
+        <button type="button" class="btn btn-secondary p-1">
+            {% include "public/lang_select.html" %}
+        </button>
+        {% if user.is_superuser %}
+        <a role="button" class="btn btn btn-secondary d-flex"
+            href="{% url 'admin:index' %}"
+            bs-data-toggle="button">
+            <span class="align-self-center">{% translate "Admin" %}</span>
+        </a>
+        {% endif %}
+    </div>
+    <div class="btn-group m-2">
+        <a role="button" class="btn btn-info" href="{% url 'authentication:token_management' %}" alt="Token Management"><i class="fa-solid fa-user-lock fa-fw"></i></a>
+    {% if user.is_superuser %}
+        <a role="button" class="btn btn-info" href="https://allianceauth.readthedocs.io/" alt="Alliance Auth Documentation"><i class="fa-solid fa-book fa-fw"></i></a>
+        <a role="button" class="btn btn-info" href="https://discord.gg/fjnHAmk" alt="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i></a>
+        <a role="button" class="btn btn-info" href="https://gitlab.com/allianceauth/allianceauth" alt="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i></a>
+    {% endif %}
+    {% if user.is_authenticated %}
+        <a role="button" class="btn btn-danger" href="{% url 'logout' %}" alt="{% translate 'Sign Out' %}"><i class="fa-solid fa-right-from-bracket fa-fw"></i></a>
+    {% else %}
+        <a role="button" class="btn btn-success" href="{% url 'authentication:login' %}" alt="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw"></i></a>
+    {% endif %}
+    </div>
+</div>
diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
new file mode 100644
index 00000000..1ee45fce
--- /dev/null
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -0,0 +1,21 @@
+{% load i18n %}
+{% load navactive %}
+{% load menu_items %}
+<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" >
+                <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">
+                        <i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
+                        <a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
+                            {% translate "Dashboard" %}
+                        </a>
+                    </li>
+                    {% sorted_menu_items %}
+                </ul>
+                {% include 'menu/menu-user.html' %}
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/allianceauth/menu/templatetags/__init__.py b/allianceauth/menu/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/menu/templatetags/menu_items.py b/allianceauth/menu/templatetags/menu_items.py
new file mode 100644
index 00000000..3d01b90c
--- /dev/null
+++ b/allianceauth/menu/templatetags/menu_items.py
@@ -0,0 +1,35 @@
+from django import template
+
+from allianceauth.hooks import get_hooks
+from allianceauth.menu.models import MenuItem
+
+from ..providers import MenuProvider
+
+register = template.Library()
+
+
+def process_menu_items(hooks, request):
+    _menu_items = list()
+    items = [fn() for fn in hooks]
+    items.sort(key=lambda i: i.order)
+    for item in items:
+        _menu_items.append(item.render(request))
+    return _menu_items
+
+
+@register.inclusion_tag('public/menublock.html', takes_context=True)
+def menu_items(context):
+    request = context['request']
+
+    return {
+        'menu_items': process_menu_items(get_hooks('menu_item_hook'), request),
+    }
+
+
+@register.inclusion_tag('menu/menu-block.html', takes_context=True)
+def sorted_menu_items(context):
+    request = context['request']
+    manu_items = MenuItem.render_menu(request)
+    return {
+        'menu_items':manu_items
+    }
diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html
index 13881f70..0dad3b96 100644
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@@ -1,37 +1,47 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load static %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Notifications" %}{% endblock %}
-
+{% block page_title %}
+    {% translate "Notifications" %}
+{% endblock page_title %}
+{% block header_nav_brand %}
+    {% translate "Notifications" %}
+{% endblock header_nav_brand %}
+{% block header_nav_collapse_left %}
+<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>
+    </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>
+    </a>
+</li>
+{% endblock %}
+{% block header_nav_collapse_right %}
+<li class="nav-item">
+    <a href="{% url 'notifications:mark_all_read' %}" class="nav-link">
+        <i class="fas fa-check-double"></i>
+    </a>
+</li>
+<li class="nav-item">
+    <a href="{% url 'notifications:delete_all_read' %}" class="nav-link">
+        <i class="fas fa-trash"></i>
+    </a>
+</li>
+{% endblock %}
 {% block content %}
-    <h1 class="page-header text-center">{% translate "Notifications" %}</h1>
-
-    <div class="panel panel-default">
-
-        <div class="panel-heading clearfix">
-            <ul class="nav nav-pills navbar-left">
-                <li class="active"><a data-toggle="tab" href="#unread">{% translate "Unread" %}<b>({{ unread|length }})</b></a></li>
-                <li><a data-toggle="tab" href="#read">{% translate "Read" %} <b>({{ read|length }})</b></a></li>
-            </ul>
-            <div class="nav navbar-nav navbar-right" style="margin-right: 0;">
-                <a href="{% url 'notifications:mark_all_read' %}" class="btn btn-warning">{% translate "Mark All Read" %}</a>
-                <a href="{% url 'notifications:delete_all_read' %}" class="btn btn-danger">{% translate "Delete All Read" %}</a>
-            </div>
+    <div class="tab-content">
+        <div class="tab-pane active" id="unread">
+            {% include "notifications/list_partial.html" with notifications=unread %}
         </div>
 
-        <div class="panel-body">
-            <div class="tab-content">
-
-                <div id="unread" class="tab-pane fade in active">
-                    {% include "notifications/list_partial.html" with notifications=unread %}
-                </div>
-
-                <div id="read" class="tab-pane fade">
-                    {% include "notifications/list_partial.html" with notifications=read %}
-                </div>
-
-            </div>
+        <div id="read" class="tab-pane fade">
+            {% include "notifications/list_partial.html" with notifications=read %}
         </div>
-
     </div>
 {% endblock %}
diff --git a/allianceauth/notifications/templates/notifications/list_partial.html b/allianceauth/notifications/templates/notifications/list_partial.html
index cdd0e559..c9dabbfe 100644
--- a/allianceauth/notifications/templates/notifications/list_partial.html
+++ b/allianceauth/notifications/templates/notifications/list_partial.html
@@ -1,29 +1,27 @@
 {% load i18n %}
 
 {% if notifications %}
-    <div class="table-responsive">
-        <table class="table table-condensed table-hover table-striped">
-            <tr>
-                <th class="text-center">{% translate "Timestamp" %}</th>
-                <th class="text-center">{% translate "Title" %}</th>
-                <th class="text-center">{% translate "Action" %}</th>
+    <table class="table table-striped">
+        <tr>
+            <th class="text-center">{% translate "Timestamp" %}</th>
+            <th class="text-center">{% translate "Title" %}</th>
+            <th class="text-center">{% translate "Action" %}</th>
+        </tr>
+        {% for notif in notifications %}
+            <tr class="{{ notif.level }}">
+                <td class="text-center">{{ notif.timestamp }}</td>
+                <td class="text-center">{{ notif.title }}</td>
+                <td class="text-center">
+                    <a href="{% url 'notifications:view' notif.id %}" class="btn btn-primary" title="View">
+                        <span class="fas fa-eye"></span>
+                    </a>
+                    <a href="{% url 'notifications:remove' notif.id %}" class="btn btn-danger" title="Remove">
+                        <span class="fas fa-trash"></span>
+                    </a>
+                </td>
             </tr>
-            {% for notif in notifications %}
-                <tr class="{{ notif.level }}">
-                    <td class="text-center">{{ notif.timestamp }}</td>
-                    <td class="text-center">{{ notif.title }}</td>
-                    <td class="text-center">
-                        <a href="{% url 'notifications:view' notif.id %}" class="btn btn-primary" title="View">
-                            <span class="glyphicon glyphicon-eye-open"></span>
-                        </a>
-                        <a href="{% url 'notifications:remove' notif.id %}" class="btn btn-danger" title="Remove">
-                            <span class="glyphicon glyphicon-remove"></span>
-                        </a>
-                    </td>
-                </tr>
-            {% endfor %}
-        </table>
-    </div>
+        {% endfor %}
+    </table>
 {% else %}
     <div class="alert alert-default text-center">{% translate "No notifications." %}</div>
 {% endif %}
diff --git a/allianceauth/notifications/templates/notifications/view.html b/allianceauth/notifications/templates/notifications/view.html
index 2aede4ee..099faf2a 100644
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@@ -6,7 +6,7 @@
 {% block content %}
     <h1 class="page-header text-center">
         {% translate "View Notification" %}
-        <div class="text-right">
+        <div class="text-end">
             <a href="{% url 'notifications:list' %}" class="btn btn-primary btn-lg">
                 <span class="glyphicon glyphicon-arrow-left"></span>
             </a>
diff --git a/allianceauth/optimer/auth_hooks.py b/allianceauth/optimer/auth_hooks.py
index 0570db0f..686bd4d4 100644
--- a/allianceauth/optimer/auth_hooks.py
+++ b/allianceauth/optimer/auth_hooks.py
@@ -1,4 +1,6 @@
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.optimer.views import dashboard_ops
+from allianceauth.services.hooks import UrlHook
 from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
 from . import urls
@@ -27,3 +29,17 @@ def register_menu():
 @hooks.register('url_hook')
 def register_url():
     return UrlHook(urls, 'optimer', r'^optimer/')
+
+
+class NextOpsHook(hooks.DashboardItemHook):
+    def __init__(self): #TODO add the view permms so if they cant see it is not rendered
+        hooks.DashboardItemHook.__init__(
+            self,
+            dashboard_ops,
+            6
+        )
+
+
+@hooks.register('dashboard_hook')
+def register_groups_hook():
+    return NextOpsHook()
diff --git a/allianceauth/optimer/templates/optimer/dashboard.ops.html b/allianceauth/optimer/templates/optimer/dashboard.ops.html
new file mode 100644
index 00000000..df988c97
--- /dev/null
+++ b/allianceauth/optimer/templates/optimer/dashboard.ops.html
@@ -0,0 +1,38 @@
+{% load i18n %}
+{% load evelinks %}
+
+<div class="col-12 col-xl-6 align-self-stretch p-2">
+    <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:-moz-scrollbars-vertical;overflow-y:auto;">
+                    <table class="table" style="--bs-table-bg: transparent;">
+                        <thead>
+                            <th class="text-center">{% translate "Operation" %}</th>
+                            <th class="text-center">{% translate "Type" %}</th>
+                            <th class="text-center">{% translate "Form Up System" %}</th>
+                            <th class="text-center">{% translate "Start Time" %}</th>
+                                </thead>
+                        <tbody>
+                        {% for ops in timers %}
+                        <tr>
+                            <td class="text-center">
+                                {{ ops.operation_name }}
+                            </td>
+                            <td class="text-center">
+                                ({{ ops.type }})
+                            </td>
+                            <td class="text-center">
+                                <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
+                            </td>
+                            <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/allianceauth/optimer/templates/optimer/fleetoptable.html b/allianceauth/optimer/templates/optimer/fleetoptable.html
index cb5d89e7..438a96f8 100644
--- a/allianceauth/optimer/templates/optimer/fleetoptable.html
+++ b/allianceauth/optimer/templates/optimer/fleetoptable.html
@@ -16,7 +16,7 @@
                     <th>{% translate "FC" %}</th>
                     {% if perms.auth.optimer_management %}
 {#                        <th>{% translate "Creator" %}</th>#}
-                        <th class="text-right" style="width: 150px;">{% translate "Action" %}</th>
+                        <th class="text-end" style="width: 150px;">{% translate "Action" %}</th>
                     {% endif %}
                 </tr>
             </thead>
@@ -40,7 +40,7 @@
                         <td>{{ ops.fc }}</td>
                         {% if perms.auth.optimer_management %}
 {#                            <td>{{ ops.eve_character }}</td>#}
-                            <td class="text-right">
+                            <td class="text-end">
                                 <a href="{% url 'optimer:remove' ops.id %}" class="btn btn-danger">
                                     <span class="glyphicon glyphicon-remove"></span>
                                 </a>
diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html
index 5f11779d..dc004d01 100644
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@@ -8,7 +8,7 @@
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Fleet Operation Timers" %}
-            <div class="text-right">
+            <div class="text-end">
                 {% if perms.auth.optimer_management %}
                     <a href="{% url 'optimer:add' %}" class="btn btn-success">{% translate "Create Operation" %}</a>
                 {% endif %}
@@ -16,10 +16,10 @@
         </h1>
 
         <div class="col-lg-12 text-center row">
-            <div class="label label-info text-left">
+            <div class="badge badge-info text-start">
                 <b>{% translate "Current Eve Time:" %} </b>
             </div>
-            <strong class="label label-info text-left" id="current-time"></strong>
+            <strong class="badge badge-info text-start" id="current-time"></strong>
             <br>
         </div>
 
diff --git a/allianceauth/optimer/views.py b/allianceauth/optimer/views.py
index b16549f8..3ebcf863 100644
--- a/allianceauth/optimer/views.py
+++ b/allianceauth/optimer/views.py
@@ -5,10 +5,11 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render, redirect
+from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from .form import OpForm
 
+from .form import OpForm
 from .models import OpTimer, OpTimerType
 
 logger = logging.getLogger(__name__)
@@ -137,3 +138,15 @@ def edit_optimer(request, optimer_id):
         }
         form = OpForm(initial=data, data_list=OpTimerType.objects.all())
     return render(request, 'optimer/update.html', context={'form': form})
+
+
+def dashboard_ops(request):
+    base_query = OpTimer.objects.select_related('eve_character', 'type')
+    timers = base_query.filter(start__gte=timezone.now())[:5]
+    if timers.count():
+        context = {
+            'timers': timers,
+        }
+        return render_to_string('optimer/dashboard.ops.html', context=context, request=request)
+    else:
+        return ""
diff --git a/allianceauth/permissions_tool/auth_hooks.py b/allianceauth/permissions_tool/auth_hooks.py
index bf78f1d2..df6e1aa2 100644
--- a/allianceauth/permissions_tool/auth_hooks.py
+++ b/allianceauth/permissions_tool/auth_hooks.py
@@ -1,7 +1,8 @@
+from allianceauth.menu.hooks import MenuItemHook
 from . import urls
 
 from allianceauth import hooks
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.services.hooks import UrlHook
 
 
 class PermissionsTool(MenuItemHook):
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
index 1239d69c..9db22d3d 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
@@ -1,93 +1,95 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
-{% block page_title %}{{ permission.permission.codename }} - {% translate "Permissions Audit" %}{% endblock page_title %}
-
+{% block page_title %}
+    {{ permission.permission.codename }} - {% translate "Permissions Audit" %}
+{% endblock page_title %}
 {% block content %}
     <div>
         <h1 class="page-header">{% translate "Permissions Audit" %}: {{ permission.permission.codename }}</h1>
         <p>
-            <a href="{% url 'permissions_tool:overview' %}" class="btn btn-default">
-                <i class="glyphicon glyphicon-chevron-left"></i> {% translate "Back" %}
+            <a href="{% url 'permissions_tool:overview' %}" class="btn btn-primary">
+                <i class="fa-solid fa-chevron-left"></i> {% translate "Back" %}
             </a>
         </p>
         <div class="table-responsive">
             <table class="table table-striped" id="tab_permissions_audit">
                 <thead>
                     <tr>
-                        <th>{% translate "Group" %}</th>
-                        <th></th>
-                        <th>{% translate "User / Character" %}</th>
-                        <th>{% translate "Organization" %}</th>
+                        <th scope="col">{% translate "Group" %}</th>
+                        <th scope="col"></th>
+                        <th scope="col">{% translate "User / Character" %}</th>
+                        <th scope="col">{% translate "Organization" %}</th>
                     </tr>
                 </thead>
                 <tbody>
-                {% for user in permission.users %}
-                    {% include 'permissions_tool/audit_row.html' with type="User" name="Permission granted directlty" %}
-                {% endfor %}
-                {% for group in permission.groups %}
-                    {% for user in group.user_set.all %}
-                        {% include 'permissions_tool/audit_row.html' with type="Group" name=group%}
+                    {% for user in permission.users %}
+                        {% include "permissions_tool/audit_row.html" with type="User" name="Permission granted directly" %}
                     {% endfor %}
-                {% endfor %}
-                {% for state in permission.states %}
-                    {% for profile in state.userprofile_set.all %}
-                        {% with profile.user as user %}
-                            {% include 'permissions_tool/audit_row.html' with type="State" name=state%}
-                        {% endwith %}
+                    {% for group in permission.groups %}
+                        {% for user in group.user_set.all %}
+                            {% include "permissions_tool/audit_row.html" with type="Group" name=group %}
+                        {% endfor %}
+                    {% endfor %}
+                    {% for state in permission.states %}
+                        {% for profile in state.userprofile_set.all %}
+                            {% with profile.user as user %}
+                                {% include "permissions_tool/audit_row.html" with type="State" name=state %}
+                            {% endwith %}
+                        {% endfor %}
                     {% endfor %}
-                {% endfor %}
                 </tbody>
             </table>
         </div>
     </div>
 {% endblock content %}
-
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-    {% include 'bundles/filterdropdown-js.html' %}
-{% endblock %}
-
+    {% include "bundles/datatables-js-bs5.html" %}
+    {% include "bundles/filterdropdown-js.html" %}
+{% endblock extra_javascript %}
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
-
+    {% include "bundles/datatables-css-bs5.html" %}
+{% endblock extra_css %}
 {% block extra_script %}
-    $(document).ready(function() {
+    $(document).ready(function () {
         let groupColumn = 0;
 
         $('#tab_permissions_audit').DataTable({
-            columnDefs: [
-                { "visible": false, "targets": groupColumn }
+            columnDefs: [{
+                "visible": false,
+                "targets": groupColumn
+            }],
+            order: [
+                [groupColumn, 'asc'],
+                [2, 'asc']
             ],
-            order: [[ groupColumn, 'asc' ], [ 2, 'asc' ] ],
-            filterDropDown:
-            {
-                columns: [
-                    {
-                        idx: 0,
-                        title: 'Source'
-                    }
-                ],
+            filterDropDown: {
+                columns: [{
+                    idx: 0,
+                    title: 'Source'
+                }],
                 bootstrap: true
             },
             "stateSave": true,
             "stateDuration": 0,
-            drawCallback: function ( settings ) {
+            drawCallback: function (settings) {
                 let api = this.api();
-                let rows = api.rows( {page:'current'} ).nodes();
+                let rows = api.rows({
+                    page: 'current'
+                }).nodes();
                 let last = null;
 
-                api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) {
-                    if ( last !== group ) {
-                        $(rows).eq( i ).before(
-                            '<tr class="tr-group"><td colspan="3">' + group + '</td></tr>'
+                api.column(groupColumn, {
+                    page: 'current'
+                }).data().each(function (group, i) {
+                    if (last !== group) {
+                        $(rows).eq(i).before(
+                            '<tr class="h4 table-secondary"><td colspan="3">' + group + '</td></tr>'
                         );
 
                         last = group;
                     }
-                } );
+                });
             }
-        } );
-    } );
-{% endblock %}
+        });
+    });
+{% endblock extra_script %}
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html
index 55313c24..4dfbef1a 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html
@@ -1,25 +1,17 @@
 {% load evelinks %}
-
+{% load i18n %}
 <tr>
-    <td>
-        {{ type }}: {{ name }}
-    </td>
-    <td class="text-right">
-        <img src="{{ user.profile.main_character|character_portrait_url:32 }}" class="img-circle" alt="{{ user.profile.main_character.character_name }}">
-    </td>
-    <td>
-        <strong>{{ user }}<br></strong>
-        {{ user.profile.main_character.character_name }}
-    </td>
-    <td class="text-left">
+    <td>{{ type }}: {{ name }}</td>
+    <td class="text-end">
+        <img src="{{ user.profile.main_character|character_portrait_url:32 }}" class="img-circle" alt="{{ user.profile.main_character.character_name }}"/></td>
+    <td><strong>{{ user }}<br/></strong>{{ user.profile.main_character.character_name }}</td>
+    <td class="text-start">
         {% if user.profile.main_character %}
-            <a href="{{ user.profile.main_character|dotlan_corporation_url }}" target="_blank">
-                {{ user.profile.main_character.corporation_name }}
-            </a><br>
+            <a href="{{ user.profile.main_character|dotlan_corporation_url }}" target="_blank">{{ user.profile.main_character.corporation_name }}</a>
+            <br/>
             {{ user.profile.main_character.alliance_name|default_if_none:"" }}
         {% else %}
-            (unknown)
+            {% translate "(unknown)" %}
         {% endif %}
-
     </td>
 </tr>
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
index 229487b0..75f7183e 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
@@ -1,128 +1,107 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
-
-{% block page_title %}{% translate "Permissions Overview" %}{% endblock page_title %}
-
+{% block page_title %}
+    {% translate "Permissions Overview" %}
+{% endblock page_title %}
 {% block content %}
     <div class="col-sm-12">
         <h1 class="page-header">{% translate "Permissions Overview" %}</h1>
         <p>
-        {% if request.GET.all != 'yes' %}
-            {% blocktranslate %}Showing only applied permissions{% endblocktranslate %}
-            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% translate "Show All" %}</a>
-        {% else %}
-            {% blocktranslate %}Showing all permissions{% endblocktranslate %}
-            <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% translate "Show Applied" %}</a>
-        {% endif %}
+            {% if request.GET.all != 'yes' %}
+                {% translate "Showing only applied permissions" %}
+                <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% translate "Show All" %}</a>
+            {% else %}
+                {% translate "Showing all permissions" %}
+                <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% translate "Show Applied" %}</a>
+            {% endif %}
         </p>
         <div class="table-responsive">
-            <table class="table table-striped" id="tab_permissions_overview" style="width:100%">
+            <table class="table table-striped" id="tab_permissions_overview">
                 <thead>
                     <tr>
-                        <th>
-                            {% translate "App" %}
-                        </th>
-                        <th>
-                            {% translate "Model" %}
-                        </th>
-                        <th>
-                            {% translate "Code Name" %}
-                        </th>
-                        <th>
-                            {% translate "Name" %}
-                        </th>
-                        <th class="col-md-1">
-                            {% translate "Users" %}
-                        </th>
-                        <th class="col-md-1">
-                            {% translate "Groups" %}
-                        </th>
-                        <th class="col-md-1">
-                            {% translate "States" %}
-                        </th>
+                        <th scope="col">{% translate "App" %}</th>
+                        <th scope="col">{% translate "Model" %}</th>
+                        <th scope="col">{% translate "Code Name" %}</th>
+                        <th scope="col">{% translate "Name" %}</th>
+                        <th scope="col">{% translate "Users" %}</th>
+                        <th scope="col">{% translate "Groups" %}</th>
+                        <th scope="col">{% translate "States" %}</th>
                     </tr>
                 </thead>
                 <tbody>
-                {% for perm in permissions %}
-                    <tr>
-                        <td>
-                            {{ perm.permission.content_type.app_label }}
-                        </td>
-                        <td>
-                            {{ perm.permission.content_type.model }}
-                        </td>
-                        <td>
-                            <a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
-                                {{ perm.permission.codename }}
-                            </a>
-                        </td>
-                        <td>
-                            {{ perm.permission.name }}
-                        </td>
-                        <td class="{% if perm.users > 0 %}info {% endif %}text-right">
-                            {{ perm.users }}
-                        </td>
-                        <td class="{% if perm.groups > 0 %}info {% endif %}text-right">
-                            {{ perm.groups }} ({{ perm.group_users }})
-                        </td>
-                        <td class="{% if perm.states > 0 %}info {% endif %}text-right">
-                            {{ perm.states }} ({{ perm.state_users }})
-                        </td>
-                    </tr>
-                {% endfor %}
+                    {% for perm in permissions %}
+                        <tr>
+                            <td>{{ perm.permission.content_type.app_label }}</td>
+                            <td>{{ perm.permission.content_type.model }}</td>
+                            <td>
+                                <a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
+                                    {{ perm.permission.codename }}
+                                </a>
+                            </td>
+                            <td>{{ perm.permission.name }}</td>
+                            <td class="{% if perm.users > 0 %}info{% endif %}text-end">{{ perm.users }}</td>
+                            <td class="{% if perm.groups > 0 %}info{% endif %}text-end">{{ perm.groups }} ({{ perm.group_users }})</td>
+                            <td class="{% if perm.states > 0 %}info{% endif %}text-end">{{ perm.states }} ({{ perm.state_users }})</td>
+                        </tr>
+                    {% endfor %}
                 </tbody>
             </table>
         </div>
     </div>
 {% endblock content %}
-
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-    {% include 'bundles/filterdropdown-js.html' %}
-{% endblock %}
-
+    {% include "bundles/datatables-js-bs5.html" %}
+    {% include "bundles/filterdropdown-js.html" %}
+{% endblock extra_javascript %}
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
-
+    {% include "bundles/datatables-css-bs5.html" %}
+{% endblock extra_css %}
 {% block extra_script %}
-    $(document).ready(function() {
-        let groupColumn = 0;
-
-        $('#tab_permissions_overview').DataTable({
-            columnDefs: [
-                { "visible": false, "targets": groupColumn }
-            ],
-            order: [[ groupColumn, 'asc' ], [ 1, 'asc' ], [ 2, 'asc' ] ],
-            filterDropDown:
-            {
-                columns: [
-                    {
-                        idx: 0
-                    },
-                    {
-                        idx: 1
-                    }
-                ],
-                bootstrap: true,
-            },
-            "stateSave": true,
-            "stateDuration": 0,
-            drawCallback: function ( settings ) {
-                let api = this.api();
-                let rows = api.rows( {page:'current'} ).nodes();
-                let last = null;
-
-                api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) {
-                    if ( last !== group ) {
-                        $(rows).eq( i ).before(
-                            '<tr class="tr-group"><td colspan="6">' + group + '</td></tr>'
-                        );
-
-                        last = group;
-                    }
-                } );
-            }
-        } );
-    } );
-{% endblock %}
+    $(document).ready(function () {
+    let groupColumn = 0;
+    $('#tab_permissions_overview').DataTable({
+    columnDefs: [{
+    "visible": false,
+    "targets": groupColumn
+    }],
+    order: [
+    [groupColumn, 'asc'],
+    [1, 'asc'],
+    [2, 'asc']
+    ],
+    filterDropDown: {
+    columns: [{
+    idx: 0
+    },
+    {
+    idx: 1
+    }
+    ],
+    bootstrap: true,
+    },
+    "stateSave": true,
+    "stateDuration": 0,
+    drawCallback: function (settings) {
+    let api = this.api();
+    let rows = api.rows({
+    page: 'current'
+    }).nodes();
+    let last = null;
+    api.column(groupColumn, {
+    page: 'current'
+    }).data().each(function (group, i) {
+    if (last !== group) {
+    $(rows).eq(i).before(
+    '
+    <tr class="h4 table-secondary">
+        <td colspan="6">' + group + '</td>
+    </tr>
+    '
+    );
+    last = group;
+    }
+    });
+    }
+    });
+    });
+{% endblock extra_script %}
diff --git a/allianceauth/project_template/project_name/settings/base.py b/allianceauth/project_template/project_name/settings/base.py
index f777aed4..2506ecfb 100644
--- a/allianceauth/project_template/project_name/settings/base.py
+++ b/allianceauth/project_template/project_name/settings/base.py
@@ -31,6 +31,11 @@ INSTALLED_APPS = [
     'allianceauth.notifications',
     'allianceauth.thirdparty.navhelper',
     'allianceauth.analytics',
+    'allianceauth.menu',
+    'allianceauth.theme',
+    'allianceauth.theme.darkly',
+    'allianceauth.theme.flatly',
+    'allianceauth.theme.materia',
 ]
 
 SECRET_KEY = "wow I'm a really bad default secret key"
@@ -188,6 +193,8 @@ DATABASES = {
 
 SITE_NAME = 'Alliance Auth'
 
+DEFAULT_THEME = "allianceauth.theme.darkly"
+
 LOGIN_URL = 'auth_login_user'  # view that handles login logic
 
 LOGIN_REDIRECT_URL = 'authentication:dashboard'  # default destination when logging in if no redirect specified
diff --git a/allianceauth/project_template/project_name/settings/local.py b/allianceauth/project_template/project_name/settings/local.py
index d83fd718..0b86e9ca 100644
--- a/allianceauth/project_template/project_name/settings/local.py
+++ b/allianceauth/project_template/project_name/settings/local.py
@@ -26,7 +26,7 @@ DEBUG = False
 
 # Add any additional apps to this list.
 INSTALLED_APPS += [
-
+    #'allianceauth.theme.bootstrap',
 ]
 
 # To change the logging level for extensions, uncomment the following line.
diff --git a/allianceauth/services/auth_hooks.py b/allianceauth/services/auth_hooks.py
index 29104705..3f032d9a 100644
--- a/allianceauth/services/auth_hooks.py
+++ b/allianceauth/services/auth_hooks.py
@@ -1,7 +1,7 @@
-from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
+from django.utils.translation import gettext_lazy as _
 
-from .hooks import MenuItemHook
+from ..menu.hooks import MenuItemHook
 from .hooks import ServicesHook
 
 
diff --git a/allianceauth/services/hooks.py b/allianceauth/services/hooks.py
index 862c7339..084d8e49 100644
--- a/allianceauth/services/hooks.py
+++ b/allianceauth/services/hooks.py
@@ -1,5 +1,5 @@
-from django.urls import include, re_path
 from string import Formatter
+from django.urls import include, re_path
 from typing import Iterable, Optional
 
 from django.conf import settings
@@ -9,6 +9,11 @@ from django.urls import include, re_path
 from django.utils.functional import cached_property
 
 from allianceauth.hooks import get_hooks
+from allianceauth.menu.hooks import MenuItemHook
+from django.conf import settings
+from django.urls import include, re_path
+from django.core.exceptions import ObjectDoesNotExist
+from django.utils.functional import cached_property
 
 from .models import NameFormatConfig
 
@@ -136,26 +141,15 @@ class ServicesHook:
             yield fn()
 
 
-class MenuItemHook:
-    def __init__(self, text, classes, url_name, order=None, navactive=list([])):
-        self.text = text
-        self.classes = classes
-        self.url_name = url_name
-        self.template = 'public/menuitem.html'
-        self.order = order if order is not None else 9999
+class MenuItemHook(MenuItemHook):
+    """
+    MenuItemHook shim to allianceauth.menu.hooks
 
-        # count is an integer shown next to the menu item as badge when count != None
-        # apps need to set the count in their child class, e.g. in render() method
-        self.count = None
-
-        navactive = navactive or []
-        navactive.append(url_name)
-        self.navactive = navactive
-
-    def render(self, request):
-        return render_to_string(self.template,
-                                {'item': self},
-                                request=request)
+    :param MenuItemHook: _description_
+    :type MenuItemHook: _type_
+    """
+    def __init_subclass__(cls) -> None:
+        return super().__init_subclass__()
 
 
 class UrlHook:
diff --git a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html
index cfece366..55aae356 100644
--- a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html
+++ b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html
@@ -1,37 +1,34 @@
 {% load i18n %}
-
-
-<tr>
-    <td class="text-center">{% translate "Discord" %}</td>
-    <td class="text-center">
+<div class="card text-center m-4" style="min-width: 18rem; min-height: 18rem;">
+    <div class="card-body ">
+        <h5 class="card-title ">{% translate "Discord" %}</h5>
+        <p class="card-text">{% if server_name %}{{ server_name }}{% else %}{% translate "Unlinked Server" %}{% endif %}</p>
+        <p class="card-text"><span class="badge {% if user_has_account %}bg-success{% else %}bg-warning{% endif %}">{% if user_has_account %}{% translate "Active" %}{% else %}{% translate "Disabled" %}{% endif %}</span></p>
+        <p class="card-text">
         {% if not user_has_account %}
-            (not activated)
+            {% translate "(not activated)" %}
         {% else %}
-            {{discord_username}}
+            {{ discord_username }}
         {% endif %}
-    </td>
-    <td class="text-center">
-        {{server_name}}
-    </td>
-    <td class="text-center">
+        </p>
+    </div>
+    <div class="card-footer">
         {% if not user_has_account %}
             <a href="{% url 'discord:activate' %}" title="{% translate 'Join the Discord server' %}" class="btn btn-primary">
-                <span class="glyphicon glyphicon-ok"></span>
+                <span class="fas fa-check fa-fw"></span>
             </a>
         {% else %}
             <a href="{% url 'discord:reset' %}" title="{% translate 'Leave- and rejoin the Discord Server (Reset)' %}" class="btn btn-warning">
-                <span class="glyphicon glyphicon-refresh"></span>
+                <span class="fas fa-sync fa-fw"></span>
             </a>
             <a href="{% url 'discord:deactivate' %}" title="{% translate 'Leave the Discord server' %}" class="btn btn-danger">
-                <span class="glyphicon glyphicon-remove"></span>
+                <span class="fas fa-times fa-fw"></span>
             </a>
         {% endif %}
         {% if request.user.is_superuser %}
-            <div class="text-center" style="padding-top:5px;">
-                <a type="button" id="btnLinkDiscordServer" class="btn btn-default" href="{% url 'discord:add_bot' %}">
-                    {% translate "Link Discord Server" %}
-                </a>
-            </div>
+            <a type="button" id="btnLinkDiscordServer" class="btn btn-primary" href="{% url 'discord:add_bot' %}">
+                <span class="fas fa-link fa-fw"></span>
+            </a>
         {% endif %}
-    </td>
-</tr>
+    </div>
+</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 2940f0f3..b4c2ced4 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
@@ -1,10 +1,20 @@
+{% extends "services/services_ctrl_base.html" %}
 {% load i18n %}
 
-<tr>
-    <td class="text-center">Discourse</td>
-    <td class="text-center">{{ char.character_name }}</td>
-    <td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
-    <td class="text-center">
-        <a title="Go To Forums" class="btn btn-success" href="{{ DISCOURSE_URL }}"><span class="glyphicon glyphicon-arrow-right"></span></a>
-    </td>
-</tr>
+{% block title %}
+    {% translate "Discourse" %}
+{% endblock %}
+
+{% block url %}
+    <a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a>
+{% endblock %}
+
+{% block user %}
+    Username: {{ char.character_name }}
+{% endblock %}
+
+{% block controls %}
+    <a title="Go To Forums" href="{{ DISCOURSE_URL }}" class="btn btn-success" title="Connect">
+        <span class="fas fa-arrow-right fa-fw"></span>
+    </a>
+{% endblock %}
diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
index 11643527..6e8605cc 100644
--- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
@@ -1,28 +1,34 @@
-<tr>
-    <td class="text-center">{{ service_name }}</td>
-    <td class="text-center">{{ username }}</td>
+{% load i18n %}
+<div class="card text-center m-4" style="min-width: 18rem; min-height: 18rem;">
+    <div class="card-body ">
+        <h5 class="card-title ">{{ service_name }}</h5>
+        <p class="card-text"><a href="mumble://{{ service_url }}">{{ service_url }}</a></p>
+        <p class="card-text"><span class="badge {% if username != '' %}bg-success{% else %}bg-warning{% endif %}">{% if username != '' %}Active{% else %}Disabled{% endif %}</span></p>
+        <p class="card-text">Username: <span class="badge bg-secondary text-end">{{ username }}</span></p>
+        </div>
+    <div class="card-footer">
         {% if username == "" %}
             <td class="text-center">{{ service_url }}</td>
             <td class="text-center">
-            <a href="{% url 'mumble:activate' %}" title="Activate" class="btn btn-warning">
-                <span class="glyphicon glyphicon-ok"></span>
-            </a>
-        </td>
+                <a href="{% url 'mumble:activate' %}" title="Activate" class="btn btn-warning">
+                    <span class="fas fa-check fa-fw"></span>
+                </a>
+            </td>
         {% else %}
-            <td class="text-center"><a href="mumble://{{ connect_url }}">{{ service_url }}</a></td>
             <td class="text-center">
-            <a href="{% url 'mumble:set_password' %}" title="Set Password" class="btn btn-warning">
-                <span class="glyphicon glyphicon-pencil"></span>
-            </a>
-            <a href="{% url 'mumble:reset_password' %}" title="Reset Password" class="btn btn-primary">
-                <span class="glyphicon glyphicon-refresh"></span>
-            </a>
-            <a href="{% url 'mumble:deactivate' %}" title="Deactivate" class="btn btn-danger">
-                <span class="glyphicon glyphicon-remove"></span>
-            </a>
-            <a href="mumble://{{ connect_url }}" class="btn btn-success" title="Connect">
-                <span class="glyphicon glyphicon-arrow-right"></span>
-            </a>
-        </td>
+                <a href="{% url 'mumble:set_password' %}" title="Set Password" class="btn btn-warning">
+                    <span class="fas fa-edit fa-fw"></span>
+                </a>
+                <a href="{% url 'mumble:reset_password' %}" title="Reset Password" class="btn btn-primary">
+                    <span class="fas fa-sync fa-fw"></span>
+                </a>
+                <a href="{% url 'mumble:deactivate' %}" title="Deactivate" class="btn btn-danger">
+                    <span class="fas fa-times fa-fw"></span>
+                </a>
+                <a href="mumble://{{ connect_url }}" class="btn btn-success" title="Connect">
+                    <span class="fas fa-arrow-right fa-fw"></span>
+                </a>
+            </td>
         {% endif %}
-</tr>
+    </div>
+</div>
diff --git a/allianceauth/services/modules/openfire/auth_hooks.py b/allianceauth/services/modules/openfire/auth_hooks.py
index 91a71cd9..6165ce19 100644
--- a/allianceauth/services/modules/openfire/auth_hooks.py
+++ b/allianceauth/services/modules/openfire/auth_hooks.py
@@ -5,7 +5,8 @@ from django.template.loader import render_to_string
 from django.utils.translation import gettext_lazy as _
 
 from allianceauth import hooks
-from allianceauth.services.hooks import ServicesHook, MenuItemHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import ServicesHook
 from .tasks import OpenfireTasks
 from .urls import urlpatterns
 
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 736788be..3a163867 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,27 +1,39 @@
+{% extends "services/services_ctrl_base.html" %}
 {% load i18n %}
 
-<tr>
-    <td class="text-center">Teamspeak 3</td>
-    <td class="text-center">{{ authinfo.teamspeak3_uid }}</td>
-    <td class="text-center"><a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}">{{ TEAMSPEAK3_PUBLIC_URL }}</a></td>
-    <td class="text-center">
-        {% if authinfo.teamspeak3_uid == "" %}
-            <a href="{% url 'teamspeak3:activate' %}" title="Activate" class="btn btn-warning">
-                <span class="glyphicon glyphicon-ok"></span>
-            </a>
-        {% else %}
-            <a href="{% url 'teamspeak3:verify' %}" title="Verify Client ID" class="btn btn-success">
-                <span class="glyphicon glyphicon-log-in"></span>
-            </a>
-            <a href="{% url 'teamspeak3:reset_perm' %}" title="Refresh Token" class="btn btn-primary">
-                <span class="glyphicon glyphicon-refresh"></span>
-            </a>
-            <a href="{% url 'teamspeak3:deactivate' %}" title="Deactivate" class="btn btn-danger">
-                <span class="glyphicon glyphicon-remove"></span>
-            </a>
-            <a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?nickname={{ authinfo.teamspeak3_uid }}" title="Connect" class="btn btn-success">
-                <span class="glyphicon glyphicon-arrow-right"></span>
-            </a>
+{% block title %}
+    {% translate "Teamspeak 3" %}
+{% endblock %}
+
+{% block url %}
+    <a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}">{{ TEAMSPEAK3_PUBLIC_URL }}</a>
+{% endblock %}
+
+{% block active %}
+    <span class="badge {% if authinfo.teamspeak3_uid != '' %}bg-success{% else %}bg-warning{% endif %}">{% if authinfo.teamspeak3_uid != '' %}Active{% else %}Disabled{% endif %}</span>
+{% endblock %}
+
+{% block user %}
+    {{ authinfo.teamspeak3_uid }}
+{% endblock %}
+
+{% block controls %}
+    {% if authinfo.teamspeak3_uid == "" %}
+        <a href="{% url 'teamspeak3:activate' %}" title="Activate" class="btn btn-warning">
+            <span class="fas fa-check fa-fw"></span>
+        </a>
+    {% else %}
+        <a href="{% url 'teamspeak3:verify' %}" title="Verify Client ID" class="btn btn-success">
+            <span class="far fa-sign-in fa-fw"></span>
+        </a>
+        <a href="{% url 'teamspeak3:reset_perm' %}" title="Refresh Token" class="btn btn-primary">
+            <span class="fas fa-sync fa-fw"></span>
+        </a>
+        <a href="{% url 'teamspeak3:deactivate' %}" title="Deactivate" class="btn btn-danger">
+            <span class="fas fa-times fa-fw"></span>
+        </a>
+        <a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?nickname={{ authinfo.teamspeak3_uid }}" title="Connect" class="btn btn-success">
+            <span class="fas fa-arrow-right fa-fw"></span>
+        </a>
         {% endif %}
-    </td>
-</tr>
+{% endblock %}
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index bcb8e02c..b176fd1f 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load bootstrap %}
 {% load i18n %}
 
diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html
index 203f5080..c8cdc362 100644
--- a/allianceauth/services/templates/services/services.html
+++ b/allianceauth/services/templates/services/services.html
@@ -1,29 +1,48 @@
-{% extends "allianceauth/base.html" %}
+{% 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 content %}
-    <div class="col-lg-12">
-    <h1 class="page-header text-center">{% translate "Available Services" %}</h1>
-        <div class="table-responsive">
-            <table class="table table-striped">
-                <thead>
-                    <tr>
-                        <th class="text-center">{% translate "Service" %}</th>
-                        <th class="text-center">{% translate "Username" %}</th>
-                        <th class="text-center">{% translate "Domain" %}</th>
-                        <th class="text-center">{% translate "Action" %}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for svc in service_ctrls %}
-                        {{ svc }}
-                    {% endfor %}
-                </tbody>
-            </table>
+    <div class="d-flex p-2 bd-highlight justify-content-center flex-wrap">
+        {% for svc in service_ctrls %}
+            {{ svc }}
+        {% endfor %}
+    </div>
+    <div class="w-100 text-center">
+        <h4>Legend</h4>
+        <div class="d-inline-flex bd-highlight justify-content-center flex-wrap">
+            <div class="d-inline-flex m-3">
+                <a title="Activate" class="btn btn-warning">
+                    <span class="fas fa-check fa-fw"></span>
+                </a>
+                <p class="m-2 p-0 align-self-center">{% translate "Click to activate the service for your user." %}</p>
+            </div>
+            <div class="d-inline-flex m-3">
+                <a title="Set Password" class="btn btn-warning">
+                    <span class="fas fa-edit fa-fw"></span>
+                </a>
+                <p class="m-2 p-0 align-self-center">{% translate "Click to manually set your password." %}</p>
+
+            </div>
+            <div class="d-inline-flex m-3">
+                <a title="Reset Password" class="btn btn-primary">
+                    <span class="fas fa-sync fa-fw"></span>
+                </a>
+                <p class="m-2 p-0 align-self-center">{% translate "Click to randomly generate your password." %}</p>
+            </div>
+            <div class="d-inline-flex m-3">
+                <a title="Deactivate" class="btn btn-danger">
+                    <span class="fas fa-times fa-fw"></span>
+                </a>
+                <p class="m-2 p-0 align-self-center">{% translate "Click to deactivate the service for your user" %}</p>
+            </div>
         </div>
+            <p class="m-2 p-0 align-self-center">{% translate "Some services provide different options. Hover over the buttons to see more." %}</p>
     </div>
 
 {% endblock content %}
diff --git a/allianceauth/services/templates/services/services_ctrl.html b/allianceauth/services/templates/services/services_ctrl.html
index 8bd84fde..6a841f99 100644
--- a/allianceauth/services/templates/services/services_ctrl.html
+++ b/allianceauth/services/templates/services/services_ctrl.html
@@ -1,32 +1,44 @@
+{% extends "services/services_ctrl_base.html" %}
 {% load i18n %}
 
-<tr>
-    <td class="text-center">{{ service_name }}</td>
-    <td class="text-center">{{ username }}</td>
-    <td class="text-center"><a href="{{ service_url }}">{{ service_url }}</a></td>
-    <td class="text-center">
-        {% if username == "" %}
-            {% if urls.auth_activate %}
-            <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
-                <span class="glyphicon glyphicon-ok"></span>
-            </a>
-            {% endif %}
-        {% else %}
-            {% if urls.auth_set_password %}
-            <a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
-                <span class="glyphicon glyphicon-pencil"></span>
-            </a>
-            {% endif %}
-            {% if urls.auth_reset_password %}
-            <a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
-                <span class="glyphicon glyphicon-refresh"></span>
-            </a>
-            {% endif %}
-            {% if urls.auth_deactivate %}
-            <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
-                <span class="glyphicon glyphicon-remove"></span>
-            </a>
-            {% endif %}
+{% block title %}
+    {{ service_name }}
+{% endblock %}
+
+{% block url %}
+    <a href="{{ service_url }}">{{ service_url }}</a>
+{% endblock %}
+
+{% block active %}
+    <span class="badge {% if username != '' %}bg-success{% else %}bg-warning{% endif %}">{% if username != '' %}Active{% else %}Disabled{% endif %}</span>
+{% endblock %}
+
+{% block user %}
+    Username: <span class="badge bg-secondary">{{ username }}</span>
+{% endblock %}
+
+{% block controls %}
+    {% if username == "" %}
+        {% if urls.auth_activate %}
+        <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
+            <span class="fas fa-check fa-fw"></span>
+        </a>
         {% endif %}
-    </td>
-</tr>
+    {% else %}
+        {% if urls.auth_set_password %}
+        <a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
+            <span class="fas fa-edit fa-fw"></span>
+        </a>
+        {% endif %}
+        {% if urls.auth_reset_password %}
+        <a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
+            <span class="fas fa-sync fa-fw"></span>
+        </a>
+        {% endif %}
+        {% if urls.auth_deactivate %}
+        <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
+            <span class="fas fa-times fa-fw"></span>
+        </a>
+        {% endif %}
+    {% endif %}
+{% endblock %}
diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html
new file mode 100644
index 00000000..fa32e37e
--- /dev/null
+++ b/allianceauth/services/templates/services/services_ctrl_base.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+<div class="card text-center m-4" style="min-width: 18rem; min-height: 18rem">
+    <div class="card-body">
+        <h5 class="card-title">{% block title %}{% endblock title %}</h5>
+        <p class="card-text">{% block url %}{% endblock url %}</p>
+        <p class="card-text">
+            {% block active %}
+            <span class="badge bg-success">Active</span>
+            {% endblock active %}
+        </p>
+        <p class="card-text">{% block user %}{% endblock user %}</p>
+        {% block extra %}{% endblock extra %}
+    </div>
+    <div class="card-footer">{% block controls %}{% endblock controls %}</div>
+</div>
diff --git a/allianceauth/srp/auth_hooks.py b/allianceauth/srp/auth_hooks.py
index f6a920c8..3a9c4306 100644
--- a/allianceauth/srp/auth_hooks.py
+++ b/allianceauth/srp/auth_hooks.py
@@ -1,7 +1,8 @@
 from django.utils.translation import gettext_lazy as _
 
 from allianceauth import hooks
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 
 from . import urls
 from .managers import SRPManager
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 0288306d..8c05b0d1 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -1,54 +1,13 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% load humanize %}
 {% block page_title %}{% translate "Srp Fleet Data" %}{% endblock page_title %}
-{% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-    {% include 'bundles/x-editable.css.html' %}
-    {% include 'bundles/checkbox-css.html' %}
-    <style>
-        .copy-text-fa-icon:hover {
-            cursor: pointer;
-        }
-        .radio label, .checkbox label {
-            padding-left: 10px;
-        }
-        .editable {
-            width:150px;
-            text-align: center;
-        }
-        .editableform .form-control {
-            width: 95%;
-            text-align: center;
-            margin-left: 10px;
-        }
-
-        .editable-input {
-            width: 95%;
-        }
-        .radio, .checkbox {
-            margin-top: 0;
-            margin-bottom: 0;
-        }
-        .editable-error-block {
-            white-space: nowrap;
-        }
-        .editable-click, a.editable-click, a.editable-click:hover {
-            border-bottom: none;
-        }
-        .tooltip-inner {
-            white-space:pre;
-            max-width: none;
-        }
-    </style>
-{% endblock extra_css %}
-
 {% block content %}
     <div class="col-lg-12">
         <div class="row">
             <h1 class="page-header text-center">{% translate "SRP Fleet Data" %}
-                <div class="text-right">
+                <div class="text-end">
                     {% if perms.auth.srp_management %}
                         {% if fleet_status == "Completed" %}
                             <a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
@@ -67,7 +26,7 @@
                 <form method="POST">
                     {% csrf_token %}
                     <div class="alert alert-info" role="alert">
-                        <div class="text-right">
+                        <div class="text-end">
                             <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
                             <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
                             {% if perms.auth.srp_management %}
@@ -114,7 +73,7 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                     </td>
                                     <td class="text-center">
                                         <a href="{{ srpfleetrequest.killboard_link }}"
-                                        target="_blank" class="label label-warning">Link</a>
+                                        target="_blank" class="badge badge-warning">{% translate "Link" %}</a>
                                     </td>
                                     <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
                                     <td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
@@ -123,15 +82,15 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                     <td class="text-center" data-sort="{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}">{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }}</td>
                                     <td class="text-center">
                                         {% if srpfleetrequest.srp_status == "Approved" %}
-                                            <div class="label label-success">
+                                            <div class="badge badge-success">
                                                 {% translate "Approved" %}
                                             </div>
                                         {% elif srpfleetrequest.srp_status == "Rejected" %}
-                                            <div class="label label-danger">
+                                            <div class="badge badge-danger">
                                                 {% translate "Rejected" %}
                                             </div>
                                         {% else %}
-                                            <div class="label label-warning">
+                                            <div class="badge badge-warning">
                                                 {% translate "Pending" %}
                                             </div>
                                         {% endif %}
@@ -148,12 +107,12 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                     {% endif %}
                                 </tr>
                             {% endfor %}
-                            <tbody>
+                            </tbody>
 
                         </table>
                     </div>
                     <div class="alert alert-info" role="alert">
-                        <div class="text-right">
+                        <div class="text-end">
                             <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
                             <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
                             {% if perms.auth.srp_management %}
@@ -180,10 +139,10 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
 {% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-    {% include 'bundles/x-editable-js.html' %}
-    {% include 'bundles/moment-js.html' %}
-    {% include 'bundles/clipboard-js.html' %}
+    {% include "bundles/datatables-js-bs5.html" %}
+    {% include "bundles/x-editable-js.html" %}
+    {% include "bundles/moment-js.html" %}
+    {% include "bundles/clipboard-js.html" %}
 
     <script>
         const clipboard = new ClipboardJS('.copy-text-fa-icon');
@@ -273,3 +232,44 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
         $("[rel=tooltip]").tooltip({ placement: 'top'});
     });
 {% endblock extra_script %}
+
+{% block extra_css %}
+    {% include "bundles/datatables-css-bs5.html" %}
+    {% include "bundles/x-editable.css.html" %}
+    {% include "bundles/checkbox-css.html" %}
+    <style>
+        .copy-text-fa-icon:hover {
+            cursor: pointer;
+        }
+        .radio label, .checkbox label {
+            padding-left: 10px;
+        }
+        .editable {
+            width:150px;
+            text-align: center;
+        }
+        .editableform .form-control {
+            width: 95%;
+            text-align: center;
+            margin-left: 10px;
+        }
+
+        .editable-input {
+            width: 95%;
+        }
+        .radio, .checkbox {
+            margin-top: 0;
+            margin-bottom: 0;
+        }
+        .editable-error-block {
+            white-space: nowrap;
+        }
+        .editable-click, a.editable-click, a.editable-click:hover {
+            border-bottom: none;
+        }
+        .tooltip-inner {
+            white-space:pre;
+            max-width: none;
+        }
+    </style>
+{% endblock extra_css %}
diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html
index 4d776519..18a1c390 100644
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% load humanize %}
@@ -10,7 +10,7 @@
     <div class="col-lg-12">
         <div class="row">
             <h1 class="page-header text-center">{% translate "SRP Management" %}
-                <div class="text-right">
+                <div class="text-end">
                     {% if perms.auth.srp_management %}
                         <a href="{% url 'srp:all' %}" class="btn btn-primary">
                             {% translate "View All" %}
@@ -24,7 +24,7 @@
                 </div>
             </h1>
             <div class="alert alert-info" role="alert">
-                <div class="text-right">
+                <div class="text-end">
                     <b>{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
                 </div>
             </div>
@@ -46,27 +46,27 @@
                         {% for srpfleet in srpfleets %}
                             <tr>
                                 <td class="text-center">
-                                    <div class="label label-info">
+                                    <div class="badge badge-info">
                                         {{ srpfleet.fleet_name }}
                                     </div>
                                 </td>
                                 <td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
                                 <td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
                                 <td class="text-center">
-                                    <div class="label label-success">
+                                    <div class="badge badge-success">
                                         {{ srpfleet.fleet_commander.character_name }}
                                     </div>
                                 </td>
                                 <td class="text-center">
-                                    {%  if srpfleet.fleet_srp_aar_link %}
-                                        <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% translate 'Link' %}</a>
-                                    {%  endif %}
+                                    {% if srpfleet.fleet_srp_aar_link %}
+                                        <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge badge-primary">{% translate "Link" %}</a>
+                                    {% endif %}
                                 </td>
                                 <td class="text-center">
                                     {% if srpfleet.fleet_srp_code %}
-                                        <a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
+                                        <a class="badge badge-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
                                     {% else %}
-                                        <div class="label label-danger">
+                                        <div class="badge badge-danger">
                                             {% translate "Disabled" %}
                                         </div>
                                     {% endif %}
@@ -75,17 +75,17 @@
 
                                 <td class="text-center">
                                     {% if srpfleet.fleet_srp_status == "" %}
-                                        <div class="label label-warning">
+                                        <div class="badge badge-warning">
                                             {% translate "Pending" %}
                                         </div>
                                     {% else %}
-                                        <div class="label label-success">
+                                        <div class="badge badge-success">
                                             {% translate "Completed" %}
                                         </div>
                                     {% endif %}
                                 </td>
                                 <td class="text-center">
-                                    <div class="label label-warning">{{ srpfleet.pending_requests }}</div>
+                                    <div class="badge badge-warning">{{ srpfleet.pending_requests }}</div>
                                 </td>
                                 <td class="text-center">
 
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index 0e46aa31..9cfd6117 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load bootstrap %}
 {% load i18n %}
 
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index baf1a8c6..dfb2af7b 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load bootstrap %}
 {% load i18n %}
 
@@ -26,7 +26,6 @@
                 </div>
             </div>
         </div>
-
     </div>
 
 {% endblock content %}
diff --git a/allianceauth/static/allianceauth/images/auth-logo.png b/allianceauth/static/allianceauth/images/auth-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b45de9c8e157f514a74e6d3d88a79151a58c5bc9
GIT binary patch
literal 10836
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
JMBd`n{{a$DmplLf

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/images/auth-logo.svg b/allianceauth/static/allianceauth/images/auth-logo.svg
new file mode 100644
index 00000000..9d0c92e2
--- /dev/null
+++ b/allianceauth/static/allianceauth/images/auth-logo.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg122"
+   width="256"
+   height="256"
+   viewBox="0 0 255.99999 256"
+   sodipodi:docname="allianceauth (2).svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs126" />
+  <sodipodi:namedview
+     id="namedview124"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="3.8506576"
+     inkscape:cx="30.514269"
+     inkscape:cy="102.57988"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g128" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g128">
+    <g
+       id="g2338"
+       transform="translate(41.953499,36.607802)">
+      <path
+         style="display:inline;fill:#e14852;stroke-width:0.32"
+         d="M 131.07236,159.67687 C 109.26615,147.02458 91.302022,136.55002 91.152067,136.40007 l -0.272649,-0.27265 23.786292,-13.82371 c 13.08247,-7.60304 23.9186,-13.82025 24.08029,-13.81602 l 0.294,0.008 15.93273,36.83413 c 8.763,20.25877 15.891,36.95054 15.84,37.09283 l -0.0927,0.25869 z"
+         id="path2342"
+         sodipodi:nodetypes="cscsccsscc" />
+      <path
+         style="display:inline;fill:#436195;stroke-width:0.32"
+         d="m 1.28,182.46369 c 0,-0.16969 17.354495,-40.46543 38.565546,-89.546103 L 78.411088,3.68 C 79.919052,1.4903841 82.294641,0.02199886 86.08,0.01224344 89.865359,0.00248802 92.288,1.4677954 93.674477,3.5158445 l 21.668143,50.1206965 21.66814,50.120699 -0.26538,0.23285 C 136.59942,104.11816 106.528,121.61441 69.92,142.87065 33.312,164.12688 2.892,181.80046 2.32,182.14527 l -1.04,0.62693 z"
+         id="path2340"
+         sodipodi:nodetypes="ssczcccssscs" />
+    </g>
+  </g>
+</svg>
diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_444444_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_444444_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..56d546beb39061e9a9f21d61e63fde3d5bcd6267
GIT binary patch
literal 7142
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
ICIb)of2uM<od5s;

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_555555_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_555555_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..607e4362a628f1ded7d05ac88176a66ce042d591
GIT binary patch
literal 7126
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
F{{Wt|fMoyx

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_777620_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_777620_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0482f86955307acc964be916150cbd973428c8f
GIT binary patch
literal 4670
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
Ks{39W9sNHQv|la&

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_777777_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_777777_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..96c5d2222f15ea81d924b8a43270b54e6553cc43
GIT binary patch
literal 7163
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

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_cc0000_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_cc0000_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f96135a16f41c9eda7474c9e177c353ac2fe6fe
GIT binary patch
literal 4670
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
Jz1KiR{|}$LN3j3^

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_ffffff_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5cdbf43ca776014783a13a69dd94c830940ddb4
GIT binary patch
literal 6539
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

literal 0
HcmV?d00001

diff --git a/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/jquery-ui.min.css b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/jquery-ui.min.css
new file mode 100644
index 00000000..e70d2ab9
--- /dev/null
+++ b/allianceauth/static/allianceauth/js/jquery-ui/1.13.2/css/jquery-ui.min.css
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.13.2 - 2023-02-03
+* http://jqueryui.com
+* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;-ms-filter:"alpha(opacity=0)"}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,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");height:100%;-ms-filter:"alpha(opacity=25)";opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:pointer;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}
\ No newline at end of file
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index adfd6e58..57c59aad 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -1,82 +1,96 @@
 {% load i18n %}
 {% load humanize %}
-
-<div class="col-sm-12">
-    <div class="row vertical-flexbox-row2">
-        <div class="col-sm-6">
-            <div class="panel panel-primary" style="height:100%;position:relative;">
-                <div class="panel-heading text-center"><h3 class="panel-title">{% translate "Alliance Auth Notifications" %}</h3></div>
-                <div class="panel-body">
-                    <ul class="list-group">
-                        {% for notif in notifications %}
-                        <li class="list-group-item">
-                            {% if notif.state == 'opened' %}
-                                <span class="label label-success">{% translate "Open" %}</span>
-                            {% else %}
-                                <span class="label label-danger">{% translate "Closed" %}</span>
-                            {% endif %}
-                            <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
-                        </li>
-                        {% endfor %}
-                    </ul>
-                </div>
-
-                <div class="text-right" style="position: absolute; bottom: 5px; right: 5px;">
-                    <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" style="margin-right: 0.5rem;">
-                        <span class="label" style="background-color: #e65328;">
-                            <i class="fab fa-gitlab" aria-hidden="true"></i>
-                            {% translate 'Powered by GitLab' %}
-                        </span>
-                    </a>
-
-                    <a href="https://discord.com/invite/fjnHAmk" target="_blank">
-                        <span class="label" style="background-color: rgb(110,133,211);">
-                            <i class="fab fa-discord" aria-hidden="true"></i>
-                            {% translate 'Support Discord' %}
-                        </span>
-                    </a>
+{% if notifications %}
+<div class="col-12 align-self-stretch p-2">
+    <div class="card">
+        <div class="card-body">
+            <div class="d-flex align-items-center">
+                <div class="w-100 align-self-stretch">
+                    <h4 class="ms-auto me-auto">
+                        {% translate "Alliance Auth Notifications" %}
+                    </h4>
+                    <div class="card-body">
+                        <ul class="list-group">
+                            {% for notif in notifications %}
+                            <li class="list-group-item">
+                                {% if notif.state == 'opened' %}
+                                    <span class="badge badge-success">{% translate "Open" %}</span>
+                                {% else %}
+                                    <span class="badge badge-danger">{% translate "Closed" %}</span>
+                                {% endif %}
+                                <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
+                            </li>
+                            {% empty %}
+                            <div class="alert alert-primary" role="alert">
+                                {% translate "No notifications at this time" %}
+                            </div>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                    <div class="text-end" style="position: absolute; bottom: 5px; right: 5px;">
+                        <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" style="margin-right: 0.5rem;">
+                            <span class="badge" style="background-color: #e65328;">
+                                <i class="fab fa-gitlab" aria-hidden="true"></i>
+                                {% translate 'Powered by GitLab' %}
+                            </span>
+                        </a>
+                        <a href="https://discord.com/invite/fjnHAmk" target="_blank">
+                            <span class="badge" style="background-color: rgb(110,133,211);">
+                                <i class="fab fa-discord" aria-hidden="true"></i>
+                                {% translate 'Support Discord' %}
+                            </span>
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="col-sm-6">
-            <div class="panel panel-primary" style="height:50%;">
-                <div class="panel-heading text-center"><h3 class="panel-title">{% translate "Software Version" %}</h3></div>
-                <div class="panel-body flex-center-horizontal">
-                    <ul class="list-group list-group-horizontal" style="margin-bottom: 0;">
-                        <li class="list-group-item">
+    </div>
+</div>
+{% endif %}
+<div class="col-12 align-self-stretch p-2">
+    <div class="card">
+        <div class="card-body d-flex flex-row flex-wrap">
+            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
+                <h4 class="ms-auto me-auto text-center">
+                    {% translate "Software Version" %}
+                </h4>
+                <div class="card-body pb-0">
+                    <ul class="list-group list-group-horizontal w-100" role="group" aria-label="Basic example">
+                        <li type="button" class="list-group-item w-100">
                             <h5 class="list-group-item-heading">{% translate "Current" %}</h5>
                             <p class="list-group-item-text">
                                 {{ current_version }}
                             </p>
                         </li>
-                        <li class="list-group-item list-group-item-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %}">
-                            <h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>
-                            <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/-/tags/v{{ latest_patch_version }}" style="color:#000;">
-                                    <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
-                                    {{ latest_patch_version }}
-                                </a>
-                                {% if not latest_patch %}<br>{% translate "Update available" %}{% endif %}
-                            </p>
+                        <li class="list-group-item list-group-item-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100" href="https://gitlab.com/allianceauth/allianceauth/-/tags/v{{ latest_patch_version }}">
+                                <h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>
+                                <p class="list-group-item-text">
+                                        <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
+                                        {{ latest_patch_version }}
+                                    {% if not latest_patch %}<br>{% translate "Update available" %}{% endif %}
+                                </p>
                         </li>
                         {% if latest_beta %}
-                        <li class="list-group-item list-group-item-info">
-                            <h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>
-                            <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/-/tags/v{{ latest_beta_version }}" style="color:#000;">
+                        <li>
+                            <a type="button" class="btn btn-info w-100" href="https://gitlab.com/allianceauth/allianceauth/-/tags/v{{ latest_beta_version }}">
+                                <h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>
+                                <p class="list-group-item-text">
                                     <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_beta_version }}
-                                </a>
-                                <br>{% translate "Pre-Release available" %}
-                            </p>
+                                    <br>{% translate "Pre-Release available" %}
+                                </p>
+                            </a>
                         </li>
                         {% endif %}
                     </ul>
                 </div>
             </div>
-            <div class="panel panel-primary" style="height:50%;">
-                <div class="panel-heading text-center"><h3 class="panel-title">{% translate "Task Queue" %}</h3></div>
-                <div class="panel-body flex-center-horizontal">
+            <div class="d-xl-none d-lg-show d-md-show d-sm-show m-2"></div>
+            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
+                <h4 class="ms-auto me-auto text-center">
+                    {% translate "Task Queue" %}
+                </h4>
+                <div class="card-body pb-0">
                     <p>
                     {% blocktranslate with total=tasks_total|intcomma latest=earliest_task|timesince|default:"?" %}
                     Status of {{ total }} processed tasks • last {{ latest }}
@@ -99,7 +113,6 @@
             </div>
         </div>
     </div>
-    <div class="clearfix"></div>
 </div>
 
 <script>
diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html
new file mode 100644
index 00000000..086eb6b3
--- /dev/null
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@@ -0,0 +1,123 @@
+{% load static %}
+{% load i18n %}
+{% load navactive %}
+{% load auth_notifications %}
+{% load theme_tags %}
+<!DOCTYPE html>
+<html lang="en" {% theme_html_tags %}>
+    <head>
+        <!-- Required meta tags -->
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <!-- End Required meta tags -->
+
+        <!-- Meta tags -->
+        <!-- TODO Bundle all the site specific stuff up into its own template for easy overide -->
+        <meta name="description" content="">
+        <meta name="author" content="">
+        {% include 'allianceauth/icons.html' %}
+        <!-- Meta tags -->
+        <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
+
+        {% theme_css %}
+
+        {% include 'bundles/fontawesome.html' %}
+        <style>
+            .navbar-toggler.collapsed{
+                transform: rotate(180deg);
+            }
+
+            .nav-padding {
+                padding-top: {% header_padding_size %} !important;
+            }
+
+            .auth-logo {
+                background-position: bottom;
+                background-repeat: no-repeat;
+                background-image: url("{% static 'allianceauth/images/auth-logo.png' %}") ;
+            }
+        </style>
+        {% block extra_css %}{% endblock extra_css %}
+    </head>
+
+    <body class="overflow-none">
+        {% if user.is_authenticated %}
+            <!-- Top Menu, Blocks don't work in "include" tagged views -->
+            <nav class="navbar navbar-expand-lg navbar-dark fixed-top 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="fas fa-solid fa-bars ms-2 me-2"></i>
+                    </a>
+                    <a class="navbar-brand">{% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}</a>
+                    <div class="collapse navbar-collapse" id="navbarexpand">
+                    <div class="m-2"></div>
+                        <ul id="nav-left" class="navbar-nav nav me-auto">
+                            {% block header_nav_collapse_left %}
+                            {% endblock %}
+                        </ul>
+                        <ul id="nav-right" class="navbar-nav">
+                            {% block header_nav_collapse_right %} <!-- Default to add char and swap main -->
+                                {% include 'allianceauth/top-menu-rh-default.html' %}
+                            {% endblock %}
+                            {% include 'menu/menu-notification-block.html' %}
+                        </ul>
+                    </div>
+
+                    <a class="navbar-toggler navbar-brand border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#navbarexpand" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" style="margin-left: auto;">
+                        <i class="fas fa-solid fa-chevron-up"></i>
+                    </a>
+                </div>
+            </nav>
+            <!-- End Top Menu -->
+            <!-- Body -->
+            <main class="row flex-nowrap m-0">
+                {% include 'menu/sortable-side-menu.html' %}
+                <div class="nav-padding col flex-nowrap px-0 m-0 vh-100 overflow-auto">
+                    <div class="p-2">
+                        {% include 'allianceauth/messages-bs5.html' %}
+                        {% block content %}
+                        {% endblock content %}
+                    </div>
+                </div>
+            </main>
+            <!-- End Body -->
+        {% endif %}
+        <script>
+            (function () {
+                // TODO Extend this to the groups in the sidebar too.
+                // TODO Move to own JS file
+                var sidebar = document.getElementById('sidebar')
+
+                sidebar.addEventListener("shown.bs.collapse", function () {
+                    localStorage.removeItem("sidebar_" + sidebar.id);
+                });
+
+                sidebar.addEventListener("hidden.bs.collapse", function () {
+                    localStorage.setItem("sidebar_" + sidebar.id, true);
+                });
+
+                if (localStorage.getItem("sidebar_" + sidebar.id) === "true") {
+                    sidebar.classList.remove("show")
+                }
+                else {
+                    sidebar.classList.add("show")
+                }
+            })();
+        </script>
+        {% include 'bundles/jquery-js.html' %}
+        {% theme_js %}
+        <script type="application/javascript">
+            let notificationUPdateSettings = {
+                notificationsListViewUrl: "{% url 'notifications:list' %}",
+                notificationsRefreshTime: "{% notifications_refresh_time %}",
+                userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}"
+            };
+        </script>
+        {% block extra_javascript %}
+        {% endblock extra_javascript %}
+        <script>
+            {% block extra_script %}
+            {% endblock extra_script %}
+        </script>
+    </body>
+</html>
diff --git a/allianceauth/templates/allianceauth/error.html b/allianceauth/templates/allianceauth/error.html
new file mode 100644
index 00000000..57087193
--- /dev/null
+++ b/allianceauth/templates/allianceauth/error.html
@@ -0,0 +1,27 @@
+{% extends "allianceauth/base-bs5.html" %}
+{% block page_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>
+    <p class="text-center"></p>>{{ error_message }}</p>
+</div>
+{% endblock content %}
diff --git a/allianceauth/templates/allianceauth/messages-bs5.html b/allianceauth/templates/allianceauth/messages-bs5.html
new file mode 100644
index 00000000..d12caed2
--- /dev/null
+++ b/allianceauth/templates/allianceauth/messages-bs5.html
@@ -0,0 +1,26 @@
+{% if messages %}
+    <br>
+    {% for message in messages %}
+        <div class="alert alert-{{ message.level_tag }} alert-dismissible d-flex align-items-center fade show" role="alert">
+
+            <div class="" style="">
+                {% if message.level_tag == "info" %}
+                    <i class="fas fa-info-circle"></i>
+                {% elif message.level_tag == "success" %}
+                    <i class="fas fa-check-circle"></i>
+                {% elif message.level_tag == "warning" %}
+                    <i class="fas fa-exclamation-circle"></i>
+                {% elif "danger" in message.level_tag %}
+                    <i class="fas fa-exclamation-triangle"></i>
+                {% endif %}
+            </div>
+
+            <div class="ms-2" style="">
+                {{ message }}
+            </div>
+
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+
+        </div>
+    {% endfor %}
+{% endif %}
diff --git a/allianceauth/templates/allianceauth/top-menu-rh-default.html b/allianceauth/templates/allianceauth/top-menu-rh-default.html
new file mode 100644
index 00000000..7485635c
--- /dev/null
+++ b/allianceauth/templates/allianceauth/top-menu-rh-default.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+
+<li class="nav-item active">
+    <a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}"><i class="fas fa-plus"></i></span><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="fas fa-random"></i></span><span class="d-lg-none d-md-inline m-2">{% translate 'Change Main' %}</span></a>
+</li>
diff --git a/allianceauth/templates/bundles/auth-base-css.html b/allianceauth/templates/bundles/auth-base-css.html
index 0ee2e7ce..7a846063 100644
--- a/allianceauth/templates/bundles/auth-base-css.html
+++ b/allianceauth/templates/bundles/auth-base-css.html
@@ -1,3 +1,3 @@
 {% load static %}
 
-<link href="{% static 'allianceauth/css/auth-base.css' %}" rel="stylesheet">
+<link href="{% static 'allianceauth/css/auth-base.css' %}" rel="stylesheet"/>
diff --git a/allianceauth/templates/bundles/bootstrap-css.html b/allianceauth/templates/bundles/bootstrap-css.html
index 47b1c380..97a01bce 100644
--- a/allianceauth/templates/bundles/bootstrap-css.html
+++ b/allianceauth/templates/bundles/bootstrap-css.html
@@ -3,17 +3,18 @@
 {% if NIGHT_MODE %}
     {% if debug %}
         <!-- In template debug, loading less file instead of CSS -->
-        <link rel="stylesheet/less" href="{% static 'allianceauth/css/themes/darkly/darkly.less' %}">
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/4.1.2/less.min.js" integrity="sha512-eXBn7AaMbUOWb3PSDhwcjByoM89FeO1SF9Jww6kqPYQkBrGZvqAKFbtqLHh5O95rYA/AOtWZ0QRO2S6rP+KsUw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>    {% else %}
-        <link rel="stylesheet" href="{% static 'allianceauth/css/themes/darkly/darkly.min.css' %}">
+        <link rel="stylesheet/less" href="{% static 'allianceauth/css/themes/darkly/darkly.less' %}"/>
+        <script src='https://cdnjs.cloudflare.com/ajax/libs/less.js/4.1.3/less.min.js' integrity='sha512-6gUGqd/zBCrEKbJqPI7iINc61jlOfH5A+SluY15IkNO1o4qP1DEYjQBewTB4l0U4ihXZdupg8Mb77VxqE+37dg==' crossorigin='anonymous' referrerpolicy="no-referrer"></script>
+    {% else %}
+        <link rel="stylesheet" href="{% static 'allianceauth/css/themes/darkly/darkly.min.css' %}"/>
     {% endif %}
 {% else %}
     {% if debug %}
         <!-- In template debug, loading less file instead of CSS -->
-        <link rel="stylesheet/less" href="{% static 'allianceauth/css/themes/flatly/flatly.less' %}">
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/4.1.2/less.min.js" integrity="sha512-eXBn7AaMbUOWb3PSDhwcjByoM89FeO1SF9Jww6kqPYQkBrGZvqAKFbtqLHh5O95rYA/AOtWZ0QRO2S6rP+KsUw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <link rel="stylesheet/less" href="{% static 'allianceauth/css/themes/flatly/flatly.less' %}"/>
+        <script src='https://cdnjs.cloudflare.com/ajax/libs/less.js/4.1.3/less.min.js' integrity='sha512-6gUGqd/zBCrEKbJqPI7iINc61jlOfH5A+SluY15IkNO1o4qP1DEYjQBewTB4l0U4ihXZdupg8Mb77VxqE+37dg==' crossorigin='anonymous' referrerpolicy="no-referrer"></script>
     {% else %}
-        <link rel="stylesheet" href="{% static 'allianceauth/css/themes/flatly/flatly.min.css' %}">
+        <link rel="stylesheet" href="{% static 'allianceauth/css/themes/flatly/flatly.min.css' %}"/>
     {% endif %}
 {% endif %}
 <!-- End Bootstrap CSS -->
diff --git a/allianceauth/templates/bundles/bootstrap-js.html b/allianceauth/templates/bundles/bootstrap-js.html
index 62993680..009e6712 100644
--- a/allianceauth/templates/bundles/bootstrap-js.html
+++ b/allianceauth/templates/bundles/bootstrap-js.html
@@ -1,4 +1,4 @@
 <!-- Start Bootstrap + jQuery js from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <!-- End Bootstrap + jQuery js from cdnjs -->
diff --git a/allianceauth/templates/bundles/checkbox-css.html b/allianceauth/templates/bundles/checkbox-css.html
index f400d36c..32462811 100644
--- a/allianceauth/templates/bundles/checkbox-css.html
+++ b/allianceauth/templates/bundles/checkbox-css.html
@@ -1,3 +1,3 @@
 {% load static %}
 
-<link href="{% static 'allianceauth/css/checkbox.css' %}" rel="stylesheet">
+<link href="{% static 'allianceauth/css/checkbox.css' %}" rel="stylesheet"/>
diff --git a/allianceauth/templates/bundles/clipboard-js.html b/allianceauth/templates/bundles/clipboard-js.html
index 2827e812..5d2c5fcc 100644
--- a/allianceauth/templates/bundles/clipboard-js.html
+++ b/allianceauth/templates/bundles/clipboard-js.html
@@ -1,3 +1,3 @@
 <!-- Start Clipboard.js js from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.8/clipboard.min.js" integrity="sha512-sIqUEnRn31BgngPmHt2JenzleDDsXwYO+iyvQ46Mw6RL+udAUZj2n/u/PGY80NxRxynO7R9xIGx5LEzw4INWJQ==" crossorigin="anonymous"></script>
+<script src='https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.11/clipboard.min.js' integrity='sha512-7O5pXpc0oCRrxk8RUfDYFgn0nO1t+jLuIOQdOMRp4APB7uZ4vSjspzp5y6YDtDs4VzUSTbWzBFZ/LKJhnyFOKw==' crossorigin='anonymous' referrerpolicy="no-referrer"></script>
 <!-- End Clipboard.js js from cdnjs -->
diff --git a/allianceauth/templates/bundles/datatables-css-bs5.html b/allianceauth/templates/bundles/datatables-css-bs5.html
new file mode 100644
index 00000000..bdab4853
--- /dev/null
+++ b/allianceauth/templates/bundles/datatables-css-bs5.html
@@ -0,0 +1,3 @@
+<!-- Start Datatables-css from cdnjs -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables.net-bs5/1.13.4/dataTables.bootstrap5.min.css" integrity="sha512-zY8EbjNubt5sVVeNIxLQuU6lrDn0zYpaxCtS6mBBaqQREH1ZNQLdUxhHZjPaZhrw1CbEZkNdShEbIInJxzs9dQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<!-- End Datatables-css from cdnjs -->
diff --git a/allianceauth/templates/bundles/datatables-css.html b/allianceauth/templates/bundles/datatables-css.html
index 4acceb86..9367b4fa 100644
--- a/allianceauth/templates/bundles/datatables-css.html
+++ b/allianceauth/templates/bundles/datatables-css.html
@@ -1,3 +1,3 @@
 <!-- Start Datatables-css from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.21/css/dataTables.bootstrap.min.css" integrity="sha512-BMbq2It2D3J17/C7aRklzOODG1IQ3+MHw3ifzBHMBwGO/0yUqYmsStgBjI0z5EYlaDEFnvYV7gNYdD3vFLRKsA==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables.net-bs/1.13.4/dataTables.bootstrap.min.css" integrity="sha512-LNQbjsbyJFucRxb1nbmwGxOlsO3ttrO7sE9mHMsbVCXakH/sUYbvfGveW800lXcbR2GMgpL1dDaY1xBv1jFDZw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 <!-- End Datatables-css from cdnjs -->
diff --git a/allianceauth/templates/bundles/datatables-js-bs5.html b/allianceauth/templates/bundles/datatables-js-bs5.html
new file mode 100644
index 00000000..28b590d4
--- /dev/null
+++ b/allianceauth/templates/bundles/datatables-js-bs5.html
@@ -0,0 +1,4 @@
+<!-- Start Datatables-js from cdnjs -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/datatables.net/1.13.4/jquery.dataTables.min.js" integrity="sha512-8mDDicdS5IeRnHI+un7skH0RJoB2QMMJmORCHizlxul5jgf9tSWJwpE1eSl/2a9xFQYGOwXLr0Lh5SJPnL4IOw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/datatables.net-bs5/1.13.4/dataTables.bootstrap5.min.js" integrity="sha512-KFdmxVdAssPxrj4mZh1c01AbGXMAmXmBsO4Tc/GG5+kNLqitTfUBpDHicyDwF7CaFV+pN1r808IOK+vHzWB8gw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<!-- End Datatables-js from cdnjs -->
diff --git a/allianceauth/templates/bundles/datatables-js.html b/allianceauth/templates/bundles/datatables-js.html
index f7a11806..f6afbf86 100644
--- a/allianceauth/templates/bundles/datatables-js.html
+++ b/allianceauth/templates/bundles/datatables-js.html
@@ -1,4 +1,4 @@
 <!-- Start Datatables-js from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.21/js/jquery.dataTables.min.js" integrity="sha512-BkpSL20WETFylMrcirBahHfSnY++H2O1W+UnEEO4yNIl+jI2+zowyoGJpbtk6bx97fBXf++WJHSSK2MV4ghPcg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.21/js/dataTables.bootstrap.min.js" integrity="sha512-F0E+jKGaUC90odiinxkfeS3zm9uUT1/lpusNtgXboaMdA3QFMUez0pBmAeXGXtGxoGZg3bLmrkSkbK1quua4/Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/datatables.net/1.13.4/jquery.dataTables.min.js" integrity="sha512-8mDDicdS5IeRnHI+un7skH0RJoB2QMMJmORCHizlxul5jgf9tSWJwpE1eSl/2a9xFQYGOwXLr0Lh5SJPnL4IOw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/datatables.net-bs/1.13.4/dataTables.bootstrap.min.js" integrity="sha512-D14TIq/nBnZ4mTY+R1t/K0Mm49GvUZ6hgqmOMq0s3zbD2DlBqa8VOFNETlrk2gZcYHA6xhkIesrqmxE2eTNltw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <!-- End Datatables-js from cdnjs -->
diff --git a/allianceauth/templates/bundles/fontawesome.html b/allianceauth/templates/bundles/fontawesome.html
index bd4b17e8..8b07bf57 100644
--- a/allianceauth/templates/bundles/fontawesome.html
+++ b/allianceauth/templates/bundles/fontawesome.html
@@ -1,3 +1,3 @@
 <!-- Start FontAwesome CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" integrity="sha512-iecdLmaskl7CVkqkXNQ/ZH/XLlvWZOJyj7Yy7tcenmpD1ypASozpmT/E0iPtmFIB46ZmdtAc9eNBvH0H/ZpiBw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 <!-- End FontAwesome CSS from cdnjs -->
diff --git a/allianceauth/templates/bundles/jquery-datetimepicker-css.html b/allianceauth/templates/bundles/jquery-datetimepicker-css.html
index 57ad87a0..c232b306 100644
--- a/allianceauth/templates/bundles/jquery-datetimepicker-css.html
+++ b/allianceauth/templates/bundles/jquery-datetimepicker-css.html
@@ -1,3 +1,3 @@
 <!-- Start jQuery-DateTimePicker CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.min.css" integrity="sha512-f0tzWhCwVFS3WeYaofoLWkTP62ObhewQ1EZn65oSYDZUg1+CyywGKkWzm8BxaJj5HGKI72PnMH9jYyIFz+GH7g==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.min.css" integrity="sha512-f0tzWhCwVFS3WeYaofoLWkTP62ObhewQ1EZn65oSYDZUg1+CyywGKkWzm8BxaJj5HGKI72PnMH9jYyIFz+GH7g==" crossorigin="anonymous" referrerpolicy="no-referrer"/>
 <!-- End jQuery-DateTimePicker CSS from cdnjs -->
diff --git a/allianceauth/templates/bundles/jquery-js.html b/allianceauth/templates/bundles/jquery-js.html
new file mode 100644
index 00000000..75979ad8
--- /dev/null
+++ b/allianceauth/templates/bundles/jquery-js.html
@@ -0,0 +1,3 @@
+<!-- Start jQuery js from cdnjs -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<!-- End jQuery js from cdnjs -->
diff --git a/allianceauth/templates/bundles/jquery-ui-css.html b/allianceauth/templates/bundles/jquery-ui-css.html
index f4c4b423..4293e4b6 100644
--- a/allianceauth/templates/bundles/jquery-ui-css.html
+++ b/allianceauth/templates/bundles/jquery-ui-css.html
@@ -1,5 +1,5 @@
 {% load static %}
 <!-- Start jQuery UI CSS from Alliance Auth -->
 <!-- CDNs all contain theme.css, which is not supposed to be in the base CSS, Which is why this is uniquely bundled in not using a CDN -->
-<link rel="stylesheet" href="{% static 'allianceauth/js/jquery-ui/1.12.1/css/jquery-ui.min.css' %}" integrity="sha512-7smZe1765O+Mm1UZH46SzaFClbRX7dEs01lB9lqU91oocmugWWfQXVQNVr5tEwktYSqwJMErEfr4GvflXMgTPA==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<link rel="stylesheet" href="{% static 'allianceauth/js/jquery-ui/1.13.2/css/jquery-ui.min.css' %}" integrity="VEqAhOZvZrx/WaxlpMoLvZDSLeLNYhkL5LU2R4/ihPJb/+qkGoMrA15SqEGtI+PCLgKwCDiby7tgdvdiAZkJGg==" crossorigin="anonymous" referrerpolicy="no-referrer"/>
 <!-- End jQuery UI CSS from aa-gdpr -->
diff --git a/allianceauth/templates/bundles/jquery-ui-js.html b/allianceauth/templates/bundles/jquery-ui-js.html
index 03b89f95..e9e91eae 100644
--- a/allianceauth/templates/bundles/jquery-ui-js.html
+++ b/allianceauth/templates/bundles/jquery-ui-js.html
@@ -1,3 +1,3 @@
 <!-- Start jQuery UI JS from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha512-uto9mlQzrs59VwILcLiRYeLKPPbS/bT71da/OEBYEwcdNUk8jYIy+D176RYoop1Da+f9mvkYrmj5MCLZWEtQuA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js" integrity="sha512-57oZ/vW8ANMjR/KQ6Be9v/+/h6bq9/l3f0Oc7vn6qMqyhvPd1cvKBRWWpzu0QoneImqr2SkmO4MSqU+RpHom3Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <!-- End jQuery UI JS from cdnjs -->
diff --git a/allianceauth/templates/bundles/moment-js.html b/allianceauth/templates/bundles/moment-js.html
index 94dcfbe6..3cfabb28 100644
--- a/allianceauth/templates/bundles/moment-js.html
+++ b/allianceauth/templates/bundles/moment-js.html
@@ -1,7 +1,7 @@
 <!-- Start Moment.js from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js" integrity="sha512-qTXRIMyZIFb8iQcfjXWCO8+M5Tbc38Qi5WzdPOYZHIlZpzBHG3L3by84BBBOiRGiEb7KKtAOAs5qYdUiZiQNNQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment.min.js" integrity="sha512-CryKbMe7sjSCDPl18jtJI5DR5jtkUWxPXWaLCst6QjH8wxDexfRJic2WRmRXmstr2Y8SxDDWuBO6CQC6IE4KTA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 {% if locale and LANGUAGE_CODE != 'en' %}
     <!-- Moment.JS Not EN-en  -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/locale/{{ LANGUAGE_CODE }}.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/locale/{{ LANGUAGE_CODE }}.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 {% endif %}
 <!-- End Moment JS from cdnjs -->
diff --git a/allianceauth/templates/bundles/x-editable.css.html b/allianceauth/templates/bundles/x-editable.css.html
index c3cf4021..a21a7f0c 100644
--- a/allianceauth/templates/bundles/x-editable.css.html
+++ b/allianceauth/templates/bundles/x-editable.css.html
@@ -1,3 +1,3 @@
 <!-- Start X-editable CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.1/bootstrap3-editable/css/bootstrap-editable.css" integrity="sha512-e0rbO6UJET0zDdXOHjwc6D44UpeKumn7cU7XR/fa4S0/Jso0bZqcCqlIF6mtvcimMbf846mkv8aSWFnTwABr/g==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.1/bootstrap3-editable/css/bootstrap-editable.css" integrity="sha512-e0rbO6UJET0zDdXOHjwc6D44UpeKumn7cU7XR/fa4S0/Jso0bZqcCqlIF6mtvcimMbf846mkv8aSWFnTwABr/g==" crossorigin="anonymous" referrerpolicy="no-referrer"/>
 <!-- End X-editable CSS from cdnjs -->
diff --git a/allianceauth/theme/__init__.py b/allianceauth/theme/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/apps.py b/allianceauth/theme/apps.py
new file mode 100644
index 00000000..e613c1e6
--- /dev/null
+++ b/allianceauth/theme/apps.py
@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+
+
+class ThemeConfig(AppConfig):
+    name = "allianceauth.theme"
+    label = "theme"
+
+    def ready(self):
+        pass
diff --git a/allianceauth/theme/bootstrap/__init__.py b/allianceauth/theme/bootstrap/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/bootstrap/apps.py b/allianceauth/theme/bootstrap/apps.py
new file mode 100644
index 00000000..c25bcb78
--- /dev/null
+++ b/allianceauth/theme/bootstrap/apps.py
@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class BootstrapThemeConfig(AppConfig):
+    name = "allianceauth.theme.bootstrap"
+    label = "bootstrap"
+    version = "5.3.0"
+    verbose_name = f"Bootstrap v{version}"
+
+    def ready(self):
+        pass
diff --git a/allianceauth/theme/bootstrap/auth_hooks.py b/allianceauth/theme/bootstrap/auth_hooks.py
new file mode 100644
index 00000000..e43f029d
--- /dev/null
+++ b/allianceauth/theme/bootstrap/auth_hooks.py
@@ -0,0 +1,33 @@
+from allianceauth import hooks
+from allianceauth.theme.hooks import ThemeHook
+
+
+class BootstrapThemeHook(ThemeHook):
+    """
+    Bootstrap in all its glory!
+    https://getbootstrap.com/
+    """
+
+    def __init__(self):
+        ThemeHook.__init__(
+            self,
+            "Bootstrap",
+            "Powerful, extensible, and feature-packed frontend toolkit.",
+            css=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css",
+                "integrity": "sha512-t4GWSVZO1eC8BM339Xd7Uphw5s17a86tIZIj8qRxhnKub6WoyhnrxeCIMeAqBPgdZGlCcG2PrZjMc+Wr78+5Xg=="
+            }],
+            js=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js",
+                "integrity": "sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
+            }, {
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js",
+                "integrity": "sha512-3dZ9wIrMMij8rOH7X3kLfXAzwtcHpuYpEgQg1OA4QAob1e81H8ntUQmQm3pBudqIoySO5j0tHN4ENzA6+n2r4w=="
+            }],
+            header_padding="3.5em"
+        )
+
+
+@hooks.register('theme_hook')
+def register_darkly_hook():
+    return BootstrapThemeHook()
diff --git a/allianceauth/theme/bootstrap_dark/__init__.py b/allianceauth/theme/bootstrap_dark/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/bootstrap_dark/apps.py b/allianceauth/theme/bootstrap_dark/apps.py
new file mode 100644
index 00000000..f0055e03
--- /dev/null
+++ b/allianceauth/theme/bootstrap_dark/apps.py
@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class BootstrapDarkThemeConfig(AppConfig):
+    name = "allianceauth.theme.bootstrap_dark"
+    label = "bootstrap_dark"
+    version = "5.3.0"
+    verbose_name = f"Bootstrap Dark v{version}"
+
+    def ready(self):
+        pass
diff --git a/allianceauth/theme/bootstrap_dark/auth_hooks.py b/allianceauth/theme/bootstrap_dark/auth_hooks.py
new file mode 100644
index 00000000..e0a8f292
--- /dev/null
+++ b/allianceauth/theme/bootstrap_dark/auth_hooks.py
@@ -0,0 +1,34 @@
+from allianceauth import hooks
+from allianceauth.theme.hooks import ThemeHook
+
+
+class BootstrapDarkThemeHook(ThemeHook):
+    """
+    Bootstrap in all its glory!
+    https://getbootstrap.com/
+    """
+
+    def __init__(self):
+        ThemeHook.__init__(
+            self,
+            "Bootstrap Dark",
+            "Powerful, extensible, and feature-packed frontend toolkit.",
+            css=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css",
+                "integrity": "sha512-t4GWSVZO1eC8BM339Xd7Uphw5s17a86tIZIj8qRxhnKub6WoyhnrxeCIMeAqBPgdZGlCcG2PrZjMc+Wr78+5Xg=="
+            }],
+            js=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js",
+                "integrity": "sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
+            }, {
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js",
+                "integrity": "sha512-3dZ9wIrMMij8rOH7X3kLfXAzwtcHpuYpEgQg1OA4QAob1e81H8ntUQmQm3pBudqIoySO5j0tHN4ENzA6+n2r4w=="
+            }],
+            html_tags="data-bs-theme=dark",
+            header_padding="3.5em"
+        )
+
+
+@hooks.register('theme_hook')
+def register_bootstrap_dark_hook():
+    return BootstrapDarkThemeHook()
diff --git a/allianceauth/theme/darkly/__init__.py b/allianceauth/theme/darkly/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/darkly/apps.py b/allianceauth/theme/darkly/apps.py
new file mode 100644
index 00000000..59b2e652
--- /dev/null
+++ b/allianceauth/theme/darkly/apps.py
@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class DarklyThemeConfig(AppConfig):
+    name = "allianceauth.theme.darkly"
+    label = "darkly"
+    version = "5.3.0"
+    verbose_name = f"Bootswatch Darkly v{version}"
+
+    def ready(self):
+        pass
diff --git a/allianceauth/theme/darkly/auth_hooks.py b/allianceauth/theme/darkly/auth_hooks.py
new file mode 100644
index 00000000..4d4c46eb
--- /dev/null
+++ b/allianceauth/theme/darkly/auth_hooks.py
@@ -0,0 +1,33 @@
+from allianceauth import hooks
+from allianceauth.theme.hooks import ThemeHook
+
+
+class DarklyThemeHook(ThemeHook):
+    """
+    The default auth theme
+    https://bootswatch.com/darkly/
+    """
+
+    def __init__(self):
+        ThemeHook.__init__(
+            self,
+            "Darkly",
+            "Flatly in night mode!",
+            css=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.0/darkly/bootstrap.min.css",
+                "integrity": "sha512-3xynESL0QF3ERUl9se1VJk043nWT+UzWJveifBw7kLtC226vyGINZFtmyK015F83KBSNW+67alYSY2cCj1LHOQ=="
+            }],
+            js=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js",
+                "integrity": "sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
+            }, {
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js",
+                "integrity": "sha512-3dZ9wIrMMij8rOH7X3kLfXAzwtcHpuYpEgQg1OA4QAob1e81H8ntUQmQm3pBudqIoySO5j0tHN4ENzA6+n2r4w=="
+            }],
+            header_padding="4.5em"
+        )
+
+
+@hooks.register('theme_hook')
+def register_darkly_hook():
+    return DarklyThemeHook()
diff --git a/allianceauth/theme/flatly/__init__.py b/allianceauth/theme/flatly/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/flatly/apps.py b/allianceauth/theme/flatly/apps.py
new file mode 100644
index 00000000..a4f1b5de
--- /dev/null
+++ b/allianceauth/theme/flatly/apps.py
@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class FlatlyThemeConfig(AppConfig):
+    name = "allianceauth.theme.flatly"
+    label = "flatly"
+    version = "5.3.0"
+    verbose_name = f"Bootswatch Flatly v{version}"
+
+    def ready(self):
+        pass
diff --git a/allianceauth/theme/flatly/auth_hooks.py b/allianceauth/theme/flatly/auth_hooks.py
new file mode 100644
index 00000000..c6d4a458
--- /dev/null
+++ b/allianceauth/theme/flatly/auth_hooks.py
@@ -0,0 +1,33 @@
+from allianceauth import hooks
+from allianceauth.theme.hooks import ThemeHook
+
+
+class FlatlyThemeHook(ThemeHook):
+    """
+    auth light theme
+    https://bootswatch.com/flatly/
+    """
+
+    def __init__(self):
+        ThemeHook.__init__(
+            self,
+            "Flatly",
+            "Flat and modern!",
+            css=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.0/flatly/bootstrap.min.css",
+                "integrity": "sha512-N/JRw8RFoUkWgQIpunoKtmZShzrHbs724xV4DMh+LSNjebmrgNy2dzAIUhoOqSazEZ/bLlulWy2muCxletfrsA=="
+            }],
+            js=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js",
+                "integrity": "sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
+            }, {
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js",
+                "integrity": "sha512-3dZ9wIrMMij8rOH7X3kLfXAzwtcHpuYpEgQg1OA4QAob1e81H8ntUQmQm3pBudqIoySO5j0tHN4ENzA6+n2r4w=="
+            }],
+            header_padding="4.5em"
+        )
+
+
+@hooks.register('theme_hook')
+def register_flatly_hook():
+    return FlatlyThemeHook()
diff --git a/allianceauth/theme/hooks.py b/allianceauth/theme/hooks.py
new file mode 100644
index 00000000..7a618676
--- /dev/null
+++ b/allianceauth/theme/hooks.py
@@ -0,0 +1,47 @@
+from typing import List, Optional
+
+
+class ThemeHook:
+    """
+        Theme hook for injecting a Bootstrap 5 Theme and associated JS into alliance auth.
+        these can be local or CDN delivered
+    """
+
+    def __init__(self,
+                name: str,
+                description: str,
+                css: List[dict],
+                js: List[dict],
+                css_template: Optional[str] = None,
+                js_template: Optional[str] = None,
+                html_tags: Optional[str] = "",
+                header_padding: Optional[str] = "4em"):
+        """
+        :param name: Theme python name
+        :type name: str
+        :param description: Theme verbose name
+        :type description: str
+        :param css: CSS paths to load
+        :type css: List[dict]
+        :param js: JS paths to load
+        :type js: List[dict]
+        :param css_template: _description_, defaults to None
+        :type css_template: Optional[str], optional
+        :param js_template: _description_, defaults to None
+        :type js_template: Optional[str], optional
+        """
+        self.name = name
+        self.description = description
+
+        # Direct from CDN
+        self.css = css
+        self.js = js
+
+        # Load a django template with static file definitions
+        self.css_template = css_template
+        self.js_template = js_template
+
+        self.html_tags = html_tags
+        self.header_padding = header_padding
+    def get_name(self):
+        return f"{self.__class__.__module__}.{self.__class__.__name__}"
diff --git a/allianceauth/theme/materia/__init__.py b/allianceauth/theme/materia/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/materia/apps.py b/allianceauth/theme/materia/apps.py
new file mode 100644
index 00000000..7181c2a4
--- /dev/null
+++ b/allianceauth/theme/materia/apps.py
@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class MateriaThemeConfig(AppConfig):
+    name = "allianceauth.theme.materia"
+    label = "materia"
+    version = "5.3.0"
+    verbose_name = f"Bootswatch Materia v{version}"
+
+    def ready(self):
+        pass
diff --git a/allianceauth/theme/materia/auth_hooks.py b/allianceauth/theme/materia/auth_hooks.py
new file mode 100644
index 00000000..d0cc73ae
--- /dev/null
+++ b/allianceauth/theme/materia/auth_hooks.py
@@ -0,0 +1,33 @@
+from allianceauth import hooks
+from allianceauth.theme.hooks import ThemeHook
+
+
+class MateriaThemeHook(ThemeHook):
+    """
+    Materia theme
+    https://bootswatch.com/materia/
+    """
+
+    def __init__(self):
+        ThemeHook.__init__(
+            self,
+            "Materia",
+            "Material is the metaphor",
+            css=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.0/materia/bootstrap.min.css",
+                "integrity": "sha512-FukZyva60KXjmN0uleimuMCoAUwuRha1fSCdzWtxZ29YBIev3gGBU0FpTIEfmGZ9YSrmgW4Pv5geC/q11RuATg=="
+            }],
+            js=[{
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js",
+                "integrity": "sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
+            }, {
+                "url": "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js",
+                "integrity": "sha512-3dZ9wIrMMij8rOH7X3kLfXAzwtcHpuYpEgQg1OA4QAob1e81H8ntUQmQm3pBudqIoySO5j0tHN4ENzA6+n2r4w=="
+            }],
+            header_padding="5.25em"
+        )
+
+
+@hooks.register('theme_hook')
+def register_materia_hook():
+    return MateriaThemeHook()
diff --git a/allianceauth/theme/templates/__init__.py b/allianceauth/theme/templates/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/templates/theme/__init__.py b/allianceauth/theme/templates/theme/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/templates/theme/theme_imports_css.html b/allianceauth/theme/templates/theme/theme_imports_css.html
new file mode 100644
index 00000000..a0691971
--- /dev/null
+++ b/allianceauth/theme/templates/theme/theme_imports_css.html
@@ -0,0 +1,10 @@
+{% load static %}
+<!-- allianceauth.theme.{{ theme.name }} CSS -->
+{% if theme.css_template %}
+    {% include theme.css_template %}
+{% else %}
+    {% for x in theme.css %}
+        <link rel="stylesheet" href="{{ x.url }}" integrity="{{ x.integrity }}" crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    {% endfor %}
+{% endif %}
+<!-- allianceauth.theme.{{ theme.name }} CSS Ends -->
diff --git a/allianceauth/theme/templates/theme/theme_imports_js.html b/allianceauth/theme/templates/theme/theme_imports_js.html
new file mode 100644
index 00000000..f362ddf0
--- /dev/null
+++ b/allianceauth/theme/templates/theme/theme_imports_js.html
@@ -0,0 +1,10 @@
+{% load static %}
+<!-- allianceauth.theme.{{ theme.name }} JS -->
+{% if theme.js_template %}
+    {% include theme.css_template %}
+{% else %}
+    {% for x in theme.js %}
+        <script src="{{ x.url }}" integrity="{{ x.integrity }}" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    {% endfor %}
+{% endif %}
+<!-- allianceauth.theme.{{ theme.name }} JS Ends-->
diff --git a/allianceauth/theme/templates/theme/theme_select.html b/allianceauth/theme/templates/theme/theme_select.html
new file mode 100644
index 00000000..96fea987
--- /dev/null
+++ b/allianceauth/theme/templates/theme/theme_select.html
@@ -0,0 +1,9 @@
+<form action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
+    {% csrf_token %}
+    <select name="theme" value="theme" class="form-select" aria-label="" onchange="this.form.submit()">
+        <option selected>Select Theme</option>
+        {% for theme in themes %}
+            <option value="{{ theme.get_name }}">{{ theme.name }}</option>
+        {% endfor %}
+    </select>
+</form>
diff --git a/allianceauth/theme/templatetags/__init__.py b/allianceauth/theme/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/allianceauth/theme/templatetags/theme_tags.py b/allianceauth/theme/templatetags/theme_tags.py
new file mode 100644
index 00000000..aff18233
--- /dev/null
+++ b/allianceauth/theme/templatetags/theme_tags.py
@@ -0,0 +1,73 @@
+from django import template
+from django.conf import settings
+
+from allianceauth.hooks import get_hooks
+
+register = template.Library()
+
+
+def hook_to_name(th):
+    return f"{th.__class__.__module__}.{th.__class__.__name__}"
+
+
+def get_theme_from_hooks(theme, hooks):
+    for h in hooks:
+        _h = h()
+        _hn = hook_to_name(_h)
+        if _hn == theme:
+            return _h
+
+
+def get_theme(request):
+    theme = settings.DEFAULT_THEME
+    hooks = get_hooks('theme_hook')
+    if request.user:
+        theme = request.user.profile.theme or theme
+
+    theme_hook = get_theme_from_hooks(theme, hooks)
+
+    if not theme_hook:
+        theme_hook = get_theme_from_hooks(settings.DEFAULT_THEME, hooks)
+
+    return theme_hook
+
+
+def get_theme_context(request):
+    return {
+        'theme': get_theme(request)
+    }
+
+
+@register.inclusion_tag('theme/theme_imports_css.html', takes_context=True)
+def theme_css(context):
+    request = context['request']
+    return get_theme_context(request)
+
+
+@register.simple_tag(takes_context=True)
+def theme_html_tags(context):
+    request = context['request']
+    theme = get_theme(request)
+    return getattr(theme, "html_tags", "")
+
+
+@register.simple_tag(takes_context=True)
+def header_padding_size(context):
+    request = context['request']
+    theme = get_theme(request)
+    return getattr(theme, "header_padding")
+
+
+@register.inclusion_tag('theme/theme_imports_js.html', takes_context=True)
+def theme_js(context):
+    request = context['request']
+    return get_theme_context(request)
+
+
+@register.inclusion_tag('theme/theme_select.html', takes_context=True)
+def theme_select(context):
+    request = context['request']
+    return {
+        'next': request.path,
+        'themes': get_hooks('theme_hook')
+    }
diff --git a/allianceauth/timerboard/auth_hooks.py b/allianceauth/timerboard/auth_hooks.py
index d542d58d..496445d8 100644
--- a/allianceauth/timerboard/auth_hooks.py
+++ b/allianceauth/timerboard/auth_hooks.py
@@ -1,6 +1,8 @@
-from allianceauth.services.hooks import MenuItemHook, UrlHook
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook
 
 from allianceauth import hooks
+from allianceauth.timerboard.views import dashboard_timers
 from . import urls
 
 
@@ -27,3 +29,17 @@ def register_menu():
 @hooks.register('url_hook')
 def register_url():
     return UrlHook(urls, 'timerboard', r'^timers/')
+
+
+class NextTimersHook(hooks.DashboardItemHook):
+    def __init__(self):  #TODO add the view permms so if they cant see it is not rendered
+        hooks.DashboardItemHook.__init__(
+            self,
+            dashboard_timers,
+            7
+        )
+
+
+@hooks.register('dashboard_hook')
+def register_groups_hook():
+    return NextTimersHook()
diff --git a/allianceauth/timerboard/templates/timerboard/dashboard.timers.html b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
new file mode 100644
index 00000000..ed1cb4e7
--- /dev/null
+++ b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
@@ -0,0 +1,58 @@
+{% load i18n %}
+{% load evelinks %}
+
+<div class="col-12 col-l-6 align-self-stretch p-2">
+    <div class="card h-100">
+        <div class="card-body">
+            <h4 class="card-title text-center">{% translate "Upcoming Timers" %}</h4>
+            <div class="card-body">
+                <div style="height: 300px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
+                    <table class="table" style="--bs-table-bg: transparent;">
+                        <thead>
+                            <th class="text-center">{% translate "Details" %}</th>
+                            <th class="text-center">{% translate "Timer" %}</th>
+                            <th class="text-center">{% translate "Type" %}</th>
+                            <th class="text-center">{% translate "System" %}</th>
+                            <th class="text-center">{% translate "Eve Time" %}</th>
+                        </thead>
+                        <tbody>
+                        {% for timer in timers %}
+                        <tr>
+                            <td style="" class="text-center">
+                                {{ timer.details }}
+                            </td>
+                            <td style="" class="text-center">
+                                {{ timer.get_timer_type_display }}
+                            </td>
+                            <td class="text-center" nowrap>
+                                {% if timer.objective == "Hostile" %}
+                                    <div class="badge badge-danger">
+                                        {% translate "Hostile" %}
+                                    </div>
+                                {% endif %}
+                                {% if timer.objective == "Friendly" %}
+                                    <div class="badge badge-primary">
+                                        {% translate "Friendly" %}
+                                    </div>
+                                {% endif %}
+                                {% if timer.objective == "Neutral" %}
+                                    <div class="badge badge-default">
+                                        {% translate "Neutral" %}
+                                    </div>
+                                {% endif %}
+                            </td>
+                            <td class="text-center"><a href="{{ timer.system|dotlan_solar_system_url }}">
+                                {{ timer.system }} {{ timer.planet_moon }}
+                                </a>
+                            </td>
+                            <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
+
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/allianceauth/timerboard/templates/timerboard/form.html b/allianceauth/timerboard/templates/timerboard/form.html
index 35faab0b..2221294b 100644
--- a/allianceauth/timerboard/templates/timerboard/form.html
+++ b/allianceauth/timerboard/templates/timerboard/form.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load bootstrap %}
 {% load i18n %}
 
@@ -9,8 +9,8 @@
     <div class="col-lg-12">
         <h1 class="page-header text-center">
             {% block page_header %}
-            {% endblock %}
-            {% include 'timerboard/index_button.html' %}
+            {% endblock page_header %}
+            {% include "timerboard/index_button.html" %}
         </h1>
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -21,7 +21,7 @@
                         <br>
                         <button class="btn btn-lg btn-primary btn-block" type="submit">
                             {% block submit_button_text %}
-                            {% endblock %}
+                            {% endblock submit_button_text %}
                         </button>
                     </form>
                 </div>
diff --git a/allianceauth/timerboard/templates/timerboard/index_button.html b/allianceauth/timerboard/templates/timerboard/index_button.html
index 6b055f4c..6f7a5c3e 100644
--- a/allianceauth/timerboard/templates/timerboard/index_button.html
+++ b/allianceauth/timerboard/templates/timerboard/index_button.html
@@ -1,4 +1,4 @@
 {% load i18n %}
-<div class="text-right">
+<div class="text-end">
     <a href="{% url 'timerboard:view' %}" class="btn btn-default">{% translate "Back" %}</a>
 </div>
diff --git a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
index 5b791f02..5491054e 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
@@ -1,15 +1,15 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
 {% block page_title %}
-    Delete Timer
+    {% translate "Delete Timer" %}
 {% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">
             {% translate "Delete Timer" %}
-            {% include 'timerboard/index_button.html' %}
+            {% include "timerboard/index_button.html" %}
         </h1>
         <div class="container-fluid">
             <div class="col-md-2 col-md-offset-5">
diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html
index 3ec1bd4d..822c7806 100644
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@@ -1,4 +1,4 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 {% load evelinks %}
@@ -9,7 +9,7 @@
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% translate "Structure Timers" %}
-            <div class="text-right">
+            <div class="text-end">
                 {% if perms.auth.timer_management %}
                     <a href="{% url 'timerboard:add' %}" class="btn btn-success">
                         {% translate "Create Structure Timer" %}
@@ -18,10 +18,10 @@
             </div>
         </h1>
         <div class="col-lg-12 text-center">
-            <div class="label label-info text-left">
+            <div class="badge badge-info text-start">
                 <b>{% translate "Current Eve Time:" %} </b>
             </div>
-            <strong class="label label-info text-left" id="current-time"></strong>
+            <strong class="badge badge-info text-start" id="current-time"></strong>
         </div>
         {% if corp_timers %}
             <h4><b>{% translate "Corp Timers" %}</b></h4>
@@ -42,7 +42,7 @@
                     {% for timer in corp_timers %}
                         {% if timer.important == True %}
                             <tr class="danger">
-                                {% else %}
+                        {% else %}
                             <tr class="info">
                         {% endif %}
                     <td style="width:150px" class="text-center">
@@ -53,17 +53,17 @@
                     </td>
                     <td class="text-center">
                         {% if timer.objective == "Hostile" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 {% translate "Hostile" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Friendly" %}
-                            <div class="label label-primary">
+                            <div class="badge badge-primary">
                                 {% translate "Friendly" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Neutral" %}
-                            <div class="label label-default">
+                            <div class="badge badge-default">
                                 {% translate "Neutral" %}
                             </div>
                         {% endif %}
@@ -74,97 +74,97 @@
                     </td>
                     <td class="text-center">
                         {% if timer.structure == "POCO" %}
-                            <div class="label label-info">
+                            <div class="badge badge-info">
                                 POCO
                             </div>
                         {% endif %}
                         {% if timer.structure == "I-HUB" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 I-HUB
                             </div>
                         {% endif %}
                         {% if timer.structure == "TCU" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 TCU
                             </div>
                         {% endif %}
                         {% if timer.structure == "POS[S]" %}
-                            <div class="label label-info">
+                            <div class="badge badge-info">
                                 POS [S]
                             </div>
                         {% endif %}
                         {% if timer.structure == "POS[M]" %}
-                            <div class="label label-info">
+                            <div class="badge badge-info">
                                 POS [M]
                             </div>
                         {% endif %}
                         {% if timer.structure == "POS[L]" %}
-                            <div class="label label-info">
+                            <div class="badge badge-info">
                                 POS [L]
                             </div>
                         {% endif %}
                         {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 Astrahus
                             </div>
                         {% endif %}
                         {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 Fortizar
                             </div>
                         {% endif %}
                         {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 Keepstar
                             </div>
                         {% endif %}
                         {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Raitaru
                             </div>
                         {% endif %}
                         {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Azbel
                             </div>
                         {% endif %}
                         {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Sotiyo
                             </div>
                         {% endif %}
                         {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Athanor
                             </div>
                         {% endif %}
                         {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Tatara
                             </div>
                         {% endif %}
                         {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Cyno Beacon
                             </div>
                         {% endif %}
                         {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Tenebrex Cyno Jammer
                             </div>
                         {% endif %}
                         {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
-                            <div class="label label-warning">
+                            <div class="badge badge-warning">
                                 Ansiblex Jump Gate
                             </div>
                         {% endif %}
                         {% if timer.structure == "Moon Mining Cycle" %}
-                            <div class="label label-success">
+                            <div class="badge badge-success">
                                 Moon Mining Cycle
                             </div>
                         {% endif %}
                         {% if timer.structure == "Other" %}
-                            <div class="label label-default">
+                            <div class="badge badge-default">
                                 Other
                             </div>
                         {% endif %}
@@ -220,17 +220,17 @@
                         </td>
                         <td class="text-center">
                         {% if timer.objective == "Hostile" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 {% translate "Hostile" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Friendly" %}
-                            <div class="label label-primary">
+                            <div class="badge badge-primary">
                                 {% translate "Friendly" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Neutral" %}
-                            <div class="label label-default">
+                            <div class="badge badge-default">
                                 {% translate "Neutral" %}
                             </div>
                         {% endif %}
@@ -242,97 +242,97 @@
                         </td>
                         <td class="text-center">
                             {% if timer.structure == "POCO" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POCO
                                 </div>
                             {% endif %}
                             {% if timer.structure == "I-HUB" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     I-HUB
                                 </div>
                             {% endif %}
                             {% if timer.structure == "TCU" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     TCU
                                 </div>
                             {% endif %}
                             {% if timer.structure == "POS[S]" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POS [S]
                                 </div>
                             {% endif %}
                             {% if timer.structure == "POS[M]" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POS [M]
                                 </div>
                             {% endif %}
                             {% if timer.structure == "POS[L]" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POS [L]
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     Astrahus
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     Fortizar
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     Keepstar
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Raitaru
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Azbel
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Sotiyo
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Athanor
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Tatara
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Pharolux Cyno Beacon
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Tenebrex Cyno Jammer
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Ansiblex Jump Gate
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Moon Mining Cycle" %}
-                                <div class="label label-success">
+                                <div class="badge badge-success">
                                     Moon Mining Cycle
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Other" %}
-                                <div class="label label-default">
+                                <div class="badge badge-default">
                                     Other
                                 </div>
                             {% endif %}
@@ -393,17 +393,17 @@
                         </td>
                         <td class="text-center">
                         {% if timer.objective == "Hostile" %}
-                            <div class="label label-danger">
+                            <div class="badge badge-danger">
                                 {% translate "Hostile" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Friendly" %}
-                            <div class="label label-primary">
+                            <div class="badge badge-primary">
                                 {% translate "Friendly" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Neutral" %}
-                            <div class="label label-default">
+                            <div class="badge badge-default">
                                 {% translate "Neutral" %}
                             </div>
                         {% endif %}
@@ -415,97 +415,97 @@
                         </td>
                         <td class="text-center">
                             {% if timer.structure == "POCO" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POCO
                                 </div>
                             {% endif %}
                             {% if timer.structure == "I-HUB" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     I-HUB
                                 </div>
                             {% endif %}
                             {% if timer.structure == "TCU" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     TCU
                                 </div>
                             {% endif %}
                             {% if timer.structure == "POS[S]" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POS [S]
                                 </div>
                             {% endif %}
                             {% if timer.structure == "POS[M]" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POS [M]
                                 </div>
                             {% endif %}
                             {% if timer.structure == "POS[L]" %}
-                                <div class="label label-info">
+                                <div class="badge badge-info">
                                     POS [L]
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     Astrahus
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     Fortizar
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                                <div class="label label-danger">
+                                <div class="badge badge-danger">
                                     Keepstar
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Raitaru
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Azbel
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Sotiyo
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Athanor
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Tatara
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Pharolux Cyno Beacon
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Tenebrex Cyno Jammer
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
-                                <div class="label label-warning">
+                                <div class="badge badge-warning">
                                     Ansiblex Jump Gate
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Moon Mining Cycle" %}
-                                <div class="label label-success">
+                                <div class="badge badge-success">
                                     Moon Mining Cycle
                                 </div>
                             {% endif %}
                             {% if timer.structure == "Other" %}
-                                <div class="label label-default">
+                                <div class="badge badge-default">
                                     Other
                                 </div>
                             {% endif %}
@@ -537,8 +537,8 @@
         {% endif %}
     </div>
 
-    {% include 'bundles/moment-js.html' with locale=True %}
-    {% include 'bundles/timers-js.html' %}
+    {% include "bundles/moment-js.html" with locale=True %}
+    {% include "bundles/timers-js.html" %}
     <script>
         let timers = [
             {% for timer in timers %}
diff --git a/allianceauth/timerboard/views.py b/allianceauth/timerboard/views.py
index 9da84b1e..91912a9f 100644
--- a/allianceauth/timerboard/views.py
+++ b/allianceauth/timerboard/views.py
@@ -2,12 +2,14 @@ import datetime
 import logging
 
 from django.contrib import messages
+from django.db.models import Q
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render, redirect
 from django.views import View
 from django.urls import reverse_lazy
 from django.views.generic import CreateView, UpdateView, DeleteView
 from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
+from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
@@ -48,7 +50,6 @@ class TimerManagementView(BaseTimerView):
     index_redirect = 'timerboard:view'
     success_url = reverse_lazy(index_redirect)
     model = Timer
-    form_class = TimerForm
 
     def get_timer(self, timer_id):
         return get_object_or_404(self.model, id=timer_id)
@@ -85,3 +86,15 @@ class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
 
 class RemoveTimerView(TimerManagementView, DeleteView):
     pass
+
+
+def dashboard_timers(request):
+    corp = request.user.profile.main_character.corporation
+    timers = Timer.objects.select_related('eve_character').filter((Q(eve_corp__isnull=True) | Q(eve_corp=corp)) ,eve_time__gte=timezone.now())[:5]
+    if timers.count():
+        context = {
+            'timers': timers,
+        }
+        return render_to_string('timerboard/dashboard.timers.html', context=context, request=request)
+    else:
+        return ""
diff --git a/allianceauth/urls.py b/allianceauth/urls.py
index 20189356..71a43b26 100644
--- a/allianceauth/urls.py
+++ b/allianceauth/urls.py
@@ -77,7 +77,10 @@ urlpatterns = [
     path('', decorate_url_patterns(allianceauth.services.urls.urlpatterns, main_character_required)),
 
     # Night mode
-    path('night/', views.NightModeRedirectView.as_view(), name='nightmode')
+    path('night/', views.NightModeRedirectView.as_view(), name='nightmode'),
+
+    # Theme Change
+    path('theme/', views.ThemeRedirectView.as_view(), name='theme')
 ]
 
 url_hooks = get_hooks("url_hook")
diff --git a/allianceauth/views.py b/allianceauth/views.py
index d9dacba2..ae8edfea 100644
--- a/allianceauth/views.py
+++ b/allianceauth/views.py
@@ -1,8 +1,8 @@
 from django.views.generic.base import View
 from django.http import HttpResponseRedirect
-from django.shortcuts import redirect
+from django.shortcuts import render, redirect
 from django.contrib import messages
-
+from django.conf import settings
 import logging
 
 logger = logging.getLogger(__name__)
@@ -32,37 +32,63 @@ class NightModeRedirectView(View):
             return False
 
 
-def Generic500Redirect(request):
-    messages.error(
-        request,
-        "Auth encountered an error processing your request, please try again. "
-        "If the error persists, please contact the administrators. (500 Internal Server Error)",
+class ThemeRedirectView(View):
+
+    def post(self, request, *args, **kwargs):
+        theme = request.POST.get('theme', settings.DEFAULT_THEME)
+        if not request.user.is_anonymous:
+            try:
+                request.user.profile.theme = theme
+                request.user.profile.save()
+            except Exception as e:
+                logger.exception(e)
+
+        return HttpResponseRedirect(request.GET.get("next", "/"))
+
+
+def Generic500Redirect(request):  # TODO Real view
+
+    title = _(
+        "Internal Server Error"
     )
-    return redirect("authentication:dashboard")
+    message = _(
+        "Auth encountered an error processing your request, please try again. "
+        "If the error persists, please contact the administrators."
+    )
+
+    return render(request, "allianceauth/error.html", context={"error_title": title, "error_message": message})
 
 
-def Generic404Redirect(request, exception):
-    messages.error(
-        request,
+def Generic404Redirect(request, exception):  # TODO Real view
+    title = _(
+        "Page Not Found"
+    )
+    message = _(
         "Page does not exist. If you believe this is in error please contact the administrators. "
-        "(404 Page Not Found)",
     )
-    return redirect("authentication:dashboard")
+
+    return render(request, "allianceauth/error.html", context={"error_title": title, "error_message": message})
 
 
-def Generic403Redirect(request, exception):
-    messages.error(
-        request,
+def Generic403Redirect(request, exception):  # TODO Real view
+    title = _(
+        "Permission Denied"
+    )
+    message = _(
         "You do not have permission to access the requested page. "
-        "If you believe this is in error please contact the administrators. (403 Permission Denied)",
+        "If you believe this is in error please contact the administrators."
     )
-    return redirect("authentication:dashboard")
+
+    return render(request, "allianceauth/error.html", context={"error_title": title, "error_message": message})
 
 
-def Generic400Redirect(request, exception):
-    messages.error(
-        request,
+def Generic400Redirect(request, exception):  # TODO Real view
+    title = _(
+        "Bad Request"
+    )
+    message = _(
         "Auth encountered an error processing your request, please try again. "
-        "If the error persists, please contact the administrators. (400 Bad Request)",
+        "If the error persists, please contact the administrators."
     )
-    return redirect("authentication:dashboard")
+
+    return render(request, "allianceauth/error.html", context={"error_title": title, "error_message": message})
diff --git a/docs/customizing/index.md b/docs/customizing/index.md
index 3ff85913..70e9cd44 100644
--- a/docs/customizing/index.md
+++ b/docs/customizing/index.md
@@ -23,7 +23,7 @@ Within your auth project exists two folders named `static` and `templates`. Thes
 
 You can add extra static or templates by putting files in these folders. Note that changes to static requires running the `python manage.py collectstatic` command to copy to the web server directory.
 
-It is possible to overload static and templates shipped with Django or Alliance Auth by including a file with the exact path of the one you wish to overload. For instance if you wish to add extra links to the menu bar by editing the template, you would make a copy of the `allianceauth/templates/allianceauth/base.html` file to `myauth/templates/allianceauth/base.html` and edit it there. Notice the paths are identical after the `templates/` directory - this is critical for it to be recognized. Your custom template would be used instead of the one included with Alliance Auth when Django renders the web page. Similar idea for static: put CSS or images at an identical path after the `static/` directory and they will be copied to the web server directory instead of the ones included.
+It is possible to overload static and templates shipped with Django or Alliance Auth by including a file with the exact path of the one you wish to overload. For instance if you wish to add extra links to the menu bar by editing the template, you would make a copy of the `allianceauth/templates/allianceauth/base-bs5.html` (Bootstrap 5) `allianceauth/templates/allianceauth/base.html` (Legacy BS3) file to `myauth/templates/allianceauth/*.html` and edit it there. Notice the paths are identical after the `templates/` directory - this is critical for it to be recognized. Your custom template would be used instead of the one included with Alliance Auth when Django renders the web page. Similar idea for static: put CSS or images at an identical path after the `static/` directory and they will be copied to the web server directory instead of the ones included.
 
 ## Custom URLs and Views
 
diff --git a/docs/development/aa_core/documentation.md b/docs/development/aa_core/documentation.md
index 0d443213..45d4e821 100644
--- a/docs/development/aa_core/documentation.md
+++ b/docs/development/aa_core/documentation.md
@@ -4,13 +4,13 @@ The documentation for Alliance Auth uses [Sphinx](http://www.sphinx-doc.org/) to
 to specific branches is made (master, primarily), the repository is automatically pulled, docs built and deployed on
 [readthedocs.org](https://readthedocs.org/).
 
-
 Documentation was migrated from the GitHub wiki pages and into the repository to allow documentation changes to be
 included with pull requests. This means that documentation can be guaranteed to be updated when a pull request is
 accepted rather than hoping documentation is updated afterwards or relying on maintainers to do the work. It also
 allows for documentation to be maintained at different versions more easily.
 
 ## Building Documentation
+
 If you're developing new documentation, its likely you'll want or need to test build it before committing to your
 branch. To achieve this you can use Sphinx to build the documentation locally as it appears on Read the Docs.
 
@@ -24,7 +24,6 @@ build in the `/docs/_build/` directory.
 Occasionally you may need to fully rebuild the documents by running `make clean` first, usually when you add or
 rearrange toctrees.
 
-
 ## Documentation Format
 
 CommonMark Markdown is the current preferred format, via [recommonmark](https://github.com/rtfd/recommonmark).
diff --git a/docs/development/custom/custom-themes.md b/docs/development/custom/custom-themes.md
new file mode 100644
index 00000000..538c235f
--- /dev/null
+++ b/docs/development/custom/custom-themes.md
@@ -0,0 +1,19 @@
+# Theme Hooks
+
+The theme hook allows custom themes to be loaded dynamically by AAs CSS/JS Bundles, as selected by Users.
+
+To register a ThemeHook class you would do the following:
+
+```Python
+@hooks.register('theme_hook')
+def register_darkly_hook():
+    return ThemeHook()
+```
+
+The `ThemeHook` class specifies some parameters/instance variables required.
+
+```eval_rst
+.. autoclass:: allianceauth.theme.hooks.ThemeHook
+    :members: __init__
+    :undoc-members:
+```
diff --git a/docs/development/custom/index.md b/docs/development/custom/index.md
index 72882345..95510c0c 100644
--- a/docs/development/custom/index.md
+++ b/docs/development/custom/index.md
@@ -1,12 +1,13 @@
 # Custom apps and services
 
-This section describes how to extend **Alliance Auth** with custom apps and services.
+This section describes how to extend **Alliance Auth** with custom apps, services and themes.
 
 ```eval_rst
 .. toctree::
     :maxdepth: 1
 
     integrating-services
+    custom-themes
     menu-hooks
     url-hooks
     logging
diff --git a/docs/development/custom/integrating-services.md b/docs/development/custom/integrating-services.md
index 3c28d8e4..7e4e42b0 100644
--- a/docs/development/custom/integrating-services.md
+++ b/docs/development/custom/integrating-services.md
@@ -20,19 +20,21 @@ Typically a service will contain 5 key components:
 
 The architecture looks something like this:
 
-          urls -------▶ Views
-            ▲              |
-            |              |
-            |              ▼
-        ServiceHook ----▶ Tasks ----▶ Manager
-            ▲
-            |
-            |
-        AllianceAuth
+```none
+  urls -------▶ Views
+    ▲              |
+    |              |
+    |              ▼
+ServiceHook ----▶ Tasks ----▶ Manager
+    ▲
+    |
+    |
+AllianceAuth
 
 
-      Where:
-          Module --▶ Dependency/Import
+Where:
+  Module --▶ Dependency/Import
+```
 
 While this is the typical structure of the existing services modules, there is no enforcement of this structure and you are, effectively, free to create whatever architecture may be necessary. A service module need not even communicate with an external service, for example, if similar triggers such as validate_user, delete_user are required for a module it may be convenient to masquerade as a service. Ideally though, using the common structure improves the maintainability for other developers.
 
@@ -40,9 +42,11 @@ While this is the typical structure of the existing services modules, there is n
 
 In order to integrate with Alliance Auth service modules must provide a `services_hook`. This hook will be a function that returns an instance of the `services.hooks.ServiceHook` class and decorated with the `@hooks.registerhook` decorator. For example:
 
-    @hooks.register('services_hook')
-    def register_service():
-        return ExampleService()
+```python
+@hooks.register('services_hook')
+def register_service():
+    return ExampleService()
+```
 
 This would register the ExampleService class which would need to be a subclass of `services.hooks.ServiceHook`.
 
@@ -53,15 +57,17 @@ This would register the ExampleService class which would need to be a subclass o
 
 A subclassed `ServiceHook` might look like this:
 
-    class ExampleService(ServicesHook):
-    def __init__(self):
-        ServicesHook.__init__(self)
-        self.urlpatterns = urlpatterns
-        self.service_url = 'http://exampleservice.example.com'
+```python
+class ExampleService(ServicesHook):
+def __init__(self):
+    ServicesHook.__init__(self)
+    self.urlpatterns = urlpatterns
+    self.service_url = 'http://exampleservice.example.com'
 
     """
     Overload base methods here to implement functionality
     """
+```
 
 ### The ServiceHook class
 
@@ -71,9 +77,9 @@ You will need to subclass `services.hooks.ServiceHook` in order to provide imple
 
 Instance Variables:
 
-- [self.name](#self-name)
-- [self.urlpatterns](#self-url-patterns)
-- [self.service_ctrl_template](#self-service-ctrl-template)
+- [self.name](#selfname)
+- [self.urlpatterns](#selfurlpatterns)
+- [self.service_ctrl_template](#selfservice-ctrl-template)
 
 Properties:
 
@@ -88,37 +94,47 @@ Functions:
 - [update_groups](#update_groups)
 - [update_groups_bulk](#update_groups_bulk)
 - [update_all_groups](#update_all_groups)
-- [service_enabled_members](#service_enabled_members)
-- [service_enabled_blues](#service_enabled_blues)
 - [service_active_for_user](#service_active_for_user)
 - [show_service_ctrl](#show_service_ctrl)
 - [render_service_ctrl](#render_service_ctrl)
 
+### Variables
+
 #### self.name
 
 Internal name of the module, should be unique amongst modules.
 
+#### self.service-ctrl-template
+
+The template used to render
+
 #### self.urlpatterns
 
 You should define all of your service URLs internally, usually in `urls.py`. Then you can import them and set `self.urlpatterns` to your defined urlpatterns.
 
-    from . import urls
-    ...
-    class MyService(ServiceHook):
-        def __init__(self):
-            ...
-            self.urlpatterns = urls.urlpatterns
+```python
+from . import urls
+...
+class MyService(ServiceHook):
+    def __init__(self):
+        ...
+        self.urlpatterns = urls.urlpatterns
+```
 
 All of your apps defined urlpatterns will then be included in the `URLconf` when the core application starts.
 
-#### self.service_ctrl_template
-
-This is provided as a courtesy and defines the default template to be used with [render_service_ctrl](#render-service-ctrl). You are free to redefine or not use this variable at all.
+### Properties
 
 #### title
 
 This is a property which provides a user friendly display of your service's name. It will usually do a reasonably good job unless your service name has punctuation or odd capitalization. If this is the case you should override this method and return a string.
 
+### Functions
+
+#### self.service_ctrl_template
+
+This is provided as a courtesy and defines the default template to be used with [render_service_ctrl](#render-service-ctrl). You are free to redefine or not use this variable at all.
+
 #### delete_user
 
 `def delete_user(self, user, notify_user=False):`
@@ -134,12 +150,12 @@ The function should return a boolean, `True` if successfully disabled, `False` o
 Validate the users service account, deleting it if they should no longer have access. The `user` parameter should be a Django User object.
 
 An implementation will probably look like the following:
-
-        def validate_user(self, user):
-        logger.debug('Validating user %s %s account' % (user, self.name))
-        if ExampleTasks.has_account(user) and not self.service_active_for_user(user):
-            self.delete_user(user, notify_user=True)
-
+```python
+def validate_user(self, user):
+logger.debug('Validating user %s %s account' % (user, self.name))
+if ExampleTasks.has_account(user) and not self.service_active_for_user(user):
+    self.delete_user(user, notify_user=True)
+```
 No return value is expected.
 
 This function will be called periodically on all users to validate that the given user should have their current service accounts.
@@ -207,37 +223,39 @@ Should the service be shown for the given `user` with the given `state`? The `us
 
 Usually you wont need to override this function.
 
-For more information see the [render_service_ctrl](#render-service-ctrl) section.
+For more information see the [render_service_ctrl](#render_service_ctrl) section.
 
 #### render_service_ctrl
 
 `def render_services_ctrl(self, request):`
 
-Render the services control row. This will be called for all active services when a user visits the `/services/` page and [show_service_ctrl](#show-service-ctrl) returns `True` for the given user.
+Render the services control row. This will be called for all active services when a user visits the `/services/` page and [show_service_ctrl](#show_service_ctrl) returns `True` for the given user.
 
 It should return a string (usually from `render_to_string`) of a table row (`<tr>`) with 4 columns (`<td>`). Column #1 is the service name, column #2 is the users username for this service, column #3 is the services URL, and column #4 is the action buttons.
 
 You may either define your own service template or use the default one provided. The default can be used like this example:
 
-    def render_services_ctrl(self, request):
-        """
-        Example for rendering the service control panel row
-        You can override the default template and create a
-        custom one if you wish.
-        :param request:
-        :return:
-        """
-        urls = self.Urls()
-        urls.auth_activate = 'auth_example_activate'
-        urls.auth_deactivate = 'auth_example_deactivate'
-        urls.auth_reset_password = 'auth_example_reset_password'
-        urls.auth_set_password = 'auth_example_set_password'
-        return render_to_string(self.service_ctrl_template, {
-            'service_name': self.title,
-            'urls': urls,
-            'service_url': self.service_url,
-            'username': 'example username'
-        }, request=request)
+```python
+def render_services_ctrl(self, request):
+    """
+    Example for rendering the service control panel row
+    You can override the default template and create a
+    custom one if you wish.
+    :param request:
+    :return:
+    """
+    urls = self.Urls()
+    urls.auth_activate = 'auth_example_activate'
+    urls.auth_deactivate = 'auth_example_deactivate'
+    urls.auth_reset_password = 'auth_example_reset_password'
+    urls.auth_set_password = 'auth_example_set_password'
+    return render_to_string(self.service_ctrl_template, {
+        'service_name': self.title,
+        'urls': urls,
+        'service_url': self.service_url,
+        'username': 'example username'
+    }, request=request)
+```
 
 the `Urls` class defines the available URL names for the 4 actions available in the default template:
 
diff --git a/docs/development/custom/logging.md b/docs/development/custom/logging.md
index bd6d8a81..56b59349 100644
--- a/docs/development/custom/logging.md
+++ b/docs/development/custom/logging.md
@@ -1,7 +1,9 @@
 # Logging from Custom Apps
+
 Alliance Auth provides a logger for use with custom apps to make everyone's life a little easier.
 
 ## Using the Extensions Logger
+
 AllianceAuth provides a helper function to get the logger for the current module to reduce the amount of
 code you need to write.
 
@@ -15,17 +17,20 @@ This works by creating a child logger of the extension logger which propagates a
 to the parent (extensions) logger.
 
 ## Changing the Logging Level
+
 By default, the extension logger's level is set to `DEBUG`.
 To change this, uncomment (or add) the following line in `local.py`.
 
 ```python
 LOGGING['handlers']['extension_file']['level'] = 'INFO'
 ```
+
 *(Remember to restart your supervisor workers after changes to `local.py`)*
 
 This will change the logger's level to the level you define.
 
 Options are: *(all options accept entries of levels listed below them)*
+
 * `DEBUG`
 * `INFO`
 * `WARNING`
diff --git a/docs/development/custom/menu-hooks.md b/docs/development/custom/menu-hooks.md
index 04efc38a..5f67a6e1 100644
--- a/docs/development/custom/menu-hooks.md
+++ b/docs/development/custom/menu-hooks.md
@@ -4,37 +4,21 @@ The menu hooks allow you to dynamically specify menu items from your plugin app
 
 To register a MenuItemHook class you would do the following:
 
-```Python
+```python
 @hooks.register('menu_item_hook')
 def register_menu():
-    return MenuItemHook('Example Item', 'glyphicon glyphicon-heart', 'example_url_name',150)
+    return MenuItemHook('Example Item', 'fas fa-user fa-fw"', 'example_url_name', 150)
 ```
 
 The `MenuItemHook` class specifies some parameters/instance variables required for menu item display.
 
-## MenuItemHook(text, classes, url_name, order=None)
+```eval_rst
+.. autoclass:: allianceauth.services.hooks.MenuItemHook
+    :members: __init__
+    :undoc-members:
+```
 
-### text
-
-The text shown as menu item, e.g. usually the name of the app.
-
-### classes
-
-The classes that should be applied to the bootstrap menu item icon
-
-### url_name
-
-The name of the Django URL to use
-
-### order
-
-An integer which specifies the order of the menu item, lowest to highest. Community apps are free ot use an oder above `1000`. Numbers below are served for Auth.
-
-### navactive
-
-A list of views or namespaces the link should be highlighted on. See [django-navhelper](https://github.com/geelweb/django-navhelper#navactive) for usage. Defaults to the supplied `url_name`.
-
-### count
+## count
 
 `count` is an integer shown next to the menu item as badge when `count` is not `None`.
 
@@ -49,10 +33,18 @@ This is a great feature to signal the user, that he has some open issues to take
 
 To use it set count the `render()` function of your subclass in accordance to the current user. Here is an example:
 
+```eval_rst
+.. automodule:: allianceauth.services.hooks.MenuItemHook
+    :members: render
+    :noindex:
+    :undoc-members:
+```
+
 ```Python
 def render(self, request):
     # ...
     self.count = calculate_count_for_user(request.user)
+    return MenuItemHook.render(self, request)
     # ...
 ```
 
diff --git a/docs/development/custom/url-hooks.md b/docs/development/custom/url-hooks.md
index 1c43544a..d8244e44 100644
--- a/docs/development/custom/url-hooks.md
+++ b/docs/development/custom/url-hooks.md
@@ -12,6 +12,18 @@ def register_urls():
     return UrlHook(app_name.urls, 'app_name', r^'app_name/')
 ```
 
+#### urls
+
+The urls module to include. See [the Django docs](https://docs.djangoproject.com/en/dev/topics/http/urls/#example) for designing urlpatterns.
+
+#### namespace
+
+The URL namespace to apply. This is usually just the app name.
+
+#### base_url
+
+The URL prefix to match against in regex form. Example `r'^app_name/'`. This prefix will be applied in front of all URL patterns included. It is possible to use the same prefix as existing apps (or no prefix at all) but [standard URL resolution](https://docs.djangoproject.com/en/dev/topics/http/urls/#how-django-processes-a-request) ordering applies (hook URLs are the last ones registered).
+
 ### Public views
 
 In addition is it possible to make views public. Normally, all views are automatically decorated with the `main_character_required` decorator. That decorator ensures a user needs to be logged in and have a main before he can access that view. This feature protects against a community app sneaking in a public view without the administrator knowing about it.
@@ -22,7 +34,6 @@ An app can opt-out of this feature by adding a list of views to be excluded when
 .. note::
     Note that for a public view to work, administrators need to also explicitly allow apps to have public views in their AA installation, by adding the apps label to ``APPS_WITH_PUBLIC_VIEWS`` setting.
 ```
-
 ## Examples
 
 An app called `plugin` provides a single view:
diff --git a/docs/development/index.md b/docs/development/index.md
index 05636730..1e7ea5fe 100644
--- a/docs/development/index.md
+++ b/docs/development/index.md
@@ -4,7 +4,7 @@
 
 ```eval_rst
 .. toctree::
-    :maxdepth: 1
+    :maxdepth: 2
 
     custom/index
     aa_core/index