Version Bump 4.8.0

Merge branch 'translations_7f31a07ccd4e4a66b1dd7b6bc2dbddb5' into 'master'
Updates for project Alliance Auth See merge request allianceauth/allianceauth!1732
2025-07-09 12:30:15 +02:00 · 2025-07-03 09:19:25 +10:00 · 2025-07-02 23:17:15 +00:00 · 2025-07-02 23:17:15 +00:00 · 2025-07-02 23:06:28 +00:00 · 2025-07-01 14:07:12 +02:00
501 changed files with 42350 additions and 13507 deletions
--- a/.coveragerc
+++ b/.coveragerc
@ -19,5 +19,6 @@ exclude_lines =
    if __name__ == .__main__.:
    def __repr__
    raise AssertionError
+    if TYPE_CHECKING:

 ignore_errors = True
--- a/.gitignore
+++ b/.gitignore
@ -73,3 +73,4 @@ celerybeat-schedule
 .flake8
 .pylintrc
 Makefile
+alliance_auth.sqlite3
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -25,12 +25,12 @@ before_script:
 pre-commit-check:
  <<: *only-default
  stage: pre-commit
-  image: python:3.10-bullseye
-  variables:
-    PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
-  cache:
-    paths:
-      - ${PRE_COMMIT_HOME}
+  image: python:3.11-bookworm
+  # variables:
+  #   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
+  # cache:
+  #   paths:
+  #     - ${PRE_COMMIT_HOME}
  script:
    - pip install pre-commit
    - pre-commit run --all-files
@ -53,7 +53,7 @@ secret_detection:

 test-3.8-core:
  <<: *only-default
-  image: python:3.8-bullseye
+  image: python:3.8-bookworm
  script:
    - tox -e py38-core
  artifacts:
@ -65,7 +65,7 @@ test-3.8-core:

 test-3.9-core:
  <<: *only-default
-  image: python:3.9-bullseye
+  image: python:3.9-bookworm
  script:
    - tox -e py39-core
  artifacts:
@ -77,7 +77,7 @@ test-3.9-core:

 test-3.10-core:
  <<: *only-default
-  image: python:3.10-bullseye
+  image: python:3.10-bookworm
  script:
    - tox -e py310-core
  artifacts:
@ -89,7 +89,7 @@ test-3.10-core:

 test-3.11-core:
  <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
  script:
    - tox -e py311-core
  artifacts:
@ -99,22 +99,21 @@ test-3.11-core:
        coverage_format: cobertura
        path: coverage.xml

-test-pvpy-core:
+test-3.12-core:
  <<: *only-default
-  image: pypy:3.9-bullseye
+  image: python:3.12-bookworm
  script:
-    - tox -e pypy-all
+    - tox -e py312-core
  artifacts:
    when: always
    reports:
      coverage_report:
        coverage_format: cobertura
        path: coverage.xml
-  allow_failure: true

 test-3.8-all:
  <<: *only-default
-  image: python:3.8-bullseye
+  image: python:3.8-bookworm
  script:
    - tox -e py38-all
  artifacts:
@ -126,7 +125,7 @@ test-3.8-all:

 test-3.9-all:
  <<: *only-default
-  image: python:3.9-bullseye
+  image: python:3.9-bookworm
  script:
    - tox -e py39-all
  artifacts:
@ -138,7 +137,7 @@ test-3.9-all:

 test-3.10-all:
  <<: *only-default
-  image: python:3.10-bullseye
+  image: python:3.10-bookworm
  script:
    - tox -e py310-all
  artifacts:
@ -150,7 +149,7 @@ test-3.10-all:

 test-3.11-all:
  <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
  script:
    - tox -e py311-all
  artifacts:
@ -161,22 +160,21 @@ test-3.11-all:
        path: coverage.xml
  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'

-test-pvpy-all:
+test-3.12-all:
  <<: *only-default
-  image: pypy:3.9-bullseye
+  image: python:3.12-bookworm
  script:
-    - tox -e pypy-all
+    - tox -e py312-all
  artifacts:
    when: always
    reports:
      coverage_report:
        coverage_format: cobertura
        path: coverage.xml
-  allow_failure: true

 build-test:
  stage: test
-  image: python:3.10-bullseye
+  image: python:3.11-bookworm

  before_script:
    - python -m pip install --upgrade pip
@ -195,13 +193,13 @@ build-test:

 test-docs:
  <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
  script:
    - tox -e docs

 deploy_production:
  stage: deploy
-  image: python:3.10-bullseye
+  image: python:3.11-bookworm

  before_script:
    - python -m pip install --upgrade pip
@ -217,10 +215,10 @@ deploy_production:

 build-image:
  before_script: []
-  image: docker:20.10.10
+  image: docker:24.0
  stage: docker
  services:
-    - docker:20.10.10-dind
+    - docker:24.0-dind
  script: |
    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_SHORT_SHA
@ -230,12 +228,10 @@ build-image:
    LATEST_TAG=$CI_REGISTRY_IMAGE/auth:latest

    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
-    docker tag $IMAGE_TAG $CURRENT_TAG
-    docker tag $IMAGE_TAG $MINOR_TAG
-    docker tag $IMAGE_TAG $MAJOR_TAG
-    docker tag $IMAGE_TAG $LATEST_TAG
-    docker image push --all-tags $CI_REGISTRY_IMAGE/auth
+    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
+    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker buildx create --use --name new-builder
+    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
  rules:
    - if: $CI_COMMIT_TAG
      when: delayed
@ -243,17 +239,19 @@ build-image:

 build-image-dev:
  before_script: []
-  image: docker:20.10.10
+  image: docker:24.0
  stage: docker
  services:
-    - docker:20.10.10-dind
+    - docker:24.0-dind
  script: |
    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA

    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
-    docker push $IMAGE_TAG
+    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
+    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker buildx create --use --name new-builder
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
  rules:
    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
      when: manual
@ -262,17 +260,19 @@ build-image-dev:

 build-image-mr:
  before_script: []
-  image: docker:20.10.10
+  image: docker:24.0
  stage: docker
  services:
-    - docker:20.10.10-dind
+    - docker:24.0-dind
  script: |
    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$CI_COMMIT_SHORT_SHA

    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    docker build . -t $IMAGE_TAG -f docker/Dockerfile --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    docker push $IMAGE_TAG
+    docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
+    docker run --privileged --rm tonistiigi/binfmt --install all
+    docker buildx create --use --name new-builder
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
  rules:
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
      when: manual
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,9 +3,41 @@
 # Update this file:
 #   pre-commit autoupdate

+# Set the default language versions for the hooks
+default_language_version:
+  python: python3  # Force all Python hooks to use Python 3
+  node: 22.12.0  # Force all Node hooks to use Node 22.12.0
+
+# Globally exclude files
+# https://pre-commit.com/#top_level-exclude
+exclude: |
+  (?x)(
+    LICENSE|
+    allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
+    \.min\.css|
+    \.min\.js|
+    \.po|
+    \.mo|
+    swagger\.json|
+    static/(.*)/libs/
+  )
+
 repos:
+  # Code Upgrades
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.20.0
+    hooks:
+      - id: pyupgrade
+        args: [--py38-plus]
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.25.0
+    hooks:
+      - id: django-upgrade
+        args: [--target-version=4.2]
+
+  # Formatting
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
    hooks:
      # Identify invalid files
      - id: check-ast
@ -13,67 +45,51 @@ repos:
      - id: check-json
      - id: check-toml
      - id: check-xml
-
      # git checks
      - id: check-merge-conflict
      - id: check-added-large-files
-        args: [ --maxkb=1000 ]
+        args: [--maxkb=1000]
      - id: detect-private-key
      - id: check-case-conflict
-
      # Python checks
 #      - id: check-docstring-first
      - id: debug-statements
 #      - id: requirements-txt-fixer
      - id: fix-encoding-pragma
-        args: [ --remove ]
+        args: [--remove]
      - id: fix-byte-order-marker
-
      # General quality checks
      - id: mixed-line-ending
-        args: [ --fix=lf ]
+        args: [--fix=lf]
      - id: trailing-whitespace
-        args: [ --markdown-linebreak-ext=md ]
-        exclude: |
-          (?x)(
-            \.min\.css|
-            \.min\.js|
-            \.po|
-            \.mo|
-            swagger\.json
-          )
+        args: [--markdown-linebreak-ext=md]
      - id: check-executables-have-shebangs
      - id: end-of-file-fixer
-        exclude: |
-          (?x)(
-            \.min\.css|
-            \.min\.js|
-            \.po|
-            \.mo|
-            swagger\.json
-          )
-
  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 2.7.2
+    rev: 3.2.1
    hooks:
      - id: editorconfig-checker
-        exclude: |
-          (?x)(
-            LICENSE|
-            allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
-            \.po|
-            \.mo|
-            swagger\.json
-          )
-
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.14.0
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.45.0
    hooks:
-      - id: django-upgrade
-        args: [ --target-version=4.0 ]
-
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+      - id: markdownlint
+        language: node
+        args:
+          - --disable=MD013
+  # Infrastructure
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.6.0
    hooks:
-      - id: pyupgrade
-        args: [ --py38-plus ]
+      - id: pyproject-fmt
+        name: pyproject.toml formatter
+        description: "Format the pyproject.toml file."
+        args:
+          - --indent=4
+        additional_dependencies:
+          - tox==4.24.1 # https://github.com/tox-dev/tox/releases/latest
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.24.1
+    hooks:
+      - id: validate-pyproject
+        name: Validate pyproject.toml
+        description: "Validate the pyproject.toml file."
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@ -12,6 +12,9 @@ build:
    - redis
  tools:
    python: "3.11"
+  jobs:
+    post_system_dependencies:
+      - redis-server --daemonize yes

 # Build documentation in the docs/ directory with Sphinx
 sphinx:
--- a/.tx/config
+++ b/.tx/config
@ -1,10 +0,0 @@
-[main]
-host     = https://app.transifex.com
-lang_map = zh-Hans: zh_Hans
-
-[o:alliance-auth:p:alliance-auth:r:django-po]
-file_filter  = allianceauth/locale/<lang>/LC_MESSAGES/django.po
-source_file  = allianceauth/locale/en/LC_MESSAGES/django.po
-source_lang  = en
-type         = PO
-minimum_perc = 0
--- a/README.md
+++ b/README.md
@ -1,20 +1,20 @@
 # Alliance Auth

-[![license](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
-[![python](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
-[![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
-[![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
-[![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
-[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](http://allianceauth.readthedocs.io/?badge=latest)
-[![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![License](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
+[![Django Versions](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
+[![Stable AA Version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
+[![Pipeline Status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
+[![Test Coverage Report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)

-An auth system for EVE Online to help in-game organizations manage online service access.
+A flexible authentication platform for EVE Online to help in-game organizations manage access to applications and services. AA provides both, a stable core, and a robust framework for community development and custom applications.

 ## Content

 - [Overview](#overview)
- [Documentation](http://allianceauth.rtfd.io)
+- [Documentation](https://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
 - [Developer Team](#development-team)
@ -22,29 +22,35 @@ An auth system for EVE Online to help in-game organizations manage online servic

 ## Overview

-Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
+Alliance Auth (AA) is a platform that helps Eve Online organizations efficiently manage access to applications and services.

 Main features:

- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
+- Automatically grants or revokes user access to external services (e.g.: Discord, Mumble) based on the user's current membership to [a variety of EVE Online affiliation](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)

 - Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.

- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["Services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others

- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
+- Includes a set of web [Apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker

 - Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)

 - English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr:, Russian :flag_ru:, Italian :flag_it:, French :flag_fr:, Japanese :flag_jp: and Ukrainian :flag_ua: Localization

-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](https://allianceauth.rtfd.io).

 ## Screenshot

-Here is an example of the Alliance Auth web site with some plug-ins apps and services enabled:
+Here is an example of the Alliance Auth web site with a mixture of Services, Apps and Community Creations enabled:

-![screenshot](https://i.imgur.com/2tnX9kD.png)
+### Flatly Theme
+
+![Flatly Theme](docs/_static/images/promotion/SampleInstallation-Flatly.png)
+
+### Darkly Theme
+
+![Darkly Theme](docs/_static/images/promotion/SampleInstallation-Darkly.png)

 ## Support

--- a/allianceauth/init.py
+++ b/allianceauth/init.py
@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.

-__version__ = '3.8.1'
+__version__ = '4.8.0'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'
--- a/allianceauth/analytics/admin.py
+++ b/allianceauth/analytics/admin.py
@ -1,21 +1,16 @@
 from django.contrib import admin

-from .models import AnalyticsIdentifier, AnalyticsPath, AnalyticsTokens
+from .models import AnalyticsIdentifier, AnalyticsTokens
+from solo.admin import SingletonModelAdmin


@admin.register(AnalyticsIdentifier)
-class AnalyticsIdentifierAdmin(admin.ModelAdmin):
+class AnalyticsIdentifierAdmin(SingletonModelAdmin):
    search_fields = ['identifier', ]
-    list_display = ('identifier',)
+    list_display = ['identifier', ]


@admin.register(AnalyticsTokens)
 class AnalyticsTokensAdmin(admin.ModelAdmin):
    search_fields = ['name', ]
-    list_display = ('name', 'type',)
-
-
-@admin.register(AnalyticsPath)
-class AnalyticsPathAdmin(admin.ModelAdmin):
-    search_fields = ['ignore_path', ]
-    list_display = ('ignore_path',)
+    list_display = ['name', 'type', ]
--- a/allianceauth/analytics/apps.py
+++ b/allianceauth/analytics/apps.py
@ -1,9 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class AnalyticsConfig(AppConfig):
    name = 'allianceauth.analytics'
    label = 'analytics'
-
-    def ready(self):
-        import allianceauth.analytics.signals
+    verbose_name = _('Analytics')
--- a/allianceauth/analytics/fixtures/disable_analytics.json
+++ b/allianceauth/analytics/fixtures/disable_analytics.json
@ -3,11 +3,10 @@
    "model": "analytics.AnalyticsTokens",
    "pk": 1,
    "fields": {
-        "name": "AA Team Public Google Analytics (Universal)",
+        "name": "AA Team Public Google Analytics (V4)",
        "type": "GA-V4",
-        "token": "UA-186249766-2",
-        "send_page_views": "False",
-        "send_celery_tasks": "False",
+        "token": "G-6LYSMYK8DE",
+        "secret": "KLlpjLZ-SRGozS5f5wb_kw",
        "send_stats": "False"
        }
    },
--- a/allianceauth/analytics/middleware.py
+++ b/allianceauth/analytics/middleware.py
@ -1,52 +0,0 @@
-from bs4 import BeautifulSoup
-
-from django.conf import settings
-from django.utils.deprecation import MiddlewareMixin
-from .models import AnalyticsTokens, AnalyticsIdentifier
-from .tasks import send_ga_tracking_web_view
-
-import re
-
-
-class AnalyticsMiddleware(MiddlewareMixin):
-    def process_response(self, request, response):
-        """Django Middleware: Process Page Views and creates Analytics Celery Tasks"""
-        if getattr(settings, "ANALYTICS_DISABLED", False):
-            return response
-        analyticstokens = AnalyticsTokens.objects.all()
-        client_id = AnalyticsIdentifier.objects.get(id=1).identifier.hex
-        try:
-            title = BeautifulSoup(
-                response.content, "html.parser").html.head.title.text
-        except AttributeError:
-            title = ''
-        for token in analyticstokens:
-            # Check if Page View Sending is Disabled
-            if token.send_page_views is False:
-                continue
-            # Check Exclusions
-            ignore = False
-            for ignore_path in token.ignore_paths.values():
-                ignore_path_regex = re.compile(ignore_path["ignore_path"])
-                if re.search(ignore_path_regex, request.path) is not None:
-                    ignore = True
-
-            if ignore is True:
-                continue
-
-            tracking_id = token.token
-            locale = request.LANGUAGE_CODE
-            path = request.path
-            try:
-                useragent = request.headers["User-Agent"]
-            except KeyError:
-                useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-
-            send_ga_tracking_web_view.s(tracking_id=tracking_id,
-                                        client_id=client_id,
-                                        page=path,
-                                        title=title,
-                                        locale=locale,
-                                        useragent=useragent).\
-                apply_async(priority=9)
-        return response
--- a/allianceauth/analytics/migrations/0007_analyticstokens_secret.py
+++ b/allianceauth/analytics/migrations/0007_analyticstokens_secret.py
@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-08-30 05:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0006_more_ignore_paths'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='analyticstokens',
+            name='secret',
+            field=models.CharField(blank=True, max_length=254),
+        ),
+    ]
--- a/allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token
+++ b/allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token
@ -0,0 +1,64 @@
+# Generated by Django 3.1.4 on 2020-12-30 08:53
+
+from django.db import migrations
+from django.core.exceptions import ObjectDoesNotExist
+
+
+def add_aa_team_token(apps, schema_editor):
+    # We can't import the Person model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
+    AnalyticsPath = apps.get_model('analytics', 'AnalyticsPath')
+    token = Tokens()
+    try:
+        ua_token = Tokens.objects.get(token="UA-186249766-2")
+        original_send_page_views = ua_token.send_page_views
+        original_send_celery_tasks = ua_token.send_celery_tasks
+        original_send_stats = ua_token.send_stats
+    except ObjectDoesNotExist:
+        original_send_page_views = True
+        original_send_celery_tasks = True
+        original_send_stats = True
+
+    try:
+        user_notifications_count = AnalyticsPath.objects.get(ignore_path=r"^\/user_notifications_count\/.*",)
+    except ObjectDoesNotExist:
+        user_notifications_count = AnalyticsPath.objects.create(ignore_path=r"^\/user_notifications_count\/.*")
+
+    try:
+        admin = AnalyticsPath.objects.get(ignore_path=r"^\/admin\/.*")
+    except ObjectDoesNotExist:
+        admin = AnalyticsPath.objects.create(ignore_path=r"^\/admin\/.*")
+
+    try:
+        account_activate = AnalyticsPath.objects.get(ignore_path=r"^\/account\/activate\/.*")
+    except ObjectDoesNotExist:
+        account_activate = AnalyticsPath.objects.create(ignore_path=r"^\/account\/activate\/.*")
+
+    token.type = 'GA-V4'
+    token.token = 'G-6LYSMYK8DE'
+    token.secret = 'KLlpjLZ-SRGozS5f5wb_kw'
+    token.send_page_views = original_send_page_views
+    token.send_celery_tasks = original_send_celery_tasks
+    token.send_stats = original_send_stats
+    token.name = 'AA Team Public Google Analytics (V4)'
+    token.save()
+    token.ignore_paths.add(admin, user_notifications_count, account_activate)
+    token.save()
+
+
+def remove_aa_team_token(apps, schema_editor):
+    # Have to define some code to remove this identifier
+    # In case of migration rollback?
+    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
+    token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0007_analyticstokens_secret'),
+    ]
+
+    operations = [migrations.RunPython(
+        add_aa_team_token, remove_aa_team_token)]
--- a/allianceauth/analytics/migrations/0009_remove_analyticstokens_ignore_paths_and_more.py
+++ b/allianceauth/analytics/migrations/0009_remove_analyticstokens_ignore_paths_and_more.py
@ -0,0 +1,28 @@
+# Generated by Django 4.0.10 on 2023-05-08 05:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0008_add_AA_GA-4_Team_Token '),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='analyticstokens',
+            name='ignore_paths',
+        ),
+        migrations.RemoveField(
+            model_name='analyticstokens',
+            name='send_celery_tasks',
+        ),
+        migrations.RemoveField(
+            model_name='analyticstokens',
+            name='send_page_views',
+        ),
+        migrations.DeleteModel(
+            name='AnalyticsPath',
+        ),
+    ]
--- a/allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py
+++ b/allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py
@ -0,0 +1,17 @@
+# Generated by Django 4.2.16 on 2024-12-11 02:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0009_remove_analyticstokens_ignore_paths_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='analyticsidentifier',
+            options={'verbose_name': 'Analytics Identifier'},
+        ),
+    ]
--- a/allianceauth/analytics/models.py
+++ b/allianceauth/analytics/models.py
@ -1,26 +1,19 @@
+from typing import Literal
 from django.db import models
-from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-
+from solo.models import SingletonModel
 from uuid import uuid4


-class AnalyticsIdentifier(models.Model):
+class AnalyticsIdentifier(SingletonModel):

-    identifier = models.UUIDField(default=uuid4,
-                                editable=False)
+    identifier = models.UUIDField(default=uuid4, editable=False)

-    def save(self, *args, **kwargs):
-        if not self.pk and AnalyticsIdentifier.objects.exists():
-            # Force a single object
-            raise ValidationError('There is can be only one \
-                                    AnalyticsIdentifier instance')
-        self.pk = self.id = 1 # If this happens to be deleted and recreated, force it to be 1
-        return super().save(*args, **kwargs)
+    def __str__(self) -> Literal['Analytics Identifier']:
+        return "Analytics Identifier"

-
-class AnalyticsPath(models.Model):
-    ignore_path = models.CharField(max_length=254, default="/example/", help_text="Regex Expression, If matched no Analytics Page View is sent")
+    class Meta:
+        verbose_name = "Analytics Identifier"


 class AnalyticsTokens(models.Model):
@ -32,7 +25,5 @@ class AnalyticsTokens(models.Model):
    name = models.CharField(max_length=254)
    type = models.CharField(max_length=254, choices=Analytics_Type.choices)
    token = models.CharField(max_length=254, blank=False)
-    send_page_views = models.BooleanField(default=False)
-    send_celery_tasks = models.BooleanField(default=False)
+    secret = models.CharField(max_length=254, blank=True)
    send_stats = models.BooleanField(default=False)
-    ignore_paths = models.ManyToManyField(AnalyticsPath, blank=True)
--- a/allianceauth/analytics/signals.py
+++ b/allianceauth/analytics/signals.py
@ -1,55 +0,0 @@
-import logging
-from celery.signals import task_failure, task_success
-from django.conf import settings
-from allianceauth.analytics.tasks import analytics_event
-
-logger = logging.getLogger(__name__)
-
-
-@task_failure.connect
-def process_failure_signal(
-                        exception, traceback,
-                        sender, task_id, signal,
-                        args, kwargs, einfo, **kw):
-    logger.debug("Celery task_failure signal %s" % sender.__class__.__name__)
-    if getattr(settings, "ANALYTICS_DISABLED", False):
-        return
-
-    category = sender.__module__
-
-    if 'allianceauth.analytics' not in category:
-        if category.endswith(".tasks"):
-            category = category[:-6]
-
-        action = sender.__name__
-
-        label = f"{exception.__class__.__name__}"
-
-        analytics_event(category=category,
-                        action=action,
-                        label=label)
-
-
-@task_success.connect
-def celery_success_signal(sender, result=None, **kw):
-    logger.debug("Celery task_success signal %s" % sender.__class__.__name__)
-    if getattr(settings, "ANALYTICS_DISABLED", False):
-        return
-
-    category = sender.__module__
-
-    if 'allianceauth.analytics' not in category:
-        if category.endswith(".tasks"):
-            category = category[:-6]
-
-        action = sender.__name__
-        label = "Success"
-
-        value = 0
-        if isinstance(result, int):
-            value = result
-
-        analytics_event(category=category,
-                        action=action,
-                        label=label,
-                        value=value)
--- a/allianceauth/analytics/tasks.py
+++ b/allianceauth/analytics/tasks.py
@ -3,23 +3,25 @@ import logging
 from django.conf import settings
 from django.apps import apps
 from celery import shared_task
-from allianceauth import __version__
 from .models import AnalyticsTokens, AnalyticsIdentifier
 from .utils import (
+    existence_baremetal_or_docker,
    install_stat_addons,
    install_stat_tokens,
    install_stat_users)

+from allianceauth import __version__
+
 logger = logging.getLogger(__name__)

-BASE_URL = "https://www.google-analytics.com/"
+BASE_URL = "https://www.google-analytics.com"

-DEBUG_URL = f"{BASE_URL}debug/collect"
-COLLECTION_URL = f"{BASE_URL}collect"
+DEBUG_URL = f"{BASE_URL}/debug/mp/collect"
+COLLECTION_URL = f"{BASE_URL}/mp/collect"

 if getattr(settings, "ANALYTICS_ENABLE_DEBUG", False) and settings.DEBUG:
-    # Force sending of analytics data during in a debug/test environemt
-    # Usefull for developers working on this feature.
+    # Force sending of analytics data during in a debug/test environment
+    # Useful for developers working on this feature.
    logger.warning(
        "You have 'ANALYTICS_ENABLE_DEBUG' Enabled! "
        "This debug instance will send analytics data!")
@ -31,177 +33,175 @@ if settings.DEBUG is True:
    ANALYTICS_URL = DEBUG_URL


-def analytics_event(category: str,
-                    action: str,
-                    label: str,
-                    value: int = 0,
+def analytics_event(namespace: str,
+                    task: str,
+                    label: str = "",
+                    result: str = "",
+                    value: int = 1,
                    event_type: str = 'Celery'):
    """
    Send a Google Analytics Event for each token stored
    Includes check for if its enabled/disabled

    Args:
-        `category` (str): Celery Namespace
-        `action` (str): Task Name
-        `label` (str): Optional, Task Success/Exception
-        `value` (int): Optional, If bulk, Query size, can be a binary True/False
+        `namespace` (str): Celery Namespace
+        `task` (str): Task Name
+        `label` (str): Optional, additional task label
+        `result` (str): Optional, Task Success/Exception
+        `value` (int): Optional, If bulk, Query size, can be a Boolean
        `event_type` (str): Optional, Celery or Stats only, Default to Celery
    """
-    analyticstokens = AnalyticsTokens.objects.all()
-    client_id = AnalyticsIdentifier.objects.get(id=1).identifier.hex
-    for token in analyticstokens:
-        if event_type == 'Celery':
-            allowed = token.send_celery_tasks
-        elif event_type == 'Stats':
+    for token in AnalyticsTokens.objects.filter(type='GA-V4'):
+        if event_type == 'Stats':
            allowed = token.send_stats
        else:
            allowed = False

        if allowed is True:
-            tracking_id = token.token
            send_ga_tracking_celery_event.s(
-                tracking_id=tracking_id,
-                client_id=client_id,
-                category=category,
-                action=action,
+                measurement_id=token.token,
+                secret=token.secret,
+                namespace=namespace,
+                task=task,
                label=label,
+                result=result,
                value=value).apply_async(priority=9)


-@shared_task()
-def analytics_daily_stats():
+@shared_task
+def analytics_daily_stats() -> None:
    """Celery Task: Do not call directly

-    Gathers a series of daily statistics and sends analytics events containing them
+    Gathers a series of daily statistics
+    Sends analytics events containing them
    """
    users = install_stat_users()
    tokens = install_stat_tokens()
    addons = install_stat_addons()
+    existence_type = existence_baremetal_or_docker()
    logger.debug("Running Daily Analytics Upload")

-    analytics_event(category='allianceauth.analytics',
-                    action='send_install_stats',
+    analytics_event(namespace='allianceauth.analytics',
+                    task='send_install_stats',
                    label='existence',
                    value=1,
                    event_type='Stats')
-    analytics_event(category='allianceauth.analytics',
-                    action='send_install_stats',
+    analytics_event(namespace='allianceauth.analytics',
+                    task='send_install_stats',
+                    label=existence_type,
+                    value=1,
+                    event_type='Stats')
+    analytics_event(namespace='allianceauth.analytics',
+                    task='send_install_stats',
                    label='users',
                    value=users,
                    event_type='Stats')
-    analytics_event(category='allianceauth.analytics',
-                    action='send_install_stats',
+    analytics_event(namespace='allianceauth.analytics',
+                    task='send_install_stats',
                    label='tokens',
                    value=tokens,
                    event_type='Stats')
-    analytics_event(category='allianceauth.analytics',
-                    action='send_install_stats',
+    analytics_event(namespace='allianceauth.analytics',
+                    task='send_install_stats',
                    label='addons',
                    value=addons,
                    event_type='Stats')
-
    for appconfig in apps.get_app_configs():
-        analytics_event(category='allianceauth.analytics',
-                        action='send_extension_stats',
+        if appconfig.label in [
+            "django_celery_beat",
+            "bootstrapform",
+            "messages",
+            "sessions",
+            "auth",
+            "staticfiles",
+            "users",
+            "addons",
+            "admin",
+            "humanize",
+            "contenttypes",
+            "sortedm2m",
+            "django_bootstrap5",
+            "tokens",
+            "authentication",
+            "services",
+            "framework",
+            "notifications"
+            "eveonline",
+            "navhelper",
+            "analytics",
+            "menu",
+            "theme"
+        ]:
+            pass
+        else:
+            analytics_event(namespace='allianceauth.analytics',
+                            task='send_extension_stats',
                            label=appconfig.label,
                            value=1,
                            event_type='Stats')


-@shared_task()
-def send_ga_tracking_web_view(
-                            tracking_id: str,
-                            client_id: str,
-                            page: str,
-                            title: str,
-                            locale: str,
-                            useragent: str) -> requests.Response:
-
-    """Celery Task: Do not call directly
-
-    Sends Page View events to GA, Called only via analytics.middleware
-
-    Parameters
-    ----------
-    `tracking_id` (str): Unique Server Identifier
-    `client_id` (str): GA Token
-    `page` (str): Page Path
-    `title` (str): Page Title
-    `locale` (str): Browser Language
-    `useragent` (str): Browser UserAgent
-
-    Returns
-    -------
-    requests.Reponse Object
-    """
-    headers = {"User-Agent": useragent}
-
-    payload = {
-            'v': '1',
-            'tid': tracking_id,
-            'cid': client_id,
-            't': 'pageview',
-            'dp': page,
-            'dt': title,
-            'ul': locale,
-            'ua': useragent,
-            'aip': 1,
-            'an': "allianceauth",
-            'av': __version__
-            }
-
-    response = requests.post(
-                        ANALYTICS_URL, data=payload,
-                        timeout=5, headers=headers)
-    logger.debug(f"Analytics Page View HTTP{response.status_code}")
-    return response
-
-
-@shared_task()
+@shared_task
 def send_ga_tracking_celery_event(
-                                tracking_id: str,
-                                client_id: str,
-                                category: str,
-                                action: str,
-                                label: str,
-                                value: int) -> requests.Response:
+        measurement_id: str,
+        secret: str,
+        namespace: str,
+        task: str,
+        label: str = "",
+        result: str = "",
+        value: int = 1):
    """Celery Task: Do not call directly

-    Sends Page View events to GA, Called only via analytics.middleware
+    Sends an events to GA

    Parameters
    ----------
-    `tracking_id` (str): Unique Server Identifier
-    `client_id` (str): GA Token
-    `category` (str): Celery Namespace
-    `action` (str): Task Name
-    `label` (str): Optional, Task Success/Exception
+    `measurement_id` (str): GA Token
+    `secret` (str): GA Authentication Secret
+    `namespace` (str): Celery Namespace
+    `task` (str): Task Name
+    `label` (str): Optional, additional task label
+    `result` (str): Optional, Task Success/Exception
    `value` (int): Optional, If bulk, Query size, can be a binary True/False
-
-    Returns
-    -------
-    requests.Reponse Object
    """

-    headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"}
-
-    payload = {
-            'v': '1',
-            'tid': tracking_id,
-            'cid': client_id,
-            't': 'event',
-            'ec': category,
-            'ea': action,
-            'el': label,
-            'ev': value,
-            'aip': 1,
-            'an': "allianceauth",
-            'av': __version__
+    parameters = {
+        'measurement_id': measurement_id,
+        'api_secret': secret
    }

+    payload = {
+        'client_id': AnalyticsIdentifier.get_solo().identifier.hex,
+        "user_properties": {
+            "allianceauth_version": {
+                "value": __version__
+            }
+        },
+        'non_personalized_ads': True,
+        "events": [{
+            "name": "celery_event",
+            "params": {
+                    "namespace": namespace,
+                    "task": task,
+                    'result': result,
+                    'label': label,
+                    "value": value
+            }
+        }]
+    }
+    try:
        response = requests.post(
-                        ANALYTICS_URL, data=payload,
-                        timeout=5, headers=headers)
-    logger.debug(f"Analytics Celery/Stats Event HTTP{response.status_code}")
-    return response
+            ANALYTICS_URL,
+            params=parameters,
+            json=payload,
+            timeout=10)
+        response.raise_for_status()
+        logger.debug(
+            f"Analytics Celery/Stats Event HTTP{response.status_code}")
+        return response.status_code
+    except requests.exceptions.HTTPError as e:
+        logger.debug(e)
+        return response.status_code
+    except requests.exceptions.ConnectionError as e:
+        logger.debug(e)
+        return "Failed"
--- a/allianceauth/analytics/tests/test_integration.py
+++ b/allianceauth/analytics/tests/test_integration.py
@ -1,109 +0,0 @@
-from unittest.mock import patch
-from urllib.parse import parse_qs
-
-import requests_mock
-
-from django.test import override_settings
-
-from allianceauth.analytics.tasks import ANALYTICS_URL
-from allianceauth.eveonline.tasks import update_character
-from allianceauth.tests.auth_utils import AuthUtils
-from allianceauth.utils.testing import NoSocketsTestCase
-
-
-@override_settings(CELERY_ALWAYS_EAGER=True)
-@requests_mock.mock()
-class TestAnalyticsForViews(NoSocketsTestCase):
-    @override_settings(ANALYTICS_DISABLED=False)
-    def test_should_run_analytics(self, requests_mocker):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        self.client.force_login(user)
-        # when
-        response = self.client.get("/dashboard/")
-        # then
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(requests_mocker.called)
-
-    @override_settings(ANALYTICS_DISABLED=True)
-    def test_should_not_run_analytics(self, requests_mocker):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        self.client.force_login(user)
-        # when
-        response = self.client.get("/dashboard/")
-        # then
-        self.assertEqual(response.status_code, 200)
-        self.assertFalse(requests_mocker.called)
-
-
-@override_settings(CELERY_ALWAYS_EAGER=True)
-@requests_mock.mock()
-class TestAnalyticsForTasks(NoSocketsTestCase):
-    @override_settings(ANALYTICS_DISABLED=False)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_run_analytics_for_successful_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertTrue(requests_mocker.called)
-        payload = parse_qs(requests_mocker.last_request.text)
-        self.assertListEqual(payload["el"], ["Success"])
-
-    @override_settings(ANALYTICS_DISABLED=True)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_not_run_analytics_for_successful_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertFalse(requests_mocker.called)
-
-    @override_settings(ANALYTICS_DISABLED=False)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_run_analytics_for_failed_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        mock_update_character.side_effect = RuntimeError
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertTrue(requests_mocker.called)
-        payload = parse_qs(requests_mocker.last_request.text)
-        self.assertNotEqual(payload["el"], ["Success"])
-
-    @override_settings(ANALYTICS_DISABLED=True)
-    @patch("allianceauth.eveonline.models.EveCharacter.objects.update_character")
-    def test_should_not_run_analytics_for_failed_task(
-        self, requests_mocker, mock_update_character
-    ):
-        # given
-        requests_mocker.post(ANALYTICS_URL)
-        mock_update_character.side_effect = RuntimeError
-        user = AuthUtils.create_user("Bruce Wayne")
-        character = AuthUtils.add_main_character_2(user, "Bruce Wayne", 1001)
-        # when
-        update_character.delay(character.character_id)
-        # then
-        self.assertTrue(mock_update_character.called)
-        self.assertFalse(requests_mocker.called)
--- a/allianceauth/analytics/tests/test_middleware.py
+++ b/allianceauth/analytics/tests/test_middleware.py
@ -1,24 +0,0 @@
-from allianceauth.analytics.middleware import AnalyticsMiddleware
-from unittest.mock import Mock
-from django.http import HttpResponse
-
-from django.test.testcases import TestCase
-
-
-class TestAnalyticsMiddleware(TestCase):
-
-    def setUp(self):
-        self.middleware = AnalyticsMiddleware(HttpResponse)
-        self.request = Mock()
-        self.request.headers = {
-                "User-Agent": "AUTOMATED TEST"
-            }
-        self.request.path = '/testURL/'
-        self.request.session = {}
-        self.request.LANGUAGE_CODE = 'en'
-        self.response = Mock()
-        self.response.content = 'hello world'
-
-    def test_middleware(self):
-        response = self.middleware.process_response(self.request, self.response)
-        self.assertEqual(self.response, response)
--- a/allianceauth/analytics/tests/test_models.py
+++ b/allianceauth/analytics/tests/test_models.py
@ -1,9 +1,8 @@
 from allianceauth.analytics.models import AnalyticsIdentifier
-from django.core.exceptions import ValidationError

 from django.test.testcases import TestCase

-from uuid import UUID, uuid4
+from uuid import uuid4


 # Identifiers
@ -14,13 +13,4 @@ uuid_2 = "7aa6bd70701f44729af5e3095ff4b55c"
 class TestAnalyticsIdentifier(TestCase):

    def test_identifier_random(self):
-        self.assertNotEqual(AnalyticsIdentifier.objects.get(), uuid4)
-
-    def test_identifier_singular(self):
-        AnalyticsIdentifier.objects.all().delete()
-        AnalyticsIdentifier.objects.create(identifier=uuid_1)
-        # Yeah i have multiple asserts here, they all do the same thing
-        with self.assertRaises(ValidationError):
-            AnalyticsIdentifier.objects.create(identifier=uuid_2)
-        self.assertEqual(AnalyticsIdentifier.objects.count(), 1)
-        self.assertEqual(AnalyticsIdentifier.objects.get(pk=1).identifier, UUID(uuid_1))
+        self.assertNotEqual(AnalyticsIdentifier.get_solo(), uuid4)
--- a/allianceauth/analytics/tests/test_tasks.py
+++ b/allianceauth/analytics/tests/test_tasks.py
@ -4,12 +4,11 @@ from django.test.utils import override_settings

 from allianceauth.analytics.tasks import (
    analytics_event,
-    send_ga_tracking_celery_event,
-    send_ga_tracking_web_view)
+    send_ga_tracking_celery_event)
 from allianceauth.utils.testing import NoSocketsTestCase


-GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/collect'
+GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'


@override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True)
@ -18,195 +17,53 @@ class TestAnalyticsTasks(NoSocketsTestCase):
    def test_analytics_event(self, requests_mocker):
        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
        analytics_event(
-                        category='allianceauth.analytics',
-                        action='send_tests',
+            namespace='allianceauth.analytics',
+            task='send_tests',
            label='test',
            value=1,
+            result="Success",
            event_type='Stats')

-    def test_send_ga_tracking_web_view_sent(self, requests_mocker):
-        """This test sends if the event SENDS to google.
-        Not if it was successful.
-        """
-        # given
-        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        tracking_id = 'UA-186249766-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        page = '/index/'
-        title = 'Hello World'
-        locale = 'en'
-        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        # when
-        response = send_ga_tracking_web_view(
-                                            tracking_id,
-                                            client_id,
-                                            page,
-                                            title,
-                                            locale,
-                                            useragent)
-        # then
-        self.assertEqual(response.status_code, 200)
-
-    def test_send_ga_tracking_web_view_success(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={"hitParsingResult":[{'valid': True}]}
-        )
-        tracking_id = 'UA-186249766-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        page = '/index/'
-        title = 'Hello World'
-        locale = 'en'
-        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        # when
-        json_response = send_ga_tracking_web_view(
-                                                tracking_id,
-                                                client_id,
-                                                page,
-                                                title,
-                                                locale,
-                                                useragent).json()
-        # then
-        self.assertTrue(json_response["hitParsingResult"][0]["valid"])
-
-    def test_send_ga_tracking_web_view_invalid_token(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={
-                "hitParsingResult":[
-                    {
-                        'valid': False,
-                        'parserMessage': [
-                            {
-                                'messageType': 'INFO',
-                                'description': 'IP Address from this hit was anonymized to 1.132.110.0.',
-                                'messageCode': 'VALUE_MODIFIED'
-                            },
-                            {
-                                'messageType': 'ERROR',
-                                'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.",
-                                'messageCode': 'VALUE_INVALID', 'parameter': 'tid'
-                            }
-                        ],
-                        'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'
-                    }
-                ]
-            }
-        )
-        tracking_id = 'UA-IntentionallyBadTrackingID-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        page = '/index/'
-        title = 'Hello World'
-        locale = 'en'
-        useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        # when
-        json_response = send_ga_tracking_web_view(
-                                            tracking_id,
-                                            client_id,
-                                            page,
-                                            title,
-                                            locale,
-                                            useragent).json()
-        # then
-        self.assertFalse(json_response["hitParsingResult"][0]["valid"])
-        self.assertEqual(
-            json_response["hitParsingResult"][0]["parserMessage"][1]["description"],
-            "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details."
-        )
-
-        # [{'valid': False, 'parserMessage': [{'messageType': 'INFO', 'description': 'IP Address from this hit was anonymized to 1.132.110.0.', 'messageCode': 'VALUE_MODIFIED'}, {'messageType': 'ERROR', 'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.", 'messageCode': 'VALUE_INVALID', 'parameter': 'tid'}], 'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'}]
-
    def test_send_ga_tracking_celery_event_sent(self, requests_mocker):
        # given
        requests_mocker.register_uri('POST', GOOGLE_ANALYTICS_DEBUG_URL)
-        tracking_id = 'UA-186249766-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        token = 'G-6LYSMYK8DE'
+        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
        category = 'test'
        action = 'test'
        label = 'test'
        value = '1'
        # when
-        response = send_ga_tracking_celery_event(
-                                                tracking_id,
-                                                client_id,
+        task = send_ga_tracking_celery_event(
+            token,
+            secret,
            category,
            action,
            label,
            value)
        # then
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(task, 200)

    def test_send_ga_tracking_celery_event_success(self, requests_mocker):
        # given
        requests_mocker.register_uri(
            'POST',
            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={"hitParsingResult":[{'valid': True}]}
+            json={"validationMessages": []}
        )
-        tracking_id = 'UA-186249766-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
+        token = 'G-6LYSMYK8DE'
+        secret = 'KLlpjLZ-SRGozS5f5wb_kw',
        category = 'test'
        action = 'test'
        label = 'test'
        value = '1'
        # when
-        json_response = send_ga_tracking_celery_event(
-                                                    tracking_id,
-                                                    client_id,
+        task = send_ga_tracking_celery_event(
+            token,
+            secret,
            category,
            action,
            label,
-                                                    value).json()
+            value)
        # then
-        self.assertTrue(json_response["hitParsingResult"][0]["valid"])
-
-    def test_send_ga_tracking_celery_event_invalid_token(self, requests_mocker):
-        # given
-        requests_mocker.register_uri(
-            'POST',
-            GOOGLE_ANALYTICS_DEBUG_URL,
-            json={
-                "hitParsingResult":[
-                    {
-                        'valid': False,
-                        'parserMessage': [
-                            {
-                                'messageType': 'INFO',
-                                'description': 'IP Address from this hit was anonymized to 1.132.110.0.',
-                                'messageCode': 'VALUE_MODIFIED'
-                            },
-                            {
-                                'messageType': 'ERROR',
-                                'description': "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details.",
-                                'messageCode': 'VALUE_INVALID', 'parameter': 'tid'
-                            }
-                        ],
-                        'hit': '/debug/collect?v=1&tid=UA-IntentionallyBadTrackingID-2&cid=ab33e241fbf042b6aa77c7655a768af7&t=pageview&dp=/index/&dt=Hello World&ul=en&ua=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36&aip=1&an=allianceauth&av=2.9.0a2'
-                    }
-                ]
-            }
-        )
-        tracking_id = 'UA-IntentionallyBadTrackingID-2'
-        client_id = 'ab33e241fbf042b6aa77c7655a768af7'
-        category = 'test'
-        action = 'test'
-        label = 'test'
-        value = '1'
-        # when
-        json_response = send_ga_tracking_celery_event(
-                                                    tracking_id,
-                                                    client_id,
-                                                    category,
-                                                    action,
-                                                    label,
-                                                    value).json()
-        # then
-        self.assertFalse(json_response["hitParsingResult"][0]["valid"])
-        self.assertEqual(
-            json_response["hitParsingResult"][0]["parserMessage"][1]["description"],
-            "The value provided for parameter 'tid' is invalid. Please see http://goo.gl/a8d4RP#tid for details."
-        )
+        self.assertTrue(task, 200)
--- a/allianceauth/analytics/tests/test_utils.py
+++ b/allianceauth/analytics/tests/test_utils.py
@ -18,17 +18,17 @@ def create_testdata():
        'abc@example.com',
        'password'
    )
-    #Token.objects.all().delete()
-    #Token.objects.create(
+    # Token.objects.all().delete()
+    # Token.objects.create(
    #            character_id=101,
    #            character_name='character1',
    #            access_token='my_access_token'
-    #)
-    #Token.objects.create(
+    # )
+    # Token.objects.create(
    #            character_id=102,
    #            character_name='character2',
    #            access_token='my_access_token'
-    #)
+    # )


 class TestAnalyticsUtils(TestCase):
@ -40,7 +40,7 @@ class TestAnalyticsUtils(TestCase):
        users = install_stat_users()
        self.assertEqual(users, expected)

-    #def test_install_stat_tokens(self):
+    # def test_install_stat_tokens(self):
    #    create_testdata()
    #    expected = 2
    #
--- a/allianceauth/analytics/utils.py
+++ b/allianceauth/analytics/utils.py
@ -1,3 +1,4 @@
+import os
 from django.apps import apps
 from allianceauth.authentication.models import User
 from esi.models import Token
@ -34,3 +35,16 @@ def install_stat_addons() -> int:
        The Number of Installed Apps"""
    addons = len(list(apps.get_app_configs()))
    return addons
+
+
+def existence_baremetal_or_docker() -> str:
+    """Checks the Installation Type of an install
+
+    Returns
+    -------
+    str
+        existence_baremetal or existence_docker"""
+    docker_tag = os.getenv('AA_DOCKER_TAG')
+    if docker_tag:
+        return "existence_docker"
+    return "existence_baremetal"
--- a/allianceauth/apps.py
+++ b/allianceauth/apps.py
@ -3,3 +3,6 @@ from django.apps import AppConfig

 class AllianceAuthConfig(AppConfig):
    name = 'allianceauth'
+
+    def ready(self) -> None:
+        import allianceauth.checks # noqa
--- a/allianceauth/authentication/admin.py
+++ b/allianceauth/authentication/admin.py
@ -288,7 +288,7 @@ class UserAdmin(BaseUserAdmin):
    Behavior of groups and characters columns can be configured via settings
    """

-    inlines = BaseUserAdmin.inlines + [UserProfileInline]
+    inlines = [UserProfileInline]
    ordering = ('username', )
    list_select_related = ('profile__state', 'profile__main_character')
    show_full_result_count = True
--- a/allianceauth/authentication/apps.py
+++ b/allianceauth/authentication/apps.py
@ -1,10 +1,12 @@
 from django.apps import AppConfig
 from django.core.checks import register, Tags
+from django.utils.translation import gettext_lazy as _


 class AuthenticationConfig(AppConfig):
    name = "allianceauth.authentication"
    label = "authentication"
+    verbose_name = _("Authentication")

    def ready(self):
        from allianceauth.authentication import checks, signals  # noqa: F401
--- a/allianceauth/authentication/auth_hooks.py
+++ b/allianceauth/authentication/auth_hooks.py
@ -0,0 +1,59 @@
+from allianceauth.hooks import DashboardItemHook
+from allianceauth import hooks
+from .views import dashboard_characters, dashboard_esi_check, 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,
+            1
+        )
+
+
+class ESICheckHook(DashboardItemHook):
+    def __init__(self):
+        DashboardItemHook.__init__(
+            self,
+            dashboard_esi_check,
+            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()
+
+
+@hooks.register('dashboard_hook')
+def register_esi_hook():
+    return ESICheckHook()
--- a/allianceauth/authentication/constants.py
+++ b/allianceauth/authentication/constants.py
@ -0,0 +1,12 @@
+from django.utils.translation import gettext_lazy as _
+
+# Overide ESI messages in the dashboard widget
+# when the returned messages are not helpful or out of date
+ESI_ERROR_MESSAGE_OVERRIDES = {
+    420: _("This software has exceeded the error limit for ESI. "
+            "If you are a user, please contact the maintainer of this software."
+            " If you are a developer/maintainer, please make a greater "
+            "effort in the future to receive valid responses. For tips on how, "
+            "come have a chat with us in ##3rd-party-dev-and-esi on the EVE "
+            "Online Discord. https://www.eveonline.com/discord")
+}
--- a/allianceauth/authentication/decorators.py
+++ b/allianceauth/authentication/decorators.py
@ -1,3 +1,6 @@
+from django.urls import include
+from django.contrib.auth.decorators import user_passes_test
+from django.core.exceptions import PermissionDenied
 from functools import wraps
 from typing import Callable, Iterable, Optional

--- 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,13 @@ class UserSettingsMiddleware(MiddlewareMixin):
            except Exception as e:
                logger.exception(e)

+            # AA v4 Themes
+            # Null = has not been set by the user ever, dont act
+            # DEFAULT_THEME or DEFAULT_THEME_DARK will be used in get_theme()
+            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
--- a/allianceauth/authentication/migrations/0022_userprofile_theme.py
+++ 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'),
+        ),
+    ]
--- a/allianceauth/authentication/migrations/0023_alter_userprofile_language.py
+++ b/allianceauth/authentication/migrations/0023_alter_userprofile_language.py
@ -0,0 +1,18 @@
+# Generated by Django 4.2.13 on 2024-05-12 09:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0022_userprofile_theme'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, choices=[('en', 'English'), ('de', 'German'), ('es', 'Spanish'), ('zh-hans', 'Chinese Simplified'), ('ru', 'Russian'), ('ko', 'Korean'), ('fr', 'French'), ('ja', 'Japanese'), ('it', 'Italian'), ('uk', 'Ukrainian'), ('pl', 'Polish')], default='', max_length=10, verbose_name='Language'),
+        ),
+    ]
--- a/allianceauth/authentication/migrations/0024_alter_userprofile_language.py
+++ b/allianceauth/authentication/migrations/0024_alter_userprofile_language.py
@ -0,0 +1,18 @@
+# Generated by Django 4.2 on 2024-09-13 09:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0023_alter_userprofile_language'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, choices=[('en', 'English'), ('cs-cz', 'Czech'), ('de', 'German'), ('es', 'Spanish'), ('it-it', 'Italian'), ('ja', 'Japanese'), ('ko-kr', 'Korean'), ('fr-fr', 'French'), ('ru', 'Russian'), ('nl-nl', 'Dutch'), ('pl-pl', 'Polish'), ('uk', 'Ukrainian'), ('zh-hans', 'Simplified Chinese')], default='', max_length=10, verbose_name='Language'),
+        ),
+    ]
--- a/allianceauth/authentication/models.py
+++ b/allianceauth/authentication/models.py
@ -1,4 +1,5 @@
 import logging
+from typing import ClassVar

 from django.contrib.auth.models import User, Permission
 from django.db import models, transaction
@ -27,7 +28,7 @@ class State(models.Model):
                                            help_text="Factions to whose members this state is available.")
    public = models.BooleanField(default=False, help_text="Make this state available to any character.")

-    objects = StateManager()
+    objects: ClassVar[StateManager] = StateManager()

    class Meta:
        ordering = ['-priority']
@ -67,17 +68,20 @@ class UserProfile(models.Model):
        """
        Choices for UserProfile.language
        """
-
+        # Sorted by Language Code alphabetical order + English at top
        ENGLISH = 'en', _('English')
+        CZECH = 'cs-cz', _("Czech")  # Not yet at 50% translated
        GERMAN = 'de', _('German')
        SPANISH = 'es', _('Spanish')
-        CHINESE = 'zh-hans', _('Chinese Simplified')
-        RUSSIAN = 'ru', _('Russian')
-        KOREAN = 'ko', _('Korean')
-        FRENCH = 'fr', _('French')
+        ITALIAN = 'it-it', _('Italian')
        JAPANESE = 'ja', _('Japanese')
-        ITALIAN = 'it', _('Italian')
+        KOREAN = 'ko-kr', _('Korean')
+        FRENCH = 'fr-fr', _('French')
+        RUSSIAN = 'ru', _('Russian')
+        DUTCH = 'nl-nl', _("Dutch")
+        POLISH = 'pl-pl', _("Polish")
        UKRAINIAN = 'uk', _('Ukrainian')
+        CHINESE = 'zh-hans', _('Simplified Chinese')

    user = models.OneToOneField(
        User,
@ -101,6 +105,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:
@ -127,8 +138,10 @@ class UserProfile(models.Model):
                    sender=self.__class__, user=self.user, state=self.state
                )

-    def __str__(self):
+    def __str__(self) -> str:
        return str(self.user)
+
+
 class CharacterOwnership(models.Model):
    class Meta:
        default_permissions = ('change', 'delete')
@ -138,7 +151,7 @@ class CharacterOwnership(models.Model):
    owner_hash = models.CharField(max_length=28, unique=True)
    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')

-    objects = CharacterOwnershipManager()
+    objects: ClassVar[CharacterOwnershipManager] = CharacterOwnershipManager()

    def __str__(self):
        return f"{self.user}: {self.character}"
--- 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>
+        {% for dash in views %}
+            {{ dash | safe }}
        {% 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>
 {% endblock %}
--- a/allianceauth/authentication/templates/authentication/dashboard_bs3.html
+++ b/allianceauth/authentication/templates/authentication/dashboard_bs3.html
@ -0,0 +1,10 @@
+{% extends 'allianceauth/base.html' %}
+
+
+{% block page_title %}Dashboard{% endblock page_title %}
+
+{% block content %}
+    <div>
+        <h1>Dashboard Dummy</h1>
+    </div>
+{% endblock %}
--- a/allianceauth/authentication/templates/authentication/dashboard_characters.html
+++ b/allianceauth/authentication/templates/authentication/dashboard_characters.html
@ -0,0 +1,44 @@
+{% load i18n %}
+<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
+    <div class="card h-100">
+        <div class="card-body">
+            {% translate "Characters" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
+
+            <div>
+                <div style="height: 300px; 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 class="d-md-inline m-2">{% translate 'Change Main' %}</span>
+                        </a>
+                    </div>
+                    <table class="table">
+                        <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 }}" 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_if_none:"" }}</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
--- a/allianceauth/authentication/templates/authentication/dashboard_groups.html
+++ b/allianceauth/authentication/templates/authentication/dashboard_groups.html
@ -0,0 +1,22 @@
+{% load i18n %}
+<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
+    <div class="card h-100">
+        <div class="card-body">
+            {% translate "Membership" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
+
+            <div>
+                <div style="height: 300px; overflow-y:auto;">
+                    <h5 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h5>
+                    <table class="table">
+                        {% for group in groups %}
+                            <tr>
+                                <td class="text-center">{{ group.name }}</td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@ -1,62 +1,89 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load aa_i18n %}
 {% load i18n %}

-{% block page_title %}{% translate "Dashboard" %}{% endblock %}
+{% block page_title %}
+    {% translate "Token Management" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Token Management" %}
+{% endblock header_nav_brand %}

 {% block content %}
-    <h1 class="page-header text-center">{% translate "Token Management" %}</h1>
-    <div class="col-sm-12">
-        <table class="table table-aa" id="table_tokens" style="width:100%">
+    <div>
+        <p class="mb-3">
+            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://developers.eveonline.com/authorized-apps where possible."|urlize %}
+        </p>
+
+        <table class="table w-100" id="table_tokens">
            <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>
            </thead>
+
            <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 style="white-space:initial;">
+                            {% for s in t.scopes.all %}
+                                <span class="badge text-bg-secondary">{{ s.name }}</span>
+                            {% endfor %}
+                        </td>
+
+                        <td nowrap class="text-end">
+                            <a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fa-solid fa-trash-can"></i></a>
+                            <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fa-solid fa-rotate"></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" %}

-{% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}

-{% block extra_script %}
-    $(document).ready(function(){
+    <script>
+        $(document).ready(() => {
            let grp = 2;
-        var table = $('#table_tokens').DataTable({
-            "columnDefs": [{ orderable: false, targets: [0,1] },{ "visible": false, "targets": grp }],
-            "order": [[grp, 'asc']],
-            "drawCallback": function (settings) {
-                var api = this.api();
-                var rows = api.rows({ page: 'current' }).nodes();
-                var last = null;
-                api.column(grp, { page: 'current' })
+
+            $('#table_tokens').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
+                'columnDefs': [{orderable: false, targets: [0, 1]}, {
+                    'visible': false,
+                    'targets': grp
+                }],
+                'order': [[grp, 'asc']],
+                'drawCallback': function (settings) {
+                    const api = this.api();
+                    const rows = api.rows({page: 'current'}).nodes();
+                    let last = null;
+                    api.column(grp, {page: 'current'})
                        .data()
-                    .each(function (group, i) {
+                        .each((group, i) => {
                            if (last !== group) {
-                            $(rows).eq(i).before('<tr class="info"><td colspan="3">' + group + '</td></tr>');
+                                $(rows).eq(i).before(`<tr class="h5 table-primary"><td colspan="3">${group}</td></tr>`);
+
                                last = group;
                            }
                        });
                },
-            "stateSave": true,
+                'stateSave': true
            });
        });
-{% endblock %}
+    </script>
+{% endblock extra_javascript %}
+
+{% block extra_css %}
+    {% include "bundles/datatables-css-bs5.html" %}
+{% endblock extra_css %}
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@ -1,22 +1,25 @@
+{% load theme_tags %}
 {% load static %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" {% theme_html_tags %}>
    <head>
+        <!-- Required meta tags -->
        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="">
-        <meta name="author" content="">
-        <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.">
+        <!-- End Required meta tags -->

+        <!-- Meta tags -->
+        {% include 'allianceauth/opengraph.html' %}
        {% include 'allianceauth/icons.html' %}
+        <!-- Meta tags -->

        <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>

-        {% include 'bundles/bootstrap-css.html' %}
+        {% theme_css %}
+
        {% include 'bundles/fontawesome.html' %}
+        {% include 'bundles/auth-framework-css.html' %}
+
        {% block extra_include %}
        {% endblock %}

@ -29,25 +32,23 @@
                background-size: cover;
            }

-            .panel-transparent {
-                background: rgba(48, 48, 48, 0.7);
-                color: #ffffff;
+            .card-login {
+                background: rgba(48 48 48 / 0.7);
+                color: rgb(255 255 255);
                padding-bottom: 21px;
            }

-            .panel-body {
-
-            }
-
            #lang-select {
                width: 40%;
                margin-left: auto;
                margin-right: auto;
            }
+
            {% block extra_style %}
            {% endblock %}
        </style>
    </head>
+
    <body>
        <div class="container" style="margin-top:150px;">
            {% block content %}
--- a/allianceauth/authentication/templates/public/lang_select.html
+++ b/allianceauth/authentication/templates/public/lang_select.html
@ -1,14 +1,15 @@
 {% load i18n %}
-<div class="dropdown">
-    <form action="{% url 'set_language' %}" method="post">
+
+<form class="dropdown-item" action="{% url 'set_language' %}" method="post">
    {% csrf_token %}
-        <select onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
-            {% get_language_info_list for LANGUAGES as languages %}
-            {% for language in languages %}
-                <option lang="{{ language.code }}" value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                    {{ language.name_local|capfirst }} ({{ language.code }})
+
+    <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
+        {% get_available_languages as LANGUAGES %}
+
+        {% for lang_code, lang_name in LANGUAGES %}
+            <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
+                {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
            </option>
        {% endfor %}
    </select>
-    </form>
-</div>
+</form>
--- a/allianceauth/authentication/templates/public/middle_box.html
+++ b/allianceauth/authentication/templates/public/middle_box.html
@ -3,16 +3,17 @@
 {% load i18n %}

 {% block content %}
-    <div class="col-md-4 col-md-offset-4">
+    <div class="row justify-content-center">
+        <div class="col-md-6">
            {% if messages %}
                {% for message in messages %}
                    <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
                {% endfor %}
            {% endif %}

-        <div class="panel panel-default panel-transparent">
-            <div class="panel-body">
-                <div class="col-md-12">
+            <div class="card card-login border-secondary p-3">
+                <div class="card-body">
+                    <div class="text-center">
                        {% block middle_box_content %}
                        {% endblock %}
                    </div>
@ -20,22 +21,23 @@

                {% include 'public/lang_select.html' %}

-            <p class="text-center" style="margin-top: 2rem;">
+                <p class="text-center mt-3">
                    {% translate "For information on SSO, ESI and security read the CCP Dev Blog" %}<br>
-                <a href="https://www.eveonline.com/article/introducing-esi" target="_blank" rel="noopener noreferrer">
-                    {% translate "Introducing ESI - A New API For Eve Online" %}
+                    <a class="text-reset" href="https://www.eveonline.com/news/view/introducing-esi" target="_blank" rel="noopener noreferrer">
+                        {% translate "Introducing ESI - A New API For EVE Online" %}
                    </a>
                </p>

                <p class="text-center">
-                <a href="https://community.eveonline.com/support/third-party-applications/" target="_blank" rel="noopener noreferrer">
+                    <a class="text-reset" href="https://developers.eveonline.com/authorized-apps" target="_blank" rel="noopener noreferrer">
                        {% translate "Manage ESI Applications" %}
                    </a>
                </p>
            </div>
        </div>
+    </div>
 {% endblock %}

 {% block extra_include %}
-    {% include 'bundles/bootstrap-js.html' %}
+    {% include 'bundles/bootstrap-js-bs5.html' %}
 {% endblock %}
--- a/allianceauth/authentication/templates/public/register.html
+++ b/allianceauth/authentication/templates/public/register.html
@ -1,27 +1,31 @@
 {% extends 'public/base.html' %}

-{% load bootstrap %}
+{% load django_bootstrap5 %}
 {% load i18n %}

 {% block page_title %}{% translate "Registration" %}{% endblock %}

 {% block extra_include %}
-    {% include 'bundles/bootstrap-css.html' %}
+    {% include 'bundles/bootstrap-css-bs5.html' %}
    {% include 'bundles/fontawesome.html' %}
-    {% include 'bundles/bootstrap-js.html' %}
+    {% include 'bundles/bootstrap-js-bs5.html' %}
 {% endblock %}

 {% block content %}
-    <div class="col-md-4 col-md-offset-4">
-        <div class="panel panel-default panel-transparent">
-            <div class="panel-body">
+    <div class="row justify-content-center">
+        <div class="col-md-6">
+            <div class="card card-login border-secondary p-3">
+                <div class="card-body">
                    <form method="POST">
                        {% csrf_token %}
-                    {{ form|bootstrap }}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Register" %}</button>
+                        {% bootstrap_form form %}
+
+                        <button class="btn btn-primary btn-block" type="submit">{% translate "Register" %}</button>
                    </form>
-            </div>
-        </div>
+
                    {% include 'public/lang_select.html' %}
                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}
--- a/allianceauth/authentication/templates/registration/activate.html
+++ b/allianceauth/authentication/templates/registration/activate.html
@ -1,5 +1,7 @@
 {% extends 'public/middle_box.html' %}
+
 {% load i18n %}
+
 {% block middle_box_content %}
    <div class="alert alert-danger">{% translate 'Invalid or expired activation link.' %}</div>
 {% endblock %}
--- a/allianceauth/authentication/tests/test_views.py
+++ b/allianceauth/authentication/tests/test_views.py
@ -1,10 +1,12 @@
 import json
+import requests_mock
 from unittest.mock import patch

 from django.test import RequestFactory, TestCase

-from allianceauth.authentication.views import task_counts
+from allianceauth.authentication.views import task_counts, esi_check
 from allianceauth.tests.auth_utils import AuthUtils
+from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES

 MODULE_PATH = "allianceauth.authentication.views"

@ -21,6 +23,8 @@ class TestRunningTasksCount(TestCase):
        super().setUpClass()
        cls.factory = RequestFactory()
        cls.user = AuthUtils.create_user("bruce_wayne")
+        cls.user.is_superuser = True
+        cls.user.save()

    def test_should_return_data(
        self, mock_active_tasks_count, mock_queued_tasks_count
@ -35,5 +39,164 @@ class TestRunningTasksCount(TestCase):
        # then
        self.assertEqual(response.status_code, 200)
        self.assertDictEqual(
-            jsonresponse_to_dict(response), {"tasks_running": 2, "tasks_queued": 3}
+            jsonresponse_to_dict(response), {
+                "tasks_running": 2, "tasks_queued": 3}
        )
+
+    def test_su_only(
+        self, mock_active_tasks_count, mock_queued_tasks_count
+    ):
+        self.user.is_superuser = False
+        self.user.save()
+        self.user.refresh_from_db()
+        # given
+        mock_active_tasks_count.return_value = 2
+        mock_queued_tasks_count.return_value = 3
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = task_counts(request)
+        # then
+        self.assertEqual(response.status_code, 302)
+
+
+class TestEsiCheck(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.factory = RequestFactory()
+        cls.user = AuthUtils.create_user("bruce_wayne")
+        cls.user.is_superuser = True
+        cls.user.save()
+
+    @requests_mock.Mocker()
+    def test_401_data_returns_200(
+        self, m
+    ):
+        error_json = {
+            "error": "You have been banned from using ESI. Please contact Technical Support. (support@eveonline.com)"
+        }
+        status_code = 401
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(error_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": error_json
+            }
+        )
+
+    @requests_mock.Mocker()
+    def test_504_data_returns_200(
+        self, m
+    ):
+        error_json = {
+            "error": "Gateway timeout message",
+            "timeout": 5000
+        }
+        status_code = 504
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(error_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": error_json
+            }
+        )
+
+    @requests_mock.Mocker()
+    def test_420_data_override(
+        self, m
+    ):
+        error_json = {
+            "error": "message from CCP",
+        }
+        status_code = 420
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(error_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertNotEqual(
+            jsonresponse_to_dict(response)["data"],
+            error_json
+        )
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": {
+                    "error": ESI_ERROR_MESSAGE_OVERRIDES.get(status_code)
+                }
+            }
+        )
+
+    @requests_mock.Mocker()
+    def test_200_data_returns_200(
+        self, m
+    ):
+        good_json = {
+            "players": 5,
+            "server_version": "69420",
+            "start_time": "2030-01-01T23:59:59Z"
+        }
+        status_code = 200
+
+        m.get(
+            "https://esi.evetech.net/latest/status/?datasource=tranquility",
+            text=json.dumps(good_json),
+            status_code=status_code
+        )
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            jsonresponse_to_dict(response), {
+                "status": status_code,
+                "data": good_json
+            }
+        )
+
+    def test_su_only(
+        self,
+    ):
+        self.user.is_superuser = False
+        self.user.save()
+        self.user.refresh_from_db()
+        # given
+        request = self.factory.get("/")
+        request.user = self.user
+        # when
+        response = esi_check(request)
+        # then
+        self.assertEqual(response.status_code, 302)
--- a/allianceauth/authentication/urls.py
+++ b/allianceauth/authentication/urls.py
@ -38,5 +38,7 @@ urlpatterns = [
        name='token_refresh'
    ),
    path('dashboard/', views.dashboard, name='dashboard'),
+    path('dashboard_bs3/', views.dashboard_bs3, name='dashboard_bs3'),
    path('task-counts/', views.task_counts, name='task_counts'),
+    path('esi-check/', views.esi_check, name='esi_check'),
 ]
--- a/allianceauth/authentication/views.py
+++ b/allianceauth/authentication/views.py
@ -1,5 +1,6 @@
 import logging

+import requests
 from django_registration.backends.activation.views import (
    REGISTRATION_SALT, ActivationView as BaseActivationView,
    RegistrationView as BaseRegistrationView,
@ -9,7 +10,7 @@ from django_registration.signals import user_registered
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import authenticate, login
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
 from django.core import signing
 from django.http import JsonResponse
@ -22,14 +23,16 @@ from esi.decorators import token_required
 from esi.models import Token

 from allianceauth.eveonline.models import EveCharacter
+from allianceauth.hooks import get_hooks

+from .constants import ESI_ERROR_MESSAGE_OVERRIDES
 from .core.celery_workers import active_tasks_count, queued_tasks_count
 from .forms import RegistrationForm
 from .models import CharacterOwnership

 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
    _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import *
+    from allianceauth.eveonline.autogroups.models import *  # noqa: F401, F403
 else:
    _has_auto_groups = False

@ -42,23 +45,58 @@ 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 ""
+
+
+def dashboard_esi_check(request):
+    if request.user.is_superuser:
+        return render_to_string('allianceauth/admin-status/esi_check.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)


@ -106,23 +144,30 @@ def token_refresh(request, token_id=None):
@login_required
@token_required(scopes=settings.LOGIN_TOKEN_SCOPES)
 def main_character_change(request, token):
-    logger.debug(f"main_character_change called by user {request.user} for character {token.character_name}")
+    logger.debug(
+        f"main_character_change called by user {request.user} for character {token.character_name}")
    try:
-        co = CharacterOwnership.objects.get(character__character_id=token.character_id, user=request.user)
+        co = CharacterOwnership.objects.get(
+            character__character_id=token.character_id, user=request.user)
    except CharacterOwnership.DoesNotExist:
        if not CharacterOwnership.objects.filter(character__character_id=token.character_id).exists():
            co = CharacterOwnership.objects.create_by_token(token)
        else:
            messages.error(
                request,
-                _('Cannot change main character to %(char)s: character owned by a different account.') % ({'char': token.character_name})
+                _('Cannot change main character to %(char)s: character owned by a different account.') % (
+                    {'char': token.character_name})
            )
            co = None
    if co:
        request.user.profile.main_character = co.character
        request.user.profile.save(update_fields=['main_character'])
-        messages.success(request, _('Changed main character to %(char)s') % {"char": co.character})
-        logger.info('Changed user %(user)s main character to %(char)s' % ({'user': request.user, 'char': co.character}))
+        messages.success(request, _('Changed main character to %s') % co.character)
+        logger.info(
+            'Changed user {user} main character to {char}'.format(
+                user=request.user, char=co.character
+            )
+        )
    return redirect("authentication:dashboard")


@ -130,9 +175,11 @@ def main_character_change(request, token):
 def add_character(request, token):
    if CharacterOwnership.objects.filter(character__character_id=token.character_id).filter(
            owner_hash=token.character_owner_hash).filter(user=request.user).exists():
-        messages.success(request, _('Added %(name)s to your account.' % ({'name': token.character_name})))
+        messages.success(request, _(
+            'Added %(name)s to your account.' % ({'name': token.character_name})))
    else:
-        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % ({'name': token.character_name})))
+        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % (
+            {'name': token.character_name})))
    return redirect('authentication:dashboard')


@ -175,8 +222,10 @@ def sso_login(request, token):
    token.delete()
    messages.error(
        request,
-        _('Unable to authenticate as the selected character. '
-        'Please log in with the main character associated with this account.')
+        _(
+            'Unable to authenticate as the selected character. '
+            'Please log in with the main character associated with this account.'
+        )
    )
    return redirect(settings.LOGIN_URL)

@ -249,7 +298,8 @@ class RegistrationView(BaseRegistrationView):
        return super().dispatch(request, *args, **kwargs)

    def register(self, form):
-        user = User.objects.get(pk=self.request.session.get('registration_uid'))
+        user = User.objects.get(
+            pk=self.request.session.get('registration_uid'))
        user.email = form.cleaned_data['email']
        user_registered.send(self.__class__, user=user, request=self.request)
        if getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
@ -266,7 +316,8 @@ class RegistrationView(BaseRegistrationView):

    def get_email_context(self, activation_key):
        context = super().get_email_context(activation_key)
-        context['url'] = context['site'].domain + reverse('registration_activate', args=[activation_key])
+        context['url'] = context['site'].domain + \
+            reverse('registration_activate', args=[activation_key])
        return context


@ -299,20 +350,24 @@ class ActivationView(BaseActivationView):


 def registration_complete(request):
-    messages.success(request, _('Sent confirmation email. Please follow the link to confirm your email address.'))
+    messages.success(request, _(
+        'Sent confirmation email. Please follow the link to confirm your email address.'))
    return redirect('authentication:login')


 def activation_complete(request):
-    messages.success(request, _('Confirmed your email address. Please login to continue.'))
+    messages.success(request, _(
+        'Confirmed your email address. Please login to continue.'))
    return redirect('authentication:dashboard')


 def registration_closed(request):
-    messages.error(request, _('Registration of new accounts is not allowed at this time.'))
+    messages.error(request, _(
+        'Registration of new accounts is not allowed at this time.'))
    return redirect('authentication:login')


+@user_passes_test(lambda u: u.is_superuser)
 def task_counts(request) -> JsonResponse:
    """Return task counts as JSON for an AJAX call."""
    data = {
@ -320,3 +375,31 @@ def task_counts(request) -> JsonResponse:
        "tasks_queued": queued_tasks_count()
    }
    return JsonResponse(data)
+
+
+def check_for_override_esi_error_message(response):
+    if response.status_code in ESI_ERROR_MESSAGE_OVERRIDES:
+        return {"error": ESI_ERROR_MESSAGE_OVERRIDES.get(response.status_code)}
+    else:
+        return response.json()
+
+
+@user_passes_test(lambda u: u.is_superuser)
+def esi_check(request) -> JsonResponse:
+    """Return if ESI ok With error messages and codes as JSON"""
+    _r = requests.get("https://esi.evetech.net/latest/status/?datasource=tranquility")
+
+    data = {
+        "status": _r.status_code,
+        "data": check_for_override_esi_error_message(_r)
+    }
+    return JsonResponse(data)
+
+
+@login_required
+def dashboard_bs3(request):
+    """Render dashboard view with BS3 theme.
+
+    This is an internal view used for testing BS3 backward compatibility in AA4 only.
+    """
+    return render(request, 'authentication/dashboard_bs3.html')
--- a/allianceauth/bin/allianceauth.py
+++ b/allianceauth/bin/allianceauth.py
@ -12,13 +12,14 @@ class StartProject(BaseStartProject):
        parser.add_argument('--python', help='The path to the python executable.')
        parser.add_argument('--celery', help='The path to the celery executable.')
        parser.add_argument('--gunicorn', help='The path to the gunicorn executable.')
+        parser.add_argument('--memmon', help='The path to the memmon executable.')


 def create_project(parser, options, args):
    # Validate args
    if len(args) < 2:
        parser.error("Please specify a name for your Alliance Auth installation.")
-    elif len(args) > 3:
+    elif len(args) > 4:
        parser.error("Too many arguments.")

    # First find the path to Alliance Auth
@ -32,6 +33,7 @@ def create_project(parser, options, args):
        'python': shutil.which('python'),
        'gunicorn': shutil.which('gunicorn'),
        'celery': shutil.which('celery'),
+        'memmon': shutil.which('memmon'),
        'extensions': ['py', 'conf', 'json'],
    }

--- a/allianceauth/checks.py
+++ b/allianceauth/checks.py
@ -0,0 +1,562 @@
+"""
+Django system checks for Alliance Auth
+"""
+
+from typing import List
+from django import db
+from django.core.checks import CheckMessage, Error, register, Warning
+from allianceauth.utils.cache import get_redis_client
+from django.utils import timezone
+from packaging.version import InvalidVersion, Version as Pep440Version
+from celery import current_app
+from django.conf import settings
+from sqlite3.dbapi2 import sqlite_version_info
+
+"""
+A = System Packages
+B = Configuration
+"""
+
+
+@register()
+def django_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that Django settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: List[CheckMessage] = []
+
+    # Check for SITE_URL
+    if hasattr(settings, "SITE_URL"):
+        # Check if SITE_URL is empty
+        if settings.SITE_URL == "":
+            errors.append(
+                Error(
+                    msg="'SITE_URL' is empty.",
+                    hint="Make sure to set 'SITE_URL' to the URL of your Auth instance. (Without trailing slash)",
+                    id="allianceauth.checks.B011",
+                )
+            )
+        # Check if SITE_URL has a trailing slash
+        elif settings.SITE_URL[-1] == "/":
+            errors.append(
+                Warning(
+                    msg="'SITE_URL' has a trailing slash. This may lead to incorrect links being generated by Auth.",
+                    hint="",
+                    id="allianceauth.checks.B005",
+                )
+            )
+    # SITE_URL not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.",
+                hint="",
+                id="allianceauth.checks.B006",
+            )
+        )
+
+    # Check for CSRF_TRUSTED_ORIGINS
+    if hasattr(settings, "CSRF_TRUSTED_ORIGINS") and hasattr(settings, "SITE_URL"):
+        # Check if SITE_URL is not in CSRF_TRUSTED_ORIGINS
+        if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
+            errors.append(
+                Warning(
+                    msg="'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.",
+                    hint="",
+                    id="allianceauth.checks.B007",
+                )
+            )
+    # CSRF_TRUSTED_ORIGINS not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified",
+                hint="",
+                id="allianceauth.checks.B008",
+            )
+        )
+
+    # Check for ESI_USER_CONTACT_EMAIL
+    if hasattr(settings, "ESI_USER_CONTACT_EMAIL"):
+        # Check if ESI_USER_CONTACT_EMAIL is empty
+        if settings.ESI_USER_CONTACT_EMAIL == "":
+            errors.append(
+                Error(
+                    msg="'ESI_USER_CONTACT_EMAIL' is empty. A valid email is required as maintainer contact for CCP.",
+                    hint="",
+                    id="allianceauth.checks.B009",
+                )
+            )
+    # ESI_USER_CONTACT_EMAIL not found
+    else:
+        errors.append(
+            Error(
+                msg="No 'ESI_USER_CONTACT_EMAIL' found is settings. A valid email is required as maintainer contact for CCP.",
+                hint="",
+                id="allianceauth.checks.B010",
+            )
+        )
+
+    return errors
+
+
+@register()
+def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that Redis is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    allianceauth_redis_install_link = "https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools"
+
+    errors: List[CheckMessage] = []
+
+    try:
+        redis_version = Pep440Version(get_redis_client().info()["redis_version"])
+    except InvalidVersion:
+        errors.append(Warning("Unable to confirm Redis Version"))
+
+        return errors
+
+    if (
+        redis_version.major == 7
+        and redis_version.minor == 2
+        and timezone.now()
+        > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
+    ):
+        errors.append(
+            Error(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A001",
+            )
+        )
+    elif redis_version.major == 7 and redis_version.minor == 0:
+        errors.append(
+            Warning(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A002",
+            )
+        )
+    elif redis_version.major == 6 and redis_version.minor == 2:
+        errors.append(
+            Warning(
+                msg=f"Redis {redis_version.public} in Security Support only, Updating Suggested",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A018",
+            )
+        )
+    elif redis_version.major in [6, 5]:
+        errors.append(
+            Error(
+                msg=f"Redis {redis_version.public} EOL",
+                hint=allianceauth_redis_install_link,
+                id="allianceauth.checks.A003",
+            )
+        )
+
+    return errors
+
+
+@register()
+def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that MySQL is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    mysql_quick_guide_link = "https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/"
+
+    errors: List[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":
+            try:
+                mysql_version = Pep440Version(
+                    ".".join(str(i) for i in connection.mysql_version)
+                )
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm MySQL Version"))
+
+                return errors
+
+            #  MySQL 8
+            if mysql_version.major == 8:
+                if mysql_version.minor == 4 and timezone.now() > timezone.datetime(
+                    year=2032, month=4, day=30, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A004",
+                        )
+                    )
+                elif mysql_version.minor == 3:
+                    errors.append(
+                        Warning(
+                            msg=f"MySQL {mysql_version.public} Non LTS",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A005",
+                        )
+                    )
+                elif mysql_version.minor == 2:
+                    errors.append(
+                        Warning(
+                            msg=f"MySQL {mysql_version.public} Non LTS",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A006",
+                        )
+                    )
+                elif mysql_version.minor == 1:
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A007",
+                        )
+                    )
+                elif mysql_version.minor == 0 and timezone.now() > timezone.datetime(
+                    year=2026, month=4, day=30, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A008",
+                        )
+                    )
+
+            # MySQL below 8
+            # This will also catch Mariadb 5.x
+            elif mysql_version.major < 8:
+                errors.append(
+                    Error(
+                        msg=f"MySQL or MariaDB {mysql_version.public} EOL",
+                        hint=mysql_quick_guide_link,
+                        id="allianceauth.checks.A009",
+                    )
+                )
+
+    return errors
+
+
+@register()
+def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that MariaDB is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    mariadb_download_link = "https://mariadb.org/download/?t=repo-config"
+
+    errors: List[CheckMessage] = []
+
+    for connection in db.connections.all():
+        # TODO: Find a way to determine MySQL vs. MariaDB
+        if connection.vendor == "mysql":
+            try:
+                mariadb_version = Pep440Version(
+                    ".".join(str(i) for i in connection.mysql_version)
+                )
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm MariaDB Version"))
+
+                return errors
+
+            # MariaDB 11
+            if mariadb_version.major == 11:
+                if mariadb_version.minor == 4 and timezone.now() > timezone.datetime(
+                    year=2029, month=5, day=19, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A010",
+                        )
+                    )
+                elif mariadb_version.minor == 2:
+                    errors.append(
+                        Warning(
+                            msg=f"MariaDB {mariadb_version.public} Non LTS",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A018",
+                        )
+                    )
+
+                    if timezone.now() > timezone.datetime(
+                        year=2024, month=11, day=21, tzinfo=timezone.utc
+                    ):
+                        errors.append(
+                            Error(
+                                msg=f"MariaDB {mariadb_version.public} EOL",
+                                hint=mariadb_download_link,
+                                id="allianceauth.checks.A011",
+                            )
+                        )
+                elif mariadb_version.minor == 1:
+                    errors.append(
+                        Warning(
+                            msg=f"MariaDB {mariadb_version.public} Non LTS",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A019",
+                        )
+                    )
+
+                    if timezone.now() > timezone.datetime(
+                        year=2024, month=8, day=21, tzinfo=timezone.utc
+                    ):
+                        errors.append(
+                            Error(
+                                msg=f"MariaDB {mariadb_version.public} EOL",
+                                hint=mariadb_download_link,
+                                id="allianceauth.checks.A012",
+                            )
+                        )
+                # Demote versions down here once EOL
+                elif mariadb_version.minor in [0, 3]:
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A013",
+                        )
+                    )
+
+            # MariaDB 10
+            elif mariadb_version.major == 10:
+                if mariadb_version.minor == 11 and timezone.now() > timezone.datetime(
+                    year=2028, month=2, day=10, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A014",
+                        )
+                    )
+                elif mariadb_version.minor == 6 and timezone.now() > timezone.datetime(
+                    year=2026, month=7, day=6, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A0015",
+                        )
+                    )
+                elif mariadb_version.minor == 5 and timezone.now() > timezone.datetime(
+                    year=2025, month=6, day=24, tzinfo=timezone.utc
+                ):
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A016",
+                        )
+                    )
+                # Demote versions down here once EOL
+                elif mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:
+                    errors.append(
+                        Error(
+                            msg=f"MariaDB {mariadb_version.public} EOL",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A017",
+                        )
+                    )
+
+    return errors
+
+
+@register()
+def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that SQLite is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: List[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "sqlite":
+            try:
+                sqlite_version = Pep440Version(
+                    ".".join(str(i) for i in sqlite_version_info)
+                )
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm SQLite Version"))
+
+                return errors
+            if sqlite_version.major == 3 and sqlite_version.minor < 27:
+                errors.append(
+                    Error(
+                        msg=f"SQLite {sqlite_version.public} Unsupported by Django",
+                        hint="https://pkgs.org/download/sqlite3",
+                        id="allianceauth.checks.A020",
+                    )
+                )
+
+    return errors
+
+
+@register()
+def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that SQL settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: List[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":
+            try:
+                if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
+                    errors.append(
+                        Error(
+                            msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
+                            hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+                            id="allianceauth.checks.B001",
+                        )
+                    )
+            except KeyError:
+                errors.append(
+                    Error(
+                        msg=f"SQL Charset is not set to utf8mb4 DB: {connection.alias}",
+                        hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+                        id="allianceauth.checks.B001",
+                    )
+                )
+
+            # This hasn't actually been set on AA yet
+            # try:
+            #     if (
+            #         connection.settings_dict["OPTIONS"]["collation"]
+            #         != "utf8mb4_unicode_ci"
+            #     ):
+            #         errors.append(
+            #             Error(
+            #                 msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
+            #                 hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+            #                 id="allianceauth.checks.B001",
+            #             )
+            #         )
+            # except KeyError:
+            #     errors.append(
+            #         Error(
+            #             msg=f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}",
+            #             hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8",
+            #             id="allianceauth.checks.B001",
+            #         )
+            #     )
+
+        # if connection.vendor == "sqlite":
+
+    return errors
+
+
+@register()
+def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    """
+    Check that Celery settings are correctly configured
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
+    """
+
+    errors: List[CheckMessage] = []
+
+    try:
+        if current_app.conf.broker_transport_options != {
+            "priority_steps": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+            "queue_order_strategy": "priority",
+        }:
+            errors.append(
+                Error(
+                    msg="Celery Priorities are not set correctly",
+                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
+                    id="allianceauth.checks.B003",
+                )
+            )
+    except KeyError:
+        errors.append(
+            Error(
+                msg="Celery Priorities are not set",
+                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc",
+                id="allianceauth.checks.B003",
+            )
+        )
+
+    try:
+        if not current_app.conf.broker_connection_retry_on_startup:
+            errors.append(
+                Error(
+                    msg="Celery broker_connection_retry_on_startup not set correctly",
+                    hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
+                    id="allianceauth.checks.B004",
+                )
+            )
+    except KeyError:
+        errors.append(
+            Error(
+                msg="Celery broker_connection_retry_on_startup not set",
+                hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280",
+                id="allianceauth.checks.B004",
+            )
+        )
+
+    return errors
+
+
+# IDEAS
+
+# Any other celery things weve manually changed over the years
+# I'd be happy to add Community App checks, old versions the owners dont want to support etc.
+
+
+# Check Default Collation on DB
+# Check Charset Collation on all tables
--- a/allianceauth/corputils/apps.py
+++ b/allianceauth/corputils/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class CorpUtilsConfig(AppConfig):
    name = 'allianceauth.corputils'
    label = 'corputils'
+    verbose_name = _('Corporation Stats')
--- 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
@ -9,7 +10,7 @@ class CorpStats(MenuItemHook):
        MenuItemHook.__init__(
            self,
            _('Corporation Stats'),
-            'fas fa-share-alt fa-fw',
+            'fa-solid fa-share-nodes',
            'corputils:view',
            navactive=['corputils:']
        )
--- a/allianceauth/corputils/models.py
+++ b/allianceauth/corputils/models.py
@ -1,5 +1,6 @@
 import logging
 import os
+from typing import ClassVar

 from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
@ -40,9 +41,9 @@ class CorpStats(models.Model):
        verbose_name = "corp stats"
        verbose_name_plural = "corp stats"

-    objects = CorpStatsManager()
+    objects: ClassVar[CorpStatsManager] = CorpStatsManager()

-    def __str__(self):
+    def __str__(self) -> str:
        return f"{self.__class__.__name__} for {self.corp}"

    def update(self):
--- a/allianceauth/corputils/templates/corputils/base.html
+++ b/allianceauth/corputils/templates/corputils/base.html
@ -1,37 +1,63 @@
-{% extends 'allianceauth/base.html' %}
+{% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
-{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %}
-{% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
-        <div class="col-lg-10 col-lg-offset-1 container">
-            <nav class="navbar navbar-default">
-                <div class="container-fluid">
-                    <ul class="nav navbar-nav">
-                        <li class="dropdown">
-                            <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
-                            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+
+{% block page_title %}
+    {% translate "Corporation Member Data" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Corporation Member Data" %}
+{% endblock header_nav_brand %}
+
+{% block header_nav_collapse_left %}
+    <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
+            {% translate "Corporations" %}
+        </a>
+
+        <ul class="dropdown-menu">
            {% for corpstat in available %}
                <li>
-                                        <a href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">{{ corpstat.corp.corporation_name }}</a>
+                    <a class="dropdown-item" href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">
+                        {{ corpstat.corp.corporation_name }}
+                    </a>
                </li>
            {% endfor %}
-                            </ul>
-                        </li>
+
            {% if perms.corputils.add_corpstats %}
+                {% if available.count >= 1 %}
+                    <li>&nbsp;</li>
+                {% endif %}
+
                <li>
-                                <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
+                    <a class="dropdown-item" href="{% url 'corputils:add' %}">
+                        {% translate "Add corporation" %}
+                    </a>
                </li>
            {% endif %}
        </ul>
+    </li>
+{% endblock %}
+
+{% block header_nav_collapse_right %}
+    <li class="nav-item">
        <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 %}
-        </div>
-    </div>
+    </li>
 {% endblock %}
+
+{% block content %}
+    <div>
+        {% block member_data %}
+        {% endblock member_data %}
+    </div>
+{% endblock content %}
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@ -1,93 +1,144 @@
 {% extends 'corputils/base.html' %}
+
+{% load aa_i18n %}
 {% load i18n %}
 {% load humanize %}
+
 {% block member_data %}
    {% if corpstats %}
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <table class="table">
+        <div>
+            <table class="table text-center">
                <tr>
-                        <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
+                    <td>
                        <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}" alt="{{ corpstats.corp.corporation_name }}">
                    </td>
+
                    {% if corpstats.corp.alliance %}
-                            <td class="text-center col-lg-6">
+                        <td>
                            <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}" alt="{{ corpstats.corp.alliance.alliance_name }}">
                        </td>
                    {% endif %}
                </tr>
+
                <tr>
-                        <td class="text-center"><h4>{{ corpstats.corp.corporation_name }}</h4></td>
+                    <td><p class="h4">{{ corpstats.corp.corporation_name }}</p></td>
+
                    {% if corpstats.corp.alliance %}
-                            <td class="text-center"><h4>{{ corpstats.corp.alliance.alliance_name }}</h4></td>
+                        <td><p class="h4">{{ corpstats.corp.alliance.alliance_name }}</p></td>
                    {% endif %}
                </tr>
            </table>
        </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <ul class="nav nav-pills pull-left">
-                            <li class="active"><a href="#mains" data-toggle="pill">{% translate 'Mains' %} ({{ total_mains }})</a></li>
-                            <li><a href="#members" data-toggle="pill">{% translate 'Members' %} ({{ corpstats.member_count }})</a></li>
-                            <li><a href="#unregistered" data-toggle="pill">{% translate 'Unregistered' %} ({{ unregistered.count }})</a></li>
+
+        <div class="card card-default mt-4">
+            <div class="card-header clearfix" role="tablist">
+                <ul class="nav nav-pills float-start">
+                    <li class="nav-item" role="presentation">
+                        <a
+                            class="nav-link active"
+                            id="mains"
+                            data-bs-toggle="tab"
+                            href="#tab-mains"
+                            role="tab"
+                            aria-controls="tab-mains"
+                            aria-selected="true"
+                        >
+                            {% translate 'Mains' %} ({{ total_mains }})
+                        </a>
+                    </li>
+
+                    <li class="nav-item" role="presentation">
+                        <a
+                            class="nav-link"
+                            id="members"
+                            data-bs-toggle="tab"
+                            href="#tab-members"
+                            role="tab"
+                            aria-controls="tab-members"
+                            aria-selected="false"
+                        >
+                            {% translate 'Members' %} ({{ corpstats.member_count }})
+                        </a>
+                    </li>
+
+                    <li class="nav-item">
+                        <a
+                            class="nav-link"
+                            id="unregistered"
+                            data-bs-toggle="tab"
+                            href="#tab-unregistered"
+                            role="tab"
+                            aria-controls="tab-unregistered"
+                            aria-selected="false"
+                        >
+                            {% translate 'Unregistered' %} ({{ unregistered.count }})
+                        </a>
+                    </li>
                </ul>
-                        <div class="pull-right hidden-xs">
-                            {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
-                            <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
-                                <span class="glyphicon glyphicon-refresh"></span>
+
+                <div class="float-end d-none d-sm-block">
+                    {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}
+
+                    <a
+                        class="btn btn-success btn-sm ms-2"
+                        type="button"
+                        href="{% url 'corputils:update' corpstats.corp.corporation_id %}"
+                        title="{% translate 'Update Now' %}"
+                    >
+                        <i class="fa-solid fa-rotate"></i>
                    </a>
                </div>
-                        <div class="clearfix"></div>
            </div>
-                    <div class="panel-body">
+
+            <div class="card-body">
                <div class="tab-content">
-                            <div class="tab-pane fade in active" id="mains">
+                    <div class="tab-pane fade show active" id="tab-mains" role="tabpanel" aria-labelledby="tab-mains">
                        {% if mains %}
                            <div class="table-responsive">
                                <table class="table table-hover" id="table-mains">
                                    <thead>
                                        <tr>
-                                                    <th style="height:1em;"><!-- Must have text or height to prevent clipping --></th>
-                                                    <th></th>
+                                            <th>{% translate "Main character" %}</th>
+                                            <th>{% translate "Registered characters" %}</th>
                                        </tr>
                                    </thead>
+
                                    <tbody>
                                        {% for id, main in mains.items %}
                                            <tr>
-                                                        <td class="text-center" style="vertical-align:middle">
+                                                <td class="text-center" style="vertical-align: middle;">
                                                    <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
                                                        <img src="{{ main.main.portrait_url_64 }}" class="img-circle" alt="{{ main.main }}">
-                                                                <div class="caption text-center">
+                                                        <div class="caption">
                                                            {{ main.main }}
                                                        </div>
                                                    </div>
                                                </td>
+
                                                <td>
                                                    <table class="table table-hover">
-                                                                {% for alt in main.alts %}
+                                                        {% for alt in main.alts|dictsort:"character_name" %}
                                                            {% if forloop.first %}
                                                                <tr>
                                                                    <th></th>
-                                                                            <th class="text-center">{% translate "Character" %}</th>
-                                                                            <th class="text-center">{% translate "Corporation" %}</th>
-                                                                            <th class="text-center">{% translate "Alliance" %}</th>
-                                                                            <th class="text-center"></th>
+                                                                    <th>{% translate "Character" %}</th>
+                                                                    <th>{% translate "Corporation" %}</th>
+                                                                    <th>{% translate "Alliance" %}</th>
+                                                                    <th></th>
                                                                </tr>
                                                            {% endif %}
+
                                                            <tr>
-                                                                        <td class="text-center" style="width:5%">
+                                                                <td style="width: 5%;">
                                                                    <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
                                                                        <img src="{{ alt.portrait_url_32 }}" class="img-circle" alt="{{ alt.character_name }}">
                                                                    </div>
                                                                </td>
-                                                                        <td class="text-center" style="width:30%">{{ alt.character_name }}</td>
-                                                                        <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">
+                                                                <td style="width: 30%;">{{ alt.character_name }}</td>
+                                                                <td style="width: 30%;">{{ alt.corporation_name }}</td>
+                                                                <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
+                                                                <td style="width: 5%;">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                                        {% translate "Killboard" %}
                                                                    </a>
                                                                </td>
@ -102,43 +153,46 @@
                            </div>
                        {% endif %}
                    </div>
-                            <div class="tab-pane fade" id="members">
+
+                    <div class="tab-pane fade" id="tab-members" role="tabpanel" aria-labelledby="tab-members">
                        {% if members %}
                            <div class="table-responsive">
                                <table class="table table-hover" id="table-members">
                                    <thead>
                                        <tr>
                                            <th></th>
-                                                    <th class="text-center">{% translate "Character" %}</th>
-                                                    <th class="text-center"></th>
-                                                    <th class="text-center">{% translate "Main Character" %}</th>
-                                                    <th class="text-center">{% translate "Main Corporation" %}</th>
-                                                    <th class="text-center">{% translate "Main Alliance" %}</th>
+                                            <th>{% translate "Character" %}</th>
+                                            <th></th>
+                                            <th>{% translate "Main Character" %}</th>
+                                            <th>{% translate "Main Corporation" %}</th>
+                                            <th>{% translate "Main Alliance" %}</th>
                                        </tr>
                                    </thead>
+
                                    <tbody>
                                        {% for member in members %}
                                            <tr>
                                                <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>
+                                                <td>{{ member }}</td>
+                                                <td>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-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>
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.alliance_name }}</td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.alliance_name|default_if_none:""  }}</td>
                                            </tr>
                                        {% endfor %}
+
                                        {% for member in unregistered %}
-                                                    <tr class="danger">
+                                            <tr class="table-danger">
                                                <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>
+                                                <td>{{ member.character_name }}</td>
+                                                <td>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                </td>
-                                                        <td class="text-center"></td>
-                                                        <td class="text-center"></td>
-                                                        <td class="text-center"></td>
+                                                <td></td>
+                                                <td></td>
+                                                <td></td>
                                            </tr>
                                        {% endfor %}
                                    </tbody>
@ -146,24 +200,26 @@
                            </div>
                        {% endif %}
                    </div>
-                            <div class="tab-pane fade" id="unregistered">
+
+                    <div class="tab-pane fade" id="tab-unregistered" role="tabpanel" aria-labelledby="tab-unregistered">
                        {% if unregistered %}
                            <div class="table-responsive">
                                <table class="table table-hover" id="table-unregistered">
                                    <thead>
                                        <tr>
                                            <th></th>
-                                                    <th class="text-center">{% translate "Character" %}</th>
-                                                    <th class="text-center"></th>
+                                            <th>{% translate "Character" %}</th>
+                                            <th></th>
                                        </tr>
                                    </thead>
+
                                    <tbody>
                                        {% for member in unregistered %}
-                                                    <tr class="danger">
+                                            <tr class="table-danger">
                                                <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">
+                                                <td>{{ member.character_name }}</td>
+                                                <td>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                        {% translate "Killboard" %}
                                                    </a>
                                                </td>
@ -177,35 +233,27 @@
                </div>
            </div>
        </div>
-            </div>
-        </div>
    {% endif %}
 {% endblock %}
+
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-{% endblock %}
-{% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
-{% block extra_script %}
-    $(document).ready(function(){
+    {% include 'bundles/datatables-js-bs5.html' %}
+
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
+    <script>
+        $(document).ready(() => {
            $('#table-mains').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                "columnDefs": [
                    { "sortable": false, "targets": [1] },
                ],
                "stateSave": true,
                "stateDuration": 0
            });
+
            $('#table-members').DataTable({
-            "columnDefs": [
-                { "searchable": false, "targets": [0, 2] },
-                { "sortable": false, "targets": [0, 2] },
-            ],
-            "order": [[ 1, "asc" ]],
-            "stateSave": true,
-            "stateDuration": 0
-        });
-        $('#table-unregistered').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                "columnDefs": [
                    { "searchable": false, "targets": [0, 2] },
                    { "sortable": false, "targets": [0, 2] },
@ -215,5 +263,20 @@
                "stateDuration": 0
            });

+            $('#table-unregistered').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
+                "columnDefs": [
+                    { "searchable": false, "targets": [0, 2] },
+                    { "sortable": false, "targets": [0, 2] },
+                ],
+                "order": [[ 1, "asc" ]],
+                "stateSave": true,
+                "stateDuration": 0
            });
+        });
+    </script>
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@ -1,33 +1,37 @@
 {% extends "corputils/base.html" %}
+
+{% load aa_i18n %}
 {% load i18n %}
+
 {% block member_data %}
-    <div class="panel panel-default">
-        <div class="panel-heading clearfix">
-            <div class="panel-title pull-left">{% translate "Search Results" %}</div>
+    <div class="card card-default">
+        <div class="card-header clearfix">
+            <div class="card-title">{% translate "Search Results" %}</div>
        </div>
-        <div class="panel-body">
+
+        <div class="card-body mt-2">
            <table class="table table-hover" id="table-search">
                <thead>
                    <tr>
-                        <th class="text-center"></th>
-                        <th class="text-center">{% translate "Character" %}</th>
-                        <th class="text-center">{% translate "Corporation" %}</th>
-                        <th class="text-center">{% translate "zKillboard" %}</th>
-                        <th class="text-center">{% translate "Main Character" %}</th>
-                        <th class="text-center">{% translate "Main Corporation" %}</th>
-                        <th class="text-center">{% translate "Main Alliance" %}</th>
+                        <th></th>
+                        <th>{% translate "Character" %}</th>
+                        <th>{% translate "Corporation" %}</th>
+                        <th>{% translate "zKillboard" %}</th>
+                        <th>{% translate "Main Character" %}</th>
+                        <th>{% translate "Main Corporation" %}</th>
+                        <th>{% translate "Main Alliance" %}</th>
                    </tr>
                </thead>
                <tbody>
                    {% for result in results %}
                        <tr {% if not result.1.registered %}class="danger"{% endif %}>
-                            <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">{{ 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>
+                            <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
+                            <td>{{ result.1.character_name }}</td>
+                            <td >{{ result.0.corp.corporation_name }}</td>
+                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td>{{ result.1.main_character.character_name }}</td>
+                            <td>{{ result.1.main_character.corporation_name }}</td>
+                            <td>{{ result.1.main_character.alliance_name }}</td>
                        </tr>
                    {% endfor %}
                </tbody>
@ -35,17 +39,23 @@
        </div>
    </div>
 {% endblock %}
+
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-{% endblock %}
-{% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
-{% block extra_script %}
-    $(document).ready(function(){
+    {% include 'bundles/datatables-js-bs5.html' %}
+
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
+    <script>
+        $(document).ready(() => {
            $('#table-search').DataTable({
+                "language": {"url": '{{ DT_LANG_PATH }}'},
                "stateSave": true,
                "stateDuration": 0
            });
        });
+    </script>
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
--- a/allianceauth/crontab/init.py
+++ b/allianceauth/crontab/init.py
@ -0,0 +1,3 @@
+"""
+Alliance Auth Crontab Utilities
+"""
--- a/allianceauth/crontab/apps.py
+++ b/allianceauth/crontab/apps.py
@ -0,0 +1,16 @@
+"""
+Crontab App Config
+"""
+
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class CrontabConfig(AppConfig):
+    """
+    Crontab App Config
+    """
+
+    name = "allianceauth.crontab"
+    label = "crontab"
+    verbose_name = _("Crontab")
--- a/allianceauth/crontab/migrations/0001_initial.py
+++ b/allianceauth/crontab/migrations/0001_initial.py
@ -0,0 +1,29 @@
+# Generated by Django 4.2.16 on 2025-01-20 06:16
+
+import allianceauth.crontab.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CronOffset',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('minute', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Minute Offset')),
+                ('hour', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Hour Offset')),
+                ('day_of_month', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Month Offset')),
+                ('month_of_year', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Month of Year Offset')),
+                ('day_of_week', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Week Offset')),
+            ],
+            options={
+                'verbose_name': 'Cron Offsets',
+            },
+        ),
+    ]
--- a/allianceauth/services/templatetags/init.py
+++ b/allianceauth/services/templatetags/init.py
--- a/allianceauth/crontab/models.py
+++ b/allianceauth/crontab/models.py
@ -0,0 +1,23 @@
+from random import random
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from solo.models import SingletonModel
+
+
+def random_default() -> float:
+    return random()
+
+
+class CronOffset(SingletonModel):
+
+    minute = models.FloatField(_("Minute Offset"), default=random_default)
+    hour = models.FloatField(_("Hour Offset"), default=random_default)
+    day_of_month = models.FloatField(_("Day of Month Offset"), default=random_default)
+    month_of_year = models.FloatField(_("Month of Year Offset"), default=random_default)
+    day_of_week = models.FloatField(_("Day of Week Offset"), default=random_default)
+
+    def __str__(self) -> str:
+        return "Cron Offsets"
+
+    class Meta:
+        verbose_name = "Cron Offsets"
--- a/allianceauth/crontab/schedulers.py
+++ b/allianceauth/crontab/schedulers.py
@ -0,0 +1,70 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django_celery_beat.schedulers import (
+    DatabaseScheduler
+)
+from django_celery_beat.models import CrontabSchedule
+from django.db.utils import OperationalError, ProgrammingError
+
+from celery import schedules
+from celery.utils.log import get_logger
+
+from allianceauth.crontab.models import CronOffset
+from allianceauth.crontab.utils import offset_cron
+
+logger = get_logger(__name__)
+
+
+class OffsetDatabaseScheduler(DatabaseScheduler):
+    """
+    Customization of Django Celery Beat, Database Scheduler
+    Takes the Celery Schedule from local.py and applies our AA Framework Cron Offset, if apply_offset is true
+    Otherwise it passes it through as normal
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+    def update_from_dict(self, mapping):
+        s = {}
+
+        try:
+            cron_offset = CronOffset.get_solo()
+        except (OperationalError, ProgrammingError, ObjectDoesNotExist) as exc:
+            # This is just incase we haven't migrated yet or something
+            logger.warning(
+                "OffsetDatabaseScheduler: Could not fetch CronOffset (%r). "
+                "Defering to DatabaseScheduler",
+                exc
+            )
+            return super().update_from_dict(mapping)
+
+        for name, entry_fields in mapping.items():
+            try:
+                apply_offset = entry_fields.pop("apply_offset", False)  # Ensure this pops before django tries to save to ORM
+                entry = self.Entry.from_entry(name, app=self.app, **entry_fields)
+
+                if apply_offset:
+                    entry_fields.update({"apply_offset": apply_offset})  # Reapply this as its gets pulled from config inconsistently.
+                    schedule_obj = entry.schedule
+                    if isinstance(schedule_obj, schedules.crontab):
+                        offset_cs = CrontabSchedule.from_schedule(offset_cron(schedule_obj))
+                        offset_cs, created = CrontabSchedule.objects.get_or_create(
+                            minute=offset_cs.minute,
+                            hour=offset_cs.hour,
+                            day_of_month=offset_cs.day_of_month,
+                            month_of_year=offset_cs.month_of_year,
+                            day_of_week=offset_cs.day_of_week,
+                            timezone=offset_cs.timezone,
+                        )
+                        entry.schedule = offset_cron(schedule_obj)  # This gets passed into Celery Beats Memory, important to keep it in sync with the model/DB
+                        entry.model.crontab = offset_cs
+                        entry.model.save()
+                        logger.debug(f"Offset applied for '{name}' due to 'apply_offset' = True.")
+
+                if entry.model.enabled:
+                    s[name] = entry
+
+            except Exception as e:
+                logger.exception("Error updating schedule for %s: %r", name, e)
+
+        self.schedule.update(s)
--- a/allianceauth/crontab/tests/init.py
+++ b/allianceauth/crontab/tests/init.py
--- a/allianceauth/crontab/tests/test_models.py
+++ b/allianceauth/crontab/tests/test_models.py
@ -0,0 +1,63 @@
+from unittest.mock import patch
+from django.test import TestCase
+
+from allianceauth.crontab.models import CronOffset
+
+
+class CronOffsetModelTest(TestCase):
+    def test_cron_offset_is_singleton(self):
+        """
+        Test that CronOffset is indeed a singleton and that
+        multiple calls to get_solo() return the same instance.
+        """
+        offset1 = CronOffset.get_solo()
+        offset2 = CronOffset.get_solo()
+
+        # They should be the exact same object in memory
+        self.assertEqual(offset1.pk, offset2.pk)
+
+    def test_default_values_random(self):
+        """
+        Test that the default values are set via random_default() when
+        no explicit value is provided. We'll patch 'random.random' to
+        produce predictable output.
+        """
+        with patch('allianceauth.crontab.models.random', return_value=0.1234):
+            # Force creation of a new CronOffset by clearing the existing one
+            CronOffset.objects.all().delete()
+
+            offset = CronOffset.get_solo()  # This triggers creation
+
+            # All fields should be 0.1234, because we patched random()
+            self.assertAlmostEqual(offset.minute, 0.1234)
+            self.assertAlmostEqual(offset.hour, 0.1234)
+            self.assertAlmostEqual(offset.day_of_month, 0.1234)
+            self.assertAlmostEqual(offset.month_of_year, 0.1234)
+            self.assertAlmostEqual(offset.day_of_week, 0.1234)
+
+    def test_update_offset_values(self):
+        """
+        Test that we can update the offsets and retrieve them.
+        """
+        offset = CronOffset.get_solo()
+        offset.minute = 0.5
+        offset.hour = 0.25
+        offset.day_of_month = 0.75
+        offset.month_of_year = 0.99
+        offset.day_of_week = 0.33
+        offset.save()
+
+        # Retrieve again to ensure changes persist
+        saved_offset = CronOffset.get_solo()
+        self.assertEqual(saved_offset.minute, 0.5)
+        self.assertEqual(saved_offset.hour, 0.25)
+        self.assertEqual(saved_offset.day_of_month, 0.75)
+        self.assertEqual(saved_offset.month_of_year, 0.99)
+        self.assertEqual(saved_offset.day_of_week, 0.33)
+
+    def test_str_representation(self):
+        """
+        Verify the __str__ method returns 'Cron Offsets'.
+        """
+        offset = CronOffset.get_solo()
+        self.assertEqual(str(offset), "Cron Offsets")
--- a/allianceauth/crontab/tests/test_utils.py
+++ b/allianceauth/crontab/tests/test_utils.py
@ -0,0 +1,80 @@
+# myapp/tests/test_tasks.py
+
+import logging
+from unittest.mock import patch
+from django.test import TestCase
+from django.db import ProgrammingError
+from celery.schedules import crontab
+
+from allianceauth.crontab.utils import offset_cron
+from allianceauth.crontab.models import CronOffset
+
+logger = logging.getLogger(__name__)
+
+
+class TestOffsetCron(TestCase):
+
+    def test_offset_cron_normal(self):
+        """
+        Test that offset_cron modifies the minute/hour fields
+        based on the CronOffset values when everything is normal.
+        """
+        # We'll create a mock CronOffset instance
+        mock_offset = CronOffset(minute=0.5, hour=0.5)
+
+        # Our initial crontab schedule
+        original_schedule = crontab(
+            minute=[0, 5, 55],
+            hour=[0, 3, 23],
+            day_of_month='*',
+            month_of_year='*',
+            day_of_week='*'
+        )
+
+        # Patch CronOffset.get_solo to return our mock offset
+        with patch('allianceauth.crontab.models.CronOffset.get_solo', return_value=mock_offset):
+            new_schedule = offset_cron(original_schedule)
+
+        # Check the new minute/hour
+        # minute 0 -> 0 + round(60 * 0.5) = 30 % 60 = 30
+        # minute 5 -> 5 + 30 = 35 % 60 = 35
+        # minute 55 -> 55 + 30 = 85 % 60 = 25  --> sorted => 25,30,35
+        self.assertEqual(new_schedule._orig_minute, '25,30,35')
+
+        # hour 0 -> 0 + round(24 * 0.5) = 12 % 24 = 12
+        # hour 3 -> 3 + 12 = 15 % 24 = 15
+        # hour 23 -> 23 + 12 = 35 % 24 = 11 --> sorted => 11,12,15
+        self.assertEqual(new_schedule._orig_hour, '11,12,15')
+
+        # Check that other fields are unchanged
+        self.assertEqual(new_schedule._orig_day_of_month, '*')
+        self.assertEqual(new_schedule._orig_month_of_year, '*')
+        self.assertEqual(new_schedule._orig_day_of_week, '*')
+
+    def test_offset_cron_programming_error(self):
+        """
+        Test that if a ProgrammingError is raised (e.g. before migrations),
+        offset_cron just returns the original schedule.
+        """
+        original_schedule = crontab(minute=[0, 15, 30], hour=[1, 2, 3])
+
+        # Force get_solo to raise ProgrammingError
+        with patch('allianceauth.crontab.models.CronOffset.get_solo', side_effect=ProgrammingError()):
+            new_schedule = offset_cron(original_schedule)
+
+        # Should return the original schedule unchanged
+        self.assertEqual(new_schedule, original_schedule)
+
+    def test_offset_cron_unexpected_exception(self):
+        """
+        Test that if any other exception is raised, offset_cron
+        also returns the original schedule, and logs the error.
+        """
+        original_schedule = crontab(minute='0', hour='0')
+
+        # Force get_solo to raise a generic Exception
+        with patch('allianceauth.crontab.models.CronOffset.get_solo', side_effect=Exception("Something bad")):
+            new_schedule = offset_cron(original_schedule)
+
+        # Should return the original schedule unchanged
+        self.assertEqual(new_schedule, original_schedule)
--- a/allianceauth/crontab/utils.py
+++ b/allianceauth/crontab/utils.py
@ -0,0 +1,50 @@
+from celery.schedules import crontab
+import logging
+from allianceauth.crontab.models import CronOffset
+from django.db import ProgrammingError
+
+
+logger = logging.getLogger(__name__)
+
+
+def offset_cron(schedule: crontab) -> crontab:
+    """Take a crontab and apply a series of precalculated offsets to spread out tasks execution on remote resources
+
+    Args:
+        schedule (crontab): celery.schedules.crontab()
+
+    Returns:
+        crontab: A crontab with offsetted Minute and Hour fields
+    """
+
+    try:
+        cron_offset = CronOffset.get_solo()
+
+        # Stops this shit from happening 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+        # It is only cosmetic, but still annoying
+        if schedule._orig_minute == '*':
+            new_minute = '*'
+        else:
+            new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
+        if schedule._orig_hour == '*':
+            new_hour = '*'
+        else:
+            new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]
+
+        return crontab(
+            minute=",".join(str(m) for m in sorted(new_minute)),
+            hour=",".join(str(h) for h in sorted(new_hour)),
+            day_of_month=schedule._orig_day_of_month,
+            month_of_year=schedule._orig_month_of_year,
+            day_of_week=schedule._orig_day_of_week)
+
+    except ProgrammingError as e:
+        # If this is called before migrations are run hand back the default schedule
+        # These offsets are stored in a Singleton Model,
+        logger.error(e)
+        return schedule
+
+    except Exception as e:
+        # We absolutely cant fail to hand back a schedule
+        logger.error(e)
+        return schedule
--- a/allianceauth/custom_css/init.py
+++ b/allianceauth/custom_css/init.py
@ -0,0 +1,3 @@
+"""
+Initializes the custom_css module.
+"""
--- a/allianceauth/custom_css/admin.py
+++ b/allianceauth/custom_css/admin.py
@ -0,0 +1,25 @@
+"""
+Admin classes for custom_css app
+"""
+
+# Django
+from django.contrib import admin
+
+# Django Solos
+from solo.admin import SingletonModelAdmin
+
+# Alliance Auth Custom CSS
+from allianceauth.custom_css.models import CustomCSS
+from allianceauth.custom_css.forms import CustomCSSAdminForm
+
+
+@admin.register(CustomCSS)
+class CustomCSSAdmin(SingletonModelAdmin):
+    """
+    Custom CSS Admin
+    """
+
+    form = CustomCSSAdminForm
+
+    # Leave this here for when we decide to add syntax highlighting to the CSS editor
+    # change_form_template = 'custom_css/admin/change_form.html'
--- a/allianceauth/custom_css/apps.py
+++ b/allianceauth/custom_css/apps.py
@ -0,0 +1,13 @@
+"""
+Django app configuration for custom_css
+"""
+
+# Django
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class CustomCSSConfig(AppConfig):
+    name = "allianceauth.custom_css"
+    label = "custom_css"
+    verbose_name = _("Custom CSS")
--- a/allianceauth/custom_css/forms.py
+++ b/allianceauth/custom_css/forms.py
@ -0,0 +1,29 @@
+"""
+Forms for custom_css app
+"""
+
+# Alliance Auth Custom CSS
+from allianceauth.custom_css.models import CustomCSS
+from allianceauth.custom_css.widgets import CssEditorWidget
+
+# Django
+from django import forms
+
+
+class CustomCSSAdminForm(forms.ModelForm):
+    """
+    Form for editing custom CSS
+    """
+
+    class Meta:
+        model = CustomCSS
+        fields = ("css",)
+        widgets = {
+            "css": CssEditorWidget(
+                attrs={
+                    "style": "width: 90%; height: 100%;",
+                    "data-editor": "code-highlight",
+                    "data-language": "css",
+                }
+            )
+        }
--- a/allianceauth/custom_css/migrations/0001_initial.py
+++ b/allianceauth/custom_css/migrations/0001_initial.py
@ -0,0 +1,42 @@
+# Generated by Django 4.2.15 on 2024-08-14 11:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="CustomCSS",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "css",
+                    models.TextField(
+                        blank=True,
+                        help_text="This CSS will be added to the site after the default CSS.",
+                        null=True,
+                        verbose_name="Your custom CSS",
+                    ),
+                ),
+                ("timestamp", models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                "verbose_name": "Custom CSS",
+                "verbose_name_plural": "Custom CSS",
+                "default_permissions": (),
+            },
+        ),
+    ]
--- a/allianceauth/custom_css/migrations/init.py
+++ b/allianceauth/custom_css/migrations/init.py
--- a/allianceauth/custom_css/models.py
+++ b/allianceauth/custom_css/models.py
@ -0,0 +1,143 @@
+"""
+Models for the custom_css app
+"""
+
+import os
+import re
+
+# Django Solo
+from solo.models import SingletonModel
+
+# Django
+from django.conf import settings
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+class CustomCSS(SingletonModel):
+    """
+    Model for storing custom CSS for the site
+    """
+
+    css = models.TextField(
+        blank=True,
+        null=True,
+        verbose_name=_("Your custom CSS"),
+        help_text=_("This CSS will be added to the site after the default CSS."),
+    )
+    timestamp = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        """
+        Meta for CustomCSS
+        """
+
+        default_permissions = ()
+        verbose_name = _("Custom CSS")
+        verbose_name_plural = _("Custom CSS")
+
+    def __str__(self) -> str:
+        """
+        String representation of CustomCSS
+
+        :return:
+        :rtype:
+        """
+
+        return str(_("Custom CSS"))
+
+    def save(self, *args, **kwargs):
+        """
+        Save method for CustomCSS
+
+        :param args:
+        :type args:
+        :param kwargs:
+        :type kwargs:
+        :return:
+        :rtype:
+        """
+
+        self.pk = 1
+
+        if self.css and len(self.css.replace(" ", "")) > 0:
+            # Write the custom CSS to a file
+            custom_css_file = open(
+                f"{settings.STATIC_ROOT}allianceauth/custom-styles.css", "w+"
+            )
+            custom_css_file.write(self.compress_css())
+            custom_css_file.close()
+        else:
+            # Remove the custom CSS file
+            try:
+                os.remove(f"{settings.STATIC_ROOT}allianceauth/custom-styles.css")
+            except FileNotFoundError:
+                pass
+
+        super().save(*args, **kwargs)
+
+    def compress_css(self) -> str:
+        """
+        Compress CSS
+
+        :return:
+        :rtype:
+        """
+
+        css = self.css
+        new_css = ""
+
+        # Remove comments
+        css = re.sub(pattern=r"\s*/\*\s*\*/", repl="$$HACK1$$", string=css)
+        css = re.sub(pattern=r"/\*[\s\S]*?\*/", repl="", string=css)
+        css = css.replace("$$HACK1$$", "/**/")
+
+        # url() doesn't need quotes
+        css = re.sub(pattern=r'url\((["\'])([^)]*)\1\)', repl=r"url(\2)", string=css)
+
+        # Spaces may be safely collapsed as generated content will collapse them anyway.
+        css = re.sub(pattern=r"\s+", repl=" ", string=css)
+
+        # Shorten collapsable colors: #aabbcc to #abc
+        css = re.sub(
+            pattern=r"#([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3(\s|;)",
+            repl=r"#\1\2\3\4",
+            string=css,
+        )
+
+        # Fragment values can loose zeros
+        css = re.sub(
+            pattern=r":\s*0(\.\d+([cm]m|e[mx]|in|p[ctx]))\s*;", repl=r":\1;", string=css
+        )
+
+        for rule in re.findall(pattern=r"([^{]+){([^}]*)}", string=css):
+            # We don't need spaces around operators
+            selectors = [
+                re.sub(
+                    pattern=r"(?<=[\[\(>+=])\s+|\s+(?=[=~^$*|>+\]\)])",
+                    repl=r"",
+                    string=selector.strip(),
+                )
+                for selector in rule[0].split(",")
+            ]
+
+            # Order is important, but we still want to discard repetitions
+            properties = {}
+            porder = []
+
+            for prop in re.findall(pattern="(.*?):(.*?)(;|$)", string=rule[1]):
+                key = prop[0].strip().lower()
+
+                if key not in porder:
+                    porder.append(key)
+
+                properties[key] = prop[1].strip()
+
+            # output rule if it contains any declarations
+            if properties:
+                new_css += "{}{{{}}}".format(
+                    ",".join(selectors),
+                    "".join([f"{key}:{properties[key]};" for key in porder])[:-1],
+                )
+
+        return new_css
--- a/allianceauth/custom_css/templates/custom_css/admin/change_form.html
+++ b/allianceauth/custom_css/templates/custom_css/admin/change_form.html
@ -0,0 +1,48 @@
+{% extends "admin/change_form.html" %}
+
+{% block field_sets %}
+    {% for fieldset in adminform %}
+        <fieldset class="module aligned {{ fieldset.classes }}">
+            {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
+
+            {% if fieldset.description %}
+                <div class="description">{{ fieldset.description|safe }}</div>
+            {% endif %}
+
+            {% for line in fieldset %}
+                <div class="form-row{% if line.fields|length == 1 and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
+                    {% if line.fields|length == 1 %}{{ line.errors }}{% else %}<div class="flex-container form-multiline">{% endif %}
+
+                    {% for field in line %}
+                        <div>
+                            {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
+
+                            <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+                                {% if field.is_checkbox %}
+                                    {{ field.field }}{{ field.label_tag }}
+                                {% else %}
+                                    {{ field.label_tag }}
+                                    {% if field.is_readonly %}
+                                        <div class="readonly">{{ field.contents }}</div>
+                                    {% else %}
+                                        {{ field.field }}
+                                    {% endif %}
+                                {% endif %}
+                            </div>
+
+                            {% if field.field.help_text %}
+                                <div class="help"{% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
+                                    <div>{{ field.field.help_text|safe }}</div>
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% endfor %}
+
+                    {% if not line.fields|length == 1 %}</div>{% endif %}
+                </div>
+            {% endfor %}
+        </fieldset>
+    {% endfor %}
+{% endblock %}
+
+{% block after_field_sets %}{% endblock %}
--- a/allianceauth/custom_css/templates/custom_css/bundles/custom-css.html
+++ b/allianceauth/custom_css/templates/custom_css/bundles/custom-css.html
@ -0,0 +1,3 @@
+{% load custom_css %}
+
+{% custom_css_static 'allianceauth/custom-styles.css' %}
--- a/allianceauth/custom_css/templatetags/init.py
+++ b/allianceauth/custom_css/templatetags/init.py
@ -0,0 +1,3 @@
+"""
+Init file for custom_css templatetags
+"""
--- a/allianceauth/custom_css/templatetags/custom_css.py
+++ b/allianceauth/custom_css/templatetags/custom_css.py
@ -0,0 +1,48 @@
+"""
+Custom template tags for custom_css app
+"""
+
+# Alliance Auth Custom CSS
+from allianceauth.custom_css.models import CustomCSS
+
+# Django
+from django.conf import settings
+from django.template.defaulttags import register
+from django.templatetags.static import static
+from django.utils.safestring import mark_safe
+
+from pathlib import Path
+
+
+@register.simple_tag
+def custom_css_static(path: str) -> str:
+    """
+    Versioned static URL
+    This is to make sure to break the browser cache on CSS updates.
+
+    Example: /static/allianceauth/custom-styles.css?v=1234567890
+
+    :param path:
+    :type path:
+    :return:
+    :rtype:
+    """
+
+    try:
+        Path(f"{settings.STATIC_ROOT}{path}").resolve(strict=True)
+    except FileNotFoundError:
+        return ""
+    else:
+        try:
+            custom_css = CustomCSS.objects.get(pk=1)
+        except CustomCSS.DoesNotExist:
+            return ""
+        else:
+            custom_css_changed = custom_css.timestamp.timestamp()
+            custom_css_version = (
+                str(custom_css_changed).replace(" ", "").replace(":", "").replace("-", "")
+            )  # remove spaces, colons, and dashes
+            static_url = static(path)
+            versioned_url = static_url + "?v=" + custom_css_version
+
+            return mark_safe(f'<link rel="stylesheet" href="{versioned_url}">')
--- a/allianceauth/custom_css/widgets.py
+++ b/allianceauth/custom_css/widgets.py
@ -0,0 +1,38 @@
+"""
+Form widgets for custom_css app
+"""
+
+# Django
+from django import forms
+
+# Alliance Auth
+from allianceauth.custom_css.models import CustomCSS
+
+
+class CssEditorWidget(forms.Textarea):
+    """
+    Widget for editing CSS
+    """
+
+    def __init__(self, attrs=None):
+        default_attrs = {"class": "custom-css-editor"}
+
+        if attrs:
+            default_attrs.update(attrs)
+
+        super().__init__(default_attrs)
+
+    # For when we want to add some sort of syntax highlight to it, which is not that
+    # easy to do on a textarea field though.
+    # `highlight.js` is just used as an example here, and doesn't work on a textarea field.
+    # class Media:
+    #     css = {
+    #         "all": (
+    #             "/static/custom_css/libs/highlight.js/11.10.0/styles/github.min.css",
+    #         )
+    #     }
+    #     js = (
+    #         "/static/custom_css/libs/highlight.js/11.10.0/highlight.min.js",
+    #         "/static/custom_css/libs/highlight.js/11.10.0/languages/css.min.js",
+    #         "/static/custom_css/javascript/custom-css.min.js",
+    #     )
--- a/allianceauth/eveonline/apps.py
+++ b/allianceauth/eveonline/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class EveonlineConfig(AppConfig):
    name = 'allianceauth.eveonline'
    label = 'eveonline'
+    verbose_name = _('EVE Online')
--- a/allianceauth/eveonline/autogroups/apps.py
+++ b/allianceauth/eveonline/autogroups/apps.py
@ -1,9 +1,11 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class EveAutogroupsConfig(AppConfig):
    name = 'allianceauth.eveonline.autogroups'
    label = 'eve_autogroups'
+    verbose_name = _('EVE Online Autogroups')

    def ready(self):
        import allianceauth.eveonline.autogroups.signals
--- a/allianceauth/eveonline/autogroups/models.py
+++ b/allianceauth/eveonline/autogroups/models.py
@ -1,4 +1,5 @@
 import logging
+from typing import ClassVar
 from django.db import models, transaction
 from django.contrib.auth.models import Group, User
 from django.core.exceptions import ObjectDoesNotExist
@ -38,13 +39,13 @@ class AutogroupsConfigManager(models.Manager):
        """
        if state is None:
            state = user.profile.state
-        for config in self.filter(states=state):
-            # grant user new groups for their state
-            config.update_group_membership_for_user(user)
        for config in self.exclude(states=state):
            # ensure user does not have groups from previous state
            config.remove_user_from_alliance_groups(user)
            config.remove_user_from_corp_groups(user)
+        for config in self.filter(states=state):
+            # grant user new groups for their state
+            config.update_group_membership_for_user(user)


 class AutogroupsConfig(models.Model):
@ -78,7 +79,7 @@ class AutogroupsConfig(models.Model):
        max_length=10, default='', blank=True,
        help_text='Any spaces in the group name will be replaced with this.')

-    objects = AutogroupsConfigManager()
+    objects: ClassVar[AutogroupsConfigManager] = AutogroupsConfigManager()

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
--- a/allianceauth/eveonline/autogroups/tests/test_managers.py
+++ b/allianceauth/eveonline/autogroups/tests/test_managers.py
@ -1,3 +1,4 @@
+from allianceauth.eveonline.models import EveCorporationInfo
 from django.test import TestCase
 from allianceauth.tests.auth_utils import AuthUtils

@ -73,3 +74,51 @@ class AutogroupsConfigManagerTestCase(TestCase):
        AutogroupsConfig.objects.update_groups_for_user(member)

        self.assertTrue(update_groups.called)
+
+    def test_update_group_membership_corp_in_two_configs(self):
+        # given
+        member = AuthUtils.create_member('test member')
+        AuthUtils.add_main_character_2(
+            member,
+            character_id='1234',
+            name='test character',
+            corp_id='2345',
+            corp_name='corp name',
+            corp_ticker='TIKK',
+
+        )
+
+        corp = EveCorporationInfo.objects.create(
+            corporation_id='2345',
+            corporation_name='corp name',
+            corporation_ticker='TIKK',
+            member_count=10,
+        )
+
+        member_state = AuthUtils.get_member_state()
+        member_config = AutogroupsConfig.objects.create(corp_groups=True)
+        member_config.states.add(member_state)
+        blue_state = AuthUtils.get_blue_state()
+        blue_state.member_corporations.add(corp)
+        blue_config = AutogroupsConfig.objects.create(corp_groups=True)
+        blue_config.states.add(blue_state)
+
+        member.profile.state = blue_state
+        member.profile.save()
+
+        AutogroupsConfig.objects.update_groups_for_user(member)
+
+        # Checks before test that the role is correctly applied
+        group = blue_config.get_corp_group(corp)
+        self.assertIn(group, member.groups.all())
+
+        # when
+        blue_state.member_corporations.remove(corp)
+        member_state.member_corporations.add(corp)
+        member.profile.state = member_state
+        member.profile.save()
+
+        # then
+        AutogroupsConfig.objects.update_groups_for_user(member)
+        group = member_config.get_corp_group(corp)
+        self.assertIn(group, member.groups.all())
--- a/allianceauth/eveonline/autogroups/tests/test_models.py
+++ b/allianceauth/eveonline/autogroups/tests/test_models.py
@ -93,7 +93,7 @@ class AutogroupsConfigTestCase(TestCase):
        group_qs = Group.objects.filter(pk=group.pk)

        self.assertIn(group, self.member.groups.all())
-        self.assertQuerysetEqual(self.member.groups.all(), map(repr, pre_groups | group_qs), ordered=False)
+        self.assertQuerySetEqual(self.member.groups.all(), pre_groups | group_qs, ordered=False)

    def test_update_alliance_group_membership_no_main_character(self):
        obj = AutogroupsConfig.objects.create()
@ -172,7 +172,7 @@ class AutogroupsConfigTestCase(TestCase):
        group_qs = Group.objects.filter(pk=group.pk)

        self.assertIn(group, self.member.groups.all())
-        self.assertQuerysetEqual(self.member.groups.all(), map(repr, pre_groups | group_qs), ordered=False)
+        self.assertQuerySetEqual(self.member.groups.all(), pre_groups | group_qs, ordered=False)

    def test_update_corp_group_membership_no_state(self):
        obj = AutogroupsConfig.objects.create(corp_groups=True)
--- a/allianceauth/eveonline/evelinks/dotlan.py
+++ b/allianceauth/eveonline/evelinks/dotlan.py
@ -10,7 +10,7 @@ from . import (
 )


-_BASE_URL = 'http://evemaps.dotlan.net'
+_BASE_URL = 'https://evemaps.dotlan.net'


 def _build_url(category: str, name: str) -> str:
--- a/allianceauth/eveonline/evelinks/tests/test_evelinks.py
+++ b/allianceauth/eveonline/evelinks/tests/test_evelinks.py
@ -31,29 +31,29 @@ class TestDotlan(TestCase):
    def test_alliance_url(self):
        self.assertEqual(
            dotlan.alliance_url('Wayne Enterprices'),
-            'http://evemaps.dotlan.net/alliance/Wayne_Enterprices'
+            'https://evemaps.dotlan.net/alliance/Wayne_Enterprices'
        )

    def test_corporation_url(self):
        self.assertEqual(
            dotlan.corporation_url('Wayne Technology'),
-            'http://evemaps.dotlan.net/corp/Wayne_Technology'
+            'https://evemaps.dotlan.net/corp/Wayne_Technology'
        )
        self.assertEqual(
            dotlan.corporation_url('Crédit Agricole'),
-            'http://evemaps.dotlan.net/corp/Cr%C3%A9dit_Agricole'
+            'https://evemaps.dotlan.net/corp/Cr%C3%A9dit_Agricole'
        )

    def test_region_url(self):
        self.assertEqual(
            dotlan.region_url('Black Rise'),
-            'http://evemaps.dotlan.net/map/Black_Rise'
+            'https://evemaps.dotlan.net/map/Black_Rise'
        )

    def test_solar_system_url(self):
        self.assertEqual(
            dotlan.solar_system_url('Jita'),
-            'http://evemaps.dotlan.net/system/Jita'
+            'https://evemaps.dotlan.net/system/Jita'
        )


--- a/allianceauth/eveonline/managers.py
+++ b/allianceauth/eveonline/managers.py
@ -14,10 +14,20 @@ class EveCharacterProviderManager:
 class EveCharacterManager(models.Manager):
    provider = EveCharacterProviderManager()

-    def create_character(self, character_id):
+    def exclude_biomassed(self):
+        """
+        Get a queryset of EveCharacter objects, excluding the "Doomheim" corporation (1000001).
+
+        :return:
+        :rtype:
+        """
+
+        return self.exclude(corporation_id=1000001)
+
+    def create_character(self, character_id) -> models.Model:
        return self.create_character_obj(self.provider.get_character(character_id))

-    def create_character_obj(self, character: providers.Character):
+    def create_character_obj(self, character: providers.Character) -> models.Model:
        return self.create(
            character_id=character.id,
            character_name=character.name,
--- a/allianceauth/eveonline/models.py
+++ b/allianceauth/eveonline/models.py
@ -1,5 +1,5 @@
 import logging
-from typing import Union
+from typing import ClassVar, Union

 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
@ -75,8 +75,8 @@ class EveAllianceInfo(models.Model):
    alliance_ticker = models.CharField(max_length=254)
    executor_corp_id = models.PositiveIntegerField()

-    objects = EveAllianceManager()
-    provider = EveAllianceProviderManager()
+    objects: ClassVar[EveAllianceManager] = EveAllianceManager()
+    provider: ClassVar[EveAllianceProviderManager] = EveAllianceProviderManager()

    class Meta:
        indexes = [models.Index(fields=['executor_corp_id',])]
@ -147,7 +147,7 @@ class EveCorporationInfo(models.Model):
        EveAllianceInfo, blank=True, null=True, on_delete=models.SET_NULL
    )

-    objects = EveCorporationManager()
+    objects: ClassVar[EveCorporationManager] = EveCorporationManager()
    provider = EveCorporationProviderManager()

    class Meta:
@ -214,7 +214,7 @@ class EveCharacter(models.Model):
    faction_id = models.PositiveIntegerField(blank=True, null=True, default=None)
    faction_name = models.CharField(max_length=254, blank=True, null=True, default='')

-    objects = EveCharacterManager()
+    objects: ClassVar[EveCharacterManager] = EveCharacterManager()
    provider = EveCharacterProviderManager()

    class Meta:
--- a/allianceauth/eveonline/tasks.py
+++ b/allianceauth/eveonline/tasks.py
@ -1,4 +1,5 @@
 import logging
+from random import randint

 from celery import shared_task

@ -9,7 +10,8 @@ from . import providers
 logger = logging.getLogger(__name__)

 TASK_PRIORITY = 7
-CHUNK_SIZE = 500
+CHARACTER_AFFILIATION_CHUNK_SIZE = 500
+EVEONLINE_TASK_JITTER = 600


 def chunks(lst, n):
@ -19,13 +21,13 @@ def chunks(lst, n):


@shared_task
-def update_corp(corp_id):
+def update_corp(corp_id: int) -> None:
    """Update given corporation from ESI"""
    EveCorporationInfo.objects.update_corporation(corp_id)


@shared_task
-def update_alliance(alliance_id):
+def update_alliance(alliance_id: int) -> None:
    """Update given alliance from ESI"""
    EveAllianceInfo.objects.update_alliance(alliance_id).populate_alliance()

@ -37,23 +39,30 @@ def update_character(character_id: int) -> None:


@shared_task
-def run_model_update():
+def run_model_update() -> None:
    """Update all alliances, corporations and characters from ESI"""

-    #update existing corp models
+    # Queue update tasks for Known Corporation Models
    for corp in EveCorporationInfo.objects.all().values('corporation_id'):
-        update_corp.apply_async(args=[corp['corporation_id']], priority=TASK_PRIORITY)
+        update_corp.apply_async(
+            args=[corp['corporation_id']],
+            priority=TASK_PRIORITY,
+            countdown=randint(1, EVEONLINE_TASK_JITTER))

-    # update existing alliance models
+    # Queue update tasks for Known Alliance Models
    for alliance in EveAllianceInfo.objects.all().values('alliance_id'):
-        update_alliance.apply_async(args=[alliance['alliance_id']], priority=TASK_PRIORITY)
+        update_alliance.apply_async(
+            args=[alliance['alliance_id']],
+            priority=TASK_PRIORITY,
+            countdown=randint(1, EVEONLINE_TASK_JITTER))

-    # update existing character models
+    # Queue update tasks for Known Character Models
    character_ids = EveCharacter.objects.all().values_list('character_id', flat=True)
-    for character_ids_chunk in chunks(character_ids, CHUNK_SIZE):
+    for character_ids_chunk in chunks(character_ids, CHARACTER_AFFILIATION_CHUNK_SIZE):
        update_character_chunk.apply_async(
-            args=[character_ids_chunk], priority=TASK_PRIORITY
-        )
+            args=[character_ids_chunk],
+            priority=TASK_PRIORITY,
+            countdown=randint(1, EVEONLINE_TASK_JITTER))


@shared_task
@ -68,8 +77,9 @@ def update_character_chunk(character_ids_chunk: list):
        logger.info("Failed to bulk update characters. Attempting single updates")
        for character_id in character_ids_chunk:
            update_character.apply_async(
-                args=[character_id], priority=TASK_PRIORITY
-            )
+                args=[character_id],
+                priority=TASK_PRIORITY,
+                countdown=randint(1, EVEONLINE_TASK_JITTER))
        return

    affiliations = {
@ -107,5 +117,5 @@ def update_character_chunk(character_ids_chunk: list):

            if corp_changed or alliance_changed or name_changed:
                update_character.apply_async(
-                    args=[character.get('character_id')], priority=TASK_PRIORITY
-                )
+                    args=[character.get('character_id')],
+                    priority=TASK_PRIORITY)
--- a/allianceauth/eveonline/templatetags/examples.html
+++ b/allianceauth/eveonline/templatetags/examples.html
@ -8,77 +8,70 @@ 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 %}
+    <div>
+        {% include "framework/header/page-header.html" with title="Evelinks templatetags examples" %}

-    <div class="col-lg-12">
-        <h1 class="page-header text-center">Evelinks templatetags examples</h1>
        <div class="col-lg-12 container">
-
            <h2>profile URLs</h2>

            <div class="rows">
-
                <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>
-                </div>
+                    <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>

            <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>
-                </div>
-
-            </div>
-
+                    <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>
-
-{% endblock %}
+        </div>
+    </div>
+{% endblock content %}
--- a/allianceauth/eveonline/tests/test_providers.py
+++ b/allianceauth/eveonline/tests/test_providers.py
@ -723,5 +723,5 @@ class TestEveSwaggerProvider(TestCase):
        my_client = my_provider.client
        operation = my_client.Universe.get_universe_factions()
        self.assertEqual(
-            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0'
+            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0 dummy@example.net'
        )
--- a/allianceauth/eveonline/tests/test_tasks.py
+++ b/allianceauth/eveonline/tests/test_tasks.py
@ -84,7 +84,7 @@ class TestUpdateTasks(TestCase):
@override_settings(CELERY_ALWAYS_EAGER=True)
@patch('allianceauth.eveonline.providers.esi_client_factory')
@patch('allianceauth.eveonline.tasks.providers')
-@patch('allianceauth.eveonline.tasks.CHUNK_SIZE', 2)
+@patch('allianceauth.eveonline.tasks.CHARACTER_AFFILIATION_CHUNK_SIZE', 2)
 class TestRunModelUpdate(TransactionTestCase):
    def test_should_run_updates(self, mock_providers, mock_esi_client_factory):
        # given
@ -139,7 +139,7 @@ class TestRunModelUpdate(TransactionTestCase):
@patch('allianceauth.eveonline.tasks.update_character', wraps=update_character)
@patch('allianceauth.eveonline.providers.esi_client_factory')
@patch('allianceauth.eveonline.tasks.providers')
-@patch('allianceauth.eveonline.tasks.CHUNK_SIZE', 2)
+@patch('allianceauth.eveonline.tasks.CHARACTER_AFFILIATION_CHUNK_SIZE', 2)
 class TestUpdateCharacterChunk(TestCase):
    @staticmethod
    def _updated_character_ids(spy_update_character) -> set:
--- a/allianceauth/fleetactivitytracking/apps.py
+++ b/allianceauth/fleetactivitytracking/apps.py
@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _


 class FatConfig(AppConfig):
    name = 'allianceauth.fleetactivitytracking'
    label = 'fleetactivitytracking'
+    verbose_name = _('Fleet Activity Tracking')
--- a/allianceauth/fleetactivitytracking/auth_hooks.py
+++ b/allianceauth/fleetactivitytracking/auth_hooks.py
@ -1,12 +1,13 @@
+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')
 def register_menu():
-    return MenuItemHook(_('Fleet Activity Tracking'), 'fas fa-users fa-fw', 'fatlink:view',
+    return MenuItemHook(_('Fleet Activity Tracking'), 'fa-solid fa-users', 'fatlink:view',
                        navactive=['fatlink:'])


--- a/allianceauth/fleetactivitytracking/forms.py
+++ b/allianceauth/fleetactivitytracking/forms.py
@ -4,4 +4,4 @@ from django.utils.translation import gettext_lazy as _

 class FatlinkForm(forms.Form):
    fleet = forms.CharField(label=_("Fleet Name"), max_length=50)
-    duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647, help_text=_('minutes'))
+    duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647, help_text=_('Duration of the fat-link in minutes'))
--- a/allianceauth/fleetactivitytracking/migrations/0002_auto_20160905_2220.py
+++ b/allianceauth/fleetactivitytracking/migrations/0002_auto_20160905_2220.py
@ -2,7 +2,6 @@

 import datetime
 from django.db import migrations, models
-from django.utils.timezone import utc


 class Migration(migrations.Migration):
@ -15,6 +14,6 @@ class Migration(migrations.Migration):
        migrations.AlterField(
            model_name='fatlink',
            name='fatdatetime',
-            field=models.DateTimeField(default=datetime.datetime(2016, 9, 5, 22, 20, 2, 999041, tzinfo=utc)),
+            field=models.DateTimeField(default=datetime.datetime(2016, 9, 5, 22, 20, 2, 999041, tzinfo=datetime.timezone.utc)),
        ),
    ]
--- a/allianceauth/fleetactivitytracking/migrations/0007_sentinel_user.py
+++ b/allianceauth/fleetactivitytracking/migrations/0007_sentinel_user.py
@ -0,0 +1,26 @@
+"""
+Migration to AA Framework API method
+"""
+
+from django.conf import settings
+from django.db import migrations, models
+
+import allianceauth.framework.api.user
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("fleetactivitytracking", "0006_auto_20180803_0430"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="fatlink",
+            name="creator",
+            field=models.ForeignKey(
+                on_delete=models.SET(allianceauth.framework.api.user.get_sentinel_user),
+                to=settings.AUTH_USER_MODEL
+            ),
+        ),
+    ]
--- a/allianceauth/fleetactivitytracking/models.py
+++ b/allianceauth/fleetactivitytracking/models.py
@ -3,10 +3,7 @@ from django.db import models
 from django.utils import timezone

 from allianceauth.eveonline.models import EveCharacter
-
-
-def get_sentinel_user():
-    return User.objects.get_or_create(username='deleted')[0]
+from allianceauth.framework.api.user import get_sentinel_user


 class Fatlink(models.Model):
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
@ -1,27 +1,48 @@
-{% 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 header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}

 {% 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>
+        {% translate "Character not found!" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div class="col-lg-12 container">
            <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="card card-default">
+                        <div class="card-header">
+                            <div class="card-title mb-0">
+                                {{ character_name }}
+                            </div>
+                        </div>
+
+                        <div class="card-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="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 %}
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
@ -0,0 +1,53 @@
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load django_bootstrap5 %}
+{% load i18n %}
+
+{% block page_title %}
+    {% translate "Create Fatlink" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
+{% block content %}
+    <div>
+        {% translate "Create Fatlink" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div>
+            {% if badrequest %}
+                <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="card card-primary border-0">
+                <div class="card-header">
+                    <div class="card-title mb-0">
+                        {% translate "Fatlink details" %}
+                    </div>
+                </div>
+
+                <div class="card-body">
+                    <div class="row justify-content-center">
+                        <div class="col-md-6">
+                            <form role="form" action="" method="POST">
+                                {% csrf_token %}
+                                {% bootstrap_form form %}
+
+                                <div class="form-group mt-3 clearfix">
+                                    {% translate "Create fatlink" as button_text %}
+                                    {% bootstrap_button button_class="btn btn-primary" content=button_text name="submit_fat" id="submit_fat" %}
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock content %}
--- a/Show More
+++ b/Show More