diff --git a/commentaries/forms.py b/commentaries/forms.py
index ce198737a14d3e2e06dc19a59946bbb4edb85d2c..e0df7db0437beb4251d5377eaeabbd71cea8b620 100644
--- a/commentaries/forms.py
+++ b/commentaries/forms.py
@@ -5,7 +5,6 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.template.loader import get_template
-from django.template import Context
 
 from .models import Commentary
 from .constants import COMMENTARY_PUBLISHED, COMMENTARY_PREPRINT
@@ -32,7 +31,7 @@ class DOIToQueryForm(forms.Form):
         commentary = Commentary.objects.filter(pub_DOI=input_doi)
         if commentary.exists():
             error_message = get_template('commentaries/_doi_query_commentary_exists.html').render(
-                Context({'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string})
+                {'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string}
             )
             raise forms.ValidationError(mark_safe(error_message))
 
@@ -68,7 +67,7 @@ class ArxivQueryForm(forms.Form):
         commentary = Commentary.objects.filter(arxiv_identifier=identifier)
         if commentary.exists():
             error_message = get_template('commentaries/_doi_query_commentary_exists.html').render(
-                Context({'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string})
+                {'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string}
             )
             raise forms.ValidationError(mark_safe(error_message))
 
@@ -126,7 +125,7 @@ class RequestArxivPreprintForm(RequestCommentaryForm):
         commentary = Commentary.objects.filter(arxiv_identifier=arxiv_identifier)
         if commentary.exists():
             error_message = get_template('commentaries/_doi_query_commentary_exists.html').render(
-                Context({'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string})
+                {'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string}
             )
             raise forms.ValidationError(mark_safe(error_message))
 
@@ -157,7 +156,7 @@ class RequestPublishedArticleForm(RequestCommentaryForm):
         commentary = Commentary.objects.filter(pub_DOI=input_doi)
         if commentary.exists():
             error_message = get_template('commentaries/_doi_query_commentary_exists.html').render(
-                Context({'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string})
+                {'arxiv_or_DOI_string': commentary[0].arxiv_or_DOI_string}
             )
             raise forms.ValidationError(mark_safe(error_message))
 
diff --git a/comments/templates/comments/_add_comment_form.html b/comments/templates/comments/_add_comment_form.html
index e50ce6528019f236fa9c2e7f8a634d63d86c9ec1..ac4a6b8c1e9d482d8a08e01f1ad3fed8c59f708e 100644
--- a/comments/templates/comments/_add_comment_form.html
+++ b/comments/templates/comments/_add_comment_form.html
@@ -1,7 +1,8 @@
 {% load bootstrap %}
 
+{% block footer_script %}
 <script>
-    $(document).ready(function(){
+    $(function(){
         var comment_text_input = $("#id_comment_text");
 
         comment_text_input.on('keyup', function(){
@@ -11,6 +12,7 @@
         }).trigger('keyup')
     });
 </script>
+{% endblock %}
 
 <form enctype="multipart/form-data" action="{{url}}" method="post">
       {% csrf_token %}
diff --git a/comments/templatetags/comment_extras.py b/comments/templatetags/comment_extras.py
index 5ae3d8261883134688183e76825356cf8ec0d209..cd426b4d4612a57bfa1965159507b7ce43f1abd8 100644
--- a/comments/templatetags/comment_extras.py
+++ b/comments/templatetags/comment_extras.py
@@ -21,13 +21,13 @@ class CommentTemplateNode(template.Node):
         content_object = self.content_object.resolve(context)
         if isinstance(content_object, Submission):
             t = context.template.engine.get_template('submissions/_submission_summary_short.html')
-            return t.render(template.Context({'submission': content_object}))
+            return t.render({'submission': content_object})
         elif isinstance(content_object, Commentary):
             t = context.template.engine.get_template('commentaries/_commentary_summary.html')
-            return t.render(template.Context({'commentary': content_object}))
+            return t.render({'commentary': content_object})
         elif isinstance(content_object, ThesisLink):
             t = context.template.engine.get_template('theses/_thesislink_information.html')
-            return t.render(template.Context({'thesislink': content_object}))
+            return t.render({'thesislink': content_object})
         else:
             raise template.TemplateSyntaxError(
                 "The instance type given as an argument is not supported.")
diff --git a/scipost/utils.py b/scipost/utils.py
index ed3d5b251a87c83040425da86aa073c3a814fa5b..84e0e4673cf216ecd329e25167496f821bcb4200 100644
--- a/scipost/utils.py
+++ b/scipost/utils.py
@@ -194,7 +194,7 @@ class Utils(BaseMailUtil):
         cls.invitation.save()
         email_text = ''
         email_text_html = ''
-        email_context = Context({})
+        email_context = {}
         if renew:
             email_text += ('Reminder: Invitation to SciPost\n'
                            '-------------------------------\n\n')
@@ -615,7 +615,7 @@ class Utils(BaseMailUtil):
         """
         Requires loading the 'notification' attribute.
         """
-        email_context = Context({})
+        email_context = {}
         email_text = ('Dear ' + cls.notification.contributor.get_title_display() +
                       ' ' + cls.notification.contributor.user.last_name)
         email_text_html = 'Dear {{ title }} {{ last_name }}'
diff --git a/scipost/views.py b/scipost/views.py
index ef40f025bf02f8d131e359ee9ce278cb1e5c5c5a..349d0f80f379177a332171bc03a053b906f9b5cc 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -1087,12 +1087,12 @@ def email_group_members(request):
                         email_text_html += (
                             '<br/>\n<p style="font-size: 10px;">Don\'t want to receive such '
                             'emails? <a href="%s">Unsubscribe</a>.</p>' % url_unsubscribe)
-                        email_context = Context({
+                        email_context = {
                             'title': member.contributor.get_title_display(),
                             'last_name': member.last_name,
                             'email_text': form.cleaned_data['email_text'],
                             'key': member.contributor.activation_key,
-                        })
+                        }
                         html_template = Template(email_text_html)
                         html_version = html_template.render(email_context)
                         message = EmailMultiAlternatives(
@@ -1121,7 +1121,7 @@ def email_particular(request):
         if form.is_valid():
             email_text = form.cleaned_data['email_text']
             email_text_html = '{{ email_text|linebreaks }}'
-            email_context = Context({'email_text': form.cleaned_data['email_text']})
+            email_context = {'email_text': form.cleaned_data['email_text']}
             if form.cleaned_data['include_scipost_summary']:
                 email_text += SCIPOST_SUMMARY_FOOTER
                 email_text_html += SCIPOST_SUMMARY_FOOTER_HTML
@@ -1163,7 +1163,7 @@ def send_precooked_email(request):
         precookedEmail.save()
         email_text = precookedEmail.email_text
         email_text_html = '{{ email_text|linebreaks }}'
-        email_context = Context({'email_text': precookedEmail.email_text_html})
+        email_context = {'email_text': precookedEmail.email_text_html}
         if form.cleaned_data['include_scipost_summary']:
             email_text += SCIPOST_SUMMARY_FOOTER
             email_text_html += SCIPOST_SUMMARY_FOOTER_HTML
diff --git a/submissions/utils.py b/submissions/utils.py
index 27b139a1c98d471a9caf665e87d3905078dccff6..2fe298451595321a8b7485c1cf43227d57f4b833 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -322,12 +322,12 @@ class SubmissionUtils(BaseMailUtil):
             'from your <a href="https://scipost.org/personal_page">personal page</a>.</p>'
             '<p>With many thanks,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.submission.submitted_by.get_title_display(),
             'last_name': cls.submission.submitted_by.user.last_name,
             'sub_title': cls.submission.title,
             'author_list': cls.submission.author_list,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -361,12 +361,12 @@ class SubmissionUtils(BaseMailUtil):
             'from your <a href="https://scipost.org/personal_page">personal page</a>.</p>'
             '<p>With many thanks,</p>'
             '<p>The SciPost Team</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.submission.submitted_by.get_title_display(),
             'last_name': cls.submission.submitted_by.user.last_name,
             'sub_title': cls.submission.title,
             'author_list': cls.submission.author_list,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -414,12 +414,12 @@ class SubmissionUtils(BaseMailUtil):
             'fails in the meantime.</p>'
             '\n<p>Many thanks in advance for your collaboration,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.assignment.to.get_title_display(),
             'last_name': cls.assignment.to.user.last_name,
             'sub_title': cls.assignment.submission.title,
             'author_list': cls.assignment.submission.author_list,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -470,13 +470,13 @@ class SubmissionUtils(BaseMailUtil):
             '<a href="https://scipost.org/EdCol_by-laws">Editorial College by-laws</a>.</p>'
             '<p>Many thanks in advance for your collaboration,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.assignment.to.get_title_display(),
             'last_name': cls.assignment.to.user.last_name,
             'sub_title': cls.assignment.submission.title,
             'author_list': cls.assignment.submission.author_list,
             'arxiv_identifier_w_vn_nr': cls.assignment.submission.arxiv_identifier_w_vn_nr,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -553,7 +553,7 @@ class SubmissionUtils(BaseMailUtil):
             '<p>We thank you very much for your contribution.</p>'
             '<p>Sincerely,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.assignment.submission.submitted_by.get_title_display(),
             'last_name': cls.assignment.submission.submitted_by.user.last_name,
             'sub_title': cls.assignment.submission.title,
@@ -561,7 +561,7 @@ class SubmissionUtils(BaseMailUtil):
             'arxiv_identifier_w_vn_nr': cls.assignment.submission.arxiv_identifier_w_vn_nr,
             'deadline': datetime.datetime.strftime(cls.assignment.submission.reporting_deadline,
                                                    "%Y-%m-%d"),
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -605,13 +605,13 @@ class SubmissionUtils(BaseMailUtil):
             '<p>We nonetheless thank you very much for your contribution.</p>'
             '<p>Sincerely,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.submission.submitted_by.get_title_display(),
             'last_name': cls.submission.submitted_by.user.last_name,
             'sub_title': cls.submission.title,
             'author_list': cls.submission.author_list,
             'personal_message': cls.personal_message,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -719,7 +719,7 @@ class SubmissionUtils(BaseMailUtil):
             '<p>We very much hope we can count on your expertise,</p>'
             '<p>Many thanks in advance,</p>'
             '<p>The SciPost Team</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.invitation.get_title_display(),
             'last_name': cls.invitation.last_name,
             'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
@@ -730,7 +730,7 @@ class SubmissionUtils(BaseMailUtil):
             'deadline': datetime.datetime.strftime(cls.invitation.submission.reporting_deadline,
                                                    "%Y-%m-%d"),
             'invitation_key': cls.invitation.invitation_key,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -805,7 +805,7 @@ class SubmissionUtils(BaseMailUtil):
             '<p>We very much hope we can count on your expertise,</p>'
             '<p>Many thanks in advance,</p>'
             '<p>The SciPost Team</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.invitation.get_title_display(),
             'last_name': cls.invitation.last_name,
             'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
@@ -816,7 +816,7 @@ class SubmissionUtils(BaseMailUtil):
             'deadline': datetime.datetime.strftime(cls.invitation.submission.reporting_deadline,
                                                    "%Y-%m-%d"),
             'invitation_key': cls.invitation.invitation_key,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -876,7 +876,7 @@ class SubmissionUtils(BaseMailUtil):
                 'registration form</a> is still available '
                 'after which your registration will be activated, giving you full access to '
                 'the portal\'s facilities (in particular allowing you to provide referee reports).</p>')
-        email_context = Context({
+        email_context = {
             'title': cls.invitation.get_title_display(),
             'last_name': cls.invitation.last_name,
             'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
@@ -884,7 +884,7 @@ class SubmissionUtils(BaseMailUtil):
             'sub_title': cls.invitation.submission.title,
             'author_list': cls.invitation.submission.author_list,
             'invitation_key': cls.invitation.invitation_key,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -989,7 +989,7 @@ class SubmissionUtils(BaseMailUtil):
                 '\n<strong>Report</strong>: <br/><p>{{ report|linebreaks }}</p>'
                 '\n<strong>Requested changes</strong>: <br/><p>{{ requested_changes|linebreaks }}</p>'
                 '\n<strong>Remarks for Editors</strong>: <br/><p>{{ remarks_for_editors|linebreaks }}</p>')
-        email_context = Context({
+        email_context = {
             'ref_title': cls.report.author.get_title_display(),
             'ref_last_name': cls.report.author.user.last_name,
             'sub_title': cls.report.submission.title,
@@ -1000,7 +1000,7 @@ class SubmissionUtils(BaseMailUtil):
             'report': cls.report.report,
             'requested_changes': cls.report.requested_changes,
             'remarks_for_editors': cls.report.remarks_for_editors,
-        })
+        }
         if cls.report.status in [STATUS_UNCLEAR, STATUS_INCORRECT,
                                  STATUS_NOT_USEFUL, STATUS_NOT_ACADEMIC]:
             email_context['refusal_reason'] = cls.report.get_status_display()
@@ -1050,13 +1050,13 @@ class SubmissionUtils(BaseMailUtil):
             '\n<p>We thank you very much for your contribution.</p>'
             '<p>Sincerely,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'auth_title': cls.report.submission.submitted_by.get_title_display(),
             'auth_last_name': cls.report.submission.submitted_by.user.last_name,
             'sub_title': cls.report.submission.title,
             'author_list': cls.report.submission.author_list,
             'arxiv_identifier_w_vn_nr': cls.report.submission.arxiv_identifier_w_vn_nr,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -1092,13 +1092,13 @@ class SubmissionUtils(BaseMailUtil):
             '\n<p>We thank you very much for your contribution.</p>'
             '<p>Sincerely,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'auth_title': cls.submission.submitted_by.get_title_display(),
             'auth_last_name': cls.submission.submitted_by.user.last_name,
             'sub_title': cls.submission.title,
             'author_list': cls.submission.author_list,
             'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -1223,13 +1223,13 @@ class SubmissionUtils(BaseMailUtil):
             '\n<p>We thank you very much for your contribution.</p>'
             '<p>Sincerely,</p>'
             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'auth_title': cls.submission.submitted_by.get_title_display(),
             'auth_last_name': cls.submission.submitted_by.user.last_name,
             'sub_title': cls.submission.title,
             'author_list': cls.submission.author_list,
             'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -1312,14 +1312,14 @@ class SubmissionUtils(BaseMailUtil):
         email_text_html += ('\n<p>We thank you very much for your contribution.</p>'
                             '<p>Sincerely,</p>'
                             '<p>The SciPost Team.</p>')
-        email_context = Context({
+        email_context = {
             'auth_title': cls.submission.submitted_by.get_title_display(),
             'auth_last_name': cls.submission.submitted_by.user.last_name,
             'sub_title': cls.submission.title,
             'author_list': cls.submission.author_list,
             'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
             'journal': cls.submission.get_submitted_to_journal_display(),
-        })
+        }
         email_text_html += '<br/>' + EMAIL_FOOTER
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
@@ -1357,7 +1357,7 @@ class SubmissionUtils(BaseMailUtil):
             'so we can finish processing these submissions?</p>'
             '<p>Many thanks in advance,</p>'
             '<p>The SciPost Team.</p><br/>' + EMAIL_FOOTER)
-        email_context = Context({})
+        email_context = {}
         html_template = Template(email_text_html)
         html_version = html_template.render(email_context)
         emailmessage = EmailMultiAlternatives(
diff --git a/submissions/views.py b/submissions/views.py
index cda1c2fdc58343fa484fd3cb925b8fbd392f2974..e4f4615f536b2899e8aaa992ec4299c3675b3c37 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1389,7 +1389,7 @@ def remind_Fellows_to_vote(request):
     for name in sorted(Fellow_names):
         ack_message += '<li>' + name + '</li>'
     ack_message += '</ul>'
-    context = {'ack_message': Template(ack_message).render(Context({})),
+    context = {'ack_message': Template(ack_message).render({}),
                'followup_message': 'Return to the ',
                'followup_link': reverse('submissions:pool'),
                'followup_link_label': 'Submissions pool'}
diff --git a/virtualmeetings/views.py b/virtualmeetings/views.py
index cb3d7984b9d226a453a2a43fdd4e91df6ea40057..23e3c3e3d3d0e5b8e0b58052793d687564b177b6 100644
--- a/virtualmeetings/views.py
+++ b/virtualmeetings/views.py
@@ -27,7 +27,7 @@ def VGMs(request):
 @permission_required('scipost.can_attend_VGMs')
 def VGM_detail(request, VGM_id):
     VGM_instance = get_object_or_404(VGM, id=VGM_id)
-    VGM_information = Template(VGM_instance.information).render(Context({}))
+    VGM_information = Template(VGM_instance.information).render({})
     feedback_received = Feedback.objects.filter(VGM=VGM_instance).order_by('date')
     feedback_form = FeedbackForm()
     current_Fellows = Contributor.objects.filter(