diff --git a/allianceauth/authentication/templates/registration/registration_form.html b/allianceauth/authentication/templates/registration/registration_form.html
index 5c35fe88..a9aa5ef5 100644
--- a/allianceauth/authentication/templates/registration/registration_form.html
+++ b/allianceauth/authentication/templates/registration/registration_form.html
@@ -7,8 +7,8 @@
     <form class="form-signin" role="form" action="" method="POST">
         {% csrf_token %}
         {{ form|bootstrap }}
-        <br/>
+        <br>
         <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Submit" %}</button>
-        <br/>
+        <br>
     </form>
 {% endblock %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
index b6f241e8..903b961a 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
@@ -21,7 +21,7 @@
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit" name="submit_fat">{% translate "Create fatlink" %}</button>
                         </form>
                 </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index 26bf8c66..ce45356e 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -19,8 +19,8 @@
                                 <div cass="text-center">{{ question.help_text }}</div>
                             {% endif %}
                             {% for choice in question.choices.all %}
-                                <input type={% if question.multi_select == False %}"radio"{% else %}"checkbox"{% endif %} name="{{ question.pk }}" id="id_{{ question.pk }}" value="{{ choice.choice_text }}" />
-                                <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br />
+                                <input type={% if question.multi_select == False %}"radio"{% else %}"checkbox"{% endif %} name="{{ question.pk }}" id="id_{{ question.pk }}" value="{{ choice.choice_text }}">
+                                <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
                             {% empty %}
                                 <textarea class="form-control" cols="30" id="id_{{ question.pk }}" name="{{ question.pk }}" rows="4"></textarea>
                             {% endfor %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index adb87442..95d1e844 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -181,7 +181,7 @@
                         <form class="form-signin" role="form" action={% url 'hrapplications:search' %} method="POST">
                             {% csrf_token %}
                             {{ search_form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
                         </form>
                     </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index 979cb9db..064ece8d 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -67,7 +67,7 @@
                         <form class="form-signin" role="form" action={% url 'hrapplications:search' %} method="POST">
                             {% csrf_token %}
                             {{ search_form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
                         </form>
                     </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 5f3b8526..a30e4d61 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -140,7 +140,7 @@
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ comment_form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Add Comment" %}</button>
                         </form>
                     </div>
diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html
index 84e1b694..fffc9707 100644
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@@ -19,7 +19,7 @@
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Create Fleet Operation" %}</button>
                         </form>
                 </div>
diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html
index 1cb85f0e..51b48c8e 100644
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@@ -21,7 +21,7 @@
                 <b>{% translate "Current Eve Time:" %} </b>
             </div>
             <strong class="label label-info text-left" id="current-time"></strong>
-            <br  />
+            <br>
         </div>
 
         <h4><b>{% translate "Next Fleet Operations" %}</b></h4>
diff --git a/allianceauth/optimer/templates/optimer/update.html b/allianceauth/optimer/templates/optimer/update.html
index 7eb46577..ec0d1429 100644
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@@ -24,7 +24,7 @@
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Update Fleet Operation" %}
                             </button>
                         </form>
diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
index 519cbd49..50dd1b7d 100755
--- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
+++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
@@ -19,7 +19,7 @@
                     <form class="form-signin" role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
                         {% csrf_token %}
                         {{ form|bootstrap }}
-                        <br/>
+                        <br>
                         <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Broadcast" %}
                         </button>
                     </form>
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index 64c16339..2c78b2fc 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -12,11 +12,11 @@
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
                 <a href="ts3server://{{ public_url }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% translate "Join Server" %}</a>
-                <br/>
+                <br>
                 <form class="form-signin" role="form" action="{% url 'teamspeak3:verify' %}" method="POST">
                     {% csrf_token %}
                     {{ form|bootstrap }}
-                    <br/>
+                    <br>
                     <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Continue" %}</button>
                 </form>
                 </div>
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index 9827c9b2..dc906622 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -20,9 +20,9 @@
                     <form class="form-signin" role="form" action="" method="POST">
                         {% csrf_token %}
                         {{ form|bootstrap }}
-                        <br/>
+                        <br>
                         <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Format" %}</button>
-                        <br/>
+                        <br>
                     </form>
                 </div>
             </div>
diff --git a/allianceauth/services/templates/services/service_confirm_delete.html b/allianceauth/services/templates/services/service_confirm_delete.html
index a2e1772e..0712f635 100644
--- a/allianceauth/services/templates/services/service_confirm_delete.html
+++ b/allianceauth/services/templates/services/service_confirm_delete.html
@@ -21,7 +21,7 @@
                             Are you sure you want to delete your {{ service_name }} account {{ object }}?
                             {% endblocktrans %}
                         </p>
-                        <input class="btn btn-danger btn-block" type="submit" value="Confirm" />
+                        <input class="btn btn-danger btn-block" type="submit" value="Confirm">
                     </form>
                 </div>
             </div>
diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html
index 481fc25b..0ecc18f4 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -14,7 +14,7 @@
                     <form class="form-signin" role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
                         {% csrf_token %}
                         {{ form|bootstrap }}
-                        <br/>
+                        <br>
                         <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Set Password" %}</button>
                     </form>
                 </div>
diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index 95646b9b..e7ed4cc0 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -20,7 +20,7 @@
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Create SRP Fleet" %}</button>
                         </form>
                     {% else %}
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index eaccf7e5..6e669f62 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -16,7 +16,7 @@
                     <form class="form-signin" role="form" action="" method="POST">
                         {% csrf_token %}
                         {{ form|bootstrap }}
-                        <br/>
+                        <br>
                         <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Create SRP Request" %}
                         </button>
                     </form>
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index ea141580..82c33674 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -19,7 +19,7 @@
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
-                            <br/>
+                            <br>
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Update AAR Link" %}
                             </button>
                         </form>
diff --git a/allianceauth/templates/bundles/bootstrap-css.html b/allianceauth/templates/bundles/bootstrap-css.html
index e9f04b0f..e9fe4a05 100644
--- a/allianceauth/templates/bundles/bootstrap-css.html
+++ b/allianceauth/templates/bundles/bootstrap-css.html
@@ -3,17 +3,17 @@
 {% if NIGHT_MODE %}
     {% if debug %}
         <!-- In template debug, loading less file instead of CSS -->
-        <link rel="stylesheet/less" type="text/css" href="{% static 'css/themes/darkly/darkly.less' %}" />
+        <link rel="stylesheet/less" type="text/css" href="{% static 'css/themes/darkly/darkly.less' %}">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/4.1.2/less.min.js" integrity="sha512-eXBn7AaMbUOWb3PSDhwcjByoM89FeO1SF9Jww6kqPYQkBrGZvqAKFbtqLHh5O95rYA/AOtWZ0QRO2S6rP+KsUw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>    {% else %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/themes/darkly/darkly.min.css' %}" />
+        <link rel="stylesheet" type="text/css" href="{% static 'css/themes/darkly/darkly.min.css' %}">
     {% endif %}
 {% else %}
     {% if debug %}
         <!-- In template debug, loading less file instead of CSS -->
-        <link rel="stylesheet/less" type="text/css" href="{% static 'css/themes/flatly/flatly.less' %}" />
+        <link rel="stylesheet/less" type="text/css" href="{% static 'css/themes/flatly/flatly.less' %}">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/4.1.2/less.min.js" integrity="sha512-eXBn7AaMbUOWb3PSDhwcjByoM89FeO1SF9Jww6kqPYQkBrGZvqAKFbtqLHh5O95rYA/AOtWZ0QRO2S6rP+KsUw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     {% else %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/themes/flatly/flatly.min.css' %}" />
+        <link rel="stylesheet" type="text/css" href="{% static 'css/themes/flatly/flatly.min.css' %}">
     {% endif %}
 {% endif %}
 <!-- End Bootstrap CSS -->
diff --git a/allianceauth/templates/bundles/datatables-css.html b/allianceauth/templates/bundles/datatables-css.html
index c38578c8..4acceb86 100644
--- a/allianceauth/templates/bundles/datatables-css.html
+++ b/allianceauth/templates/bundles/datatables-css.html
@@ -1,3 +1,3 @@
 <!-- Start Datatables-css from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.21/css/dataTables.bootstrap.min.css" integrity="sha512-BMbq2It2D3J17/C7aRklzOODG1IQ3+MHw3ifzBHMBwGO/0yUqYmsStgBjI0z5EYlaDEFnvYV7gNYdD3vFLRKsA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.21/css/dataTables.bootstrap.min.css" integrity="sha512-BMbq2It2D3J17/C7aRklzOODG1IQ3+MHw3ifzBHMBwGO/0yUqYmsStgBjI0z5EYlaDEFnvYV7gNYdD3vFLRKsA==" crossorigin="anonymous" referrerpolicy="no-referrer">
 <!-- End Datatables-css from cdnjs -->
diff --git a/allianceauth/templates/bundles/fontawesome.html b/allianceauth/templates/bundles/fontawesome.html
index 287adac5..bd4b17e8 100644
--- a/allianceauth/templates/bundles/fontawesome.html
+++ b/allianceauth/templates/bundles/fontawesome.html
@@ -1,3 +1,3 @@
 <!-- Start FontAwesome CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer">
 <!-- End FontAwesome CSS from cdnjs -->
diff --git a/allianceauth/templates/bundles/jquery-datetimepicker-css.html b/allianceauth/templates/bundles/jquery-datetimepicker-css.html
index 2e697e43..57ad87a0 100644
--- a/allianceauth/templates/bundles/jquery-datetimepicker-css.html
+++ b/allianceauth/templates/bundles/jquery-datetimepicker-css.html
@@ -1,3 +1,3 @@
 <!-- Start jQuery-DateTimePicker CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.min.css" integrity="sha512-f0tzWhCwVFS3WeYaofoLWkTP62ObhewQ1EZn65oSYDZUg1+CyywGKkWzm8BxaJj5HGKI72PnMH9jYyIFz+GH7g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.min.css" integrity="sha512-f0tzWhCwVFS3WeYaofoLWkTP62ObhewQ1EZn65oSYDZUg1+CyywGKkWzm8BxaJj5HGKI72PnMH9jYyIFz+GH7g==" crossorigin="anonymous" referrerpolicy="no-referrer">
 <!-- End jQuery-DateTimePicker CSS from cdnjs -->
diff --git a/allianceauth/templates/bundles/jquery-ui-css.html b/allianceauth/templates/bundles/jquery-ui-css.html
index b7ddc1aa..308841bc 100644
--- a/allianceauth/templates/bundles/jquery-ui-css.html
+++ b/allianceauth/templates/bundles/jquery-ui-css.html
@@ -1,5 +1,5 @@
 {% load static %}
 <!-- Start jQuery UI CSS from Alliance Auth -->
 <!-- CDNs all contain theme.css, which is not supposed to be in the base CSS, Which is why this is uniquely bundled in not using a CDN -->
-<link rel="stylesheet" href="{% static 'js/jquery-ui/1.12.1/css/jquery-ui.min.css' %}" integrity="sha512-7smZe1765O+Mm1UZH46SzaFClbRX7dEs01lB9lqU91oocmugWWfQXVQNVr5tEwktYSqwJMErEfr4GvflXMgTPA==" crossorigin="anonymous" referrerpolicy="no-referrer"/>
+<link rel="stylesheet" href="{% static 'js/jquery-ui/1.12.1/css/jquery-ui.min.css' %}" integrity="sha512-7smZe1765O+Mm1UZH46SzaFClbRX7dEs01lB9lqU91oocmugWWfQXVQNVr5tEwktYSqwJMErEfr4GvflXMgTPA==" crossorigin="anonymous" referrerpolicy="no-referrer">
 <!-- End jQuery UI CSS from aa-gdpr -->
diff --git a/allianceauth/templates/bundles/x-editable.css.html b/allianceauth/templates/bundles/x-editable.css.html
index 2b7cae17..c3cf4021 100644
--- a/allianceauth/templates/bundles/x-editable.css.html
+++ b/allianceauth/templates/bundles/x-editable.css.html
@@ -1,3 +1,3 @@
 <!-- Start X-editable CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.1/bootstrap3-editable/css/bootstrap-editable.css" integrity="sha512-e0rbO6UJET0zDdXOHjwc6D44UpeKumn7cU7XR/fa4S0/Jso0bZqcCqlIF6mtvcimMbf846mkv8aSWFnTwABr/g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.1/bootstrap3-editable/css/bootstrap-editable.css" integrity="sha512-e0rbO6UJET0zDdXOHjwc6D44UpeKumn7cU7XR/fa4S0/Jso0bZqcCqlIF6mtvcimMbf846mkv8aSWFnTwABr/g==" crossorigin="anonymous" referrerpolicy="no-referrer">
 <!-- End X-editable CSS from cdnjs -->
diff --git a/allianceauth/timerboard/templates/timerboard/form.html b/allianceauth/timerboard/templates/timerboard/form.html
index ecf6eea9..8d1980a9 100644
--- a/allianceauth/timerboard/templates/timerboard/form.html
+++ b/allianceauth/timerboard/templates/timerboard/form.html
@@ -19,7 +19,7 @@
                     <form id="add-timer-form" class="form-signin" role="form" action="" method="POST">
                         {% csrf_token %}
                         {{ form|bootstrap }}
-                        <br/>
+                        <br>
                         <button class="btn btn-lg btn-primary btn-block" type="submit">
                             {% block submit_button_text %}
                             {% endblock %}
diff --git a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
index 235925d3..22249d29 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
@@ -17,7 +17,7 @@
                     <form action="" method="post">
                         {% csrf_token %}
                         <p>{% blocktrans %}Are you sure you want to delete timer "{{ object }}"?{% endblocktrans %}</p>
-                        <input class="btn btn-danger btn-block" type="submit" value="Confirm" />
+                        <input class="btn btn-danger btn-block" type="submit" value="Confirm">
                     </form>
                 </div>
             </div>