diff --git a/bakery/management/commands/build.py b/bakery/management/commands/build.py
index 4a3bc1a..8ac5abe 100644
--- a/bakery/management/commands/build.py
+++ b/bakery/management/commands/build.py
@@ -15,7 +15,7 @@
 # Filesystem
 from fs import path
 from fs import copy
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 
 # Pooling
 import multiprocessing
@@ -128,9 +128,9 @@ def set_options(self, *args, **options):
             self.build_dir = settings.BUILD_DIR
 
         # Get the datatypes right so fs will be happy
-        self.build_dir = smart_text(self.build_dir)
-        self.static_root = smart_text(settings.STATIC_ROOT)
-        self.media_root = smart_text(settings.MEDIA_ROOT)
+        self.build_dir = smart_str(self.build_dir)
+        self.static_root = smart_str(settings.STATIC_ROOT)
+        self.media_root = smart_str(settings.MEDIA_ROOT)
 
         # Connect the BUILD_DIR with our filesystem backend
         self.app = apps.get_app_config("bakery")
@@ -176,7 +176,7 @@ def build_static(self, *args, **options):
 
         # Set the target directory inside the filesystem.
         target_dir = path.join(self.build_dir, settings.STATIC_URL.lstrip("/"))
-        target_dir = smart_text(target_dir)
+        target_dir = smart_str(target_dir)
         if os.path.exists(self.static_root) and settings.STATIC_URL:
             if getattr(settings, "BAKERY_GZIP", False):
                 self.copytree_and_gzip(self.static_root, target_dir)
@@ -210,7 +210,7 @@ def build_media(self):
         if os.path.exists(self.media_root) and settings.MEDIA_URL:
             target_dir = path.join(self.build_dir, settings.MEDIA_URL.lstrip("/"))
             logger.debug("Copying {}{} to {}{}".format("osfs://", self.media_root, self.fs_name, target_dir))
-            copy.copy_dir("osfs:///", smart_text(self.media_root), self.fs, smart_text(target_dir))
+            copy.copy_dir("osfs:///", smart_str(self.media_root), self.fs, smart_str(target_dir))
 
     def get_view_instance(self, view):
         """
@@ -294,7 +294,7 @@ def copyfile_and_gzip(self, source_path, target_path):
                     "osfs://", source_path, self.fs_name, target_path
                 )
             )
-            copy.copy_file("osfs:///", smart_text(source_path), self.fs, smart_text(target_path))
+            copy.copy_file("osfs:///", smart_str(source_path), self.fs, smart_str(target_path))
 
         # # if the file is already gzipped
         elif encoding == "gzip":
@@ -303,7 +303,7 @@ def copyfile_and_gzip(self, source_path, target_path):
                     "osfs://", source_path, self.fs_name, target_path
                 )
             )
-            copy.copy_file("osfs:///", smart_text(source_path), self.fs, smart_text(target_path))
+            copy.copy_file("osfs:///", smart_str(source_path), self.fs, smart_str(target_path))
 
         # If it is one we want to gzip...
         else:
@@ -320,6 +320,6 @@ def copyfile_and_gzip(self, source_path, target_path):
                     f.write(six.binary_type(source_file.read()))
 
                 # Write that buffer out to the filesystem
-                with self.fs.open(smart_text(target_path), "wb") as outfile:
+                with self.fs.open(smart_str(target_path), "wb") as outfile:
                     outfile.write(data_buffer.getvalue())
                     outfile.close()
diff --git a/bakery/management/commands/publish.py b/bakery/management/commands/publish.py
index fa43573..2cba459 100644
--- a/bakery/management/commands/publish.py
+++ b/bakery/management/commands/publish.py
@@ -15,7 +15,7 @@
 from fs import copy
 from fs_s3fs import S3FS
 from fs.copy import copy_file
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 
 from django.apps import apps
 
@@ -223,7 +223,7 @@ def set_options(self, options):
             # Go ahead and use it
             self.build_dir = settings.BUILD_DIR
 
-        self.build_dir = smart_text(self.build_dir)
+        self.build_dir = smart_str(self.build_dir)
 
         # Connect the BUILD_DIR with our filesystem backend
         self.app = apps.get_app_config("bakery")
@@ -295,7 +295,7 @@ def get_local_file_list(self):
 
                 local_key = path.combine(path.frombase(path.abspath(self.build_dir), dirpath), fname.name)
                 local_key = path.relpath(local_key)
-                file_list.append(smart_text(local_key))
+                file_list.append(smart_str(local_key))
         return file_list
 
     def sync_with_s3(self):
diff --git a/bakery/views/base.py b/bakery/views/base.py
index 819fb29..be1c94f 100644
--- a/bakery/views/base.py
+++ b/bakery/views/base.py
@@ -14,7 +14,7 @@
 from fs import path
 from django.apps import apps
 from django.conf import settings
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from bakery import DEFAULT_GZIP_CONTENT_TYPES
 from django.test.client import RequestFactory
 from bakery.management.commands import get_s3_client
@@ -76,7 +76,7 @@ def write_file(self, target_path, html):
         Writes out the provided HTML to the provided path.
         """
         logger.debug("Building to {}{}".format(self.fs_name, target_path))
-        with self.fs.open(smart_text(target_path), "wb") as outfile:
+        with self.fs.open(smart_str(target_path), "wb") as outfile:
             outfile.write(six.binary_type(html))
             outfile.close()
 
@@ -114,7 +114,7 @@ def gzip_file(self, target_path, html):
             f.write(six.binary_type(html))
 
         # Write that buffer out to the filesystem
-        with self.fs.open(smart_text(target_path), "wb") as outfile:
+        with self.fs.open(smart_str(target_path), "wb") as outfile:
             outfile.write(data_buffer.getvalue())
             outfile.close()
 
diff --git a/bigvince/settings_.py b/bigvince/settings_.py
index 633c5c6..332c45b 100644
--- a/bigvince/settings_.py
+++ b/bigvince/settings_.py
@@ -46,6 +46,8 @@
 import environ
 import urllib
 
+import django
+
 env = environ.Env(DEBUG=(bool, False))
 environ.Env.read_env()
 
@@ -56,6 +58,11 @@
 # any change that requires database migrations is a minor release
 VERSION = "3.0.44"
 
+if django.VERSION >= (5, 1):
+    DB_BACKEND="django.db.backends.postgresql"
+else:
+    DB_BACKEND=DB_BACKEND
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
 
@@ -192,7 +199,14 @@
         STATIC_URL = f"https://{AWS_S3_CUSTOM_DOMAIN}/{AWS_LOCATION}/"
     # Tell the staticfiles app to use S3Boto3 storage when writing the collected static files (when
     # you run `collectstatic`).
-    STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    if django.VERSION >= (5, 1):
+        STORAGES = {
+            "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+            "staticfiles": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage"},
+        }
+    else:
+        STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+
     # set to True if you want VINCE to write a contacts backup file to an S3 directory,
     # you must also set ANCIENT_SRMAIL_BUCKET to S3 arn
     # To reload contacts into VINCE, set INITIAL_CONTACT_FILE and
@@ -425,7 +439,7 @@ def get_secret(secret_arn):
 DATABASES = {"default": {}}
 if VINCE_NAMESPACE == "vince":
     DATABASES["default"] = {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": DB_BACKEND,
         "NAME": vincetrack_db,
         "USER": vincetrack_user,
         "PASSWORD": vincetrack_password,
@@ -439,7 +453,7 @@ def get_secret(secret_arn):
 
 if VINCE_NAMESPACE in ["vince", "vinny"]:
     DATABASES["vincecomm"] = {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": DB_BACKEND,
         "NAME": vincecomm_db,
         "USER": vincecomm_user,
         "PASSWORD": vincecomm_password,
@@ -449,7 +463,7 @@ def get_secret(secret_arn):
     }
 
 DATABASES["vincepub"] = {
-    "ENGINE": "django.db.backends.postgresql_psycopg2",
+    "ENGINE": DB_BACKEND,
     "NAME": vincepub_db,
     "USER": vincepub_user,
     "PASSWORD": vincepub_password,
@@ -462,7 +476,7 @@ def get_secret(secret_arn):
     # don't enable the admin interface for kb
     ADMIN_ENABLED = False
     DATABASES["default"] = {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": DB_BACKEND,
         "NAME": vincepub_db,
         "USER": vincepub_user,
         "PASSWORD": vincepub_password,
@@ -475,7 +489,7 @@ def get_secret(secret_arn):
 if VINCE_NAMESPACE == "vinny":
     SESSION_COOKIE_PATH = "/vince/comm"
     DATABASES["default"] = {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": DB_BACKEND,
         "NAME": vincecomm_db,
         "USER": vincecomm_user,
         "PASSWORD": vincecomm_password,
diff --git a/cogauth/backend.py b/cogauth/backend.py
index 0ce62dc..f875aac 100644
--- a/cogauth/backend.py
+++ b/cogauth/backend.py
@@ -49,7 +49,7 @@
 from vinny.models import VinceAPIToken
 from rest_framework import exceptions
 from rest_framework.authentication import BaseAuthentication, TokenAuthentication, get_authorization_header
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from django.utils.translation import gettext as _
 from bigvince.utils import get_cognito_url, get_cognito_pool_url
 import traceback
@@ -443,7 +443,7 @@ def authenticate(self, request):
     def get_jwt_token(self, request):
         logger.debug(f"Collected headers for JSONWwebToken as {request.headers}")
         auth = get_authorization_header(request).split()
-        if not auth or smart_text(auth[0].lower()) != "bearer":
+        if not auth or smart_str(auth[0].lower()) != "bearer":
             return None
 
         if len(auth) == 1:
diff --git a/requirements.txt b/requirements.txt
index 5d383cf..cd18d91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 amqp==5.1.1
 appdirs==1.4.4
-asgiref==3.6.0
+asgiref==3.8.1
 asn1crypto==1.5.1
 async-timeout==4.0.2
 attrs==22.1.0
@@ -24,7 +24,7 @@ cryptography==50.0.0
 cvelib==1.3.0
 Deprecated==1.2.13
 dictdiffer==0.9.0
-Django==4.2.30
+Django==5.2.16
 django-appconf==1.0.5
 django-countries==7.4.2
 django-environ==0.9.0
diff --git a/vince/forms.py b/vince/forms.py
index 7b73879..5d63c03 100644
--- a/vince/forms.py
+++ b/vince/forms.py
@@ -55,7 +55,7 @@
 from vince.permissions import get_user_gen_queue
 import traceback
 import os
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -562,7 +562,7 @@ def save(self):
         logger.debug("IN FILE UPLOAD SAVE")
         # create the vincecommattachment
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type
diff --git a/vince/lib.py b/vince/lib.py
index cbc7d4c..ed5c8be 100644
--- a/vince/lib.py
+++ b/vince/lib.py
@@ -48,7 +48,7 @@
 from django.core.files import File
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from django.template.loader import render_to_string, get_template
 from vince.models import VulnerabilityCase
 
@@ -287,7 +287,7 @@ def process_attachments(followup, attached_files):
     for attached in attached_files:
         logger.debug(attached)
         if attached.size:
-            filename = smart_text(attached.name)
+            filename = smart_str(attached.name)
             logger.debug(filename)
             try:
                 mime_type = attached.content_type
diff --git a/vince/templates/vince/400.html b/vince/templates/vince/400.html
index e8e2baa..33733a6 100644
--- a/vince/templates/vince/400.html
+++ b/vince/templates/vince/400.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/403.html b/vince/templates/vince/403.html
index d679bad..80c51ab 100644
--- a/vince/templates/vince/403.html
+++ b/vince/templates/vince/403.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/500.html b/vince/templates/vince/500.html
index 80f6aab..c715ae8 100644
--- a/vince/templates/vince/500.html
+++ b/vince/templates/vince/500.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/activity.html b/vince/templates/vince/activity.html
index 5820c06..da0186b 100644
--- a/vince/templates/vince/activity.html
+++ b/vince/templates/vince/activity.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Activity" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/activity_search.js' %}"></script>
diff --git a/vince/templates/vince/approve_all.html b/vince/templates/vince/approve_all.html
index f8efd53..20c0c04 100644
--- a/vince/templates/vince/approve_all.html
+++ b/vince/templates/vince/approve_all.html
@@ -1,7 +1,7 @@
 {% extends "vince/modal.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="fullmodal">
diff --git a/vince/templates/vince/approve_users.html b/vince/templates/vince/approve_users.html
index ec94c6b..c20600f 100644
--- a/vince/templates/vince/approve_users.html
+++ b/vince/templates/vince/approve_users.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Pending Users" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/puser.js' %}"></script>
diff --git a/vince/templates/vince/artifacts.html b/vince/templates/vince/artifacts.html
index daa0d58..054e6ad 100644
--- a/vince/templates/vince/artifacts.html
+++ b/vince/templates/vince/artifacts.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize%}
 {% block vince_title %}{% trans "Ticket Artifacts" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/tabulator_bootstrap4.min.css' %}">
diff --git a/vince/templates/vince/bouncemanager.html b/vince/templates/vince/bouncemanager.html
index 7ca4491..cacfba0 100644
--- a/vince/templates/vince/bouncemanager.html
+++ b/vince/templates/vince/bouncemanager.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n contact_tags %}
 {% block vince_title %}{% trans "VINCE Bounce Manager" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/bouncemgr.js' %}"></script>
diff --git a/vince/templates/vince/case.html b/vince/templates/vince/case.html
index 93f2c02..2017391 100644
--- a/vince/templates/vince/case.html
+++ b/vince/templates/vince/case.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tickets.js' %}"></script>
diff --git a/vince/templates/vince/case_templates.html b/vince/templates/vince/case_templates.html
index 6aec9c4..00de03e 100644
--- a/vince/templates/vince/case_templates.html
+++ b/vince/templates/vince/case_templates.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case Template Management" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/case_management.js' %}"></script>
diff --git a/vince/templates/vince/changelog.html b/vince/templates/vince/changelog.html
index 4ac85fe..f89942e 100644
--- a/vince/templates/vince/changelog.html
+++ b/vince/templates/vince/changelog.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/diffview.js' %}"></script>
diff --git a/vince/templates/vince/complete_transfer.html b/vince/templates/vince/complete_transfer.html
index 5d3e7ed..82d52b9 100644
--- a/vince/templates/vince/complete_transfer.html
+++ b/vince/templates/vince/complete_transfer.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize ticket_to_link %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/transfer.js' %}"></script>
diff --git a/vince/templates/vince/contact.html b/vince/templates/vince/contact.html
index 5f4d472..1e673e3 100644
--- a/vince/templates/vince/contact.html
+++ b/vince/templates/vince/contact.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize ticket_to_link contact_tags %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/scontact.js' %}"></script>
diff --git a/vince/templates/vince/contact_assoc_list.html b/vince/templates/vince/contact_assoc_list.html
index e0cda07..4193f07 100644
--- a/vince/templates/vince/contact_assoc_list.html
+++ b/vince/templates/vince/contact_assoc_list.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Completed Associations" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vince/templates/vince/contact_cases.html b/vince/templates/vince/contact_cases.html
index 8ed4acf..c15b75c 100644
--- a/vince/templates/vince/contact_cases.html
+++ b/vince/templates/vince/contact_cases.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize post_tags ticket_to_link %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Contact Cases" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vince/templates/vince/contact_changes.html b/vince/templates/vince/contact_changes.html
index 879ab74..2de6130 100644
--- a/vince/templates/vince/contact_changes.html
+++ b/vince/templates/vince/contact_changes.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize contact_tags %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/scontact.js' %}"></script>
diff --git a/vince/templates/vince/contact_report.html b/vince/templates/vince/contact_report.html
index 5e0bdd0..7938cde 100644
--- a/vince/templates/vince/contact_report.html
+++ b/vince/templates/vince/contact_report.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Contact Reports" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/contactupdatelist.html b/vince/templates/vince/contactupdatelist.html
index bf8bfef..90edf1b 100644
--- a/vince/templates/vince/contactupdatelist.html
+++ b/vince/templates/vince/contactupdatelist.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Contact Updates" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vince/templates/vince/cr.html b/vince/templates/vince/cr.html
index b6f3731..565be93 100644
--- a/vince/templates/vince/cr.html
+++ b/vince/templates/vince/cr.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <!--<link rel="stylesheet" href="{% static 'vince/css/tabulator.min.css' %}">-->
diff --git a/vince/templates/vince/create.html b/vince/templates/vince/create.html
index 1134746..2990011 100644
--- a/vince/templates/vince/create.html
+++ b/vince/templates/vince/create.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/mathjax_config.js' %}"></script>
diff --git a/vince/templates/vince/create_case.html b/vince/templates/vince/create_case.html
index c529357..05a3f47 100644
--- a/vince/templates/vince/create_case.html
+++ b/vince/templates/vince/create_case.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create New Case Request" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vincecr.js' %}"></script>
diff --git a/vince/templates/vince/create_user.html b/vince/templates/vince/create_user.html
index 57127a7..28e328a 100644
--- a/vince/templates/vince/create_user.html
+++ b/vince/templates/vince/create_user.html
@@ -2,7 +2,7 @@
 {% load i18n static %}
 
 {% block vince_title %}{% trans "Create New User" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 
 {% block content %}
 {% load widget_tweaks %}
diff --git a/vince/templates/vince/cve_list.html b/vince/templates/vince/cve_list.html
index 0edb5d8..f724adc 100644
--- a/vince/templates/vince/cve_list.html
+++ b/vince/templates/vince/cve_list.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags widget_tweaks %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "CVE Services" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>
diff --git a/vince/templates/vince/cveform.html b/vince/templates/vince/cveform.html
index 3fa0b78..2b4ca47 100644
--- a/vince/templates/vince/cveform.html
+++ b/vince/templates/vince/cveform.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create CVE" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.formset.js' %}"></script>
diff --git a/vince/templates/vince/cveservices.html b/vince/templates/vince/cveservices.html
index e486c52..2c0e4a2 100644
--- a/vince/templates/vince/cveservices.html
+++ b/vince/templates/vince/cveservices.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "CVE Services" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 
diff --git a/vince/templates/vince/dashboard.html b/vince/templates/vince/dashboard.html
index 27f7bd4..472c82e 100644
--- a/vince/templates/vince/dashboard.html
+++ b/vince/templates/vince/dashboard.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Dashboard" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>
diff --git a/vince/templates/vince/edit_case.html b/vince/templates/vince/edit_case.html
index 9a2501e..a98eb72 100644
--- a/vince/templates/vince/edit_case.html
+++ b/vince/templates/vince/edit_case.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create Case" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/editcase.js' %}"></script>
diff --git a/vince/templates/vince/edit_case_template.html b/vince/templates/vince/edit_case_template.html
index a236fbd..8522597 100644
--- a/vince/templates/vince/edit_case_template.html
+++ b/vince/templates/vince/edit_case_template.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case Template Management" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/case_management.js' %}"></script>
diff --git a/vince/templates/vince/edit_cr.html b/vince/templates/vince/edit_cr.html
index 6f204b4..9a22568 100644
--- a/vince/templates/vince/edit_cr.html
+++ b/vince/templates/vince/edit_cr.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create New Case Request" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/editcr.js' %}"></script>
diff --git a/vince/templates/vince/edit_exploit.html b/vince/templates/vince/edit_exploit.html
index 6cfbaf5..b2bd109 100644
--- a/vince/templates/vince/edit_exploit.html
+++ b/vince/templates/vince/edit_exploit.html
@@ -1,6 +1,6 @@
 {% extends "vince/modal.html" %}
 {% load i18n widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vince/templates/vince/edit_ticket.html b/vince/templates/vince/edit_ticket.html
index 8e93089..4ed0088 100644
--- a/vince/templates/vince/edit_ticket.html
+++ b/vince/templates/vince/edit_ticket.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Edit Ticket" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.formset.js' %}"></script>
diff --git a/vince/templates/vince/edit_vulnote.html b/vince/templates/vince/edit_vulnote.html
index 6a63ee7..93ff2ae 100644
--- a/vince/templates/vince/edit_vulnote.html
+++ b/vince/templates/vince/edit_vulnote.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/mathjax_config.js' %}"></script>
diff --git a/vince/templates/vince/editcontact.html b/vince/templates/vince/editcontact.html
index 4d1bd33..d700cd0 100644
--- a/vince/templates/vince/editcontact.html
+++ b/vince/templates/vince/editcontact.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.formset.js' %}"></script>
diff --git a/vince/templates/vince/editgroup.html b/vince/templates/vince/editgroup.html
index a39093b..24875dc 100644
--- a/vince/templates/vince/editgroup.html
+++ b/vince/templates/vince/editgroup.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.multi-select.js' %}"></script>
diff --git a/vince/templates/vince/editvendorstatus.html b/vince/templates/vince/editvendorstatus.html
index d9c30e5..769f66c 100644
--- a/vince/templates/vince/editvendorstatus.html
+++ b/vince/templates/vince/editvendorstatus.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Edit Vendor Status" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/easymde.min.css' %}">
diff --git a/vince/templates/vince/editvul.html b/vince/templates/vince/editvul.html
index aae646a..1746326 100644
--- a/vince/templates/vince/editvul.html
+++ b/vince/templates/vince/editvul.html
@@ -1,6 +1,6 @@
 {% extends "vince/modal.html" %}
 {% load i18n widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 
 {% block content %}
 <div class="fullmodal">
diff --git a/vince/templates/vince/email_all.html b/vince/templates/vince/email_all.html
index 48d9da1..c02f339 100644
--- a/vince/templates/vince/email_all.html
+++ b/vince/templates/vince/email_all.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Email All" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/email.js' %}"></script>
diff --git a/vince/templates/vince/email_templates.html b/vince/templates/vince/email_templates.html
index 16353c2..46e994b 100644
--- a/vince/templates/vince/email_templates.html
+++ b/vince/templates/vince/email_templates.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Email Template Management" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/email_management.js' %}"></script>
diff --git a/vince/templates/vince/emails.html b/vince/templates/vince/emails.html
index 14bc17c..fbe1ace 100644
--- a/vince/templates/vince/emails.html
+++ b/vince/templates/vince/emails.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "VINCE Email" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/email_search.js' %}"></script>
diff --git a/vince/templates/vince/group.html b/vince/templates/vince/group.html
index 02353f4..3287dc1 100644
--- a/vince/templates/vince/group.html
+++ b/vince/templates/vince/group.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/group.js' %}"></script>
diff --git a/vince/templates/vince/ignored_users.html b/vince/templates/vince/ignored_users.html
index 747d138..525dfe8 100644
--- a/vince/templates/vince/ignored_users.html
+++ b/vince/templates/vince/ignored_users.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Ignored Users" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 {% load widget_tweaks %}
 
diff --git a/vince/templates/vince/include/statement.html b/vince/templates/vince/include/statement.html
index 652e87c..6c71ee1 100644
--- a/vince/templates/vince/include/statement.html
+++ b/vince/templates/vince/include/statement.html
@@ -1,7 +1,7 @@
 {% extends "vince/modal.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <form id="providestatementform" method="post" action="{{ action }}" enctype="multipart/form-data">
diff --git a/vince/templates/vince/initcontactverify.html b/vince/templates/vince/initcontactverify.html
index aad6536..32ff04a 100644
--- a/vince/templates/vince/initcontactverify.html
+++ b/vince/templates/vince/initcontactverify.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Verify Contact" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/contactverify.js' %}"></script>
diff --git a/vince/templates/vince/logout.html b/vince/templates/vince/logout.html
index 243706f..63b87d5 100644
--- a/vince/templates/vince/logout.html
+++ b/vince/templates/vince/logout.html
@@ -1,6 +1,6 @@
 {% extends "vince/login.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{%  load static %}
 
 {% block extrahead %}
 <script type="text/javascript" src="{% static 'vince/js/jquery.min.js' %}"></script>
diff --git a/vince/templates/vince/manage_alerts.html b/vince/templates/vince/manage_alerts.html
index d6c4447..350bbda 100644
--- a/vince/templates/vince/manage_alerts.html
+++ b/vince/templates/vince/manage_alerts.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Manage Alerts" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/manage_auto_assign.html b/vince/templates/vince/manage_auto_assign.html
index a01ea6f..e169f04 100644
--- a/vince/templates/vince/manage_auto_assign.html
+++ b/vince/templates/vince/manage_auto_assign.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Manage Ticket Assignment" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/assignment.js' %}"></script>
diff --git a/vince/templates/vince/manage_cve.html b/vince/templates/vince/manage_cve.html
index 26053e0..d126b9a 100644
--- a/vince/templates/vince/manage_cve.html
+++ b/vince/templates/vince/manage_cve.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create CVE" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.formset.js' %}"></script>
diff --git a/vince/templates/vince/new_email.html b/vince/templates/vince/new_email.html
index 253072b..9a4d0b6 100644
--- a/vince/templates/vince/new_email.html
+++ b/vince/templates/vince/new_email.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create Email" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/email.js' %}"></script>
diff --git a/vince/templates/vince/newcase.html b/vince/templates/vince/newcase.html
index 8112246..9bec65d 100644
--- a/vince/templates/vince/newcase.html
+++ b/vince/templates/vince/newcase.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create Case" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/newcase.js' %}"></script>
diff --git a/vince/templates/vince/newcontact.html b/vince/templates/vince/newcontact.html
index 9f402b2..1b5738e 100644
--- a/vince/templates/vince/newcontact.html
+++ b/vince/templates/vince/newcontact.html
@@ -1,6 +1,6 @@
 {% extends "vince/modal.html" %}
 {% load i18n widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <form name="cmgr" enctype="multipart/form-data" method="POST" action="{% url 'vince:newcontact' %}" id="cmgrform">
diff --git a/vince/templates/vince/newgroup.html b/vince/templates/vince/newgroup.html
index d103514..51898ba 100644
--- a/vince/templates/vince/newgroup.html
+++ b/vince/templates/vince/newgroup.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.multi-select.js' %}"></script>
diff --git a/vince/templates/vince/newticket.html b/vince/templates/vince/newticket.html
index 77754ab..73ef090 100644
--- a/vince/templates/vince/newticket.html
+++ b/vince/templates/vince/newticket.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Create Ticket" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/jquery.formset.js' %}"></script>
diff --git a/vince/templates/vince/notification.html b/vince/templates/vince/notification.html
index c38f457..126c37f 100644
--- a/vince/templates/vince/notification.html
+++ b/vince/templates/vince/notification.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/notify.html b/vince/templates/vince/notify.html
index 291433e..6674ddc 100644
--- a/vince/templates/vince/notify.html
+++ b/vince/templates/vince/notify.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 {% block vince_title %}{% trans "Write Vendor Notification" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/easymde.min.css' %}">
diff --git a/vince/templates/vince/notify_participant.html b/vince/templates/vince/notify_participant.html
index d5e4e99..01f5a9f 100644
--- a/vince/templates/vince/notify_participant.html
+++ b/vince/templates/vince/notify_participant.html
@@ -1,7 +1,7 @@
 {% extends "vince/modal.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="fullmodal">
diff --git a/vince/templates/vince/notify_vendor.html b/vince/templates/vince/notify_vendor.html
index 744df50..c71bcec 100644
--- a/vince/templates/vince/notify_vendor.html
+++ b/vince/templates/vince/notify_vendor.html
@@ -1,7 +1,7 @@
 {% extends "vince/modal.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   {% if vendors %}
diff --git a/vince/templates/vince/notifycr.html b/vince/templates/vince/notifycr.html
index 8680bdc..cd1ff05 100644
--- a/vince/templates/vince/notifycr.html
+++ b/vince/templates/vince/notifycr.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize ticket_to_link %}
 {% block vince_title %}{% trans "Write Vendor Notification" %}{% endblock %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/easymde.min.css' %}">
diff --git a/vince/templates/vince/preferences.html b/vince/templates/vince/preferences.html
index d40b71e..9f2fd95 100644
--- a/vince/templates/vince/preferences.html
+++ b/vince/templates/vince/preferences.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize widget_tweaks%}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 </script>  
 
diff --git a/vince/templates/vince/process_email.html b/vince/templates/vince/process_email.html
index f7b39dd..3aa2615 100644
--- a/vince/templates/vince/process_email.html
+++ b/vince/templates/vince/process_email.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize widget_tweaks%}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 </script>  
 
diff --git a/vince/templates/vince/redirect.html b/vince/templates/vince/redirect.html
index 11c598a..d4114a2 100644
--- a/vince/templates/vince/redirect.html
+++ b/vince/templates/vince/redirect.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Ticket Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tokens.js' %}"></script>
diff --git a/vince/templates/vince/reminders.html b/vince/templates/vince/reminders.html
index da505d4..09874c0 100644
--- a/vince/templates/vince/reminders.html
+++ b/vince/templates/vince/reminders.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize widget_tweaks%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/reminder.js' %}"></script>
diff --git a/vince/templates/vince/reports.html b/vince/templates/vince/reports.html
index 046e3fe..a582eae 100644
--- a/vince/templates/vince/reports.html
+++ b/vince/templates/vince/reports.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n report_tags ticket_to_link %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Reports" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/reports.js' %}"></script>
diff --git a/vince/templates/vince/review.html b/vince/templates/vince/review.html
index 2b87705..8b38aa5 100644
--- a/vince/templates/vince/review.html
+++ b/vince/templates/vince/review.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n markdown_extras %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/mathjax_config.js' %}"></script>
diff --git a/vince/templates/vince/roles.html b/vince/templates/vince/roles.html
index 1b7b0ce..6a8491e 100644
--- a/vince/templates/vince/roles.html
+++ b/vince/templates/vince/roles.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize widget_tweaks%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/fullcalendar/main.js' %}"></script>
diff --git a/vince/templates/vince/search.html b/vince/templates/vince/search.html
index 8386670..2c4141f 100644
--- a/vince/templates/vince/search.html
+++ b/vince/templates/vince/search.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Ticket Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/allsearch.js' %}"></script>
diff --git a/vince/templates/vince/searchcases.html b/vince/templates/vince/searchcases.html
index 237bed5..408195a 100644
--- a/vince/templates/vince/searchcases.html
+++ b/vince/templates/vince/searchcases.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/case_search.js' %}"></script>
diff --git a/vince/templates/vince/searchcontacts.html b/vince/templates/vince/searchcontacts.html
index a37026d..b5280ab 100644
--- a/vince/templates/vince/searchcontacts.html
+++ b/vince/templates/vince/searchcontacts.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/contact.js' %}"></script>
diff --git a/vince/templates/vince/searchtickets.html b/vince/templates/vince/searchtickets.html
index fe653e0..6a114e0 100644
--- a/vince/templates/vince/searchtickets.html
+++ b/vince/templates/vince/searchtickets.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n ticket_to_link %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Ticket Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/search.js' %}"></script>
diff --git a/vince/templates/vince/ssvc_assessment.html b/vince/templates/vince/ssvc_assessment.html
index 1386f41..cc1ee59 100644
--- a/vince/templates/vince/ssvc_assessment.html
+++ b/vince/templates/vince/ssvc_assessment.html
@@ -1,6 +1,6 @@
 {% extends 'vince/base.html' %}
 {% load i18n humanize %}
-{% load staticfiles %}
+{%  load static %}
 
 {% block content %}
 
diff --git a/vince/templates/vince/tag_manager.html b/vince/templates/vince/tag_manager.html
index c5715fb..a23dd3d 100644
--- a/vince/templates/vince/tag_manager.html
+++ b/vince/templates/vince/tag_manager.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Tag Manager" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tagmanager.js' %}"></script>
diff --git a/vince/templates/vince/teamdash.html b/vince/templates/vince/teamdash.html
index 6680067..1310ea9 100644
--- a/vince/templates/vince/teamdash.html
+++ b/vince/templates/vince/teamdash.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Dashboard" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>
diff --git a/vince/templates/vince/teams.html b/vince/templates/vince/teams.html
index 02ca329..5a0c987 100644
--- a/vince/templates/vince/teams.html
+++ b/vince/templates/vince/teams.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "User Admin" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/teamsettings.html b/vince/templates/vince/teamsettings.html
index b4de740..beab131 100644
--- a/vince/templates/vince/teamsettings.html
+++ b/vince/templates/vince/teamsettings.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Team Settings" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/easymde.min.css' %}">
diff --git a/vince/templates/vince/ticket.html b/vince/templates/vince/ticket.html
index 6b94fa5..a9f77a5 100644
--- a/vince/templates/vince/ticket.html
+++ b/vince/templates/vince/ticket.html
@@ -1,5 +1,5 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/tabulator_bootstrap4.css' %}">
diff --git a/vince/templates/vince/triage.html b/vince/templates/vince/triage.html
index 4962f76..a18f70a 100644
--- a/vince/templates/vince/triage.html
+++ b/vince/templates/vince/triage.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Ticket Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/triage.js' %}"></script>
diff --git a/vince/templates/vince/user_admin.html b/vince/templates/vince/user_admin.html
index 8c1a558..88cca89 100644
--- a/vince/templates/vince/user_admin.html
+++ b/vince/templates/vince/user_admin.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "User Admin" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vince/templates/vince/user_reports.html b/vince/templates/vince/user_reports.html
index 9f0fc23..6e49b67 100644
--- a/vince/templates/vince/user_reports.html
+++ b/vince/templates/vince/user_reports.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n report_tags dashboard_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Reports" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>
diff --git a/vince/templates/vince/user_search.html b/vince/templates/vince/user_search.html
index 286bdff..1e9a7ee 100644
--- a/vince/templates/vince/user_search.html
+++ b/vince/templates/vince/user_search.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize widget_tweaks%}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 </script>  
 
diff --git a/vince/templates/vince/usergraphs.html b/vince/templates/vince/usergraphs.html
index 6ee9c23..0b26355 100644
--- a/vince/templates/vince/usergraphs.html
+++ b/vince/templates/vince/usergraphs.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n report_tags ticket_to_link %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "User Graph" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/chart.min.js' %}"></script>
diff --git a/vince/templates/vince/vendors.html b/vince/templates/vince/vendors.html
index 3cf8d54..fcde545 100644
--- a/vince/templates/vince/vendors.html
+++ b/vince/templates/vince/vendors.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load i18n humanize%}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vince_contact.js' %}"></script>
diff --git a/vince/templates/vince/vendorstatus.html b/vince/templates/vince/vendorstatus.html
index b8669d0..44a4276 100644
--- a/vince/templates/vince/vendorstatus.html
+++ b/vince/templates/vince/vendorstatus.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n markdown_extras %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Vendor Status" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vendorstatus.js' %}"></script>
diff --git a/vince/templates/vince/vendorstatuschanges.html b/vince/templates/vince/vendorstatuschanges.html
index 00ddbc3..f83fb7e 100644
--- a/vince/templates/vince/vendorstatuschanges.html
+++ b/vince/templates/vince/vendorstatuschanges.html
@@ -1,7 +1,7 @@
 {% extends "vince/base.html" %}{% load i18n markdown_extras %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Vendor Status" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vendorstatus.js' %}"></script>
diff --git a/vince/templates/vince/vendorstatuslist.html b/vince/templates/vince/vendorstatuslist.html
index 8cd2341..c8d2eaa 100644
--- a/vince/templates/vince/vendorstatuslist.html
+++ b/vince/templates/vince/vendorstatuslist.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Ticket Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vince/templates/vince/verifycontacts.html b/vince/templates/vince/verifycontacts.html
index 8f873a0..55cd08e 100644
--- a/vince/templates/vince/verifycontacts.html
+++ b/vince/templates/vince/verifycontacts.html
@@ -1,7 +1,7 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n humanize post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Pending Users" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/contact_request.js' %}"></script>
diff --git a/vince/templates/vince/vincecomm_user.html b/vince/templates/vince/vincecomm_user.html
index 9b1b2f9..6837f68 100644
--- a/vince/templates/vince/vincecomm_user.html
+++ b/vince/templates/vince/vincecomm_user.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}
 {% load post_tags inbox_tags %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vcuser.js' %}"></script>
diff --git a/vince/templates/vince/vrf_full_screen.html b/vince/templates/vince/vrf_full_screen.html
index fd87c4d..420e991 100644
--- a/vince/templates/vince/vrf_full_screen.html
+++ b/vince/templates/vince/vrf_full_screen.html
@@ -3,7 +3,7 @@
 <head>
   <title>VRF {{object.vrf_id}}</title>
 </head>
-{% load staticfiles %}
+{%  load static %}
 <body>
 
 {{ object.description|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}
diff --git a/vince/templates/vince/vul.html b/vince/templates/vince/vul.html
index 4f434ee..802dffb 100644
--- a/vince/templates/vince/vul.html
+++ b/vince/templates/vince/vul.html
@@ -2,7 +2,7 @@
 {% load i18n humanize dashboard_tags %}
 {% load widget_tweaks %}
 {% block vince_title %}{% trans "Edit Vuls" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>
diff --git a/vince/templates/vince/vulnote_reviewal.html b/vince/templates/vince/vulnote_reviewal.html
index 23ea6fe..e45fd75 100644
--- a/vince/templates/vince/vulnote_reviewal.html
+++ b/vince/templates/vince/vulnote_reviewal.html
@@ -1,6 +1,6 @@
 {% extends VINCETRACK_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/mathjax_config.js' %}"></script>
diff --git a/vince/templates/vince/vuls.html b/vince/templates/vince/vuls.html
index 39f8ad2..d3e824d 100644
--- a/vince/templates/vince/vuls.html
+++ b/vince/templates/vince/vuls.html
@@ -2,7 +2,7 @@
 {% load i18n humanize%}
 {% load widget_tweaks %}
 {% block vince_title %}{% trans "Edit Vuls" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>
diff --git a/vincepub/templates/vincepub/400.html b/vincepub/templates/vincepub/400.html
index 70677dc..e431975 100644
--- a/vincepub/templates/vincepub/400.html
+++ b/vincepub/templates/vincepub/400.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <br/>
diff --git a/vincepub/templates/vincepub/403.html b/vincepub/templates/vincepub/403.html
index e908da6..19ef146 100644
--- a/vincepub/templates/vincepub/403.html
+++ b/vincepub/templates/vincepub/403.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <br/>
diff --git a/vincepub/templates/vincepub/404.html b/vincepub/templates/vincepub/404.html
index dae08d5..afdaa13 100644
--- a/vincepub/templates/vincepub/404.html
+++ b/vincepub/templates/vincepub/404.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <br/>
diff --git a/vincepub/templates/vincepub/500.html b/vincepub/templates/vincepub/500.html
index 7a29195..08485db 100644
--- a/vincepub/templates/vincepub/500.html
+++ b/vincepub/templates/vincepub/500.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <br/>
diff --git a/vincepub/templates/vincepub/base.html b/vincepub/templates/vincepub/base.html
index 147d2e9..3a1da50 100644
--- a/vincepub/templates/vincepub/base.html
+++ b/vincepub/templates/vincepub/base.html
@@ -23,7 +23,7 @@
     <META name="siteDomain" content="www.kb.cert.org" class="swiftype" data-type="string">
     {% endblock %}
     
-    {% load staticfiles %}
+    {%  load static %}
     <link rel="stylesheet" type="text/css" href="{% static 'vince/css/foundation.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'vincepub/css/style.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'vince/css/jquery-ui.min.css' %}" />
diff --git a/vincepub/templates/vincepub/base_public.html b/vincepub/templates/vincepub/base_public.html
index 3064779..5441dc2 100644
--- a/vincepub/templates/vincepub/base_public.html
+++ b/vincepub/templates/vincepub/base_public.html
@@ -18,7 +18,7 @@
     <META name="siteDomain" content="{{VINCEPUB_URL}}" class="swiftype" data-type="string">
     {% endblock %}
     
-    {% load staticfiles %}
+    {%  load static %}
     <link rel="stylesheet" type="text/css" href="{% static 'vince/css/foundation.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'vincepub/css/style.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'vince/css/jquery-ui.min.css' %}" />
diff --git a/vincepub/templates/vincepub/base_stable.html b/vincepub/templates/vincepub/base_stable.html
index 3d530ef..e093956 100644
--- a/vincepub/templates/vincepub/base_stable.html
+++ b/vincepub/templates/vincepub/base_stable.html
@@ -13,7 +13,7 @@
 
   <title>CERT Vulnerability Notes Database</title>
 
-{% load staticfiles %}
+{%  load static %}
 <link rel="stylesheet" type="text/css" href="{% static 'vulcoord/css/foundation.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'vulcoord/css/style.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'vulcoord/css/jquery-ui.min.css' %}" />
diff --git a/vincepub/templates/vincepub/base_without_announcement.html b/vincepub/templates/vincepub/base_without_announcement.html
index 3d530ef..e093956 100644
--- a/vincepub/templates/vincepub/base_without_announcement.html
+++ b/vincepub/templates/vincepub/base_without_announcement.html
@@ -13,7 +13,7 @@
 
   <title>CERT Vulnerability Notes Database</title>
 
-{% load staticfiles %}
+{%  load static %}
 <link rel="stylesheet" type="text/css" href="{% static 'vulcoord/css/foundation.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'vulcoord/css/style.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'vulcoord/css/jquery-ui.min.css' %}" />
diff --git a/vincepub/templates/vincepub/baseauth.html b/vincepub/templates/vincepub/baseauth.html
index 00d879f..148c9e6 100644
--- a/vincepub/templates/vincepub/baseauth.html
+++ b/vincepub/templates/vincepub/baseauth.html
@@ -23,7 +23,7 @@
     <META name="siteDomain" content="www.kb.cert.org" class="swiftype" data-type="string">
     {% endblock %}
     
-    {% load staticfiles %}
+    {%  load static %}
     <link rel="stylesheet" type="text/css" href="{% static 'vince/css/foundation.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'vincepub/css/style.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'vince/css/jquery-ui.min.css' %}" />
diff --git a/vincepub/templates/vincepub/example.html b/vincepub/templates/vincepub/example.html
index f5a7acc..08195ff 100644
--- a/vincepub/templates/vincepub/example.html
+++ b/vincepub/templates/vincepub/example.html
@@ -1,5 +1,5 @@
 {% extends "vulcoord/base.html" %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
   
diff --git a/vincepub/templates/vincepub/index.html b/vincepub/templates/vincepub/index.html
index 0393949..f582835 100644
--- a/vincepub/templates/vincepub/index.html
+++ b/vincepub/templates/vincepub/index.html
@@ -1,5 +1,5 @@
 {% extends "vincepub/base.html" %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="row">
   <div class="large-8 medium-8 small-12 columns">
diff --git a/vincepub/templates/vincepub/index_public.html b/vincepub/templates/vincepub/index_public.html
index fd623dd..c122558 100644
--- a/vincepub/templates/vincepub/index_public.html
+++ b/vincepub/templates/vincepub/index_public.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vincepub/js/vulsearch.js' %}"></script>
diff --git a/vincepub/templates/vincepub/report.html b/vincepub/templates/vincepub/report.html
index f436b69..c241d90 100644
--- a/vincepub/templates/vincepub/report.html
+++ b/vincepub/templates/vincepub/report.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vincepub/templates/vincepub/reportcoord.html b/vincepub/templates/vincepub/reportcoord.html
index 427808c..7601b59 100644
--- a/vincepub/templates/vincepub/reportcoord.html
+++ b/vincepub/templates/vincepub/reportcoord.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vincepub/js/vulcommon.js' %}"></script>
diff --git a/vincepub/templates/vincepub/search.html b/vincepub/templates/vincepub/search.html
index 2831aa4..58741eb 100644
--- a/vincepub/templates/vincepub/search.html
+++ b/vincepub/templates/vincepub/search.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vincepub/js/vulsearch.js' %}"></script>
diff --git a/vincepub/templates/vincepub/vudetail.html b/vincepub/templates/vincepub/vudetail.html
index c0b4eb5..e114ca2 100644
--- a/vincepub/templates/vincepub/vudetail.html
+++ b/vincepub/templates/vincepub/vudetail.html
@@ -17,7 +17,7 @@
 <meta name="keywords"             value="{{ object.keywords_str }}">
 {% endif %}
 {% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vincepub/js/vulaccordion.js' %}"></script>
diff --git a/vincepub/views.py b/vincepub/views.py
index 1a05090..41f47ef 100644
--- a/vincepub/views.py
+++ b/vincepub/views.py
@@ -44,7 +44,7 @@
 from django.contrib.postgres.search import SearchVector, SearchRank
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.encoding import force_str as force_text
+from django.utils.encoding import force_str
 from django.core.paginator import Paginator
 from django.db import connection
 from django.db.models import Q
@@ -793,7 +793,7 @@ class WhatisCVEView(generic.TemplateView):
 
 
 def escape_query(text, re_escape_chars):
-    text = force_text(text)
+    text = force_str(text)
     text = RE_SPACE.sub(" ", text)  # Standardize spacing.
     text = re_escape_chars.sub(" ", text)  # Replace harmful characters with space.
     text = text.strip()
diff --git a/vinny/forms.py b/vinny/forms.py
index 47b38e3..02b3b5f 100644
--- a/vinny/forms.py
+++ b/vinny/forms.py
@@ -41,7 +41,7 @@
 from django.core.exceptions import ValidationError
 import mimetypes
 import os
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from vinny.settings import DEFAULT_USER_SETTINGS
 from django.urls import reverse, reverse_lazy
 import base64
@@ -591,7 +591,7 @@ def save(self, commit=True):
         file = self.cleaned_data["attachment"]
 
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type
@@ -636,7 +636,7 @@ def save(self, commit=True):
         file = self.cleaned_data["attachment"]
 
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type
diff --git a/vinny/models.py b/vinny/models.py
index e8b5828..105d326 100644
--- a/vinny/models.py
+++ b/vinny/models.py
@@ -48,7 +48,7 @@
 from django.utils.functional import cached_property
 from vinny.mailer import send_newmessage_mail
 from bigvince.storage_backends import PrivateMediaStorage, SharedMediaStorage
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from lib.vince.m2crypto_encrypt_decrypt import ED
 import base64
 import os
@@ -1820,7 +1820,7 @@ def attach_file(cls, message, file):
         """
 
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type
diff --git a/vinny/templates/vinny/400.html b/vinny/templates/vinny/400.html
index 28b9ba5..5cd6a96 100644
--- a/vinny/templates/vinny/400.html
+++ b/vinny/templates/vinny/400.html
@@ -1,5 +1,5 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/403.html b/vinny/templates/vinny/403.html
index 1650f24..36a9db4 100644
--- a/vinny/templates/vinny/403.html
+++ b/vinny/templates/vinny/403.html
@@ -1,5 +1,5 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/500.html b/vinny/templates/vinny/500.html
index 1897fd6..8b3005b 100644
--- a/vinny/templates/vinny/500.html
+++ b/vinny/templates/vinny/500.html
@@ -1,5 +1,5 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/addfile.html b/vinny/templates/vinny/addfile.html
index 62268cb..e0b9e0d 100644
--- a/vinny/templates/vinny/addfile.html
+++ b/vinny/templates/vinny/addfile.html
@@ -1,6 +1,6 @@
 {% extends "vinny/modal.html" %}{% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <form id="uploadfile" method="post" action="{% url 'vinny:addfile' case.id %}" enctype="multipart/form-data">
diff --git a/vinny/templates/vinny/addreportfile.html b/vinny/templates/vinny/addreportfile.html
index ddb41aa..d256692 100644
--- a/vinny/templates/vinny/addreportfile.html
+++ b/vinny/templates/vinny/addreportfile.html
@@ -1,6 +1,6 @@
 {% extends "vinny/modal.html" %}{% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <form method="post" id="uploadfile" action="{% url 'vinny:addreportfile' report.id %}" enctype="multipart/form-data">
diff --git a/vinny/templates/vinny/admin.html b/vinny/templates/vinny/admin.html
index 417246c..1b24421 100644
--- a/vinny/templates/vinny/admin.html
+++ b/vinny/templates/vinny/admin.html
@@ -1,6 +1,6 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n humanize user_tags %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/gadmin.js' %}"></script>
diff --git a/vinny/templates/vinny/allreports.html b/vinny/templates/vinny/allreports.html
index 0f04f68..a9da7a8 100644
--- a/vinny/templates/vinny/allreports.html
+++ b/vinny/templates/vinny/allreports.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "My Reports" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vinny_dashboard.js' %}"></script>
diff --git a/vinny/templates/vinny/case.html b/vinny/templates/vinny/case.html
index b1a40e4..15d9892 100644
--- a/vinny/templates/vinny/case.html
+++ b/vinny/templates/vinny/case.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n humanize post_tags %}{% load filename %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/simplemde.min.css' %}">
diff --git a/vinny/templates/vinny/case_summary.html b/vinny/templates/vinny/case_summary.html
index 6b60286..deac6ab 100644
--- a/vinny/templates/vinny/case_summary.html
+++ b/vinny/templates/vinny/case_summary.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n humanize post_tags %}{% load filename %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case Summary" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/ics.deps.min.js' %}"></script>
diff --git a/vinny/templates/vinny/caseaccess.html b/vinny/templates/vinny/caseaccess.html
index fa5f39d..d6cd50d 100644
--- a/vinny/templates/vinny/caseaccess.html
+++ b/vinny/templates/vinny/caseaccess.html
@@ -1,6 +1,6 @@
 {% extends "vince/modal.html" %}{% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <form id="accessform" method="post" action="{% url 'vinny:caseaccess' vendor u.id %}">
diff --git a/vinny/templates/vinny/contact.html b/vinny/templates/vinny/contact.html
index 0cb90b3..8f40b10 100644
--- a/vinny/templates/vinny/contact.html
+++ b/vinny/templates/vinny/contact.html
@@ -1,6 +1,6 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n humanize post_tags %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vinny/templates/vinny/cr_report.html b/vinny/templates/vinny/cr_report.html
index 54b6994..4aa32e6 100644
--- a/vinny/templates/vinny/cr_report.html
+++ b/vinny/templates/vinny/cr_report.html
@@ -1,5 +1,5 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n humanize post_tags filename %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/report.js' %}"></script>
diff --git a/vinny/templates/vinny/csrf_fail.html b/vinny/templates/vinny/csrf_fail.html
index a7e805a..7bdfe6e 100644
--- a/vinny/templates/vinny/csrf_fail.html
+++ b/vinny/templates/vinny/csrf_fail.html
@@ -1,5 +1,5 @@
 {% extends VINCEPUB_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <br/>
diff --git a/vinny/templates/vinny/dashboard.html b/vinny/templates/vinny/dashboard.html
index 568b4ba..f60fb1c 100644
--- a/vinny/templates/vinny/dashboard.html
+++ b/vinny/templates/vinny/dashboard.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n user_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Dashboard" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vinny_dashboard.js' %}"></script>
diff --git a/vinny/templates/vinny/editcontact.html b/vinny/templates/vinny/editcontact.html
index d4ec5d3..9b3d651 100644
--- a/vinny/templates/vinny/editcontact.html
+++ b/vinny/templates/vinny/editcontact.html
@@ -1,5 +1,5 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/dropzone.js' %}"></script>
diff --git a/vinny/templates/vinny/faq.html b/vinny/templates/vinny/faq.html
index 7f790d0..6109960 100644
--- a/vinny/templates/vinny/faq.html
+++ b/vinny/templates/vinny/faq.html
@@ -1,7 +1,7 @@
 {% extends "vinny/base.html" %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "VINCE FAQ" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 
 {% block content %}
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/groupchat.html b/vinny/templates/vinny/groupchat.html
index c84b003..7ef0ce4 100644
--- a/vinny/templates/vinny/groupchat.html
+++ b/vinny/templates/vinny/groupchat.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Send a Message" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/dropzone.js' %}"></script>
diff --git a/vinny/templates/vinny/inbox.html b/vinny/templates/vinny/inbox.html
index cb6afce..535973d 100644
--- a/vinny/templates/vinny/inbox.html
+++ b/vinny/templates/vinny/inbox.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Inbox" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/inbox.js' %}"></script>
diff --git a/vinny/templates/vinny/index.html b/vinny/templates/vinny/index.html
index 7f5f678..3a78db4 100644
--- a/vinny/templates/vinny/index.html
+++ b/vinny/templates/vinny/index.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Login" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/vinny_tokens.js' %}"></script>
diff --git a/vinny/templates/vinny/limited.html b/vinny/templates/vinny/limited.html
index 149197d..7058470 100644
--- a/vinny/templates/vinny/limited.html
+++ b/vinny/templates/vinny/limited.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Dashboard" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/case_search.js' %}"></script>
diff --git a/vinny/templates/vinny/multi_admin.html b/vinny/templates/vinny/multi_admin.html
index d34bc52..0ea84ae 100644
--- a/vinny/templates/vinny/multi_admin.html
+++ b/vinny/templates/vinny/multi_admin.html
@@ -1,6 +1,6 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n humanize %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/multi_contact.html b/vinny/templates/vinny/multi_contact.html
index bed89b2..5c19cf7 100644
--- a/vinny/templates/vinny/multi_contact.html
+++ b/vinny/templates/vinny/multi_contact.html
@@ -1,6 +1,6 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n humanize %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/multi_status.html b/vinny/templates/vinny/multi_status.html
index 3a59ba9..8740cc2 100644
--- a/vinny/templates/vinny/multi_status.html
+++ b/vinny/templates/vinny/multi_status.html
@@ -1,6 +1,6 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n humanize %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/mutecase.html b/vinny/templates/vinny/mutecase.html
index 823c045..3e6832f 100644
--- a/vinny/templates/vinny/mutecase.html
+++ b/vinny/templates/vinny/mutecase.html
@@ -1,5 +1,5 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 
 <div class="app-top-panel">
diff --git a/vinny/templates/vinny/myreports.html b/vinny/templates/vinny/myreports.html
index 8a72660..15bb47a 100644
--- a/vinny/templates/vinny/myreports.html
+++ b/vinny/templates/vinny/myreports.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "My Reports" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/vinny_dashboard.js' %}"></script>
diff --git a/vinny/templates/vinny/postdiff.html b/vinny/templates/vinny/postdiff.html
index f5e32ef..417c433 100644
--- a/vinny/templates/vinny/postdiff.html
+++ b/vinny/templates/vinny/postdiff.html
@@ -1,6 +1,6 @@
 {% extends "vince/modal.html" %}{% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vinny/templates/vinny/preferences.html b/vinny/templates/vinny/preferences.html
index 7bb94a5..69a4021 100644
--- a/vinny/templates/vinny/preferences.html
+++ b/vinny/templates/vinny/preferences.html
@@ -1,6 +1,6 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n humanize widget_tweaks%}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vinny/templates/vinny/provide_statement.html b/vinny/templates/vinny/provide_statement.html
index bf10d0d..a346391 100644
--- a/vinny/templates/vinny/provide_statement.html
+++ b/vinny/templates/vinny/provide_statement.html
@@ -1,7 +1,7 @@
 {% extends "vince/modal.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <div class="modal-content">
diff --git a/vinny/templates/vinny/redirect.html b/vinny/templates/vinny/redirect.html
index 47a7f38..e3ff6a1 100644
--- a/vinny/templates/vinny/redirect.html
+++ b/vinny/templates/vinny/redirect.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Redirecting" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/tokens.js' %}"></script>
diff --git a/vinny/templates/vinny/report.html b/vinny/templates/vinny/report.html
index bf67f31..186e545 100644
--- a/vinny/templates/vinny/report.html
+++ b/vinny/templates/vinny/report.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n report_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Reports" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/reports.js' %}"></script>
diff --git a/vinny/templates/vinny/searchcases.html b/vinny/templates/vinny/searchcases.html
index 62e7d0e..bec384d 100644
--- a/vinny/templates/vinny/searchcases.html
+++ b/vinny/templates/vinny/searchcases.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case Search" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vinny/js/case_search.js' %}"></script>
diff --git a/vinny/templates/vinny/sendmessage_all.html b/vinny/templates/vinny/sendmessage_all.html
index 6267d96..116f55c 100644
--- a/vinny/templates/vinny/sendmessage_all.html
+++ b/vinny/templates/vinny/sendmessage_all.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Send a Message" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/dropzone.js' %}"></script>
diff --git a/vinny/templates/vinny/sendmsg.html b/vinny/templates/vinny/sendmsg.html
index 655f122..8aa0054 100644
--- a/vinny/templates/vinny/sendmsg.html
+++ b/vinny/templates/vinny/sendmsg.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Send a Message" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/dropzone.js' %}"></script>
diff --git a/vinny/templates/vinny/sendmsguser.html b/vinny/templates/vinny/sendmsguser.html
index 224a0ac..b21061e 100644
--- a/vinny/templates/vinny/sendmsguser.html
+++ b/vinny/templates/vinny/sendmsguser.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Send a Message" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/dropzone.js' %}"></script>
diff --git a/vinny/templates/vinny/statement.html b/vinny/templates/vinny/statement.html
index c1710ac..7e13d67 100644
--- a/vinny/templates/vinny/statement.html
+++ b/vinny/templates/vinny/statement.html
@@ -1,7 +1,7 @@
 {% extends "vince/modal.html" %}
 {% load i18n markdown_extras %}
 {% load widget_tweaks %}
-{% load staticfiles %}
+{%  load static %}
 {% block content %}
 <div class="fullmodal">
   <div class="modal-content">
diff --git a/vinny/templates/vinny/status.html b/vinny/templates/vinny/status.html
index ceb48d0..af43747 100644
--- a/vinny/templates/vinny/status.html
+++ b/vinny/templates/vinny/status.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n post_tags markdown_extras %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <link rel="stylesheet" href="{% static 'vince/css/easymde.min.css' %}">
diff --git a/vinny/templates/vinny/thread_detail.html b/vinny/templates/vinny/thread_detail.html
index c49490b..1a3b3af 100644
--- a/vinny/templates/vinny/thread_detail.html
+++ b/vinny/templates/vinny/thread_detail.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n markdown_extras %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Thread Detail" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/dropzone.js' %}"></script>
diff --git a/vinny/templates/vinny/vul.html b/vinny/templates/vinny/vul.html
index a7dcd51..6821907 100644
--- a/vinny/templates/vinny/vul.html
+++ b/vinny/templates/vinny/vul.html
@@ -2,7 +2,7 @@
 {% load i18n humanize%}
 {% load widget_tweaks post_tags %}
 {% block vince_title %}{% trans "Vulnerability Detail" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 {% endblock %}
diff --git a/vinny/templates/vinny/vuls.html b/vinny/templates/vinny/vuls.html
index 5fe57f6..cfca471 100644
--- a/vinny/templates/vinny/vuls.html
+++ b/vinny/templates/vinny/vuls.html
@@ -1,7 +1,7 @@
 {% extends VINCECOMM_BASE_TEMPLATE %}{% load i18n post_tags %}
 <!-- site-title  -->
 {% block vince_title %}{% trans "Case Vuls" %}{% endblock %}
-{% load staticfiles %}
+{%  load static %}
 {% block js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'vince/js/tabulator.min.js' %}"></script>