diff --git a/AKModel/templates/admin/login.html b/AKModel/templates/admin/login.html
index 8a61f6d1c2b873851b0cbb21e093e97476ce5fc8..705a126fe95abbfc5d769cca3644fc3e6f049899 100644
--- a/AKModel/templates/admin/login.html
+++ b/AKModel/templates/admin/login.html
@@ -1,21 +1,6 @@
-{% extends "admin/base_site.html" %}
+{% extends "admin/login.html" %}
 {% load i18n static %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}">
-{{ form.media }}
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} login{% endblock %}
-
-{% block usertools %}{% endblock %}
-
-{% block nav-global %}{% endblock %}
-
-{% block nav-sidebar %}{% endblock %}
-
-{% block content_title %}{% endblock %}
-
-{% block breadcrumbs %}{% endblock %}
 
 {% block content %}
 {% if form.errors and not form.non_field_errors %}
diff --git a/requirements.txt b/requirements.txt
index 9213a6a7437e14143f74bc24fcae9ee37edd35c9..8c66a5e76f5f7b779b8716f4ee77a13f840019b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.1.8
+Django==3.2.16
 django-bootstrap4==2.3.1
 django-fontawesome-5==1.0.18
 django-split-settings==1.0.1
diff --git a/static_common/common/css/admin-bootstrap.css b/static_common/common/css/admin-bootstrap.css
new file mode 100644
index 0000000000000000000000000000000000000000..c0b4714c96ba710b69fd4d410376368811ff1b7b
--- /dev/null
+++ b/static_common/common/css/admin-bootstrap.css
@@ -0,0 +1,6 @@
+/*
+    Load both the django admin base style and bootstrap -- but make sure bootstrap is loaded first to override all critical theme settings from bootstrap with the default admin style.
+    This especially fixes the dark theme.
+*/
+@import "/static/common/css/bootstrap.css";
+@import "../../admin/css/base.css";
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
index 05eee8a8dae38d719aea7ae2e5f595c58f23b92d..0fbdfeb40d89c1e5e665c45056e376411ca46d0e 100644
--- a/templates/admin/base_site.html
+++ b/templates/admin/base_site.html
@@ -4,6 +4,8 @@
 {% load fontawesome_5 %}
 {% load static %}
 
+{% block stylesheet %}{% static "common/css/admin-bootstrap.css" %}{% endblock %}
+
 {% block extrastyle %}
     {% if not debug %}
         <link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
@@ -12,7 +14,6 @@
 
 {% block extrahead %}
     <!-- Load bootstrap, jquery and fontawesome-->
-    {% bootstrap_css %}
     {% bootstrap_javascript jquery=True %}
     {% fontawesome_5_static %}