diff --git a/ietf/templates/401.html b/ietf/templates/401.html
index 0620f5c90..b50c93f5f 100644
--- a/ietf/templates/401.html
+++ b/ietf/templates/401.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2012, All Rights Reserved #}
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}401 Unauthorized{% endblock %}
{% block content %}
diff --git a/ietf/templates/404.html b/ietf/templates/404.html
index b85786550..46a3ef625 100644
--- a/ietf/templates/404.html
+++ b/ietf/templates/404.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}404 Not Found{% endblock %}
{% block content %}
diff --git a/ietf/templates/500.html b/ietf/templates/500.html
index a7338c38c..c3bf32209 100644
--- a/ietf/templates/500.html
+++ b/ietf/templates/500.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}500 Internal Server Error{% endblock %}
{% block content %}
diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html
index 1bf06a692..25e51677b 100644
--- a/ietf/templates/api/index.html
+++ b/ietf/templates/api/index.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}API Notes{% endblock %}
{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
{% block content %}
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index bdefe9d63..035701e8e 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -1,4 +1,4 @@
- {% load ietf_filters staticfiles %}
+ {% load ietf_filters static %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
{% load bootstrap3 %}
diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html
index 817a873fa..a7406a969 100644
--- a/ietf/templates/community/manage_list.html
+++ b/ietf/templates/community/manage_list.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
{% block pagehead %}
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index a771632b0..d9f23eb1b 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block title %}Change document shepherd for {{ doc.name }}-{{ doc.rev }}{% endblock %}
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 8fa5592ed..50c50eb3e 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 8e379890f..95cff8f86 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index db87270f4..f6d01ac7f 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2016-2020, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_email.html b/ietf/templates/doc/document_email.html
index d089e8529..45f785e79 100644
--- a/ietf/templates/doc/document_email.html
+++ b/ietf/templates/doc/document_email.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 42c6c0538..613cf0bf7 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
{% block title %}History for {{ doc.name }}-{{ doc.rev }}{% endblock %}
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index 6326f990f..4a39aa0f3 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2016, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 41ee1d73b..b584497dd 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index 27d7d1a15..1656a113d 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles ietf_filters %}
+{% load origin static ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index 2bb603fab..17a24c5fc 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles ietf_filters %}
+{% load origin static ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index e62fbb7a7..77b653244 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2016-2019, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load textfilters %}
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index eacccc358..06bb11db9 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/downref.html b/ietf/templates/doc/downref.html
index fd5fda57d..a2551caa8 100644
--- a/ietf/templates/doc/downref.html
+++ b/ietf/templates/doc/downref.html
@@ -3,7 +3,7 @@
{% load origin %}
{% load bootstrap3 %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index be50b2e0e..1297d2cf7 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block title %}Change documents replaced by {{ doc }}{% endblock %}
diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html
index 95ea8ceae..bdddfdb6c 100644
--- a/ietf/templates/doc/drafts_for_ad.html
+++ b/ietf/templates/doc/drafts_for_ad.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ietf_filters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index d950b515c..e015f109a 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% load textfilters %}
{% block pagehead %}
diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html
index 13febb1aa..825513e8b 100644
--- a/ietf/templates/doc/drafts_in_last_call.html
+++ b/ietf/templates/doc/drafts_in_last_call.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html
index 3f2d12c55..2ccec635a 100644
--- a/ietf/templates/doc/frontpage.html
+++ b/ietf/templates/doc/frontpage.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% block title %}IETF Datatracker{% if server_mode != "production" %} -- Development Mode{% endif %}{% endblock %}
{% block content %}
diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html
index ef1df87ce..e9a02f885 100644
--- a/ietf/templates/doc/index_active_drafts.html
+++ b/ietf/templates/doc/index_active_drafts.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Active Internet-Drafts{% endblock %}
{% block content %}
diff --git a/ietf/templates/doc/irsg_ballot_status.html b/ietf/templates/doc/irsg_ballot_status.html
index 14b4408da..ed194e1d8 100644
--- a/ietf/templates/doc/irsg_ballot_status.html
+++ b/ietf/templates/doc/irsg_ballot_status.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2019, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ballot_icon %}
{% load ietf_filters %}
diff --git a/ietf/templates/doc/recent_drafts.html b/ietf/templates/doc/recent_drafts.html
index 1658d232f..b22e67370 100644
--- a/ietf/templates/doc/recent_drafts.html
+++ b/ietf/templates/doc/recent_drafts.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/doc/relationship_help.html b/ietf/templates/doc/relationship_help.html
index 30e5aec10..829dcf26e 100644
--- a/ietf/templates/doc/relationship_help.html
+++ b/ietf/templates/doc/relationship_help.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/doc/search/search.html b/ietf/templates/doc/search/search.html
index 97e194fff..a1ba409fa 100644
--- a/ietf/templates/doc/search/search.html
+++ b/ietf/templates/doc/search/search.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block title %}Document Search{% endblock %}
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
index 0b7d55fae..a61b8f941 100644
--- a/ietf/templates/doc/state_help.html
+++ b/ietf/templates/doc/state_help.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% block title %}{{ title }}{% endblock %}
{% block pagehead %}
diff --git a/ietf/templates/doc/stats/highstock.html b/ietf/templates/doc/stats/highstock.html
index 515e0d26c..7c9a02624 100644
--- a/ietf/templates/doc/stats/highstock.html
+++ b/ietf/templates/doc/stats/highstock.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block js %}
diff --git a/ietf/templates/doc/status_change/edit_relations.html b/ietf/templates/doc/status_change/edit_relations.html
index b4bae45ef..8be9152e6 100644
--- a/ietf/templates/doc/status_change/edit_relations.html
+++ b/ietf/templates/doc/status_change/edit_relations.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block title %}Edit RFCs affected by status change{% endblock %}
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index dc0f684e5..5887c9943 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block pagehead %}
diff --git a/ietf/templates/doc/status_change/start.html b/ietf/templates/doc/status_change/start.html
index 64ab4ddea..147bd1083 100644
--- a/ietf/templates/doc/status_change/start.html
+++ b/ietf/templates/doc/status_change/start.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block title %}Begin RFC status change review{% endblock %}
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index 8419fa132..fbb2ef06d 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/form.html b/ietf/templates/form.html
index a15340209..fb2521e2c 100644
--- a/ietf/templates/form.html
+++ b/ietf/templates/form.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block title %}{{ title|striptags }}{% endblock %}
diff --git a/ietf/templates/group/active_ags.html b/ietf/templates/group/active_ags.html
index 4b6f53db0..80a660bdd 100644
--- a/ietf/templates/group/active_ags.html
+++ b/ietf/templates/group/active_ags.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html
index 044a3636e..44ab88715 100644
--- a/ietf/templates/group/active_dirs.html
+++ b/ietf/templates/group/active_dirs.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_groups.html b/ietf/templates/group/active_groups.html
index 6eab00f9f..b03318f53 100644
--- a/ietf/templates/group/active_groups.html
+++ b/ietf/templates/group/active_groups.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_programs.html b/ietf/templates/group/active_programs.html
index 70e57bbf2..e3aa75579 100644
--- a/ietf/templates/group/active_programs.html
+++ b/ietf/templates/group/active_programs.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_review_dirs.html b/ietf/templates/group/active_review_dirs.html
index b444e4728..b589c1f94 100644
--- a/ietf/templates/group/active_review_dirs.html
+++ b/ietf/templates/group/active_review_dirs.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_rgs.html b/ietf/templates/group/active_rgs.html
index 1882d1985..b2bee951d 100644
--- a/ietf/templates/group/active_rgs.html
+++ b/ietf/templates/group/active_rgs.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_teams.html b/ietf/templates/group/active_teams.html
index 4c7a7d9ca..3fd871b62 100644
--- a/ietf/templates/group/active_teams.html
+++ b/ietf/templates/group/active_teams.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index b991e8b41..4a29b854d 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles group_filters %}
+{% load origin static group_filters %}
{% block pagehead %}
diff --git a/ietf/templates/group/all_photos.html b/ietf/templates/group/all_photos.html
index aff1bf0d8..22741a64b 100644
--- a/ietf/templates/group/all_photos.html
+++ b/ietf/templates/group/all_photos.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block morecss %}
.well { max-width: 150px;}
diff --git a/ietf/templates/group/all_status.html b/ietf/templates/group/all_status.html
index 5fc0f31cb..dcb56c396 100644
--- a/ietf/templates/group/all_status.html
+++ b/ietf/templates/group/all_status.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% load ietf_filters %}
{% load textfilters %}
diff --git a/ietf/templates/group/bofs.html b/ietf/templates/group/bofs.html
index 374118359..6c45884ab 100644
--- a/ietf/templates/group/bofs.html
+++ b/ietf/templates/group/bofs.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/change_review_secretary_settings.html b/ietf/templates/group/change_review_secretary_settings.html
index ee178d2e7..00015a935 100644
--- a/ietf/templates/group/change_review_secretary_settings.html
+++ b/ietf/templates/group/change_review_secretary_settings.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block content %}
{% origin %}
diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html
index 98d6d39c0..0f3ca5d03 100644
--- a/ietf/templates/group/change_reviewer_settings.html
+++ b/ietf/templates/group/change_reviewer_settings.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block pagehead %}
diff --git a/ietf/templates/group/chartering_groups.html b/ietf/templates/group/chartering_groups.html
index d86c57fa4..d93344b9a 100644
--- a/ietf/templates/group/chartering_groups.html
+++ b/ietf/templates/group/chartering_groups.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/concluded_groups.html b/ietf/templates/group/concluded_groups.html
index abe6b9b43..a93d51b89 100644
--- a/ietf/templates/group/concluded_groups.html
+++ b/ietf/templates/group/concluded_groups.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html
index 47acfbfd9..b350973d7 100644
--- a/ietf/templates/group/edit.html
+++ b/ietf/templates/group/edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% load ietf_filters %}
diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html
index 07e4af093..ffac886a0 100644
--- a/ietf/templates/group/edit_milestones.html
+++ b/ietf/templates/group/edit_milestones.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block pagehead %}
diff --git a/ietf/templates/group/email.html b/ietf/templates/group/email.html
index 0fc7cc0a5..247f09224 100644
--- a/ietf/templates/group/email.html
+++ b/ietf/templates/group/email.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
{% block pagehead %}
diff --git a/ietf/templates/group/email_open_review_assignments.html b/ietf/templates/group/email_open_review_assignments.html
index 4ac55fc46..a27a05226 100644
--- a/ietf/templates/group/email_open_review_assignments.html
+++ b/ietf/templates/group/email_open_review_assignments.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block title %}Email summary of assigned review requests for {{ group.acronym }}{% endblock %}
diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html
index 0d3bd717f..8774e1a7f 100644
--- a/ietf/templates/group/group_about_status.html
+++ b/ietf/templates/group/group_about_status.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% load ietf_filters %}
{% load textfilters %}
diff --git a/ietf/templates/group/group_about_status_meeting.html b/ietf/templates/group/group_about_status_meeting.html
index ccb8d56d2..498cea648 100644
--- a/ietf/templates/group/group_about_status_meeting.html
+++ b/ietf/templates/group/group_about_status_meeting.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% load ietf_filters %}
{% load textfilters %}
diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html
index e06575ce6..eacc7b875 100644
--- a/ietf/templates/group/group_base.html
+++ b/ietf/templates/group/group_base.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/group/group_photos.html b/ietf/templates/group/group_photos.html
index c63a9de34..494aaf060 100644
--- a/ietf/templates/group/group_photos.html
+++ b/ietf/templates/group/group_photos.html
@@ -1,6 +1,6 @@
{% extends "group/group_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block morecss %}
.well { max-width: 150px;}
diff --git a/ietf/templates/group/history.html b/ietf/templates/group/history.html
index 91d393d1d..5536bf323 100644
--- a/ietf/templates/group/history.html
+++ b/ietf/templates/group/history.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
{% block pagehead %}
diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html
index acb1a70b5..9420f64cb 100644
--- a/ietf/templates/group/index.html
+++ b/ietf/templates/group/index.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ietf_filters %}
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index facf1a460..5540de76a 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block title %}Manage open review requests for {{ group.acronym }}{% endblock %}
diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html
index 0b205132e..1d3b5f15c 100644
--- a/ietf/templates/group/materials.html
+++ b/ietf/templates/group/materials.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/group/reset_next_reviewer.html b/ietf/templates/group/reset_next_reviewer.html
index cbae7205d..ab984b7a0 100644
--- a/ietf/templates/group/reset_next_reviewer.html
+++ b/ietf/templates/group/reset_next_reviewer.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block content %}
Set next reviewer in queue for {{ group.acronym }}
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index bcae4ccbf..8ce86f083 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block group_subtitle %}Review requests{% endblock %}
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index c1edb9e7e..193e949df 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block group_subtitle %}Reviewers{% endblock %}
diff --git a/ietf/templates/group/stream_documents.html b/ietf/templates/group/stream_documents.html
index 6ecb76fee..bde4c9860 100644
--- a/ietf/templates/group/stream_documents.html
+++ b/ietf/templates/group/stream_documents.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html
index f24965cb2..79066728a 100644
--- a/ietf/templates/group/stream_edit.html
+++ b/ietf/templates/group/stream_edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load bootstrap3 %}
diff --git a/ietf/templates/help/state_index.html b/ietf/templates/help/state_index.html
index c5e065351..fae63936a 100644
--- a/ietf/templates/help/state_index.html
+++ b/ietf/templates/help/state_index.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/help/states.html b/ietf/templates/help/states.html
index 6faad8d6a..1e8ea82be 100644
--- a/ietf/templates/help/states.html
+++ b/ietf/templates/help/states.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% block pagehead %}
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 88a858209..17186a774 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ballot_icon %}
{% load ietf_filters %}
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index 384a9499e..9b5c1615e 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ballot_icon %}
{% load ietf_filters %}
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 7aec253cb..4ffc3f626 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ballot_icon %}
{% load ietf_filters %}
diff --git a/ietf/templates/iesg/photos.html b/ietf/templates/iesg/photos.html
index 852f05d97..4e8994446 100644
--- a/ietf/templates/iesg/photos.html
+++ b/ietf/templates/iesg/photos.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
{% load ietf_filters %}
{% block morecss %}
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index f2b3f65f9..53522b140 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters ipr_filters bootstrap3 widget_tweaks %}
{% block title %}{% if form.instance %}Edit IPR #{{ form.instance.id }}{% else %}New IPR{% endif %}{% endblock %}
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index 2f2aa5ba7..9b8124110 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters ipr_filters staticfiles %}
+{% load ietf_filters ipr_filters static %}
{% block morecss %}
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index 6e4780f4a..fc3ae4552 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap3 %}
{% block title %}Email submitter of {{ ipr.title }}{% endblock %}
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html
index a48401476..de3a54652 100644
--- a/ietf/templates/ipr/list.html
+++ b/ietf/templates/ipr/list.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block title %}Intellectual property rights disclosures{% endblock %}
diff --git a/ietf/templates/ipr/search.html b/ietf/templates/ipr/search.html
index fa354a2f9..bb7037943 100644
--- a/ietf/templates/ipr/search.html
+++ b/ietf/templates/ipr/search.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% block title %}IPR search{% endblock %}
{% block content %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index b8aeb04da..df9166c78 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 46d377b00..d571a39e1 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 656dde667..b770cc1b6 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -1,9 +1,9 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
{% block pagehead %}
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index 216c12e43..b35a759e0 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
index 53388a180..353d9128e 100644
--- a/ietf/templates/liaisons/detail_history.html
+++ b/ietf/templates/liaisons/detail_history.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index beec43670..20d2b73e6 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load bootstrap3 widget_tweaks %}
diff --git a/ietf/templates/liaisons/edit_attachment.html b/ietf/templates/liaisons/edit_attachment.html
index 1a0ca2f13..fd33dcfd1 100644
--- a/ietf/templates/liaisons/edit_attachment.html
+++ b/ietf/templates/liaisons/edit_attachment.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load bootstrap3 widget_tweaks %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Edit liaison attachment{% endblock %}
diff --git a/ietf/templates/liaisons/field_help.html b/ietf/templates/liaisons/field_help.html
index bb0cfe872..6ba7bfde1 100644
--- a/ietf/templates/liaisons/field_help.html
+++ b/ietf/templates/liaisons/field_help.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html
index ac46a27fe..7abbc545c 100644
--- a/ietf/templates/liaisons/guide_from_ietf.html
+++ b/ietf/templates/liaisons/guide_from_ietf.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html
index 97075cff9..fcd1572a4 100644
--- a/ietf/templates/liaisons/guide_to_ietf.html
+++ b/ietf/templates/liaisons/guide_to_ietf.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/liaisons/liaison_base.html b/ietf/templates/liaisons/liaison_base.html
index 7dee3ff26..de5eefef5 100644
--- a/ietf/templates/liaisons/liaison_base.html
+++ b/ietf/templates/liaisons/liaison_base.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
{% block pagehead %}
diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html
index bdf51ee91..97308ab18 100644
--- a/ietf/templates/meeting/add_session_drafts.html
+++ b/ietf/templates/meeting/add_session_drafts.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}Add drafts to {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index ff033dd31..c4d82fc07 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load textfilters %}
{% load htmlfilters %}
diff --git a/ietf/templates/meeting/approve_proposed_slides.html b/ietf/templates/meeting/approve_proposed_slides.html
index 8bb9af398..4e44b35fb 100644
--- a/ietf/templates/meeting/approve_proposed_slides.html
+++ b/ietf/templates/meeting/approve_proposed_slides.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}Approve Slides Proposed for {{ submission.session.meeting }} : {{ submission.session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/copy_meeting_schedule.html b/ietf/templates/meeting/copy_meeting_schedule.html
index 14c1365b5..b09391617 100644
--- a/ietf/templates/meeting/copy_meeting_schedule.html
+++ b/ietf/templates/meeting/copy_meeting_schedule.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load bootstrap3 %}
diff --git a/ietf/templates/meeting/delete_schedule.html b/ietf/templates/meeting/delete_schedule.html
index 76254bcae..321fada29 100644
--- a/ietf/templates/meeting/delete_schedule.html
+++ b/ietf/templates/meeting/delete_schedule.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load bootstrap3 %}
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index 0008653e6..27cfad07e 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block morecss %}
diff --git a/ietf/templates/meeting/floor-plan.html b/ietf/templates/meeting/floor-plan.html
index 8708952ec..920b44d9a 100644
--- a/ietf/templates/meeting/floor-plan.html
+++ b/ietf/templates/meeting/floor-plan.html
@@ -4,7 +4,7 @@
{% load ietf_filters %}
{% load textfilters %}
-{% load staticfiles %}
+{% load static %}
{% block title %}
IETF {{ meeting.number }} meeting agenda
diff --git a/ietf/templates/meeting/important-dates.html b/ietf/templates/meeting/important-dates.html
index 0d092790c..d5035db2e 100644
--- a/ietf/templates/meeting/important-dates.html
+++ b/ietf/templates/meeting/important-dates.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2017, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block title %}IETF {{meetings.0.number}} : Important Dates{% endblock %}
diff --git a/ietf/templates/meeting/interim_announce.html b/ietf/templates/meeting/interim_announce.html
index f3ae6b562..62697bef7 100644
--- a/ietf/templates/meeting/interim_announce.html
+++ b/ietf/templates/meeting/interim_announce.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
{% block title %}Interim Meetings to be Announced{% endblock %}
diff --git a/ietf/templates/meeting/interim_pending.html b/ietf/templates/meeting/interim_pending.html
index bb91a30cf..6cd3c045c 100644
--- a/ietf/templates/meeting/interim_pending.html
+++ b/ietf/templates/meeting/interim_pending.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
{% block title %}Interim Pending{% endblock %}
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 19981dba7..58b4ceb5d 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks ietf_filters %}
+{% load static bootstrap3 widget_tweaks ietf_filters %}
{% block title %}Interim Request{% endblock %}
diff --git a/ietf/templates/meeting/interim_request_cancel.html b/ietf/templates/meeting/interim_request_cancel.html
index da93af2d9..95f8d3c21 100644
--- a/ietf/templates/meeting/interim_request_cancel.html
+++ b/ietf/templates/meeting/interim_request_cancel.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
diff --git a/ietf/templates/meeting/interim_request_details.html b/ietf/templates/meeting/interim_request_details.html
index c0c51f2b3..116176b20 100644
--- a/ietf/templates/meeting/interim_request_details.html
+++ b/ietf/templates/meeting/interim_request_details.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks ietf_filters %}
+{% load static bootstrap3 widget_tweaks ietf_filters %}
{% block title %}Interim Request Details{% endblock %}
diff --git a/ietf/templates/meeting/interim_request_edit.html b/ietf/templates/meeting/interim_request_edit.html
index 249537646..64fc2bcee 100644
--- a/ietf/templates/meeting/interim_request_edit.html
+++ b/ietf/templates/meeting/interim_request_edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
{% block title %}Edit Interim Request{% endblock %}
diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html
index 0cbc80888..05f99961c 100644
--- a/ietf/templates/meeting/interim_send_announcement.html
+++ b/ietf/templates/meeting/interim_send_announcement.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
{% block title %}Announce Interim Meeting{% endblock %}
diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index 9732b1de3..33277a0be 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load textfilters %}
{% origin %}
{% with session.official_timeslotassignment as item %}
diff --git a/ietf/templates/meeting/interim_skip_announce.html b/ietf/templates/meeting/interim_skip_announce.html
index 22b287a80..e984b07d7 100644
--- a/ietf/templates/meeting/interim_skip_announce.html
+++ b/ietf/templates/meeting/interim_skip_announce.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
{% block title %}Interim Meetings Skip Announcement{% endblock %}
diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html
index 91d7785e2..6b3d98f12 100644
--- a/ietf/templates/meeting/landscape_edit.html
+++ b/ietf/templates/meeting/landscape_edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load humanize %}
diff --git a/ietf/templates/meeting/make_schedule_official.html b/ietf/templates/meeting/make_schedule_official.html
index c762e7307..ef520c998 100644
--- a/ietf/templates/meeting/make_schedule_official.html
+++ b/ietf/templates/meeting/make_schedule_official.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load bootstrap3 %}
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index 4bee21774..42a156d47 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles managed_groups %}
+{% load ietf_filters static managed_groups %}
{% block pagehead %}
diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html
index d758754ec..f7735f421 100644
--- a/ietf/templates/meeting/past.html
+++ b/ietf/templates/meeting/past.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 4700aae74..dee9923f2 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index 19ca01aa7..1c175c868 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load bootstrap3 %}
diff --git a/ietf/templates/meeting/propose_session_slides.html b/ietf/templates/meeting/propose_session_slides.html
index 3245b7b04..2fc8d22ea 100644
--- a/ietf/templates/meeting/propose_session_slides.html
+++ b/ietf/templates/meeting/propose_session_slides.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}Propose Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/request_minutes.html b/ietf/templates/meeting/request_minutes.html
index 194412f34..6b34694bc 100644
--- a/ietf/templates/meeting/request_minutes.html
+++ b/ietf/templates/meeting/request_minutes.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2018, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
{% block morecss %}
#id_body {height:700px;}
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index 5b0678d29..b2cbf3b7a 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
{% block pagehead %}
diff --git a/ietf/templates/meeting/room-view.html b/ietf/templates/meeting/room-view.html
index ea577d5c8..28346bc33 100644
--- a/ietf/templates/meeting/room-view.html
+++ b/ietf/templates/meeting/room-view.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load staticfiles %}
+{% load static %}
{% comment %} This sets box-sizing: border-box {% endcomment %}
diff --git a/ietf/templates/meeting/room_edit.html b/ietf/templates/meeting/room_edit.html
index 93f86dd90..3a9cf30f1 100644
--- a/ietf/templates/meeting/room_edit.html
+++ b/ietf/templates/meeting/room_edit.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% load humanize %}
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
index 3ea142ea2..4a4a07817 100644
--- a/ietf/templates/meeting/schedule_list.html
+++ b/ietf/templates/meeting/schedule_list.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load ietf_filters %}
{% block title %}IETF {{ meeting.number }} Meeting Agenda List{% endblock %}
diff --git a/ietf/templates/meeting/session_agenda_include.html b/ietf/templates/meeting/session_agenda_include.html
index 18a094698..308092886 100644
--- a/ietf/templates/meeting/session_agenda_include.html
+++ b/ietf/templates/meeting/session_agenda_include.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load staticfiles %}
+{% load static %}
{% load textfilters %}
{% load ietf_filters %}
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index aeb1f915f..1309f2577 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load staticfiles %}
+{% load static %}
{% load textfilters %}
{% origin %}
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 0c1ec3241..17cd98887 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin ietf_filters staticfiles %}
+{% load origin ietf_filters static %}
{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index bb32da7de..a9b73895a 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load cache %}
-{% load ietf_filters staticfiles classname %}
+{% load ietf_filters static classname %}
{% block pagehead %}
diff --git a/ietf/templates/meeting/upload_session_agenda.html b/ietf/templates/meeting/upload_session_agenda.html
index 1ddec4ca7..57db35fb8 100644
--- a/ietf/templates/meeting/upload_session_agenda.html
+++ b/ietf/templates/meeting/upload_session_agenda.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}{% if agenda_sp %}Revise{% else %}Upload{% endif %} Agenda for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/upload_session_bluesheets.html b/ietf/templates/meeting/upload_session_bluesheets.html
index 8698b267f..96a02e4ea 100644
--- a/ietf/templates/meeting/upload_session_bluesheets.html
+++ b/ietf/templates/meeting/upload_session_bluesheets.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}{% if bluesheet_sp %}Revise{% else %}Upload{% endif %} Bluesheets for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/upload_session_minutes.html b/ietf/templates/meeting/upload_session_minutes.html
index ba96cf761..4a27133eb 100644
--- a/ietf/templates/meeting/upload_session_minutes.html
+++ b/ietf/templates/meeting/upload_session_minutes.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}{% if minutes_sp %}Revise{% else %}Upload{% endif %} Minutes for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/upload_session_slides.html b/ietf/templates/meeting/upload_session_slides.html
index 92dd9af51..4335e6342 100644
--- a/ietf/templates/meeting/upload_session_slides.html
+++ b/ietf/templates/meeting/upload_session_slides.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
{% block title %}{% if slides_sp %}Revise{% else %}Upload New{% endif %} Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html
index 647a13954..f100264e4 100644
--- a/ietf/templates/meeting/week-view.html
+++ b/ietf/templates/meeting/week-view.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load staticfiles %}
+{% load static %}