diff --git a/mayan/apps/main/templates/about.html b/mayan/apps/main/templates/about.html
index 0d1e3ace7f..4968571ec0 100644
--- a/mayan/apps/main/templates/about.html
+++ b/mayan/apps/main/templates/about.html
@@ -1,20 +1,23 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
+
 {% load i18n %}
+
 {% load project_tags %}
 {% load version_tags %}
-{% block title %} :: {% trans "About this program" %}{% endblock %}
+
+{% block title %} :: {% trans 'About this program' %}{% endblock %}
 {% block content %}
 
     <div class="content tc">
-        <h3>{% project_name %} ({% trans "Version" %} {% app_version "mayan" %})</h3>
+        <h3>{% project_name %} ({% trans 'Version' %} {% app_version 'mayan' %})</h3>
     </div>
-    {% include "project_description.html" %}
+    {% include 'project_description.html' %}
 
 {% endblock %}
 {% block footer %}
     <div id="footer">
         <div class="block">
-            <p>Copyright &copy; 2011 Roberto Rosario.</p>
+            <p>{% trans 'Copyright &copy; 2011 Roberto Rosario.' %}</p>
         </div>
     </div>
 {% endblock %}
diff --git a/mayan/apps/main/templates/base.html b/mayan/apps/main/templates/base.html
index 91a10c831a..cbf6e50402 100644
--- a/mayan/apps/main/templates/base.html
+++ b/mayan/apps/main/templates/base.html
@@ -1,5 +1,7 @@
-{% extends "web_theme_base.html" %}
+{% extends 'web_theme_base.html' %}
+
 {% load i18n %}
+
 {% load project_tags %}
 {% load navigation_tags %}
 {% load settings %}
@@ -17,7 +19,7 @@
             <META HTTP-EQUIV="refresh" CONTENT="{{ new_window_url_timeout|default:'2' }};{{ new_window_url|safe }}">
         </noscript>
     {% endif %}
-    
+
     {% if html_redirect %}
         <META HTTP-EQUIV="refresh" CONTENT="{{ html_redirect_timeout|default:'2' }};{{ html_redirect|safe }}">
     {% endif %}
@@ -32,16 +34,16 @@
     <link rel="stylesheet" href="{{ STATIC_URL }}css/960-fluid.css" type="text/css" media="screen" />
     <link rel="stylesheet" href="{{ STATIC_URL }}css/override.css" type="text/css" media="screen" />
     <link rel="stylesheet" href="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-    <style type="text/css"> 
-        #fancybox-left-ico { 
-         left: 20px; 
-        } 
+    <style type="text/css">
+        #fancybox-left-ico {
+         left: 20px;
+        }
+
+        #fancybox-right-ico {
+         right: 20px;
+         left: auto;
+        }
 
-        #fancybox-right-ico { 
-         right: 20px; 
-         left: auto; 
-        } 
-        
         .tags {
             margin: 0;
             padding: 0;
@@ -49,7 +51,7 @@
             bottom: -12px;
             list-style: none;
         }
-        
+
         .tags li {
             float:left;
             height: 18px;
@@ -62,30 +64,30 @@
             color: black;
             text-decoration: none;
             -moz-border-radius-bottomright: 4px;
-            -webkit-border-bottom-right-radius: 4px;	
+            -webkit-border-bottom-right-radius: 4px;
             border-bottom-right-radius: 4px;
             -moz-border-radius-topright: 4px;
-            -webkit-border-top-right-radius: 4px;	
-            border-top-right-radius: 4px;	
+            -webkit-border-top-right-radius: 4px;
+            border-top-right-radius: 4px;
 
-            border-top-left-radius: 12px;	
+            border-top-left-radius: 12px;
             -moz-border-radius-topleft: 12px;
             -webkit-border-top-left-radius: 12px;
 
             border-bottom-left-radius: 12px;
             -moz-border-radius-bottomleft: 12px;
-            -webkit-border-bottom-left-radius: 12px;	
+            -webkit-border-bottom-left-radius: 12px;
 
             /*border:1px solid #ccc;*/
             border: 1px solid rgba(0, 0, 0, 0.4);
             -moz-box-shadow: 1px 1px 2px #888;
             -webkit-box-shadow: 1px 1px 2px #888;
             box-shadow: 1px 1px 2px #888;
-            
+
             text-shadow: 0 0 10px #fff, 0 0 20px #fff, 0 0 30px #fff, 0 0 40px #fff, 0 0 70px #fff, 0 0 80px #fff, 0 0 100px #fff, 0 0 150px #fff;
             margin-bottom: 2px;
         }
-            
+
         .tags li:after {
             content: "";
             position: absolute;
@@ -101,12 +103,12 @@
             -moz-box-shadow: -1px -1px 2px #004977;
             -webkit-box-shadow: -1px -1px 2px #004977;
             box-shadow: -1px -1px 2px #004977;
-        }		
-        
+        }
+
         .thin_border {
             border: 1px solid black;
         }
-    </style> 
+    </style>
     {% block stylesheets %}{% endblock %}
 {% endblock %}
 
@@ -128,7 +130,7 @@
                 $(':submit', this).click(function() {
                     return false;
                 });
-            });        
+            });
 
             $("a.fancybox").fancybox({
             'titleShow'     : false,
@@ -149,7 +151,7 @@
             'type'          : 'image',
             'autoScale'     : true
             });
-            
+
             $("a.fancybox-noscaling").fancybox({
             'titleShow'     : false,
             'transitionIn'  : 'elastic',
@@ -159,7 +161,7 @@
             'type'          : 'image',
             'autoScale'     : false
             });
-            
+
             $("a.fancybox-iframe").fancybox({
                 'titleShow'     : false,
                 'transitionIn'  : 'elastic',
@@ -172,7 +174,7 @@
                 'height'        : '99%',
                 'showNavArrows' : false,
                 'margin'        : 20
-            });    
+            });
             $('.scrollable').scrollview();
             $('.full-height').height($(window).height() - 210);
             $('.no-parent-history', this).click(function() {
@@ -208,7 +210,7 @@
                         <option value="{{ lang.0 }}" {% if lang.0 == LANGUAGE_CODE %}selected="selected"{% endif %}>{{ lang.0|language_name_local|capfirst }}</option>
                     {% endfor %}
                 </select>
-            </form>                                
+            </form>
         </li>
     {% endif %}
     {% get_setting "LOGIN_URL" as login_url %}
@@ -250,7 +252,7 @@
                                 {% endwith %}
                                 {% endwith %}
                         </ul>
-                    </div>    
+                    </div>
                 {% endif %}
         {% endfor %}
     {% else %}
@@ -270,7 +272,7 @@
                             {% endwith %}
                             {% endwith %}
                     </ul>
-                </div>    
+                </div>
             {% endif %}
     {% endif %}
 {% endblock %}
@@ -288,7 +290,7 @@
         {% endwith %}
         {% endwith %}
     {% endif %}
-    
+
     {% get_object_navigation_links "secondary_menu" as object_navigation_links %}
         {% if object_navigation_links %}
         <div class="block">
@@ -321,7 +323,7 @@
                         {% endwith %}
                     </ul>
                 </div>
-            {% endif %}       
+            {% endif %}
             {% get_object_navigation_links "related" as object_navigation_links %}
                 {% if object_navigation_links %}
                 <div class="block">
@@ -332,7 +334,7 @@
                         {% endwith %}
                     </ul>
                 </div>
-            {% endif %}    
+            {% endif %}
             {% get_object_navigation_links "sidebar" as object_navigation_links %}
             {% if object_navigation_links %}
             <div class="block">
@@ -375,7 +377,7 @@
                     {% endwith %}
                 </ul>
             </div>
-        {% endif %}    
+        {% endif %}
     {% endif %}
 
     {% get_object_navigation_links "sidebar" as object_navigation_links %}
@@ -388,7 +390,7 @@
                 {% endwith %}
             </ul>
         </div>
-    {% endif %}        
+    {% endif %}
 
     {% get_sidebar_templates as sidebar_templates %}
     {% for template in sidebar_templates %}
diff --git a/mayan/apps/main/templates/diagnostics.html b/mayan/apps/main/templates/diagnostics.html
index c5db65a7da..fea22e33cc 100644
--- a/mayan/apps/main/templates/diagnostics.html
+++ b/mayan/apps/main/templates/diagnostics.html
@@ -1,22 +1,22 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
 
 {% block title %} :: {{ title|capfirst }}{% endblock %}
 
 {% block content %}
     {% for key, value in blocks.items %}
-        <div class="content">    
+        <div class="content">
         <h2 class="title">{{ value.title|capfirst }}</h2>
         <div class="inner">
         <p>
             <ul class="undecorated_list">
                 {% with value.links as object_navigation_links %}
                 {% with 'true' as as_li %}
-                    {% include "generic_navigation.html" %}
+                    {% include 'generic_navigation.html' %}
                 {% endwith %}
                 {% endwith %}
             </ul>
         </p>
-        
+
         </div></div>
     {% endfor %}
 {% endblock %}
diff --git a/mayan/apps/main/templates/home.html b/mayan/apps/main/templates/home.html
index 095ed73001..72edafd7bf 100644
--- a/mayan/apps/main/templates/home.html
+++ b/mayan/apps/main/templates/home.html
@@ -1,6 +1,9 @@
-{% extends "base.html" %}
-{% load project_tags %}
+{% extends 'base.html' %}
+
 {% load i18n %}
+
+{% load project_tags %}
+
 {% block content %}
     <div class="content tc">
         <h1>{% project_name %}</h1>
@@ -11,7 +14,7 @@
 {% block footer %}
     <div id="footer">
         <div class="block">
-            <p>Copyright &copy; 2011 Roberto Rosario.</p>
+            <p>{% trans 'Copyright &copy; 2011 Roberto Rosario.' %}</p>
         </div>
     </div>
 {% endblock %}
diff --git a/mayan/apps/main/templates/project_description.html b/mayan/apps/main/templates/project_description.html
index beefd73b9a..b36a1667e4 100644
--- a/mayan/apps/main/templates/project_description.html
+++ b/mayan/apps/main/templates/project_description.html
@@ -1,9 +1,10 @@
 {% load i18n %}
+
 <link rel="stylesheet" href="{{ STATIC_URL }}css/override.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{ STATIC_URL }}css/famfamfam-silk-sprite.css" type="text/css" media="screen" />
-    
+
 <p class="tc">
-    {% trans "Open source, Django based electronic document manager with custom metadata, indexing, tagging, file serving integration, digital signature support and OCR capabilities" %}
+    {% trans 'Open source, Django based electronic document manager with custom metadata, indexing, tagging, file serving integration, digital signature support and OCR capabilities' %}
 </p>
 <p class="tc">
     <span class="famfam active famfam-world_go"></span><a href="http://www.mayan-edms.com">http://www.mayan-edms.com</a>
@@ -18,7 +19,7 @@
     <span class="famfam active famfam-bug"></span><a href="https://github.com/mayan-edms/mayan-edms/issues">https://github.com/mayan-edms/mayan-edms/issues</a>
 </p>
 <p class="tc">
-    {% trans "Released under the GPL V3 License" %}
+    {% trans 'Released under the GPL V3 License' %}
 </p>
 <div class="tc">
     <img src="{{ STATIC_URL }}images/mayan_logo_landscape_rough.png"/>
diff --git a/mayan/apps/main/templates/statistics.html b/mayan/apps/main/templates/statistics.html
index 325b394ccf..66d1d55f3e 100644
--- a/mayan/apps/main/templates/statistics.html
+++ b/mayan/apps/main/templates/statistics.html
@@ -1,11 +1,12 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
+
 {% block title %} :: {{ title|capfirst }}{% endblock %}
 
 {% block content %}
     {% for block in blocks %}
         {% with block.title as title %}
         {% with block.paragraphs as paragraphs %}
-            {% include "generic_subtemplate.html" %}
+            {% include 'generic_subtemplate.html' %}
         {% endwith %}
         {% endwith %}
     {% endfor %}
diff --git a/mayan/apps/main/templates/tools.html b/mayan/apps/main/templates/tools.html
index 876fb77dcd..888cbdca87 100644
--- a/mayan/apps/main/templates/tools.html
+++ b/mayan/apps/main/templates/tools.html
@@ -1,22 +1,22 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
 
 {% block title %} :: {{ title|capfirst }}{% endblock %}
 
 {% block content %}
     {% for key, value in blocks.items %}
-        <div class="content">    
+        <div class="content">
         <h2 class="title">{{ value.title|capfirst }}</h2>
         <div class="inner">
         <p>
             <ul class="undecorated_list">
                 {% for link in value.links %}
                     <li>
-                        {% include "generic_subnavigation.html" %}{% if link.description %} - {{ link.description }}{% endif %}
+                        {% include 'generic_subnavigation.html' %}{% if link.description %} - {{ link.description }}{% endif %}
                     </li>
                 {% endfor %}
             </ul>
         </p>
-        
+
         </div></div>
     {% endfor %}
 {% endblock %}
diff --git a/mayan/apps/main/templates/verbose_login.html b/mayan/apps/main/templates/verbose_login.html
index 5b7b262dee..e40005aef5 100644
--- a/mayan/apps/main/templates/verbose_login.html
+++ b/mayan/apps/main/templates/verbose_login.html
@@ -1,9 +1,10 @@
 {% load i18n %}
+
 {% load version_tags %}
 
-<p>{% trans "Version" %} {% app_version "main" %}</p>
+<p>{% trans 'Version' %} {% app_version 'mayan' %}</p>
 
-<p>Copyright &copy; 2011, 2012 Roberto Rosario.</p>
+<p>{% trans 'Copyright &copy; 2011 Roberto Rosario.' %}</p>
 
-{% include "project_description.html" %}
+{% include 'project_description.html' %}