diff --git a/app/templates/about.html b/app/templates/about.html
index f0b56854..f5b85dda 100644
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
 <div class="row">
diff --git a/app/templates/admin/activities.html b/app/templates/admin/activities.html
index 47b3ccd2..b9edebd3 100644
--- a/app/templates/admin/activities.html
+++ b/app/templates/admin/activities.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_activities' %}
 
diff --git a/app/templates/admin/activity_json.html b/app/templates/admin/activity_json.html
index 28960783..a5076364 100644
--- a/app/templates/admin/activity_json.html
+++ b/app/templates/admin/activity_json.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_activities' %}
 
diff --git a/app/templates/admin/add_user.html b/app/templates/admin/add_user.html
index 51668b5d..b20e4dc2 100644
--- a/app/templates/admin/add_user.html
+++ b/app/templates/admin/add_user.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'admin_users' %}
 
diff --git a/app/templates/admin/approve_registrations.html b/app/templates/admin/approve_registrations.html
index 0e94347a..ec2fc977 100644
--- a/app/templates/admin/approve_registrations.html
+++ b/app/templates/admin/approve_registrations.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_approve_registrations' %}
 
diff --git a/app/templates/admin/communities.html b/app/templates/admin/communities.html
index d90f1f00..2a56904d 100644
--- a/app/templates/admin/communities.html
+++ b/app/templates/admin/communities.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_communities' %}
 
diff --git a/app/templates/admin/deleted_posts.html b/app/templates/admin/deleted_posts.html
index 75164833..218dead8 100644
--- a/app/templates/admin/deleted_posts.html
+++ b/app/templates/admin/deleted_posts.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_content_deleted' %}
 
diff --git a/app/templates/admin/edit_community.html b/app/templates/admin/edit_community.html
index a1ce4b71..4f1c7b6c 100644
--- a/app/templates/admin/edit_community.html
+++ b/app/templates/admin/edit_community.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'admin_communities' %}
 
diff --git a/app/templates/admin/edit_instance.html b/app/templates/admin/edit_instance.html
index 2f9bc874..34e942b0 100644
--- a/app/templates/admin/edit_instance.html
+++ b/app/templates/admin/edit_instance.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_instances' %}
 
diff --git a/app/templates/admin/edit_topic.html b/app/templates/admin/edit_topic.html
index e1373850..da2cfdb6 100644
--- a/app/templates/admin/edit_topic.html
+++ b/app/templates/admin/edit_topic.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_topics' %}
 
diff --git a/app/templates/admin/edit_user.html b/app/templates/admin/edit_user.html
index 7fa6044d..fdd357f3 100644
--- a/app/templates/admin/edit_user.html
+++ b/app/templates/admin/edit_user.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'admin_users' %}
 
diff --git a/app/templates/admin/federation.html b/app/templates/admin/federation.html
index 39f6d181..cc4d1a8f 100644
--- a/app/templates/admin/federation.html
+++ b/app/templates/admin/federation.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form, render_field %}
 {% set active_child = 'admin_federation' %}
 
diff --git a/app/templates/admin/home.html b/app/templates/admin/home.html
index db0363db..2d373ec2 100644
--- a/app/templates/admin/home.html
+++ b/app/templates/admin/home.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/admin/misc.html b/app/templates/admin/misc.html
index 32a7ce6d..57ea0561 100644
--- a/app/templates/admin/misc.html
+++ b/app/templates/admin/misc.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_misc' %}
 
diff --git a/app/templates/admin/permissions.html b/app/templates/admin/permissions.html
index 3389b5ee..4de9bc64 100644
--- a/app/templates/admin/permissions.html
+++ b/app/templates/admin/permissions.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_permissions' %}
 
diff --git a/app/templates/admin/posts.html b/app/templates/admin/posts.html
index 3d2c4a3c..69d8aa8d 100644
--- a/app/templates/admin/posts.html
+++ b/app/templates/admin/posts.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_content_trash' %}
 
diff --git a/app/templates/admin/reports.html b/app/templates/admin/reports.html
index 86824929..d6fd8017 100644
--- a/app/templates/admin/reports.html
+++ b/app/templates/admin/reports.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_reports' %}
 
diff --git a/app/templates/admin/site.html b/app/templates/admin/site.html
index 73f70799..3abc7971 100644
--- a/app/templates/admin/site.html
+++ b/app/templates/admin/site.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'admin_site' %}
 
diff --git a/app/templates/admin/spam_posts.html b/app/templates/admin/spam_posts.html
index cc9f3a15..c7222352 100644
--- a/app/templates/admin/spam_posts.html
+++ b/app/templates/admin/spam_posts.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_content_spam' %}
 
diff --git a/app/templates/admin/topics.html b/app/templates/admin/topics.html
index 68fa34d1..074067ad 100644
--- a/app/templates/admin/topics.html
+++ b/app/templates/admin/topics.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_topics' %}
 
diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index 2428cda0..17b0e90e 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_users' %}
 
diff --git a/app/templates/admin/users_trash.html b/app/templates/admin/users_trash.html
index 2f700d12..4eae558c 100644
--- a/app/templates/admin/users_trash.html
+++ b/app/templates/admin/users_trash.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'admin_users_trash' %}
 
diff --git a/app/templates/auth/register.html b/app/templates/auth/register.html
index 891643ee..49673e1e 100644
--- a/app/templates/auth/register.html
+++ b/app/templates/auth/register.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block scripts %}
diff --git a/app/templates/auth/reset_password.html b/app/templates/auth/reset_password.html
index 1af5d3b3..61438e79 100644
--- a/app/templates/auth/reset_password.html
+++ b/app/templates/auth/reset_password.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/auth/reset_password_request.html b/app/templates/auth/reset_password_request.html
index 1af5d3b3..61438e79 100644
--- a/app/templates/auth/reset_password_request.html
+++ b/app/templates/auth/reset_password_request.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/chat/blocked.html b/app/templates/chat/blocked.html
index 4915d970..0aa08616 100644
--- a/app/templates/chat/blocked.html
+++ b/app/templates/chat/blocked.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'chats' %}
 
 {% block app_content %}
diff --git a/app/templates/chat/chat_options.html b/app/templates/chat/chat_options.html
index fd3ba14b..211673c1 100644
--- a/app/templates/chat/chat_options.html
+++ b/app/templates/chat/chat_options.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'chats' %}
 {% from 'bootstrap/form.html' import render_form %}
 
diff --git a/app/templates/chat/conversation.html b/app/templates/chat/conversation.html
index 7dd8a6e4..62aa8e09 100644
--- a/app/templates/chat/conversation.html
+++ b/app/templates/chat/conversation.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'chats' %}
 {% from 'bootstrap/form.html' import render_form %}
 
diff --git a/app/templates/chat/denied.html b/app/templates/chat/denied.html
index 394958e0..fee62c99 100644
--- a/app/templates/chat/denied.html
+++ b/app/templates/chat/denied.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'chats' %}
 
diff --git a/app/templates/chat/empty.html b/app/templates/chat/empty.html
index 8b8b3161..f5891e83 100644
--- a/app/templates/chat/empty.html
+++ b/app/templates/chat/empty.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'chats' %}
 
 {% block app_content %}
diff --git a/app/templates/chat/new_message.html b/app/templates/chat/new_message.html
index bde02ddb..7bad2968 100644
--- a/app/templates/chat/new_message.html
+++ b/app/templates/chat/new_message.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'chats' %}
 {% from 'bootstrap/form.html' import render_form %}
 
diff --git a/app/templates/chat/report.html b/app/templates/chat/report.html
index ce9ebe3d..80fcb381 100644
--- a/app/templates/chat/report.html
+++ b/app/templates/chat/report.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'chats' %}
 {% from 'bootstrap/form.html' import render_form %}
 
diff --git a/app/templates/community/add_local.html b/app/templates/community/add_local.html
index c7ab04fb..2c4849bd 100644
--- a/app/templates/community/add_local.html
+++ b/app/templates/community/add_local.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/add_remote.html b/app/templates/community/add_remote.html
index a79894b2..a56b60a2 100644
--- a/app/templates/community/add_remote.html
+++ b/app/templates/community/add_remote.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_ban_user.html b/app/templates/community/community_ban_user.html
index ccf90c65..2f9bf976 100644
--- a/app/templates/community/community_ban_user.html
+++ b/app/templates/community/community_ban_user.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_delete.html b/app/templates/community/community_delete.html
index 486ee070..c7d96cb3 100644
--- a/app/templates/community/community_delete.html
+++ b/app/templates/community/community_delete.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_edit.html b/app/templates/community/community_edit.html
index a5267cd6..767debf1 100644
--- a/app/templates/community/community_edit.html
+++ b/app/templates/community/community_edit.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_find_moderator.html b/app/templates/community/community_find_moderator.html
index 5f321070..c032f401 100644
--- a/app/templates/community/community_find_moderator.html
+++ b/app/templates/community/community_find_moderator.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_mod_list.html b/app/templates/community/community_mod_list.html
index a4243311..3b4b5c8f 100644
--- a/app/templates/community/community_mod_list.html
+++ b/app/templates/community/community_mod_list.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_moderate.html b/app/templates/community/community_moderate.html
index 4a0611bf..8901a55e 100644
--- a/app/templates/community/community_moderate.html
+++ b/app/templates/community/community_moderate.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_moderate_report_escalate.html b/app/templates/community/community_moderate_report_escalate.html
index 401168ce..e833d28c 100644
--- a/app/templates/community/community_moderate_report_escalate.html
+++ b/app/templates/community/community_moderate_report_escalate.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_moderate_report_resolve.html b/app/templates/community/community_moderate_report_resolve.html
index ee16f7aa..e096a84e 100644
--- a/app/templates/community/community_moderate_report_resolve.html
+++ b/app/templates/community/community_moderate_report_resolve.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_moderate_subscribers.html b/app/templates/community/community_moderate_subscribers.html
index bf61c627..4d3090c3 100644
--- a/app/templates/community/community_moderate_subscribers.html
+++ b/app/templates/community/community_moderate_subscribers.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_modlog.html b/app/templates/community/community_modlog.html
index 64d38e4c..1927683a 100644
--- a/app/templates/community/community_modlog.html
+++ b/app/templates/community/community_modlog.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_wiki_edit.html b/app/templates/community/community_wiki_edit.html
index 8f1c4d40..0d06f32c 100644
--- a/app/templates/community/community_wiki_edit.html
+++ b/app/templates/community/community_wiki_edit.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form, render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_wiki_list.html b/app/templates/community/community_wiki_list.html
index 07e30bca..dfe9e0b2 100644
--- a/app/templates/community/community_wiki_list.html
+++ b/app/templates/community/community_wiki_list.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/community_wiki_revisions.html b/app/templates/community/community_wiki_revisions.html
index 1a920525..02756d3a 100644
--- a/app/templates/community/community_wiki_revisions.html
+++ b/app/templates/community/community_wiki_revisions.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
diff --git a/app/templates/community/lookup_remote.html b/app/templates/community/lookup_remote.html
index 08fd524e..9c0d9b6c 100644
--- a/app/templates/community/lookup_remote.html
+++ b/app/templates/community/lookup_remote.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/community/retrieve_remote_post.html b/app/templates/community/retrieve_remote_post.html
index 0e963f91..106094ea 100644
--- a/app/templates/community/retrieve_remote_post.html
+++ b/app/templates/community/retrieve_remote_post.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/dev/tools.html b/app/templates/dev/tools.html
index a49332cd..e4d56587 100644
--- a/app/templates/dev/tools.html
+++ b/app/templates/dev/tools.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'dev_tools' %}
 
diff --git a/app/templates/domain/domain.html b/app/templates/domain/domain.html
index bfca8ab1..01d38ae7 100644
--- a/app/templates/domain/domain.html
+++ b/app/templates/domain/domain.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/domain/domains.html b/app/templates/domain/domains.html
index 4eac8579..a004305b 100644
--- a/app/templates/domain/domains.html
+++ b/app/templates/domain/domains.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/domain/domains_blocked.html b/app/templates/domain/domains_blocked.html
index 460b203e..ac9254ca 100644
--- a/app/templates/domain/domains_blocked.html
+++ b/app/templates/domain/domains_blocked.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/donate.html b/app/templates/donate.html
index 179b6c62..77396b19 100644
--- a/app/templates/donate.html
+++ b/app/templates/donate.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
 <div class="row">
diff --git a/app/templates/errors/401.html b/app/templates/errors/401.html
index 115eb36d..cd34299a 100644
--- a/app/templates/errors/401.html
+++ b/app/templates/errors/401.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
     <div class="row">
diff --git a/app/templates/errors/404.html b/app/templates/errors/404.html
index e652ca43..b37443c8 100644
--- a/app/templates/errors/404.html
+++ b/app/templates/errors/404.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
     <div class="row">
diff --git a/app/templates/errors/500.html b/app/templates/errors/500.html
index 36c848c1..e0a2024d 100644
--- a/app/templates/errors/500.html
+++ b/app/templates/errors/500.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
     <div class="row">
diff --git a/app/templates/instance/list_instances.html b/app/templates/instance/list_instances.html
index 75bd470a..8d18f9fb 100644
--- a/app/templates/instance/list_instances.html
+++ b/app/templates/instance/list_instances.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/instance/overview.html b/app/templates/instance/overview.html
index 1f1d3482..0d337f89 100644
--- a/app/templates/instance/overview.html
+++ b/app/templates/instance/overview.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/instance/people.html b/app/templates/instance/people.html
index a93fe188..7ab7b5d5 100644
--- a/app/templates/instance/people.html
+++ b/app/templates/instance/people.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/keyboard_shortcuts.html b/app/templates/keyboard_shortcuts.html
index 91b04df0..7f3da43c 100644
--- a/app/templates/keyboard_shortcuts.html
+++ b/app/templates/keyboard_shortcuts.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
 <div class="row">
diff --git a/app/templates/post/add_reply.html b/app/templates/post/add_reply.html
index e3d9b7e2..4e6f5bef 100644
--- a/app/templates/post/add_reply.html
+++ b/app/templates/post/add_reply.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/continue_discussion.html b/app/templates/post/continue_discussion.html
index 50cda27f..c6b67a5d 100644
--- a/app/templates/post/continue_discussion.html
+++ b/app/templates/post/continue_discussion.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_cross_post.html b/app/templates/post/post_cross_post.html
index 550589c3..11cdb8a9 100644
--- a/app/templates/post/post_cross_post.html
+++ b/app/templates/post/post_cross_post.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_cross_posts.html b/app/templates/post/post_cross_posts.html
index 734c69c3..52acd590 100644
--- a/app/templates/post/post_cross_posts.html
+++ b/app/templates/post/post_cross_posts.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_edit.html b/app/templates/post/post_edit.html
index 1fc96591..861ac374 100644
--- a/app/templates/post/post_edit.html
+++ b/app/templates/post/post_edit.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form, render_field %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_mea_culpa.html b/app/templates/post/post_mea_culpa.html
index 9b19caae..131254b3 100644
--- a/app/templates/post/post_mea_culpa.html
+++ b/app/templates/post/post_mea_culpa.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_reply_edit.html b/app/templates/post/post_reply_edit.html
index 9fcc5686..35ebf51f 100644
--- a/app/templates/post/post_reply_edit.html
+++ b/app/templates/post/post_reply_edit.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_reply_report.html b/app/templates/post/post_reply_report.html
index 4708d851..f49bdd28 100644
--- a/app/templates/post/post_reply_report.html
+++ b/app/templates/post/post_reply_report.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/post/post_report.html b/app/templates/post/post_report.html
index 3eaf0148..f8926807 100644
--- a/app/templates/post/post_report.html
+++ b/app/templates/post/post_report.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/privacy.html b/app/templates/privacy.html
index 9623f1e3..dce29668 100644
--- a/app/templates/privacy.html
+++ b/app/templates/privacy.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 
 {% block app_content %}
 <div class="row">
diff --git a/app/templates/search/results.html b/app/templates/search/results.html
index a366ae4b..e12b50cf 100644
--- a/app/templates/search/results.html
+++ b/app/templates/search/results.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/search/start.html b/app/templates/search/start.html
index 36756bb6..0f0f7bf1 100644
--- a/app/templates/search/start.html
+++ b/app/templates/search/start.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/tag/tag.html b/app/templates/tag/tag.html
index a651f237..88e5649e 100644
--- a/app/templates/tag/tag.html
+++ b/app/templates/tag/tag.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/tag/tags.html b/app/templates/tag/tags.html
index 88e41836..63a33bad 100644
--- a/app/templates/tag/tags.html
+++ b/app/templates/tag/tags.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/tag/tags_blocked.html b/app/templates/tag/tags_blocked.html
index 88e41836..63a33bad 100644
--- a/app/templates/tag/tags_blocked.html
+++ b/app/templates/tag/tags_blocked.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/topic/show_topic.html b/app/templates/topic/show_topic.html
index 50b19cc7..f1e43a5b 100644
--- a/app/templates/topic/show_topic.html
+++ b/app/templates/topic/show_topic.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/topic/suggest_topics.html b/app/templates/topic/suggest_topics.html
index c7262e8a..340d88ee 100644
--- a/app/templates/topic/suggest_topics.html
+++ b/app/templates/topic/suggest_topics.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'suggest_topics' %}
 {% from 'bootstrap/form.html' import render_form %}
 
diff --git a/app/templates/topic/suggestion_denied.html b/app/templates/topic/suggestion_denied.html
index 4f9313d0..8ee3a4eb 100644
--- a/app/templates/topic/suggestion_denied.html
+++ b/app/templates/topic/suggestion_denied.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'suggest_topics' %}
 
diff --git a/app/templates/user/delete_account.html b/app/templates/user/delete_account.html
index 3e9d19a8..e54e4d2a 100644
--- a/app/templates/user/delete_account.html
+++ b/app/templates/user/delete_account.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/user/edit_filters.html b/app/templates/user/edit_filters.html
index af3449c3..727e1844 100644
--- a/app/templates/user/edit_filters.html
+++ b/app/templates/user/edit_filters.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'filters' %}
 
diff --git a/app/templates/user/edit_profile.html b/app/templates/user/edit_profile.html
index cafb3661..be9af653 100644
--- a/app/templates/user/edit_profile.html
+++ b/app/templates/user/edit_profile.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% set active_child = 'edit_profile' %}
 {% from 'bootstrap/form.html' import render_field %}
 
diff --git a/app/templates/user/edit_settings.html b/app/templates/user/edit_settings.html
index 1742764e..2de97832 100644
--- a/app/templates/user/edit_settings.html
+++ b/app/templates/user/edit_settings.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'settings' %}
 
diff --git a/app/templates/user/fediverse_redirect.html b/app/templates/user/fediverse_redirect.html
index ea450d39..2498cb75 100644
--- a/app/templates/user/fediverse_redirect.html
+++ b/app/templates/user/fediverse_redirect.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 {% set active_child = 'settings' %}
 
diff --git a/app/templates/user/filters.html b/app/templates/user/filters.html
index 4a1c5caf..311b1cec 100644
--- a/app/templates/user/filters.html
+++ b/app/templates/user/filters.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'filters' %}
 
diff --git a/app/templates/user/import_export.html b/app/templates/user/import_export.html
index 15c40d5f..b2cca54d 100644
--- a/app/templates/user/import_export.html
+++ b/app/templates/user/import_export.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_field %}
 {% set active_child = 'settings' %}
 
diff --git a/app/templates/user/notifications.html b/app/templates/user/notifications.html
index e71ef369..9332fbe5 100644
--- a/app/templates/user/notifications.html
+++ b/app/templates/user/notifications.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/user/people.html b/app/templates/user/people.html
index c40708f4..243109ae 100644
--- a/app/templates/user/people.html
+++ b/app/templates/user/people.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index 0b76b8da..4d0f33cf 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% if current_user.is_authenticated and user.id == current_user.id %}
diff --git a/app/templates/user/user_report.html b/app/templates/user/user_report.html
index 6c85b404..82fde20c 100644
--- a/app/templates/user/user_report.html
+++ b/app/templates/user/user_report.html
@@ -2,7 +2,7 @@
     {% extends 'themes/' + theme() + '/base.html' %}
 {% else %}
     {% extends "base.html" %}
-{% endif %} %}
+{% endif %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}