diff --git a/cvkbrno/templates/cvkbrno_boat_add_form.html b/cvkbrno/templates/cvkbrno_boat_add_form.html
index 9cb2478b..9327fabd 100644
--- a/cvkbrno/templates/cvkbrno_boat_add_form.html
+++ b/cvkbrno/templates/cvkbrno_boat_add_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Boat" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_boat_delete_confirm.html b/cvkbrno/templates/cvkbrno_boat_delete_confirm.html
index 351a4293..7f032a70 100644
--- a/cvkbrno/templates/cvkbrno_boat_delete_confirm.html
+++ b/cvkbrno/templates/cvkbrno_boat_delete_confirm.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 
diff --git a/cvkbrno/templates/cvkbrno_boat_edit_form.html b/cvkbrno/templates/cvkbrno_boat_edit_form.html
index 52e08559..1a74b248 100644
--- a/cvkbrno/templates/cvkbrno_boat_edit_form.html
+++ b/cvkbrno/templates/cvkbrno_boat_edit_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Boat" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_boats_admin.html b/cvkbrno/templates/cvkbrno_boats_admin.html
index a9598bf6..972bdc56 100644
--- a/cvkbrno/templates/cvkbrno_boats_admin.html
+++ b/cvkbrno/templates/cvkbrno_boats_admin.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Boats Admin" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_categories_admin.html b/cvkbrno/templates/cvkbrno_categories_admin.html
index d1f245a2..3d6d24ae 100644
--- a/cvkbrno/templates/cvkbrno_categories_admin.html
+++ b/cvkbrno/templates/cvkbrno_categories_admin.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Boat Category Admin" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_categories_delete_confirm.html b/cvkbrno/templates/cvkbrno_categories_delete_confirm.html
index d9415b2b..a4b1aca1 100644
--- a/cvkbrno/templates/cvkbrno_categories_delete_confirm.html
+++ b/cvkbrno/templates/cvkbrno_categories_delete_confirm.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Delete Boat Category" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_categories_edit_form.html b/cvkbrno/templates/cvkbrno_categories_edit_form.html
index 29715c8a..fba0ee92 100644
--- a/cvkbrno/templates/cvkbrno_categories_edit_form.html
+++ b/cvkbrno/templates/cvkbrno_categories_edit_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Category" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_category_add_form.html b/cvkbrno/templates/cvkbrno_category_add_form.html
index 697e89f5..655bc4ff 100644
--- a/cvkbrno/templates/cvkbrno_category_add_form.html
+++ b/cvkbrno/templates/cvkbrno_category_add_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Category" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_member_add_form.html b/cvkbrno/templates/cvkbrno_member_add_form.html
index 9f035086..673467f6 100644
--- a/cvkbrno/templates/cvkbrno_member_add_form.html
+++ b/cvkbrno/templates/cvkbrno_member_add_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Member" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_member_edit_form.html b/cvkbrno/templates/cvkbrno_member_edit_form.html
index fa3e6ae7..f1aed60b 100644
--- a/cvkbrno/templates/cvkbrno_member_edit_form.html
+++ b/cvkbrno/templates/cvkbrno_member_edit_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Member" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_members_admin.html b/cvkbrno/templates/cvkbrno_members_admin.html
index a9c24caa..7f83aa51 100644
--- a/cvkbrno/templates/cvkbrno_members_admin.html
+++ b/cvkbrno/templates/cvkbrno_members_admin.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Members Admin" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_members_delete_confirm.html b/cvkbrno/templates/cvkbrno_members_delete_confirm.html
index 414a9c87..11b360e9 100644
--- a/cvkbrno/templates/cvkbrno_members_delete_confirm.html
+++ b/cvkbrno/templates/cvkbrno_members_delete_confirm.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Delete Member" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_memberswork_add_form.html b/cvkbrno/templates/cvkbrno_memberswork_add_form.html
index f5f3c004..831fb127 100644
--- a/cvkbrno/templates/cvkbrno_memberswork_add_form.html
+++ b/cvkbrno/templates/cvkbrno_memberswork_add_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Members Work" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_memberswork_admin.html b/cvkbrno/templates/cvkbrno_memberswork_admin.html
index f2af7385..3414bc23 100644
--- a/cvkbrno/templates/cvkbrno_memberswork_admin.html
+++ b/cvkbrno/templates/cvkbrno_memberswork_admin.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Members Work Admin" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_memberwork_edit_form.html b/cvkbrno/templates/cvkbrno_memberwork_edit_form.html
index 8a4baf4b..c27ccfeb 100644
--- a/cvkbrno/templates/cvkbrno_memberwork_edit_form.html
+++ b/cvkbrno/templates/cvkbrno_memberwork_edit_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Member Work" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_meterboard.html b/cvkbrno/templates/cvkbrno_meterboard.html
index 618914de..b88b3120 100644
--- a/cvkbrno/templates/cvkbrno_meterboard.html
+++ b/cvkbrno/templates/cvkbrno_meterboard.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Meterboard" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_outing_admin.html b/cvkbrno/templates/cvkbrno_outing_admin.html
index 6d702066..6dbccf9b 100644
--- a/cvkbrno/templates/cvkbrno_outing_admin.html
+++ b/cvkbrno/templates/cvkbrno_outing_admin.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load filter %}
 {% load tz %}
diff --git a/cvkbrno/templates/cvkbrno_outing_closeform.html b/cvkbrno/templates/cvkbrno_outing_closeform.html
index 02bb3cf1..a6b38809 100644
--- a/cvkbrno/templates/cvkbrno_outing_closeform.html
+++ b/cvkbrno/templates/cvkbrno_outing_closeform.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Return from outing" %}
diff --git a/cvkbrno/templates/cvkbrno_outing_form.html b/cvkbrno/templates/cvkbrno_outing_form.html
index d10da855..6c04a751 100644
--- a/cvkbrno/templates/cvkbrno_outing_form.html
+++ b/cvkbrno/templates/cvkbrno_outing_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/cvkbrno/templates/cvkbrno_races_form.html b/cvkbrno/templates/cvkbrno_races_form.html
index 7c0b7ab9..cd6b343e 100644
--- a/cvkbrno/templates/cvkbrno_races_form.html
+++ b/cvkbrno/templates/cvkbrno_races_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Races Event" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_races_list.html b/cvkbrno/templates/cvkbrno_races_list.html
index 48aa8cd6..8fcd3393 100644
--- a/cvkbrno/templates/cvkbrno_races_list.html
+++ b/cvkbrno/templates/cvkbrno_races_list.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Races Admin" %}{% endblock %}
diff --git a/cvkbrno/templates/cvkbrno_reservation_form.html b/cvkbrno/templates/cvkbrno_reservation_form.html
index 50dbfa56..d7a45bbe 100644
--- a/cvkbrno/templates/cvkbrno_reservation_form.html
+++ b/cvkbrno/templates/cvkbrno_reservation_form.html
@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/cvkbrno/templates/cvkbrno_setlanguage.html b/cvkbrno/templates/cvkbrno_setlanguage.html
index 9f93455d..d05f741e 100644
--- a/cvkbrno/templates/cvkbrno_setlanguage.html
+++ b/cvkbrno/templates/cvkbrno_setlanguage.html
@@ -1,5 +1,5 @@
 {% extends "cvkbrnobase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Jdu na vodu {% endblock %}
diff --git a/rowers/templates/add_instantplan.html b/rowers/templates/add_instantplan.html
index 4fb4e298..7617ab23 100644
--- a/rowers/templates/add_instantplan.html
+++ b/rowers/templates/add_instantplan.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Add Instant Plan{% endblock %}
diff --git a/rowers/templates/add_result.html b/rowers/templates/add_result.html
index d0fa8aa7..45082bec 100644
--- a/rowers/templates/add_result.html
+++ b/rowers/templates/add_result.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
  
 {% block title %}Here's your result{% endblock %}
  
diff --git a/rowers/templates/agegroupchart.html b/rowers/templates/agegroupchart.html
index e7e499db..6d4d01df 100644
--- a/rowers/templates/agegroupchart.html
+++ b/rowers/templates/agegroupchart.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Age Group Records{% endblock %}
diff --git a/rowers/templates/agegroupcp.html b/rowers/templates/agegroupcp.html
index 253eff4f..2308f5fb 100644
--- a/rowers/templates/agegroupcp.html
+++ b/rowers/templates/agegroupcp.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Age Group CP{% endblock %}
diff --git a/rowers/templates/alert_create.html b/rowers/templates/alert_create.html
index d2d5da48..9940fa8e 100644
--- a/rowers/templates/alert_create.html
+++ b/rowers/templates/alert_create.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Metric Alert{% endblock %}
 
diff --git a/rowers/templates/alert_delete_confirm.html b/rowers/templates/alert_delete_confirm.html
index dc9a5417..8871a27d 100644
--- a/rowers/templates/alert_delete_confirm.html
+++ b/rowers/templates/alert_delete_confirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Planned Session{% endblock %}
 
diff --git a/rowers/templates/alert_edit.html b/rowers/templates/alert_edit.html
index 7849f3b4..04f92ce2 100644
--- a/rowers/templates/alert_edit.html
+++ b/rowers/templates/alert_edit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Metric Alert{% endblock %}
 
diff --git a/rowers/templates/alert_stats.html b/rowers/templates/alert_stats.html
index 94cb4294..22d0492e 100644
--- a/rowers/templates/alert_stats.html
+++ b/rowers/templates/alert_stats.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Metric Alert{% endblock %}
diff --git a/rowers/templates/alerts.html b/rowers/templates/alerts.html
index 1ac3b2dc..b6830a63 100644
--- a/rowers/templates/alerts.html
+++ b/rowers/templates/alerts.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Analysis {% endblock %}
diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html
index 68579114..d77796f8 100644
--- a/rowers/templates/analysis.html
+++ b/rowers/templates/analysis.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Analysis {% endblock %}
diff --git a/rowers/templates/async_tasks.html b/rowers/templates/async_tasks.html
index 83c916f0..524f621a 100644
--- a/rowers/templates/async_tasks.html
+++ b/rowers/templates/async_tasks.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Tasks {% endblock %}
diff --git a/rowers/templates/boxplot.html b/rowers/templates/boxplot.html
index e5574916..7f8bd9db 100644
--- a/rowers/templates/boxplot.html
+++ b/rowers/templates/boxplot.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Box Plot {% endblock %}
diff --git a/rowers/templates/c2_list_import.html b/rowers/templates/c2_list_import.html
index 69a81cc7..e8015401 100644
--- a/rowers/templates/c2_list_import.html
+++ b/rowers/templates/c2_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/c2_list_import2.html b/rowers/templates/c2_list_import2.html
index 5e1ffa68..42bae8e7 100644
--- a/rowers/templates/c2_list_import2.html
+++ b/rowers/templates/c2_list_import2.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/cn_form.html b/rowers/templates/cn_form.html
index 5a32d235..5523eb51 100644
--- a/rowers/templates/cn_form.html
+++ b/rowers/templates/cn_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}CrewNerd Summary loading{% endblock %}
 
diff --git a/rowers/templates/comparison_list.html b/rowers/templates/comparison_list.html
index 804fd6b9..354257d0 100644
--- a/rowers/templates/comparison_list.html
+++ b/rowers/templates/comparison_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/course_edit_view.html b/rowers/templates/course_edit_view.html
index 797a2924..58b2cb64 100644
--- a/rowers/templates/course_edit_view.html
+++ b/rowers/templates/course_edit_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/course_form.html b/rowers/templates/course_form.html
index 1c5b25b6..f5d92337 100644
--- a/rowers/templates/course_form.html
+++ b/rowers/templates/course_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/course_form_update.html b/rowers/templates/course_form_update.html
index 7a5dca80..7ba554cc 100644
--- a/rowers/templates/course_form_update.html
+++ b/rowers/templates/course_form_update.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/course_replace.html b/rowers/templates/course_replace.html
index 17ad92c4..53569c1f 100644
--- a/rowers/templates/course_replace.html
+++ b/rowers/templates/course_replace.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/course_replace_confirm.html b/rowers/templates/course_replace_confirm.html
index b0b010c4..965b9180 100644
--- a/rowers/templates/course_replace_confirm.html
+++ b/rowers/templates/course_replace_confirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/course_view.html b/rowers/templates/course_view.html
index b7c9da70..06c3a1ec 100644
--- a/rowers/templates/course_view.html
+++ b/rowers/templates/course_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/coursemap.html b/rowers/templates/coursemap.html
index b5b162e6..d926f731 100644
--- a/rowers/templates/coursemap.html
+++ b/rowers/templates/coursemap.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/cum_flex.html b/rowers/templates/cum_flex.html
index c718372e..e78b002f 100644
--- a/rowers/templates/cum_flex.html
+++ b/rowers/templates/cum_flex.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}
diff --git a/rowers/templates/cumstats.html b/rowers/templates/cumstats.html
index 7841874a..7e5c5b83 100644
--- a/rowers/templates/cumstats.html
+++ b/rowers/templates/cumstats.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}
diff --git a/rowers/templates/dashboard.html b/rowers/templates/dashboard.html
index 1d3d0829..bfa4930d 100644
--- a/rowers/templates/dashboard.html
+++ b/rowers/templates/dashboard.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 
diff --git a/rowers/templates/disqualification_view.html b/rowers/templates/disqualification_view.html
index bd1894b7..e0a984ee 100644
--- a/rowers/templates/disqualification_view.html
+++ b/rowers/templates/disqualification_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% block scripts %}
 {% include "monitorjobs.html" %}
diff --git a/rowers/templates/document_form.html b/rowers/templates/document_form.html
index b5dd35ba..2a6befb5 100644
--- a/rowers/templates/document_form.html
+++ b/rowers/templates/document_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/dropathleteconfirm.html b/rowers/templates/dropathleteconfirm.html
index 73077b69..2e85294a 100644
--- a/rowers/templates/dropathleteconfirm.html
+++ b/rowers/templates/dropathleteconfirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Remove Athlete {% endblock %}
diff --git a/rowers/templates/dropcoachconfirm.html b/rowers/templates/dropcoachconfirm.html
index 863c0e2c..b582aabb 100644
--- a/rowers/templates/dropcoachconfirm.html
+++ b/rowers/templates/dropcoachconfirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Remove Coach {% endblock %}
diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index 5543733b..0ff08fbe 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load i18n %}
 {% load leaflet_tags %}
diff --git a/rowers/templates/embedded_video_mini.html b/rowers/templates/embedded_video_mini.html
index 20288285..db87e5ce 100644
--- a/rowers/templates/embedded_video_mini.html
+++ b/rowers/templates/embedded_video_mini.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load i18n %}
 {% load leaflet_tags %}
diff --git a/rowers/templates/empower_fix.html b/rowers/templates/empower_fix.html
index 5fd1101e..9fbc66c3 100644
--- a/rowers/templates/empower_fix.html
+++ b/rowers/templates/empower_fix.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Empower FIX{% endblock %}
diff --git a/rowers/templates/entryedit.html b/rowers/templates/entryedit.html
index fc1d5848..5adbce18 100644
--- a/rowers/templates/entryedit.html
+++ b/rowers/templates/entryedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Register for a Virtual Race{% endblock %}
diff --git a/rowers/templates/export.html b/rowers/templates/export.html
index 59c952e5..e28275c0 100644
--- a/rowers/templates/export.html
+++ b/rowers/templates/export.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Export {% endblock %}
diff --git a/rowers/templates/export_workouts.html b/rowers/templates/export_workouts.html
index b45dc2f5..0addb835 100644
--- a/rowers/templates/export_workouts.html
+++ b/rowers/templates/export_workouts.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Workouts Summary Export{% endblock %}
diff --git a/rowers/templates/failed_jobs.html b/rowers/templates/failed_jobs.html
index 42080a36..526fa5f3 100644
--- a/rowers/templates/failed_jobs.html
+++ b/rowers/templates/failed_jobs.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Failed Que{% endblock %}
diff --git a/rowers/templates/fastestvirtualeventcreate.html b/rowers/templates/fastestvirtualeventcreate.html
index 7034c3f3..00eb120f 100644
--- a/rowers/templates/fastestvirtualeventcreate.html
+++ b/rowers/templates/fastestvirtualeventcreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Virtual Challenge{% endblock %}
diff --git a/rowers/templates/fitnessfit.html b/rowers/templates/fitnessfit.html
index 8c15d925..010f8e09 100644
--- a/rowers/templates/fitnessfit.html
+++ b/rowers/templates/fitnessfit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Fitness Progress {% endblock %}
diff --git a/rowers/templates/fitnessmetric.html b/rowers/templates/fitnessmetric.html
index 647f49be..c3a0a4d6 100644
--- a/rowers/templates/fitnessmetric.html
+++ b/rowers/templates/fitnessmetric.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Fitness Progress {% endblock %}
diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html
index d7fdf3af..bbae4c43 100644
--- a/rowers/templates/flexchart3otw.html
+++ b/rowers/templates/flexchart3otw.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/flexchartstacked.html b/rowers/templates/flexchartstacked.html
index 665453ac..d44b9c33 100644
--- a/rowers/templates/flexchartstacked.html
+++ b/rowers/templates/flexchartstacked.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/followerform.html b/rowers/templates/followerform.html
index 15b2231c..c64e5abc 100644
--- a/rowers/templates/followerform.html
+++ b/rowers/templates/followerform.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/forcecurve_single.html b/rowers/templates/forcecurve_single.html
index ed7f9c5a..547b2bc5 100644
--- a/rowers/templates/forcecurve_single.html
+++ b/rowers/templates/forcecurve_single.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/freecoach_registration_form.html b/rowers/templates/freecoach_registration_form.html
index a1746819..737ee4dc 100644
--- a/rowers/templates/freecoach_registration_form.html
+++ b/rowers/templates/freecoach_registration_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% block title %}New Coach Registration{% endblock title %}
 {% block meta %}
diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index dcd397c2..52f3a7c9 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -1,5 +1,5 @@
 {% extends "newbasefront.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Rowing Data{% endblock %}
diff --git a/rowers/templates/frontpageblogs.html b/rowers/templates/frontpageblogs.html
index dd65e3ff..bc0e9eea 100644
--- a/rowers/templates/frontpageblogs.html
+++ b/rowers/templates/frontpageblogs.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% for blog in blogposts %}
diff --git a/rowers/templates/fusion.html b/rowers/templates/fusion.html
index 89a11a4b..d5185cf8 100644
--- a/rowers/templates/fusion.html
+++ b/rowers/templates/fusion.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/fusion_list.html b/rowers/templates/fusion_list.html
index a1d1d497..84cb64d5 100644
--- a/rowers/templates/fusion_list.html
+++ b/rowers/templates/fusion_list.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/gdpr_optin.html b/rowers/templates/gdpr_optin.html
index a5a68a63..9e084f75 100644
--- a/rowers/templates/gdpr_optin.html
+++ b/rowers/templates/gdpr_optin.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}GDPR Opt-In{% endblock %}
diff --git a/rowers/templates/goldmedalscores.html b/rowers/templates/goldmedalscores.html
index 2cd05773..020db44c 100644
--- a/rowers/templates/goldmedalscores.html
+++ b/rowers/templates/goldmedalscores.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Gold Medal Score {% endblock %}
diff --git a/rowers/templates/graphimage_delete_confirm.html b/rowers/templates/graphimage_delete_confirm.html
index 8e8a6c02..d1f39b21 100644
--- a/rowers/templates/graphimage_delete_confirm.html
+++ b/rowers/templates/graphimage_delete_confirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Delete Graph Image {% endblock %}
diff --git a/rowers/templates/help.html b/rowers/templates/help.html
index cf49d2f7..85f1b893 100644
--- a/rowers/templates/help.html
+++ b/rowers/templates/help.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/histo.html b/rowers/templates/histo.html
index be333c76..cbb641c7 100644
--- a/rowers/templates/histo.html
+++ b/rowers/templates/histo.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}
diff --git a/rowers/templates/histo_single.html b/rowers/templates/histo_single.html
index fce8843e..85539731 100644
--- a/rowers/templates/histo_single.html
+++ b/rowers/templates/histo_single.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}View Workout {% endblock %}
diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index e66e58ca..819b0ff5 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}
diff --git a/rowers/templates/image_form.html b/rowers/templates/image_form.html
index 43182ced..23804475 100644
--- a/rowers/templates/image_form.html
+++ b/rowers/templates/image_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/image_page.html b/rowers/templates/image_page.html
index 96c34955..b56bd322 100644
--- a/rowers/templates/image_page.html
+++ b/rowers/templates/image_page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
  
 {% block title %}Here's your plot{% endblock %}
  
diff --git a/rowers/templates/indoorvirtualeventcreate.html b/rowers/templates/indoorvirtualeventcreate.html
index 8ec29004..336990c5 100644
--- a/rowers/templates/indoorvirtualeventcreate.html
+++ b/rowers/templates/indoorvirtualeventcreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Virtual Challenge{% endblock %}
diff --git a/rowers/templates/instantplan.html b/rowers/templates/instantplan.html
index b581bd5d..5cfbe7fc 100644
--- a/rowers/templates/instantplan.html
+++ b/rowers/templates/instantplan.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{{ plan.name }}{% endblock %}
diff --git a/rowers/templates/instantplans.html b/rowers/templates/instantplans.html
index 6382fbd5..6176d9b9 100644
--- a/rowers/templates/instantplans.html
+++ b/rowers/templates/instantplans.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/instroke.html b/rowers/templates/instroke.html
index 09282e17..10c526be 100644
--- a/rowers/templates/instroke.html
+++ b/rowers/templates/instroke.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Advanced Features {% endblock %}
diff --git a/rowers/templates/laboratory.html b/rowers/templates/laboratory.html
index 41fe9cb0..15b27e02 100644
--- a/rowers/templates/laboratory.html
+++ b/rowers/templates/laboratory.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Analysis {% endblock %}
diff --git a/rowers/templates/list_courses.html b/rowers/templates/list_courses.html
index bd99a4f7..bab2409f 100644
--- a/rowers/templates/list_courses.html
+++ b/rowers/templates/list_courses.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Courses List{% endblock %}
diff --git a/rowers/templates/list_graphs.html b/rowers/templates/list_graphs.html
index 8daf3046..1dfa9d78 100644
--- a/rowers/templates/list_graphs.html
+++ b/rowers/templates/list_graphs.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Recent Graphs{% endblock %}
diff --git a/rowers/templates/list_standards.html b/rowers/templates/list_standards.html
index b99ac07f..e30d8492 100644
--- a/rowers/templates/list_standards.html
+++ b/rowers/templates/list_standards.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Course Standards List{% endblock %}
diff --git a/rowers/templates/list_videos.html b/rowers/templates/list_videos.html
index 4e1dfa33..748db1c1 100644
--- a/rowers/templates/list_videos.html
+++ b/rowers/templates/list_videos.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Recent Video Analyses{% endblock %}
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 991ff27a..21c5944d 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Workouts List{% endblock %}
diff --git a/rowers/templates/logo_form.html b/rowers/templates/logo_form.html
index 9482267a..82929c99 100644
--- a/rowers/templates/logo_form.html
+++ b/rowers/templates/logo_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/manualadd.html b/rowers/templates/manualadd.html
index 09a435f0..0ec7f110 100644
--- a/rowers/templates/manualadd.html
+++ b/rowers/templates/manualadd.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/map_view.html b/rowers/templates/map_view.html
index 93d9677c..676aa566 100644
--- a/rowers/templates/map_view.html
+++ b/rowers/templates/map_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/mapcompare.html b/rowers/templates/mapcompare.html
index be79b5c3..4d219412 100644
--- a/rowers/templates/mapcompare.html
+++ b/rowers/templates/mapcompare.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index 2bf2760f..0f12d35d 100644
--- a/rowers/templates/menu_analytics.html
+++ b/rowers/templates/menu_analytics.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/analysis/">Analysis</a></h1>
 <ul class="cd-accordion-menu animated">
diff --git a/rowers/templates/menu_other.html b/rowers/templates/menu_other.html
index a3961006..b565018e 100644
--- a/rowers/templates/menu_other.html
+++ b/rowers/templates/menu_other.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/list-workouts/">Workouts</a></h1>
 <ul class="cd-accordion-menu animated">
diff --git a/rowers/templates/menu_payments.html b/rowers/templates/menu_payments.html
index bad5cd53..7d280b5a 100644
--- a/rowers/templates/menu_payments.html
+++ b/rowers/templates/menu_payments.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/me/edit/">Profile</a></h1>
 <ul class="cd-accordion-menu animated">
diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html
index 765861fa..da163066 100644
--- a/rowers/templates/menu_plan.html
+++ b/rowers/templates/menu_plan.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/sessions/">Plan</a></h1>
 <ul class="cd-accordion-menu animated">
diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html
index 692c1c97..7f357789 100644
--- a/rowers/templates/menu_profile.html
+++ b/rowers/templates/menu_profile.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/me/edit/">Profile</a></h1>
 <ul class="cd-accordion-menu animated">
diff --git a/rowers/templates/menu_teams.html b/rowers/templates/menu_teams.html
index 8464df9f..9665d742 100644
--- a/rowers/templates/menu_teams.html
+++ b/rowers/templates/menu_teams.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/me/teams/">Teams</a></h1>
 
diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index 73c22bdf..833e6fac 100644
--- a/rowers/templates/menu_workouts.html
+++ b/rowers/templates/menu_workouts.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <h1><a href="/rowers/list-workouts/">Workouts</a></h1>
 <ul class="cd-accordion-menu animated">
diff --git a/rowers/templates/menublogs.html b/rowers/templates/menublogs.html
index dd65e3ff..bc0e9eea 100644
--- a/rowers/templates/menublogs.html
+++ b/rowers/templates/menublogs.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% for blog in blogposts %}
diff --git a/rowers/templates/multicompare.html b/rowers/templates/multicompare.html
index df363159..6024d130 100644
--- a/rowers/templates/multicompare.html
+++ b/rowers/templates/multicompare.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}View Comparison {% endblock %}
diff --git a/rowers/templates/multiflex.html b/rowers/templates/multiflex.html
index ea02452c..e9638577 100644
--- a/rowers/templates/multiflex.html
+++ b/rowers/templates/multiflex.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}View Comparison {% endblock %}
diff --git a/rowers/templates/newchallengechoice.html b/rowers/templates/newchallengechoice.html
index b08c0395..6f56fd22 100644
--- a/rowers/templates/newchallengechoice.html
+++ b/rowers/templates/newchallengechoice.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Virtual Challenge{% endblock %}
diff --git a/rowers/templates/nk_list_import.html b/rowers/templates/nk_list_import.html
index f8689b06..e97d711b 100644
--- a/rowers/templates/nk_list_import.html
+++ b/rowers/templates/nk_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/oterankings.html b/rowers/templates/oterankings.html
index 4fc7d4ac..76c07327 100644
--- a/rowers/templates/oterankings.html
+++ b/rowers/templates/oterankings.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block scripts %}
diff --git a/rowers/templates/otwgeeky.html b/rowers/templates/otwgeeky.html
index 403be27d..4ed742ab 100644
--- a/rowers/templates/otwgeeky.html
+++ b/rowers/templates/otwgeeky.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Advanced Features {% endblock %}
diff --git a/rowers/templates/otwinteractive.html b/rowers/templates/otwinteractive.html
index ef2d13da..5c5164cb 100644
--- a/rowers/templates/otwinteractive.html
+++ b/rowers/templates/otwinteractive.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}View Workout {% endblock %}
diff --git a/rowers/templates/otwrankings.html b/rowers/templates/otwrankings.html
index 9e5184b8..bd0186b4 100644
--- a/rowers/templates/otwrankings.html
+++ b/rowers/templates/otwrankings.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block scripts %}
diff --git a/rowers/templates/otwsetpower.html b/rowers/templates/otwsetpower.html
index c01631a4..8021191b 100644
--- a/rowers/templates/otwsetpower.html
+++ b/rowers/templates/otwsetpower.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Advanced Features {% endblock %}
diff --git a/rowers/templates/performancemanager.html b/rowers/templates/performancemanager.html
index 9e336622..43a98877 100644
--- a/rowers/templates/performancemanager.html
+++ b/rowers/templates/performancemanager.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Fitness Progress {% endblock %}
diff --git a/rowers/templates/plannedsession_comments.html b/rowers/templates/plannedsession_comments.html
index 1236e0c5..8060acf0 100644
--- a/rowers/templates/plannedsession_comments.html
+++ b/rowers/templates/plannedsession_comments.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/plannedsession_message.html b/rowers/templates/plannedsession_message.html
index db759697..bfb0ca40 100644
--- a/rowers/templates/plannedsession_message.html
+++ b/rowers/templates/plannedsession_message.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html
index 66c761be..97bab57e 100644
--- a/rowers/templates/plannedsession_multicreate.html
+++ b/rowers/templates/plannedsession_multicreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Plan entire microcycle{% endblock %}
diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html
index b51ffed7..64c2bc6b 100644
--- a/rowers/templates/plannedsessioncreate.html
+++ b/rowers/templates/plannedsessioncreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Planned Session{% endblock %}
diff --git a/rowers/templates/plannedsessiondeleteconfirm.html b/rowers/templates/plannedsessiondeleteconfirm.html
index f196304f..52ccd481 100644
--- a/rowers/templates/plannedsessiondeleteconfirm.html
+++ b/rowers/templates/plannedsessiondeleteconfirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Planned Session{% endblock %}
 
diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html
index 7f5ccd12..8ec4a578 100644
--- a/rowers/templates/plannedsessionedit.html
+++ b/rowers/templates/plannedsessionedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Update Planned Session{% endblock %}
diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html
index d9ceb02d..2f9f48e8 100644
--- a/rowers/templates/plannedsessions.html
+++ b/rowers/templates/plannedsessions.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Planned Sessions{% endblock %}
diff --git a/rowers/templates/plannedsessions_multiclone_select.html b/rowers/templates/plannedsessions_multiclone_select.html
index 674dd7a3..054618a3 100644
--- a/rowers/templates/plannedsessions_multiclone_select.html
+++ b/rowers/templates/plannedsessions_multiclone_select.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/plannedsessions_print.html b/rowers/templates/plannedsessions_print.html
index 63fba42d..901a82b1 100644
--- a/rowers/templates/plannedsessions_print.html
+++ b/rowers/templates/plannedsessions_print.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Planned Sessions{% endblock %}
diff --git a/rowers/templates/plannedsessionscoach.html b/rowers/templates/plannedsessionscoach.html
index cc9a747a..0ff672f1 100644
--- a/rowers/templates/plannedsessionscoach.html
+++ b/rowers/templates/plannedsessionscoach.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Planned Sessions{% endblock %}
diff --git a/rowers/templates/plannedsessionscoach2.html b/rowers/templates/plannedsessionscoach2.html
index 5c38503e..339dcc56 100644
--- a/rowers/templates/plannedsessionscoach2.html
+++ b/rowers/templates/plannedsessionscoach2.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Planned Sessions{% endblock %}
diff --git a/rowers/templates/plannedsessionsmanage.html b/rowers/templates/plannedsessionsmanage.html
index fa78f7b1..6ec1c3fa 100644
--- a/rowers/templates/plannedsessionsmanage.html
+++ b/rowers/templates/plannedsessionsmanage.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Planned Sessions{% endblock %}
diff --git a/rowers/templates/plannedsessionteamcreate.html b/rowers/templates/plannedsessionteamcreate.html
index 784f3881..46043c98 100644
--- a/rowers/templates/plannedsessionteamcreate.html
+++ b/rowers/templates/plannedsessionteamcreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Planned Session{% endblock %}
diff --git a/rowers/templates/plannedsessionteamedit.html b/rowers/templates/plannedsessionteamedit.html
index 260af903..42ce3aed 100644
--- a/rowers/templates/plannedsessionteamedit.html
+++ b/rowers/templates/plannedsessionteamedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Planned Session{% endblock %}
diff --git a/rowers/templates/plannedsessiontemplatecreate.html b/rowers/templates/plannedsessiontemplatecreate.html
index 573dfdca..fbda21b5 100644
--- a/rowers/templates/plannedsessiontemplatecreate.html
+++ b/rowers/templates/plannedsessiontemplatecreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Create Library Session{% endblock %}
diff --git a/rowers/templates/plannedsessiontemplateedit.html b/rowers/templates/plannedsessiontemplateedit.html
index 9fa47d07..d3c15a01 100644
--- a/rowers/templates/plannedsessiontemplateedit.html
+++ b/rowers/templates/plannedsessiontemplateedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Update Library Session{% endblock %}
diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html
index 3a9e2ca3..21d57028 100644
--- a/rowers/templates/plannedsessionview.html
+++ b/rowers/templates/plannedsessionview.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/polar_list_import.html b/rowers/templates/polar_list_import.html
index 9e6a3817..f8754284 100644
--- a/rowers/templates/polar_list_import.html
+++ b/rowers/templates/polar_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/race_submit.html b/rowers/templates/race_submit.html
index f38bc57a..4eedefa6 100644
--- a/rowers/templates/race_submit.html
+++ b/rowers/templates/race_submit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Submit challenge Result{% endblock %}
diff --git a/rowers/templates/rankings.html b/rowers/templates/rankings.html
index cc573e39..74591842 100644
--- a/rowers/templates/rankings.html
+++ b/rowers/templates/rankings.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/redesign.html b/rowers/templates/redesign.html
index 79779d35..69ac9321 100644
--- a/rowers/templates/redesign.html
+++ b/rowers/templates/redesign.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_analysis.html b/rowers/templates/redesign_analysis.html
index 20dfc9c7..17384d12 100644
--- a/rowers/templates/redesign_analysis.html
+++ b/rowers/templates/redesign_analysis.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_plan.html b/rowers/templates/redesign_plan.html
index 72057cd1..f33f1928 100644
--- a/rowers/templates/redesign_plan.html
+++ b/rowers/templates/redesign_plan.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_profile.html b/rowers/templates/redesign_profile.html
index 896712fa..2c82f205 100644
--- a/rowers/templates/redesign_profile.html
+++ b/rowers/templates/redesign_profile.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_racing.html b/rowers/templates/redesign_racing.html
index dacdee63..1d749333 100644
--- a/rowers/templates/redesign_racing.html
+++ b/rowers/templates/redesign_racing.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_teams.html b/rowers/templates/redesign_teams.html
index 46e03a4b..546f8059 100644
--- a/rowers/templates/redesign_teams.html
+++ b/rowers/templates/redesign_teams.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_workout.html b/rowers/templates/redesign_workout.html
index 669cd281..cc894544 100644
--- a/rowers/templates/redesign_workout.html
+++ b/rowers/templates/redesign_workout.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/redesign_workouts.html b/rowers/templates/redesign_workouts.html
index 3205bcc2..166c2208 100644
--- a/rowers/templates/redesign_workouts.html
+++ b/rowers/templates/redesign_workouts.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/registration_form.html b/rowers/templates/registration_form.html
index d7c27f4c..29328f81 100644
--- a/rowers/templates/registration_form.html
+++ b/rowers/templates/registration_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% block title %}New User Registration{% endblock title %}
 {% block meta %}
diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html
index 3097ab60..d83d8a59 100644
--- a/rowers/templates/rower_form.html
+++ b/rowers/templates/rower_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Change Rower {% endblock %}
diff --git a/rowers/templates/rower_preferences.html b/rowers/templates/rower_preferences.html
index cce14a1f..28f27dc2 100644
--- a/rowers/templates/rower_preferences.html
+++ b/rowers/templates/rower_preferences.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Change Rower Preferences{% endblock %}
diff --git a/rowers/templates/rp3_list_import.html b/rowers/templates/rp3_list_import.html
index 5827dda7..24404971 100644
--- a/rowers/templates/rp3_list_import.html
+++ b/rowers/templates/rp3_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/runkeeper_list_import.html b/rowers/templates/runkeeper_list_import.html
index 8af34266..d25a509d 100644
--- a/rowers/templates/runkeeper_list_import.html
+++ b/rowers/templates/runkeeper_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/share.html b/rowers/templates/share.html
index 4f8850a3..4abda35a 100644
--- a/rowers/templates/share.html
+++ b/rowers/templates/share.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/show_graph.html b/rowers/templates/show_graph.html
index c3a1a8b8..50ce40b0 100644
--- a/rowers/templates/show_graph.html
+++ b/rowers/templates/show_graph.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{{ workout.name }}{% endblock %}
diff --git a/rowers/templates/splitworkout.html b/rowers/templates/splitworkout.html
index 5c93f159..6a2994df 100644
--- a/rowers/templates/splitworkout.html
+++ b/rowers/templates/splitworkout.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/sporttracks_list_import.html b/rowers/templates/sporttracks_list_import.html
index 8400d5ff..ef97b2fb 100644
--- a/rowers/templates/sporttracks_list_import.html
+++ b/rowers/templates/sporttracks_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/standard_form.html b/rowers/templates/standard_form.html
index 282ba443..afb374e4 100644
--- a/rowers/templates/standard_form.html
+++ b/rowers/templates/standard_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/standard_view.html b/rowers/templates/standard_view.html
index 222282e5..dc35c345 100644
--- a/rowers/templates/standard_view.html
+++ b/rowers/templates/standard_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/strava_list_import.html b/rowers/templates/strava_list_import.html
index a3c1c97b..f6b1bea0 100644
--- a/rowers/templates/strava_list_import.html
+++ b/rowers/templates/strava_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/streamedit.html b/rowers/templates/streamedit.html
index 18306667..16a0e59a 100644
--- a/rowers/templates/streamedit.html
+++ b/rowers/templates/streamedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Advanced Features {% endblock %}
diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html
index 844e3272..422f34bc 100644
--- a/rowers/templates/summary_edit.html
+++ b/rowers/templates/summary_edit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/survey.html b/rowers/templates/survey.html
index 39433159..001b9483 100644
--- a/rowers/templates/survey.html
+++ b/rowers/templates/survey.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}
diff --git a/rowers/templates/survey2.html b/rowers/templates/survey2.html
index 109fc78e..cd2941dd 100644
--- a/rowers/templates/survey2.html
+++ b/rowers/templates/survey2.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}
diff --git a/rowers/templates/team_compare_select.html b/rowers/templates/team_compare_select.html
index 0480f481..19140d18 100644
--- a/rowers/templates/team_compare_select.html
+++ b/rowers/templates/team_compare_select.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/team_document_form.html b/rowers/templates/team_document_form.html
index 899e62da..54260f6d 100644
--- a/rowers/templates/team_document_form.html
+++ b/rowers/templates/team_document_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}File loading{% endblock %}
 
diff --git a/rowers/templates/teamcreate.html b/rowers/templates/teamcreate.html
index 7014ef5c..c361ff73 100644
--- a/rowers/templates/teamcreate.html
+++ b/rowers/templates/teamcreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}New Team{% endblock %}
 
diff --git a/rowers/templates/teamdeleteconfirm.html b/rowers/templates/teamdeleteconfirm.html
index 20120bc3..2bf8d5b8 100644
--- a/rowers/templates/teamdeleteconfirm.html
+++ b/rowers/templates/teamdeleteconfirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Delete Team {% endblock %}
diff --git a/rowers/templates/teamedit.html b/rowers/templates/teamedit.html
index 3219025b..ab34f726 100644
--- a/rowers/templates/teamedit.html
+++ b/rowers/templates/teamedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Edit Team{% endblock %}
 
diff --git a/rowers/templates/teamleaveconfirm.html b/rowers/templates/teamleaveconfirm.html
index cae64c93..aa795a7b 100644
--- a/rowers/templates/teamleaveconfirm.html
+++ b/rowers/templates/teamleaveconfirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Leave Team {% endblock %}
diff --git a/rowers/templates/templatelibrary.html b/rowers/templates/templatelibrary.html
index 7fe46fa4..c8c72041 100644
--- a/rowers/templates/templatelibrary.html
+++ b/rowers/templates/templatelibrary.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Planned Sessions{% endblock %}
diff --git a/rowers/templates/trainingplan.html b/rowers/templates/trainingplan.html
index 181f22cc..f6a7c73d 100644
--- a/rowers/templates/trainingplan.html
+++ b/rowers/templates/trainingplan.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/trainingplan2.html b/rowers/templates/trainingplan2.html
index 8a54c518..cb06f4f8 100644
--- a/rowers/templates/trainingplan2.html
+++ b/rowers/templates/trainingplan2.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/trainingplan_chart.html b/rowers/templates/trainingplan_chart.html
index 14c62309..aca80898 100644
--- a/rowers/templates/trainingplan_chart.html
+++ b/rowers/templates/trainingplan_chart.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/trainingplan_create.html b/rowers/templates/trainingplan_create.html
index 74f81e90..7f683aa4 100644
--- a/rowers/templates/trainingplan_create.html
+++ b/rowers/templates/trainingplan_create.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/trainingplan_delete.html b/rowers/templates/trainingplan_delete.html
index d39d971f..045411e4 100644
--- a/rowers/templates/trainingplan_delete.html
+++ b/rowers/templates/trainingplan_delete.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/trainingplan_edit.html b/rowers/templates/trainingplan_edit.html
index 3f24d8d7..0ff2f815 100644
--- a/rowers/templates/trainingplan_edit.html
+++ b/rowers/templates/trainingplan_edit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}
diff --git a/rowers/templates/transactions.html b/rowers/templates/transactions.html
index 1cb1375e..8bdf1db1 100644
--- a/rowers/templates/transactions.html
+++ b/rowers/templates/transactions.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}
diff --git a/rowers/templates/underarmour_list_import.html b/rowers/templates/underarmour_list_import.html
index 424f7feb..1bbd5c2d 100644
--- a/rowers/templates/underarmour_list_import.html
+++ b/rowers/templates/underarmour_list_import.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/user_analysis_select.html b/rowers/templates/user_analysis_select.html
index 3c5bc554..f952b9b2 100644
--- a/rowers/templates/user_analysis_select.html
+++ b/rowers/templates/user_analysis_select.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Analysis{% endblock %}
diff --git a/rowers/templates/user_boxplot_select.html b/rowers/templates/user_boxplot_select.html
index f29d3fda..bd290f55 100644
--- a/rowers/templates/user_boxplot_select.html
+++ b/rowers/templates/user_boxplot_select.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/user_multiflex_select.html b/rowers/templates/user_multiflex_select.html
index 9b4478fa..d73cf985 100644
--- a/rowers/templates/user_multiflex_select.html
+++ b/rowers/templates/user_multiflex_select.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/userprofile_deactivate.html b/rowers/templates/userprofile_deactivate.html
index de600442..16efc99a 100644
--- a/rowers/templates/userprofile_deactivate.html
+++ b/rowers/templates/userprofile_deactivate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Deactivate your account{% endblock %}
diff --git a/rowers/templates/userprofile_delete.html b/rowers/templates/userprofile_delete.html
index d5099477..08d4c466 100644
--- a/rowers/templates/userprofile_delete.html
+++ b/rowers/templates/userprofile_delete.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Delete your account{% endblock %}
diff --git a/rowers/templates/video_delete_confirm.html b/rowers/templates/video_delete_confirm.html
index c014f34d..d26907e8 100644
--- a/rowers/templates/video_delete_confirm.html
+++ b/rowers/templates/video_delete_confirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Delete Graph Image {% endblock %}
diff --git a/rowers/templates/video_selectworkout.html b/rowers/templates/video_selectworkout.html
index 1902ca5e..b4e68a34 100644
--- a/rowers/templates/video_selectworkout.html
+++ b/rowers/templates/video_selectworkout.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html
index d98ba3e4..80dc9195 100644
--- a/rowers/templates/virtualevent.html
+++ b/rowers/templates/virtualevent.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 {% load tz %}
diff --git a/rowers/templates/virtualeventcreate.html b/rowers/templates/virtualeventcreate.html
index 6bd65d53..6dfdddd1 100644
--- a/rowers/templates/virtualeventcreate.html
+++ b/rowers/templates/virtualeventcreate.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Virtual Challenge{% endblock %}
diff --git a/rowers/templates/virtualeventedit.html b/rowers/templates/virtualeventedit.html
index 7a923c6b..42682017 100644
--- a/rowers/templates/virtualeventedit.html
+++ b/rowers/templates/virtualeventedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Edit Virtual Challenge{% endblock %}
diff --git a/rowers/templates/virtualeventranking.html b/rowers/templates/virtualeventranking.html
index 9053c269..ce0b4dcd 100644
--- a/rowers/templates/virtualeventranking.html
+++ b/rowers/templates/virtualeventranking.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/virtualeventregister.html b/rowers/templates/virtualeventregister.html
index d5c2ee00..c89040d7 100644
--- a/rowers/templates/virtualeventregister.html
+++ b/rowers/templates/virtualeventregister.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Register for a Virtual Race{% endblock %}
diff --git a/rowers/templates/virtualevents.html b/rowers/templates/virtualevents.html
index 9fb5856f..0a9179a3 100644
--- a/rowers/templates/virtualevents.html
+++ b/rowers/templates/virtualevents.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Virtual Challenges{% endblock %}
diff --git a/rowers/templates/waiting_page.html b/rowers/templates/waiting_page.html
index bda459af..db53aaca 100644
--- a/rowers/templates/waiting_page.html
+++ b/rowers/templates/waiting_page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Waiting{% endblock %}
 {% block meta %}<meta http-equiv="refresh" content="30">{% endblock %}
diff --git a/rowers/templates/windedit.html b/rowers/templates/windedit.html
index ff1f5f30..6ba3d3d1 100644
--- a/rowers/templates/windedit.html
+++ b/rowers/templates/windedit.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Advanced Features {% endblock %}
diff --git a/rowers/templates/withdraw_view.html b/rowers/templates/withdraw_view.html
index 05e890ee..91b0809d 100644
--- a/rowers/templates/withdraw_view.html
+++ b/rowers/templates/withdraw_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% block scripts %}
 {% include "monitorjobs.html" %}
diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html
index 0ed796ce..75bd7179 100644
--- a/rowers/templates/workflow.html
+++ b/rowers/templates/workflow.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 {% load leaflet_tags %}
diff --git a/rowers/templates/workout_comments.html b/rowers/templates/workout_comments.html
index e8fd8630..e802eada 100644
--- a/rowers/templates/workout_comments.html
+++ b/rowers/templates/workout_comments.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 
diff --git a/rowers/templates/workout_data.html b/rowers/templates/workout_data.html
index a5ce5581..94d6a79e 100644
--- a/rowers/templates/workout_data.html
+++ b/rowers/templates/workout_data.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workout Data{% endblock %}
diff --git a/rowers/templates/workout_delete_confirm.html b/rowers/templates/workout_delete_confirm.html
index 348de945..23685d99 100644
--- a/rowers/templates/workout_delete_confirm.html
+++ b/rowers/templates/workout_delete_confirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Change Workout {% endblock %}
diff --git a/rowers/templates/workout_erase_column.html b/rowers/templates/workout_erase_column.html
index 12d13549..0663fd91 100644
--- a/rowers/templates/workout_erase_column.html
+++ b/rowers/templates/workout_erase_column.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workout Data{% endblock %}
diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 51a5a83b..4dddb8b2 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/workout_join_select.html b/rowers/templates/workout_join_select.html
index 73ccca7c..4baa15d5 100644
--- a/rowers/templates/workout_join_select.html
+++ b/rowers/templates/workout_join_select.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
diff --git a/rowers/templates/workout_remove_power_confirm.html b/rowers/templates/workout_remove_power_confirm.html
index a6b3b9e0..5d301c6a 100644
--- a/rowers/templates/workout_remove_power_confirm.html
+++ b/rowers/templates/workout_remove_power_confirm.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Change Workout {% endblock %}
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index e240cb70..bb790ef3 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 
diff --git a/rowers/templates/workoutstats.html b/rowers/templates/workoutstats.html
index 088b6af3..13407497 100644
--- a/rowers/templates/workoutstats.html
+++ b/rowers/templates/workoutstats.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workout Statistics{% endblock %}
diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py
index 795f6060..65aba97e 100644
--- a/rowers/tests/test_aworkouts.py
+++ b/rowers/tests/test_aworkouts.py
@@ -14,6 +14,8 @@ from django.utils.six import BytesIO
 from PIL import Image
 from io import StringIO
 
+import warnings
+warnings.simplefilter("error")
 
 def create_image(storage, filename, size=(100, 100), image_mode='RGB', image_format='PNG'):
    """
@@ -317,13 +319,15 @@ class WorkoutViewTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         form_data = {
-            'xaxis':'distance',
+            'xaxis':'time',
             'yaxis1':'power',
             'yaxis2':'driveenergy',
             'yaxis3':'hr',
-            'yaxis4':'strokedistance'
+            'yaxis4':'spm'
         }
 
+
+
         response = self.c.post(url,form_data)
         self.assertEqual(response.status_code,200)
 
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 6788e61e..13f40ea5 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -3959,6 +3959,8 @@ def workout_flexchart_stacked_view(request,*args,**kwargs):
 
     if request.method == 'POST':
         flexaxesform = StravaChartForm(request,request.POST)
+        if not flexaxesform.is_valid():
+            print(flexaxesform.errors)
         if flexaxesform.is_valid():
             cd = flexaxesform.cleaned_data
             xparam = cd['xaxis']
diff --git a/templates/400.html b/templates/400.html
index 6c1096f1..3927e3f3 100644
--- a/templates/400.html
+++ b/templates/400.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Error {% endblock %}
diff --git a/templates/403.html b/templates/403.html
index 182685d7..0bbdba76 100644
--- a/templates/403.html
+++ b/templates/403.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Error {% endblock %}
diff --git a/templates/404.html b/templates/404.html
index 9e064e10..c5f765c6 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Change Workout {% endblock %}
 
diff --git a/templates/500.html b/templates/500.html
index 6373fba8..855afcb9 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Error {% endblock %}
 
diff --git a/templates/502.html b/templates/502.html
index 2fd17d50..256a7c62 100644
--- a/templates/502.html
+++ b/templates/502.html
@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Error{% endblock %}
 
diff --git a/templates/analysismenu.html b/templates/analysismenu.html
index becf84f7..a2bd239a 100644
--- a/templates/analysismenu.html
+++ b/templates/analysismenu.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 <span class="tooltiptext">Analysis of workouts over a period of time</span>
 <button class="button gray grid_2 small dropbtn">Analysis</button>