diff --git a/priv/skel/blog/templates/_article_chapeau.tpl b/priv/skel/blog/templates/_article_chapeau.tpl
index feaf4eb275..d8bbb7a639 100644
--- a/priv/skel/blog/templates/_article_chapeau.tpl
+++ b/priv/skel/blog/templates/_article_chapeau.tpl
@@ -1,12 +1,12 @@
 {% with id|menu_trail as parents %}
 {% if parents %}
 <div class="span12">
-    <h5 class="chapeau">
-        {% for p in parents %}
-        <a href="{{ m.rsc[p].page_url }}">{{ m.rsc[p].title }}</a>
-        {% if not forloop.last %}&raquo;{% endif %}
-        {% endfor %}
-    </h5>
+	<h5 class="chapeau">
+		{% for p in parents %}
+		<a href="{{ m.rsc[p].page_url }}">{{ m.rsc[p].title }}</a>
+		{% if not forloop.last %}&raquo;{% endif %}
+		{% endfor %}
+	</h5>
 </div>
 {% endif %}
 {% endwith %}
diff --git a/priv/skel/blog/templates/_article_keywords.tpl b/priv/skel/blog/templates/_article_keywords.tpl
index 929dc80104..c2e1d01342 100644
--- a/priv/skel/blog/templates/_article_keywords.tpl
+++ b/priv/skel/blog/templates/_article_keywords.tpl
@@ -1,10 +1,10 @@
 {% with id.o.subject as tags %}
 {% if tags %}
 <p class="keywords">
-    {_ Keywords _}: 
-    {% for id in tags %}
-    <a class="label label-info" href="{{ m.rsc[id].page_url }}">{{ m.rsc[id].title }}</a>
-    {% endfor %}
+	{_ Keywords _}:
+	{% for id in tags %}
+	<a class="label label-info" href="{{ m.rsc[id].page_url }}">{{ m.rsc[id].title }}</a>
+	{% endfor %}
 </p>
 {% endif %}
 {% endwith %}
diff --git a/priv/skel/blog/templates/_article_prevnext.tpl b/priv/skel/blog/templates/_article_prevnext.tpl
index 37fc5a6491..993b4ca7cf 100644
--- a/priv/skel/blog/templates/_article_prevnext.tpl
+++ b/priv/skel/blog/templates/_article_prevnext.tpl
@@ -2,17 +2,17 @@
 
 <div class="prevnext">
 
-    {% for id in m.search[{next cat='article' id=id pagelen=1}] %}
-	    <div class="next">
-    	    <a href="{{ m.rsc[id].page_url }}" title="{{ m.rsc[id].title }}">{_ Next post _} &raquo;</a>
-	    </div>
-    {% endfor %}
+	{% for id in m.search[{next cat='article' id=id pagelen=1}] %}
+		<div class="next">
+			<a href="{{ m.rsc[id].page_url }}" title="{{ m.rsc[id].title }}">{_ Next post _} &raquo;</a>
+		</div>
+	{% endfor %}
 
-    {% for id in m.search[{previous cat='article' id=id pagelen=1}] %}
-    	<div class="prev">
-        	<a href="{{ m.rsc[id].page_url }}" title="{{ m.rsc[id].title }}">&laquo; {_ Previous post _}</a>
-	    </div>
-    {% endfor %}
+	{% for id in m.search[{previous cat='article' id=id pagelen=1}] %}
+		<div class="prev">
+			<a href="{{ m.rsc[id].page_url }}" title="{{ m.rsc[id].title }}">&laquo; {_ Previous post _}</a>
+		</div>
+	{% endfor %}
 
 </div>
 
diff --git a/priv/skel/blog/templates/_article_sidebar.tpl b/priv/skel/blog/templates/_article_sidebar.tpl
index 21425e8b94..3153f97689 100644
--- a/priv/skel/blog/templates/_article_sidebar.tpl
+++ b/priv/skel/blog/templates/_article_sidebar.tpl
@@ -1,17 +1,17 @@
 {% include "_article_keywords.tpl" %}
 
-{% with m.rsc[id].media|without_embedded_media:id as media %} 
+{% with m.rsc[id].media|without_embedded_media:id as media %}
 {% if media %}
 <ul class="thumbnails">
-    {% for medium in media %}
-    <li>
-        <a href="{{ medium.id.page_url }}" class="thumbnail">
-            {% include "_body_media.tpl" width=300 align="block" id=medium %}
-        </a>
-    </li>
-    {% endfor %}
+	{% for medium in media %}
+	<li>
+		<a href="{{ medium.id.page_url }}" class="thumbnail">
+			{% include "_body_media.tpl" width=300 align="block" id=medium %}
+		</a>
+	</li>
+	{% endfor %}
 </ul>
-{% endif %}	
+{% endif %}
 {% endwith %}
 
 {% include "_edit_button.tpl" %}
diff --git a/priv/skel/blog/templates/_article_summary.tpl b/priv/skel/blog/templates/_article_summary.tpl
index 6a9ba9760d..ec75b97357 100644
--- a/priv/skel/blog/templates/_article_summary.tpl
+++ b/priv/skel/blog/templates/_article_summary.tpl
@@ -21,7 +21,6 @@
 			{{ id|summary:300 }} <a href="{{ m.rsc[id].page_url }}">{_ Read more _}&nbsp;&raquo;</a>
 		</p>
 
-
 	</section>
 
 {% else %}
diff --git a/priv/skel/blog/templates/_body_media.tpl b/priv/skel/blog/templates/_body_media.tpl
index 2f9a9fc87d..31ea6cdaad 100644
--- a/priv/skel/blog/templates/_body_media.tpl
+++ b/priv/skel/blog/templates/_body_media.tpl
@@ -6,8 +6,8 @@
 	{% else %}
 		<figure class="image-wrapper block-level-image">
 			{% media m.rsc[id].medium width=size.width|default:width height=size.height|default:height crop=crop class=align link=link alt=m.rsc[id].title %}
-            {% with id|summary as summary %}{% if summary %}<p class="image-caption">{{ summary }}</p>{% endif %}{% endwith %}
-		</figure>	
+			{% with id|summary as summary %}{% if summary %}<p class="image-caption">{{ summary }}</p>{% endif %}{% endwith %}
+		</figure>
 	{% endifequal %}
 {% else %}
 	{% media m.rsc[id].medium width=size.width|default:width height=size.height|default:height crop=crop class=align link=link alt=m.rsc[id].title %}
diff --git a/priv/skel/blog/templates/_email_contact.tpl b/priv/skel/blog/templates/_email_contact.tpl
index ee93f5ebc9..cfe164baef 100644
--- a/priv/skel/blog/templates/_email_contact.tpl
+++ b/priv/skel/blog/templates/_email_contact.tpl
@@ -1,16 +1,16 @@
 <html>
-    <head>
-        <title>{{ name|escape }} - Contact form</title>
-    </head>
-    <body>
-        <p>Hello, the contact form of the site has been submitted.</p>
+	<head>
+		<title>{{ name|escape }} - Contact form</title>
+	</head>
+	<body>
+		<p>Hello, the contact form of the site has been submitted.</p>
 
-        <p>Name: {{ name|escape }}</p>
-        <p>E-mail: {{ mail|escape }}</p>
+		<p>Name: {{ name|escape }}</p>
+		<p>E-mail: {{ mail|escape }}</p>
 
-        <p>The contents of the message was this:</p>
-        <pre>{{ message|force_escape|linebreaksbr }}</pre>
+		<p>The contents of the message was this:</p>
+		<pre>{{ message|force_escape|linebreaksbr }}</pre>
 
-        <p>Regards, your website.</p>
-    </body>
+		<p>Regards, your website.</p>
+	</body>
 </html>
diff --git a/priv/skel/blog/templates/_listitem.tpl b/priv/skel/blog/templates/_listitem.tpl
index a8f6fa600a..ce9db0ad06 100644
--- a/priv/skel/blog/templates/_listitem.tpl
+++ b/priv/skel/blog/templates/_listitem.tpl
@@ -1,4 +1,4 @@
 <li class="listitem">
-    <h3><a href="{{ m.rsc[id].page_url }}">{{ m.rsc[id].title }}</a></h3>
-    {{ m.rsc[id].summary }} 
+	<h3><a href="{{ m.rsc[id].page_url }}">{{ m.rsc[id].title }}</a></h3>
+	{{ m.rsc[id].summary }}
 </li>
diff --git a/priv/skel/blog/templates/_sidebar.tpl b/priv/skel/blog/templates/_sidebar.tpl
index 5188253870..5be1bfe54b 100644
--- a/priv/skel/blog/templates/_sidebar.tpl
+++ b/priv/skel/blog/templates/_sidebar.tpl
@@ -1,8 +1,8 @@
 {# Cache the sidebar, depending on the stuff in the 'article' category #}
 {% cache 3600 cat='article' %}
-	
+
 	{% if m.category.tweet %}
-	
+
 		{% with m.search[{latest cat='tweet' pagelen=4}] as r %}
 			{% if r.result %}
 				<h2>Tweets</h2>
@@ -19,28 +19,28 @@
 				</ul>
 			{% endif %}
 		{% endwith %}
-	
+
 	{% endif %}
-	
+
 	<h2>{_ Archive _}</h2>
-    <ul class="simple-list">
+	<ul class="simple-list">
 		{% for year, months in m.search[{archive_year_month cat='article'}] %}
-	    	<li><a class="caption" href="{% url archives_y year=year %}">{{ year }}</a>
-                <ul>
-                    {% for row in months %}
-                    <li><a href="{% url archives_m year=year month=row.month %}">{{ row.month_as_date|date:"F" }}</a> ({{ row.count }}){% if not forloop.last %},{% else %}.{% endif %}</li>
-                    {% endfor %}
-                </ul>
-            </li>
-	    {% endfor %}
-    </ul>
-	
-    <h2>{_ Keywords _}</h2>
-    <ul class="inline-list clearfix">
-	    {% for id, count in m.search[{keyword_cloud cat='article'}] %}
-        <li><a href="{{ m.rsc[id].page_url }}">{{ m.rsc[id].title }}</a> ({{ count }}){% if not forloop.last %},{% else %}.{% endif %}</li>
-	    {% endfor %}
-    </ul>
+			<li><a class="caption" href="{% url archives_y year=year %}">{{ year }}</a>
+				<ul>
+					{% for row in months %}
+					<li><a href="{% url archives_m year=year month=row.month %}">{{ row.month_as_date|date:"F" }}</a> ({{ row.count }}){% if not forloop.last %},{% else %}.{% endif %}</li>
+					{% endfor %}
+				</ul>
+			</li>
+		{% endfor %}
+	</ul>
+
+	<h2>{_ Keywords _}</h2>
+	<ul class="inline-list clearfix">
+		{% for id, count in m.search[{keyword_cloud cat='article'}] %}
+		<li><a href="{{ m.rsc[id].page_url }}">{{ m.rsc[id].title }}</a> ({{ count }}){% if not forloop.last %},{% else %}.{% endif %}</li>
+		{% endfor %}
+	</ul>
 
 {% endcache %}
 
diff --git a/priv/skel/blog/templates/archives.tpl b/priv/skel/blog/templates/archives.tpl
index 41d0c9a7f9..716867a3fa 100644
--- a/priv/skel/blog/templates/archives.tpl
+++ b/priv/skel/blog/templates/archives.tpl
@@ -7,15 +7,15 @@
 {% endblock %}
 
 {% block content %}
-	
+
 	{% with m.search.paged[{query publication_year=q.year publication_month=q.month sort='-publication_start' cat=cat page=q.page pagelen=m.config.site.pagelen.value}] as result %}
-		
+
 		{% for id in result %}
-			
+
 			{% include "_article_summary.tpl" id=id %}
-		
+
 		{% endfor %}
-	
+
 		{% pager result=result dispatch=zotonic_dispatch year=q.year month=q.month %}
 
 	{% endwith %}
diff --git a/priv/skel/blog/templates/base.tpl b/priv/skel/blog/templates/base.tpl
index 5b89dc152f..4db8f3c954 100644
--- a/priv/skel/blog/templates/base.tpl
+++ b/priv/skel/blog/templates/base.tpl
@@ -1,97 +1,98 @@
 <!DOCTYPE html>
 <html lang="{{ z_language|default:"en"|escape }}">
-    <head>
-        <meta charset="utf-8" />
-	<title>{% block title %}{% endblock %} &mdash; {{ m.config.site.title.value }}</title>
-
-	<!--
-		Website built by:
-		YOUR NAME HERE
-
-		Proudly powered by: Zotonic, the Erlang CMS <http://www.zotonic.com>
-	-->
-
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<meta name="author" content="YOUR NAME HERE &copy; 2012" />
-
-	{% all include "_html_head.tpl" %}
-
-	{% lib
-        "bootstrap/css/bootstrap.min.css"
-        "bootstrap/css/bootstrap.responsive.min.css"
-        "css/jquery.loadmask.css"
-        "css/z-menu.css"
-        "css/project.css"
-        %}
-
-	{% block html_head_extra %}{% endblock %}
-    </head>
-    <body class="{% block page_class %}page{% endblock %}">
-
-        <div class="navbar navbar-fixed-top">
-
-            <div class="navbar-inner">
-                <div class="container">
-        	    <a class="brand" href="/">{{ m.config.site.title.value }} {% if m.config.site.subtitle.value %}{% endif %}</a>
-                    {# <span>{{ m.config.site.subtitle.value }}</span> #}
-                    
-                    {% menu id=id %}
-                </div>
-            </div>
-        </div><!-- end navbar -->
-        
-        <div class="container">
-
-            <div class="row">
-	        {% block content_area %}
-	        {% block chapeau %}{% endblock %}
-
-                <div class="span8">
-                    {% block content %}
-		    <!-- The default content goes here. -->
-                    {% endblock %}
-                </div>
-
-                <div id="sidebar" class="span4">
-                    {% block sidebar %}
-		    {% include "_sidebar.tpl" %}
-    	            {% endblock %}
-                </div>
-
-		{% endblock %}
-
-            </div>
-
-            <div class="row">
-                <div class="span12" id="footer">
-		    <div class="pull-right">
-		        <p class="footer-blog-title">{_ Website powered by _} <a href="http://zotonic.com">Zotonic</a> {{ m.config.zotonic.version.value }}.</p>
-                    </div>
-		    {% menu id=id menu_id='footer_menu' %}
-                </div>
-            </div>
-        </div>
-        
-	{% include "_js_include_jquery.tpl" %}
-        {% lib
-        "bootstrap/js/bootstrap.min.js"
-	"js/apps/zotonic-1.0.js" 
-	"js/apps/z.widgetmanager.js" 
-	"js/modules/livevalidation-1.3.js" 
-	"js/modules/z.inputoverlay.js"
-	"js/modules/jquery.loadmask.js"
-        "js/z.superfish.js" 
-	%}
-	
-	{% block _js_include_extra %}{% endblock %}
-
-        <script type="text/javascript">
-            $(function() { $.widgetManager(); });
-        </script>
-
-	{% stream %}
-        {% script %}
-
-        {% all include "_html_body.tpl" %}
-    </body>
+	<head>
+		<meta charset="utf-8" />
+		<title>{% block title %}{% endblock %} &mdash; {{ m.config.site.title.value }}</title>
+
+		<!--
+			Website built by:
+			YOUR NAME HERE
+
+			Proudly powered by: Zotonic, the Erlang CMS <http://www.zotonic.com>
+		-->
+
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="author" content="YOUR NAME HERE &copy; 2012" />
+
+		{% all include "_html_head.tpl" %}
+
+		{% lib
+			"bootstrap/css/bootstrap.min.css"
+			"bootstrap/css/bootstrap.responsive.min.css"
+			"css/jquery.loadmask.css"
+			"css/z-menu.css"
+			"css/project.css"
+		%}
+
+		{% block html_head_extra %}{% endblock %}
+	</head>
+	<body class="{% block page_class %}page{% endblock %}">
+
+		<div class="navbar navbar-fixed-top">
+
+			<div class="navbar-inner">
+				<div class="container">
+				<a class="brand" href="/">{{ m.config.site.title.value }} {% if m.config.site.subtitle.value %}{% endif %}</a>
+					{# <span>{{ m.config.site.subtitle.value }}</span> #}
+
+					{% menu id=id %}
+				</div>
+			</div>
+		</div>
+		<!-- end navbar -->
+
+		<div class="container">
+
+			<div class="row">
+				{% block content_area %}
+					{% block chapeau %}{% endblock %}
+
+					<div class="span8">
+						{% block content %}
+							<!-- The default content goes here. -->
+						{% endblock %}
+					</div>
+
+					<div id="sidebar" class="span4">
+						{% block sidebar %}
+							{% include "_sidebar.tpl" %}
+						{% endblock %}
+					</div>
+
+				{% endblock %}
+
+			</div>
+
+			<div class="row">
+				<div class="span12" id="footer">
+					<div class="pull-right">
+						<p class="footer-blog-title">{_ Website powered by _} <a href="http://zotonic.com">Zotonic</a> {{ m.config.zotonic.version.value }}.</p>
+					</div>
+					{% menu id=id menu_id='footer_menu' %}
+				</div>
+			</div>
+		</div>
+
+		{% include "_js_include_jquery.tpl" %}
+		{% lib
+			"bootstrap/js/bootstrap.min.js"
+			"js/apps/zotonic-1.0.js"
+			"js/apps/z.widgetmanager.js"
+			"js/modules/livevalidation-1.3.js"
+			"js/modules/z.inputoverlay.js"
+			"js/modules/jquery.loadmask.js"
+			"js/z.superfish.js"
+		%}
+
+		{% block _js_include_extra %}{% endblock %}
+
+		<script type="text/javascript">
+			$(function() { $.widgetManager(); });
+		</script>
+
+		{% stream %}
+		{% script %}
+
+		{% all include "_html_body.tpl" %}
+	</body>
 </html>
diff --git a/priv/skel/blog/templates/by_keyword.tpl b/priv/skel/blog/templates/by_keyword.tpl
index e1879dbcac..888fd56273 100644
--- a/priv/skel/blog/templates/by_keyword.tpl
+++ b/priv/skel/blog/templates/by_keyword.tpl
@@ -9,13 +9,13 @@
 {% block content %}
 
 	{% with m.search.paged[{referrers id=q.id page=q.page pagelen=m.config.site.pagelen.value}] as result %}
-	
+
 		{% for id, predicate in result %}
 			{% include "_article_summary.tpl" id=id %}
 		{% endfor %}
-		
+
 		{% pager result=result dispatch='keyword' id=id slug=m.rsc[id].slug %}
-	
+
 	{% endwith %}
 
 {% endblock %}
diff --git a/priv/skel/blog/templates/contact.tpl b/priv/skel/blog/templates/contact.tpl
index a598e31ecc..dcc37f1881 100644
--- a/priv/skel/blog/templates/contact.tpl
+++ b/priv/skel/blog/templates/contact.tpl
@@ -5,35 +5,35 @@
 {% wire id="contact-form" type="submit" postback={contact} delegate="resource_default_contact" %}
 <form id="contact-form" method="post" action="postback" class="form">
 
-    <div class="control-group">
+	<div class="control-group">
 	<label class="control-label" for="name">Name</label>
-        <div class="controls">
-    	    <input type="text" name="name" id="name" class="span4" />
-        </div>
-    </div>
+		<div class="controls">
+			<input type="text" name="name" id="name" class="span4" />
+		</div>
+	</div>
 
-    <div class="control-group">
+	<div class="control-group">
 	<label class="control-label" for="email">E-mail</label>
-        <div class="controls">
-    	    <input type="text" name="mail" id="email" class="span4" />
-    	    {% validate id="email" type={email} type={presence} %}
-        </div>
-    </div>
-    
-    <div class="control-group">
+		<div class="controls">
+			<input type="text" name="mail" id="email" class="span4" />
+			{% validate id="email" type={email} type={presence} %}
+		</div>
+	</div>
+
+	<div class="control-group">
 	<label class="control-label" for="message">Message</label>
-        <div class="controls">
-	    <textarea name="message" id="message" cols="60" rows="8" class="span4"></textarea>
-    	    {% validate id="message" type={presence} %}
-        </div>
-    </div>
-
-    <div class="control-group">
-        <div class="controls">
-            <button class="btn btn-primary" type="submit">Send</button>
-        </div>
-    </div>
-    
+		<div class="controls">
+		<textarea name="message" id="message" cols="60" rows="8" class="span4"></textarea>
+			{% validate id="message" type={presence} %}
+		</div>
+	</div>
+
+	<div class="control-group">
+		<div class="controls">
+			<button class="btn btn-primary" type="submit">Send</button>
+		</div>
+	</div>
+
 </form>
 
 {% endblock %}
diff --git a/priv/skel/blog/templates/home.tpl b/priv/skel/blog/templates/home.tpl
index c6c3d8927e..b816dbcb75 100644
--- a/priv/skel/blog/templates/home.tpl
+++ b/priv/skel/blog/templates/home.tpl
@@ -5,12 +5,12 @@
 {% block content %}
 
 	{% if m.rsc[id].is_featured %}
-	
+
 		<h1>{{ m.rsc[id].title }}</h1>
 		<p class="summary">{{ id|summary }}</p>
-	
+
 		{% for id in m.rsc[id].media %}
-           {% include "_body_media.tpl" width=445 crop=1 align="block" %}
+			{% include "_body_media.tpl" width=445 crop=1 align="block" %}
 		{% endfor %}
 
 	{% endif %}
@@ -23,10 +23,10 @@
 			{% endfor %}
 		</div>
 
-        {% ifequal m.config.site.pagelen.value result|length %}
+		{% ifequal m.config.site.pagelen.value result|length %}
 			{% wire id="more-results" action={moreresults result=result target="list-articles" template="_article_summary.tpl"} %}
 			<p><a href="javascript:void(0);" id="more-results">More results...</a></p>
-        {% endifequal %}
+		{% endifequal %}
 	{% endwith %}
 
 {% endblock %}
diff --git a/priv/skel/blog/templates/page.query.tpl b/priv/skel/blog/templates/page.query.tpl
index f4b1a66a77..a8045a5a66 100644
--- a/priv/skel/blog/templates/page.query.tpl
+++ b/priv/skel/blog/templates/page.query.tpl
@@ -3,16 +3,16 @@
 {% block below_body %}
 
 	{% with m.search.paged[{query query_id=id page=q.page pagelen=6}] as result %}
-		
+
 		<ul class="list query-list clearfix">
-		
-		    {% for id in result %}
-	    		{% catinclude "_listitem.tpl" id %}
-		    {% endfor %}
+
+			{% for id in result %}
+				{% catinclude "_listitem.tpl" id %}
+			{% endfor %}
 		</ul>
 
 		{% pager result=result dispatch="page" id=id %}
 
 	{% endwith %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}