diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 62d21f01c3..0c81972c73 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -14,10 +14,10 @@
{% if v %}
-
- {% if v.agendaposter %}{% elif v.css %}{% endif %}
+
+ {% if v.agendaposter %}{% elif v.css %}{% endif %}
{% else %}
-
+
{% endif %}
diff --git a/files/templates/default.html b/files/templates/default.html
index adcb97ca1c..222a4bdb46 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -247,10 +247,10 @@
{% block stylesheets %}
{% if v %}
-
- {% if v.agendaposter %}{% elif v.css %}{% endif %}
+
+ {% if v.agendaposter %}{% elif v.css %}{% endif %}
{% else %}
-
+
{% endif %}
{% endblock %}
diff --git a/files/templates/log.html b/files/templates/log.html
index 19d42461b6..2d68e609b9 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -16,10 +16,10 @@
{% if v %}
-
- {% if v.agendaposter %}{% elif v.css %}{% endif %}
+
+ {% if v.agendaposter %}{% elif v.css %}{% endif %}
{% else %}
-
+
{% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 7d1203e2d0..bafd905835 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -15,7 +15,7 @@
-
+
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index c3bc854672..a29a87de55 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -13,7 +13,7 @@
-
+
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 88c2bec971..53c7b4a17f 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -71,8 +71,8 @@
-
- {% if v.agendaposter %}
{% elif v.css %}
{% endif %}
+
+ {% if v.agendaposter %}
{% elif v.css %}
{% endif %}
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 868db33f3b..ed1698e39c 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -39,9 +39,9 @@
{% if v %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 8b84a64bba..3b312fc038 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -35,7 +35,7 @@
-
+
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 3fd13f15e5..b851bff5e1 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -30,7 +30,7 @@
-
+
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 9a0a310d1c..e16a00e537 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -255,7 +255,7 @@
-
+
{% if p.realbody(v) and request.path != "/changelog"%}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 8982a4b1ec..1273283568 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -24,10 +24,10 @@
{% block stylesheets %}
{% if v %}
-
- {% if v.agendaposter %}
{% elif v.css %}
{% endif %}
+
+ {% if v.agendaposter %}
{% elif v.css %}
{% endif %}
{% else %}
-
+
{% endif %}
{% endblock %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index fd46bd2d15..9eb7cce635 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -3,10 +3,10 @@
{% if u and u.profilecss %}
{% block stylesheets %}
{% if v %}
-
- {% if v.agendaposter %}
{% elif v.css %}
{% endif %}
+
+ {% if v.agendaposter %}
{% elif v.css %}
{% endif %}
{% else %}
-
+
{% endif %}
{% if u and u.profilecss %}