diff --git a/RIGS/templates/RIGS/event_embed.html b/RIGS/templates/RIGS/event_embed.html
index a6e3e586..be5af812 100644
--- a/RIGS/templates/RIGS/event_embed.html
+++ b/RIGS/templates/RIGS/event_embed.html
@@ -1,12 +1,11 @@
 {% extends 'base_embed.html' %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block content %}
-
 <div class="row">
     <div class="col-sm-12">
         <a href="/">
-            <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span> 
+            <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
         </a>
     </div>
 
@@ -20,7 +19,7 @@
                 <span class="glyphicon glyphicon-exclamation-sign"></span>
             {% endif %}
         </span>
-        
+
         <h3>
             <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}"{% endif %}>
                 {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
@@ -72,7 +71,6 @@
                 </p>
             </div>
             <div class="col-xs-6">
-                
                 {% if object.meet_at %}
                     <p>
                         <strong>Crew meet:</strong>
@@ -97,10 +95,7 @@
             {{ object.description|linebreaksbr }}
             </p>
         {% endif %}
-            
         </table>
     </div>
 </div>
-
-
 {% endblock %}
diff --git a/assets/templates/asset_embed.html b/assets/templates/asset_embed.html
index c4a40187..2d98a541 100644
--- a/assets/templates/asset_embed.html
+++ b/assets/templates/asset_embed.html
@@ -1,8 +1,7 @@
 {% extends 'base_embed.html' %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block content %}
-
 <div class="row">
     <div class="col-sm-12">
         <a href="/assets">
@@ -35,6 +34,4 @@
         </table>
     </div>
 </div>
-
-
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index c5aae95e..39cf5e58 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,6 @@
 {% load static %}
 {% load raven %}
 
-
 <!DOCTYPE html>
 <html
         dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}"
diff --git a/templates/base_client.html b/templates/base_client.html
index 824e9f88..08a2e0ad 100644
--- a/templates/base_client.html
+++ b/templates/base_client.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 {% load raven %}
 
 
diff --git a/templates/base_client_email.html b/templates/base_client_email.html
index f6f5e255..cabe7985 100644
--- a/templates/base_client_email.html
+++ b/templates/base_client_email.html
@@ -1,17 +1,14 @@
-{% load static from staticfiles %}
+{% load static %}
 {% load raven %}
 
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width">
   </head>
 
   <body>
-
     <table class="main-table">
         <tr class="client-header">
           <td align="center">
@@ -32,7 +29,7 @@
             <!--[if mso]>
              </td></tr></table>
              </center>
-            <![endif]--> 
+            <![endif]-->
           </td>
         </tr>
         <tr>
@@ -47,12 +44,9 @@
                 <!--[if mso]>
                  </td></tr></table>
                  </center>
-                <![endif]--> 
+                <![endif]-->
             </td>
         </tr>
     </table>
-
-    
-
   </body>
 </html>
