diff --git a/alplora/templates/alplora/index.html b/alplora/templates/alplora/index.html
index ae388459..5c76229a 100644
--- a/alplora/templates/alplora/index.html
+++ b/alplora/templates/alplora/index.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n%}
+{% load static i18n%}
 <!DOCTYPE html>
 <html lang={{language}}>
     
diff --git a/alplora/templates/alplora/login.html b/alplora/templates/alplora/login.html
index 2d8d65ec..7e378fdd 100644
--- a/alplora/templates/alplora/login.html
+++ b/alplora/templates/alplora/login.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n%}
+{% load static i18n%}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/cms_templates/djangocms_blog/_header_post_detail.html b/cms_templates/djangocms_blog/_header_post_detail.html
index fb49e5ca..3c2bfcb5 100644
--- a/cms_templates/djangocms_blog/_header_post_detail.html
+++ b/cms_templates/djangocms_blog/_header_post_detail.html
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles %}
+{% load cms_tags static %}
 {% load i18n %}
 <!-- Page Header -->
 <!-- Set your background image for this header on the line below. -->
diff --git a/cms_templates/home_digitalglarus.html b/cms_templates/home_digitalglarus.html
index 0d965dbe..be0aafe7 100644
--- a/cms_templates/home_digitalglarus.html
+++ b/cms_templates/home_digitalglarus.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 
 {% block content %}
 
diff --git a/cms_templates/letscowork.html b/cms_templates/letscowork.html
index 76a5c0d4..8037ea07 100644
--- a/cms_templates/letscowork.html
+++ b/cms_templates/letscowork.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/cms_templates/one_column.html b/cms_templates/one_column.html
index b6d6495a..c6b2af1f 100644
--- a/cms_templates/one_column.html
+++ b/cms_templates/one_column.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}About{% endblock %}
 
 {% block content %}
diff --git a/cms_templates/two_columns.html b/cms_templates/two_columns.html
index 83f30927..44d27e2d 100644
--- a/cms_templates/two_columns.html
+++ b/cms_templates/two_columns.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}About{% endblock %}
 
 {% block content %}
diff --git a/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html b/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html
index b43e97d8..3bb5199b 100644
--- a/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html
+++ b/cmsplugin_filer_folder/templates/cmsplugin_filer_folder/plugins/folder/default.html
@@ -1,4 +1,4 @@
-{% load i18n thumbnail sekizai_tags staticfiles %}
+{% load i18n thumbnail sekizai_tags static %}
 {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'cmsplugin_filer_folder/css/slideshow.css' %}" media="screen, projection" />{% endaddtoblock "css" %}
 {% addtoblock "js" %}<script type="text/javascript" src="{% static 'cmsplugin_filer_folder/js/jquery.cycle.lite-1.7.js' %}"></script>{% endaddtoblock "js" %}
 {% addtoblock "js" %}
diff --git a/datacenterlight/templates/datacenterlight/add_ssh_key.html b/datacenterlight/templates/datacenterlight/add_ssh_key.html
index 44048bad..0eb2ecfa 100644
--- a/datacenterlight/templates/datacenterlight/add_ssh_key.html
+++ b/datacenterlight/templates/datacenterlight/add_ssh_key.html
@@ -1,5 +1,5 @@
 
-{% load staticfiles bootstrap3 i18n custom_tags humanize %}
+{% load static bootstrap3 i18n custom_tags humanize %}
 
 {% block content %}
     {% block userkey_form %}
diff --git a/datacenterlight/templates/datacenterlight/base_hosting.html b/datacenterlight/templates/datacenterlight/base_hosting.html
index e50c4975..000f9c45 100644
--- a/datacenterlight/templates/datacenterlight/base_hosting.html
+++ b/datacenterlight/templates/datacenterlight/base_hosting.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n cms_tags sekizai_tags %}
+{% load static i18n cms_tags sekizai_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
 <!DOCTYPE html>
diff --git a/datacenterlight/templates/datacenterlight/includes/_calculator_form.html b/datacenterlight/templates/datacenterlight/includes/_calculator_form.html
index 2c2b51dd..1b1dad5c 100644
--- a/datacenterlight/templates/datacenterlight/includes/_calculator_form.html
+++ b/datacenterlight/templates/datacenterlight/includes/_calculator_form.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n%}
+{% load static i18n%}
 
 {% if vm_pricing %}
     <script type="application/javascript">
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index 7b036b9e..ee6be2b5 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n custom_tags %}
+{% load static i18n custom_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 <nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
     <!-- Brand and toggle get grouped for better mobile display -->
diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html
index 8e71473e..a499feab 100755
--- a/datacenterlight/templates/datacenterlight/index.html
+++ b/datacenterlight/templates/datacenterlight/index.html
@@ -1,5 +1,5 @@
 {% extends "datacenterlight/base.html" %}
-{% load staticfiles i18n %}
+{% load static i18n %}
 
 {% block content %}
 
diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html
index 66a0e63f..f5bed795 100644
--- a/datacenterlight/templates/datacenterlight/landing_payment.html
+++ b/datacenterlight/templates/datacenterlight/landing_payment.html
@@ -1,5 +1,5 @@
 {% extends "datacenterlight/base_hosting.html" %}
-{% load staticfiles bootstrap3 i18n cms_tags humanize %}
+{% load static bootstrap3 i18n cms_tags humanize %}
 
 {% block css_extra %}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index 1f7a3cda..e0d4d417 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -1,5 +1,5 @@
 {% extends "datacenterlight/base_hosting.html" %}
-{% load staticfiles bootstrap3 i18n custom_tags humanize %}
+{% load static bootstrap3 i18n custom_tags humanize %}
 
 {% block content %}
 <script>
diff --git a/datacenterlight/templates/datacenterlight/whydatacenterlight.html b/datacenterlight/templates/datacenterlight/whydatacenterlight.html
index 2e2402ed..60d56a9d 100644
--- a/datacenterlight/templates/datacenterlight/whydatacenterlight.html
+++ b/datacenterlight/templates/datacenterlight/whydatacenterlight.html
@@ -1,5 +1,5 @@
 {% extends "datacenterlight/base.html" %}
-{% load staticfiles i18n%}
+{% load static i18n%}
 
 {% block content %}
     <!-- Why Data Center Light? -->
diff --git a/digitalglarus/templates/about.html b/digitalglarus/templates/about.html
index a63a58ac..e95c3994 100755
--- a/digitalglarus/templates/about.html
+++ b/digitalglarus/templates/about.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}About{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/base_glarus.html b/digitalglarus/templates/base_glarus.html
index b94c813e..0dcab5ed 100644
--- a/digitalglarus/templates/base_glarus.html
+++ b/digitalglarus/templates/base_glarus.html
@@ -1,6 +1,6 @@
 
 
-{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags %}
+{% load static cms_tags menu_tags sekizai_tags  menu_tags %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/digitalglarus/templates/digitalglarus/about.html b/digitalglarus/templates/digitalglarus/about.html
index a63a58ac..e95c3994 100755
--- a/digitalglarus/templates/digitalglarus/about.html
+++ b/digitalglarus/templates/digitalglarus/about.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}About{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/booking.html b/digitalglarus/templates/digitalglarus/booking.html
index fcac62af..3fd9cd63 100644
--- a/digitalglarus/templates/digitalglarus/booking.html
+++ b/digitalglarus/templates/digitalglarus/booking.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/booking_orders_detail.html b/digitalglarus/templates/digitalglarus/booking_orders_detail.html
index ec740206..d07c9b04 100644
--- a/digitalglarus/templates/digitalglarus/booking_orders_detail.html
+++ b/digitalglarus/templates/digitalglarus/booking_orders_detail.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
   
   <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/booking_orders_list.html b/digitalglarus/templates/digitalglarus/booking_orders_list.html
index a1cb8e39..885b0511 100644
--- a/digitalglarus/templates/digitalglarus/booking_orders_list.html
+++ b/digitalglarus/templates/digitalglarus/booking_orders_list.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
   
 
diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html
index c99fcf9d..c73584a3 100644
--- a/digitalglarus/templates/digitalglarus/booking_payment.html
+++ b/digitalglarus/templates/digitalglarus/booking_payment.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/booking_payment2.html b/digitalglarus/templates/digitalglarus/booking_payment2.html
index f2b7ea5c..3ea84acf 100644
--- a/digitalglarus/templates/digitalglarus/booking_payment2.html
+++ b/digitalglarus/templates/digitalglarus/booking_payment2.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/confirm_reset_password.html b/digitalglarus/templates/digitalglarus/confirm_reset_password.html
index ca3d9948..4e851a01 100644
--- a/digitalglarus/templates/digitalglarus/confirm_reset_password.html
+++ b/digitalglarus/templates/digitalglarus/confirm_reset_password.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/credit_card_edit_confirmation.html b/digitalglarus/templates/digitalglarus/credit_card_edit_confirmation.html
index 75f92d02..ff1e664f 100644
--- a/digitalglarus/templates/digitalglarus/credit_card_edit_confirmation.html
+++ b/digitalglarus/templates/digitalglarus/credit_card_edit_confirmation.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/edit_credit_card.html b/digitalglarus/templates/digitalglarus/edit_credit_card.html
index cac93d64..ff1e504d 100644
--- a/digitalglarus/templates/digitalglarus/edit_credit_card.html
+++ b/digitalglarus/templates/digitalglarus/edit_credit_card.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html
index cd63b871..3c2e1393 100644
--- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html
+++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt
index cd63b871..3c2e1393 100644
--- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt
+++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html
index 1c9f6310..fda74da2 100644
--- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html
+++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt
index 1c9f6310..fda74da2 100644
--- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt
+++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_order_email.html b/digitalglarus/templates/digitalglarus/emails/booking_order_email.html
index 901a6f33..96358a04 100644
--- a/digitalglarus/templates/digitalglarus/emails/booking_order_email.html
+++ b/digitalglarus/templates/digitalglarus/emails/booking_order_email.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt b/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt
index 901a6f33..96358a04 100644
--- a/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt
+++ b/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_charge.html b/digitalglarus/templates/digitalglarus/emails/membership_charge.html
index e5de2491..2d3115fc 100644
--- a/digitalglarus/templates/digitalglarus/emails/membership_charge.html
+++ b/digitalglarus/templates/digitalglarus/emails/membership_charge.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_charge.txt b/digitalglarus/templates/digitalglarus/emails/membership_charge.txt
index e890a8c5..747a5108 100644
--- a/digitalglarus/templates/digitalglarus/emails/membership_charge.txt
+++ b/digitalglarus/templates/digitalglarus/emails/membership_charge.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html b/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html
index a30e93a0..de4e27a2 100644
--- a/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html
+++ b/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.txt b/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.txt
index 4a962c41..61e913c5 100644
--- a/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.txt
+++ b/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/password_reset_email.html b/digitalglarus/templates/digitalglarus/emails/password_reset_email.html
index 1688af72..e1bcd286 100644
--- a/digitalglarus/templates/digitalglarus/emails/password_reset_email.html
+++ b/digitalglarus/templates/digitalglarus/emails/password_reset_email.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt b/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt
index 42562b05..5cd4ce56 100644
--- a/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt
+++ b/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/digitalglarus/templates/digitalglarus/history.html b/digitalglarus/templates/digitalglarus/history.html
index 7e42ce62..51a2b23b 100755
--- a/digitalglarus/templates/digitalglarus/history.html
+++ b/digitalglarus/templates/digitalglarus/history.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html
index 7fa9d290..4e1151b5 100644
--- a/digitalglarus/templates/digitalglarus/index.html
+++ b/digitalglarus/templates/digitalglarus/index.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 
 {% block content %}
 
diff --git a/digitalglarus/templates/digitalglarus/login.html b/digitalglarus/templates/digitalglarus/login.html
index 5a902745..1543b252 100644
--- a/digitalglarus/templates/digitalglarus/login.html
+++ b/digitalglarus/templates/digitalglarus/login.html
@@ -1,6 +1,6 @@
 
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/login_hello.html b/digitalglarus/templates/digitalglarus/login_hello.html
index 1eb49516..76f5972b 100644
--- a/digitalglarus/templates/digitalglarus/login_hello.html
+++ b/digitalglarus/templates/digitalglarus/login_hello.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 
diff --git a/digitalglarus/templates/digitalglarus/membership_activated.html b/digitalglarus/templates/digitalglarus/membership_activated.html
index a63cf2cc..bf68afad 100644
--- a/digitalglarus/templates/digitalglarus/membership_activated.html
+++ b/digitalglarus/templates/digitalglarus/membership_activated.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html
index 89f862d7..6d643869 100644
--- a/digitalglarus/templates/digitalglarus/membership_deactivated.html
+++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated_success.html b/digitalglarus/templates/digitalglarus/membership_deactivated_success.html
index 0156359d..fc46de92 100644
--- a/digitalglarus/templates/digitalglarus/membership_deactivated_success.html
+++ b/digitalglarus/templates/digitalglarus/membership_deactivated_success.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/membership_orders_detail.html b/digitalglarus/templates/digitalglarus/membership_orders_detail.html
index b504c6e0..922a5fd0 100644
--- a/digitalglarus/templates/digitalglarus/membership_orders_detail.html
+++ b/digitalglarus/templates/digitalglarus/membership_orders_detail.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
   
   <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/membership_orders_list.html b/digitalglarus/templates/digitalglarus/membership_orders_list.html
index dd49837d..36aff3ca 100644
--- a/digitalglarus/templates/digitalglarus/membership_orders_list.html
+++ b/digitalglarus/templates/digitalglarus/membership_orders_list.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 <style type="text/css">
 
diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html
index 8a2b79c7..2383f708 100644
--- a/digitalglarus/templates/digitalglarus/membership_payment.html
+++ b/digitalglarus/templates/digitalglarus/membership_payment.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 <style type="text/css">
diff --git a/digitalglarus/templates/digitalglarus/membership_pricing.html b/digitalglarus/templates/digitalglarus/membership_pricing.html
index 28de2bda..a9803a98 100644
--- a/digitalglarus/templates/digitalglarus/membership_pricing.html
+++ b/digitalglarus/templates/digitalglarus/membership_pricing.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/old_index.html b/digitalglarus/templates/digitalglarus/old_index.html
index d7894fb2..3c4640fd 100644
--- a/digitalglarus/templates/digitalglarus/old_index.html
+++ b/digitalglarus/templates/digitalglarus/old_index.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 
 {% block content %}
 <div class="row">
diff --git a/digitalglarus/templates/digitalglarus/reset_password.html b/digitalglarus/templates/digitalglarus/reset_password.html
index 2cd0c2b9..ecde715a 100644
--- a/digitalglarus/templates/digitalglarus/reset_password.html
+++ b/digitalglarus/templates/digitalglarus/reset_password.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/signup.html b/digitalglarus/templates/digitalglarus/signup.html
index fbc8646c..54fc0aa2 100644
--- a/digitalglarus/templates/digitalglarus/signup.html
+++ b/digitalglarus/templates/digitalglarus/signup.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/supportus.html b/digitalglarus/templates/digitalglarus/supportus.html
index 2d5fff64..f54edd44 100644
--- a/digitalglarus/templates/digitalglarus/supportus.html
+++ b/digitalglarus/templates/digitalglarus/supportus.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 
 
 {% block content %}
diff --git a/digitalglarus/templates/digitalglarus/terms.html b/digitalglarus/templates/digitalglarus/terms.html
index dc2c48c3..3ae9bd7e 100755
--- a/digitalglarus/templates/digitalglarus/terms.html
+++ b/digitalglarus/templates/digitalglarus/terms.html
@@ -1,6 +1,6 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
-{% load staticfiles bootstrap3 i18n %}
+{% load static cms_tags bootstrap3%}
+{% load static bootstrap3 i18n %}
 {% block content %}
 <!DOCTYPE html>
 <html lang="en">
diff --git a/digitalglarus/templates/digitalglarus/user_billing_address.html b/digitalglarus/templates/digitalglarus/user_billing_address.html
index b5e86d56..ddfaeea2 100644
--- a/digitalglarus/templates/digitalglarus/user_billing_address.html
+++ b/digitalglarus/templates/digitalglarus/user_billing_address.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
 <style type="text/css">
diff --git a/digitalglarus/templates/index.html b/digitalglarus/templates/index.html
index aeab4f1e..13f63ac0 100644
--- a/digitalglarus/templates/index.html
+++ b/digitalglarus/templates/index.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 
 {% block content %}
 
diff --git a/digitalglarus/templates/letscowork.html b/digitalglarus/templates/letscowork.html
index 56f42cd6..9ea5490a 100644
--- a/digitalglarus/templates/letscowork.html
+++ b/digitalglarus/templates/letscowork.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html
index a932a246..b3f4914f 100644
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@@ -1,5 +1,5 @@
 {% load static %}
-{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags  bootstrap3 %}
+{% load static cms_tags menu_tags sekizai_tags  menu_tags  bootstrap3 %}
 {% load i18n %}
 <!DOCTYPE html>
 <html lang="en">
diff --git a/digitalglarus/templates/new_base_glarus_c.html b/digitalglarus/templates/new_base_glarus_c.html
index 918b27b0..35de5590 100644
--- a/digitalglarus/templates/new_base_glarus_c.html
+++ b/digitalglarus/templates/new_base_glarus_c.html
@@ -1,5 +1,5 @@
 {% load static %}
-{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags  bootstrap3 %}
+{% load static cms_tags menu_tags sekizai_tags  menu_tags  bootstrap3 %}
 {% load i18n %}
 <!DOCTYPE html>
 <html lang="en">
diff --git a/digitalglarus/templates/support.html b/digitalglarus/templates/support.html
index 5ba63ee5..373cd896 100644
--- a/digitalglarus/templates/support.html
+++ b/digitalglarus/templates/support.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load cms_tags %}
 {% block title %}About{% endblock %}
 
diff --git a/digitalglarus/templates/supporters.html b/digitalglarus/templates/supporters.html
index 7d6d6dd7..2c53f11c 100644
--- a/digitalglarus/templates/supporters.html
+++ b/digitalglarus/templates/supporters.html
@@ -1,5 +1,5 @@
 {% extends "base_glarus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load cms_tags %}
 {% block title %}About{% endblock %}
 
diff --git a/hosting/templates/hosting/base.html b/hosting/templates/hosting/base.html
index 681a9c8b..2bf5e8db 100644
--- a/hosting/templates/hosting/base.html
+++ b/hosting/templates/hosting/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 18ed3e26..8022f87e 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n cms_tags sekizai_tags %}
+{% load static i18n cms_tags sekizai_tags %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/hosting/templates/hosting/bill_detail.html b/hosting/templates/hosting/bill_detail.html
index 11472039..4211084d 100644
--- a/hosting/templates/hosting/bill_detail.html
+++ b/hosting/templates/hosting/bill_detail.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 %}
+{% load static bootstrap3 %}
 {% load i18n %}
 {% block content %}
 
diff --git a/hosting/templates/hosting/bill_error.html b/hosting/templates/hosting/bill_error.html
index b9edf86b..d453de48 100644
--- a/hosting/templates/hosting/bill_error.html
+++ b/hosting/templates/hosting/bill_error.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 %}
+{% load static bootstrap3 %}
 {% load i18n %}
 {% block content %}
 
diff --git a/hosting/templates/hosting/bills.html b/hosting/templates/hosting/bills.html
index 770886f6..2f9fe50d 100644
--- a/hosting/templates/hosting/bills.html
+++ b/hosting/templates/hosting/bills.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 %}
+{% load static bootstrap3 %}
 {% load i18n %}
 
 {% block content %}
diff --git a/hosting/templates/hosting/calculator_form.html b/hosting/templates/hosting/calculator_form.html
index 02bb36ea..56b916b7 100644
--- a/hosting/templates/hosting/calculator_form.html
+++ b/hosting/templates/hosting/calculator_form.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n%}
+{% load static i18n%}
 <form id="order_form" method="POST" action="" data-toggle="validator" role="form">
     {% csrf_token %}
     <div class="price">
diff --git a/hosting/templates/hosting/choice_ssh_keys.html b/hosting/templates/hosting/choice_ssh_keys.html
index dbd3150a..abe6245e 100644
--- a/hosting/templates/hosting/choice_ssh_keys.html
+++ b/hosting/templates/hosting/choice_ssh_keys.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 <div>
 	<div class="container virtual-machine-container dashboard-container dashboard-choice-container">
diff --git a/hosting/templates/hosting/confirm_reset_password.html b/hosting/templates/hosting/confirm_reset_password.html
index a3c8d030..0a4a4a49 100644
--- a/hosting/templates/hosting/confirm_reset_password.html
+++ b/hosting/templates/hosting/confirm_reset_password.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block navbar %}
     {% include 'hosting/includes/_navbar_transparent.html' %}
diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html
index 5c4bc3cf..c2266c04 100644
--- a/hosting/templates/hosting/create_virtual_machine.html
+++ b/hosting/templates/hosting/create_virtual_machine.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n cms_tags %}
+{% load static bootstrap3 i18n cms_tags %}
 
 {% block content %}
 
diff --git a/hosting/templates/hosting/dashboard.html b/hosting/templates/hosting/dashboard.html
index 212c5885..ebec43d7 100644
--- a/hosting/templates/hosting/dashboard.html
+++ b/hosting/templates/hosting/dashboard.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block content %}
     <div class="hosting-dashboard">
diff --git a/hosting/templates/hosting/django.html b/hosting/templates/hosting/django.html
index 99ada559..461b3ee7 100644
--- a/hosting/templates/hosting/django.html
+++ b/hosting/templates/hosting/django.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {%block specification %} 
   <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
diff --git a/hosting/templates/hosting/emails/vm_charged.html b/hosting/templates/hosting/emails/vm_charged.html
index 3a6c4f95..e11f6ce8 100644
--- a/hosting/templates/hosting/emails/vm_charged.html
+++ b/hosting/templates/hosting/emails/vm_charged.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/hosting/templates/hosting/emails/vm_charged.txt b/hosting/templates/hosting/emails/vm_charged.txt
index 33568d05..3dc2b608 100644
--- a/hosting/templates/hosting/emails/vm_charged.txt
+++ b/hosting/templates/hosting/emails/vm_charged.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/hosting/templates/hosting/hosting_pricing.html b/hosting/templates/hosting/hosting_pricing.html
index 25a726a0..ffcd575e 100644
--- a/hosting/templates/hosting/hosting_pricing.html
+++ b/hosting/templates/hosting/hosting_pricing.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/hosting/templates/hosting/includes/_header.html b/hosting/templates/hosting/includes/_header.html
index 6f9b4a5c..d4c6a82b 100644
--- a/hosting/templates/hosting/includes/_header.html
+++ b/hosting/templates/hosting/includes/_header.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <a name="about"></a>
 <div class="intro-header">
     <div class="container">
diff --git a/hosting/templates/hosting/includes/_navbar.html b/hosting/templates/hosting/includes/_navbar.html
index aa1fe8a6..ccd7de89 100644
--- a/hosting/templates/hosting/includes/_navbar.html
+++ b/hosting/templates/hosting/includes/_navbar.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 
 <nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html
index bd77eb5c..644543f0 100644
--- a/hosting/templates/hosting/includes/_navbar_user.html
+++ b/hosting/templates/hosting/includes/_navbar_user.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n custom_tags %}
+{% load static i18n custom_tags %}
 
 <!-- Navigation -->
 <nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
diff --git a/hosting/templates/hosting/includes/_our_infrastructure.html b/hosting/templates/hosting/includes/_our_infrastructure.html
index 135d6ba4..69593b77 100644
--- a/hosting/templates/hosting/includes/_our_infrastructure.html
+++ b/hosting/templates/hosting/includes/_our_infrastructure.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 <a name="our"></a>
 <div class="content-section-b">
diff --git a/hosting/templates/hosting/includes/_pricing.html b/hosting/templates/hosting/includes/_pricing.html
index 41a5fcf2..0449b667 100644
--- a/hosting/templates/hosting/includes/_pricing.html
+++ b/hosting/templates/hosting/includes/_pricing.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <a name="price"></a>
 <div class="content-section-b">
   <div class="container-fluid pricing-container">
diff --git a/hosting/templates/hosting/includes/_your_infrastructure.html b/hosting/templates/hosting/includes/_your_infrastructure.html
index e70a6261..5a0d8d45 100644
--- a/hosting/templates/hosting/includes/_your_infrastructure.html
+++ b/hosting/templates/hosting/includes/_your_infrastructure.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 <a name="your"></a>
 <div class="content-section-a" id="own">
diff --git a/hosting/templates/hosting/invoice_detail.html b/hosting/templates/hosting/invoice_detail.html
index e5714b82..4b5539fb 100644
--- a/hosting/templates/hosting/invoice_detail.html
+++ b/hosting/templates/hosting/invoice_detail.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 humanize i18n custom_tags %}
+{% load static bootstrap3 humanize i18n custom_tags %}
 
 
 {% block content %}
diff --git a/hosting/templates/hosting/invoices.html b/hosting/templates/hosting/invoices.html
index 347b1ff4..8e457847 100644
--- a/hosting/templates/hosting/invoices.html
+++ b/hosting/templates/hosting/invoices.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 humanize i18n custom_tags %}
+{% load static bootstrap3 humanize i18n custom_tags %}
 
 {% block content %}
 <div class="dashboard-container">
diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html
index 9545cddb..4c9aa1fa 100644
--- a/hosting/templates/hosting/login.html
+++ b/hosting/templates/hosting/login.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load i18n staticfiles bootstrap3%}
+{% load i18n static bootstrap3%}
 
 {% block navbar %}
     {% include 'hosting/includes/_navbar_transparent.html' %}
diff --git a/hosting/templates/hosting/nodejs.html b/hosting/templates/hosting/nodejs.html
index 8bedf943..43509f25 100644
--- a/hosting/templates/hosting/nodejs.html
+++ b/hosting/templates/hosting/nodejs.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 
 {%block customcss %} 
diff --git a/hosting/templates/hosting/notifications.html b/hosting/templates/hosting/notifications.html
index 835f644b..872e64e0 100644
--- a/hosting/templates/hosting/notifications.html
+++ b/hosting/templates/hosting/notifications.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %} 
 <div>
 	<div class="virtual-machine-container dashboard-container ">
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index dee453d5..76f4c6e2 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 humanize i18n custom_tags %}
+{% load static bootstrap3 humanize i18n custom_tags %}
 
 
 {% block content %}
diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index 96d9e9e3..54f862fc 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 humanize i18n %}
+{% load static bootstrap3 humanize i18n %}
 
 {% block content %}
 <div class="dashboard-container">
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index f0512fdb..bbc1845e 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n humanize %}
+{% load static bootstrap3 i18n humanize %}
 
 {% block css_extra %}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
diff --git a/hosting/templates/hosting/rails.html b/hosting/templates/hosting/rails.html
index cbda1776..d5a974bd 100644
--- a/hosting/templates/hosting/rails.html
+++ b/hosting/templates/hosting/rails.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {%block specification %} 
   <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
diff --git a/hosting/templates/hosting/resend_activation_link.html b/hosting/templates/hosting/resend_activation_link.html
index a0338058..f3dee80b 100644
--- a/hosting/templates/hosting/resend_activation_link.html
+++ b/hosting/templates/hosting/resend_activation_link.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block navbar %}
     {% include 'hosting/includes/_navbar_transparent.html' %}
diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html
index 87cb24e4..7a863038 100644
--- a/hosting/templates/hosting/reset_password.html
+++ b/hosting/templates/hosting/reset_password.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load i18n staticfiles bootstrap3%}
+{% load i18n static bootstrap3%}
 
 {% block navbar %}
     {% include 'hosting/includes/_navbar_transparent.html' %}
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index 5a0b7990..432f9836 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block css_extra %}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
diff --git a/hosting/templates/hosting/signup.html b/hosting/templates/hosting/signup.html
index 59d0957a..1ff6f3f3 100644
--- a/hosting/templates/hosting/signup.html
+++ b/hosting/templates/hosting/signup.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block navbar %}
     {% include 'hosting/includes/_navbar_transparent.html' %}
diff --git a/hosting/templates/hosting/signup_validate.html b/hosting/templates/hosting/signup_validate.html
index 0538cb64..d350c534 100644
--- a/hosting/templates/hosting/signup_validate.html
+++ b/hosting/templates/hosting/signup_validate.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block navbar %}
     {% include  'hosting/includes/_navbar_transparent.html' %}
diff --git a/hosting/templates/hosting/user_key.html b/hosting/templates/hosting/user_key.html
index 247551b5..5bf96ec8 100644
--- a/hosting/templates/hosting/user_key.html
+++ b/hosting/templates/hosting/user_key.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 <div>
 	<div class="virtual-machine-container dashboard-container">
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 8009b23d..e8959c7e 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 <div>
 	<div class="container virtual-machine-container dashboard-container ">
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 6b41af95..b8a8e3af 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 humanize %}
+{% load static bootstrap3 humanize %}
 {% load i18n %}
 
 {% block content %}
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index 467d9d39..99c32755 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -1,5 +1,5 @@
 {% extends "hosting/base_short.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 <div class="dashboard-container">
     <div class="dashboard-container-head">
diff --git a/membership/templates/login.html b/membership/templates/login.html
index 75545873..21fa5715 100644
--- a/membership/templates/login.html
+++ b/membership/templates/login.html
@@ -1,5 +1,5 @@
 {% extends "new_base_glarus.html" %}
-{% load staticfiles cms_tags bootstrap3%}
+{% load static cms_tags bootstrap3%}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/nosystemd/templates/nosystemd/confirm_reset_password.html b/nosystemd/templates/nosystemd/confirm_reset_password.html
index 50eaec05..4d5f2dad 100644
--- a/nosystemd/templates/nosystemd/confirm_reset_password.html
+++ b/nosystemd/templates/nosystemd/confirm_reset_password.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3%}
+{% load static bootstrap3%}
 {% load i18n %}
 
 {% block content %}
diff --git a/nosystemd/templates/nosystemd/donation.html b/nosystemd/templates/nosystemd/donation.html
index fc478aa0..af818185 100644
--- a/nosystemd/templates/nosystemd/donation.html
+++ b/nosystemd/templates/nosystemd/donation.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3 %}
+{% load static bootstrap3 %}
 {% block content %} 
 <!-- Credit card form -->
 
diff --git a/nosystemd/templates/nosystemd/donation_detail.html b/nosystemd/templates/nosystemd/donation_detail.html
index e730e91f..2d3d989e 100644
--- a/nosystemd/templates/nosystemd/donation_detail.html
+++ b/nosystemd/templates/nosystemd/donation_detail.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3 %}
+{% load static bootstrap3 %}
 {% load i18n %}
 {% block content %} 
 
diff --git a/nosystemd/templates/nosystemd/donations.html b/nosystemd/templates/nosystemd/donations.html
index 5091f85a..c979d196 100644
--- a/nosystemd/templates/nosystemd/donations.html
+++ b/nosystemd/templates/nosystemd/donations.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 
 {% block content %}
     <header>
diff --git a/nosystemd/templates/nosystemd/donator_status.html b/nosystemd/templates/nosystemd/donator_status.html
index 6d80f82b..1c8c8d81 100644
--- a/nosystemd/templates/nosystemd/donator_status.html
+++ b/nosystemd/templates/nosystemd/donator_status.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
     <header>
diff --git a/nosystemd/templates/nosystemd/emails/donation_charge.html b/nosystemd/templates/nosystemd/emails/donation_charge.html
index aec55260..2f230755 100644
--- a/nosystemd/templates/nosystemd/emails/donation_charge.html
+++ b/nosystemd/templates/nosystemd/emails/donation_charge.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/nosystemd/templates/nosystemd/emails/donation_charge.txt b/nosystemd/templates/nosystemd/emails/donation_charge.txt
index 6e81f644..c7b0f301 100644
--- a/nosystemd/templates/nosystemd/emails/donation_charge.txt
+++ b/nosystemd/templates/nosystemd/emails/donation_charge.txt
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static from static %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
diff --git a/nosystemd/templates/nosystemd/landing.html b/nosystemd/templates/nosystemd/landing.html
index 2e19af2f..4f3101ff 100755
--- a/nosystemd/templates/nosystemd/landing.html
+++ b/nosystemd/templates/nosystemd/landing.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
     <header>
diff --git a/nosystemd/templates/nosystemd/login.html b/nosystemd/templates/nosystemd/login.html
index 059f261d..875208f7 100644
--- a/nosystemd/templates/nosystemd/login.html
+++ b/nosystemd/templates/nosystemd/login.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3 i18n %}
+{% load static bootstrap3 i18n %}
 {% block content %}
 
     <header>
diff --git a/nosystemd/templates/nosystemd/reset_password.html b/nosystemd/templates/nosystemd/reset_password.html
index abffb2da..bbce8bb5 100644
--- a/nosystemd/templates/nosystemd/reset_password.html
+++ b/nosystemd/templates/nosystemd/reset_password.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3%}
+{% load static bootstrap3%}
 {% load i18n %}
 
 {% block content %}
diff --git a/nosystemd/templates/nosystemd/signup.html b/nosystemd/templates/nosystemd/signup.html
index 870e496b..4fdd8697 100644
--- a/nosystemd/templates/nosystemd/signup.html
+++ b/nosystemd/templates/nosystemd/signup.html
@@ -1,5 +1,5 @@
 {% extends "nosystemd/base.html" %}
-{% load staticfiles bootstrap3%}
+{% load static bootstrap3%}
 {% load i18n %}
 
 {% block content %}
diff --git a/templates/cms/digitalglarus/about.html b/templates/cms/digitalglarus/about.html
index 6c12cbcb..4dfe132d 100755
--- a/templates/cms/digitalglarus/about.html
+++ b/templates/cms/digitalglarus/about.html
@@ -1,5 +1,5 @@
 {% extends "cms/digitalglarus/base.html" %}
-{% load staticfiles cms_tags %}
+{% load static cms_tags %}
 {% block title %}About{% endblock %}
 
 {% block content %}
diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html
index f519501e..a1e1e477 100644
--- a/templates/cms/digitalglarus/base.html
+++ b/templates/cms/digitalglarus/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles cms_tags menu_tags sekizai_tags %}
+{% load static cms_tags menu_tags sekizai_tags %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/templates/cms/digitalglarus/index.html b/templates/cms/digitalglarus/index.html
index 7e7eaff3..861973ad 100644
--- a/templates/cms/digitalglarus/index.html
+++ b/templates/cms/digitalglarus/index.html
@@ -1,5 +1,5 @@
 {% extends "digitalglarus/base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block content %}
 <div class="row">
diff --git a/templates/cms/digitalglarus/letscowork.html b/templates/cms/digitalglarus/letscowork.html
index 518e1224..853f86c3 100644
--- a/templates/cms/digitalglarus/letscowork.html
+++ b/templates/cms/digitalglarus/letscowork.html
@@ -1,5 +1,5 @@
 {% extends "digitalglarus/base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
diff --git a/templates/cms/ungleichch/_header_base.html b/templates/cms/ungleichch/_header_base.html
index 43e535f6..a9e66050 100644
--- a/templates/cms/ungleichch/_header_base.html
+++ b/templates/cms/ungleichch/_header_base.html
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles %}
+{% load cms_tags static %}
 <!-- Page Header -->
 <!-- Set your background image for this header on the line below. -->
 <header class="intro-header"
diff --git a/templates/cms/ungleichch/_menu.html b/templates/cms/ungleichch/_menu.html
index 05acc787..3a6ae389 100644
--- a/templates/cms/ungleichch/_menu.html
+++ b/templates/cms/ungleichch/_menu.html
@@ -1,4 +1,4 @@
-{% load menu_tags staticfiles cms_tags %}
+{% load menu_tags static cms_tags %}
 <!-- Navigation -->
 <nav class="navbar navbar-default navbar-custom navbar-fixed-top">
   <div class="container-fluid">
diff --git a/templates/cms/ungleichch/base.html b/templates/cms/ungleichch/base.html
index 9f366ed4..c8e3ec52 100644
--- a/templates/cms/ungleichch/base.html
+++ b/templates/cms/ungleichch/base.html
@@ -1,4 +1,4 @@
-{% load cms_tags menu_tags sekizai_tags staticfiles bootstrap3 %}
+{% load cms_tags menu_tags sekizai_tags static bootstrap3 %}
 <!doctype html>
 <html>
   <head>
diff --git a/ungleich/templates/cms/ungleichch/_header_base.html b/ungleich/templates/cms/ungleichch/_header_base.html
index fdfb9515..29b72d6e 100644
--- a/ungleich/templates/cms/ungleichch/_header_base.html
+++ b/ungleich/templates/cms/ungleichch/_header_base.html
@@ -1,4 +1,4 @@
-{% load i18n cms_tags staticfiles menu_tags sekizai_tags  %}
+{% load i18n cms_tags static menu_tags sekizai_tags  %}
 <!-- Page Header -->
 <!-- Set your background image for this header on the line below. -->
 <header class="intro-header"
diff --git a/ungleich/templates/cms/ungleichch/_menu.html b/ungleich/templates/cms/ungleichch/_menu.html
index ea217351..3a0595f2 100644
--- a/ungleich/templates/cms/ungleichch/_menu.html
+++ b/ungleich/templates/cms/ungleichch/_menu.html
@@ -1,4 +1,4 @@
-{% load menu_tags staticfiles cms_tags %}
+{% load menu_tags static cms_tags %}
 <!-- Navigation -->
 <nav class="navbar navbar-default navbar-custom navbar-fixed-top">
   <div class="container-fluid">
diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html
index 05432626..d260b8c9 100644
--- a/ungleich/templates/cms/ungleichch/base_ungleich.html
+++ b/ungleich/templates/cms/ungleichch/base_ungleich.html
@@ -1,4 +1,4 @@
-{% load  i18n cms_tags menu_tags sekizai_tags staticfiles bootstrap3 %}
+{% load  i18n cms_tags menu_tags sekizai_tags static bootstrap3 %}
 <!doctype html>
 <html>
   <head>
diff --git a/ungleich_page/templates/ungleich_page/404.html b/ungleich_page/templates/ungleich_page/404.html
index 0af5fa25..ddcdaaa1 100644
--- a/ungleich_page/templates/ungleich_page/404.html
+++ b/ungleich_page/templates/ungleich_page/404.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n %}
+{% load static i18n %}
 <!DOCTYPE html>
 <html lang="en">
 
diff --git a/ungleich_page/templates/ungleich_page/_header_base.html b/ungleich_page/templates/ungleich_page/_header_base.html
index cc80e74b..5674d5ef 100644
--- a/ungleich_page/templates/ungleich_page/_header_base.html
+++ b/ungleich_page/templates/ungleich_page/_header_base.html
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles %}
+{% load cms_tags static %}
 <!-- Page Header -->
 <!-- Set your background image for this header on the line below. -->
 <header class="intro-header" style="background-image: url('{% static 'ungleich_page/img/header-bg.jpg'  %}');">
diff --git a/ungleich_page/templates/ungleich_page/_menu.html b/ungleich_page/templates/ungleich_page/_menu.html
index 05acc787..3a6ae389 100644
--- a/ungleich_page/templates/ungleich_page/_menu.html
+++ b/ungleich_page/templates/ungleich_page/_menu.html
@@ -1,4 +1,4 @@
-{% load menu_tags staticfiles cms_tags %}
+{% load menu_tags static cms_tags %}
 <!-- Navigation -->
 <nav class="navbar navbar-default navbar-custom navbar-fixed-top">
   <div class="container-fluid">
diff --git a/utils/mailer.py b/utils/mailer.py
index ae1d96da..ca25a86f 100644
--- a/utils/mailer.py
+++ b/utils/mailer.py
@@ -1,4 +1,3 @@
-import six
 from django.core.mail import send_mail
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
@@ -45,7 +44,7 @@ class BaseMailer(object):
 
     @slug.setter
     def slug(self, val):
-        assert isinstance(val, six.string_types), "slug is not string: %r" % val
+        assert isinstance(val, str), "slug is not string: %r" % val
         self._slug = val
 
     @property
@@ -59,7 +58,7 @@ class BaseMailer(object):
         assert val.get('subject') and val.get('message'), msg
         self._message, self._subject, self._from = (
             val.get('message'), val.get('subject'), val.get('from'))
-        assert isinstance(self.slug, six.string_types), 'slug not set'
+        assert isinstance(self.slug, str), 'slug not set'
 
     def send_mail(self, to=None):
         if not to: