From: Jan Szejko <jan.szejko@gmail.com>
Date: Wed, 20 Apr 2016 15:32:00 +0000 (+0200)
Subject: reformat templates
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3c0e373447323b5e33b273859e790a2054771afa?ds=inline

reformat templates
---

diff --git a/lib/librarian b/lib/librarian
index 90f6c5d93..7f5ff5c99 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 90f6c5d936cafdc51639b251591a909696ea4935
+Subproject commit 7f5ff5c99803e281dc90364cd6efb77b8d91fa26
diff --git a/src/ajaxable/templates/ajaxable/form.html b/src/ajaxable/templates/ajaxable/form.html
index 963f411f7..af98d5158 100755
--- a/src/ajaxable/templates/ajaxable/form.html
+++ b/src/ajaxable/templates/ajaxable/form.html
@@ -4,19 +4,19 @@
 <h1>{{ title }}</h1>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
-	class="cuteform{% if placeholdize %} hidelabels{% endif %}">
-{% ssi_csrf_token %}
-{% if honeypot %}
+      class="cuteform{% if placeholdize %} hidelabels{% endif %}">
+  {% ssi_csrf_token %}
+  {% if honeypot %}
     {% load honeypot %}
     {% render_honeypot_field %}
-{% endif %}
-<ol>
+  {% endif %}
+  <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}
     <li><input type="submit" value="{{ submit }}"/></li>
-</ol>
+  </ol>
 </form>
 
 <div class="form-extra">
-{% block extra %}{% endblock %}
+  {% block extra %}{% endblock %}
 </div>
diff --git a/src/ajaxable/templates/ajaxable/form_on_page.html b/src/ajaxable/templates/ajaxable/form_on_page.html
index 8e495234a..e5c27a807 100755
--- a/src/ajaxable/templates/ajaxable/form_on_page.html
+++ b/src/ajaxable/templates/ajaxable/form_on_page.html
@@ -1,18 +1,18 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{{ title }}{% endblock %}
 
 {% block body %}
 
-    <div class="white-box">
+  <div class="white-box">
 
-    {% include ajax_template %}
+  {% include ajax_template %}
 
-    {% if response_data.message %}
-        <p>{{ response_data.message }}</p>
-    {% endif %}
+  {% if response_data.message %}
+    <p>{{ response_data.message }}</p>
+  {% endif %}
 
-    </div>
+  </div>
 
 {% endblock %}
diff --git a/src/api/templates/api/main.html b/src/api/templates/api/main.html
index 04244dc91..67ff426fe 100755
--- a/src/api/templates/api/main.html
+++ b/src/api/templates/api/main.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load build_absolute_uri from fnp_common %}
 
@@ -7,91 +7,90 @@
 {% block bodyid %}api{% endblock %}
 
 {% block body %}
+  <h1>API</h1>
 
-<h1>API</h1>
+  <div class="normal-text white-box">
+    <p>
+      {% url "api" as u %}
+      {% blocktrans with u=u|build_absolute_uri:request %}
+        WolneLektury.pl API resides under <code>{{ u }}</code>.
+        You can use it to access information about books, their fragments and
+        their metadata.
+      {% endblocktrans %}
+    </p>
 
-<div class="normal-text white-box">
-<p>
-{% url "api" as u %}
-{% blocktrans with u=u|build_absolute_uri:request %}
-WolneLektury.pl API resides under <code>{{ u }}</code>.
-You can use it to access information about books, their fragments and
-their metadata.
-{% endblocktrans %}
-</p>
+    <p>
+      {% blocktrans %}
+        Default data serialization format is
+        <a href="http://en.wikipedia.org/wiki/JSON">JSON</a>,
+        but you can also use XML by appending <code>?format=xml</code>
+        query parameter to each URL.
+      {% endblocktrans %}
+    </p>
 
-<p>
-{% blocktrans %}
-Default data serialization format is
-<a href="http://en.wikipedia.org/wiki/JSON">JSON</a>, 
-but you can also use XML by appending <code>?format=xml</code>
-query parameter to each URL.
-{% endblocktrans %}
-</p>
+    <p>
+      {% blocktrans %}
+        The URLs in WolneLektury.pl API are:
+      {% endblocktrans %}
+    </p>
 
-<p>
-{% blocktrans %}
-The URLs in WolneLektury.pl API are:
-{% endblocktrans %}
-</p>
+    <ul>
+        <li><a href='{% url "api_book_list" "" %}'>
+          {% url "api_book_list" "" %}</a> – {% trans "All books" %}</li>
+        <li><a href='{% url "api_audiobook_list" "" %}'>
+          {% url "api_audiobook_list" "" %}</a> – {% trans "Audiobooks" %}</li>
+        <li><a href='{% url "api_daisy_list" "" %}'>
+          {% url "api_daisy_list" "" %}</a> – {% trans "DAISY" %}</li>
 
-<ul>
-    <li><a href='{% url "api_book_list" "" %}'>
-    	{% url "api_book_list" "" %}</a> – {% trans "All books" %}
-    <li><a href='{% url "api_audiobook_list" "" %}'>
-    	{% url "api_audiobook_list" "" %}</a> – {% trans "Audiobooks" %}
-    <li><a href='{% url "api_daisy_list" "" %}'>
-    	{% url "api_daisy_list" "" %}</a> – {% trans "DAISY" %}
+        <li><a href='{% url "api_tag_list" "authors" %}'>
+          {% url "api_tag_list" "authors" %}</a> – {% trans "List of all authors" %}</li>
+        <li><a href='{% url "api_tag_list" "epochs" %}'>
+          {% url "api_tag_list" "epochs" %}</a> – {% trans "List of all epochs" %}</li>
+        <li><a href='{% url "api_tag_list" "genres" %}'>
+          {% url "api_tag_list" "genres" %}</a> – {% trans "List of all genres" %}</li>
+        <li><a href='{% url "api_tag_list" "kinds" %}'>
+          {% url "api_tag_list" "kinds" %}</a> – {% trans "List of all kinds" %}</li>
 
-    <li><a href='{% url "api_tag_list" "authors" %}'>
-    	{% url "api_tag_list" "authors" %}</a> – {% trans "List of all authors" %}</li>
-    <li><a href='{% url "api_tag_list" "epochs" %}'>
-    	{% url "api_tag_list" "epochs" %}</a> – {% trans "List of all epochs" %}</li>
-    <li><a href='{% url "api_tag_list" "genres" %}'>
-    	{% url "api_tag_list" "genres" %}</a> – {% trans "List of all genres" %}</li>
-    <li><a href='{% url "api_tag_list" "kinds" %}'>
-    	{% url "api_tag_list" "kinds" %}</a> – {% trans "List of all kinds" %}</li>
+        <li><a href='{% url "api_tag_list" "themes" %}'>
+          {% url "api_tag_list" "themes" %}</a> – {% trans "List of all themes" %}</li>
+        <li><a href='{% url "api_collections" %}'>
+          {% url "api_collections" %}</a> – {% trans "Collections" %}</li>
+    </ul>
 
-    <li><a href='{% url "api_tag_list" "themes" %}'>
-    	{% url "api_tag_list" "themes" %}</a> – {% trans "List of all themes" %}</li>
-    <li><a href='{% url "api_collections" %}'>
-    	{% url "api_collections" %}</a> – {% trans "Collections" %}
-</ul>
+    <p>
+      {% url "api_book" "studnia-i-wahadlo" as e1 %}
+      {% url "api_tag" "authors" "edgar-allan-poe" as e2 %}
+      {% blocktrans %}
+        Each element of those lists contains a link (in a "href") attibute
+        which points to individual resource's details, i.e.:
+        <a href="{{e1}}">{{e1}}</a> or
+        <a href="{{e2}}">{{e2}}</a>.
+      {% endblocktrans %}
+    </p>
 
-<p>
-{% url "api_book" "studnia-i-wahadlo" as e1 %}
-{% url "api_tag" "authors" "edgar-allan-poe" as e2 %}
-{% blocktrans %}
-Each element of those lists contains a link (in a "href") attibute
-which points to individual resource's details, i.e.:
-<a href="{{e1}}">{{e1}}</a> or
-<a href="{{e2}}">{{e2}}</a>.
-{% endblocktrans %}
-</p>
+    <p>
+      {% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/books/" as e %}
+        You can combine authors, epochs, genres and kinds to find only books matching
+        those criteria. For instance:
+        <a href="{{e}}">{{e}}</a>.
+      {% endblocktrans %}
+    </p>
 
-<p>
-{% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/books/" as e %}
-You can combine authors, epochs, genres and kinds to find only books matching
-those criteria. For instance:
-<a href="{{e}}">{{e}}</a>.
-{% endblocktrans %}
-</p>
+    <p>
+      {% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/parent_books/" as e %}
+        If you only want top-level books and not all the children, you can use /parent_books/, as in:
+        <a href="{{e}}">{{e}}</a>.
+      {% endblocktrans %}
+    </p>
 
-<p>
-{% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/parent_books/" as e %}
-If you only want top-level books and not all the children, you can use /parent_books/, as in:
-<a href="{{e}}">{{e}}</a>.
-{% endblocktrans %}
-</p>
-
-<p>
-{% url "api_fragment" "sen-nocy-letniej" "1290526312912-3814598192" as f %}
-{% blocktrans with "/api/authors/william-shakespeare/themes/zabawa/fragments/" as e %}
-The same way, using also books and themes, you can search for a list of fragments:
-<a href="{{e}}">{{e}}</a>. 
-Again, each entry has a "href" attribute which links to the fragment's details, i.e.:
-<a href="{{f}}">{{f}}</a>. 
-{% endblocktrans %}
-</p>
-</div>
+    <p>
+      {% url "api_fragment" "sen-nocy-letniej" "1290526312912-3814598192" as f %}
+      {% blocktrans with "/api/authors/william-shakespeare/themes/zabawa/fragments/" as e %}
+        The same way, using also books and themes, you can search for a list of fragments:
+        <a href="{{e}}">{{e}}</a>.
+        Again, each entry has a "href" attribute which links to the fragment's details, i.e.:
+        <a href="{{f}}">{{f}}</a>.
+      {% endblocktrans %}
+    </p>
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html
index 308318161..4f590ce79 100644
--- a/src/catalogue/templates/catalogue/book_detail.html
+++ b/src/catalogue/templates/catalogue/book_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load common_tags catalogue_tags %}
 {% load ssify %}
@@ -13,68 +13,71 @@
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
-
-{% ssi_include 'catalogue_book_wide' pk=book.pk %}
-
-{% work_list book_children %}
-
-{% spaceless %}
-{% if book.other_versions %}
-<section class="see-also" style="display: inline-block;">
-<h1>{% trans "Other versions" %}:</h1>
-{% for rel in book.other_versions %}
-    {% cache 86400 book_mini_box rel.pk %}
-      {% include 'catalogue/book_mini_box.html' with book=rel %}
-    {% endcache %}
-    {#% ssi_include 'catalogue_book_mini' pk=rel.pk %#}
-{% endfor %}
-</section>
-{% endif %}
-
-<section class="see-also" style="display: inline-block;">
-<h2>{% trans "See also" %}:</h2>
-{% related_books book taken=book.other_versions|length %}
-</section>
-{% endspaceless %}
-
-
-
-{% with book.related_themes as themes %}
-{% if themes %}
-    <h2>{% trans "Themes" %}</h2>
-    {% plain_list themes book=book %}
-{% endif %}
-{% endwith %}
-
-
-
-<h2>{% trans "Information about the work" %}</h2>
-{% for tag in tags %}
-        <div class="white-box">
-            <a style="display:block" href="{{ tag.get_absolute_url }}">
+  {% ssi_include 'catalogue_book_wide' pk=book.pk %}
+
+  {% work_list book_children %}
+
+  {% spaceless %}
+    {% if book.other_versions %}
+      <section class="see-also">
+        <h1>{% trans "Other versions" %}:</h1>
+        {% for rel in book.other_versions %}
+          {% cache 86400 book_mini_box rel.pk %}
+            {% include 'catalogue/book_mini_box.html' with book=rel %}
+          {% endcache %}
+          {#% ssi_include 'catalogue_book_mini' pk=rel.pk %#}
+        {% endfor %}
+      </section>
+    {% endif %}
+
+    <section class="see-also">
+      <h2>{% trans "See also" %}:</h2>
+      {% related_books book taken=book.other_versions|length %}
+    </section>
+  {% endspaceless %}
+
+  {% with book.related_themes as themes %}
+    {% if themes %}
+      <h2>{% trans "Themes" %}</h2>
+      {% plain_list themes book=book %}
+    {% endif %}
+  {% endwith %}
+
+
+  <h2>{% trans "Information about the work" %}</h2>
+  {% for tag in tags %}
+    <div class="white-box">
+      <a style="display:block" href="{{ tag.get_absolute_url }}">
         {% ssi_include 'catalogue_tag_box' pk=tag.pk %}
-        </a>
-        </div>
-{% endfor %}
-
-
-      {% if extra_info.source_url %}
-      <div class="white-box"><a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}
-      {% trans "in" %} {% source_name extra_info.source_url %}</div>
-      {% endif %}
-      <div class="white-box"><a href="{{ book.xml_file.url }}">{% trans "Source XML file" %}</a></div>
-      {% if extra_info.about and not hide_about %}
-      <div class="white-box">{% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a></div>
-      {% endif %}
-      {% if book.gazeta_link %}
-      <div class="white-box"><a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a></div>
-      {% endif %}
-      {% if book.wiki_link %}
-      <div class="white-box"><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></div>
-      {% endif %}
-      <div class="white-box"><a href="{% url 'poem_from_book' book.slug %}">{% trans "Mix this book" %}</a></div>
-
-
-
+      </a>
+    </div>
+  {% endfor %}
+
+
+  {% if extra_info.source_url %}
+    <div class="white-box">
+      <a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}
+      {% trans "in" %} {% source_name extra_info.source_url %}
+    </div>
+  {% endif %}
+  <div class="white-box"><a href="{{ book.xml_file.url }}">{% trans "Source XML file" %}</a></div>
+  {% if extra_info.about and not hide_about %}
+    <div class="white-box">
+      {% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a>
+    </div>
+  {% endif %}
+  {% if book.gazeta_link %}
+    <div class="white-box">
+      <a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a>
+    </div>
+  {% endif %}
+  {% if book.wiki_link %}
+    <div class="white-box">
+      <a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a>
+    </div>
+  {% endif %}
+  <div class="white-box">
+    <a href="{% url 'poem_from_book' book.slug %}">{% trans "Mix this book" %}</a>
+  </div>
 
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/book_fragments.html b/src/catalogue/templates/catalogue/book_fragments.html
index d46f869d8..7696c149f 100644
--- a/src/catalogue/templates/catalogue/book_fragments.html
+++ b/src/catalogue/templates/catalogue/book_fragments.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load work_list from catalogue_tags %}
 
@@ -7,14 +7,14 @@
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <div class="left-column">
-    <h1>{% trans "Theme" %}
-    	<a href="{{ theme.get_absolute_url }}">{{ theme }}</a>
-    	<br/>{% trans "in work " %}
-    	<a href="{{ book.get_absolute_url }}">{{ book }}</a></h1>
-    </div>
+  <div class="left-column">
+  <h1>{% trans "Theme" %}
+    <a href="{{ theme.get_absolute_url }}">{{ theme }}</a>
+    <br/>{% trans "in work " %}
+    <a href="{{ book.get_absolute_url }}">{{ book }}</a></h1>
+  </div>
 
-    <div class="right-column">
-        {% work_list fragments %}
-    </div>
+  <div class="right-column">
+    {% work_list fragments %}
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/book_info.html b/src/catalogue/templates/catalogue/book_info.html
index e245335ee..5b67ad631 100755
--- a/src/catalogue/templates/catalogue/book_info.html
+++ b/src/catalogue/templates/catalogue/book_info.html
@@ -2,18 +2,18 @@
 {% load catalogue_tags %}
 
 <p>
-    {% if book.extra_info.license %}
-        {% trans "This work is licensed under:" %}
-        <a href="{{ book.extra_info.license }}">{{ book.extra_info.license_description }}</a>
-    {% else %}
-        {% blocktrans %}This work isn't covered by copyright and is part of the
-        public domain, which means it can be freely used, published and
-        distributed. If there are any additional copyrighted materials
-        provided with this work (such as annotations, motifs etc.), those
-        materials are licensed under the 
-        <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0</a>
-        license.{% endblocktrans %}
-    {% endif %}
+  {% if book.extra_info.license %}
+    {% trans "This work is licensed under:" %}
+    <a href="{{ book.extra_info.license }}">{{ book.extra_info.license_description }}</a>
+  {% else %}
+    {% blocktrans %}This work isn't covered by copyright and is part of the
+    public domain, which means it can be freely used, published and
+    distributed. If there are any additional copyrighted materials
+    provided with this work (such as annotations, motifs etc.), those
+    materials are licensed under the
+    <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0</a>
+    license.{% endblocktrans %}
+  {% endif %}
 </p>
 
 {% if book.extra_info.source_name %}
@@ -25,22 +25,26 @@
 {% endif %}
 
 {% if book.extra_info.editor or book.extra_info.technical_editor %}
-  <p>{% if is_picture %}
-        {% trans "Edited by:" %}
+  <p>
+    {% if is_picture %}
+      {% trans "Edited by:" %}
     {% else %}
-        {% trans "Edited and annotated by:" %}
+      {% trans "Edited and annotated by:" %}
     {% endif %}
-      {% all_editors book.extra_info %}.</p>
+    {% all_editors book.extra_info %}.
+  </p>
 {% endif %}
 
 {% if book.extra_info.funders %}
-  <p>{% trans "Publication funded by:" %}
-      {% for funder in book.extra_info.funders %}{{ funder }}{% if not forloop.last %}, {% else %}.{% endif %}{% endfor %}
+  <p>
+    {% trans "Publication funded by:" %}
+    {% for funder in book.extra_info.funders %}{{ funder }}{% if not forloop.last %}, {% else %}.{% endif %}{% endfor %}
   </p>
 {% endif %}
 
 {% if book.extra_info.cover_by %}
-  <p>{% trans "Cover image by:" %}
-      <a href="{{ book.extra_info.cover_source }}">
-      {{ book.extra_info.cover_by }}</a>.</p>
+  <p>
+    {% trans "Cover image by:" %}
+    <a href="{{ book.extra_info.cover_source }}">{{ book.extra_info.cover_by }}</a>.
+  </p>
 {% endif %}
diff --git a/src/catalogue/templates/catalogue/book_list.html b/src/catalogue/templates/catalogue/book_list.html
index e29cd50ec..b5c3b60ca 100644
--- a/src/catalogue/templates/catalogue/book_list.html
+++ b/src/catalogue/templates/catalogue/book_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 {% load ssi_include from ssify %}
@@ -8,14 +8,13 @@
 {% block titleextra %}{% trans "Listing of all works" %}{% endblock %}
 
 {% block body %}
-{% spaceless %}
-
+  {% spaceless %}
     <h1>{% block book_list_header %}{% trans "Listing of all works" %}{% endblock %}</h1>
 
     <div class="left-column"><div class="normal-text" style="margin-bottom: 2em">
-        {% block book_list_info %}
-            {% ssi_include 'chunk' key='book-list' %}
-        {% endblock %}
+      {% block book_list_info %}
+        {% ssi_include 'chunk' key='book-list' %}
+      {% endblock %}
     </div></div>
 
     <div style='clear:both;'></div>
@@ -23,10 +22,10 @@
     <a name="top"></a>
 
     <div id="book-list-nav">
-        <h2>{% trans "Table of Content" %}</h2>
-        <div id="book-list-nav-index">
-            {{ rendered_nav }}
-        </div>
+      <h2>{% trans "Table of Content" %}</h2>
+      <div id="book-list-nav-index">
+        {{ rendered_nav }}
+      </div>
     </div>
     <div id="book-list">
       {% block book_list %}
@@ -34,6 +33,5 @@
       {% endblock %}
     </div>
     <a id="book-list-up" href="#top">{% trans "↑ top ↑" %}</a>
-
-{% endspaceless %}
+  {% endspaceless %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/book_searched.html b/src/catalogue/templates/catalogue/book_searched.html
index 357491ce6..26b9f6130 100644
--- a/src/catalogue/templates/catalogue/book_searched.html
+++ b/src/catalogue/templates/catalogue/book_searched.html
@@ -1,38 +1,34 @@
 {% spaceless %}
+  {% load i18n %}
+  {% load inline_tag_list from catalogue_tags %}
+  {% load ssi_include from ssify %}
 
-{% load i18n %}
-{% load inline_tag_list from catalogue_tags %}
-{% load ssi_include from ssify %}
+  <div class="search-result">
+    {% ssi_include 'catalogue_book_short' pk=book.pk %}
 
-<div class="search-result">
+    <div class="snippets">
+      {% for hit in hits %}
+        {% if hit.snippet %}
+          <div class="snippet-text">
+            <a href="{% url 'book_text' book.slug %}#sec{{hit.section_number}}">{{hit.snippet|safe}}</a>
+          </div>
+        {% elif hit.fragment %}
+          <div class="snippet-text">
+            {% if hit.themes_hit %}
+              {% inline_tag_list hit.themes_hit  %}
+            {% endif %}
+            <a href="{{hit.fragment.get_absolute_url}}">
+              {% if hit.snippet %}
+                {{hit.snippet|safe}}
+              {% else %}
+                {{hit.fragment.text|truncatewords_html:15|safe}}
+              {% endif %}
+            </a>
+          </div>
+        {% endif %}
+      {% endfor %}
+    </div>
 
-{% ssi_include 'catalogue_book_short' pk=book.pk %}
-
-<div class="snippets">
-  {% for hit in hits %}
-  {% if hit.snippet %}
-  <div class="snippet-text"><a href="{% url 'book_text' book.slug %}#sec{{hit.section_number}}">{{hit.snippet|safe}}</a></div>
-  {% else %}
-  {% if hit.fragment %}
-  <div class="snippet-text">
-    {% if hit.themes_hit %}
-    {% inline_tag_list hit.themes_hit  %}
-    {% endif %}
-    <a href="{{hit.fragment.get_absolute_url}}">
-      {% if hit.snippet %}
-        {{hit.snippet|safe}}
-      {% else %}
-        {{hit.fragment.text|truncatewords_html:15|safe}}
-      {% endif %}
-    </a>
+    <div style="clear: right"></div>
   </div>
-  {% endif %}
-  {% endif %}
-  {% endfor %}
-</div>
-
-<div style="clear: right"></div>
-
-</div>
-
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html
index 6f5b19f47..0cba65cc9 100644
--- a/src/catalogue/templates/catalogue/book_short.html
+++ b/src/catalogue/templates/catalogue/book_short.html
@@ -1,129 +1,127 @@
 {% spaceless %}
-{% load i18n %}
-{% load catalogue_tags %}
-{% load book_shelf_tags from social_tags %}
-<div class="{% block box-class %}book-box{% if audiobooks %} audiobook-box{% endif %}{% endblock %}">
-<div class="book-box-inner">
+  {% load i18n %}
+  {% load catalogue_tags %}
+  {% load book_shelf_tags from social_tags %}
 
-{% block book-box-pre %}
-    {% include "catalogue/snippets/like_button.html" %}
-{% endblock %}
+  <div class="{% block box-class %}book-box{% if audiobooks %} audiobook-box{% endif %}{% endblock %}">
+    <div class="book-box-inner">
 
-<div class="book-left-column">
+    {% block book-box-pre %}
+      {% include "catalogue/snippets/like_button.html" %}
+    {% endblock %}
 
-    <div class="book-box-body">
+    <div class="book-left-column">
+      <div class="book-box-body">
         {% block book-box-body-pre %}
         {% endblock %}
 
         <div class="book-box-head">
-            <div class="author">
-                {% for tag in tags.author %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>{% if not forloop.last %},
-                {% endif %}{% endfor %}{% for parent in parents %},
-                    <a href="{{ parent.get_absolute_url }}">{{ parent.title }}</a>{% endfor %}
-            </div>
-            <div class="title">
-                {% if main_link %}<a href="{{ main_link }}">{% endif %}{{ book.title }}{% if main_link %}</a>{% endif %}
-            </div>
+          <div class="author">
+            {% for tag in tags.author %}
+              <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>{% if not forloop.last %},
+            {% endif %}{% endfor %}{% for parent in parents %},
+              <a href="{{ parent.get_absolute_url }}">{{ parent.title }}</a>{% endfor %}
+          </div>
+          <div class="title">
+            {% if main_link %}<a href="{{ main_link }}">{% endif %}{{ book.title }}{% if main_link %}</a>{% endif %}
+          </div>
         </div>
 
         <div class="cover-area">
-            {% if book.cover_thumb %}
-                {% if main_link %}<a href="{{ main_link }}">{% endif %}
-                    <img src="{{ book.cover_thumb.url }}" alt="Cover" class="cover" />
-                {% if main_link %}</a>{% endif %}
-            {% endif %}
-            {% block cover-area-extra %}{% endblock %}
+          {% if book.cover_thumb %}
+            {% if main_link %}<a href="{{ main_link }}">{% endif %}
+              <img src="{{ book.cover_thumb.url }}" alt="Cover" class="cover" />
+            {% if main_link %}</a>{% endif %}
+          {% endif %}
+          {% block cover-area-extra %}{% endblock %}
         </div>
 
         <div class="tags">
-            {% spaceless %}
-
-            <span class="category">
-            <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
-                {% for tag in tags.epoch %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
-                    {% if not forloop.last %}<span>, </span>{% endif %}
-                {% endfor %}
-            </span></span>
+          <span class="category">
+          <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
+            {% for tag in tags.epoch %}
+              <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
+              {% if not forloop.last %}<span>, </span>{% endif %}
+            {% endfor %}
+          </span></span>
 
-            <span class="category">
-            <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
-                {% for tag in tags.kind %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
-                    {% if not forloop.last %}<span>, </span>{% endif %}
-                {% endfor %}
-            </span></span>
+          <span class="category">
+          <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
+            {% for tag in tags.kind %}
+              <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
+              {% if not forloop.last %}<span>, </span>{% endif %}
+            {% endfor %}
+          </span></span>
 
-            <span class="category">
-            <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
-                {% for tag in tags.genre %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
-                    {% if not forloop.last %}<span>, </span>{% endif %}
-                {% endfor %}
-            </span></span>
+          <span class="category">
+          <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
+            {% for tag in tags.genre %}
+              <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
+              {% if not forloop.last %}<span>, </span>{% endif %}
+            {% endfor %}
+          </span></span>
 
-            {% if show_lang %}
+          {% if show_lang %}
             <span class="category">
-            <span class="mono"> {% trans "Language" %}:</span>&nbsp;<span class="book-box-tag">
+              <span class="mono"> {% trans "Language" %}:</span>&nbsp;<span class="book-box-tag">
                 <a>{{ book.language_name }}</a>
-            </span></span>
-            {% endif %}
-
-            {% if stage_note %}
-            <br><span class="category">
-                <a{% if stage_note_url %} href="{{ stage_note_url }}"{% endif %}>{{ stage_note }}</a>
+              </span>
             </span>
-            {% endif %}
+          {% endif %}
 
-           {% endspaceless %}
+          {% if stage_note %}
+            <br>
+            <span class="category">
+              <a{% if stage_note_url %} href="{{ stage_note_url }}"{% endif %}>{{ stage_note }}</a>
+            </span>
+          {% endif %}
         </div>
-    </div>
-    {% book_shelf_tags book.pk %}
+      </div>
+      {% book_shelf_tags book.pk %}
 
-    <ul class="book-box-tools">
+      <ul class="book-box-tools">
         <li class="book-box-read">
-        {% if book.html_file %}
+          {% if book.html_file %}
             <a href="{% url 'book_text' book.slug %}" class="downarrow">{% trans "Read online" %}</a>
-        {% endif %}
+          {% endif %}
         </li>
         <li class="book-box-download">
-            <a class="downarrow">{% trans "Download" %}: </a>
-            <div class="book-box-formats">
-             {% if book.pdf_file %}
-             <span><a href="{{ book.pdf_file.url}}">PDF</a></span>
-             {% endif %}
-             {% custom_pdf_link_li book %}
-             {% if book.epub_file %}
-             <span><a href="{{ book.epub_file.url}}">EPUB</a></span>
-             {% endif %}
-             {% if book.mobi_file %}
-             <span><a href="{{ book.mobi_file.url}}">MOBI</a></span>
-             {% endif %}
-             {% if  book.fb2_file %}
-             <span><a href="{{ book.fb2_file.url}}">FB2</a></span>
-             {% endif %}
-             {% if  book.txt_file %}
-             <span><a href="{{ book.txt_file.url}}">TXT</a></span>
-             {% endif %}
-             {% download_audio book %}
-            </div>
+          <a class="downarrow">{% trans "Download" %}:</a>
+          <div class="book-box-formats">
+            {% if book.pdf_file %}
+              <span><a href="{{ book.pdf_file.url}}">PDF</a></span>
+            {% endif %}
+            {% custom_pdf_link_li book %}
+            {% if book.epub_file %}
+              <span><a href="{{ book.epub_file.url}}">EPUB</a></span>
+            {% endif %}
+            {% if book.mobi_file %}
+              <span><a href="{{ book.mobi_file.url}}">MOBI</a></span>
+            {% endif %}
+            {% if  book.fb2_file %}
+              <span><a href="{{ book.fb2_file.url}}">FB2</a></span>
+            {% endif %}
+            {% if  book.txt_file %}
+              <span><a href="{{ book.txt_file.url}}">TXT</a></span>
+            {% endif %}
+            {% download_audio book %}
+          </div>
         </li>
-    </ul>
-    {% block book-box-extra-info %}{% endblock %}
-    {% block box-append %}
-    {% endblock %}
-</div>
+      </ul>
+      {% block book-box-extra-info %}{% endblock %}
+      {% block box-append %}
+      {% endblock %}
+    </div>
 
-{% block right-column %}
-    {% if audiobooks %}
+    {% block right-column %}
+      {% if audiobooks %}
         <div class="audiobook-right-column">
-            {% include 'catalogue/snippets/jplayer.html' %}
+          {% include 'catalogue/snippets/jplayer.html' %}
         </div>
-    {% endif %}
-{% endblock %}
+      {% endif %}
+    {% endblock %}
 
-<div class="clearboth"></div>
-</div>
-</div>
+    <div class="clearboth"></div>
+    </div>
+  </div>
 {% endspaceless %}
diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html
index f51e565e6..5a6db1138 100644
--- a/src/catalogue/templates/catalogue/book_text.html
+++ b/src/catalogue/templates/catalogue/book_text.html
@@ -9,97 +9,107 @@
 
 
 {% block menu %}
-<li><a href="{{ book.get_absolute_url }}" id="menu-book" data-box="book-short">
-    <img src="{% if book.cover_thumb %}{% thumbnail book.cover_thumb '80x111' as thumb %}{{ thumb.url }}{% empty %}{{ book.cover_thumb.url }}{% endthumbnail %}{% endif %}"
-        width="80" height="111"
-        alt="{{ book.pretty_title }}"
-        title="{{ book.pretty_title }}">
-</a></li>
-
-{% if book.other_versions.exists %}
-    <li id="menu-other"><a href="#" data-box="other">
-        <span class="label">{% trans "Other versions" %}</span>
+  <li>
+    <a href="{{ book.get_absolute_url }}" id="menu-book" data-box="book-short">
+      <img src="{% if book.cover_thumb %}{% thumbnail book.cover_thumb '80x111' as thumb %}{{ thumb.url }}{% empty %}{{ book.cover_thumb.url }}{% endthumbnail %}{% endif %}"
+           width="80" height="111"
+           alt="{{ book.pretty_title }}"
+           title="{{ book.pretty_title }}">
     </a>
+  </li>
+
+  {% if book.other_versions.exists %}
+    <li id="menu-other">
+      <a href="#" data-box="other">
+        <span class="label">{% trans "Other versions" %}</span>
+      </a>
     </li>
-{% endif %}
+  {% endif %}
 
-<li id="menu-toc"><a href="#" data-box="toc">
-    <span class="label">{% trans "Table of contents" %}</span>
-</a></li>
+  <li id="menu-toc">
+    <a href="#" data-box="toc">
+      <span class="label">{% trans "Table of contents" %}</span>
+    </a>
+  </li>
 
-<li id="menu-themes"><a href="#" data-box="themes">
-    <span class="label">{% trans "Themes" %}</span>
-</a></li>
+  <li id="menu-themes">
+    <a href="#" data-box="themes">
+      <span class="label">{% trans "Themes" %}</span>
+    </a>
+  </li>
 
-<li id="menu-settings"><a href="#" data-box="settings">
-    <span class="label">{% trans "Settings" %}</span>
-</a></li>
+  <li id="menu-settings">
+    <a href="#" data-box="settings">
+      <span class="label">{% trans "Settings" %}</span>
+    </a>
+  </li>
 
-<li id="menu-nota_red"><a href="#" data-box="nota_red">
-    <span class="label">{% trans "Edit. note" %}</span>
-</a></li>
+  <li id="menu-nota_red">
+    <a href="#" data-box="nota_red">
+      <span class="label">{% trans "Edit. note" %}</span>
+    </a>
+  </li>
 
-<li id="menu-info"><a href="#info" data-box="info">
-    <span class="label">{% trans "Infobox" %}</span>
-</a></li>
+  <li id="menu-info">
+    <a href="#info" data-box="info">
+      <span class="label">{% trans "Infobox" %}</span>
+    </a>
+  </li>
 {% endblock menu %}
 
 
-
 {% block big-pane %}
-<div id="big-pane" style="">
+  <article id="main-text">
+    <!--#include file='{{ book.html_file.url }}'-->
+  </article>
 
-<article id="main-text">
-<!--#include file='{{ book.html_file.url }}'-->
-</article>
-
-<article id="other-text">
+  <article id="other-text">
     <a class="other-text-close" href="#">{% trans "Close" %}</a>
     <div id="other-text-waiter">{% trans "Please wait..." %}</div>
     <div id="other-text-body" style="display: none;"></div>
-</article>
+  </article>
 {% endblock big-pane %}
 
 
-
-
-
 {% block footer %}
-<div id="info" class="box">
-    {% book_info book %}
-</div>
-
-{% if book.other_versions.exists %}
-<div class="box" id="other">
-    <h2>{% trans "Other versions of the book" %}</h2>
-    <a class="other-text-close" href="#">{% trans "Close the other version" %}</a>
-    <ul>
-    {% spaceless %}
-    {% for other_version in book.other_versions %}
-        <li>
-          <a class="display-other"
-              data-other="{{ other_version.html_file.url }}"
-              href="{% url 'book_text' other_version.slug %}">
-            {% cache 86400 book_mini_box other_version.pk %}
-              {% include 'catalogue/book_mini_box.html' with book=other_version no_link=True %}
-            {% endcache %}
-            {#% ssi_include 'catalogue_book_mini_nolink' pk=other_version.pk %#}
-          </a>
-        </li>
-    {% endfor %}
-    {% endspaceless %}
-    </ul>
-</div>
-{% endif %}
-
-<div class="box" id="settings">
+  <div id="info" class="box">
+      {% book_info book %}
+  </div>
+
+  {% if book.other_versions.exists %}
+    <div class="box" id="other">
+      <h2>{% trans "Other versions of the book" %}</h2>
+      <a class="other-text-close" href="#">{% trans "Close the other version" %}</a>
+      <ul>
+        {% spaceless %}
+          {% for other_version in book.other_versions %}
+            <li>
+              <a class="display-other"
+                 data-other="{{ other_version.html_file.url }}"
+                 href="{% url 'book_text' other_version.slug %}">
+                {% cache 86400 book_mini_box other_version.pk %}
+                  {% include 'catalogue/book_mini_box.html' with book=other_version no_link=True %}
+                {% endcache %}
+                {#% ssi_include 'catalogue_book_mini_nolink' pk=other_version.pk %#}
+              </a>
+            </li>
+          {% endfor %}
+        {% endspaceless %}
+      </ul>
+    </div>
+  {% endif %}
+
+  <div class="box" id="settings">
     <h2>{% trans "Settings" %}</h2>
-    <a href="#" class="settings-switch" id="settings-line-numbers" data-setting="always-hide-line-numbers">{% trans "Display line numbers" %}</a><br/>
-    <a href="#" class="settings-switch" id="settings-themes" data-setting="always-hide-themes">{% trans "Display themes" %}</a><br/>
-    <a href="#" class="settings-switch" id="settings-annotations" data-setting="no-annotations">{% trans "Display footnotes" %}</a><br/>
-</div>
-
-<div class="box" id="book-short">
+    <a href="#" class="settings-switch" id="settings-line-numbers"
+       data-setting="always-hide-line-numbers">{% trans "Display line numbers" %}</a><br/>
+    <a href="#" class="settings-switch" id="settings-themes"
+       data-setting="always-hide-themes">{% trans "Display themes" %}</a><br/>
+    <a href="#" class="settings-switch" id="settings-annotations"
+       data-setting="no-annotations">{% trans "Display footnotes" %}</a><br/>
+  </div>
+
+  <div class="box" id="book-short">
     {% ssi_include 'catalogue_book_short' pk=book.pk %}
-</div>
+  </div>
 {% endblock footer %}
diff --git a/src/catalogue/templates/catalogue/book_wide.html b/src/catalogue/templates/catalogue/book_wide.html
index aa78292a8..88cc0be32 100644
--- a/src/catalogue/templates/catalogue/book_wide.html
+++ b/src/catalogue/templates/catalogue/book_wide.html
@@ -1,6 +1,6 @@
 {% extends "catalogue/book_short.html" %}
 {% load i18n %}
-{% load choose_fragment download_audio custom_pdf_link_li license_icon source_name from catalogue_tags %}
+{% load choose_fragment license_icon from catalogue_tags %}
 {% load choose_cite from social_tags %}
 {% load ssi_include from ssify %}
 
@@ -9,9 +9,9 @@
 
 
 {% block cover-area-extra %}
-{% if extra_info.license %}
-  {% license_icon extra_info.license %}
-{% endif %}
+  {% if extra_info.license %}
+    {% license_icon extra_info.license %}
+  {% endif %}
 {% endblock %}
 
 
@@ -33,7 +33,7 @@
 
 
 {% block book-box-body-pre %}
-    {% include "catalogue/snippets/like_button.html" %}
+  {% include "catalogue/snippets/like_button.html" %}
 {% endblock %}
 
 {% block book-box-pre %}
diff --git a/src/catalogue/templates/catalogue/catalogue.html b/src/catalogue/templates/catalogue/catalogue.html
index 1fc8b7b3d..482e8286c 100644
--- a/src/catalogue/templates/catalogue/catalogue.html
+++ b/src/catalogue/templates/catalogue/catalogue.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -8,14 +8,13 @@
 {% block bodyid %}catalogue-catalogue{% endblock %}
 
 {% block body %}
-    <h1>{% trans "All works" %}</h1>
-
-
-    <div class="normal-text catalogue-catalogue">
-
-    <p><a href="{% url 'reporting_catalogue_pdf' %}">
+  <h1>{% trans "All works" %}</h1>
+  <div class="normal-text catalogue-catalogue">
+    <p>
+      <a href="{% url 'reporting_catalogue_pdf' %}">
         {% trans "Download the catalogue in PDF format." %}
-    </a></p>
+      </a>
+    </p>
 
     <h2>{% trans "Literature" %}</h2>
     {% plain_list books by_author=True paged=False initial_blocks=True %}
@@ -25,7 +24,5 @@
 
     <h2>{% trans "Gallery" %}</h2>
     {% plain_list pictures by_author=True paged=False initial_blocks=True %}
-
-
-    </div>
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/collection.html b/src/catalogue/templates/catalogue/collection.html
index cf43ef36b..7a08ab6c7 100755
--- a/src/catalogue/templates/catalogue/collection.html
+++ b/src/catalogue/templates/catalogue/collection.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -7,11 +7,9 @@
 {% block bodyid %}collection{% endblock %}
 
 {% block body %}
-    <h1>{{ collection.title }}</h1>
-
-    {{ collection.description|safe }}
-
-    {% plain_list collection.get_books by_author=True %}
+  <h1>{{ collection.title }}</h1>
 
+  {{ collection.description|safe }}
 
+  {% plain_list collection.get_books by_author=True %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/collection_box.html b/src/catalogue/templates/catalogue/collection_box.html
index 1d9206b60..ac59fbe86 100644
--- a/src/catalogue/templates/catalogue/collection_box.html
+++ b/src/catalogue/templates/catalogue/collection_box.html
@@ -1,24 +1,24 @@
 {% spaceless %}
-{% load i18n %}
-{% load ssi_include from ssify %}
-{% load cache %}
-<div class="collection-box white-box">
+  {% load i18n %}
+  {% load ssi_include from ssify %}
+  {% load cache %}
+  <div class="collection-box white-box">
     <h2><a href="{{ obj.get_absolute_url }}">{% trans "Collection" %}: {{ obj }}</a></h2>
     {% if obj.description %}
-    {{ obj.description|safe|truncatewords_html:40 }}
+      {{ obj.description|safe|truncatewords_html:40 }}
     {% endif %}
     {% for book in obj.get_books|slice:":5" %}
-        {% cache 86400 book_mini_box book.pk %}
-          {% include 'catalogue/book_mini_box.html' %}
-        {% endcache %}
-        {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
+      {% cache 86400 book_mini_box book.pk %}
+        {% include 'catalogue/book_mini_box.html' %}
+      {% endcache %}
+      {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
     {% endfor %}
     {% with obj.get_books.count|add:-5 as more %}
-        {% if more > 0 %}
-            <a href="{{ obj.get_absolute_url }}">
-                {% blocktrans count c=more %}and one more{% plural %}and {{ c }} more{% endblocktrans %}
-            </a>
-        {% endif %}
+      {% if more > 0 %}
+        <a href="{{ obj.get_absolute_url }}">
+          {% blocktrans count c=more %}and one more{% plural %}and {{ c }} more{% endblocktrans %}
+        </a>
+      {% endif %}
     {% endwith %}
-</div>
+  </div>
 {% endspaceless %}
diff --git a/src/catalogue/templates/catalogue/collection_list.html b/src/catalogue/templates/catalogue/collection_list.html
index 38466f157..f6b806e8f 100755
--- a/src/catalogue/templates/catalogue/collection_list.html
+++ b/src/catalogue/templates/catalogue/collection_list.html
@@ -1,5 +1,5 @@
 <ul>
-{% for collection in collections %}
+  {% for collection in collections %}
     <li><a href="{{ collection.get_absolute_url }}">{{ collection }}</a></li>
-{% endfor %}
+  {% endfor %}
 </ul>
diff --git a/src/catalogue/templates/catalogue/collections.html b/src/catalogue/templates/catalogue/collections.html
index 1c6987278..2f8d1214b 100644
--- a/src/catalogue/templates/catalogue/collections.html
+++ b/src/catalogue/templates/catalogue/collections.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 {% load ssi_include from ssify %}
@@ -8,15 +8,12 @@
 {% block bodyid %}collections{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Collections" %}</h1>
-
-    {% for obj in best %}
-        {% ssi_include 'catalogue_collection_box' pk=obj.pk %}
-    {% endfor %}
-
-    <h2>{% trans "All collections" %}</h2>
-    {% plain_list objects %}
-
+  <h1>{% trans "Collections" %}</h1>
 
+  {% for obj in best %}
+    {% ssi_include 'catalogue_collection_box' pk=obj.pk %}
+  {% endfor %}
 
+  <h2>{% trans "All collections" %}</h2>
+  {% plain_list objects %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/daisy_list.html b/src/catalogue/templates/catalogue/daisy_list.html
index 65d9d6bcd..22a82d60f 100644
--- a/src/catalogue/templates/catalogue/daisy_list.html
+++ b/src/catalogue/templates/catalogue/daisy_list.html
@@ -7,11 +7,13 @@
 {% block titleextra %}{% trans "Listing of all DAISY files" %}{% endblock %}
 
 {% block extrahead %}
-    <link rel="alternate" type="application/atom+xml" title="{% trans "Latest DAISY audiobooks" %}" href="{% url 'audiobook_feed' 'daisy' %}" />
+  <link rel="alternate" type="application/atom+xml"
+        title="{% trans "Latest DAISY audiobooks" %}"
+        href="{% url 'audiobook_feed' 'daisy' %}" />
 {% endblock %}
 
 {% block book_list_header %}{% trans "Listing of all DAISY files" %}{% endblock %}
 
 {% block book_list_info %}
-{% ssi_include 'chunk' key='daisy-list' %}
+  {% ssi_include 'chunk' key='daisy-list' %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/differentiate_tags.html b/src/catalogue/templates/catalogue/differentiate_tags.html
index b8ef906ef..6c0fcfca4 100644
--- a/src/catalogue/templates/catalogue/differentiate_tags.html
+++ b/src/catalogue/templates/catalogue/differentiate_tags.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -7,14 +7,14 @@
 {% block bodyid %}differentiate_tags{% endblock %}
 
 {% block body %}
-    <h1>{% title_from_tags tags %}</h1>
+  <h1>{% title_from_tags tags %}</h1>
 
-	<p>{% trans "The criteria are ambiguous. Please select one of the following options:" %}</p>
+  <p>{% trans "The criteria are ambiguous. Please select one of the following options:" %}</p>
     <div id="books-list">
-        {% for option in options %}
-        <div class="book-description"
-            <p><a href="{% url 'tagged_object_list' option.url_args %}">{% if tags %}{% title_from_tags tags %}, {% endif %}<em>{%title_from_tags option.tags %}</em>{% if unparsed %}, {{unparsed|join:', '}}{% endif %}</a></p>
-		</div>
-        {% endfor %}
+      {% for option in options %}
+        <div class="book-description">
+          <p><a href="{% url 'tagged_object_list' option.url_args %}">{% if tags %}{% title_from_tags tags %}, {% endif %}<em>{%title_from_tags option.tags %}</em>{% if unparsed %}, {{unparsed|join:', '}}{% endif %}</a></p>
+        </div>
+      {% endfor %}
     </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/fragment_promo.html b/src/catalogue/templates/catalogue/fragment_promo.html
index cf817ae7c..fc8de0cf6 100755
--- a/src/catalogue/templates/catalogue/fragment_promo.html
+++ b/src/catalogue/templates/catalogue/fragment_promo.html
@@ -1,8 +1,8 @@
 {% if fragment %}
-<a href="{{ fragment.get_absolute_url }}" class="cite">
+  <a href="{{ fragment.get_absolute_url }}" class="cite">
     <blockquote class="cite-body">
-        {{ fragment.get_short_text|safe }}
+      {{ fragment.get_short_text|safe }}
     </blockquote>
     <p class="mono source">{{ fragment.book.pretty_title }}</p>
-</a>
+  </a>
 {% endif %}
diff --git a/src/catalogue/templates/catalogue/fragment_short.html b/src/catalogue/templates/catalogue/fragment_short.html
index b5921f215..935a1a545 100644
--- a/src/catalogue/templates/catalogue/fragment_short.html
+++ b/src/catalogue/templates/catalogue/fragment_short.html
@@ -2,25 +2,25 @@
 {% load book_title_html from catalogue_tags %} 
 
 <div class="cite {% if fragment.short_text %}fragment-with-short{% endif %}">
-	{% if fragment.short_text %}
-	<div class="fragment-short-text">
-    	<blockquote class="cite-body">
-			<a href="{{ fragment.get_absolute_url }}" class="fragment">
-		    	{{ fragment.short_text|safe }}
-			</a>
-	    </blockquote>
-		<a href="#" class="toggle mono">↓ {% trans "Expand fragment" %} ↓</a>
+  {% if fragment.short_text %}
+    <div class="fragment-short-text">
+      <blockquote class="cite-body">
+        <a href="{{ fragment.get_absolute_url }}" class="fragment">
+          {{ fragment.short_text|safe }}
+        </a>
+      </blockquote>
+      <a href="#" class="toggle mono">↓ {% trans "Expand fragment" %} ↓</a>
     </div>
-    {% endif %}
-	<div class="fragment-long-text" {% if fragment.short_text %}style="display:none;"{% endif %}>
+  {% endif %}
+  <div class="fragment-long-text" {% if fragment.short_text %}style="display:none;"{% endif %}>
     <blockquote class="cite-body fragment-text">
-		<a href="{{ fragment.get_absolute_url }}" class="fragment">
+      <a href="{{ fragment.get_absolute_url }}" class="fragment">
         {{ fragment.text|safe }}
-		</a>
+      </a>
     </blockquote>
-		{% if fragment.short_text %}
-		<a href="#" class="toggle mono">↑ {% trans "Hide fragment" %} ↑</a>
-		{% endif %}
-    </div>
-<p class="mono source">{% book_title_html fragment.book %}</p>
+    {% if fragment.short_text %}
+      <a href="#" class="toggle mono">↑ {% trans "Hide fragment" %} ↑</a>
+    {% endif %}
+  </div>
+  <p class="mono source">{% book_title_html fragment.book %}</p>
 </div>
diff --git a/src/catalogue/templates/catalogue/inline_tag_list.html b/src/catalogue/templates/catalogue/inline_tag_list.html
index 802fcb19e..a552d9121 100755
--- a/src/catalogue/templates/catalogue/inline_tag_list.html
+++ b/src/catalogue/templates/catalogue/inline_tag_list.html
@@ -2,26 +2,26 @@
 {% load catalogue_tags %}
 
 {% if choices %}
-    {% if category_choices %}
-        <ul>
-        {% for tag in category_choices %}
-            <li class="active">{{ tag }} <a href="{% catalogue_url list_type choices -tag %}">X</a></li>
-        {% endfor %}
-        </ul>
-    {% endif %}
-{% endif %}
-{% if tags %}
+  {% if category_choices %}
     <ul>
-        {% for tag in tags %}
-            <li><a href="{% catalogue_url list_type choices tag %}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
-        {% endfor %}
+      {% for tag in category_choices %}
+        <li class="active">{{ tag }} <a href="{% catalogue_url list_type choices -tag %}">X</a></li>
+      {% endfor %}
     </ul>
+  {% endif %}
+{% endif %}
+{% if tags %}
+  <ul>
+    {% for tag in tags %}
+      <li><a href="{% catalogue_url list_type choices tag %}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
+    {% endfor %}
+  </ul>
 {% endif %}
 {% if other %}
-    <ul>
-        <li class="header">{% trans "Other" %}:</li>
-        {% for tag in other %}
-            <li class="other"><a href="{% catalogue_url list_type tag %}">{{ tag }}</a></li>
-        {% endfor %}
-    </ul>
+  <ul>
+    <li class="header">{% trans "Other" %}:</li>
+    {% for tag in other %}
+      <li class="other"><a href="{% catalogue_url list_type tag %}">{{ tag }}</a></li>
+    {% endfor %}
+  </ul>
 {% endif %}
diff --git a/src/catalogue/templates/catalogue/picture_detail.html b/src/catalogue/templates/catalogue/picture_detail.html
index b8b70c6be..5eeea7f5b 100644
--- a/src/catalogue/templates/catalogue/picture_detail.html
+++ b/src/catalogue/templates/catalogue/picture_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 {% load thumbnail %}
@@ -9,86 +9,85 @@
 {% block bodyid %}picture-detail{% endblock %}
 
 {% block body %}
-    <h1>{{picture.title}}</h1>
+  <h1>{{picture.title}}</h1>
 
-    <div id="books-list">
-        <div id='breadcrumbs'>
-            {% if categories.author %}
-                {% for tag in categories.author %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                {% endfor %}
-                &#187; 
-            {% endif %}
-        </div>
+  <div id="books-list">
+    <div id='breadcrumbs'>
+      {% if categories.author %}
+        {% for tag in categories.author %}
+          <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
+        {% endfor %}
+        &#187;
+      {% endif %}
+    </div>
+
+    {% thumbnail picture.image_file "400x500" upscale="false" as im %}
+      <img style="margin:{{ im|margin:"500x500" }}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}"/>
+    {% endthumbnail %}
 
-	{% thumbnail picture.image_file "400x500" upscale="false" as im %}
-	<img style="margin:{{ im|margin:"500x500" }}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
-	{% endthumbnail %}
+    {% if picture.info.license %}
+      <p>{% trans "Work is licensed under " %} <a href="{{ picture.info.license }}">{{ picture.info.license_description }}</a>.</p>
+    {% endif %}
+    <p>{% trans "Based on" %}: {{ picture.info.source_name }}</p>
+    {% if picture.info.description %}
+      <div id="description">
+        <div id='description-long'>{{ picture.info.description|safe }}</div>
+        {# <div id='description-short'>{{ picture.info.description|safe|truncatewords_html:30 }}</div> #}
+      </div>
+      <div id="toggle-description"><p></p></div>
+    {% endif %}
+  </div>
 
-        {% if picture.info.license %}
-        <p>{% trans "Work is licensed under " %} <a href="{{ picture.info.license }}">{{ picture.info.license_description }}</a>.</p>
+  <div id="tags-list">
+    <div id="book-info">
+      <h2>{% trans "Details" %}</h2>
+      <ul>
+        <li>
+          {% trans "Author" %}:
+          {% for tag in categories.author %}
+            <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
+          {% endfor %}
+        </li>
+        <li>
+          {% trans "Epoch" %}:
+          {% for tag in categories.epoch %}
+            <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
+          {% endfor %}
+        </li>
+        <li>
+          {% trans "Kind" %}:
+          {% for tag in categories.kind %}
+            <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
+          {% endfor %}
+        </li>
+      </ul>
+      <h2>{% trans "Other resources" %}</h2>
+      <ul>
+        {% if picture.info.source_url %}
+          <li><a href="{{ picture.info.source_url }}">{% trans "Source of the image" %}</a></li>
         {% endif %}
-        <p>{% trans "Based on" %}: {{ picture.info.source_name }}</p>
-        {% if picture.info.description %}
-            <div id="description">
-                <div id='description-long'>{{ picture.info.description|safe }}</div>
-{%comment%}                <div id='description-short'>{{ picture.info.description|safe|truncatewords_html:30 }}</div>{%endcomment%}
-            </div>
-            <div id="toggle-description"><p></p></div>
+        {% if picture.info.about and not hide_about %}
+          <li><a href="{{ picture.info.about }}">{% trans "Image on the Editor's Platform" %}</a></li>
         {% endif %}
-
+        {% comment %}
+        {% if book.gazeta_link %}
+          <li><a href="{{ book.gazeta_link }}">{% trans "Picture description on Lektury.Gazeta.pl" %}</a></li>
+        {% endif %}
+        {% if book.wiki_link %}
+          <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
+        {% endif %}
+        {% endcomment %}
+      </ul>
+      <p><a href="{{ picture.xml_file.url }}">{% trans "View XML source" %}</a></p>
     </div>
-
-    <div id="tags-list">
-        <div id="book-info">
-            <h2>{% trans "Details" %}</h2>
-            <ul>
-                <li>
-                    {% trans "Author" %}:
-                    {% for tag in categories.author %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>
-                <li>
-                    {% trans "Epoch" %}:
-                    {% for tag in categories.epoch %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>
-                <li>
-                    {% trans "Kind" %}:
-                    {% for tag in categories.kind %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>
-            </ul>
-            <h2>{% trans "Other resources" %}</h2>
-            <ul>
-                {% if picture.info.source_url %}
-                <li><a href="{{ picture.info.source_url }}">{% trans "Source of the image" %}</a></li>
-                {% endif %}
-                {% if picture.info.about and not hide_about %}
-                <li><a href="{{ picture.info.about }}">{% trans "Image on the Editor's Platform" %}</a></li>
-                {% endif %}
-{% comment %}
-                {% if book.gazeta_link %}
-                <li><a href="{{ book.gazeta_link }}">{% trans "Picture description on Lektury.Gazeta.pl" %}</a></li>
-                {% endif %}
-                {% if book.wiki_link %}
-                <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
-                {% endif %}
-{% endcomment %}
-            </ul>
-            <p><a href="{{ picture.xml_file.url }}">{% trans "View XML source" %}</a></p>
-        </div>
-        <div id="themes-list">
-            <h2>{% trans "Work's themes " %}</h2>
-            <ul>
-            {% for theme in picture_themes %}
-                <li><a href="{{ theme.get_absolute_url }}">{{ theme }} ({{ theme.count }})</a></li>
-            {% endfor %}
-            </ul>
-        </div>
-        <div class="clearboth"></div>
+    <div id="themes-list">
+      <h2>{% trans "Work's themes " %}</h2>
+      <ul>
+        {% for theme in picture_themes %}
+          <li><a href="{{ theme.get_absolute_url }}">{{ theme }} ({{ theme.count }})</a></li>
+        {% endfor %}
+      </ul>
     </div>
+    <div class="clearboth"></div>
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/picture_list.html b/src/catalogue/templates/catalogue/picture_list.html
index ce61ec48b..60f2eb0d9 100644
--- a/src/catalogue/templates/catalogue/picture_list.html
+++ b/src/catalogue/templates/catalogue/picture_list.html
@@ -11,22 +11,19 @@
 
 
 {% block book_list %}
-{% for author, group in pictures_by_author.items %}
-<a name="{{ author.slug }}"/>
-<div class="group">
-  <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
-  {% for picture in group %}
-  <div class="picture">
-    {% thumbnail picture.image_file "300x300" as im %}
-    <img style="float: left; margin:{{ im|margin:"300x300" }}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
-    {% endthumbnail %}
-    <span class="title"><a href="{{picture.get_absolute_url}}">{{picture.title}}</a></span>
-    <br class="clearboth"/>
-  </div>
+  {% for author, group in pictures_by_author.items %}
+    <a name="{{ author.slug }}"></a>
+    <div class="group">
+      <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
+      {% for picture in group %}
+        <div class="picture">
+          {% thumbnail picture.image_file "300x300" as im %}
+            <img style="float: left; margin:{{ im|margin:"300x300" }}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
+          {% endthumbnail %}
+          <span class="title"><a href="{{picture.get_absolute_url}}">{{picture.title}}</a></span>
+          <br class="clearboth"/>
+        </div>
+      {% endfor %}
+    </div>
   {% endfor %}
-</div>
-  
-{% endfor %}
-
 {% endblock %}
-
diff --git a/src/catalogue/templates/catalogue/plain_list.html b/src/catalogue/templates/catalogue/plain_list.html
index e26bb7f15..b96eb96cd 100644
--- a/src/catalogue/templates/catalogue/plain_list.html
+++ b/src/catalogue/templates/catalogue/plain_list.html
@@ -1,23 +1,21 @@
 {% spaceless %}
-{% load catalogue_tags %}
+  {% load catalogue_tags %}
 
-
-<div class='{% if paged %}plain-list-paged {% endif %}plain-list-container white-box'>
-  <div class="pager-center">
+  <div class='{% if paged %}plain-list-paged {% endif %}plain-list-container white-box'>
+    <div class="pager-center">
       <div class="pager"></div>
-  </div>
-  <div class='plain-list' style=''>
-    {% for initial, object_list in names %}
-      {% if initial_blocks %}<div class="initial-block">{% endif %}
-      {% if initial %}
-        <p class="header">{{ initial }}</p>
-      {% endif %}
-      {% for item in object_list %}
-        <p><a href="{% if book %}{% url 'book_fragments' book.slug item.slug %}{% elif choice %}{% catalogue_url list_type choice item %}{% elif list_type == 'gallery' and item.get_absolute_gallery_url %}{{ item.get_absolute_gallery_url }}{% else %}{{ item.get_absolute_url }}{% endif %}">{{ item }}{% if item.count %}&nbsp;({{ item.count}}){% endif %}</a></p>
+    </div>
+    <div class='plain-list' style=''>
+      {% for initial, object_list in names %}
+        {% if initial_blocks %}<div class="initial-block">{% endif %}
+        {% if initial %}
+          <p class="header">{{ initial }}</p>
+        {% endif %}
+        {% for item in object_list %}
+          <p><a href="{% if book %}{% url 'book_fragments' book.slug item.slug %}{% elif choice %}{% catalogue_url list_type choice item %}{% elif list_type == 'gallery' and item.get_absolute_gallery_url %}{{ item.get_absolute_gallery_url }}{% else %}{{ item.get_absolute_url }}{% endif %}">{{ item }}{% if item.count %}&nbsp;({{ item.count}}){% endif %}</a></p>
+        {% endfor %}
+        {% if initial_blocks %}</div>{% endif %}
       {% endfor %}
-    {% if initial_blocks %}</div>{% endif %}
-    {% endfor %}
+    </div>
   </div>
-</div>
-
 {% endspaceless %}
diff --git a/src/catalogue/templates/catalogue/player.html b/src/catalogue/templates/catalogue/player.html
index 91f0fa6a0..2e32f711f 100755
--- a/src/catalogue/templates/catalogue/player.html
+++ b/src/catalogue/templates/catalogue/player.html
@@ -1,84 +1,74 @@
 <!DOCTYPE html>
 <html>
-    {% load static from staticfiles %}
-    {% load i18n pipeline %}
-    {% load catalogue_tags %}
-    {% load thumbnail %}
-    {% load piwik_tags %}
-    <head>
-        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-        <meta name="description"
-            content="{{ book.title }} - darmowy audiobook na wolnej licencji" />
-        <title>{% trans "Wolne Lektury" %} ::
-            {{ book.title }} - {{ audiobook }}</title>
-        <link rel="icon" href="{% static "img/favicon.png" %}" type="image/png" />
-        {% stylesheet "all" %}
-        {% stylesheet "player" %}
-
-    </head>
-    <body id="{% block bodyid %}player{% endblock %}">
-
-	        {% if book.cover_thumb %}
-            <img src="
-                {% thumbnail book.cover_thumb "101x140" as thumb %}
-                    {{ thumb.url }}
-                {% empty %}
-                    {{ book.cover_thumb.url }}
-                {% endthumbnail %}
-            " alt="Cover" style="float: left; margin: .5em 1em 1em 1em;" />
-        {% endif %}
+  {% load static from staticfiles %}
+  {% load i18n pipeline %}
+  {% load catalogue_tags %}
+  {% load thumbnail %}
+  {% load piwik_tags %}
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta name="description"
+        content="{{ book.title }} - darmowy audiobook na wolnej licencji" />
+    <title>{% trans "Wolne Lektury" %} ::
+        {{ book.title }} - {{ audiobook }}</title>
+    <link rel="icon" href="{% static "img/favicon.png" %}" type="image/png" />
+    {% stylesheet "all" %}
+    {% stylesheet "player" %}
+  </head>
+  <body id="{% block bodyid %}player{% endblock %}">
+    {% if book.cover_thumb %}
+      <img src="{% thumbnail book.cover_thumb "101x140" as thumb %}{{ thumb.url }}{% empty %}{{ book.cover_thumb.url }}{% endthumbnail %}"
+           alt="Cover" style="float: left; margin: .5em 1em 1em 1em;" />
+    {% endif %}
 
 
-<h1>{% book_title book %}</h1>
+  <h1>{% book_title book %}</h1>
 
-<div class="player-info normal-text">
-	<p><a target="_blank" href="{{ book.get_absolute_url }}">{% trans "Book's page" %}</a>.</p>
-	<p>{% trans "Download as" %} {% download_audio book False %}.</p>
+  <div class="player-info normal-text">
+    <p><a target="_blank" href="{{ book.get_absolute_url }}">{% trans "Book's page" %}</a>.</p>
+    <p>{% trans "Download as" %} {% download_audio book False %}.</p>
 
     {% if book.has_daisy_file %}
-        <p>DAISY:</p>
-        <ul class="daisy-list">
-        {% for media in book.get_daisy %}
-            <li><a href="{{ media.file.url }}">{{ media.name }}</a></li>
-        {% endfor %}
-        </ul>
+      <p>DAISY:</p>
+      <ul class="daisy-list">
+      {% for media in book.get_daisy %}
+          <li><a href="{{ media.file.url }}">{{ media.name }}</a></li>
+      {% endfor %}
+      </ul>
     {% endif %}
-</div>
+  </div>
 
-<div style="clear: both"></div>
-        {% include "catalogue/snippets/jplayer.html" %}
-
-        {% if projects|length > 1 %}
-            <p>{% trans "Audiobooks were prepared as a part of the projects:" %}</p>
-            <ul>
-            {% for cs, fb in projects %}
-                <li>
-                {% if fb %}
-                    {% blocktrans %}{{ cs }}, funded by {{ fb }}{% endblocktrans %}
-                {% else %}
-                    {{ cs }}
-                {% endif %}
-                </li>
-            {% endfor %}
-            </ul>
-        {% else %}
-            <p>
-            {% with projects.0.0 as cs %}
-            {% with projects.0.1 as fb %}
-                {% if fb %}
-                    {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project funded by {{ fb }}.{% endblocktrans %}
-                {% else %}
-                    {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project.{% endblocktrans %}
-                {% endif %}
-            {% endwith %}
-            {% endwith %}
-            </p>
-        {% endif %}
+  <div style="clear: both"></div>
+    {% include "catalogue/snippets/jplayer.html" %}
 
+    {% if projects|length > 1 %}
+      <p>{% trans "Audiobooks were prepared as a part of the projects:" %}</p>
+      <ul>
+        {% for cs, fb in projects %}
+          <li>
+            {% if fb %}
+              {% blocktrans %}{{ cs }}, funded by {{ fb }}{% endblocktrans %}
+            {% else %}
+              {{ cs }}
+            {% endif %}
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      <p>
+        {% with cs=projects.0.0 fb=projects.0.1 %}
+          {% if fb %}
+            {% blocktrans %}Audiobooks were prepared as a part of the <em>{{ cs }}</em> project funded by {{ fb }}.{% endblocktrans %}
+          {% else %}
+            {% blocktrans %}Audiobooks were prepared as a part of the <em>{{ cs }}</em> project.{% endblocktrans %}
+          {% endif %}
+        {% endwith %}
+      </p>
+    {% endif %}
 
-        <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-        {% javascript "player" %}
+    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    {% javascript "player" %}
 
-        {% tracking_code %}
-    </body>
+    {% tracking_code %}
+  </body>
 </html>
diff --git a/src/catalogue/templates/catalogue/recent_audiobooks_list.html b/src/catalogue/templates/catalogue/recent_audiobooks_list.html
index 762cb80d7..a597f0b88 100755
--- a/src/catalogue/templates/catalogue/recent_audiobooks_list.html
+++ b/src/catalogue/templates/catalogue/recent_audiobooks_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -7,9 +7,9 @@
 {% block bodyid %}recent-list{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Recent audiobooks" %}</h1>
+  <h1>{% trans "Recent audiobooks" %}</h1>
 
-    <div id="books-list">
-        {% work_list object_list %}
-    </div>
+  <div id="books-list">
+    {% work_list object_list %}
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/recent_daisy_list.html b/src/catalogue/templates/catalogue/recent_daisy_list.html
index 6675af206..2b0ab83ed 100755
--- a/src/catalogue/templates/catalogue/recent_daisy_list.html
+++ b/src/catalogue/templates/catalogue/recent_daisy_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -7,9 +7,9 @@
 {% block bodyid %}recent-list{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Recent DAISY files" %}</h1>
+  <h1>{% trans "Recent DAISY files" %}</h1>
 
-    <div id="books-list">
-        {% work_list object_list %}
-    </div>
+  <div id="books-list">
+    {% work_list object_list %}
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/recent_list.html b/src/catalogue/templates/catalogue/recent_list.html
index 28a96b831..f0fadb30b 100755
--- a/src/catalogue/templates/catalogue/recent_list.html
+++ b/src/catalogue/templates/catalogue/recent_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -7,16 +7,16 @@
 {% block bodyid %}recent-list{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Recent publications" %}</h1>
+  <h1>{% trans "Recent publications" %}</h1>
 
-    {% url 'recent_audiobooks_list' as a %}
-    {% url 'recent_daisy_list' as d %}
-    <p class='normal-text'>
-        {% blocktrans %}You can also see <a href="{{a}}">recent audiobooks</a>
-        and <a href="{{d}}">recent DAISY files</a>.{% endblocktrans %}
-    </p>
+  {% url 'recent_audiobooks_list' as a %}
+  {% url 'recent_daisy_list' as d %}
+  <p class='normal-text'>
+    {% blocktrans %}You can also see <a href="{{a}}">recent audiobooks</a>
+    and <a href="{{d}}">recent DAISY files</a>.{% endblocktrans %}
+  </p>
 
-    <div id="books-list">
-        {% work_list object_list %}
-    </div>
+  <div id="books-list">
+    {% work_list object_list %}
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/related_books.html b/src/catalogue/templates/catalogue/related_books.html
index 03d779342..74e680f59 100755
--- a/src/catalogue/templates/catalogue/related_books.html
+++ b/src/catalogue/templates/catalogue/related_books.html
@@ -1,29 +1,28 @@
 {% spaceless %}
-{% load catalogue_random_book from catalogue_tags %}
-{% load picture_random_picture from picture_tags %}
-{% load ssi_include from ssify %}
-{% load cache %}
+  {% load catalogue_random_book from catalogue_tags %}
+  {% load picture_random_picture from picture_tags %}
+  {% load ssi_include from ssify %}
+  {% load cache %}
 
-{% for pic in pics %}
+  {% for pic in pics %}
     {% ssi_include 'picture_mini' pk=pic.pk %}
-{% endfor %}
+  {% endfor %}
 
-{% for book in books %}
+  {% for book in books %}
     {% cache 86400 book_mini_box book.pk %}
       {% include 'catalogue/book_mini_box.html' %}
     {% endcache %}
     {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
-{% endfor %}
+  {% endfor %}
 
-{% if random %}
+  {% if random %}
     {% catalogue_random_book random_excluded_books as random_book_pk %}
     {% picture_random_picture random_excluded_pics unless=random_book_pk as random_pic_pk %}
     {{ random_book_pk.if }}
-        {% ssi_include 'catalogue_book_mini' pk=random_book_pk %}
+      {% ssi_include 'catalogue_book_mini' pk=random_book_pk %}
     {{ random_book_pk.endif }}
     {{ random_pic_pk.if }}
-        {% ssi_include 'picture_mini' pk=random_pic_pk %}
+      {% ssi_include 'picture_mini' pk=random_pic_pk %}
     {{ random_pic_pk.endif }}
-{% endif %}
-
+  {% endif %}
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/catalogue/templates/catalogue/search_multiple_hits.html b/src/catalogue/templates/catalogue/search_multiple_hits.html
index 24a7a7930..28e3985b9 100644
--- a/src/catalogue/templates/catalogue/search_multiple_hits.html
+++ b/src/catalogue/templates/catalogue/search_multiple_hits.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load pagination_tags %}
 {% load inline_tag_list from catalogue_tags %}
@@ -10,128 +10,132 @@
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    {% if did_you_mean %}
-      <span class="did_you_mean">{% trans "Did you mean" %} <a href="{% url 'search' %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a>?</span>
+  {% if did_you_mean %}
+    <span class="did_you_mean">{% trans "Did you mean" %}
+      <a href="{% url 'search' %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a>?</span>
+  {% endif %}
+  <!-- tu pójdą trafienia w tagi: Autorzy - z description oraz motywy i rodzaje -->
+  <div class="inline-tag-lists top-tag-list">
+    {% if tags.author %}
+      <div>
+        <h2>{% trans "Authors" %}:</h2>
+        {% for tag in tags.author %}
+          <a class="tag-box" href="{{ tag.get_absolute_url }}">
+            {% ssi_include "catalogue_tag_box" pk=tag.pk %}
+          </a>
+        {% endfor %}
+      </div>
     {% endif %}
-    <!-- tu pójdą trafienia w tagi: Autorzy - z description oraz motywy i rodzaje -->
-      <div class="inline-tag-lists top-tag-list">
-	{% if tags.author %}
-	<div>
-	  <h2>{% trans "Authors" %}:</h2>
-      {% for tag in tags.author %}
-      <a class="tag-box" href="{{ tag.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=tag.pk %}
-      </a>
-      {% endfor %}
-	</div>
-	{% endif %}
-	{% if tags.kind %}
-	<div>
-	  <h2>{% trans "Kinds" %}:</h2>
-      {% for tag in tags.kind %}
-      <a class="tag-box" href="{{ tag.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=tag.pk %}
-      </a>
-      {% endfor %}
-	</div>
-	{% endif %}
-	{% if tags.genre %}
-	<div>
-	  <h2>{% trans "Genres" %}:</h2>
-      {% for tag in tags.genre %}
-      <a class="tag-box" href="{{ tag.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=tag.pk %}
-      </a>
-      {% endfor %}
-	</div>
-	{% endif %}
-	{% if tags.epoch %}
-	<div class="inline-tag-list">
-	  <h2>{% trans "Epochs" %}:</h2>
-      {% for tag in tags.epoch %}
-      <a class="tag-box" href="{{ tag.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=tag.pk %}
-      </a>
-      {% endfor %}
-	</div>
-	{% endif %}
+    {% if tags.kind %}
+      <div>
+        <h2>{% trans "Kinds" %}:</h2>
+        {% for tag in tags.kind %}
+          <a class="tag-box" href="{{ tag.get_absolute_url }}">
+            {% ssi_include "catalogue_tag_box" pk=tag.pk %}
+          </a>
+        {% endfor %}
+      </div>
+    {% endif %}
+    {% if tags.genre %}
+      <div>
+        <h2>{% trans "Genres" %}:</h2>
+        {% for tag in tags.genre %}
+          <a class="tag-box" href="{{ tag.get_absolute_url }}">
+            {% ssi_include "catalogue_tag_box" pk=tag.pk %}
+          </a>
+        {% endfor %}
       </div>
+    {% endif %}
+    {% if tags.epoch %}
+      <div class="inline-tag-list">
+        <h2>{% trans "Epochs" %}:</h2>
+        {% for tag in tags.epoch %}
+          <a class="tag-box" href="{{ tag.get_absolute_url }}">
+            {% ssi_include "catalogue_tag_box" pk=tag.pk %}
+          </a>
+        {% endfor %}
+      </div>
+    {% endif %}
+  </div>
 
-    {% if results.title %}
+  {% if results.title %}
     <div class="book-list-header">
       <div class="book-box-inner">
-      <p>{% trans "Results by title" %}</p>
+        <p>{% trans "Results by title" %}</p>
       </div>
     </div>
     <div>
       <ol class="work-list">
-	{% for result in results.title %}<li class="Book-item">
-	  {% ssi_include 'catalogue_book_short' pk=result.book.pk %}
-	</li>{% endfor %}
+        {% for result in results.title %}
+          <li class="Book-item">
+            {% ssi_include 'catalogue_book_short' pk=result.book.pk %}
+          </li>
+        {% endfor %}
       </ol>
     </div>
-    {% endif %}
+  {% endif %}
 
-    {% if results.author %}
+  {% if results.author %}
     <div class="book-list-header">
       <div class="book-box-inner">
-	<p>{% trans "Results by authors" %}</p>
+        <p>{% trans "Results by authors" %}</p>
       </div>
     </div>
     <div>
       <ol class="work-list">
-	{% for author in results.author %}<li class="Book-item">{% ssi_include 'catalogue_book_short' pk=author.book.pk %}</li>{% endfor %}
+        {% for author in results.author %}
+          <li class="Book-item">{% ssi_include 'catalogue_book_short' pk=author.book.pk %}</li>
+        {% endfor %}
       </ol>
     </div>
-    {% endif %}
+  {% endif %}
 
-    {% if results.translator %}
+  {% if results.translator %}
     <div class="book-list-header">
       <div class="book-box-inner">
-	<p>{% trans "Results by translators" %}</p>
+        <p>{% trans "Results by translators" %}</p>
       </div>
     </div>
     <div>
       <ol class="work-list">
-	{% for translator in results.translator %}<li class="Book-item">{% ssi_include 'catalogue_book_short' pk=translator.book.pk %}</li>{% endfor %}
+        {% for translator in results.translator %}
+          <li class="Book-item">{% ssi_include 'catalogue_book_short' pk=translator.book.pk %}</li>
+        {% endfor %}
       </ol>
     </div>
-    {% endif %}
+  {% endif %}
 
-    {% if results.content %}
-    <div class="book-list-header">
-      <div class="book-box-inner">
+  {% if results.content %}
+  <div class="book-list-header">
+    <div class="book-box-inner">
       <p>{% trans "Results in text" %}</p>
-      </div>
     </div>
-    <div>
-      <ol class="work-list">
-	{% for result in results.content %}
-	<li class="Book-item">
+  </div>
+  <div>
+    <ol class="work-list">
+      {% for result in results.content %}
+        <li class="Book-item">
           {% book_searched result %}
-	</li>
-	{% endfor %}
-      </ol>
-    </div>
-    {% endif %}
+        </li>
+      {% endfor %}
+    </ol>
+  </div>
+  {% endif %}
 
-    {% if results.other %}
+  {% if results.other %}
     <div class="book-list-header">
       <div class="book-box-inner">
-	<p>{% trans "Other results" %}</p>
+        <p>{% trans "Other results" %}</p>
       </div>
     </div>
     <div>
       <ol class="work-list">
-	{% for result in results.other %}
-	<li class="Book-item">
-          {% book_searched result %}
-	</li>
-	{% endfor %}
+        {% for result in results.other %}
+          <li class="Book-item">
+            {% book_searched result %}
+          </li>
+        {% endfor %}
       </ol>
     </div>
-    {% endif %}
-
-
-
+  {% endif %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/search_no_hits.html b/src/catalogue/templates/catalogue/search_no_hits.html
index a2c9a63a7..50001f6ec 100644
--- a/src/catalogue/templates/catalogue/search_no_hits.html
+++ b/src/catalogue/templates/catalogue/search_no_hits.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
@@ -7,24 +7,25 @@
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Search" %}</h1>
+  <h1>{% trans "Search" %}</h1>
 
-    <div class="left-column">
+  <div class="left-column">
     <div class="normal-text">
-      <p>    
-	{% if did_you_mean %}
-	<span class="did_you_mean">{% trans "Did you mean" %} <a href="{% url 'search' %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a>?</span>
-	{% endif %}
+      <p>
+        {% if did_you_mean %}
+          <span class="did_you_mean">{% trans "Did you mean" %}
+            <a href="{% url 'search' %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a>?</span>
+        {% endif %}
       </p>
-        <p>{% trans "Sorry! Search cirteria did not match any resources." %}</p>
+      <p>{% trans "Sorry! Search cirteria did not match any resources." %}</p>
 
-		<p>{% blocktrans %}Search engine supports following criteria: title, author, theme/topic, epoch, kind and genre.
-		As for now we do not support full text search.{% endblocktrans %}</p>
-        {% include "info/join_us.html" %}
-    </div>
+      <p>{% blocktrans %}Search engine supports following criteria: title, author, theme/topic, epoch, kind and genre.
+        As for now we do not support full text search.{% endblocktrans %}</p>
+      {% include "info/join_us.html" %}
     </div>
+  </div>
 
-    <div class="right-column">
-        {% include "publishing_suggest.html" %}
-    </div>
+  <div class="right-column">
+    {% include "publishing_suggest.html" %}
+  </div>
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/search_too_short.html b/src/catalogue/templates/catalogue/search_too_short.html
index 62d0ad022..253a94b5c 100644
--- a/src/catalogue/templates/catalogue/search_too_short.html
+++ b/src/catalogue/templates/catalogue/search_too_short.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
@@ -7,11 +7,10 @@
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Search" %}</h1>
-
-    <div id="books-list">
-        <p>{% trans "Sorry! Search query must have at least two characters." %}</p>
-        {% include "info/join_us.html" %}
-    </div>
+  <h1>{% trans "Search" %}</h1>
 
+  <div id="books-list">
+    <p>{% trans "Sorry! Search query must have at least two characters." %}</p>
+    {% include "info/join_us.html" %}
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/catalogue/templates/catalogue/snippets/audiobook_list.html b/src/catalogue/templates/catalogue/snippets/audiobook_list.html
index d7f599274..73f9f6ad3 100755
--- a/src/catalogue/templates/catalogue/snippets/audiobook_list.html
+++ b/src/catalogue/templates/catalogue/snippets/audiobook_list.html
@@ -2,11 +2,11 @@
 
 {% audiobook_tree orphans books_by_parent %}
 {% for author, group in books_by_author.items %}
-    {% if group %}
-        <a name="{{ author.slug }}"></a>
-        <div class="group">
-            <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
-            {% audiobook_tree group books_by_parent %}
-        </div>
-    {% endif %}
+  {% if group %}
+    <a name="{{ author.slug }}"></a>
+    <div class="group">
+      <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
+      {% audiobook_tree group books_by_parent %}
+    </div>
+  {% endif %}
 {% endfor %}
diff --git a/src/catalogue/templates/catalogue/snippets/book_list.html b/src/catalogue/templates/catalogue/snippets/book_list.html
index 526dcbbcc..5f1a04fd7 100755
--- a/src/catalogue/templates/catalogue/snippets/book_list.html
+++ b/src/catalogue/templates/catalogue/snippets/book_list.html
@@ -2,11 +2,11 @@
 
 {% book_tree orphans books_by_parent %}
 {% for author, group in books_by_author.items %}
-    {% if group %}
-        <a name="{{ author.slug }}"></a>
-        <div class="group">
-            <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
-            {% book_tree group books_by_parent %}
-        </div>
-    {% endif %}
+  {% if group %}
+    <a name="{{ author.slug }}"></a>
+    <div class="group">
+      <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
+      {% book_tree group books_by_parent %}
+    </div>
+  {% endif %}
 {% endfor %}
diff --git a/src/catalogue/templates/catalogue/snippets/book_list_nav.html b/src/catalogue/templates/catalogue/snippets/book_list_nav.html
index 258824df3..a08b6970b 100755
--- a/src/catalogue/templates/catalogue/snippets/book_list_nav.html
+++ b/src/catalogue/templates/catalogue/snippets/book_list_nav.html
@@ -1,10 +1,12 @@
 {% for index, authors in books_nav.items %}
-    <ul>
-        <li><a class="book-list-index" href="#">{{ index|upper }}</a></li>
-        <ul class="book-list-show-index">
-        {% for author in authors %}
-            <li><a href="#{{ author.slug }}">{{ author }}</a></li>
-        {% endfor %}
-        </ul>
-    </ul>
+  <ul>
+    <li><a class="book-list-index" href="#">{{ index|upper }}</a></li>
+    <li>
+      <ul class="book-list-show-index">
+      {% for author in authors %}
+        <li><a href="#{{ author.slug }}">{{ author }}</a></li>
+      {% endfor %}
+      </ul>
+    </li>
+  </ul>
 {% endfor %}
diff --git a/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html b/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html
index 1528f3a30..fb381ed6c 100644
--- a/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html
+++ b/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 {% if not NO_CUSTOM_PDF %}
-    <a href="{% url 'custom_pdf_form' book.slug %}">{% trans "Download a custom PDF" %}</a>
+  <a href="{% url 'custom_pdf_form' book.slug %}">{% trans "Download a custom PDF" %}</a>
 {% endif %}
diff --git a/src/catalogue/templates/catalogue/snippets/license_icon.html b/src/catalogue/templates/catalogue/snippets/license_icon.html
index 732e3bf92..0dbdad3c6 100755
--- a/src/catalogue/templates/catalogue/snippets/license_icon.html
+++ b/src/catalogue/templates/catalogue/snippets/license_icon.html
@@ -3,8 +3,7 @@
 
 {% if license_url %}
 <a class="license-icon" href="{{ license_url }}"
-    title="{% trans "Free license" %}: {{ license_description }}">
-    <img src="{% static icon %}"
-        alt="{% trans "Free license" %}: {{ license_description }}" />
+   title="{% trans "Free license" %}: {{ license_description }}">
+  <img src="{% static icon %}" alt="{% trans "Free license" %}: {{ license_description }}"/>
 </a>
 {% endif %}
diff --git a/src/catalogue/templates/catalogue/snippets/like_button.html b/src/catalogue/templates/catalogue/snippets/like_button.html
index aa6969cd6..6f0902e58 100644
--- a/src/catalogue/templates/catalogue/snippets/like_button.html
+++ b/src/catalogue/templates/catalogue/snippets/like_button.html
@@ -2,13 +2,16 @@
 {% load likes_book from social_tags %}
 {% likes_book book.pk as likes %}
 <div class="star {{ likes.if }}{{ likes.else }}un{{ likes.endif }}like">
-    <div class="if-like" >
-        <a id="social-book-sets-{{ book.slug }}" data-callback='social-book-sets' class='ajaxable' href='{% url "social_book_sets" book.slug %}'>★</a>
-    </div>
-    <div class="if-unlike">
-        <form id="social-like-book-{{ book.slug }}" data-callback='social-like-book' method='post' class='ajax-form' action='{% url "social_like_book" book.slug %}'>
-            {% ssi_csrf_token %}
-            <button type='submit'>☆</button>
-        </form>
-    </div>
+  <div class="if-like" >
+    <a id="social-book-sets-{{ book.slug }}" data-callback='social-book-sets'
+       class='ajaxable' href='{% url "social_book_sets" book.slug %}'>★</a>
+  </div>
+  <div class="if-unlike">
+    <form id="social-like-book-{{ book.slug }}"
+          data-callback='social-like-book' method='post'
+          class='ajax-form' action='{% url "social_like_book" book.slug %}'>
+      {% ssi_csrf_token %}
+      <button type='submit'>☆</button>
+    </form>
+  </div>
 </div>
diff --git a/src/catalogue/templates/catalogue/tag_box.html b/src/catalogue/templates/catalogue/tag_box.html
index 1398ca9fb..f76df32cb 100644
--- a/src/catalogue/templates/catalogue/tag_box.html
+++ b/src/catalogue/templates/catalogue/tag_box.html
@@ -1,10 +1,11 @@
 {% spaceless %}
-{% load i18n %}
-{% load catalogue_tags %}
-<div class="white-box normal-text">
-  <h2>{% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}</h2>
-  {% if tag.description %}
-    {{ tag.description|strip_tag:"a"|safe|truncatewords_html:40 }}
-  {% endif %}
-</div>
+  {% load i18n %}
+  {% load catalogue_tags %}
+
+  <div class="white-box normal-text">
+    <h2>{% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}</h2>
+    {% if tag.description %}
+      {{ tag.description|strip_tag:"a"|safe|truncatewords_html:40 }}
+    {% endif %}
+  </div>
 {% endspaceless %}
diff --git a/src/catalogue/templates/catalogue/tag_catalogue.html b/src/catalogue/templates/catalogue/tag_catalogue.html
index 22a678f3d..5f7e61b8d 100644
--- a/src/catalogue/templates/catalogue/tag_catalogue.html
+++ b/src/catalogue/templates/catalogue/tag_catalogue.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load plain_list from catalogue_tags %}
 {% load ssi_include from ssify %}
@@ -8,16 +8,15 @@
 {% block bodyid %}tag-catalogue{% endblock %}
 
 {% block body %}
-<h1>{{ title|title }} {% trans "on Wolne Lektury" %}</h1>
+  <h1>{{ title|title }} {% trans "on Wolne Lektury" %}</h1>
 
-{% for tag in best %}
-      <a class="tag-box" href="{{ tag.get_absolute_url }}">
+  {% for tag in best %}
+    <a class="tag-box" href="{{ tag.get_absolute_url }}">
       {% ssi_include "catalogue_tag_box" pk=tag.pk %}
-      </a>
-{% endfor %}
+    </a>
+  {% endfor %}
 
-<h2>{{ whole_category }}</h2>
-
-{% plain_list tags %}
+  <h2>{{ whole_category }}</h2>
 
+  {% plain_list tags %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/tag_list.html b/src/catalogue/templates/catalogue/tag_list.html
index 2a7fd6a6b..69ed8a884 100644
--- a/src/catalogue/templates/catalogue/tag_list.html
+++ b/src/catalogue/templates/catalogue/tag_list.html
@@ -1,21 +1,22 @@
 {% spaceless %}
 
-{% load i18n %}
-{% load catalogue_tags %}
-{% if one_tag %}
+  {% load i18n %}
+  {% load catalogue_tags %}
+
+  {% if one_tag %}
     <p>{% trans "See full category" %} <a href="{% catalogue_url 'default' one_tag %}">{{ one_tag }}</a></p>
-{% else %}
+  {% else %}
     <ul>
-        {% if choices %}
+      {% if choices %}
         {% for tag in tags %}
-            <li><a href="{% catalogue_url 'default' choices tag %}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
+          <li><a href="{% catalogue_url 'default' choices tag %}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
         {% endfor %}
-        {% else %}
+      {% else %}
         {% for tag in tags %}
-            <li><a href="{{ tag.get_absolute_url }}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
+          <li><a href="{{ tag.get_absolute_url }}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
         {% endfor %}
-        {% endif %}
+      {% endif %}
     </ul>
-{% endif %}
+  {% endif %}
 
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/catalogue/templates/catalogue/tag_list_split.html b/src/catalogue/templates/catalogue/tag_list_split.html
index cb7ab26ec..d4769d126 100644
--- a/src/catalogue/templates/catalogue/tag_list_split.html
+++ b/src/catalogue/templates/catalogue/tag_list_split.html
@@ -1,10 +1,11 @@
 {% load i18n %}
+
 {% if books %}
-<p>{% trans "Literature" %}:</p>
-<div>{{books|safe}}</div>
+  <p>{% trans "Literature" %}:</p>
+  <div>{{books|safe}}</div>
 {% endif %}
 
 {% if pictures %}
-<p>{% trans "Gallery" %}:</p>
-<div>{{pictures|safe}}</div>
+  <p>{% trans "Gallery" %}:</p>
+  <div>{{pictures|safe}}</div>
 {% endif %}
diff --git a/src/catalogue/templates/catalogue/tagged_object_list.html b/src/catalogue/templates/catalogue/tagged_object_list.html
index 7603d7b97..f83c7d5cd 100644
--- a/src/catalogue/templates/catalogue/tagged_object_list.html
+++ b/src/catalogue/templates/catalogue/tagged_object_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags switch_tag social_tags %}
 {% load ssi_include from ssify %}
@@ -8,120 +8,118 @@
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-<div class="tabbed-filter">
+  <div class="tabbed-filter">
     <h1>{% if tags %}{% html_title_from_tags tags %}{% endif %}</h1>
 
     <div class="tabs">
-        <a class="tab white-box" data-id="authors">{% trans "Authors" %}</a>
-        <a class="tab white-box" data-id="epochs">{% trans "Epochs" %}</a>
-        <a class="tab white-box" data-id="genres">{% trans "Genres" %}</a>
-        <a class="tab white-box" data-id="kinds">{% trans "Kinds" %}</a>
-        {% if theme_is_set %}
-            <a class="tab white-box" data-id="themes">{% trans "Themes" %}</a>
-        {% endif %}
+      <a class="tab white-box" data-id="authors">{% trans "Authors" %}</a>
+      <a class="tab white-box" data-id="epochs">{% trans "Epochs" %}</a>
+      <a class="tab white-box" data-id="genres">{% trans "Genres" %}</a>
+      <a class="tab white-box" data-id="kinds">{% trans "Kinds" %}</a>
+      {% if theme_is_set %}
+        <a class="tab white-box" data-id="themes">{% trans "Themes" %}</a>
+      {% endif %}
     </div>
-</div>
+  </div>
 
-<div class="tabbed-filter-contents">
+  <div class="tabbed-filter-contents">
     <div id="authors" class="white-box normal-text tab-content">
-        {% inline_tag_list categories.author tags 'author' list_type=list_type %}
+      {% inline_tag_list categories.author tags 'author' list_type=list_type %}
     </div>
     <div id="epochs" class="white-box normal-text tab-content">
-        {% inline_tag_list categories.epoch tags 'epoch' list_type=list_type %}
+      {% inline_tag_list categories.epoch tags 'epoch' list_type=list_type %}
     </div>
     <div id="genres" class="white-box normal-text tab-content">
-        {% inline_tag_list categories.genre tags 'genre' list_type=list_type %}
+      {% inline_tag_list categories.genre tags 'genre' list_type=list_type %}
     </div>
     <div id="kinds" class="white-box normal-text tab-content">
-        {% inline_tag_list categories.kind tags 'kind' list_type=list_type %}
+      {% inline_tag_list categories.kind tags 'kind' list_type=list_type %}
     </div>
     {% if theme_is_set %}
-        <div id="themes" class="white-box normal-text tab-content">
-            {% inline_tag_list categories.theme tags 'theme' list_type=list_type %}
-        </div>
+      <div id="themes" class="white-box normal-text tab-content">
+        {% inline_tag_list categories.theme tags 'theme' list_type=list_type %}
+      </div>
     {% endif %}
-</div>
+  </div>
 
-{% comment %}
-{% if list_type == 'books' and not tags %}
+  {% comment %}
+  {% if list_type == 'books' and not tags %}
     <section>
-        <h1>{% trans "Recent publications" %}</h1>
-        {% for book in last_published %}
-            {% ssi_include 'catalogue_book_mini' pk=book.pk %}
-        {% endfor %}
-        <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
+      <h1>{% trans "Recent publications" %}</h1>
+      {% for book in last_published %}
+        {% ssi_include 'catalogue_book_mini' pk=book.pk %}
+      {% endfor %}
+      <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
     </section>
     <section>
-        <h1>{% trans "Most popular books" %}</h1>
-        {% for book in most_popular %}
-            {% ssi_include 'catalogue_book_mini' pk=book.pk %}
-        {% endfor %}
+      <h1>{% trans "Most popular books" %}</h1>
+      {% for book in most_popular %}
+        {% ssi_include 'catalogue_book_mini' pk=book.pk %}
+      {% endfor %}
     </section>
-{% endif %}
-{% endcomment %}
+  {% endif %}
+  {% endcomment %}
 
-{% if theme_is_set %}
+  {% if theme_is_set %}
     {% work_list object_list %}
-{% else %}
+  {% else %}
     <div id="books-list">
-        {% if object_list %}
-            {% work_list best %}
-            {% if tags %}
-                <h2>{% trans "All matching works" %}</h2>
-            {% else %}
-                {% if list_type == 'audiobooks' %}
-                    <h2>{% trans "Listing of all audiobooks" %}</h2>
-                {% else %}
-                    <h2>{% trans "All works" %}</h2>
-                 {% endif %}
-            {% endif %}
-            {% plain_list object_list by_author=True list_type=list_type %}
-            {% if daisy %}
-                <h2>{% trans "DAISY files" %}</h2>
-                {% plain_list daisy by_author=True %}
-            {% endif %}
+      {% if object_list %}
+        {% work_list best %}
+        {% if tags %}
+          <h2>{% trans "All matching works" %}</h2>
         {% else %}
-            {% trans "Sorry! Search cirteria did not match any resources." %}
-            {% include "info/join_us.html" %}
+          {% if list_type == 'audiobooks' %}
+            <h2>{% trans "Listing of all audiobooks" %}</h2>
+          {% else %}
+            <h2>{% trans "All works" %}</h2>
+          {% endif %}
+        {% endif %}
+        {% plain_list object_list by_author=True list_type=list_type %}
+        {% if daisy %}
+          <h2>{% trans "DAISY files" %}</h2>
+          {% plain_list daisy by_author=True %}
         {% endif %}
+      {% else %}
+        {% trans "Sorry! Search cirteria did not match any resources." %}
+        {% include "info/join_us.html" %}
+      {% endif %}
     </div>
 
     {% if categories.theme and list_type != 'audiobooks' %}
-        <h2>{% trans "Motifs and themes" %}</h2>
-        {% plain_list categories.theme choice=tags list_type=list_type %}
+      <h2>{% trans "Motifs and themes" %}</h2>
+      {% plain_list categories.theme choice=tags list_type=list_type %}
     {% endif %}
+  {% endif %}
 
-{% endif %}
-
-{% for tag in tags %}
+  {% for tag in tags %}
     {% if tag.category != 'set' %}
-        <h2>{% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}</h2>
-        <div class="white-box">
-            {% if tag.has_description %}
-                {{ tag.description|safe }}
-            {% else %}
-                <em>{% trans "No description." %}</em>
-            {% endif %}
-        </div>
-
-        {% if tag.gazeta_link %}
-            <div class="white-box"><a href="{{ tag.gazeta_link }}">
-                {{ tag }} {% trans "in Lektury.Gazeta.pl" %}
-            </a></div>
-        {% endif %}
-        {% if tag.wiki_link %}
-            <div class="white-box">
-            <a href="{{ tag.wiki_link }}">
-                {{ tag }} {% trans "in Wikipedia" %}
-            </a></div>
-        {% endif %}
-        {% if tag.culturepl_link %}
-            <div class="white-box">
-            <a href="{{ tag.culturepl_link }}">
-                {{ tag }} {% trans "in Culture.pl" %}
-            </a></div>
+      <h2>{% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}</h2>
+      <div class="white-box">
+        {% if tag.has_description %}
+          {{ tag.description|safe }}
+        {% else %}
+          <em>{% trans "No description." %}</em>
         {% endif %}
-    {% endif %}
-{% endfor %}
+      </div>
 
+      {% if tag.gazeta_link %}
+        <div class="white-box"><a href="{{ tag.gazeta_link }}">
+          {{ tag }} {% trans "in Lektury.Gazeta.pl" %}
+        </a></div>
+      {% endif %}
+      {% if tag.wiki_link %}
+        <div class="white-box">
+        <a href="{{ tag.wiki_link }}">
+          {{ tag }} {% trans "in Wikipedia" %}
+        </a></div>
+      {% endif %}
+      {% if tag.culturepl_link %}
+        <div class="white-box">
+        <a href="{{ tag.culturepl_link }}">
+          {{ tag }} {% trans "in Culture.pl" %}
+        </a></div>
+      {% endif %}
+    {% endif %}
+  {% endfor %}
 {% endblock %}
diff --git a/src/catalogue/templates/catalogue/viewer_base.html b/src/catalogue/templates/catalogue/viewer_base.html
index 2f2394b37..3a8372a72 100644
--- a/src/catalogue/templates/catalogue/viewer_base.html
+++ b/src/catalogue/templates/catalogue/viewer_base.html
@@ -4,72 +4,67 @@
 {% load pipeline %}
 {% load piwik_tags %}
 <html class="no-js">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-        <title>{% block title %}{% endblock %} :: {% trans "Wolne Lektury" %}</title>
-        <link rel="icon" href="{% static "img/favicon.png" %}" type="image/x-icon" />
-        {% stylesheet "book_text" %}
-        {% block extrahead %}{% endblock %}
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>{% block title %}{% endblock %} :: {% trans "Wolne Lektury" %}</title>
+    <link rel="icon" href="{% static "img/favicon.png" %}" type="image/x-icon" />
+    {% stylesheet "book_text" %}
+    {% block extrahead %}{% endblock %}
+  </head>
+  <body id="{% block body-id %}reader{% endblock %}">
+    <nav id="no-menu"><ul>
+      <li><a href="#" id="menu-toggle-on"></a></li>
+      {% block no-menu-extra %}{% endblock %}
+    </ul></nav>
 
-    </head>
-    <body id="{% block body-id %}reader{% endblock %}">
-        <nav id="no-menu"><ul>
-            <li><a href="#" id="menu-toggle-on"></a></li>
-            {% block no-menu-extra %}{% endblock %}
-        </ul></nav>
-
-        <nav id="menu"><ul>
-            <li><a href="#" id="menu-toggle-off"></a></li>
-
-            <li><a href="/">
-                <img src="{% static 'img/logo-neon.png' %}" width="80"
-                    alt="Wolne Lektury"
-                    title="Wolne Lektury">
-            </a></li>
-
-            {% block menu %}
-            {% endblock menu %}
-
-        </ul></nav>
-
-        {% block big-pane %}
-        <div id="big-pane">
+    <nav id="menu">
+      <ul>
+        <li><a href="#" id="menu-toggle-off"></a></li>
+        <li>
+          <a href="/">
+            <img src="{% static 'img/logo-neon.png' %}" width="80"
+                 alt="Wolne Lektury"
+                 title="Wolne Lektury">
+          </a>
+        </li>
+        {% block menu %}
+        {% endblock menu %}
+      </ul>
+    </nav>
 
+    <div id="big-pane">
+      {% block big-pane %}
         {% block main %}
-        <article id="main-text">
+          <article id="main-text">
             {% block main-text %}{% endblock %}
-        </article>
+          </article>
         {% endblock main %}
-        {% endblock big-pane %}
-
-
-        <footer>
-            {% block footer %}{% endblock %}
-
-            <div id="box-underlay"></div>
-
-            {# template #}
-            <div id="ajaxable-window" class='dialog-window'>
-                <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-                <div class="target">
-                    <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
-                </div>
-            </div>
-        </footer>
+      {% endblock big-pane %}
 
+      <footer>
+        {% block footer %}{% endblock %}
+        <div id="box-underlay"></div>
+        {# template #}
+        <div id="ajaxable-window" class='dialog-window'>
+          <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
+          <div class="target">
+            <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
+          </div>
         </div>
+      </footer>
+    </div>
 
-        <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-        {% block js-dependencies %}{% endblock %}
-        <script type="text/javascript">
-            var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
-            var STATIC_URL = "{{ STATIC_URL }}";
-        </script>
-        {% javascript "book_text" %}
+    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    {% block js-dependencies %}{% endblock %}
+    <script type="text/javascript">
+      var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
+      var STATIC_URL = "{{ STATIC_URL }}";
+    </script>
+    {% javascript "book_text" %}
 
-        {% tracking_code %}
-        {% block extrabody %}{% endblock %}
-        <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
-    </body>
+    {% tracking_code %}
+    {% block extrabody %}{% endblock %}
+    <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
+  </body>
 </html>
diff --git a/src/catalogue/templates/catalogue/work-list.html b/src/catalogue/templates/catalogue/work-list.html
index 30265255a..03833c16f 100755
--- a/src/catalogue/templates/catalogue/work-list.html
+++ b/src/catalogue/templates/catalogue/work-list.html
@@ -1,19 +1,19 @@
 {% spaceless %}
 
-{% load pagination_tags %}
-{% load class_name from catalogue_tags %}
-{% load ssi_include from ssify %}
+  {% load pagination_tags %}
+  {% load class_name from catalogue_tags %}
+  {% load ssi_include from ssify %}
 
-{% autopaginate object_list 10 %}
+  {% autopaginate object_list 10 %}
 
-<ol class='work-list'>
-{% for item in object_list %}
-    <li class='{{ item|class_name }}-item'>
+  <ol class='work-list'>
+    {% for item in object_list %}
+      <li class='{{ item|class_name }}-item'>
         {% ssi_include item.short_html_url_name pk=item.pk %}
-    </li>
-{% endfor %}
-</ol>
+      </li>
+    {% endfor %}
+  </ol>
 
-{% paginate %}
+  {% paginate %}
 
 {% endspaceless %}
diff --git a/src/dictionary/templates/dictionary/note_list.html b/src/dictionary/templates/dictionary/note_list.html
index 9428655b0..3083e0479 100755
--- a/src/dictionary/templates/dictionary/note_list.html
+++ b/src/dictionary/templates/dictionary/note_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n pagination_tags %}
 {% load set_get from set_get %}
 
@@ -9,108 +9,103 @@
 
 
 {% block body %}
-    <h1>{% trans "Footnotes" %}</h1>
-
-<div class="normal-text">
-
-<p>
-{% trans "By first letter" %}:
-{% if letter %}
-    <a href='?{% set_get "page" "ltr" %}'>{% trans "all" %}</a>
-{% else %}
-    <strong>{% trans "all" %}</strong>
-{% endif %}
-
-{% for let in letters %}
-    |
-    {% if let == letter %}
-        <strong>{{ let|upper }}</strong>
-    {% else %}
-        <a href='?{% set_get "page" ltr=let %}'>{{ let|upper }}</a>
-    {% endif %}
-{% endfor %}
-</p>
-
-<p>
-{% trans "By type" %}:
-{% if fn_type %}
-    <a href='?{% set_get "page" "type" %}'>{% trans "all" %}</a>
-{% else %}
-    <strong>{% trans "all" %}</strong>
-{% endif %}
-
-{% for fnt, fnt_name in fn_types %}
-    |
-    {% if fnt == fn_type %}
-        <strong>{{ fnt_name }}</strong>
-    {% else %}
-        <a href='?{% set_get "page" type=fnt %}'>{{ fnt_name }}</a>
-    {% endif %}
-{% endfor %}
-</p>
-
-
-<p>
-{% trans "By qualifier" %}:
-{% if qualifier %}
-    <a href='?{% set_get "page" "qual" %}'>{% trans "all" %}</a>
-{% else %}
-    <strong>{% trans "all" %}</strong>
-{% endif %}
-
-{% for qual in qualifiers %}
-    |
-    {% if qual == qualifier %}
-        <strong>{{ qual }}</strong>
-    {% else %}
-        <a href='?{% set_get "page" qual=qual.qualifier %}'>{{ qual }}</a>
-    {% endif %}
-{% endfor %}
-</p>
-
-<p>
-{% trans "By language" %}:
-{% if language %}
-    <a href='?{% set_get "page" "lang" %}'>{% trans "all" %}</a>
-{% else %}
-    <strong>{% trans "all" %}</strong>
-{% endif %}
-
-{% for lang, lang_name in languages %}
-    |
-    {% if lang == language %}
-        <strong>{{ lang_name }}</strong>
-    {% else %}
-        <a href='?{% set_get "page" lang=lang %}'>{{ lang_name }}</a>
-    {% endif %}
-{% endfor %}
-</p>
-
-<hr/>
-
-<p>
-{% blocktrans count object_list.count as c %}{{c}} footnote found{% plural %}{{c}} footnotes found{% endblocktrans %}
-</p>
-
-{% if object_list.exists %}
-
-{% autopaginate object_list 100 %}
-{% paginate %}
-{% for obj in object_list %}
-    <div class='dictionary-note'>
-        {{ obj.html|safe }}
-        {% for note_source in obj.notesource_set.all %}
+  <h1>{% trans "Footnotes" %}</h1>
+
+  <div class="normal-text">
+    <p>
+      {% trans "By first letter" %}:
+      {% if letter %}
+        <a href='?{% set_get "page" "ltr" %}'>{% trans "all" %}</a>
+      {% else %}
+        <strong>{% trans "all" %}</strong>
+      {% endif %}
+
+      {% for let in letters %}
+        |
+        {% if let == letter %}
+          <strong>{{ let|upper }}</strong>
+        {% else %}
+          <a href='?{% set_get "page" ltr=let %}'>{{ let|upper }}</a>
+        {% endif %}
+      {% endfor %}
+    </p>
+
+    <p>
+      {% trans "By type" %}:
+      {% if fn_type %}
+        <a href='?{% set_get "page" "type" %}'>{% trans "all" %}</a>
+      {% else %}
+        <strong>{% trans "all" %}</strong>
+      {% endif %}
+
+      {% for fnt, fnt_name in fn_types %}
+        |
+        {% if fnt == fn_type %}
+          <strong>{{ fnt_name }}</strong>
+        {% else %}
+          <a href='?{% set_get "page" type=fnt %}'>{{ fnt_name }}</a>
+        {% endif %}
+      {% endfor %}
+    </p>
+
+
+    <p>
+      {% trans "By qualifier" %}:
+      {% if qualifier %}
+        <a href='?{% set_get "page" "qual" %}'>{% trans "all" %}</a>
+      {% else %}
+        <strong>{% trans "all" %}</strong>
+      {% endif %}
+
+      {% for qual in qualifiers %}
+        |
+        {% if qual == qualifier %}
+          <strong>{{ qual }}</strong>
+        {% else %}
+          <a href='?{% set_get "page" qual=qual.qualifier %}'>{{ qual }}</a>
+        {% endif %}
+      {% endfor %}
+    </p>
+
+    <p>
+      {% trans "By language" %}:
+      {% if language %}
+        <a href='?{% set_get "page" "lang" %}'>{% trans "all" %}</a>
+      {% else %}
+        <strong>{% trans "all" %}</strong>
+      {% endif %}
+
+      {% for lang, lang_name in languages %}
+        |
+        {% if lang == language %}
+          <strong>{{ lang_name }}</strong>
+        {% else %}
+          <a href='?{% set_get "page" lang=lang %}'>{{ lang_name }}</a>
+        {% endif %}
+      {% endfor %}
+    </p>
+
+    <hr/>
+
+    <p>
+      {% blocktrans count object_list.count as c %}{{c}} footnote found{% plural %}{{c}} footnotes found{% endblocktrans %}
+    </p>
+
+    {% if object_list.exists %}
+      {% autopaginate object_list 100 %}
+      {% paginate %}
+      {% for obj in object_list %}
+        <div class='dictionary-note'>
+          {{ obj.html|safe }}
+          {% for note_source in obj.notesource_set.all %}
             <div class='dictionary-note-source'>
-                <a href='{% url "book_text" note_source.book.slug %}#{{ note_source.anchor }}'>{{ note_source.book.pretty_title }}</a>
-                (<a href='{{ note_source.book.extra_info.about }}'>źródło na Platformie Redakcyjnej</a>)
+              <a href='{% url "book_text" note_source.book.slug %}#{{ note_source.anchor }}'>{{ note_source.book.pretty_title }}</a>
+              (<a href='{{ note_source.book.extra_info.about }}'>źródło na Platformie Redakcyjnej</a>)
             </div>
-        {% endfor %}
-    </div>
-{% endfor %}
-{% paginate %}
-
-{% endif %}
-
-</div>
-
+          {% endfor %}
+        </div>
+      {% endfor %}
+      {% paginate %}
+    {% endif %}
+  </div>
 {% endblock %}
diff --git a/src/funding/templates/admin/funding/offer/change_form.html b/src/funding/templates/admin/funding/offer/change_form.html
index 292d0dfeb..3a7392e4a 100755
--- a/src/funding/templates/admin/funding/offer/change_form.html
+++ b/src/funding/templates/admin/funding/offer/change_form.html
@@ -2,30 +2,26 @@
 {% load i18n %}
 
 {% block extrahead %}
-{{ block.super }}
-<script type="text/javascript">
-(function($) {
-    $(document).ready(function($) {
-        $("#generated-switch").click(function() {
-            $('#generated').toggle()
+  {{ block.super }}
+  <script type="text/javascript">
+    (function($) {
+        $(document).ready(function($) {
+            $("#generated-switch").click(function() {
+                $('#generated').toggle()
+            });
         });
-    });
-})(django.jQuery);
-</script>
+    })(django.jQuery);
+  </script>
 {% endblock %}
 
-
-
 {% block pretitle %}
-
-
-<a id="generated-switch">↓ {% trans "fundings" %} ↓</a>
-<div id="generated" style="display:none; padding:1em; border: 1px solid #aaa;">{% spaceless %}
+  <a id="generated-switch">↓ {% trans "fundings" %} ↓</a>
+  <div id="generated" style="display:none; padding:1em; border: 1px solid #aaa;">{% spaceless %}
     {% for funding in original.funders %}
-        {% if funding.name %}
-            &lt;dc:contributor.funding xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">{{ funding.name }}&lt;/dc:contributor.funding><br/>
-        {% endif %}
+      {% if funding.name %}
+        &lt;dc:contributor.funding xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">{{ funding.name }}&lt;/dc:contributor.funding><br/>
+      {% endif %}
     {% endfor %}
-{% endspaceless %}</div>
-{{ block.super }}
+  {% endspaceless %}</div>
+  {{ block.super }}
 {% endblock %}
diff --git a/src/funding/templates/funding/disable_notifications.html b/src/funding/templates/funding/disable_notifications.html
index 9123310d9..ed5c3a677 100644
--- a/src/funding/templates/funding/disable_notifications.html
+++ b/src/funding/templates/funding/disable_notifications.html
@@ -1,34 +1,28 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load fnp_share %}
 
 {% block titleextra %}{% trans "Payment failed" %}{% endblock %}
 
 {% block body %}
-
-<h1>{% trans "Disable notifications" %}</h1>
-<div class="white-box normal-text">
-
-{% if view.object.notifications %}
-
-<p>{% blocktrans with e=view.object.email %}Are you sure you want to disable notifications for address {{e}}?{% endblocktrans %}</p>
-<form method="post" action="">
-    <button>{% trans "Disable notifications" %}</button>
-</form>
-
-{% else %}
-
-<p>{% blocktrans with e=view.object.email %}Notifications for address {{e}} have been successfully disabled.{% endblocktrans %}</p>
-
-{% endif %}
-
-{% url 'funding_current' as current %}
-<p>
-{% blocktrans with current=current %}Return to the <a href="{{current}}">current fundraiser</a>.{% endblocktrans %}
-</p>
-
-
-</div>
-
-
+  <h1>{% trans "Disable notifications" %}</h1>
+  <div class="white-box normal-text">
+    {% if view.object.notifications %}
+      <p>
+        {% blocktrans with e=view.object.email %}Are you sure you want to disable notifications for address {{e}}?{% endblocktrans %}
+      </p>
+      <form method="post" action="">
+        <button>{% trans "Disable notifications" %}</button>
+      </form>
+    {% else %}
+      <p>
+        {% blocktrans with e=view.object.email %}Notifications for address {{e}} have been successfully disabled.{% endblocktrans %}
+      </p>
+    {% endif %}
+
+    {% url 'funding_current' as current %}
+    <p>
+      {% blocktrans with current=current %}Return to the <a href="{{current}}">current fundraiser</a>.{% endblocktrans %}
+    </p>
+  </div>
 {% endblock %}
diff --git a/src/funding/templates/funding/includes/funding.html b/src/funding/templates/funding/includes/funding.html
index c8f62d275..3d24b7df2 100644
--- a/src/funding/templates/funding/includes/funding.html
+++ b/src/funding/templates/funding/includes/funding.html
@@ -1,72 +1,69 @@
 {% spaceless %}
+  {% load i18n %}
+  {% load time_tags %}
 
-{% load i18n %}
-{% load time_tags %}
-
-{% if offer %}
-
-<div {% if closeable %}id="funding-closeable" {% endif %}class="funding {{ add_class }}" data-offer-id="{{offer.id}}" style="">
-    {% if closeable %}<a href="#" class="close">X</a>{% endif %}
-    {% if link and is_current %}
+  {% if offer %}
+    <div {% if closeable %}id="funding-closeable" {% endif %}class="funding {{ add_class }}"
+         data-offer-id="{{offer.id}}" style="">
+      {% if closeable %}<a href="#" class="close">X</a>{% endif %}
+      {% if link and is_current %}
         <div class="call-area">
-            <a class="call honking" href="{% url 'funding_current' offer.slug %}">
-                {% trans "Support!" %}</a>
-            <div class="learn-more">
-                <a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>
-            </div>
+          <a class="call honking" href="{% url 'funding_current' offer.slug %}">
+            {% trans "Support!" %}
+          </a>
+          <div class="learn-more">
+            <a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>
+          </div>
         </div>
-    {% endif %}
-    <div class="description {% if link and is_current %}with-button{% endif %}">
-    {% if link %}<a href="{% if is_current %}{% url 'funding_current' offer.slug %}{% else %}{{ offer.get_absolute_url }}{% endif %}">{% endif %}
-    {% if show_title %}
+      {% endif %}
+      <div class="description {% if link and is_current %}with-button{% endif %}">
+      {% if link %}
+        <a href="{% if is_current %}{% url 'funding_current' offer.slug %}{% else %}{{ offer.get_absolute_url }}{% endif %}">
+      {% endif %}
+      {% if show_title %}
         {% if is_current and show_title_calling %}<strong style="margin-right: .6em;">{% trans "Help free the book!" %}</strong>{% endif %}
         <span class="funding-title{% if not is_current %}-strong{% endif %}">{{ offer }}</span>
-    {% endif %}
+      {% endif %}
 
-    <div class="progress"
-        style="text-align: center; background-size: {{ percentage|stringformat:'.2f' }}% 1px;"
-    >
+      <div class="progress" style="text-align: center; background-size: {{ percentage|stringformat:'.2f' }}% 1px;">
         {% if sum %}
-            <span class="piece progress-collected">{% trans "collected" %}: {{ sum }} zł</span>
+          <span class="piece progress-collected">{% trans "collected" %}: {{ sum }} zł</span>
         {% endif %}
         {% if not is_win %}
-            <span class="piece progress-target"><span class="{% if sum %}progress-extralabel{% endif %}">{% trans "needed" %}: </span>{{ offer.target }} zł</span>
+          <span class="piece progress-target"><span class="{% if sum %}progress-extralabel{% endif %}">{% trans "needed" %}: </span>{{ offer.target }} zł</span>
         {% endif %}
         {% if is_current %}
-            <span class="piece progress-until"><span class="progress-extralabel">{% trans "until fundraiser end" %}:</span>
-                <span class="countdown inline" data-until='{{ offer.end|date_to_utc:True|utc_for_js }}'></span>
-            </span>
+          <span class="piece progress-until"><span class="progress-extralabel">{% trans "until fundraiser end" %}:</span>
+          <span class="countdown inline" data-until='{{ offer.end|date_to_utc:True|utc_for_js }}'></span>
+          </span>
         {% else %}
             <div style="clear: both"></div>
         {% endif %}
+      </div>
+      {% if link %}</a>{% endif %}
+      </div>
+      <div style="clear: both"></div>
     </div>
-    {% if link %}</a>{% endif %}
-    </div>
-    <div style="clear: both"></div>
-</div>
-{% if closeable %}
-    <div id="funding-handle">{% trans "Help free the book!" %}</div>
-
-<script type="text/javascript">(function() {
-var storage = true;
-try {
-    localStorage.setItem('test', 'test');
-    localStorage.removeItem('test');
-} catch (exception) {
-    storage = false;
-}
-if (storage) {
-    var closeable = document.getElementById('funding-closeable');
-    if (localStorage['hide-offer-id'] !== closeable.getAttribute('data-offer-id')) {
-        closeable.style.display = 'block';
-        document.getElementById('funding-handle').style.display = 'none';
-    }
-}
-})();</script>
-
-{% endif %}
-
-
-{% endif %}
-
+    {% if closeable %}
+      <div id="funding-handle">{% trans "Help free the book!" %}</div>
+      <script type="text/javascript">
+        (function() {
+            var storage = true;
+            try {
+                localStorage.setItem('test', 'test');
+                localStorage.removeItem('test');
+            } catch (exception) {
+                storage = false;
+            }
+            if (storage) {
+                var closeable = document.getElementById('funding-closeable');
+                if (localStorage['hide-offer-id'] !== closeable.getAttribute('data-offer-id')) {
+                    closeable.style.display = 'block';
+                    document.getElementById('funding-handle').style.display = 'none';
+                }
+            }
+        })();
+      </script>
+    {% endif %}
+  {% endif %}
 {% endspaceless %}
diff --git a/src/funding/templates/funding/includes/fundings.html b/src/funding/templates/funding/includes/fundings.html
index e13e1ec18..4d4902c84 100644
--- a/src/funding/templates/funding/includes/fundings.html
+++ b/src/funding/templates/funding/includes/fundings.html
@@ -1,28 +1,26 @@
 {% spaceless %}
+  {% load i18n %}
+  {% load pagination_tags %}
 
-{% load i18n %}
-{% load pagination_tags %}
-
-<table class="wlfund">
-
-{% for funding in fundings %}
-    <tr class="funding-plus">
+  <table class="wlfund">
+    {% for funding in fundings %}
+      <tr class="funding-plus">
         <td class="oneline">{{ funding.payed_at.date }}</td>
         <td>
-            {% if funding.name %}
-                {{ funding.name }}
-            {% else %}
-                <em>{% trans "Anonymous" %}</em>
-            {% endif %}
+          {% if funding.name %}
+            {{ funding.name }}
+          {% else %}
+            <em>{% trans "Anonymous" %}</em>
+          {% endif %}
         </td>
         <td>{{ funding.amount }}&nbsp;zł</td>
         <td>&nbsp;
-            {% for perk in funding.perks.all %}
-                {{ perk.name }}{% if not forloop.last %},{% endif %}
-            {% endfor %}
+          {% for perk in funding.perks.all %}
+            {{ perk.name }}{% if not forloop.last %},{% endif %}
+          {% endfor %}
         </td>
-{% endfor %}
-</table>
-
-{% endspaceless %}{% paginate %}
-
+      </tr>
+    {% endfor %}
+  </table>
+{% endspaceless %}
+{% paginate %}
\ No newline at end of file
diff --git a/src/funding/templates/funding/includes/offer_status.html b/src/funding/templates/funding/includes/offer_status.html
index 4d5ae05ea..ec6e95482 100644
--- a/src/funding/templates/funding/includes/offer_status.html
+++ b/src/funding/templates/funding/includes/offer_status.html
@@ -1,31 +1,31 @@
 {% load i18n %}
 
 {% if offer.is_current %}
-    {% if offer.is_win %}
-        <p>
-            {% blocktrans with end=offer.end %}The fundraiser
-            ends on {{ end }}. The full amount has been successfully
-            raised, but you can still contribute and help liberate
-            more books.{% endblocktrans %}
-        </p>
-    {% else %}
+  {% if offer.is_win %}
     <p>
-        <strong>{% blocktrans with target=offer.target|floatformat:-2 %}We need {{target}} zł to digitize it,
-        compile it and publish for free in multiple formats.{% endblocktrans %}</strong>
+      {% blocktrans with end=offer.end %}The fundraiser
+      ends on {{ end }}. The full amount has been successfully
+      raised, but you can still contribute and help liberate
+      more books.{% endblocktrans %}
     </p>
+  {% else %}
+  <p>
+    <strong>{% blocktrans with target=offer.target|floatformat:-2 %}We need {{target}} zł to digitize it,
+    compile it and publish for free in multiple formats.{% endblocktrans %}</strong>
+  </p>
+  <p>
+    {% blocktrans with end=offer.end %}If we raise enough money before {{end}} we will
+    publish it and make it available for everyone.{% endblocktrans %}
+  </p>
+  {% endif %}
+{% else %}
+  {% if offer.is_win %}
     <p>
-        {% blocktrans with end=offer.end %}If we raise enough money before {{end}} we will
-        publish it and make it available for everyone.{% endblocktrans %}
+      {% trans "Full amount was successfully raised!" %}
     </p>
-    {% endif %}
-{% else %}
-    {% if offer.is_win %}
-        <p>
-            {% trans "Full amount was successfully raised!" %}
-        </p>
-    {% else %}
-        <p>
-            {% trans "The amount needed was not raised." %}
-        </p>
-    {% endif %}
+  {% else %}
+    <p>
+      {% trans "The amount needed was not raised." %}
+    </p>
+  {% endif %}
 {% endif %}
diff --git a/src/funding/templates/funding/includes/offer_status_more.html b/src/funding/templates/funding/includes/offer_status_more.html
index c94c9a801..cca6423b2 100644
--- a/src/funding/templates/funding/includes/offer_status_more.html
+++ b/src/funding/templates/funding/includes/offer_status_more.html
@@ -1,26 +1,26 @@
 {% load i18n %}
 
 {% if offer.is_current %}
-        <p>
-            {% include "funding/snippets/any_remaining.html" %}
-        </p>
+  <p>
+    {% include "funding/snippets/any_remaining.html" %}
+  </p>
 {% else %}
-    <p class="date">{% trans "Fundraiser span" %}: {{ offer.start }} – {{ offer.end }}</p>
-    {% if offer.is_win %}
-        <p>
-            {% if offer.book %}
-                {% blocktrans with bu=offer.book.get_absolute_url bt=offer.book %}The book
-                <a href="{{ bu }}">{{ bt }}</a> has been already published.{% endblocktrans %}
-            {% else %}
-                {% if offer.redakcja_url %}
-                    {% blocktrans with r=offer.redakcja_url %}You can follow
-                    the work on the <a href="{{ r }}">Editorial Platform</a>.{% endblocktrans %}
-                {% endif %}
-            {% endif %}
-        </p>
-    {% endif %}
+  <p class="date">{% trans "Fundraiser span" %}: {{ offer.start }} – {{ offer.end }}</p>
+  {% if offer.is_win %}
+    <p>
+      {% if offer.book %}
+        {% blocktrans with bu=offer.book.get_absolute_url bt=offer.book %}The book
+        <a href="{{ bu }}">{{ bt }}</a> has been already published.{% endblocktrans %}
+      {% else %}
+        {% if offer.redakcja_url %}
+          {% blocktrans with r=offer.redakcja_url %}You can follow
+          the work on the <a href="{{ r }}">Editorial Platform</a>.{% endblocktrans %}
+        {% endif %}
+      {% endif %}
+    </p>
+  {% endif %}
 
-    {% if offer.remaining %}
-        <p>{% include "funding/snippets/any_remaining.html" %}</p>
-    {% endif %}
+  {% if offer.remaining %}
+    <p>{% include "funding/snippets/any_remaining.html" %}</p>
+  {% endif %}
 {% endif %}
diff --git a/src/funding/templates/funding/no_thanks.html b/src/funding/templates/funding/no_thanks.html
index 3c8db166e..b9f25959f 100644
--- a/src/funding/templates/funding/no_thanks.html
+++ b/src/funding/templates/funding/no_thanks.html
@@ -1,23 +1,16 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load fnp_share %}
 
 {% block titleextra %}{% trans "Payment failed" %}{% endblock %}
 
 {% block body %}
-
-<h1>{% trans "Payment failed" %}</h1>
-<div class="white-box normal-text">
-
-<p>{% trans "You're support has not been processed successfully." %}</p>
-
-{% url 'funding_current' as current %}
-<p>
-{% blocktrans with current=current %}Return to the <a href="{{current}}">current fundraiser</a> and try again or try to use a different payment method.{% endblocktrans %}
-</p>
-
-
-</div>
-
-
+  <h1>{% trans "Payment failed" %}</h1>
+  <div class="white-box normal-text">
+    <p>{% trans "You're support has not been processed successfully." %}</p>
+    {% url 'funding_current' as current %}
+    <p>
+      {% blocktrans with current=current %}Return to the <a href="{{current}}">current fundraiser</a> and try again or try to use a different payment method.{% endblocktrans %}
+    </p>
+  </div>
 {% endblock %}
diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html
index 70930c400..535008123 100644
--- a/src/funding/templates/funding/offer_detail.html
+++ b/src/funding/templates/funding/offer_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load url from future %}
 {% load i18n static %}
 {% load pagination_tags %}
@@ -16,62 +16,56 @@
 
 
 {% block body %}
+  <h1>{{ object }}</h1>
 
-<h1>{{ object }}</h1>
-
-{% ssi_include 'funding_detail_bar' pk=object.pk %}
-<div class="white-box">
+  {% ssi_include 'funding_detail_bar' pk=object.pk %}
+  <div class="white-box">
     <div class="funding-details-intro">
-        {% if object.cover %}
-            <img src="
-                {% thumbnail object.cover "139x193" as thumb %}
-                    {{ thumb.url }}
-                {% empty %}
-                    {{ object.cover.url }}
-                {% endthumbnail %}
-            " alt="Cover" class="funding-cover" />
-        {% endif %}
-        <div class="normal-text">
+      {% if object.cover %}
+        <img src="{% thumbnail object.cover "139x193" as thumb %}{{ thumb.url }}{% empty %}{{ object.cover.url }}{% endthumbnail %}"
+             alt="Cover" class="funding-cover" />
+      {% endif %}
+      <div class="normal-text">
         <h3>{% trans "Help free the book!" %}</h3>
         {{ object.description|safe }}
         {% ssi_include 'funding_status' pk=object.pk %}
         <a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>
         {% ssi_include 'funding_status_more' pk=object.pk %}
         <p><a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
-        </div>
-        
-        <div style="clear:both;"></div>
+      </div>
+
+      <div style="clear:both;"></div>
     </div>
 
     {% if object.is_current %}
-        <div class="normal-text">
-            <h3>{% trans "Support the publication" %}</h3>
-            <form action="" method="post">
-                <table>
-                {{ form.as_table }}
-                <tr><td></td><td>
-                    <button type="submit" style="border: none; background: none; cursor: pointer">
-                    <img alt="{% trans 'Donate!' %}" src="{% static 'img/payu.png' %}" />
-                    </button>
-                    </td></tr>
-                </table>
-            </form>
-        </div>
-
-        {% url 'funding_current' object.slug as current %}
-        <p class="normal-text">{% trans "Tell your friends!" %}</p>
-        <p class="share">{% share current _("Support Wolne Lektury!") "big" %}</p>
+      <div class="normal-text">
+        <h3>{% trans "Support the publication" %}</h3>
+        <form action="" method="post">
+          <table>
+            {{ form.as_table }}
+            <tr>
+              <td></td>
+              <td>
+                <button type="submit" style="border: none; background: none; cursor: pointer">
+                  <img alt="{% trans 'Donate!' %}" src="{% static 'img/payu.png' %}" />
+                </button>
+              </td>
+            </tr>
+          </table>
+        </form>
+      </div>
+
+      {% url 'funding_current' object.slug as current %}
+      <p class="normal-text">{% trans "Tell your friends!" %}</p>
+      <p class="share">{% share current _("Support Wolne Lektury!") "big" %}</p>
     {% endif %}
 
     <p class="normal-text"><a href="{% url 'funding' %}">{% trans "See all fundraisers." %}</a></p>
+  </div>
 
-</div>
+  <h2>{% trans "Supporters" %}:</h2>
 
-
-<h2>{% trans "Supporters" %}:</h2>
-
-<div class="white-box normal-text">
+  <div class="white-box normal-text">
     {% ssi_include 'funding_fundings' pk=object.pk page=page %}
-</div>
-
+  </div>
 {% endblock %}
diff --git a/src/funding/templates/funding/offer_list.html b/src/funding/templates/funding/offer_list.html
index e8088bfa8..85c7b900d 100644
--- a/src/funding/templates/funding/offer_list.html
+++ b/src/funding/templates/funding/offer_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load url from future %}
 {% load i18n %}
 {% load ssi_include from ssify %}
@@ -9,39 +9,35 @@
 {% block bodyid %}funding-offer-list{% endblock %}
 
 {% block body %}
-<h1>{% trans "All fundraisers" %}</h1>
+  <h1>{% trans "All fundraisers" %}</h1>
 
-
-{% autopaginate object_list 10 %}
-{% if page_obj.number == 1 %}
+  {% autopaginate object_list 10 %}
+  {% if page_obj.number == 1 %}
     <h2>{% trans "Current fundraiser:" %}</h2>
-{% endif %}
+  {% endif %}
 
-{% for offer in object_list %}
-{% with is_win=offer.is_win is_current=offer.is_current %}
-    {% if not is_current  and forloop.first and page_obj.number == 1 %}
+  {% for offer in object_list %}
+    {% with is_win=offer.is_win is_current=offer.is_current %}
+      {% if not is_current  and forloop.first and page_obj.number == 1 %}
         <p class="normal-text">{% trans "No fundraiser is currently running." %}</p>
         <h2>{% trans "Previous fundraisers:" %}</h2>
-    {% endif %}
+      {% endif %}
 
-    {% ssi_include 'funding_list_bar' pk=offer.pk %}
+      {% ssi_include 'funding_list_bar' pk=offer.pk %}
 
-    <div class="white-box normal-text">
+      <div class="white-box normal-text">
         {% if is_current %}
-            <h3>{% trans "Help free the book!" %}</h3>
-            {{ offer.description|safe }}
+          <h3>{% trans "Help free the book!" %}</h3>
+          {{ offer.description|safe }}
         {% endif %}
         {% ssi_include 'funding_status' pk=offer.pk %}
         {% ssi_include 'funding_status_more' pk=offer.pk %}
+      </div>
 
-    </div>
-
-    {% if is_current and not forloop.last %}
+      {% if is_current and not forloop.last %}
         <h2>{% trans "Previous fundraisers:" %}</h2>
-    {% endif %}
-
-{% endwith %}
-{% endfor %}
-{% paginate %}
-
+      {% endif %}
+    {% endwith %}
+  {% endfor %}
+  {% paginate %}
 {% endblock %}
diff --git a/src/funding/templates/funding/snippets/any_remaining.html b/src/funding/templates/funding/snippets/any_remaining.html
index d8a5bd675..1888326c4 100644
--- a/src/funding/templates/funding/snippets/any_remaining.html
+++ b/src/funding/templates/funding/snippets/any_remaining.html
@@ -1,10 +1,8 @@
-
 {% load i18n %}
+
 {% url 'funding_wlfund' as wlfund %}
 {% blocktrans %}Any <a href="{{wlfund}}">remaining funds</a> will be spent
 on other books waiting to be published.{% endblocktrans %}
 <br/><br/>
 {% blocktrans %}We will supplement every book with your name as a donor, no matter how
 big your support will be.{% endblocktrans %}
-
-
diff --git a/src/funding/templates/funding/thanks.html b/src/funding/templates/funding/thanks.html
index 676ea487b..c92e3e9e1 100644
--- a/src/funding/templates/funding/thanks.html
+++ b/src/funding/templates/funding/thanks.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load fnp_share %}
 {% load polls_tags %}
@@ -6,46 +6,38 @@
 {% block titleextra %}{% trans "Thank you for your support!" %}{% endblock %}
 
 {% block body %}
-
-<h1>{% trans "Thank you!" %}</h1>
-<div class="white-box normal-text">
-
-<a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>
-
-<p>{% trans "Thank you for your support!" %}</p>
-<p>{% blocktrans %}We will contact you if you qualify for perks.{% endblocktrans %}</p>
-
-{% if offer.is_win %}
-    <p>{% trans "Full amount was successfully raised!" %}</p>
-
-    <p>{% blocktrans with b=offer.title %}Your donation will be spent on digitizing, compiling and
-    publishing the book {{ b }} in multiple formats.{% endblocktrans %}</p>
-
-{% else %}
-
-    <p>{% blocktrans with b=offer.title %}If the full amount needed is raised,
-    your donation will be spent on digitizing, compiling and
-    publishing the book {{ b }} in multiple formats.{% endblocktrans %}</p>
-
-{% endif %}
-
-
-<p>{% include "funding/snippets/any_remaining.html" %}
-
-<a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
-
-{% url 'funding_current' offer.slug as current %}
-<p><a href="{{ current }}">{% trans "Go back to the current fundraiser." %}</a></p>
-
-
-<h3>{% trans "Tell your friends!" %}</h3>
-<p class="share">{% share current _("I support Wolne Lektury.") "big" %}</p>
-
-{% if offer.poll %}
-    <h3>{% trans "Vote for a book for the next fundraiser" %}</h3>
-    {% poll offer.poll %}
-{% endif %}
-</div>
-
-
+  <h1>{% trans "Thank you!" %}</h1>
+  <div class="white-box normal-text">
+    <a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>
+
+    <p>{% trans "Thank you for your support!" %}</p>
+    <p>{% blocktrans %}We will contact you if you qualify for perks.{% endblocktrans %}</p>
+
+    {% if offer.is_win %}
+      <p>{% trans "Full amount was successfully raised!" %}</p>
+      <p>{% blocktrans with b=offer.title %}Your donation will be spent on digitizing, compiling and
+      publishing the book {{ b }} in multiple formats.{% endblocktrans %}</p>
+    {% else %}
+      <p>{% blocktrans with b=offer.title %}If the full amount needed is raised,
+      your donation will be spent on digitizing, compiling and
+      publishing the book {{ b }} in multiple formats.{% endblocktrans %}</p>
+    {% endif %}
+
+    <p>
+      {% include "funding/snippets/any_remaining.html" %}
+      <a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.
+    </p>
+
+    {% url 'funding_current' offer.slug as current %}
+    <p><a href="{{ current }}">{% trans "Go back to the current fundraiser." %}</a></p>
+
+
+    <h3>{% trans "Tell your friends!" %}</h3>
+    <p class="share">{% share current _("I support Wolne Lektury.") "big" %}</p>
+
+    {% if offer.poll %}
+      <h3>{% trans "Vote for a book for the next fundraiser" %}</h3>
+      {% poll offer.poll %}
+    {% endif %}
+  </div>
 {% endblock %}
diff --git a/src/funding/templates/funding/widgets/amount.html b/src/funding/templates/funding/widgets/amount.html
index 01db675a0..eb3f0f755 100644
--- a/src/funding/templates/funding/widgets/amount.html
+++ b/src/funding/templates/funding/widgets/amount.html
@@ -1,19 +1,23 @@
 {% load i18n %}
+
 <div style="line-height:2em;">
-{% if perks %}
+  {% if perks %}
     {% for perk in perks %}
-        <label>
-            <input type="radio" name="{{ perks_input_name }}" value="{{ perk.price }}"
-                    {% if perk.chosen %}checked="checked"{% endif %} />
-                <span style="font-size: 1.5em; ">{{ perk.price }} zł</span> ({{ perk.long_name }})
-        </label><br/>
+      <label>
+        <input type="radio" name="{{ perks_input_name }}" value="{{ perk.price }}"
+               {% if perk.chosen %}checked="checked"{% endif %}/>
+        <span style="font-size: 1.5em; ">{{ perk.price }} zł</span>
+        ({{ perk.long_name }})
+      </label>
+      <br/>
     {% endfor %}
     <label>
-        <input type="radio" name="{{ perks_input_name }}" value=""
-            {% if not perk_chosen %}checked="checked"{% endif %} /> {% trans "Other amount" %}:
+      <input type="radio" name="{{ perks_input_name }}" value=""
+             {% if not perk_chosen %}checked="checked"{% endif %}/>
+      {% trans "Other amount" %}:
     </label>
-    <input size="5" name="{{ name }}" value="{% if not perk_chosen %}{{ value|default_if_none:'' }}{% endif %}" /> zł
-{% else %}
-    <input name="{{ name }}" value="{{ value|default_if_none:'' }}" {% if value != None %}{% endif %} />
-{% endif %}
+    <input size="5" name="{{ name }}" value="{% if not perk_chosen %}{{ value|default_if_none:'' }}{% endif %}"/> zł
+  {% else %}
+    <input name="{{ name }}" value="{{ value|default_if_none:'' }}"/>
+  {% endif %}
 </div>
diff --git a/src/funding/templates/funding/wlfund.html b/src/funding/templates/funding/wlfund.html
index bb8a2bea2..a86735219 100644
--- a/src/funding/templates/funding/wlfund.html
+++ b/src/funding/templates/funding/wlfund.html
@@ -1,59 +1,63 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{% trans "Remaining funds" %}{% endblock %}
 
 {% block body %}
+  <h1>{% trans "Remaining funds" %}</h1>
 
-<h1>{% trans "Remaining funds" %}</h1>
+  <div class="left-column normal-text">
+    <p>
+      {% blocktrans with r="http://redakcja.wolnelektury.pl/" %}
+        If the full amount needed for publishing a book is not raised in time,
+        the funds are spent on <a href="{{r}}">other books waiting for
+        publication</a>. The same thing happens with any money remaining
+        from successful fundraisers.
+      {% endblocktrans %}
 
-<div class="left-column normal-text">
-<p>{% blocktrans with r="http://redakcja.wolnelektury.pl/" %}If
-the full amount needed for publishing a book is not raised in time,
-the funds are spent on <a href="{{r}}">other books waiting for
-publication</a>. The same thing happens with any money remaining
-from successful fundraisers.{% endblocktrans %}
+      <a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.
+    </p>
 
-<a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
+    <p>{% trans "Spending these remaining funds is recorded in this table." %}</p>
+  </div>
 
-<p>{% trans "Spending these remaining funds is recorded in this table." %}</p>
-</div>
-
-<table class="normal-text wlfund">
+  <table class="normal-text wlfund">
 
     <tr>
-        <td>{% trans "Date" %}:</td>
-        <td>{% trans "Operation" %}:</td>
-        <td>{% trans "Amount" %}:</td>
-        <td>{% trans "Balance" %}:</td>
+      <td>{% trans "Date" %}:</td>
+      <td>{% trans "Operation" %}:</td>
+      <td>{% trans "Amount" %}:</td>
+      <td>{% trans "Balance" %}:</td>
     </tr>
 
     {% for tag, entry in log %}
-    {% if tag == 'spent' %}
+      {% if tag == 'spent' %}
         <tr class="funding-minus">
-            <td class="oneline">{{ entry.timestamp }}</td>
-            <td>{% trans "Money spent on publishing the book" %}:
-                <a href="{{ entry.book.get_absolute_url }}">
-                {{ entry.book }}</a></td>
-            <td>-{{ entry.amount }}&nbsp;zł</td>
-            <td>{{ entry.total }}&nbsp;zł</td>
+          <td class="oneline">{{ entry.timestamp }}</td>
+          <td>
+            {% trans "Money spent on publishing the book" %}:
+            <a href="{{ entry.book.get_absolute_url }}">{{ entry.book }}</a>
+          </td>
+          <td>-{{ entry.amount }}&nbsp;zł</td>
+          <td>{{ entry.total }}&nbsp;zł</td>
         </tr>
-    {% else %}
+      {% else %}
         <tr class="funding-plus">
-            <td class="oneline">{{ entry.end }}</td>
-            <td>{% trans "Money remaining from the fundraiser for" %}:
-                <a href="{{ entry.get_absolute_url }}">
-                {{ entry }}</a></td>
-            <td>+{{ entry.wlfund }}&nbsp;zł</td>
-            <td>{{ entry.total }}&nbsp;zł</td>
+          <td class="oneline">{{ entry.end }}</td>
+          <td>
+            {% trans "Money remaining from the fundraiser for" %}:
+            <a href="{{ entry.get_absolute_url }}">{{ entry }}</a>
+          </td>
+          <td>+{{ entry.wlfund }}&nbsp;zł</td>
+          <td>{{ entry.total }}&nbsp;zł</td>
         </tr>
-    {% endif %}
+      {% endif %}
     {% empty %}
-        <tr><td colspan="4" style="text-align:center; color: #888;">
-            <em>{% trans "There are no previous fundraisers to show yet." %}</em>
-        </td></tr>
+      <tr>
+        <td colspan="4" style="text-align:center; color: #888;">
+          <em>{% trans "There are no previous fundraisers to show yet." %}</em>
+        </td>
+      </tr>
     {% endfor %}
-</table>
-
-
+  </table>
 {% endblock %}
diff --git a/src/infopages/templates/infopages/infopage.html b/src/infopages/templates/infopages/infopage.html
index 75dae0850..d9eab9a8e 100755
--- a/src/infopages/templates/infopages/infopage.html
+++ b/src/infopages/templates/infopages/infopage.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{{ page.title }}{% endblock %}
@@ -6,18 +6,18 @@
 {% block metadescription %}{{ left_column|striptags|truncatewords:10 }}{% endblock %}
 
 {% block body %}
-    <h1>{{ page.title }}</h1>
+  <h1>{{ page.title }}</h1>
 
-    {% autoescape off %}
-    <div class="left-column">
-        <div class="normal-text">
-            {{ left_column }}
-        </div>
+  {% autoescape off %}
+  <div class="left-column">
+    <div class="normal-text">
+      {{ left_column }}
     </div>
-    <div class="right-column">
-        <div class="normal-text">
-            {{ right_column }}
-        </div>
+  </div>
+  <div class="right-column">
+    <div class="normal-text">
+      {{ right_column }}
     </div>
-    {% endautoescape %}
+  </div>
+  {% endautoescape %}
 {% endblock %}
diff --git a/src/infopages/templates/infopages/on_main.html b/src/infopages/templates/infopages/on_main.html
index 5d80dad57..8ebbea05b 100755
--- a/src/infopages/templates/infopages/on_main.html
+++ b/src/infopages/templates/infopages/on_main.html
@@ -1,3 +1,3 @@
 {% for page in objects %}
-    <li><a href="{{ page.get_absolute_url }}">{{ page.title }}</a></li>
+  <li><a href="{{ page.get_absolute_url }}">{{ page.title }}</a></li>
 {% endfor %}
diff --git a/src/lesmianator/templates/lesmianator/lesmianator.html b/src/lesmianator/templates/lesmianator/lesmianator.html
index cc7decbc7..a6e305fbb 100644
--- a/src/lesmianator/templates/lesmianator/lesmianator.html
+++ b/src/lesmianator/templates/lesmianator/lesmianator.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -9,52 +9,60 @@
 {% block bodyid %}lesmianator{% endblock %}
 
 {% block body %}
-    <h1>Leśmianator</h1>
+  <h1>Leśmianator</h1>
 
-    <div class="left-column">
+  <div class="left-column">
     <div class="normal-text">
-        <p>Leśmianator tworzy wierszmiksy – dzięki niemu
-            <a href="{% url 'new_poem' %}">napiszesz wiersz jednym kliknięciem</a>.
-            W nowej odsłonie nowe możliwości zabawy – teraz możesz zdecydować, co wrzucasz do miksera,
-            a swoimi dziełami podzielić się z&nbsp;przyjaciółmi!</p>
-            <p>Przygotowaliśmy kilka propozycji na start – możesz wybrać jedną z nich,
-            albo ułożyć sobie własną, niepowtarzalną mieszankę.</p>
-        <ul>
-            <li><a href="{% url 'poem_from_book' 'liryki-lozanskie' %}">Adam Mickiewicz, Liryki lozańskie</a></li>
-            <li><a href="{% url 'poem_from_book' 'sonety-krymskie' %}">Adam Mickiewicz, Sonety krymskie</a></li>
-            <li><a href="{% url 'poem_from_book' 'hymny' %}">Jan Kasprowicz, Hymny</a></li>
-            <li><a href="{% url 'poem_from_book' 'bogurodzica' %}">Bogurodzica</a></li>
-            {% for s in shelves %}
-                <li><a href="{% url 'poem_from_set' s.slug %}">{{ s.name }}</a></li>
-            {% endfor %}
-    
-    </div>
+      <p>
+        Leśmianator tworzy wierszmiksy – dzięki niemu
+        <a href="{% url 'new_poem' %}">napiszesz wiersz jednym kliknięciem</a>.
+        W nowej odsłonie nowe możliwości zabawy – teraz możesz zdecydować, co wrzucasz do miksera,
+        a swoimi dziełami podzielić się z&nbsp;przyjaciółmi!
+      </p>
+      <p>
+        Przygotowaliśmy kilka propozycji na start – możesz wybrać jedną z nich,
+        albo ułożyć sobie własną, niepowtarzalną mieszankę.
+      </p>
+      <ul>
+        <li><a href="{% url 'poem_from_book' 'liryki-lozanskie' %}">Adam Mickiewicz, Liryki lozańskie</a></li>
+        <li><a href="{% url 'poem_from_book' 'sonety-krymskie' %}">Adam Mickiewicz, Sonety krymskie</a></li>
+        <li><a href="{% url 'poem_from_book' 'hymny' %}">Jan Kasprowicz, Hymny</a></li>
+        <li><a href="{% url 'poem_from_book' 'bogurodzica' %}">Bogurodzica</a></li>
+        {% for s in shelves %}
+          <li><a href="{% url 'poem_from_set' s.slug %}">{{ s.name }}</a></li>
+        {% endfor %}
+      </ul>
     </div>
+  </div>
 
-    <div class="right-column">
+  <div class="right-column">
     <div class="normal-text">
-        <h3>Miksuj utwory</h3>
-        <p>Możesz <a href="{% url 'new_poem' %}">zmiksować całą lirykę</a> w naszej bibliotece
+      <h3>Miksuj utwory</h3>
+      <p>
+        Możesz <a href="{% url 'new_poem' %}">zmiksować całą lirykę</a> w naszej bibliotece
         albo tylko jeden konkretny utwór. Jak? Wejdź na
         <a href="{% url 'book_detail' 'do-m' %}">stronę utworu</a>,
-        kliknij w link „miksuj ten utwór” – i gotowe!</p>
+        kliknij w link „miksuj ten utwór” – i gotowe!
+      </p>
 
-        <h3>Miksuj półki</h3>
-        <p>Załóż konto, poukładaj swoje ulubione książki na półkach i miksuj
+      <h3>Miksuj półki</h3>
+      <p>
+        Załóż konto, poukładaj swoje ulubione książki na półkach i miksuj
         w dowolnych konfiguracjach. Nic prostszego, niż zmieszać
         <a href="{% url 'tagged_object_list' 'autor/boleslaw-lesmian' %}">Leśmiana</a> z
         <a href="{% url 'tagged_object_list' 'autor/kazimierz-przerwa-tetmajer' %}">Tetmajerem</a>,
         a <a href="{% url 'tagged_object_list' 'autor/stefan-zeromski' %}">Żeromskiego</a> z
         <a href="{% url 'tagged_object_list' 'autor/henryk-sienkiewicz' %}">Sienkiewiczem</a>
-        – wystarczy wrzucić ich utwory na półkę i kliknąć
-        w link „miksuj utwory z tej półki”.</p>
-
-        <h3>Dziel się z innymi</h3>
-        <p>Wyszedł Ci wyjątkowo udany wierszmiks? Znajdziesz pod nim link, przy pomocy
-        którego możesz się nim podzielić z przyjaciółmi.</p>
+        – wystarczy wrzucić ich utwory na półkę i klikną w link „miksuj utwory z tej półki”.
+      </p>
 
-        <p>Miłej zabawy!</p>
+      <h3>Dziel się z innymi</h3>
+      <p>
+        Wyszedł Ci wyjątkowo udany wierszmiks? Znajdziesz pod nim link, przy pomocy
+        którego możesz się nim podzielić z przyjaciółmi.
+      </p>
 
+      <p>Miłej zabawy!</p>
     </div>
-    </div>
+  </div>
 {% endblock %}
diff --git a/src/lesmianator/templates/lesmianator/poem.html b/src/lesmianator/templates/lesmianator/poem.html
index 4c4726f0f..458ab21e7 100644
--- a/src/lesmianator/templates/lesmianator/poem.html
+++ b/src/lesmianator/templates/lesmianator/poem.html
@@ -1,65 +1,68 @@
 {% extends "catalogue/viewer_base.html" %}
 {% load i18n %}
 
-
 {% block title %}Leśmianator{% endblock %}
 
-
 {% block menu %}
-    <li><a href='{% url 'lesmianator' %}'><span class="label">Wolne Lektury przepuszczone przez mikser.</span></a></li>
-    {% if shelf or not books %}
-        {# shelf or global mixing #}
-        <li><a href=''><span class='label'>Twórzże się jeszcze raz!</span></a></li>
-    {% else %}{% if book %} 
-        <li><a href='{% url "poem_from_book" book.slug %}'><span class='label'>Twórzże się jeszcze raz!</span></a></li>
-    {% endif %}{% endif %}
+  <li><a href='{% url 'lesmianator' %}'><span class="label">Wolne Lektury przepuszczone przez mikser.</span></a></li>
+  {% if shelf or not books %}
+    {# shelf or global mixing #}
+    <li><a href=''><span class='label'>Twórzże się jeszcze raz!</span></a></li>
+  {% elif book %}
+    <li><a href='{% url "poem_from_book" book.slug %}'><span class='label'>Twórzże się jeszcze raz!</span></a></li>
+  {% endif %}
 {% endblock menu %}
 
 
-
 {% block main-text %}
-    <div id="book-text">
-            <h1>
-                <span class="author">Leśmianator</span>
-                <span class="title">***</span>
-            </h1>
-            {{ poem.text|linebreaksbr }}
-        <div id="footnotes" >
-            <h3>O utworze</h3>
-            <div><p>
-                Aby pokazać innym ten utwór, użyj linku:<br/>
-                <a class="permalink" href="{{ poem.get_absolute_url }}">http://www.wolnelektury.pl{{ poem.get_absolute_url }}</a>
-            </p></div>
-            <div>
-            {% if book %}
-                <p>Tekst powstał przez zmiksowanie utworu
-                <a href="{{ book.get_absolute_url }}">{{ book.title }}</a>.<br/>
-                <a href="{% url 'poem_from_book' book.slug %}">Zmiksuj go ponownie</a>
-                albo <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
-            {% else %}{% if books %}
-                <p>Tekst powstał przez zmiksowanie utworów:</p>
-                <ul>
-                    {% for book in books %}
-                        <li><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></li>
-                    {% endfor %}
-                </ul>
-                {% if shelf %}
-                    <p>
-                    <a href="">Zmiksuj</a>
-                    półkę <a href="{{ shelf.get_absolute_url }}">{{ shelf.name }}</a>
-                    jeszcze raz, albo
-                    <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
-                {% else %}
-                    <p><a href="{% url 'lesmianator' %}">Zobacz</a>,
-                    jak łatwo możesz stworzyć własny wierszmiks.</p>
-                {% endif %}
-            {% else %}
-                <p>Wiersz powstał przez zmiksowanie ze sobą całej liryki z Wolnych Lektur.
-                <a href="">Spróbuj jeszcze raz</a>, albo
-                <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
-            {% endif %}{% endif %}
-            <div>
-        </div>
-        </div>
+  <div id="book-text">
+    <h1>
+      <span class="author">Leśmianator</span>
+      <span class="title">***</span>
+    </h1>
+    {{ poem.text|linebreaksbr }}
+    <div id="footnotes" >
+      <h3>O utworze</h3>
+      <div>
+        <p>
+          Aby pokazać innym ten utwór, użyj linku:<br/>
+          <a class="permalink" href="{{ poem.get_absolute_url }}">http://www.wolnelektury.pl{{ poem.get_absolute_url }}</a>
+        </p>
+      </div>
+      <div>
+        {% if book %}
+          <p>
+            Tekst powstał przez zmiksowanie utworu
+            <a href="{{ book.get_absolute_url }}">{{ book.title }}</a>.<br/>
+            <a href="{% url 'poem_from_book' book.slug %}">Zmiksuj go ponownie</a>
+            albo <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.
+          </p>
+        {% elif books %}
+          <p>Tekst powstał przez zmiksowanie utworów:</p>
+          <ul>
+            {% for book in books %}
+              <li><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></li>
+            {% endfor %}
+          </ul>
+          {% if shelf %}
+            <p>
+              <a href="">Zmiksuj</a>
+              półkę <a href="{{ shelf.get_absolute_url }}">{{ shelf.name }}</a>
+              jeszcze raz, albo
+              <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.
+            </p>
+          {% else %}
+            <p>
+              <a href="{% url 'lesmianator' %}">Zobacz</a>,
+              jak łatwo możesz stworzyć własny wierszmiks.
+            </p>
+          {% endif %}
+        {% else %}
+            <p>Wiersz powstał przez zmiksowanie ze sobą całej liryki z Wolnych Lektur.
+            <a href="">Spróbuj jeszcze raz</a>, albo
+            <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
+        {% endif %}
+      </div>
     </div>
+  </div>
 {% endblock main-text %}
diff --git a/src/libraries/templates/libraries/catalog_view.html b/src/libraries/templates/libraries/catalog_view.html
index 5d35fd973..2a022d47b 100644
--- a/src/libraries/templates/libraries/catalog_view.html
+++ b/src/libraries/templates/libraries/catalog_view.html
@@ -1,19 +1,18 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{% trans 'Libraries directory' %}{% endblock %}
 
 
 {% block body %}
-    <h1>{{ catalog.name }}</h1>
-    <div class="left-column">
-        <div class="normal-text">
-            <ul>
-                {% for library in catalog.libraries.all %}
-                    <li><a href="{{library.get_absolute_url}}">{{library.name}}</a></li>
-                {% endfor %}
-            </ul>
-        </div>
+  <h1>{{ catalog.name }}</h1>
+  <div class="left-column">
+    <div class="normal-text">
+      <ul>
+        {% for library in catalog.libraries.all %}
+          <li><a href="{{library.get_absolute_url}}">{{library.name}}</a></li>
+        {% endfor %}
+      </ul>
     </div>
-
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/libraries/templates/libraries/library_view.html b/src/libraries/templates/libraries/library_view.html
index a97282987..283d1c047 100644
--- a/src/libraries/templates/libraries/library_view.html
+++ b/src/libraries/templates/libraries/library_view.html
@@ -1,13 +1,12 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{{ library.name }}{% endblock %}
 
-
-{% block body %}
-    <h1>{{ library.name }}</h1>
-    <div class="normal-text">
-        <p>Adres strony www: <a href="{{library.url}}">{{library.url}}</a></p>
-        {% autoescape off %}{{library.description}}{% endautoescape%}
-    </div>
+{% block body %}
+  <h1>{{ library.name }}</h1>
+  <div class="normal-text">
+    <p>Adres strony www: <a href="{{library.url}}">{{library.url}}</a></p>
+    {% autoescape off %}{{library.description}}{% endautoescape%}
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/libraries/templates/libraries/main_view.html b/src/libraries/templates/libraries/main_view.html
index 55e5f0249..3593616a6 100644
--- a/src/libraries/templates/libraries/main_view.html
+++ b/src/libraries/templates/libraries/main_view.html
@@ -1,19 +1,17 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{% trans 'Library directories' %}{% endblock %}
 
-
 {% block body %}
-    <h1>{% trans 'Library directories' %}</h1>
-    <div class="left-column">
-        <div class="normal-text">
-            <ul>
-            {% for catalog in catalogs %}
-                <li><a href="{{catalog.get_absolute_url}}">{{catalog}}</a></li>
-            {% endfor %}
-            </ul>
-        </div>
+  <h1>{% trans 'Library directories' %}</h1>
+  <div class="left-column">
+    <div class="normal-text">
+      <ul>
+        {% for catalog in catalogs %}
+          <li><a href="{{catalog.get_absolute_url}}">{{catalog}}</a></li>
+        {% endfor %}
+      </ul>
     </div>
-
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/pdcounter/templates/pdcounter/author_detail.html b/src/pdcounter/templates/pdcounter/author_detail.html
index 50eef63fb..98a5fc799 100644
--- a/src/pdcounter/templates/pdcounter/author_detail.html
+++ b/src/pdcounter/templates/pdcounter/author_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load time_tags %}
 
@@ -9,48 +9,57 @@
 {% block bodyid %}author-detail{% endblock %}
 
 {% block body %}
-
-    <div class="left-column">
+  <div class="left-column">
     <h1>{{ author.name }}</h1>
-	<div class="normal-text white-box">
-        {% if author.has_description %}
-            <div id="description">
-                <div id='description-long'>{{ author.description|safe }}</div>
-                <div id='description-short'>{{ author.description|safe|truncatewords_html:30 }}</div>
-            </div>
-            <div class="clearboth"></div>
-            <div id="toggle-description"><p></p></div>
-        {% endif %}
-        {% if author.gazeta_link %}
-        <p><a href="{{ author.gazeta_link }}">
+    <div class="normal-text white-box">
+      {% if author.has_description %}
+        <div id="description">
+          <div id='description-long'>{{ author.description|safe }}</div>
+          <div id='description-short'>{{ author.description|safe|truncatewords_html:30 }}</div>
+        </div>
+        <div class="clearboth"></div>
+        <div id="toggle-description"><p></p></div>
+      {% endif %}
+      {% if author.gazeta_link %}
+        <p>
+          <a href="{{ author.gazeta_link }}">
             {% trans "Read work's study of this author on Lektury.Gazeta.pl" %}
-        </a></p>
-        {% endif %}
-        {% if author.wiki_link %}
-        <p><a href="{{ author.wiki_link }}">
+          </a>
+        </p>
+      {% endif %}
+      {% if author.wiki_link %}
+        <p>
+          <a href="{{ author.wiki_link }}">
             {% trans "Read article about this author on Wikipedia" %}
-        </a></p>
-        {% endif %}
+          </a>
+        </p>
+      {% endif %}
 
-        {% if author.alive %}
-            <p>{% trans "This author's works are copyrighted." %}
-            {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}</p>
+      {% if author.alive %}
+        <p>
+          {% trans "This author's works are copyrighted." %}
+          {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}
+        </p>
+      {% else %}
+        {% if author.in_pd %}
+          <p>{% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
         {% else %}
-            {% if author.in_pd %}
-                <p>{% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
-            {% else %}
-                <div>
-                    <p>{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}</p>
-                    <div class='countdown' data-until='{{ pd_counter|date_to_utc|utc_for_js }}'></div>
-                    <p>{% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}</p>
-                </div>
-            {% endif %}
+          <div>
+            <p>
+              {% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}
+            </p>
+            <div class='countdown' data-until='{{ pd_counter|date_to_utc|utc_for_js }}'></div>
+            <p>
+              {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}
+            </p>
+          </div>
         {% endif %}
-        {% include "info/join_us.html" %}
-    </div>
+      {% endif %}
+      {% include "info/join_us.html" %}
     </div>
+  </div>
 
-    <div class="right-column block-form">
-        {% include "publishing_suggest.html" %}
-    </div>
+  <div class="right-column block-form">
+    {% include "publishing_suggest.html" %}
+  </div>
 {% endblock %}
diff --git a/src/pdcounter/templates/pdcounter/book_stub_detail.html b/src/pdcounter/templates/pdcounter/book_stub_detail.html
index 640d68ebe..db1a2997a 100644
--- a/src/pdcounter/templates/pdcounter/book_stub_detail.html
+++ b/src/pdcounter/templates/pdcounter/book_stub_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load time_tags %}
 
@@ -9,27 +9,32 @@
 {% block bodyid %}book-stub-detail{% endblock %}
 
 {% block body %}
-    <div class="left-column">
+  <div class="left-column">
     <h1>{{ book.author }}, {{ book.title }}</h1>
-	<div class="normal-text white-box">
-
-    {% if book.in_pd %}
-		<p>{% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
-	{% else %}
-	    {% if book.pd %}
-			<p>{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}</p>
-            <div class='countdown' data-until='{{ pd_counter|date_to_utc|utc_for_js }}'></div>
-			<p>{% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}</p>
-		{% else %}
-		    <p>{% trans "This work is copyrighted." %}
-		    {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}</p>
-		{% endif %}
-	{% endif %}
-    {% include "info/join_us.html" %}
-    </div>
+    <div class="normal-text white-box">
+      {% if book.in_pd %}
+        <p>{% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
+      {% else %}
+        {% if book.pd %}
+          <p>
+            {% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}
+          </p>
+          <div class='countdown' data-until='{{ pd_counter|date_to_utc|utc_for_js }}'></div>
+          <p>
+            {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}
+          </p>
+        {% else %}
+          <p>
+            {% trans "This work is copyrighted." %}
+            {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}
+          </p>
+        {% endif %}
+      {% endif %}
+      {% include "info/join_us.html" %}
     </div>
+  </div>
 
-    <div class="right-column block-form">
-        {% include "publishing_suggest.html" %}
-    </div>
+  <div class="right-column block-form">
+    {% include "publishing_suggest.html" %}
+  </div>
 {% endblock %}
diff --git a/src/picture/templates/admin/picture/picture/change_list.html b/src/picture/templates/admin/picture/picture/change_list.html
index 05566c0ab..564b26db4 100755
--- a/src/picture/templates/admin/picture/picture/change_list.html
+++ b/src/picture/templates/admin/picture/picture/change_list.html
@@ -2,11 +2,13 @@
 {% load i18n %}
 
 {% block content %}
-    <form action="{% url 'import_picture' %}" method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-        <p>XML: <input type="file" id="id_picture_xml_file" name="picture_xml_file" /><br/>
-            {% trans "Image" %}: <input type="file" id="id_picture_image_file" name="picture_image_file" /><br/>
-            <input type="submit" value="{% trans "Import picture" %}"/></p>
-    </form>
-    {{ block.super }}
+  <form action="{% url 'import_picture' %}" method="post" enctype="multipart/form-data">
+  {% csrf_token %}
+    <p>
+      XML: <input type="file" id="id_picture_xml_file" name="picture_xml_file" /><br/>
+      {% trans "Image" %}: <input type="file" id="id_picture_image_file" name="picture_image_file" /><br/>
+      <input type="submit" value="{% trans "Import picture" %}"/>
+    </p>
+  </form>
+  {{ block.super }}
 {% endblock content %}
diff --git a/src/picture/templates/picture/collection.html b/src/picture/templates/picture/collection.html
index f794fbfeb..3c48fa194 100644
--- a/src/picture/templates/picture/collection.html
+++ b/src/picture/templates/picture/collection.html
@@ -6,5 +6,5 @@
 {% block book_list_header %}{{ context.collection.title }}{% endblock %}
 
 {% block book_list_info %}
-{{ context.collection.description|safe }}
+  {{ context.collection.description|safe }}
 {% endblock %}
diff --git a/src/picture/templates/picture/picture_detail.html b/src/picture/templates/picture/picture_detail.html
index 514f8c3e8..6505c48ff 100644
--- a/src/picture/templates/picture/picture_detail.html
+++ b/src/picture/templates/picture/picture_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load picture_tags catalogue_tags pagination_tags %}
 {% load thumbnail %}
@@ -14,13 +14,10 @@
 
 {% block body %}
   {% picture_wide picture %}
-
-{% spaceless %}
-
-<section class="see-also" style="display: inline-block;">
-<h1>{% trans "See also" %}:</h1>
-{% related_books picture %}
-</section>
-{% endspaceless %}
-
+  {% spaceless %}
+    <section class="see-also">
+      <h1>{% trans "See also" %}:</h1>
+      {% related_books picture %}
+    </section>
+  {% endspaceless %}
 {% endblock %}
diff --git a/src/picture/templates/picture/picture_info.html b/src/picture/templates/picture/picture_info.html
index c2d2c9aaa..79c3043b9 100644
--- a/src/picture/templates/picture/picture_info.html
+++ b/src/picture/templates/picture/picture_info.html
@@ -1,17 +1,15 @@
- 
 <div id="picture-themes" class="dropdown-body">
   <ul>
-{% for slug, theme in themes.items %}
-<li><a href="#theme-{{slug}}" data-coords="{{theme.coords}}">{{theme.theme}}</a></li>
-{% endfor %}
+    {% for slug, theme in themes.items %}
+      <li><a href="#theme-{{slug}}" data-coords="{{theme.coords}}">{{theme.theme}}</a></li>
+    {% endfor %}
   </ul>
-</div> 
+</div>
 
 <div id="picture-objects" class="dropdown-body">
   <ul>
-{% for slug, thing in things.items %}
-<li><a href="#object-{{slug}}" data-coords="{{thing.coords}}">{{thing.object}}</a></li>
-{% endfor %}
+    {% for slug, thing in things.items %}
+      <li><a href="#object-{{slug}}" data-coords="{{thing.coords}}">{{thing.object}}</a></li>
+    {% endfor %}
   </ul>
 </div>
-
diff --git a/src/picture/templates/picture/picture_list_thumb.html b/src/picture/templates/picture/picture_list_thumb.html
index a38efa517..3c1dd8cc1 100644
--- a/src/picture/templates/picture/picture_list_thumb.html
+++ b/src/picture/templates/picture/picture_list_thumb.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 {% load static %}
@@ -10,16 +10,17 @@
 
 
 {% block body %}
-    <h1>{% block book_list_header %}{% trans "Listing of all works" context "gallery" %}{% endblock %}</h1>
+  <h1>{% block book_list_header %}{% trans "Listing of all works" context "gallery" %}{% endblock %}</h1>
 
-    <div class="left-column"><div class="normal-text">
-        {% block book_list_info %}
-            {% ssi_include 'chunk' key='picture-list' %}
-        {% endblock %}
-    </div></div>
+  <div class="left-column">
+    <div class="normal-text">
+      {% block book_list_info %}
+        {% ssi_include 'chunk' key='picture-list' %}
+      {% endblock %}
+    </div>
+  </div>
 
-    <div class='clearboth'></div>
-
-{% work_list picture_list %}
+  <div class='clearboth'></div>
 
+  {% work_list picture_list %}
 {% endblock %}
diff --git a/src/picture/templates/picture/picture_mini_box.html b/src/picture/templates/picture/picture_mini_box.html
index 1ad2accb4..132f8fcc9 100644
--- a/src/picture/templates/picture/picture_mini_box.html
+++ b/src/picture/templates/picture/picture_mini_box.html
@@ -1,23 +1,20 @@
 {% spaceless %}
-
-{% load thumbnail %}
-<div class="book-mini-box">
+  {% load thumbnail %}
+  <div class="book-mini-box">
     <div class="book-mini-box-inner">
-    {% if with_link %}
-    <a href="{{ picture.get_absolute_url }}">
-    {% endif %}
+      {% if with_link %}
+      <a href="{{ picture.get_absolute_url }}">
+      {% endif %}
         {% if picture.image_file %}
-            <img src="{% thumbnail picture.image_file "139x193" crop="center" as thumb %}{{ thumb.url }}{% empty %}{{ picture.image_file.url }}{% endthumbnail %}" alt="{{ author }} – {{ picture.title }}" class="cover" />
+          <img src="{% thumbnail picture.image_file "139x193" crop="center" as thumb %}{{ thumb.url }}{% empty %}{{ picture.image_file.url }}{% endthumbnail %}" alt="{{ author }} – {{ picture.title }}" class="cover" />
         {% endif %}
         <div class="desc">
-            <span class="mono author">{{ author }}</span>
-            <span class="title">{{ picture.title }}</span>
+          <span class="mono author">{{ author }}</span>
+          <span class="title">{{ picture.title }}</span>
         </div>
-    {% if with_link %}
-    </a>
-    {% endif %}
+      {% if with_link %}
+      </a>
+      {% endif %}
     </div>
-</div>
-
-
+  </div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/picture/templates/picture/picture_short.html b/src/picture/templates/picture/picture_short.html
index 35fba77b0..05a0398ad 100644
--- a/src/picture/templates/picture/picture_short.html
+++ b/src/picture/templates/picture/picture_short.html
@@ -2,69 +2,67 @@
 {% load thumbnail %}
 {% load catalogue_tags social_tags %}
 {% load picture_tags %}
-<div class="{% block box-class %}book-box{% endblock %} picture">
-<div class="book-box-inner">
-
-<div class="book-box-body">
-
-        <div class="book-box-head">
-            <div class="author">
-                {% for tag in tags.author %}
-                    <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>{% if not forloop.last %},
-                {% endif %}{% endfor %}
-            </div>
-            <div class="title">
-				{% if main_link %}<a href="{{ main_link }}">{% endif %}
-					{{ picture.title }}
-			    {% if main_link %}</a>{% endif %}
-			</div>
-        </div>
-
-
 
-  <div class="cover-area">
-    {% block picture-view %}
-    {% if main_link %}<a href="{{ main_link }}">{% endif %}
-      {% thumbnail picture.image_file "216x288" crop="center" as thumb %}
-      <img class="cover" src="{{thumb.url}}"/>
-      {% endthumbnail %}
-    {% if main_link %}</a>{% endif %}
-    {% endblock %}
-     {# what about licensing icons here #}
-  </div>
+<div class="{% block box-class %}book-box{% endblock %} picture">
+  <div class="book-box-inner">
+    <div class="book-box-body">
+      <div class="book-box-head">
+          <div class="author">
+              {% for tag in tags.author %}
+                  <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>{% if not forloop.last %},
+              {% endif %}{% endfor %}
+          </div>
+          <div class="title">
+              {% if main_link %}<a href="{{ main_link }}">{% endif %}
+                  {{ picture.title }}
+              {% if main_link %}</a>{% endif %}
+          </div>
+      </div>
 
-        <div class="tags">
-            {% spaceless %}
+      <div class="cover-area">
+        {% block picture-view %}
+        {% if main_link %}<a href="{{ main_link }}">{% endif %}
+          {% thumbnail picture.image_file "216x288" crop="center" as thumb %}
+          <img class="cover" src="{{thumb.url}}"/>
+          {% endthumbnail %}
+        {% if main_link %}</a>{% endif %}
+        {% endblock %}
+         {# what about licensing icons here #}
+      </div>
 
-            <span class="category">
+      <div class="tags">
+        {% spaceless %}
+          <span class="category">
             <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
-            	{% for tag in tags.epoch %}
-            		<a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
-            		{% if not forloop.last %}<span>, </span>{% endif %}
-                {% endfor %}
-            </span></span>
+              {% for tag in tags.epoch %}
+                <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
+                {% if not forloop.last %}<span>, </span>{% endif %}
+              {% endfor %}
+            </span>
+          </span>
 
-            <span class="category">
+          <span class="category">
             <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
-            	{% for tag in tags.kind %}
-            		<a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
-            		{% if not forloop.last %}<span>, </span>{% endif %}
-                {% endfor %}
-            </span></span>
+              {% for tag in tags.kind %}
+                <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
+                {% if not forloop.last %}<span>, </span>{% endif %}
+              {% endfor %}
+            </span>
+          </span>
 
-            <span class="category">
+          <span class="category">
             <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
-            	{% for tag in tags.genre %}
-            		<a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
-            		{% if not forloop.last %}<span>, </span>{% endif %}
-                {% endfor %}
-            </span></span>
-
-            {% block extra_categories %}
-            {% endblock %}
+              {% for tag in tags.genre %}
+                <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
+                {% if not forloop.last %}<span>, </span>{% endif %}
+              {% endfor %}
+            </span>
+          </span>
 
-            {% endspaceless %}
-        </div>
+          {% block extra_categories %}
+          {% endblock %}
+        {% endspaceless %}
+      </div>
     </div>
     <ul class="book-box-tools">
       <li class="book-box-read">
@@ -75,10 +73,8 @@
       </li>
     </ul>
     {% block book-box-extra-info %}{% endblock %}
-    {% block box-append %}
-    {% endblock %}
-    {% block right-column %}
-    {% endblock %}
+    {% block box-append %}{% endblock %}
+    {% block right-column %}{% endblock %}
     <div class="clearboth"></div>
-</div>
+  </div>
 </div>
diff --git a/src/picture/templates/picture/picture_viewer.html b/src/picture/templates/picture/picture_viewer.html
index 937ef689f..75be359bf 100644
--- a/src/picture/templates/picture/picture_viewer.html
+++ b/src/picture/templates/picture/picture_viewer.html
@@ -13,88 +13,92 @@
 
 
 {% block js-dependencies %}
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
+  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 {% endblock %}
 
 
 {% block no-menu-extra %}
-<li><a class="square button plus inactive" href="#">+<!--&#x2795;--><!-- heavy plus sign --></a></li><li><a class="square button minus inactive" href="#">-<!-- &#x2796;--><!-- heavy minus sign --></a></li>
+  <li><a class="square button plus inactive" href="#">+<!--&#x2795;--><!-- heavy plus sign --></a></li>
+  <li><a class="square button minus inactive" href="#">-<!-- &#x2796;--><!-- heavy minus sign --></a></li>
 {% endblock %}
 
 
 {% block menu %}
-<li><a style="width: 50%;display: inline-block;" class="square button plus inactive" href="#">+<!--&#x2795;--><!-- heavy plus sign --></a><a style="width: 50%;display: inline-block;" class="square button minus inactive" href="#">-<!-- &#x2796;--><!-- heavy minus sign --></a></li>
-
-{% spaceless %}
-<li>
-    {% with picture.get_previous as prev %}
+  <li>
+    <a style="width: 50%;display: inline-block;" class="square button plus inactive" href="#">+<!--&#x2795;--><!-- heavy plus sign --></a>
+    <a style="width: 50%;display: inline-block;" class="square button minus inactive" href="#">-<!-- &#x2796;--><!-- heavy minus sign --></a>
+  </li>
+
+  {% spaceless %}
+    <li>
+      {% with picture.get_previous as prev %}
         <a style="width: 50%;display: inline-block;" {% if prev %}href="{% url 'picture_viewer' prev.slug %}"{% endif %}>{% if prev %}&lt;{%endif %}</a>
-    {% endwith %}
-    {% with picture.get_next as next %}
+      {% endwith %}
+      {% with picture.get_next as next %}
         <a style="width: 50%;display: inline-block;" {% if next %}href="{% url 'picture_viewer' next.slug %}"{% endif %}>{% if next %}&gt;{% endif %}</a>
-    {% endwith %}
-</li>
-{% endspaceless %}
-
-
-<li><a href="{{ picture.get_absolute_url }}" id="menu-book" data-box="book-short">
-    <img src="{% thumbnail picture.image_file '80x200' as thumb %}{{ thumb.url }}{% empty %}{{ picture.image_file.url }}{% endthumbnail %}"
-        width="80"
-        alt="{{ picture.pretty_title }}"
-        title="{{ picture.pretty_title }}">
-</a></li>
-
-
-<li><a href="#picture-objects" class="dropdown"><span class="label">{% trans "Objects" %}</span></a></li>
-<li><a href="#picture-themes" class="dropdown"><span class="label">{% trans "Themes" %}</span></a></li>
-
-
-<li id="menu-info"><a href="#info" data-box="info">
-    <span class="label">{% trans "Infobox" %}</span>
-</a></li>
-
-<li id="sponsors">
+      {% endwith %}
+    </li>
+  {% endspaceless %}
+
+  <li>
+    <a href="{{ picture.get_absolute_url }}" id="menu-book" data-box="book-short">
+      <img src="{% thumbnail picture.image_file '80x200' as thumb %}{{ thumb.url }}{% empty %}{{ picture.image_file.url }}{% endthumbnail %}"
+           width="80"
+           alt="{{ picture.pretty_title }}"
+           title="{{ picture.pretty_title }}">
+    </a>
+  </li>
+
+  <li><a href="#picture-objects" class="dropdown"><span class="label">{% trans "Objects" %}</span></a></li>
+  <li><a href="#picture-themes" class="dropdown"><span class="label">{% trans "Themes" %}</span></a></li>
+
+  <li id="menu-info">
+    <a href="#info" data-box="info">
+      <span class="label">{% trans "Infobox" %}</span>
+    </a>
+  </li>
+
+  <li id="sponsors">
     {% for sponsor in sponsors %}
-        {% thumbnail sponsor.logo "80x200" as logo %}
-            <a href="{{ sponsor.url }}" target="_blank"><img src="{{ logo.url }}" alt="{{ sponsor.name }}" /></a>
-        {% endthumbnail %}
+      {% thumbnail sponsor.logo "80x200" as logo %}
+        <a href="{{ sponsor.url }}" target="_blank"><img src="{{ logo.url }}" alt="{{ sponsor.name }}" /></a>
+      {% endthumbnail %}
     {% endfor %}
-</li>
-
+  </li>
 {% endblock %}
 
 {% block main %}
-	<div id="picture-view">
-	  {% thumbnail picture.image_file "700x500" as pic %}
-	  <div class="picture-wrap {% if picture.image_file|is_portrait %}portrait{% endif %}"
-	       data-original-width="{{picture.width}}" data-original-height="{{picture.height}}"
+  <div id="picture-view">
+    {% thumbnail picture.image_file "700x500" as pic %}
+      <div class="picture-wrap {% if picture.image_file|is_portrait %}portrait{% endif %}"
+           data-original-width="{{picture.width}}" data-original-height="{{picture.height}}"
            data-original-url="{{ picture.image_file.url }}"
-	       data-width="{{pic.width}}" data-height="{{pic.height}}" style="background-image: url('{{pic.url}}');  width: {{pic.width}}px; height: {{pic.height}}px;">
-	  </div>
-	  {% endthumbnail %}
-	</div>
+           data-width="{{pic.width}}" data-height="{{pic.height}}" style="background-image: url('{{pic.url}}');  width: {{pic.width}}px; height: {{pic.height}}px;">
+      </div>
+    {% endthumbnail %}
+  </div>
 {% endblock %}
 
 
 {% block footer %}
-{{ picture.html_file.read|safe }}
-
-<div id="info" class="box">
-	  <div class="sponsors">
-	    <a href="/"><img src="{% static "img/logo-220.png" %}" alt="Wolne Lektury" ></img>
-	    </a>
-        {% for sponsor in sponsors %}
-            {% thumbnail sponsor.logo "220x220" as logo %}
-                <a href="{{ sponsor.url }}" target="_blank"><img src="{{ logo.url }}" alt="{{ sponsor.name }}" /></a>
-            {% endthumbnail %}
-        {% endfor %}
-	  </div>
+  {{ picture.html_file.read|safe }}
+
+  <div id="info" class="box">
+    <div class="sponsors">
+      <a href="/">
+        <img src="{% static "img/logo-220.png" %}" alt="Wolne Lektury"/>
+      </a>
+      {% for sponsor in sponsors %}
+        {% thumbnail sponsor.logo "220x220" as logo %}
+          <a href="{{ sponsor.url }}" target="_blank"><img src="{{ logo.url }}" alt="{{ sponsor.name }}"/></a>
+        {% endthumbnail %}
+      {% endfor %}
+    </div>
 
     {% book_info picture %}
-</div>
+  </div>
 
-<div class="box Picture-item" id="book-short">
+  <div class="box Picture-item" id="book-short">
     {% ssi_include 'picture_short' pk=picture.pk %}
-</div>
-
+  </div>
 {% endblock %}
diff --git a/src/picture/templates/picture/picture_wide.html b/src/picture/templates/picture/picture_wide.html
index 00260f55f..3ca7afe89 100644
--- a/src/picture/templates/picture/picture_wide.html
+++ b/src/picture/templates/picture/picture_wide.html
@@ -6,92 +6,97 @@
 {% block box-class %}book-wide-box{% endblock %}
 
 {% block picture-view %}
-<a href="{{ main_link }}">
-{% thumbnail picture.image_file "535" upscale=0 as thumb %}
-<img class="cover" src="{{thumb.url}}"/></a>
-{% endthumbnail %}
+  <a href="{{ main_link }}">
+    {% thumbnail picture.image_file "535" upscale=0 as thumb %}
+      <img class="cover" src="{{thumb.url}}"/>
+    {% endthumbnail %}
+  </a>
 {% endblock %}
 
 
 {% block extra_categories %}
-{% if picture.extra_info.styles %}
-<span class="category">
-<span class="mono"> {% trans "Style" %}:</span>&nbsp;<span class="book-box-tag">
-    {% for tag in picture.extra_info.styles %}
-        <a>{{ tag }}</a>
-        {% if not forloop.last %}<span>, </span>{% endif %}
-    {% endfor %}
-</span></span>
-{% endif %}
+  {% if picture.extra_info.styles %}
+    <span class="category">
+      <span class="mono"> {% trans "Style" %}:</span>&nbsp;<span class="book-box-tag">
+        {% for tag in picture.extra_info.styles %}
+          <a>{{ tag }}</a>
+          {% if not forloop.last %}<span>, </span>{% endif %}
+        {% endfor %}
+      </span>
+    </span>
+  {% endif %}
 
-{% if picture.extra_info.medium %}
-<span class="category">
-<span class="mono"> {% trans "Medium" %}:</span>&nbsp;<span class="book-box-tag">
-    <a>{{ picture.extra_info.medium }}</a>
-</span></span>
-{% endif %}
+  {% if picture.extra_info.medium %}
+    <span class="category">
+      <span class="mono"> {% trans "Medium" %}:</span>&nbsp;<span class="book-box-tag">
+        <a>{{ picture.extra_info.medium }}</a>
+      </span>
+    </span>
+  {% endif %}
 
-{% if picture.extra_info.original_dimensions %}
-<span class="category">
-<span class="mono"> {% trans "Dimensions" %}:</span>&nbsp;<span class="book-box-tag">
-    <a>{{ picture.extra_info.original_dimensions }}</a>
-</span></span>
-{% endif %}
-
-<span class="category">
-<span class="mono"> {% trans "Date" %}:</span>&nbsp;<span class="book-box-tag">
-    <a>{{ picture.extra_info.created_at }}</a>
-</span></span>
+  {% if picture.extra_info.original_dimensions %}
+    <span class="category">
+      <span class="mono"> {% trans "Dimensions" %}:</span>&nbsp;<span class="book-box-tag">
+        <a>{{ picture.extra_info.original_dimensions }}</a>
+      </span>
+    </span>
+  {% endif %}
 
+  <span class="category">
+    <span class="mono"> {% trans "Date" %}:</span>&nbsp;<span class="book-box-tag">
+      <a>{{ picture.extra_info.created_at }}</a>
+    </span>
+  </span>
 {% endblock %}
 
 
 {% block book-box-extra-info %}
-{% if themes or things%}
+  {% if themes or things%}
     <div class="hidden-box-wrapper" id="theme-list-wrapper">
-        <p><a class="hidden-box-trigger theme-list-link"
-                href="#">{% trans "Motifs, themes and objects" %}</a></p>
-        <div class="hidden-box">
-	  {% if themes %}
-	  <p>{% trans "Motifs and themes" %}</p>
+      <p>
+        <a class="hidden-box-trigger theme-list-link" href="#">{% trans "Motifs, themes and objects" %}</a>
+      </p>
+      <div class="hidden-box">
+        {% if themes %}
+          <p>{% trans "Motifs and themes" %}</p>
           <ul>
             {% for theme in themes %}
-            <li><a href="{% url 'picture_viewer' picture.slug %}#theme-{{theme.slug}}">{{ theme }}</a></li>
-		{% endfor %}
-            </ul>
-	    {% endif %}
-	    {% if things %}
-	  <p>{% trans "Objects" %}</p>
+              <li><a href="{% url 'picture_viewer' picture.slug %}#theme-{{theme.slug}}">{{ theme }}</a></li>
+            {% endfor %}
+          </ul>
+        {% endif %}
+        {% if things %}
+          <p>{% trans "Objects" %}</p>
           <ul>
             {% for thing in things %}
-            <li><a href="{% url 'picture_viewer' picture.slug %}#object-{{thing.slug}}">{{ thing }}</a></li>
+              <li><a href="{% url 'picture_viewer' picture.slug %}#object-{{thing.slug}}">{{ thing }}</a></li>
             {% endfor %}
           </ul>
-	  {% endif %}
-        </div>
+        {% endif %}
+      </div>
     </div>
-{% else %}
-	<p>&nbsp;</p>
-{% endif %}
+  {% else %}
+    <p>&nbsp;</p>
+  {% endif %}
 {% endblock %}
 
 
 {% block right-column %}
-<div class="right-column">
-  <div class="other-tools">
-    <h2 class="mono">{% trans "See" %}</h2>
-    <ul class="plain">
-      {% if picture.extra_info.source_url %}
-      <li><a href="{{ picture.extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the picture" %}</li>
-      {% endif %}
-      <li><a href="{{ picture.xml_file.url }}">{% trans "Source XML file" %}</a></li>
-      {% if picture.extra_info.about and not hide_about %}
-      <li>{% trans "Picture on" %} <a href="{{ picture.extra_info.about }}">{% trans "Editor's Platform" %}</a></li>
-      {% endif %}
-      {% if picture.wiki_link %}
-      <li><a href="{{ picture.wiki_link }}">{% trans "Picture description on Wikipedia" %}</a></li>
-      {% endif %}
-    </ul>
+  <div class="right-column">
+    <div class="other-tools">
+      <h2 class="mono">{% trans "See" %}</h2>
+      <ul class="plain">
+        {% if picture.extra_info.source_url %}
+          <li><a href="{{ picture.extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the picture" %}</li>
+        {% endif %}
+        <li><a href="{{ picture.xml_file.url }}">{% trans "Source XML file" %}</a></li>
+        {% if picture.extra_info.about and not hide_about %}
+          <li>{% trans "Picture on" %} <a href="{{ picture.extra_info.about }}">{% trans "Editor's Platform" %}</a></li>
+        {% endif %}
+        {% if picture.wiki_link %}
+          <li><a href="{{ picture.wiki_link }}">{% trans "Picture description on Wikipedia" %}</a></li>
+        {% endif %}
+      </ul>
+    </div>
   </div>
-</div>
 {% endblock %}
diff --git a/src/picture/templates/picture/picturearea_short.html b/src/picture/templates/picture/picturearea_short.html
index 4fa97817d..59aa73643 100644
--- a/src/picture/templates/picture/picturearea_short.html
+++ b/src/picture/templates/picture/picturearea_short.html
@@ -4,14 +4,16 @@
 
 <div class="area">
   <div class="area-thumbnail">
-    <a href="{% url 'picture_viewer' area.picture.slug %}{% if theme %}#theme-{{theme.slug}}{% else %}#object-{{thing.slug}}{% endif %}"><img src='{% area_thumbnail_url area "100x100" %}' /></a>
+    <a href="{% url 'picture_viewer' area.picture.slug %}{% if theme %}#theme-{{theme.slug}}{% else %}#object-{{thing.slug}}{% endif %}">
+      <img src='{% area_thumbnail_url area "100x100" %}'/>
+    </a>
   </div>
   {% with area.picture as picture %}
-  <div class="area-description">
-            <div class="mono source">
-	      {% book_title_html picture %}
-	    </div>
-  </div>
-  <div style="clear:both"/>
+    <div class="area-description">
+      <div class="mono source">
+        {% book_title_html picture %}
+      </div>
+    </div>
+    <div style="clear:both"></div>
   {% endwith %}
 </div>
diff --git a/src/polls/templates/polls/poll.html b/src/polls/templates/polls/poll.html
index edb14cf7b..e57d9cd50 100644
--- a/src/polls/templates/polls/poll.html
+++ b/src/polls/templates/polls/poll.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load polls_tags %}
 
@@ -6,10 +6,10 @@
 
 
 {% block body %}
-    <div class="normal-text">
-        {% if voted_already %}
-            <p class="poll-msg">{% trans "Thanks for voting! You can see current results below." %}</p>
-        {% endif %}
-        {% poll poll %}
-    </div>
+  <div class="normal-text">
+    {% if voted_already %}
+      <p class="poll-msg">{% trans "Thanks for voting! You can see current results below." %}</p>
+    {% endif %}
+    {% poll poll %}
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/reporting/templates/reporting/main.html b/src/reporting/templates/reporting/main.html
index 46d49c9ea..bae491e32 100755
--- a/src/reporting/templates/reporting/main.html
+++ b/src/reporting/templates/reporting/main.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load reporting_stats catalogue_tags %}
 
@@ -8,41 +8,39 @@
 
 
 {% block body %}
-    <h1>Statystyka</h1>
-
-    <div class="normal-text">
+  <h1>Statystyka</h1>
 
+  <div class="normal-text">
     <h3>Audiobooki</h3>
 
     <table class="stats">
-        <tr><th>Utwory</th></tr>
-        <tr><td>Utwory:</td><td>{% count_books %}</td></tr>
-        <tr><td>Niezależne książki:</td><td>{% count_books_root %}</td></tr>
-        <tr><td>Utwory nadrzędne:</td><td>{% count_books_parent %}</td></tr>
-        <tr><td>Wszystkie utwory:</td><td>{% count_books_all %}</td></tr>
-
-        <tr><th>Media</th><th>Liczba</th><th>Rozmiar</th><th>Do wymiany</th></tr>
-        {% for mt in media_types %}
-            <tr><td>{{ mt.type }}:</td>
-                <td>{{ mt.count }}</td>
-                <td>{{ mt.size|filesizeformat }}</td>
-                <td>{{ mt.deprecated }}
-                    {% for m in mt.deprecated_files %}
-                        <br/><a href="{{ m.book.get_absolute_url }}">{% book_title m.book %}: {{ m }}</a>
-                    {% endfor %}
-                </td>
-            </tr>
-        {% endfor %}
+      <tr><th>Utwory</th></tr>
+      <tr><td>Utwory:</td><td>{% count_books %}</td></tr>
+      <tr><td>Niezależne książki:</td><td>{% count_books_root %}</td></tr>
+      <tr><td>Utwory nadrzędne:</td><td>{% count_books_parent %}</td></tr>
+      <tr><td>Wszystkie utwory:</td><td>{% count_books_all %}</td></tr>
+
+      <tr><th>Media</th><th>Liczba</th><th>Rozmiar</th><th>Do wymiany</th></tr>
+      {% for mt in media_types %}
+        <tr>
+          <td>{{ mt.type }}:</td>
+          <td>{{ mt.count }}</td>
+          <td>{{ mt.size|filesizeformat }}</td>
+          <td>
+            {{ mt.deprecated }}
+            {% for m in mt.deprecated_files %}
+              <br/><a href="{{ m.book.get_absolute_url }}">{% book_title m.book %}: {{ m }}</a>
+            {% endfor %}
+          </td>
+        </tr>
+      {% endfor %}
     </table>
 
     <h3>Licencje</h3>
     <ul>
-    {% for license, license_description in licenses %}
+      {% for license, license_description in licenses %}
         <li>{{ license }} ({{ license_description }})</li>
-    {% endfor %}
+      {% endfor %}
     </ul>
-
-
-    </div>
-
+  </div>
 {% endblock %}
diff --git a/src/search/templates/newsearch/search.html b/src/search/templates/newsearch/search.html
index 0b0fad49d..881e85136 100644
--- a/src/search/templates/newsearch/search.html
+++ b/src/search/templates/newsearch/search.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -9,50 +9,51 @@
 {% block bodyid %}newsearch{% endblock %}
 
 {% block body %}
-    <h1>Search</h1>
-    <form action="{% url 'search' %}" method="get" accept-charset="utf-8" id="search-form-x">
-        <p>
-	  <input type="text" name="q" value="{{request.GET.q}}" style="width:250px; font-size: 1.2em;">
-	  <input type="submit" value="{% trans "Search" %}" /> 
-	  <br />
-	  <input type="checkbox" value="true" name="fuzzy" {% if fuzzy %}checked{% endif %}/> fuzzy.
-	</p>
-    </form>
-    {% if did_you_mean %}
+  <h1>Search</h1>
+  <form action="{% url 'search' %}" method="get" accept-charset="utf-8" id="search-form-x">
+    <p>
+      <input type="text" name="q" value="{{request.GET.q}}" style="width:250px; font-size: 1.2em;"/>
+      <input type="submit" value="{% trans "Search" %}" />
+      <br />
+      <input type="checkbox" value="true" name="fuzzy" {% if fuzzy %}checked{% endif %}/> fuzzy.
+    </p>
+  </form>
+  {% if did_you_mean %}
     Czy miałeś na mysli <a href="?q={{did_you_mean|urlencode}}">{{did_you_mean}}</a>?
-    {% endif %}
+  {% endif %}
 
-
-    <div id="results">
-      <ol>
+  <div id="results">
+    <ol>
       {% for result in results %}
-      <li>
-	<p><a href="{{result.book.get_absolute_url}}">{{result.book.pretty_title}}</a> (id: {{result.book_id}}, score: {{result.score}})</p>
-	<ul>
-	  {% for snip in hit.snippets %}
-	  <li>
-	    {{snip|safe}}<br/>
-	  </li>
-	  {% endfor %}
-
-	  {% for part in result.parts %}
-	  {% if part.header %}
-	  <li>W {{part.header}} nr {{part.position}}</li>
-	  {% else %} 
-	  {% if part.fragment %}
-	  <li>
-	    <div style="">Tagi/Motywy: {% for tag in part.fragment.tags %}{{tag.name}} {% endfor %}</div>
-	    {{part.fragment.short_html|safe}}
-	  </li>
-	  {% endif %}
-	  {% endif %}
-	  {% endfor %}
-	</ul>
-      </li>
+        <li>
+          <p>
+            <a href="{{result.book.get_absolute_url}}">{{result.book.pretty_title}}</a>
+            (id: {{result.book_id}}, score: {{result.score}})
+          </p>
+          <ul>
+            {% for snip in hit.snippets %}
+              <li>
+                {{snip|safe}}<br/>
+              </li>
+            {% endfor %}
+
+            {% for part in result.parts %}
+              {% if part.header %}
+                <li>W {{part.header}} nr {{part.position}}</li>
+              {% else %}
+                {% if part.fragment %}
+                  <li>
+                    <div style="">Tagi/Motywy: {% for tag in part.fragment.tags %}{{tag.name}} {% endfor %}</div>
+                    {{part.fragment.short_html|safe}}
+                  </li>
+                {% endif %}
+              {% endif %}
+            {% endfor %}
+          </ul>
+        </li>
       {% empty %}
-      <p>No results.</p>
+        <p>No results.</p>
       {% endfor %}
-      </ol>
-    </div>
-
+    </ol>
+  </div>
 {% endblock %}
diff --git a/src/social/templates/social/cite_info.html b/src/social/templates/social/cite_info.html
index 8f8e16d11..1f75c18e3 100644
--- a/src/social/templates/social/cite_info.html
+++ b/src/social/templates/social/cite_info.html
@@ -1,19 +1,17 @@
 {% spaceless %}
-
-{% if cite.image %}
+  {% if cite.image %}
     {% if cite.image_link %}<a href="{{ cite.image_link }}">{% endif %}
     {% if cite.image_title %}
-        {{ cite.image_title }}{% else %}
-	untitled{% endif %}{% if cite.image_link %}</a>{% endif %}{% if cite.image_author %}, 
-	{{ cite.image_author }}{% endif %}{% if cite.image_license %},
-    {% if cite.image_license_link %}<a href="{{ cite.image_license_link }}">{% endif %}
-    {{ cite.image_license }}
-    {% if cite.image_license_link %}</a>{% endif %}
+      {{ cite.image_title }}{% else %}
+      untitled{% endif %}{% if cite.image_link %}</a>{% endif %}{% if cite.image_author %},
+      {{ cite.image_author }}{% endif %}{% if cite.image_license %},
+      {% if cite.image_license_link %}<a href="{{ cite.image_license_link }}">{% endif %}
+      {{ cite.image_license }}
+      {% if cite.image_license_link %}</a>{% endif %}
     {% endif %}
-{% else %}
+  {% else %}
     <a href="http://www.flickr.com/photos/lou/430980641/">books about architecture</a>,
     saikofish@Flickr,
     <a href="http://creativecommons.org/licenses/by-nc-sa/2.0/">CC BY NC SA</a>.
-{% endif %}
-
+  {% endif %}
 {% endspaceless %}
diff --git a/src/social/templates/social/cite_promo.html b/src/social/templates/social/cite_promo.html
index 15786cf3b..546e07087 100755
--- a/src/social/templates/social/cite_promo.html
+++ b/src/social/templates/social/cite_promo.html
@@ -1,30 +1,25 @@
 {% spaceless %}
+  {% load i18n %}
 
-{% load i18n %}
-
-{% if main %}
+  {% if main %}
     <section id="big-cite"{% if cite.image %} style="background-image: url('{{ cite.image.url }}'); background-position: 50% {{ cite.image_shift|default_if_none:50 }}%;"{% endif %} >
-{% endif %}
-
-{% if cite %}
+  {% endif %}
 
-<a href="{{ cite.link }}" class="cite{% if cite.small %} cite-small{% endif %}">
-    {% if cite.vip %}
+  {% if cite %}
+    <a href="{{ cite.link }}" class="cite{% if cite.small %} cite-small{% endif %}">
+      {% if cite.vip %}
         <p class='vip mono'><span>{{ cite.vip }} {% trans "recommends" %}:</span></p>
-    {% endif %}
-    <blockquote class="cite-body">
+      {% endif %}
+      <blockquote class="cite-body">
         <span>{{ cite.text|linebreaksbr|safe }}</span>
-    </blockquote>
-    {% if cite.book %}
-    <p class="source mono"><span>{{ cite.book.pretty_title }}</span></p>
-    {% endif %}
-</a>
-
-{% endif %}
-
-
-{% if main %}
+      </blockquote>
+      {% if cite.book %}
+        <p class="source mono"><span>{{ cite.book.pretty_title }}</span></p>
+      {% endif %}
+    </a>
+  {% endif %}
+
+  {% if main %}
     </section>
-{% endif %}
-
+  {% endif %}
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/social/templates/social/my_shelf.html b/src/social/templates/social/my_shelf.html
index f448ad220..140551201 100755
--- a/src/social/templates/social/my_shelf.html
+++ b/src/social/templates/social/my_shelf.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 
@@ -7,13 +7,11 @@
 {% block logout %}/{% endblock %}
 
 {% block body %}
+  <h1>{% trans "My shelf" %}</h1>
 
-    <h1>{% trans "My shelf" %}</h1>
+  {% work_list books %}
 
-    {% work_list books %}
-
-    {% if not books %}
+  {% if not books %}
     {% trans "Add works to your shelf by clicking on the star on the page of the work. The work will then show up on My shelf page." %}
-    {# trans "Aby dodać pozycję do swojej półki, należy zaznaczyć gwiazdkę znajdującą się na stronie utworu. Po jej zaznaczeniu publikacja pojawi się w zakładce Moja półka" #}
-    {% endif %}
+  {% endif %}
 {% endblock %}
diff --git a/src/social/templates/social/sets_form.html b/src/social/templates/social/sets_form.html
index 5974a2a71..05f8e4361 100755
--- a/src/social/templates/social/sets_form.html
+++ b/src/social/templates/social/sets_form.html
@@ -3,17 +3,17 @@
 <h1>{{ title }}</h1>
 
 <form action="{% url 'social_unlike_book' view_kwargs.slug %}" method="post" accept-charset="utf-8"
-	class="cuteform{% if placeholdize %} hidelabels{% endif %}">
-{% ssi_csrf_token %}
-    <input type="submit" value="{% trans "Remove from my shelf" %}"/>
+      class="cuteform{% if placeholdize %} hidelabels{% endif %}">
+  {% ssi_csrf_token %}
+  <input type="submit" value="{% trans "Remove from my shelf" %}"/>
 </form>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
-	class="cuteform{% if placeholdize %} hidelabels{% endif %}">
-{% ssi_csrf_token %}
-<ol>
+      class="cuteform{% if placeholdize %} hidelabels{% endif %}">
+  {% ssi_csrf_token %}
+  <ol>
     <div id="id___all__"></div>
     {{ form.as_ul }}
     <li><input type="submit" value="{{ submit }}"/></li>
-</ol>
+  </ol>
 </form>
diff --git a/src/social/templates/social/shelf_tags.html b/src/social/templates/social/shelf_tags.html
index 2baa0f007..47e0b0a17 100755
--- a/src/social/templates/social/shelf_tags.html
+++ b/src/social/templates/social/shelf_tags.html
@@ -1,9 +1,7 @@
 {% spaceless %}
-
-<ul class='social-shelf-tags'>
+  <ul class='social-shelf-tags'>
     {% for tag in tags %}
-        <li><a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a></li>
+      <li><a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a></li>
     {% endfor %}
-</ul>
-
+  </ul>
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/sponsors/templates/sponsors/page.html b/src/sponsors/templates/sponsors/page.html
index 5a3b38ec2..c94f3d40c 100644
--- a/src/sponsors/templates/sponsors/page.html
+++ b/src/sponsors/templates/sponsors/page.html
@@ -1,16 +1,16 @@
 {% spaceless %}
-<style type="text/css">.sponsors-page a{background-image:url({{ page.sprite.url }});}</style>
-<div class="sponsors-page">
+  <style type="text/css">.sponsors-page a{background-image:url({{ page.sprite.url }});}</style>
+  <div class="sponsors-page">
     {% for column in sponsors %}
-        <div class="sponsors-column">
-            <p class="sponsors-column-name">{{ column.name|default:"&nbsp;" }}</p>
-            <div class='sponsor-logos'>
-                {% for offset, sponsor in column.sponsors %}
-                    <a href="{{ sponsor.url }}" title="{{ sponsor.description }}" style='background-position: 0px {{ offset }}px;'></a>
-                {% endfor %}
-            </div>
+      <div class="sponsors-column">
+        <p class="sponsors-column-name">{{ column.name|default:"&nbsp;" }}</p>
+        <div class='sponsor-logos'>
+          {% for offset, sponsor in column.sponsors %}
+            <a href="{{ sponsor.url }}" title="{{ sponsor.description }}" style='background-position: 0px {{ offset }}px;'></a>
+          {% endfor %}
         </div>
+      </div>
     {% endfor %}
     <div style="clear: both"></div>
-</div>
+  </div>
 {% endspaceless %}
diff --git a/src/suggest/templates/publishing_suggest.html b/src/suggest/templates/publishing_suggest.html
index 33f95a531..16c70a49b 100755
--- a/src/suggest/templates/publishing_suggest.html
+++ b/src/suggest/templates/publishing_suggest.html
@@ -5,19 +5,31 @@
 <h1>{% trans "Didn't find a book? Make a suggestion." %}</h1>
 
 <form id='suggest-publishing-form' action="{% url 'suggest_publishing' %}" method="post" accept-charset="utf-8" class="cuteform">
-{% ssi_csrf_token %}
-{% render_honeypot_field %}
-<ol>
-    <li><span class="error">{{ form.contact.errors }}</span><label for="id_contact">{{ form.contact.label }}</label> {{ form.contact }}</li>
+  {% ssi_csrf_token %}
+  {% render_honeypot_field %}
+  <ol>
+    <li>
+      <span class="error">{{ form.contact.errors }}</span>
+      <label for="id_contact">{{ form.contact.label }}</label>
+      {{ form.contact }}
+    </li>
 
     <li>{% trans "I'd like to find in WolneLektury.pl these…" %}</li>
 
     <li><label for="id_books">{{ form.books.label }}:</label> {{ form.books }}</li>
 
-    <li class="checkbox"><span class="error">{{ form.ebook.errors }}</span><label for="id_ebook">{{ form.ebook.label }}:</label> {{ form.ebook }}</li>
-    <li class="checkbox"><span class="error">{{ form.audiobook.errors }}</span><label for="id_audiobook">{{ form.audiobook.label }}:</label> {{ form.audiobook }}</li>
+    <li class="checkbox">
+      <span class="error">{{ form.ebook.errors }}</span>
+      <label for="id_ebook">{{ form.ebook.label }}:</label>
+      {{ form.ebook }}
+    </li>
+    <li class="checkbox">
+      <span class="error">{{ form.audiobook.errors }}</span>
+      <label for="id_audiobook">{{ form.audiobook.label }}:</label>
+      {{ form.audiobook }}
+    </li>
 
     <li><input type="submit" value="{% trans "Send report" %}"/></li>
     <li>{% trans "Remember that we can only publish books in public domain, ie. 70 years after the death of the author!" %}</li>
-</ol>
+  </ol>
 </form>
diff --git a/src/waiter/templates/waiter/wait.html b/src/waiter/templates/waiter/wait.html
index 6ef1b7751..0a0fb0d17 100644
--- a/src/waiter/templates/waiter/wait.html
+++ b/src/waiter/templates/waiter/wait.html
@@ -1,93 +1,100 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 {% load static from staticfiles %}
 
 {% block titleextra %}
-{% if file_url %}
+  {% if file_url %}
     {% trans "The file is ready for download!" %}
-{% else %}
+  {% else %}
     {% if waiting %}
-        {% trans "Your file is being prepared, please wait." %}
+      {% trans "Your file is being prepared, please wait." %}
     {% else %}
-        {% trans "Something went wrong." %}
+      {% trans "Something went wrong." %}
     {% endif %}
-{% endif %}
+  {% endif %}
 {% endblock %}
 
 
 {% block extrahead %}
-{% if file_url %}
+  {% if file_url %}
     <meta http-equiv="refresh" content="3; url={{ file_url }}" />
-{% else %}
+  {% else %}
     {% if waiting %}
-        <noscript>
-            <meta http-equiv="refresh" content="10" />
-        </noscript>
+      <noscript>
+        <meta http-equiv="refresh" content="10" />
+      </noscript>
     {% endif %}
-{% endif %}
+  {% endif %}
 {% endblock %}
 
 
 {% block body %}
-{% if file_url %}
+  {% if file_url %}
     <h1>{% trans "The file is ready for download!" %}</h1>
 
     <div class="normal-text white-box">
-    <p>{% blocktrans %}Your file is ready!
-        If the download doesn't start in a few seconds,
-        feel free to use this <a href="{{ file_url }}">direct link</a>.{% endblocktrans %}</p>
+      <p>
+        {% blocktrans %}Your file is ready!
+          If the download doesn't start in a few seconds,
+          feel free to use this <a href="{{ file_url }}">direct link</a>.{% endblocktrans %}
+      </p>
     </div>
-{% else %}
- {% if waiting %}
-    <h1><img src="{% static "img/indicator.gif" %}" alt="{% trans 'Please wait' %}"/>
-        {% trans "Your file is being prepared, please wait." %}</h1>
+  {% else %}
+    {% if waiting %}
+      <h1>
+        <img src="{% static "img/indicator.gif" %}" alt="{% trans 'Please wait' %}"/>
+        {% trans "Your file is being prepared, please wait." %}
+      </h1>
 
-    <div class="normal-text">
-    <p>{% blocktrans with d=waiting.description %}The file you requested was: <em>{{d}}</em>.{% endblocktrans %}</p>
+      <div class="normal-text">
+        <p>{% blocktrans with d=waiting.description %}The file you requested was: <em>{{d}}</em>.{% endblocktrans %}</p>
 
-    <p>{% blocktrans %}<strong>Be aware:</strong> Generating the file can take a while.
-        Please be patient, or bookmark this page and come back later.</p>{% endblocktrans %}
-    </div>
- {% else %}
-    <h1>{% trans "Something went wrong." %}</h1>
+        <p>
+          {% blocktrans %}<strong>Be aware:</strong> Generating the file can take a while.
+            Please be patient, or bookmark this page and come back later.{% endblocktrans %}
+        </p>
+      </div>
+    {% else %}
+      <h1>{% trans "Something went wrong." %}</h1>
 
-    <div class="normal-text">
-    {% url 'suggest' as s %}
-    <p>{% blocktrans %}Something seems to have gone wrong while generating your file.
-        Please order it again or <a id='suggest' class='ajaxable' href="{{s}}">complain to us</a> about it.{% endblocktrans %}</p>
-    </div>
- {% endif %}
-{% endif %}
-	
+      <div class="normal-text">
+        {% url 'suggest' as s %}
+        <p>
+          {% blocktrans %}Something seems to have gone wrong while generating your file.
+            Please order it again or <a id='suggest' class='ajaxable' href="{{s}}">complain to us</a> about it.{% endblocktrans %}
+        </p>
+      </div>
+    {% endif %}
+  {% endif %}
 {% endblock %}
 
 {% block extrabody %}
-{% if waiting %}
-<script language="JavaScript">
-<!--
-(function($) {
-    $(function(){
+  {% if waiting %}
+  <script language="JavaScript">
+    <!--
+    (function($) {
+        $(function(){
 
-function wait() {
-    $.ajax({
-        href: '',
-        success: function(data) {
-            if (data) {
+    function wait() {
+        $.ajax({
+            href: '',
+            success: function(data) {
+                if (data) {
+                    location.reload();
+                }
+                else
+                    setTimeout(wait, 10*1000);
+            },
+            error: function(xhr) {
                 location.reload();
             }
-            else
-                setTimeout(wait, 10*1000);
-        },
-        error: function(xhr) {
-            location.reload();
-        }
-    });
-}
-setTimeout(wait, 10*1000);
+        });
+    }
+    setTimeout(wait, 10*1000);
 
-    });
-})(jQuery);
-//-->
-</script>
-{% endif %}
+        });
+    })(jQuery);
+    //-->
+  </script>
+  {% endif %}
 {% endblock %}
diff --git a/src/wolnelektury/static/js/base.js b/src/wolnelektury/static/js/base.js
index eee31f914..1dde3221c 100644
--- a/src/wolnelektury/static/js/base.js
+++ b/src/wolnelektury/static/js/base.js
@@ -1,29 +1,29 @@
 (function($) {
     $(function() {
         $.fn.toggle_slide = function(p) {
-            cont = $(this);
-            short_el = p['short_el'] || $(':first-child', this);
-            long_el = p['long_el'] || short_el.next();
-            button = p['button'];
-            short_text = p['short_text'],
-            long_text = p['long_text'];
+            var cont = $(this);
+            var short_el = p['short_el'] || $(':first-child', this);
+            var long_el = p['long_el'] || short_el.next();
+            var button = p['button'];
+            var short_text = p['short_text'];
+            var long_text = p['long_text'];
 
             var toggle_fun = function(cont, short_el, long_el, button, short_text, long_text) {
-                var toggle = function() {
+                return function () {
                     if (cont.hasClass('short')) {
-                        cont.animate({"height": long_el.attr("cont_h")+'px'}, {duration: "fast" }).removeClass('short');
+                        cont.animate({"height": long_el.attr("cont_h") + 'px'}, {duration: "fast"})
+                            .removeClass('short');
                         short_el.hide();
                         long_el.show();
                         if (button && long_text) button.html(long_text);
                     } else {
-                        cont.animate({"height": short_el.attr("cont_h")+'px'}, {duration: "fast" }).addClass('short');
+                        cont.animate({"height": short_el.attr("cont_h") + 'px'}, {duration: "fast"}).addClass('short');
                         long_el.hide();
                         short_el.show();
                         if (button && short_text) button.html(short_text);
                     }
                     return false;
                 };
-                return toggle;
             };
             if (long_el.html().length <= short_el.html().length)
                 return;
@@ -34,8 +34,10 @@
             short_el.show().attr("cont_h", $(this).height());
             $(this).addClass('short');
 
-            if (button && short_text) button.html(short_text);
-            if (button) button.click(toggle_fun(cont, short_el, long_el, button, short_text, long_text));
+            if (button && short_text)
+                button.html(short_text);
+            if (button)
+                button.click(toggle_fun(cont, short_el, long_el, button, short_text, long_text));
         };
 
 
@@ -57,24 +59,24 @@
 
 
 
-		(function() {
-			var $current = null;
+        (function() {
+            var $current = null;
             var menu_loaded = false;
-			$('.hidden-box-wrapper').each(function() {
-				var $hidden = $('.hidden-box', this);
-				$('.hidden-box-trigger', this).click(function(event) {
-					event.preventDefault();
-					if ($current == $hidden) {
-						$current = null;
-						$hidden.hide('fast');
-					} else {
-						$current && $current.hide('fast');
-						$hidden.show('fast');
-						$current = $hidden;
+            $('.hidden-box-wrapper').each(function() {
+                var $hidden = $('.hidden-box', this);
+                $('.hidden-box-trigger', this).click(function(event) {
+                    event.preventDefault();
+                    if ($current == $hidden) {
+                        $current = null;
+                        $hidden.hide('fast');
+                    } else {
+                        $current && $current.hide('fast');
+                        $hidden.show('fast');
+                        $current = $hidden;
                         if ($(this).hasClass('load-menu') && !menu_loaded) {
                             $.ajax({
                                 url: '/katalog/' + LANGUAGE_CODE + '.json',
-                                dataType: "json",
+                                dataType: "json"
                             }).done(function(data) {
                                 $.each(data, function(index, value) {
                                     var $menuitem = $('#menu-' + index);
@@ -86,7 +88,8 @@
                                             $("li", $menuitem).each(function() {
                                                 if ($("a", this).text().toLowerCase().indexOf(s) != -1)
                                                     $(this).show();
-                                                else $(this).hide();
+                                                else
+                                                    $(this).hide();
                                             });
                                         }
                                         else {
@@ -98,133 +101,134 @@
                                 menu_loaded = true;
                             });
                         }
-					}
-				});
-			});
-		    /* this kinda breaks the whole page. */
-			$('body').click(function(e) {
-				if ($current == null) return;
-				var p = $(e.target);
-				while (p.length) {
-					if (p == $current)
-						return;
-					if (p.hasClass('hidden-box-trigger')
-					    || p.hasClass('simple-toggler')
+                    }
+                });
+            });
+            /* this kinda breaks the whole page. */
+            $('body').click(function(e) {
+                if ($current == null) return;
+                var p = $(e.target);
+                while (p.length) {
+                    if (p == $current)
+                        return;
+                    if (p.hasClass('hidden-box-trigger')
+                        || p.hasClass('simple-toggler')
                         || p.hasClass('mini-search'))
-						return;
-					p = p.parent();
-				}
-				$current.hide('fast');
-				$current = null;
-			});
-		})();
+                        return;
+                    p = p.parent();
+                }
+                $current.hide('fast');
+                $current = null;
+            });
+        })();
 
 
-$('#show-menu').click(function(event) {
-    event.preventDefault();
-    //$('#menu').toggle('slow');
-    $('body').toggleClass('menu-on');
-});
+        $('#show-menu').click(function(event) {
+            event.preventDefault();
+            //$('#menu').toggle('fast');
+            $('body').toggleClass('menu-on');
+        });
 
 
-$('#book-list-nav h2').click(function(event) {
-    event.preventDefault();
-    $('#book-list-nav-index').toggle();
-});
+        $('#book-list-nav').find('h2').click(function(event) {
+            event.preventDefault();
+            $('#book-list-nav-index').toggle();
+        });
 
 
-$('#themes-list-toggle').click(function(event) {
-    event.preventDefault();
-    $('#themes-list').toggle('slow');
-});
+        $('#themes-list-toggle').click(function(event) {
+            event.preventDefault();
+            $('#themes-list').toggle('fast');
+        });
 
 
         $('.book-list-index').click(function(){
-            $('.book-list-show-index').hide('slow');
-            if($(this).parent().next('ul:not(:hidden)').length == 0){
-		$(this).parent().next('ul').toggle('slow');
-	    }
+            $('.book-list-show-index').hide('fast');
+            var books_ul = $(this).parent().next().children().first();
+            if(books_ul.first().is(':hidden')){
+                books_ul.toggle('fast');
+            }
             return false;
         });
 
-	$('.hoverclick').click(function() {$(this).closest('.hoverget').toggleClass('hover');});
-
-	$(function(){
-	    $("#search").search();});
-
-      $('body').on('click', '.simple-toggler' , function(ev) {
-	ev.preventDefault();
-	var scope = $(this).closest('.simple-toggler-scope');
-	scope.find('.simple-hidden-box').each(function(){
-	  var $this = $(this);
-	  if ($this.is(':hidden')) {
-	    $this.show();
-	  } else {
-	    $this.hide();
-	  }
-	  });
-      });
-
-
-    $('.tabbed-filter').each(function() {
-        var tf = this;
-        $('.tab').click(function() {
-            if ($(this).hasClass('active')) {
-                $(this).removeClass('active');
-                $('#' + $(this).attr('data-id')).hide();
-            }
-            else {
-                var $active = $('.active', tf);
-                $active.removeClass('active');
-                $('#' + $active.attr('data-id')).hide();
-                $(this).addClass('active');
-                $('#' + $(this).attr('data-id')).show();
-            }
+        $('.hoverclick').click(function() {$(this).closest('.hoverget').toggleClass('hover');});
+
+        $(function(){
+            $("#search").search();
         });
-    });
 
+        $('body').on('click', '.simple-toggler' , function(ev) {
+            ev.preventDefault();
+            var scope = $(this).closest('.simple-toggler-scope');
+            scope.find('.simple-hidden-box').each(function() {
+                var $this = $(this);
+                if ($this.is(':hidden')) {
+                    $this.show();
+                } else {
+                    $this.hide();
+                }
+            });
+        });
 
-    $('.plain-list-paged').each(function() {
-        // should change on resize?
-        var $plc = $(this);
-        var $pl = $('.plain-list', this);
-
-        var $items = $('p', $pl);
-
-        if ($items.length > 40) {
-            $items.hide();
-            var prev = [0, 0];
-
-            $('.pager', $plc).paging($items.length, {
-                format: '[< ncnnn >]', // define how the navigation should look like and in which order onFormat() get's called
-                perpage: 40,
-                lapping: 0, // don't overlap pages for the moment
-                page: 1, // start at page, can also be "null" or negative
-                onSelect: function (page) {
-                    var data = this.slice;
-                    $items.slice(prev[0], prev[1]).hide();
-                    $items.slice(data[0], data[1]).show();
-                    prev = data;
-                },
-                onFormat: function (type) {
-                    switch (type) {
-                        case 'block': // n and c
-                            return ' <li><a href="#"' + (this.value == this.page ? ' class="current"' : '') + '>' + this.value + '</a></li>';
-                        case 'next': // >
-                            return '<li><a href="#">&rsaquo;</a></li>';
-                        case 'prev': // <
-                            return '<li><a href="#">&lsaquo;</a></li>';
-                        case 'first': // [
-                            return '<li><a href="#">&laquo;</a></li>';
-                        case 'last': // ]
-                            return '<li><a href="#">&raquo;</a></li>';
-                    }
+
+        $('.tabbed-filter').each(function() {
+            var tf = this;
+            $('.tab').click(function() {
+                if ($(this).hasClass('active')) {
+                    $(this).removeClass('active');
+                    $('#' + $(this).attr('data-id')).hide();
+                }
+                else {
+                    var $active = $('.active', tf);
+                    $active.removeClass('active');
+                    $('#' + $active.attr('data-id')).hide();
+                    $(this).addClass('active');
+                    $('#' + $(this).attr('data-id')).show();
                 }
             });
-        }
-    });
+        });
 
 
+        $('.plain-list-paged').each(function() {
+            // should change on resize?
+            var $plc = $(this);
+            var $pl = $('.plain-list', this);
+
+            var $items = $('p', $pl);
+
+            if ($items.length > 40) {
+                $items.hide();
+                var prev = [0, 0];
+
+                $('.pager', $plc).paging($items.length, {
+                    format: '[< ncnnn >]', // define how the navigation should look like and in which order onFormat() get's called
+                    perpage: 40,
+                    lapping: 0, // don't overlap pages for the moment
+                    page: 1, // start at page, can also be "null" or negative
+                    onSelect: function (page) {
+                        var data = this.slice;
+                        $items.slice(prev[0], prev[1]).hide();
+                        $items.slice(data[0], data[1]).show();
+                        prev = data;
+                    },
+                    onFormat: function (type) {
+                        switch (type) {
+                            case 'block': // n and c
+                                return ' <li><a href="#"' + (this.value == this.page ? ' class="current"' : '') + '>' +
+                                    this.value + '</a></li>';
+                            case 'next': // >
+                                return '<li><a href="#">&rsaquo;</a></li>';
+                            case 'prev': // <
+                                return '<li><a href="#">&lsaquo;</a></li>';
+                            case 'first': // [
+                                return '<li><a href="#">&laquo;</a></li>';
+                            case 'last': // ]
+                                return '<li><a href="#">&raquo;</a></li>';
+                        }
+                    }
+                });
+            }
+        });
     });
 })(jQuery);
 
diff --git a/src/wolnelektury/static/scss/main/book_box.scss b/src/wolnelektury/static/scss/main/book_box.scss
index 592f8efe7..23575ce99 100755
--- a/src/wolnelektury/static/scss/main/book_box.scss
+++ b/src/wolnelektury/static/scss/main/book_box.scss
@@ -488,6 +488,7 @@
 
 #book-detail .see-also,
 #picture-detail .see-also {
+  display: inline-block;
   h1 {
     @include size(height, 32px);
     margin: 0;
diff --git a/src/wolnelektury/templates/404.html b/src/wolnelektury/templates/404.html
index f3846aac4..63d3cacb6 100644
--- a/src/wolnelektury/templates/404.html
+++ b/src/wolnelektury/templates/404.html
@@ -1,19 +1,14 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
-
-{% block titleextra %}404 - {% trans "Page does not exist" %}{% endblock %}
+{% block titleextra %}404 – {% trans "Page does not exist" %}{% endblock %}
 
 
 {% block body %}
+  <h1>{% trans "Page not found" %}</h1>
 
-<h1>{% trans "Page not found" %}</h1>
-
-
-<p class="normal-text">
-{% trans "We are sorry, but this page does not exist. Please check if you entered correct address or go to "%} <a href="/">{% trans "main page" %}</a>.
-</p>
-
-
-
+  <p class="normal-text">
+    {% trans "We are sorry, but this page does not exist. Please check if you entered correct address or go to "%}
+    <a href="/">{% trans "main page" %}</a>.
+  </p>
 {% endblock body %}
diff --git a/src/wolnelektury/templates/500.html b/src/wolnelektury/templates/500.html
index df74fe42d..6ce3a2ae7 100644
--- a/src/wolnelektury/templates/500.html
+++ b/src/wolnelektury/templates/500.html
@@ -1,24 +1,24 @@
 {% load i18n %}
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <title>Wolne Lektury :: 500 - {% trans "Server error" %}</title>
-    </head>
-    <body style="background: #F7F7F7;font-family:Georgia;margin:0;padding:0;font-size:.625em;">
-        <div style="height:9.4em;background:#191919;">
-        	<div style="max-width:97.5em;margin:auto;">
-<img src='data:image/png;base64,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'/>
-			</div>
-        </div>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Wolne Lektury :: 500 – {% trans "Server error" %}</title>
+  </head>
+  <body style="background: #F7F7F7;font-family:Georgia;margin:0;padding:0;font-size:.625em;">
+    <div style="height:9.4em;background:#191919;">
+      <div style="max-width:97.5em;margin:auto;">
+        <img src='data:image/png;base64,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'/>
+      </div>
+    </div>
 
-        <div style="max-width:97.5em;margin:auto">
-        	<div style="font-size:1.4em;">
-			<h1>{% trans "Server error" %}</h1>
+    <div style="max-width:97.5em;margin:auto">
+      <div style="font-size:1.4em;">
+        <h1>{% trans "Server error" %}</h1>
 
-{% trans "<p>The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our <a href='http://nowoczesnapolska.org.pl'>blog</a>.</p> <p>Inform our <a href='mailto:fundacja@nowoczesnapolska.org.pl'>administrators</a> about the error.</p>" %}
+        {% trans "<p>The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our <a href='http://nowoczesnapolska.org.pl'>blog</a>.</p> <p>Inform our <a href='mailto:fundacja@nowoczesnapolska.org.pl'>administrators</a> about the error.</p>" %}
 
-			</div>
-        </div>
-    </body>
+      </div>
+    </div>
+  </body>
 </html>
\ No newline at end of file
diff --git a/src/wolnelektury/templates/503.html b/src/wolnelektury/templates/503.html
index 47689d122..2319f0d13 100644
--- a/src/wolnelektury/templates/503.html
+++ b/src/wolnelektury/templates/503.html
@@ -1,24 +1,24 @@
 {% load i18n %}
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <title>Wolne Lektury :: 503 - {% trans "Service unavailable" %}</title>
-    </head>
-    <body style="background: #F7F7F7;font-family:Georgia;margin:0;padding:0;font-size:.625em;">
-        <div style="height:9.4em;background:#191919;">
-        	<div style="max-width:97.5em;margin:auto;">
-<img src='data:image/png;base64,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'/>
-			</div>
-        </div>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Wolne Lektury :: 503 – {% trans "Service unavailable" %}</title>
+  </head>
+  <body style="background: #F7F7F7;font-family:Georgia;margin:0;padding:0;font-size:.625em;">
+    <div style="height:9.4em;background:#191919;">
+      <div style="max-width:97.5em;margin:auto;">
+        <img src='data:image/png;base64,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'/>
+      </div>
+    </div>
 
-        <div style="max-width:97.5em;margin:auto">
-        	<div style="font-size:1.4em;">
-			<h1>{% trans "Service unavailable" %}</h1>
-<p>
-{% trans "The Wolnelektury.pl site is currently unavailable due to maintainance." %}
-</p>
-</div>
-        </div>
-    </body>
+    <div style="max-width:97.5em;margin:auto">
+      <div style="font-size:1.4em;">
+        <h1>{% trans "Service unavailable" %}</h1>
+        <p>
+          {% trans "The Wolnelektury.pl site is currently unavailable due to maintainance." %}
+        </p>
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/src/wolnelektury/templates/account/base.html b/src/wolnelektury/templates/account/base.html
index ebd628603..a2ddbe685 100755
--- a/src/wolnelektury/templates/account/base.html
+++ b/src/wolnelektury/templates/account/base.html
@@ -1,12 +1,11 @@
 {% extends "site_base.html" %}
 
 {% block body %}
-<div class="white-box normal-text">
-{% block content %} {% endblock %}
-</div>
+  <div class="white-box normal-text">
+    {% block content %}{% endblock %}
+  </div>
 {% endblock %}
 
 {% block extrabody %}
-{% block extra_body %}
-{% endblock %}
+  {% block extra_body %}{% endblock %}
 {% endblock %}
diff --git a/src/wolnelektury/templates/admin/base_site.html b/src/wolnelektury/templates/admin/base_site.html
index ff381b554..c4b16b482 100644
--- a/src/wolnelektury/templates/admin/base_site.html
+++ b/src/wolnelektury/templates/admin/base_site.html
@@ -4,8 +4,8 @@
 {% block title %}{{ title }} | {% trans "Site administration" %} - WolneLektury.pl{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">{% trans "Site administration" %} - WolneLektury.pl</h1>
-<p style="font-size: 11px;margin-left:10px;">
+  <h1 id="site-name">{% trans "Site administration" %} - WolneLektury.pl</h1>
+  <p style="font-size: 11px;margin-left:10px;">
     <!--a href="/rosetta/">{% trans "Translations" %}</a-->
     <a href="/admin/chunks/chunk/promo/">promobox</a> |
     <a href="/admin/social/cite">cytaty</a> |
@@ -16,7 +16,7 @@
     <a href="/admin/pdcounter/">licznik domeny</a> |
     <a href="/admin/sponsors/">sponsorzy</a> |
     <a href="/admin/suggest/suggestion/">sugestie</a>
-</p>
+  </p>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}
\ No newline at end of file
diff --git a/src/wolnelektury/templates/admin/catalogue/book/change_form.html b/src/wolnelektury/templates/admin/catalogue/book/change_form.html
index 819ab62fc..5282ebe01 100644
--- a/src/wolnelektury/templates/admin/catalogue/book/change_form.html
+++ b/src/wolnelektury/templates/admin/catalogue/book/change_form.html
@@ -2,45 +2,43 @@
 {% load i18n %}
 
 {% block content_title %}
-    {% if change and 'advanced' in request.GET %}
-        <h1>{{ title }} &mdash; {% trans "advanced" %} </h1>
-    {% else %}
-        {{ block.super }}
-    {% endif %}
+  {% if change and 'advanced' in request.GET %}
+    <h1>{{ title }} &mdash; {% trans "advanced" %} </h1>
+  {% else %}
+    {{ block.super }}
+  {% endif %}
 {% endblock %}
 
 
 {# add an "Advanced" button to tools #}
 
 {% block extrastyle %}
-    {% if change and not is_popup %}
-        {{ block.super }}
-        <style>
-            .object-tools {margin-bottom:0; margin-top:0;}
-            .advancedlink {text-transform: capitalize;}
-        </style>
-    {% else %}
-        {{ block.super }}
-    {% endif %}
+  {% if change and not is_popup %}
+    {{ block.super }}
+    <style>
+      .object-tools {margin-bottom:0; margin-top:0;}
+      .advancedlink {text-transform: capitalize;}
+    </style>
+  {% else %}
+    {{ block.super }}
+  {% endif %}
 {% endblock %}
 
 {% block object-tools %}
-    {% if change and not is_popup %}
-        <div style='margin-bottom: -2em; margin-top: -2.4em; float:right; '>
-        {{ block.super }}
-        <ul class="object-tools"><li>
-        {% if 'advanced' in request.GET %}
+  {% if change and not is_popup %}
+    <div style='margin-bottom: -2em; margin-top: -2.4em; float:right; '>
+      {{ block.super }}
+      <ul class="object-tools">
+        <li>
+          {% if 'advanced' in request.GET %}
             <a href="." class="advancedlink">{% trans "simplified" %}</a>
-        {% else %}
+          {% else %}
             <a href="?advanced" class="advancedlink">{% trans "advanced" %}</a>
-        {% endif %}
-        </li></ul>
-        </div>
-    {% else %}
-        {{ block.super }}
-    {% endif %}
+          {% endif %}
+        </li>
+      </ul>
+    </div>
+  {% else %}
+    {{ block.super }}
+  {% endif %}
 {% endblock %}
-
-
-
-
diff --git a/src/wolnelektury/templates/admin/catalogue/book/change_list.html b/src/wolnelektury/templates/admin/catalogue/book/change_list.html
index 9f1b8cbf4..131250a3a 100644
--- a/src/wolnelektury/templates/admin/catalogue/book/change_list.html
+++ b/src/wolnelektury/templates/admin/catalogue/book/change_list.html
@@ -2,9 +2,12 @@
 {% load i18n %}
 
 {% block content %}
-    <form action="{% url 'import_book' %}" method="post" enctype="multipart/form-data">
+  <form action="{% url 'import_book' %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
-        <p><input type="file" id="id_book_xml_file" name="book_xml_file" /> <input type="submit" value="{% trans "Import book" %}"/></p>
-    </form>
-    {{ block.super }}
+    <p>
+      <input type="file" id="id_book_xml_file" name="book_xml_file"/>
+      <input type="submit" value="{% trans "Import book" %}"/>
+    </p>
+  </form>
+  {{ block.super }}
 {% endblock content %}
diff --git a/src/wolnelektury/templates/annoy.html b/src/wolnelektury/templates/annoy.html
index 890b62d91..a5b34a29a 100755
--- a/src/wolnelektury/templates/annoy.html
+++ b/src/wolnelektury/templates/annoy.html
@@ -1,18 +1,21 @@
 {% load static %}
 <a id='annoy-on' href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">1%</a>
-<div id='annoy'>
+  <div id='annoy'>
     <a href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
-        <img src='{% static "img/procent.png" %}' alt="Logo akcji 1%" style="float:left;margin: 0 2em" /></a>
+      <img src='{% static "img/procent.png" %}' alt="Logo akcji 1%" style="float:left;margin: 0 2em" />
+    </a>
     <p>Droga użytkowniczko, drogi użytkowniku!</p>
-    <p>Czy wiesz, że biblioteka internetowa Wolne Lektury to jeden z&nbsp;projektów
-    <strong>fundacji Nowoczesna Polska</strong> –
-    organizacji pożytku publicznego działającej na rzecz wolności korzystania
-    z&nbsp;dóbr kultury? Wesprzyj nasze działania, przeznaczając na nie 1% swojego podatku.
-    Możesz to zrobić, wpisując w&nbsp;zeznaniu podatkowym numer
-    <strong>KRS 0000070056</strong>.</p>
+    <p>
+      Czy wiesz, że biblioteka internetowa Wolne Lektury to jeden z&nbsp;projektów
+      <strong>fundacji Nowoczesna Polska</strong> –
+      organizacji pożytku publicznego działającej na rzecz wolności korzystania
+      z&nbsp;dóbr kultury? Wesprzyj nasze działania, przeznaczając na nie 1% swojego podatku.
+      Możesz to zrobić, wpisując w&nbsp;zeznaniu podatkowym numer
+      <strong>KRS 0000070056</strong>.
+    </p>
 
     <p><a href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">Dowiedz się więcej</a></p>
-    
+
     <a id='annoy-off'>x</a>
     <div style="clear:both;"></div>
 </div>
diff --git a/src/wolnelektury/templates/auth/login.html b/src/wolnelektury/templates/auth/login.html
index 756b8ad31..8509b4cf9 100644
--- a/src/wolnelektury/templates/auth/login.html
+++ b/src/wolnelektury/templates/auth/login.html
@@ -4,20 +4,20 @@
 <h1>{{ title }}</h1>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
-	class="cuteform{% if placeholdize %} hidelabels{% endif %}">
-{% ssi_csrf_token %}
-<ol>
+      class="cuteform{% if placeholdize %} hidelabels{% endif %}">
+  {% ssi_csrf_token %}
+  <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}
     <li><a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a></li>
     <li><input type="submit" value="{{ submit }}"/></li>
-</ol>
+  </ol>
 </form>
 
 <h1>{% trans "Sign in using:" %}</h1>
 
 <ul class="socialaccount_providers">
-{% include "socialaccount/snippets/provider_list.html" %}
+  {% include "socialaccount/snippets/provider_list.html" %}
 </ul>
 
 {% include "socialaccount/snippets/login_extra.html" %}
diff --git a/src/wolnelektury/templates/auth/login_register.html b/src/wolnelektury/templates/auth/login_register.html
index 80d3d232a..31d137cdc 100755
--- a/src/wolnelektury/templates/auth/login_register.html
+++ b/src/wolnelektury/templates/auth/login_register.html
@@ -4,21 +4,18 @@
 {% load ssi_csrf_token from ssify %}
 
 {% block extra %}
+  {{ block.super }}
 
-{{ block.super }}
-
-<h1>{% trans "or register" %}:</h1>
-
-<form action="{% url 'register' %}" method="post" accept-charset="utf-8"
-	class="cuteform hidelabels">
-{% ssi_csrf_token %}
-{% render_honeypot_field %}
-<ol>
-    <div id="id_register-__all__"></div>
-    {{ register_form.as_ul }}
-    <li><input type="submit" value="{{ register_submit }}"/></li>
-</ol>
-</form>
-
+  <h1>{% trans "or register" %}:</h1>
 
+  <form action="{% url 'register' %}" method="post" accept-charset="utf-8"
+        class="cuteform hidelabels">
+    {% ssi_csrf_token %}
+    {% render_honeypot_field %}
+    <ol>
+      <div id="id_register-__all__"></div>
+      {{ register_form.as_ul }}
+      <li><input type="submit" value="{{ register_submit }}"/></li>
+    </ol>
+  </form>
 {% endblock %}
diff --git a/src/wolnelektury/templates/auth/register.html b/src/wolnelektury/templates/auth/register.html
index 9d2c28363..3252caeb8 100644
--- a/src/wolnelektury/templates/auth/register.html
+++ b/src/wolnelektury/templates/auth/register.html
@@ -7,7 +7,7 @@
 <h1>{% trans "Sign in using:" %}</h1>
 
 <ul class="socialaccount_providers">
-{% include "socialaccount/snippets/provider_list.html" %}
+  {% include "socialaccount/snippets/provider_list.html" %}
 </ul>
 
 {% include "socialaccount/snippets/login_extra.html" %}
diff --git a/src/wolnelektury/templates/base.html b/src/wolnelektury/templates/base.html
deleted file mode 100644
index 345b80f15..000000000
--- a/src/wolnelektury/templates/base.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "superbase.html" %}
-
-
-{% block ogtitle %}{% block titleextra %}{{ page_title }}{% endblock %}{% endblock %}
diff --git a/src/wolnelektury/templates/base/base.html b/src/wolnelektury/templates/base/base.html
new file mode 100644
index 000000000..600ec9225
--- /dev/null
+++ b/src/wolnelektury/templates/base/base.html
@@ -0,0 +1,4 @@
+{% extends "base/superbase.html" %}
+
+
+{% block ogtitle %}{% block titleextra %}{{ page_title }}{% endblock %}{% endblock %}
diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
new file mode 100644
index 000000000..ec523e568
--- /dev/null
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+{% spaceless %}
+  <html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
+    {% load pipeline i18n %}
+    {% load static from staticfiles %}
+    {% load catalogue_tags funding_tags reporting_stats %}
+    {% load piwik_tags %}
+    {% load ssi_include ssi_csrf_token from ssify %}
+    {% load user_username user_is_staff from common_tags %}
+    <head>
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+      <meta name="application-name" content="Wolne Lektury" />
+      <meta property="og:site_name" content="Wolne Lektury" />
+      <meta property="og:title" content="{% block ogtitle %}{{ page_title }}{% endblock %}" />
+      <meta property="og:type" content="{% block ogtype %}website{% endblock %}" />
+      <meta property="og:image" content="{% block ogimage %}{{ FULL_STATIC_URL }}img/wiatrak.jpg{% endblock %}" />
+      <meta name="description" content="{% block metadescription %}Darmowe, opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
+      {% block ogextra %}{% endblock %}
+
+      <title>
+        {% block title %}{% block titleextra %}{{ page_title }}{% endblock %} :: {% trans "Wolne Lektury" %}{% endblock %}
+      </title>
+      <link rel="icon" href="{% static 'img/favicon.png' %}" type="image/png"/>
+      <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury"
+            href="{% static 'opensearch.xml' %}"/>
+      {% stylesheet "main" %}
+      {% block extrahead %}{% endblock %}
+    </head>
+    <body id="{% block bodyid %}base{% endblock %}">
+
+      {% block bodycontent %}
+
+        {% if not funding_no_show_current %}
+          {% current_offer as current_offer %}
+          {{ current_offer.if }}
+          {% ssi_include 'funding_top_bar' pk=current_offer %}
+          {{ current_offer.endif }}
+        {% endif %}
+
+        <div id="whole-header">
+          <div id="header-wrapper">
+            <header id="main">
+              <a href="/" id="logo">
+                <img src="{% static 'img/logo-neon.png' %}" alt="Wolne Lektury"/>
+              </a>
+
+              <p id="tagline">
+                {% url 'book_list' as b %}
+                {% url 'infopage' 'prawa' as r %}
+                {% count_books book_count %}
+                {% blocktrans count book_count as c %}
+                  <a href='{{ b }}'>{{ c }}</a> free reading you have <a href='{{ r }}'>right to</a>
+                {% plural %}
+                  <a href='{{ b }}'>{{ c }}</a> free readings you have <a href='{{ r }}'>right to</a>
+                {% endblocktrans %}
+              </p>
+
+              <div id="lang-menu" class="hoverget">
+                <span id='lang-button' class='hoverclick'>
+                  <span class="lang-flag">⚐</span>
+                  <span class="label"> {% trans "Language" %}</span>
+                </span>
+                <div id="lang-menu-items">
+                  {% for lang in LANGUAGES %}
+                    <form action="{% url 'django.views.i18n.set_language' %}" method="post">
+                      {% ssi_csrf_token %}
+                      <input type="hidden" name="language" value="{{ lang.0 }}"/>
+                      <button type="submit" lang="{{ lang.0 }}"
+                              class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>
+                    </form>
+                  {% endfor %}
+                </div>
+              </div>
+
+              <a id="show-menu"></a>
+              <nav id="menu">
+                <ul id="user-info">
+                  {% user_username as user_username %}
+                  {% user_is_staff as user_is_staff %}
+                  {{ user_username.if }}
+                    <li>
+                      <a href="{% url 'user_settings' %}">
+                        <strong>{{ user_username }}</strong>
+                      </a>
+                    </li>
+                    <li>
+                      <a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
+                    </li>
+                  {{ user_username.endif }}
+                  {{ user_is_staff.if }}
+                    <li><a href="{% url 'admin:index' %}">{% trans "Administration" %}</a></li>
+                  {{ user_is_staff.endif }}
+                  {{ user_username.if }}
+                    <li>
+                      <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
+                    </li>
+                  {{ user_username.else }}
+                    <li>
+                      <a href="{% url 'login' %}?next={{ request.path }}" id="login">{% trans "Sign in" %}</a>
+                      / <a href="{% url 'register' %}?next={{ request.path }}" id="register">{% trans "Register" %}</a>
+                    </li>
+                  {{ user_username.endif }}
+                </ul>
+
+                <ul id="main-menu">
+                  <li{% if active_menu_item == 'books' %} class="active"{% endif %}>
+                    <a href="{% url 'book_list' %}">{% trans "Literature" %}</a>
+                  </li>
+                  <li{% if active_menu_item == 'theme' %} class="active"{% endif %}>
+                    <a href="{% url 'theme_catalogue' %}">{% trans "Themes" %}</a>
+                  </li>
+                  <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
+                    <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
+                  </li>
+                  <li{% if active_menu_item == 'gallery' %} class="active"{% endif %}>
+                    <a href="{% url 'gallery' %}">{% trans "Gallery" %}</a>
+                  </li>
+                  <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
+                    <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
+                  </li>
+                </ul>
+              </nav>
+              <form id="search-area" action="{% url 'search' %}">
+                <div id="search-field">
+                  <label for="search">{{ search_form.q.label }}</label>
+                  {{ search_form.q }}
+                </div>
+                <button type='submit'>{% trans "Search" %}</button>
+              </form>
+            </header>
+          </div>
+        </div>
+
+        <div id="main-content">
+          <div id="banners">
+            <a href="https://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
+              <img src="{% static 'img/banners/960x150_wolneLektury.jpg' %}"
+                   alt="Wesprzyj działalność Nowoczesnej Polski"/>
+            </a>
+          </div>
+          {% block body %}
+          {% endblock %}
+          <div class="clearboth"></div>
+        </div>
+
+        <div id="footer-wrapper">
+          <footer id="main">
+            {% ssi_include 'chunk' key='footer' %}
+            {% block add_footer %}{% endblock %}
+            {% ssi_include 'sponsor_page' name='footer' %}
+          </footer>
+        </div>
+
+        {# template #}
+        <div id="ajaxable-window" class='dialog-window'>
+          <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
+          <div class="target">
+            <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
+          </div>
+        </div>
+      {% endblock bodycontent %}
+
+      <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+      <script type="text/javascript">
+        var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
+        var STATIC_URL = "{{ STATIC_URL }}";
+      </script>
+      {% javascript "base" %}
+
+      {% tracking_code %}
+
+      {% block extrabody %}{% endblock %}
+
+      <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
+    </body>
+  </html>
+{% endspaceless %}
diff --git a/src/wolnelektury/templates/info/join_us.html b/src/wolnelektury/templates/info/join_us.html
index 3853b0251..32bb676a8 100644
--- a/src/wolnelektury/templates/info/join_us.html
+++ b/src/wolnelektury/templates/info/join_us.html
@@ -3,20 +3,23 @@
 
 {% count_books book_count %}
 <p>
-{% blocktrans count book_count as c %}
-We have {{c}} work published in Wolne Lektury!
-Help us expand the library and set new readings free by
-<a href="http://nowoczesnapolska.org.pl/wesprzyj_nas/">making a donation
-or transferring 1&#37; of your income tax</a>.
-{% plural %}
-We have {{c}} works published in Wolne Lektury!
-Help us expand the library and set new readings free by
-<a href="http://nowoczesnapolska.org.pl/wesprzyj_nas/">making a donation
-or transferring 1&#37; of your income tax</a>.
-{% endblocktrans %}
-{% comment %}<a href='{}'>{% trans "More..." %}</a>{% endcomment %}</p>
+  {% blocktrans count book_count as c %}
+    We have {{c}} work published in Wolne Lektury!
+    Help us expand the library and set new readings free by
+    <a href="http://nowoczesnapolska.org.pl/wesprzyj_nas/">making a donation
+    or transferring 1&#37; of your income tax</a>.
+  {% plural %}
+    We have {{c}} works published in Wolne Lektury!
+    Help us expand the library and set new readings free by
+    <a href="http://nowoczesnapolska.org.pl/wesprzyj_nas/">making a donation
+    or transferring 1&#37; of your income tax</a>.
+  {% endblocktrans %}
+  {% comment %}<a href='{}'>{% trans "More..." %}</a>{% endcomment %}
+</p>
 
-<p>{% blocktrans %}Become an editor of Wolne Lektury! Find out if
-we're currently working on a reading you're looking for and prepare
-a publication by yourself by logging into the Editorial Platform.{% endblocktrans %}
-<a href='{% url "infopage" 'wlacz-sie-w-prace' %}'>{% trans "More..." %}</a></p>
+<p>
+  {% blocktrans %}Become an editor of Wolne Lektury! Find out if
+    we're currently working on a reading you're looking for and prepare
+    a publication by yourself by logging into the Editorial Platform.{% endblocktrans %}
+  <a href='{% url "infopage" 'wlacz-sie-w-prace' %}'>{% trans "More..." %}</a>
+</p>
diff --git a/src/wolnelektury/templates/latest_blog_posts.html b/src/wolnelektury/templates/latest_blog_posts.html
index 24d486ef1..af7d256c5 100644
--- a/src/wolnelektury/templates/latest_blog_posts.html
+++ b/src/wolnelektury/templates/latest_blog_posts.html
@@ -1,9 +1,7 @@
 {% spaceless %}
-
-<ol>
-{% for post in posts %}
-    <li><a href="{{ post.link }}">{{ post.title }}</a></li>
-{% endfor %}
-</ol>
-
+  <ol>
+    {% for post in posts %}
+      <li><a href="{{ post.link }}">{{ post.title }}</a></li>
+    {% endfor %}
+  </ol>
 {% endspaceless %}
\ No newline at end of file
diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index 591984c11..deea0a53c 100755
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load static from staticfiles %}
 {% load i18n catalogue_tags infopages_tags social_tags %}
 {% load ssi_include from ssify %}
@@ -8,153 +8,153 @@
 {% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 
-{% block body %}{% spaceless %}
-
-  {% choose_cite as cite_pk %}
-  {{ cite_pk.if }}
-    {% ssi_include 'social_cite_main' pk=cite_pk %}
-  {{ cite_pk.endif }}
+{% block body %}
+  {% spaceless %}
+    {% choose_cite as cite_pk %}
+    {{ cite_pk.if }}
+      {% ssi_include 'social_cite_main' pk=cite_pk %}
+    {{ cite_pk.endif }}
+
+    <section id="main-library">
+      <h1>W naszej cyfrowej bibliotece znajdziesz</h1>
+      <div class="main-library-row">
+        <div class="covers">
+          {% for book in best %}
+            {% cache 86400 book_mini_box book.pk %}
+              {% include 'catalogue/book_mini_box.html' %}
+            {% endcache %}
+            {#% ssi_include 'catalogue_book_mini' pk=b.pk %#}
+          {% endfor %}
+        </div>
+        <a href="{% url "book_list" %}">
+          <div class="note white-box normal-text" style="font-size: 18px">
+            i wiele innych książek, wierszy, obrazów, audiobooków…
+          </div>
+        </a>
+      </div>
+    </section>
 
-  <section id="main-library">
-    <h1>W naszej cyfrowej bibliotece znajdziesz</h1>
-    <div class="main-library-row">
-      <div class="covers">
-        {% for book in best %}
+    <section id="main-theme">
+      <h1>Motywy i tematy</h1>
+      <div class="white-box normal-text">
+        <h2>{% trans "Theme" %}: {{ theme }}</h2>
+        <p>Utwory, w których występuje ten motyw:</p>
+        {% for book in theme_books %}
           {% cache 86400 book_mini_box book.pk %}
             {% include 'catalogue/book_mini_box.html' %}
           {% endcache %}
-          {#% ssi_include 'catalogue_book_mini' pk=b.pk %#}
+          {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
         {% endfor %}
+        {% if theme_fragment %}
+          {% ssi_include 'catalogue_fragment_promo' pk=theme_fragment.pk %}
+        {% endif %}
       </div>
-      <a href="{% url "book_list" %}">
-        <div class="note white-box normal-text" style="font-size: 18px">
-          i wiele innych książek, wierszy, obrazów, audiobooków…
-        </div>
+      <a class="more" href="{% url 'theme_catalogue' %}">Zobacz katalog motywów</a>
+    </section>
+
+    {% comment %}
+    <section class="tag-box-section">
+      <h1>Autorzy</h1>
+      <a class="tag-box" href="{{ author.get_absolute_url }}">
+        {% ssi_include "catalogue_tag_box" pk=author.pk %}
       </a>
-    </div>
-  </section>
-
-  <section id="main-theme">
-    <h1>Motywy i tematy</h1>
-    <div class="white-box normal-text">
-      <h2>{% trans "Theme" %}: {{ theme }}</h2>
-      <p>Utwory, w których występuje ten motyw:</p>
-      {% for book in theme_books %}
-        {% cache 86400 book_mini_box book.pk %}
-          {% include 'catalogue/book_mini_box.html' %}
-        {% endcache %}
-        {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
-      {% endfor %}
-      {% if theme_fragment %}
-        {% ssi_include 'catalogue_fragment_promo' pk=theme_fragment.pk %}
-      {% endif %}
-    </div>
-    <a class="more" href="{% url 'theme_catalogue' %}">Zobacz katalog motywów</a>
-  </section>
-
-  {% comment %}
-  <section class="tag-box-section">
-    <h1>Autorzy</h1>
-    <a class="tag-box" href="{{ author.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=author.pk %}
-    </a>
-    <a class="more" href="{% url 'author_catalogue' %}">Zobacz katalog autorów</a>
-  </section>
-
-  <section class="tag-box-section">
-    <h1>Gatunki</h1>
-    <a class="tag-box" href="{{ genre.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=genre.pk %}
-    </a>
-    <a class="more" href="{% url 'genre_catalogue' %}">Zobacz katalog gatunków</a>
-  </section>
-
-  <section class="tag-box-section">
-    <h1>Rodzaje</h1>
-    <a class="tag-box" href="{{ kind.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=kind.pk %}
-    </a>
-    <a class="more" href="{% url 'kind_catalogue' %}">Zobacz katalog rodzajów</a>
-  </section>
-
-  <section class="tag-box-section">
-    <h1>Epoki</h1>
-    <a class="tag-box" href="{{ epoch.get_absolute_url }}">
-      {% ssi_include "catalogue_tag_box" pk=epoch.pk %}
-    </a>
-    <a class="more" href="{% url 'epoch_catalogue' %}">Zobacz katalog epok</a>
-  </section>
-  {% endcomment %}
-
-  {% if collection %}
-    <section>
-      <h1>Kolekcje</h1>
-      {% ssi_include 'catalogue_collection_box' pk=collection.pk %}
-      <a class="more" href="{% url 'catalogue_collections' %}">Zobacz katalog kolekcji</a>
+      <a class="more" href="{% url 'author_catalogue' %}">Zobacz katalog autorów</a>
     </section>
-  {% endif %}
-
-  <section>
-    <h1>{% trans "Recent publications" %}</h1>
-      {% for book in last_published %}
-        {% cache 86400 book_mini_box book.pk %}
-          {% include 'catalogue/book_mini_box.html' %}
-        {% endcache %}
-        {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
-      {% endfor %}
-    <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
-  </section>
-
-  <div class="clearboth"></div>
-
-  <section class="infopages-box">
-    <h1>{% trans "News" %}</h1>
-    {% ssi_include 'latest_blog_posts' %}
-  </section>
-
-
-  <section class="infopages-box">
-    <h1>{% trans "Utilities" %}</h1>
-
-    <ul>
-      <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
-      <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
-      <li><a href="{% url 'reporting_catalogue_pdf' %}">{% trans "Download the catalogue in PDF format." %}</a></li>
-<li><a href="{% url 'dictionary_notes' %}">{% trans "Footnotes" %}</a></li>
-      <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
-      <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
-      <li><a href="{% url 'api' %}">API</a></li>
-      <li><a href="{% url 'oaipmh' %}">OAI-PMH</a></li>
-      <li><a href="{% url 'lesmianator' %}" lang="pl">Leśmianator</a></li>
-      <li><a href="http://polski.wolnelektury.pl" lang="pl">Materiały do nauki j. polskiego</a></li>
-    </ul>
-  </section>
-
-
-  <section class="infopages-box">
-    <h1>{% trans "Information" %}</h1>
-    <ul>
-      <li><a href="https://nowoczesnapolska.org.pl/prywatnosc/">{% trans "Privacy policy" %}</a></li>
-      {% infopages_on_main %}
-    </ul>
-
-    <div class="social-links">
-      <a href="https://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268" title='Wolne Lektury @ Facebook'>
-        <img src="{% static "img/social/f.png" %}" alt="Wolne Lektury @ Facebook" />
+
+    <section class="tag-box-section">
+      <h1>Gatunki</h1>
+      <a class="tag-box" href="{{ genre.get_absolute_url }}">
+        {% ssi_include "catalogue_tag_box" pk=genre.pk %}
       </a>
-      <a href="https://nk.pl/profile/30441509" title='Wolne Lektury @ NK'>
-        <img src="{% static "img/social/nk.png" %}" alt="Wolne Lektury @ NK.pl" />
+      <a class="more" href="{% url 'genre_catalogue' %}">Zobacz katalog gatunków</a>
+    </section>
+
+    <section class="tag-box-section">
+      <h1>Rodzaje</h1>
+      <a class="tag-box" href="{{ kind.get_absolute_url }}">
+        {% ssi_include "catalogue_tag_box" pk=kind.pk %}
+      </a>
+      <a class="more" href="{% url 'kind_catalogue' %}">Zobacz katalog rodzajów</a>
+    </section>
+
+    <section class="tag-box-section">
+      <h1>Epoki</h1>
+      <a class="tag-box" href="{{ epoch.get_absolute_url }}">
+        {% ssi_include "catalogue_tag_box" pk=epoch.pk %}
       </a>
-    </div>
-  </section>
+      <a class="more" href="{% url 'epoch_catalogue' %}">Zobacz katalog epok</a>
+    </section>
+    {% endcomment %}
+
+    {% if collection %}
+      <section>
+        <h1>Kolekcje</h1>
+        {% ssi_include 'catalogue_collection_box' pk=collection.pk %}
+        <a class="more" href="{% url 'catalogue_collections' %}">Zobacz katalog kolekcji</a>
+      </section>
+    {% endif %}
+
+    <section>
+      <h1>{% trans "Recent publications" %}</h1>
+        {% for book in last_published %}
+          {% cache 86400 book_mini_box book.pk %}
+            {% include 'catalogue/book_mini_box.html' %}
+          {% endcache %}
+          {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
+        {% endfor %}
+      <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
+    </section>
 
-{% endspaceless %}{% endblock %}
+    <div class="clearboth"></div>
 
+    <section class="infopages-box">
+      <h1>{% trans "News" %}</h1>
+      {% ssi_include 'latest_blog_posts' %}
+    </section>
 
-{% block add_footer %}{% spaceless %}
-  {{ cite_pk.if }}
-    <p>{% trans "Image used:" %}
-      {% ssi_include 'social_cite_info' pk=cite_pk %}
-    </p>
-  {{ cite_pk.endif }}
-{% endspaceless %}{% endblock %}
+    <section class="infopages-box">
+      <h1>{% trans "Utilities" %}</h1>
+
+      <ul>
+        <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
+        <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
+        <li><a href="{% url 'reporting_catalogue_pdf' %}">{% trans "Download the catalogue in PDF format." %}</a></li>
+        <li><a href="{% url 'dictionary_notes' %}">{% trans "Footnotes" %}</a></li>
+        <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
+        <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
+        <li><a href="{% url 'api' %}">API</a></li>
+        <li><a href="{% url 'oaipmh' %}">OAI-PMH</a></li>
+        <li><a href="{% url 'lesmianator' %}" lang="pl">Leśmianator</a></li>
+        <li><a href="http://polski.wolnelektury.pl" lang="pl">Materiały do nauki j. polskiego</a></li>
+      </ul>
+    </section>
+
+    <section class="infopages-box">
+      <h1>{% trans "Information" %}</h1>
+      <ul>
+        <li><a href="https://nowoczesnapolska.org.pl/prywatnosc/">{% trans "Privacy policy" %}</a></li>
+        {% infopages_on_main %}
+      </ul>
+
+      <div class="social-links">
+        <a href="https://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268" title='Wolne Lektury @ Facebook'>
+          <img src="{% static "img/social/f.png" %}" alt="Wolne Lektury @ Facebook" />
+        </a>
+        <a href="https://nk.pl/profile/30441509" title='Wolne Lektury @ NK'>
+          <img src="{% static "img/social/nk.png" %}" alt="Wolne Lektury @ NK.pl" />
+        </a>
+      </div>
+    </section>
+  {% endspaceless %}
+{% endblock %}
+
+
+{% block add_footer %}
+  {% spaceless %}
+    {{ cite_pk.if }}
+      <p>{% trans "Image used:" %}
+        {% ssi_include 'social_cite_info' pk=cite_pk %}
+      </p>
+    {{ cite_pk.endif }}
+  {% endspaceless %}
+{% endblock %}
diff --git a/src/wolnelektury/templates/openid/login.html b/src/wolnelektury/templates/openid/login.html
index 41eafa479..f9b4b34ba 100644
--- a/src/wolnelektury/templates/openid/login.html
+++ b/src/wolnelektury/templates/openid/login.html
@@ -6,28 +6,22 @@
 {% block head_title %}{% trans "OpenID Sign In" %}{% endblock %}
 
 {% block body %}
-
-<h1>{% trans 'OpenID Sign In' %}</h1>
-<div class="normal-text white-box">
-
-<form id="openid_login_form" class="openid_login uniForm" method="post" action="{% url 'openid_login' %}">
-{% csrf_token %}
-<fieldset class="inlineLabels">
-
-{#{form|as_uni_form}#}
-<div id="div_id_openid" class="ctrlHolder">
-<label for="id_openid" class="requiredField">
-OpenID<span class="asteriskField">*</span>
-</label>
-<input id="id_openid" type="text" class="textInput textinput" name="openid" />
-</div>
-
-
-<div class="buttonHolder">
-<button type="submit">{% trans "Sign In" %}</button>
-</div>
-</fieldset>
-</form>
-
-</div>
+  <h1>{% trans 'OpenID Sign In' %}</h1>
+  <div class="normal-text white-box">
+    <form id="openid_login_form" class="openid_login uniForm" method="post" action="{% url 'openid_login' %}">
+      {% csrf_token %}
+      <fieldset class="inlineLabels">
+        {#{form|as_uni_form}#}
+        <div id="div_id_openid" class="ctrlHolder">
+          <label for="id_openid" class="requiredField">
+            OpenID<span class="asteriskField">*</span>
+          </label>
+          <input id="id_openid" type="text" class="textInput textinput" name="openid" />
+        </div>
+        <div class="buttonHolder">
+          <button type="submit">{% trans "Sign In" %}</button>
+        </div>
+      </fieldset>
+    </form>
+  </div>
 {% endblock %}
diff --git a/src/wolnelektury/templates/pagination/pagination.html b/src/wolnelektury/templates/pagination/pagination.html
index 432cf6954..9f3375a7d 100644
--- a/src/wolnelektury/templates/pagination/pagination.html
+++ b/src/wolnelektury/templates/pagination/pagination.html
@@ -1,26 +1,27 @@
 {% load i18n %}
+
 {% if is_paginated %}
-<div class="pagination">
+  <div class="pagination">
     {% if page_obj.has_previous %}
-        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %} </a>
+      <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %} </a>
     {% else %}
-        <span class="disabled prev">&lsaquo;&lsaquo; {% trans "previous" %} </span>
+      <span class="disabled prev">&lsaquo;&lsaquo; {% trans "previous" %} </span>
     {% endif %}
     {% for page in pages %}
-        {% if page %}
-            {% ifequal page page_obj.number %}
-                <span class="current page"> {{ page }} </span>
-            {% else %}
-                <a href="?page={{ page }}{{ getvars }}" class="page"> {{ page }} </a>
-            {% endifequal %}
+      {% if page %}
+        {% ifequal page page_obj.number %}
+          <span class="current page"> {{ page }} </span>
         {% else %}
-            ...
-        {% endif %}
+          <a href="?page={{ page }}{{ getvars }}" class="page"> {{ page }} </a>
+        {% endifequal %}
+      {% else %}
+        …
+      {% endif %}
     {% endfor %}
     {% if page_obj.has_next %}
-        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next"> {% trans "next" %} &rsaquo;&rsaquo;</a>
+      <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next"> {% trans "next" %} &rsaquo;&rsaquo;</a>
     {% else %}
-        <span class="disabled next"> {% trans "next" %} &rsaquo;&rsaquo;</span>
+      <span class="disabled next"> {% trans "next" %} &rsaquo;&rsaquo;</span>
     {% endif %}
-</div>
+  </div>
 {% endif %}
diff --git a/src/wolnelektury/templates/piston/authorize_token.html b/src/wolnelektury/templates/piston/authorize_token.html
index 87450a20c..a76823843 100755
--- a/src/wolnelektury/templates/piston/authorize_token.html
+++ b/src/wolnelektury/templates/piston/authorize_token.html
@@ -1,18 +1,20 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Authorize access to Wolne Lektury" %}</h1>
+  <h1>{% trans "Authorize access to Wolne Lektury" %}</h1>
 
-	<div class="normal-text">
-    <p>{% blocktrans %}Confirm to authorize access to Wolne Lektury as user <strong>{{ user}}</strong>.{% endblocktrans %}</p>
+  <div class="normal-text">
+    <p>
+      {% blocktrans %}Confirm to authorize access to Wolne Lektury as user <strong>{{ user}}</strong>.{% endblocktrans %}
+    </p>
 
     <form action="{% url 'piston.authentication.oauth_user_auth' %}" method="POST">
-    {% csrf_token %}
+      {% csrf_token %}
       {{ form.as_p }}
       <button type="submit">Confirm</button>
     </form>
-    </div>
+  </div>
 {% endblock %}
diff --git a/src/wolnelektury/templates/publish_plan.html b/src/wolnelektury/templates/publish_plan.html
index c4c3d6e6a..ffc11501e 100755
--- a/src/wolnelektury/templates/publish_plan.html
+++ b/src/wolnelektury/templates/publish_plan.html
@@ -1,16 +1,15 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{% trans "Publishing plan" %}{% endblock titleextra %}
 
 
 {% block body %}
-<h1>{% trans "Publishing plan" %}</h1>
-
-<ul class="normal-text">
-{% for elem in plan %}
-    <li><a href="{{ elem.link }}">{{ elem.title }}</a></li>
-{% endfor %}
-</ul>
+  <h1>{% trans "Publishing plan" %}</h1>
 
+  <ul class="normal-text">
+    {% for elem in plan %}
+      <li><a href="{{ elem.link }}">{{ elem.title }}</a></li>
+    {% endfor %}
+  </ul>
 {% endblock %}
diff --git a/src/wolnelektury/templates/site_base.html b/src/wolnelektury/templates/site_base.html
index b0c2ca524..3982fc4ca 100644
--- a/src/wolnelektury/templates/site_base.html
+++ b/src/wolnelektury/templates/site_base.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {# This is for allauth templates. #}
 
 {% block bodyid %}auth-page{% endblock %}
diff --git a/src/wolnelektury/templates/socialaccount/login_cancelled.html b/src/wolnelektury/templates/socialaccount/login_cancelled.html
index bee55649a..eed32128a 100644
--- a/src/wolnelektury/templates/socialaccount/login_cancelled.html
+++ b/src/wolnelektury/templates/socialaccount/login_cancelled.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 
 {% load i18n %}
 
diff --git a/src/wolnelektury/templates/superbase.html b/src/wolnelektury/templates/superbase.html
deleted file mode 100644
index d3abd31f2..000000000
--- a/src/wolnelektury/templates/superbase.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html>
-{% spaceless %}
-    <html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
-    {% load pipeline i18n %}
-    {% load static from staticfiles %}
-    {% load catalogue_tags funding_tags reporting_stats %}
-    {% load piwik_tags %}
-    {% load ssi_include ssi_csrf_token from ssify %}
-    {% load user_username user_is_staff from common_tags %}
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-        <meta name="application-name" content="Wolne Lektury" />
-        <meta property="og:site_name" content="Wolne Lektury" />
-        <meta property="og:title" content="{% block ogtitle %}{{ page_title }}{% endblock %}" />
-        <meta property="og:type" content="{% block ogtype %}website{% endblock %}" />
-        <meta property="og:image" content="{% block ogimage %}{{ FULL_STATIC_URL }}img/wiatrak.jpg{% endblock %}" />
-        <meta name="description" content="{% block metadescription %}Darmowe, opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
-        {% block ogextra %}{% endblock %}
-
-        <title>
-            {% block title %}{% block titleextra %}{{ page_title }}{% endblock %} :: {% trans "Wolne Lektury" %}{% endblock %}</title>
-        <link rel="icon" href="{% static 'img/favicon.png' %}" type="image/png"/>
-        <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury"
-              href="{% static 'opensearch.xml' %}"/>
-        {% stylesheet "main" %}
-        {% block extrahead %}
-        {% endblock %}
-    </head>
-    <body id="{% block bodyid %}base{% endblock %}">
-
-    {% block bodycontent %}
-
-        {% if not funding_no_show_current %}
-            {% current_offer as current_offer %}
-            {{ current_offer.if }}
-            {% ssi_include 'funding_top_bar' pk=current_offer %}
-            {{ current_offer.endif }}
-        {% endif %}
-
-        <div id="whole-header">
-            <div id="header-wrapper">
-                <header id="main">
-
-                    <a href="/" id="logo">
-                        <img src="{% static 'img/logo-neon.png' %}" alt="Wolne Lektury"/>
-                    </a>
-
-                    <p id="tagline">
-                        {% url 'book_list' as b %}
-                        {% url 'infopage' 'prawa' as r %}
-                        {% count_books book_count %}
-                        {% blocktrans count book_count as c %}
-                            <a href='{{ b }}'>{{ c }}</a> free reading you have <a href='{{ r }}'>right to</a>
-                        {% plural %}
-                            <a href='{{ b }}'>{{ c }}</a> free readings you have <a href='{{ r }}'>right to</a>
-                        {% endblocktrans %}
-                    </p>
-
-                    <div id="lang-menu" class="hoverget">
-                <span id='lang-button' class='hoverclick'>
-                    <span class="lang-flag">⚐</span>
-                    <span class="label"> {% trans "Language" %}</span>
-                </span>
-                        <div id="lang-menu-items">
-                            {% for lang in LANGUAGES %}
-                                <form action="{% url 'django.views.i18n.set_language' %}" method="post">
-                                    {% ssi_csrf_token %}
-                                    <input type="hidden" name="language" value="{{ lang.0 }}"/>
-                                    <button type="submit" lang="{{ lang.0 }}"
-                                            class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>
-                                </form>
-                            {% endfor %}
-                        </div>
-                    </div>
-
-                    <a id="show-menu"></a>
-                    <nav id="menu">
-
-                        <ul id="user-info">
-                            {% user_username as user_username %}
-                            {% user_is_staff as user_is_staff %}
-                            {{ user_username.if }}
-                            <li>
-                                <a href="{% url 'user_settings' %}">
-                                    <strong>{{ user_username }}</strong>
-                                </a>
-                            </li>
-                            <li><a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
-                            </li>
-                            {{ user_username.endif }}
-                            {{ user_is_staff.if }}
-                            <li><a href="/admin/">{% trans "Administration" %}</a></li>
-                            {{ user_is_staff.endif }}
-                            {{ user_username.if }}
-                            <li><a href="{% url 'logout' %}?next=
-
-
-                                    {% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
-                            </li>
-                            {{ user_username.else }}
-                            <li>
-                                <a href="{% url 'login' %}?next={{ request.path }}" id="login">{% trans "Sign in" %}</a>
-                                / <a href="{% url 'register' %}?next={{ request.path }}"
-                                     id="register">{% trans "Register" %}</a>
-                            </li>
-                            {{ user_username.endif }}
-                        </ul>
-
-
-            <ul id="main-menu">
-                <li{% if active_menu_item == 'books' %} class="active"{% endif %}>
-                    <a href="{% url 'book_list' %}">{% trans "Literature" %}</a>
-                </li>
-                <li{% if active_menu_item == 'theme' %} class="active"{% endif %}>
-                    <a href="{% url 'theme_catalogue' %}">{% trans "Themes" %}</a>
-                </li>
-                <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
-                    <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
-                </li>
-                <li{% if active_menu_item == 'gallery' %} class="active"{% endif %}>
-                    <a href="{% url 'gallery' %}">{% trans "Gallery" %}</a>
-                </li>
-                <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
-                    <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
-                </li>
-            </ul>
-
-
-                    </nav>
-
-                    <form id="search-area" action="{% url 'search' %}">
-                        <div id="search-field">
-                            <label for="search">{{ search_form.q.label }}</label>
-                            {{ search_form.q }}
-                        </div>
-                        <button type='submit'>{% trans "Search" %}</button>
-                    </form>
-
-                </header>
-            </div>
-        </div>
-
-
-
-        <div id="main-content">
-            <div id="banners">
-                <a href="https://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
-                    <img src="{% static 'img/banners/960x150_wolneLektury.jpg' %}"
-                         alt="Wesprzyj działalność Nowoczesnej Polski"/>
-                </a>
-            </div>
-            {% block body %}
-            {% endblock %}
-            <div class="clearboth"></div>
-        </div>
-
-
-        <div id="footer-wrapper">
-            <footer id="main">
-                {% ssi_include 'chunk' key='footer' %}
-                {% block add_footer %}{% endblock %}
-                {% ssi_include 'sponsor_page' name='footer' %}
-            </footer>
-        </div>
-
-
-
-        {# template #}
-        <div id="ajaxable-window" class='dialog-window'>
-            <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-            <div class="target">
-                <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
-            </div>
-        </div>
-
-
-    {% endblock bodycontent %}
-
-
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-    <script type="text/javascript">var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
-    var STATIC_URL = "{{ STATIC_URL }}";</script>
-    {% javascript "base" %}
-
-    {% tracking_code %}
-
-    {% block extrabody %}
-    {% endblock %}
-
-    <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
-    </body>
-    </html>
-{% endspaceless %}
diff --git a/src/wolnelektury/templates/user.html b/src/wolnelektury/templates/user.html
index fa2f66035..f7491badd 100644
--- a/src/wolnelektury/templates/user.html
+++ b/src/wolnelektury/templates/user.html
@@ -1,18 +1,15 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}
 {% load i18n %}
 
 
 {% block titleextra %}{% trans "User" %}{% endblock %}
 
 {% block body %}
+  <div class="normal-text white-box">
+    <h1>{% trans "User" %}</h1>
 
-<div class="normal-text white-box">
-
-<h1>{% trans "User" %}</h1>
-
-<p><a href="{% url 'account_set_password' %}">{% trans "Password" %}</a></p>
-<p><a href="{% url 'account_email' %}">{% trans "E-mail" %}</a></p>
-<p><a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a></p>
-</div>
-
+    <p><a href="{% url 'account_set_password' %}">{% trans "Password" %}</a></p>
+    <p><a href="{% url 'account_email' %}">{% trans "E-mail" %}</a></p>
+    <p><a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a></p>
+  </div>
 {% endblock %}
diff --git a/src/wolnelektury/templates/widget.html b/src/wolnelektury/templates/widget.html
index 444f466ab..1103641f6 100644
--- a/src/wolnelektury/templates/widget.html
+++ b/src/wolnelektury/templates/widget.html
@@ -1,37 +1,30 @@
 {% spaceless %}
-
-{% load static from staticfiles %}
-{% load pipeline %}
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <base target="_parent" />
-    <title>Widget Wolnych Lektur</title>
-    {% stylesheet 'widget' %}
-</head>
-<body>
-<div id="wl">
-
-<a href="/">
-    <img src="{% static 'img/logo-neon.png' %}">
-</a>
-
-<form action="{% url 'search' %}" method="get" accept-charset="utf-8" id="wl-form">
-    <div id="wl-search">
-        <input data-source="{% url 'search_hint' %}?max=3" id="id_qq" name="q" title="tytuł, autor, motyw/temat, epoka, rodzaj, gatunek, cytat" placeholder="tytuł, autor, motyw/temat, epoka, rodzaj, gatunek, cytat" type="text" value="">
-    </div>
-    <button>
-        <img alt="Szukaj" src="{% static 'img/search.png' %}">
-    </button>
-</form>
-
-</div>
-
-{% javascript 'widget' %}
-
-</body>
-</html>
-
+  {% load static from staticfiles %}
+  {% load pipeline %}
+  <!DOCTYPE html>
+
+  <html>
+    <head>
+      <meta charset="UTF-8">
+      <base target="_parent" />
+      <title>Widget Wolnych Lektur</title>
+      {% stylesheet 'widget' %}
+    </head>
+    <body>
+      <div id="wl">
+        <a href="/">
+          <img src="{% static 'img/logo-neon.png' %}">
+        </a>
+        <form action="{% url 'search' %}" method="get" accept-charset="utf-8" id="wl-form">
+          <div id="wl-search">
+            <input data-source="{% url 'search_hint' %}?max=3" id="id_qq" name="q" title="tytuł, autor, motyw/temat, epoka, rodzaj, gatunek, cytat" placeholder="tytuł, autor, motyw/temat, epoka, rodzaj, gatunek, cytat" type="text" value=""/>
+          </div>
+          <button>
+            <img alt="Szukaj" src="{% static 'img/search.png' %}">
+          </button>
+        </form>
+      </div>
+      {% javascript 'widget' %}
+    </body>
+  </html>
 {% endspaceless %}