diff --git a/djangocms_blog/templates/djangocms_blog/base.html b/djangocms_blog/templates/djangocms_blog/base.html
index 233092d..84c4a2b 100644
--- a/djangocms_blog/templates/djangocms_blog/base.html
+++ b/djangocms_blog/templates/djangocms_blog/base.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 
 {% block meta %}
-	{%  if meta %}
-		{% include "meta_mixin/meta.html" %}
-	{% endif %}
+    {%  if meta %}
+        {% include "meta_mixin/meta.html" %}
+    {% endif %}
 {% endblock meta %}
 
 {% block content %}
 <div class="app app-blog span8">
-	{% block content_blog %}{% endblock %}
+    {% block content_blog %}{% endblock %}
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/includes/blog_item.html b/djangocms_blog/templates/djangocms_blog/includes/blog_item.html
index 71605a2..246aa6b 100644
--- a/djangocms_blog/templates/djangocms_blog/includes/blog_item.html
+++ b/djangocms_blog/templates/djangocms_blog/includes/blog_item.html
@@ -4,9 +4,9 @@
 <article id="post-{{ post.slug }}" class="post-item">
     <header>
         <h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
-		{% block blog_meta %}
-			{% include "djangocms_blog/includes/blog_meta.html" %}
-		{% endblock %}
+        {% block blog_meta %}
+            {% include "djangocms_blog/includes/blog_meta.html" %}
+        {% endblock %}
     </header>
     {% if image and post.main_image %}
     <div class="blog-visual">
diff --git a/djangocms_blog/templates/djangocms_blog/plugins/archive.html b/djangocms_blog/templates/djangocms_blog/plugins/archive.html
index c0dc686..70f1a97 100644
--- a/djangocms_blog/templates/djangocms_blog/plugins/archive.html
+++ b/djangocms_blog/templates/djangocms_blog/plugins/archive.html
@@ -2,16 +2,16 @@
 {% load url from future %}{% spaceless %}
 <div class="plugin plugin-blog">
     <h3>{% trans "Archive" %}</h3>
-	{% regroup dates by date.year as years %}
-	{% with current_year=year current_month=month %}
-	<ul class="blog-archive">
-		{% for year in years %}
-		<li{% if year.grouper == current_year %} class="active"{% endif %}>
-			<a href="{% url 'djangocms_blog:posts-archive' year=year.grouper %}">{{ year.grouper }}</a>
-			<ul>
-				{% for month in year.list %}
-				<li{% if year.grouper == current_year and month.date.month == current_month %} class="active"{% else %} class="month"{% endif %}>
-					<a href="{% url 'djangocms_blog:posts-archive' year=year.grouper month=month.date|date:"n" %}">
+    {% regroup dates by date.year as years %}
+    {% with current_year=year current_month=month %}
+    <ul class="blog-archive">
+        {% for year in years %}
+        <li{% if year.grouper == current_year %} class="active"{% endif %}>
+            <a href="{% url 'djangocms_blog:posts-archive' year=year.grouper %}">{{ year.grouper }}</a>
+            <ul>
+                {% for month in year.list %}
+                <li{% if year.grouper == current_year and month.date.month == current_month %} class="active"{% else %} class="month"{% endif %}>
+                    <a href="{% url 'djangocms_blog:posts-archive' year=year.grouper month=month.date|date:"n" %}">
                         {{ month.date|date:"F" }}
                         <span>(
                             {% if month.count > 0 %}
@@ -19,14 +19,14 @@
                             {% else %}{% trans "0 articles" %}{% endif %}
                         )</span>
                     </a>
-				</li>
-				{% endfor %}
-			</ul>
-		</li>
-		{% empty %}
-		<li class="blog-empty"><p>{% trans "No article found." %}</p></li>
-		{% endfor %}
-	</ul>
-	{% endwith %}
+                </li>
+                {% endfor %}
+            </ul>
+        </li>
+        {% empty %}
+        <li class="blog-empty"><p>{% trans "No article found." %}</p></li>
+        {% endfor %}
+    </ul>
+    {% endwith %}
 </div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/plugins/authors.html b/djangocms_blog/templates/djangocms_blog/plugins/authors.html
index 6c9aa66..09276c7 100644
--- a/djangocms_blog/templates/djangocms_blog/plugins/authors.html
+++ b/djangocms_blog/templates/djangocms_blog/plugins/authors.html
@@ -1,19 +1,19 @@
 {% load i18n thumbnail %}{% spaceless %}
 <div class="plugin plugin-blog">
     <h3>{% trans "Authors" %}</h3>
-	<ul class="blog-authors">
-		{% for author in authors_list %}
+    <ul class="blog-authors">
+        {% for author in authors_list %}
         <li><a href="{% url 'djangocms_blog:posts-author' author.get_username %}">
-		    {{ author.get_full_name }}
+            {{ author.get_full_name }}
             <span>(
                 {% if author.count > 0 %}
                 {% blocktrans count articles=author.count %}1 article{% plural %}{{ articles }} articles{% endblocktrans %}
                 {% else %}{% trans "0 articles" %}{% endif %}
             )</span>
         </a></li>
-		{% empty %}
-		<li class="blog-empty"><p>{% trans "No article found." %}</p></li>
-		{% endfor %}
-	</ul>
+        {% empty %}
+        <li class="blog-empty"><p>{% trans "No article found." %}</p></li>
+        {% endfor %}
+    </ul>
 </div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/plugins/categories.html b/djangocms_blog/templates/djangocms_blog/plugins/categories.html
index 9a50bfa..b19c9ca 100644
--- a/djangocms_blog/templates/djangocms_blog/plugins/categories.html
+++ b/djangocms_blog/templates/djangocms_blog/plugins/categories.html
@@ -2,9 +2,9 @@
 {% load url from future %}{% spaceless %}
 <div class="plugin plugin-blog">
     <h3>{% trans "Categories" %}</h3>
-	<ul class="blog-categories">
-		{% for category in categories %}
-		    <li><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">
+    <ul class="blog-categories">
+        {% for category in categories %}
+            <li><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">
                 {{ category.name }}
                 <span>(
                     {% if category.count > 0 %}
@@ -12,9 +12,9 @@
                     {% else %}{% trans "0 articles" %}{% endif %}
                 )</span>
             </a></li>
-		{% empty %}
-		    <li class="blog-empty"><p>{% trans "No categories found." %}</p></li>
-		{% endfor %}
-	</ul>
+        {% empty %}
+            <li class="blog-empty"><p>{% trans "No categories found." %}</p></li>
+        {% endfor %}
+    </ul>
 </div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/plugins/latest_entries.html b/djangocms_blog/templates/djangocms_blog/plugins/latest_entries.html
index fd700a1..726aa1d 100644
--- a/djangocms_blog/templates/djangocms_blog/plugins/latest_entries.html
+++ b/djangocms_blog/templates/djangocms_blog/plugins/latest_entries.html
@@ -1,11 +1,11 @@
 {% load i18n %}{% spaceless %}
 <div class="plugin plugin-blog">
-	<div class="blog-latest-entries">
+    <div class="blog-latest-entries">
     {% for post in posts_list %}
-    	{% include "djangocms_blog/includes/blog_item.html" with post=post TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
-	{% empty %}
-	<p class="blog-empty">{% trans "No article found." %}</p>
+        {% include "djangocms_blog/includes/blog_item.html" with post=post TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+    {% empty %}
+    <p class="blog-empty">{% trans "No article found." %}</p>
     {% endfor %}
-	</div>
+    </div>
 </div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/plugins/tags.html b/djangocms_blog/templates/djangocms_blog/plugins/tags.html
index d45adb4..8098859 100644
--- a/djangocms_blog/templates/djangocms_blog/plugins/tags.html
+++ b/djangocms_blog/templates/djangocms_blog/plugins/tags.html
@@ -2,9 +2,9 @@
 {% load url from future %}{% spaceless %}
 <div class="plugin plugin-blog">
     <h3>{% trans "Tags" %}</h3>
-	<ul class="blog-tags">
-		{% for tag in tags %}
-		    <li><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag-{{ tag.count }}">
+    <ul class="blog-tags">
+        {% for tag in tags %}
+            <li><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag-{{ tag.count }}">
                 {{ tag.name }}
                 <span>(
                     {% if tag.count > 0 %}
@@ -12,9 +12,9 @@
                     {% else %}{% trans "0 articles" %}{% endif %}
                 )</span>
             </a></li>
-		{% empty %}
-		<li class="blog-empty"><p>{% trans "No article found." %}</p></li>
-		{% endfor %}
-	</ul>
+        {% empty %}
+        <li class="blog-empty"><p>{% trans "No article found." %}</p></li>
+        {% endfor %}
+    </ul>
 </div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/post_detail.html b/djangocms_blog/templates/djangocms_blog/post_detail.html
index affa872..a8378c0 100644
--- a/djangocms_blog/templates/djangocms_blog/post_detail.html
+++ b/djangocms_blog/templates/djangocms_blog/post_detail.html
@@ -11,9 +11,9 @@
 <article id="post-{{ post.slug }}" class="post-item post-detail">
     <header>
         <h2>{% render_model post "title" %}</h2>
-		{% block blog_meta %}
-			{% include "djangocms_blog/includes/blog_meta.html" %}
-		{% endblock %}
+        {% block blog_meta %}
+            {% include "djangocms_blog/includes/blog_meta.html" %}
+        {% endblock %}
     </header>
     {% if post.main_image_id %}
     <div class="blog-visual">
@@ -22,10 +22,10 @@
     </div>
     {% endif %}
     {% endspaceless %}
-	{% if use_placeholder %}
-		<div class="blog-content">{% render_placeholder post.content %}</div>
-	{% else %}
-		<div class="blog-content">{% render_model post "post_text" "post_text" %}</div>
-	{% endif %}
+    {% if use_placeholder %}
+        <div class="blog-content">{% render_placeholder post.content %}</div>
+    {% else %}
+        <div class="blog-content">{% render_model post "post_text" "post_text" %}</div>
+    {% endif %}
 </article>
 {% endblock content_blog %}
diff --git a/djangocms_blog/templates/djangocms_blog/post_list.html b/djangocms_blog/templates/djangocms_blog/post_list.html
index 302a548..9af3416 100644
--- a/djangocms_blog/templates/djangocms_blog/post_list.html
+++ b/djangocms_blog/templates/djangocms_blog/post_list.html
@@ -8,7 +8,7 @@
     {% block blog_title %}
     <header>
         <h2>
-		{% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
+        {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
         {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
         {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
         {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
@@ -16,13 +16,13 @@
     </header>
     {% endblock %}
     {% for post in post_list %}
-    	{% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
-	{% empty %}
-	<p class="blog-empty">{% trans "No article found." %}</p>
+        {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+    {% empty %}
+    <p class="blog-empty">{% trans "No article found." %}</p>
     {% endfor %}
-	{% if author or archive_date or tagged_entries %}
-	<p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>
-	{% endif %}
+    {% if author or archive_date or tagged_entries %}
+    <p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>
+    {% endif %}
     {% if is_paginated %}
     <nav class="{% firstof css_grid instance.css_grid %} pagination">
         {% if page_obj.has_previous %}