diff --git a/euscanwww/templates/_base.html b/euscanwww/templates/_base.html
index 22f9220..635aad3 100644
--- a/euscanwww/templates/_base.html
+++ b/euscanwww/templates/_base.html
@@ -15,7 +15,7 @@
   <body>
     <div id="header">
       <a href="http://www.gentoo.org">
-	<img id="logo" src="{{ STATIC_URL }}img/gentoo_org.png" />
+        <img id="logo" src="{{ STATIC_URL }}img/gentoo_org.png" />
       </a>
       {% block header %}<h1>Ebuild Upstream Scanner (euscan)</h1>{% endblock %}
     </div>
@@ -24,44 +24,44 @@
     </div>
     <div id="menus">
       {% block menus %}
-      <div class="menu">
-	<ul>
-	  {% block menu %}
-	  <li><a href="{% url djeuscan.views.index %}">Home</a></li>
-	  <li><a href="{% url djeuscan.views.categories %}">Categories</a></li>
-	  <li><a href="{% url djeuscan.views.herds %}">Herds</a></li>
-	  <li><a href="{% url djeuscan.views.maintainers %}">Maintainers</a></li>
-	  <li><a href="{% url djeuscan.views.overlays %}">Overlays</a></li>
-	  <li><a href="{% url djeuscan.views.world %}">Scan World</a></li>
-	  <li><a href="{% url djeuscan.views.statistics %}">Statistics</a></li>
-	  <!--
-	  <li>---</li>
-	  <li><a href="#">Login</a></li>
-	  <li><a href="#">Register</a></li>
-	  -->
-	  <li>---</li>
-	  {% block menu_feed %}
-	  <li>
-	    <img src="{{ STATIC_URL }}img/feed.png" alt="feed" />
-	    <a title="Global Feed" href="{% url global_feed %}">Global Feed</a>
-	  </li>
-	  {% endblock %}
-	  <li>---</li>
-	  <li><a href="{% url djeuscan.views.api %}">API</a></li>
-	  <li><a href="{% url djeuscan.views.about %}">About</a></li>
-	  {% endblock %}
-	</ul>
-      </div>
+        <div class="menu">
+          <ul>
+            {% block menu %}
+              <li><a href="{% url djeuscan.views.index %}">Home</a></li>
+              <li><a href="{% url djeuscan.views.categories %}">Categories</a></li>
+              <li><a href="{% url djeuscan.views.herds %}">Herds</a></li>
+              <li><a href="{% url djeuscan.views.maintainers %}">Maintainers</a></li>
+              <li><a href="{% url djeuscan.views.overlays %}">Overlays</a></li>
+              <li><a href="{% url djeuscan.views.world %}">Scan World</a></li>
+              <li><a href="{% url djeuscan.views.statistics %}">Statistics</a></li>
+              <!--
+              <li>---</li>
+              <li><a href="#">Login</a></li>
+              <li><a href="#">Register</a></li>
+              -->
+              <li>---</li>
+              {% block menu_feed %}
+                <li>
+                  <img src="{{ STATIC_URL }}img/feed.png" alt="feed" />
+                  <a title="Global Feed" href="{% url global_feed %}">Global Feed</a>
+                </li>
+              {% endblock %}
+              <li>---</li>
+              <li><a href="{% url djeuscan.views.api %}">API</a></li>
+              <li><a href="{% url djeuscan.views.about %}">About</a></li>
+            {% endblock %}
+          </ul>
+        </div>
       {% endblock %}
     </div>
     <div id="footer">
       <p>
-	Questions, Comments, Corrections ?
-	Email: corentin.chary at gmail.com<br />
-	Copyright (C) 2011 <strong>Corentin Chary</strong><br />
-	Original Gentoo artwork and logos copyright (C) Gentoo Foundation.<br />
-	Design inspired by (stolen from) gentoo.org and bugs.gentoo.org.<br />
-	<em>This site is not an official Gentoo website.</em>
+        Questions, Comments, Corrections ?
+        Email: corentin.chary at gmail.com<br />
+        Copyright (C) 2011 <strong>Corentin Chary</strong><br />
+        Original Gentoo artwork and logos copyright (C) Gentoo Foundation.<br />
+        Design inspired by (stolen from) gentoo.org and bugs.gentoo.org.<br />
+        <em>This site is not an official Gentoo website.</em>
       </p>
     </div>
   </body>
diff --git a/euscanwww/templates/euscan/_packages.html b/euscanwww/templates/euscan/_packages.html
index 68e5115..c39d11c 100644
--- a/euscanwww/templates/euscan/_packages.html
+++ b/euscanwww/templates/euscan/_packages.html
@@ -19,7 +19,7 @@
   <tr>
     <td>
       <a href="{% url djeuscan.views.package package.category package.name %}">
-	{{ package.category }}/{{ package.name }}
+        {{ package.category }}/{{ package.name }}
       </a>
       {% package_bar package %}
     </td>
diff --git a/euscanwww/templates/euscan/category.html b/euscanwww/templates/euscan/category.html
index 6bd887a..66e034d 100644
--- a/euscanwww/templates/euscan/category.html
+++ b/euscanwww/templates/euscan/category.html
@@ -47,7 +47,7 @@
     <dd><img src="{% url djeuscan.views.chart_category category 'versions-monthly-small' %}" /></dd>
     <dt>Packages</dt>
     <dd><img src="{% url djeuscan.views.chart_category category 'packages-monthly-small' %}" /></dd>
-    </dl>
+  </dl>
 </div>
 
 {% endblock %}
diff --git a/euscanwww/templates/euscan/herd.html b/euscanwww/templates/euscan/herd.html
index 38598fc..98e9951 100644
--- a/euscanwww/templates/euscan/herd.html
+++ b/euscanwww/templates/euscan/herd.html
@@ -45,7 +45,7 @@
     <dd><img src="{% url djeuscan.views.chart_herd herd.herd 'versions-monthly-small' %}" /></dd>
     <dt>Packages</dt>
     <dd><img src="{% url djeuscan.views.chart_herd herd.herd 'packages-monthly-small' %}" /></dd>
-    </dl>
+  </dl>
 </div>
 
 {% endblock %}
diff --git a/euscanwww/templates/euscan/maintainer.html b/euscanwww/templates/euscan/maintainer.html
index a8803ab..dfa38b0 100644
--- a/euscanwww/templates/euscan/maintainer.html
+++ b/euscanwww/templates/euscan/maintainer.html
@@ -45,7 +45,7 @@
     <dd><img src="{% url djeuscan.views.chart_maintainer maintainer.id 'versions-monthly-small' %}" /></dd>
     <dt>Packages</dt>
     <dd><img src="{% url djeuscan.views.chart_maintainer maintainer.id 'packages-monthly-small' %}" /></dd>
-    </dl>
+  </dl>
 </div>
 
 {% endblock %}
diff --git a/euscanwww/templates/euscan/maintainers.html b/euscanwww/templates/euscan/maintainers.html
index b0c833e..443950b 100644
--- a/euscanwww/templates/euscan/maintainers.html
+++ b/euscanwww/templates/euscan/maintainers.html
@@ -24,11 +24,11 @@
   <tr>
     <td>
       <a href="{% url djeuscan.views.maintainer maintainer.maintainers__id %}">
-	{% if maintainer.maintainers__name != maintainer.maintainers__email %}
-	{{ maintainer.maintainers__name }} &lt;{{ maintainer.maintainers__email }}&gt;
-	{% else %}
-	{{ maintainer.maintainers__name }}
-	{% endif %}
+        {% if maintainer.maintainers__name != maintainer.maintainers__email %}
+          {{ maintainer.maintainers__name }} &lt;{{ maintainer.maintainers__email }}&gt;
+        {% else %}
+          {{ maintainer.maintainers__name }}
+        {% endif %}
       </a>
       {% package_bar maintainer %}
     </td>
diff --git a/euscanwww/templates/euscan/package.html b/euscanwww/templates/euscan/package.html
index eafab82..819f143 100644
--- a/euscanwww/templates/euscan/package.html
+++ b/euscanwww/templates/euscan/package.html
@@ -51,7 +51,7 @@
     {% for maintainer in package.maintainers.all %}
       {% if maintainer.name != maintainer.email %}
        <a href="{% url djeuscan.views.maintainer maintainer.id %}">
-	 {{ maintainer.name }}
+         {{ maintainer.name }}
        </a>
        &lt;{{ maintainer.email }}&gt;
       {% else %}
@@ -68,12 +68,12 @@
     <ul>
       {% for version in packaged %}
       <li id="{{ version.version }}-{{version.revision }}:{{ version.slot }}-[{{ version.overlay }}]">
-	{% if version.overlay == "gentoo" %}
-	<img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="In Gentoo" />
-	{% else %}
-	<img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="In Overlays" />
-	{% endif %}
-	{{ version.version }}-{{ version.revision }} :{{ version.slot }} [{{ version.overlay }}]
+        {% if version.overlay == "gentoo" %}
+          <img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="In Gentoo" />
+        {% else %}
+          <img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="In Overlays" />
+        {% endif %}
+        {{ version.version }}-{{ version.revision }} :{{ version.slot }} [{{ version.overlay }}]
       </li>
       {% endfor %}
     </ul>
@@ -85,8 +85,8 @@
     <ul>
       {% for version in upstream %}
       <li>
-	<img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Upstream" />
-	{{ version.version }} - {{ version.urls }}
+        <img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Upstream" />
+        {{ version.version }} - {{ version.urls }}
       </li>
       {% endfor %}
      </ul>
@@ -101,14 +101,16 @@
       {% else %}
       <li class="removed">
       {% endif %}
-	{% if version.overlay == "gentoo" %}
-	<img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="In Gentoo" />
-	{% else %}{% if version.overlay %}
-	<img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="In Overlays" />
-	{% else %}
-	<img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Upstream" />
-	{% endif %}{% endif %}
-	{{ version }} - {{ version.datetime }}
+        {% if version.overlay == "gentoo" %}
+          <img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="In Gentoo" />
+        {% elif version.overlay %}
+          <img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="In Overlays" />
+        {% else %}
+          <img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Upstream" />
+        {% endif %}
+
+        {{ version }} - {{ version.datetime }}
+
       </li>
       {% endfor %}
     </ul>
