diff --git a/.gitignore b/.gitignore
index f0ee47d9b..e5651bb7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ sith/settings_custom.py
 sith/search_indexes/
 .coverage
 coverage_report/
-doc/_build
+
+# compiled documentation
+site/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8a98da0de..b81eaae6f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,4 +7,15 @@ repos:
       - id: ruff  # actually fix the fixable errors, but print nothing
         args: ["--fix", "--silent"]
       # Run the formatter.
-      - id: ruff-format
\ No newline at end of file
+      - id: ruff-format
+  - repo: https://github.com/rtts/djhtml
+    rev: 3.0.6
+    hooks:
+      - id: djhtml
+        name: format templates
+        entry: djhtml --tabwidth 2
+        types: ["jinja"]
+      - id: djcss
+        name: format scss files
+        entry: djcss --tabwidth 2
+        types: ["scss"]
diff --git a/accounting/templates/accounting/accountingtype_list.jinja b/accounting/templates/accounting/accountingtype_list.jinja
index f04cc7982..7ae540145 100644
--- a/accounting/templates/accounting/accountingtype_list.jinja
+++ b/accounting/templates/accounting/accountingtype_list.jinja
@@ -1,27 +1,27 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Accounting type list{% endtrans %}
+  {% trans %}Accounting type list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <p>
-        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-        {% trans %}Accounting types{% endtrans %}
-        </p>
-        <hr>
-        <p><a href="{{ url('accounting:type_new') }}">{% trans %}New accounting type{% endtrans %}</a></p>
-        {% if accountingtype_list %}
-        <h3>{% trans %}Accounting type list{% endtrans %}</h3>
-        <ul>
-            {% for a in accountingtype_list  %}
-            <li><a href="{{ url('accounting:type_edit', type_id=a.id) }}">{{ a }}</a></li>
-            {% endfor %}
-        </ul>
-        {% else %}
-        {% trans %}There is no types in this website.{% endtrans %}
-        {% endif %}
-    </div>
+  <div id="accounting">
+    <p>
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      {% trans %}Accounting types{% endtrans %}
+    </p>
+    <hr>
+    <p><a href="{{ url('accounting:type_new') }}">{% trans %}New accounting type{% endtrans %}</a></p>
+    {% if accountingtype_list %}
+      <h3>{% trans %}Accounting type list{% endtrans %}</h3>
+      <ul>
+        {% for a in accountingtype_list  %}
+          <li><a href="{{ url('accounting:type_edit', type_id=a.id) }}">{{ a }}</a></li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      {% trans %}There is no types in this website.{% endtrans %}
+    {% endif %}
+  </div>
 {% endblock %}
 
diff --git a/accounting/templates/accounting/bank_account_details.jinja b/accounting/templates/accounting/bank_account_details.jinja
index eb7ac8b17..f1b1e0561 100644
--- a/accounting/templates/accounting/bank_account_details.jinja
+++ b/accounting/templates/accounting/bank_account_details.jinja
@@ -1,37 +1,37 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Bank account: {% endtrans %}{{ object.name }}
+  {% trans %}Bank account: {% endtrans %}{{ object.name }}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <p>
-        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-        {{ object.name }}
-        </p>
-        <hr>
-        <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
-        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %}
-        <a href="{{ url('accounting:bank_delete', b_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
-        {% endif %}
-        <h4>{% trans %}Infos{% endtrans %}</h4>
-        <ul>
-            <li><strong>{% trans %}IBAN: {% endtrans %}</strong>{{ object.iban }}</li>
-            <li><strong>{% trans %}Number: {% endtrans %}</strong>{{ object.number }}</li>
-        </ul>
-        <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">{% trans %}New club account{% endtrans %}</a></p>
-        <ul>
-        {% for c in object.club_accounts.all() %}
-            <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a>
-                - <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a>
-                {% if c.journals.count() == 0 %}
-                - <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a>
-                {% endif %}
-                </li>
-        {% endfor %}
-        </ul>
-    </div>
+  <div id="accounting">
+    <p>
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      {{ object.name }}
+    </p>
+    <hr>
+    <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
+    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %}
+      <a href="{{ url('accounting:bank_delete', b_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
+    {% endif %}
+    <h4>{% trans %}Infos{% endtrans %}</h4>
+    <ul>
+      <li><strong>{% trans %}IBAN: {% endtrans %}</strong>{{ object.iban }}</li>
+      <li><strong>{% trans %}Number: {% endtrans %}</strong>{{ object.number }}</li>
+    </ul>
+    <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">{% trans %}New club account{% endtrans %}</a></p>
+    <ul>
+      {% for c in object.club_accounts.all() %}
+        <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a>
+          - <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a>
+          {% if c.journals.count() == 0 %}
+            - <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
 {% endblock %}
 
 
diff --git a/accounting/templates/accounting/bank_account_list.jinja b/accounting/templates/accounting/bank_account_list.jinja
index 0bd654b8f..bb47cfcad 100644
--- a/accounting/templates/accounting/bank_account_list.jinja
+++ b/accounting/templates/accounting/bank_account_list.jinja
@@ -1,32 +1,32 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Bank account list{% endtrans %}
+  {% trans %}Bank account list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <h4>
-        {% trans %}Accounting{% endtrans %}
-        </h4>
-        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-        <p><a href="{{ url('accounting:simple_type_list') }}">{% trans %}Manage simplified types{% endtrans %}</a></p>
-        <p><a href="{{ url('accounting:type_list') }}">{% trans %}Manage accounting types{% endtrans %}</a></p>
-        <p><a href="{{ url('accounting:bank_new') }}">{% trans %}New bank account{% endtrans %}</a></p>
-        {% endif %}
-        {% if bankaccount_list %}
-        <h3>{% trans %}Bank account list{% endtrans %}</h3>
-            <ul>
-                {% for a in object_list  %}
-                <li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a>
-                    - <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a>
-                </li>
-                {% endfor %}
-            </ul>
-        {% else %}
-        {% trans %}There is no accounts in this website.{% endtrans %}
-        {% endif %}
-    </div>
+  <div id="accounting">
+    <h4>
+      {% trans %}Accounting{% endtrans %}
+    </h4>
+    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+      <p><a href="{{ url('accounting:simple_type_list') }}">{% trans %}Manage simplified types{% endtrans %}</a></p>
+      <p><a href="{{ url('accounting:type_list') }}">{% trans %}Manage accounting types{% endtrans %}</a></p>
+      <p><a href="{{ url('accounting:bank_new') }}">{% trans %}New bank account{% endtrans %}</a></p>
+    {% endif %}
+    {% if bankaccount_list %}
+      <h3>{% trans %}Bank account list{% endtrans %}</h3>
+      <ul>
+        {% for a in object_list  %}
+          <li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a>
+            - <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a>
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      {% trans %}There is no accounts in this website.{% endtrans %}
+    {% endif %}
+  </div>
 {% endblock %}
 
 
diff --git a/accounting/templates/accounting/club_account_details.jinja b/accounting/templates/accounting/club_account_details.jinja
index f9ceec234..b6df130ee 100644
--- a/accounting/templates/accounting/club_account_details.jinja
+++ b/accounting/templates/accounting/club_account_details.jinja
@@ -1,68 +1,68 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Club account:{% endtrans %} {{ object.name }}
+  {% trans %}Club account:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <p>
-        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-        <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
-        {{ object }}
-        </p>
-        <hr>
-        <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2>
-        {% if user.is_root and not object.journals.exists() %}
-        <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
-        {% endif %}
-        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-        <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
-        {% endif %}
-        <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p>
-        {% if not object.has_open_journal() %}
-        <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>
-        {% else %}
-        <p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p>
-        {% endif %}
-        <table>
-            <thead>
-            <tr>
-                <td>{% trans %}Name{% endtrans %}</td>
-                <td>{% trans %}Start{% endtrans %}</td>
-                <td>{% trans %}End{% endtrans %}</td>
-                <td>{% trans %}Amount{% endtrans %}</td>
-                <td>{% trans %}Effective amount{% endtrans %}</td>
-                <td>{% trans %}Closed{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-            </thead>
-            <tbody>
-            {% for j in object.journals.all() %}
-            <tr>
-                <td>{{ j.name }}</td>
-                <td>{{ j.start_date }}</td>
-                {% if j.end_date %}
-                <td>{{ j.end_date }}</td>
-                {% else %}
-                <td> - </td>
-                {% endif %}
-                <td>{{ j.amount }} €</td>
-                <td>{{ j.effective_amount }} €</td>
-                {% if j.closed %}
-                <td>{% trans %}Yes{% endtrans %}</td>
-                {% else %}
-                <td>{% trans %}No{% endtrans %}</td>
-                {% endif %}
-                <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %}
-                        <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a>
-                    {% endif %}
-                    </td>
-            </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    </div>
+  <div id="accounting">
+    <p>
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
+      {{ object }}
+    </p>
+    <hr>
+    <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2>
+    {% if user.is_root and not object.journals.exists() %}
+      <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
+    {% endif %}
+    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+      <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
+    {% endif %}
+    <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p>
+    {% if not object.has_open_journal() %}
+      <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>
+    {% else %}
+      <p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p>
+    {% endif %}
+    <table>
+      <thead>
+        <tr>
+          <td>{% trans %}Name{% endtrans %}</td>
+          <td>{% trans %}Start{% endtrans %}</td>
+          <td>{% trans %}End{% endtrans %}</td>
+          <td>{% trans %}Amount{% endtrans %}</td>
+          <td>{% trans %}Effective amount{% endtrans %}</td>
+          <td>{% trans %}Closed{% endtrans %}</td>
+          <td>{% trans %}Actions{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for j in object.journals.all() %}
+          <tr>
+            <td>{{ j.name }}</td>
+            <td>{{ j.start_date }}</td>
+            {% if j.end_date %}
+              <td>{{ j.end_date }}</td>
+            {% else %}
+              <td> - </td>
+            {% endif %}
+            <td>{{ j.amount }} €</td>
+            <td>{{ j.effective_amount }} €</td>
+            {% if j.closed %}
+              <td>{% trans %}Yes{% endtrans %}</td>
+            {% else %}
+              <td>{% trans %}No{% endtrans %}</td>
+            {% endif %}
+            <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a>
+              <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a>
+              {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %}
+                <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a>
+              {% endif %}
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
 {% endblock %}
diff --git a/accounting/templates/accounting/co_list.jinja b/accounting/templates/accounting/co_list.jinja
index 0cca32c63..1d357820c 100644
--- a/accounting/templates/accounting/co_list.jinja
+++ b/accounting/templates/accounting/co_list.jinja
@@ -1,30 +1,30 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Company list{% endtrans %}
+  {% trans %}Company list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        {% if user.is_root
-           or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-        %}
-        <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p>
-        {% endif %}
-        <br/>
-        <table>
-            <thead>
-            <tr>
-                <td>{% trans %}Companies{% endtrans %}</td>
-            </tr>
-            </thead>
-            <tbody>
-                {% for o in object_list %}
-                    <tr>
-                        <td><a href="{{ url('accounting:co_edit', co_id=o.id) }}">{{ o.get_display_name() }}</a></td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
+  <div id="accounting">
+    {% if user.is_root
+    or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+    %}
+    <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p>
+{% endif %}
+<br/>
+<table>
+  <thead>
+    <tr>
+      <td>{% trans %}Companies{% endtrans %}</td>
+    </tr>
+  </thead>
+  <tbody>
+    {% for o in object_list %}
+      <tr>
+        <td><a href="{{ url('accounting:co_edit', co_id=o.id) }}">{{ o.get_display_name() }}</a></td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+</div>
 {% endblock %}
diff --git a/accounting/templates/accounting/journal_details.jinja b/accounting/templates/accounting/journal_details.jinja
index 274e678f8..8393ca8bf 100644
--- a/accounting/templates/accounting/journal_details.jinja
+++ b/accounting/templates/accounting/journal_details.jinja
@@ -1,103 +1,103 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}General journal:{% endtrans %} {{ object.name }}
+  {% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <p>
-        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-        <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
-        <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
-        {{ object.name }}
-        </p>
-        <hr>
-        <h2>{% trans %}General journal:{% endtrans %} {{ object.name }}</h2>
-        <p><a href="{{ url('accounting:label_new') }}?parent={{ object.club_account.id }}">{% trans %}New label{% endtrans %}</a></p>
-        <p><a href="{{ url('accounting:label_list', clubaccount_id=object.club_account.id) }}">{% trans %}Label list{% endtrans %}</a></p>
-        <p><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></p>
-        <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ object.amount }} € -
-        <strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ object.effective_amount }} €</p>
-        {% if object.closed %}
-        <p>{% trans %}Journal is closed, you can not create operation{% endtrans %}</p>
-        {% else %}
-        <p><a href="{{ url('accounting:op_new', j_id=object.id) }}">{% trans %}New operation{% endtrans %}</a></p>
-        </br>
-        {% endif %}
-        <div class="journal-table">
-        <table>
-            <thead>
+  <div id="accounting">
+    <p>
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
+      <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
+      {{ object.name }}
+    </p>
+    <hr>
+    <h2>{% trans %}General journal:{% endtrans %} {{ object.name }}</h2>
+    <p><a href="{{ url('accounting:label_new') }}?parent={{ object.club_account.id }}">{% trans %}New label{% endtrans %}</a></p>
+    <p><a href="{{ url('accounting:label_list', clubaccount_id=object.club_account.id) }}">{% trans %}Label list{% endtrans %}</a></p>
+    <p><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></p>
+    <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ object.amount }} € -
+      <strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ object.effective_amount }} €</p>
+    {% if object.closed %}
+      <p>{% trans %}Journal is closed, you can not create operation{% endtrans %}</p>
+    {% else %}
+      <p><a href="{{ url('accounting:op_new', j_id=object.id) }}">{% trans %}New operation{% endtrans %}</a></p>
+      </br>
+    {% endif %}
+    <div class="journal-table">
+      <table>
+        <thead>
+          <tr>
+            <td>{% trans %}Nb{% endtrans %}</td>
+            <td>{% trans %}Date{% endtrans %}</td>
+            <td>{% trans %}Label{% endtrans %}</td>
+            <td>{% trans %}Amount{% endtrans %}</td>
+            <td>{% trans %}Payment mode{% endtrans %}</td>
+            <td>{% trans %}Target{% endtrans %}</td>
+            <td>{% trans %}Code{% endtrans %}</td>
+            <td>{% trans %}Nature{% endtrans %}</td>
+            <td>{% trans %}Done{% endtrans %}</td>
+            <td>{% trans %}Comment{% endtrans %}</td>
+            <td>{% trans %}File{% endtrans %}</td>
+            <td>{% trans %}Actions{% endtrans %}</td>
+            <td>{% trans %}PDF{% endtrans %}</td>
+          </tr>
+        </thead>
+        <tbody>
+          {% for o in object.operations.all() %}
             <tr>
-                <td>{% trans %}Nb{% endtrans %}</td>
-                <td>{% trans %}Date{% endtrans %}</td>
-                <td>{% trans %}Label{% endtrans %}</td>
-                <td>{% trans %}Amount{% endtrans %}</td>
-                <td>{% trans %}Payment mode{% endtrans %}</td>
-                <td>{% trans %}Target{% endtrans %}</td>
-                <td>{% trans %}Code{% endtrans %}</td>
-                <td>{% trans %}Nature{% endtrans %}</td>
-                <td>{% trans %}Done{% endtrans %}</td>
-                <td>{% trans %}Comment{% endtrans %}</td>
-                <td>{% trans %}File{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-                <td>{% trans %}PDF{% endtrans %}</td>
-            </tr>
-            </thead>
-            <tbody>
-            {% for o in object.operations.all() %}
-            <tr>
-                <td>{{ o.number }}</td>
-                <td>{{ o.date }}</td>
-                <td>{{ o.label or "" }}</td>
-                {% if o.accounting_type.movement_type == "DEBIT" %}
-                    <td class="neg-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
-                {% else %}
-                    <td class="pos-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
-                {% endif %}
-                <td>{{ o.get_mode_display() }}</td>
-                {% if o.target_type == "OTHER" %}
+              <td>{{ o.number }}</td>
+              <td>{{ o.date }}</td>
+              <td>{{ o.label or "" }}</td>
+              {% if o.accounting_type.movement_type == "DEBIT" %}
+                <td class="neg-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
+              {% else %}
+                <td class="pos-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
+              {% endif %}
+              <td>{{ o.get_mode_display() }}</td>
+              {% if o.target_type == "OTHER" %}
                 <td>{{ o.target_label }}</td>
-                {% else %}
+              {% else %}
                 <td><a href="{{ o.target.get_absolute_url() }}">{{ o.target.get_display_name() }}</a></td>
-                {% endif %}
-                <td>{{ o.accounting_type.code }}</td>
-                <td>{{ o.accounting_type.label }}</td>
-                {% if o.done %}
+              {% endif %}
+              <td>{{ o.accounting_type.code }}</td>
+              <td>{{ o.accounting_type.label }}</td>
+              {% if o.done %}
                 <td>{% trans %}Yes{% endtrans %}</td>
-                {% else %}
+              {% else %}
                 <td>{% trans %}No{% endtrans %}</td>
-                {% endif %}
-                <td>{{ o.remark }}
+              {% endif %}
+              <td>{{ o.remark }}
                 {% if not o.linked_operation and o.target_type == "ACCOUNT" and not o.target.has_open_journal() %}
-                    <p><strong>
-    {% trans %}Warning: this operation has no linked operation because the targeted club account has no opened journal.{% endtrans %}
-                </strong></p>
-                <p><strong>
-    {% trans url=o.target.get_absolute_url() %}Open a journal in <a href="{{ url }}">this club account</a>, then save this operation again to make the linked operation.{% endtrans %}
-            </strong></p>
+                  <p><strong>
+                    {% trans %}Warning: this operation has no linked operation because the targeted club account has no opened journal.{% endtrans %}
+                  </strong></p>
+                  <p><strong>
+                    {% trans url=o.target.get_absolute_url() %}Open a journal in <a href="{{ url }}">this club account</a>, then save this operation again to make the linked operation.{% endtrans %}
+                  </strong></p>
                 {% endif %}
-                </td>
-                {% if o.invoice %}
+              </td>
+              {% if o.invoice %}
                 <td><a href="{{ url('core:download', file_id=o.invoice.id) }}">{{ o.invoice.name }}</a></td>
-                {% else %}
+              {% else %}
                 <td>-</td>
+              {% endif %}
+              <td>
+                {%
+                if o.journal.club_account.bank_account.name not in ["AE TI", "TI"]
+                or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+                %}
+                {% if not o.journal.closed %}
+                  <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>
                 {% endif %}
-                <td>
-                    {%
-                        if o.journal.club_account.bank_account.name not in ["AE TI", "TI"]
-                        or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-                    %}
-                        {% if not o.journal.closed %}
-                            <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>
-                        {% endif %}
-                    {% endif %}
-                </td>
-                <td><a href="{{ url('accounting:op_pdf', op_id=o.id) }}">{% trans %}Generate{% endtrans %}</a></td>
-            </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-        </div>
-    </div>
+          {% endif %}
+        </td>
+        <td><a href="{{ url('accounting:op_pdf', op_id=o.id) }}">{% trans %}Generate{% endtrans %}</a></td>
+      </tr>
+{% endfor %}
+</tbody>
+</table>
+</div>
+</div>
 {% endblock %}
diff --git a/accounting/templates/accounting/journal_statement_accounting.jinja b/accounting/templates/accounting/journal_statement_accounting.jinja
index 0661bbcf9..5641e78b7 100644
--- a/accounting/templates/accounting/journal_statement_accounting.jinja
+++ b/accounting/templates/accounting/journal_statement_accounting.jinja
@@ -1,33 +1,33 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}General journal:{% endtrans %} {{ object.name }}
+  {% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 
 {% block content %}
-<div id="accounting">
+  <div id="accounting">
     <h3>{% trans %}Accounting statement: {% endtrans %} {{ object.name }}</h3>
 
     <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Operation type{% endtrans %}</td>
-                <td>{% trans %}Sum{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for k,v in statement.items() %}
-            <tr>
-                <td>{{ k }}</td>
-                <td>{{ "%.2f" % v }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
+      <thead>
+        <tr>
+          <td>{% trans %}Operation type{% endtrans %}</td>
+          <td>{% trans %}Sum{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for k,v in statement.items() %}
+          <tr>
+            <td>{{ k }}</td>
+            <td>{{ "%.2f" % v }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
 
     </table>
 
     <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ "%.2f" % object.amount }} €</p>
     <p><strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ "%.2f" %object.effective_amount }} €</p>
-</div>
+  </div>
 {% endblock %}
diff --git a/accounting/templates/accounting/journal_statement_nature.jinja b/accounting/templates/accounting/journal_statement_nature.jinja
index a3aa15678..0a149326f 100644
--- a/accounting/templates/accounting/journal_statement_nature.jinja
+++ b/accounting/templates/accounting/journal_statement_nature.jinja
@@ -1,57 +1,57 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}General journal:{% endtrans %} {{ object.name }}
+  {% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 {% macro display_tables(dict) %}
-<div id="accounting">
+  <div id="accounting">
     <h6>{% trans %}Credit{% endtrans %}</h6>
     <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Nature of operation{% endtrans %}</td>
-                <td>{% trans %}Sum{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for k,v in dict['CREDIT'].items() %}
-            <tr>
-                <td>{{ k }}</td>
-                <td>{{ "%.2f" % v }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
+      <thead>
+        <tr>
+          <td>{% trans %}Nature of operation{% endtrans %}</td>
+          <td>{% trans %}Sum{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for k,v in dict['CREDIT'].items() %}
+          <tr>
+            <td>{{ k }}</td>
+            <td>{{ "%.2f" % v }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
     </table>
     {% trans %}Total: {% endtrans %}{{ "%.2f" % dict['CREDIT_sum'] }}
 
     <h6>{% trans %}Debit{% endtrans %}</h6>
     <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Nature of operation{% endtrans %}</td>
-                <td>{% trans %}Sum{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for k,v in dict['DEBIT'].items() %}
-            <tr>
-                <td>{{ k }}</td>
-                <td>{{ "%.2f" % v }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
+      <thead>
+        <tr>
+          <td>{% trans %}Nature of operation{% endtrans %}</td>
+          <td>{% trans %}Sum{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for k,v in dict['DEBIT'].items() %}
+          <tr>
+            <td>{{ k }}</td>
+            <td>{{ "%.2f" % v }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
     </table>
     {% trans %}Total: {% endtrans %}{{ "%.2f" % dict['DEBIT_sum'] }}
-    {% endmacro %}
+{% endmacro %}
 
-    {% block content %}
-    <h3>{% trans %}Statement by nature: {% endtrans %} {{ object.name }}</h3>
+{% block content %}
+  <h3>{% trans %}Statement by nature: {% endtrans %} {{ object.name }}</h3>
 
-    {% for k,v in statement.items() %}
-        <h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}</h4>
+  {% for k,v in statement.items() %}
+    <h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}</h4>
     {{ display_tables(v) }}
     <hr>
-    {% endfor %}
-</div>
+  {% endfor %}
+  </div>
 {% endblock %}
diff --git a/accounting/templates/accounting/journal_statement_person.jinja b/accounting/templates/accounting/journal_statement_person.jinja
index 9a88e73f6..764826471 100644
--- a/accounting/templates/accounting/journal_statement_person.jinja
+++ b/accounting/templates/accounting/journal_statement_person.jinja
@@ -1,37 +1,37 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}General journal:{% endtrans %} {{ object.name }}
+  {% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 
 {% block content %}
-<div id="accounting">
+  <div id="accounting">
     <h3>{% trans %}Statement by person: {% endtrans %} {{ object.name }}</h3>
 
     <h4>{% trans %}Credit{% endtrans %}</h4>
 
     <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Target of the operation{% endtrans %}</td>
-                <td>{% trans %}Sum{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for key in credit_statement.keys() %}
-            <tr>
-                {% if key.target_type == "OTHER" %}
-                <td>{{ o.target_label }}</td>
-                {% elif key %}
-                <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
-                {% else %}
-                <td></td>
-                {% endif %}
-                <td>{{ "%.2f" % credit_statement[key] }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
+      <thead>
+        <tr>
+          <td>{% trans %}Target of the operation{% endtrans %}</td>
+          <td>{% trans %}Sum{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for key in credit_statement.keys() %}
+          <tr>
+            {% if key.target_type == "OTHER" %}
+              <td>{{ o.target_label }}</td>
+            {% elif key %}
+              <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
+            {% else %}
+              <td></td>
+            {% endif %}
+            <td>{{ "%.2f" % credit_statement[key] }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
 
     </table>
 
@@ -40,29 +40,29 @@
     <h4>{% trans %}Debit{% endtrans %}</h4>
 
     <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Target of the operation{% endtrans %}</td>
-                <td>{% trans %}Sum{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for key in debit_statement.keys() %}
-            <tr>
-                {% if key.target_type == "OTHER" %}
-                <td>{{ o.target_label }}</td>
-                {% elif key %}
-                <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
-                {% else %}
-                <td></td>
-                {% endif %}
-                <td>{{ "%.2f" % debit_statement[key] }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
+      <thead>
+        <tr>
+          <td>{% trans %}Target of the operation{% endtrans %}</td>
+          <td>{% trans %}Sum{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for key in debit_statement.keys() %}
+          <tr>
+            {% if key.target_type == "OTHER" %}
+              <td>{{ o.target_label }}</td>
+            {% elif key %}
+              <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
+            {% else %}
+              <td></td>
+            {% endif %}
+            <td>{{ "%.2f" % debit_statement[key] }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
 
     </table>
 
     <p>Total : {{ "%.2f" % total_debit }}</p>
-</div>
+  </div>
 {% endblock %}
diff --git a/accounting/templates/accounting/label_list.jinja b/accounting/templates/accounting/label_list.jinja
index c15a9373a..6b5a9b8b9 100644
--- a/accounting/templates/accounting/label_list.jinja
+++ b/accounting/templates/accounting/label_list.jinja
@@ -1,36 +1,36 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Label list{% endtrans %}
+  {% trans %}Label list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <p>
-        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-        <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
-        <a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{{ object }}</a>
-        </p>
-        <hr>
-        <p><a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{% trans %}Back to club account{% endtrans %}</a></p>
-        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-        <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
-        {% endif %}
-        {% if object.labels.all() %}
-        <h3>{% trans %}Label list{% endtrans %}</h3>
-        <ul>
-            {% for l in object.labels.all()  %}
-            <li><a href="{{ url('accounting:label_edit', label_id=l.id) }}">{{ l }}</a>
+  <div id="accounting">
+    <p>
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
+      <a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{{ object }}</a>
+    </p>
+    <hr>
+    <p><a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{% trans %}Back to club account{% endtrans %}</a></p>
+    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+      <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
+    {% endif %}
+    {% if object.labels.all() %}
+      <h3>{% trans %}Label list{% endtrans %}</h3>
+      <ul>
+        {% for l in object.labels.all()  %}
+          <li><a href="{{ url('accounting:label_edit', label_id=l.id) }}">{{ l }}</a>
             {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-             -
-                <a href="{{ url('accounting:label_delete', label_id=l.id) }}">{% trans %}Delete{% endtrans %}</a>
+              -
+              <a href="{{ url('accounting:label_delete', label_id=l.id) }}">{% trans %}Delete{% endtrans %}</a>
             {% endif %}
-            </li>
-            {% endfor %}
-        </ul>
-        {% else %}
-        {% trans %}There is no label in this club account.{% endtrans %}
-        {% endif %}
-    </div>
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      {% trans %}There is no label in this club account.{% endtrans %}
+    {% endif %}
+  </div>
 {% endblock %}
 
diff --git a/accounting/templates/accounting/operation_edit.jinja b/accounting/templates/accounting/operation_edit.jinja
index 333489681..e8c34364b 100644
--- a/accounting/templates/accounting/operation_edit.jinja
+++ b/accounting/templates/accounting/operation_edit.jinja
@@ -1,123 +1,123 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Edit operation{% endtrans %}
+  {% trans %}Edit operation{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div id="accounting">
+  <div id="accounting">
     <p>
-    <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-    <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
-    <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
-    <a href="{{ url('accounting:journal_details', j_id=object.id) }}">{{ object.name }}</a> >
-    {% trans %}Edit operation{% endtrans %}
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
+      <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
+      <a href="{{ url('accounting:journal_details', j_id=object.id) }}">{{ object.name }}</a> >
+      {% trans %}Edit operation{% endtrans %}
     </p>
     <hr>
     <h2>{% trans %}Edit operation{% endtrans %}</h2>
     <form action="" method="post">
-        {% csrf_token %}
-        {{ form.non_field_errors() }}
-        {{ form.journal }}
-        {{ form.target_id }}
-        <p>{{ form.amount.errors }}<label for="{{ form.amount.name }}">{{ form.amount.label }}</label> {{ form.amount }}</p>
-        <p>{{ form.remark.errors }}<label for="{{ form.remark.name }}">{{ form.remark.label }}</label> {{ form.remark }}</p>
-        <br />
-        <strong>{% trans %}Warning: if you select <em>Account</em>, the opposite operation will be created in the target account. If you don't want that, select <em>Club</em> instead of <em>Account</em>.{% endtrans %}</strong>
-        <p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> {{ form.target_type }}</p>
-            {{ form.user }}
-            {{ form.club }}
-            {{ form.club_account }}
-            {{ form.company }}
-            {{ form.target_label }}
-            <span id="id_need_link_full"><label>{{ form.need_link.label }}</label> {{ form.need_link }}</span>
-        <p>{{ form.date.errors }}<label for="{{ form.date.name }}">{{ form.date.label }}</label> {{ form.date }}</p>
-        <p>{{ form.mode.errors }}<label for="{{ form.mode.name }}">{{ form.mode.label }}</label> {{ form.mode }}</p>
-        <p>{{ form.cheque_number.errors }}<label for="{{ form.cheque_number.name }}">{{ form.cheque_number.label }}</label> {{
+      {% csrf_token %}
+      {{ form.non_field_errors() }}
+      {{ form.journal }}
+      {{ form.target_id }}
+      <p>{{ form.amount.errors }}<label for="{{ form.amount.name }}">{{ form.amount.label }}</label> {{ form.amount }}</p>
+      <p>{{ form.remark.errors }}<label for="{{ form.remark.name }}">{{ form.remark.label }}</label> {{ form.remark }}</p>
+      <br />
+      <strong>{% trans %}Warning: if you select <em>Account</em>, the opposite operation will be created in the target account. If you don't want that, select <em>Club</em> instead of <em>Account</em>.{% endtrans %}</strong>
+      <p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> {{ form.target_type }}</p>
+      {{ form.user }}
+      {{ form.club }}
+      {{ form.club_account }}
+      {{ form.company }}
+      {{ form.target_label }}
+      <span id="id_need_link_full"><label>{{ form.need_link.label }}</label> {{ form.need_link }}</span>
+      <p>{{ form.date.errors }}<label for="{{ form.date.name }}">{{ form.date.label }}</label> {{ form.date }}</p>
+      <p>{{ form.mode.errors }}<label for="{{ form.mode.name }}">{{ form.mode.label }}</label> {{ form.mode }}</p>
+      <p>{{ form.cheque_number.errors }}<label for="{{ form.cheque_number.name }}">{{ form.cheque_number.label }}</label> {{
         form.cheque_number }}</p>
-        <p>{{ form.invoice.errors }}<label for="{{ form.invoice.name }}">{{ form.invoice.label }}</label> {{ form.invoice }}</p>
-        <p>{{ form.simpleaccounting_type.errors }}<label for="{{ form.simpleaccounting_type.name }}">{{
-            form.simpleaccounting_type.label }}</label> {{ form.simpleaccounting_type }}</p>
-        <p>{{ form.accounting_type.errors }}<label for="{{ form.accounting_type.name }}">{{ form.accounting_type.label }}</label> {{
+      <p>{{ form.invoice.errors }}<label for="{{ form.invoice.name }}">{{ form.invoice.label }}</label> {{ form.invoice }}</p>
+      <p>{{ form.simpleaccounting_type.errors }}<label for="{{ form.simpleaccounting_type.name }}">{{
+        form.simpleaccounting_type.label }}</label> {{ form.simpleaccounting_type }}</p>
+      <p>{{ form.accounting_type.errors }}<label for="{{ form.accounting_type.name }}">{{ form.accounting_type.label }}</label> {{
         form.accounting_type }}</p>
-        <p>{{ form.label.errors }}<label for="{{ form.label.name }}">{{ form.label.label }}</label> {{ form.label }}</p>
-        <p>{{ form.done.errors }}<label for="{{ form.done.name }}">{{ form.done.label }}</label> {{ form.done }}</p>
-        {% if form.instance.linked_operation %}
+      <p>{{ form.label.errors }}<label for="{{ form.label.name }}">{{ form.label.label }}</label> {{ form.label }}</p>
+      <p>{{ form.done.errors }}<label for="{{ form.done.name }}">{{ form.done.label }}</label> {{ form.done }}</p>
+      {% if form.instance.linked_operation %}
         {% set obj = form.instance.linked_operation %}
         <p><strong>{% trans %}Linked operation:{% endtrans %}</strong><br>
-        <a href="{{ url('accounting:bank_details', b_account_id=obj.journal.club_account.bank_account.id) }}">
-                {{obj.journal.club_account.bank_account }}</a> >
-        <a href="{{ url('accounting:club_details', c_account_id=obj.journal.club_account.id) }}">{{ obj.journal.club_account }}</a> >
-        <a href="{{ url('accounting:journal_details', j_id=obj.journal.id) }}">{{ obj.journal }}</a> >
-        n°{{ obj.number }}
+          <a href="{{ url('accounting:bank_details', b_account_id=obj.journal.club_account.bank_account.id) }}">
+            {{obj.journal.club_account.bank_account }}</a> >
+          <a href="{{ url('accounting:club_details', c_account_id=obj.journal.club_account.id) }}">{{ obj.journal.club_account }}</a> >
+          <a href="{{ url('accounting:journal_details', j_id=obj.journal.id) }}">{{ obj.journal }}</a> >
+          n°{{ obj.number }}
         </p>
-        {% endif %}
-        <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+      {% endif %}
+      <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
     </form>
-    {% endblock %}
+{% endblock %}
 
-    {% block script %}
-        {{ super() }}
-    <script>
+{% block script %}
+  {{ super() }}
+  <script>
     $( function() {
-            var target_type = $('#id_target_type');
-            var user = $('#id_user_wrapper');
-            var club = $('#id_club_wrapper');
-            var club_account = $('#id_club_account_wrapper');
-            var company = $('#id_company_wrapper');
-            var other = $('#id_target_label');
-            var need_link = $('#id_need_link_full');
-            function update_targets () {
-                if (target_type.val() == "USER") {
-                    console.log(user);
-                    user.show();
-                    club.hide();
-                    club_account.hide();
-                    company.hide();
-                    other.hide();
-                    need_link.hide();
-                } else if (target_type.val() == "ACCOUNT") {
-                    club_account.show();
-                    need_link.show();
-                    user.hide();
-                    club.hide();
-                    company.hide();
-                    other.hide();
-                } else if (target_type.val() == "CLUB") {
-                    club.show();
-                    user.hide();
-                    club_account.hide();
-                    company.hide();
-                    other.hide();
-                    need_link.hide();
-                } else if (target_type.val() == "COMPANY") {
-                    company.show();
-                    user.hide();
-                    club_account.hide();
-                    club.hide();
-                    other.hide();
-                    need_link.hide();
-                } else if (target_type.val() == "OTHER") {
-                    other.show();
-                    user.hide();
-                    club.hide();
-                    club_account.hide();
-                    company.hide();
-                    need_link.hide();
-                } else {
-                    company.hide();
-                    user.hide();
-                    club_account.hide();
-                    club.hide();
-                    other.hide();
-                    need_link.hide();
-                }
-            }
-            update_targets();
-            target_type.change(update_targets);
-            } );
-    </script>
-</div>
+      var target_type = $('#id_target_type');
+      var user = $('#id_user_wrapper');
+      var club = $('#id_club_wrapper');
+      var club_account = $('#id_club_account_wrapper');
+      var company = $('#id_company_wrapper');
+      var other = $('#id_target_label');
+      var need_link = $('#id_need_link_full');
+      function update_targets () {
+        if (target_type.val() == "USER") {
+          console.log(user);
+          user.show();
+          club.hide();
+          club_account.hide();
+          company.hide();
+          other.hide();
+          need_link.hide();
+        } else if (target_type.val() == "ACCOUNT") {
+          club_account.show();
+          need_link.show();
+          user.hide();
+          club.hide();
+          company.hide();
+          other.hide();
+        } else if (target_type.val() == "CLUB") {
+          club.show();
+          user.hide();
+          club_account.hide();
+          company.hide();
+          other.hide();
+          need_link.hide();
+        } else if (target_type.val() == "COMPANY") {
+          company.show();
+          user.hide();
+          club_account.hide();
+          club.hide();
+          other.hide();
+          need_link.hide();
+        } else if (target_type.val() == "OTHER") {
+          other.show();
+          user.hide();
+          club.hide();
+          club_account.hide();
+          company.hide();
+          need_link.hide();
+        } else {
+          company.hide();
+          user.hide();
+          club_account.hide();
+          club.hide();
+          other.hide();
+          need_link.hide();
+        }
+      }
+      update_targets();
+      target_type.change(update_targets);
+    } );
+  </script>
+  </div>
 {% endblock %}
 
 
diff --git a/accounting/templates/accounting/refound_account.jinja b/accounting/templates/accounting/refound_account.jinja
index 2987c04b9..9e726a247 100644
--- a/accounting/templates/accounting/refound_account.jinja
+++ b/accounting/templates/accounting/refound_account.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Refound account{% endtrans %}
+  {% trans %}Refound account{% endtrans %}
 {% endblock %}
 
 {% block content %}
-	<div id="accounting">
-	    <h3>{% trans %}Refound account{% endtrans %}</h3>
-	    <form action="" method="post">
-	        {% csrf_token %}
-	        {{ form.as_p() }}
-	        <p><input type="submit" value="{% trans %}Refound{% endtrans %}" /></p>
-	    </form>
-	</div>
+  <div id="accounting">
+    <h3>{% trans %}Refound account{% endtrans %}</h3>
+    <form action="" method="post">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <p><input type="submit" value="{% trans %}Refound{% endtrans %}" /></p>
+    </form>
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/accounting/templates/accounting/simplifiedaccountingtype_list.jinja b/accounting/templates/accounting/simplifiedaccountingtype_list.jinja
index 8e6bbc85f..da72a3708 100644
--- a/accounting/templates/accounting/simplifiedaccountingtype_list.jinja
+++ b/accounting/templates/accounting/simplifiedaccountingtype_list.jinja
@@ -1,27 +1,27 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Simplified type list{% endtrans %}
+  {% trans %}Simplified type list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <div id="accounting">
-        <p>
-        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-        {% trans %}Simplified types{% endtrans %}
-        </p>
-        <hr>
-        <p><a href="{{ url('accounting:simple_type_new') }}">{% trans %}New simplified type{% endtrans %}</a></p>
-        {% if simplifiedaccountingtype_list %}
-        <h3>{% trans %}Simplified type list{% endtrans %}</h3>
-        <ul>
-            {% for a in simplifiedaccountingtype_list  %}
-            <li><a href="{{ url('accounting:simple_type_edit', type_id=a.id) }}">{{ a }}</a></li>
-            {% endfor %}
-        </ul>
-        {% else %}
-        {% trans %}There is no types in this website.{% endtrans %}
-        {% endif %}
-    </div>
+  <div id="accounting">
+    <p>
+      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+      {% trans %}Simplified types{% endtrans %}
+    </p>
+    <hr>
+    <p><a href="{{ url('accounting:simple_type_new') }}">{% trans %}New simplified type{% endtrans %}</a></p>
+    {% if simplifiedaccountingtype_list %}
+      <h3>{% trans %}Simplified type list{% endtrans %}</h3>
+      <ul>
+        {% for a in simplifiedaccountingtype_list  %}
+          <li><a href="{{ url('accounting:simple_type_edit', type_id=a.id) }}">{{ a }}</a></li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      {% trans %}There is no types in this website.{% endtrans %}
+    {% endif %}
+  </div>
 {% endblock %}
 
diff --git a/accounting/tests.py b/accounting/tests.py
index 610a574d1..3630c0e22 100644
--- a/accounting/tests.py
+++ b/accounting/tests.py
@@ -264,33 +264,26 @@ def test_person_statement(self):
         )
         self.assertContains(response, "Total : 5575.72", status_code=200)
         self.assertContains(response, "Total : 71.42")
-        self.assertContains(
-            response,
-            """
-                <td><a href="/user/1/">S&#39; Kia</a></td>
-                
-                <td>3.00</td>""",
+        content = response.content.decode()
+        self.assertInHTML(
+            """<td><a href="/user/1/">S&#39; Kia</a></td><td>3.00</td>""", content
         )
-        self.assertContains(
-            response,
-            """
-                <td><a href="/user/1/">S&#39; Kia</a></td>
-                
-                <td>823.00</td>""",
+        self.assertInHTML(
+            """<td><a href="/user/1/">S&#39; Kia</a></td><td>823.00</td>""", content
         )
 
     def test_accounting_statement(self):
         response = self.client.get(
             reverse("accounting:journal_accounting_statement", args=[self.journal.id])
         )
-        self.assertContains(
-            response,
+        assert response.status_code == 200
+        self.assertInHTML(
             """
             <tr>
                 <td>443 - Crédit - Ce code n&#39;existe pas</td>
                 <td>3.00</td>
             </tr>""",
-            status_code=200,
+            response.content.decode(),
         )
         self.assertContains(
             response,
diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja
index 6dbb62b2d..42e93b81d 100644
--- a/club/templates/club/club_detail.jinja
+++ b/club/templates/club/club_detail.jinja
@@ -2,16 +2,16 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block content %}
-	<div id="club_detail">
-		{% if club.logo %}
-			<div class="club_logo"><img src="{{ club.logo.url }}" alt="{{ club.unix_name }}"></div>
-		{% endif %}
-		{% if page_revision %}
-			{{ page_revision|markdown }}
- 		{% else %}
- 		<h3>{% trans %}Club{% endtrans %}</h3>
-	    {% endif %}
-    </div>
+  <div id="club_detail">
+    {% if club.logo %}
+      <div class="club_logo"><img src="{{ club.logo.url }}" alt="{{ club.unix_name }}"></div>
+    {% endif %}
+    {% if page_revision %}
+      {{ page_revision|markdown }}
+    {% else %}
+      <h3>{% trans %}Club{% endtrans %}</h3>
+    {% endif %}
+  </div>
 {% endblock %}
 
 
diff --git a/club/templates/club/club_list.jinja b/club/templates/club/club_list.jinja
index ba875c893..f914803e6 100644
--- a/club/templates/club/club_list.jinja
+++ b/club/templates/club/club_list.jinja
@@ -1,48 +1,48 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Club list{% endtrans %}
+  {% trans %}Club list{% endtrans %}
 {% endblock %}
 
 {% macro display_club(club) -%}
 
-        {% if club.is_active or user.is_root %}
-        
-        <li><a href="{{ url('club:club_view', club_id=club.id) }}">{{ club.name }}</a>
-        
-        {% if not club.is_active %}
-            ({% trans %}inactive{% endtrans %})
-        {% endif %}
-
-        {% if club.president %} - <a href="{{ url('core:user_profile', user_id=club.president.user.id) }}">{{ club.president.user }}</a>{% endif %}
-        {% if club.short_description %}<p>{{ club.short_description|markdown }}</p>{% endif %}
-            
-        {% endif %}
-
-        {%- if club.children.all()|length != 0 %}
-        <ul>
-            {%- for c in club.children.order_by('name') %}
-                {{ display_club(c) }}
-            {%- endfor %}
-        </ul>
-        {%- endif -%}
-    </li>
+  {% if club.is_active or user.is_root %}
+
+    <li><a href="{{ url('club:club_view', club_id=club.id) }}">{{ club.name }}</a>
+
+      {% if not club.is_active %}
+        ({% trans %}inactive{% endtrans %})
+      {% endif %}
+
+      {% if club.president %} - <a href="{{ url('core:user_profile', user_id=club.president.user.id) }}">{{ club.president.user }}</a>{% endif %}
+      {% if club.short_description %}<p>{{ club.short_description|markdown }}</p>{% endif %}
+
+  {% endif %}
+
+  {%- if club.children.all()|length != 0 %}
+    <ul>
+      {%- for c in club.children.order_by('name') %}
+        {{ display_club(c) }}
+      {%- endfor %}
+    </ul>
+  {%- endif -%}
+  </li>
 {%- endmacro %}
 
 {% block content %}
-    {% if user.is_root %}
+  {% if user.is_root %}
     <p><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></p>
-    {% endif %}
-    {% if club_list %}
+  {% endif %}
+  {% if club_list %}
     <h3>{% trans %}Club list{% endtrans %}</h3>
     <ul>
-        {%- for c in club_list.all().order_by('name') if c.parent is none %}
+      {%- for c in club_list.all().order_by('name') if c.parent is none %}
         {{ display_club(c) }}
-        {%- endfor %}
+      {%- endfor %}
     </ul>
-    {% else %}
+  {% else %}
     {% trans %}There is no club in this website.{% endtrans %}
-    {% endif %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/club/templates/club/club_members.jinja b/club/templates/club/club_members.jinja
index 817b01703..a64d43ce8 100644
--- a/club/templates/club/club_members.jinja
+++ b/club/templates/club/club_members.jinja
@@ -2,81 +2,81 @@
 {% from 'core/macros.jinja' import user_profile_link, select_all_checkbox %}
 
 {% block content %}
-    <h2>{% trans %}Club members{% endtrans %}</h2>
-    {% if members %}
+  <h2>{% trans %}Club members{% endtrans %}</h2>
+  {% if members %}
     <form action="{{ url('club:club_members', club_id=club.id) }}" id="users_old" method="post">
-        {% csrf_token %}
-        {% set users_old = dict(form.users_old | groupby("choice_label")) %}
-        {% if users_old %}
-            {{ select_all_checkbox("users_old") }}
-            <p></p>
-        {% endif %}
-        <table>
-            <thead>
-                <tr>
-                    <td>{% trans %}User{% endtrans %}</td>
-                    <td>{% trans %}Role{% endtrans %}</td>
-                    <td>{% trans %}Description{% endtrans %}</td>
-                    <td>{% trans %}Since{% endtrans %}</td>
-                    {% if users_old %}
-                        <td>{% trans %}Mark as old{% endtrans %}</td>
-                    {% endif %}
-                </tr>
-            </thead>
-            <tbody>
-            {% for m in members %}
-                <tr>
-                    <td>{{ user_profile_link(m.user) }}</td>
-                    <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-                    <td>{{ m.description }}</td>
-                    <td>{{ m.start_date }}</td>
-                    {% if users_old %}
-                        <td>
-                        {% set user_old = users_old[m.user.get_display_name()] %}
-                        {% if user_old %}
-                            {{ user_old[0].tag() }}
-                        {% endif %}
-                        </td>
-                    {% endif %}
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-        {{ form.users_old.errors }}
-        {% if users_old %}
-            <p></p>
-            <input type="submit" name="submit" value="{% trans %}Mark as old{% endtrans %}">
-        {% endif %}
+      {% csrf_token %}
+      {% set users_old = dict(form.users_old | groupby("choice_label")) %}
+      {% if users_old %}
+        {{ select_all_checkbox("users_old") }}
+        <p></p>
+      {% endif %}
+      <table>
+        <thead>
+          <tr>
+            <td>{% trans %}User{% endtrans %}</td>
+            <td>{% trans %}Role{% endtrans %}</td>
+            <td>{% trans %}Description{% endtrans %}</td>
+            <td>{% trans %}Since{% endtrans %}</td>
+            {% if users_old %}
+              <td>{% trans %}Mark as old{% endtrans %}</td>
+            {% endif %}
+          </tr>
+        </thead>
+        <tbody>
+          {% for m in members %}
+            <tr>
+              <td>{{ user_profile_link(m.user) }}</td>
+              <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+              <td>{{ m.description }}</td>
+              <td>{{ m.start_date }}</td>
+              {% if users_old %}
+                <td>
+                  {% set user_old = users_old[m.user.get_display_name()] %}
+                  {% if user_old %}
+                    {{ user_old[0].tag() }}
+                  {% endif %}
+                </td>
+              {% endif %}
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+      {{ form.users_old.errors }}
+      {% if users_old %}
+        <p></p>
+        <input type="submit" name="submit" value="{% trans %}Mark as old{% endtrans %}">
+      {% endif %}
     </form>
-    {% else %}
+  {% else %}
     <p>{% trans %}There are no members in this club.{% endtrans %}</p>
+  {% endif %}
+  <form action="{{ url('club:club_members', club_id=club.id) }}" id="add_users" method="post">
+    {% csrf_token %}
+    {{ form.non_field_errors() }}
+    <p>
+      {{ form.users.errors }}
+      <label for="{{ form.users.id_for_label }}">{{ form.users.label }} :</label>
+      {{ form.users }}
+      <span class="helptext">{{ form.users.help_text }}</span>
+    </p>
+    <p>
+      {{ form.role.errors }}
+      <label for="{{ form.role.id_for_label }}">{{ form.role.label }} :</label>
+      {{ form.role }}
+    </p>
+    {% if form.start_date %}
+      <p>
+        {{ form.start_date.errors }}
+        <label for="{{ form.start_date.id_for_label }}">{{ form.start_date.label }} :</label>
+        {{ form.start_date }}
+      </p>
     {% endif %}
-    <form action="{{ url('club:club_members', club_id=club.id) }}" id="add_users" method="post">
-        {% csrf_token %}
-        {{ form.non_field_errors() }}
-        <p>
-            {{ form.users.errors }}
-            <label for="{{ form.users.id_for_label }}">{{ form.users.label }} :</label>
-            {{ form.users }}
-            <span class="helptext">{{ form.users.help_text }}</span>
-        </p>
-        <p>
-            {{ form.role.errors }}
-            <label for="{{ form.role.id_for_label }}">{{ form.role.label }} :</label>
-            {{ form.role }}
-        </p>
-        {% if form.start_date %}
-        <p>
-            {{ form.start_date.errors }}
-            <label for="{{ form.start_date.id_for_label }}">{{ form.start_date.label }} :</label>
-            {{ form.start_date }}
-        </p>
-        {% endif %}
-        <p>
-            {{ form.description.errors }}
-            <label for="{{ form.description.id_for_label }}">{{ form.description.label }} :</label>
-            {{ form.description }}
-        </p>
-        <p><input type="submit" value="{% trans %}Add{% endtrans %}" /></p>
-    </form>
+    <p>
+      {{ form.description.errors }}
+      <label for="{{ form.description.id_for_label }}">{{ form.description.label }} :</label>
+      {{ form.description }}
+    </p>
+    <p><input type="submit" value="{% trans %}Add{% endtrans %}" /></p>
+  </form>
 {% endblock %}
diff --git a/club/templates/club/club_old_members.jinja b/club/templates/club/club_old_members.jinja
index 4d024df67..887da079d 100644
--- a/club/templates/club/club_old_members.jinja
+++ b/club/templates/club/club_old_members.jinja
@@ -2,27 +2,27 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block content %}
-    <h2>{% trans %}Club old members{% endtrans %}</h2>
-    <table>
-        <thead>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Role{% endtrans %}</td>
-            <td>{% trans %}Description{% endtrans %}</td>
-            <td>{% trans %}From{% endtrans %}</td>
-            <td>{% trans %}To{% endtrans %}</td>
-        </thead>
-        <tbody>
-        {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %}
-            <tr>
-                <td>{{ user_profile_link(m.user) }}</td>
-                <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-                <td>{{ m.description }}</td>
-                <td>{{ m.start_date }}</td>
-                <td>{{ m.end_date }}</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+  <h2>{% trans %}Club old members{% endtrans %}</h2>
+  <table>
+    <thead>
+      <td>{% trans %}User{% endtrans %}</td>
+      <td>{% trans %}Role{% endtrans %}</td>
+      <td>{% trans %}Description{% endtrans %}</td>
+      <td>{% trans %}From{% endtrans %}</td>
+      <td>{% trans %}To{% endtrans %}</td>
+    </thead>
+    <tbody>
+      {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %}
+        <tr>
+          <td>{{ user_profile_link(m.user) }}</td>
+          <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+          <td>{{ m.description }}</td>
+          <td>{{ m.start_date }}</td>
+          <td>{{ m.end_date }}</td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 {% endblock %}
 
 
diff --git a/club/templates/club/club_sellings.jinja b/club/templates/club/club_sellings.jinja
index 6fdee86a9..191d5fb2b 100644
--- a/club/templates/club/club_sellings.jinja
+++ b/club/templates/club/club_sellings.jinja
@@ -2,65 +2,65 @@
 {% from 'core/macros.jinja' import user_profile_link, paginate %}
 
 {% block content %}
-<h3>{% trans %}Sales{% endtrans %}</h3>
-<form id="form" action="?page=1" method="post">
+  <h3>{% trans %}Sales{% endtrans %}</h3>
+  <form id="form" action="?page=1" method="post">
     {% csrf_token %}
     {{ form }}
     <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
     <p><input type="submit" value="{% trans %}Download as cvs{% endtrans %}" formaction="{{ url('club:sellings_csv', club_id=object.id) }}"/></p>
-</form>
-<p>
-{% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}<br/>
-{% trans %}Total: {% endtrans %}{{ total }} €<br/>
-{% trans %}Benefit: {% endtrans %}{{ benefit }} €
-</p>
-<table>
+  </form>
+  <p>
+    {% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}<br/>
+    {% trans %}Total: {% endtrans %}{{ total }} €<br/>
+    {% trans %}Benefit: {% endtrans %}{{ benefit }} €
+  </p>
+  <table>
     <thead>
-        <tr>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Counter{% endtrans %}</td>
-            <td>{% trans %}Barman{% endtrans %}</td>
-            <td>{% trans %}Customer{% endtrans %}</td>
-            <td>{% trans %}Label{% endtrans %}</td>
-            <td>{% trans %}Quantity{% endtrans %}</td>
-            <td>{% trans %}Total{% endtrans %}</td>
-            <td>{% trans %}Payment method{% endtrans %}</td>
-        </tr>
+      <tr>
+        <td>{% trans %}Date{% endtrans %}</td>
+        <td>{% trans %}Counter{% endtrans %}</td>
+        <td>{% trans %}Barman{% endtrans %}</td>
+        <td>{% trans %}Customer{% endtrans %}</td>
+        <td>{% trans %}Label{% endtrans %}</td>
+        <td>{% trans %}Quantity{% endtrans %}</td>
+        <td>{% trans %}Total{% endtrans %}</td>
+        <td>{% trans %}Payment method{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-    {% for s in paginated_result %}
+      {% for s in paginated_result %}
         <tr>
-            <td>{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}</td>
-            <td>{{ s.counter }}</td>
-            {% if s.seller %}
+          <td>{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td>{{ s.counter }}</td>
+          {% if s.seller %}
             <td><a href="{{ s.seller.get_absolute_url() }}">{{ s.seller.get_display_name() }}</a></td>
-            {% else %}
+          {% else %}
             <td></td>
-            {% endif %}
-            {% if s.customer %}
+          {% endif %}
+          {% if s.customer %}
             <td><a href="{{ s.customer.user.get_absolute_url() }}">{{ s.customer.user.get_display_name() }}</a></td>
-            {% else %}
+          {% else %}
             <td></td>
-            {% endif %}
-            <td>{{ s.label }}</td>
-            <td>{{ s.quantity }}</td>
-            <td>{{ s.quantity * s.unit_price }} €</td>
-            <td>{{ s.get_payment_method_display() }}</td>
-            {% if s.is_owned_by(user) %}
-                <td><a href="{{ url('counter:selling_delete', selling_id=s.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-            {% endif %}
+          {% endif %}
+          <td>{{ s.label }}</td>
+          <td>{{ s.quantity }}</td>
+          <td>{{ s.quantity * s.unit_price }} €</td>
+          <td>{{ s.get_payment_method_display() }}</td>
+          {% if s.is_owned_by(user) %}
+            <td><a href="{{ url('counter:selling_delete', selling_id=s.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+          {% endif %}
         </tr>
-    {% endfor %}
+      {% endfor %}
     </tbody>
-</table>
-<script type="text/javascript">
+  </table>
+  <script type="text/javascript">
     function formPagination(link){
-        $("form").attr("action", link.href);
-        link.href = "javascript:void(0)"; // block link action
-        $("form").submit();
+      $("form").attr("action", link.href);
+      link.href = "javascript:void(0)"; // block link action
+      $("form").submit();
     }
-</script>
-{{ paginate(paginated_result, paginator, "formPagination(this)") }}
+  </script>
+  {{ paginate(paginated_result, paginator, "formPagination(this)") }}
 {% endblock %}
 
 
diff --git a/club/templates/club/club_tools.jinja b/club/templates/club/club_tools.jinja
index 49e2b0df7..fa9584fa2 100644
--- a/club/templates/club/club_tools.jinja
+++ b/club/templates/club/club_tools.jinja
@@ -1,46 +1,46 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<h3>{% trans %}Club tools{% endtrans %}</h3>
-<div>
+  <h3>{% trans %}Club tools{% endtrans %}</h3>
+  <div>
     <h4>{% trans %}Communication:{% endtrans %}</h4>
     <ul>
-        <li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
-        <li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
-        {% if object.trombi %}
+      <li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
+      <li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
+      {% if object.trombi %}
         <li> <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">{% trans %}Edit Trombi{% endtrans %}</a></li>
-        {% else %}
+      {% else %}
         <li> <a href="{{ url('trombi:create', club_id=object.id) }}">{% trans %}New Trombi{% endtrans %}</a></li>
         <li> <a href="{{ url('club:poster_list', club_id=object.id) }}">{% trans %}Posters{% endtrans %}</a></li>
-        {% endif %}
+      {% endif %}
     </ul>
     <h4>{% trans %}Counters:{% endtrans %}</h4>
     <ul>
-    {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %}
-    {% for l in Launderette.objects.all() %}
-        <li><a href="{{ url('launderette:main_click', launderette_id=l.id) }}">{{ l }}</a></li>
-    {% endfor %}
-    {% elif object.counters.filter(type="OFFICE")|count > 0 %}
+      {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %}
+        {% for l in Launderette.objects.all() %}
+          <li><a href="{{ url('launderette:main_click', launderette_id=l.id) }}">{{ l }}</a></li>
+        {% endfor %}
+      {% elif object.counters.filter(type="OFFICE")|count > 0 %}
         {% for c in object.counters.filter(type="OFFICE") %}
-        <li>{{ c }}:
+          <li>{{ c }}:
             <a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
             <a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
-        </li>
+          </li>
         {% endfor %}
-    {% endif %}
+      {% endif %}
     </ul>
     {% if object.club_account.exists() %}
-        <h4>{% trans %}Accounting: {% endtrans %}</h4>
-        <ul>
+      <h4>{% trans %}Accounting: {% endtrans %}</h4>
+      <ul>
         {% for ca in object.club_account.all() %}
-            <li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>
+          <li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>
         {% endfor %}
-        </ul>
+      </ul>
     {% endif %}
     {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %}
-    <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Manage launderettes{% endtrans %}</a></li>
+      <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Manage launderettes{% endtrans %}</a></li>
     {% endif %}
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/club/templates/club/mailing.jinja b/club/templates/club/mailing.jinja
index 8a3642954..a74216027 100644
--- a/club/templates/club/mailing.jinja
+++ b/club/templates/club/mailing.jinja
@@ -2,107 +2,107 @@
 {% from 'core/macros.jinja' import select_all_checkbox %}
 
 {% block title %}
-{% trans %}Mailing lists{% endtrans %}
+  {% trans %}Mailing lists{% endtrans %}
 {% endblock %}
 
 {% block content %}
 
-    <b>{% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %}</b>
+  <b>{% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %}</b>
 
-    {% if mailings_not_moderated %}
-        <p>{% trans %}Mailing lists waiting for moderation{% endtrans %}</p>
-        <ul>
-            {% for mailing in mailings_not_moderated %}
-                <li>{{ mailing.email_full }}<a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a></li>
-            {% endfor %}
-        </ul>
-    {% endif %}
+  {% if mailings_not_moderated %}
+    <p>{% trans %}Mailing lists waiting for moderation{% endtrans %}</p>
+    <ul>
+      {% for mailing in mailings_not_moderated %}
+        <li>{{ mailing.email_full }}<a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a></li>
+      {% endfor %}
+    </ul>
+  {% endif %}
 
-    {% if mailings_moderated %}
+  {% if mailings_moderated %}
     {% for mailing in mailings_moderated %}
-    <h2>{% trans %}Mailing{% endtrans %} {{ mailing.email_full }}
+      <h2>{% trans %}Mailing{% endtrans %} {{ mailing.email_full }}
         {%- if user.is_owner(mailing) -%}
-        <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a>
+          <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a>
         {%- endif -%}
-    </h2>
-    <form method="GET" action="{{ url('club:mailing_generate', mailing_id=mailing.id) }}" style="display:inline-block;">
+      </h2>
+      <form method="GET" action="{{ url('club:mailing_generate', mailing_id=mailing.id) }}" style="display:inline-block;">
         <input type="submit" name="generateMalingList" value="{% trans %}Generate mailing list{% endtrans %}">
-    </form>
-    {% set form_mailing_removal = form["removal_" + mailing.id|string] %}
-    {% if form_mailing_removal.field.choices %}
-    {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %}
-    <form action="{{ url('club:mailing', club_id=club.id) }}" id="{{ form_mailing_removal.auto_id }}" method="post" enctype="multipart/form-data">
-        <p style="margin-bottom: 1em;">{{ select_all_checkbox(form_mailing_removal.auto_id) }}</p>
-        {% csrf_token %}
-        <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.REMOVE_SUBSCRIPTION }}" />
-        <table>
+      </form>
+      {% set form_mailing_removal = form["removal_" + mailing.id|string] %}
+      {% if form_mailing_removal.field.choices %}
+        {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %}
+        <form action="{{ url('club:mailing', club_id=club.id) }}" id="{{ form_mailing_removal.auto_id }}" method="post" enctype="multipart/form-data">
+          <p style="margin-bottom: 1em;">{{ select_all_checkbox(form_mailing_removal.auto_id) }}</p>
+          {% csrf_token %}
+          <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.REMOVE_SUBSCRIPTION }}" />
+          <table>
             <thead>
-                <tr>
-                    <td>{% trans %}User{% endtrans %}</td>
-                    <td>{% trans %}Email{% endtrans %}</td>
-                    <td>{% trans %}Delete{% endtrans %}</td>
-                </tr>
+              <tr>
+                <td>{% trans %}User{% endtrans %}</td>
+                <td>{% trans %}Email{% endtrans %}</td>
+                <td>{% trans %}Delete{% endtrans %}</td>
+              </tr>
             </thead>
             <tbody>
-                {% for widget in form_mailing_removal.subwidgets %}
+              {% for widget in form_mailing_removal.subwidgets %}
                 {% set user = ms[widget.data.value.value][0] %}
                 <tr>
-                    <td>{{ user.get_username }}</td>
-                    <td>{{ user.get_email }}</td>
-                    <td>{{ widget.tag() }}</td>
+                  <td>{{ user.get_username }}</td>
+                  <td>{{ user.get_email }}</td>
+                  <td>{{ widget.tag() }}</td>
                 </tr>
-                {% endfor %}
+              {% endfor %}
             </tbody>
-        </table>
-        {{ form_mailing_removal.errors }}
-        <p><input type="submit" value="{% trans %}Remove from mailing list{% endtrans %}" /></p>
-    </form>
+          </table>
+          {{ form_mailing_removal.errors }}
+          <p><input type="submit" value="{% trans %}Remove from mailing list{% endtrans %}" /></p>
+        </form>
 
-    {% else %}
+      {% else %}
         <p><b>{% trans %}There is no subscriber for this mailing list{% endtrans %}</b></p>
-    {% endif %}
+      {% endif %}
     {% endfor %}
 
-    {% else %}
+  {% else %}
     <p>{% trans %}No mailing list existing for this club{% endtrans %}</p>
-    {% endif %}
-
-    <p>{{ form.non_field_errors() }}</p>
-    {% if mailings_moderated %}
-        <h2>{% trans %}New member{% endtrans %}</h2>
-        <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            <p>
-                {{ form.subscription_mailing.errors }}
-                <label for="{{ form.subscription_mailing.id_for_label }}">{{ form.subscription_mailing.label }}</label>
-                {{ form.subscription_mailing }}
-            </p>
-            <p>
-                {{ form.subscription_users.errors }}
-                <label for="{{ form.subscription_users.id_for_label }}">{{ form.subscription_users.label }}</label>
-                {{ form.subscription_users }}
-                <span class="helptext">{{ form.subscription_users.help_text }}</span>
-            </p>
-            <p>
-                {{ form.subscription_email.errors }}
-                <label for="{{ form.subscription_email.id_for_label }}">{{ form.subscription_email.label }}</label>
-                {{ form.subscription_email }}
-            </p>
-            <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_SUBSCRIPTION }}" />
-            <p><input type="submit" value="{% trans %}Add to mailing list{% endtrans %}" /></p>
-        </form>
-    {% endif %}
+  {% endif %}
 
-    <h2>{% trans %}New mailing{% endtrans %}</h2>
+  <p>{{ form.non_field_errors() }}</p>
+  {% if mailings_moderated %}
+    <h2>{% trans %}New member{% endtrans %}</h2>
     <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-        <p>
-            {{ form.mailing_email.errors }}
-            <label for="{{ form.mailing_email.id_for_label }}">{{ form.mailing_email.label }}</label>
-            {{ form.mailing_email }}
-        </p>
-        <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_MALING }}" />
-        <p><input type="submit" value="{% trans %}Create mailing list{% endtrans %}" /></p>
+      {% csrf_token %}
+      <p>
+        {{ form.subscription_mailing.errors }}
+        <label for="{{ form.subscription_mailing.id_for_label }}">{{ form.subscription_mailing.label }}</label>
+        {{ form.subscription_mailing }}
+      </p>
+      <p>
+        {{ form.subscription_users.errors }}
+        <label for="{{ form.subscription_users.id_for_label }}">{{ form.subscription_users.label }}</label>
+        {{ form.subscription_users }}
+        <span class="helptext">{{ form.subscription_users.help_text }}</span>
+      </p>
+      <p>
+        {{ form.subscription_email.errors }}
+        <label for="{{ form.subscription_email.id_for_label }}">{{ form.subscription_email.label }}</label>
+        {{ form.subscription_email }}
+      </p>
+      <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_SUBSCRIPTION }}" />
+      <p><input type="submit" value="{% trans %}Add to mailing list{% endtrans %}" /></p>
     </form>
+  {% endif %}
+
+  <h2>{% trans %}New mailing{% endtrans %}</h2>
+  <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
+    {% csrf_token %}
+    <p>
+      {{ form.mailing_email.errors }}
+      <label for="{{ form.mailing_email.id_for_label }}">{{ form.mailing_email.label }}</label>
+      {{ form.mailing_email }}
+    </p>
+    <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_MALING }}" />
+    <p><input type="submit" value="{% trans %}Create mailing list{% endtrans %}" /></p>
+  </form>
 
 {% endblock %}
diff --git a/club/templates/club/page_history.jinja b/club/templates/club/page_history.jinja
index 766ef8a19..07c251460 100644
--- a/club/templates/club/page_history.jinja
+++ b/club/templates/club/page_history.jinja
@@ -2,11 +2,11 @@
 {% from 'core/macros_pages.jinja' import page_history %}
 
 {% block content %}
-	{% if club.page %}
-	{{ page_history(club.page) }}
-	{% else %}
-	    {% trans %}No page existing for this club{% endtrans %}
-	{% endif %}
+  {% if club.page %}
+    {{ page_history(club.page) }}
+  {% else %}
+    {% trans %}No page existing for this club{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/club/templates/club/pagerev_edit.jinja b/club/templates/club/pagerev_edit.jinja
index 91a26b4e7..5253805d6 100644
--- a/club/templates/club/pagerev_edit.jinja
+++ b/club/templates/club/pagerev_edit.jinja
@@ -2,7 +2,7 @@
 {% from 'core/macros_pages.jinja' import page_edit_form %}
 
 {% block content %}
-{{ page_edit_form(page, form, url('club:club_edit_page', club_id=page.club.id), csrf_token) }}
+  {{ page_edit_form(page, form, url('club:club_edit_page', club_id=page.club.id), csrf_token) }}
 {% endblock %}
 
 
diff --git a/club/templates/club/stats.jinja b/club/templates/club/stats.jinja
index cf6c33583..43488be02 100644
--- a/club/templates/club/stats.jinja
+++ b/club/templates/club/stats.jinja
@@ -1,48 +1,48 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Club stats{% endtrans %}
+  {% trans %}Club stats{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    {% if club_list %}
+  {% if club_list %}
     <h3>{% trans %}Club stats{% endtrans %}</h3>
     <form action="" method="GET">
-        {% csrf_token %}
-        <p>
+      {% csrf_token %}
+      <p>
         <select name="branch">
-            {% for b in settings.SITH_PROFILE_DEPARTMENTS %}
-                <option value="{{ b[0] }}">{{ b[0] }}</option>
-            {% endfor %}
+          {% for b in settings.SITH_PROFILE_DEPARTMENTS %}
+            <option value="{{ b[0] }}">{{ b[0] }}</option>
+          {% endfor %}
         </select>
-        </p>
-        <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
+      </p>
+      <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
     </form>
     <table>
-        <thead>
-            <tr>
-                <td>Club</td>
-                <td>Member number</td>
-                <td>Old member number</td>
-            </tr>
-        </thead>
-        <tbody>
+      <thead>
+        <tr>
+          <td>Club</td>
+          <td>Member number</td>
+          <td>Old member number</td>
+        </tr>
+      </thead>
+      <tbody>
         {% for c in club_list.order_by('id') %}
-            {% set members = c.members.all() %}
-            {% if request.GET['branch'] %}
+          {% set members = c.members.all() %}
+          {% if request.GET['branch'] %}
             {% set members = members.filter(user__department=request.GET['branch']) %}
-            {% endif %}
-            <tr>
-                <td>{{ c.get_display_name() }}</td>
-                <td>{{ members.filter(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
-                <td>{{ members.exclude(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
-            </tr>
+          {% endif %}
+          <tr>
+            <td>{{ c.get_display_name() }}</td>
+            <td>{{ members.filter(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
+            <td>{{ members.exclude(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
+          </tr>
         {% endfor %}
-        </tbody>
+      </tbody>
     </table>
-    {% else %}
+  {% else %}
     {% trans %}There is no club in this website.{% endtrans %}
-    {% endif %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/com/templates/com/mailing_admin.jinja b/com/templates/com/mailing_admin.jinja
index 75d098bc9..3096e435e 100644
--- a/com/templates/com/mailing_admin.jinja
+++ b/com/templates/com/mailing_admin.jinja
@@ -1,43 +1,43 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Mailing lists administration{% endtrans %}
+  {% trans %}Mailing lists administration{% endtrans %}
 {% endblock %}
 
 {% macro display_mailings(list) %}
-    <table>
-        <tr>
-            <th>{% trans %}Email{% endtrans %}</th>
-            <th>{% trans %}Club{%endtrans%}</th>
-            <th>{% trans %}Actions{% endtrans %}</th>
-        </tr>
-        {% for mailing in list %}
-        <tr>
-            <td>{{ mailing.email_full }}</td>
-            <td><a href="{{ url('club:mailing', club_id=mailing.club.id) }}">{{ mailing.club }}</a></td>
-            <td>
-                <a href="{{ url('com:mailing_delete', mailing_id=mailing.id) }}">{% trans %}Delete{% endtrans %}</a> - {% if not mailing.is_moderated %}<a href="{{ url('com:mailing_moderate', mailing_id=mailing.id) }}">{% trans %}Moderate{% endtrans %}</a>{% else %}{% trans user=mailing.moderator %}Moderated by {{ user }}{% endtrans %}{% endif %}
-            </td>
-        </tr>
-        {% endfor %}
-    </table>
-    
+  <table>
+    <tr>
+      <th>{% trans %}Email{% endtrans %}</th>
+      <th>{% trans %}Club{%endtrans%}</th>
+      <th>{% trans %}Actions{% endtrans %}</th>
+    </tr>
+    {% for mailing in list %}
+      <tr>
+        <td>{{ mailing.email_full }}</td>
+        <td><a href="{{ url('club:mailing', club_id=mailing.club.id) }}">{{ mailing.club }}</a></td>
+        <td>
+          <a href="{{ url('com:mailing_delete', mailing_id=mailing.id) }}">{% trans %}Delete{% endtrans %}</a> - {% if not mailing.is_moderated %}<a href="{{ url('com:mailing_moderate', mailing_id=mailing.id) }}">{% trans %}Moderate{% endtrans %}</a>{% else %}{% trans user=mailing.moderator %}Moderated by {{ user }}{% endtrans %}{% endif %}
+        </td>
+      </tr>
+    {% endfor %}
+  </table>
+
 {% endmacro %}
 
 {% block content %}
-    <h1>{% trans %}This page lists all mailing lists{% endtrans %}</h1>
+  <h1>{% trans %}This page lists all mailing lists{% endtrans %}</h1>
 
-    {% if has_unmoderated %}
+  {% if has_unmoderated %}
     <h2>{% trans %}Not moderated mailing lists{% endtrans %}</h2>
     {{ display_mailings(unmoderated) }}
-    {% endif %}
+  {% endif %}
 
-    <h2>{% trans %}Moderated mailing lists{% endtrans %}</h2>
-    {% if has_moderated %}
-        {{ display_mailings(moderated) }}
-    {% else %}
+  <h2>{% trans %}Moderated mailing lists{% endtrans %}</h2>
+  {% if has_moderated %}
+    {{ display_mailings(moderated) }}
+  {% else %}
     <p>{% trans %}No mailing list existing{% endtrans %}</p>
-    {% endif %}
+  {% endif %}
 
 {% endblock %}
 
diff --git a/com/templates/com/news_admin_list.jinja b/com/templates/com/news_admin_list.jinja
index 5f7e3b1f2..3214ffd5c 100644
--- a/com/templates/com/news_admin_list.jinja
+++ b/com/templates/com/news_admin_list.jinja
@@ -2,317 +2,317 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{% trans %}News admin{% endtrans %}
+  {% trans %}News admin{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <h3>{% trans %}News{% endtrans %}</h3>
+  <h3>{% trans %}News{% endtrans %}</h3>
 
-    <p><a href="{{ url('com:news_new') }}">{% trans %}Create news{% endtrans %}</a></p>
+  <p><a href="{{ url('com:news_new') }}">{% trans %}Create news{% endtrans %}</a></p>
 
-    <hr />
-    <h4>{% trans %}Notices{% endtrans %}</h4>
-    {% set notices = object_list.filter(type="NOTICE").distinct().order_by('id') %}
-    <h5>{% trans %}Displayed notices{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Moderator{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in notices.filter(is_moderated=True) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>{{ user_profile_link(news.moderator) }}</td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-    <h5>{% trans %}Notices to moderate{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in notices.filter(is_moderated=False) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+  <hr />
+  <h4>{% trans %}Notices{% endtrans %}</h4>
+  {% set notices = object_list.filter(type="NOTICE").distinct().order_by('id') %}
+  <h5>{% trans %}Displayed notices{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Moderator{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in notices.filter(is_moderated=True) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>{{ user_profile_link(news.moderator) }}</td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  <h5>{% trans %}Notices to moderate{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in notices.filter(is_moderated=False) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    <hr />
-    <h4>{% trans %}Weeklies{% endtrans %}</h4>
-    {% set weeklies = object_list.filter(type="WEEKLY", dates__end_date__gte=timezone.now()).distinct().order_by('id') %}
-    <h5>{% trans %}Displayed weeklies{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Moderator{% endtrans %}</td>
-                <td>{% trans %}Dates{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in weeklies.filter(is_moderated=True) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>{{ user_profile_link(news.moderator) }}</td>
-                <td>
-                    <ul>
-                    {% for d in news.dates.all() %}
-                        <li>{{ d.start_date|localtime|date(DATETIME_FORMAT) }}
-                            {{ d.start_date|localtime|time(DATETIME_FORMAT) }} -
-                            {{ d.end_date|localtime|date(DATETIME_FORMAT) }}
-                            {{ d.end_date|localtime|time(DATETIME_FORMAT) }}
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-    <h5>{% trans %}Weeklies to moderate{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Dates{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in weeklies.filter(is_moderated=False) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>
-                    <ul>
-                    {% for d in news.dates.all() %}
-                        <li>{{ d.start_date|localtime|date(DATETIME_FORMAT) }}
-                            {{ d.start_date|localtime|time(DATETIME_FORMAT) }} -
-                            {{ d.end_date|localtime|date(DATETIME_FORMAT) }}
-                            {{ d.end_date|localtime|time(DATETIME_FORMAT) }}
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+  <hr />
+  <h4>{% trans %}Weeklies{% endtrans %}</h4>
+  {% set weeklies = object_list.filter(type="WEEKLY", dates__end_date__gte=timezone.now()).distinct().order_by('id') %}
+  <h5>{% trans %}Displayed weeklies{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Moderator{% endtrans %}</td>
+        <td>{% trans %}Dates{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in weeklies.filter(is_moderated=True) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>{{ user_profile_link(news.moderator) }}</td>
+          <td>
+            <ul>
+              {% for d in news.dates.all() %}
+                <li>{{ d.start_date|localtime|date(DATETIME_FORMAT) }}
+                  {{ d.start_date|localtime|time(DATETIME_FORMAT) }} -
+                  {{ d.end_date|localtime|date(DATETIME_FORMAT) }}
+                  {{ d.end_date|localtime|time(DATETIME_FORMAT) }}
+                </li>
+              {% endfor %}
+            </ul>
+          </td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  <h5>{% trans %}Weeklies to moderate{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Dates{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in weeklies.filter(is_moderated=False) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>
+            <ul>
+              {% for d in news.dates.all() %}
+                <li>{{ d.start_date|localtime|date(DATETIME_FORMAT) }}
+                  {{ d.start_date|localtime|time(DATETIME_FORMAT) }} -
+                  {{ d.end_date|localtime|date(DATETIME_FORMAT) }}
+                  {{ d.end_date|localtime|time(DATETIME_FORMAT) }}
+                </li>
+              {% endfor %}
+            </ul>
+          </td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    <hr />
-    <h4>{% trans %}Calls{% endtrans %}</h4>
-    {% set calls = object_list.filter(type="CALL", dates__end_date__gte=timezone.now()).distinct().order_by('id') %}
-    <h5>{% trans %}Displayed calls{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Moderator{% endtrans %}</td>
-                <td>{% trans %}Start{% endtrans %}</td>
-                <td>{% trans %}End{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in calls.filter(is_moderated=True) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>{{ user_profile_link(news.moderator) }}</td>
-                <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-    <h5>{% trans %}Calls to moderate{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Start{% endtrans %}</td>
-                <td>{% trans %}End{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in calls.filter(is_moderated=False) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+  <hr />
+  <h4>{% trans %}Calls{% endtrans %}</h4>
+  {% set calls = object_list.filter(type="CALL", dates__end_date__gte=timezone.now()).distinct().order_by('id') %}
+  <h5>{% trans %}Displayed calls{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Moderator{% endtrans %}</td>
+        <td>{% trans %}Start{% endtrans %}</td>
+        <td>{% trans %}End{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in calls.filter(is_moderated=True) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>{{ user_profile_link(news.moderator) }}</td>
+          <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  <h5>{% trans %}Calls to moderate{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Start{% endtrans %}</td>
+        <td>{% trans %}End{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in calls.filter(is_moderated=False) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    <hr />
-    <h4>{% trans %}Events{% endtrans %}</h4>
-    {% set events = object_list.filter(type="EVENT", dates__end_date__gte=timezone.now()).distinct().order_by('id') %}
-    <h5>{% trans %}Displayed events{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Moderator{% endtrans %}</td>
-                <td>{% trans %}Start{% endtrans %}</td>
-                <td>{% trans %}End{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in events.filter(is_moderated=True) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>{{ user_profile_link(news.moderator) }}</td>
-                <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-    <h5>{% trans %}Events to moderate{% endtrans %}</h5>
-    <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Type{% endtrans %}</td>
-                <td>{% trans %}Title{% endtrans %}</td>
-                <td>{% trans %}Summary{% endtrans %}</td>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Author{% endtrans %}</td>
-                <td>{% trans %}Start{% endtrans %}</td>
-                <td>{% trans %}End{% endtrans %}</td>
-                <td>{% trans %}Actions{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for news in events.filter(is_moderated=False) %}
-            <tr>
-                <td>{{ news.get_type_display() }}</td>
-                <td>{{ news.title }}</td>
-                <td>{{ news.summary|markdown }}</td>
-                <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
-                <td>{{ user_profile_link(news.author) }}</td>
-                <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                    {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
-                <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
-                    <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
-                    <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+  <hr />
+  <h4>{% trans %}Events{% endtrans %}</h4>
+  {% set events = object_list.filter(type="EVENT", dates__end_date__gte=timezone.now()).distinct().order_by('id') %}
+  <h5>{% trans %}Displayed events{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Moderator{% endtrans %}</td>
+        <td>{% trans %}Start{% endtrans %}</td>
+        <td>{% trans %}End{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in events.filter(is_moderated=True) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>{{ user_profile_link(news.moderator) }}</td>
+          <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}?remove">{% trans %}Remove{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  <h5>{% trans %}Events to moderate{% endtrans %}</h5>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Type{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Summary{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Start{% endtrans %}</td>
+        <td>{% trans %}End{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for news in events.filter(is_moderated=False) %}
+        <tr>
+          <td>{{ news.get_type_display() }}</td>
+          <td>{{ news.title }}</td>
+          <td>{{ news.summary|markdown }}</td>
+          <td><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></td>
+          <td>{{ user_profile_link(news.author) }}</td>
+          <td>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+            {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td><a href="{{ url('com:news_detail', news_id=news.id) }}">{% trans %}View{% endtrans %}</a>
+            <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a>
+            <a href="{{ url('com:news_delete', news_id=news.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 {% endblock %}
 
 
diff --git a/com/templates/com/news_detail.jinja b/com/templates/com/news_detail.jinja
index 18fc633f0..cbfa596c1 100644
--- a/com/templates/com/news_detail.jinja
+++ b/com/templates/com/news_detail.jinja
@@ -2,48 +2,48 @@
 {% from 'core/macros.jinja' import user_profile_link, facebook_share, tweet, link_news_logo, gen_news_metatags %}
 
 {% block title %}
-{% trans %}News{% endtrans %} -
-{{ object.title }}
+  {% trans %}News{% endtrans %} -
+  {{ object.title }}
 {% endblock %}
 
 {% block head %}
-{{ super() }}
-{{ gen_news_metatags(news) }}
+  {{ super() }}
+  {{ gen_news_metatags(news) }}
 {% endblock %}
 
 {% block content %}
-<p><a href="{{ url('com:news_list') }}">{% trans %}Back to news{% endtrans %}</a></p>
-    <section id="news_details">
-        <div class="club_logo">
-            <img src="{{ link_news_logo(news)}}" alt="{{ news.club }}" />
-            <a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a>
-        </div>
-        <h4>{{ news.title }}</h4>
-        <p class="date">
-            <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-            <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-        </p>
-        <div class="news_content">
-        <div><em>{{ news.summary|markdown }}</em></div>
-        <br/>
-        <div>{{ news.content|markdown }}</div>
-        {{ facebook_share(news) }}
-        {{ tweet(news) }}
-        <div class="news_meta">
+  <p><a href="{{ url('com:news_list') }}">{% trans %}Back to news{% endtrans %}</a></p>
+  <section id="news_details">
+    <div class="club_logo">
+      <img src="{{ link_news_logo(news)}}" alt="{{ news.club }}" />
+      <a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a>
+    </div>
+    <h4>{{ news.title }}</h4>
+    <p class="date">
+      <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+      <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+    </p>
+    <div class="news_content">
+      <div><em>{{ news.summary|markdown }}</em></div>
+      <br/>
+      <div>{{ news.content|markdown }}</div>
+      {{ facebook_share(news) }}
+      {{ tweet(news) }}
+      <div class="news_meta">
         <p>{% trans %}Author: {% endtrans %}{{ user_profile_link(news.author) }}</p>
         {% if news.moderator %}
-        <p>{% trans %}Moderator: {% endtrans %}{{ user_profile_link(news.moderator) }}</p>
+          <p>{% trans %}Moderator: {% endtrans %}{{ user_profile_link(news.moderator) }}</p>
         {% elif user.is_com_admin %}
-        <p> <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
+          <p> <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
         {% endif %}
         {% if user.can_edit(news) %}
-        <p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be moderated again){% endtrans %}</a></p>
+          <p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be moderated again){% endtrans %}</a></p>
         {% endif %}
-        </div>
-        </div>
-    </section>
+      </div>
+    </div>
+  </section>
 {% endblock %}
 
 
diff --git a/com/templates/com/news_edit.jinja b/com/templates/com/news_edit.jinja
index dd86f5447..858ec9a80 100644
--- a/com/templates/com/news_edit.jinja
+++ b/com/templates/com/news_edit.jinja
@@ -2,46 +2,46 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{% if object %}
-{% trans %}Edit news{% endtrans %}
-{% else %}
-{% trans %}Create news{% endtrans %}
-{% endif %}
+  {% if object %}
+    {% trans %}Edit news{% endtrans %}
+  {% else %}
+    {% trans %}Create news{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 {% block content %}
-{% if 'preview' in request.POST.keys() %}
-<section class="news_event">
-    <h4>{{ form.instance.title }}</h4>
-    <p class="date">
+  {% if 'preview' in request.POST.keys() %}
+    <section class="news_event">
+      <h4>{{ form.instance.title }}</h4>
+      <p class="date">
         <span>{{ form.instance.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-            {{ form.instance.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+          {{ form.instance.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
         <span>{{ form.instance.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-            {{ form.instance.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-    </p>
-    <p><a href="#">{{ form.instance.club or "Club" }}</a></p>
-    <div>{{ form.instance.summary|markdown }}</div>
-    <div>{{ form.instance.content|markdown }}</div>
-    <p>{% trans %}Author: {% endtrans %} {{ user_profile_link(form.instance.author) }}</p>
-</section>
-{% endif %}
-{% if object %}
-<h2>{% trans %}Edit news{% endtrans %}</h2>
-{% else %}
-<h2>{% trans %}Create news{% endtrans %}</h2>
-{% endif %}
-<form action="" method="post">
+          {{ form.instance.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+      </p>
+      <p><a href="#">{{ form.instance.club or "Club" }}</a></p>
+      <div>{{ form.instance.summary|markdown }}</div>
+      <div>{{ form.instance.content|markdown }}</div>
+      <p>{% trans %}Author: {% endtrans %} {{ user_profile_link(form.instance.author) }}</p>
+    </section>
+  {% endif %}
+  {% if object %}
+    <h2>{% trans %}Edit news{% endtrans %}</h2>
+  {% else %}
+    <h2>{% trans %}Create news{% endtrans %}</h2>
+  {% endif %}
+  <form action="" method="post">
     {% csrf_token %}
     {{ form.non_field_errors() }}
     {{ form.author }}
     <p>{{ form.type.errors }}<label for="{{ form.type.name }}">{{ form.type.label }}</label>
-    <ul>
+      <ul>
         <li>{% trans %}Notice: Information, election result - no date{% endtrans %}</li>
         <li>{% trans %}Event: punctual event, associated with one date{% endtrans %}</li>
         <li>{% trans %}Weekly: recurrent event, associated with many dates (specify the first one, and a deadline){% endtrans %}</li>
         <li>{% trans %}Call: long time event, associated with a long date (election appliance, ...){% endtrans %}</li>
-    </ul>
-    {{ form.type }}</p>
+      </ul>
+      {{ form.type }}</p>
     <p class="date">{{ form.start_date.errors }}<label for="{{ form.start_date.name }}">{{ form.start_date.label }}</label> {{ form.start_date }}</p>
     <p class="date">{{ form.end_date.errors }}<label for="{{ form.end_date.name }}">{{ form.end_date.label }}</label> {{ form.end_date }}</p>
     <p class="until">{{ form.until.errors }}<label for="{{ form.until.name }}">{{ form.until.label }}</label> {{ form.until }}</p>
@@ -50,38 +50,38 @@
     <p>{{ form.summary.errors }}<label for="{{ form.summary.name }}">{{ form.summary.label }}</label> {{ form.summary }}</p>
     <p>{{ form.content.errors }}<label for="{{ form.content.name }}">{{ form.content.label }}</label> {{ form.content }}</p>
     {% if user.is_com_admin %}
-    <p>{{ form.automoderation.errors }}<label for="{{ form.automoderation.name }}">{{ form.automoderation.label }}</label>
+      <p>{{ form.automoderation.errors }}<label for="{{ form.automoderation.name }}">{{ form.automoderation.label }}</label>
         {{ form.automoderation }}</p>
     {% endif %}
     <p><input type="submit" name="preview" value="{% trans %}Preview{% endtrans %}" /></p>
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 {% block script %}
-    {{ super() }}
-<script>
-$( function() {
-        var type = $('input[name=type]');
-        var dates = $('.date');
-        var until = $('.until');
-        function update_targets () {
-            type_checked = $('input[name=type]:checked');
-            if (type_checked.val() == "EVENT" || type_checked.val() == "CALL") {
-                dates.show();
-                until.hide();
-            } else if (type_checked.val() == "WEEKLY") {
-                dates.show();
-                until.show();
-            } else {
-                dates.hide();
-                until.hide();
-            }
+  {{ super() }}
+  <script>
+    $( function() {
+      var type = $('input[name=type]');
+      var dates = $('.date');
+      var until = $('.until');
+      function update_targets () {
+        type_checked = $('input[name=type]:checked');
+        if (type_checked.val() == "EVENT" || type_checked.val() == "CALL") {
+          dates.show();
+          until.hide();
+        } else if (type_checked.val() == "WEEKLY") {
+          dates.show();
+          until.show();
+        } else {
+          dates.hide();
+          until.hide();
         }
-        update_targets();
-        type.change(update_targets);
-        } );
-</script>
+      }
+      update_targets();
+      type.change(update_targets);
+    } );
+  </script>
 {% endblock %}
 
 
diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja
index ba811403d..bcb0eb6e5 100644
--- a/com/templates/com/news_list.jinja
+++ b/com/templates/com/news_list.jinja
@@ -2,162 +2,162 @@
 {% from 'core/macros.jinja' import tweet_quick, fb_quick %}
 
 {% block title %}
-{% trans %}News{% endtrans %}
+  {% trans %}News{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if user.is_com_admin %}
-<div id="news_admin">
-  <a class="button" href="{{ url('com:news_admin_list') }}">{% trans %}Administrate news{% endtrans %}</a>
-</div>
-<br>
-{% endif  %}
+  {% if user.is_com_admin %}
+    <div id="news_admin">
+      <a class="button" href="{{ url('com:news_admin_list') }}">{% trans %}Administrate news{% endtrans %}</a>
+    </div>
+    <br>
+  {% endif  %}
 
-<div id="news">
+  <div id="news">
     <div id="left_column" class="news_column">
-        {% for news in object_list.filter(type="NOTICE") %}
-            <section class="news_notice">
-                <h4><a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
-                <div class="news_content">{{ news.summary|markdown }}</div>
-            </section>
-        {% endfor %}
+      {% for news in object_list.filter(type="NOTICE") %}
+        <section class="news_notice">
+          <h4><a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+          <div class="news_content">{{ news.summary|markdown }}</div>
+        </section>
+      {% endfor %}
+
+      {% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %}
+        <section class="news_call">
+          <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+          <div class="news_date">
+            <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+              {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+            <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+              {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+          </div>
+          <div class="news_content">{{ news.summary|markdown }}</div>
+        </section>
+      {% endfor %}
 
-        {% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %}
-            <section class="news_call">
+      {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5), news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %}
+      <h3>{% trans %}Events today and the next few days{% endtrans %}</h3>
+      {% if events_dates %}
+        {% for d in events_dates %}
+          <div class="news_events_group">
+            <div class="news_events_group_date">
+              <div>
+                <div>{{ d|localtime|date('D') }}</div>
+                <div class="day">{{ d|localtime|date('d') }}</div>
+                <div>{{ d|localtime|date('b') }}</div>
+              </div>
+            </div>
+            <div class="news_events_group_items">
+              {% for news in object_list.filter(dates__start_date__gte=d,
+              dates__start_date__lte=d+timedelta(days=1),
+              type="EVENT").exclude(dates__end_date__lt=timezone.now())
+              .order_by('dates__start_date') %}
+              <section class="news_event">
+                <div class="club_logo">
+                  {% if news.club.logo %}
+                    <img src="{{ news.club.logo.url }}" alt="{{ news.club }}" />
+                  {% else %}
+                    <img src="{{ static("com/img/news.png") }}" alt="{{ news.club }}" />
+                  {% endif %}
+                </div>
                 <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                <div><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></div>
                 <div class="news_date">
-                    <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                    <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                  <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                  <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
                 </div>
-                <div class="news_content">{{ news.summary|markdown }}</div>
-            </section>
-        {% endfor %}
-
-        {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5), news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %}
-        <h3>{% trans %}Events today and the next few days{% endtrans %}</h3>
-        {% if events_dates %}
-            {% for d in events_dates %}
-                <div class="news_events_group">
-                    <div class="news_events_group_date">
-                        <div>
-                            <div>{{ d|localtime|date('D') }}</div>
-                            <div class="day">{{ d|localtime|date('d') }}</div>
-                            <div>{{ d|localtime|date('b') }}</div>
-                        </div>
-                    </div>
-                    <div class="news_events_group_items">
-                        {% for news in object_list.filter(dates__start_date__gte=d,
-                        dates__start_date__lte=d+timedelta(days=1),
-                        type="EVENT").exclude(dates__end_date__lt=timezone.now())
-                        .order_by('dates__start_date') %}
-                        <section class="news_event">
-                            <div class="club_logo">
-                                {% if news.club.logo %}
-                                    <img src="{{ news.club.logo.url }}" alt="{{ news.club }}" />
-                                {% else %}
-                                    <img src="{{ static("com/img/news.png") }}" alt="{{ news.club }}" />
-                                {% endif %}
-                            </div>
-                            <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
-                            <div><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></div>
-                            <div class="news_date">
-                                <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                                <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                            </div>
-                            <div class="news_content">{{ news.summary|markdown }}
-                                <div class="button_bar">
-                                    {{ fb_quick(news) }}
-                                    {{ tweet_quick(news) }}
-                                </div>
-                            </div>
-                        </section>
-                    {% endfor %}
-                    </div>
+                <div class="news_content">{{ news.summary|markdown }}
+                  <div class="button_bar">
+                    {{ fb_quick(news) }}
+                    {{ tweet_quick(news) }}
+                  </div>
                 </div>
-            {% endfor %}
-        {% else %}
-            <div class="news_empty">
-                <em>{% trans %}Nothing to come...{% endtrans %}</em>
-            </div>
-        {% endif %}
+              </section>
+        {% endfor %}
+        </div>
+        </div>
+      {% endfor %}
+{% else %}
+  <div class="news_empty">
+    <em>{% trans %}Nothing to come...{% endtrans %}</em>
+  </div>
+{% endif %}
 
-        {% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5),
-        type="EVENT").order_by('dates__start_date') %}
-        {% if coming_soon %}
-            <h3>{% trans %}Coming soon... don't miss!{% endtrans %}</h3>
-            {% for news in coming_soon %}
-                <section class="news_coming_soon">
-                    <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a>
-                    <span class="news_date">{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} -
-                        {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                </section>
-            {% endfor %}
-        {% endif %}
+{% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5),
+type="EVENT").order_by('dates__start_date') %}
+{% if coming_soon %}
+  <h3>{% trans %}Coming soon... don't miss!{% endtrans %}</h3>
+  {% for news in coming_soon %}
+    <section class="news_coming_soon">
+      <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a>
+      <span class="news_date">{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} -
+        {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+    </section>
+  {% endfor %}
+{% endif %}
 
-        <h3>{% trans %}All coming events{% endtrans %}</h3>
-        <iframe 
-            src="https://embed.styledcalendar.com/#2mF2is8CEXhr4ADcX6qN" 
-            title="Styled Calendar"
-            class="styled-calendar-container" 
-            style="width: 100%; border: none; height: 1060px" 
-            data-cy="calendar-embed-iframe">
-        </iframe>
-    </div>
+<h3>{% trans %}All coming events{% endtrans %}</h3>
+<iframe
+  src="https://embed.styledcalendar.com/#2mF2is8CEXhr4ADcX6qN"
+  title="Styled Calendar"
+  class="styled-calendar-container"
+  style="width: 100%; border: none; height: 1060px"
+  data-cy="calendar-embed-iframe">
+</iframe>
+</div>
 
-    <div id="right_column" class="news_column">
-        <div id="agenda">
-            <div id="agenda_title">{% trans %}Agenda{% endtrans %}</div>
-            <div id="agenda_content">
-                {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(),
-                news__is_moderated=True, news__type__in=["WEEKLY",
-                "EVENT"]).order_by('start_date', 'end_date') %}
-                <div class="agenda_item">
-                    <div class="agenda_date">
-                        <strong>{{ d.start_date|localtime|date('D d M Y') }}</strong>
-                    </div>
-                    <div class="agenda_time">
-                        <span>{{ d.start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                        <span>{{ d.end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                    </div>
-                    <div>
-                        <strong><a href="{{ url('com:news_detail', news_id=d.news.id) }}">{{ d.news.title }}</a></strong>
-                        <a href="{{ d.news.club.get_absolute_url() }}">{{ d.news.club }}</a>
-                    </div>
-                    <div class="agenda_item_content">{{ d.news.summary|markdown }}</div>
-                </div>
-            {% endfor %}
-            </div>
+<div id="right_column" class="news_column">
+  <div id="agenda">
+    <div id="agenda_title">{% trans %}Agenda{% endtrans %}</div>
+    <div id="agenda_content">
+      {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(),
+      news__is_moderated=True, news__type__in=["WEEKLY",
+      "EVENT"]).order_by('start_date', 'end_date') %}
+      <div class="agenda_item">
+        <div class="agenda_date">
+          <strong>{{ d.start_date|localtime|date('D d M Y') }}</strong>
+        </div>
+        <div class="agenda_time">
+          <span>{{ d.start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+          <span>{{ d.end_date|localtime|time(DATETIME_FORMAT) }}</span>
         </div>
+        <div>
+          <strong><a href="{{ url('com:news_detail', news_id=d.news.id) }}">{{ d.news.title }}</a></strong>
+          <a href="{{ d.news.club.get_absolute_url() }}">{{ d.news.club }}</a>
+        </div>
+        <div class="agenda_item_content">{{ d.news.summary|markdown }}</div>
+      </div>
+      {% endfor %}
+    </div>
+  </div>
 
-        <div id="birthdays">
-            <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
-            <div id="birthdays_content">
-                {% if user.is_subscribed %}
+  <div id="birthdays">
+    <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
+    <div id="birthdays_content">
+      {% if user.is_subscribed %}
                     {# Cache request for 1 hour #}
-                    {% cache 3600 "birthdays" %}
-                    <ul class="birthdays_year">
-                        {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
-                            <li>
-                                {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
-                                <ul>
-                                    {% for u in birthdays.filter(date_of_birth__year=d.year) %}
-                                        <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
-                                    {% endfor %}
-                                </ul>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                    {% endcache %}
-                {% else %}
-                    <p>{% trans %}You need an up to date subscription to access this content{% endtrans %}</p>
-                {% endif %}
-            </div>
-        </div>
+        {% cache 3600 "birthdays" %}
+          <ul class="birthdays_year">
+            {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
+              <li>
+                {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
+                <ul>
+                  {% for u in birthdays.filter(date_of_birth__year=d.year) %}
+                    <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
+                  {% endfor %}
+                </ul>
+              </li>
+            {% endfor %}
+          </ul>
+        {% endcache %}
+      {% else %}
+        <p>{% trans %}You need an up to date subscription to access this content{% endtrans %}</p>
+      {% endif %}
     </div>
+  </div>
+</div>
 
 </div>
 {% endblock %}
diff --git a/com/templates/com/poster_edit.jinja b/com/templates/com/poster_edit.jinja
index 5e7f15cb8..3c5bf39d5 100644
--- a/com/templates/com/poster_edit.jinja
+++ b/com/templates/com/poster_edit.jinja
@@ -1,42 +1,42 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Poster{% endtrans %}
+  {% trans %}Poster{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div id="poster_edit">
+  <div id="poster_edit">
 
     <div id="title">
-        <div id="links" class="left">
-            {% if app == "com" %}
-                <a id="list" class="link" href="{{ url(app + ":poster_list") }}">{% trans %}List{% endtrans %}</a>
-            {% elif app == "club" %}
-                <a id="list" class="link" href="{{ url(app + ":poster_list", club.id) }}">{% trans %}List{% endtrans %}</a>
-            {% endif %}
-        </div>
-        <h3>{% trans %}Posters - edit{% endtrans %}</h3>
-        <div id="links" class="right">
-            {% if app == "com" %}
-                <a class="link delete" href="{{ url(app + ":poster_delete", poster.id) }}">{% trans %}Delete{% endtrans %}</a>
-            {% elif app == "club" %}
-                <a class="link delete" href="{{ url(app + ":poster_delete", club.id, poster.id) }}">{% trans %}Delete{% endtrans %}</a>
-            {% endif %}
-        </div>
+      <div id="links" class="left">
+        {% if app == "com" %}
+          <a id="list" class="link" href="{{ url(app + ":poster_list") }}">{% trans %}List{% endtrans %}</a>
+        {% elif app == "club" %}
+          <a id="list" class="link" href="{{ url(app + ":poster_list", club.id) }}">{% trans %}List{% endtrans %}</a>
+        {% endif %}
+      </div>
+      <h3>{% trans %}Posters - edit{% endtrans %}</h3>
+      <div id="links" class="right">
+        {% if app == "com" %}
+          <a class="link delete" href="{{ url(app + ":poster_delete", poster.id) }}">{% trans %}Delete{% endtrans %}</a>
+        {% elif app == "club" %}
+          <a class="link delete" href="{{ url(app + ":poster_delete", club.id, poster.id) }}">{% trans %}Delete{% endtrans %}</a>
+        {% endif %}
+      </div>
     </div>
 
     <div id="poster">
 
-        <form action="" method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            {{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-        </form>
+      <form action="" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p() }}
+        <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+      </form>
 
 
     </div>
 
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/com/templates/com/poster_list.jinja b/com/templates/com/poster_list.jinja
index f752013e2..9ff3add42 100644
--- a/com/templates/com/poster_list.jinja
+++ b/com/templates/com/poster_list.jinja
@@ -1,66 +1,66 @@
 {% extends "core/base.jinja" %}
 
 {% block script %}
-{{ super() }}
-<script src="{{ static('com/js/poster_list.js') }}"></script>
+  {{ super() }}
+  <script src="{{ static('com/js/poster_list.js') }}"></script>
 {% endblock %}
 
 
 {% block title %}
-{% trans %}Poster{% endtrans %}
+  {% trans %}Poster{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div id="poster_list">
+  <div id="poster_list">
 
     <div id="title">
-        <h3>{% trans %}Posters{% endtrans %}</h3>
-        <div id="links" class="right">
-            {% if app == "com" %}
-                <a id="create" class="link" href="{{ url(app + ":poster_create") }}">{% trans %}Create{% endtrans %}</a>
-                <a id="moderation" class="link" href="{{ url("com:poster_moderate_list") }}">{% trans %}Moderation{% endtrans %}</a>
-            {% elif app == "club" %}
-                <a id="create" class="link" href="{{ url(app + ":poster_create", club.id) }}">{% trans %}Create{% endtrans %}</a>
-            {% endif %}
-        </div>
+      <h3>{% trans %}Posters{% endtrans %}</h3>
+      <div id="links" class="right">
+        {% if app == "com" %}
+          <a id="create" class="link" href="{{ url(app + ":poster_create") }}">{% trans %}Create{% endtrans %}</a>
+          <a id="moderation" class="link" href="{{ url("com:poster_moderate_list") }}">{% trans %}Moderation{% endtrans %}</a>
+        {% elif app == "club" %}
+          <a id="create" class="link" href="{{ url(app + ":poster_create", club.id) }}">{% trans %}Create{% endtrans %}</a>
+        {% endif %}
+      </div>
     </div>
 
     <div id="posters">
 
-        {% if poster_list.count() == 0 %}
-            <div id="no-posters">{% trans %}No posters{% endtrans %}</div>
-        {% else %}
+      {% if poster_list.count() == 0 %}
+        <div id="no-posters">{% trans %}No posters{% endtrans %}</div>
+      {% else %}
 
-            {% for poster in poster_list %}
-                <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
-                    <div class="name">{{ poster.name }}</div>
-                    <div class="image"><img src="{{ poster.file.url }}"></img></div>
-                    <div class="dates">
-                        <div class="begin">{{ poster.date_begin | localtime | date("d/M/Y H:m") }}</div>
-                        <div class="end">{{ poster.date_end | localtime | date("d/M/Y H:m") }}</div>
-                    </div>
-                    {% if app == "com" %}
-                        <a class="edit" href="{{ url(app + ":poster_edit", poster.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    {% elif app == "club" %}
-                        <a class="edit" href="{{ url(app + ":poster_edit", club.id, poster.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    {% endif %}
-                    <div class="tooltip">
-                        <ul>
-                        {% for screen in poster.screens.all() %}
-                            <li>{{ screen }}</li>
-                        {% endfor %}
-                        </ul>
-                    </div>
-                </div>
-            {% endfor %}
+        {% for poster in poster_list %}
+          <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
+            <div class="name">{{ poster.name }}</div>
+            <div class="image"><img src="{{ poster.file.url }}"></img></div>
+            <div class="dates">
+              <div class="begin">{{ poster.date_begin | localtime | date("d/M/Y H:m") }}</div>
+              <div class="end">{{ poster.date_end | localtime | date("d/M/Y H:m") }}</div>
+            </div>
+            {% if app == "com" %}
+              <a class="edit" href="{{ url(app + ":poster_edit", poster.id) }}">{% trans %}Edit{% endtrans %}</a>
+            {% elif app == "club" %}
+              <a class="edit" href="{{ url(app + ":poster_edit", club.id, poster.id) }}">{% trans %}Edit{% endtrans %}</a>
+            {% endif %}
+            <div class="tooltip">
+              <ul>
+                {% for screen in poster.screens.all() %}
+                  <li>{{ screen }}</li>
+                {% endfor %}
+              </ul>
+            </div>
+          </div>
+        {% endfor %}
 
-        {% endif %}
+      {% endif %}
 
     </div>
 
     <div id="view"><div id="placeholder"></div></div>
 
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/com/templates/com/poster_moderate.jinja b/com/templates/com/poster_moderate.jinja
index d9b340824..36e3dae7a 100644
--- a/com/templates/com/poster_moderate.jinja
+++ b/com/templates/com/poster_moderate.jinja
@@ -1,39 +1,39 @@
 {% extends "core/base.jinja" %}
 
 {% block script %}
-{{ super() }}
-<script src="{{ static('com/js/poster_list.js') }}"></script>
+  {{ super() }}
+  <script src="{{ static('com/js/poster_list.js') }}"></script>
 {% endblock %}
 
 {% block content %}
-<div id="poster_list">
+  <div id="poster_list">
 
     <div id="title">
-        <div id="links" class="left">
-            <a id="list" class="link" href="{{ url("com:poster_list") }}">{% trans %}List{% endtrans %}</a>
-        </div>
-        <h3>{% trans %}Posters - moderation{% endtrans %}</h3>
+      <div id="links" class="left">
+        <a id="list" class="link" href="{{ url("com:poster_list") }}">{% trans %}List{% endtrans %}</a>
+      </div>
+      <h3>{% trans %}Posters - moderation{% endtrans %}</h3>
     </div>
 
     <div id="posters">
 
-        {% if object_list.count == 0 %}
-            <div id="no-posters">{% trans %}No objects{% endtrans %}</div>
-        {% else %}
+      {% if object_list.count == 0 %}
+        <div id="no-posters">{% trans %}No objects{% endtrans %}</div>
+      {% else %}
 
-            {% for poster in object_list %}
-                <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
-                    <div class="name"> {{ poster.name }} </div>
-                    <div class="image"> <img src="{{ poster.file.url }}"></img> </div>
-                    <a class="moderate" href="{{ url("com:poster_moderate", object_id=poster.id) }}">Moderate</a>
-                </div>
-            {% endfor %}
+        {% for poster in object_list %}
+          <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
+            <div class="name"> {{ poster.name }} </div>
+            <div class="image"> <img src="{{ poster.file.url }}"></img> </div>
+            <a class="moderate" href="{{ url("com:poster_moderate", object_id=poster.id) }}">Moderate</a>
+          </div>
+        {% endfor %}
 
-        {% endif %}
+      {% endif %}
 
     </div>
 
     <div id="view"><div id="placeholder"></div></div>
 
-</div>
+  </div>
 {% endblock %}
diff --git a/com/templates/com/screen_edit.jinja b/com/templates/com/screen_edit.jinja
index 70aa2b6c4..73e13876d 100644
--- a/com/templates/com/screen_edit.jinja
+++ b/com/templates/com/screen_edit.jinja
@@ -1,33 +1,33 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Screen{% endtrans %}
+  {% trans %}Screen{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div id="screen_edit">
+  <div id="screen_edit">
 
     <div id="title">
-        <div id="links" class="left">
-            <a id="list" class="link" href="{{ url("com:screen_list") }}">{% trans %}List{% endtrans %}</a>
-        </div>
-        <h3>{% trans %}Screen - edit{% endtrans %}</h3>
-        <div id="links" class="right">
-            <a class="link delete" href="{{ url("com:screen_delete", screen.id) }}">{% trans %}Delete{% endtrans %}</a>
-        </div>
+      <div id="links" class="left">
+        <a id="list" class="link" href="{{ url("com:screen_list") }}">{% trans %}List{% endtrans %}</a>
+      </div>
+      <h3>{% trans %}Screen - edit{% endtrans %}</h3>
+      <div id="links" class="right">
+        <a class="link delete" href="{{ url("com:screen_delete", screen.id) }}">{% trans %}Delete{% endtrans %}</a>
+      </div>
     </div>
 
     <div id="screen">
 
-        <form action="" method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            {{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-        </form>
+      <form action="" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p() }}
+        <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+      </form>
 
     </div>
 
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/com/templates/com/screen_list.jinja b/com/templates/com/screen_list.jinja
index 27ff7354c..237873d9c 100644
--- a/com/templates/com/screen_list.jinja
+++ b/com/templates/com/screen_list.jinja
@@ -1,38 +1,38 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Screens{% endtrans %}
+  {% trans %}Screens{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div id="screen_list">
+  <div id="screen_list">
 
     <div id="title">
-        <h3>{% trans %}Screens{% endtrans %}</h3>
-        <div id="links" class="right">
-            <a id="create" class="link" href="{{ url("com:screen_create") }}">{% trans %}Create{% endtrans %}</a>
-        </div>
+      <h3>{% trans %}Screens{% endtrans %}</h3>
+      <div id="links" class="right">
+        <a id="create" class="link" href="{{ url("com:screen_create") }}">{% trans %}Create{% endtrans %}</a>
+      </div>
     </div>
 
     <div id="screens">
 
-        {% if screen_list.count() == 0 %}
-            <div id="no-screens">{% trans %}No screens{% endtrans %}</div>
-        {% else %}
+      {% if screen_list.count() == 0 %}
+        <div id="no-screens">{% trans %}No screens{% endtrans %}</div>
+      {% else %}
 
-            {% for screen in screen_list %}
-                <div class="screen">
-                    <div class="name">{{ screen.name }}</div>
-                    <a class="edit" href="{{ url("com:screen_edit", screen.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <a class="slideshow" href="{{ url("com:screen_slideshow", screen.id) }}" target="_blank">{% trans %}Slideshow{% endtrans %}</a>
-                </div>
-            {% endfor %}
+        {% for screen in screen_list %}
+          <div class="screen">
+            <div class="name">{{ screen.name }}</div>
+            <a class="edit" href="{{ url("com:screen_edit", screen.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a class="slideshow" href="{{ url("com:screen_slideshow", screen.id) }}" target="_blank">{% trans %}Slideshow{% endtrans %}</a>
+          </div>
+        {% endfor %}
 
-        {% endif %}
+      {% endif %}
 
     </div>
 
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/com/templates/com/screen_slideshow.jinja b/com/templates/com/screen_slideshow.jinja
index da429b6b4..9e386fcfe 100644
--- a/com/templates/com/screen_slideshow.jinja
+++ b/com/templates/com/screen_slideshow.jinja
@@ -1,30 +1,30 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
+  <head>
     <title>{% trans %}Slideshow{% endtrans %}</title>
     <link href="{{ scss('com/slideshow.scss') }}" rel="stylesheet" type="text/css" />
-</head>
-<body>
+  </head>
+  <body>
     <div id="slideshow">
 
-        <div id="slides">
+      <div id="slides">
         {% for poster in posters %}
-        <div class="slide {% if loop.first %}center{% else %}right{% endif %}" display_time="{{ poster.display_time }}">
-                <img src="{{ poster.file.url }}"></img>
-            </div>
+          <div class="slide {% if loop.first %}center{% else %}right{% endif %}" display_time="{{ poster.display_time }}">
+            <img src="{{ poster.file.url }}"></img>
+          </div>
         {% endfor %}
-        </div>
+      </div>
 
-        <div id="progress_bullets">
+      <div id="progress_bullets">
         {% for poster in posters %}
-            <div class="bullet {% if loop.first %}active{% endif %}"></div>
+          <div class="bullet {% if loop.first %}active{% endif %}"></div>
         {% endfor %}
-        </div>
+      </div>
 
-        <div id="progress_bar"></div>
+      <div id="progress_bar"></div>
 
     </div>
     <script src="{{ static('core/js/jquery-3.6.2.min.js') }}"></script>
     <script src="{{ static('com/js/slideshow.js') }}"></script>
-</body>
+  </body>
 </html>
diff --git a/com/templates/com/weekmail.jinja b/com/templates/com/weekmail.jinja
index f524fc3b1..f8b37cbf3 100644
--- a/com/templates/com/weekmail.jinja
+++ b/com/templates/com/weekmail.jinja
@@ -2,77 +2,77 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{% trans %}Weekmail{% endtrans %}
+  {% trans %}Weekmail{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}Weekmail{% endtrans %} {{ object.id }}</h3>
-<p><a href="{{ url('com:weekmail_preview') }}">{% trans %}Preview{% endtrans %}</a></p>
-<p><a href="{{ url('com:weekmail_preview') }}?send=true">{% trans %}Send{% endtrans %}</a></p>
-<p><a href="{{ url('com:weekmail_article') }}">{% trans %}New article{% endtrans %}</a></p>
-<h4>{% trans %}Articles in no weekmail yet{% endtrans %}</h4>
-<table>
+  <h3>{% trans %}Weekmail{% endtrans %} {{ object.id }}</h3>
+  <p><a href="{{ url('com:weekmail_preview') }}">{% trans %}Preview{% endtrans %}</a></p>
+  <p><a href="{{ url('com:weekmail_preview') }}?send=true">{% trans %}Send{% endtrans %}</a></p>
+  <p><a href="{{ url('com:weekmail_article') }}">{% trans %}New article{% endtrans %}</a></p>
+  <h4>{% trans %}Articles in no weekmail yet{% endtrans %}</h4>
+  <table>
     <thead>
-        <tr>
-            <td>{% trans %}Author{% endtrans %}</td>
-            <td>{% trans %}Club{% endtrans %}</td>
-            <td>{% trans %}Title{% endtrans %}</td>
-            <td>{% trans %}Content{% endtrans %}</td>
-            <td>{% trans %}Actions{% endtrans %}</td>
-        </tr>
+      <tr>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Content{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-    {% for a in orphans.all() %}
+      {% for a in orphans.all() %}
         <tr>
-            <td>{{ user_profile_link(a.author) }}</td>
-            <td><a href="{{ a.club.get_absolute_url() }}">{{ a.club }}</a></td>
-            <td>{{ a.title }}</td>
-            <td>{{ a.content|markdown }}</td>
-            <td>
-                <a href="{{ url('com:weekmail_article_edit', article_id=a.id) }}">{% trans %}Edit{% endtrans %}</a> |
-                <a href="{{ url('com:weekmail_article_delete', article_id=a.id) }}">{% trans %}Delete{% endtrans %}</a> |
-                <a href="?add_article={{ a.id }}">{% trans %}Add to weekmail{% endtrans %}</a> |
-                <a href="?up_article={{ a.id }}">{% trans %}Up{% endtrans %}</a> |
-                <a href="?down_article={{ a.id }}">{% trans %}Down{% endtrans %}</a>
-            </td>
+          <td>{{ user_profile_link(a.author) }}</td>
+          <td><a href="{{ a.club.get_absolute_url() }}">{{ a.club }}</a></td>
+          <td>{{ a.title }}</td>
+          <td>{{ a.content|markdown }}</td>
+          <td>
+            <a href="{{ url('com:weekmail_article_edit', article_id=a.id) }}">{% trans %}Edit{% endtrans %}</a> |
+            <a href="{{ url('com:weekmail_article_delete', article_id=a.id) }}">{% trans %}Delete{% endtrans %}</a> |
+            <a href="?add_article={{ a.id }}">{% trans %}Add to weekmail{% endtrans %}</a> |
+            <a href="?up_article={{ a.id }}">{% trans %}Up{% endtrans %}</a> |
+            <a href="?down_article={{ a.id }}">{% trans %}Down{% endtrans %}</a>
+          </td>
         </tr>
-    {% endfor %}
+      {% endfor %}
     </tbody>
-</table>
-<h4>{% trans %}Articles included the next weekmail{% endtrans %}</h4>
-<table>
+  </table>
+  <h4>{% trans %}Articles included the next weekmail{% endtrans %}</h4>
+  <table>
     <thead>
-        <tr>
-            <td>{% trans %}Author{% endtrans %}</td>
-            <td>{% trans %}Club{% endtrans %}</td>
-            <td>{% trans %}Title{% endtrans %}</td>
-            <td>{% trans %}Content{% endtrans %}</td>
-            <td>{% trans %}Actions{% endtrans %}</td>
-        </tr>
+      <tr>
+        <td>{% trans %}Author{% endtrans %}</td>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Title{% endtrans %}</td>
+        <td>{% trans %}Content{% endtrans %}</td>
+        <td>{% trans %}Actions{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-    {% for a in object.articles.order_by('rank') %}
+      {% for a in object.articles.order_by('rank') %}
         <tr>
-            <td>{{ user_profile_link(a.author) }}</td>
-            <td><a href="{{ a.club.get_absolute_url() }}">{{ a.club }}</a></td>
-            <td>{{ a.title }}</td>
-            <td>{{ a.content|markdown }}</td>
-            <td>
-                <a href="{{ url('com:weekmail_article_edit', article_id=a.id) }}">{% trans %}Edit{% endtrans %}</a> |
-                <a href="{{ url('com:weekmail_article_delete', article_id=a.id) }}">{% trans %}Delete{% endtrans %}</a> |
-                <a href="?del_article={{ a.id }}">{% trans %}Delete from weekmail{% endtrans %}</a> |
-                <a href="?up_article={{ a.id }}">{% trans %}Up{% endtrans %}</a> |
-                <a href="?down_article={{ a.id }}">{% trans %}Down{% endtrans %}</a>
-            </td>
+          <td>{{ user_profile_link(a.author) }}</td>
+          <td><a href="{{ a.club.get_absolute_url() }}">{{ a.club }}</a></td>
+          <td>{{ a.title }}</td>
+          <td>{{ a.content|markdown }}</td>
+          <td>
+            <a href="{{ url('com:weekmail_article_edit', article_id=a.id) }}">{% trans %}Edit{% endtrans %}</a> |
+            <a href="{{ url('com:weekmail_article_delete', article_id=a.id) }}">{% trans %}Delete{% endtrans %}</a> |
+            <a href="?del_article={{ a.id }}">{% trans %}Delete from weekmail{% endtrans %}</a> |
+            <a href="?up_article={{ a.id }}">{% trans %}Up{% endtrans %}</a> |
+            <a href="?down_article={{ a.id }}">{% trans %}Down{% endtrans %}</a>
+          </td>
         </tr>
-    {% endfor %}
+      {% endfor %}
     </tbody>
-</table>
-<form action="" method="post" enctype="multipart/form-data">
+  </table>
+  <form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/com/templates/com/weekmail_preview.jinja b/com/templates/com/weekmail_preview.jinja
index 44c4da0a4..067eb95d9 100644
--- a/com/templates/com/weekmail_preview.jinja
+++ b/com/templates/com/weekmail_preview.jinja
@@ -2,41 +2,41 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{{ weekmail.title }}
+  {{ weekmail.title }}
 {% endblock %}
 
 {% block content %}
-<a href="{{ url('com:weekmail') }}">{% trans %}Back{% endtrans %}</a>
-{% if bad_recipients %}
+  <a href="{{ url('com:weekmail') }}">{% trans %}Back{% endtrans %}</a>
+  {% if bad_recipients %}
     <p>
-    <span class="important">
+      <span class="important">
         {% trans %}The following recipients were refused by the SMTP:{% endtrans %}
-    </span>
-    <ul>
-    {% for r in bad_recipients.keys() %}
-        <li>{{ r }}</li>
-    {% endfor %}
-    </ul>
+      </span>
+      <ul>
+        {% for r in bad_recipients.keys() %}
+          <li>{{ r }}</li>
+        {% endfor %}
+      </ul>
     </p>
 
     <form method="post" action="">
-        {% csrf_token %}
-        <button type="submit" name="send" value="clean">{% trans %}Clean subscribers{% endtrans %}</button>
+      {% csrf_token %}
+      <button type="submit" name="send" value="clean">{% trans %}Clean subscribers{% endtrans %}</button>
     </form>
-{% else %}
+  {% else %}
     {% if request.GET['send'] %}
-        <p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
-        {% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
-            <p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
-        {% endif %}
-        <form method="post" action="">
-            {% csrf_token %}
-            <button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
-        </form>
+      <p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
+      {% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
+        <p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
+      {% endif %}
+      <form method="post" action="">
+        {% csrf_token %}
+        <button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
+      </form>
     {% endif %}
-{% endif %}
-<hr>
-{{ weekmail_rendered|safe }}
+  {% endif %}
+  <hr>
+  {{ weekmail_rendered|safe }}
 {% endblock %}
 
 
diff --git a/com/templates/com/weekmail_renderer_html.jinja b/com/templates/com/weekmail_renderer_html.jinja
index c3e865be8..50bef937f 100644
--- a/com/templates/com/weekmail_renderer_html.jinja
+++ b/com/templates/com/weekmail_renderer_html.jinja
@@ -1,52 +1,52 @@
 <style type="text/css" media="all">
-h1, h2, h3, h4, h5, h6, p {
+  h1, h2, h3, h4, h5, h6, p {
     padding: 5px ;
     margin: 5px;
-}
-img {
+  }
+  img {
     margin: 5px ;
     width: 95%;
-}
+  }
 </style>
 <div style="background: #CBD1DD; padding: 0px 5%;">
-    <div style="background: #F9FAFB;">
-        <h2 style="background: #000; color: #f9fafb">{{ weekmail.title }}</h2>
-        <img src="{{ weekmail.get_banner() }}"
-        id="OWATemporaryImageDivContainerBannerForOutlook"
-        >
-        {% if weekmail.intro %}
-        <h3 style="background: #000; color: #f9fafb">{% trans %}Intro{% endtrans %}</h3>
-        {{ weekmail.intro|markdown }}
-        {% endif %}
+  <div style="background: #F9FAFB;">
+    <h2 style="background: #000; color: #f9fafb">{{ weekmail.title }}</h2>
+    <img src="{{ weekmail.get_banner() }}"
+         id="OWATemporaryImageDivContainerBannerForOutlook"
+    >
+    {% if weekmail.intro %}
+      <h3 style="background: #000; color: #f9fafb">{% trans %}Intro{% endtrans %}</h3>
+      {{ weekmail.intro|markdown }}
+    {% endif %}
 
-        <h3 style="background: #000; color: #f9fafb">{% trans %}Table of content{% endtrans %}</h3>
-        <ul>
-            {% for a in weekmail.articles.all() %}
-            <li>[{{ a.club }}] {{ a.title }}</li>
-            {%- endfor %}
-        </ul>
+    <h3 style="background: #000; color: #f9fafb">{% trans %}Table of content{% endtrans %}</h3>
+    <ul>
+      {% for a in weekmail.articles.all() %}
+        <li>[{{ a.club }}] {{ a.title }}</li>
+      {%- endfor %}
+    </ul>
 
-        {%- for a in weekmail.articles.all() %}
-        <h3 style="background: #000; color: #f9fafb">[{{ a.club }}] {{ a.title }}</h3>
-        {{ a.content|markdown }}
-        {%- endfor -%}
+    {%- for a in weekmail.articles.all() %}
+      <h3 style="background: #000; color: #f9fafb">[{{ a.club }}] {{ a.title }}</h3>
+      {{ a.content|markdown }}
+    {%- endfor -%}
 
-        {%- if weekmail.joke %}
-        <h3 style="background: #000; color: #f9fafb">{% trans %}Joke{% endtrans %}</h3>
-        {{ weekmail.joke|markdown }}
-        {% endif -%}
+    {%- if weekmail.joke %}
+      <h3 style="background: #000; color: #f9fafb">{% trans %}Joke{% endtrans %}</h3>
+      {{ weekmail.joke|markdown }}
+    {% endif -%}
 
-        {%- if weekmail.protip %}
-        <h3 style="background: #000; color: #f9fafb">{% trans %}Pro tip{% endtrans %}</h3>
-        {{ weekmail.protip|markdown }}
-        {% endif -%}
+    {%- if weekmail.protip %}
+      <h3 style="background: #000; color: #f9fafb">{% trans %}Pro tip{% endtrans %}</h3>
+      {{ weekmail.protip|markdown }}
+    {% endif -%}
 
-        {%- if weekmail.conclusion %}
-        <h3 style="background: #000; color: #f9fafb">{% trans %}Final word{% endtrans %}</h3>
-        {{ weekmail.conclusion|markdown }}
-        {% endif -%}
-        <img src="{{ weekmail.get_footer() }}"
-    </div>
+    {%- if weekmail.conclusion %}
+      <h3 style="background: #000; color: #f9fafb">{% trans %}Final word{% endtrans %}</h3>
+      {{ weekmail.conclusion|markdown }}
+    {% endif -%}
+    <img src="{{ weekmail.get_footer() }}"
+         </div>
 
-</div>
+  </div>
 
diff --git a/com/templates/com/weekmail_renderer_text.jinja b/com/templates/com/weekmail_renderer_text.jinja
index 82c6b8136..b07ef8e75 100644
--- a/com/templates/com/weekmail_renderer_text.jinja
+++ b/com/templates/com/weekmail_renderer_text.jinja
@@ -1,8 +1,8 @@
 # {{ weekmail.title }}
 
 {%- if weekmail.intro %}
-## {% trans %}Intro{% endtrans %}
-{{ weekmail.intro }}
+  ## {% trans %}Intro{% endtrans %}
+  {{ weekmail.intro }}
 {% endif %}
 
 ## {% trans %}Table of content{% endtrans %}
@@ -11,22 +11,22 @@
 {% endfor -%}
 
 {% for a in weekmail.articles.all() %}
-## [{{ a.club }}] {{ a.title }}
-{{ a.content }}
+  ## [{{ a.club }}] {{ a.title }}
+  {{ a.content }}
 {% endfor -%}
 
 {%- if weekmail.joke %}
-## {% trans %}Joke{% endtrans %}
-{{ weekmail.joke }}
+  ## {% trans %}Joke{% endtrans %}
+  {{ weekmail.joke }}
 {% endif -%}
 
 {%- if weekmail.protip %}
-## {% trans %}Pro tip{% endtrans %}
-{{ weekmail.protip }}
+  ## {% trans %}Pro tip{% endtrans %}
+  {{ weekmail.protip }}
 {% endif -%}
 
 {%- if weekmail.conclusion %}
-## {% trans %}Final word{% endtrans %}
-{{ weekmail.conclusion }}
+  ## {% trans %}Final word{% endtrans %}
+  {{ weekmail.conclusion }}
 {% endif -%}
 
diff --git a/com/tests.py b/com/tests.py
index bc00ea487..1ca29a08b 100644
--- a/com/tests.py
+++ b/com/tests.py
@@ -69,11 +69,11 @@ def test_alert_msg(self):
             },
         )
         r = self.client.get(reverse("core:index"))
-        self.assertContains(
-            r,
-            """<div id="alert_box">
-                            <div class="markdown"><h3>ALERTE!</h3>
-<p><strong>Caaaataaaapuuuulte!!!!</strong></p>""",
+        assert r.status_code == 200
+        self.assertInHTML(
+            """<div id="alert_box"><div class="markdown"><h3>ALERTE!</h3>
+            <p><strong>Caaaataaaapuuuulte!!!!</strong></p>""",
+            r.content.decode(),
         )
 
     def test_info_msg(self):
@@ -86,10 +86,12 @@ def test_info_msg(self):
             },
         )
         r = self.client.get(reverse("core:index"))
-        self.assertContains(
-            r,
-            """<div id="info_box">
-                            <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>""",
+
+        assert r.status_code == 200
+        self.assertInHTML(
+            """<div id="info_box"><div class="markdown">
+            <h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>""",
+            r.content.decode(),
         )
 
     def test_birthday_non_subscribed_user(self):
diff --git a/core/static/com/slideshow.scss b/core/static/com/slideshow.scss
index 82d63a4dc..9ea4fa529 100644
--- a/core/static/com/slideshow.scss
+++ b/core/static/com/slideshow.scss
@@ -1,149 +1,149 @@
 body{
-    position: absolute;
-    width: 100vw;
-    height: 100vh;
+  position: absolute;
+  width: 100vw;
+  height: 100vh;
 
-    padding: 0;
-    margin: 0;
+  padding: 0;
+  margin: 0;
 }
 
 #slideshow{
-    position: relative;
-    background-color: lightgrey;
+  position: relative;
+  background-color: lightgrey;
 
-    height: 100%;
+  height: 100%;
 
-    *{
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    }
+  *{
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+  }
 
-    &:hover{
+  &:hover{
 
-        &::before{
+    &::before{
 
-            position: absolute;
-            width: 100%;
-            height: 100%;
+      position: absolute;
+      width: 100%;
+      height: 100%;
 
-            display: flex;
-            justify-content: center;
-            align-items: center;
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
-            z-index: 10;
+      z-index: 10;
 
-            content: "Click to expand";
+      content: "Click to expand";
 
-            color: white;
-            background-color: rgba(black, 0.5);
+      color: white;
+      background-color: rgba(black, 0.5);
 
-        }
+    }
+
+  }
 
+  &.fullscreen{
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    background: none;
+
+    &:before{
+      display:none;
+    }
+
+    #slides{
+      height: 100vh;
     }
 
-    &.fullscreen{
-        position: fixed;
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-        background: none;
+  }
+
+  #slides{
+    position: relative;
+    height: 100%;
+    overflow: hidden;
+
+    .slide{
+      position: absolute;
+      width: 100%;
+      height: 100%;
 
-        &:before{
-            display:none;
-        }
+      display: inline-flex;
+      justify-content: center;
 
-        #slides{
-            height: 100vh;
-        }
+      top: 0px;
 
+      background-color: grey;
+      transition: left 1s ease-out;
+
+      img{
+        max-width: 100%;
+        max-height: 100%;
+        object-fit: contain;
+      }
     }
 
-    #slides{
-        position: relative;
-        height: 100%;
-        overflow: hidden;
-
-        .slide{
-            position: absolute;
-            width: 100%;
-            height: 100%;
-
-            display: inline-flex;
-            justify-content: center;
-
-            top: 0px;
-
-            background-color: grey;
-            transition: left 1s ease-out;
-
-            img{
-                max-width: 100%;
-                max-height: 100%;
-                object-fit: contain;
-            }
-        }
-
-        .slide.left{
-            left: -100%;
-        }
-
-        .slide.center{
-            left: 0px;
-        }
-
-        .slide.right{
-            left: 100%;
-            transition: none;
-        }
+    .slide.left{
+      left: -100%;
     }
 
+    .slide.center{
+      left: 0px;
+    }
 
-    #progress_bullets{
-        position: absolute;
-        bottom: 10px;
-        width: 100%;
-        height: 10px;
+    .slide.right{
+      left: 100%;
+      transition: none;
+    }
+  }
 
-        display: flex;
-        justify-content: center;
 
-        margin-bottom: 10px;
+  #progress_bullets{
+    position: absolute;
+    bottom: 10px;
+    width: 100%;
+    height: 10px;
 
-        .bullet{
-            height: 10px;
-            width: 10px;
+    display: flex;
+    justify-content: center;
 
-            margin-left: 5px;
-            margin-right: 5px;
+    margin-bottom: 10px;
 
-            border-radius: 50%;
+    .bullet{
+      height: 10px;
+      width: 10px;
 
-            background-color: grey;
+      margin-left: 5px;
+      margin-right: 5px;
+
+      border-radius: 50%;
+
+      background-color: grey;
+
+      &.active{
+        background-color: #c99836;
+      }
+    }
+  }
+
+  #progress_bar{
+    position: absolute;
+    bottom: 0px;
+    height: 10px;
+    background-color: #304c83;
 
-            &.active{
-                background-color: #c99836;
-            }
-        }
+    &.init{
+      width: 0px;
+      transition: none;
     }
 
-    #progress_bar{
-        position: absolute;
-        bottom: 0px;
-        height: 10px;
-        background-color: #304c83;
-
-        &.init{
-            width: 0px;
-            transition: none;
-        }
-
-        &.progress{
-            width: 100%;
-            transition: width 10s linear;
-        }
+    &.progress{
+      width: 100%;
+      transition: width 10s linear;
     }
+  }
 }
 
diff --git a/core/static/core/markdown.scss b/core/static/core/markdown.scss
index 55e3bed69..86778e465 100644
--- a/core/static/core/markdown.scss
+++ b/core/static/core/markdown.scss
@@ -21,9 +21,9 @@
     overflow: auto;
     max-width: 100%;
     font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console",
-      "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono",
-      "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier,
-      monospace;
+                 "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono",
+                 "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier,
+                 monospace;
     font-size: 14px;
     tab-size: 4;
     border-radius: 4px;
diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss
index a3b4209cd..5b5e06536 100644
--- a/core/static/core/navbar.scss
+++ b/core/static/core/navbar.scss
@@ -43,7 +43,7 @@ nav.navbar {
       justify-content: center;
       display: flex !important;
     }
-    
+
     > .menu,
     > .link {
       box-sizing: border-box;
@@ -146,5 +146,5 @@ nav.navbar {
         }
       }
     }
-  }  
+  }
 }
\ No newline at end of file
diff --git a/core/static/core/style.scss b/core/static/core/style.scss
index a25969866..f169c88bf 100644
--- a/core/static/core/style.scss
+++ b/core/static/core/style.scss
@@ -170,7 +170,7 @@ a:not(.button) {
 
 .shadow {
   box-shadow: rgba(60, 64, 67, 0.3) 0 1px 3px 0,
-    rgba(60, 64, 67, 0.15) 0 4px 8px 3px;
+              rgba(60, 64, 67, 0.15) 0 4px 8px 3px;
 }
 
 .w_big {
@@ -246,7 +246,7 @@ a:not(.button) {
 #page {
   width: 90%;
   margin: 20px auto 0;
-  /*---------------------------------NAV---------------------------------*/
+/*---------------------------------NAV---------------------------------*/
 
   .btn {
     font-size: 15px;
@@ -278,7 +278,7 @@ a:not(.button) {
     }
   }
 
-  /*--------------------------------CONTENT------------------------------*/
+/*--------------------------------CONTENT------------------------------*/
   #quick_notif {
     width: 100%;
     margin: 0 auto;
@@ -357,7 +357,7 @@ a:not(.button) {
     }
   }
 
-  /*---------------------------------NEWS--------------------------------*/
+/*---------------------------------NEWS--------------------------------*/
   #news {
     display: flex;
 
@@ -385,11 +385,11 @@ a:not(.button) {
         background: $second-color;
         box-shadow: $shadow-color 1px 1px 1px;
         padding: 0.4em;
-        margin: 0em 0em 0.5em 0em;
+        margin: 0 0 0.5em 0;
         text-transform: uppercase;
         font-size: 1.1em;
         &:not(:first-of-type) {
-          margin: 2em 0em 1em 0em;
+          margin: 2em 0 1em 0;
         }
       }
     }
@@ -400,7 +400,7 @@ a:not(.button) {
       }
     }
 
-    /* AGENDA/BIRTHDAYS */
+/* AGENDA/BIRTHDAYS */
     #agenda,
     #birthdays {
       display: block;
@@ -410,7 +410,7 @@ a:not(.button) {
       margin-bottom: 1em;
       #agenda_title,
       #birthdays_title {
-        margin: 0em;
+        margin: 0;
         border-radius: 5px 5px 0 0;
         box-shadow: $shadow-color 1px 1px 1px;
         padding: 0.5em;
@@ -444,7 +444,7 @@ a:not(.button) {
           }
         }
         ul.birthdays_year {
-          margin: 0em;
+          margin: 0;
           list-style-type: none;
           font-weight: bold;
           > li {
@@ -454,7 +454,7 @@ a:not(.button) {
             }
           }
           ul {
-            margin: 0em;
+            margin: 0;
             margin-left: 1em;
             list-style-type: square;
             list-style-position: inside;
@@ -463,9 +463,9 @@ a:not(.button) {
         }
       }
     }
-    /* END AGENDA/BIRTHDAYS */
+/* END AGENDA/BIRTHDAYS */
 
-    /* EVENTS TODAY AND NEXT FEW DAYS */
+/* EVENTS TODAY AND NEXT FEW DAYS */
     .news_events_group {
       box-shadow: $shadow-color 1px 1px 1px;
       margin-left: 1em;
@@ -516,14 +516,14 @@ a:not(.button) {
             float: left;
             min-width: 7em;
             max-width: 9em;
-            margin: 0em;
+            margin: 0;
             margin-right: 1em;
             margin-top: 0.8em;
             img {
               max-height: 6em;
               max-width: 8em;
               display: block;
-              margin: 0em auto;
+              margin: 0 auto;
             }
           }
           .news_date {
@@ -544,15 +544,15 @@ a:not(.button) {
         }
       }
     }
-    /* END EVENTS TODAY AND NEXT FEW DAYS */
+/* END EVENTS TODAY AND NEXT FEW DAYS */
 
-    /* COMING SOON */
+/* COMING SOON */
     .news_coming_soon {
       display: list-item;
       list-style-type: square;
       list-style-position: inside;
       margin-left: 1em;
-      padding-left: 0em;
+      padding-left: 0;
       a {
         font-weight: bold;
         text-transform: uppercase;
@@ -561,35 +561,35 @@ a:not(.button) {
         font-size: 0.9em;
       }
     }
-    /* END COMING SOON */
+/* END COMING SOON */
 
-    /* NOTICES */
+/* NOTICES */
     .news_notice {
-      margin: 0em 0em 1em 1em;
+      margin: 0 0 1em 1em;
       padding: 0.4em;
       padding-left: 1em;
       background: $secondary-neutral-light-color;
       box-shadow: $shadow-color 0 0 2px;
       border-radius: 18px 5px 18px 5px;
       h4 {
-        margin: 0em;
+        margin: 0;
       }
       .news_content {
         margin-left: 1em;
       }
     }
-    /* END NOTICES */
+/* END NOTICES */
 
-    /* CALLS */
+/* CALLS */
     .news_call {
-      margin: 0em 0em 1em 1em;
+      margin: 0 0 1em 1em;
       padding: 0.4em;
       padding-left: 1em;
       background: $secondary-neutral-light-color;
       border: 1px solid grey;
       box-shadow: $shadow-color 1px 1px 1px;
       h4 {
-        margin: 0em;
+        margin: 0;
       }
       .news_date {
         font-size: 0.9em;
@@ -598,7 +598,7 @@ a:not(.button) {
         margin-left: 1em;
       }
     }
-    /* END CALLS */
+/* END CALLS */
 
     .news_empty {
       margin-left: 1em;
@@ -631,12 +631,12 @@ a:not(.button) {
     width: 19%;
     float: left;
     min-width: 15em;
-    margin: 0em;
+    margin: 0;
     img {
       max-height: 15em;
       max-width: 12em;
       display: block;
-      margin: 0em auto;
+      margin: 0 auto;
       margin-bottom: 10px;
     }
   }
@@ -646,7 +646,6 @@ a:not(.button) {
     padding: 0.5em 1em;
     text-align: center;
     text-decoration: none;
-    display: inline-block;
     font-size: 1.2em;
     border-radius: 2px;
     float: right;
@@ -978,7 +977,7 @@ table {
   -moz-border-radius: 5px;
   overflow: hidden;
   box-shadow: rgba(60, 64, 67, 0.3) 0 1px 3px 0,
-    rgba(60, 64, 67, 0.15) 0 4px 8px 3px;
+              rgba(60, 64, 67, 0.15) 0 4px 8px 3px;
 }
 
 @media screen and (max-width: 500px) {
@@ -1198,8 +1197,8 @@ u,
     color: $primary-neutral-dark-color;
     height: 100%;
     width: 100%;
-    margin: 0em;
-    padding: 0em;
+    margin: 0;
+    padding: 0;
     display: block;
   }
 }
@@ -1393,7 +1392,7 @@ footer {
   text-align: center;
   vertical-align: middle;
   div {
-    margin: 0.6em 0em;
+    margin: 0.6em 0;
     color: $white-color;
     border-radius: 5px;
     display: flex;
@@ -1573,10 +1572,10 @@ $pedagogy-white-text: #f0f0f0;
       grid-template-columns: auto auto;
       grid-template-rows: auto auto auto;
       grid-template-areas:
-        "action-bar action-bar"
-        "search-bar search-bar"
-        "radio-department radio-department"
-        "radio-credit-type radio-semester";
+      "action-bar action-bar"
+      "search-bar search-bar"
+      "radio-department radio-department"
+      "radio-credit-type radio-semester";
     }
 
     .action-bar {
@@ -1668,8 +1667,8 @@ $pedagogy-white-text: #f0f0f0;
       grid-template-columns: 20% 20% 20% 20% auto;
       grid-template-rows: auto auto;
       grid-template-areas:
-        "hours-cm hours-td hours-tp hours-te hours-the"
-        "department credit-type semester . .";
+      "hours-cm hours-td hours-tp hours-te hours-the"
+      "department credit-type semester . .";
     }
 
     .department {
@@ -1722,8 +1721,8 @@ $pedagogy-white-text: #f0f0f0;
           grid-template-columns: 100%;
           grid-template-rows: auto auto;
           grid-template-areas:
-            "stars"
-            "comment";
+          "stars"
+          "comment";
         }
       }
 
@@ -1770,15 +1769,15 @@ $pedagogy-white-text: #f0f0f0;
       grid-template-columns: 150px 100px auto;
       grid-template-rows: 156px 1fr;
       grid-template-areas:
-        "grade grade-stars uv-infos"
-        ". . uv-infos";
+      "grade grade-stars uv-infos"
+      ". . uv-infos";
 
       @media screen and (max-width: $large-devices) {
         grid-template-columns: 50% 50%;
         grid-template-rows: auto auto;
         grid-template-areas:
-          "grade grade-stars"
-          "uv-infos uv-infos";
+        "grade grade-stars"
+        "uv-infos uv-infos";
       }
     }
 
@@ -1811,9 +1810,9 @@ $pedagogy-white-text: #f0f0f0;
       grid-template-columns: 300px auto;
       grid-template-rows: auto auto auto;
       grid-template-areas:
-        "grade-block comment"
-        "grade-block info"
-        "comment-end-bar comment-end-bar";
+      "grade-block comment"
+      "grade-block info"
+      "comment-end-bar comment-end-bar";
       margin-bottom: 30px;
       margin-top: 10px;
 
@@ -1821,10 +1820,10 @@ $pedagogy-white-text: #f0f0f0;
         grid-template-columns: auto;
         grid-template-rows: auto auto auto auto;
         grid-template-areas:
-          "grade-block"
-          "comment"
-          "info"
-          "comment-end-bar";
+        "grade-block"
+        "comment"
+        "info"
+        "comment-end-bar";
       }
 
       .grade-block {
@@ -1835,8 +1834,8 @@ $pedagogy-white-text: #f0f0f0;
         grid-template-columns: 150px 150px;
         grid-template-rows: 156px auto;
         grid-template-areas:
-          "grade-type grade-stars"
-          "grade-extension grade-extension";
+        "grade-type grade-stars"
+        "grade-extension grade-extension";
         grid-gap: 15px;
 
         clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 30px, 270px 0);
@@ -1881,8 +1880,8 @@ $pedagogy-white-text: #f0f0f0;
         grid-template-columns: auto;
         grid-template-rows: auto auto;
         grid-template-areas:
-          "anchor"
-          "markdown";
+        "anchor"
+        "markdown";
 
         @media screen and (max-width: $large-devices) {
           border-left: solid;
@@ -1944,9 +1943,9 @@ $pedagogy-white-text: #f0f0f0;
           grid-template-columns: auto;
           grid-template-rows: auto auto auto;
           grid-template-areas:
-            "report"
-            "date"
-            "author";
+          "report"
+          "date"
+          "author";
           margin-top: 0;
           text-align: center;
         }
diff --git a/core/static/election/election.scss b/core/static/election/election.scss
index c6f7cc269..ab12078d4 100644
--- a/core/static/election/election.scss
+++ b/core/static/election/election.scss
@@ -5,287 +5,287 @@ $border: .01rem solid black;
 $min_col_width: 100px;
 
 .error {
-    color: red !important;
+  color: red !important;
 }
 
 .radio-btn {
-    display: flex;
-    flex-direction: row;
-    gap: $gap;
+  display: flex;
+  flex-direction: row;
+  gap: $gap;
 
-    > input,
-    > label {
-        margin: 0;
-    }
+  > input,
+  > label {
+    margin: 0;
+  }
 
-    &:hover {
-        cursor: pointer;
-    }
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 .election_vote {
-    overflow-x: scroll !important;
+  overflow-x: scroll !important;
 }
 
 .election_table {
-    width: 100%;
+  width: 100%;
 
-    >.lists {
+  >.lists {
+    display: flex;
+    flex-direction: row;
+
+    >tr {
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+
+      >.column {
+        display: flex;
+        flex-direction: column-reverse;
+        align-items: center;
+        justify-content: center;
+        padding: $padding;
+        border: $border;
+        border-collapse: collapse;
+        position: relative;
+        min-width: $min_col_width;
+
+        >a{
+          margin-left: $padding;
+          width: 20px;
+          height: 20px;
+          text-align: center;
+          padding: 5px;
+          border-radius: 25%;
+          margin: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: absolute;
+          right: $gap;
+          top: $gap;
+
+          &:hover {
+            background-color: #ddd;
+          }
+        }
+      }
+    }
+  }
+
+  >.role {
+    display: flex;
+    flex-direction: column;
+
+    >tr {
+      display: flex;
+      flex-direction: row;
+      background-color: lightgrey;
+
+      &:hover {
+        background-color: lightgrey;
+      }
+
+      >.role_title {
         display: flex;
         flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        margin: 0;
+        padding: $padding;
+        width: 100%;
+
+
+        >.role_text {
+          >h4 {
+            margin: 0;
+          }
+          >p {
+            margin-top: .5em;
+          }
+        }
 
-        >tr {
+        >.role_buttons {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          gap: $gap;
+
+          > button,
+          > button > i,
+          > a {
+            width: 20px;
+            height: 20px;
+            background-color: #e9e9e9;
+            text-align: center;
+            padding: 5px;
+            border-radius: 25%;
+            margin: 0;
             display: flex;
-            flex-direction: row;
-            width: 100%;
+            align-items: center;
+            justify-content: center;
 
-            >.column {
-                display: flex;
-                flex-direction: column-reverse;
-                align-items: center;
-                justify-content: center;
-                padding: $padding;
-                border: $border;
-                border-collapse: collapse;
-                position: relative;
-                min-width: $min_col_width;
-
-                >a{
-                    margin-left: $padding;
-                    width: 20px;
-                    height: 20px;
-                    text-align: center;
-                    padding: 5px;
-                    border-radius: 25%;
-                    margin: 0;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    position: absolute;
-                    right: $gap;
-                    top: $gap;
-                
-                    &:hover {
-                        background-color: #ddd;
-                    }
-                }
+            &:hover,
+            &:hover > i {
+              background-color: #fff;
             }
+          }
+
+          > button {
+            width: 30px;
+            height: 30px;
+          }
+
+          > button[disabled] {
+            background-color: #eee;
+            cursor: not-allowed;
+
+            >i,
+            &:hover,
+            &:hover > i {
+              background-color: #eee;
+            }
+          }
         }
-    }
+      }
 
-    >.role {
+      >.list_per_role {
         display: flex;
-        flex-direction: column;
-
-        >tr {
+        flex-direction: row;
+        justify-content: center;
+        border: $border;
+        border-collapse: collapse;
+        background-color: #fff;
+        padding: $padding_smaller;
+        margin: 0;
+        min-width: $min_col_width;
+
+        >.candidates {
+          margin: 0;
+          display: flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+          justify-content: center;
+          width: 100%;
+          gap: $gap;
+
+          >.candidate {
             display: flex;
-            flex-direction: row;
-            background-color: lightgrey;
+            flex-direction: column;
+            align-items: center;
+            list-style-type: none;
+            width: 100%;
+            gap: $gap;
 
-            &:hover {
-                background-color: lightgrey;
+            >input[type="radio"]:checked + label,
+            >input[type="checkbox"]:checked + label {
+              background-color: lightgray;
+              border-radius: 10px;
+
+              >figure>.edit_btns>a:hover{
+                background-color: #fff;
+              }
             }
 
-            >.role_title {
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                justify-content: space-between;
-                margin: 0;
-                padding: $padding;
-                width: 100%;
+            >label {
+              width: 100%;
+            }
 
+            >label>figure,
+            >figure {
+              position: relative;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              gap: $gap;
+              padding: 10px;
+              max-width: 100%;
+
+              >img {
+                max-width: 100% !important;
+              }
+
+              >figcaption {
+                width: 100%;
+                max-width: inherit !important;
+                overflow: hidden;
 
-                >.role_text {
-                    >h4 {
-                        margin: 0;
-                    }
-                    >p {
-                        margin-top: .5em;
-                    }
+                h5 {
+                  margin: 0;
+                  text-align: center;
                 }
-
-                >.role_buttons {
-                    display: flex;
-                    flex-direction: row;
-                    align-items: center;
-                    gap: $gap;
-                    
-                    > button,
-                    > button > i,
-                    > a {
-                        width: 20px;
-                        height: 20px;
-                        background-color: #e9e9e9;
-                        text-align: center;
-                        padding: 5px;
-                        border-radius: 25%;
-                        margin: 0;
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-
-                        &:hover,
-                        &:hover > i {
-                            background-color: #fff;
-                        }
-                    }
-                    
-                    > button {
-                        width: 30px;
-                        height: 30px;
-                    }
-
-                    > button[disabled] {
-                        background-color: #eee;
-                        cursor: not-allowed;
-
-                        >i,
-                        &:hover,
-                        &:hover > i {
-                            background-color: #eee;
-                        }
-                    }
+                .candidate_program {
+                  margin: 5px 0;
                 }
-            }
+              }
 
-            >.list_per_role {
+              >.edit_btns {
+                position: absolute;
                 display: flex;
-                flex-direction: row;
-                justify-content: center;
-                border: $border;
-                border-collapse: collapse;
-                background-color: #fff;
-                padding: $padding_smaller;
-                margin: 0;
-                min-width: $min_col_width;
-
-                >.candidates {
-                    margin: 0;
-                    display: flex;
-                    flex-direction: row;
-                    flex-wrap: wrap;
-                    justify-content: center;
-                    width: 100%;                    
-                    gap: $gap;
-
-                    >.candidate {
-                        display: flex;
-                        flex-direction: column;
-                        align-items: center;
-                        list-style-type: none;
-                        width: 100%;
-                        gap: $gap;
-
-                        >input[type="radio"]:checked + label,
-                        >input[type="checkbox"]:checked + label {
-                            background-color: lightgray;
-                            border-radius: 10px;
-
-                            >figure>.edit_btns>a:hover{
-                                background-color: #fff;
-                            }
-                        }
-
-                        >label {
-                            width: 100%;
-                        }
-
-                        >label>figure,
-                        >figure {
-                            position: relative;
-                            display: flex;
-                            flex-direction: column;
-                            align-items: center;
-                            gap: $gap;
-                            padding: 10px;
-                            max-width: 100%;
-
-                            >img {
-                                max-width: 100% !important;
-                            }
-
-                            >figcaption {
-                                width: 100%;
-                                max-width: inherit !important;
-                                overflow: hidden;
-                                
-                                h5 {
-                                    margin: 0;
-                                    text-align: center;
-                                }
-                                .candidate_program {
-                                    margin: 5px 0;
-                                }
-                            }
-
-                            >.edit_btns {
-                                position: absolute;
-                                display: flex;
-                                flex-direction: column;
-                                top: $gap;
-                                right: $gap;
-                                gap: $gap;
-                                
-                                > a {
-                                    width: 20px;
-                                    height: 20px;
-                                    background-color: #e9e9e9;
-                                    text-align: center;
-                                    padding: 5px;
-                                    border-radius: 25%;
-                                    margin: 0;
-                                    display: flex;
-                                    align-items: center;
-                                    justify-content: center;
-
-                                    &:hover {
-                                        background-color: #d8d8d8;
-                                    }
-                                }
-                            }
-                        }
-                    }
+                flex-direction: column;
+                top: $gap;
+                right: $gap;
+                gap: $gap;
+
+                > a {
+                  width: 20px;
+                  height: 20px;
+                  background-color: #e9e9e9;
+                  text-align: center;
+                  padding: 5px;
+                  border-radius: 25%;
+                  margin: 0;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+
+                  &:hover {
+                    background-color: #d8d8d8;
+                  }
                 }
+              }
             }
+          }
         }
+      }
     }
+  }
 }
 
 .election_details {
-    margin: .5em 0;
+  margin: .5em 0;
 }
 
 .buttons {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: center;
-    gap: $gap;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: center;
+  gap: $gap;
 }
 
 .button {
-    border: none;
+  border: none;
+  color: black;
+  text-decoration: none;
+  background-color: #f2f2f2;
+  padding: 0.4em;
+  margin: 0.1em;
+  font-size: 1.18em;
+  border-radius: 5px;
+  box-shadow: #dfdfdf 0px 0px 1px;
+  cursor: pointer;
+
+  &:hover {
     color: black;
-    text-decoration: none;
-    background-color: #f2f2f2;
-    padding: 0.4em;
-    margin: 0.1em;
-    font-size: 1.18em;
-    border-radius: 5px;
-    box-shadow: #dfdfdf 0px 0px 1px;
-    cursor: pointer;
+    background: #d4d4d4;
+  }
 
+  &_send {
+    background-color: #59aee2;
     &:hover {
-        color: black;
-        background: #d4d4d4;
-    }
-
-    &_send {
-        background-color: #59aee2;
-        &:hover {
-            background-color: rgb(130, 186, 235);
-        }
+      background-color: rgb(130, 186, 235);
     }
+  }
 }
\ No newline at end of file
diff --git a/core/static/user/user_godfathers.scss b/core/static/user/user_godfathers.scss
index e49e63c99..1075c8b8f 100644
--- a/core/static/user/user_godfathers.scss
+++ b/core/static/user/user_godfathers.scss
@@ -50,7 +50,7 @@
           align-items: flex-start;
           max-height: 65px;
         }
-    
+
         > span {
           height: 150px;
           width: 100%;
@@ -66,14 +66,14 @@
             max-height: 100%;
             height: auto;
             object-fit: contain;
-        
+
             @media (max-width: 375px) {
               max-width: 100%;
               max-height: 65px;
             }
           }
         }
-    
+
         > em {
           box-sizing: border-box;
           padding: 0 5px;
diff --git a/core/static/user/user_tools.scss b/core/static/user/user_tools.scss
index 82cb5cbff..268e33718 100644
--- a/core/static/user/user_tools.scss
+++ b/core/static/user/user_tools.scss
@@ -35,7 +35,7 @@ main {
         > span {
           margin-top: 5px;
         }
-      
+
         > span > span,
         > span {
           display: flex;
@@ -43,7 +43,7 @@ main {
           flex-wrap: wrap;
           gap: 5px;
           width: 100%;
-      
+
           >.button {
             font-size: smaller;
             width: 100%;
diff --git a/core/templates/core/403.jinja b/core/templates/core/403.jinja
index 194109a87..33a1a0844 100644
--- a/core/templates/core/403.jinja
+++ b/core/templates/core/403.jinja
@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<h3>{% trans %}403, Forbidden{% endtrans %}</h3>
+  <h3>{% trans %}403, Forbidden{% endtrans %}</h3>
 
-{{ super() }}
+  {{ super() }}
 
 {% endblock %}
 
diff --git a/core/templates/core/404.jinja b/core/templates/core/404.jinja
index a777cea6d..9560fb272 100644
--- a/core/templates/core/404.jinja
+++ b/core/templates/core/404.jinja
@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<div id="page">
-	<h3>{% trans %}404, Not Found{% endtrans %}</h3>
-</div>
+  <div id="page">
+    <h3>{% trans %}404, Not Found{% endtrans %}</h3>
+  </div>
 
 {% endblock %}
 
diff --git a/core/templates/core/500.jinja b/core/templates/core/500.jinja
index 67962e0d1..4b6ad8837 100644
--- a/core/templates/core/500.jinja
+++ b/core/templates/core/500.jinja
@@ -1,27 +1,27 @@
 {% extends "core/base.jinja" %}
 {% block head %}
-{{ super() }}
-	<script
-	src="https://browser.sentry-cdn.com/7.11.1/bundle.min.js"
-	integrity="sha384-qcYSo5+/E8hEkPmHFa79GRDsGT84SRhBJHRw3+dbQyh0UwueiFP1jCsRBClEREcs"
-	crossorigin="anonymous"
-	></script>
+  {{ super() }}
+  <script
+    src="https://browser.sentry-cdn.com/7.11.1/bundle.min.js"
+    integrity="sha384-qcYSo5+/E8hEkPmHFa79GRDsGT84SRhBJHRw3+dbQyh0UwueiFP1jCsRBClEREcs"
+    crossorigin="anonymous"
+  ></script>
 {% endblock head %}
 
 {% block content %}
-	<h3>{% trans %}500, Server Error{% endtrans %}</h3>
-	{% if settings.SENTRY_DSN %}
-	<script>
-		Sentry.init({ dsn: '{{ settings.SENTRY_DSN }}' });
-		Sentry.showReportDialog({ 
-			eventId: '{{ request.sentry_last_event_id() }}',
-			{% if user.is_authenticated %}
-			user: {
-				'name': '{{user.first_name}} {{user.last_name}}',
-				'email': '{{user.email}}'
-			}
-			{% endif %}
-		})
-	</script>
-{% endif %}
+  <h3>{% trans %}500, Server Error{% endtrans %}</h3>
+  {% if settings.SENTRY_DSN %}
+    <script>
+      Sentry.init({ dsn: '{{ settings.SENTRY_DSN }}' });
+      Sentry.showReportDialog({
+        eventId: '{{ request.sentry_last_event_id() }}',
+        {% if user.is_authenticated %}
+          user: {
+            'name': '{{user.first_name}} {{user.last_name}}',
+            'email': '{{user.email}}'
+          }
+        {% endif %}
+      })
+    </script>
+  {% endif %}
 {% endblock content %}
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index bfbf3f568..f1389a940 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -1,342 +1,342 @@
 <!DOCTYPE html>
 <html lang="fr">
-    <head>
-        {% block head %}
-            <title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
-            <link rel="stylesheet" href="{{ static('core/base.css') }}">
-            <link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}">
-            <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
-            <link rel="stylesheet" href="{{ scss('core/style.scss') }}">
-            <link rel="stylesheet" href="{{ scss('core/markdown.scss') }}">
-            <link rel="stylesheet" href="{{ scss('core/header.scss') }}">
-            <link rel="stylesheet" href="{{ scss('core/navbar.scss') }}">
+  <head>
+    {% block head %}
+      <title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
+      <link rel="stylesheet" href="{{ static('core/base.css') }}">
+      <link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}">
+      <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
+      <link rel="stylesheet" href="{{ scss('core/style.scss') }}">
+      <link rel="stylesheet" href="{{ scss('core/markdown.scss') }}">
+      <link rel="stylesheet" href="{{ scss('core/header.scss') }}">
+      <link rel="stylesheet" href="{{ scss('core/navbar.scss') }}">
 
-            {% block jquery_css %}
+      {% block jquery_css %}
                 {# Thile file is quite heavy (around 250kb), so declaring it in a block allows easy removal #}
-                <link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
-            {% endblock %}
-            <link rel="preload" as="style" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}" onload="this.onload=null;this.rel='stylesheet'">
-            <noscript><link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}"></noscript>
-            <script defer href="{{ static('core/font-awesome/js/fontawesone.min.js') }}"></script>
+        <link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
+      {% endblock %}
+      <link rel="preload" as="style" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}" onload="this.onload=null;this.rel='stylesheet'">
+      <noscript><link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}"></noscript>
+      <script defer href="{{ static('core/font-awesome/js/fontawesone.min.js') }}"></script>
 
             <!-- Jquery declared here to be accessible in every django widgets -->
-            <script src="{{ static('core/js/jquery-3.6.2.min.js') }}"></script>
+      <script src="{{ static('core/js/jquery-3.6.2.min.js') }}"></script>
             <!-- Put here to always have acces to those functions on django widgets -->
-            <script src="{{ static('core/js/script.js') }}"></script>
+      <script src="{{ static('core/js/script.js') }}"></script>
 
-            {% block additional_css %}{% endblock %}
-            {% block additional_js %}{% endblock %}
-        {% endblock %}
-    </head>
+      {% block additional_css %}{% endblock %}
+      {% block additional_js %}{% endblock %}
+    {% endblock %}
+  </head>
 
-    <body>
+  <body>
 
         <!-- The token is always passed here to be accessible from the dom -->
         <!-- See this workaround https://docs.djangoproject.com/en/2.0/ref/csrf/#acquiring-the-token-if-csrf-use-sessions-is-true -->
-        {% csrf_token %}
+    {% csrf_token %}
         <!-- BEGIN HEADER -->
-        {% block header %}
-            {% if not popup %}
-                <header class="header">
-                    <div class="header-logo">
-                        <a class="header-logo-picture" href="{{ url('core:index') }}" style="background-image: url('{{ static('core/img/logo_no_text.png') }}')">
-                            &nbsp;
-                        </a>
-                        <a class="header-logo-text" href="{{ url('core:index') }}">
-                            <span>Association des Étudiants</span>
-                            <span>de l'Université de Technologie de Belfort-Montbéliard</span>
-                        </a>
-                    </div>
-                    {% if not user.is_authenticated %}
-                        <div class="header-disconnected">
-                            <a class="button" href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>
-                            <a class="button" href="{{ url('core:register') }}">{% trans %}Register{% endtrans %}</a>
-                        </div>
-                    {% else %}
-                        <div class="header-connected">
-                            <div class="left">
-                                <form class="search" action="{{ url('core:search') }}" method="GET" id="header_search">
-                                    <input class="header-input" type="text" placeholder="{% trans %}Search{% endtrans %}" name="query" id="search" />
-                                    <input type="submit" value="{% trans %}Search{% endtrans %}" style="display: none;" />
-                               </form>
-                                <ul class="bars">
-                                    {% cache 100 "counters_activity" %}
-                                        {% for bar in Counter.objects.annotate_has_barman(user).filter(type="BAR") %}
-                                            <li>
+    {% block header %}
+      {% if not popup %}
+        <header class="header">
+          <div class="header-logo">
+            <a class="header-logo-picture" href="{{ url('core:index') }}" style="background-image: url('{{ static('core/img/logo_no_text.png') }}')">
+              &nbsp;
+            </a>
+            <a class="header-logo-text" href="{{ url('core:index') }}">
+              <span>Association des Étudiants</span>
+              <span>de l'Université de Technologie de Belfort-Montbéliard</span>
+            </a>
+          </div>
+          {% if not user.is_authenticated %}
+            <div class="header-disconnected">
+              <a class="button" href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>
+              <a class="button" href="{{ url('core:register') }}">{% trans %}Register{% endtrans %}</a>
+            </div>
+          {% else %}
+            <div class="header-connected">
+              <div class="left">
+                <form class="search" action="{{ url('core:search') }}" method="GET" id="header_search">
+                  <input class="header-input" type="text" placeholder="{% trans %}Search{% endtrans %}" name="query" id="search" />
+                  <input type="submit" value="{% trans %}Search{% endtrans %}" style="display: none;" />
+                </form>
+                <ul class="bars">
+                  {% cache 100 "counters_activity" %}
+                    {% for bar in Counter.objects.annotate_has_barman(user).filter(type="BAR") %}
+                      <li>
                                                 {# If the user is a barman, we redirect him directly to the barman page
                                                 else we redirect him to the activity page #}
-                                                {% if bar.has_annotated_barman %}
-                                                    <a href="{{ url('counter:details', counter_id=bar.id) }}">
-                                                {% else %}
-                                                    <a href="{{ url('counter:activity', counter_id=bar.id) }}">
-                                                {% endif %}
-                                                {% if bar.is_inactive() %}
-                                                  <i class="fa fa-question" style="color: #f39c12"></i>
-                                                {% elif bar.is_open %}
-                                                  <i class="fa fa-check" style="color: #2ecc71"></i>
-                                                {% else %}
-                                                  <i class="fa fa-times" style="color: #eb2f06"></i>
-                                                {% endif %}
-                                                <span>{{ bar }}</span>
-                                                </a>
-                                            </li>
-                                        {% endfor %}
-                                    {% endcache %}
-                                </ul>
-                            </div>
-                            <div class="right">
-                                <div class="user">
-                                    <div class="options">
-                                        <div class="username">
-                                            <a href="{{ url('core:user_profile', user_id=user.id) }}">{{ user.get_display_name() }}</a>
-                                        </div>
-                                        <div class="links">
-                                            <a href="{{ url('core:user_tools') }}">{% trans %}Tools{% endtrans %}</a>
-                                            <a href="{{ url('core:logout') }}">{% trans %}Logout{% endtrans %}</a>
-                                        </div>
-                                    </div>
-                                    <a 
-                                        href="{{ url('core:user_profile', user_id=user.id) }}"
-                                        {% if user.profile_pict %}
-                                            style="background-image: url('{{ user.profile_pict.get_download_url() }}')"
-                                        {% else %}
-                                            style="background-image: url('{{ static('core/img/unknown.jpg') }}')"
-                                        {% endif %}                                  
-                                    ></a>
-                                </div>
-                                <div class="notification">
-                                    <a href="#" onclick="display_notif()">
-                                        <i class="fa fa-bell-o"></i>
-                                        {% set notification_count = user.notifications.filter(viewed=False).count() %}
-
-                                        {% if notification_count > 0 %}
-                                        <span>
-                                            {% if notification_count < 100 %}
-                                                {{ notification_count }}
-                                            {% else %}
-                                                &nbsp;
-                                            {% endif %}
-                                        </span>
-                                        {% endif %}
-                                    </a>
-                                    <div id="header_notif">
-                                        <ul>
-                                            {% if user.notifications.filter(viewed=False).count() > 0 %}
-                                                {% for n in user.notifications.filter(viewed=False).order_by('-date') %}
-                                                    <li>
-                                                        <a href="{{ url("core:notification", notif_id=n.id) }}">
-                                                            <div class="datetime">
-                                                                <span class="header_notif_date">
-                                                                    {{ n.date|localtime|date(DATE_FORMAT) }}
-                                                                </span>
-                                                                <span class="header_notif_time">
-                                                                    {{ n.date|localtime|time(DATETIME_FORMAT) }}
-                                                                </span>
-                                                            </div>
-                                                            <div class="reason">
-                                                                {{ n }}
-                                                            </div>
-                                                        </a>
-                                                    </li>
-                                                {% endfor %}
-                                            {% else %}
-                                                <li class="empty-notification">{% trans %}You do not have any unread notification{% endtrans %}</li>
-                                            {% endif %}
-                                        </ul>
-                                        <div class="options">
-                                            <a href="{{ url('core:notification_list') }}">
-                                                {% trans %}View more{% endtrans %}
-                                            </a>
-                                            <a href="{{ url('core:notification_list') }}?see_all">
-                                                {% trans %}Mark all as read{% endtrans %}
-                                            </a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    {% endif %}
-                    <div class="header-lang">
-                        {% for language in LANGUAGES %}
-                            <form action="{{ url('set_language') }}" method="post">
-                                {% csrf_token %}
-                                <input name="next" value="{{ request.path }}" type="hidden" />
-                                <input name="language" value="{{ language[0] }}" type="hidden" />
-                                <input type="submit" value="{% if language[0] == 'en' %}🇬🇧{% else %}🇫🇷{% endif %}" />
-                            </form>
-                        {% endfor %}
+                        {% if bar.has_annotated_barman %}
+                          <a href="{{ url('counter:details', counter_id=bar.id) }}">
+                        {% else %}
+                          <a href="{{ url('counter:activity', counter_id=bar.id) }}">
+                        {% endif %}
+                        {% if bar.is_inactive() %}
+                          <i class="fa fa-question" style="color: #f39c12"></i>
+                        {% elif bar.is_open %}
+                          <i class="fa fa-check" style="color: #2ecc71"></i>
+                        {% else %}
+                          <i class="fa fa-times" style="color: #eb2f06"></i>
+                        {% endif %}
+                        <span>{{ bar }}</span>
+                      </a>
+                      </li>
+                    {% endfor %}
+                  {% endcache %}
+                </ul>
+              </div>
+              <div class="right">
+                <div class="user">
+                  <div class="options">
+                    <div class="username">
+                      <a href="{{ url('core:user_profile', user_id=user.id) }}">{{ user.get_display_name() }}</a>
+                    </div>
+                    <div class="links">
+                      <a href="{{ url('core:user_tools') }}">{% trans %}Tools{% endtrans %}</a>
+                      <a href="{{ url('core:logout') }}">{% trans %}Logout{% endtrans %}</a>
                     </div>
-                </header>
+                  </div>
+                  <a
+                    href="{{ url('core:user_profile', user_id=user.id) }}"
+                    {% if user.profile_pict %}
+                      style="background-image: url('{{ user.profile_pict.get_download_url() }}')"
+                    {% else %}
+                      style="background-image: url('{{ static('core/img/unknown.jpg') }}')"
+                    {% endif %}
+                  ></a>
+                </div>
+                <div class="notification">
+                  <a href="#" onclick="display_notif()">
+                    <i class="fa fa-bell-o"></i>
+                    {% set notification_count = user.notifications.filter(viewed=False).count() %}
 
-                {% block info_boxes %}
-                    <div id="info_boxes">
-                        {% set sith = get_sith() %}
-                        {% if sith.alert_msg %}
-                        <div id="alert_box">
-                            {{ sith.alert_msg|markdown }}
-                        </div>
-                        {% endif %}
-                        {% if sith.info_msg %}
-                        <div id="info_box">
-                            {{ sith.info_msg|markdown }}
-                        </div>
+                    {% if notification_count > 0 %}
+                      <span>
+                        {% if notification_count < 100 %}
+                          {{ notification_count }}
+                        {% else %}
+                          &nbsp;
                         {% endif %}
+                      </span>
+                    {% endif %}
+                  </a>
+                  <div id="header_notif">
+                    <ul>
+                      {% if user.notifications.filter(viewed=False).count() > 0 %}
+                        {% for n in user.notifications.filter(viewed=False).order_by('-date') %}
+                          <li>
+                            <a href="{{ url("core:notification", notif_id=n.id) }}">
+                              <div class="datetime">
+                                <span class="header_notif_date">
+                                  {{ n.date|localtime|date(DATE_FORMAT) }}
+                                </span>
+                                <span class="header_notif_time">
+                                  {{ n.date|localtime|time(DATETIME_FORMAT) }}
+                                </span>
+                              </div>
+                              <div class="reason">
+                                {{ n }}
+                              </div>
+                            </a>
+                          </li>
+                        {% endfor %}
+                      {% else %}
+                        <li class="empty-notification">{% trans %}You do not have any unread notification{% endtrans %}</li>
+                      {% endif %}
+                    </ul>
+                    <div class="options">
+                      <a href="{{ url('core:notification_list') }}">
+                        {% trans %}View more{% endtrans %}
+                      </a>
+                      <a href="{{ url('core:notification_list') }}?see_all">
+                        {% trans %}Mark all as read{% endtrans %}
+                      </a>
                     </div>
-                {% endblock %}
+                  </div>
+                </div>
+              </div>
+            </div>
+          {% endif %}
+          <div class="header-lang">
+            {% for language in LANGUAGES %}
+              <form action="{{ url('set_language') }}" method="post">
+                {% csrf_token %}
+                <input name="next" value="{{ request.path }}" type="hidden" />
+                <input name="language" value="{{ language[0] }}" type="hidden" />
+                <input type="submit" value="{% if language[0] == 'en' %}🇬🇧{% else %}🇫🇷{% endif %}" />
+              </form>
+            {% endfor %}
+          </div>
+        </header>
 
-            {% else %}
-                <div id="popupheader">{{ user.get_display_name() }}</div>
+        {% block info_boxes %}
+          <div id="info_boxes">
+            {% set sith = get_sith() %}
+            {% if sith.alert_msg %}
+              <div id="alert_box">
+                {{ sith.alert_msg|markdown }}
+              </div>
             {% endif %}
-
-        {% endblock %}
-        <!-- END HEADER -->
-
-        {% block nav %}
-            {% if not popup %}
-                <nav class="navbar">
-                    <button class="expand-button" onclick="showMenu()"><i class="fa fa-bars"></i></button>
-                    <div id="navbar-content" class="content" style="display: none;">
-                        <a class="link" href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
-                        <div class="menu">
-                            <span class="head">{% trans %}Associations & Clubs{% endtrans %}</span>
-                            <ul class="content">
-                                <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
-                            </ul>
-                        </div>
-                        <div class="menu">
-                            <span class="head">{% trans %}Events{% endtrans %}</span>
-                            <ul class="content">
-                                <li><a href="{{ url('election:list') }}">{% trans %}Elections{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='ga') }}">{% trans %}Big event{% endtrans %}</a></li>
-                            </ul>
-                        </div>
-                        <a class="link" href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
-                        <a class="link" href="{{ url('sas:main') }}">{% trans %}Gallery{% endtrans %}</a>
-                        <a class="link" href="{{ url('eboutic:main') }}">{% trans %}Eboutic{% endtrans %}</a>
-                        <div class="menu">
-                            <span class="head">{% trans %}Services{% endtrans %}</span>
-                            <ul class="content">
-                                <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
-                                <li><a href="/launderette">{% trans %}Launderette{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
-                                <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
-                            </ul>
-                        </div>
-                        <div class="menu">
-                            <span class="head">{% trans %}My Benefits{% endtrans %}</span>
-                            <ul class="content">
-                                <li><a href="{{ url('core:page', page_name='partenaires')}}">{% trans %}Sponsors{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='avantages') }}">{% trans %}Subscriber benefits{% endtrans %}</a></li>
-                            </ul>
-                        </div>
-                        <div class="menu">
-                            <span class="head">{% trans %}Help{% endtrans %}</span>
-                            <ul class="content">
-                                <li><a href="{{ url('core:page', page_name='FAQ') }}">{% trans %}FAQ{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='Index') }}">{% trans %}Wiki{% endtrans %}</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </nav>
+            {% if sith.info_msg %}
+              <div id="info_box">
+                {{ sith.info_msg|markdown }}
+              </div>
             {% endif %}
+          </div>
         {% endblock %}
 
-        <div id="page">
+      {% else %}
+        <div id="popupheader">{{ user.get_display_name() }}</div>
+      {% endif %}
 
-          <ul id="quick_notif">
-              {% for n in quick_notifs %}
-              <li>{{ n }}</li>
-              {% endfor %}
-          </ul>
+    {% endblock %}
+        <!-- END HEADER -->
 
-          <div id="content">
-            {% if list_of_tabs %}
-            <div class="tool_bar">
-                <div class="tools">
-                    {% for t in list_of_tabs -%}
-                    <a href="{{ t.url }}" {%- if current_tab==t.slug %} class="selected_tab" {%- endif -%}>{{ t.name }}</a>
-                    {%- endfor %}
-                </div>
+    {% block nav %}
+      {% if not popup %}
+        <nav class="navbar">
+          <button class="expand-button" onclick="showMenu()"><i class="fa fa-bars"></i></button>
+          <div id="navbar-content" class="content" style="display: none;">
+            <a class="link" href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
+            <div class="menu">
+              <span class="head">{% trans %}Associations & Clubs{% endtrans %}</span>
+              <ul class="content">
+                <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
+                <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
+                <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
+              </ul>
             </div>
-            {% endif %}
+            <div class="menu">
+              <span class="head">{% trans %}Events{% endtrans %}</span>
+              <ul class="content">
+                <li><a href="{{ url('election:list') }}">{% trans %}Elections{% endtrans %}</a></li>
+                <li><a href="{{ url('core:page', page_name='ga') }}">{% trans %}Big event{% endtrans %}</a></li>
+              </ul>
+            </div>
+            <a class="link" href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
+            <a class="link" href="{{ url('sas:main') }}">{% trans %}Gallery{% endtrans %}</a>
+            <a class="link" href="{{ url('eboutic:main') }}">{% trans %}Eboutic{% endtrans %}</a>
+            <div class="menu">
+              <span class="head">{% trans %}Services{% endtrans %}</span>
+              <ul class="content">
+                <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
+                <li><a href="/launderette">{% trans %}Launderette{% endtrans %}</a></li>
+                <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
+                <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
+              </ul>
+            </div>
+            <div class="menu">
+              <span class="head">{% trans %}My Benefits{% endtrans %}</span>
+              <ul class="content">
+                <li><a href="{{ url('core:page', page_name='partenaires')}}">{% trans %}Sponsors{% endtrans %}</a></li>
+                <li><a href="{{ url('core:page', page_name='avantages') }}">{% trans %}Subscriber benefits{% endtrans %}</a></li>
+              </ul>
+            </div>
+            <div class="menu">
+              <span class="head">{% trans %}Help{% endtrans %}</span>
+              <ul class="content">
+                <li><a href="{{ url('core:page', page_name='FAQ') }}">{% trans %}FAQ{% endtrans %}</a></li>
+                <li><a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a></li>
+                <li><a href="{{ url('core:page', page_name='Index') }}">{% trans %}Wiki{% endtrans %}</a></li>
+              </ul>
+            </div>
+          </div>
+        </nav>
+      {% endif %}
+    {% endblock %}
+
+    <div id="page">
+
+      <ul id="quick_notif">
+        {% for n in quick_notifs %}
+          <li>{{ n }}</li>
+        {% endfor %}
+      </ul>
 
-              {% if error %}
-              {{ error }}
-              {% endif %}
-              {% block content %}
-              {% endblock %}
+      <div id="content">
+        {% if list_of_tabs %}
+          <div class="tool_bar">
+            <div class="tools">
+              {% for t in list_of_tabs -%}
+                <a href="{{ t.url }}" {%- if current_tab==t.slug %} class="selected_tab" {%- endif -%}>{{ t.name }}</a>
+              {%- endfor %}
+            </div>
           </div>
-        </div>
+        {% endif %}
 
-        {% if not popup %}
-            <footer>
-                {% block footer %}
-                    <div>
-                        <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
-                        <a href="{{ url('core:page', 'legals') }}">{% trans %}Legal notices{% endtrans %}</a>
-                        <a href="{{ url('core:page', 'copyright_agent') }}">{% trans %}Intellectual property{% endtrans %}</a>
-                        <a href="{{ url('core:page', 'docs') }}">{% trans %}Help & Documentation{% endtrans %}</a>
-                        <a href="{{ url('core:page', 'rd') }}">{% trans %}R&D{% endtrans %}</a>
-                    </div>
-                    <a href="https://discord.gg/XK9WfPsUFm" target="_link">
-                        {% trans %}Site created by the IT Department of the AE{% endtrans %}
-                    </a>
-                {% endblock %}
-                <br>
-                <code class="version">
-                    {% cache 1000 "sith_version" %}
-                        {% trans %}Sith version:{% endtrans %}&nbsp;{{ get_sith().version }}
-                    {% endcache %}
-                </code>
-            </footer>
+        {% if error %}
+          {{ error }}
         {% endif %}
+        {% block content %}
+        {% endblock %}
+      </div>
+    </div>
+
+    {% if not popup %}
+      <footer>
+        {% block footer %}
+          <div>
+            <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
+            <a href="{{ url('core:page', 'legals') }}">{% trans %}Legal notices{% endtrans %}</a>
+            <a href="{{ url('core:page', 'copyright_agent') }}">{% trans %}Intellectual property{% endtrans %}</a>
+            <a href="{{ url('core:page', 'docs') }}">{% trans %}Help & Documentation{% endtrans %}</a>
+            <a href="{{ url('core:page', 'rd') }}">{% trans %}R&D{% endtrans %}</a>
+          </div>
+          <a href="https://discord.gg/XK9WfPsUFm" target="_link">
+            {% trans %}Site created by the IT Department of the AE{% endtrans %}
+          </a>
+        {% endblock %}
+        <br>
+        <code class="version">
+          {% cache 1000 "sith_version" %}
+            {% trans %}Sith version:{% endtrans %}&nbsp;{{ get_sith().version }}
+          {% endcache %}
+        </code>
+      </footer>
+    {% endif %}
         <!--
             {% block tests %}
             {{ tests }}
             {% endblock %}
         -->
-        {% block script %}
-        <script src="{{ static('core/js/ui/jquery-ui.min.js') }}"></script>
-        <script src="{{ static('core/js/ui/i18n/datepicker-fr.js') }}"></script>
-        <script src="{{ static('core/js/jquery.datetimepicker.full.min.js') }}"></script>
-        <script src="{{ static('ajax_select/js/ajax_select.js') }}"></script>
-        <script src="{{ url('javascript-catalog') }}"></script>
-        <script>
-            function showMenu() {
-                let navbar = document.getElementById("navbar-content");
-                const current = navbar.style.getPropertyValue("display");
-                navbar.style.setProperty("display", current == "none" ? "block" : "none");
-            }
-        </script>
-        <script>
-$('.select_date').datepicker({
-    changeMonth: true,
-    changeYear: true,
-    dayNamesShort: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].dayNamesShort,
-    dayNames: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].dayNames,
-    monthNamesShort: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].monthNamesShort,
-    monthNames: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].monthNames,
-}).datepicker( $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"] );
-$(document).keydown(function (e) {
-    if ($(e.target).is('input')) { return }
-    if ($(e.target).is('textarea')) { return }
-    if ($(e.target).is('select')) { return }
-    if (e.keyCode == 83) {
-        $("#search").focus();
-        return false;
-    }
-});
-jQuery.datetimepicker.setLocale('{{ request.LANGUAGE_CODE|lower }}');
-$('.select_datetime').datetimepicker({
-        format: 'Y-m-d H:i:s',
-});
+    {% block script %}
+      <script src="{{ static('core/js/ui/jquery-ui.min.js') }}"></script>
+      <script src="{{ static('core/js/ui/i18n/datepicker-fr.js') }}"></script>
+      <script src="{{ static('core/js/jquery.datetimepicker.full.min.js') }}"></script>
+      <script src="{{ static('ajax_select/js/ajax_select.js') }}"></script>
+      <script src="{{ url('javascript-catalog') }}"></script>
+      <script>
+        function showMenu() {
+          let navbar = document.getElementById("navbar-content");
+          const current = navbar.style.getPropertyValue("display");
+          navbar.style.setProperty("display", current == "none" ? "block" : "none");
+        }
+      </script>
+      <script>
+        $('.select_date').datepicker({
+          changeMonth: true,
+          changeYear: true,
+          dayNamesShort: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].dayNamesShort,
+          dayNames: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].dayNames,
+          monthNamesShort: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].monthNamesShort,
+          monthNames: $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"  ].monthNames,
+        }).datepicker( $.datepicker.regional[ "{{ request.LANGUAGE_CODE }}"] );
+        $(document).keydown(function (e) {
+          if ($(e.target).is('input')) { return }
+          if ($(e.target).is('textarea')) { return }
+          if ($(e.target).is('select')) { return }
+          if (e.keyCode == 83) {
+            $("#search").focus();
+            return false;
+          }
+        });
+        jQuery.datetimepicker.setLocale('{{ request.LANGUAGE_CODE|lower }}');
+        $('.select_datetime').datetimepicker({
+          format: 'Y-m-d H:i:s',
+        });
 
-        </script>
-        {% endblock %}
-    </body>
+      </script>
+    {% endblock %}
+  </body>
 </html>
diff --git a/core/templates/core/create.jinja b/core/templates/core/create.jinja
index 04d8f866e..332bb94b4 100644
--- a/core/templates/core/create.jinja
+++ b/core/templates/core/create.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}
+  {% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h2>{% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}</h2>
-<form action="" method="post" enctype="multipart/form-data">
+  <h2>{% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}</h2>
+  <form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/core/templates/core/delete_confirm.jinja b/core/templates/core/delete_confirm.jinja
index a439c9e08..3a393b67d 100644
--- a/core/templates/core/delete_confirm.jinja
+++ b/core/templates/core/delete_confirm.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Delete confirmation{% endtrans %}
+  {% trans %}Delete confirmation{% endtrans %}
 {% endblock %}
 
 {% block info_boxes %}
@@ -11,14 +11,14 @@
 {% endblock %}
 
 {% block content %}
-<h2>{% trans %}Delete confirmation{% endtrans %}</h2>
-<form action="" method="post">{% csrf_token %}
+  <h2>{% trans %}Delete confirmation{% endtrans %}</h2>
+  <form action="" method="post">{% csrf_token %}
     <p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
     <input type="submit" value="{% trans %}Confirm{% endtrans %}" />
-</form>
-<form method="GET" action="javascript:history.back();">
+  </form>
+  <form method="GET" action="javascript:history.back();">
     <input type="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}" />
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/core/templates/core/edit.jinja b/core/templates/core/edit.jinja
index a6fe7a40e..25c6bd74e 100644
--- a/core/templates/core/edit.jinja
+++ b/core/templates/core/edit.jinja
@@ -1,24 +1,24 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% if object %}
-{% trans obj=object %}Edit {{ obj }}{% endtrans %}
-{% else %}
-{% trans %}Save{% endtrans %}
-{% endif %}
+  {% if object %}
+    {% trans obj=object %}Edit {{ obj }}{% endtrans %}
+  {% else %}
+    {% trans %}Save{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 {% block content %}
-{% if object %}
-<h2>{% trans obj=object %}Edit {{ obj }}{% endtrans %}</h2>
-{% else %}
-<h2>{% trans %}Save{% endtrans %}</h2>
-{% endif %}
-<form action="" method="post" enctype="multipart/form-data">
+  {% if object %}
+    <h2>{% trans obj=object %}Edit {{ obj }}{% endtrans %}</h2>
+  {% else %}
+    <h2>{% trans %}Save{% endtrans %}</h2>
+  {% endif %}
+  <form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/core/templates/core/file.jinja b/core/templates/core/file.jinja
index f6e2d856a..f8f429906 100644
--- a/core/templates/core/file.jinja
+++ b/core/templates/core/file.jinja
@@ -1,62 +1,62 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% if file %}
-{{ file.get_display_name() }}
-{% elif file_list %}
-{% trans %}File list{% endtrans %}
-{% elif new_file %}
-{% trans %}New file{% endtrans %}
-{% else %}
-{% trans %}Not found{% endtrans %}
-{% endif %}
+  {% if file %}
+    {{ file.get_display_name() }}
+  {% elif file_list %}
+    {% trans %}File list{% endtrans %}
+  {% elif new_file %}
+    {% trans %}New file{% endtrans %}
+  {% else %}
+    {% trans %}Not found{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 {% macro print_file_name(file) %}
-{% if file %}
-{{ print_file_name(file.parent) }} >
-<a href="{{ url('core:file_detail', file_id=file.id, popup=popup) }}">{{ file.get_display_name() }}</a>
-{% else %}
-<a href="{{ url('core:file_list', popup) }}">{% trans %}Files{% endtrans %}</a>
-{% endif %}
+  {% if file %}
+    {{ print_file_name(file.parent) }} >
+    <a href="{{ url('core:file_detail', file_id=file.id, popup=popup) }}">{{ file.get_display_name() }}</a>
+  {% else %}
+    <a href="{{ url('core:file_list', popup) }}">{% trans %}Files{% endtrans %}</a>
+  {% endif %}
 {% endmacro %}
 
 {% block content %}
-{{ print_file_name(file) }}
+  {{ print_file_name(file) }}
 
-<div class="tool_bar">
+  <div class="tool_bar">
     <div class="tools">
-        <div>
-            {% set home = user.home %}
-            {% if home %}
-            <a href="{{ url('core:file_detail', home.id, popup) }}">{% trans %}My files{% endtrans %}</a>
-            {% endif %}
-        </div>
-        {% if file %}
+      <div>
+        {% set home = user.home %}
+        {% if home %}
+          <a href="{{ url('core:file_detail', home.id, popup) }}">{% trans %}My files{% endtrans %}</a>
+        {% endif %}
+      </div>
+      {% if file %}
         <a href="{{ url('core:file_detail', file.id, popup) }}">{% trans %}View{% endtrans %}</a>
         {% if can_edit(file, user) %}
-        <a href="{{ url('core:file_edit', file_id=file.id, popup=popup) }}">{% trans %}Edit{% endtrans %}</a>
+          <a href="{{ url('core:file_edit', file_id=file.id, popup=popup) }}">{% trans %}Edit{% endtrans %}</a>
         {% endif %}
         {% if can_edit_prop(file, user) %}
-        <a href="{{ url('core:file_prop', file_id=file.id, popup=popup) }}">{% trans %}Prop{% endtrans %}</a>
-        {% endif %}
+          <a href="{{ url('core:file_prop', file_id=file.id, popup=popup) }}">{% trans %}Prop{% endtrans %}</a>
         {% endif %}
+      {% endif %}
     </div>
-</div>
-<hr>
+  </div>
+  <hr>
 
-{% if file %}
-{% block file %}
-{% endblock %}
-{% endif %}
+  {% if file %}
+    {% block file %}
+    {% endblock %}
+  {% endif %}
 
-{% block script %}
-{{ super() }}
-{% if popup %}
-<script>
-parent.$(".choose_file_widget").css("height", "75%");
-</script>
-{% endif %}
-{% endblock %}
+  {% block script %}
+    {{ super() }}
+    {% if popup %}
+      <script>
+        parent.$(".choose_file_widget").css("height", "75%");
+      </script>
+    {% endif %}
+  {% endblock %}
 
 {% endblock %}
diff --git a/core/templates/core/file_delete_confirm.jinja b/core/templates/core/file_delete_confirm.jinja
index 3efd2bd7f..521413e29 100644
--- a/core/templates/core/file_delete_confirm.jinja
+++ b/core/templates/core/file_delete_confirm.jinja
@@ -1,18 +1,18 @@
 {% extends "core/file.jinja" %}
 
 {% block title %}
-{% trans %}Delete confirmation{% endtrans %}
+  {% trans %}Delete confirmation{% endtrans %}
 {% endblock %}
 
 {% block file %}
-<h2>{% trans %}Delete confirmation{% endtrans %}</h2>
-<form action="" method="post">{% csrf_token %}
+  <h2>{% trans %}Delete confirmation{% endtrans %}</h2>
+  <form action="" method="post">{% csrf_token %}
     <p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
     <input type="submit" value="{% trans %}Confirm{% endtrans %}" />
-</form>
-<form method="GET" action="javascript:history.back();">
+  </form>
+  <form method="GET" action="javascript:history.back();">
     <input type="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}" />
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/core/templates/core/file_detail.jinja b/core/templates/core/file_detail.jinja
index 4d0a2887b..b8b5c18b6 100644
--- a/core/templates/core/file_detail.jinja
+++ b/core/templates/core/file_detail.jinja
@@ -2,78 +2,78 @@
 
 
 {% block file %}
-<h3>
-{% if file.is_folder %}
-<i class="fa fa-folder fa-3x" aria-hidden="true"></i>
-{% else %}
-<i class="fa fa-file fa-3x" aria-hidden="true"></i>
-{% endif %}
-{{ file.get_display_name() }}
-</h3>
-<p>{% trans %}Owner: {% endtrans %}{{ file.owner.get_display_name() }}</p>
-{% if file.is_folder %}
-{% if user.can_edit(file) %}
-<form action="" method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-    {{ form.as_p() }}
-    <p><input type="submit" value="{% trans %}Add{% endtrans %}"></p>
-</form>
-{% endif %}
-<form action="" method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-    <p>
+  <h3>
+    {% if file.is_folder %}
+      <i class="fa fa-folder fa-3x" aria-hidden="true"></i>
+    {% else %}
+      <i class="fa fa-file fa-3x" aria-hidden="true"></i>
+    {% endif %}
+    {{ file.get_display_name() }}
+  </h3>
+  <p>{% trans %}Owner: {% endtrans %}{{ file.owner.get_display_name() }}</p>
+  {% if file.is_folder %}
+    {% if user.can_edit(file) %}
+      <form action="" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p() }}
+        <p><input type="submit" value="{% trans %}Add{% endtrans %}"></p>
+      </form>
+    {% endif %}
+    <form action="" method="post" enctype="multipart/form-data">
+      {% csrf_token %}
+      <p>
         <input name="delete" type="submit" value="{% trans %}Delete{% endtrans %}"> |
         <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}"> |
         <input name="cut" type="submit" value="{% trans %}Cut{% endtrans %}"> |
         <input name="paste" type="submit" value="{% trans %}Paste{% endtrans %}">
-    </p>
-    {% if clipboard %}
-    <p>{% trans %}Clipboard: {% endtrans %}
-        <ul>
-        {% for f in clipboard %}
-            <li>{{ f.get_full_path() }}</li>
-        {% endfor %}
-        </ul>
-    </p>
-    {% endif %}
-    <ul>
+      </p>
+      {% if clipboard %}
+        <p>{% trans %}Clipboard: {% endtrans %}
+          <ul>
+            {% for f in clipboard %}
+              <li>{{ f.get_full_path() }}</li>
+            {% endfor %}
+          </ul>
+        </p>
+      {% endif %}
+      <ul>
         {% for f in file.children.order_by('-is_folder', 'name').all() %}
-        <li style="list-style-type: none;">
+          <li style="list-style-type: none;">
             <input type="checkbox" name="file_list" value="{{ f.id }}">
             {% if f.is_folder %}
-                <i class="fa fa-folder" aria-hidden="true"></i>
+              <i class="fa fa-folder" aria-hidden="true"></i>
             {% else %}
-                <i class="fa fa-file" aria-hidden="true"></i>
+              <i class="fa fa-file" aria-hidden="true"></i>
             {% endif %}
             <a href="{{ url('core:file_detail', file_id=f.id, popup=popup) }}">{{ f.get_display_name() }}</a></li>
         {% endfor %}
-    </ul>
-</form>
-{% else %}
-<p>{% trans %}Real name: {% endtrans %}{{ file.file.name.split('/')[-1] }}</p>
-<p>{% trans %}Date: {% endtrans %}{{ file.date|localtime|date(DATETIME_FORMAT) }} -
-{{ file.date|localtime|time(DATETIME_FORMAT) }}</p>
-<p>{% trans %}Type: {% endtrans %}{{ file.mime_type }}</p>
-<p>{% trans %}Size: {% endtrans %}{{ file.size }} {% trans %}bytes{% endtrans %}</p>
+      </ul>
+    </form>
+  {% else %}
+    <p>{% trans %}Real name: {% endtrans %}{{ file.file.name.split('/')[-1] }}</p>
+    <p>{% trans %}Date: {% endtrans %}{{ file.date|localtime|date(DATETIME_FORMAT) }} -
+      {{ file.date|localtime|time(DATETIME_FORMAT) }}</p>
+    <p>{% trans %}Type: {% endtrans %}{{ file.mime_type }}</p>
+    <p>{% trans %}Size: {% endtrans %}{{ file.size }} {% trans %}bytes{% endtrans %}</p>
 
-<p><a href="{{ url('core:download', file_id=file.id) }}">{% trans %}Download{% endtrans %}</a></p>
-{% endif %}
-{% if not file.home_of and not file.home_of_club and file.parent %}
-<p><a href="{{ url('core:file_delete', file_id=file.id, popup=popup) }}">{% trans %}Delete{% endtrans %}</a></p>
-{% endif %}
-{% if user.is_com_admin %}
-<p><a href="{{ url('core:file_moderate', file_id=file.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
-{% endif %}
+    <p><a href="{{ url('core:download', file_id=file.id) }}">{% trans %}Download{% endtrans %}</a></p>
+  {% endif %}
+  {% if not file.home_of and not file.home_of_club and file.parent %}
+    <p><a href="{{ url('core:file_delete', file_id=file.id, popup=popup) }}">{% trans %}Delete{% endtrans %}</a></p>
+  {% endif %}
+  {% if user.is_com_admin %}
+    <p><a href="{{ url('core:file_moderate', file_id=file.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
+  {% endif %}
 {% endblock %}
 
 {% block script %}
-{{ super() }}
-<script>
-{% if popup and file.is_file %}
-parent.$("#file_id").replaceWith('<div id="file_id" value="{{ file.id }}">{{ file.name }}</div>');
-parent.$(".ui-dialog-buttonpane button").button("option", "disabled", false);
-{% endif %}
-</script>
+  {{ super() }}
+  <script>
+    {% if popup and file.is_file %}
+      parent.$("#file_id").replaceWith('<div id="file_id" value="{{ file.id }}">{{ file.name }}</div>');
+      parent.$(".ui-dialog-buttonpane button").button("option", "disabled", false);
+    {% endif %}
+  </script>
 {% endblock %}
 
 
diff --git a/core/templates/core/file_edit.jinja b/core/templates/core/file_edit.jinja
index 38d746955..338fa2b9e 100644
--- a/core/templates/core/file_edit.jinja
+++ b/core/templates/core/file_edit.jinja
@@ -1,12 +1,12 @@
 {% extends "core/file.jinja" %}
 
 {% block file %}
-<h2>{% trans obj=object %}Edit {{ obj }}{% endtrans %}</h2>
-<form action="" method="post">
+  <h2>{% trans obj=object %}Edit {{ obj }}{% endtrans %}</h2>
+  <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/core/templates/core/file_list.jinja b/core/templates/core/file_list.jinja
index b8b282615..077a2bf9d 100644
--- a/core/templates/core/file_list.jinja
+++ b/core/templates/core/file_list.jinja
@@ -1,23 +1,23 @@
 {% extends "core/file.jinja" %}
 
 {% block content %}
-{{ super() }}
-{% if file_list %}
-<h3>{% trans %}File list{% endtrans %}</h3>
-<ul>
-    {% for f in file_list %}
-    <li style="list-style-type: none;">
-        {% if f.is_folder %}
-			<i class="fa fa-folder" aria-hidden="true"></i>
-        {% else %}
-			<i class="fa fa-file" aria-hidden="true"></i>
-        {% endif %}
-        <a href="{{ url('core:file_detail', file_id=f.id, popup=popup) }}">{{ f.name }}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>{% trans %}There is no file in this website.{% endtrans %}</p>
-{% endif %}
+  {{ super() }}
+  {% if file_list %}
+    <h3>{% trans %}File list{% endtrans %}</h3>
+    <ul>
+      {% for f in file_list %}
+        <li style="list-style-type: none;">
+          {% if f.is_folder %}
+            <i class="fa fa-folder" aria-hidden="true"></i>
+          {% else %}
+            <i class="fa fa-file" aria-hidden="true"></i>
+          {% endif %}
+          <a href="{{ url('core:file_detail', file_id=f.id, popup=popup) }}">{{ f.name }}</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    <p>{% trans %}There is no file in this website.{% endtrans %}</p>
+  {% endif %}
 {% endblock %}
 
 
diff --git a/core/templates/core/file_moderation.jinja b/core/templates/core/file_moderation.jinja
index ba46d8067..f8fd255e0 100644
--- a/core/templates/core/file_moderation.jinja
+++ b/core/templates/core/file_moderation.jinja
@@ -1,28 +1,28 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}File moderation{% endtrans %}
+  {% trans %}File moderation{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}File moderation{% endtrans %}</h3>
-<div>
+  <h3>{% trans %}File moderation{% endtrans %}</h3>
+  <div>
     {% for f in files %}
-    <div style="margin: 2px; padding: 2px; border: solid 1px red; text-align: center">
+      <div style="margin: 2px; padding: 2px; border: solid 1px red; text-align: center">
         {% if f.is_folder %}
-        <strong>Folder</strong>
+          <strong>Folder</strong>
         {% else %}
-        <strong>File</strong>
+          <strong>File</strong>
         {% endif %}
         <p>
-            <a href="{{ url("core:file_detail", file_id=f.id) }}">{{ f.name }}</a><br/>
-            {% trans %}Full name: {% endtrans %}{{ f.get_parent_path()+'/'+f.name }}<br/>
-            {% trans %}Owner: {% endtrans %}{{ f.owner.get_display_name() }}<br/>
-            {% trans %}Date: {% endtrans %}{{ f.date|date(DATE_FORMAT) }} {{ f.date|time(TIME_FORMAT) }}<br/>
+          <a href="{{ url("core:file_detail", file_id=f.id) }}">{{ f.name }}</a><br/>
+          {% trans %}Full name: {% endtrans %}{{ f.get_parent_path()+'/'+f.name }}<br/>
+          {% trans %}Owner: {% endtrans %}{{ f.owner.get_display_name() }}<br/>
+          {% trans %}Date: {% endtrans %}{{ f.date|date(DATE_FORMAT) }} {{ f.date|time(TIME_FORMAT) }}<br/>
         </p>
         <p><a href="{{ url('core:file_moderate', file_id=f.id) }}">{% trans %}Moderate{% endtrans %}</a> -
-        <a href="{{ url('core:file_delete', file_id=f.id) }}?next={{ url('core:file_moderation') }}">{% trans %}Delete{% endtrans %}</a></p>
-    </div>
+          <a href="{{ url('core:file_delete', file_id=f.id) }}?next={{ url('core:file_moderation') }}">{% trans %}Delete{% endtrans %}</a></p>
+      </div>
     {% endfor %}
-</div>
+  </div>
 {% endblock %}
diff --git a/core/templates/core/group_detail.jinja b/core/templates/core/group_detail.jinja
index 3e9dfe45f..0c9ebb53d 100644
--- a/core/templates/core/group_detail.jinja
+++ b/core/templates/core/group_detail.jinja
@@ -2,38 +2,38 @@
 {% from "core/macros.jinja" import select_all_checkbox %}
 
 {% block title %}
-    {% trans %}Group detail{% endtrans %}
+  {% trans %}Group detail{% endtrans %}
 {% endblock title %}
 
 {% block content %}
-    <h1>{{ object }}</h1>
-	<p><a href="{{ url('core:group_list') }}">{% trans %}Back to list{% endtrans %}</a></p>
-    {% if form.users_removed | length <= 0 %}
-        <p>{% trans %}No user in this group{% endtrans %}</p>
-    {% else %}
-        <form action="{{ url('core:group_detail', object.id) }}" method="post" id="add_users">
-            {{ select_all_checkbox("add_users") }}
-            <hr>
-            {% csrf_token %}
-            <label for="{{ form.users_removed.id_for_label }}">{{ form.users_removed.label }} :</label>
-            {{ form.users_removed.errors }}
-            {% for user in form.users_removed %}
-                <label for="{{ user.id_for_label }}">
-                    {{ user.tag() }}
-                    <a href="{{ url('core:user_profile', user.data.value) }}">{{ user.choice_label }}</a>
-                </label>
-            {% endfor %}
-            <input type="submit" name="submit" value="{% trans %}Delete{% endtrans %}">
-        </form>
-    {% endif %}
+  <h1>{{ object }}</h1>
+  <p><a href="{{ url('core:group_list') }}">{% trans %}Back to list{% endtrans %}</a></p>
+  {% if form.users_removed | length <= 0 %}
+    <p>{% trans %}No user in this group{% endtrans %}</p>
+  {% else %}
     <form action="{{ url('core:group_detail', object.id) }}" method="post" id="add_users">
-        {% csrf_token %}
-        <p>
-            {{ form.users_added.errors }}
-            <label for="{{ form.users_added.id_for_label }}">{{ form.users_added.label }} :</label>
-            {{ form.users_added }}
-            <span class="helptext">{{ form.users_added.help_text }}</span>
-        </p>
-        <input type="submit" name="submit">
+      {{ select_all_checkbox("add_users") }}
+      <hr>
+      {% csrf_token %}
+      <label for="{{ form.users_removed.id_for_label }}">{{ form.users_removed.label }} :</label>
+      {{ form.users_removed.errors }}
+      {% for user in form.users_removed %}
+        <label for="{{ user.id_for_label }}">
+          {{ user.tag() }}
+          <a href="{{ url('core:user_profile', user.data.value) }}">{{ user.choice_label }}</a>
+        </label>
+      {% endfor %}
+      <input type="submit" name="submit" value="{% trans %}Delete{% endtrans %}">
     </form>
+  {% endif %}
+  <form action="{{ url('core:group_detail', object.id) }}" method="post" id="add_users">
+    {% csrf_token %}
+    <p>
+      {{ form.users_added.errors }}
+      <label for="{{ form.users_added.id_for_label }}">{{ form.users_added.label }} :</label>
+      {{ form.users_added }}
+      <span class="helptext">{{ form.users_added.help_text }}</span>
+    </p>
+    <input type="submit" name="submit">
+  </form>
 {% endblock content %}
\ No newline at end of file
diff --git a/core/templates/core/group_edit.jinja b/core/templates/core/group_edit.jinja
index 44ad2d1cc..081cf3037 100644
--- a/core/templates/core/group_edit.jinja
+++ b/core/templates/core/group_edit.jinja
@@ -1,13 +1,13 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<p><a href="{{ url('core:group_list') }}">{% trans %}Back to list{% endtrans %}</a></p>
-<h2>{% trans %}Edit group{% endtrans %}</h2>
-<form action="" method="post">
+  <p><a href="{{ url('core:group_list') }}">{% trans %}Back to list{% endtrans %}</a></p>
+  <h2>{% trans %}Edit group{% endtrans %}</h2>
+  <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/core/templates/core/group_list.jinja b/core/templates/core/group_list.jinja
index e655335d1..1cf9cab98 100644
--- a/core/templates/core/group_list.jinja
+++ b/core/templates/core/group_list.jinja
@@ -1,31 +1,31 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Group list{% endtrans %}
+  {% trans %}Group list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}Group list{% endtrans %}</h3>
-<p><a href="{{ url('core:group_new') }}">{% trans %}New group{% endtrans %}</a></p>
-<table>
-	<thead>
-		<tr>
-			<td>{% trans %}ID{% endtrans %}</td>
-			<td>{% trans %}Group{% endtrans %}</td>
-			<td>{% trans %}Description{% endtrans %}</td>
-		</tr>
-	</thead>
-	<tbody>
-		{% for group in object_list %}
-		<tr>
-			<td>{{ group.id }}</td>
-			<td><a href="{{ url('core:group_detail', group.id) }}">{{ group }}</a></td>
-			<td>{{ group.description }}</td>
-			<td><a href="{{ url('core:group_edit', group.id) }}">{% trans %}Edit{% endtrans %}</a></td>
-			<td><a href="{{ url('core:group_delete', group.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-		</tr>
-		{% endfor %}
-	</tbody>
-</table>
+  <h3>{% trans %}Group list{% endtrans %}</h3>
+  <p><a href="{{ url('core:group_new') }}">{% trans %}New group{% endtrans %}</a></p>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}ID{% endtrans %}</td>
+        <td>{% trans %}Group{% endtrans %}</td>
+        <td>{% trans %}Description{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for group in object_list %}
+        <tr>
+          <td>{{ group.id }}</td>
+          <td><a href="{{ url('core:group_detail', group.id) }}">{{ group }}</a></td>
+          <td>{{ group.description }}</td>
+          <td><a href="{{ url('core:group_edit', group.id) }}">{% trans %}Edit{% endtrans %}</a></td>
+          <td><a href="{{ url('core:group_delete', group.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 {% endblock %}
 
diff --git a/core/templates/core/login.jinja b/core/templates/core/login.jinja
index 4e56613dc..5e94a304d 100644
--- a/core/templates/core/login.jinja
+++ b/core/templates/core/login.jinja
@@ -1,11 +1,11 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-    <link rel="stylesheet" href="{{ scss('user/login.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/login.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-    {% trans %}Login{% endtrans %}
+  {% trans %}Login{% endtrans %}
 {% endblock %}
 
 {% block info_boxes %}
@@ -15,48 +15,48 @@
 {% endblock %}
 
 {% block content %}
-    <h1 class="title">{% trans %}Login{% endtrans %}</h1>
+  <h1 class="title">{% trans %}Login{% endtrans %}</h1>
 
-    {% if next %}
-        {% if user.is_authenticated %}
-        <p>{% trans %}Your account doesn't have access to this page. To proceed,
+  {% if next %}
+    {% if user.is_authenticated %}
+      <p>{% trans %}Your account doesn't have access to this page. To proceed,
         please login with an account that has access.{% endtrans %}</p>
-        {% else %}
-        <p>{% trans %}Please login or create an account to see this page.{% endtrans %}</p>
-        {% endif %}
+    {% else %}
+      <p>{% trans %}Please login or create an account to see this page.{% endtrans %}</p>
     {% endif %}
+  {% endif %}
 
-    <form method="post" action="{{ url('core:login') }}">
-        {% if form.errors %}
-            <p class="alert alert-red">{% trans %}Your username and password didn't match. Please try again.{% endtrans %}</p>
-            <br>
-        {% endif %}
+  <form method="post" action="{{ url('core:login') }}">
+    {% if form.errors %}
+      <p class="alert alert-red">{% trans %}Your username and password didn't match. Please try again.{% endtrans %}</p>
+      <br>
+    {% endif %}
 
-        {% csrf_token %}
-        {% render_honeypot_field %}
+    {% csrf_token %}
+    {% render_honeypot_field %}
 
-        <div>
-            <label for="{{ form.username.name }}">{{ form.username.label }}</label>
-            <input id="id_username" maxlength="254" name="username" type="text" autofocus="autofocus" />
-            {{ form.username.errors }}
-        </div>
+    <div>
+      <label for="{{ form.username.name }}">{{ form.username.label }}</label>
+      <input id="id_username" maxlength="254" name="username" type="text" autofocus="autofocus" />
+      {{ form.username.errors }}
+    </div>
 
-        <div>
-            <label for="{{ form.password.name }}">{{ form.password.label }}</label>
-            {{ form.password }}
-            {{ form.password.errors }}
-        </div>
+    <div>
+      <label for="{{ form.password.name }}">{{ form.password.label }}</label>
+      {{ form.password }}
+      {{ form.password.errors }}
+    </div>
 
-        <input type="hidden" name="next" value="{{ next }}">
-        <input type="submit" value="{% trans %}Login{% endtrans %}">
+    <input type="hidden" name="next" value="{{ next }}">
+    <input type="submit" value="{% trans %}Login{% endtrans %}">
 
 
         {# Assumes you setup the password_reset view in your URLconf #}
-        <p>
-            <a href="{{ url('core:password_reset') }}">{% trans %}Lost password?{% endtrans %}</a>
-            &nbsp;&nbsp;
-            <a href="{{ url('core:register') }}">{% trans %}Create account{% endtrans %}</a>
-        </p>
-    </form>
+    <p>
+      <a href="{{ url('core:password_reset') }}">{% trans %}Lost password?{% endtrans %}</a>
+      &nbsp;&nbsp;
+      <a href="{{ url('core:register') }}">{% trans %}Create account{% endtrans %}</a>
+    </p>
+  </form>
 {% endblock %}
 
diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index 02a3ceaed..2344de379 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -1,155 +1,155 @@
 {% macro user_profile_link(user) -%}
-<a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_display_name() }}</a>
+  <a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_display_name() }}</a>
 {%- endmacro %}
 
 {% macro user_profile_link_short_name(user) -%}
-<a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_short_name() }}</a>
+  <a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_short_name() }}</a>
 {%- endmacro %}
 
 {% macro user_link_with_pict(user) -%}
-<a href="{{ url("core:user_profile", user_id=user.id) }}" class="mini_profile_link" >
+  <a href="{{ url("core:user_profile", user_id=user.id) }}" class="mini_profile_link" >
     {{ user.get_mini_item()|safe }}
-</a>
+  </a>
 {%- endmacro %}
 
 {% macro link_news_logo(news) -%}
-    {% if news.club.logo -%}
-        {{ news.club.logo.url }}
-    {% else -%}
-        {{ static("com/img/news.png") }}
-    {% endif %}
+  {% if news.club.logo -%}
+    {{ news.club.logo.url }}
+  {% else -%}
+    {{ static("com/img/news.png") }}
+  {% endif %}
 {%- endmacro %}
 
 {% macro gen_news_metatags(news) -%}
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:site" content="{{ settings.SITH_TWITTER }}" />
-<meta name="twitter:creator" content= "{{ settings.SITH_TWITTER }}" />
-<meta property="og:url"                content="{{ news.get_full_url() }}" />
-<meta property="og:type"               content="article" />
-<meta property="og:title"              content="{{ news.title }}" />
-<meta property="og:description"        content="{{ news.summary }}" />
-<meta property="og:image"              content="{{ "https://%s%s" % (settings.SITH_URL, link_news_logo(news)) }}" />
+  <meta name="twitter:card" content="summary" />
+  <meta name="twitter:site" content="{{ settings.SITH_TWITTER }}" />
+  <meta name="twitter:creator" content= "{{ settings.SITH_TWITTER }}" />
+  <meta property="og:url"                content="{{ news.get_full_url() }}" />
+  <meta property="og:type"               content="article" />
+  <meta property="og:title"              content="{{ news.title }}" />
+  <meta property="og:description"        content="{{ news.summary }}" />
+  <meta property="og:image"              content="{{ "https://%s%s" % (settings.SITH_URL, link_news_logo(news)) }}" />
 {%- endmacro %}
 
 {% macro facebook_share(news) -%}
-<a rel="nofollow" target="#" class="share_button facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ news.get_full_url() }}">{% trans %}Share on Facebook{% endtrans %}</a>
+  <a rel="nofollow" target="#" class="share_button facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ news.get_full_url() }}">{% trans %}Share on Facebook{% endtrans %}</a>
 {%- endmacro %}
 
 {% macro tweet(news) -%}
-<a rel="nofollow" target="#" class="share_button twitter" href="https://twitter.com/intent/tweet?text={{ news.get_full_url() }}">{% trans %}Tweet{% endtrans %}</a>
+  <a rel="nofollow" target="#" class="share_button twitter" href="https://twitter.com/intent/tweet?text={{ news.get_full_url() }}">{% trans %}Tweet{% endtrans %}</a>
 {%- endmacro %}
 
 {% macro fb_quick(news) -%}
-<a rel="nofollow" target="#" href="https://www.facebook.com/sharer/sharer.php?u={{ news.get_full_url() }}" class="fb fa fa-facebook-square fa-2x"></a>
+  <a rel="nofollow" target="#" href="https://www.facebook.com/sharer/sharer.php?u={{ news.get_full_url() }}" class="fb fa fa-facebook-square fa-2x"></a>
 {%- endmacro %}
 
 {% macro tweet_quick(news) -%}
-<a rel="nofollow" target="#" href="https://twitter.com/intent/tweet?text={{ news.get_full_url() }}" class="twitter fa fa-twitter-square fa-2x"></a>
+  <a rel="nofollow" target="#" href="https://twitter.com/intent/tweet?text={{ news.get_full_url() }}" class="twitter fa fa-twitter-square fa-2x"></a>
 {%- endmacro %}
 
 {% macro user_mini_profile(user) %}
-<div class="user_mini_profile">
+  <div class="user_mini_profile">
     <div class="user_mini_profile_infos">
-        <div class="user_mini_profile_infos_text">
-            <div class="user_mini_profile_name">{{ user.get_full_name() }}</div>
-            {% if user.nick_name %}
-            <div class="user_mini_profile_nick">&laquo; {{ user.nick_name }} &raquo;</div>
-            {% endif %}
-            {% if user.pronouns %}
-            <div class="user_mini_profile_pronouns">{{ user.pronouns }}</div>
-            {% endif %}
-            {% if user.date_of_birth %}
-            <div class="user_mini_profile_dob">
-                {{ user.date_of_birth|date("d/m/Y") }} ({{ user.get_age() }})
-            </div>
-            {% endif %}
-        </div>
-        {% if user.promo %}
+      <div class="user_mini_profile_infos_text">
+        <div class="user_mini_profile_name">{{ user.get_full_name() }}</div>
+        {% if user.nick_name %}
+          <div class="user_mini_profile_nick">&laquo; {{ user.nick_name }} &raquo;</div>
+        {% endif %}
+        {% if user.pronouns %}
+          <div class="user_mini_profile_pronouns">{{ user.pronouns }}</div>
+        {% endif %}
+        {% if user.date_of_birth %}
+          <div class="user_mini_profile_dob">
+            {{ user.date_of_birth|date("d/m/Y") }} ({{ user.get_age() }})
+          </div>
+        {% endif %}
+      </div>
+      {% if user.promo %}
         <div class="user_mini_profile_promo">
-            <img src="{{ static('core/img/promo_%02d.png' % user.promo) }}" title="Promo {{ user.promo }}" alt="Promo {{ user.promo }}" class="promo_pict" />
+          <img src="{{ static('core/img/promo_%02d.png' % user.promo) }}" title="Promo {{ user.promo }}" alt="Promo {{ user.promo }}" class="promo_pict" />
         </div>
-        {% endif %}
+      {% endif %}
     </div>
     <div class="user_mini_profile_picture">
-    {% if user.profile_pict %}
+      {% if user.profile_pict %}
         <img src="{{ user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" />
-    {% else %}
+      {% else %}
         <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}"
-            title="{% trans %}Profile{% endtrans %}" />
-    {% endif %}
+             title="{% trans %}Profile{% endtrans %}" />
+      {% endif %}
     </div>
-</div>
+  </div>
 {%- endmacro %}
 
 {% macro user_subscription(user) %}
-        {% trans subscription_end=user.subscriptions.order_by('subscription_end').last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/>
-        {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}<br/>
+  {% trans subscription_end=user.subscriptions.order_by('subscription_end').last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/>
+  {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}<br/>
 {%- endmacro %}
 
 {% macro show_slots(user) %}
-    {% if user.slots.filter(start_date__gte=timezone.now()).exists() %}
-        <h5>{% trans %}Slot{% endtrans %}</h5>
-        <ul>
-        {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %}
-            <li>{{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} :
-            {{ i.start_date|time(DATETIME_FORMAT) }} |
-            <a href="{{ url('launderette:delete_slot', slot_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></li>
-        {% endfor %}
-        </ul>
-    {% endif %}
+  {% if user.slots.filter(start_date__gte=timezone.now()).exists() %}
+    <h5>{% trans %}Slot{% endtrans %}</h5>
+    <ul>
+      {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %}
+        <li>{{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} :
+          {{ i.start_date|time(DATETIME_FORMAT) }} |
+          <a href="{{ url('launderette:delete_slot', slot_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></li>
+      {% endfor %}
+    </ul>
+  {% endif %}
 {% endmacro %}
 
 {% macro show_tokens(user) %}
-    {% if user.tokens.exists() %}
-        <h5>{% trans %}Tokens{% endtrans %}</h5>
-        <ul>
-        {% for i in user.tokens.all() %}
-            <li>{{ i }}</li>
-        {% endfor %}
-        </ul>
-    {% endif %}
+  {% if user.tokens.exists() %}
+    <h5>{% trans %}Tokens{% endtrans %}</h5>
+    <ul>
+      {% for i in user.tokens.all() %}
+        <li>{{ i }}</li>
+      {% endfor %}
+    </ul>
+  {% endif %}
 {% endmacro %}
 
 {% macro delete_godfather(user, profile, godfather, is_father) %}
-    {% if user == profile or user.is_root or user.is_board_member %}
+  {% if user == profile or user.is_root or user.is_board_member %}
     <a href="{{ url("core:user_godfathers_delete", user_id=profile.id, godfather_id=godfather.id, is_father=is_father) }}">{% trans %}Delete{% endtrans %}</a>
-    {% endif %}
+  {% endif %}
 {% endmacro %}
 
 {% macro paginate(page_obj, paginator, js_action) %}
-    {% set js = js_action|default('') %}
-    {% if page_obj.has_previous() or page_obj.has_next() %}
-        {% if page_obj.has_previous() %}
-            <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
-        {% else %}
-            <span class="disabled">{% trans %}Previous{% endtrans %}</span>
-        {% endif %}
-        {% for i in paginator.page_range %}
-            {% if page_obj.number == i %}
-                <span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
-            {% else %}
-                <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ i }}">{{ i }}</a>
-            {% endif %}
-        {% endfor %}
-        {% if page_obj.has_next() %}
-            <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
-        {% else %}
-            <span class="disabled">{% trans %}Next{% endtrans %}</span>
-        {% endif %}
+  {% set js = js_action|default('') %}
+  {% if page_obj.has_previous() or page_obj.has_next() %}
+    {% if page_obj.has_previous() %}
+      <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
+    {% else %}
+      <span class="disabled">{% trans %}Previous{% endtrans %}</span>
+    {% endif %}
+    {% for i in paginator.page_range %}
+      {% if page_obj.number == i %}
+        <span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
+      {% else %}
+        <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ i }}">{{ i }}</a>
+      {% endif %}
+    {% endfor %}
+    {% if page_obj.has_next() %}
+      <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
+    {% else %}
+      <span class="disabled">{% trans %}Next{% endtrans %}</span>
     {% endif %}
+  {% endif %}
 {% endmacro %}
 
 {% macro select_all_checkbox(form_id) %}
-    <script type="text/javascript">
-        function checkbox_{{form_id}}(value) {
-            list = document.getElementById("{{ form_id }}").getElementsByTagName("input");
-            for (let element of list){
-              if (element.type == "checkbox"){
-                element.checked = value;
-              }
-            }
+  <script type="text/javascript">
+    function checkbox_{{form_id}}(value) {
+      list = document.getElementById("{{ form_id }}").getElementsByTagName("input");
+      for (let element of list){
+        if (element.type == "checkbox"){
+          element.checked = value;
         }
-    </script>
-    <button type="button" onclick="checkbox_{{form_id}}(true);">{% trans %}Select All{% endtrans %}</button>
-    <button type="button" onclick="checkbox_{{form_id}}(false);">{% trans %}Unselect All{% endtrans %}</button>
+      }
+    }
+  </script>
+  <button type="button" onclick="checkbox_{{form_id}}(true);">{% trans %}Select All{% endtrans %}</button>
+  <button type="button" onclick="checkbox_{{form_id}}(false);">{% trans %}Unselect All{% endtrans %}</button>
 {% endmacro %}
diff --git a/core/templates/core/macros_pages.jinja b/core/templates/core/macros_pages.jinja
index 4f486a2f8..c18bfe31c 100644
--- a/core/templates/core/macros_pages.jinja
+++ b/core/templates/core/macros_pages.jinja
@@ -1,27 +1,27 @@
 {% from "core/macros.jinja" import user_profile_link %}
 
 {% macro page_history(page) %}
-<p>{% trans page_name=page.name %}You're seeing the history of page "{{ page_name }}"{% endtrans %}</p>
-<ul>
+  <p>{% trans page_name=page.name %}You're seeing the history of page "{{ page_name }}"{% endtrans %}</p>
+  <ul>
     {% for r in (page.revisions.all()|sort(attribute='date', reverse=True)) %}
-        {% if loop.index < 2 %}
+      {% if loop.index < 2 %}
         <li><a href="{{ url('core:page', page_name=page.get_full_name()) }}">{% trans %}last{% endtrans %}</a> -
-        {{ user_profile_link(page.revisions.last().author) }} -
-        {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }}</a></li>
-        {% else %}
+          {{ user_profile_link(page.revisions.last().author) }} -
+          {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }}</a></li>
+      {% else %}
         <li><a href="{{ url('core:page_rev', page_name=page.get_full_name(), rev=r['id']) }}">{{ r.revision }}</a> -
-        {{ user_profile_link(r.author) }} -
-        {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }}</a></li>
-        {% endif %}
+          {{ user_profile_link(r.author) }} -
+          {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }}</a></li>
+      {% endif %}
     {% endfor %}
-</ul>
+  </ul>
 {% endmacro %}
 
 {% macro page_edit_form(page, form, url, token) %}
-<h2>{% trans %}Edit page{% endtrans %}</h2>
-<form action="{{ url }}" method="post">
+  <h2>{% trans %}Edit page{% endtrans %}</h2>
+  <form action="{{ url }}" method="post">
     <input type="hidden" name="csrfmiddlewaretoken" value="{{ token }}">
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endmacro %}
diff --git a/core/templates/core/markdown_textarea.jinja b/core/templates/core/markdown_textarea.jinja
index 9f94c4d35..a97dc80fb 100644
--- a/core/templates/core/markdown_textarea.jinja
+++ b/core/templates/core/markdown_textarea.jinja
@@ -1,198 +1,198 @@
 <div>
 	{# Depends on this package https://github.com/lonaru/easy-markdown-editor #}
-	<textarea name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea>
+  <textarea name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea>
 
 	{# The easymde script can be included twice, it's safe in the code #}
-	<script src="{{ statics.js }}"> </script>
-	<script type="text/javascript">
-		$(function() {
-			const css = "{{ statics.css }}";
-			let lastAPICall;
+  <script src="{{ statics.js }}"> </script>
+  <script type="text/javascript">
+    $(function() {
+      const css = "{{ statics.css }}";
+      let lastAPICall;
 
 			// Only import the css once
-			if (!document.head.innerHTML.includes(css)) {
-				document.head.innerHTML += '<link rel="stylesheet" href="' + css + '">';
-			}
+      if (!document.head.innerHTML.includes(css)) {
+        document.head.innerHTML += '<link rel="stylesheet" href="' + css + '">';
+      }
 
 			// Pretty markdown input
-			const easymde = new EasyMDE({
-				element: document.getElementById("{{ widget.attrs.id }}"),
-				spellChecker: false,
-				autoDownloadFontAwesome: false,
-				previewRender: function (plainText, preview) {
-					clearTimeout(lastAPICall);
-					lastAPICall = setTimeout(async () => {
-                        const res = await fetch("{{ markdown_api_url }}", {
-                            method: "POST",
-                            body: JSON.stringify({ text: plainText }),
-                        });
-                        preview.innerHTML = await res.text();
-					}, 300);
-                    return null;
-				},
-				forceSync: true, // Avoid validation error on generic create view
-				toolbar: [
-					{
-						name: "heading-smaller",
-						action: EasyMDE.toggleHeadingSmaller,
-						className: "fa fa-header",
-						title: "{{ translations.heading_smaller }}"
-					},
-					{
-						name: "italic",
-						action: EasyMDE.toggleItalic,
-						className: "fa fa-italic",
-						title: "{{ translations.italic }}"
-					},
-					{
-						name: "bold",
-						action: EasyMDE.toggleBold,
-						className: "fa fa-bold",
-						title: "{{ translations.bold }}"
-					},
-					{
-						name: "strikethrough",
-						action: EasyMDE.toggleStrikethrough,
-						className: "fa fa-strikethrough",
-						title: "{{ translations.strikethrough }}"
-					},
-					{
-						name: "underline",
-						action: function customFunction(editor){
-							let cm = editor.codemirror;
-							cm.replaceSelection('__' + cm.getSelection() + '__');
-						},
-						className: "fa fa-underline",
-						title: "{{ translations.underline }}"
-					},
-					{
-						name: "superscript",
-						action: function customFunction(editor){
-							let cm = editor.codemirror;
-							cm.replaceSelection('^' + cm.getSelection() + '^');
-						},
-						className: "fa fa-superscript",
-						title: "{{ translations.superscript }}"
-					},
-					{
-						name: "subscript",
-						action: function customFunction(editor){
-							let cm = editor.codemirror;
-							cm.replaceSelection('~' + cm.getSelection() + '~');
-						},
-						className: "fa fa-subscript",
-						title: "{{ translations.subscript }}"
-					},
-					{
-						name: "code",
-						action: EasyMDE.toggleCodeBlock,
-						className: "fa fa-code",
-						title: "{{ translations.code }}"
-					},
-					"|",
-					{
-						name: "quote",
-						action: EasyMDE.toggleBlockquote,
-						className: "fa fa-quote-left",
-						title: "{{ translations.quote }}"
-					},
-					{
-						name: "unordered-list",
-						action: EasyMDE.toggleUnorderedList,
-						className: "fa fa-list-ul",
-						title: "{{ translations.unordered_list }}"
-					},
-					{
-						name: "ordered-list",
-						action: EasyMDE.toggleOrderedList,
-						className: "fa fa-list-ol",
-						title: "{{ translations.ordered_list }}"
-					},
-					"|",
-					{
-						name: "link",
-						action: EasyMDE.drawLink,
-						className: "fa fa-link",
-						title: "{{ translations.link }}"
-					},
-					{
-						name: "image",
-						action: EasyMDE.drawImage,
-						className: "fa fa-picture-o",
-						title: "{{ translations.image }}"
-					},
-					{
-						name: "table",
-						action: EasyMDE.drawTable,
-						className: "fa fa-table",
-						title: "{{ translations.table }}"
-					},
-					"|",
-					{
-						name: "clean-block",
-						action: EasyMDE.cleanBlock,
-						className: "fa fa-eraser fa-clean-block",
-						title: "{{ translations.clean_block }}"
-					},
-					"|",
-					{
-						name: "preview",
-						action: EasyMDE.togglePreview,
-						className: "fa fa-eye no-disable",
-						title: "{{ translations.preview }}"
-					},
-					{
-						name: "side-by-side",
-						action: EasyMDE.toggleSideBySide,
-						className: "fa fa-columns no-disable no-mobile",
-						title: "{{ translations.side_by_side }}"
-					},
-					{
-						name: "fullscreen",
-						action: EasyMDE.toggleFullScreen,
-						className: "fa fa-arrows-alt no-disable no-mobile",
-						title: "{{ translations.fullscreen }}"
-					},
-					"|",
-					{
-						name: "guide",
-						action: "/page/Aide_sur_la_syntaxe",
-						className: "fa fa-question-circle",
-						title: "{{ translations.guide }}"
-					},
-				]
-			});
+      const easymde = new EasyMDE({
+        element: document.getElementById("{{ widget.attrs.id }}"),
+        spellChecker: false,
+        autoDownloadFontAwesome: false,
+        previewRender: function (plainText, preview) {
+          clearTimeout(lastAPICall);
+          lastAPICall = setTimeout(async () => {
+            const res = await fetch("{{ markdown_api_url }}", {
+              method: "POST",
+              body: JSON.stringify({ text: plainText }),
+            });
+            preview.innerHTML = await res.text();
+          }, 300);
+          return null;
+        },
+        forceSync: true, // Avoid validation error on generic create view
+        toolbar: [
+          {
+            name: "heading-smaller",
+            action: EasyMDE.toggleHeadingSmaller,
+            className: "fa fa-header",
+            title: "{{ translations.heading_smaller }}"
+          },
+          {
+            name: "italic",
+            action: EasyMDE.toggleItalic,
+            className: "fa fa-italic",
+            title: "{{ translations.italic }}"
+          },
+          {
+            name: "bold",
+            action: EasyMDE.toggleBold,
+            className: "fa fa-bold",
+            title: "{{ translations.bold }}"
+          },
+          {
+            name: "strikethrough",
+            action: EasyMDE.toggleStrikethrough,
+            className: "fa fa-strikethrough",
+            title: "{{ translations.strikethrough }}"
+          },
+          {
+            name: "underline",
+            action: function customFunction(editor){
+              let cm = editor.codemirror;
+              cm.replaceSelection('__' + cm.getSelection() + '__');
+            },
+            className: "fa fa-underline",
+            title: "{{ translations.underline }}"
+          },
+          {
+            name: "superscript",
+            action: function customFunction(editor){
+              let cm = editor.codemirror;
+              cm.replaceSelection('^' + cm.getSelection() + '^');
+            },
+            className: "fa fa-superscript",
+            title: "{{ translations.superscript }}"
+          },
+          {
+            name: "subscript",
+            action: function customFunction(editor){
+              let cm = editor.codemirror;
+              cm.replaceSelection('~' + cm.getSelection() + '~');
+            },
+            className: "fa fa-subscript",
+            title: "{{ translations.subscript }}"
+          },
+          {
+            name: "code",
+            action: EasyMDE.toggleCodeBlock,
+            className: "fa fa-code",
+            title: "{{ translations.code }}"
+          },
+          "|",
+          {
+            name: "quote",
+            action: EasyMDE.toggleBlockquote,
+            className: "fa fa-quote-left",
+            title: "{{ translations.quote }}"
+          },
+          {
+            name: "unordered-list",
+            action: EasyMDE.toggleUnorderedList,
+            className: "fa fa-list-ul",
+            title: "{{ translations.unordered_list }}"
+          },
+          {
+            name: "ordered-list",
+            action: EasyMDE.toggleOrderedList,
+            className: "fa fa-list-ol",
+            title: "{{ translations.ordered_list }}"
+          },
+          "|",
+          {
+            name: "link",
+            action: EasyMDE.drawLink,
+            className: "fa fa-link",
+            title: "{{ translations.link }}"
+          },
+          {
+            name: "image",
+            action: EasyMDE.drawImage,
+            className: "fa fa-picture-o",
+            title: "{{ translations.image }}"
+          },
+          {
+            name: "table",
+            action: EasyMDE.drawTable,
+            className: "fa fa-table",
+            title: "{{ translations.table }}"
+          },
+          "|",
+          {
+            name: "clean-block",
+            action: EasyMDE.cleanBlock,
+            className: "fa fa-eraser fa-clean-block",
+            title: "{{ translations.clean_block }}"
+          },
+          "|",
+          {
+            name: "preview",
+            action: EasyMDE.togglePreview,
+            className: "fa fa-eye no-disable",
+            title: "{{ translations.preview }}"
+          },
+          {
+            name: "side-by-side",
+            action: EasyMDE.toggleSideBySide,
+            className: "fa fa-columns no-disable no-mobile",
+            title: "{{ translations.side_by_side }}"
+          },
+          {
+            name: "fullscreen",
+            action: EasyMDE.toggleFullScreen,
+            className: "fa fa-arrows-alt no-disable no-mobile",
+            title: "{{ translations.fullscreen }}"
+          },
+          "|",
+          {
+            name: "guide",
+            action: "/page/Aide_sur_la_syntaxe",
+            className: "fa fa-question-circle",
+            title: "{{ translations.guide }}"
+          },
+        ]
+      });
 
-			const textarea = document.getElementById('{{ widget.attrs.id }}');
-			const submits = textarea
-				.closest('form')
-				.querySelectorAll('input[type="submit"]');
-			const parentDiv = textarea.parentElement;
-			let submitPressed = false;
+      const textarea = document.getElementById('{{ widget.attrs.id }}');
+      const submits = textarea
+        .closest('form')
+        .querySelectorAll('input[type="submit"]');
+      const parentDiv = textarea.parentElement;
+      let submitPressed = false;
 
-			function checkMarkdownInput(e) {
+      function checkMarkdownInput(e) {
 				// an attribute is null if it does not exist, else a string
-				const required = textarea.getAttribute('required') != null;
-				const length = textarea.value.trim().length;
+        const required = textarea.getAttribute('required') != null;
+        const length = textarea.value.trim().length;
 
-				if (required && length == 0) {
-					parentDiv.style.boxShadow = 'red 0px 0px 1.5px 1px';
-				} else {
-					parentDiv.style.boxShadow = '';
-				}
-			}
+        if (required && length == 0) {
+          parentDiv.style.boxShadow = 'red 0px 0px 1.5px 1px';
+        } else {
+          parentDiv.style.boxShadow = '';
+        }
+      }
 
-			function onSubmitClick(e) {
-				if (!submitPressed) {
-					easymde.codemirror.on('change', checkMarkdownInput);
-				}
-				submitPressed = true;
-				checkMarkdownInput(e);
-			}
+      function onSubmitClick(e) {
+        if (!submitPressed) {
+          easymde.codemirror.on('change', checkMarkdownInput);
+        }
+        submitPressed = true;
+        checkMarkdownInput(e);
+      }
 
-			submits.forEach((submit) => {
-				submit.addEventListener('click', onSubmitClick);
-			})
-		})
-	</script>
+      submits.forEach((submit) => {
+        submit.addEventListener('click', onSubmitClick);
+      })
+    })
+  </script>
 </div>
diff --git a/core/templates/core/new_user_email.jinja b/core/templates/core/new_user_email.jinja
index e23c6b16e..6dff5b3cb 100644
--- a/core/templates/core/new_user_email.jinja
+++ b/core/templates/core/new_user_email.jinja
@@ -1,17 +1,17 @@
 {% autoescape off %}
-{% trans %}You're receiving this email because you subscribed to the UTBM student association.{% endtrans %}
+  {% trans %}You're receiving this email because you subscribed to the UTBM student association.{% endtrans %}
 
-{% trans %}Please go to the following page and choose a new password:{% endtrans %}
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
-{% endblock %}
-{% trans %}Your username, in case it was not given to you: {% endtrans %} {{ user.get_username() }}
-{% trans %}You also got a new account that will be useful to purchase products in the living areas and on the Eboutic.{% endtrans %}
-{% trans account=user.customer.account_id %}Here is your account number: {{ account }}{% endtrans %}
+  {% trans %}Please go to the following page and choose a new password:{% endtrans %}
+  {% block reset_link %}
+    {{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
+  {% endblock %}
+  {% trans %}Your username, in case it was not given to you: {% endtrans %} {{ user.get_username() }}
+  {% trans %}You also got a new account that will be useful to purchase products in the living areas and on the Eboutic.{% endtrans %}
+  {% trans account=user.customer.account_id %}Here is your account number: {{ account }}{% endtrans %}
 
-{% trans %}Thanks for subscribing! {% endtrans %}
+  {% trans %}Thanks for subscribing! {% endtrans %}
 
-{% trans %}The AE team{% endtrans %}
+  {% trans %}The AE team{% endtrans %}
 
 {% endautoescape %}
 
diff --git a/core/templates/core/new_user_email_subject.jinja b/core/templates/core/new_user_email_subject.jinja
index 103149c47..f992d0a74 100644
--- a/core/templates/core/new_user_email_subject.jinja
+++ b/core/templates/core/new_user_email_subject.jinja
@@ -1,3 +1,3 @@
 {% autoescape off %}
-{% trans %}New subscription to the UTBM student association{% endtrans %}
+  {% trans %}New subscription to the UTBM student association{% endtrans %}
 {% endautoescape %}
diff --git a/core/templates/core/notification_list.jinja b/core/templates/core/notification_list.jinja
index 412d79f4a..3b8f2a6b5 100644
--- a/core/templates/core/notification_list.jinja
+++ b/core/templates/core/notification_list.jinja
@@ -1,24 +1,24 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Notification list{% endtrans %}
+  {% trans %}Notification list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}Notification list{% endtrans %}</h3>
-<ul id="notifications">
-{% for n in notification_list %}
-    {% if n.viewed %}
-    <li>
-    {% else %}
-    <li style="background: lightgrey;">
-    {% endif %}
-        <a href="{{ url("core:notification", notif_id=n.id) }}">
+  <h3>{% trans %}Notification list{% endtrans %}</h3>
+  <ul id="notifications">
+    {% for n in notification_list %}
+      {% if n.viewed %}
+        <li>
+      {% else %}
+        <li style="background: lightgrey;">
+      {% endif %}
+      <a href="{{ url("core:notification", notif_id=n.id) }}">
         <span style="font-size: small; ">{{ n.date|localtime|date(DATE_FORMAT) }} {{
-            n.date|localtime|time(DATETIME_FORMAT) }}</span><br>
+          n.date|localtime|time(DATETIME_FORMAT) }}</span><br>
         {{ n }}</a>
-    </li>
-{% endfor %}
-</ul>
+      </li>
+    {% endfor %}
+  </ul>
 {% endblock %}
 
diff --git a/core/templates/core/page.jinja b/core/templates/core/page.jinja
index 73a586767..620839aa6 100644
--- a/core/templates/core/page.jinja
+++ b/core/templates/core/page.jinja
@@ -1,53 +1,53 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% if page %}
-{{ page.get_display_name() }}
-{% elif page_list %}
-{% trans %}Page list{% endtrans %}
-{% elif new_page %}
-{% trans %}Create page{% endtrans %}
-{% else %}
-{% trans %}Not found{% endtrans %}
-{% endif %}
+  {% if page %}
+    {{ page.get_display_name() }}
+  {% elif page_list %}
+    {% trans %}Page list{% endtrans %}
+  {% elif new_page %}
+    {% trans %}Create page{% endtrans %}
+  {% else %}
+    {% trans %}Not found{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 {% macro print_page_name(page) %}
-{% if page %}
-{{ print_page_name(page.parent) }} >
-<a href="{{ url('core:page', page_name=page.get_full_name()) }}">{{ page.get_display_name() }}</a>
-{% endif %}
+  {% if page %}
+    {{ print_page_name(page.parent) }} >
+    <a href="{{ url('core:page', page_name=page.get_full_name()) }}">{{ page.get_display_name() }}</a>
+  {% endif %}
 {% endmacro %}
 
 {% block content %}
-{{ print_page_name(page) }}
+  {{ print_page_name(page) }}
 
-<div class="tool_bar">
+  <div class="tool_bar">
     <div class="tools">
-        {% if page %}
+      {% if page %}
         {% if page.club %}
-        <a href="{{ url('club:club_view', club_id=page.club.id) }}">{% trans %}Return to club management{% endtrans %}</a>
+          <a href="{{ url('club:club_view', club_id=page.club.id) }}">{% trans %}Return to club management{% endtrans %}</a>
         {% else %}
-        <a href="{{ url('core:page', page.get_full_name()) }}">{% trans %}View{% endtrans %}</a>
+          <a href="{{ url('core:page', page.get_full_name()) }}">{% trans %}View{% endtrans %}</a>
         {% endif %}
         <a href="{{ url('core:page_hist', page_name=page.get_full_name()) }}">{% trans %}History{% endtrans %}</a>
         {% if can_edit(page, user) %}
-        <a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">{% trans %}Edit{% endtrans %}</a>
+          <a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">{% trans %}Edit{% endtrans %}</a>
         {% endif %}
         {% if can_edit_prop(page, user) and not page.is_club_page %}
-        <a href="{{ url('core:page_prop', page_name=page.get_full_name()) }}">{% trans %}Prop{% endtrans %}</a>
-        {% endif %}
+          <a href="{{ url('core:page_prop', page_name=page.get_full_name()) }}">{% trans %}Prop{% endtrans %}</a>
         {% endif %}
+      {% endif %}
     </div>
-</div>
-<hr>
+  </div>
+  <hr>
 
-{% if page %}
-{% block page %}
-{% endblock %}
-{% else %}
-<h2>{% trans %}Page does not exist{% endtrans %}</h2>
-<p><a href="{{ url('core:page_new') }}?page={{ request.resolver_match.kwargs['page_name'] }}">
-    {% trans %}Create it?{% endtrans %}</a></p>
-{% endif %}
+  {% if page %}
+    {% block page %}
+    {% endblock %}
+  {% else %}
+    <h2>{% trans %}Page does not exist{% endtrans %}</h2>
+    <p><a href="{{ url('core:page_new') }}?page={{ request.resolver_match.kwargs['page_name'] }}">
+      {% trans %}Create it?{% endtrans %}</a></p>
+  {% endif %}
 {% endblock %}
diff --git a/core/templates/core/page_detail.jinja b/core/templates/core/page_detail.jinja
index afa5d3ca8..054ee6122 100644
--- a/core/templates/core/page_detail.jinja
+++ b/core/templates/core/page_detail.jinja
@@ -1,16 +1,16 @@
 {% extends "core/page.jinja" %}
 
 {% block page %}
-{% if rev %}
-<h4>{% trans rev_id=rev.revision %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}</h4>
-<h3>{{ rev.title }}</h3>
-<div class="page_content">{{ rev.content|markdown }}</div>
-{% else %}
-{% if page.revisions.last() %}
-<h3>{{ page.revisions.last().title }}</h3>
-<div class="page_content">{{ page.revisions.last().content|markdown }}</div>
-{% endif %}
-{% endif %}
+  {% if rev %}
+    <h4>{% trans rev_id=rev.revision %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}</h4>
+    <h3>{{ rev.title }}</h3>
+    <div class="page_content">{{ rev.content|markdown }}</div>
+  {% else %}
+    {% if page.revisions.last() %}
+      <h3>{{ page.revisions.last().title }}</h3>
+      <div class="page_content">{{ page.revisions.last().content|markdown }}</div>
+    {% endif %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/core/templates/core/page_hist.jinja b/core/templates/core/page_hist.jinja
index 6f363f7b3..4aac13b1e 100644
--- a/core/templates/core/page_hist.jinja
+++ b/core/templates/core/page_hist.jinja
@@ -3,8 +3,8 @@
 {% from "core/macros_pages.jinja" import page_history %}
 
 {% block page %}
-    <h3>{% trans %}Page history{% endtrans %}</h3>
-{{ page_history(page) }}
+  <h3>{% trans %}Page history{% endtrans %}</h3>
+  {{ page_history(page) }}
 {% endblock %}
 
 
diff --git a/core/templates/core/page_list.jinja b/core/templates/core/page_list.jinja
index 39e9b69fc..dfb8ea48f 100644
--- a/core/templates/core/page_list.jinja
+++ b/core/templates/core/page_list.jinja
@@ -1,20 +1,20 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Page list{% endtrans %}
+  {% trans %}Page list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if page_list %}
-<h3>{% trans %}Page list{% endtrans %}</h3>
-<ul>
-    {% for p in page_list %}
-    <li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no page in this website.{% endtrans %}
-{% endif %}
+  {% if page_list %}
+    <h3>{% trans %}Page list{% endtrans %}</h3>
+    <ul>
+      {% for p in page_list %}
+        <li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no page in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/core/templates/core/page_prop.jinja b/core/templates/core/page_prop.jinja
index 9207f52cb..978ec3858 100644
--- a/core/templates/core/page_prop.jinja
+++ b/core/templates/core/page_prop.jinja
@@ -1,18 +1,18 @@
 {% extends "core/page.jinja" %}
 
 {% block content %}
-{% if page %}
-{{ super() }}
-{% endif %}
-<h2>{% trans %}Page properties{% endtrans %}</h2>
-<form action="" method="post">
+  {% if page %}
+    {{ super() }}
+  {% endif %}
+  <h2>{% trans %}Page properties{% endtrans %}</h2>
+  <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
-{% if page %}
-<a href="{{ url('core:page_delete', page_id=page.id)}}">{% trans %}Delete{% endtrans %}</a>
-{% endif %}
+  </form>
+  {% if page %}
+    <a href="{{ url('core:page_delete', page_id=page.id)}}">{% trans %}Delete{% endtrans %}</a>
+  {% endif %}
 {% endblock %}
 
 
diff --git a/core/templates/core/pagerev_edit.jinja b/core/templates/core/pagerev_edit.jinja
index 9e188d4f5..2d1bb6a0a 100644
--- a/core/templates/core/pagerev_edit.jinja
+++ b/core/templates/core/pagerev_edit.jinja
@@ -2,7 +2,7 @@
 {% from 'core/macros_pages.jinja' import page_edit_form %}
 
 {% block page %}
-{{ page_edit_form(page, form, url('core:page_edit', page_name=page.get_full_name()), csrf_token) }}
+  {{ page_edit_form(page, form, url('core:page_edit', page_name=page.get_full_name()), csrf_token) }}
 {% endblock %}
 
 
diff --git a/core/templates/core/password_change.jinja b/core/templates/core/password_change.jinja
index a81baf551..7cd27b1e6 100644
--- a/core/templates/core/password_change.jinja
+++ b/core/templates/core/password_change.jinja
@@ -2,12 +2,12 @@
 
 {% block content %}
 
-{% if target %}
+  {% if target %}
     <p>{% trans user=target.get_display_name() %}Change password for {{ user }}{% endtrans %}</p>
-{% endif %}
-<form method="post" action="">
-{% csrf_token %}
-{{ form.as_p() }}
-<input type="submit" value="{% trans %}Change{% endtrans %}" />
-</form>
+  {% endif %}
+  <form method="post" action="">
+    {% csrf_token %}
+    {{ form.as_p() }}
+    <input type="submit" value="{% trans %}Change{% endtrans %}" />
+  </form>
 {% endblock %}
diff --git a/core/templates/core/password_change_done.jinja b/core/templates/core/password_change_done.jinja
index fbb570da1..86ce14078 100644
--- a/core/templates/core/password_change_done.jinja
+++ b/core/templates/core/password_change_done.jinja
@@ -1,6 +1,6 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<p>{% trans %}You successfully changed your password!{% endtrans %}</p>
+  <p>{% trans %}You successfully changed your password!{% endtrans %}</p>
 {% endblock %}
 
diff --git a/core/templates/core/password_reset.jinja b/core/templates/core/password_reset.jinja
index b0a63fc3b..3f141d711 100644
--- a/core/templates/core/password_reset.jinja
+++ b/core/templates/core/password_reset.jinja
@@ -1,10 +1,10 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<form method="post" action="">
-{% csrf_token %}
-{% render_honeypot_field %}
-{{ form.as_p() }}
-<input type="submit" value="{% trans %}Reset{% endtrans %}" />
-</form>
+  <form method="post" action="">
+    {% csrf_token %}
+    {% render_honeypot_field %}
+    {{ form.as_p() }}
+    <input type="submit" value="{% trans %}Reset{% endtrans %}" />
+  </form>
 {% endblock %}
diff --git a/core/templates/core/password_reset_complete.jinja b/core/templates/core/password_reset_complete.jinja
index fdd79b488..30898d71f 100644
--- a/core/templates/core/password_reset_complete.jinja
+++ b/core/templates/core/password_reset_complete.jinja
@@ -1,8 +1,8 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<p>{% trans %}You successfully reset your password!{% endtrans %}</p>
-<a href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>
+  <p>{% trans %}You successfully reset your password!{% endtrans %}</p>
+  <a href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>
 {% endblock %}
 
 
diff --git a/core/templates/core/password_reset_confirm.jinja b/core/templates/core/password_reset_confirm.jinja
index e90c9f367..fe172f1ff 100644
--- a/core/templates/core/password_reset_confirm.jinja
+++ b/core/templates/core/password_reset_confirm.jinja
@@ -1,14 +1,14 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-{% if form %}
-<form method="post" action="">
-{% csrf_token %}
-{{ form.as_p() }}
-<input type="submit" value="{% trans %}Reset{% endtrans %}" />
-</form>
-{% else %}
-{% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}<a href="{{ url('core:password_change') }}">{% trans %}lost password{% endtrans %}</a>.
-{% endif %}
+  {% if form %}
+    <form method="post" action="">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <input type="submit" value="{% trans %}Reset{% endtrans %}" />
+    </form>
+  {% else %}
+    {% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}<a href="{{ url('core:password_change') }}">{% trans %}lost password{% endtrans %}</a>.
+  {% endif %}
 {% endblock %}
 
diff --git a/core/templates/core/password_reset_done.jinja b/core/templates/core/password_reset_done.jinja
index 2f56cac14..f2743e8ac 100644
--- a/core/templates/core/password_reset_done.jinja
+++ b/core/templates/core/password_reset_done.jinja
@@ -1,15 +1,15 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<h2>{% trans %}Password reset sent{% endtrans %}</h2>
+  <h2>{% trans %}Password reset sent{% endtrans %}</h2>
 
-<p>
-{% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should
-receive them shortly.{% endtrans %}
-</p>
+  <p>
+    {% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should
+      receive them shortly.{% endtrans %}
+  </p>
 
-<p>
-{% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam
-folder.{% endtrans %}
-</p>
+  <p>
+    {% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam
+      folder.{% endtrans %}
+  </p>
 {% endblock %}
diff --git a/core/templates/core/password_reset_email.jinja b/core/templates/core/password_reset_email.jinja
index 65532865e..6e0f6f63f 100644
--- a/core/templates/core/password_reset_email.jinja
+++ b/core/templates/core/password_reset_email.jinja
@@ -1,15 +1,15 @@
 {% autoescape off %}
-{% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %}
+  {% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %}
 
-{% trans %}Please go to the following page and choose a new password:{% endtrans %}
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
-{% endblock %}
-{% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }}
+  {% trans %}Please go to the following page and choose a new password:{% endtrans %}
+  {% block reset_link %}
+    {{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
+  {% endblock %}
+  {% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }}
 
-{% trans %}Thanks for using our site! {% endtrans %}
+  {% trans %}Thanks for using our site! {% endtrans %}
 
-{% trans %}The {{ site_name }} team{% endtrans %}
+  {% trans %}The {{ site_name }} team{% endtrans %}
 
 {% endautoescape %}
 
diff --git a/core/templates/core/poster_list.jinja b/core/templates/core/poster_list.jinja
index 816c8332e..fe65658c9 100644
--- a/core/templates/core/poster_list.jinja
+++ b/core/templates/core/poster_list.jinja
@@ -1,53 +1,53 @@
 {% extends "core/base.jinja" %}
 
 {% block script %}
-{{ super() }}
-<script src="{{ static('com/js/poster_list.js') }}"></script>
+  {{ super() }}
+  <script src="{{ static('com/js/poster_list.js') }}"></script>
 {% endblock %}
 
 
 {% block title %}
-{% trans %}Poster{% endtrans %}
+  {% trans %}Poster{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div id="poster_list">
+  <div id="poster_list">
 
     <div id="title">
-        <h3>{% trans %}Posters{% endtrans %}</h3>
-        <div id="links" class="right">
-            <a id="create" class="link" href="{{ url(app + ":poster_list") }}">{% trans %}Create{% endtrans %}</a>
-            {% if app == "com" %}
-                <a id="moderation" class="link" href="{{ url("com:poster_moderate_list") }}">{% trans %}Moderation{% endtrans %}</a>
-            {% endif %}
-        </div>
+      <h3>{% trans %}Posters{% endtrans %}</h3>
+      <div id="links" class="right">
+        <a id="create" class="link" href="{{ url(app + ":poster_list") }}">{% trans %}Create{% endtrans %}</a>
+        {% if app == "com" %}
+          <a id="moderation" class="link" href="{{ url("com:poster_moderate_list") }}">{% trans %}Moderation{% endtrans %}</a>
+        {% endif %}
+      </div>
     </div>
 
     <div id="posters">
 
-        {% if poster_list.count() == 0 %}
-            <div id="no-posters">{% trans %}No posters{% endtrans %}</div>
-        {% else %}
-
-            {% for poster in poster_list %}
-                <div class="poster">
-                    <div class="name">{{ poster.name }}</div>
-                    <div class="image"><img src="{{ poster.file.url }}"></img></div>
-                    <div class="dates">
-                        <div class="begin">{{ poster.date_begin | date("d/M/Y H:m") }}</div>
-                        <div class="end">{{ poster.date_end | date("d/M/Y H:m") }}</div>
-                    </div>
-                    <a class="edit" href="{{ url(poster_edit_url_name, poster.id) }}">{% trans %}Edit{% endtrans %}</a>
-                </div>
-            {% endfor %}
+      {% if poster_list.count() == 0 %}
+        <div id="no-posters">{% trans %}No posters{% endtrans %}</div>
+      {% else %}
 
-        {% endif %}
+        {% for poster in poster_list %}
+          <div class="poster">
+            <div class="name">{{ poster.name }}</div>
+            <div class="image"><img src="{{ poster.file.url }}"></img></div>
+            <div class="dates">
+              <div class="begin">{{ poster.date_begin | date("d/M/Y H:m") }}</div>
+              <div class="end">{{ poster.date_end | date("d/M/Y H:m") }}</div>
+            </div>
+            <a class="edit" href="{{ url(poster_edit_url_name, poster.id) }}">{% trans %}Edit{% endtrans %}</a>
+          </div>
+        {% endfor %}
+
+      {% endif %}
 
     </div>
 
     <div id="view"><div id="placeholder"></div></div>
 
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja
index c80d2f982..2ad7d4c1f 100644
--- a/core/templates/core/register.jinja
+++ b/core/templates/core/register.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-    <link rel="stylesheet" href="{{ scss('user/login.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/login.scss') }}">
 {%- endblock -%}
 
 {% block title %}{% trans %}Register{% endtrans %}{% endblock %}
@@ -13,13 +13,12 @@
 {% endblock %}
 
 {% block content %}
-    <h1 class="title">{% trans %}Register{% endtrans %}</h1>
+  <h1 class="title">{% trans %}Register{% endtrans %}</h1>
 
-    <form action="{{ url('core:register') }}" method="post">
-        {% csrf_token %}
-        {% render_honeypot_field %}
-        {{ form }}
-        <input type="submit" value="{% trans %}Register{% endtrans %}" />
-    </form>
+  <form action="{{ url('core:register') }}" method="post">
+    {% csrf_token %}
+    {% render_honeypot_field %}
+    {{ form }}
+    <input type="submit" value="{% trans %}Register{% endtrans %}" />
+  </form>
 {% endblock %}
- 
\ No newline at end of file
diff --git a/core/templates/core/register_confirm_mail.jinja b/core/templates/core/register_confirm_mail.jinja
index 9b3130358..2bc321b0b 100644
--- a/core/templates/core/register_confirm_mail.jinja
+++ b/core/templates/core/register_confirm_mail.jinja
@@ -1,17 +1,17 @@
 {% autoescape off %}
-{% trans %}You're receiving this email because you created an account on the AE website.{% endtrans %}
+  {% trans %}You're receiving this email because you created an account on the AE website.{% endtrans %}
 
-{% trans %}Your username, in case it was not given to you: {% endtrans %} {{ username }}
+  {% trans %}Your username, in case it was not given to you: {% endtrans %} {{ username }}
 
-{% trans %}
-As this is the website of the students of the AE, by the students of the AE,
-for the students of the AE, you won't be able to do many things without subscribing to the AE.
-To make a contribution, contact a member of the association's board, either directly or by email at ae@utbm.fr.
-{% endtrans %}
+  {% trans %}
+    As this is the website of the students of the AE, by the students of the AE,
+    for the students of the AE, you won't be able to do many things without subscribing to the AE.
+    To make a contribution, contact a member of the association's board, either directly or by email at ae@utbm.fr.
+  {% endtrans %}
 
-{% trans %}Wishing you a good experience among us! {% endtrans %}
+  {% trans %}Wishing you a good experience among us! {% endtrans %}
 
-{% trans %}The AE team{% endtrans %}
+  {% trans %}The AE team{% endtrans %}
 
 {% endautoescape %}
 
diff --git a/core/templates/core/screen_slideshow.jinja b/core/templates/core/screen_slideshow.jinja
index 4dd638842..9e386fcfe 100644
--- a/core/templates/core/screen_slideshow.jinja
+++ b/core/templates/core/screen_slideshow.jinja
@@ -1,30 +1,30 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
+  <head>
     <title>{% trans %}Slideshow{% endtrans %}</title>
     <link href="{{ scss('com/slideshow.scss') }}" rel="stylesheet" type="text/css" />
-</head>
-<body>
+  </head>
+  <body>
     <div id="slideshow">
 
-        <div id="slides">
+      <div id="slides">
         {% for poster in posters %}
-            <div class="slide {% if loop.first %}center{% else %}right{% endif %}" display_time="{{ poster.display_time }}">
-                <img src="{{ poster.file.url }}"></img>
-            </div>
+          <div class="slide {% if loop.first %}center{% else %}right{% endif %}" display_time="{{ poster.display_time }}">
+            <img src="{{ poster.file.url }}"></img>
+          </div>
         {% endfor %}
-        </div>
+      </div>
 
-        <div id="progress_bullets">
+      <div id="progress_bullets">
         {% for poster in posters %}
-            <div class="bullet {% if loop.first %}active{% endif %}"></div>
+          <div class="bullet {% if loop.first %}active{% endif %}"></div>
         {% endfor %}
-        </div>
+      </div>
 
-        <div id="progress_bar"></div>
+      <div id="progress_bar"></div>
 
     </div>
     <script src="{{ static('core/js/jquery-3.6.2.min.js') }}"></script>
     <script src="{{ static('com/js/slideshow.js') }}"></script>
-</body>
+  </body>
 </html>
diff --git a/core/templates/core/search.jinja b/core/templates/core/search.jinja
index bd38874e2..f413debb1 100644
--- a/core/templates/core/search.jinja
+++ b/core/templates/core/search.jinja
@@ -3,24 +3,24 @@
 {% from "core/macros.jinja" import user_link_with_pict %}
 
 {% block title %}
-    {% trans %}Search result{% endtrans %}
+  {% trans %}Search result{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <h4>{% trans %}Users{% endtrans %}</h4>
-    <ul>
+  <h4>{% trans %}Users{% endtrans %}</h4>
+  <ul>
     {% for i in result.users %}
-        <li>
+      <li>
         {{ user_link_with_pict(i) }}
-        </li>
+      </li>
     {% endfor %}
-    </ul>
-    <h4>{% trans %}Clubs{% endtrans %}</h4>
-    <ul>
+  </ul>
+  <h4>{% trans %}Clubs{% endtrans %}</h4>
+  <ul>
     {% for i in result.clubs %}
-        <li>
+      <li>
         <a href="{{ url("club:club_view", club_id=i.id) }}">{{ i }}</a>
-        </li>
+      </li>
     {% endfor %}
-    </ul>
+  </ul>
 {% endblock %}
diff --git a/core/templates/core/to_markdown.jinja b/core/templates/core/to_markdown.jinja
index 85ef0a711..06318d590 100644
--- a/core/templates/core/to_markdown.jinja
+++ b/core/templates/core/to_markdown.jinja
@@ -1,28 +1,28 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}To Markdown{% endtrans %}
+  {% trans %}To Markdown{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<form action="" method="post" enctype="multipart/form-data">
+  <form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <input type="radio" name="syntax" value="doku" {% if request.POST['syntax'] != "bbcode" %}checked{% endif %} >Doku</input>
     <input type="radio" name="syntax" value="bbcode" {% if request.POST['syntax'] == "bbcode" %}checked{% endif %} >BBCode</input>
     <textarea name="text" id="text" rows="30" cols="80">
-        {{- text -}}
+      {{- text -}}
     </textarea>
     <p><input type="submit" value="{% trans %}Convert{% endtrans %}" /></p>
-</form>
-<hr>
-<h6>{% trans %}Markdown{% endtrans %}</h6>
-<div style="border: 1px solid black; color: white; background: black; padding: 10px; margin: 5px;"><pre>{{- text_md -}}</pre>
-</div>
-<hr>
-<h6>{% trans %}Render{% endtrans %}</h6>
-<div style="border: 1px solid black; padding: 10px; margin: 5px;" class="page_content">
-{{ text_md|markdown }}
-</div>
+  </form>
+  <hr>
+  <h6>{% trans %}Markdown{% endtrans %}</h6>
+  <div style="border: 1px solid black; color: white; background: black; padding: 10px; margin: 5px;"><pre>{{- text_md -}}</pre>
+  </div>
+  <hr>
+  <h6>{% trans %}Render{% endtrans %}</h6>
+  <div style="border: 1px solid black; padding: 10px; margin: 5px;" class="page_content">
+    {{ text_md|markdown }}
+  </div>
 {% endblock %}
 
 
diff --git a/core/templates/core/user_account.jinja b/core/templates/core/user_account.jinja
index 2f9cfb311..c1a8b742c 100644
--- a/core/templates/core/user_account.jinja
+++ b/core/templates/core/user_account.jinja
@@ -1,83 +1,83 @@
 {% extends "core/base.jinja" %}
 
 {% macro monthly(obj) %}
-<div>
+  <div>
     <table>
-        <thead>
-            <tr>
-                <td>{% trans %}Year{% endtrans %}</td>
-                <td>{% trans %}Month{% endtrans %}</td>
-                <td>{% trans %}Total{% endtrans %}</td>
-            </tr>
-        </thead>
-        <tbody>
+      <thead>
+        <tr>
+          <td>{% trans %}Year{% endtrans %}</td>
+          <td>{% trans %}Month{% endtrans %}</td>
+          <td>{% trans %}Total{% endtrans %}</td>
+        </tr>
+      </thead>
+      <tbody>
         {% for array in obj %}
-            {% for dict in array %}
-                {% if dict['sum'] != 0 %}
-                {% set link=url('core:user_account_detail', user_id=profile.id, year=dict['date'].year, month=dict['date'].month) %}
-                <tr>
-                    <td><a href="{{ link }}">{{ dict['date'].year }}</a></td>
-                    <td><a href="{{ link }}">{{ dict['date']|date("E") }}</a></td>
-                    <td><a href="{{ link }}">{{ dict['sum'] }} €</a></td>
-                </tr>
-                {% endif %}
-            {% endfor %}
+          {% for dict in array %}
+            {% if dict['sum'] != 0 %}
+              {% set link=url('core:user_account_detail', user_id=profile.id, year=dict['date'].year, month=dict['date'].month) %}
+              <tr>
+                <td><a href="{{ link }}">{{ dict['date'].year }}</a></td>
+                <td><a href="{{ link }}">{{ dict['date']|date("E") }}</a></td>
+                <td><a href="{{ link }}">{{ dict['sum'] }} €</a></td>
+              </tr>
+            {% endif %}
+          {% endfor %}
         {% endfor %}
-        </tbody>
+      </tbody>
     </table>
-</div>
+  </div>
 {% endmacro %}
 
 {% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if customer %}
-<h3>{% trans %}User account{% endtrans %}</h3>
-<p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
-<div id="drop">
-{% set bought = customer.buyings.exists() %}
-{% set refilled = customer.refillings.exists() %}
-{% if bought or refilled %}
-    {% if bought %}
-    <h5>{% trans %}Account purchases{% endtrans %}</h5>
-        {{ monthly(buyings_month) }}
-    {% endif %}
-    {% if refilled %}
-    <h5>{% trans %}Reloads{% endtrans %}</h5>
-        {{ monthly(refilling_month) }}
-    {% endif %}
-{% endif %}
-    {% if customer.user.invoices.exists() %}
-    <h5>{% trans %}Eboutic invoices{% endtrans %}</h5>
+  {% if customer %}
+    <h3>{% trans %}User account{% endtrans %}</h3>
+    <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
+    <div id="drop">
+      {% set bought = customer.buyings.exists() %}
+      {% set refilled = customer.refillings.exists() %}
+      {% if bought or refilled %}
+        {% if bought %}
+          <h5>{% trans %}Account purchases{% endtrans %}</h5>
+          {{ monthly(buyings_month) }}
+        {% endif %}
+        {% if refilled %}
+          <h5>{% trans %}Reloads{% endtrans %}</h5>
+          {{ monthly(refilling_month) }}
+        {% endif %}
+      {% endif %}
+      {% if customer.user.invoices.exists() %}
+        <h5>{% trans %}Eboutic invoices{% endtrans %}</h5>
         {{ monthly(invoices_month) }}
-    {% endif %}
-    {% if etickets %}
-    <h4>{% trans %}Etickets{% endtrans %}</h4>
-    <div>
-        <ul>
-        {% for s in etickets %}
-        <li><a href="{{ url('counter:eticket_pdf', selling_id=s.id) }}">{{ s.quantity }} x {{ s.product.eticket }}</a></li>
-        {% endfor %}
-        </ul>
+      {% endif %}
+      {% if etickets %}
+        <h4>{% trans %}Etickets{% endtrans %}</h4>
+        <div>
+          <ul>
+            {% for s in etickets %}
+              <li><a href="{{ url('counter:eticket_pdf', selling_id=s.id) }}">{{ s.quantity }} x {{ s.product.eticket }}</a></li>
+            {% endfor %}
+          </ul>
+        </div>
+      {% endif %}
     </div>
-    {% endif %}
-</div>
-{% else %}
-<p>{% trans %}User has no account{% endtrans %}</p>
-{% endif %}
+  {% else %}
+    <p>{% trans %}User has no account{% endtrans %}</p>
+  {% endif %}
 {% endblock %}
 
 {% block script %}
-{{ super() }}
-<script>
-$(function(){
-    $("#drop").accordion({
+  {{ super() }}
+  <script>
+    $(function(){
+      $("#drop").accordion({
         heightStyle: "content"
+      });
     });
-});
-</script>
+  </script>
 {% endblock %}
 
 
diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja
index ccb35f38d..8c9b3c3c2 100644
--- a/core/templates/core/user_account_detail.jinja
+++ b/core/templates/core/user_account_detail.jinja
@@ -1,19 +1,19 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if customer %}
-<h3>{% trans %}User account{% endtrans %}</h3>
-<p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
-<p><a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Back{% endtrans %}</a></p>
-{% if customer.buyings.exists() %}
-<h4>{% trans %}Account purchases{% endtrans %}</h4>
-<table>
-    <thead>
-        <tr>
+  {% if customer %}
+    <h3>{% trans %}User account{% endtrans %}</h3>
+    <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
+    <p><a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Back{% endtrans %}</a></p>
+    {% if customer.buyings.exists() %}
+      <h4>{% trans %}Account purchases{% endtrans %}</h4>
+      <table>
+        <thead>
+          <tr>
             <td>{% trans %}Date{% endtrans %}</td>
             <td>{% trans %}Counter{% endtrans %}</td>
             <td>{% trans %}Barman{% endtrans %}</td>
@@ -21,85 +21,85 @@
             <td>{% trans %}Quantity{% endtrans %}</td>
             <td>{% trans %}Total{% endtrans %}</td>
             <td>{% trans %}Payment method{% endtrans %}</td>
-        </tr>
-    </thead>
-    <tbody>
-    {% for i in customer.buyings.order_by('-date').all().filter(
-        date__year=year, date__month=month) %}
-        <tr>
-        <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
-        <td>{{ i.counter }}</td>
-        <td><a href="{{ i.seller.get_absolute_url() }}">{{ i.seller.get_display_name() }}</a></td>
-        <td>{{ i.label }}</td>
-        <td>{{ i.quantity }}</td>
-        <td>{{ i.quantity * i.unit_price }} €</td>
-        <td>{{ i.get_payment_method_display() }}</td>
-        {% if i.is_owned_by(user) %}
-            <td><a href="{{ url('counter:selling_delete', selling_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-        {% endif %}
-    </tr>
-{% endfor %}
+          </tr>
+        </thead>
+        <tbody>
+          {% for i in customer.buyings.order_by('-date').all().filter(
+          date__year=year, date__month=month) %}
+          <tr>
+            <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
+            <td>{{ i.counter }}</td>
+            <td><a href="{{ i.seller.get_absolute_url() }}">{{ i.seller.get_display_name() }}</a></td>
+            <td>{{ i.label }}</td>
+            <td>{{ i.quantity }}</td>
+            <td>{{ i.quantity * i.unit_price }} €</td>
+            <td>{{ i.get_payment_method_display() }}</td>
+            {% if i.is_owned_by(user) %}
+              <td><a href="{{ url('counter:selling_delete', selling_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+            {% endif %}
+          </tr>
+    {% endfor %}
     </tbody>
-</table>
-{% endif %}
-{% if customer.refillings.exists() %}
-<h4>{% trans %}Reloads{% endtrans %}</h4>
-<table>
-    <thead>
+    </table>
+  {% endif %}
+  {% if customer.refillings.exists() %}
+    <h4>{% trans %}Reloads{% endtrans %}</h4>
+    <table>
+      <thead>
         <tr>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Counter{% endtrans %}</td>
-            <td>{% trans %}Barman{% endtrans %}</td>
-            <td>{% trans %}Amount{% endtrans %}</td>
-            <td>{% trans %}Payment method{% endtrans %}</td>
+          <td>{% trans %}Date{% endtrans %}</td>
+          <td>{% trans %}Counter{% endtrans %}</td>
+          <td>{% trans %}Barman{% endtrans %}</td>
+          <td>{% trans %}Amount{% endtrans %}</td>
+          <td>{% trans %}Payment method{% endtrans %}</td>
         </tr>
-    </thead>
-    <tbody>
-    {% for i in customer.refillings.order_by('-date').filter( date__year=year, date__month=month) %}
-        <tr>
-        <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
-        <td>{{ i.counter }}</td>
-        <td><a href="{{ i.operator.get_absolute_url() }}">{{ i.operator.get_display_name() }}</a></td>
-        <td>{{ i.amount }} €</td>
-        <td>{{ i.get_payment_method_display() }}</td>
-        {% if i.is_owned_by(user) %}
-            <td><a href="{{ url('counter:refilling_delete', refilling_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-        {% endif %}
-    </tr>
-{% endfor %}
-    </tbody>
-</table>
-{% endif %}
-{% if customer.user.invoices.exists() %}
-<h4>{% trans %}Eboutic invoices{% endtrans %}</h4>
-<table>
-    <thead>
+      </thead>
+      <tbody>
+        {% for i in customer.refillings.order_by('-date').filter( date__year=year, date__month=month) %}
+          <tr>
+            <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
+            <td>{{ i.counter }}</td>
+            <td><a href="{{ i.operator.get_absolute_url() }}">{{ i.operator.get_display_name() }}</a></td>
+            <td>{{ i.amount }} €</td>
+            <td>{{ i.get_payment_method_display() }}</td>
+            {% if i.is_owned_by(user) %}
+              <td><a href="{{ url('counter:refilling_delete', refilling_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+            {% endif %}
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  {% endif %}
+  {% if customer.user.invoices.exists() %}
+    <h4>{% trans %}Eboutic invoices{% endtrans %}</h4>
+    <table>
+      <thead>
         <tr>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Items{% endtrans %}</td>
-            <td>{% trans %}Amount{% endtrans %}</td>
+          <td>{% trans %}Date{% endtrans %}</td>
+          <td>{% trans %}Items{% endtrans %}</td>
+          <td>{% trans %}Amount{% endtrans %}</td>
         </tr>
-    </thead>
-    <tbody>
-    {% for i in customer.user.invoices.order_by('-date').all().filter(
+      </thead>
+      <tbody>
+        {% for i in customer.user.invoices.order_by('-date').all().filter(
         date__year=year, date__month=month) %}
         <tr>
-        <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
-        <td>
+          <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td>
             <ul>
-                {% for it in i.items.all() %}
+              {% for it in i.items.all() %}
                 <li>{{ it.quantity }} x {{ it.product_name }} - {{ it.product_unit_price }} €</li>
-                {% endfor %}
+              {% endfor %}
             </ul>
-        </td>
-        <td>{{ i.get_total() }} €</td>
-    </tr>
-{% endfor %}
-    </tbody>
-</table>
+          </td>
+          <td>{{ i.get_total() }} €</td>
+        </tr>
+  {% endfor %}
+  </tbody>
+  </table>
 {% endif %}
 {% else %}
-<p>{% trans %}User has no account{% endtrans %}</p>
+  <p>{% trans %}User has no account{% endtrans %}</p>
 {% endif %}
 <p><a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Back{% endtrans %}</a></p>
 {% endblock %}
diff --git a/core/templates/core/user_clubs.jinja b/core/templates/core/user_clubs.jinja
index f6e96b9aa..324f8389e 100644
--- a/core/templates/core/user_clubs.jinja
+++ b/core/templates/core/user_clubs.jinja
@@ -1,80 +1,80 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-	{% trans user_name=profile.get_display_name() %}{{ user_name }}'s club(s){% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s club(s){% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans%}Club(s){% endtrans %}</h3>
-<br>
-<h4>{% trans%}Current club(s) :{% endtrans %}</h4>
-<br>
-<table>
+  <h3>{% trans%}Club(s){% endtrans %}</h3>
+  <br>
+  <h4>{% trans%}Current club(s) :{% endtrans %}</h4>
+  <br>
+  <table>
     <thead>
-    	<tr>
-            <td>{% trans %}Club{% endtrans %}</td>
-	        <td>{% trans %}Role{% endtrans %}</td>
-	        <td>{% trans %}Description{% endtrans %}</td>
-	        <td>{% trans %}Since{% endtrans %}</td>
-            <td></td>
-            <td></td>
-    	</tr>
+      <tr>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Role{% endtrans %}</td>
+        <td>{% trans %}Description{% endtrans %}</td>
+        <td>{% trans %}Since{% endtrans %}</td>
+        <td></td>
+        <td></td>
+      </tr>
     </thead>
     <tbody>
-	    {% for m in profile.memberships.filter(end_date=None).all() %}
+      {% for m in profile.memberships.filter(end_date=None).all() %}
         <tr>
-            <td><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></td>
-            <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-            <td>{{ m.description }}</td>
-            <td>{{ m.start_date }}</td>
-            {% if m.can_be_edited_by(user) %}
+          <td><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></td>
+          <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+          <td>{{ m.description }}</td>
+          <td>{{ m.start_date }}</td>
+          {% if m.can_be_edited_by(user) %}
             <td><a href="{{ url('club:membership_set_old', membership_id=m.id) }}">{% trans %}Mark as old{% endtrans %}</a></td>
-            {% endif %}
-            {% if user.is_root %}
-                <td><a href="{{ url('club:membership_delete', membership_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-            {% endif %}
+          {% endif %}
+          {% if user.is_root %}
+            <td><a href="{{ url('club:membership_delete', membership_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+          {% endif %}
         </tr>
-    	{% endfor %}
+      {% endfor %}
     </tbody>
-</table>
-<br>
-<h4>{% trans%}Old club(s) :{% endtrans %}</h4>
-<br>
-<table>
+  </table>
+  <br>
+  <h4>{% trans%}Old club(s) :{% endtrans %}</h4>
+  <br>
+  <table>
     <thead>
-    	<tr>
-            <td>{% trans %}Club{% endtrans %}</td>
-	        <td>{% trans %}Role{% endtrans %}</td>
-	        <td>{% trans %}Description{% endtrans %}</td>
-	        <td>{% trans %}From{% endtrans %}</td>
-	        <td>{% trans %}To{% endtrans %}</td>
+      <tr>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Role{% endtrans %}</td>
+        <td>{% trans %}Description{% endtrans %}</td>
+        <td>{% trans %}From{% endtrans %}</td>
+        <td>{% trans %}To{% endtrans %}</td>
 
-    	</tr>
+      </tr>
     </thead>
     <tbody>
-	    {% for m in profile.memberships.exclude(end_date=None).all() %}
+      {% for m in profile.memberships.exclude(end_date=None).all() %}
         <tr>
-            <td><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></td>
-            <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-            <td>{{ m.description }}</td>
-            <td>{{ m.start_date }}</td>
-            <td>{{ m.end_date }}</td>
-            {% if user.is_root %}
-                <td><a href="{{ url('club:membership_delete', membership_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-            {% endif %}
+          <td><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></td>
+          <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+          <td>{{ m.description }}</td>
+          <td>{{ m.start_date }}</td>
+          <td>{{ m.end_date }}</td>
+          {% if user.is_root %}
+            <td><a href="{{ url('club:membership_delete', membership_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+          {% endif %}
         </tr>
-    	{% endfor %}
+      {% endfor %}
     </tbody>
-</table>
+  </table>
 
-{% if
-    profile.mailing_subscriptions.exists()
-    and (profile.id == user.id or user.is_root or user.is_com_admin)
-%}
-    <h4>{% trans %}Subscribed mailing lists{% endtrans %}</h4>
-    {% for sub in profile.mailing_subscriptions.all() %}
-        <p>{{ sub.mailing.email }} <a href="{{ url('club:mailing_subscription_delete', mailing_subscription_id=sub.id) }}">{% trans %}Unsubscribe{% endtrans %}</a></p>
-    {% endfor %}
+  {% if
+  profile.mailing_subscriptions.exists()
+  and (profile.id == user.id or user.is_root or user.is_com_admin)
+  %}
+  <h4>{% trans %}Subscribed mailing lists{% endtrans %}</h4>
+  {% for sub in profile.mailing_subscriptions.all() %}
+    <p>{{ sub.mailing.email }} <a href="{{ url('club:mailing_subscription_delete', mailing_subscription_id=sub.id) }}">{% trans %}Unsubscribe{% endtrans %}</a></p>
+  {% endfor %}
 {% endif %}
 {% endblock %}
 
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index b7651b88c..9f5824fc6 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -2,279 +2,279 @@
 {% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_detail.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_detail.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
 {% endblock %}
 
 {% block additional_js %}
-    <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
+  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block content %}
-<div class="user_profile_page" x-data>
+  <div class="user_profile_page" x-data>
     <div class="user_profile">
         <!-- Profile -->
-        <div class="user-name">
-            <h3>{{ profile.get_full_name() }}</h3>
-            {% if profile.nick_name %}
-            <div class="user_profile_infos_nick">&laquo; {{ profile.nick_name }} &raquo;</div>
-            {% endif %}
-        </div>
+      <div class="user-name">
+        <h3>{{ profile.get_full_name() }}</h3>
+        {% if profile.nick_name %}
+          <div class="user_profile_infos_nick">&laquo; {{ profile.nick_name }} &raquo;</div>
+        {% endif %}
+      </div>
 
-        <div class="infos-and-picture">
-            <div class="user_profile_infos">
-                {% if profile.quote %}
-                <div class="user_profile_infos_quote">
-                    {{ profile.quote }}
-                </div>
-                {% endif %}
+      <div class="infos-and-picture">
+        <div class="user_profile_infos">
+          {% if profile.quote %}
+            <div class="user_profile_infos_quote">
+              {{ profile.quote }}
+            </div>
+          {% endif %}
 
-                <div class="user_profile_infos_items">
-                    {% if profile.pronouns %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Pronouns: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.pronouns }}</span>
-                    </div>
-                    {% endif %}
-                    {% if profile.date_of_birth %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Born: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.date_of_birth|date("d/m/Y") }}</span>
-                    </div>
-                    {% endif %}
+          <div class="user_profile_infos_items">
+            {% if profile.pronouns %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Pronouns: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.pronouns }}</span>
+              </div>
+            {% endif %}
+            {% if profile.date_of_birth %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Born: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.date_of_birth|date("d/m/Y") }}</span>
+              </div>
+            {% endif %}
 
-                    {% if profile.department != "NA" %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Department: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.department }}{{ profile.semester
-                            }}</span>
-                    </div>
-                    {% endif %}
+            {% if profile.department != "NA" %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Department: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.department }}{{ profile.semester
+                  }}</span>
+              </div>
+            {% endif %}
 
-                    {% if profile.dpt_option %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Option: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.dpt_option }}</span>
-                    </div>
-                    {% endif %}
+            {% if profile.dpt_option %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Option: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.dpt_option }}</span>
+              </div>
+            {% endif %}
 
-                    {% if profile.phone %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Phone: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.phone }}</span>
-                    </div>
-                    {% endif %}
+            {% if profile.phone %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Phone: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.phone }}</span>
+              </div>
+            {% endif %}
 
-                    {% if profile.address %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Address: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.address }}</span>
-                    </div>
-                    {% endif %}
+            {% if profile.address %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Address: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.address }}</span>
+              </div>
+            {% endif %}
 
-                    {% if profile.parent_address %}
-                    <div>
-                        <span class="user_profile_infos_item">{% trans %}Parents address: {% endtrans %}</span>
-                        <span class="user_profile_infos_item_value">{{ profile.parent_address }}</span>
-                    </div>
-                    {% endif %}
-                </div>
+            {% if profile.parent_address %}
+              <div>
+                <span class="user_profile_infos_item">{% trans %}Parents address: {% endtrans %}</span>
+                <span class="user_profile_infos_item_value">{{ profile.parent_address }}</span>
+              </div>
+            {% endif %}
+          </div>
 
-                {% if profile.promo %}
-                <br>
-                <div class="user_profile_infos_promo">
-                    {% trans %}Promo: {% endtrans %}{{ profile.promo }}
-                    {% if profile.promo_has_logo() %}
-                        <img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" />
-                    {% else %}
-                        <div>
-                            <span>¯\_(ツ)_/¯</span>
-                        </div>
-                    {% endif %}
+          {% if profile.promo %}
+            <br>
+            <div class="user_profile_infos_promo">
+              {% trans %}Promo: {% endtrans %}{{ profile.promo }}
+              {% if profile.promo_has_logo() %}
+                <img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" />
+              {% else %}
+                <div>
+                  <span>¯\_(ツ)_/¯</span>
                 </div>
-                {% endif %}
+              {% endif %}
             </div>
+          {% endif %}
+        </div>
             <!-- Pictures -->
-            <div class="user_profile_pictures">
-                <div class="user_profile_pictures_bigone" id="big_picture">
-                    {% if profile.profile_pict %}
-                    <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
-                        title="{% trans %}Profile{% endtrans %}" />
-                    {% else %}
-                    <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}"
-                        title="{% trans %}Profile{% endtrans %}" />
-                    {% endif %}
-                </div>
-                <div class="user_profile_pictures_thumbnails" id="small_pictures">
-                    {% if profile.profile_pict %}
-                    <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
-                        title="{% trans %}Profile{% endtrans %}" />
-                    {% else %}
-                    <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}"
-                        title="{% trans %}Profile{% endtrans %}" />
-                    {% endif %}
+        <div class="user_profile_pictures">
+          <div class="user_profile_pictures_bigone" id="big_picture">
+            {% if profile.profile_pict %}
+              <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
+                   title="{% trans %}Profile{% endtrans %}" />
+            {% else %}
+              <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}"
+                   title="{% trans %}Profile{% endtrans %}" />
+            {% endif %}
+          </div>
+          <div class="user_profile_pictures_thumbnails" id="small_pictures">
+            {% if profile.profile_pict %}
+              <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
+                   title="{% trans %}Profile{% endtrans %}" />
+            {% else %}
+              <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}"
+                   title="{% trans %}Profile{% endtrans %}" />
+            {% endif %}
 
-                    {% if profile.avatar_pict %}
-                    <img src="{{ profile.avatar_pict.get_download_url() }}" alt="{% trans %}Avatar{% endtrans %}"
-                        title="{% trans %}Avatar{% endtrans %}" />
-                    {% else %}
-                    <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Avatar{% endtrans %}"
-                        title="{% trans %}Avatar{% endtrans %}" />
-                    {% endif %}
+            {% if profile.avatar_pict %}
+              <img src="{{ profile.avatar_pict.get_download_url() }}" alt="{% trans %}Avatar{% endtrans %}"
+                   title="{% trans %}Avatar{% endtrans %}" />
+            {% else %}
+              <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Avatar{% endtrans %}"
+                   title="{% trans %}Avatar{% endtrans %}" />
+            {% endif %}
 
-                    {% if profile.scrub_pict %}
-                    <img src="{{ profile.scrub_pict.get_download_url() }}" alt="{% trans %}Scrub{% endtrans %}"
-                        title="{% trans %}Scrub{% endtrans %}" />
-                    {% else %}
-                    <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Scrub{% endtrans %}"
-                        title="{% trans %}Scrub{% endtrans %}" />
-                    {% endif %}
-                </div>
-            </div>
+            {% if profile.scrub_pict %}
+              <img src="{{ profile.scrub_pict.get_download_url() }}" alt="{% trans %}Scrub{% endtrans %}"
+                   title="{% trans %}Scrub{% endtrans %}" />
+            {% else %}
+              <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Scrub{% endtrans %}"
+                   title="{% trans %}Scrub{% endtrans %}" />
+            {% endif %}
+          </div>
         </div>
+      </div>
     </main>
     {% if
-        user == profile
-        or user.memberships.ongoing().exists()
-        or user.is_board_member
-        or user.is_in_group(name=settings.SITH_BAR_MANAGER_BOARD_GROUP)
+    user == profile
+    or user.memberships.ongoing().exists()
+    or user.is_board_member
+    or user.is_in_group(name=settings.SITH_BAR_MANAGER_BOARD_GROUP)
     %}
         {# if the user is member of a club, he can view the subscription state #}
-        <hr>
-        {% if profile.is_subscribed %}
-            {% if user == profile or user.is_root or user.is_board_member %}
-                <div>
-                    {{ user_subscription(profile) }}
-                </div>
-            {% endif %}
-            {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
-                <div>
+    <hr>
+    {% if profile.is_subscribed %}
+      {% if user == profile or user.is_root or user.is_board_member %}
+        <div>
+          {{ user_subscription(profile) }}
+        </div>
+      {% endif %}
+      {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
+        <div>
                     {# Shows tokens bought by the user #}
-                    {{ show_tokens(profile) }}
+          {{ show_tokens(profile) }}
                     {# Shows slots took by the user #}
-                    {{ show_slots(profile) }}
-                </div>
-            {% endif %}
-        {% else %}
-            <div>
-                {% trans %}Not subscribed{% endtrans %}
-                {% if user.is_board_member %}
-                <a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">
-                    {% trans %}New subscription{% endtrans %}
-                </a>
-                {% endif %}
-                {% endif %}
-            </div>
-        {% endif %}
-        <br>
-        {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
-            <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
-                <div class="collapse-header clickable" @click="collapsed = !collapsed">
-                    <span class="collapse-header-text">
-                        {% trans %}Subscription history{% endtrans %}
-                    </span>
-                    <span class="collapse-header-icon" :class="{'reverse': collapsed}">
-                        <i class="fa fa-caret-down"></i>
-                    </span>
-                </div>
-                <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
-                    <table>
-                        <thead>
-                            <tr>
-                                <th>{% trans %}Subscription start{% endtrans %}</th>
-                                <th>{% trans %}Subscription end{% endtrans %}</th>
-                                <th>{% trans %}Subscription type{% endtrans %}</th>
-                                <th>{% trans %}Payment method{% endtrans %}</th>
-                            </tr>
-                        </thead>
-                        {% for sub in profile.subscriptions.all() %}
-                            <tr>
-                                <td>{{ sub.subscription_start }}</td>
-                                <td>{{ sub.subscription_end }}</td>
-                                <td>{{ sub.subscription_type }}</td>
-                                <td>{{ sub.get_payment_method_display() }}</td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </div>
-            </div>
+          {{ show_slots(profile) }}
+        </div>
+      {% endif %}
+    {% else %}
+      <div>
+        {% trans %}Not subscribed{% endtrans %}
+        {% if user.is_board_member %}
+          <a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">
+            {% trans %}New subscription{% endtrans %}
+          </a>
         {% endif %}
+    {% endif %}
+  </div>
+{% endif %}
+<br>
+{% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
+  <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
+    <div class="collapse-header clickable" @click="collapsed = !collapsed">
+      <span class="collapse-header-text">
+        {% trans %}Subscription history{% endtrans %}
+      </span>
+      <span class="collapse-header-icon" :class="{'reverse': collapsed}">
+        <i class="fa fa-caret-down"></i>
+      </span>
+    </div>
+    <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
+      <table>
+        <thead>
+          <tr>
+            <th>{% trans %}Subscription start{% endtrans %}</th>
+            <th>{% trans %}Subscription end{% endtrans %}</th>
+            <th>{% trans %}Subscription type{% endtrans %}</th>
+            <th>{% trans %}Payment method{% endtrans %}</th>
+          </tr>
+        </thead>
+        {% for sub in profile.subscriptions.all() %}
+          <tr>
+            <td>{{ sub.subscription_start }}</td>
+            <td>{{ sub.subscription_end }}</td>
+            <td>{{ sub.subscription_type }}</td>
+            <td>{{ sub.get_payment_method_display() }}</td>
+          </tr>
+        {% endfor %}
+      </table>
+    </div>
+  </div>
+{% endif %}
 
-        <hr>
-        <div>
-        {% if user.is_root or user.is_board_member %}
-            <form class="form-gifts" action="{{ url('core:user_gift_create', user_id=profile.id) }}" method="post">
-                {% csrf_token %}
-                {{ gift_form.label }}
-                {{ gift_form.user }}
-                <input type="submit" value="{% trans %}Give gift{% endtrans %}">
-            </form>
-            {% if profile.gifts.exists() %}
-                {% set gifts = profile.gifts.order_by("-date")|list %}
-                <br>
-                <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
-                    <div class="collapse-header clickable" @click="collapsed = !collapsed">
-                        <span class="collapse-header-text">
-                            {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
-                        </span>
-                        <span class="collapse-header-icon" :class="{'reverse': collapsed}">
-                            <i class="fa fa-caret-down"></i>
-                        </span>
-                    </div>
-                    <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
-                        <ul>
-                        {% for gift in gifts %}
-                            <li>{{ gift }}
-                                <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">
-                                    <i class="fa fa-trash"></i>
-                                </a>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </div>
-        {% else %}
-            <em>{% trans %}No gift given yet{% endtrans %}</em>
-        {% endif %}
+<hr>
+<div>
+  {% if user.is_root or user.is_board_member %}
+    <form class="form-gifts" action="{{ url('core:user_gift_create', user_id=profile.id) }}" method="post">
+      {% csrf_token %}
+      {{ gift_form.label }}
+      {{ gift_form.user }}
+      <input type="submit" value="{% trans %}Give gift{% endtrans %}">
+    </form>
+    {% if profile.gifts.exists() %}
+      {% set gifts = profile.gifts.order_by("-date")|list %}
+      <br>
+      <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
+        <div class="collapse-header clickable" @click="collapsed = !collapsed">
+          <span class="collapse-header-text">
+            {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
+          </span>
+          <span class="collapse-header-icon" :class="{'reverse': collapsed}">
+            <i class="fa fa-caret-down"></i>
+          </span>
+        </div>
+        <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
+          <ul>
+            {% for gift in gifts %}
+              <li>{{ gift }}
+                <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">
+                  <i class="fa fa-trash"></i>
+                </a>
+              </li>
+            {% endfor %}
+          </ul>
         </div>
+    {% else %}
+      <em>{% trans %}No gift given yet{% endtrans %}</em>
     {% endif %}
+    </div>
+  {% endif %}
 </div>
 
 
 {% endblock %}
 
 {% block script %}
-{{ super() }}
-<script>
+  {{ super() }}
+  <script>
     $(function () {
-        var keys = [];
-        var pattern = "71,85,89,71,85,89";
-        $(document).keydown(function (e) {
-            keys.push(e.keyCode);
-            if (keys.toString() == pattern) {
-                keys = [];
-                $("#big_picture img").attr("src", "{{ static('core/img/yug.jpg') }}");
-            }
-            if (keys.length == 6) {
-                keys.shift();
-            }
-        });
+      var keys = [];
+      var pattern = "71,85,89,71,85,89";
+      $(document).keydown(function (e) {
+        keys.push(e.keyCode);
+        if (keys.toString() == pattern) {
+          keys = [];
+          $("#big_picture img").attr("src", "{{ static('core/img/yug.jpg') }}");
+        }
+        if (keys.length == 6) {
+          keys.shift();
+        }
+      });
     });
     $(function () {
-        $("#small_pictures img").click(function () {
-            $("#big_picture img").attr("src", $(this)[0].src);
-            $("#big_picture img").attr("alt", $(this)[0].alt);
-            $("#big_picture img").attr("title", $(this)[0].title);
-        })
+      $("#small_pictures img").click(function () {
+        $("#big_picture img").attr("src", $(this)[0].src);
+        $("#big_picture img").attr("alt", $(this)[0].alt);
+        $("#big_picture img").attr("title", $(this)[0].title);
+      })
     });
     $(function () {
-        $("#drop_gifts").accordion({
-            heightStyle: "content",
-            collapsible: true,
-            active: false
-        });
+      $("#drop_gifts").accordion({
+        heightStyle: "content",
+        collapsible: true,
+        active: false
+      });
     });
-</script>
+  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/user_edit.jinja b/core/templates/core/user_edit.jinja
index 41b9dfb85..39b355f7a 100644
--- a/core/templates/core/user_edit.jinja
+++ b/core/templates/core/user_edit.jinja
@@ -1,166 +1,166 @@
 {%- extends "core/base.jinja" -%}
 
 {%- block title -%}
-{%- trans -%}Edit user{%- endtrans -%}
+  {%- trans -%}Edit user{%- endtrans -%}
 {%- endblock -%}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_edit.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_edit.scss') }}">
 {%- endblock -%}
 
 {%- block content -%}
-<h2 class="title">{%- trans -%}Edit user profile{%- endtrans -%}</h2>
-<form action="" method="post" enctype="multipart/form-data" id="user_edit">
+  <h2 class="title">{%- trans -%}Edit user profile{%- endtrans -%}</h2>
+  <form action="" method="post" enctype="multipart/form-data" id="user_edit">
 
     {%- csrf_token -%}
     {{ form.non_field_errors() }}
 
     {# User Pictures #}
     <div class="profile-pictures">
-        <div class="profile-picture">
-            <div class="profile-picture-display">
-
-                {%- if form.instance.profile_pict -%}
-                <img src="{{ form.instance.profile_pict.get_download_url() }}"
-                    alt="{%- trans -%}Profile{%- endtrans -%}" title="{%- trans -%}Profile{%- endtrans -%}" />
-                {%- else -%}
-                <img src="{{ static('core/img/unknown.jpg') }}" alt="{%- trans -%}Profile{%- endtrans -%}"
-                    title="{%- trans -%}Profile{%- endtrans -%}" />
-                {%- endif -%}
-            </div>
-            <div class="profile-picture-edit">
-                {%- if form["profile_pict"] -%}
-                    <p>{{ form["profile_pict"].label }}</p>
-                    {{ form["profile_pict"] }}
-                {%- else -%}
-                    <em>{% trans %}To edit your profile picture, ask a member of the AE{% endtrans %}</em>
-                {%- endif -%}
-                {%- if user.is_board_member and form.instance.profile_pict.id -%}
-                    <a href="{{ url('core:file_delete', file_id=form.instance.profile_pict.id, popup='') }}">
-                        {%- trans -%}Delete{%- endtrans -%}
-                    </a>
-                {%- endif -%}
-            </div>
+      <div class="profile-picture">
+        <div class="profile-picture-display">
+
+          {%- if form.instance.profile_pict -%}
+            <img src="{{ form.instance.profile_pict.get_download_url() }}"
+                 alt="{%- trans -%}Profile{%- endtrans -%}" title="{%- trans -%}Profile{%- endtrans -%}" />
+          {%- else -%}
+            <img src="{{ static('core/img/unknown.jpg') }}" alt="{%- trans -%}Profile{%- endtrans -%}"
+                 title="{%- trans -%}Profile{%- endtrans -%}" />
+          {%- endif -%}
         </div>
-        <div class="profile-picture">
-            <div class="profile-picture-display">
-                {%- if form.instance.avatar_pict -%}
-                <img src="{{ form.instance.avatar_pict.get_download_url() }}" alt="{%- trans -%}Profile{%- endtrans -%}"
-                    title="{%- trans -%}Profile{%- endtrans -%}" />
-                {%- else -%}
-                <img src="{{ static('core/img/unknown.jpg') }}" alt="{%- trans -%}Profile{%- endtrans -%}"
-                    title="{%- trans -%}Profile{%- endtrans -%}" />
-                {%- endif -%}
-            </div>
-            <div class="profile-picture-edit">
-                <p>{{ form["avatar_pict"].label }}</p>
-                {{ form["avatar_pict"] }}
-                {%- if user.is_board_member and form.instance.avatar_pict.id -%}
-                    <a href="{{ url('core:file_delete', file_id=form.instance.avatar_pict.id, popup='') }}">
-                        {%- trans -%}Delete{%- endtrans -%}
-                    </a>
-                {%- endif -%}
-            </div>
+        <div class="profile-picture-edit">
+          {%- if form["profile_pict"] -%}
+            <p>{{ form["profile_pict"].label }}</p>
+            {{ form["profile_pict"] }}
+          {%- else -%}
+            <em>{% trans %}To edit your profile picture, ask a member of the AE{% endtrans %}</em>
+          {%- endif -%}
+          {%- if user.is_board_member and form.instance.profile_pict.id -%}
+            <a href="{{ url('core:file_delete', file_id=form.instance.profile_pict.id, popup='') }}">
+              {%- trans -%}Delete{%- endtrans -%}
+            </a>
+          {%- endif -%}
         </div>
-        <div class="profile-picture">
-            <div class="profile-picture-display">
-                {%- if form.instance.scrub_pict -%}
-                <img src="{{ form.instance.scrub_pict.get_download_url() }}" alt="{%- trans -%}Profile{%- endtrans -%}"
-                    title="{%- trans -%}Profile{%- endtrans -%}" />
-                {%- else -%}
-                <img src="{{ static('core/img/unknown.jpg') }}" alt="{%- trans -%}Profile{%- endtrans -%}"
-                    title="{%- trans -%}Profile{%- endtrans -%}" />
-                {%- endif -%}
-            </div>
-            <div class="profile-picture-edit">
-                <p>{{ form["scrub_pict"].label }}</p>
-                {{ form["scrub_pict"] }}
-                {%- if user.is_board_member and form.instance.scrub_pict.id -%}
-                    <a href="{{ url('core:file_delete', file_id=form.instance.scrub_pict.id, popup='') }}">
-                        {%- trans -%}Delete{%-endtrans -%}
-                    </a>
-                {%- endif -%}
-            </div>
+      </div>
+      <div class="profile-picture">
+        <div class="profile-picture-display">
+          {%- if form.instance.avatar_pict -%}
+            <img src="{{ form.instance.avatar_pict.get_download_url() }}" alt="{%- trans -%}Profile{%- endtrans -%}"
+                 title="{%- trans -%}Profile{%- endtrans -%}" />
+          {%- else -%}
+            <img src="{{ static('core/img/unknown.jpg') }}" alt="{%- trans -%}Profile{%- endtrans -%}"
+                 title="{%- trans -%}Profile{%- endtrans -%}" />
+          {%- endif -%}
         </div>
+        <div class="profile-picture-edit">
+          <p>{{ form["avatar_pict"].label }}</p>
+          {{ form["avatar_pict"] }}
+          {%- if user.is_board_member and form.instance.avatar_pict.id -%}
+            <a href="{{ url('core:file_delete', file_id=form.instance.avatar_pict.id, popup='') }}">
+              {%- trans -%}Delete{%- endtrans -%}
+            </a>
+          {%- endif -%}
+        </div>
+      </div>
+      <div class="profile-picture">
+        <div class="profile-picture-display">
+          {%- if form.instance.scrub_pict -%}
+            <img src="{{ form.instance.scrub_pict.get_download_url() }}" alt="{%- trans -%}Profile{%- endtrans -%}"
+                 title="{%- trans -%}Profile{%- endtrans -%}" />
+          {%- else -%}
+            <img src="{{ static('core/img/unknown.jpg') }}" alt="{%- trans -%}Profile{%- endtrans -%}"
+                 title="{%- trans -%}Profile{%- endtrans -%}" />
+          {%- endif -%}
+        </div>
+        <div class="profile-picture-edit">
+          <p>{{ form["scrub_pict"].label }}</p>
+          {{ form["scrub_pict"] }}
+          {%- if user.is_board_member and form.instance.scrub_pict.id -%}
+            <a href="{{ url('core:file_delete', file_id=form.instance.scrub_pict.id, popup='') }}">
+              {%- trans -%}Delete{%-endtrans -%}
+            </a>
+          {%- endif -%}
+        </div>
+      </div>
     </div>
 
 
     {# All fields #}
     <div class="profile-fields">
-        {%- for field in form -%}
+      {%- for field in form -%}
         {%-
         if field.name in ["quote","profile_pict","avatar_pict","scrub_pict","is_subscriber_viewable","forum_signature"]
         -%}
         {%- continue -%}
-        {%- endif -%}
-
-        <div class="profile-field">
-            <div class="profile-field-label">{{ field.label }}</div>
-            <div class="profile-field-content">
-                {{ field }}
-                {%- if field.errors -%}
-                <div class="field-error">{{ field.errors }}</div>
-                {%- endif -%}
-            </div>
+      {%- endif -%}
+
+      <div class="profile-field">
+        <div class="profile-field-label">{{ field.label }}</div>
+        <div class="profile-field-content">
+          {{ field }}
+          {%- if field.errors -%}
+            <div class="field-error">{{ field.errors }}</div>
+          {%- endif -%}
         </div>
-        {%- endfor -%}
-    </div>
+      </div>
+{%- endfor -%}
+</div>
 
     {# Textareas #}
-    <div class="profile-fields">
-        {%- for field in [form["quote"], form["forum_signature"]] -%}
-        <div class="profile-field">
-            <div class="profile-field-label">{{ field.label }}</div>
-            <div class="profile-field-content">
-                {{ field }}
-                {%- if field.errors -%}
-                <div class="field-error">{{ field.errors }}</div>
-                {%- endif -%}
-            </div>
-        </div>
-        {%- endfor -%}
+<div class="profile-fields">
+  {%- for field in [form["quote"], form["forum_signature"]] -%}
+    <div class="profile-field">
+      <div class="profile-field-label">{{ field.label }}</div>
+      <div class="profile-field-content">
+        {{ field }}
+        {%- if field.errors -%}
+          <div class="field-error">{{ field.errors }}</div>
+        {%- endif -%}
+      </div>
     </div>
+  {%- endfor -%}
+</div>
 
     {# Checkboxes #}
-    <div class="profile-visible">
-        {{ form["is_subscriber_viewable"] }}
-        {{ form["is_subscriber_viewable"].label }}
-    </div>
+<div class="profile-visible">
+  {{ form["is_subscriber_viewable"] }}
+  {{ form["is_subscriber_viewable"].label }}
+</div>
+
+{%- if form.instance == user -%}
+  <p>
+    <a href="{{ url('core:password_change') }}">{%- trans -%}Change my password{%- endtrans -%}</a>
+  </p>
+{%- elif user.is_root -%}
+  <p>
+    <a href="{{ url('core:password_root_change', user_id=form.instance.id) }}">
+      {%- trans -%}Change user password{%- endtrans -%}
+    </a>
+  </p>
+{%- endif -%}
 
-    {%- if form.instance == user -%}
-    <p>
-        <a href="{{ url('core:password_change') }}">{%- trans -%}Change my password{%- endtrans -%}</a>
-    </p>
-    {%- elif user.is_root -%}
-    <p>
-        <a href="{{ url('core:password_root_change', user_id=form.instance.id) }}">
-            {%- trans -%}Change user password{%- endtrans -%}
-        </a>
-    </p>
-    {%- endif -%}
-
-    <p>
-        <input type="submit" value="{%- trans -%}Update{%- endtrans -%}" />
-    </p>
+<p>
+  <input type="submit" value="{%- trans -%}Update{%- endtrans -%}" />
+</p>
 </form>
 
 <p>
-    <em>{%- trans -%}Username: {%- endtrans -%}&nbsp;{{ form.instance.username }}</em>
-    <br />
-    {%- if form.instance.customer -%}
+  <em>{%- trans -%}Username: {%- endtrans -%}&nbsp;{{ form.instance.username }}</em>
+  <br />
+  {%- if form.instance.customer -%}
     <em>{%- trans -%}Account number: {%- endtrans -%}&nbsp;{{ form.instance.customer.account_id }}</em>
-    {%- endif -%}
+  {%- endif -%}
 </p>
 
 {%- endblock -%}
 
 {%- block script -%}
-{{ super() }}
-{%- if not form.instance.profile_pict -%}
-<script src="{{ static('core/js/webcam.js') }}"></script>
-<script>
-    Webcam.on('error', function (msg) { console.log('Webcam.js error: ' + msg) })
-    Webcam.set({
+  {{ super() }}
+  {%- if not form.instance.profile_pict -%}
+    <script src="{{ static('core/js/webcam.js') }}"></script>
+    <script>
+      Webcam.on('error', function (msg) { console.log('Webcam.js error: ' + msg) })
+      Webcam.set({
         width: 320,
         height: 240,
         dest_width: 320,
@@ -168,22 +168,22 @@
         image_format: 'jpeg',
         jpeg_quality: 90,
         force_flash: false
-    });
-    Webcam.attach('#camera_canvas');
-    function take_snapshot() {
+      });
+      Webcam.attach('#camera_canvas');
+      function take_snapshot() {
         const data_uri = Webcam.snap();
         const url = "{{ url('core:user_profile_upload', user_id=form.instance.id) }}";
         Webcam.upload(data_uri, url, function (code, text) {
-            if (code === 302 || code === 200) {
-                $('#new_profile').attr('src', data_uri);
-                $('#take_picture').remove();
-                $('#id_profile_pict').remove();
-            } else {
-                console.log("Unknown error: ");
-                console.log(text);
-            }
+          if (code === 302 || code === 200) {
+            $('#new_profile').attr('src', data_uri);
+            $('#take_picture').remove();
+            $('#id_profile_pict').remove();
+          } else {
+            console.log("Unknown error: ");
+            console.log(text);
+          }
         }, "new_profile_pict", { name: 'csrfmiddlewaretoken', value: '{{ csrf_token }}' });
-    }
-</script>
-{%- endif -%}
+      }
+    </script>
+  {%- endif -%}
 {%- endblock -%}
\ No newline at end of file
diff --git a/core/templates/core/user_godfathers.jinja b/core/templates/core/user_godfathers.jinja
index c5f48dfdd..496d0f214 100644
--- a/core/templates/core/user_godfathers.jinja
+++ b/core/templates/core/user_godfathers.jinja
@@ -2,66 +2,66 @@
 {% from "core/macros.jinja" import user_link_with_pict, delete_godfather %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_godfathers.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_godfathers.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s family{% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s family{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div class="container">
+  <div class="container">
     <a href="{{ url('core:user_godfathers_tree_pict', user_id=profile.id) }}?family">
-        {% trans %}Show family picture{% endtrans %}
+      {% trans %}Show family picture{% endtrans %}
     </a>
 
     <h4>{% trans %}Godfathers / Godmothers{% endtrans %}</h4>
     {% if profile.godfathers.exists() %}
-        <ul class="users">
-            {% for u in profile.godfathers.all() %}
-                <li class="users-card">
-                    <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
-                        {{ u.get_mini_item() | safe }}
-                    </a>
-                    {{ delete_godfather(user, profile, u, True) }}
-                </li>
-            {% endfor %}
-        </ul>
+      <ul class="users">
+        {% for u in profile.godfathers.all() %}
+          <li class="users-card">
+            <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
+              {{ u.get_mini_item() | safe }}
+            </a>
+            {{ delete_godfather(user, profile, u, True) }}
+          </li>
+        {% endfor %}
+      </ul>
 
-        <a href="{{ url('core:user_godfathers_tree', user_id=profile.id) }}">
-            {% trans %}Show ancestors tree{% endtrans %}
-        </a>
+      <a href="{{ url('core:user_godfathers_tree', user_id=profile.id) }}">
+        {% trans %}Show ancestors tree{% endtrans %}
+      </a>
     {% else %}
-        <p>{% trans %}No godfathers / godmothers{% endtrans %}
+      <p>{% trans %}No godfathers / godmothers{% endtrans %}
     {% endif %}
 
     <h4>{% trans %}Godchildren{% endtrans %}</h4>
     {% if profile.godchildren.exists() %}
-        <ul class="users">
-            {% for u in profile.godchildren.all() %}
-                <li class="users-card">
-                    <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
-                        {{ u.get_mini_item()|safe }} 
-                    </a>
-                    {{ delete_godfather(user, profile, u, False) }}
-                </li>
-            {% endfor %}
-        </ul>
-        
-        <a href="{{ url('core:user_godfathers_tree', user_id=profile.id) }}?descent">
-            {% trans %}Show descent tree{% endtrans %}
-        </a>
+      <ul class="users">
+        {% for u in profile.godchildren.all() %}
+          <li class="users-card">
+            <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
+              {{ u.get_mini_item()|safe }}
+            </a>
+            {{ delete_godfather(user, profile, u, False) }}
+          </li>
+        {% endfor %}
+      </ul>
+
+      <a href="{{ url('core:user_godfathers_tree', user_id=profile.id) }}?descent">
+        {% trans %}Show descent tree{% endtrans %}
+      </a>
     {% else %}
-        <p>{% trans %}No godchildren{% endtrans %}
+      <p>{% trans %}No godchildren{% endtrans %}
     {% endif %}
 
     {% if profile == user or user.is_root %}
-    <form action="" method="post">
+      <form action="" method="post">
         {% csrf_token %}
         {{ form.as_p() }}
         <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-    </form>
+      </form>
     {% endif %}
-</div>
+  </div>
 {% endblock %}
 
diff --git a/core/templates/core/user_godfathers_tree.jinja b/core/templates/core/user_godfathers_tree.jinja
index 75de2ce5d..775ac52c5 100644
--- a/core/templates/core/user_godfathers_tree.jinja
+++ b/core/templates/core/user_godfathers_tree.jinja
@@ -1,54 +1,54 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% if param == "godchildren" %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s godchildren{% endtrans %}
-{% else %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s godfathers{% endtrans %}
-{% endif %}
+  {% if param == "godchildren" %}
+    {% trans user_name=profile.get_display_name() %}{{ user_name }}'s godchildren{% endtrans %}
+  {% else %}
+    {% trans user_name=profile.get_display_name() %}{{ user_name }}'s godfathers{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 {% macro display_members_list(user) %}
-{% if user.__getattribute__(param).exists() %}
-<ul>
-    {% for u in user.__getattribute__(param).all() %}
-    <li>
-        <a href="{{ url("core:user_godfathers", user_id=u.id) }}">
+  {% if user.__getattribute__(param).exists() %}
+    <ul>
+      {% for u in user.__getattribute__(param).all() %}
+        <li>
+          <a href="{{ url("core:user_godfathers", user_id=u.id) }}">
             {{ u.get_short_name() }}
-        </a>
-        {% if u in members_set %}
+          </a>
+          {% if u in members_set %}
             {% trans %}Already seen (check above){% endtrans %}
-        {% else %}
+          {% else %}
             {{ members_set.add(u) or "" }}
             {{ display_members_list(u) }}
-        {% endif %}
-    </li>
-    {% endfor %}
-</ul>
-{% endif %}
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+  {% endif %}
 {% endmacro %}
 
 {% block content %}
-    <p><a href="{{ url("core:user_godfathers", user_id=profile.id) }}">
-        {% trans %}Back to family{% endtrans %}</a></p>
-    {% if profile.__getattribute__(param).exists() %}
-        {% if param == "godchildren" %}
-        <p><a href="{{ url("core:user_godfathers_tree_pict", user_id=profile.id) }}?descent">
-            {% trans %}Show a picture of the tree{% endtrans %}</a></p>
-        <h4>{% trans u=profile.get_short_name() %}Descent tree of {{ u }}{% endtrans %}</h4>
-        {% else %}
-        <p><a href="{{ url("core:user_godfathers_tree_pict", user_id=profile.id) }}?ancestors">
-            {% trans %}Show a picture of the tree{% endtrans %}</a></p>
-        <h4>{% trans u=profile.get_short_name() %}Ancestors tree of {{ u }}{% endtrans %}</h4>
-        {% endif %}
-        {{ members_set.add(profile) or "" }}
-        {{ display_members_list(profile) }}
+  <p><a href="{{ url("core:user_godfathers", user_id=profile.id) }}">
+    {% trans %}Back to family{% endtrans %}</a></p>
+  {% if profile.__getattribute__(param).exists() %}
+    {% if param == "godchildren" %}
+      <p><a href="{{ url("core:user_godfathers_tree_pict", user_id=profile.id) }}?descent">
+        {% trans %}Show a picture of the tree{% endtrans %}</a></p>
+      <h4>{% trans u=profile.get_short_name() %}Descent tree of {{ u }}{% endtrans %}</h4>
     {% else %}
-        {% if param == "godchildren" %}
-        <p>{% trans %}No godchildren{% endtrans %}
-        {% else %}
-        <p>{% trans %}No godfathers / godmothers{% endtrans %}
-        {% endif %}
+      <p><a href="{{ url("core:user_godfathers_tree_pict", user_id=profile.id) }}?ancestors">
+        {% trans %}Show a picture of the tree{% endtrans %}</a></p>
+      <h4>{% trans u=profile.get_short_name() %}Ancestors tree of {{ u }}{% endtrans %}</h4>
     {% endif %}
+    {{ members_set.add(profile) or "" }}
+    {{ display_members_list(profile) }}
+  {% else %}
+    {% if param == "godchildren" %}
+      <p>{% trans %}No godchildren{% endtrans %}
+    {% else %}
+      <p>{% trans %}No godfathers / godmothers{% endtrans %}
+    {% endif %}
+  {% endif %}
 {% endblock %}
 
diff --git a/core/templates/core/user_group.jinja b/core/templates/core/user_group.jinja
index 3becceb8e..7fd30d615 100644
--- a/core/templates/core/user_group.jinja
+++ b/core/templates/core/user_group.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_group.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_group.scss') }}">
 {%- endblock -%}
 
 {% block content %}
-<main>
+  <main>
     <h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2>
     <form action="" method="post">
-        {% csrf_token %}
-        {{ form.as_p() }}
-        <p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
     </form>
-</main>
+  </main>
 {%- endblock -%}
\ No newline at end of file
diff --git a/core/templates/core/user_list.jinja b/core/templates/core/user_list.jinja
index db8f1fce0..da853d889 100644
--- a/core/templates/core/user_list.jinja
+++ b/core/templates/core/user_list.jinja
@@ -1,15 +1,15 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}User list{% endtrans %}
+  {% trans %}User list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}User list{% endtrans %}</h3>
-<ul>
-{% for u in user_list %}
-<li><a href="{{ url('core:user_profile', user_id=u.id) }}">{{ u.get_display_name() }}</a></li>
-{% endfor %}
-</ul>
+  <h3>{% trans %}User list{% endtrans %}</h3>
+  <ul>
+    {% for u in user_list %}
+      <li><a href="{{ url('core:user_profile', user_id=u.id) }}">{{ u.get_display_name() }}</a></li>
+    {% endfor %}
+  </ul>
 {% endblock %}
 
diff --git a/core/templates/core/user_pictures.jinja b/core/templates/core/user_pictures.jinja
index de3f2af0e..00f1913e6 100644
--- a/core/templates/core/user_pictures.jinja
+++ b/core/templates/core/user_pictures.jinja
@@ -1,111 +1,111 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-    <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
+  <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s pictures{% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s pictures{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <main>
+  <main>
     {% if can_edit(profile, user) %}
-        <button id="download_all_pictures", onclick=download_pictures()>{% trans %}Download all my pictures{% endtrans %}</button>
+      <button id="download_all_pictures", onclick=download_pictures()>{% trans %}Download all my pictures{% endtrans %}</button>
     {% endif %}
     {% for a in albums %}
-        <h4>{{ a.name }}</h4>
-        <div class="photos">
-            {% for p in pictures[a.id] %}
-                {% if p.can_be_viewed_by(user) %}
-                    <a href="{{ url("sas:picture", picture_id=p.id) }}#pict">
-                        <div
-                            class="photo{% if not p.is_moderated %} not_moderated{% endif %}"
-                            style="background-image: url('{% if p.file %}{{ p.get_download_thumb_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
-                        >
-                            {% if not p.is_moderated %}
-                                <div class="overlay">&nbsp;</div>
-                                <div class="text">{% trans %}To be moderated{% endtrans %}</div>
-                            {% else %}
-                                <div class="text">&nbsp;</div>
-                            {% endif %}
-                        </div>
-                    </a>
+      <h4>{{ a.name }}</h4>
+      <div class="photos">
+        {% for p in pictures[a.id] %}
+          {% if p.can_be_viewed_by(user) %}
+            <a href="{{ url("sas:picture", picture_id=p.id) }}#pict">
+              <div
+                class="photo{% if not p.is_moderated %} not_moderated{% endif %}"
+                style="background-image: url('{% if p.file %}{{ p.get_download_thumb_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
+              >
+                {% if not p.is_moderated %}
+                  <div class="overlay">&nbsp;</div>
+                  <div class="text">{% trans %}To be moderated{% endtrans %}</div>
                 {% else %}
-                    <div>
-                        <div class="photo">
-                            <div class="text">{% trans %}Picture Unavailable{% endtrans %}</div>
-                        </div>
-                    </div>
+                  <div class="text">&nbsp;</div>
                 {% endif %}
-            {% endfor %}
-        </div>
-        <br>
+              </div>
+            </a>
+          {% else %}
+            <div>
+              <div class="photo">
+                <div class="text">{% trans %}Picture Unavailable{% endtrans %}</div>
+              </div>
+            </div>
+          {% endif %}
+        {% endfor %}
+      </div>
+      <br>
     {% endfor %}
-    </main>
+  </main>
 {% endblock %}
 
 {% block script %}
-    {{ super() }}
-    <script type="text/javascript">
+  {{ super() }}
+  <script type="text/javascript">
         /**
          * Download a list of files.
          * @author speedplane
          */
-        function download_files(files) {
-          function download_next(i) {
-            if (i >= files.length) {
-              return;
-            }
-            var a = document.createElement('a');
-            a.href = files[i].download;
-            a.target = '_parent';
+    function download_files(files) {
+      function download_next(i) {
+        if (i >= files.length) {
+          return;
+        }
+        var a = document.createElement('a');
+        a.href = files[i].download;
+        a.target = '_parent';
             // Use a.download if available, it prevents plugins from opening.
-            if ('download' in a) {
-              a.download = files[i].filename;
-            }
+        if ('download' in a) {
+          a.download = files[i].filename;
+        }
             // Add a to the doc for click to work.
-            (document.body || document.documentElement).appendChild(a);
-            if (a.click) {
-              a.click(); // The click method is supported by most browsers.
-            } else {
-              $(a).click(); // Backup using jquery
-            }
+        (document.body || document.documentElement).appendChild(a);
+        if (a.click) {
+          a.click(); // The click method is supported by most browsers.
+        } else {
+          $(a).click(); // Backup using jquery
+        }
             // Delete the temporary link.
-            a.parentNode.removeChild(a);
+        a.parentNode.removeChild(a);
             // Download the next file with a small timeout. The timeout is necessary
             // for IE, which will otherwise only download the first file.
-            setTimeout(function() {
-              download_next(i + 1);
-            }, 500);
-          }
+        setTimeout(function() {
+          download_next(i + 1);
+        }, 500);
+      }
           // Initiate the first download.
-          download_next(0);
-        }
-        function download_pictures() {
-            $("#download_all_pictures").prop("disabled", true);
-            const xhr = new XMLHttpRequest();
-            $.ajax({
-                type: "GET",
-                url: "{{ url('api:pictures') }}?users_identified={{ object.id }}",
-                tryCount: 0,
-                xhr: function(){
-                     return xhr;
-                },
-                success: function(data){
-                    $("#download_all_pictures").prop("disabled", false);
-                    to_download = [];
-                    data.forEach(picture => 
-                        to_download.push({ download: picture["full_size_url"], filename: picture["name"] })
-                    );
-                    download_files(to_download);
-                },
-                error: function(data){
-                    console.log("Error retrieving data from url: " + data);
-                    $("#download_all_pictures").text("{% trans %}Error downloading your pictures{% endtrans %}");
-                }
-            });
+      download_next(0);
+    }
+    function download_pictures() {
+      $("#download_all_pictures").prop("disabled", true);
+      const xhr = new XMLHttpRequest();
+      $.ajax({
+        type: "GET",
+        url: "{{ url('api:pictures') }}?users_identified={{ object.id }}",
+        tryCount: 0,
+        xhr: function(){
+          return xhr;
+        },
+        success: function(data){
+          $("#download_all_pictures").prop("disabled", false);
+          to_download = [];
+          data.forEach(picture =>
+            to_download.push({ download: picture["full_size_url"], filename: picture["name"] })
+          );
+          download_files(to_download);
+        },
+        error: function(data){
+          console.log("Error retrieving data from url: " + data);
+          $("#download_all_pictures").text("{% trans %}Error downloading your pictures{% endtrans %}");
         }
-    </script>
+      });
+    }
+  </script>
 {% endblock %}
 
diff --git a/core/templates/core/user_preferences.jinja b/core/templates/core/user_preferences.jinja
index 587086358..88cb8c4a1 100644
--- a/core/templates/core/user_preferences.jinja
+++ b/core/templates/core/user_preferences.jinja
@@ -1,69 +1,69 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_preferences.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_preferences.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-{% trans %}Preferences{% endtrans %}
+  {% trans %}Preferences{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <div class="main">
-        <h2>{% trans %}Preferences{% endtrans %}</h2>
-        <h3>{% trans %}General{% endtrans %}</h3>
-        <form class="form form-general" action="" method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            {{ form.as_p() }}
-            <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
-        </form>
+  <div class="main">
+    <h2>{% trans %}Preferences{% endtrans %}</h2>
+    <h3>{% trans %}General{% endtrans %}</h3>
+    <form class="form form-general" action="" method="post" enctype="multipart/form-data">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
+    </form>
 
-        <h3>{% trans %}Trombi{% endtrans %}</h3>
+    <h3>{% trans %}Trombi{% endtrans %}</h3>
 
-        {% if trombi_form %}
-            <form class="form form-trombi" action="{{ url('trombi:user_tools') }}" method="post" enctype="multipart/form-data">
-                {% csrf_token %}
-                {{ trombi_form.as_p() }}
-                <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
-            </form>
+    {% if trombi_form %}
+      <form class="form form-trombi" action="{{ url('trombi:user_tools') }}" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ trombi_form.as_p() }}
+        <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
+      </form>
 
-        {% else %}
-            <p>{% trans trombi=user.trombi_user.trombi %}You already choose to be in that Trombi: {{ trombi }}.{% endtrans %}
-                <br />
-                <a href="{{ url('trombi:user_tools') }}">{% trans %}Go to my Trombi tools{% endtrans %}</a>
-            </p>
-        {% endif %}
+    {% else %}
+      <p>{% trans trombi=user.trombi_user.trombi %}You already choose to be in that Trombi: {{ trombi }}.{% endtrans %}
+        <br />
+        <a href="{{ url('trombi:user_tools') }}">{% trans %}Go to my Trombi tools{% endtrans %}</a>
+      </p>
+    {% endif %}
 
 
-        {% if profile.customer %}
-            <h3>{% trans %}Student cards{% endtrans %}</h3>
+    {% if profile.customer %}
+      <h3>{% trans %}Student cards{% endtrans %}</h3>
 
-            {% if profile.customer.student_cards.exists() %}
-                <ul class="student-cards">
-                    {% for card in profile.customer.student_cards.all() %}
-                    <li>
-                        {{ card.uid }}
-                        &nbsp;-&nbsp;
-                        <a href="{{ url('counter:delete_student_card', customer_id=profile.customer.pk, card_id=card.id) }}">
-                            {% trans %}Delete{% endtrans %}
-                        </a>
-                    </li>
-                    {% endfor %}
-                </ul>
-            {% else %}
-                <em class="no-cards">{% trans %}No student card registered.{% endtrans %}</em>
-                <p class="justify">
-                    {% trans %}You can add a card by asking at a counter or add it yourself here. If you want to manually
-                    add a student card yourself, you'll need a NFC reader. We store the UID of the card which is 14 characters long.{% endtrans %}
-                </p>
-            {% endif %}
+      {% if profile.customer.student_cards.exists() %}
+        <ul class="student-cards">
+          {% for card in profile.customer.student_cards.all() %}
+            <li>
+              {{ card.uid }}
+              &nbsp;-&nbsp;
+              <a href="{{ url('counter:delete_student_card', customer_id=profile.customer.pk, card_id=card.id) }}">
+                {% trans %}Delete{% endtrans %}
+              </a>
+            </li>
+          {% endfor %}
+        </ul>
+      {% else %}
+        <em class="no-cards">{% trans %}No student card registered.{% endtrans %}</em>
+        <p class="justify">
+          {% trans %}You can add a card by asking at a counter or add it yourself here. If you want to manually
+            add a student card yourself, you'll need a NFC reader. We store the UID of the card which is 14 characters long.{% endtrans %}
+        </p>
+      {% endif %}
 
-            <form class="form form-cards" action="{{ url('counter:add_student_card', customer_id=profile.customer.pk) }}"
-                method="post">
-                {% csrf_token %}
-                {{ student_card_form.as_p() }}
-                <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
-            </form>
-        {% endif %}
-    </div>
+      <form class="form form-cards" action="{{ url('counter:add_student_card', customer_id=profile.customer.pk) }}"
+            method="post">
+        {% csrf_token %}
+        {{ student_card_form.as_p() }}
+        <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
+      </form>
+    {% endif %}
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/user_stats.jinja b/core/templates/core/user_stats.jinja
index be7c44ccf..9038cb9f8 100644
--- a/core/templates/core/user_stats.jinja
+++ b/core/templates/core/user_stats.jinja
@@ -1,58 +1,58 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_stats.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_stats.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s stats{% endtrans %}
+  {% trans user_name=profile.get_display_name() %}{{ user_name }}'s stats{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div class="container">
-<div class="row">
-    {% if profile.permanencies %}
-    <div>
-        <h3>{% trans %}Permanencies{% endtrans %}</h3>
-        <div class="flexed">
+  <div class="container">
+    <div class="row">
+      {% if profile.permanencies %}
+        <div>
+          <h3>{% trans %}Permanencies{% endtrans %}</h3>
+          <div class="flexed">
             <div><span>Foyer :</span><span>{{ total_foyer_time }}</span></div>
             <div><span>Gommette :</span><span>{{ total_gommette_time }}</span></div>
             <div><span>MDE :</span><span>{{ total_mde_time }}</span></div>
             <div><b>Total :</b><b>{{ total_perm_time }}</b></div>
+          </div>
         </div>
-    </div>
-    {% endif %}
+      {% endif %}
 
-    <div>
+      <div>
         <h3>{% trans %}Buyings{% endtrans %}</h3>
         <div class="flexed">
-            <div><span>Foyer :</span><span>{{ total_foyer_buyings }}&nbsp;€</span></div>
-            <div><span>Gommette :</span><span>{{ total_gommette_buyings }}&nbsp;€</span></div>
-            <div><span>MDE :</span><span>{{ total_mde_buyings }}&nbsp;€</span></div>
-            <div><b>Total :</b><b>{{ total_foyer_buyings + total_gommette_buyings + total_mde_buyings }}&nbsp;€</b>
-            </div>
+          <div><span>Foyer :</span><span>{{ total_foyer_buyings }}&nbsp;€</span></div>
+          <div><span>Gommette :</span><span>{{ total_gommette_buyings }}&nbsp;€</span></div>
+          <div><span>MDE :</span><span>{{ total_mde_buyings }}&nbsp;€</span></div>
+          <div><b>Total :</b><b>{{ total_foyer_buyings + total_gommette_buyings + total_mde_buyings }}&nbsp;€</b>
+          </div>
         </div>
+      </div>
     </div>
-</div>
 
-<div>
-    <h3>{% trans %}Product top 10{% endtrans %}</h3>
-    <table>
+    <div>
+      <h3>{% trans %}Product top 10{% endtrans %}</h3>
+      <table>
         <thead>
-            <tr>
-                <td>{% trans %}Product{% endtrans %}</td>
-                <td>{% trans %}Quantity{% endtrans %}</td>
-            </tr>
+          <tr>
+            <td>{% trans %}Product{% endtrans %}</td>
+            <td>{% trans %}Quantity{% endtrans %}</td>
+          </tr>
         </thead>
         <tbody>
-            {% for p in top_product %}
+          {% for p in top_product %}
             <tr>
-                <td>{{ p['product__name'] }}</td>
-                <td>{{ p['product_sum'] }}</td>
+              <td>{{ p['product__name'] }}</td>
+              <td>{{ p['product_sum'] }}</td>
             </tr>
-            {% endfor %}
+          {% endfor %}
         </tbody>
-    </table>
-</div>
-</div>
+      </table>
+    </div>
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index 4e1e69a2c..fed40176a 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -1,199 +1,199 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('user/user_tools.scss') }}">
+  <link rel="stylesheet" href="{{ scss('user/user_tools.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-{% trans user_name=user.get_display_name() %}{{ user_name }}'s tools{% endtrans %}
+  {% trans user_name=user.get_display_name() %}{{ user_name }}'s tools{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<main>
+  <main>
     <h3>{% trans %}User Tools{% endtrans %}</h3>
 
     <div class="container">
-        {% if user.can_create_subscription or user.is_root or user.is_board_member %}
-            <div>
-                <h4>{% trans %}Sith management{% endtrans %}</h4>
-                <ul>
-                    {% if user.is_root %}
-                    <li><a href="{{ url('core:group_list') }}">{% trans %}Groups{% endtrans %}</a></li>
-                    <li><a href="{{ url('rootplace:merge') }}">{% trans %}Merge users{% endtrans %}</a></li>
-                    <li><a href="{{ url('rootplace:operation_logs') }}">{% trans %}Operation logs{% endtrans %}</a></li>
-                    <li><a href="{{ url('rootplace:delete_forum_messages') }}">{% trans %}Delete user's forum messages{% endtrans %}</a></li>
-                    {% endif %}
-                    {% if user.can_create_subscription or user.is_root %}
-                    <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
-                    {% endif %}
-                    {% if user.is_board_member or user.is_root %}
-                    <li><a href="{{ url('subscription:stats') }}">{% trans %}Subscription stats{% endtrans %}</a></li>
-                    <li><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></li>
-                    {% endif %}
-                </ul>
-            </div>
-        {% endif %}
-
-        {% set is_admin_on_a_counter = false %}
-        {% for b in settings.SITH_COUNTER_BARS if user.is_in_group(name=b[1] + " admin") %}
-            {% set is_admin_on_a_counter = true %}
-        {% endfor %}
-
-        {% if
-            is_admin_on_a_counter
-            or user.is_root
-            or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
-        %}
-            <div>
-                <h4>{% trans %}Counters{% endtrans %}</h4>
-                <ul>
-                    {% if user.is_root
-                       or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
-                    %}
-                        <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
-                        <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
-                        <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
-                        <li><a href="{{ url('counter:cash_summary_list') }}">{% trans %}Cash register summaries{% endtrans %}</a></li>
-                        <li><a href="{{ url('counter:invoices_call') }}">{% trans %}Invoices call{% endtrans %}</a></li>
-                        <li><a href="{{ url('counter:eticket_list') }}">{% trans %}Etickets{% endtrans %}</a></li>
-                    {% endif %}
-                </ul>
-                <ul>
-                    {% for b in settings.SITH_COUNTER_BARS %}
-                        {% if user.is_in_group(name=b[1]+" admin") %}
-                            {% set c = Counter.objects.filter(id=b[0]).first() %}
-
-                            <li class="rows counter">
-                                <a href="{{ url('counter:details', counter_id=b[0]) }}">{{ b[1] }}</a>
-
-                                <span>
-                                    <span>
-                                        <a class="button" href="{{ url('counter:admin', counter_id=b[0]) }}">{% trans %}Edit{% endtrans %}</a>
-                                        <a class="button" href="{{ url('counter:stats', counter_id=b[0]) }}">{% trans %}Stats{% endtrans %}</a>
-                                        {% if c.stock %}
-                                        <a class="button" href="{{ url('stock:items_list', stock_id=c.stock.id)}}">Stock</a>
-                                        {% endif %}
-                                    </span>
-                                    {% if c.stock %}
-                                        <a class="button" href="{{ url('stock:shoppinglist_list', stock_id=c.stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a>
-                                    {% else %}
-                                        <a class="button" href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a>
-                                    {% endif %}
-                                </span>
-                            </li>
-                        {% endif %}
-                    {% endfor %}
-                </ul>
-            </div>
-        {% endif %}
-
-        {% if
-            user.is_root
-            or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-            or user.memberships.ongoing().filter(role__gte=7).count() > 10
-        %}
-            <div>
-                <h4>{% trans %}Accounting{% endtrans %}</h4>
-                <ul>
-                    {% if user.is_root
-                       or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-                    %}
-                        <li><a href="{{ url('accounting:refound_account') }}">{% trans %}Refound Account{% endtrans %}</a></li>
-                        <li><a href="{{ url('accounting:bank_list') }}">{% trans %}General accounting{% endtrans %}</a></li>
-                        <li><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></li>
-                    {% endif %}
-
-                    {% for m in user.memberships.filter(end_date=None).filter(role__gte=7).all() -%}
-                        {%- for b in m.club.bank_accounts.all() %}
-                            <li class="rows">
-                                <strong>{% trans %}Bank account: {% endtrans %}</strong>
-                                <a href="{{ url('accounting:bank_details', b_account_id=b.id) }}">{{ b }}</a>
-                            </li>
-                        {%- endfor %}
-
-                        {% if m.club.club_account.exists() -%}
-                            {% for ca in m.club.club_account.all() %}
-                                <li class="rows">
-                                    <strong>{% trans %}Club account: {% endtrans %}</strong>
-                                    <a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca }}</a>
-                                </li>
-                            {%- endfor %}
-                        {%- endif -%}
-                    {%- endfor %}
-                </ul>
-            </div>
-        {% endif %}
-
-        {% if
-            user.is_root
-            or user.is_com_admin
-            or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID)
-        %}
-            <div>
-                <h4>{% trans %}Communication{% endtrans %}</h4>
-                <ul>
-                    {% if user.is_com_admin or user.is_root %}
-                        <li><a href="{{ url('com:weekmail_article') }}">{% trans %}Create weekmail article{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:weekmail') }}">{% trans %}Weekmail{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:weekmail_destinations') }}">{% trans %}Weekmail destinations{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:news_new') }}">{% trans %}Create news{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:news_admin_list') }}">{% trans %}Moderate news{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:alert_edit') }}">{% trans %}Edit alert message{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:info_edit') }}">{% trans %}Edit information message{% endtrans %}</a></li>
-                        <li><a href="{{ url('core:file_moderation') }}">{% trans %}Moderate files{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:mailing_admin') }}">{% trans %}Mailing lists administration{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:poster_list') }}">{% trans %}Posters{% endtrans %}</a></li>
-                        <li><a href="{{ url('com:screen_list') }}">{% trans %}Screens{% endtrans %}</a></li>
-                    {% endif %}
-                    {% if user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
-                        <li><a href="{{ url('sas:moderation') }}">{% trans %}Moderate pictures{% endtrans %}</a></li>
-                    {% endif %}
-                </ul>
-            </div>
-        {% endif %}
-
-        {% if user.memberships.filter(end_date=None).all().count() > 0 %}
-            <div>
-                <h4>{% trans %}Club tools{% endtrans %}</h4>
-                <ul>
-                    {% for m in user.memberships.filter(end_date=None).all() %}
-                    <li><a href="{{ url('club:tools', club_id=m.club.id) }}">{{ m.club }}</a></li>
-                    {% endfor %}
-                </ul>
-            </div>
-        {% endif %}
-
-        {% if
-            user.is_root
-            or user.is_in_group(pk=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID)
-        %}
-            <div>
-                <h4>{% trans %}Pedagogy{% endtrans %}</h4>
-                <ul>
-                    <li><a href="{{ url('pedagogy:uv_create') }}">{% trans %}Create UV{% endtrans %}</a></li>
-                    <li><a href="{{ url('pedagogy:moderation') }}">{% trans %}Moderate comments{% endtrans %}</a></li>
-                </ul>
-            </div>
-        {% endif %}
-
-        <div>
-            <h4>{% trans %}Elections{% endtrans %}</h4>
-            <ul>
-                <li><a href="{{ url('election:list') }}">{% trans %}See available elections{% endtrans %}</a></li>
-                <li><a href="{{ url('election:list_archived') }}">{% trans %}See archived elections{% endtrans %}</a></li>
-                {%- if user.is_subscribed -%}
-                    <li><a href="{{ url('election:create') }}">{% trans %}Create a new election{% endtrans %}</a></li>
-                {%- endif -%}
-            </ul>
-        </div>
-
+      {% if user.can_create_subscription or user.is_root or user.is_board_member %}
         <div>
-            <h4>{% trans %}Other tools{% endtrans %}</h4>
-            <ul>
-                <li><a href="{{ url('core:to_markdown') }}">{% trans %}Convert dokuwiki/BBcode syntax to Markdown{% endtrans %}</a></li>
-                <li><a href="{{ url('trombi:user_tools') }}">{% trans %}Trombi tools{% endtrans %}</a></li>
-            </ul>
+          <h4>{% trans %}Sith management{% endtrans %}</h4>
+          <ul>
+            {% if user.is_root %}
+              <li><a href="{{ url('core:group_list') }}">{% trans %}Groups{% endtrans %}</a></li>
+              <li><a href="{{ url('rootplace:merge') }}">{% trans %}Merge users{% endtrans %}</a></li>
+              <li><a href="{{ url('rootplace:operation_logs') }}">{% trans %}Operation logs{% endtrans %}</a></li>
+              <li><a href="{{ url('rootplace:delete_forum_messages') }}">{% trans %}Delete user's forum messages{% endtrans %}</a></li>
+            {% endif %}
+            {% if user.can_create_subscription or user.is_root %}
+              <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
+            {% endif %}
+            {% if user.is_board_member or user.is_root %}
+              <li><a href="{{ url('subscription:stats') }}">{% trans %}Subscription stats{% endtrans %}</a></li>
+              <li><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></li>
+            {% endif %}
+          </ul>
         </div>
-    </div>
+      {% endif %}
+
+      {% set is_admin_on_a_counter = false %}
+      {% for b in settings.SITH_COUNTER_BARS if user.is_in_group(name=b[1] + " admin") %}
+        {% set is_admin_on_a_counter = true %}
+      {% endfor %}
+
+      {% if
+      is_admin_on_a_counter
+      or user.is_root
+      or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
+      %}
+      <div>
+        <h4>{% trans %}Counters{% endtrans %}</h4>
+        <ul>
+          {% if user.is_root
+          or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
+          %}
+          <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
+          <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
+          <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
+          <li><a href="{{ url('counter:cash_summary_list') }}">{% trans %}Cash register summaries{% endtrans %}</a></li>
+          <li><a href="{{ url('counter:invoices_call') }}">{% trans %}Invoices call{% endtrans %}</a></li>
+          <li><a href="{{ url('counter:eticket_list') }}">{% trans %}Etickets{% endtrans %}</a></li>
+{% endif %}
+</ul>
+<ul>
+  {% for b in settings.SITH_COUNTER_BARS %}
+    {% if user.is_in_group(name=b[1]+" admin") %}
+      {% set c = Counter.objects.filter(id=b[0]).first() %}
+
+      <li class="rows counter">
+        <a href="{{ url('counter:details', counter_id=b[0]) }}">{{ b[1] }}</a>
+
+        <span>
+          <span>
+            <a class="button" href="{{ url('counter:admin', counter_id=b[0]) }}">{% trans %}Edit{% endtrans %}</a>
+            <a class="button" href="{{ url('counter:stats', counter_id=b[0]) }}">{% trans %}Stats{% endtrans %}</a>
+            {% if c.stock %}
+              <a class="button" href="{{ url('stock:items_list', stock_id=c.stock.id)}}">Stock</a>
+            {% endif %}
+          </span>
+          {% if c.stock %}
+            <a class="button" href="{{ url('stock:shoppinglist_list', stock_id=c.stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a>
+          {% else %}
+            <a class="button" href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a>
+          {% endif %}
+        </span>
+      </li>
+    {% endif %}
+  {% endfor %}
+</ul>
+</div>
+{% endif %}
+
+{% if
+user.is_root
+or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+or user.memberships.ongoing().filter(role__gte=7).count() > 10
+%}
+<div>
+  <h4>{% trans %}Accounting{% endtrans %}</h4>
+  <ul>
+    {% if user.is_root
+    or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+    %}
+    <li><a href="{{ url('accounting:refound_account') }}">{% trans %}Refound Account{% endtrans %}</a></li>
+    <li><a href="{{ url('accounting:bank_list') }}">{% trans %}General accounting{% endtrans %}</a></li>
+    <li><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></li>
+    {% endif %}
+
+    {% for m in user.memberships.filter(end_date=None).filter(role__gte=7).all() -%}
+      {%- for b in m.club.bank_accounts.all() %}
+        <li class="rows">
+          <strong>{% trans %}Bank account: {% endtrans %}</strong>
+          <a href="{{ url('accounting:bank_details', b_account_id=b.id) }}">{{ b }}</a>
+        </li>
+      {%- endfor %}
+
+      {% if m.club.club_account.exists() -%}
+        {% for ca in m.club.club_account.all() %}
+          <li class="rows">
+            <strong>{% trans %}Club account: {% endtrans %}</strong>
+            <a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca }}</a>
+          </li>
+        {%- endfor %}
+      {%- endif -%}
+    {%- endfor %}
+  </ul>
+</div>
+{% endif %}
+
+{% if
+user.is_root
+or user.is_com_admin
+or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID)
+%}
+<div>
+  <h4>{% trans %}Communication{% endtrans %}</h4>
+  <ul>
+    {% if user.is_com_admin or user.is_root %}
+      <li><a href="{{ url('com:weekmail_article') }}">{% trans %}Create weekmail article{% endtrans %}</a></li>
+      <li><a href="{{ url('com:weekmail') }}">{% trans %}Weekmail{% endtrans %}</a></li>
+      <li><a href="{{ url('com:weekmail_destinations') }}">{% trans %}Weekmail destinations{% endtrans %}</a></li>
+      <li><a href="{{ url('com:news_new') }}">{% trans %}Create news{% endtrans %}</a></li>
+      <li><a href="{{ url('com:news_admin_list') }}">{% trans %}Moderate news{% endtrans %}</a></li>
+      <li><a href="{{ url('com:alert_edit') }}">{% trans %}Edit alert message{% endtrans %}</a></li>
+      <li><a href="{{ url('com:info_edit') }}">{% trans %}Edit information message{% endtrans %}</a></li>
+      <li><a href="{{ url('core:file_moderation') }}">{% trans %}Moderate files{% endtrans %}</a></li>
+      <li><a href="{{ url('com:mailing_admin') }}">{% trans %}Mailing lists administration{% endtrans %}</a></li>
+      <li><a href="{{ url('com:poster_list') }}">{% trans %}Posters{% endtrans %}</a></li>
+      <li><a href="{{ url('com:screen_list') }}">{% trans %}Screens{% endtrans %}</a></li>
+    {% endif %}
+    {% if user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
+      <li><a href="{{ url('sas:moderation') }}">{% trans %}Moderate pictures{% endtrans %}</a></li>
+    {% endif %}
+  </ul>
+</div>
+{% endif %}
+
+{% if user.memberships.filter(end_date=None).all().count() > 0 %}
+  <div>
+    <h4>{% trans %}Club tools{% endtrans %}</h4>
+    <ul>
+      {% for m in user.memberships.filter(end_date=None).all() %}
+        <li><a href="{{ url('club:tools', club_id=m.club.id) }}">{{ m.club }}</a></li>
+      {% endfor %}
+    </ul>
+  </div>
+{% endif %}
+
+{% if
+user.is_root
+or user.is_in_group(pk=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID)
+%}
+<div>
+  <h4>{% trans %}Pedagogy{% endtrans %}</h4>
+  <ul>
+    <li><a href="{{ url('pedagogy:uv_create') }}">{% trans %}Create UV{% endtrans %}</a></li>
+    <li><a href="{{ url('pedagogy:moderation') }}">{% trans %}Moderate comments{% endtrans %}</a></li>
+  </ul>
+</div>
+{% endif %}
+
+<div>
+  <h4>{% trans %}Elections{% endtrans %}</h4>
+  <ul>
+    <li><a href="{{ url('election:list') }}">{% trans %}See available elections{% endtrans %}</a></li>
+    <li><a href="{{ url('election:list_archived') }}">{% trans %}See archived elections{% endtrans %}</a></li>
+    {%- if user.is_subscribed -%}
+      <li><a href="{{ url('election:create') }}">{% trans %}Create a new election{% endtrans %}</a></li>
+    {%- endif -%}
+  </ul>
+</div>
+
+<div>
+  <h4>{% trans %}Other tools{% endtrans %}</h4>
+  <ul>
+    <li><a href="{{ url('core:to_markdown') }}">{% trans %}Convert dokuwiki/BBcode syntax to Markdown{% endtrans %}</a></li>
+    <li><a href="{{ url('trombi:user_tools') }}">{% trans %}Trombi tools{% endtrans %}</a></li>
+  </ul>
+</div>
+</div>
 </main>
 {% endblock %}
\ No newline at end of file
diff --git a/counter/templates/counter/activity.jinja b/counter/templates/counter/activity.jinja
index 3ea720d03..4622b7a9e 100644
--- a/counter/templates/counter/activity.jinja
+++ b/counter/templates/counter/activity.jinja
@@ -2,43 +2,43 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}
+  {% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}
 {% endblock %}
 
 {%- block additional_css -%}
-<link rel="stylesheet" href="{{ scss('counter/activity.scss') }}">
+  <link rel="stylesheet" href="{{ scss('counter/activity.scss') }}">
 {%- endblock -%}
 
 {% block content %}
-    <h3>{% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}</h3>
-        {% if counter.type == 'BAR' %}
-            <h4>{% trans %}Barmen list{% endtrans %}</h4>
-            <ul>
-                {% if counter.barmen_list | length > 0 %}
-                    {% for b in counter.barmen_list %}
-                        <li>{{ user_profile_link(b) }}</li>
-                    {% endfor %}
-                {% else %}
-                    {% trans %}There is currently no barman connected.{% endtrans %}
-                {% endif %}
-            </ul>
-        {% endif %}
+  <h3>{% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}</h3>
+  {% if counter.type == 'BAR' %}
+    <h4>{% trans %}Barmen list{% endtrans %}</h4>
+    <ul>
+      {% if counter.barmen_list | length > 0 %}
+        {% for b in counter.barmen_list %}
+          <li>{{ user_profile_link(b) }}</li>
+        {% endfor %}
+      {% else %}
+        {% trans %}There is currently no barman connected.{% endtrans %}
+      {% endif %}
+    </ul>
+  {% endif %}
 
-    <h5>{% trans %}Legend{% endtrans %}</h5>
-    <div class="activity-description">
-        <div>
-            <i class="fa fa-check" style="color: #2ecc71"></i>
-            <span>{% trans %}counter is open, there's at least one barman connected{% endtrans %}</span>
-        </div>
-        <div>
-            <i class="fa fa-question" style="color: #f39c12"></i>
-            <span>{% trans  minutes=settings.SITH_COUNTER_MINUTE_INACTIVE %}counter is open but not active, the last sale was done at least {{ minutes }} minutes ago {% endtrans %}</span>
-        </div>
-        <div>
-            <i class="fa fa-times" style="color: #eb2f06"></i>
-            <span>{% trans %}counter is not open : no one is connected{% endtrans %}</span>
-        </div>
+  <h5>{% trans %}Legend{% endtrans %}</h5>
+  <div class="activity-description">
+    <div>
+      <i class="fa fa-check" style="color: #2ecc71"></i>
+      <span>{% trans %}counter is open, there's at least one barman connected{% endtrans %}</span>
     </div>
+    <div>
+      <i class="fa fa-question" style="color: #f39c12"></i>
+      <span>{% trans  minutes=settings.SITH_COUNTER_MINUTE_INACTIVE %}counter is open but not active, the last sale was done at least {{ minutes }} minutes ago {% endtrans %}</span>
+    </div>
+    <div>
+      <i class="fa fa-times" style="color: #eb2f06"></i>
+      <span>{% trans %}counter is not open : no one is connected{% endtrans %}</span>
+    </div>
+  </div>
 {% endblock %}
 
 
diff --git a/counter/templates/counter/cash_register_summary.jinja b/counter/templates/counter/cash_register_summary.jinja
index 16cdc1a5f..0a04de01d 100644
--- a/counter/templates/counter/cash_register_summary.jinja
+++ b/counter/templates/counter/cash_register_summary.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans obj=object %}Edit {{ obj }}{% endtrans %}
+  {% trans obj=object %}Edit {{ obj }}{% endtrans %}
 {% endblock %}
 
 {% block info_boxes %}
@@ -11,22 +11,22 @@
 {% endblock %}
 
 {% block content %}
-<h2>{% trans %}Make a cash register summary{% endtrans %}</h2>
-<form action="" method="post" id="cash_summary_form">
+  <h2>{% trans %}Make a cash register summary{% endtrans %}</h2>
+  <form action="" method="post" id="cash_summary_form">
     {% csrf_token %}
     {% for field in form %}
-    <p>
-    {% if field.name[:5] == "check" and field.name[8:] == "value" %}
-        {% set name = field.name[:7] + "_quantity" %}
-    {{ field.errors }}<label for="{{ field.name }}">{{ field.label }}</label> {{ field }}
-    {{ form[name].errors }}<label for="{{ form[name].name }}">{{ form[name].label }}</label> {{ form[name] }}
-    {% elif field.name[:5] != "check" %}
-    {{ field.errors }}<label for="{{ field.name }}">{{ field.label }}</label> {{ field }}
-    {% endif %}
-    </p>
+      <p>
+        {% if field.name[:5] == "check" and field.name[8:] == "value" %}
+          {% set name = field.name[:7] + "_quantity" %}
+          {{ field.errors }}<label for="{{ field.name }}">{{ field.label }}</label> {{ field }}
+          {{ form[name].errors }}<label for="{{ form[name].name }}">{{ form[name].label }}</label> {{ form[name] }}
+        {% elif field.name[:5] != "check" %}
+          {{ field.errors }}<label for="{{ field.name }}">{{ field.label }}</label> {{ field }}
+        {% endif %}
+      </p>
     {% endfor %}
     <p><input type="submit" name="submit" value="{% trans %}Save{% endtrans %}" onclick="return confirm('{% trans %}Are you sure ?{% endtrans %}');return false;" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/counter/templates/counter/cash_summary_list.jinja b/counter/templates/counter/cash_summary_list.jinja
index 972ff9ec2..c6817d411 100644
--- a/counter/templates/counter/cash_summary_list.jinja
+++ b/counter/templates/counter/cash_summary_list.jinja
@@ -2,66 +2,66 @@
 {% from 'core/macros.jinja' import user_profile_link, paginate %}
 
 {% block title %}
-{% trans %}Cash register summary list{% endtrans %}
+  {% trans %}Cash register summary list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if cashsummary_list %}
-<h3>{% trans %}Cash register summary list{% endtrans %}</h3>
-<h5>{% trans %}Theoric sums{% endtrans %}</h5>
-<form action="" method="get">
-    {% csrf_token %}
-    {{ form }}
-    <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
-</form>
-<h6>{% trans %}Reloads{% endtrans %}</h6>
-<p>
-{% for b,s in refilling_sums.items() %}
-    {{ b }}: {{ s }} €<br/>
-{% endfor %}
-</p>
-<h6>{% trans %}Cash register summaries{% endtrans %}</h6>
-<p>
-{% for b,s in summaries_sums.items() %}
-    {{ b }}: {{ s }} €<br/>
-{% endfor %}
-</p>
-<table>
-    <thead>
+  {% if cashsummary_list %}
+    <h3>{% trans %}Cash register summary list{% endtrans %}</h3>
+    <h5>{% trans %}Theoric sums{% endtrans %}</h5>
+    <form action="" method="get">
+      {% csrf_token %}
+      {{ form }}
+      <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
+    </form>
+    <h6>{% trans %}Reloads{% endtrans %}</h6>
+    <p>
+      {% for b,s in refilling_sums.items() %}
+        {{ b }}: {{ s }} €<br/>
+      {% endfor %}
+    </p>
+    <h6>{% trans %}Cash register summaries{% endtrans %}</h6>
+    <p>
+      {% for b,s in summaries_sums.items() %}
+        {{ b }}: {{ s }} €<br/>
+      {% endfor %}
+    </p>
+    <table>
+      <thead>
         <tr>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Counter{% endtrans %}</td>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Total{% endtrans %}</td>
-            <td>{% trans %}Emptied{% endtrans %}</td>
-            <td>{% trans %}Comment{% endtrans %}</td>
+          <td>{% trans %}User{% endtrans %}</td>
+          <td>{% trans %}Counter{% endtrans %}</td>
+          <td>{% trans %}Date{% endtrans %}</td>
+          <td>{% trans %}Total{% endtrans %}</td>
+          <td>{% trans %}Emptied{% endtrans %}</td>
+          <td>{% trans %}Comment{% endtrans %}</td>
         </tr>
-    </thead>
-    <tbody>
+      </thead>
+      <tbody>
         {% for c in cashsummary_list  %}
-        <tr>
-        <td>{{ user_profile_link(c.user) }}</td>
-        <td>{{ c.counter }}</td>
-        <td>{{ c.date|localtime|date(DATETIME_FORMAT) }} - {{ c.date|localtime|time(DATETIME_FORMAT) }}</td>
-        <td>{{ c.get_total() }} €</td>
-        {% if c.emptied %}
-        <td>{% trans %}yes{% endtrans %}</td>
-        {% else %}
-        <td></td>
-        {% endif %}
-        <td>{{ c.comment }}</td>
-        <td><a href="{{ url('counter:cash_summary_edit', cashsummary_id=c.id) }}">{% trans %}Edit{% endtrans %}</td>
-        </tr>
+          <tr>
+            <td>{{ user_profile_link(c.user) }}</td>
+            <td>{{ c.counter }}</td>
+            <td>{{ c.date|localtime|date(DATETIME_FORMAT) }} - {{ c.date|localtime|time(DATETIME_FORMAT) }}</td>
+            <td>{{ c.get_total() }} €</td>
+            {% if c.emptied %}
+              <td>{% trans %}yes{% endtrans %}</td>
+            {% else %}
+              <td></td>
+            {% endif %}
+            <td>{{ c.comment }}</td>
+            <td><a href="{{ url('counter:cash_summary_edit', cashsummary_id=c.id) }}">{% trans %}Edit{% endtrans %}</td>
+            </tr>
         {% endfor %}
-    </tbody>
-</table>
-<br>
-{% if is_paginated %}
-    {{ paginate(page_obj, paginator) }}
-{% endif %}
-{% else %}
-{% trans %}There is no cash register summary in this website.{% endtrans %}
-{% endif %}
+      </tbody>
+    </table>
+    <br>
+    {% if is_paginated %}
+      {{ paginate(page_obj, paginator) }}
+    {% endif %}
+  {% else %}
+    {% trans %}There is no cash register summary in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/counter/templates/counter/counter_click.jinja b/counter/templates/counter/counter_click.jinja
index ec018fe8d..743ba732c 100644
--- a/counter/templates/counter/counter_click.jinja
+++ b/counter/templates/counter/counter_click.jinja
@@ -2,12 +2,12 @@
 {% from "core/macros.jinja" import user_mini_profile, user_subscription %}
 
 {% block title %}
-    {{ counter }}
+  {{ counter }}
 {% endblock %}
 
 {% block additional_js %}
-    <script src="{{ static('counter/js/counter_click.js') }}" defer></script>
-    <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
+  <script src="{{ static('counter/js/counter_click.js') }}" defer></script>
+  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block info_boxes %}
@@ -18,180 +18,180 @@
 {% endblock %}
 
 {% block content %}
-    <h4 id="click_interface">{{ counter }}</h4>
-
-    <div id="bar-ui" x-data="counter">
-        <noscript>
-            <p class="important">Javascript is required for the counter UI.</p>
-        </noscript>
-
-        <div id="user_info">
-            <h5>{% trans %}Customer{% endtrans %}</h5>
-            {{ user_mini_profile(customer.user) }}
-            {{ user_subscription(customer.user) }}
-            <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
-            <form method="post" action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
-                {% csrf_token %}
-                <input type="hidden" name="action" value="add_student_card">
-                {% trans %}Add a student card{% endtrans %}
-                <input type="text" name="student_card_uid"/>
-                {% if request.session['not_valid_student_card_uid'] %}
-                    <p><strong>{% trans %}This is not a valid student card UID{% endtrans %}</strong></p>
-                {% endif %}
-                <input type="submit" value="{% trans %}Go{% endtrans %}"/>
-            </form>
-            <h6>{% trans %}Registered cards{% endtrans %}</h6>
-            {% if student_cards %}
-                <p>{{ student_cards }}</p>
-                <ul>
-                    {% for card in student_cards %}
-                        <li>{{ card.uid }}</li>
-                    {% endfor %}
-                </ul>
-            {% else %}
-                {% trans %}No card registered{% endtrans %}
-            {% endif %}
-        </div>
+  <h4 id="click_interface">{{ counter }}</h4>
+
+  <div id="bar-ui" x-data="counter">
+    <noscript>
+      <p class="important">Javascript is required for the counter UI.</p>
+    </noscript>
+
+    <div id="user_info">
+      <h5>{% trans %}Customer{% endtrans %}</h5>
+      {{ user_mini_profile(customer.user) }}
+      {{ user_subscription(customer.user) }}
+      <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
+      <form method="post" action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="add_student_card">
+        {% trans %}Add a student card{% endtrans %}
+        <input type="text" name="student_card_uid"/>
+        {% if request.session['not_valid_student_card_uid'] %}
+          <p><strong>{% trans %}This is not a valid student card UID{% endtrans %}</strong></p>
+        {% endif %}
+        <input type="submit" value="{% trans %}Go{% endtrans %}"/>
+      </form>
+      <h6>{% trans %}Registered cards{% endtrans %}</h6>
+      {% if student_cards %}
+        <p>{{ student_cards }}</p>
+        <ul>
+          {% for card in student_cards %}
+            <li>{{ card.uid }}</li>
+          {% endfor %}
+        </ul>
+      {% else %}
+        {% trans %}No card registered{% endtrans %}
+      {% endif %}
+    </div>
 
-        <div id="click_form">
-            <h5>{% trans %}Selling{% endtrans %}</h5>
-            <div>
-                {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
+    <div id="click_form">
+      <h5>{% trans %}Selling{% endtrans %}</h5>
+      <div>
+        {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
 
                 {# Formulaire pour rechercher un produit en tapant son code dans une barre de recherche #}
-                <form method="post" action=""
-                      class="code_form" @submit.prevent="handle_code">
-                    {% csrf_token %}
-                    <input type="hidden" name="action" value="code">
-                    <label for="code_field"></label>
-                    <input type="text" name="code" value="" class="focus" id="code_field"/>
-                    <input type="submit" value="{% trans %}Go{% endtrans %}"/>
-                </form>
-
-                <template x-for="error in errors">
-                    <div class="alert alert-red" x-text="error">
-                    </div>
-                </template>
-                <p>{% trans %}Basket: {% endtrans %}</p>
-
-                <ul>
-                    <template x-for="[id, item] in Object.entries(basket)" :key="id">
-                        <div>
-                            <form method="post" action="" class="inline del_product_form"
-                                  @submit.prevent="handle_action">
-                                {% csrf_token %}
-                                <input type="hidden" name="action" value="del_product">
-                                <input type="hidden" name="product_id" :value="id">
-                                <input type="submit" value="-"/>
-                            </form>
-
-                            <span x-text="item['qty'] + item['bonus_qty']"></span>
-
-                            <form method="post" action="" class="inline add_product_form"
-                                  @submit.prevent="handle_action">
-                                {% csrf_token %}
-                                <input type="hidden" name="action" value="add_product">
-                                <input type="hidden" name="product_id" :value="id">
-                                <input type="submit" value="+">
-                            </form>
-
-                            <span x-text="products[id].name"></span> :
-                            <span x-text="(item['qty'] * item['price'] / 100)
-                                          .toLocaleString(undefined, { minimumFractionDigits: 2 })">
-                            </span> €
-                            <template x-if="item['bonus_qty'] > 0">P</template>
-                        </div>
-                    </template>
-                </ul>
-                <p>
-                    <strong>Total: </strong>
-                    <strong x-text="sum_basket().toLocaleString(undefined, { minimumFractionDigits: 2 })"></strong>
-                    <strong> €</strong>
-                </p>
-
-                <form method="post"
-                      action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
-                    {% csrf_token %}
-                    <input type="hidden" name="action" value="finish">
-                    <input type="submit" value="{% trans %}Finish{% endtrans %}"/>
-                </form>
-                <form method="post"
-                      action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
-                    {% csrf_token %}
-                    <input type="hidden" name="action" value="cancel">
-                    <input type="submit" value="{% trans %}Cancel{% endtrans %}"/>
-                </form>
+        <form method="post" action=""
+              class="code_form" @submit.prevent="handle_code">
+          {% csrf_token %}
+          <input type="hidden" name="action" value="code">
+          <label for="code_field"></label>
+          <input type="text" name="code" value="" class="focus" id="code_field"/>
+          <input type="submit" value="{% trans %}Go{% endtrans %}"/>
+        </form>
+
+        <template x-for="error in errors">
+          <div class="alert alert-red" x-text="error">
+          </div>
+        </template>
+        <p>{% trans %}Basket: {% endtrans %}</p>
+
+        <ul>
+          <template x-for="[id, item] in Object.entries(basket)" :key="id">
+            <div>
+              <form method="post" action="" class="inline del_product_form"
+                    @submit.prevent="handle_action">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="del_product">
+                <input type="hidden" name="product_id" :value="id">
+                <input type="submit" value="-"/>
+              </form>
+
+              <span x-text="item['qty'] + item['bonus_qty']"></span>
+
+              <form method="post" action="" class="inline add_product_form"
+                    @submit.prevent="handle_action">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="add_product">
+                <input type="hidden" name="product_id" :value="id">
+                <input type="submit" value="+">
+              </form>
+
+              <span x-text="products[id].name"></span> :
+              <span x-text="(item['qty'] * item['price'] / 100)
+                            .toLocaleString(undefined, { minimumFractionDigits: 2 })">
+              </span> €
+              <template x-if="item['bonus_qty'] > 0">P</template>
             </div>
-            {% if (counter.type == 'BAR' and barmens_can_refill) %}
-                <h5>{% trans %}Refilling{% endtrans %}</h5>
-                <div>
-                    <form method="post"
-                          action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
-                        {% csrf_token %}
-                        {{ refill_form.as_p() }}
-                        <input type="hidden" name="action" value="refill">
-                        <input type="submit" value="{% trans %}Go{% endtrans %}"/>
-                    </form>
-                </div>
-            {% endif %}
+          </template>
+        </ul>
+        <p>
+          <strong>Total: </strong>
+          <strong x-text="sum_basket().toLocaleString(undefined, { minimumFractionDigits: 2 })"></strong>
+          <strong> €</strong>
+        </p>
+
+        <form method="post"
+              action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
+          {% csrf_token %}
+          <input type="hidden" name="action" value="finish">
+          <input type="submit" value="{% trans %}Finish{% endtrans %}"/>
+        </form>
+        <form method="post"
+              action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
+          {% csrf_token %}
+          <input type="hidden" name="action" value="cancel">
+          <input type="submit" value="{% trans %}Cancel{% endtrans %}"/>
+        </form>
+      </div>
+      {% if (counter.type == 'BAR' and barmens_can_refill) %}
+        <h5>{% trans %}Refilling{% endtrans %}</h5>
+        <div>
+          <form method="post"
+                action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
+            {% csrf_token %}
+            {{ refill_form.as_p() }}
+            <input type="hidden" name="action" value="refill">
+            <input type="submit" value="{% trans %}Go{% endtrans %}"/>
+          </form>
         </div>
+      {% endif %}
+    </div>
 
-        <div id="products">
-            <ul>
-                {% for category in categories.keys() -%}
-                    <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
-                {%- endfor %}
-            </ul>
-            {% for category in categories.keys() -%}
-                <div id="cat_{{ category|slugify }}">
-                    <h5>{{ category }}</h5>
-                    {% for p in categories[category] -%}
-                        <form method="post"
-                              action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}"
-                              class="form_button add_product_form" @submit.prevent="handle_action">
-                            {% csrf_token %}
-                            <input type="hidden" name="action" value="add_product">
-                            <input type="hidden" name="product_id" value="{{ p.id }}">
-                            <button type="submit">
-                                <strong>{{ p.name }}</strong>
-                                {% if p.icon %}
-                                    <img src="{{ p.icon.url }}" alt="image de {{ p.name }}"/>
-                                {% else %}
-                                    <img src="{{ static('core/img/na.gif') }}" alt="image de {{ p.name }}"/>
-                                {% endif %}
-                                <span>{{ p.price }} €<br>{{ p.code }}</span>
-                            </button>
-                        </form>
-                    {%- endfor %}
-                </div>
-            {%- endfor %}
+    <div id="products">
+      <ul>
+        {% for category in categories.keys() -%}
+          <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
+        {%- endfor %}
+      </ul>
+      {% for category in categories.keys() -%}
+        <div id="cat_{{ category|slugify }}">
+          <h5>{{ category }}</h5>
+          {% for p in categories[category] -%}
+            <form method="post"
+                  action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}"
+                  class="form_button add_product_form" @submit.prevent="handle_action">
+              {% csrf_token %}
+              <input type="hidden" name="action" value="add_product">
+              <input type="hidden" name="product_id" value="{{ p.id }}">
+              <button type="submit">
+                <strong>{{ p.name }}</strong>
+                {% if p.icon %}
+                  <img src="{{ p.icon.url }}" alt="image de {{ p.name }}"/>
+                {% else %}
+                  <img src="{{ static('core/img/na.gif') }}" alt="image de {{ p.name }}"/>
+                {% endif %}
+                <span>{{ p.price }} €<br>{{ p.code }}</span>
+              </button>
+            </form>
+          {%- endfor %}
         </div>
+      {%- endfor %}
     </div>
+  </div>
 {% endblock content %}
 
 {% block script %}
-    {{ super() }}
-    <script>
-        const csrf_token = "{{ csrf_token }}";
-        const click_api_url = "{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}";
-        const basket = {{ request.session["basket"]|tojson }};
-        const products = {
-            {%- for p in products -%}
-                {{ p.id }}: {
-                    code: "{{ p.code }}",
-                    name: "{{ p.name }}",
-                    price: {{ p.price }},
-                },
-            {%- endfor -%}
-        };
-        const products_autocomplete = [
-            {% for p in products -%}
-                {
-                    value: "{{ p.code }}",
-                    label: "{{ p.name }}",
-                    tags: "{{ p.code }} {{ p.name }}",
-                },
-            {%- endfor %}
-        ];
-    </script>
+  {{ super() }}
+  <script>
+    const csrf_token = "{{ csrf_token }}";
+    const click_api_url = "{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}";
+    const basket = {{ request.session["basket"]|tojson }};
+    const products = {
+      {%- for p in products -%}
+        {{ p.id }}: {
+          code: "{{ p.code }}",
+          name: "{{ p.name }}",
+          price: {{ p.price }},
+        },
+      {%- endfor -%}
+    };
+    const products_autocomplete = [
+      {% for p in products -%}
+        {
+          value: "{{ p.code }}",
+          label: "{{ p.name }}",
+          tags: "{{ p.code }} {{ p.name }}",
+        },
+      {%- endfor %}
+    ];
+  </script>
 {% endblock script %}
diff --git a/counter/templates/counter/counter_list.jinja b/counter/templates/counter/counter_list.jinja
index ba8e41973..836d848b9 100644
--- a/counter/templates/counter/counter_list.jinja
+++ b/counter/templates/counter/counter_list.jinja
@@ -1,69 +1,69 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Counter admin list{% endtrans %}
+  {% trans %}Counter admin list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<p><a href="{{ url('counter:new') }}">{% trans %}New counter{% endtrans %}</a></p>
-{% if counter_list %}
-<h3>{% trans %}Counter admin list{% endtrans %}</h3>
-<h4>{% trans %}Eboutic{% endtrans %}</h4>
-<ul>
-    {% for c in counter_list.filter(type="EBOUTIC").order_by('name')  %}
-    <li>
-    <a href="{{ url('eboutic:main') }}">{{ c }}</a> -
-    {% if user.can_edit(c) %}
-    <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
-    <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
-    {% endif %}
-    {% if user.is_owner(c) %}
-    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
-    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
-    {% endif %}
-    </li>
-    {% endfor %}
-</ul>
-<h4>{% trans %}Bars{% endtrans %}</h4>
-<ul>
-    {% for c in counter_list.filter(type="BAR").order_by('name')  %}
-    <li>
-    <a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
-    {% if user.can_edit(c) %}
-    <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
-    <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
-    {% endif %}
-    {% if c.stock %}
-    <a href="{{ url('stock:items_list', stock_id=c.stock.id)}}">Stock</a> -
-    <a href="{{ url('stock:shoppinglist_list', stock_id=c.stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a> -
-    {% else %}
-    <a href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a> -
-    {% endif %}
-    {% if user.is_owner(c) %}
-    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
-    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
-    {% endif %}
-    </li>
-    {% endfor %}
-</ul>
-<h4>{% trans %}Offices{% endtrans %}</h4>
-<ul>
-    {% for c in counter_list.exclude(type="BAR").exclude(type="EBOUTIC").order_by('name')  %}
-    <li>
-    <a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
-    {% if user.can_edit(c) %}
-    <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
-    <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
-    {% endif %}
-    {% if user.is_owner(c) %}
-    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
-    {% endif %}
-    </li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no counters in this website.{% endtrans %}
-{% endif %}
+  <p><a href="{{ url('counter:new') }}">{% trans %}New counter{% endtrans %}</a></p>
+  {% if counter_list %}
+    <h3>{% trans %}Counter admin list{% endtrans %}</h3>
+    <h4>{% trans %}Eboutic{% endtrans %}</h4>
+    <ul>
+      {% for c in counter_list.filter(type="EBOUTIC").order_by('name')  %}
+        <li>
+          <a href="{{ url('eboutic:main') }}">{{ c }}</a> -
+          {% if user.can_edit(c) %}
+            <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
+            <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
+          {% endif %}
+          {% if user.is_owner(c) %}
+            <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
+            <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+    <h4>{% trans %}Bars{% endtrans %}</h4>
+    <ul>
+      {% for c in counter_list.filter(type="BAR").order_by('name')  %}
+        <li>
+          <a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
+          {% if user.can_edit(c) %}
+            <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
+            <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
+          {% endif %}
+          {% if c.stock %}
+            <a href="{{ url('stock:items_list', stock_id=c.stock.id)}}">Stock</a> -
+            <a href="{{ url('stock:shoppinglist_list', stock_id=c.stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a> -
+          {% else %}
+            <a href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a> -
+          {% endif %}
+          {% if user.is_owner(c) %}
+            <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
+            <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+    <h4>{% trans %}Offices{% endtrans %}</h4>
+    <ul>
+      {% for c in counter_list.exclude(type="BAR").exclude(type="EBOUTIC").order_by('name')  %}
+        <li>
+          <a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
+          {% if user.can_edit(c) %}
+            <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
+            <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
+          {% endif %}
+          {% if user.is_owner(c) %}
+            <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no counters in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/counter/templates/counter/counter_main.jinja b/counter/templates/counter/counter_main.jinja
index 826cca819..fcf1bb436 100644
--- a/counter/templates/counter/counter_main.jinja
+++ b/counter/templates/counter/counter_main.jinja
@@ -1,15 +1,15 @@
 {% extends "core/base.jinja" %}
 
 {% macro barman_logout_link(user) %}
-<form method="post" action="{{ url('counter:logout', counter_id=counter.id) }}" class="inline">
+  <form method="post" action="{{ url('counter:logout', counter_id=counter.id) }}" class="inline">
     {% csrf_token %}
     <input type="hidden" name="user_id" value="{{ user.id }}">
     <button type="submit" name="submit_param" value="submit_value" class="link-button">{{ user.get_display_name() }}</button>
-</form>
+  </form>
 {% endmacro %}
 
 {% block title %}
-{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}
+  {% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}
 {% endblock %}
 
 {% block info_boxes %}
@@ -19,44 +19,44 @@
 {% endblock %}
 
 {% block content %}
-<h3>{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}</h3>
-    <div>
-        <h3>{% trans %}Sales{% endtrans %}</h3>
-        {% if last_basket %}
-        <h4>{% trans %}Last selling: {% endtrans %}</h4>
-        <p>{% trans %}Client: {% endtrans %}{{ last_customer }} - {% trans %}New amount: {% endtrans %}{{ new_customer_amount }} €.</p>
-            <ul>
-            {% for s in last_basket %}
-                <li>{{ s }}</li>
-            {% endfor %}
-            </ul>
-            <p><strong>{% trans %}Total: {% endtrans %}{{ last_total }} €</strong></p>
-        {% endif %}
-        {% if barmen %}
-        <p>{% trans %}Enter client code:{% endtrans %}</p>
-        <form method="post" action="">
-            {% csrf_token %}
-            <input type="hidden" name="counter_token" value="{{ counter.token }}" />
-            {{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}validate{% endtrans %}" /></p>
-        </form>
-        {% else %}
-        <p>{% trans %}Please, login{% endtrans %}</p>
-        {% endif %}
-    </div>
-    {% if counter.type == 'BAR' %}
+  <h3>{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}</h3>
+  <div>
+    <h3>{% trans %}Sales{% endtrans %}</h3>
+    {% if last_basket %}
+      <h4>{% trans %}Last selling: {% endtrans %}</h4>
+      <p>{% trans %}Client: {% endtrans %}{{ last_customer }} - {% trans %}New amount: {% endtrans %}{{ new_customer_amount }} €.</p>
+      <ul>
+        {% for s in last_basket %}
+          <li>{{ s }}</li>
+        {% endfor %}
+      </ul>
+      <p><strong>{% trans %}Total: {% endtrans %}{{ last_total }} €</strong></p>
+    {% endif %}
+    {% if barmen %}
+      <p>{% trans %}Enter client code:{% endtrans %}</p>
+      <form method="post" action="">
+        {% csrf_token %}
+        <input type="hidden" name="counter_token" value="{{ counter.token }}" />
+        {{ form.as_p() }}
+        <p><input type="submit" value="{% trans %}validate{% endtrans %}" /></p>
+      </form>
+    {% else %}
+      <p>{% trans %}Please, login{% endtrans %}</p>
+    {% endif %}
+  </div>
+  {% if counter.type == 'BAR' %}
     <div>
-        <h3>{% trans %}Barman: {% endtrans %}</h3>
-        {% for b in barmen %}
+      <h3>{% trans %}Barman: {% endtrans %}</h3>
+      {% for b in barmen %}
         <p>{{ barman_logout_link(b) }}</p>
-        {% endfor %}
-        <form method="post" action="{{ url('counter:login', counter_id=counter.id) }}">
-            {% csrf_token %}
-            {{ login_form.as_p() }}
-            <p><input type="submit" value="{% trans %}login{% endtrans %}" /></p>
-        </form>
+      {% endfor %}
+      <form method="post" action="{{ url('counter:login', counter_id=counter.id) }}">
+        {% csrf_token %}
+        {{ login_form.as_p() }}
+        <p><input type="submit" value="{% trans %}login{% endtrans %}" /></p>
+      </form>
     </div>
-    {% endif %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/counter/templates/counter/eticket_list.jinja b/counter/templates/counter/eticket_list.jinja
index b7f9ac0f6..94e1fc422 100644
--- a/counter/templates/counter/eticket_list.jinja
+++ b/counter/templates/counter/eticket_list.jinja
@@ -1,21 +1,21 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Eticket list{% endtrans %}
+  {% trans %}Eticket list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<p><a href="{{ url('counter:new_eticket') }}">{% trans %}New eticket{% endtrans %}</a></p>
-{% if eticket_list %}
-<h3>{% trans %}Eticket list{% endtrans %}</h3>
-<ul>
-    {% for t in eticket_list  %}
-    <li><a href="{{ url('counter:edit_eticket', eticket_id=t.id) }}">{{ t }}</a> (ID: {{ t.product.id }} | Hash: <code>{{ t.secret }}</code>)</li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no eticket in this website.{% endtrans %}
-{% endif %}
+  <p><a href="{{ url('counter:new_eticket') }}">{% trans %}New eticket{% endtrans %}</a></p>
+  {% if eticket_list %}
+    <h3>{% trans %}Eticket list{% endtrans %}</h3>
+    <ul>
+      {% for t in eticket_list  %}
+        <li><a href="{{ url('counter:edit_eticket', eticket_id=t.id) }}">{{ t }}</a> (ID: {{ t.product.id }} | Hash: <code>{{ t.secret }}</code>)</li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no eticket in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/counter/templates/counter/invoices_call.jinja b/counter/templates/counter/invoices_call.jinja
index cac7d7ae5..973021fb9 100644
--- a/counter/templates/counter/invoices_call.jinja
+++ b/counter/templates/counter/invoices_call.jinja
@@ -1,37 +1,37 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Invoices call{% endtrans %}
+  {% trans %}Invoices call{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans date=start_date|date("F Y") %}Invoices call for {{ date }}{% endtrans %}</h3>
-<p>{% trans %}Choose another month: {% endtrans %}</p>
-<form method="get" action="">
+  <h3>{% trans date=start_date|date("F Y") %}Invoices call for {{ date }}{% endtrans %}</h3>
+  <p>{% trans %}Choose another month: {% endtrans %}</p>
+  <form method="get" action="">
     <select name="month">
-        {% for m in months %}
+      {% for m in months %}
         <option value="{{ m|date("Y-m") }}">{{ m|date("Y-m") }}</option>
-        {% endfor %}
+      {% endfor %}
     </select>
     <input type="submit" value="{% trans %}Go{% endtrans %}" />
-</form>
-<br>
-<p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
-<br>
-<table>
+  </form>
+  <br>
+  <p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
+  <br>
+  <table>
     <thead>
-        <td>{% trans %}Club{% endtrans %}</td>
-        <td>{% trans %}Sum{% endtrans %}</td>
+      <td>{% trans %}Club{% endtrans %}</td>
+      <td>{% trans %}Sum{% endtrans %}</td>
     </thead>
     <tbody>
-    {% for i in sums %}
+      {% for i in sums %}
         <tr>
-            <td>{{ i['club__name'] }}</td>
-            <td>{{ i['selling_sum'] }} €</td>
+          <td>{{ i['club__name'] }}</td>
+          <td>{{ i['selling_sum'] }} €</td>
         </tr>
-    {% endfor %}
+      {% endfor %}
     </tbody>
-</table>
+  </table>
 {% endblock %}
 
 
diff --git a/counter/templates/counter/last_ops.jinja b/counter/templates/counter/last_ops.jinja
index c73450881..5416bf48a 100644
--- a/counter/templates/counter/last_ops.jinja
+++ b/counter/templates/counter/last_ops.jinja
@@ -2,7 +2,7 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{% trans counter_name=counter %}{{ counter_name }} last operations{% endtrans %}
+  {% trans counter_name=counter %}{{ counter_name }} last operations{% endtrans %}
 {% endblock %}
 
 {% block info_boxes %}
@@ -12,61 +12,61 @@
 {% endblock %}
 
 {% block content %}
-<h3>{% trans counter_name=counter %}{{ counter_name }} last operations{% endtrans %}</h3>
-<h4>{% trans %}Reloads{% endtrans %}</h4>
-<table>
+  <h3>{% trans counter_name=counter %}{{ counter_name }} last operations{% endtrans %}</h3>
+  <h4>{% trans %}Reloads{% endtrans %}</h4>
+  <table>
     <thead>
-        <tr>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Barman{% endtrans %}</td>
-            <td>{% trans %}Customer{% endtrans %}</td>
-            <td>{% trans %}Amount{% endtrans %}</td>
-            <td>{% trans %}Payment method{% endtrans %}</td>
-        </tr>
+      <tr>
+        <td>{% trans %}Date{% endtrans %}</td>
+        <td>{% trans %}Barman{% endtrans %}</td>
+        <td>{% trans %}Customer{% endtrans %}</td>
+        <td>{% trans %}Amount{% endtrans %}</td>
+        <td>{% trans %}Payment method{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-    {% for i in last_refillings %}
+      {% for i in last_refillings %}
         <tr>
-            <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
-            <td><a href="{{ i.operator.get_absolute_url() }}">{{ i.operator.get_display_name() }}</a></td>
-            <td><a href="{{ i.customer.user.get_absolute_url() }}">{{ i.customer.user.get_display_name() }}</a></td>
-            <td>{{ i.amount }} €</td>
-            <td>{{ i.get_payment_method_display() }}</td>
-            <td><a href="{{ url('counter:refilling_delete', refilling_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+          <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td><a href="{{ i.operator.get_absolute_url() }}">{{ i.operator.get_display_name() }}</a></td>
+          <td><a href="{{ i.customer.user.get_absolute_url() }}">{{ i.customer.user.get_display_name() }}</a></td>
+          <td>{{ i.amount }} €</td>
+          <td>{{ i.get_payment_method_display() }}</td>
+          <td><a href="{{ url('counter:refilling_delete', refilling_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></td>
         </tr>
-{% endfor %}
+      {% endfor %}
     </tbody>
-</table>
+  </table>
 
-<h4>{% trans %}Sales{% endtrans %}</h4>
-<table>
+  <h4>{% trans %}Sales{% endtrans %}</h4>
+  <table>
     <thead>
-        <tr>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Barman{% endtrans %}</td>
-            <td>{% trans %}Customer{% endtrans %}</td>
-            <td>{% trans %}Label{% endtrans %}</td>
-            <td>{% trans %}Quantity{% endtrans %}</td>
-            <td>{% trans %}Total{% endtrans %}</td>
-            <td>{% trans %}Payment method{% endtrans %}</td>
-        </tr>
+      <tr>
+        <td>{% trans %}Date{% endtrans %}</td>
+        <td>{% trans %}Barman{% endtrans %}</td>
+        <td>{% trans %}Customer{% endtrans %}</td>
+        <td>{% trans %}Label{% endtrans %}</td>
+        <td>{% trans %}Quantity{% endtrans %}</td>
+        <td>{% trans %}Total{% endtrans %}</td>
+        <td>{% trans %}Payment method{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-    {% for i in last_sellings %}
+      {% for i in last_sellings %}
         <tr>
-            <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
-            <td><a href="{{ i.seller.get_absolute_url() }}">{{ i.seller.get_display_name() }}</a></td>
-            <td><a href="{{ i.customer.user.get_absolute_url() }}">{{ i.customer.user.get_display_name() }}</a></td>
-            <td>{{ i.label }}</td>
-            <td>{{ i.quantity }}</td>
-            <td>{{ i.quantity * i.unit_price }} €</td>
-            <td>{{ i.get_payment_method_display() }}</td>
-            <td><a href="{{ url('counter:selling_delete', selling_id=i.id) }}?next={{ url('counter:details',
-            counter_id=counter.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+          <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
+          <td><a href="{{ i.seller.get_absolute_url() }}">{{ i.seller.get_display_name() }}</a></td>
+          <td><a href="{{ i.customer.user.get_absolute_url() }}">{{ i.customer.user.get_display_name() }}</a></td>
+          <td>{{ i.label }}</td>
+          <td>{{ i.quantity }}</td>
+          <td>{{ i.quantity * i.unit_price }} €</td>
+          <td>{{ i.get_payment_method_display() }}</td>
+          <td><a href="{{ url('counter:selling_delete', selling_id=i.id) }}?next={{ url('counter:details',
+                       counter_id=counter.id) }}">{% trans %}Delete{% endtrans %}</a></td>
         </tr>
-{% endfor %}
+      {% endfor %}
     </tbody>
-</table>
+  </table>
 {% endblock %}
 
 
diff --git a/counter/templates/counter/product_list.jinja b/counter/templates/counter/product_list.jinja
index d53b8ef1d..da815c09d 100644
--- a/counter/templates/counter/product_list.jinja
+++ b/counter/templates/counter/product_list.jinja
@@ -1,32 +1,32 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Product list{% endtrans %}
+  {% trans %}Product list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if current_tab == "products" %}
-<p><a href="{{ url('counter:new_product') }}">{% trans %}New product{% endtrans %}</a></p>
-{% endif %}
-{% if product_list %}
-<h3>{% trans %}Product list{% endtrans %}</h3>
-{% for t in ProductType.objects.all().order_by('name') %}
-<h4>{{ t }}</h4>
-<ul>
-    {% for p in product_list.filter(product_type=t).all().order_by('name') %}
-    <li><a href="{{ url('counter:product_edit', product_id=p.id) }}">{{ p }} ({{ p.code }})</a></li>
+  {% if current_tab == "products" %}
+    <p><a href="{{ url('counter:new_product') }}">{% trans %}New product{% endtrans %}</a></p>
+  {% endif %}
+  {% if product_list %}
+    <h3>{% trans %}Product list{% endtrans %}</h3>
+    {% for t in ProductType.objects.all().order_by('name') %}
+      <h4>{{ t }}</h4>
+      <ul>
+        {% for p in product_list.filter(product_type=t).all().order_by('name') %}
+          <li><a href="{{ url('counter:product_edit', product_id=p.id) }}">{{ p }} ({{ p.code }})</a></li>
+        {% endfor %}
+      </ul>
     {% endfor %}
-</ul>
-{% endfor %}
-<h4>{% trans %}Uncategorized{% endtrans %}</h4>
-<ul>
-    {% for p in product_list.filter(product_type=None).all().order_by('name') %}
-    <li><a href="{{ url('counter:product_edit', product_id=p.id) }}">{{ p }} ({{ p.code }})</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no products in this website.{% endtrans %}
-{% endif %}
+    <h4>{% trans %}Uncategorized{% endtrans %}</h4>
+    <ul>
+      {% for p in product_list.filter(product_type=None).all().order_by('name') %}
+        <li><a href="{{ url('counter:product_edit', product_id=p.id) }}">{{ p }} ({{ p.code }})</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no products in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/counter/templates/counter/producttype_list.jinja b/counter/templates/counter/producttype_list.jinja
index 9a686dc82..0c4ff0c5e 100644
--- a/counter/templates/counter/producttype_list.jinja
+++ b/counter/templates/counter/producttype_list.jinja
@@ -1,21 +1,21 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Product type list{% endtrans %}
+  {% trans %}Product type list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<p><a href="{{ url('counter:new_producttype') }}">{% trans %}New product type{% endtrans %}</a></p>
-{% if producttype_list %}
-<h3>{% trans %}Product type list{% endtrans %}</h3>
-<ul>
-    {% for t in producttype_list  %}
-    <li><a href="{{ url('counter:producttype_edit', type_id=t.id) }}">{{ t }}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no product types in this website.{% endtrans %}
-{% endif %}
+  <p><a href="{{ url('counter:new_producttype') }}">{% trans %}New product type{% endtrans %}</a></p>
+  {% if producttype_list %}
+    <h3>{% trans %}Product type list{% endtrans %}</h3>
+    <ul>
+      {% for t in producttype_list  %}
+        <li><a href="{{ url('counter:producttype_edit', type_id=t.id) }}">{{ t }}</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no product types in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/counter/templates/counter/refilling_list.jinja b/counter/templates/counter/refilling_list.jinja
index ae3c56817..ab7a100ea 100644
--- a/counter/templates/counter/refilling_list.jinja
+++ b/counter/templates/counter/refilling_list.jinja
@@ -2,33 +2,33 @@
 {% from 'core/macros.jinja' import paginate %}
 
 {% block title %}
-{%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}
+  {%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}
 {% endblock %}
 
 {% block content %}
   <h3>{% trans %}Refilling{% endtrans %}</h3>
   <table>
-  <tr>
-    <th>{% trans %}Customer{% endtrans %}</th>
-    <th>{% trans %}Amount{% endtrans %}</th>
-    <th>{% trans %}Payment method{% endtrans %}</th>
-    <th>{% trans %}Seller{% endtrans %}</th>
-    <th>{% trans %}Date{% endtrans %}
-    <th>{% trans %}Actions{% endtrans %}</th>
-  </tr>
-    {%- for refilling in object_list %}
-  <tr>
-    <td><a href="{{ url('core:user_profile', user_id=refilling.customer.user.id) }}">{{ refilling.customer }}</a></td>
-    <td>{{ refilling.amount }}</td>
-    <td>{{ refilling.payment_method }}</td>
-    <td>{{ refilling.operator }}</td>
-    <td>{{ refilling.date }}</td>
-    <td><a href="{{ url('counter:refilling_delete', refilling_id=refilling.id)}}">Delete</a></td>
-  </tr>  
-  {%- endfor %}
-  </table>
-{% if is_paginated %}
-    {{ paginate(page_obj, paginator) }}
-{% endif %}
+    <tr>
+      <th>{% trans %}Customer{% endtrans %}</th>
+      <th>{% trans %}Amount{% endtrans %}</th>
+      <th>{% trans %}Payment method{% endtrans %}</th>
+      <th>{% trans %}Seller{% endtrans %}</th>
+      <th>{% trans %}Date{% endtrans %}
+        <th>{% trans %}Actions{% endtrans %}</th>
+      </tr>
+      {%- for refilling in object_list %}
+        <tr>
+          <td><a href="{{ url('core:user_profile', user_id=refilling.customer.user.id) }}">{{ refilling.customer }}</a></td>
+          <td>{{ refilling.amount }}</td>
+          <td>{{ refilling.payment_method }}</td>
+          <td>{{ refilling.operator }}</td>
+          <td>{{ refilling.date }}</td>
+          <td><a href="{{ url('counter:refilling_delete', refilling_id=refilling.id)}}">Delete</a></td>
+        </tr>
+      {%- endfor %}
+    </table>
+    {% if is_paginated %}
+      {{ paginate(page_obj, paginator) }}
+    {% endif %}
 {%- endblock %}
 
diff --git a/counter/templates/counter/stats.jinja b/counter/templates/counter/stats.jinja
index d6cc14f08..4eddccfa1 100644
--- a/counter/templates/counter/stats.jinja
+++ b/counter/templates/counter/stats.jinja
@@ -2,7 +2,7 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-    {% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}
+  {% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}
 {% endblock %}
 
 {% block jquery_css %}
@@ -10,78 +10,78 @@
 {% endblock %}
 
 {% block content %}
-    <h3>{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}</h3>
-    <h4>
-        {% trans counter_name=counter.name %}Top 100 {{ counter_name }}{% endtrans %} ({{ current_semester }})
-    </h4>
-    <table>
-        <thead>
-        <tr>
-            <td>N°</td>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Promo{% endtrans %}</td>
-            <td>{% trans %}Total{% endtrans %}</td>
-            <td>{% trans %}Percentage{% endtrans %}</td>
+  <h3>{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}</h3>
+  <h4>
+    {% trans counter_name=counter.name %}Top 100 {{ counter_name }}{% endtrans %} ({{ current_semester }})
+  </h4>
+  <table>
+    <thead>
+      <tr>
+        <td>N°</td>
+        <td>{% trans %}User{% endtrans %}</td>
+        <td>{% trans %}Promo{% endtrans %}</td>
+        <td>{% trans %}Total{% endtrans %}</td>
+        <td>{% trans %}Percentage{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for customer in top_customers %}
+        <tr class="{% if customer.user == request.user.id %}highlight{% endif %}">
+          <td>{{ loop.index }}</td>
+          <td>{{ customer.name }} {% if customer.nickname %} ({{ customer.nickname }}) {% endif %}</td>
+          <td>{{ customer.promo or '' }}</td>
+          <td>{{ "%.2f"|format(customer.selling_sum) }} €</td>
+          <td>{{ '%.2f'|format(100 * customer.selling_sum / total_sellings) }}%</td>
         </tr>
-        </thead>
-        <tbody>
-        {% for customer in top_customers %}
-            <tr class="{% if customer.user == request.user.id %}highlight{% endif %}">
-                <td>{{ loop.index }}</td>
-                <td>{{ customer.name }} {% if customer.nickname %} ({{ customer.nickname }}) {% endif %}</td>
-                <td>{{ customer.promo or '' }}</td>
-                <td>{{ "%.2f"|format(customer.selling_sum) }} €</td>
-                <td>{{ '%.2f'|format(100 * customer.selling_sum / total_sellings) }}%</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    <h4>
-        {% trans counter_name=counter.name %}Top 100 barman {{ counter_name }}{% endtrans %} ({{ current_semester }})
-    </h4>
-    <table>
-        <thead>
-        <tr>
-            <td>N°</td>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Promo{% endtrans %}</td>
-            <td>{% trans %}Time{% endtrans %}</td>
+  <h4>
+    {% trans counter_name=counter.name %}Top 100 barman {{ counter_name }}{% endtrans %} ({{ current_semester }})
+  </h4>
+  <table>
+    <thead>
+      <tr>
+        <td>N°</td>
+        <td>{% trans %}User{% endtrans %}</td>
+        <td>{% trans %}Promo{% endtrans %}</td>
+        <td>{% trans %}Time{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for barman in top_barman_semester %}
+        <tr {% if barman.user == request.user.id %}class="highlight"{% endif %}>
+          <td>{{ loop.index }}</td>
+          <td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
+          <td>{{ barman.promo or '' }}</td>
+          <td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
         </tr>
-        </thead>
-        <tbody>
-        {% for barman in top_barman_semester %}
-            <tr {% if barman.user == request.user.id %}class="highlight"{% endif %}>
-                <td>{{ loop.index }}</td>
-                <td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
-                <td>{{ barman.promo or '' }}</td>
-                <td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    <h4>{% trans counter_name=counter.name %}Top 100 barman {{ counter_name }} (all semesters){% endtrans %}</h4>
-    <table>
-        <thead>
-        <tr>
-            <td>N°</td>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Promo{% endtrans %}</td>
-            <td>{% trans %}Time{% endtrans %}</td>
+  <h4>{% trans counter_name=counter.name %}Top 100 barman {{ counter_name }} (all semesters){% endtrans %}</h4>
+  <table>
+    <thead>
+      <tr>
+        <td>N°</td>
+        <td>{% trans %}User{% endtrans %}</td>
+        <td>{% trans %}Promo{% endtrans %}</td>
+        <td>{% trans %}Time{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for barman in top_barman %}
+        <tr {% if barman.user == request.user.id %}class="highlight"{% endif %}>
+          <td>{{ loop.index }}</td>
+          <td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
+          <td>{{ barman.promo or '' }}</td>
+          <td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
         </tr>
-        </thead>
-        <tbody>
-        {% for barman in top_barman %}
-            <tr {% if barman.user == request.user.id %}class="highlight"{% endif %}>
-                <td>{{ loop.index }}</td>
-                <td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
-                <td>{{ barman.promo or '' }}</td>
-                <td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+      {% endfor %}
+    </tbody>
+  </table>
 {% endblock %}
 
 
diff --git a/docs/explanation/conventions.md b/docs/explanation/conventions.md
index 4c7c49300..47989f7eb 100644
--- a/docs/explanation/conventions.md
+++ b/docs/explanation/conventions.md
@@ -148,12 +148,14 @@ Ces règles sont automatiquement appliquées quand
 vous faites tourner Ruff, donc vous n'avez pas à trop
 vous poser de questions de ce côté-là.
 
-En ce qui concerne les autres langages utilisés
-(Jinja, SCSS, Javascript), nous n'avons pas fixé
-de convention à suivre.
-Pour SCSS et Javascript, vous pouvez utiliser
+En ce qui concerne les templates Jinja
+et les fichiers SCSS, la norme de formatage
+est celle par défaut de `djHTML`.
+
+Pour Javascript, vous pouvez utiliser
 Prettier, avec sa configuration par défaut,
-qui est plutôt bonne.
+qui est plutôt bonne,
+mais nous n'avons pas de norme établie pour le projet.
 
 ### Qualité du code
 
diff --git a/docs/explanation/technos.md b/docs/explanation/technos.md
index 29b6e0c59..9d4346701 100644
--- a/docs/explanation/technos.md
+++ b/docs/explanation/technos.md
@@ -352,4 +352,17 @@ et les corrige automatiquement (quand c'est possible)
 sans que l'utilisateur ait à s'en soucier.
 Bien installé, il peut effectuer ce travail
 à chaque sauvegarde d'un fichier dans son éditeur,
-ce qui est très agréable pour travailler.
\ No newline at end of file
+ce qui est très agréable pour travailler.
+
+### DjHTML
+
+[Site officiel](https://github.com/rtts/djhtml)
+
+Ruff permet de formater les fichiers Python,
+mais il ne formatte pas les templates et les feuilles de style.
+Pour ça, il faut un autre outil, aisément intégrable
+dans la CI : `djHTML`.
+
+En utilisant conjointement Ruff et djHTML,
+on arrive donc à la fois à formater les fichiers
+Python et les fichiers relatifs au frontend.
diff --git a/eboutic/templates/eboutic/eboutic_main.jinja b/eboutic/templates/eboutic/eboutic_main.jinja
index 9a8470d53..3e1a22390 100644
--- a/eboutic/templates/eboutic/eboutic_main.jinja
+++ b/eboutic/templates/eboutic/eboutic_main.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-    {% trans %}Eboutic{% endtrans %}
+  {% trans %}Eboutic{% endtrans %}
 {% endblock %}
 
 {% block jquery_css %}
@@ -11,120 +11,120 @@
 {% block additional_js %}
     {# This script contains the code to perform requests to manipulate the
     user basket without having to reload the page #}
-    <script src="{{ static('eboutic/js/eboutic.js') }}"></script>
-    <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
+  <script src="{{ static('eboutic/js/eboutic.js') }}"></script>
+  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block additional_css %}
-    <link rel="stylesheet" href="{{ static('eboutic/css/eboutic.css') }}">
+  <link rel="stylesheet" href="{{ static('eboutic/css/eboutic.css') }}">
 {% endblock %}
 
 {% block content %}
-    <h1 id="eboutic-title">{% trans %}Eboutic{% endtrans %}</h1>
-    <div id="eboutic" x-data="basket">
-        <div id="basket">
-            <h3>Panier</h3>
-            {% if errors %}
-                <div class="alert alert-red">
-                    <div class="alert-main">
-                        {% for error in errors %}
-                            <p style="margin: 0">{{ error }}</p>
-                        {% endfor %}
-                        {% trans %}Your basket has been cleaned accordingly to those errors.{% endtrans %}
-                    </div>
-                </div>
-            {% endif %}
-            <ul class="item-list">
+  <h1 id="eboutic-title">{% trans %}Eboutic{% endtrans %}</h1>
+  <div id="eboutic" x-data="basket">
+    <div id="basket">
+      <h3>Panier</h3>
+      {% if errors %}
+        <div class="alert alert-red">
+          <div class="alert-main">
+            {% for error in errors %}
+              <p style="margin: 0">{{ error }}</p>
+            {% endfor %}
+            {% trans %}Your basket has been cleaned accordingly to those errors.{% endtrans %}
+          </div>
+        </div>
+      {% endif %}
+      <ul class="item-list">
                 {# Starting money #}
-                <li>
-                    <span class="item-name">
-                        <strong>{% trans %}Current account amount: {% endtrans %}</strong>
-                    </span>
-                    <span class="item-price">
-                        <strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
-                    </span>
-                </li>
-                <template x-for="item in items" :key="item.id">
-                    <li class="item-row" x-show="item.quantity > 0">
-                        <div class="item-quantity">
-                            <i class="fa fa-minus fa-xs" @click="remove(item.id)"></i>
-                            <span x-text="item.quantity"></span>
-                            <i class="fa fa-plus" @click="add(item)"></i>
-                        </div>
-                        <span class="item-name" x-text="item.name"></span>
-                        <span class="item-price" x-text="(item.unit_price * item.quantity).toFixed(2) + ' €'"></span>
-                    </li>
-                </template>
-                {# Total price #}
-                <li style="margin-top: 20px">
-                    <span class="item-name"><strong>{% trans %}Basket amount: {% endtrans %}</strong></span>
-                    <span x-text="get_total().toFixed(2) + ' €'" class="item-price"></span>
-                </li>
-            </ul>
-            <div class="catalog-buttons">
-                <button @click="clear_basket()" class="clear">
-                    <i class="fa fa-trash"></i>
-                    {% trans %}Clear{% endtrans %}
-                </button>
-                <form method="get" action="{{ url('eboutic:command') }}">
-                    {% csrf_token %}
-                    <button class="validate">
-                        <i class="fa fa-check"></i>
-                        <input type="submit" value="{% trans %}Validate{% endtrans %}"/>
-                    </button>
-                </form>
+        <li>
+          <span class="item-name">
+            <strong>{% trans %}Current account amount: {% endtrans %}</strong>
+          </span>
+          <span class="item-price">
+            <strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
+          </span>
+        </li>
+        <template x-for="item in items" :key="item.id">
+          <li class="item-row" x-show="item.quantity > 0">
+            <div class="item-quantity">
+              <i class="fa fa-minus fa-xs" @click="remove(item.id)"></i>
+              <span x-text="item.quantity"></span>
+              <i class="fa fa-plus" @click="add(item)"></i>
             </div>
+            <span class="item-name" x-text="item.name"></span>
+            <span class="item-price" x-text="(item.unit_price * item.quantity).toFixed(2) + ' €'"></span>
+          </li>
+        </template>
+                {# Total price #}
+        <li style="margin-top: 20px">
+          <span class="item-name"><strong>{% trans %}Basket amount: {% endtrans %}</strong></span>
+          <span x-text="get_total().toFixed(2) + ' €'" class="item-price"></span>
+        </li>
+      </ul>
+      <div class="catalog-buttons">
+        <button @click="clear_basket()" class="clear">
+          <i class="fa fa-trash"></i>
+          {% trans %}Clear{% endtrans %}
+        </button>
+        <form method="get" action="{{ url('eboutic:command') }}">
+          {% csrf_token %}
+          <button class="validate">
+            <i class="fa fa-check"></i>
+            <input type="submit" value="{% trans %}Validate{% endtrans %}"/>
+          </button>
+        </form>
+      </div>
+    </div>
+    <div id="catalog">
+      {% if not request.user.date_of_birth %}
+        <div class="alert alert-red" x-data="{show_alert: true}" x-show="show_alert" x-transition>
+          <span class="alert-main">
+            {% trans %}You have not filled in your date of birth. As a result, you may not have access to all the products in the online shop. To fill in your date of birth, you can go to{% endtrans %}
+            <a href="{{ url("core:user_edit", user_id=request.user.id) }}">
+              {% trans %}this page{% endtrans %}
+            </a>
+          </span>
+          <span class="clickable" @click="show_alert = false">
+            <i class="fa fa-close"></i>
+          </span>
         </div>
-        <div id="catalog">
-            {% if not request.user.date_of_birth %}
-                <div class="alert alert-red" x-data="{show_alert: true}" x-show="show_alert" x-transition>
-                    <span class="alert-main">
-                        {% trans %}You have not filled in your date of birth. As a result, you may not have access to all the products in the online shop. To fill in your date of birth, you can go to{% endtrans %}
-                        <a href="{{ url("core:user_edit", user_id=request.user.id) }}">
-                            {% trans %}this page{% endtrans %}
-                        </a>
-                    </span>
-                    <span class="clickable" @click="show_alert = false">
-                        <i class="fa fa-close"></i>
-                    </span>
-                </div>
-            {% endif %}
+      {% endif %}
 
-            {% for priority_groups in products|groupby('priority')|reverse %}
-                {% for category, items in priority_groups.list|groupby('category') %}
-                    {% if items|count > 0 %}
-                        <section>
+      {% for priority_groups in products|groupby('priority')|reverse %}
+        {% for category, items in priority_groups.list|groupby('category') %}
+          {% if items|count > 0 %}
+            <section>
                             {# I would have wholeheartedly directly used the header element instead
                             but it has already been made messy in core/style.scss #}
-                            <div class="category-header">
-                                <h3>{{ category }}</h3>
-                                {% if items[0].category_comment %}
-                                    <p><i>{{ items[0].category_comment }}</i></p>
-                                {% endif %}
-                            </div>
-                            <div class="product-group">
-                                {% for p in items %}
-                                    <button id="{{ p.id }}" class="product-button"
-                                            @click='add_from_catalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'>
-                                        {% if p.icon %}
-                                            <img class="product-image" src="{{ p.icon.url }}"
-                                                 alt="image de {{ p.name }}">
-                                        {% else %}
-                                            <i class="fa fa-2x fa-picture-o product-image"></i>
-                                        {% endif %}
-                                        <div class="product-description">
-                                            <h4>{{ p.name }}</h4>
-                                            <p>{{ p.selling_price }} €</p>
-                                        </div>
-                                    </button>
-                                {% endfor %}
-                            </div>
-                        </section>
+              <div class="category-header">
+                <h3>{{ category }}</h3>
+                {% if items[0].category_comment %}
+                  <p><i>{{ items[0].category_comment }}</i></p>
+                {% endif %}
+              </div>
+              <div class="product-group">
+                {% for p in items %}
+                  <button id="{{ p.id }}" class="product-button"
+                          @click='add_from_catalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'>
+                    {% if p.icon %}
+                      <img class="product-image" src="{{ p.icon.url }}"
+                           alt="image de {{ p.name }}">
+                    {% else %}
+                      <i class="fa fa-2x fa-picture-o product-image"></i>
                     {% endif %}
+                    <div class="product-description">
+                      <h4>{{ p.name }}</h4>
+                      <p>{{ p.selling_price }} €</p>
+                    </div>
+                  </button>
                 {% endfor %}
-            {% else %}
-                <p>{% trans %}There are no items available for sale{% endtrans %}</p>
-            {% endfor %}
-        </div>
+              </div>
+            </section>
+          {% endif %}
+        {% endfor %}
+      {% else %}
+        <p>{% trans %}There are no items available for sale{% endtrans %}</p>
+      {% endfor %}
     </div>
+  </div>
 {% endblock %}
diff --git a/eboutic/templates/eboutic/eboutic_makecommand.jinja b/eboutic/templates/eboutic/eboutic_makecommand.jinja
index 1256c72e0..1ee121693 100644
--- a/eboutic/templates/eboutic/eboutic_makecommand.jinja
+++ b/eboutic/templates/eboutic/eboutic_makecommand.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-    {% trans %}Basket state{% endtrans %}
+  {% trans %}Basket state{% endtrans %}
 {% endblock %}
 
 {% block jquery_css %}
@@ -9,133 +9,133 @@
 {% endblock %}
 
 {% block additional_js %}
-    <script src="{{ static('eboutic/js/makecommand.js') }}" defer></script>
-    <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
+  <script src="{{ static('eboutic/js/makecommand.js') }}" defer></script>
+  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block content %}
-    <h3>{% trans %}Eboutic{% endtrans %}</h3>
+  <h3>{% trans %}Eboutic{% endtrans %}</h3>
 
-    <div>
-        <p>{% trans %}Basket: {% endtrans %}</p>
-        <table>
-            <thead>
-            <tr>
-                <td>Article</td>
-                <td>Quantity</td>
-                <td>Unit price</td>
-            </tr>
-            </thead>
-            <tbody>
-            {% for item in basket.items.all() %}
-                <tr>
-                    <td>{{ item.product_name }}</td>
-                    <td>{{ item.quantity }}</td>
-                    <td>{{ item.product_unit_price }} €</td>
-                </tr>
-            {% endfor %}
-            <tbody>
+  <div>
+    <p>{% trans %}Basket: {% endtrans %}</p>
+    <table>
+      <thead>
+        <tr>
+          <td>Article</td>
+          <td>Quantity</td>
+          <td>Unit price</td>
+        </tr>
+      </thead>
+      <tbody>
+        {% for item in basket.items.all() %}
+          <tr>
+            <td>{{ item.product_name }}</td>
+            <td>{{ item.quantity }}</td>
+            <td>{{ item.product_unit_price }} €</td>
+          </tr>
+        {% endfor %}
+        <tbody>
         </table>
 
         <p>
-            <strong>{% trans %}Basket amount: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong>
+          <strong>{% trans %}Basket amount: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong>
 
-            {% if customer_amount != None %}
-                <br>
-                {% trans %}Current account amount: {% endtrans %}
-                <strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
+          {% if customer_amount != None %}
+            <br>
+            {% trans %}Current account amount: {% endtrans %}
+            <strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
 
-                {% if not basket.contains_refilling_item %}
-                    <br>
-                    {% trans %}Remaining account amount: {% endtrans %}
-                    <strong>{{ "%0.2f"|format(customer_amount|float - basket.get_total()) }} €</strong>
-                {% endif %}
+            {% if not basket.contains_refilling_item %}
+              <br>
+              {% trans %}Remaining account amount: {% endtrans %}
+              <strong>{{ "%0.2f"|format(customer_amount|float - basket.get_total()) }} €</strong>
             {% endif %}
+          {% endif %}
         </p>
         <br>
         {% if settings.SITH_EBOUTIC_CB_ENABLED %}
-            <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
-                <div class="collapse-header clickable" @click="collapsed = !collapsed">
-                    <span class="collapse-header-text">
-                        {% trans %}Edit billing information{% endtrans %}
-                    </span>
-                    <span class="collapse-header-icon" :class="{'reverse': collapsed}">
-                        <i class="fa fa-caret-down"></i>
-                    </span>
-                </div>
-                <form class="collapse-body" id="billing_info_form" method="post"
-                      x-show="collapsed" x-data="billing_infos"
-                      x-transition.scale.origin.top
-                      @submit.prevent="send_form()">
-                    {% csrf_token %}
-                    {{ billing_form }}
-                    <br>
-                    <br>
-                    <div x-show="errors.length > 0" class="alert alert-red" x-transition>
-                        <div class="alert-main">
-                            <template x-for="error in errors">
-                                <div x-text="error.field + ' : ' + error.messages.join(', ')"></div>
-                            </template>
-                        </div>
-                        <div class="clickable" @click="errors = []">
-                            <i class="fa fa-close"></i>
-                        </div>
-                    </div>
-                    <div x-show="successful" class="alert alert-green" x-transition>
-                        <div class="alert-main">
-                            Informations de facturation enregistrées
-                        </div>
-                        <div class="clickable" @click="successful = false">
-                            <i class="fa fa-close"></i>
-                        </div>
-                    </div>
-                    <input type="submit" class="btn btn-blue clickable"
-                           value="{% trans %}Validate{% endtrans %}">
-                </form>
+          <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
+            <div class="collapse-header clickable" @click="collapsed = !collapsed">
+              <span class="collapse-header-text">
+                {% trans %}Edit billing information{% endtrans %}
+              </span>
+              <span class="collapse-header-icon" :class="{'reverse': collapsed}">
+                <i class="fa fa-caret-down"></i>
+              </span>
             </div>
-            <br>
-            {% if must_fill_billing_infos %}
-                <p>
-                    <i>
-                        {% trans %}You must fill your billing infos if you want to pay with your credit
-                            card{% endtrans %}
-                    </i>
-                </p>
-            {% endif %}
-            <form method="post" action="{{ settings.SITH_EBOUTIC_ET_URL }}" name="bank-pay-form">
-                <template x-data x-for="input in $store.billing_inputs.data">
-                    <input type="hidden" :name="input['key']" :value="input['value']">
-                </template>
-                <input type="submit" id="bank-submit-button"
-                       {% if must_fill_billing_infos %}disabled="disabled"{% endif %}
-                       value="{% trans %}Pay with credit card{% endtrans %}"/>
+            <form class="collapse-body" id="billing_info_form" method="post"
+                  x-show="collapsed" x-data="billing_infos"
+                  x-transition.scale.origin.top
+                  @submit.prevent="send_form()">
+              {% csrf_token %}
+              {{ billing_form }}
+              <br>
+              <br>
+              <div x-show="errors.length > 0" class="alert alert-red" x-transition>
+                <div class="alert-main">
+                  <template x-for="error in errors">
+                    <div x-text="error.field + ' : ' + error.messages.join(', ')"></div>
+                  </template>
+                </div>
+                <div class="clickable" @click="errors = []">
+                  <i class="fa fa-close"></i>
+                </div>
+              </div>
+              <div x-show="successful" class="alert alert-green" x-transition>
+                <div class="alert-main">
+                  Informations de facturation enregistrées
+                </div>
+                <div class="clickable" @click="successful = false">
+                  <i class="fa fa-close"></i>
+                </div>
+              </div>
+              <input type="submit" class="btn btn-blue clickable"
+                     value="{% trans %}Validate{% endtrans %}">
             </form>
+          </div>
+          <br>
+          {% if must_fill_billing_infos %}
+            <p>
+              <i>
+                {% trans %}You must fill your billing infos if you want to pay with your credit
+                  card{% endtrans %}
+              </i>
+            </p>
+          {% endif %}
+          <form method="post" action="{{ settings.SITH_EBOUTIC_ET_URL }}" name="bank-pay-form">
+            <template x-data x-for="input in $store.billing_inputs.data">
+              <input type="hidden" :name="input['key']" :value="input['value']">
+            </template>
+            <input type="submit" id="bank-submit-button"
+                   {% if must_fill_billing_infos %}disabled="disabled"{% endif %}
+                   value="{% trans %}Pay with credit card{% endtrans %}"/>
+          </form>
         {% endif %}
         {% if basket.contains_refilling_item %}
-            <p>{% trans %}AE account payment disabled because your basket contains refilling items.{% endtrans %}</p>
+          <p>{% trans %}AE account payment disabled because your basket contains refilling items.{% endtrans %}</p>
         {% else %}
-            <form method="post" action="{{ url('eboutic:pay_with_sith') }}" name="sith-pay-form">
-                {% csrf_token %}
-                <input type="hidden" name="action" value="pay_with_sith_account">
-                <input type="submit" value="{% trans %}Pay with Sith account{% endtrans %}"/>
-            </form>
+          <form method="post" action="{{ url('eboutic:pay_with_sith') }}" name="sith-pay-form">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="pay_with_sith_account">
+            <input type="submit" value="{% trans %}Pay with Sith account{% endtrans %}"/>
+          </form>
         {% endif %}
-    </div>
+      </div>
 {% endblock %}
 
 {% block script %}
-    <script>
-        const create_billing_info_url = '{{ url("counter:create_billing_info", user_id=request.user.id) }}'
-        const edit_billing_info_url = '{{ url("counter:edit_billing_info", user_id=request.user.id) }}';
-        const et_data_url = '{{ url("eboutic:et_data") }}'
-        let billing_info_exist = {{ "true" if billing_infos else "false" }}
+  <script>
+    const create_billing_info_url = '{{ url("counter:create_billing_info", user_id=request.user.id) }}'
+    const edit_billing_info_url = '{{ url("counter:edit_billing_info", user_id=request.user.id) }}';
+    const et_data_url = '{{ url("eboutic:et_data") }}'
+    let billing_info_exist = {{ "true" if billing_infos else "false" }}
 
-        {% if billing_infos %}
-            const et_data = {{ billing_infos|tojson }}
-        {% else %}
-            const et_data = '{"data": []}'
-        {% endif %}
-    </script>
-    {{ super() }}
+    {% if billing_infos %}
+      const et_data = {{ billing_infos|tojson }}
+    {% else %}
+      const et_data = '{"data": []}'
+    {% endif %}
+  </script>
+  {{ super() }}
 {% endblock %}
 
diff --git a/eboutic/templates/eboutic/eboutic_payment_result.jinja b/eboutic/templates/eboutic/eboutic_payment_result.jinja
index 39d9277a1..6c03754d6 100644
--- a/eboutic/templates/eboutic/eboutic_payment_result.jinja
+++ b/eboutic/templates/eboutic/eboutic_payment_result.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<h3>{% trans %}Eboutic{% endtrans %}</h3>
+  <h3>{% trans %}Eboutic{% endtrans %}</h3>
 
-<div>
+  <div>
     {% if success %}
-    {% trans %}Payment successful{% endtrans %}
+      {% trans %}Payment successful{% endtrans %}
     {% else %}
-    {% trans %}Payment failed{% endtrans %}
+      {% trans %}Payment failed{% endtrans %}
     {% endif %}
     <p><a href="{{ url('eboutic:main') }}">{% trans %}Return to eboutic{% endtrans %}</a></p>
-</div>
+  </div>
 
 
 
diff --git a/election/templates/election/candidate_form.jinja b/election/templates/election/candidate_form.jinja
index 1f0f1ac1a..7cd9e9daa 100644
--- a/election/templates/election/candidate_form.jinja
+++ b/election/templates/election/candidate_form.jinja
@@ -1,19 +1,19 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Candidate{% endtrans %}
+  {% trans %}Candidate{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    {%- if (election.can_candidate(user) and election.is_candidature_active) or (user.can_edit(election) and election.is_vote_editable) %}
+  {%- if (election.can_candidate(user) and election.is_candidature_active) or (user.can_edit(election) and election.is_vote_editable) %}
     <section class="election__add-candidature">
-        <form action="{{ url('election:candidate', election_id=election.id) }}" method="post">
-            {% csrf_token %}
-            {{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Candidate{% endtrans %}" /></p>
-        </form>
+      <form action="{{ url('election:candidate', election_id=election.id) }}" method="post">
+        {% csrf_token %}
+        {{ form.as_p() }}
+        <p><input type="submit" value="{% trans %}Candidate{% endtrans %}" /></p>
+      </form>
     </section>
-    {%- else -%}
+  {%- else -%}
     {% trans %}Candidature are closed for this election{% endtrans %}
-    {%- endif %}
+  {%- endif %}
 {% endblock content %}
diff --git a/election/templates/election/election_detail.jinja b/election/templates/election/election_detail.jinja
index 51eeb7049..60c187e3e 100644
--- a/election/templates/election/election_detail.jinja
+++ b/election/templates/election/election_detail.jinja
@@ -1,235 +1,235 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{{ object.title }}
+  {{ object.title }}
 {% endblock %}
 
 {% block head %}
-{{ super() -}}
-<link rel="stylesheet" href="{{ scss('election/election.scss') }}">
+  {{ super() -}}
+  <link rel="stylesheet" href="{{ scss('election/election.scss') }}">
 {%- endblock %}
 
 {% block content %}
-    <h3 class="election__title">{{ election.title }}</h3>
-    <p class="election__description">{{ election.description }}</p>
-    <hr>
-    <section class="election_details">
-        <p>
-            {%- if election.is_vote_active %}
-            {% trans %}Polls close {% endtrans %}
-            {%- elif election.is_vote_finished %}
-            {% trans %}Polls closed {% endtrans %}
-            {%- else %}
-            {% trans %}Polls will open {% endtrans %}
-            <time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date(DATETIME_FORMAT)}}</time>
-                        {% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time(DATETIME_FORMAT)}}</time>
-            {% trans %}and will close {% endtrans %}
-            {%- endif %}
-            <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT)}}</time>
-                        {% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT)}}</time>
-        </p>
-        {%- if election.has_voted(user) %}
-        <p class="election__elector-infos">
-            {%- if election.is_vote_active %}
-            <span>{% trans %}You already have submitted your vote.{% endtrans %}</span>
-            {%- else %}
-            <span>{% trans %}You have voted in this election.{% endtrans %}</span>
-            {%- endif %}
-        </p>
+  <h3 class="election__title">{{ election.title }}</h3>
+  <p class="election__description">{{ election.description }}</p>
+  <hr>
+  <section class="election_details">
+    <p>
+      {%- if election.is_vote_active %}
+        {% trans %}Polls close {% endtrans %}
+      {%- elif election.is_vote_finished %}
+        {% trans %}Polls closed {% endtrans %}
+      {%- else %}
+        {% trans %}Polls will open {% endtrans %}
+        <time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date(DATETIME_FORMAT)}}</time>
+        {% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time(DATETIME_FORMAT)}}</time>
+        {% trans %}and will close {% endtrans %}
+      {%- endif %}
+      <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT)}}</time>
+      {% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT)}}</time>
+    </p>
+    {%- if election.has_voted(user) %}
+      <p class="election__elector-infos">
+        {%- if election.is_vote_active %}
+          <span>{% trans %}You already have submitted your vote.{% endtrans %}</span>
+        {%- else %}
+          <span>{% trans %}You have voted in this election.{% endtrans %}</span>
         {%- endif %}
-    </section>
-    <section class="election_vote">
-        <form action="{{ url('election:vote', election.id) }}" method="post" class="election__vote-form" name="vote-form" id="vote-form">
-            {% csrf_token %}
-            <table class="election_table">
-                {%- set election_lists = election.election_lists.all() -%}
-                <caption></caption>
-                <thead class="lists">
-                    <tr>
-                        <th class="column" style="width: {{ 100 / (election_lists.count() + 1) }}%">{% trans %}Blank vote{% endtrans %}</th>
-                        {%- for election_list in election_lists %}
-                        <th class="column" style="width: {{ 100 / (election_lists.count() + 1) }}%">
-                            <span>{{ election_list.title }}</span>
-                            {% if user.can_edit(election_list) and election.is_vote_editable -%}
-                            <a href="{{ url('election:delete_list', list_id=election_list.id) }}">❌</a>
-                            {% endif %}
-                        </th>
-                        {%- endfor %}
-                    </tr>
-                </thead>
-                {%- set role_list = election.roles.order_by('order').all() %}
-                {%- for role in role_list %}
-                {%- set count = [0] %}
-                {%- set role_data = election_form.data.getlist(role.title) if role.title in election_form.data else [] %}
-                <tbody data-max-choice="{{role.max_choice}}" class="role{{ ' role_error' if role.title in election_form.errors else '' }}{{ ' role__multiple-choices' if role.max_choice > 1 else ''}}">
-                    <tr>
-                        <td class="role_title">
-                            <div class="role_text">
-                                <h4>{{ role.title }}</h4>
-                                <p class="role_description">{{ role.description }}</p>
-                                {%- if role.max_choice > 1 and not election.has_voted(user) and election.can_vote(user) %}
-                                <strong>{% trans %}You may choose up to{% endtrans %} {{ role.max_choice }} {% trans %}people.{% endtrans %}</strong>
-                                {%- endif %}
+      </p>
+    {%- endif %}
+  </section>
+  <section class="election_vote">
+    <form action="{{ url('election:vote', election.id) }}" method="post" class="election__vote-form" name="vote-form" id="vote-form">
+      {% csrf_token %}
+      <table class="election_table">
+        {%- set election_lists = election.election_lists.all() -%}
+        <caption></caption>
+        <thead class="lists">
+          <tr>
+            <th class="column" style="width: {{ 100 / (election_lists.count() + 1) }}%">{% trans %}Blank vote{% endtrans %}</th>
+            {%- for election_list in election_lists %}
+              <th class="column" style="width: {{ 100 / (election_lists.count() + 1) }}%">
+                <span>{{ election_list.title }}</span>
+                {% if user.can_edit(election_list) and election.is_vote_editable -%}
+                  <a href="{{ url('election:delete_list', list_id=election_list.id) }}">❌</a>
+                {% endif %}
+              </th>
+            {%- endfor %}
+          </tr>
+        </thead>
+        {%- set role_list = election.roles.order_by('order').all() %}
+        {%- for role in role_list %}
+          {%- set count = [0] %}
+          {%- set role_data = election_form.data.getlist(role.title) if role.title in election_form.data else [] %}
+          <tbody data-max-choice="{{role.max_choice}}" class="role{{ ' role_error' if role.title in election_form.errors else '' }}{{ ' role__multiple-choices' if role.max_choice > 1 else ''}}">
+            <tr>
+              <td class="role_title">
+                <div class="role_text">
+                  <h4>{{ role.title }}</h4>
+                  <p class="role_description">{{ role.description }}</p>
+                  {%- if role.max_choice > 1 and not election.has_voted(user) and election.can_vote(user) %}
+                    <strong>{% trans %}You may choose up to{% endtrans %} {{ role.max_choice }} {% trans %}people.{% endtrans %}</strong>
+                  {%- endif %}
 
-                                {%- if election_form.errors[role.title] is defined %}
-                                    {%- for error in election_form.errors.as_data()[role.title] %}
-                                        <strong class="error">{{ error.message }}</strong>
-                                    {%- endfor %}
-                                {%- endif %}
-                            </div>
-                            {% if user.can_edit(role) and election.is_vote_editable -%}
-                                <div class="role_buttons">
-                                    <a href="{{url('election:update_role', role_id=role.id)}}">✏️</a>
-                                    <a href="{{url('election:delete_role', role_id=role.id)}}">❌</a>
-                                    {%- if role == role_list.last() %}
-                                    <button disabled><i class="fa fa-arrow-down"></i></button>
-                                    <button disabled><i class="fa fa-caret-down"></i></button>
-                                    {%- else %}
-                                    <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=bottom');"><i class="fa fa-arrow-down"></i></button>
-                                    <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=down');"><i class="fa fa-caret-down"></i></button>
-                                    {%- endif %}
-                                    {% if role == role_list.first() %}
-                                    <button disabled><i class="fa fa-caret-up"></i></button>
-                                    <button disabled><i class="fa fa-arrow-up"></i></button>
-                                    {% else %}
-                                    <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=up');"><i class="fa fa-caret-up"></i></button>
-                                    <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=top');"><i class="fa fa-arrow-up"></i></button>
-                                    {% endif %}
-                                </div>
-                            {%- endif -%}
-                        </td>
-                    </tr>
-                    <tr class="role_candidates">
-                        <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
-                            {%- if role.max_choice == 1 and election.can_vote(user) %}
-                            <div class="radio-btn">
-                                <input id="id_{{ role.title }}_{{ count[0] }}" type="radio" name="{{ role.title }}" value {{ '' if role_data in election_form else 'checked' }} {{ 'disabled' if election.has_voted(user) else '' }}>
-                                <label for="id_{{ role.title }}_{{ count[0] }}">
-                                    <span>{% trans %}Choose blank vote{% endtrans %}</span>
-                                </label>
-                            </div>
-                            {%- set _ = count.append(count.pop() + 1) %}
-                            {%- endif %}
-                            {%- if election.is_vote_finished %}
-                            {%- set results = election_results[role.title]['blank vote'] %}
-                            <div class="election__results">
-                                <strong>{{ results.vote }} {% trans %}votes{% endtrans %} ({{ "%.2f" % results.percent }} %)</strong>
-                            </div>
+                  {%- if election_form.errors[role.title] is defined %}
+                    {%- for error in election_form.errors.as_data()[role.title] %}
+                      <strong class="error">{{ error.message }}</strong>
+                    {%- endfor %}
+                  {%- endif %}
+                </div>
+                {% if user.can_edit(role) and election.is_vote_editable -%}
+                  <div class="role_buttons">
+                    <a href="{{url('election:update_role', role_id=role.id)}}">✏️</a>
+                    <a href="{{url('election:delete_role', role_id=role.id)}}">❌</a>
+                    {%- if role == role_list.last() %}
+                      <button disabled><i class="fa fa-arrow-down"></i></button>
+                      <button disabled><i class="fa fa-caret-down"></i></button>
+                    {%- else %}
+                      <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=bottom');"><i class="fa fa-arrow-down"></i></button>
+                      <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=down');"><i class="fa fa-caret-down"></i></button>
+                    {%- endif %}
+                    {% if role == role_list.first() %}
+                      <button disabled><i class="fa fa-caret-up"></i></button>
+                      <button disabled><i class="fa fa-arrow-up"></i></button>
+                    {% else %}
+                      <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=up');"><i class="fa fa-caret-up"></i></button>
+                      <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=top');"><i class="fa fa-arrow-up"></i></button>
+                    {% endif %}
+                  </div>
+                {%- endif -%}
+              </td>
+            </tr>
+            <tr class="role_candidates">
+              <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
+                {%- if role.max_choice == 1 and election.can_vote(user) %}
+                  <div class="radio-btn">
+                    <input id="id_{{ role.title }}_{{ count[0] }}" type="radio" name="{{ role.title }}" value {{ '' if role_data in election_form else 'checked' }} {{ 'disabled' if election.has_voted(user) else '' }}>
+                    <label for="id_{{ role.title }}_{{ count[0] }}">
+                      <span>{% trans %}Choose blank vote{% endtrans %}</span>
+                    </label>
+                  </div>
+                  {%- set _ = count.append(count.pop() + 1) %}
+                {%- endif %}
+                {%- if election.is_vote_finished %}
+                  {%- set results = election_results[role.title]['blank vote'] %}
+                  <div class="election__results">
+                    <strong>{{ results.vote }} {% trans %}votes{% endtrans %} ({{ "%.2f" % results.percent }} %)</strong>
+                  </div>
+                {%- endif %}
+              </td>
+              {%- for election_list in election_lists %}
+                <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
+                  <ul class="candidates">
+                    {%- for candidature in election_list.candidatures.filter(role=role) %}
+                      <li class="candidate">
+                        {%- if election.can_vote(user) %}
+                          <input id="id_{{ role.title }}_{{ count[0] }}" type="{{ 'checkbox' if role.max_choice > 1 else 'radio' }}" {{ 'checked' if candidature.id|string in role_data else '' }} {{ 'disabled' if election.has_voted(user) else '' }} name="{{ role.title }}" value="{{ candidature.id }}">
+                          <label for="id_{{ role.title }}_{{ count[0] }}">
+                        {%- endif %}
+                        <figure>
+                          {%- if user.is_subscriber_viewable %}
+                            {% if candidature.user.profile_pict %}
+                              <img class="candidate__picture" src="{{ candidature.user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}">
+                            {% else %}
+                              <img class="candidate__picture" src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}">
+                            {% endif %}
+                          {%- endif %}
+                          <figcaption class="candidate__details">
+                            <h5>{{ candidature.user.first_name }} <em>{{candidature.user.nick_name or ''}} </em>{{ candidature.user.last_name }}</h5>
+                            {%- if not election.is_vote_finished %}
+                              <q class="candidate_program">{{ candidature.program | markdown or '' }}</q>
                             {%- endif %}
-                        </td>
-                        {%- for election_list in election_lists %}
-                        <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
-                            <ul class="candidates">
-                                {%- for candidature in election_list.candidatures.filter(role=role) %}
-                                <li class="candidate">
-                                    {%- if election.can_vote(user) %}
-                                        <input id="id_{{ role.title }}_{{ count[0] }}" type="{{ 'checkbox' if role.max_choice > 1 else 'radio' }}" {{ 'checked' if candidature.id|string in role_data else '' }} {{ 'disabled' if election.has_voted(user) else '' }} name="{{ role.title }}" value="{{ candidature.id }}">
-                                        <label for="id_{{ role.title }}_{{ count[0] }}">
-                                    {%- endif %}
-                                            <figure>
-                                                {%- if user.is_subscriber_viewable %}
-                                                    {% if candidature.user.profile_pict %}
-                                                        <img class="candidate__picture" src="{{ candidature.user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}">
-                                                    {% else %}
-                                                        <img class="candidate__picture" src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}">
-                                                    {% endif %}
-                                                {%- endif %}
-                                                <figcaption class="candidate__details">
-                                                    <h5>{{ candidature.user.first_name }} <em>{{candidature.user.nick_name or ''}} </em>{{ candidature.user.last_name }}</h5>
-                                                    {%- if not election.is_vote_finished %}
-                                                    <q class="candidate_program">{{ candidature.program | markdown or '' }}</q>
-                                                    {%- endif %}
-                                                </figcaption>
-                                                {%- if user.can_edit(candidature) -%}
-                                                {%- if election.is_vote_editable -%}
-                                                    <div class="edit_btns">
-                                                        <a href="{{url('election:update_candidate', candidature_id=candidature.id)}}">{% trans %}✏️{% endtrans %}</a>
-                                                        <a href="{{url('election:delete_candidate', candidature_id=candidature.id)}}">{% trans %}❌{% endtrans %}</a>
-                                                    </div>
-                                                {%- endif -%}
-                                                {%- endif -%}
-                                            </figure>
-                                    {%- if election.can_vote(user) %}
-                                        </label>
-                                    {%- set _ = count.append(count.pop() + 1) %}
-                                    {%- endif %}
-                                    {%- if election.is_vote_finished %}
-                                    {%- set results = election_results[role.title][candidature.user.username] %}
-                                    <div class="election__results">
-                                        <strong>{{ results.vote }} {% trans %}votes{% endtrans %} ({{ "%.2f" % results.percent }} %)</strong>
-                                    </div>
-                                    {%- endif %}
-                                </li>
-                                {%- endfor %}
-                            </ul>
-                        </td>
-                        {%- endfor %}
-                    </tr>
-                </tbody>
-                {%- endfor %}
-            </table>
-        </form>
-    </section>
-    <section class="buttons">
+                          </figcaption>
+                          {%- if user.can_edit(candidature) -%}
+                            {%- if election.is_vote_editable -%}
+                              <div class="edit_btns">
+                                <a href="{{url('election:update_candidate', candidature_id=candidature.id)}}">{% trans %}✏️{% endtrans %}</a>
+                                <a href="{{url('election:delete_candidate', candidature_id=candidature.id)}}">{% trans %}❌{% endtrans %}</a>
+                              </div>
+                            {%- endif -%}
+                          {%- endif -%}
+                        </figure>
+                        {%- if election.can_vote(user) %}
+                          </label>
+                          {%- set _ = count.append(count.pop() + 1) %}
+                        {%- endif %}
+                        {%- if election.is_vote_finished %}
+                          {%- set results = election_results[role.title][candidature.user.username] %}
+                          <div class="election__results">
+                            <strong>{{ results.vote }} {% trans %}votes{% endtrans %} ({{ "%.2f" % results.percent }} %)</strong>
+                          </div>
+                        {%- endif %}
+                      </li>
+                    {%- endfor %}
+                  </ul>
+                </td>
+              {%- endfor %}
+            </tr>
+          </tbody>
+        {%- endfor %}
+      </table>
+    </form>
+  </section>
+  <section class="buttons">
     {%- if (election.can_candidate(user) and election.is_candidature_active) or (user.can_edit(election) and election.is_vote_editable) %}
-        <a class="button" href="{{ url('election:candidate', election_id=object.id) }}">{% trans %}Candidate{% endtrans %}</a>
+      <a class="button" href="{{ url('election:candidate', election_id=object.id) }}">{% trans %}Candidate{% endtrans %}</a>
     {%- endif %}
     {%- if election.is_vote_editable %}
-        <a class="button" href="{{ url('election:create_list', election_id=object.id) }}">{% trans %}Add a new list{% endtrans %}</a>
+      <a class="button" href="{{ url('election:create_list', election_id=object.id) }}">{% trans %}Add a new list{% endtrans %}</a>
     {%- endif %}
     {%- if user.can_edit(election) %}
-        {% if election.is_vote_editable %}
+      {% if election.is_vote_editable %}
         <a  class="button" href="{{ url('election:create_role', election_id=object.id) }}">{% trans %}Add a new role{% endtrans %}</a>
-        {% endif %}
-        <a  class="button" href="{{ url('election:update', election_id=object.id) }}">{% trans %}Edit{% endtrans %}</a>
+      {% endif %}
+      <a  class="button" href="{{ url('election:update', election_id=object.id) }}">{% trans %}Edit{% endtrans %}</a>
     {%- endif %}
     {%- if user.is_root %}
-        <a  class="button" href="{{ url('election:delete', election_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
+      <a  class="button" href="{{ url('election:delete', election_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
     {%- endif %}
-    </section>
-    {%- if not election.has_voted(user) and election.can_vote(user) %}
+  </section>
+  {%- if not election.has_voted(user) and election.can_vote(user) %}
     <section class="buttons">
-        <button class="button button_send" form="vote-form">{% trans %}Submit the vote !{% endtrans %}</button>
+      <button class="button button_send" form="vote-form">{% trans %}Submit the vote !{% endtrans %}</button>
     </section>
-    {%- endif %}
+  {%- endif %}
 {% endblock %}
 
 {% block script %}
-{{ super() }}
-<script src="{{ static('core/js/shorten.min.js') }}"></script>
-<script type="text/javascript">
-$('.role_description').shorten({
-    moreText: "{% trans %}Show more{% endtrans %}",
-    lessText: "{% trans %}Show less{% endtrans %}",
-    showChars: 50
-});
-$('.candidate_program').shorten({
-    moreText: "{% trans %}Show more{% endtrans %}",
-    lessText: "{% trans %}Show less{% endtrans %}",
-    showChars: 200
-});
-</script>
-<script type="text/javascript">
-document.querySelectorAll('.role__multiple-choices').forEach(setupRestrictions);
+  {{ super() }}
+  <script src="{{ static('core/js/shorten.min.js') }}"></script>
+  <script type="text/javascript">
+    $('.role_description').shorten({
+      moreText: "{% trans %}Show more{% endtrans %}",
+      lessText: "{% trans %}Show less{% endtrans %}",
+      showChars: 50
+    });
+    $('.candidate_program').shorten({
+      moreText: "{% trans %}Show more{% endtrans %}",
+      lessText: "{% trans %}Show less{% endtrans %}",
+      showChars: 200
+    });
+  </script>
+  <script type="text/javascript">
+    document.querySelectorAll('.role__multiple-choices').forEach(setupRestrictions);
 
-function setupRestrictions(role) {
-    var selectedChoices = [];
-    role.querySelectorAll('input').forEach(setupRestriction);
+    function setupRestrictions(role) {
+      var selectedChoices = [];
+      role.querySelectorAll('input').forEach(setupRestriction);
 
-    function setupRestriction(choice) {
+      function setupRestriction(choice) {
         if (choice.checked)
-            selectedChoices.push(choice);
+          selectedChoices.push(choice);
         choice.addEventListener('change', onChange);
 
         function onChange() {
-            if (choice.checked)
-                selectedChoices.push(choice);
-            else
-                selectedChoices.splice(selectedChoices.indexOf(choice), 1);
-            while (selectedChoices.length > role.dataset.maxChoice)
-                selectedChoices.shift().checked = false;
+          if (choice.checked)
+            selectedChoices.push(choice);
+          else
+            selectedChoices.splice(selectedChoices.indexOf(choice), 1);
+          while (selectedChoices.length > role.dataset.maxChoice)
+            selectedChoices.shift().checked = false;
         }
+      }
     }
-}
-</script>
+  </script>
 {% endblock %}
diff --git a/election/templates/election/election_list.jinja b/election/templates/election/election_list.jinja
index 9e06eb74f..8eec56dd4 100644
--- a/election/templates/election/election_list.jinja
+++ b/election/templates/election/election_list.jinja
@@ -2,51 +2,51 @@
 {% from 'core/macros.jinja' import paginate %}
 
 {% block title %}
-{%- trans %}Election list{% endtrans %}
+  {%- trans %}Election list{% endtrans %}
 {%- endblock %}
 
 {% block head %}
-{{ super() -}}
-<style type="text/css">
-  small {
-    font-size: smaller;
-  }
+  {{ super() -}}
+  <style type="text/css">
+    small {
+      font-size: smaller;
+    }
 
-  time {
-    font-weight: bolder;
-  }
-</style>
+    time {
+      font-weight: bolder;
+    }
+  </style>
 {%- endblock %}
 
 {% block content %}
   <h3>{% trans %}Current elections{% endtrans %}</h3>
   {%- for election in object_list %}
-  <hr>
-  <section>
-    <h4>
-      <a href="{{ url('election:detail', election_id=election.id) }}">{{ election }}</a>
-    </h4>
-    <p>
-      {% trans %}Applications open from{% endtrans %}
-      <time datetime="{{ election.start_candidature }}">{{ election.start_candidature|localtime|date(DATETIME_FORMAT) }}</time>
-            {% trans %} at {% endtrans %}<time>{{ election.start_candidature|localtime|time(DATETIME_FORMAT) }}</time>
-       {% trans %}to{% endtrans %}
-      <time datetime="{{ election.end_candidature }}">{{ election.end_candidature|localtime|date(DATETIME_FORMAT) }}</time>
-            {% trans %} at {% endtrans %}<time>{{ election.end_candidature|time(DATETIME_FORMAT) }}</time>
-    </p>
-    <p>
-      {% trans %}Polls open from{% endtrans %}
-      <time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date(DATETIME_FORMAT) }}</time>
-            {% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time(DATETIME_FORMAT) }}</time>
-       {% trans %}to{% endtrans %}
-      <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT) }}</time>
-            {% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT) }}</time>
-    </p>
-    <p>{{ election.description }}</p>
-  </section>
+    <hr>
+    <section>
+      <h4>
+        <a href="{{ url('election:detail', election_id=election.id) }}">{{ election }}</a>
+      </h4>
+      <p>
+        {% trans %}Applications open from{% endtrans %}
+        <time datetime="{{ election.start_candidature }}">{{ election.start_candidature|localtime|date(DATETIME_FORMAT) }}</time>
+        {% trans %} at {% endtrans %}<time>{{ election.start_candidature|localtime|time(DATETIME_FORMAT) }}</time>
+        {% trans %}to{% endtrans %}
+        <time datetime="{{ election.end_candidature }}">{{ election.end_candidature|localtime|date(DATETIME_FORMAT) }}</time>
+        {% trans %} at {% endtrans %}<time>{{ election.end_candidature|time(DATETIME_FORMAT) }}</time>
+      </p>
+      <p>
+        {% trans %}Polls open from{% endtrans %}
+        <time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date(DATETIME_FORMAT) }}</time>
+        {% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time(DATETIME_FORMAT) }}</time>
+        {% trans %}to{% endtrans %}
+        <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT) }}</time>
+        {% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT) }}</time>
+      </p>
+      <p>{{ election.description }}</p>
+    </section>
   {%- endfor %}
-{% if is_paginated %}
+  {% if is_paginated %}
     {{ paginate(page_obj, paginator) }}
-{% endif %}
+  {% endif %}
 {%- endblock %}
 
diff --git a/forum/templates/forum/favorite_topics.jinja b/forum/templates/forum/favorite_topics.jinja
index 0a9e0d2f1..c46498b07 100644
--- a/forum/templates/forum/favorite_topics.jinja
+++ b/forum/templates/forum/favorite_topics.jinja
@@ -2,31 +2,31 @@
 {% from 'forum/macros.jinja' import display_topic %}
 
 {% block title %}
-{% trans %}Favorite topics{% endtrans %}
+  {% trans %}Favorite topics{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<p>
+  <p>
     <a href="{{ url('forum:main') }}">Forum</a> >
     <a href="{{ url('forum:favorite_topics') }}">{% trans %}Favorite topics{% endtrans %}</a>
-</p>
-<div id="forum">
+  </p>
+  <div id="forum">
     <h3>{% trans %}Forum{% endtrans %}</h3>
     <h4>{% trans %}Favorite topics{% endtrans %}</h4>
     {% for t in page_obj.object_list %}
-    {% if user.can_view(t) %}
-    {{ display_topic(t, user) }}
-    {% endif %}
+      {% if user.can_view(t) %}
+        {{ display_topic(t, user) }}
+      {% endif %}
     {% endfor %}
 
     <p style="text-align: right; background: #d8e7f3;">
-    {% for p in paginator.page_range %}
+      {% for p in paginator.page_range %}
         <span class="ib" style="background: {% if p == paginator.number %}white{% endif %}; margin: 0;">
-            <a href="?page={{ p }}">{{ p }}</a>
+          <a href="?page={{ p }}">{{ p }}</a>
         </span>
-    {% endfor %}
+      {% endfor %}
     </p>
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/forum/templates/forum/forum.jinja b/forum/templates/forum/forum.jinja
index 57031b198..2a328c555 100644
--- a/forum/templates/forum/forum.jinja
+++ b/forum/templates/forum/forum.jinja
@@ -2,71 +2,71 @@
 {% from 'forum/macros.jinja' import display_forum, display_breadcrumb, display_topic, display_search_bar %}
 
 {% block title %}
-{{ forum }}
+  {{ forum }}
 {% endblock %}
 
 {% block content %}
-{{ display_breadcrumb(forum) }}
-<div id="forum">
+  {{ display_breadcrumb(forum) }}
+  <div id="forum">
     <h3>{{ forum.name }}</h3>
     <p>
-    {%
-        if user.is_com_admin
-        or user.is_in_group(pk=settings.SITH_GROUP_FORUM_ADMIN_ID)
-        or user.can_edit(forum)
-    %}
-        <a class="ib button" href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">{% trans %}New forum{% endtrans %}</a> <br/>
-    {% endif %}
-    {% if not forum.is_category %}
-        <a class="ib button" href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a>
-    {% endif %}
-    {{ display_search_bar(request) }}
-    </p>
-    {% if forum.children.exists() %}
-    <div>
-        <div class="ib w_big">
-            {% trans %}Title{% endtrans %}
-        </div>
-        <div class="ib w_small">
-            <div class="ib w_medium">
-                {% trans %}Topics{% endtrans %}
-            </div>
-            <div class="ib w_small">
-                {% trans %}Last message{% endtrans %}
-            </div>
-        </div>
+      {%
+      if user.is_com_admin
+      or user.is_in_group(pk=settings.SITH_GROUP_FORUM_ADMIN_ID)
+      or user.can_edit(forum)
+      %}
+      <a class="ib button" href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">{% trans %}New forum{% endtrans %}</a> <br/>
+{% endif %}
+{% if not forum.is_category %}
+  <a class="ib button" href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a>
+{% endif %}
+{{ display_search_bar(request) }}
+</p>
+{% if forum.children.exists() %}
+  <div>
+    <div class="ib w_big">
+      {% trans %}Title{% endtrans %}
     </div>
-    {{ display_forum(forum, user, True) }}
-    {% for f in forum.children.all().select_related("_last_message__author", "_last_message__topic") %}
+    <div class="ib w_small">
+      <div class="ib w_medium">
+        {% trans %}Topics{% endtrans %}
+      </div>
+      <div class="ib w_small">
+        {% trans %}Last message{% endtrans %}
+      </div>
+    </div>
+  </div>
+  {{ display_forum(forum, user, True) }}
+  {% for f in forum.children.all().select_related("_last_message__author", "_last_message__topic") %}
     {{ display_forum(f, user) }}
-    {% endfor %}
-    {% endif %}
-    {% if topics %}
-    <div>
-        <div class="ib w_medium">
-            {% trans %}Title{% endtrans %}
-        </div>
-        <div class="ib w_medium">
-            <div class="ib w_small">
-                {% trans %}Author{% endtrans %}
-            </div>
-            <div class="ib w_medium">
-                {% trans %}Messages{% endtrans %}
-            </div>
-            <div class="ib w_small">
-                {% trans %}Last message{% endtrans %}
-            </div>
-        </div>
+  {% endfor %}
+{% endif %}
+{% if topics %}
+  <div>
+    <div class="ib w_medium">
+      {% trans %}Title{% endtrans %}
     </div>
-    {% for t in topics %}
+    <div class="ib w_medium">
+      <div class="ib w_small">
+        {% trans %}Author{% endtrans %}
+      </div>
+      <div class="ib w_medium">
+        {% trans %}Messages{% endtrans %}
+      </div>
+      <div class="ib w_small">
+        {% trans %}Last message{% endtrans %}
+      </div>
+    </div>
+  </div>
+  {% for t in topics %}
     {{ display_topic(t, user) }}
-    {% endfor %}
-    <p style="text-align: right; background: #d8e7f3;">
+  {% endfor %}
+  <p style="text-align: right; background: #d8e7f3;">
     {% for p in topics.paginator.page_range %}
-        <span class="ib" style="background: {% if p == topics.number %}white{% endif %}; margin: 0;"><a href="?topic_page={{ p }}">{{ p }}</a></span>
+      <span class="ib" style="background: {% if p == topics.number %}white{% endif %}; margin: 0;"><a href="?topic_page={{ p }}">{{ p }}</a></span>
     {% endfor %}
-    </p>
-    {% endif %}
+  </p>
+{% endif %}
 </div>
 {% endblock %}
 
diff --git a/forum/templates/forum/last_unread.jinja b/forum/templates/forum/last_unread.jinja
index d776d006c..4d574ff0d 100644
--- a/forum/templates/forum/last_unread.jinja
+++ b/forum/templates/forum/last_unread.jinja
@@ -2,35 +2,35 @@
 {% from 'forum/macros.jinja' import display_topic %}
 
 {% block title %}
-{% trans %}Last unread messages{% endtrans %}
+  {% trans %}Last unread messages{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<p>
+  <p>
     <a href="{{ url('forum:main') }}">Forum</a> >
     <a href="{{ url('forum:last_unread') }}">{% trans %}Last unread messages{% endtrans %}</a>
-</p>
-<div id="forum">
+  </p>
+  <div id="forum">
     <h3>{% trans %}Forum{% endtrans %}</h3>
     <h4>{% trans %}Last unread messages{% endtrans %}</h4>
     <p>
-        <a class="ib button" href="{{ url('forum:mark_all_as_read') }}">{% trans %}Mark all as read{% endtrans %}</a>
-        <a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}Refresh{% endtrans %}</a>
+      <a class="ib button" href="{{ url('forum:mark_all_as_read') }}">{% trans %}Mark all as read{% endtrans %}</a>
+      <a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}Refresh{% endtrans %}</a>
     </p>
     {% for t in page_obj.object_list %}
-    {% if user.can_view(t) %}
-    {{ display_topic(t, user, True) }}
-    {% endif %}
+      {% if user.can_view(t) %}
+        {{ display_topic(t, user, True) }}
+      {% endif %}
     {% endfor %}
 
     <p style="text-align: right; background: #d8e7f3;">
-    {% for p in paginator.page_range %}
+      {% for p in paginator.page_range %}
         <span class="ib" style="background: {% if p == paginator.number %}white{% endif %}; margin: 0;">
-            <a href="?page={{ p }}">{{ p }}</a>
+          <a href="?page={{ p }}">{{ p }}</a>
         </span>
-    {% endfor %}
+      {% endfor %}
     </p>
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/forum/templates/forum/macros.jinja b/forum/templates/forum/macros.jinja
index ca61e8368..6b4c0649f 100644
--- a/forum/templates/forum/macros.jinja
+++ b/forum/templates/forum/macros.jinja
@@ -1,177 +1,177 @@
 {% from 'core/macros.jinja' import user_profile_link_short_name %}
 
 {% macro display_forum(forum, user, is_root=False) %}
-<div class="forum {% if is_root %}category{% endif %}">
+  <div class="forum {% if is_root %}category{% endif %}">
     <div class="ib w_big">
-        {% if not is_root %}
+      {% if not is_root %}
         <a class="ib w_big" href="{{ url('forum:view_forum', forum_id=forum.id) }}">
-        {% else %}
+      {% else %}
         <div class="ib w_big">
-        {% endif %}
-            <div class="title">{{ forum.name }}</div>
-            <p>{{ forum.description }}</p>
-        {% if not is_root %}
+      {% endif %}
+      <div class="title">{{ forum.name }}</div>
+      <p>{{ forum.description }}</p>
+      {% if not is_root %}
         </a>
-        {% else %}
+      {% else %}
         </div>
-        {% endif %}
-        {% if user.is_owner(forum) %}
+      {% endif %}
+      {% if user.is_owner(forum) %}
         <div class="tools">
-        <a class="ib" href="{{ url('forum:edit_forum', forum_id=forum.id) }}">{% trans %}Edit{% endtrans %}</a>
-        <a class="ib" href="{{ url('forum:delete_forum', forum_id=forum.id) }}">{% trans %}Delete{% endtrans %}</a>
+          <a class="ib" href="{{ url('forum:edit_forum', forum_id=forum.id) }}">{% trans %}Edit{% endtrans %}</a>
+          <a class="ib" href="{{ url('forum:delete_forum', forum_id=forum.id) }}">{% trans %}Delete{% endtrans %}</a>
         </div>
-        {% endif %}
+      {% endif %}
     </div>
     {% if not is_root %}
-    <div class="ib w_small">
+      <div class="ib w_small">
         <p class="ib w_medium">
-            {{ forum.topic_number }}
+          {{ forum.topic_number }}
         </p>
         <div class="ib w_medium last_message" style="font-size: x-small; text-align: center">
-            {% if forum.last_message %}
+          {% if forum.last_message %}
             {{ user_profile_link_short_name(forum.last_message.author) }} <br/>
             <a href="{{ forum.last_message.get_absolute_url() }}">
-                <date>
+              <date>
                 {{ forum.last_message.date|localtime|date(DATETIME_FORMAT) }}
                 {{ forum.last_message.date|localtime|time(DATETIME_FORMAT) }}
-                </date><br>
-                <span>
+              </date><br>
+              <span>
                 {{ forum.last_message.topic }}
-                </span>
+              </span>
             </a>
-            {% endif %}
+          {% endif %}
         </div>
-    </div>
+      </div>
     {% endif %}
-</div>
+  </div>
 {% endmacro %}
 
 {% macro display_topic(topic, user, first_unread=False) %}
-<div class="topic">
+  <div class="topic">
     <div class="ib w_medium">
-        {% if first_unread %}
+      {% if first_unread %}
         <a class="ib w_big" href="{{ topic.get_first_unread_message(user).get_absolute_url() }}">
-        {% else %}
+      {% else %}
         <a class="ib w_big" href="{{ url('forum:view_topic', topic_id=topic.id) }}">
-        {% endif %}
-            <div class="title">{{ topic.title or topic.messages.first().title }}</div>
-            <p>{{ topic.description }}</p>
-        </a>
-        {% if user.can_edit(topic) %}
-        <div class="ib tools" style="text-align: center;">
-            <a href="{{ url('forum:edit_topic', topic_id=topic.id) }}">{% trans %}Edit{% endtrans %}</a>
-        </div>
-        {% endif %}
-    </div>
-    <div class="ib w_medium last_message">
-        <div class="ib w_medium">
-            <p class="ib w_medium" style="text-align: center;">
-                {{ user_profile_link_short_name(topic.author) }}
-            </p>
-            <p class="ib w_medium" style="text-align: center;">
-                {{ topic._message_number }}
-            </p>
-        </div>
-        <p class="ib w_medium" style="text-align: center;">
-            {% set last_msg = topic.last_message %}
-            {% if last_msg %}
-            {{ user_profile_link_short_name(last_msg.author) }} <br/>
-            <a href="{{ last_msg.get_absolute_url() }}">
-                <date>{{ last_msg.date|localtime|date(DATETIME_FORMAT) }} {{ last_msg.date|localtime|time(DATETIME_FORMAT) }}</date>
-            </a>
-            {% endif %}
-        </p>
+      {% endif %}
+      <div class="title">{{ topic.title or topic.messages.first().title }}</div>
+      <p>{{ topic.description }}</p>
+    </a>
+    {% if user.can_edit(topic) %}
+      <div class="ib tools" style="text-align: center;">
+        <a href="{{ url('forum:edit_topic', topic_id=topic.id) }}">{% trans %}Edit{% endtrans %}</a>
+      </div>
+    {% endif %}
+  </div>
+  <div class="ib w_medium last_message">
+    <div class="ib w_medium">
+      <p class="ib w_medium" style="text-align: center;">
+        {{ user_profile_link_short_name(topic.author) }}
+      </p>
+      <p class="ib w_medium" style="text-align: center;">
+        {{ topic._message_number }}
+      </p>
     </div>
-</div>
+    <p class="ib w_medium" style="text-align: center;">
+      {% set last_msg = topic.last_message %}
+      {% if last_msg %}
+        {{ user_profile_link_short_name(last_msg.author) }} <br/>
+        <a href="{{ last_msg.get_absolute_url() }}">
+          <date>{{ last_msg.date|localtime|date(DATETIME_FORMAT) }} {{ last_msg.date|localtime|time(DATETIME_FORMAT) }}</date>
+        </a>
+      {% endif %}
+    </p>
+  </div>
+  </div>
 {% endmacro %}
 
 {% macro display_breadcrumb(forum, topic="") %}
-<p>
+  <p>
     <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
     {% for f in forum.get_parent_list()|reverse %}
-    > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
+      > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
     {% endfor %}
     > <a href="{{ forum.get_absolute_url() }}">{{ forum }}</a>
     {% if topic != "" %} > <a href="{{ topic.get_absolute_url() }}">{{ topic }}</a>{%- endif -%}
-</p>
+  </p>
 {% endmacro %}
 
 {% macro display_message(m, user, unread=False) %}
-{% if user.can_view(m) %}
-<div id="msg_{{ m.id }}" class="message {% if unread %}unread{% endif %}">
-    <div class="msg_author {% if m.deleted %}deleted{% endif %}">
-            {% if m.author.avatar_pict %}
-        <img src="{{ m.author.avatar_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" id="picture" />
+  {% if user.can_view(m) %}
+    <div id="msg_{{ m.id }}" class="message {% if unread %}unread{% endif %}">
+      <div class="msg_author {% if m.deleted %}deleted{% endif %}">
+        {% if m.author.avatar_pict %}
+          <img src="{{ m.author.avatar_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" id="picture" />
         {% else %}
-        <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}" id="picture" />
+          <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}" id="picture" />
         {% endif %}
         <br/>
         <strong><a href="{{ m.author.get_absolute_url() }}">{{ m.author.get_short_name() }}</a></strong>
-    </div>
-    <div class="msg_content  {% if m.deleted %}deleted{% endif %}" {% if m.id == first_unread_message_id %}id="first_unread"{% endif %}>
+      </div>
+      <div class="msg_content  {% if m.deleted %}deleted{% endif %}" {% if m.id == first_unread_message_id %}id="first_unread"{% endif %}>
         <div class="msg_header">
-            <div class="ib w_big title">
-                <a href="{{ m.get_absolute_url() }}">
-                {{ m.date|localtime|date(DATETIME_FORMAT) }}
-                {{ m.date|localtime|time(DATETIME_FORMAT) }}
-                {%- if m.title -%}
-                    - {{ m.title }}
-                {%- endif -%}
-                </a>
-            </div>
-            <div class="ib w_small">
-                <span><a href="{{ m.get_absolute_url() }}">#{{ m.id }}</a></span>
-                <br/>
-                <span><a href="{{ url('forum:new_message', topic_id=m.topic.id) }}?quote_id={{ m.id }}">
-                        {% trans %}Reply as quote{% endtrans %}</a></span>
-                {% if user.can_edit(m) %}
-                <span> <a href="{{ url('forum:edit_message', message_id=m.id) }}">{% trans %}Edit{% endtrans %}</a></span>
-                {% endif %}
-                {% if m.can_be_moderated_by(user) %}
-                {% if m.deleted %}
+          <div class="ib w_big title">
+            <a href="{{ m.get_absolute_url() }}">
+              {{ m.date|localtime|date(DATETIME_FORMAT) }}
+              {{ m.date|localtime|time(DATETIME_FORMAT) }}
+              {%- if m.title -%}
+                - {{ m.title }}
+              {%- endif -%}
+            </a>
+          </div>
+          <div class="ib w_small">
+            <span><a href="{{ m.get_absolute_url() }}">#{{ m.id }}</a></span>
+            <br/>
+            <span><a href="{{ url('forum:new_message', topic_id=m.topic.id) }}?quote_id={{ m.id }}">
+              {% trans %}Reply as quote{% endtrans %}</a></span>
+            {% if user.can_edit(m) %}
+              <span> <a href="{{ url('forum:edit_message', message_id=m.id) }}">{% trans %}Edit{% endtrans %}</a></span>
+            {% endif %}
+            {% if m.can_be_moderated_by(user) %}
+              {% if m.deleted %}
                 <span> <a href="{{ url('forum:undelete_message', message_id=m.id) }}">{% trans %}Undelete{% endtrans %}</a></span>
-                {% else %}
+              {% else %}
                 <span> <a href="{{ url('forum:delete_message', message_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></span>
-                {% endif %}
-                {% endif %}
-            </div>
+              {% endif %}
+            {% endif %}
+          </div>
         </div>
         <hr>
         <div>
-        {{ m.message|markdown }}
+          {{ m.message|markdown }}
         </div>
         {% if m.can_be_moderated_by(user) %}
-        <ul class="msg_meta">
-        {% for meta in m.metas.select_related('user').order_by('id') %}
-            <li style="background: {% if m.author == meta.user %}#bfffbf{% else %}#ffffbf{% endif %}">
+          <ul class="msg_meta">
+            {% for meta in m.metas.select_related('user').order_by('id') %}
+              <li style="background: {% if m.author == meta.user %}#bfffbf{% else %}#ffffbf{% endif %}">
                 {{ meta.get_action_display() }} {{ meta.user.get_short_name() }}
                 {% trans %} at {% endtrans %}{{ meta.date|localtime|time(DATETIME_FORMAT) }}
                 {% trans %} the {% endtrans %}{{ meta.date|localtime|date(DATETIME_FORMAT)}}</li>
-        {% endfor %}
-        </ul>
+            {% endfor %}
+          </ul>
         {% endif %}
         <div class="forum_signature">{{ m.author.forum_signature|markdown }}</div>
-    </div>
-</div>
+      </div>
+  </div>
 {% else %}
-<div id="msg_{{ m.id }}" class="message">
+  <div id="msg_{{ m.id }}" class="message">
     <div class="msg_author deleted">
     </div>
     <div class="msg_content deleted">
-        <p class="ib w_big">{% trans %}Deleted or unreadable message.{% endtrans %}</p>
-        <p class="ib w_small">{{ m.date|localtime|date(DATETIME_FORMAT) }} {{ m.date|localtime|time(DATETIME_FORMAT) }}</p>
+      <p class="ib w_big">{% trans %}Deleted or unreadable message.{% endtrans %}</p>
+      <p class="ib w_small">{{ m.date|localtime|date(DATETIME_FORMAT) }} {{ m.date|localtime|time(DATETIME_FORMAT) }}</p>
     </div>
-</div>
+  </div>
 {% endif %}
 {{ m.mark_as_read(user) or "" }}
 {% endmacro %}
 
 {% macro display_search_bar(request) %}
-<form class="search_bar" action="{{ url('forum:search') }}" method="GET">
+  <form class="search_bar" action="{{ url('forum:search') }}" method="GET">
     <input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query" value="{{ request.GET.query|default('') }}"/>
     <input type="checkbox" class="search_check" name="order" value="date" {% if request.GET.order|default("") == "date" or (request.GET.order|default("") == "" and request.GET.query|default("") == "") -%}
-        checked
-    {%- endif -%}> {% trans %}Order by date{% endtrans %}<br>
+             checked
+           {%- endif -%}> {% trans %}Order by date{% endtrans %}<br>
     <input type="submit" class="search_bouton" value="{% trans %}Search{% endtrans %}"/>
-</form>
+  </form>
 {% endmacro %}
diff --git a/forum/templates/forum/main.jinja b/forum/templates/forum/main.jinja
index e6a627858..3cd3c70ee 100644
--- a/forum/templates/forum/main.jinja
+++ b/forum/templates/forum/main.jinja
@@ -3,50 +3,50 @@
 {% from 'forum/macros.jinja' import display_forum, display_search_bar %}
 
 {% block title %}
-{% trans %}Forum{% endtrans %}
+  {% trans %}Forum{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<p>
-<a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a> >
-</p>
-<div id="forum">
+  <p>
+    <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a> >
+  </p>
+  <div id="forum">
     <h3>{% trans %}Forum{% endtrans %}</h3>
     <p>
-        <a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}View last unread messages{% endtrans %}</a>
-        <a class="ib button" href="{{ url('forum:favorite_topics') }}">{% trans %}Favorite topics{% endtrans %}</a>
-        {{ display_search_bar(request) }}
+      <a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}View last unread messages{% endtrans %}</a>
+      <a class="ib button" href="{{ url('forum:favorite_topics') }}">{% trans %}Favorite topics{% endtrans %}</a>
+      {{ display_search_bar(request) }}
     </p>
     {% if
-        user.is_com_admin
-        or user.is_in_group(pk=settings.SITH_GROUP_FORUM_ADMIN_ID)
+    user.is_com_admin
+    or user.is_in_group(pk=settings.SITH_GROUP_FORUM_ADMIN_ID)
     %}
     <p>
-        <a href="{{ url('forum:new_forum') }}">{% trans %}New forum{% endtrans %}</a>
+      <a href="{{ url('forum:new_forum') }}">{% trans %}New forum{% endtrans %}</a>
     </p>
-    {% endif %}
-    <div>
-        <div class="ib w_big">
-            {% trans %}Title{% endtrans %}
-        </div>
-        <div class="ib w_small">
-            <div class="ib w_medium">
-                {% trans %}Topics{% endtrans %}
-            </div>
-            <div class="ib w_small">
-                {% trans %}Last message{% endtrans %}
-            </div>
-        </div>
+{% endif %}
+<div>
+  <div class="ib w_big">
+    {% trans %}Title{% endtrans %}
+  </div>
+  <div class="ib w_small">
+    <div class="ib w_medium">
+      {% trans %}Topics{% endtrans %}
     </div>
+    <div class="ib w_small">
+      {% trans %}Last message{% endtrans %}
+    </div>
+  </div>
+</div>
 
-    {% for f in forum_list %}
-    <div>
+{% for f in forum_list %}
+  <div>
     {{ display_forum(f, user, True) }}
-        {% for c in f.children.all() %}
-        {{ display_forum(c, user) }}
-        {% endfor %}
-    </div>
+    {% for c in f.children.all() %}
+      {{ display_forum(c, user) }}
     {% endfor %}
+  </div>
+{% endfor %}
 </div>
 {% endblock %}
 
diff --git a/forum/templates/forum/reply.jinja b/forum/templates/forum/reply.jinja
index e4b5f5f0e..a819a4002 100644
--- a/forum/templates/forum/reply.jinja
+++ b/forum/templates/forum/reply.jinja
@@ -2,46 +2,46 @@
 {% from 'forum/macros.jinja' import display_message, display_search_bar %}
 
 {% block title %}
-{% if topic %}
-{% trans %}Reply{% endtrans %}
-{% else %}
-{% trans %}New topic{% endtrans %}
-{% endif %}
+  {% if topic %}
+    {% trans %}Reply{% endtrans %}
+  {% else %}
+    {% trans %}New topic{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 {% block content %}
-{% if topic %}
-{{ display_search_bar(request) }}
-<p>
-<a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
-{% for f in topic.forum.get_parent_list() %}
-> <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
-{% endfor %}
-> <a href="{{ topic.forum.get_absolute_url() }}">{{ topic.forum }}</a>
-> <a href="{{ topic.get_absolute_url() }}">{{ topic }}</a>
-</p>
-<div id="forum">
-    <h3>{{ topic.title }}</h3>
-    <h4>{% trans %}Reply{% endtrans %}</h4>
-{% else %}
-<div id="forum">
-    <h4>{% trans %}New topic{% endtrans %}</h4>
-{% endif %}
-    <form action="" method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-        {% render_honeypot_field settings.HONEYPOT_FIELD_NAME_FORUM %}
-        {{ form.as_p() }}
-        <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-    </form>
-    <hr>
+  {% if topic %}
+    {{ display_search_bar(request) }}
+    <p>
+      <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
+      {% for f in topic.forum.get_parent_list() %}
+        > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
+      {% endfor %}
+      > <a href="{{ topic.forum.get_absolute_url() }}">{{ topic.forum }}</a>
+      > <a href="{{ topic.get_absolute_url() }}">{{ topic }}</a>
+    </p>
+    <div id="forum">
+      <h3>{{ topic.title }}</h3>
+      <h4>{% trans %}Reply{% endtrans %}</h4>
+  {% else %}
+    <div id="forum">
+      <h4>{% trans %}New topic{% endtrans %}</h4>
+  {% endif %}
+  <form action="" method="post" enctype="multipart/form-data">
+    {% csrf_token %}
+    {% render_honeypot_field settings.HONEYPOT_FIELD_NAME_FORUM %}
+    {{ form.as_p() }}
+    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+  </form>
+  <hr>
 
-    {% if topic %}
+  {% if topic %}
     {% for m in topic.messages.select_related('author__avatar_pict').order_by('-id')[:10] %}
-        {{ display_message(m, user) }}
+      {{ display_message(m, user) }}
     {% endfor %}
-    {% endif %}
+  {% endif %}
 
 
-</div>
+  </div>
 
 {% endblock %}
diff --git a/forum/templates/forum/search.jinja b/forum/templates/forum/search.jinja
index d996a3586..fee1e86ad 100644
--- a/forum/templates/forum/search.jinja
+++ b/forum/templates/forum/search.jinja
@@ -3,19 +3,19 @@
 {% from 'forum/macros.jinja' import display_message, display_breadcrumb, display_search_bar %}
 
 {% block content %}
-    <div id="forum">
+  <div id="forum">
     {{ display_search_bar(request) }}
     {% if object_list|length != 0 %}
-        <br>
-        <div class="search-results">
-            {% for m in object_list %}
-                {{ display_breadcrumb(m.topic.forum, m.topic) }}
-                {{ display_message(m, user) }}
-            {% endfor %}
-        </div>
+      <br>
+      <div class="search-results">
+        {% for m in object_list %}
+          {{ display_breadcrumb(m.topic.forum, m.topic) }}
+          {{ display_message(m, user) }}
+        {% endfor %}
+      </div>
     {% else %}
-        {% trans %}No result found{% endtrans %}
+      {% trans %}No result found{% endtrans %}
     {% endif %}
-    </div>
+  </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/forum/templates/forum/topic.jinja b/forum/templates/forum/topic.jinja
index ef7498448..f1a014736 100644
--- a/forum/templates/forum/topic.jinja
+++ b/forum/templates/forum/topic.jinja
@@ -3,68 +3,68 @@
 {% from 'forum/macros.jinja' import display_message, display_breadcrumb, display_search_bar %}
 
 {% block title %}
-{{ topic }}
+  {{ topic }}
 {% endblock %}
 
 {% block head %}
-{{ super() }}
-<style type="text/css" media="all">
-.topic {
-    border: solid skyblue 1px;
-    padding: 2px;
-    margin: 2px;
-}
-.forum {
-    background: lightblue;
-    padding: 2px;
-    margin: 2px;
-}
-.category {
-    background: skyblue;
-}
-</style>
+  {{ super() }}
+  <style type="text/css" media="all">
+    .topic {
+      border: solid skyblue 1px;
+      padding: 2px;
+      margin: 2px;
+    }
+    .forum {
+      background: lightblue;
+      padding: 2px;
+      margin: 2px;
+    }
+    .category {
+      background: skyblue;
+    }
+  </style>
 {% endblock %}
 
 {% block content %}
-{{ display_breadcrumb(topic.forum, topic) }}
-<h3>{{ topic.title }}</h3>
-<div id="forum">
+  {{ display_breadcrumb(topic.forum, topic) }}
+  <h3>{{ topic.title }}</h3>
+  <div id="forum">
     <p>{{ topic.description }}</p>
     <p>
-    <a class="ib button" href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a>
-    {% if user in topic.subscribed_users.all() %}
-    <a class="ib button" href="{{ url('forum:toggle_subscribe_topic', topic_id=topic.id) }}">{% trans %}Unmark as favorite{% endtrans %}</a>
-    {% else %}
-    <a class="ib button" href="{{ url('forum:toggle_subscribe_topic', topic_id=topic.id) }}">{% trans %}Mark as favorite{% endtrans %}</a>
-    {% endif %}
+      <a class="ib button" href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a>
+      {% if user in topic.subscribed_users.all() %}
+        <a class="ib button" href="{{ url('forum:toggle_subscribe_topic', topic_id=topic.id) }}">{% trans %}Unmark as favorite{% endtrans %}</a>
+      {% else %}
+        <a class="ib button" href="{{ url('forum:toggle_subscribe_topic', topic_id=topic.id) }}">{% trans %}Mark as favorite{% endtrans %}</a>
+      {% endif %}
     </p>
 
     {{ display_search_bar(request) }}
     <p style="text-align: right; background: #d8e7f3;">
-    {% for p in msgs.paginator.page_range %}
+      {% for p in msgs.paginator.page_range %}
         <span class="ib" style="background: {% if p == msgs.number %}white{% endif %}; margin: 0;"><a href="?page={{ p }}">{{ p }}</a></span>
-    {% endfor %}
+      {% endfor %}
     </p>
 
     {% for m in msgs %}
-        {% if m.id == first_unread_message_id %}
+      {% if m.id == first_unread_message_id %}
         <span id="first_unread"></span>
-        {% endif %}
-        {% if m.id >= first_unread_message_id %}
+      {% endif %}
+      {% if m.id >= first_unread_message_id %}
         {{ display_message(m, user, True) }}
-        {% else %}
+      {% else %}
         {{ display_message(m, user, False) }}
-        {% endif %}
+      {% endif %}
     {% endfor %}
 
     <p><a class="ib button" href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a></p>
 
     <p style="text-align: right; background: #d8e7f3;">
-    {% for p in msgs.paginator.page_range %}
+      {% for p in msgs.paginator.page_range %}
         <span class="ib" style="background: {% if p == msgs.number %}white{% endif %}; margin: 0;"><a href="?page={{ p }}">{{ p }}</a></span>
-    {% endfor %}
+      {% endfor %}
     </p>
-</div>
+  </div>
 {% endblock %}
 
 
diff --git a/galaxy/templates/galaxy/user.jinja b/galaxy/templates/galaxy/user.jinja
index 38abb6de0..733b714ee 100644
--- a/galaxy/templates/galaxy/user.jinja
+++ b/galaxy/templates/galaxy/user.jinja
@@ -1,28 +1,28 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans user_name=object.get_display_name() %}{{ user_name }}'s Galaxy{% endtrans %}
+  {% trans user_name=object.get_display_name() %}{{ user_name }}'s Galaxy{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if object.current_star %}
-<div style="display: flex; flex-wrap: wrap;">
-    <div id="3d-graph"></div>
+  {% if object.current_star %}
+    <div style="display: flex; flex-wrap: wrap;">
+      <div id="3d-graph"></div>
 
-    <div style="margin: 1em;">
+      <div style="margin: 1em;">
         <p><a onclick="focus_node(get_node_from_id({{ object.id }}))">Reset on {{ object.get_display_name() }}</a></p>
         <p>Self score: {{ object.current_star.mass }}</p>
         <table style="width: initial;">
-            <tr>
-              <th></th>
-              <th>Citizen</th>
-              <th>Score</th>
-              <th>Distance</th>
-              <th>Family</th>
-              <th>Pictures</th>
-              <th>Clubs</th>
-            </tr>
-        {% for lane in lanes %}
+          <tr>
+            <th></th>
+            <th>Citizen</th>
+            <th>Score</th>
+            <th>Distance</th>
+            <th>Family</th>
+            <th>Pictures</th>
+            <th>Clubs</th>
+          </tr>
+          {% for lane in lanes %}
             <tr>
               <td><a onclick="focus_node(get_node_from_id({{ lane.other_star_id }}))">Locate</a></td>
               <td><a href="{{ url("galaxy:user", user_id=lane.other_star_id) }}">{{ lane.other_star_name }}</a></td>
@@ -32,14 +32,14 @@
               <td>{{ lane.pictures }}</td>
               <td>{{ lane.clubs }}</td>
             </tr>
-        {% endfor %}
+          {% endfor %}
         </table>
+      </div>
     </div>
-</div>
-<p>#{{ object.current_star.galaxy }}#</p>
-{% else %}
-  <p>This citizen has not yet joined the galaxy</p>
-{% endif %}
+    <p>#{{ object.current_star.galaxy }}#</p>
+  {% else %}
+    <p>This citizen has not yet joined the galaxy</p>
+  {% endif %}
 
 {% endblock %}
 
@@ -52,17 +52,17 @@
   <script src="{{ static('galaxy/js/d3-force-3d.min.js') }}" defer></script>
 
   <script>
-  var Graph;
+    var Graph;
 
-  function get_node_from_id(id) {
+    function get_node_from_id(id) {
       return Graph.graphData().nodes.find(n => n.id === id);
-  }
+    }
 
-  function get_links_from_node_id(id) {
+    function get_links_from_node_id(id) {
       return Graph.graphData().links.filter(l => l.source.id === id || l.target.id === id);
-  }
+    }
 
-  function focus_node(node) {
+    function focus_node(node) {
       highlightNodes.clear();
       highlightLinks.clear();
 
@@ -94,28 +94,28 @@
         node, // lookAt ({ x, y, z })
         3000  // ms transition duration
       );
-  }
+    }
 
-  const highlightNodes = new Set();
-  const highlightLinks = new Set();
-  let hoverNode = null;
+    const highlightNodes = new Set();
+    const highlightLinks = new Set();
+    let hoverNode = null;
 
-  document.addEventListener("DOMContentLoaded", () => {
-    var graph_div = document.getElementById('3d-graph');
-    Graph = ForceGraph3D();
-    Graph(graph_div);
-    Graph
+    document.addEventListener("DOMContentLoaded", () => {
+      var graph_div = document.getElementById('3d-graph');
+      Graph = ForceGraph3D();
+      Graph(graph_div);
+      Graph
         .jsonUrl('{{ url("galaxy:data") }}')
         .width(graph_div.parentElement.clientWidth > 1200 ? 1200 : graph_div.parentElement.clientWidth) // Not perfect at all. JS-fu master from the future, please fix this :-)
         .height(1000)
         .enableNodeDrag(false) // allow easier navigation
         .onNodeClick(node => {
-             camera = Graph.cameraPosition();
-             var distance = Math.sqrt(Math.pow(node.x - camera.x, 2) + Math.pow(node.y - camera.y, 2) + Math.pow(node.z - camera.z, 2))
-             if (distance < 120 || highlightNodes.has(node)) {
-                 focus_node(node);
-             }
-         })
+          camera = Graph.cameraPosition();
+          var distance = Math.sqrt(Math.pow(node.x - camera.x, 2) + Math.pow(node.y - camera.y, 2) + Math.pow(node.z - camera.z, 2))
+          if (distance < 120 || highlightNodes.has(node)) {
+            focus_node(node);
+          }
+        })
         .linkWidth(link => highlightLinks.has(link) ? 0.4 : 0.0)
         .linkColor(link => highlightLinks.has(link) ? 'rgba(255,160,0,1)' : 'rgba(128,255,255,0.6)')
         .linkVisibility(link => highlightLinks.has(link))
@@ -137,14 +137,14 @@
         });
 
     // Set distance between stars
-    Graph.d3Force('link').distance(link => link.value);
+      Graph.d3Force('link').distance(link => link.value);
 
     // Set high masses nearer the center of the galaxy
     // TODO: quick and dirty strength computation, this will need tuning.
-    Graph.d3Force('positionX', d3.forceX().strength(node => { return 1 - (1 / node.mass); }));
-    Graph.d3Force('positionY', d3.forceY().strength(node => { return 1 - (1 / node.mass); }));
-    Graph.d3Force('positionZ', d3.forceZ().strength(node => { return 1 - (1 / node.mass); }));
-  })
+      Graph.d3Force('positionX', d3.forceX().strength(node => { return 1 - (1 / node.mass); }));
+      Graph.d3Force('positionY', d3.forceY().strength(node => { return 1 - (1 / node.mass); }));
+      Graph.d3Force('positionZ', d3.forceZ().strength(node => { return 1 - (1 / node.mass); }));
+    })
   </script>
 {% endblock %}
 
diff --git a/launderette/templates/launderette/launderette_admin.jinja b/launderette/templates/launderette/launderette_admin.jinja
index 07984a7aa..677161833 100644
--- a/launderette/templates/launderette/launderette_admin.jinja
+++ b/launderette/templates/launderette/launderette_admin.jinja
@@ -1,67 +1,67 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Launderette admin{% endtrans %}
+  {% trans %}Launderette admin{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}Selling{% endtrans %}</h3>
-<p><a href="{{ url('launderette:main_click', launderette_id=launderette.id) }}">{% trans %}Sell{% endtrans %}</a></p>
-<hr>
-<h3>{% trans %}Machines{% endtrans %}</h3>
-<p><a href="{{ url('launderette:machine_new') }}?launderette={{ launderette.id }}">{% trans %}New machine{% endtrans %}</a></p>
-<ul>
+  <h3>{% trans %}Selling{% endtrans %}</h3>
+  <p><a href="{{ url('launderette:main_click', launderette_id=launderette.id) }}">{% trans %}Sell{% endtrans %}</a></p>
+  <hr>
+  <h3>{% trans %}Machines{% endtrans %}</h3>
+  <p><a href="{{ url('launderette:machine_new') }}?launderette={{ launderette.id }}">{% trans %}New machine{% endtrans %}</a></p>
+  <ul>
     {% for m in launderette.machines.all() %}
-    <li><a href="{{ url('launderette:machine_edit', machine_id=m.id) }}">{{ m }}</a> -
+      <li><a href="{{ url('launderette:machine_edit', machine_id=m.id) }}">{{ m }}</a> -
         <a href="{{ url('launderette:machine_delete', machine_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></li>
     {% endfor %}
-</ul>
-<hr>
-<h3>{% trans %}Tokens{% endtrans %}</h3>
-<p>
-<form method="post" action="" id="token_form">
-    {% csrf_token %}
-    <p>{{ form.action.errors }}<label for="{{ form.action.name }}">{{ form.action.label }}</label>
-    {% for c in form.action %}
-        {{ c }}
-    {% endfor %}
-    </p>
-    <p>{{ form.token_type.errors }}<label for="{{ form.token_type.name }}">{{ form.token_type.label }}</label>
-    {% for c in form.token_type %}
-        {{ c }}
-    {% endfor %}
-    </p>
-    {{ form.tokens }}
-    <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
-</form>
-</p>
-<p>
-<table>
-    <thead>
+  </ul>
+  <hr>
+  <h3>{% trans %}Tokens{% endtrans %}</h3>
+  <p>
+    <form method="post" action="" id="token_form">
+      {% csrf_token %}
+      <p>{{ form.action.errors }}<label for="{{ form.action.name }}">{{ form.action.label }}</label>
+        {% for c in form.action %}
+          {{ c }}
+        {% endfor %}
+      </p>
+      <p>{{ form.token_type.errors }}<label for="{{ form.token_type.name }}">{{ form.token_type.label }}</label>
+        {% for c in form.token_type %}
+          {{ c }}
+        {% endfor %}
+      </p>
+      {{ form.tokens }}
+      <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
+    </form>
+  </p>
+  <p>
+    <table>
+      <thead>
         <tr>
-            <td>{% trans %}Type{% endtrans %}</td>
-            <td>{% trans %}Name{% endtrans %}</td>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Since{% endtrans %}</td>
+          <td>{% trans %}Type{% endtrans %}</td>
+          <td>{% trans %}Name{% endtrans %}</td>
+          <td>{% trans %}User{% endtrans %}</td>
+          <td>{% trans %}Since{% endtrans %}</td>
         </tr>
-    </thead>
-    <tbody>
-    {% for t in launderette.tokens.all() %}
-        <tr>
+      </thead>
+      <tbody>
+        {% for t in launderette.tokens.all() %}
+          <tr>
             <td>{{ t.get_type_display() }}</td>
             <td>{{ t.name }}</td>
             {% if t.user %}
-            <td>{{ t.user.get_display_name() }}</td>
-            <td>{{ t.borrow_date|date(DATETIME_FORMAT) }} - {{ t.borrow_date|time(DATETIME_FORMAT) }}</td>
+              <td>{{ t.user.get_display_name() }}</td>
+              <td>{{ t.borrow_date|date(DATETIME_FORMAT) }} - {{ t.borrow_date|time(DATETIME_FORMAT) }}</td>
             {% else %}
-            <td></td>
-            <td></td>
+              <td></td>
+              <td></td>
             {% endif %}
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
-</p>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </p>
 {% endblock %}
 
 
diff --git a/launderette/templates/launderette/launderette_book.jinja b/launderette/templates/launderette/launderette_book.jinja
index 5f3e9bc27..ee5e26256 100644
--- a/launderette/templates/launderette/launderette_book.jinja
+++ b/launderette/templates/launderette/launderette_book.jinja
@@ -2,57 +2,57 @@
 {% from "core/macros.jinja" import show_slots, show_tokens %}
 
 {% block title %}
-{% trans %}Launderette{% endtrans %}
+  {% trans %}Launderette{% endtrans %}
 {% endblock %}
 
 {% macro choose(date) %}
-<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
+  <form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
     {% csrf_token %}
     <input type="hidden" name="slot_type" value="{{ slot_type }}">
     <button type="submit" name="slot" value="{{ date.isoformat() }}">{% trans %}Choose{% endtrans %}</button>
-</form>
+  </form>
 {% endmacro %}
 
 
 {% block content %}
-<h3>{{ launderette }}</h3>
-<p>
-<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}"
-                    class="inline" style="display:inline">
-    {% csrf_token %}
-    <button type="submit" name="slot_type" value="BOTH" {% if slot_type == "BOTH" -%}style="background: #FF0"{% endif %}>{% trans %}Washing and drying{% endtrans %}</button>
-</form>
-<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
-    {% csrf_token %}
-    <button type="submit" name="slot_type" value="WASHING" {% if slot_type == "WASHING" -%}style="background: #FF0"{% endif %}>{% trans %}Washing{% endtrans %}</button>
-</form>
-<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
-    {% csrf_token %}
-    <button type="submit" name="slot_type" value="DRYING" {% if slot_type == "DRYING" -%}style="background: #FF0"{% endif %}>{% trans %}Drying{% endtrans %}</button>
-</form>
-</p>
-<table>
+  <h3>{{ launderette }}</h3>
+  <p>
+    <form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}"
+          class="inline" style="display:inline">
+      {% csrf_token %}
+      <button type="submit" name="slot_type" value="BOTH" {% if slot_type == "BOTH" -%}style="background: #FF0"{% endif %}>{% trans %}Washing and drying{% endtrans %}</button>
+    </form>
+    <form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
+      {% csrf_token %}
+      <button type="submit" name="slot_type" value="WASHING" {% if slot_type == "WASHING" -%}style="background: #FF0"{% endif %}>{% trans %}Washing{% endtrans %}</button>
+    </form>
+    <form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
+      {% csrf_token %}
+      <button type="submit" name="slot_type" value="DRYING" {% if slot_type == "DRYING" -%}style="background: #FF0"{% endif %}>{% trans %}Drying{% endtrans %}</button>
+    </form>
+  </p>
+  <table>
     <thead>
-        <tr>
-            {% for day in planning.keys() %}
-            <th>{{ day|date('l') }}</th>
-            {% endfor %}
-        </tr>
+      <tr>
+        {% for day in planning.keys() %}
+          <th>{{ day|date('l') }}</th>
+        {% endfor %}
+      </tr>
     </thead>
     <tbody>
-        {% for i in range(0, 24) %}
+      {% for i in range(0, 24) %}
         <tr>
-            {% for hours in planning.values() %}
+          {% for hours in planning.values() %}
             <td>
-                {% if hours[i] %}
+              {% if hours[i] %}
                 {{ hours[i]|time(TIME_FORMAT) }} {{ choose(hours[i]) }}
-                {% endif %}
+              {% endif %}
             </td>
-            {% endfor %}
+          {% endfor %}
         </tr>
-        {% endfor %}
+      {% endfor %}
     </tbody>
-</table>
-{{ show_slots(user) }}
-{{ show_tokens(user) }}
+  </table>
+  {{ show_slots(user) }}
+  {{ show_tokens(user) }}
 {% endblock %}
diff --git a/launderette/templates/launderette/launderette_book_choose.jinja b/launderette/templates/launderette/launderette_book_choose.jinja
index d80505b42..403400962 100644
--- a/launderette/templates/launderette/launderette_book_choose.jinja
+++ b/launderette/templates/launderette/launderette_book_choose.jinja
@@ -1,17 +1,17 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Launderette{% endtrans %}
+  {% trans %}Launderette{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if request.user.is_subscribed %}
-<ul>
-    {% for l in launderette_list  %}
-    <li><a href="{{ url('launderette:book_slot', launderette_id=l.id) }}">{{ l }}</a></li>
-    {% endfor %}
-</ul>
-{% endif %}
+  {% if request.user.is_subscribed %}
+    <ul>
+      {% for l in launderette_list  %}
+        <li><a href="{{ url('launderette:book_slot', launderette_id=l.id) }}">{{ l }}</a></li>
+      {% endfor %}
+    </ul>
+  {% endif %}
 {% endblock %}
 
 
diff --git a/launderette/templates/launderette/launderette_click.jinja b/launderette/templates/launderette/launderette_click.jinja
index 8709648c0..682d00387 100644
--- a/launderette/templates/launderette/launderette_click.jinja
+++ b/launderette/templates/launderette/launderette_click.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{{ counter }}
+  {{ counter }}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}</h3>
-    <div>
-        <form method="post" action="" class="inline" style="display:inline">
-            {% csrf_token %}
-            {{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
-        </form>
-    </div>
+  <h3>{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}</h3>
+  <div>
+    <form method="post" action="" class="inline" style="display:inline">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
+    </form>
+  </div>
 {% endblock %}
diff --git a/launderette/templates/launderette/launderette_list.jinja b/launderette/templates/launderette/launderette_list.jinja
index 4eadff316..c28ee86d0 100644
--- a/launderette/templates/launderette/launderette_list.jinja
+++ b/launderette/templates/launderette/launderette_list.jinja
@@ -1,24 +1,24 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Launderette admin list{% endtrans %}
+  {% trans %}Launderette admin list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if user.is_root %}
-<p><a href="{{ url('launderette:launderette_new') }}">{% trans %}New launderette{% endtrans %}</a></p>
-{% endif %}
-{% if launderette_list %}
-<h3>{% trans %}Launderette admin list{% endtrans %}</h3>
-<ul>
-    {% for l in launderette_list  %}
-    <li><a href="{{ url('launderette:launderette_admin', launderette_id=l.id) }}">{{ l }}</a> -
-        <a href="{{ url('launderette:launderette_edit', launderette_id=l.id) }}">{% trans %}Edit{% endtrans %}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no launderette in this website.{% endtrans %}
-{% endif %}
+  {% if user.is_root %}
+    <p><a href="{{ url('launderette:launderette_new') }}">{% trans %}New launderette{% endtrans %}</a></p>
+  {% endif %}
+  {% if launderette_list %}
+    <h3>{% trans %}Launderette admin list{% endtrans %}</h3>
+    <ul>
+      {% for l in launderette_list  %}
+        <li><a href="{{ url('launderette:launderette_admin', launderette_id=l.id) }}">{{ l }}</a> -
+          <a href="{{ url('launderette:launderette_edit', launderette_id=l.id) }}">{% trans %}Edit{% endtrans %}</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no launderette in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 
diff --git a/launderette/templates/launderette/launderette_main.jinja b/launderette/templates/launderette/launderette_main.jinja
index c205023ec..1a554674e 100644
--- a/launderette/templates/launderette/launderette_main.jinja
+++ b/launderette/templates/launderette/launderette_main.jinja
@@ -1,18 +1,18 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Launderette{% endtrans %}
+  {% trans %}Launderette{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if request.user.can_edit(page) %}
-<p><a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">{% trans %}Edit presentation page{% endtrans %}</a></p>
-{% endif %}
-{% if request.user.is_subscribed %}
-<p><a href="{{ url('launderette:book_main') }}">{% trans %}Book launderette slot{% endtrans %}</a></p>
-{% endif %}
-
-{{ page.revisions.last().content|markdown }}
+  {% if request.user.can_edit(page) %}
+    <p><a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">{% trans %}Edit presentation page{% endtrans %}</a></p>
+  {% endif %}
+  {% if request.user.is_subscribed %}
+    <p><a href="{{ url('launderette:book_main') }}">{% trans %}Book launderette slot{% endtrans %}</a></p>
+  {% endif %}
+
+  {{ page.revisions.last().content|markdown }}
 {% endblock %}
 
 
diff --git a/matmat/templates/matmat/search_form.jinja b/matmat/templates/matmat/search_form.jinja
index 9a2eb1494..fe607bb65 100644
--- a/matmat/templates/matmat/search_form.jinja
+++ b/matmat/templates/matmat/search_form.jinja
@@ -2,62 +2,62 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Search user{% endtrans %}
+  {% trans %}Search user{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if result_exists %}
-<h2>{% trans %}Results{% endtrans %}</h2>
-<div class="matmat_results">
-{% for user in object_list %}
-    <div class="matmat_user">
-        <a href="{{ url("core:user_profile", user_id=user.id) }}">
+  {% if result_exists %}
+    <h2>{% trans %}Results{% endtrans %}</h2>
+    <div class="matmat_results">
+      {% for user in object_list %}
+        <div class="matmat_user">
+          <a href="{{ url("core:user_profile", user_id=user.id) }}">
             {{ user_mini_profile(user) }}
-        </a>
-    </div>
+          </a>
+        </div>
 
-{% endfor %}
-</div>
-{{ paginate(page_obj, paginator) }}
-<hr>
-{% endif %}
-<h2>{% trans %}Search user{% endtrans %}</h2>
-<h3>{% trans %}Search by profile{% endtrans %}</h3>
-<form action="{{ url('matmat:search') }}" method="post" enctype="multipart/form-data">
+      {% endfor %}
+    </div>
+    {{ paginate(page_obj, paginator) }}
+    <hr>
+  {% endif %}
+  <h2>{% trans %}Search user{% endtrans %}</h2>
+  <h3>{% trans %}Search by profile{% endtrans %}</h3>
+  <form action="{{ url('matmat:search') }}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {% for field in form %}
-    {% if field.name not in ('phone', 'quick') %}
-    <p>
-    {{ field.errors }}
-    <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-    {{ field }}
-    </p>
-    {% endif %}
+      {% if field.name not in ('phone', 'quick') %}
+        <p>
+          {{ field.errors }}
+          <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+          {{ field }}
+        </p>
+      {% endif %}
     {% endfor %}
     <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
-</form>
-<h3>{% trans %}Inverted search{% endtrans %}</h3>
-<form action="{{ url('matmat:search_reverse') }}" method="post" enctype="multipart/form-data">
+  </form>
+  <h3>{% trans %}Inverted search{% endtrans %}</h3>
+  <form action="{{ url('matmat:search_reverse') }}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <p>
-    {{ form.phone.errors }}
-    <label for="{{ form.phone.id_for_label }}">{{ form.phone.label }}</label>
-    {{ form.phone }}
-    <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
+      {{ form.phone.errors }}
+      <label for="{{ form.phone.id_for_label }}">{{ form.phone.label }}</label>
+      {{ form.phone }}
+      <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
     </p>
-</form>
-<h3>{% trans %}Quick search{% endtrans %}</h3>
-<form action="{{ url('matmat:search_quick') }}" method="post">
+  </form>
+  <h3>{% trans %}Quick search{% endtrans %}</h3>
+  <form action="{{ url('matmat:search_quick') }}" method="post">
     {% csrf_token %}
     <p>
-        {{ form.quick.errors }}
-        <label for="{{ form.quick.id_for_label }}">{{ form.quick.label }}</label>
-        {{ form.quick }}
-        <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
+      {{ form.quick.errors }}
+      <label for="{{ form.quick.id_for_label }}">{{ form.quick.label }}</label>
+      {{ form.quick }}
+      <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
     </p>
-</form>
+  </form>
 {% endblock %}
 
 {% block script %}
-{{ super() }}
+  {{ super() }}
 {% endblock %}
diff --git a/pedagogy/templates/pedagogy/guide.jinja b/pedagogy/templates/pedagogy/guide.jinja
index 130122409..a726444fc 100644
--- a/pedagogy/templates/pedagogy/guide.jinja
+++ b/pedagogy/templates/pedagogy/guide.jinja
@@ -2,139 +2,139 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}UV Guide{% endtrans %}
+  {% trans %}UV Guide{% endtrans %}
 {% endblock %}
 
 {% block additional_js %}
-    <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
+  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block head %}
-    {{ super() }}
-    <meta name="viewport" content="width=device-width, initial-scale=0.6, maximum-scale=2">
+  {{ super() }}
+  <meta name="viewport" content="width=device-width, initial-scale=0.6, maximum-scale=2">
 {% endblock head %}
 
 {% block content %}
-{% if can_create_uv %}
-<div class="action-bar">
-    <p>
+  {% if can_create_uv %}
+    <div class="action-bar">
+      <p>
         <a href="{{ url('pedagogy:uv_create') }}">{% trans %}Create UV{% endtrans %}</a>
-    </p>
-    <p>
+      </p>
+      <p>
         <a href="{{ url('pedagogy:moderation') }}">{% trans %}Moderate comments{% endtrans %}</a>
-    </p>
+      </p>
+    </div>
+    <br/>
+  {% endif %}
+  <div class="pedagogy" x-data="uv_search" x-cloak>
+    <form id="search_form">
+      <div class="search-form-container">
+        <div class="search-bar">
+          <input
+            id="search_input"
+            class="search-bar-input"
+            type="text"
+            name="search"
+            x-model.debounce.500ms="search"
+          />
+        </div>
+        <div class="radio-department">
+          <div class="radio-guide">
+            {% for (display_name, real_name) in [
+            ("EDIM", "EDIM"), ("ENERGIE", "EE"), ("IMSI", "IMSI"),
+            ("INFO", "GI"), ("GMC", "MC"), ("HUMA", "HUMA"), ("TC", "TC")
+            ] %}
+            <input
+              type="checkbox"
+              name="department"
+              id="radio{{ real_name }}"
+              value="{{ real_name }}"
+              x-model="department"
+            />
+            <label for="radio{{ real_name }}">{% trans %}{{ display_name }}{% endtrans %}</label>
+{% endfor %}
+</div>
+</div>
+<div class="radio-credit-type">
+  <div class="radio-guide">
+    {% for credit_type in ["CS", "TM", "EC", "QC", "OM"] %}
+      <input
+        type="checkbox"
+        name="credit_type"
+        id="radio{{ credit_type }}"
+        value="{{ credit_type }}"
+        x-model="credit_type"
+      />
+      <label for="radio{{ credit_type }}">{% trans %}{{ credit_type }}{% endtrans %}</label>
+    {% endfor %}
+  </div>
 </div>
-<br/>
-{% endif %}
-<div class="pedagogy" x-data="uv_search" x-cloak>
-	<form id="search_form">
-		<div class="search-form-container">
-			<div class="search-bar">
-				<input
-                    id="search_input"
-                    class="search-bar-input"
-                    type="text"
-                    name="search"
-                    x-model.debounce.500ms="search"
-                />
-			</div>
-			<div class="radio-department">
-				<div class="radio-guide">
-					{% for (display_name, real_name) in [
-					    ("EDIM", "EDIM"), ("ENERGIE", "EE"), ("IMSI", "IMSI"),
-					    ("INFO", "GI"), ("GMC", "MC"), ("HUMA", "HUMA"), ("TC", "TC")
-					] %}
-						<input
-                            type="checkbox"
-                            name="department"
-                            id="radio{{ real_name }}"
-                            value="{{ real_name }}"
-                            x-model="department"
-                        />
-                        <label for="radio{{ real_name }}">{% trans %}{{ display_name }}{% endtrans %}</label>
-					{% endfor %}
-				</div>
-			</div>
-			<div class="radio-credit-type">
-				<div class="radio-guide">
-					{% for credit_type in ["CS", "TM", "EC", "QC", "OM"] %}
-						<input
-                            type="checkbox"
-                            name="credit_type"
-                            id="radio{{ credit_type }}"
-                            value="{{ credit_type }}"
-                            x-model="credit_type"
-                        />
-                        <label for="radio{{ credit_type }}">{% trans %}{{ credit_type }}{% endtrans %}</label>
-					{% endfor %}
-				</div>
-			</div>
 
-			<div class="radio-semester">
-				<div class="radio-guide">
-					<input type="checkbox" name="semester" id="radioAUTUMN" value="AUTUMN" x-model="semester"/>
-                    <label for="radioAUTUMN"><i class="fa fa-leaf"></i></label>
-					<input type="checkbox" name="semester" id="radioSPRING" value="SPRING" x-model="semester"/>
-                    <label for="radioSPRING"><i class="fa fa-sun-o"></i></label>
-				</div>
-			</div>
-		</div>
-	</form>
-	<table id="dynamic_view">
-		<thead>
-			<tr>
-				<td>{% trans %}UV{% endtrans %}</td>
-				<td>{% trans %}Title{% endtrans %}</td>
-				<td>{% trans %}Department{% endtrans %}</td>
-				<td>{% trans %}Credit type{% endtrans %}</td>
-				<td><i class="fa fa-leaf"></i></td>
-				<td><i class="fa fa-sun-o"></i></td>
-				{% if can_create_uv %}
-                    <td>{% trans %}Edit{% endtrans %}</td>
-                    <td>{% trans %}Delete{% endtrans %}</td>
-				{% endif %}
-			</tr>
-		</thead>
-		<tbody id="dynamic_view_content">
-            <template x-for="uv in uvs.results" :key="uv.id">
-                <tr @click="window.location.href = `/pedagogy/uv/${uv.id}`">
-                    <td><a :href="`/pedagogy/uv/${uv.id}`" x-text="uv.code"></a></td>
-                    <td x-text="uv.title"></td>
-                    <td x-text="uv.department"></td>
-                    <td x-text="uv.credit_type"></td>
-                    <td><i :class="uv.semester.includes('AUTUMN') && 'fa fa-leaf'"></i></td>
-                    <td><i :class="uv.semester.includes('SPRING') && 'fa fa-sun-o'"></i></td>
-                    {% if can_create_uv -%}
-                        <td><a :href="`/pedagogy/uv/${uv.id}/edit`">{% trans %}Edit{% endtrans %}</a></td>
-                        <td><a :href="`/pedagogy/uv/${uv.id}/delete`">{% trans %}Delete{% endtrans %}</a></td>
-                    {%- endif -%}
-                </tr>
-            </template>
-		</tbody>
-	</table>
-    <nav id="pagination" class="hidden" :style="max_page() == 0 && 'display: none;'">
-        <button @click="page--" :disabled="page == 1">{% trans %}Previous{% endtrans %}</button>
-        <template x-for="i in max_page()">
-            <button x-text="i" @click="page = i" :class="i == page && 'active'"></button>
-        </template>
-        <button @click="page++" :disabled="page == max_page()">{% trans %}Next{% endtrans %}</button>
-    </nav>
+<div class="radio-semester">
+  <div class="radio-guide">
+    <input type="checkbox" name="semester" id="radioAUTUMN" value="AUTUMN" x-model="semester"/>
+    <label for="radioAUTUMN"><i class="fa fa-leaf"></i></label>
+    <input type="checkbox" name="semester" id="radioSPRING" value="SPRING" x-model="semester"/>
+    <label for="radioSPRING"><i class="fa fa-sun-o"></i></label>
+  </div>
+</div>
+</div>
+</form>
+<table id="dynamic_view">
+  <thead>
+    <tr>
+      <td>{% trans %}UV{% endtrans %}</td>
+      <td>{% trans %}Title{% endtrans %}</td>
+      <td>{% trans %}Department{% endtrans %}</td>
+      <td>{% trans %}Credit type{% endtrans %}</td>
+      <td><i class="fa fa-leaf"></i></td>
+      <td><i class="fa fa-sun-o"></i></td>
+      {% if can_create_uv %}
+        <td>{% trans %}Edit{% endtrans %}</td>
+        <td>{% trans %}Delete{% endtrans %}</td>
+      {% endif %}
+    </tr>
+  </thead>
+  <tbody id="dynamic_view_content">
+    <template x-for="uv in uvs.results" :key="uv.id">
+      <tr @click="window.location.href = `/pedagogy/uv/${uv.id}`">
+        <td><a :href="`/pedagogy/uv/${uv.id}`" x-text="uv.code"></a></td>
+        <td x-text="uv.title"></td>
+        <td x-text="uv.department"></td>
+        <td x-text="uv.credit_type"></td>
+        <td><i :class="uv.semester.includes('AUTUMN') && 'fa fa-leaf'"></i></td>
+        <td><i :class="uv.semester.includes('SPRING') && 'fa fa-sun-o'"></i></td>
+        {% if can_create_uv -%}
+          <td><a :href="`/pedagogy/uv/${uv.id}/edit`">{% trans %}Edit{% endtrans %}</a></td>
+          <td><a :href="`/pedagogy/uv/${uv.id}/delete`">{% trans %}Delete{% endtrans %}</a></td>
+        {%- endif -%}
+      </tr>
+    </template>
+  </tbody>
+</table>
+<nav id="pagination" class="hidden" :style="max_page() == 0 && 'display: none;'">
+  <button @click="page--" :disabled="page == 1">{% trans %}Previous{% endtrans %}</button>
+  <template x-for="i in max_page()">
+    <button x-text="i" @click="page = i" :class="i == page && 'active'"></button>
+  </template>
+  <button @click="page++" :disabled="page == max_page()">{% trans %}Next{% endtrans %}</button>
+</nav>
 </div>
 <script>
-    const initialUrlParams = new URLSearchParams(window.location.search);
+  const initialUrlParams = new URLSearchParams(window.location.search);
 
-    function update_query_string(key, value) {
-        const url = new URL(window.location.href);
-        if (!value) {
-            url.searchParams.delete(key)
-        } else if (Array.isArray(value)) {
-            url.searchParams.delete(key)
-            value.forEach((v) => url.searchParams.append(key, v))
-        } else {
-            url.searchParams.set(key, value);
-        }
-        history.pushState(null, document.title, url.toString());
+  function update_query_string(key, value) {
+    const url = new URL(window.location.href);
+    if (!value) {
+      url.searchParams.delete(key)
+    } else if (Array.isArray(value)) {
+      url.searchParams.delete(key)
+      value.forEach((v) => url.searchParams.append(key, v))
+    } else {
+      url.searchParams.set(key, value);
     }
+    history.pushState(null, document.title, url.toString());
+  }
 
     {#
     How does this work :
@@ -145,50 +145,50 @@
     then fetch the corresponding data from the API.
     This data will then be displayed on the result part of the page.
     #}
-    const page_default = 1;
-    const page_size_default = 100;
-    document.addEventListener("alpine:init", () => {
-        Alpine.data("uv_search", () => ({
-            uvs: [],
-            page: initialUrlParams.get("page") || page_default,
-            page_size: initialUrlParams.get("page_size") || page_size_default,
-            search: initialUrlParams.get("search") || "",
-            department: initialUrlParams.getAll("department"),
-            credit_type: initialUrlParams.getAll("credit_type"),
+  const page_default = 1;
+  const page_size_default = 100;
+  document.addEventListener("alpine:init", () => {
+    Alpine.data("uv_search", () => ({
+      uvs: [],
+      page: initialUrlParams.get("page") || page_default,
+      page_size: initialUrlParams.get("page_size") || page_size_default,
+      search: initialUrlParams.get("search") || "",
+      department: initialUrlParams.getAll("department"),
+      credit_type: initialUrlParams.getAll("credit_type"),
             {# The semester is easier to use on the backend as an enum (spring/autumn/both/none)
             and easier to use on the frontend as an array ([spring, autumn]).
             Thus there is some conversion involved when both communicate together #}
-            semester: initialUrlParams.has("semester") ?
-                initialUrlParams.get("semester").split("_AND_") : [],
+      semester: initialUrlParams.has("semester") ?
+      initialUrlParams.get("semester").split("_AND_") : [],
 
-            async init() {
-                let search_params = ["search", "department", "credit_type", "semester"];
-                let pagination_params = ["semester", "page"];
-                search_params.forEach((param) => {
-                    this.$watch(param, async () => {
+      async init() {
+        let search_params = ["search", "department", "credit_type", "semester"];
+        let pagination_params = ["semester", "page"];
+        search_params.forEach((param) => {
+          this.$watch(param, async () => {
                         {# Reset pagination on search #}
-                        this.page = page_default;
-                        this.page_size = page_size_default;
-                    });
-                });
-                search_params.concat(pagination_params).forEach((param) => {
-                    this.$watch(param, async (value) => {
-                        update_query_string(param, value);
-                        await this.fetch_data();  {# reload data on form change #}
-                    });
-                });
-                await this.fetch_data();  {# load initial data #}
-            },
+            this.page = page_default;
+            this.page_size = page_size_default;
+          });
+        });
+        search_params.concat(pagination_params).forEach((param) => {
+          this.$watch(param, async (value) => {
+            update_query_string(param, value);
+            await this.fetch_data();  {# reload data on form change #}
+          });
+        });
+        await this.fetch_data();  {# load initial data #}
+      },
 
-            async fetch_data() {
-                const url = "{{ url("api:fetch_uvs") }}" + window.location.search;
-                this.uvs = await (await fetch(url)).json();
-            },
+      async fetch_data() {
+        const url = "{{ url("api:fetch_uvs") }}" + window.location.search;
+        this.uvs = await (await fetch(url)).json();
+      },
 
-            max_page() {
-                return Math.round(this.uvs.count / this.page_size);
-            }
-        }))
-    })
+      max_page() {
+        return Math.round(this.uvs.count / this.page_size);
+      }
+    }))
+  })
 </script>
 {% endblock content %}
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/macros.jinja b/pedagogy/templates/pedagogy/macros.jinja
index ea1874e87..c853ee156 100644
--- a/pedagogy/templates/pedagogy/macros.jinja
+++ b/pedagogy/templates/pedagogy/macros.jinja
@@ -1,16 +1,16 @@
 {% macro display_star(grade) -%}
 
-    {% if grade >= 0 %}
-        {% for i in range(5) %}
-            {% if i <= grade %}
-                <span class="fa fa-star pedagogy star-checked grade-with-star"></span>
-            {% else %}
-                <span class="fa fa-star pedagogy star-not-checked grade-with-star"></span>
-            {% endif %}
-        {% endfor %}
-        <span class="pedagogy grade-without-star">{{ grade }}/5</span>
-    {% else %}
-        <span class="grade-text"> {% trans %} not rated {% endtrans %} </span>
-    {% endif %}
+  {% if grade >= 0 %}
+    {% for i in range(5) %}
+      {% if i <= grade %}
+        <span class="fa fa-star pedagogy star-checked grade-with-star"></span>
+      {% else %}
+        <span class="fa fa-star pedagogy star-not-checked grade-with-star"></span>
+      {% endif %}
+    {% endfor %}
+    <span class="pedagogy grade-without-star">{{ grade }}/5</span>
+  {% else %}
+    <span class="grade-text"> {% trans %} not rated {% endtrans %} </span>
+  {% endif %}
 
 {%- endmacro %}
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/moderation.jinja b/pedagogy/templates/pedagogy/moderation.jinja
index 95367858e..501ceda9d 100644
--- a/pedagogy/templates/pedagogy/moderation.jinja
+++ b/pedagogy/templates/pedagogy/moderation.jinja
@@ -1,37 +1,37 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}UV comment moderation{% endtrans %}
+  {% trans %}UV comment moderation{% endtrans %}
 {% endblock title %}
 
 {% block content %}
-{{ form.errors }}
-<table>
-	<thead>
-		<tr>
-			<td>{% trans %}UV{% endtrans %}</td>
-			<td>{% trans %}Comment{% endtrans %}</td>
-			<td>{% trans %}Reason{% endtrans %}</td>
-			<td>{% trans %}Action{% endtrans %}</td>
-		</tr>
-	</thead>
-	<tbody>
-		{% set queryset = form.accepted_reports.field.queryset %}
-		{% for widget in form.accepted_reports.subwidgets %}
-		{% set report = queryset.get(id=widget.data.value.value) %}
-		<form action="{{ url('pedagogy:moderation') }}" method="post" enctype="multipart/form-data">
-			{% csrf_token %}
-			<tr>
-				<td><a href="{{ url('pedagogy:uv_detail', uv_id=report.comment.uv.id) }}#{{ report.comment.uv.id }}">{{ report.comment.uv }}</a></td>
-				<td>{{ report.comment.comment|markdown }}</td>
-				<td>{{ report.reason|markdown }}</td>
-				<td>
-					<button name="accepted_reports" type="submit" value="{{ report.id }}">{% trans %}Delete comment{% endtrans %}</button>
-					<button name="denied_reports" type="submit" value="{{ report.id }}">{% trans %}Delete report{% endtrans %}</button>
-				</td>
-			</tr>
-		</form>
-		{% endfor %}
-	</tbody>
-</table>
+  {{ form.errors }}
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}UV{% endtrans %}</td>
+        <td>{% trans %}Comment{% endtrans %}</td>
+        <td>{% trans %}Reason{% endtrans %}</td>
+        <td>{% trans %}Action{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% set queryset = form.accepted_reports.field.queryset %}
+      {% for widget in form.accepted_reports.subwidgets %}
+        {% set report = queryset.get(id=widget.data.value.value) %}
+        <form action="{{ url('pedagogy:moderation') }}" method="post" enctype="multipart/form-data">
+          {% csrf_token %}
+          <tr>
+            <td><a href="{{ url('pedagogy:uv_detail', uv_id=report.comment.uv.id) }}#{{ report.comment.uv.id }}">{{ report.comment.uv }}</a></td>
+            <td>{{ report.comment.comment|markdown }}</td>
+            <td>{{ report.reason|markdown }}</td>
+            <td>
+              <button name="accepted_reports" type="submit" value="{{ report.id }}">{% trans %}Delete comment{% endtrans %}</button>
+              <button name="denied_reports" type="submit" value="{{ report.id }}">{% trans %}Delete report{% endtrans %}</button>
+            </td>
+          </tr>
+        </form>
+      {% endfor %}
+    </tbody>
+  </table>
 {% endblock content %}
diff --git a/pedagogy/templates/pedagogy/starlist.jinja b/pedagogy/templates/pedagogy/starlist.jinja
index dddadae01..02379e038 100644
--- a/pedagogy/templates/pedagogy/starlist.jinja
+++ b/pedagogy/templates/pedagogy/starlist.jinja
@@ -1,58 +1,58 @@
 <div>
-    <style>
-        .checked {
-            color : orange;
-        }
-        .unchecked {
-            color : gray;
-        }
-        .star input[type="radio"] {
-            display : none;
-        }
-        .star {
-            display: inline;
-        }
+  <style>
+    .checked {
+      color : orange;
+    }
+    .unchecked {
+      color : gray;
+    }
+    .star input[type="radio"] {
+      display : none;
+    }
+    .star {
+      display: inline;
+    }
 
-    </style>
+  </style>
 
     {# Do not vote button #}
-    <label class="star">
-        <input type="radio" name="{{ widget.name }}" value="-1" onclick='
-            var stars = document.getElementsByClassName("{{ widget.name }}");
-            for (var i = 0; i < stars.length; i++){
-                var attrs = stars[i].getAttribute("class");
-                attrs = attrs.replace("unchecked", "");
-                attrs = attrs.replace("checked", "");
-                stars[i].setAttribute("class", attrs + " unchecked");
-            }
-        ' checked>
-        <span class="fa fa-times-circle"> {{ translations.do_not_vote }}</span>
-    </label>
+  <label class="star">
+    <input type="radio" name="{{ widget.name }}" value="-1" onclick='
+                                                                     var stars = document.getElementsByClassName("{{ widget.name }}");
+                                                                     for (var i = 0; i < stars.length; i++){
+                                                                     var attrs = stars[i].getAttribute("class");
+                                                                     attrs = attrs.replace("unchecked", "");
+                                                                     attrs = attrs.replace("checked", "");
+                                                                     stars[i].setAttribute("class", attrs + " unchecked");
+                                                                     }
+                                                                    ' checked>
+    <span class="fa fa-times-circle"> {{ translations.do_not_vote }}</span>
+  </label>
 
     {# Star widget #}
-    {% for i in number_of_stars %}
+  {% for i in number_of_stars %}
     <label class="star">
-        <input type="radio" name="{{ widget.name }}" value="{{ forloop.counter0 }}" onclick='
-            var stars = document.getElementsByClassName("{{ widget.name }}");
+      <input type="radio" name="{{ widget.name }}" value="{{ forloop.counter0 }}" onclick='
+                                                                                           var stars = document.getElementsByClassName("{{ widget.name }}");
 
-            for (var i = 0; i < stars.length; i++){
-                var attrs = stars[i].getAttribute("class");
-                attrs = attrs.replace("unchecked", "");
-                attrs = attrs.replace("checked", "");
-                if (i > {{ forloop.counter0 }}){
-                    stars[i].setAttribute("class", attrs + " unchecked");
-                } else {
-                    stars[i].setAttribute("class", attrs + " checked");
-                }
-            }
-        '>
-        <i class="{{ widget.name }} fa fa-star unchecked"></i>
+                                                                                           for (var i = 0; i < stars.length; i++){
+                                                                                           var attrs = stars[i].getAttribute("class");
+                                                                                           attrs = attrs.replace("unchecked", "");
+                                                                                           attrs = attrs.replace("checked", "");
+                                                                                           if (i > {{ forloop.counter0 }}){
+                                                                                           stars[i].setAttribute("class", attrs + " unchecked");
+                                                                                           } else {
+                                                                                           stars[i].setAttribute("class", attrs + " checked");
+                                                                                           }
+                                                                                           }
+                                                                                          '>
+      <i class="{{ widget.name }} fa fa-star unchecked"></i>
     </label>
-    {% endfor %}
+  {% endfor %}
 
     {# Restaure previous (-1 is default) #}
-    <script type="text/javascript">
-        document.querySelector("input[name='{{ widget.name }}'][value='{{ widget.value }}']").click()
-    </script>
+  <script type="text/javascript">
+    document.querySelector("input[name='{{ widget.name }}'][value='{{ widget.value }}']").click()
+  </script>
 
 </div>
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja
index de741b96a..bf45da0fc 100644
--- a/pedagogy/templates/pedagogy/uv_detail.jinja
+++ b/pedagogy/templates/pedagogy/uv_detail.jinja
@@ -3,223 +3,223 @@
 {% from "pedagogy/macros.jinja" import display_star %}
 
 {% block title %}
-{% trans %}UV Details{% endtrans %}
+  {% trans %}UV Details{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<div class="pedagogy">
-	<div id="uv_detail">
-		<p id="return_noscript"><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p>
-		<button id="return_js" onclick='(function(){
-			// If comes from the guide page, go back with history
-			if (document.referrer.replace(/\?(.+)/gm,"").endsWith(`{{ url("pedagogy:guide") }}`)){
-				window.history.back();
-				return;
-			}
-			// Simply goes to the guide page
-			window.location.href = `{{ url("pedagogy:guide") }}`;
-		})()' hidden>{% trans %}Back{% endtrans %}</button>
-
-		<h1>{{ object.code }} - {{ object.title }}</h1>
-		<br>
-		<div class="uv-quick-info-container">
-			<div class="hours-cm">
-				<b>{% trans %}CM: {% endtrans %}</b>{{ object.hours_CM }}
-			</div>
-			<div class="hours-td">
-				<b>{% trans %}TD: {% endtrans %}</b>{{ object.hours_TD }}
-			</div>
-			<div class="hours-tp">
-				<b>{% trans %}TP: {% endtrans %}</b>{{ object.hours_TP }}
-			</div>
-			<div class="hours-te">
-				<b>{% trans %}TE: {% endtrans %}</b>{{ object.hours_TE }}
-			</div>
-			<div class="hours-the">
-				<b>{% trans %}THE: {% endtrans %}</b>{{ object.hours_THE }}
-			</div>
-
-			<div class="department">
-				{{ object.department }}
-			</div>
-			<div class="credit-type">
-				{{ object.credit_type }}
-			</div>
-			<div class="semester">
-				{{ object.get_semester_display() }}
-			</div>
-		</div>
-
-		<br>
-
-		<div class="uv-details-container">
-			<div class="grade">
-				<p>{% trans %}Global grade{% endtrans %}</p>
-				<p>{% trans %}Utility{% endtrans %}</p>
-				<p>{% trans %}Interest{% endtrans %}</p>
-				<p>{% trans %}Teaching{% endtrans %}</p>
-				<p>{% trans %}Work load{% endtrans %}</p>
-			</div>
-			<div class="grade-stars">
-				<p>{{ display_star(object.grade_global_average) }}</p>
-				<p>{{ display_star(object.grade_utility_average) }}</p>
-				<p>{{ display_star(object.grade_interest_average) }}</p>
-				<p>{{ display_star(object.grade_teaching_average) }}</p>
-				<p>{{ display_star(object.grade_work_load_average) }}</p>
-			</div>
-			<div class="uv-infos">
-				<p><b>{% trans %}Objectives{% endtrans %}</b></p>
-				<p>{{ object.objectives|markdown }}</p>
-				<p><b>{% trans %}Program{% endtrans %}</b></p>
-				<p>{{ object.program|markdown }}</p>
-				<p><b>{% trans %}Earned skills{% endtrans %}</b></p>
-				<p>{{ object.skills|markdown }}</p>
-				<p><b>{% trans %}Key concepts{% endtrans %}</b></p>
-				<p>{{ object.key_concepts|markdown }}</p>
-				<p><b>{% trans %}UE manager: {% endtrans %}</b>{{ object.manager }}</p>
-			</div>
-		</div>
-
-		<br>
-		{% if object.has_user_already_commented(user) %}
-		<div id="leave_comment_not_allowed">
-		<p>{% trans %}You already posted a comment on this UV. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
-		</div>
-		{% else %}
-		<div id="leave_comment">
-			<h2>{% trans %}Leave comment{% endtrans %}</h2>
-			<div>
-				<form action="{{ url('pedagogy:uv_detail', uv_id=object.id) }}" method="post" enctype="multipart/form-data">
-					{% csrf_token %}
-					<div class="leave-comment-grid-container">
-						<div class="form-stars">
-							{{ form.author.errors }}
-							{{ form.uv.errors }}
-
-							{{ form.author }}
-							{{ form.uv }}
-
-							<div class="input-stars">
-								<label for="{{ form.grade_global.id_for_label }}">{{ form.grade_global.label }} :</label>
-								{{ form.grade_global.errors }}
-								{{ form.grade_global }}
-							</div>
-
-							<div class="input-stars">
-								<label for="{{ form.grade_utility.id_for_label }}">{{ form.grade_utility.label }} :</label>
-								{{ form.grade_utility.errors }}
-								{{ form.grade_utility }}
-							</div>
-
-							<div class="input-stars">
-								<label for="{{ form.grade_interest.id_for_label }}">{{ form.grade_interest.label }} :</label>
-								{{ form.grade_interest.errors }}
-								{{ form.grade_interest }}
-							</div>
-
-							<div class="input-stars">
-								<label for="{{ form.grade_teaching.id_for_label }}">{{ form.grade_teaching.label }} :</label>
-								{{ form.grade_teaching.errors }}
-								{{ form.grade_teaching }}
-							</div>
-
-							<div class="input-stars">
-								<label for="{{ form.grade_work_load.id_for_label }}">{{ form.grade_work_load.label }} :</label>
-								{{ form.grade_work_load.errors }}
-								{{ form.grade_work_load }}
-							</div>
-						</div>
-						<div class="form-comment">
-							<label for="{{ form.comment.id_for_label }}">{{ form.comment.label }} :</label>
-							{{ form.comment.errors }}
-							{{ form.comment }}
-						</div>
-					</div>
-					<p><input type="submit" value="{% trans %}Comment{% endtrans %}" /></p>
-				</form>
-			</div>
-		</div>
-		{% endif %}
-		<br>
-
-		{% if object.comments.exists() %}
-			<h2>{% trans %}Comments{% endtrans %}</h2>
-			{% for comment in object.comments.order_by("-publish_date").all() %}
-				<div id="{{ comment.id }}" class="comment-container">
-
-					<div class="grade-block">
-						<div class="grade-type">
-							<p>{% trans %}Global grade{% endtrans %}</p>
-							<p>{% trans %}Utility{% endtrans %}</p>
-							<p>{% trans %}Interest{% endtrans %}</p>
-							<p>{% trans %}Teaching{% endtrans %}</p>
-							<p>{% trans %}Work load{% endtrans %}</p>
-						</div>
-						<div class="grade-stars">
-							<p>{{ display_star(comment.grade_global) }}</p>
-							<p>{{ display_star(comment.grade_utility) }}</p>
-							<p>{{ display_star(comment.grade_interest) }}</p>
-							<p>{{ display_star(comment.grade_teaching) }}</p>
-							<p>{{ display_star(comment.grade_work_load) }}</p>
-						</div>
-						<div class="grade-extension"></div>
-					</div>
-
-					<div class="comment">
-						<div class="anchor">
-							<a href="{{ url('pedagogy:uv_detail', uv_id=uv.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
-						</div>
-						{{ comment.comment|markdown }}
-					</div>
-
-					<div class="info">
-						{% if comment.is_reported %}
-							<p class="status-reported">
-								{% trans %}This comment has been reported{% endtrans %}
-							</p>
-						{% endif %}
-
-						{% if user.is_owner(comment) %}
-							<p class="actions">
-									<a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a>
-									<a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a>
-							</p>
-						{% endif %}
-					</div>
-
-					<div class="comment-end-bar">
-						<div class="report"><p><a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report this comment{% endtrans %}</a></p></div>
-
-						<div class="date"><p>{{ comment.publish_date.strftime('%d/%m/%Y') }}</p></div>
-
-						<div class="author"><p>{{ user_profile_link(comment.author) }}</p></div>
-					</div>
-
-				</div>
-			{% endfor %}
-		{% endif %}
-
-	</div>
-</div>
-
-<script type="text/javascript">
-	$("#return_noscript").hide();
-	$("#return_js").show();
-	var icons = {
-		header: "fa fa-toggle-right",
-		activeHeader: "fa fa-toggle-down"
-	};
-	$(function(){
-		$("#leave_comment").accordion({
-			icons: icons,
-		    heightStyle: "content",
-		    active: false,
-		    collapsible: true
-		});
-	});
+  <div class="pedagogy">
+    <div id="uv_detail">
+      <p id="return_noscript"><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p>
+      <button id="return_js" onclick='(function(){
+                                      // If comes from the guide page, go back with history
+                                      if (document.referrer.replace(/\?(.+)/gm,"").endsWith(`{{ url("pedagogy:guide") }}`)){
+                                      window.history.back();
+                                      return;
+                                      }
+                                      // Simply goes to the guide page
+                                      window.location.href = `{{ url("pedagogy:guide") }}`;
+                                      })()' hidden>{% trans %}Back{% endtrans %}</button>
+
+      <h1>{{ object.code }} - {{ object.title }}</h1>
+      <br>
+      <div class="uv-quick-info-container">
+        <div class="hours-cm">
+          <b>{% trans %}CM: {% endtrans %}</b>{{ object.hours_CM }}
+        </div>
+        <div class="hours-td">
+          <b>{% trans %}TD: {% endtrans %}</b>{{ object.hours_TD }}
+        </div>
+        <div class="hours-tp">
+          <b>{% trans %}TP: {% endtrans %}</b>{{ object.hours_TP }}
+        </div>
+        <div class="hours-te">
+          <b>{% trans %}TE: {% endtrans %}</b>{{ object.hours_TE }}
+        </div>
+        <div class="hours-the">
+          <b>{% trans %}THE: {% endtrans %}</b>{{ object.hours_THE }}
+        </div>
+
+        <div class="department">
+          {{ object.department }}
+        </div>
+        <div class="credit-type">
+          {{ object.credit_type }}
+        </div>
+        <div class="semester">
+          {{ object.get_semester_display() }}
+        </div>
+      </div>
+
+      <br>
+
+      <div class="uv-details-container">
+        <div class="grade">
+          <p>{% trans %}Global grade{% endtrans %}</p>
+          <p>{% trans %}Utility{% endtrans %}</p>
+          <p>{% trans %}Interest{% endtrans %}</p>
+          <p>{% trans %}Teaching{% endtrans %}</p>
+          <p>{% trans %}Work load{% endtrans %}</p>
+        </div>
+        <div class="grade-stars">
+          <p>{{ display_star(object.grade_global_average) }}</p>
+          <p>{{ display_star(object.grade_utility_average) }}</p>
+          <p>{{ display_star(object.grade_interest_average) }}</p>
+          <p>{{ display_star(object.grade_teaching_average) }}</p>
+          <p>{{ display_star(object.grade_work_load_average) }}</p>
+        </div>
+        <div class="uv-infos">
+          <p><b>{% trans %}Objectives{% endtrans %}</b></p>
+          <p>{{ object.objectives|markdown }}</p>
+          <p><b>{% trans %}Program{% endtrans %}</b></p>
+          <p>{{ object.program|markdown }}</p>
+          <p><b>{% trans %}Earned skills{% endtrans %}</b></p>
+          <p>{{ object.skills|markdown }}</p>
+          <p><b>{% trans %}Key concepts{% endtrans %}</b></p>
+          <p>{{ object.key_concepts|markdown }}</p>
+          <p><b>{% trans %}UE manager: {% endtrans %}</b>{{ object.manager }}</p>
+        </div>
+      </div>
+
+      <br>
+      {% if object.has_user_already_commented(user) %}
+        <div id="leave_comment_not_allowed">
+          <p>{% trans %}You already posted a comment on this UV. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
+        </div>
+      {% else %}
+        <div id="leave_comment">
+          <h2>{% trans %}Leave comment{% endtrans %}</h2>
+          <div>
+            <form action="{{ url('pedagogy:uv_detail', uv_id=object.id) }}" method="post" enctype="multipart/form-data">
+              {% csrf_token %}
+              <div class="leave-comment-grid-container">
+                <div class="form-stars">
+                  {{ form.author.errors }}
+                  {{ form.uv.errors }}
+
+                  {{ form.author }}
+                  {{ form.uv }}
+
+                  <div class="input-stars">
+                    <label for="{{ form.grade_global.id_for_label }}">{{ form.grade_global.label }} :</label>
+                    {{ form.grade_global.errors }}
+                    {{ form.grade_global }}
+                  </div>
+
+                  <div class="input-stars">
+                    <label for="{{ form.grade_utility.id_for_label }}">{{ form.grade_utility.label }} :</label>
+                    {{ form.grade_utility.errors }}
+                    {{ form.grade_utility }}
+                  </div>
+
+                  <div class="input-stars">
+                    <label for="{{ form.grade_interest.id_for_label }}">{{ form.grade_interest.label }} :</label>
+                    {{ form.grade_interest.errors }}
+                    {{ form.grade_interest }}
+                  </div>
+
+                  <div class="input-stars">
+                    <label for="{{ form.grade_teaching.id_for_label }}">{{ form.grade_teaching.label }} :</label>
+                    {{ form.grade_teaching.errors }}
+                    {{ form.grade_teaching }}
+                  </div>
+
+                  <div class="input-stars">
+                    <label for="{{ form.grade_work_load.id_for_label }}">{{ form.grade_work_load.label }} :</label>
+                    {{ form.grade_work_load.errors }}
+                    {{ form.grade_work_load }}
+                  </div>
+                </div>
+                <div class="form-comment">
+                  <label for="{{ form.comment.id_for_label }}">{{ form.comment.label }} :</label>
+                  {{ form.comment.errors }}
+                  {{ form.comment }}
+                </div>
+              </div>
+              <p><input type="submit" value="{% trans %}Comment{% endtrans %}" /></p>
+            </form>
+          </div>
+        </div>
+      {% endif %}
+      <br>
+
+      {% if object.comments.exists() %}
+        <h2>{% trans %}Comments{% endtrans %}</h2>
+        {% for comment in object.comments.order_by("-publish_date").all() %}
+          <div id="{{ comment.id }}" class="comment-container">
+
+            <div class="grade-block">
+              <div class="grade-type">
+                <p>{% trans %}Global grade{% endtrans %}</p>
+                <p>{% trans %}Utility{% endtrans %}</p>
+                <p>{% trans %}Interest{% endtrans %}</p>
+                <p>{% trans %}Teaching{% endtrans %}</p>
+                <p>{% trans %}Work load{% endtrans %}</p>
+              </div>
+              <div class="grade-stars">
+                <p>{{ display_star(comment.grade_global) }}</p>
+                <p>{{ display_star(comment.grade_utility) }}</p>
+                <p>{{ display_star(comment.grade_interest) }}</p>
+                <p>{{ display_star(comment.grade_teaching) }}</p>
+                <p>{{ display_star(comment.grade_work_load) }}</p>
+              </div>
+              <div class="grade-extension"></div>
+            </div>
+
+            <div class="comment">
+              <div class="anchor">
+                <a href="{{ url('pedagogy:uv_detail', uv_id=uv.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
+              </div>
+              {{ comment.comment|markdown }}
+            </div>
+
+            <div class="info">
+              {% if comment.is_reported %}
+                <p class="status-reported">
+                  {% trans %}This comment has been reported{% endtrans %}
+                </p>
+              {% endif %}
+
+              {% if user.is_owner(comment) %}
+                <p class="actions">
+                  <a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a>
+                  <a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a>
+                </p>
+              {% endif %}
+            </div>
+
+            <div class="comment-end-bar">
+              <div class="report"><p><a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report this comment{% endtrans %}</a></p></div>
+
+              <div class="date"><p>{{ comment.publish_date.strftime('%d/%m/%Y') }}</p></div>
+
+              <div class="author"><p>{{ user_profile_link(comment.author) }}</p></div>
+            </div>
+
+          </div>
+        {% endfor %}
+      {% endif %}
+
+    </div>
+  </div>
+
+  <script type="text/javascript">
+    $("#return_noscript").hide();
+    $("#return_js").show();
+    var icons = {
+      header: "fa fa-toggle-right",
+      activeHeader: "fa fa-toggle-down"
+    };
+    $(function(){
+      $("#leave_comment").accordion({
+        icons: icons,
+        heightStyle: "content",
+        active: false,
+        collapsible: true
+      });
+    });
 	// Remove jquery-ui icons to make fontawesome work
-	$(document).ready(function(){
-		$(".ui-accordion-header-icon").first().removeClass("ui-icon");
-	});
-</script>
+    $(document).ready(function(){
+      $(".ui-accordion-header-icon").first().removeClass("ui-icon");
+    });
+  </script>
 {% endblock %}
diff --git a/pedagogy/templates/pedagogy/uv_edit.jinja b/pedagogy/templates/pedagogy/uv_edit.jinja
index 7a6b4b026..7ab54105b 100644
--- a/pedagogy/templates/pedagogy/uv_edit.jinja
+++ b/pedagogy/templates/pedagogy/uv_edit.jinja
@@ -1,88 +1,88 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Edit UE{% endtrans %}
+  {% trans %}Edit UE{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h2>{% trans %}Edit UE{% endtrans %}</h2>
-<form action="" method="post" enctype="multipart/form-data" id="uv_edit">
+  <h2>{% trans %}Edit UE{% endtrans %}</h2>
+  <form action="" method="post" enctype="multipart/form-data" id="uv_edit">
     {% csrf_token %}
     {{ form.non_field_errors() }}
 
     {% for field in form %}
 
-    {% if field.is_hidden %}
+      {% if field.is_hidden %}
 
         {{ field }}
 
-    {% else %}
-    <p>
-        {{ field.errors }}
-        <label for="{{ field.name }}">{{ field.label }}</label>
-        {{ field }}
+      {% else %}
+        <p>
+          {{ field.errors }}
+          <label for="{{ field.name }}">{{ field.label }}</label>
+          {{ field }}
 
 
-        {% if field.name == 'code' %}
-        <button type="button" id="autofill">{% trans %}Import from UTBM{% endtrans %}</button>
-        {% endif %}
-    </p>
-    {% endif %}
+          {% if field.name == 'code' %}
+            <button type="button" id="autofill">{% trans %}Import from UTBM{% endtrans %}</button>
+          {% endif %}
+        </p>
+      {% endif %}
 
 
     {% endfor %}
 
 
     <p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 {% block script %}
-{{ super() }}
+  {{ super() }}
 
-<script type="text/javascript">
+  <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function() {
-        const autofillBtn = document.getElementById('autofill')
-        const codeInput = document.querySelector('input[name="code"]')
-
-        autofillBtn.addEventListener('click', () => {
-            const today = new Date()
-            let year = today.getFullYear()
-            if (today.getMonth() < 7) {  // student year starts in september
-                year--
+      const autofillBtn = document.getElementById('autofill')
+      const codeInput = document.querySelector('input[name="code"]')
+
+      autofillBtn.addEventListener('click', () => {
+        const today = new Date()
+        let year = today.getFullYear()
+        if (today.getMonth() < 7) {  // student year starts in september
+          year--
+        }
+        const url = `/api/uv/${year}/${codeInput.value}`;
+        deleteQuickNotifs()
+
+        $.ajax({
+          dataType: "json",
+          url: url,
+          success: function(data, _, xhr) {
+            if (xhr.status !== 200) {
+              createQuickNotif("{% trans %}Unknown UE code{% endtrans %}")
+              return
             }
-            const url = `/api/uv/${year}/${codeInput.value}`;
-            deleteQuickNotifs()
-
-            $.ajax({
-                dataType: "json",
-                url: url,
-                success: function(data, _, xhr) {
-                    if (xhr.status !== 200) {
-                        createQuickNotif("{% trans %}Unknown UE code{% endtrans %}")
-                        return
-                    }
-                    Object.entries(data)
-                        .filter(([_, val]) => !!val)  // skip entries with null or undefined value
-                        .map(([key, val]) => {  // convert keys to DOM elements
-                            return [document.querySelector('[name="' + key + '"]'), val];
-                        })
-                        .filter(([elem, _]) => !!elem)  // skip non-existing DOM elements
-                        .forEach(([elem, val]) => {  // write the value in the form field
-                            if (elem.tagName === 'TEXTAREA') {
+            Object.entries(data)
+              .filter(([_, val]) => !!val)  // skip entries with null or undefined value
+              .map(([key, val]) => {  // convert keys to DOM elements
+                return [document.querySelector('[name="' + key + '"]'), val];
+              })
+              .filter(([elem, _]) => !!elem)  // skip non-existing DOM elements
+              .forEach(([elem, val]) => {  // write the value in the form field
+                if (elem.tagName === 'TEXTAREA') {
                                 // MD editor text input
-                                elem.parentNode.querySelector('.CodeMirror').CodeMirror.setValue(val);
-                            } else {
-                                elem.value = val;
-                            }
-                        });
-                    createQuickNotif('{% trans %}Successful autocomplete{% endtrans %}')
-                },
-                error: function(_, _, statusMessage) {
-                    createQuickNotif('{% trans %}An error occurred: {% endtrans %}' + statusMessage)
-                },
-            })
+                  elem.parentNode.querySelector('.CodeMirror').CodeMirror.setValue(val);
+                } else {
+                  elem.value = val;
+                }
+              });
+            createQuickNotif('{% trans %}Successful autocomplete{% endtrans %}')
+          },
+          error: function(_, _, statusMessage) {
+            createQuickNotif('{% trans %}An error occurred: {% endtrans %}' + statusMessage)
+          },
         })
+      })
     })
-</script>
+  </script>
 {% endblock %}
diff --git a/poetry.lock b/poetry.lock
index d4c9c8dff..ce1b8e72c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -694,6 +694,19 @@ Pillow = ">=6.2.0"
 [package.extras]
 test = ["testfixtures"]
 
+[[package]]
+name = "djhtml"
+version = "3.0.6"
+description = "Django/Jinja template indenter"
+optional = false
+python-versions = "*"
+files = [
+    {file = "djhtml-3.0.6.tar.gz", hash = "sha256:abfc4d7b4730432ca6a98322fbdf8ae9d6ba254ea57ba3759a10ecb293bc57de"},
+]
+
+[package.extras]
+dev = ["nox", "pre-commit"]
+
 [[package]]
 name = "docutils"
 version = "0.19"
@@ -1915,90 +1928,104 @@ pyyaml = "*"
 
 [[package]]
 name = "regex"
-version = "2024.5.15"
+version = "2023.12.25"
 description = "Alternative regular expression module, to replace re."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"
 files = [
-    {file = "regex-2024.5.15-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a81e3cfbae20378d75185171587cbf756015ccb14840702944f014e0d93ea09f"},
-    {file = "regex-2024.5.15-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7b59138b219ffa8979013be7bc85bb60c6f7b7575df3d56dc1e403a438c7a3f6"},
-    {file = "regex-2024.5.15-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a0bd000c6e266927cb7a1bc39d55be95c4b4f65c5be53e659537537e019232b1"},
-    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5eaa7ddaf517aa095fa8da0b5015c44d03da83f5bd49c87961e3c997daed0de7"},
-    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba68168daedb2c0bab7fd7e00ced5ba90aebf91024dea3c88ad5063c2a562cca"},
-    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6e8d717bca3a6e2064fc3a08df5cbe366369f4b052dcd21b7416e6d71620dca1"},
-    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1337b7dbef9b2f71121cdbf1e97e40de33ff114801263b275aafd75303bd62b5"},
-    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f9ebd0a36102fcad2f03696e8af4ae682793a5d30b46c647eaf280d6cfb32796"},
-    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9efa1a32ad3a3ea112224897cdaeb6aa00381627f567179c0314f7b65d354c62"},
-    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:1595f2d10dff3d805e054ebdc41c124753631b6a471b976963c7b28543cf13b0"},
-    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:b802512f3e1f480f41ab5f2cfc0e2f761f08a1f41092d6718868082fc0d27143"},
-    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:a0981022dccabca811e8171f913de05720590c915b033b7e601f35ce4ea7019f"},
-    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:19068a6a79cf99a19ccefa44610491e9ca02c2be3305c7760d3831d38a467a6f"},
-    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:1b5269484f6126eee5e687785e83c6b60aad7663dafe842b34691157e5083e53"},
-    {file = "regex-2024.5.15-cp310-cp310-win32.whl", hash = "sha256:ada150c5adfa8fbcbf321c30c751dc67d2f12f15bd183ffe4ec7cde351d945b3"},
-    {file = "regex-2024.5.15-cp310-cp310-win_amd64.whl", hash = "sha256:ac394ff680fc46b97487941f5e6ae49a9f30ea41c6c6804832063f14b2a5a145"},
-    {file = "regex-2024.5.15-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f5b1dff3ad008dccf18e652283f5e5339d70bf8ba7c98bf848ac33db10f7bc7a"},
-    {file = "regex-2024.5.15-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c6a2b494a76983df8e3d3feea9b9ffdd558b247e60b92f877f93a1ff43d26656"},
-    {file = "regex-2024.5.15-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a32b96f15c8ab2e7d27655969a23895eb799de3665fa94349f3b2fbfd547236f"},
-    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10002e86e6068d9e1c91eae8295ef690f02f913c57db120b58fdd35a6bb1af35"},
-    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ec54d5afa89c19c6dd8541a133be51ee1017a38b412b1321ccb8d6ddbeb4cf7d"},
-    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:10e4ce0dca9ae7a66e6089bb29355d4432caed736acae36fef0fdd7879f0b0cb"},
-    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e507ff1e74373c4d3038195fdd2af30d297b4f0950eeda6f515ae3d84a1770f"},
-    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d1f059a4d795e646e1c37665b9d06062c62d0e8cc3c511fe01315973a6542e40"},
-    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0721931ad5fe0dda45d07f9820b90b2148ccdd8e45bb9e9b42a146cb4f695649"},
-    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:833616ddc75ad595dee848ad984d067f2f31be645d603e4d158bba656bbf516c"},
-    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:287eb7f54fc81546346207c533ad3c2c51a8d61075127d7f6d79aaf96cdee890"},
-    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:19dfb1c504781a136a80ecd1fff9f16dddf5bb43cec6871778c8a907a085bb3d"},
-    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:119af6e56dce35e8dfb5222573b50c89e5508d94d55713c75126b753f834de68"},
-    {file = "regex-2024.5.15-cp311-cp311-win32.whl", hash = "sha256:1c1c174d6ec38d6c8a7504087358ce9213d4332f6293a94fbf5249992ba54efa"},
-    {file = "regex-2024.5.15-cp311-cp311-win_amd64.whl", hash = "sha256:9e717956dcfd656f5055cc70996ee2cc82ac5149517fc8e1b60261b907740201"},
-    {file = "regex-2024.5.15-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:632b01153e5248c134007209b5c6348a544ce96c46005d8456de1d552455b014"},
-    {file = "regex-2024.5.15-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e64198f6b856d48192bf921421fdd8ad8eb35e179086e99e99f711957ffedd6e"},
-    {file = "regex-2024.5.15-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68811ab14087b2f6e0fc0c2bae9ad689ea3584cad6917fc57be6a48bbd012c49"},
-    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8ec0c2fea1e886a19c3bee0cd19d862b3aa75dcdfb42ebe8ed30708df64687a"},
-    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d0c0c0003c10f54a591d220997dd27d953cd9ccc1a7294b40a4be5312be8797b"},
-    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2431b9e263af1953c55abbd3e2efca67ca80a3de8a0437cb58e2421f8184717a"},
-    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a605586358893b483976cffc1723fb0f83e526e8f14c6e6614e75919d9862cf"},
-    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:391d7f7f1e409d192dba8bcd42d3e4cf9e598f3979cdaed6ab11288da88cb9f2"},
-    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9ff11639a8d98969c863d4617595eb5425fd12f7c5ef6621a4b74b71ed8726d5"},
-    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:4eee78a04e6c67e8391edd4dad3279828dd66ac4b79570ec998e2155d2e59fd5"},
-    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8fe45aa3f4aa57faabbc9cb46a93363edd6197cbc43523daea044e9ff2fea83e"},
-    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:d0a3d8d6acf0c78a1fff0e210d224b821081330b8524e3e2bc5a68ef6ab5803d"},
-    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c486b4106066d502495b3025a0a7251bf37ea9540433940a23419461ab9f2a80"},
-    {file = "regex-2024.5.15-cp312-cp312-win32.whl", hash = "sha256:c49e15eac7c149f3670b3e27f1f28a2c1ddeccd3a2812cba953e01be2ab9b5fe"},
-    {file = "regex-2024.5.15-cp312-cp312-win_amd64.whl", hash = "sha256:673b5a6da4557b975c6c90198588181029c60793835ce02f497ea817ff647cb2"},
-    {file = "regex-2024.5.15-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:87e2a9c29e672fc65523fb47a90d429b70ef72b901b4e4b1bd42387caf0d6835"},
-    {file = "regex-2024.5.15-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c3bea0ba8b73b71b37ac833a7f3fd53825924165da6a924aec78c13032f20850"},
-    {file = "regex-2024.5.15-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bfc4f82cabe54f1e7f206fd3d30fda143f84a63fe7d64a81558d6e5f2e5aaba9"},
-    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5bb9425fe881d578aeca0b2b4b3d314ec88738706f66f219c194d67179337cb"},
-    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:64c65783e96e563103d641760664125e91bd85d8e49566ee560ded4da0d3e704"},
-    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cf2430df4148b08fb4324b848672514b1385ae3807651f3567871f130a728cc3"},
-    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5397de3219a8b08ae9540c48f602996aa6b0b65d5a61683e233af8605c42b0f2"},
-    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:455705d34b4154a80ead722f4f185b04c4237e8e8e33f265cd0798d0e44825fa"},
-    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2b6f1b3bb6f640c1a92be3bbfbcb18657b125b99ecf141fb3310b5282c7d4ed"},
-    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:3ad070b823ca5890cab606c940522d05d3d22395d432f4aaaf9d5b1653e47ced"},
-    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:5b5467acbfc153847d5adb21e21e29847bcb5870e65c94c9206d20eb4e99a384"},
-    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:e6662686aeb633ad65be2a42b4cb00178b3fbf7b91878f9446075c404ada552f"},
-    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:2b4c884767504c0e2401babe8b5b7aea9148680d2e157fa28f01529d1f7fcf67"},
-    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:3cd7874d57f13bf70078f1ff02b8b0aa48d5b9ed25fc48547516c6aba36f5741"},
-    {file = "regex-2024.5.15-cp38-cp38-win32.whl", hash = "sha256:e4682f5ba31f475d58884045c1a97a860a007d44938c4c0895f41d64481edbc9"},
-    {file = "regex-2024.5.15-cp38-cp38-win_amd64.whl", hash = "sha256:d99ceffa25ac45d150e30bd9ed14ec6039f2aad0ffa6bb87a5936f5782fc1569"},
-    {file = "regex-2024.5.15-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:13cdaf31bed30a1e1c2453ef6015aa0983e1366fad2667657dbcac7b02f67133"},
-    {file = "regex-2024.5.15-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cac27dcaa821ca271855a32188aa61d12decb6fe45ffe3e722401fe61e323cd1"},
-    {file = "regex-2024.5.15-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7dbe2467273b875ea2de38ded4eba86cbcbc9a1a6d0aa11dcf7bd2e67859c435"},
-    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64f18a9a3513a99c4bef0e3efd4c4a5b11228b48aa80743be822b71e132ae4f5"},
-    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d347a741ea871c2e278fde6c48f85136c96b8659b632fb57a7d1ce1872547600"},
-    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1878b8301ed011704aea4c806a3cadbd76f84dece1ec09cc9e4dc934cfa5d4da"},
-    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4babf07ad476aaf7830d77000874d7611704a7fcf68c9c2ad151f5d94ae4bfc4"},
-    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:35cb514e137cb3488bce23352af3e12fb0dbedd1ee6e60da053c69fb1b29cc6c"},
-    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cdd09d47c0b2efee9378679f8510ee6955d329424c659ab3c5e3a6edea696294"},
-    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:72d7a99cd6b8f958e85fc6ca5b37c4303294954eac1376535b03c2a43eb72629"},
-    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:a094801d379ab20c2135529948cb84d417a2169b9bdceda2a36f5f10977ebc16"},
-    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:c0c18345010870e58238790a6779a1219b4d97bd2e77e1140e8ee5d14df071aa"},
-    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:16093f563098448ff6b1fa68170e4acbef94e6b6a4e25e10eae8598bb1694b5d"},
-    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:e38a7d4e8f633a33b4c7350fbd8bad3b70bf81439ac67ac38916c4a86b465456"},
-    {file = "regex-2024.5.15-cp39-cp39-win32.whl", hash = "sha256:71a455a3c584a88f654b64feccc1e25876066c4f5ef26cd6dd711308aa538694"},
-    {file = "regex-2024.5.15-cp39-cp39-win_amd64.whl", hash = "sha256:cab12877a9bdafde5500206d1020a584355a97884dfd388af3699e9137bf7388"},
-    {file = "regex-2024.5.15.tar.gz", hash = "sha256:d3ee02d9e5f482cc8309134a91eeaacbdd2261ba111b0fef3748eeb4913e6a2c"},
+    {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5"},
+    {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8"},
+    {file = "regex-2023.12.25-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f"},
+    {file = "regex-2023.12.25-cp310-cp310-win32.whl", hash = "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630"},
+    {file = "regex-2023.12.25-cp310-cp310-win_amd64.whl", hash = "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105"},
+    {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6"},
+    {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97"},
+    {file = "regex-2023.12.25-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"},
+    {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"},
+    {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"},
+    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"},
+    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"},
+    {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"},
+    {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"},
+    {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"},
+    {file = "regex-2023.12.25-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:da695d75ac97cb1cd725adac136d25ca687da4536154cdc2815f576e4da11c69"},
+    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d126361607b33c4eb7b36debc173bf25d7805847346dd4d99b5499e1fef52bc7"},
+    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4719bb05094d7d8563a450cf8738d2e1061420f79cfcc1fa7f0a44744c4d8f73"},
+    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5dd58946bce44b53b06d94aa95560d0b243eb2fe64227cba50017a8d8b3cd3e2"},
+    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22a86d9fff2009302c440b9d799ef2fe322416d2d58fc124b926aa89365ec482"},
+    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2aae8101919e8aa05ecfe6322b278f41ce2994c4a430303c4cd163fef746e04f"},
+    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e692296c4cc2873967771345a876bcfc1c547e8dd695c6b89342488b0ea55cd8"},
+    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:263ef5cc10979837f243950637fffb06e8daed7f1ac1e39d5910fd29929e489a"},
+    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:d6f7e255e5fa94642a0724e35406e6cb7001c09d476ab5fce002f652b36d0c39"},
+    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:88ad44e220e22b63b0f8f81f007e8abbb92874d8ced66f32571ef8beb0643b2b"},
+    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:3a17d3ede18f9cedcbe23d2daa8a2cd6f59fe2bf082c567e43083bba3fb00347"},
+    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d15b274f9e15b1a0b7a45d2ac86d1f634d983ca40d6b886721626c47a400bf39"},
+    {file = "regex-2023.12.25-cp37-cp37m-win32.whl", hash = "sha256:ed19b3a05ae0c97dd8f75a5d8f21f7723a8c33bbc555da6bbe1f96c470139d3c"},
+    {file = "regex-2023.12.25-cp37-cp37m-win_amd64.whl", hash = "sha256:a6d1047952c0b8104a1d371f88f4ab62e6275567d4458c1e26e9627ad489b445"},
+    {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b43523d7bc2abd757119dbfb38af91b5735eea45537ec6ec3a5ec3f9562a1c53"},
+    {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:efb2d82f33b2212898f1659fb1c2e9ac30493ac41e4d53123da374c3b5541e64"},
+    {file = "regex-2023.12.25-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b7fca9205b59c1a3d5031f7e64ed627a1074730a51c2a80e97653e3e9fa0d415"},
+    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:086dd15e9435b393ae06f96ab69ab2d333f5d65cbe65ca5a3ef0ec9564dfe770"},
+    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e81469f7d01efed9b53740aedd26085f20d49da65f9c1f41e822a33992cb1590"},
+    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:34e4af5b27232f68042aa40a91c3b9bb4da0eeb31b7632e0091afc4310afe6cb"},
+    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9852b76ab558e45b20bf1893b59af64a28bd3820b0c2efc80e0a70a4a3ea51c1"},
+    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff100b203092af77d1a5a7abe085b3506b7eaaf9abf65b73b7d6905b6cb76988"},
+    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cc038b2d8b1470364b1888a98fd22d616fba2b6309c5b5f181ad4483e0017861"},
+    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:094ba386bb5c01e54e14434d4caabf6583334090865b23ef58e0424a6286d3dc"},
+    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5cd05d0f57846d8ba4b71d9c00f6f37d6b97d5e5ef8b3c3840426a475c8f70f4"},
+    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:9aa1a67bbf0f957bbe096375887b2505f5d8ae16bf04488e8b0f334c36e31360"},
+    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:98a2636994f943b871786c9e82bfe7883ecdaba2ef5df54e1450fa9869d1f756"},
+    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:37f8e93a81fc5e5bd8db7e10e62dc64261bcd88f8d7e6640aaebe9bc180d9ce2"},
+    {file = "regex-2023.12.25-cp38-cp38-win32.whl", hash = "sha256:d78bd484930c1da2b9679290a41cdb25cc127d783768a0369d6b449e72f88beb"},
+    {file = "regex-2023.12.25-cp38-cp38-win_amd64.whl", hash = "sha256:b521dcecebc5b978b447f0f69b5b7f3840eac454862270406a39837ffae4e697"},
+    {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"},
+    {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"},
+    {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20"},
+    {file = "regex-2023.12.25-cp39-cp39-win32.whl", hash = "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9"},
+    {file = "regex-2023.12.25-cp39-cp39-win_amd64.whl", hash = "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91"},
+    {file = "regex-2023.12.25.tar.gz", hash = "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5"},
 ]
 
 [[package]]
@@ -2472,4 +2499,4 @@ filelock = ">=3.4"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "f8e48947d004d61d63a345d36d7b42777030e1ac3687bb27f97b2c51318fcc8d"
+content-hash = "471a1ef315aec8a54eaa5719cd52526aaa98bd994106325d530328f755ca13f5"
diff --git a/pyproject.toml b/pyproject.toml
index f77bd0555..6515a6ee8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,6 +60,7 @@ django-debug-toolbar = "^4.0.0"
 ipython = "^8.26.0"
 pre-commit = "^3.7.1"
 ruff = "^0.5.1" # Version used in pipeline is controlled by pre-commit hooks in .pre-commit.config.yaml
+djhtml = "^3.0.6"
 
 # deps used for testing purposes
 [tool.poetry.group.tests.dependencies]
diff --git a/rootplace/templates/rootplace/delete_user_messages.jinja b/rootplace/templates/rootplace/delete_user_messages.jinja
index 01866d6e2..c6480548e 100644
--- a/rootplace/templates/rootplace/delete_user_messages.jinja
+++ b/rootplace/templates/rootplace/delete_user_messages.jinja
@@ -1,15 +1,15 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Delete user's forum messages{% endtrans %}
+  {% trans %}Delete user's forum messages{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <h3>{% trans %}Delete all forum messages from an user{% endtrans %}</h3>
-    <form action="" method="post">
-        {% csrf_token %}
-        {{ form.as_p() }}
-        <p><input type="submit" value="{% trans %}Delete messages{% endtrans %}" /></p>
-    </form>
-    <p><strong>{% trans %}If you have trouble using this utility (timeout error, 500 error), try using the command line utility. Use ./manage.py delete_all_forum_user_messages ID.{% endtrans %}</strong></p>
+  <h3>{% trans %}Delete all forum messages from an user{% endtrans %}</h3>
+  <form action="" method="post">
+    {% csrf_token %}
+    {{ form.as_p() }}
+    <p><input type="submit" value="{% trans %}Delete messages{% endtrans %}" /></p>
+  </form>
+  <p><strong>{% trans %}If you have trouble using this utility (timeout error, 500 error), try using the command line utility. Use ./manage.py delete_all_forum_user_messages ID.{% endtrans %}</strong></p>
 {% endblock %}
\ No newline at end of file
diff --git a/rootplace/templates/rootplace/logs.jinja b/rootplace/templates/rootplace/logs.jinja
index 740ec74f8..10155cf1d 100644
--- a/rootplace/templates/rootplace/logs.jinja
+++ b/rootplace/templates/rootplace/logs.jinja
@@ -2,31 +2,31 @@
 {% from 'core/macros.jinja' import paginate %}
 
 {% block title %}
-{% trans %}Operation logs{% endtrans %}
+  {% trans %}Operation logs{% endtrans %}
 {% endblock %}
 
 {% block content %}
-	<table>
-		<thead>
-			<tr>
-				<th>{% trans %}Date{% endtrans %}</th>
-				<th>{% trans %}Operation type{% endtrans %}</th>
-				<th>{% trans %}Label{% endtrans %}</th>
-				<th>{% trans %}Operator{% endtrans %}</th>
-			</tr>
-		</thead>
-		<tbody>
-			{% for log in object_list %}
-			<tr>
-				<td>{{ log.date }} </td>
-				<td>{{ log.get_operation_type_display() }}</td>
-				<td>{{ log.label }}</td>
-				<td>{{ log.operator }}</td>
-			</tr>
-			{% endfor %}
-		</tbody>
-	</table>
+  <table>
+    <thead>
+      <tr>
+        <th>{% trans %}Date{% endtrans %}</th>
+        <th>{% trans %}Operation type{% endtrans %}</th>
+        <th>{% trans %}Label{% endtrans %}</th>
+        <th>{% trans %}Operator{% endtrans %}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for log in object_list %}
+        <tr>
+          <td>{{ log.date }} </td>
+          <td>{{ log.get_operation_type_display() }}</td>
+          <td>{{ log.label }}</td>
+          <td>{{ log.operator }}</td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    <br>
-    {{ paginate(page_obj, paginator) }}
+  <br>
+  {{ paginate(page_obj, paginator) }}
 {% endblock content %}
\ No newline at end of file
diff --git a/rootplace/templates/rootplace/merge.jinja b/rootplace/templates/rootplace/merge.jinja
index 23084e739..ca7344a4b 100644
--- a/rootplace/templates/rootplace/merge.jinja
+++ b/rootplace/templates/rootplace/merge.jinja
@@ -1,14 +1,14 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Merge users{% endtrans %}
+  {% trans %}Merge users{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <h3>{% trans %}Merge two users{% endtrans %}</h3>
-    <form action="" method="post">
-        {% csrf_token %}
-        {{ form.as_p() }}
-        <p><input type="submit" value="{% trans %}Merge{% endtrans %}" /></p>
-    </form>
+  <h3>{% trans %}Merge two users{% endtrans %}</h3>
+  <form action="" method="post">
+    {% csrf_token %}
+    {{ form.as_p() }}
+    <p><input type="submit" value="{% trans %}Merge{% endtrans %}" /></p>
+  </form>
 {% endblock %}
diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja
index 46eba055b..60f9dff90 100644
--- a/sas/templates/sas/album.jinja
+++ b/sas/templates/sas/album.jinja
@@ -2,247 +2,247 @@
 {% from "core/macros.jinja" import paginate %}
 
 {%- block additional_css -%}
-    <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
+  <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-    {% trans %}SAS{% endtrans %}
+  {% trans %}SAS{% endtrans %}
 {% endblock %}
 
 {% macro print_path(file) %}
-    {% if file and file.parent %}
-        {{ print_path(file.parent) }}
-        <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
-    {% endif %}
+  {% if file and file.parent %}
+    {{ print_path(file.parent) }}
+    <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
+  {% endif %}
 {% endmacro %}
 
 
 {% block content %}
-    <code>
-        <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.get_display_name() }}
-    </code>
-
-    {% set edit_mode = user.can_edit(album) %}
-    {% set start = timezone.now() %}
-
-    {% if edit_mode %}
-        <form action="" method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-
-            <div class="album-navbar">
-                <h3>{{ album.get_display_name() }}</h3>
-
-                <div class="toolbar">
-                    <a href="{{ url('sas:album_edit', album_id=album.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    <input name="delete" type="submit" value="{% trans %}Delete{% endtrans %}">
-                    <input name="cut" type="submit" value="{% trans %}Cut{% endtrans %}">
-                    <input {% if not clipboard %}disabled{% endif %} name="paste" type="submit" value="{% trans %}Paste{% endtrans %}">
-                </div>
-            </div>
-
-            {% if clipboard %}
-                <div class="clipboard">
-                    {% trans %}Clipboard: {% endtrans %}
-                    <ul>
-                        {% for f in clipboard %}
-                            <li>{{ f.get_full_path() }}</li>
-                        {% endfor %}
-                    </ul>
-                    <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
-                </div>
-            {% endif %}
-    {% endif %}
-
-    {% if album.children_albums.count() > 0 %}
-        <h4>{% trans %}Albums{% endtrans %}</h4>
-        <div class="albums">
-            {% for a in album.children_albums.order_by('-date') %}
-                {% if a.can_be_viewed_by(user) %}
-                    <a href="{{ url('sas:album', album_id=a.id) }}">
-                        <div
-                            class="album{% if not a.is_moderated %} not_moderated{% endif %}"
-                            style="background-image: url('{% if a.file %}{{ a.get_download_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
-                        >
-                            {% if not a.is_moderated %}
-                                <div class="overlay">&nbsp;</div>
-                                <div class="text">{% trans %}To be moderated{% endtrans %}</div>
-                            {% else %}
-                                <div class="text">{{ a.name }}</div>
-                            {% endif %}
-                        </div>
-                        {% if edit_mode %}
-                            <input type="checkbox" name="file_list" value="{{ a.id }}">
-                        {% endif %}
-                    </a>
-                {% endif %}
-            {% endfor %}
-        </div>
+  <code>
+    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.get_display_name() }}
+  </code>
 
-        <br>
-    {% endif %}
-
-    <h4>{% trans %}Pictures{% endtrans %}</h4>
-    {% if pictures | length != 0 %}
-        <div class="photos">
-            {% for p in pictures %}
-                {% if p.can_be_viewed_by(user) %}
-                    <a href="{{ url('sas:picture', picture_id=p.id) }}#pict">
-                        <div
-                            class="photo {% if p.is_vertical %}vertical{% endif %}"
-                            style="background-image: url('{{ p.get_download_thumb_url() }}')"
-                        >
-                            {% if not p.is_moderated %}
-                                <div class="overlay">&nbsp;</div>
-                                <div class="text">{% trans %}To be moderated{% endtrans %}</div>
-                            {% else %}
-                                <div class="text">&nbsp;</div>
-                            {% endif %}
-                        </div>
-                        {% if edit_mode %}
-                            <input type="checkbox" name="file_list" value="{{ p.id }}">
-                        {% endif %}
-                    </a>
-                {% endif %}
-            {% endfor %}
-        </div>
-    {% else %}
-        {% trans %}This album does not contain any photos.{% endtrans %}
-    {% endif %}
+  {% set edit_mode = user.can_edit(album) %}
+  {% set start = timezone.now() %}
 
-    {% if pictures.has_previous() or pictures.has_next() %}
-        <div class="paginator">
-            {{ paginate(pictures, paginator) }}
-        </div>
-    {% endif %}
+  {% if edit_mode %}
+    <form action="" method="post" enctype="multipart/form-data">
+      {% csrf_token %}
 
-    {% if edit_mode %}
-        </form>
-    {% endif %}
+      <div class="album-navbar">
+        <h3>{{ album.get_display_name() }}</h3>
 
-    {% if user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
-        <form class="add-files" id="upload_form" action="" method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            <div class="inputs">
-                {{ form.as_p() }}
-
-                <input type="submit" value="{% trans %}Upload{% endtrans %}" />
+        <div class="toolbar">
+          <a href="{{ url('sas:album_edit', album_id=album.id) }}">{% trans %}Edit{% endtrans %}</a>
+          <input name="delete" type="submit" value="{% trans %}Delete{% endtrans %}">
+          <input name="cut" type="submit" value="{% trans %}Cut{% endtrans %}">
+          <input {% if not clipboard %}disabled{% endif %} name="paste" type="submit" value="{% trans %}Paste{% endtrans %}">
+        </div>
+      </div>
+
+      {% if clipboard %}
+        <div class="clipboard">
+          {% trans %}Clipboard: {% endtrans %}
+          <ul>
+            {% for f in clipboard %}
+              <li>{{ f.get_full_path() }}</li>
+            {% endfor %}
+          </ul>
+          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
+        </div>
+      {% endif %}
+  {% endif %}
+
+  {% if album.children_albums.count() > 0 %}
+    <h4>{% trans %}Albums{% endtrans %}</h4>
+    <div class="albums">
+      {% for a in album.children_albums.order_by('-date') %}
+        {% if a.can_be_viewed_by(user) %}
+          <a href="{{ url('sas:album', album_id=a.id) }}">
+            <div
+              class="album{% if not a.is_moderated %} not_moderated{% endif %}"
+              style="background-image: url('{% if a.file %}{{ a.get_download_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
+            >
+              {% if not a.is_moderated %}
+                <div class="overlay">&nbsp;</div>
+                <div class="text">{% trans %}To be moderated{% endtrans %}</div>
+              {% else %}
+                <div class="text">{{ a.name }}</div>
+              {% endif %}
             </div>
-        </form>
-    {% endif %}
-
-    <hr>
-
-    <p style="font-size: small; color: #444;">{% trans %}Template generation time: {% endtrans %}
+            {% if edit_mode %}
+              <input type="checkbox" name="file_list" value="{{ a.id }}">
+            {% endif %}
+          </a>
+        {% endif %}
+      {% endfor %}
+    </div>
+
+    <br>
+  {% endif %}
+
+  <h4>{% trans %}Pictures{% endtrans %}</h4>
+  {% if pictures | length != 0 %}
+    <div class="photos">
+      {% for p in pictures %}
+        {% if p.can_be_viewed_by(user) %}
+          <a href="{{ url('sas:picture', picture_id=p.id) }}#pict">
+            <div
+              class="photo {% if p.is_vertical %}vertical{% endif %}"
+              style="background-image: url('{{ p.get_download_thumb_url() }}')"
+            >
+              {% if not p.is_moderated %}
+                <div class="overlay">&nbsp;</div>
+                <div class="text">{% trans %}To be moderated{% endtrans %}</div>
+              {% else %}
+                <div class="text">&nbsp;</div>
+              {% endif %}
+            </div>
+            {% if edit_mode %}
+              <input type="checkbox" name="file_list" value="{{ p.id }}">
+            {% endif %}
+          </a>
+        {% endif %}
+      {% endfor %}
+    </div>
+  {% else %}
+    {% trans %}This album does not contain any photos.{% endtrans %}
+  {% endif %}
+
+  {% if pictures.has_previous() or pictures.has_next() %}
+    <div class="paginator">
+      {{ paginate(pictures, paginator) }}
+    </div>
+  {% endif %}
+
+  {% if edit_mode %}
+    </form>
+  {% endif %}
+
+  {% if user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
+    <form class="add-files" id="upload_form" action="" method="post" enctype="multipart/form-data">
+      {% csrf_token %}
+      <div class="inputs">
+        {{ form.as_p() }}
+
+        <input type="submit" value="{% trans %}Upload{% endtrans %}" />
+      </div>
+    </form>
+  {% endif %}
+
+  <hr>
+
+  <p style="font-size: small; color: #444;">{% trans %}Template generation time: {% endtrans %}
     {{ timezone.now() - start }}
-    </p>
+  </p>
 {% endblock %}
 
 {% block script %}
-    {{ super() }}
-    <script>
+  {{ super() }}
+  <script>
     $("form#upload_form").submit(function (event) {
-        let formData = new FormData($(this)[0]);
-
-        if(!formData.get('album_name') && !formData.get('images').name)
-            return false;
-
-        if(!formData.get('images').name) {
-            return true;
+      let formData = new FormData($(this)[0]);
+
+      if(!formData.get('album_name') && !formData.get('images').name)
+        return false;
+
+      if(!formData.get('images').name) {
+        return true;
+      }
+
+      event.preventDefault();
+
+      let errorList;
+      if((errorList = this.querySelector('#upload_form ul.errorlist.nonfield')) === null) {
+        errorList = document.createElement('ul');
+        errorList.classList.add('errorlist', 'nonfield');
+        this.insertBefore(errorList, this.firstElementChild);
+      }
+
+      while(errorList.childElementCount > 0)
+        errorList.removeChild(errorList.firstElementChild);
+
+      let progress;
+      if((progress = this.querySelector('progress')) === null) {
+        progress = document.createElement('progress');
+        progress.value = 0;
+        let p = document.createElement('p');
+        p.appendChild(progress);
+        this.insertBefore(p, this.lastElementChild);
+      }
+
+      let dataHolder;
+
+      if(formData.get('album_name')) {
+        dataHolder = new FormData();
+        dataHolder.set('csrfmiddlewaretoken', '{{ csrf_token }}');
+        dataHolder.set('album_name', formData.get('album_name'));
+        $.ajax({
+          method: 'POST',
+          url: "{{ url('sas:album_upload', album_id=object.id) }}",
+          data: dataHolder,
+          processData: false,
+          contentType: false,
+          success: onSuccess
+        });
+      }
+
+      let images = formData.getAll('images');
+      let imagesCount = images.length;
+      let completeCount = 0;
+
+      let poolSize = 1;
+      let imagePool = [];
+
+      while(images.length > 0 && imagePool.length < poolSize) {
+        let image = images.shift();
+        imagePool.push(image);
+        sendImage(image);
+      }
+
+      function sendImage(image) {
+        dataHolder = new FormData();
+        dataHolder.set('csrfmiddlewaretoken', '{{ csrf_token }}');
+        dataHolder.set('images', image);
+
+        $.ajax({
+          method: 'POST',
+          url: "{{ url('sas:album_upload', album_id=object.id) }}",
+          data: dataHolder,
+          processData: false,
+          contentType: false,
+        })
+          .fail(onSuccess.bind(undefined, image))
+          .done(onSuccess.bind(undefined, image))
+          .always(next.bind(undefined, image));
+      }
+
+      function next(image, _, __) {
+        let index = imagePool.indexOf(image);
+        let nextImage = images.shift();
+
+        if(index !== -1)
+          imagePool.splice(index, 1);
+
+        if(nextImage) {
+          imagePool.push(nextImage);
+          sendImage(nextImage);
         }
+      }
 
-        event.preventDefault();
+      function onSuccess(image, data, _, __) {
+        let errors = [];
 
-        let errorList;
-        if((errorList = this.querySelector('#upload_form ul.errorlist.nonfield')) === null) {
-            errorList = document.createElement('ul');
-            errorList.classList.add('errorlist', 'nonfield');
-            this.insertBefore(errorList, this.firstElementChild);
-        }
-
-        while(errorList.childElementCount > 0)
-            errorList.removeChild(errorList.firstElementChild);
-
-        let progress;
-        if((progress = this.querySelector('progress')) === null) {
-            progress = document.createElement('progress');
-            progress.value = 0;
-            let p = document.createElement('p');
-            p.appendChild(progress);
-            this.insertBefore(p, this.lastElementChild);
-        }
-
-        let dataHolder;
-
-        if(formData.get('album_name')) {
-            dataHolder = new FormData();
-            dataHolder.set('csrfmiddlewaretoken', '{{ csrf_token }}');
-            dataHolder.set('album_name', formData.get('album_name'));
-            $.ajax({
-                method: 'POST',
-                url: "{{ url('sas:album_upload', album_id=object.id) }}",
-                data: dataHolder,
-                processData: false,
-                contentType: false,
-                success: onSuccess
-            });
-        }
-
-        let images = formData.getAll('images');
-        let imagesCount = images.length;
-        let completeCount = 0;
+        if ($(data.responseText).find('.errorlist.nonfield')[0])
+          errors = Array.from($(data.responseText).find('.errorlist.nonfield')[0].children);
 
-        let poolSize = 1;
-        let imagePool = [];
+        while(errors.length > 0)
+          errorList.appendChild(errors.shift());
 
-        while(images.length > 0 && imagePool.length < poolSize) {
-            let image = images.shift();
-            imagePool.push(image);
-            sendImage(image);
-        }
-
-        function sendImage(image) {
-            dataHolder = new FormData();
-            dataHolder.set('csrfmiddlewaretoken', '{{ csrf_token }}');
-            dataHolder.set('images', image);
-
-            $.ajax({
-                method: 'POST',
-                url: "{{ url('sas:album_upload', album_id=object.id) }}",
-                data: dataHolder,
-                processData: false,
-                contentType: false,
-            })
-                .fail(onSuccess.bind(undefined, image))
-                .done(onSuccess.bind(undefined, image))
-                .always(next.bind(undefined, image));
-        }
-
-        function next(image, _, __) {
-            let index = imagePool.indexOf(image);
-            let nextImage = images.shift();
-
-            if(index !== -1)
-                imagePool.splice(index, 1);
-
-            if(nextImage) {
-                imagePool.push(nextImage);
-                sendImage(nextImage);
-            }
-        }
-
-        function onSuccess(image, data, _, __) {
-            let errors = [];
-
-            if ($(data.responseText).find('.errorlist.nonfield')[0])
-                errors = Array.from($(data.responseText).find('.errorlist.nonfield')[0].children);
-
-            while(errors.length > 0)
-                errorList.appendChild(errors.shift());
-
-            progress.value = ++completeCount / imagesCount;
-            if(progress.value === 1 && errorList.children.length === 0)
-                document.location.reload()
-        }
+        progress.value = ++completeCount / imagesCount;
+        if(progress.value === 1 && errorList.children.length === 0)
+          document.location.reload()
+      }
     });
-    </script>
+  </script>
 {% endblock %}
diff --git a/sas/templates/sas/main.jinja b/sas/templates/sas/main.jinja
index 637497f3a..8e37759fd 100644
--- a/sas/templates/sas/main.jinja
+++ b/sas/templates/sas/main.jinja
@@ -1,110 +1,110 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-    <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
+  <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
 {%- endblock -%}
 
 {% block title %}
-    {% trans %}SAS{% endtrans %}
+  {% trans %}SAS{% endtrans %}
 {% endblock %}
 
 {% set edit_mode = user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
 
 {% macro display_album(a, checkbox) %}
-    <a href="{{ url('sas:album', album_id=a.id) }}">
-        {% if a.file %}
-            {% set img = a.get_download_url() %}
-        {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %}
-            {% set img = a.children.filter(is_folder=False).first().as_picture.get_download_thumb_url() %}
-        {% else %}
-            {% set img = static('core/img/sas.jpg') %}
-        {% endif %}
-
-        <div 
-            class="album"
-            style="background-image: url('{{ img }}');"
-        >
-            <div class="text">
-                {{ a.name }}
-            </div>
-        </div>
+  <a href="{{ url('sas:album', album_id=a.id) }}">
+    {% if a.file %}
+      {% set img = a.get_download_url() %}
+    {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %}
+      {% set img = a.children.filter(is_folder=False).first().as_picture.get_download_thumb_url() %}
+    {% else %}
+      {% set img = static('core/img/sas.jpg') %}
+    {% endif %}
+
+    <div
+      class="album"
+      style="background-image: url('{{ img }}');"
+    >
+      <div class="text">
+        {{ a.name }}
+      </div>
+    </div>
         {# {% if edit_mode and checkbox %}
             <input type="checkbox" name="file_list" value="{{ a.id }}">
         {% endif %} #}
-    </a>
+  </a>
 {% endmacro %}
 
 {% block content %}
-    <main>
-        <h3>{% trans %}SAS{% endtrans %}</h3>
-
-        {% if not user.is_authenticated %}
-            <p>{% trans %}You must be logged in to see the SAS.{% endtrans %}</p>
-        {% else %}
-            <br>
-            <h4>{% trans %}Latest albums{% endtrans %}</h4>
-
-            <div class="albums">
-                {% for a in latest %}
-                    {{ display_album(a) }}
-                {% endfor %}
-            </div>
+  <main>
+    <h3>{% trans %}SAS{% endtrans %}</h3>
 
-            <br>
+    {% if not user.is_authenticated %}
+      <p>{% trans %}You must be logged in to see the SAS.{% endtrans %}</p>
+    {% else %}
+      <br>
+      <h4>{% trans %}Latest albums{% endtrans %}</h4>
 
-            {% if edit_mode %}
-                <form action="" method="post" enctype="multipart/form-data">
-                    {% csrf_token %}
+      <div class="albums">
+        {% for a in latest %}
+          {{ display_album(a) }}
+        {% endfor %}
+      </div>
 
-                    <div class="navbar">
-                        <h4>{% trans %}All categories{% endtrans %}</h4>
+      <br>
+
+      {% if edit_mode %}
+        <form action="" method="post" enctype="multipart/form-data">
+          {% csrf_token %}
+
+          <div class="navbar">
+            <h4>{% trans %}All categories{% endtrans %}</h4>
 
                         {# <div class="toolbar">
                             <input name="delete" type="submit" value="{% trans %}Delete{% endtrans %}">
                         </div> #}
-                    </div>
-
-                    {% if clipboard %}
-                        <div class="clipboard">
-                            {% trans %}Clipboard: {% endtrans %}
-                            <ul>
-                                {% for f in clipboard %}
-                                <li>{{ f.get_full_path() }}</li>
-                                {% endfor %}
-                            </ul>
-                            <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
-                        </div>
-                    {% endif %}
-            {% else %}
-                <h4>{% trans %}All categories{% endtrans %}</h4>
-            {% endif %}
-
-            <div class="albums">
-                {% for a in categories %}
-                    {{ display_album(a, true) }}
+          </div>
+
+          {% if clipboard %}
+            <div class="clipboard">
+              {% trans %}Clipboard: {% endtrans %}
+              <ul>
+                {% for f in clipboard %}
+                  <li>{{ f.get_full_path() }}</li>
                 {% endfor %}
+              </ul>
+              <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
             </div>
+          {% endif %}
+      {% else %}
+        <h4>{% trans %}All categories{% endtrans %}</h4>
+      {% endif %}
 
-            {% if edit_mode %}
-                </form>
+      <div class="albums">
+        {% for a in categories %}
+          {{ display_album(a, true) }}
+        {% endfor %}
+      </div>
 
-                <br>
+      {% if edit_mode %}
+        </form>
 
-                <form class="add-files" action="" method="post" enctype="multipart/form-data">
-                    {% csrf_token %}
+        <br>
 
-                    <div class="inputs">
-                        <div>
-                            <label for="{{ form.album_name.name }}">{{ form.album_name.label }}</label>
-                            {{ form.album_name }}
-                        </div>
-                        <input type="submit" value="{% trans %}Create{% endtrans %}" />
-                    </div>
+        <form class="add-files" action="" method="post" enctype="multipart/form-data">
+          {% csrf_token %}
 
-                    {{ form.non_field_errors() }}
-                    {{ form.album_name.errors }}
-                </form>
-            {% endif %}
-        {% endif %}
-    </main>
+          <div class="inputs">
+            <div>
+              <label for="{{ form.album_name.name }}">{{ form.album_name.label }}</label>
+              {{ form.album_name }}
+            </div>
+            <input type="submit" value="{% trans %}Create{% endtrans %}" />
+          </div>
+
+          {{ form.non_field_errors() }}
+          {{ form.album_name.errors }}
+        </form>
+      {% endif %}
+    {% endif %}
+  </main>
 {% endblock %}
diff --git a/sas/templates/sas/moderation.jinja b/sas/templates/sas/moderation.jinja
index c0804d280..b9a2e82e0 100644
--- a/sas/templates/sas/moderation.jinja
+++ b/sas/templates/sas/moderation.jinja
@@ -1,34 +1,34 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}SAS moderation{% endtrans %}
+  {% trans %}SAS moderation{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}SAS moderation{% endtrans %}</h3>
-<div id="moderation">
+  <h3>{% trans %}SAS moderation{% endtrans %}</h3>
+  <div id="moderation">
     <h4>{% trans %}Albums{% endtrans %}</h4>
     <ul>
-    {% for a in albums_to_moderate %}
+      {% for a in albums_to_moderate %}
         <li>{{ a }}:
-        <form action="" method="POST">
+          <form action="" method="POST">
             {% csrf_token %}
             <input type="hidden" name="album_id" value="{{ a.id }}" />
             <input type="submit" name="moderate" value="{% trans %}Moderate{% endtrans %}" />
             <input type="submit" name="delete" value="{% trans %}Delete{% endtrans %}" />
-        </form>
-    </li>
-    {% endfor %}
+          </form>
+        </li>
+      {% endfor %}
     </ul>
     {% for a in albums %}
-        <h4>{{ a.get_display_name() }}</h4>
-    {% for p in pictures.filter(parent=a).order_by('id') %}
-    <div class="picture">
-        <a href="{{ url("sas:picture", picture_id=p.id) }}">
+      <h4>{{ a.get_display_name() }}</h4>
+      {% for p in pictures.filter(parent=a).order_by('id') %}
+        <div class="picture">
+          <a href="{{ url("sas:picture", picture_id=p.id) }}">
             <img src="{{ p.get_download_thumb_url() }}" alt="{{ p.name }}">
-        </a>
-    </div>
-    {% endfor %}
+          </a>
+        </div>
+      {% endfor %}
     {% endfor %}
-</div>
+  </div>
 {% endblock %}
diff --git a/sas/templates/sas/picture.jinja b/sas/templates/sas/picture.jinja
index 711a0c6c8..191eac982 100644
--- a/sas/templates/sas/picture.jinja
+++ b/sas/templates/sas/picture.jinja
@@ -1,178 +1,178 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-    <link rel="stylesheet" href="{{ scss('sas/picture.scss') }}">
+  <link rel="stylesheet" href="{{ scss('sas/picture.scss') }}">
 {%- endblock -%}
 
 {% block head %}
-    {{ super() }}
+  {{ super() }}
 
-    {% if picture.get_previous() %}
-        <link rel="preload" as="image" href="{{ url("sas:download_compressed", picture_id=picture.get_previous().id) }}">
-    {% endif %}
-    {% if picture.get_next() %}
-        <link rel="preload" as="image" href="{{ url("sas:download_compressed", picture_id=picture.get_next().id) }}">
-    {% endif %}
+  {% if picture.get_previous() %}
+    <link rel="preload" as="image" href="{{ url("sas:download_compressed", picture_id=picture.get_previous().id) }}">
+  {% endif %}
+  {% if picture.get_next() %}
+    <link rel="preload" as="image" href="{{ url("sas:download_compressed", picture_id=picture.get_next().id) }}">
+  {% endif %}
 
 {% endblock %}
 
 {% block title %}
-    {% trans %}SAS{% endtrans %}
+  {% trans %}SAS{% endtrans %}
 {% endblock %}
 
 {% macro print_path(file) %}
-    {% if file and file.parent %}
-        {{ print_path(file.parent) }}
-        <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
-    {% endif %}
+  {% if file and file.parent %}
+    {{ print_path(file.parent) }}
+    <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
+  {% endif %}
 {% endmacro %}
 
 {% block content %}
-    <code>
-        <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(picture.parent) }} {{ picture.get_display_name() }}
-    </code>
-
-    <br>
-
-    <div class="title">
-        <h3>{{ picture.get_display_name() }}</h3>
-        <h4>{{ picture.parent.children.filter(id__lte=picture.id).count() }} / {{ picture.parent.children.count() }}</h4>
-    </div>
-    <br>
+  <code>
+    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(picture.parent) }} {{ picture.get_display_name() }}
+  </code>
+
+  <br>
+
+  <div class="title">
+    <h3>{{ picture.get_display_name() }}</h3>
+    <h4>{{ picture.parent.children.filter(id__lte=picture.id).count() }} / {{ picture.parent.children.count() }}</h4>
+  </div>
+  <br>
+
+  {% if not picture.is_moderated %}
+    {% set next = picture.get_next() %}
+    {% if not next %}
+      {% set next = url('sas:moderation') %}
+    {% else %}
+      {% set next = next.get_absolute_url() + "#pict" %}
+    {% endif %}
 
-    {% if not picture.is_moderated %}
-        {% set next = picture.get_next() %}
-        {% if not next %}
-            {% set next = url('sas:moderation') %}
+    <div class="moderation">
+      <div>
+        {% if picture.asked_for_removal %}
+          <span class="important">{% trans %}Asked for removal{% endtrans %}</span>
         {% else %}
-            {% set next = next.get_absolute_url() + "#pict" %}
+          &nbsp;
         {% endif %}
+      </div>
+      <div>
+        <a href="{{ url('core:file_moderate', file_id=picture.id) }}?next={{ next }}">
+          {% trans %}Moderate{% endtrans %}
+        </a>
+        <a href="{{ url('core:file_delete', file_id=picture.id) }}?next={{ next }}">
+          {% trans %}Delete{% endtrans %}
+        </a>
+      </div>
+    </div>
+  {% endif %}
+
+  <div class="container">
+    <div class="main">
 
-        <div class="moderation">
+      <div class="photo">
+        <img src="{{ picture.get_download_compressed_url() }}" alt="{{ picture.get_display_name() }}"/>
+      </div>
+
+      <div class="general">
+        <div class="infos">
+          <h5>{% trans %}Infos{% endtrans %}</h5>
+          <div>
             <div>
-                {% if picture.asked_for_removal %}
-                    <span class="important">{% trans %}Asked for removal{% endtrans %}</span>
-                {% else %}
-                    &nbsp;
-                {% endif %}
+              <span>{% trans %}Date: {% endtrans %}</span>
+              <span>{{ picture.date|date(DATETIME_FORMAT) }}</span>
             </div>
             <div>
-                <a href="{{ url('core:file_moderate', file_id=picture.id) }}?next={{ next }}">
-                    {% trans %}Moderate{% endtrans %}
-                </a>
-                <a href="{{ url('core:file_delete', file_id=picture.id) }}?next={{ next }}">
-                    {% trans %}Delete{% endtrans %}
-                </a>
+              <span>{% trans %}Owner: {% endtrans %}</span>
+              <a href="{{ picture.owner.get_absolute_url() }}">{{ picture.owner.get_short_name() }}</a>
             </div>
-        </div>
-    {% endif %}
 
-    <div class="container">
-        <div class="main">
+            {% if picture.moderator %}
+              <div>
+                <span>{% trans %}Moderator: {% endtrans %}</span>
+                <a href="{{ picture.moderator.get_absolute_url() }}">{{ picture.moderator.get_short_name() }}</a>
+              </div>
+            {% endif %}
+          </div>
+        </div>
 
-            <div class="photo">
-                <img src="{{ picture.get_download_compressed_url() }}" alt="{{ picture.get_display_name() }}"/>
+        <div class="tools">
+          <h5>{% trans %}Tools{% endtrans %}</h5>
+          <div>
+            <div>
+              <a class="text" href="{{ picture.get_download_url() }}">{% trans %}HD version{% endtrans %}</a>
+              <br>
+              <a class="text danger" href="?ask_removal">{% trans %}Ask for removal{% endtrans %}</a>
             </div>
-
-            <div class="general">
-                <div class="infos">
-                    <h5>{% trans %}Infos{% endtrans %}</h5>
-                    <div>
-                        <div>
-                            <span>{% trans %}Date: {% endtrans %}</span>
-                            <span>{{ picture.date|date(DATETIME_FORMAT) }}</span>
-                        </div>
-                        <div>
-                            <span>{% trans %}Owner: {% endtrans %}</span>
-                            <a href="{{ picture.owner.get_absolute_url() }}">{{ picture.owner.get_short_name() }}</a>
-                        </div>
-
-                        {% if picture.moderator %}
-                            <div>
-                                <span>{% trans %}Moderator: {% endtrans %}</span>
-                                <a href="{{ picture.moderator.get_absolute_url() }}">{{ picture.moderator.get_short_name() }}</a>
-                            </div>
-                        {% endif %}
-                    </div>
-                </div>
-
-                <div class="tools">
-                    <h5>{% trans %}Tools{% endtrans %}</h5>
-                    <div>
-                        <div>
-                            <a class="text" href="{{ picture.get_download_url() }}">{% trans %}HD version{% endtrans %}</a>
-                            <br>
-                            <a class="text danger" href="?ask_removal">{% trans %}Ask for removal{% endtrans %}</a>
-                        </div>
-                        <div class="buttons">
-                            <a class="button" href="{{ url('sas:picture_edit', picture_id=picture.id) }}">✏️</a>
-                            <a class="button" href="?rotate_left">↺</a>
-                            <a class="button" href="?rotate_right">↻</a>
-                        </div>
-                    </div>
-                </div>
+            <div class="buttons">
+              <a class="button" href="{{ url('sas:picture_edit', picture_id=picture.id) }}">✏️</a>
+              <a class="button" href="?rotate_left">↺</a>
+              <a class="button" href="?rotate_right">↻</a>
             </div>
+          </div>
         </div>
+      </div>
+    </div>
 
-        <div class="subsection">
-            <div class="navigation">
-                <div id="prev">
-                    {% if picture.get_previous() %}
-                        <a href="{{ url( 'sas:picture', picture_id=picture.get_previous().id) }}#pict">
-                            <div style="background-image: url('{{ picture.get_previous().as_picture.get_download_thumb_url() }}');"></div>
-                        </a>
-                    {% endif %}
-                </div>
-                <div id="next">
-                    {% if picture.get_next() %}
-                        <a href="{{ url( 'sas:picture', picture_id=picture.get_next().id) }}#pict">
-                            <div style="background-image: url('{{ picture.get_next().as_picture.get_download_thumb_url() }}');"></div>
-                        </a>
-                    {% endif %}
-                </div>
-            </div>
-
-            <div class="tags">
-                <h5>{% trans %}People{% endtrans %}</h5>
-                <form action="" method="post" enctype="multipart/form-data">
-                    {% csrf_token %}
-                    {{ form.as_p() }}
-                    <input type="submit" value="{% trans %}Go{% endtrans %}" />
-                </form>
-                <ul>
-                    {% for r in picture.people.all() %}
-                        <li>
-                            <a class="user" href="{{ r.user.get_absolute_url() }}">
-                                {% if r.user.profile_pict %}
-                                <div class="profile-pic" style="background-image: url('{{ r.user.profile_pict.get_download_url() }}');"></div>
-                                {% endif %}
-                                <span>{{ r.user.get_short_name() }}</span>
-                            </a>
-                            {% if user == r.user or user.can_edit(picture) %}
-                                <a class="delete" href="?remove_user={{ r.user.id }}">❌</a>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                </ul>
-            </div>
+    <div class="subsection">
+      <div class="navigation">
+        <div id="prev">
+          {% if picture.get_previous() %}
+            <a href="{{ url( 'sas:picture', picture_id=picture.get_previous().id) }}#pict">
+              <div style="background-image: url('{{ picture.get_previous().as_picture.get_download_thumb_url() }}');"></div>
+            </a>
+          {% endif %}
         </div>
+        <div id="next">
+          {% if picture.get_next() %}
+            <a href="{{ url( 'sas:picture', picture_id=picture.get_next().id) }}#pict">
+              <div style="background-image: url('{{ picture.get_next().as_picture.get_download_thumb_url() }}');"></div>
+            </a>
+          {% endif %}
+        </div>
+      </div>
+
+      <div class="tags">
+        <h5>{% trans %}People{% endtrans %}</h5>
+        <form action="" method="post" enctype="multipart/form-data">
+          {% csrf_token %}
+          {{ form.as_p() }}
+          <input type="submit" value="{% trans %}Go{% endtrans %}" />
+        </form>
+        <ul>
+          {% for r in picture.people.all() %}
+            <li>
+              <a class="user" href="{{ r.user.get_absolute_url() }}">
+                {% if r.user.profile_pict %}
+                  <div class="profile-pic" style="background-image: url('{{ r.user.profile_pict.get_download_url() }}');"></div>
+                {% endif %}
+                <span>{{ r.user.get_short_name() }}</span>
+              </a>
+              {% if user == r.user or user.can_edit(picture) %}
+                <a class="delete" href="?remove_user={{ r.user.id }}">❌</a>
+              {% endif %}
+            </li>
+          {% endfor %}
+        </ul>
+      </div>
     </div>
+  </div>
 {% endblock %}
 
 {% block script %}
-    {{ super() }}
-    <script>
+  {{ super() }}
+  <script>
     $(() => {
-        $(document).keydown((e) => {
-            switch (e.keyCode) {
-                case 37:
-                    $('#prev a')[0].click();
-                    break;
-                case 39:
-                    $('#next a')[0].click();
-                    break;
-            }
-        });
+      $(document).keydown((e) => {
+        switch (e.keyCode) {
+          case 37:
+            $('#prev a')[0].click();
+            break;
+          case 39:
+            $('#next a')[0].click();
+            break;
+        }
+      });
     });
-    </script>
+  </script>
 {% endblock %}
diff --git a/stock/templates/stock/shopping_list_items.jinja b/stock/templates/stock/shopping_list_items.jinja
index bafcd8729..67cc58173 100644
--- a/stock/templates/stock/shopping_list_items.jinja
+++ b/stock/templates/stock/shopping_list_items.jinja
@@ -1,51 +1,51 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}{{ shoppinglist }}'s items{% endtrans %}
+  {% trans %}{{ shoppinglist }}'s items{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if current_tab == "stocks" %}
-	<a href="{{ url('stock:shoppinglist_list', stock_id=shoppinglist.stock_owner.id)}}">{% trans %}Back{% endtrans %}</a>
-{% endif %}
+  {% if current_tab == "stocks" %}
+    <a href="{{ url('stock:shoppinglist_list', stock_id=shoppinglist.stock_owner.id)}}">{% trans %}Back{% endtrans %}</a>
+  {% endif %}
 
-<h3>{{ shoppinglist.name }}</h3>
-{% for t in ProductType.objects.order_by('name').all() %}
-	{% if shoppinglist.shopping_items_to_buy.filter(type=t) %}
-	<h4>{{ t }}</h4>
-	<br>
-	<table>
-		<thead>
-		    <tr>
-		        <td>{% trans %}Name{% endtrans %}</td>
-		        <td>{% trans %}Quantity asked{% endtrans %}</td>
-		        <td>{% trans %}Quantity bought{% endtrans %}</td>
-		    </tr>
-		</thead>
-		<tbody>
-    	{% for i in shoppinglist.shopping_items_to_buy.filter(type=t).order_by('name').all() %}
-			<tr>
-				<td>{{ i.name }}</td>
-				<td>{{ i.tobuy_quantity }}</td>
-				<td>{{ i.bought_quantity }}</td>
-			</tr>
-		{% endfor %}
-		</tbody>
-	</table>
-	{% endif %}
-{% endfor %}
-<h4>{% trans %}Other{% endtrans %}</h4>
-<br>
-<table>
-	<thead>
-	    <tr>
-	        <td>{% trans %}Comments{% endtrans %}</td>
-	    </tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>{{ shoppinglist.comment }}</td>
-		</tr>
-	</tbody>
-</table>
+  <h3>{{ shoppinglist.name }}</h3>
+  {% for t in ProductType.objects.order_by('name').all() %}
+    {% if shoppinglist.shopping_items_to_buy.filter(type=t) %}
+      <h4>{{ t }}</h4>
+      <br>
+      <table>
+        <thead>
+          <tr>
+            <td>{% trans %}Name{% endtrans %}</td>
+            <td>{% trans %}Quantity asked{% endtrans %}</td>
+            <td>{% trans %}Quantity bought{% endtrans %}</td>
+          </tr>
+        </thead>
+        <tbody>
+          {% for i in shoppinglist.shopping_items_to_buy.filter(type=t).order_by('name').all() %}
+            <tr>
+              <td>{{ i.name }}</td>
+              <td>{{ i.tobuy_quantity }}</td>
+              <td>{{ i.bought_quantity }}</td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    {% endif %}
+  {% endfor %}
+  <h4>{% trans %}Other{% endtrans %}</h4>
+  <br>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Comments{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>{{ shoppinglist.comment }}</td>
+      </tr>
+    </tbody>
+  </table>
 {% endblock %}
\ No newline at end of file
diff --git a/stock/templates/stock/shopping_list_quantity.jinja b/stock/templates/stock/shopping_list_quantity.jinja
index 45a76d97f..8ac66397e 100644
--- a/stock/templates/stock/shopping_list_quantity.jinja
+++ b/stock/templates/stock/shopping_list_quantity.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans s = stock %}{{ s }}'s quantity to buy{% endtrans %}
+  {% trans s = stock %}{{ s }}'s quantity to buy{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans s = stock %}{{ s }}'s quantity to buy{% endtrans %}</h3>
-    <div>
-    	<form method="post" action="" class="inline" style="display:inline">
-        	{% csrf_token %}
-        	{{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Create shopping list{% endtrans %}" /></p>
-        </form>
-    </div>
+  <h3>{% trans s = stock %}{{ s }}'s quantity to buy{% endtrans %}</h3>
+  <div>
+    <form method="post" action="" class="inline" style="display:inline">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <p><input type="submit" value="{% trans %}Create shopping list{% endtrans %}" /></p>
+    </form>
+  </div>
 {% endblock %}
diff --git a/stock/templates/stock/stock_item_list.jinja b/stock/templates/stock/stock_item_list.jinja
index dd8e68b69..15f2ba750 100644
--- a/stock/templates/stock/stock_item_list.jinja
+++ b/stock/templates/stock/stock_item_list.jinja
@@ -2,31 +2,31 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{{ stock }}
+  {{ stock }}
 {% endblock %}
 
 {% block content %}
-{% if current_tab == "stocks" %}
-	<p><a href="{{ url('stock:new_item', stock_id=stock.id)}}">{% trans %}New item{% endtrans %}</a></p>
-	<h5><a href="{{ url('stock:shoppinglist_list', stock_id=stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a></h5>
-{% endif %}
-{% if stock %}
-<h3>{{ stock }}</h3>
-{% for t in ProductType.objects.order_by('name') %}
-	<h4>{{ t }}</h4>
-	<ul>
-    {% for i in stock.items.filter(type=t).order_by('name') %}
-    	<li><a href="{{ url('stock:edit_item', item_id=i.id)}}">{{ i }} ({{ i.effective_quantity }} {% trans %}left{% endtrans %})</a></li>
+  {% if current_tab == "stocks" %}
+    <p><a href="{{ url('stock:new_item', stock_id=stock.id)}}">{% trans %}New item{% endtrans %}</a></p>
+    <h5><a href="{{ url('stock:shoppinglist_list', stock_id=stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a></h5>
+  {% endif %}
+  {% if stock %}
+    <h3>{{ stock }}</h3>
+    {% for t in ProductType.objects.order_by('name') %}
+      <h4>{{ t }}</h4>
+      <ul>
+        {% for i in stock.items.filter(type=t).order_by('name') %}
+          <li><a href="{{ url('stock:edit_item', item_id=i.id)}}">{{ i }} ({{ i.effective_quantity }} {% trans %}left{% endtrans %})</a></li>
+        {% endfor %}
+      </ul>
     {% endfor %}
-	</ul>
-{% endfor %}
-<h4>{% trans %}Others{% endtrans %}</h4>
-	<ul>
-    {% for i in stock.items.filter(type=None).order_by('name') %}
-    	<li><a href="{{ url('stock:edit_item', item_id=i.id)}}">{{ i }} ({{ i.effective_quantity }} {% trans %}left{% endtrans %})</a></li>
-    {% endfor %}
-	</ul>
-{% else %}
-{% trans %}There is no items in this stock.{% endtrans %}
-{% endif %}
+    <h4>{% trans %}Others{% endtrans %}</h4>
+    <ul>
+      {% for i in stock.items.filter(type=None).order_by('name') %}
+        <li><a href="{{ url('stock:edit_item', item_id=i.id)}}">{{ i }} ({{ i.effective_quantity }} {% trans %}left{% endtrans %})</a></li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no items in this stock.{% endtrans %}
+  {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/stock/templates/stock/stock_list.jinja b/stock/templates/stock/stock_list.jinja
index b803094af..c3e56ba1f 100644
--- a/stock/templates/stock/stock_list.jinja
+++ b/stock/templates/stock/stock_list.jinja
@@ -1,24 +1,24 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Stock list{% endtrans %}
+  {% trans %}Stock list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-{% if stock_list %}
-<h3>{% trans %}Stock list{% endtrans %}</h3>
-<ul>
-    {% for s in stock_list.order_by('name')  %}
-    <li>
-    	{% if user.can_edit(s) %}
-    	<a href="{{ url('stock:items_list', stock_id=s.id) }}">{{ s }}</a>
-    	- <a href="{{ url('stock:edit', stock_id=s.id) }}">Edit</a>
-    	- <a href="{{ url('stock:shoppinglist_list', stock_id=s.id)}}">{% trans %}Shopping lists{% endtrans %}</a>
-    	{% endif %}
-    </li>
-    {% endfor %}
-</ul>
-{% else %}
-{% trans %}There is no stocks in this website.{% endtrans %}
-{% endif %}
+  {% if stock_list %}
+    <h3>{% trans %}Stock list{% endtrans %}</h3>
+    <ul>
+      {% for s in stock_list.order_by('name')  %}
+        <li>
+          {% if user.can_edit(s) %}
+            <a href="{{ url('stock:items_list', stock_id=s.id) }}">{{ s }}</a>
+            - <a href="{{ url('stock:edit', stock_id=s.id) }}">Edit</a>
+            - <a href="{{ url('stock:shoppinglist_list', stock_id=s.id)}}">{% trans %}Shopping lists{% endtrans %}</a>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no stocks in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
diff --git a/stock/templates/stock/stock_shopping_list.jinja b/stock/templates/stock/stock_shopping_list.jinja
index b8ca84e38..e5d29f8b5 100644
--- a/stock/templates/stock/stock_shopping_list.jinja
+++ b/stock/templates/stock/stock_shopping_list.jinja
@@ -1,75 +1,75 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-Shopping list for {{ stock }}
+  Shopping list for {{ stock }}
 {% endblock %}
 
 {% block content %}
-{% if current_tab == "stocks" %}
-	<a href="{{ url('stock:shoppinglist_create', stock_id=stock.id)}}">{% trans %}Create shopping list{% endtrans %}</a>
-{% endif %}
-<h3>{% trans s=stock %}Shopping lists history for {{ s }}{% endtrans %}</h3>
+  {% if current_tab == "stocks" %}
+    <a href="{{ url('stock:shoppinglist_create', stock_id=stock.id)}}">{% trans %}Create shopping list{% endtrans %}</a>
+  {% endif %}
+  <h3>{% trans s=stock %}Shopping lists history for {{ s }}{% endtrans %}</h3>
 
-	<p>
-		{% trans %}Information :{% endtrans %}
-		<br>
-		{% trans %}Use the "update stock" action when you get back from shopping to add the effective quantity bought for each shopping list item.{% endtrans %}
-		<br> 
-		{% trans %}For example, 3 Cheeseburger (boxes) are aksing in the list, but there were only 2 so, 2 have to be added in the stock quantity.{% endtrans %}
-	</p>
+  <p>
+    {% trans %}Information :{% endtrans %}
+    <br>
+    {% trans %}Use the "update stock" action when you get back from shopping to add the effective quantity bought for each shopping list item.{% endtrans %}
+    <br>
+    {% trans %}For example, 3 Cheeseburger (boxes) are aksing in the list, but there were only 2 so, 2 have to be added in the stock quantity.{% endtrans %}
+  </p>
 
-	<h4>{% trans %}To do{% endtrans %}</h4>
-	<table>
-		<thead>
-		    <tr>
-		        <td>{% trans %}Date{% endtrans %}</td>
-		        <td>{% trans %}Name{% endtrans %}</td>
-		        <td>{% trans %}Number of items{% endtrans %}</td>
-		    </tr>
-		</thead>
-		<tbody>
-		{% for s in stock.shopping_lists.filter(todo=True).filter(stock_owner=stock).order_by('-date').all() %}
-			<tr>
-				<td>{{ s.date|localtime|date("Y-m-d H:i") }}</td>
-				<td><a href="{{ url('stock:shoppinglist_items', stock_id=stock.id, shoppinglist_id=s.id)}}">{{ s.name }}</a></td>
-				<td>{{ s.shopping_items_to_buy.count() }}</td>
-				<td>
-					<a href="{{ url('stock:update_after_shopping', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Update stock{% endtrans %}</a>
-				</td>
-				<td>
-					<a href="{{ url('stock:shoppinglist_set_done', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Mark as done{% endtrans %}</a>
-				</td>
-				<td>
-					<a href="{{ url('stock:shoppinglist_delete', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Delete{% endtrans %}</a>
-				</td>
-			</tr>
-		{% endfor %}
-		</tbody>
-	</table>
+  <h4>{% trans %}To do{% endtrans %}</h4>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Date{% endtrans %}</td>
+        <td>{% trans %}Name{% endtrans %}</td>
+        <td>{% trans %}Number of items{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for s in stock.shopping_lists.filter(todo=True).filter(stock_owner=stock).order_by('-date').all() %}
+        <tr>
+          <td>{{ s.date|localtime|date("Y-m-d H:i") }}</td>
+          <td><a href="{{ url('stock:shoppinglist_items', stock_id=stock.id, shoppinglist_id=s.id)}}">{{ s.name }}</a></td>
+          <td>{{ s.shopping_items_to_buy.count() }}</td>
+          <td>
+            <a href="{{ url('stock:update_after_shopping', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Update stock{% endtrans %}</a>
+          </td>
+          <td>
+            <a href="{{ url('stock:shoppinglist_set_done', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Mark as done{% endtrans %}</a>
+          </td>
+          <td>
+            <a href="{{ url('stock:shoppinglist_delete', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
-	<h4>{% trans %}Done{% endtrans %}</h4>
-	<table>
-		<thead>
-		    <tr>
-		        <td>{% trans %}Date{% endtrans %}</td>
-		        <td>{% trans %}Name{% endtrans %}</td>
-		        <td>{% trans %}Number of items{% endtrans %}</td>
-		    </tr>
-		</thead>
-		<tbody>
-		{% for s in stock.shopping_lists.filter(todo=False).filter(stock_owner=stock).order_by('-date').all() %}
-			<tr>
-				<td>{{ s.date|localtime|date("Y-m-d H:i") }}</td>
-				<td><a href="{{ url('stock:shoppinglist_items', stock_id=stock.id, shoppinglist_id=s.id)}}">{{ s.name }}</a></td>
-				<td>{{ s.shopping_items_to_buy.count() }}</td>
-				<td>
-					<a href="{{ url('stock:shoppinglist_set_todo', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Mark as to do{% endtrans %}</a>
-				</td>
-				<td>
-					<a href="{{ url('stock:shoppinglist_delete', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Delete{% endtrans %}</a>
-				</td>
-			</tr>
-		{% endfor %}
-		</tbody>
-	</table>
+  <h4>{% trans %}Done{% endtrans %}</h4>
+  <table>
+    <thead>
+      <tr>
+        <td>{% trans %}Date{% endtrans %}</td>
+        <td>{% trans %}Name{% endtrans %}</td>
+        <td>{% trans %}Number of items{% endtrans %}</td>
+      </tr>
+    </thead>
+    <tbody>
+      {% for s in stock.shopping_lists.filter(todo=False).filter(stock_owner=stock).order_by('-date').all() %}
+        <tr>
+          <td>{{ s.date|localtime|date("Y-m-d H:i") }}</td>
+          <td><a href="{{ url('stock:shoppinglist_items', stock_id=stock.id, shoppinglist_id=s.id)}}">{{ s.name }}</a></td>
+          <td>{{ s.shopping_items_to_buy.count() }}</td>
+          <td>
+            <a href="{{ url('stock:shoppinglist_set_todo', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Mark as to do{% endtrans %}</a>
+          </td>
+          <td>
+            <a href="{{ url('stock:shoppinglist_delete', stock_id=stock.id, shoppinglist_id=s.id)}}">{% trans %}Delete{% endtrans %}</a>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 {% endblock %}
\ No newline at end of file
diff --git a/stock/templates/stock/stock_take_items.jinja b/stock/templates/stock/stock_take_items.jinja
index ed59b3bcb..742ad4469 100644
--- a/stock/templates/stock/stock_take_items.jinja
+++ b/stock/templates/stock/stock_take_items.jinja
@@ -2,16 +2,16 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block title %}
-{% trans s = stock %}Take items from {{ s }}{% endtrans %}
+  {% trans s = stock %}Take items from {{ s }}{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans s = stock %}Take items from {{ s }}{% endtrans %}</h3>
-    <div>
-    	<form method="post" action="" class="inline" style="display:inline">
-        	{% csrf_token %}
-        	{{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Take items{% endtrans %}" /></p>
-        </form>
-    </div>
+  <h3>{% trans s = stock %}Take items from {{ s }}{% endtrans %}</h3>
+  <div>
+    <form method="post" action="" class="inline" style="display:inline">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <p><input type="submit" value="{% trans %}Take items{% endtrans %}" /></p>
+    </form>
+  </div>
 {% endblock %}
diff --git a/stock/templates/stock/update_after_shopping.jinja b/stock/templates/stock/update_after_shopping.jinja
index fb0439859..708ace05f 100644
--- a/stock/templates/stock/update_after_shopping.jinja
+++ b/stock/templates/stock/update_after_shopping.jinja
@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans s = shoppinglist %}Update {{ s }}'s quantity after shopping{% endtrans %}
+  {% trans s = shoppinglist %}Update {{ s }}'s quantity after shopping{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans s = shoppinglist %}Update {{ s }}'s quantity after shopping{% endtrans %}</h3>
-    <div>
-    	<form method="post" action="" class="inline" style="display:inline">
-        	{% csrf_token %}
-        	{{ form.as_p() }}
-            <p><input type="submit" value="{% trans %}Update stock quantities{% endtrans %}" /></p>
-        </form>
-    </div>
+  <h3>{% trans s = shoppinglist %}Update {{ s }}'s quantity after shopping{% endtrans %}</h3>
+  <div>
+    <form method="post" action="" class="inline" style="display:inline">
+      {% csrf_token %}
+      {{ form.as_p() }}
+      <p><input type="submit" value="{% trans %}Update stock quantities{% endtrans %}" /></p>
+    </form>
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/subscription/templates/subscription/stats.jinja b/subscription/templates/subscription/stats.jinja
index 5db061a3a..617705b9c 100644
--- a/subscription/templates/subscription/stats.jinja
+++ b/subscription/templates/subscription/stats.jinja
@@ -1,136 +1,136 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-    {% trans %}Subscription stats{% endtrans %}
+  {% trans %}Subscription stats{% endtrans %}
 {% endblock %}
 
 {% block head %}
-{{ super() }}
-<script type="text/javascript" src="{{ static('core/js/Chart.bundle.min.js') }}"></script>
+  {{ super() }}
+  <script type="text/javascript" src="{{ static('core/js/Chart.bundle.min.js') }}"></script>
 {% endblock %}
 
 {% block content %}
 
-<p>
+  <p>
     {{ form.start_date.label }}<br>
     {{ form.start_date }}<br><br>
     {{ form.end_date.label }}<br>
     {{ form.end_date }}<br>
     <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
-</p>
+  </p>
 
-<canvas id="statsChart" width="400" height="200"></canvas>
+  <canvas id="statsChart" width="400" height="200"></canvas>
 
-<p>
+  <p>
     {% trans %}Total subscriptions{% endtrans %} : {{ subscriptions_total.count() }}<br><br>
     {% trans %}Subscriptions by type{% endtrans %}<br><br>
     {% for location in locations %}
-        {{ location[1] }} : <i class="nb">{{ subscriptions_total.filter(location=location[0]).count() }}</i><br>
+      {{ location[1] }} : <i class="nb">{{ subscriptions_total.filter(location=location[0]).count() }}</i><br>
     {% endfor %}
-<p>
+    <p>
 
-<br>
+      <br>
 
-<table>
-    <tr>
-        <th>{% trans %}Subscription type{% endtrans %}</th>
-        {% for location in locations %}
-            <th>{{ location[1] }}</th>
-        {% endfor %}
-        <th id="graphLabel">{% trans %}Total{% endtrans %}</th>
-        {% for type in subscriptions_types %}
+      <table>
         <tr>
-            <td><i class="types" >{{ subscriptions_types[type]['name'] }}</i></td>
-            {% set subscriptions_total_type = subscriptions_total.filter(subscription_type=type) %}
-            {% for location in locations %}
+          <th>{% trans %}Subscription type{% endtrans %}</th>
+          {% for location in locations %}
+            <th>{{ location[1] }}</th>
+          {% endfor %}
+          <th id="graphLabel">{% trans %}Total{% endtrans %}</th>
+          {% for type in subscriptions_types %}
+            <tr>
+              <td><i class="types" >{{ subscriptions_types[type]['name'] }}</i></td>
+              {% set subscriptions_total_type = subscriptions_total.filter(subscription_type=type) %}
+              {% for location in locations %}
                 <td>
-                {% set subscriptions_total_type_location = subscriptions_total_type.filter(location=location[0]) %}
-                {% trans %}Total{% endtrans %} : {{ subscriptions_total_type_location.count()}}<br>
-                {% for p_type in payment_types %}
-                {{ p_type[1] }} : <i class="nb">{{ subscriptions_total_type_location.filter(payment_method=p_type[0]).count()}}</i><br>
-                {% endfor %}
+                  {% set subscriptions_total_type_location = subscriptions_total_type.filter(location=location[0]) %}
+                  {% trans %}Total{% endtrans %} : {{ subscriptions_total_type_location.count()}}<br>
+                  {% for p_type in payment_types %}
+                    {{ p_type[1] }} : <i class="nb">{{ subscriptions_total_type_location.filter(payment_method=p_type[0]).count()}}</i><br>
+                  {% endfor %}
                 </td>
-            {% endfor %}
-            <td class="total"><i class="nb">{{subscriptions_total_type.count()}}</i>
-        </tr>
-        {% endfor %}
-</table>
+              {% endfor %}
+              <td class="total"><i class="nb">{{subscriptions_total_type.count()}}</i>
+              </tr>
+          {% endfor %}
+        </table>
 
 {% endblock %}
 
 {% block script %}
-{{ super() }}
-<script>
-function getRandomColor() {
-    var letters = '0123456789ABCDEF';
-    var color = '#';
-    for (var i = 0; i < 6; i++ ) {
+  {{ super() }}
+  <script>
+    function getRandomColor() {
+      var letters = '0123456789ABCDEF';
+      var color = '#';
+      for (var i = 0; i < 6; i++ ) {
         color += letters[Math.floor(Math.random() * 16)];
+      }
+      return color;
     }
-    return color;
-}
-function getRandomColorUniq(list) {
-    var color = getRandomColor();
-    while (list.includes(color)){
+    function getRandomColorUniq(list) {
+      var color = getRandomColor();
+      while (list.includes(color)){
         color = getRandomColor();
+      }
+      return color;
     }
-    return color;
-}
-function hexToRgb(hex) {
+    function hexToRgb(hex) {
     // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
-    var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
-    hex = hex.replace(shorthandRegex, function(m, r, g, b) {
+      var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+      hex = hex.replace(shorthandRegex, function(m, r, g, b) {
         return r + r + g + g + b + b;
-    });
+      });
 
-    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-    return result ? {
+      var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+      return result ? {
         r: parseInt(result[1], 16),
         g: parseInt(result[2], 16),
         b: parseInt(result[3], 16)
-    } : null;
-}
+      } : null;
+    }
 
-var ctx = document.getElementById("statsChart").getContext('2d');
-var labels = [];
-var total = [];
-var colors = [];
-var colors_dimmed = [];
-Array.from(document.getElementsByClassName("types")).forEach(function(element){
-    labels.push(element.childNodes[0].data);
-});
-Array.from(document.getElementsByClassName("total")).forEach(function(element){
-    total.push(element.childNodes[0].childNodes[0].data);
-});
-labels.forEach(function(element){
-    colors.push(getRandomColorUniq(colors));
-});
-colors.forEach(function(element){
-    var rgb_color = hexToRgb(element);
-    colors_dimmed.push('rgba(' + rgb_color.r + ', ' + rgb_color.g + ', ' + rgb_color.b + ', 0.2)');
-});
-console.log(colors);console.log(colors_dimmed);
-var myChart = new Chart(ctx, {
-    type: 'bar',
-    data: {
+    var ctx = document.getElementById("statsChart").getContext('2d');
+    var labels = [];
+    var total = [];
+    var colors = [];
+    var colors_dimmed = [];
+    Array.from(document.getElementsByClassName("types")).forEach(function(element){
+      labels.push(element.childNodes[0].data);
+    });
+    Array.from(document.getElementsByClassName("total")).forEach(function(element){
+      total.push(element.childNodes[0].childNodes[0].data);
+    });
+    labels.forEach(function(element){
+      colors.push(getRandomColorUniq(colors));
+    });
+    colors.forEach(function(element){
+      var rgb_color = hexToRgb(element);
+      colors_dimmed.push('rgba(' + rgb_color.r + ', ' + rgb_color.g + ', ' + rgb_color.b + ', 0.2)');
+    });
+    console.log(colors);console.log(colors_dimmed);
+    var myChart = new Chart(ctx, {
+      type: 'bar',
+      data: {
         labels: labels,
         datasets: [{
-            label: document.getElementById("graphLabel").childNodes[0].data,
-            data: total,
-            backgroundColor: colors_dimmed,
-            borderColor: colors,
-            borderWidth: 1
+          label: document.getElementById("graphLabel").childNodes[0].data,
+          data: total,
+          backgroundColor: colors_dimmed,
+          borderColor: colors,
+          borderWidth: 1
         }]
-    },
-    options: {
+      },
+      options: {
         scales: {
-            yAxes: [{
-                ticks: {
-                    beginAtZero:true
-                }
-            }]
+          yAxes: [{
+            ticks: {
+              beginAtZero:true
+            }
+          }]
         }
-    }
-});
-</script>
+      }
+    });
+  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/subscription/templates/subscription/subscription.jinja b/subscription/templates/subscription/subscription.jinja
index 7c0fc4708..a26c7afca 100644
--- a/subscription/templates/subscription/subscription.jinja
+++ b/subscription/templates/subscription/subscription.jinja
@@ -1,62 +1,62 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}New subscription{% endtrans %}
+  {% trans %}New subscription{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}New subscription{% endtrans %}</h3>
-<div id="user_info"></div>
-<form action="" method="post" id="subscription_form">
+  <h3>{% trans %}New subscription{% endtrans %}</h3>
+  <div id="user_info"></div>
+  <form action="" method="post" id="subscription_form">
     {% csrf_token %}
     {{ form.non_field_errors() }}
     <p>{{ form.member.errors }}<label for="{{ form.member.name }}">{{ form.member.label }}</label> {{ form.member }}</p>
     <div id="new_member">
-        <p>{{ form.first_name.errors }}<label for="{{ form.first_name.name }}">{{ form.first_name.label }}</label> {{ form.first_name }}</p>
-        <p>{{ form.last_name.errors }}<label for="{{ form.last_name.name }}">{{ form.last_name.label }}</label> {{ form.last_name }}</p>
-        <p>{{ form.email.errors }}<label for="{{ form.email.name }}">{{ form.email.label }}</label> {{ form.email }}</p>
-        <p>{{ form.date_of_birth.errors }}<label for="{{ form.date_of_birth.name }}">{{ form.date_of_birth.label}}</label> {{ form.date_of_birth }}</p>
+      <p>{{ form.first_name.errors }}<label for="{{ form.first_name.name }}">{{ form.first_name.label }}</label> {{ form.first_name }}</p>
+      <p>{{ form.last_name.errors }}<label for="{{ form.last_name.name }}">{{ form.last_name.label }}</label> {{ form.last_name }}</p>
+      <p>{{ form.email.errors }}<label for="{{ form.email.name }}">{{ form.email.label }}</label> {{ form.email }}</p>
+      <p>{{ form.date_of_birth.errors }}<label for="{{ form.date_of_birth.name }}">{{ form.date_of_birth.label}}</label> {{ form.date_of_birth }}</p>
     </div>
     <p>{{ form.subscription_type.errors }}<label for="{{ form.subscription_type.name }}">{{ form.subscription_type.label }}</label> {{ form.subscription_type }}</p>
     <p>{{ form.payment_method.errors }}<label for="{{ form.payment_method.name }}">{{ form.payment_method.label }}</label> {{
-    form.payment_method }}</p>
+      form.payment_method }}</p>
     <p>{% trans %}Eboutic is reserved to specific users. In doubt, don't use it.{% endtrans %}</p>
     <p>{{ form.location.errors }}<label for="{{ form.location.name }}">{{ form.location.label }}</label> {{ form.location }}</p>
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 {% block script %}
-    {{ super() }}
-<script type="text/javascript" charset="utf-8">
-$( function() {
-    select = $("#id_member");
-    member_block = $("#subscription_form #new_member");
-    user_info = $("#user_info");
-    function display_new_member() {
+  {{ super() }}
+  <script type="text/javascript" charset="utf-8">
+    $( function() {
+      select = $("#id_member");
+      member_block = $("#subscription_form #new_member");
+      user_info = $("#user_info");
+      function display_new_member() {
         if (select.val()) {
-            member_block.hide();
-            member_block.children().each(function() {
-                $(this).children().each(function() {
-                    $(this).removeAttr('required');
-                });
+          member_block.hide();
+          member_block.children().each(function() {
+            $(this).children().each(function() {
+              $(this).removeAttr('required');
             });
-            user_info.load("/user/"+select.val()+"/mini");
-            user_info.show();
+          });
+          user_info.load("/user/"+select.val()+"/mini");
+          user_info.show();
         } else {
-            member_block.show();
-            member_block.children().each(function() {
-                $(this).children().each(function() {
-                    $(this).prop('required', true);
-                });
+          member_block.show();
+          member_block.children().each(function() {
+            $(this).children().each(function() {
+              $(this).prop('required', true);
             });
+          });
 
-            user_info.empty();
-            user_info.hide();
+          user_info.empty();
+          user_info.hide();
         }
-    }
-    select.on("change", display_new_member);
-    display_new_member();
-} );
-</script>
+      }
+      select.on("change", display_new_member);
+      display_new_member();
+    } );
+  </script>
 {% endblock %}
diff --git a/trombi/templates/trombi/comment.jinja b/trombi/templates/trombi/comment.jinja
index c8694bb88..e23a3ef0f 100644
--- a/trombi/templates/trombi/comment.jinja
+++ b/trombi/templates/trombi/comment.jinja
@@ -1,30 +1,30 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Comment{% endtrans %}
+  {% trans %}Comment{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h2>{% trans %}Comment{% endtrans %}</h2>
-<div style="width: 400px; margin: auto; border: solid 1px grey; text-align: center">
+  <h2>{% trans %}Comment{% endtrans %}</h2>
+  <div style="width: 400px; margin: auto; border: solid 1px grey; text-align: center">
     {% set file = None %}
     {% if target.profile_pict %}
-        {% set file = target.profile_pict.url %}
+      {% set file = target.profile_pict.url %}
     {% else %}
-        {% set file = static('core/img/na.gif') %}
+      {% set file = static('core/img/na.gif') %}
     {% endif %}
     <div style="max-width: 300px; margin: auto;">
-        <img src="{{ file }}" alt="" style="max-width: 300px">
+      <img src="{{ file }}" alt="" style="max-width: 300px">
     </div>
     <div>
-        {{ target.user.get_display_name() }}
+      {{ target.user.get_display_name() }}
     </div>
-</div>
-<form action="" method="post">
+  </div>
+  <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
+  </form>
 {% endblock %}
 
 
diff --git a/trombi/templates/trombi/comment_moderation.jinja b/trombi/templates/trombi/comment_moderation.jinja
index 893049e5d..29bea603c 100644
--- a/trombi/templates/trombi/comment_moderation.jinja
+++ b/trombi/templates/trombi/comment_moderation.jinja
@@ -1,33 +1,33 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Moderate Trombi comments{% endtrans %}
+  {% trans %}Moderate Trombi comments{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans %}Moderate Trombi comments{% endtrans %}</h3>
-<h4>{{ trombi }}</h4>
-<a href="{{ url('trombi:detail', trombi_id=object.id) }}">{% trans %}Back{% endtrans %}</a>
-<hr>
-<dl>
-{% for c in comments %}
-    <dt>{% trans author=c.author.user.get_display_name(),
-            target=c.target.user.get_display_name() %}Author: {{ author }} - Target: {{ target }}{% endtrans %}</dt>
-    <dd>
+  <h3>{% trans %}Moderate Trombi comments{% endtrans %}</h3>
+  <h4>{{ trombi }}</h4>
+  <a href="{{ url('trombi:detail', trombi_id=object.id) }}">{% trans %}Back{% endtrans %}</a>
+  <hr>
+  <dl>
+    {% for c in comments %}
+      <dt>{% trans author=c.author.user.get_display_name(),
+        target=c.target.user.get_display_name() %}Author: {{ author }} - Target: {{ target }}{% endtrans %}</dt>
+  <dd>
         <pre>
         {{ c.content }}
         </pre>
-        <form action="{{ url('trombi:moderate_comment', comment_id=c.id )}}" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="action" id="action" value="accept" />
-            <p><input type="submit" value="{% trans %}Accept{% endtrans %}" /></p>
-        </form>
-        <form action="{{ url('trombi:moderate_comment', comment_id=c.id )}}" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="action" id="action" value="reject" />
-            <p><input type="submit" value="{% trans %}Reject{% endtrans %}" /></p>
-        </form>
-    </dd>
+    <form action="{{ url('trombi:moderate_comment', comment_id=c.id )}}" method="post">
+      {% csrf_token %}
+      <input type="hidden" name="action" id="action" value="accept" />
+      <p><input type="submit" value="{% trans %}Accept{% endtrans %}" /></p>
+    </form>
+    <form action="{{ url('trombi:moderate_comment', comment_id=c.id )}}" method="post">
+      {% csrf_token %}
+      <input type="hidden" name="action" id="action" value="reject" />
+      <p><input type="submit" value="{% trans %}Reject{% endtrans %}" /></p>
+    </form>
+  </dd>
 {% endfor %}
 </dl>
 
diff --git a/trombi/templates/trombi/detail.jinja b/trombi/templates/trombi/detail.jinja
index bbd278043..b542d9baa 100644
--- a/trombi/templates/trombi/detail.jinja
+++ b/trombi/templates/trombi/detail.jinja
@@ -1,40 +1,40 @@
 {% extends 'core/base.jinja' %}
 
 {% block title %}
-{% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}
+  {% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <h2>{% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}</h2>
-    <a href="{{ url('trombi:edit', trombi_id=object.id) }}">{% trans %}Edit{% endtrans %}</a>
-    <a href="{{ url('trombi:moderate_comments', trombi_id=object.id) }}">{% trans %}Moderate comments{% endtrans %}</a>
-    <p>{% trans %}Subscription deadline: {% endtrans %}{{ object.subscription_deadline|date(DATETIME_FORMAT) }}</p>
-    <p>{% trans %}Comment deadline: {% endtrans %}{{ object.comments_deadline|date(DATETIME_FORMAT) }}</p>
-    <a href="{{ url('trombi:export', trombi_id=object.id) }}">{% trans %}Export{% endtrans %}</a>
-    <hr>
-    <h4>{% trans %}Add user{% endtrans %}</h4>
-    <form action="" method="post">
-        {% csrf_token %}
-        {{ form.as_p() }}
-        <input type="submit" value="{% trans %}Add{% endtrans %}" />
-    </form>
-    <hr>
-    <div>
+  <h2>{% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}</h2>
+  <a href="{{ url('trombi:edit', trombi_id=object.id) }}">{% trans %}Edit{% endtrans %}</a>
+  <a href="{{ url('trombi:moderate_comments', trombi_id=object.id) }}">{% trans %}Moderate comments{% endtrans %}</a>
+  <p>{% trans %}Subscription deadline: {% endtrans %}{{ object.subscription_deadline|date(DATETIME_FORMAT) }}</p>
+  <p>{% trans %}Comment deadline: {% endtrans %}{{ object.comments_deadline|date(DATETIME_FORMAT) }}</p>
+  <a href="{{ url('trombi:export', trombi_id=object.id) }}">{% trans %}Export{% endtrans %}</a>
+  <hr>
+  <h4>{% trans %}Add user{% endtrans %}</h4>
+  <form action="" method="post">
+    {% csrf_token %}
+    {{ form.as_p() }}
+    <input type="submit" value="{% trans %}Add{% endtrans %}" />
+  </form>
+  <hr>
+  <div>
     {% for u in object.users.order_by('user__nick_name') %}
-        <div class="ib" style="border: solid 1px grey; text-align: center">
-            {% set file = None %}
-            {% if u.profile_pict %}
-                {% set file = u.profile_pict.url %}
-            {% else %}
-                {% set file = static('core/img/na.gif') %}
-            {% endif %}
-            <div style="max-width: 100px; margin: auto;">
-                <img src="{{ file }}" alt="" style="max-width: 100px">
-            </div>
-            <div>{{ u.user.get_display_name() }}</div>
-            <div><a href="{{ url('trombi:delete_user', user_id=u.id) }}">{% trans %}Delete{% endtrans %}</a></div>
-            <div><a href="{{ url('trombi:create_membership', user_id=u.id) }}">{% trans %}Add club membership{% endtrans %}</a></div>
+      <div class="ib" style="border: solid 1px grey; text-align: center">
+        {% set file = None %}
+        {% if u.profile_pict %}
+          {% set file = u.profile_pict.url %}
+        {% else %}
+          {% set file = static('core/img/na.gif') %}
+        {% endif %}
+        <div style="max-width: 100px; margin: auto;">
+          <img src="{{ file }}" alt="" style="max-width: 100px">
         </div>
+        <div>{{ u.user.get_display_name() }}</div>
+        <div><a href="{{ url('trombi:delete_user', user_id=u.id) }}">{% trans %}Delete{% endtrans %}</a></div>
+        <div><a href="{{ url('trombi:create_membership', user_id=u.id) }}">{% trans %}Add club membership{% endtrans %}</a></div>
+      </div>
     {% endfor %}
-    </div>
+  </div>
 {% endblock %}
diff --git a/trombi/templates/trombi/edit_profile.jinja b/trombi/templates/trombi/edit_profile.jinja
index 819ebe512..5a8aa3485 100644
--- a/trombi/templates/trombi/edit_profile.jinja
+++ b/trombi/templates/trombi/edit_profile.jinja
@@ -1,42 +1,42 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Edit profile{% endtrans %}
+  {% trans %}Edit profile{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h2>{% trans %}Edit profile{% endtrans %}</h2>
-<p> <a href="{{ url('trombi:user_tools') }}">{% trans %}Back to tools{% endtrans %}</a></p>
-<form action="" method="post" enctype="multipart/form-data">
+  <h2>{% trans %}Edit profile{% endtrans %}</h2>
+  <p> <a href="{{ url('trombi:user_tools') }}">{% trans %}Back to tools{% endtrans %}</a></p>
+  <form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
-<h4>{% trans %}Club{% endtrans %}</h4>
-<a href="{{ url('trombi:reset_memberships') }}">
+  </form>
+  <h4>{% trans %}Club{% endtrans %}</h4>
+  <a href="{{ url('trombi:reset_memberships') }}">
     {% trans %}Reset club memberships in Trombi (delete exising ones, does not impact real club memberships){% endtrans %}
-</a>
-<table style="max-width: 80%; margin: auto;">
+  </a>
+  <table style="max-width: 80%; margin: auto;">
     <thead>
-        <tr>
-            <td>{% trans %}Club{% endtrans %}</td>
-            <td>{% trans %}Role{% endtrans %}</td>
-            <td>{% trans %}Dates{% endtrans %}</td>
-        </tr>
+      <tr>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Role{% endtrans %}</td>
+        <td>{% trans %}Dates{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-        {% for m in user.trombi_user.memberships.all() %}
+      {% for m in user.trombi_user.memberships.all() %}
         <tr>
-            <td>{{ m.club }}</td>
-            <td>{{ m.role }}</td>
-            <td>{{ m.start }} - {{ m.end }}</td>
-            <td>
-                <a href="{{ url('trombi:edit_membership', membership_id=m.id) }}">{% trans %}Edit{% endtrans %}</a>
-                <a href="{{ url('trombi:delete_membership', membership_id=m.id) }}">{% trans %}Delete{% endtrans %}</a>
-            </td>
+          <td>{{ m.club }}</td>
+          <td>{{ m.role }}</td>
+          <td>{{ m.start }} - {{ m.end }}</td>
+          <td>
+            <a href="{{ url('trombi:edit_membership', membership_id=m.id) }}">{% trans %}Edit{% endtrans %}</a>
+            <a href="{{ url('trombi:delete_membership', membership_id=m.id) }}">{% trans %}Delete{% endtrans %}</a>
+          </td>
         </tr>
-        {% endfor %}
+      {% endfor %}
     </tbody>
-</table>
+  </table>
 {% endblock %}
 
diff --git a/trombi/templates/trombi/export.jinja b/trombi/templates/trombi/export.jinja
index 679491ddd..f7cc408ea 100644
--- a/trombi/templates/trombi/export.jinja
+++ b/trombi/templates/trombi/export.jinja
@@ -1,117 +1,117 @@
 {% extends 'core/base.jinja' %}
 
 {% block title %}
-{% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}
+  {% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    <h2>{% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}</h2>
-    <a href="{{ url('trombi:detail', trombi_id=object.id) }}">{% trans %}Back{% endtrans %}</a>
-    <hr>
-    <div>
+  <h2>{% trans club=object.club %}{{ club }}'s Trombi{% endtrans %}</h2>
+  <a href="{{ url('trombi:detail', trombi_id=object.id) }}">{% trans %}Back{% endtrans %}</a>
+  <hr>
+  <div>
     {% for trombi_user in object.users.order_by('user__nick_name') %}
-        <div style="border: solid 1px grey; text-align: center; margin: 5px;">
-            <div id="user_{{ trombi_user.id }}_infos">
-                {{ trombi_user.user.get_display_name() }}<br>
-                {{ trombi_user.user.department }}/{{ trombi_user.user.dpt_option }}<br>
-                {% trans %}Quote: {% endtrans %}{{ trombi_user.user.quote }}<br>
-                {% trans %}Date of birth: {% endtrans %}{{ trombi_user.user.date_of_birth|date("d F Y") }}<br>
-                {% trans %}Email: {% endtrans %}{{ trombi_user.user.second_email }}<br>
-                {% trans %}Phone: {% endtrans %}{{ trombi_user.user.phone|phonenumber }}<br>
-                {% trans %}City: {% endtrans %}{{ trombi_user.user.parent_address }}<br>
-            </div>
-            <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_infos'))">{% trans %}Copy{% endtrans %}</button>
+      <div style="border: solid 1px grey; text-align: center; margin: 5px;">
+        <div id="user_{{ trombi_user.id }}_infos">
+          {{ trombi_user.user.get_display_name() }}<br>
+          {{ trombi_user.user.department }}/{{ trombi_user.user.dpt_option }}<br>
+          {% trans %}Quote: {% endtrans %}{{ trombi_user.user.quote }}<br>
+          {% trans %}Date of birth: {% endtrans %}{{ trombi_user.user.date_of_birth|date("d F Y") }}<br>
+          {% trans %}Email: {% endtrans %}{{ trombi_user.user.second_email }}<br>
+          {% trans %}Phone: {% endtrans %}{{ trombi_user.user.phone|phonenumber }}<br>
+          {% trans %}City: {% endtrans %}{{ trombi_user.user.parent_address }}<br>
+        </div>
+        <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_infos'))">{% trans %}Copy{% endtrans %}</button>
 
-            <h4>{% trans %}Pictures{% endtrans %}</h4>
-            {% set profile_file = None %}
-            {% set scrub_file = None %}
-            {% if trombi_user.profile_pict %}
-                {% set profile_file = trombi_user.profile_pict.url %}
-            {% else %}
-                {% set profile_file = static('core/img/na.gif') %}
-            {% endif %}
-            {% if trombi_user.scrub_pict %}
-                {% set scrub_file = trombi_user.scrub_pict.url %}
-            {% else %}
-                {% set scrub_file = static('core/img/na.gif') %}
-            {% endif %}
-            <div style="max-width: 410px; margin: auto; text-align: center;">
-                <div>
-                    <div class="ib w_medium">
-                        <div id="user_{{ trombi_user.id }}_profile"><img src="{{ profile_file }}" alt="" style="max-width: 200px"></div>
-                        <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_profile'))">{% trans %}Copy profile picture{% endtrans %}</button>
-                    </div>
-                    <div class="ib w_medium">
-                        <div id="user_{{ trombi_user.id }}_scrub"><img src="{{ scrub_file }}" alt="" style="max-width: 200px"></div>
-                        <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_scrub'))">{% trans %}Copy scrub picture{% endtrans %}</button>
-                    </div>
-                </div>
+        <h4>{% trans %}Pictures{% endtrans %}</h4>
+        {% set profile_file = None %}
+        {% set scrub_file = None %}
+        {% if trombi_user.profile_pict %}
+          {% set profile_file = trombi_user.profile_pict.url %}
+        {% else %}
+          {% set profile_file = static('core/img/na.gif') %}
+        {% endif %}
+        {% if trombi_user.scrub_pict %}
+          {% set scrub_file = trombi_user.scrub_pict.url %}
+        {% else %}
+          {% set scrub_file = static('core/img/na.gif') %}
+        {% endif %}
+        <div style="max-width: 410px; margin: auto; text-align: center;">
+          <div>
+            <div class="ib w_medium">
+              <div id="user_{{ trombi_user.id }}_profile"><img src="{{ profile_file }}" alt="" style="max-width: 200px"></div>
+              <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_profile'))">{% trans %}Copy profile picture{% endtrans %}</button>
+            </div>
+            <div class="ib w_medium">
+              <div id="user_{{ trombi_user.id }}_scrub"><img src="{{ scrub_file }}" alt="" style="max-width: 200px"></div>
+              <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_scrub'))">{% trans %}Copy scrub picture{% endtrans %}</button>
             </div>
-            {% if trombi_user.memberships.exists() %}
-            <h4>{% trans %}Club{% endtrans %}</h4>
-            <table id="user_{{ trombi_user.id }}_clubs" style="max-width: 70%; margin: auto;">
-                <thead>
-                    <tr>
-                        <td>{% trans %}Club{% endtrans %}</td>
-                        <td>{% trans %}Role{% endtrans %}</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for m in trombi_user.memberships.all() %}
-                    <tr>
-                        <td>{{ m.club }}</td>
-                        <td>{{ m.start }} - {{ m.end }} ({{ m.role }})</td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-            <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_clubs'))">{% trans %}Copy clubs{% endtrans %}</button>
-            {% endif %}
-            <h4>{% trans %}Comments{% endtrans %}</h4>
-            <table id="user_{{ trombi_user.id }}_coms" style="text-align: left; word-wrap: break-word;">
-                <tbody>
-                {% for c in trombi_user.received_comments.filter(is_moderated=True) %}
-                    <tr>
-                        <td>{{ c.author.user.get_short_name() }}</td>
-                        <td>
-                        {% for line in c.content.splitlines() %}
-                            {{ line }}<br>
-                        {% endfor %}
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-            <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_coms'))">{% trans %}Copy comments{% endtrans %}</button>
+          </div>
         </div>
+        {% if trombi_user.memberships.exists() %}
+          <h4>{% trans %}Club{% endtrans %}</h4>
+          <table id="user_{{ trombi_user.id }}_clubs" style="max-width: 70%; margin: auto;">
+            <thead>
+              <tr>
+                <td>{% trans %}Club{% endtrans %}</td>
+                <td>{% trans %}Role{% endtrans %}</td>
+              </tr>
+            </thead>
+            <tbody>
+              {% for m in trombi_user.memberships.all() %}
+                <tr>
+                  <td>{{ m.club }}</td>
+                  <td>{{ m.start }} - {{ m.end }} ({{ m.role }})</td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+          <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_clubs'))">{% trans %}Copy clubs{% endtrans %}</button>
+        {% endif %}
+        <h4>{% trans %}Comments{% endtrans %}</h4>
+        <table id="user_{{ trombi_user.id }}_coms" style="text-align: left; word-wrap: break-word;">
+          <tbody>
+            {% for c in trombi_user.received_comments.filter(is_moderated=True) %}
+              <tr>
+                <td>{{ c.author.user.get_short_name() }}</td>
+                <td>
+                  {% for line in c.content.splitlines() %}
+                    {{ line }}<br>
+                  {% endfor %}
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+        <button onclick="copyToClipboard(document.getElementById('user_{{ trombi_user.id }}_coms'))">{% trans %}Copy comments{% endtrans %}</button>
+      </div>
     {% endfor %}
-    </div>
+  </div>
 {% endblock %}
 
 {% block script %}
-{{ super () }}
-<script>
-function copyToClipboard(el) {
-    var body = document.body, range, sel;
-    if (document.createRange && window.getSelection) {
+  {{ super () }}
+  <script>
+    function copyToClipboard(el) {
+      var body = document.body, range, sel;
+      if (document.createRange && window.getSelection) {
         range = document.createRange();
         sel = window.getSelection();
         sel.removeAllRanges();
         try {
-            range.selectNodeContents(el);
-            sel.addRange(range);
+          range.selectNodeContents(el);
+          sel.addRange(range);
         } catch (e) {
-            range.selectNode(el);
-            sel.addRange(range);
+          range.selectNode(el);
+          sel.addRange(range);
         }
         document.execCommand("copy");
 
-    } else if (body.createTextRange) {
+      } else if (body.createTextRange) {
         range = body.createTextRange();
         range.moveToElementText(el);
         range.select();
         range.execCommand("Copy");
+      }
     }
-}
-</script>
+  </script>
 {% endblock %}
diff --git a/trombi/templates/trombi/user_profile.jinja b/trombi/templates/trombi/user_profile.jinja
index cbeab2973..fe8d1bf5e 100644
--- a/trombi/templates/trombi/user_profile.jinja
+++ b/trombi/templates/trombi/user_profile.jinja
@@ -1,62 +1,62 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans user_name=trombi_user.user.get_display_name() %}{{ user_name }}'s Trombi profile{% endtrans %}
+  {% trans user_name=trombi_user.user.get_display_name() %}{{ user_name }}'s Trombi profile{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans user_name=trombi_user.user.get_display_name() %}{{ user_name }}'s Trombi profile{% endtrans %}</h3>
-<p> <a href="{{ url('trombi:user_tools') }}">{% trans %}Back to tools{% endtrans %}</a></p>
-<div>
+  <h3>{% trans user_name=trombi_user.user.get_display_name() %}{{ user_name }}'s Trombi profile{% endtrans %}</h3>
+  <p> <a href="{{ url('trombi:user_tools') }}">{% trans %}Back to tools{% endtrans %}</a></p>
+  <div>
     <h4>{% trans %}Pictures{% endtrans %}</h4>
     {% set profile_file = None %}
     {% set scrub_file = None %}
     {% if trombi_user.profile_pict %}
-        {% set profile_file = trombi_user.profile_pict.url %}
+      {% set profile_file = trombi_user.profile_pict.url %}
     {% else %}
-        {% set profile_file = static('core/img/na.gif') %}
+      {% set profile_file = static('core/img/na.gif') %}
     {% endif %}
     {% if trombi_user.scrub_pict %}
-        {% set scrub_file = trombi_user.scrub_pict.url %}
+      {% set scrub_file = trombi_user.scrub_pict.url %}
     {% else %}
-        {% set scrub_file = static('core/img/na.gif') %}
+      {% set scrub_file = static('core/img/na.gif') %}
     {% endif %}
     <div style="max-width: 410px; margin: auto; text-align: center;">
-        <div>
-            <img src="{{ profile_file }}" alt="" style="max-width: 200px">
-            <img src="{{ scrub_file }}" alt="" style="max-width: 200px">
-        </div>
-        <div>
-            <em>{{ trombi_user.user.get_short_name() }}</em>
-        </div>
+      <div>
+        <img src="{{ profile_file }}" alt="" style="max-width: 200px">
+        <img src="{{ scrub_file }}" alt="" style="max-width: 200px">
+      </div>
+      <div>
+        <em>{{ trombi_user.user.get_short_name() }}</em>
+      </div>
     </div>
     {% if trombi_user.memberships.exists() %}
-    <h4>{% trans %}Club{% endtrans %}</h4>
-    <table style="max-width: 70%; margin: auto;">
+      <h4>{% trans %}Club{% endtrans %}</h4>
+      <table style="max-width: 70%; margin: auto;">
         <thead>
-            <tr>
-                <td>{% trans %}Club{% endtrans %}</td>
-                <td>{% trans %}Role{% endtrans %}</td>
-                <td>{% trans %}Date{% endtrans %}</td>
-            </tr>
+          <tr>
+            <td>{% trans %}Club{% endtrans %}</td>
+            <td>{% trans %}Role{% endtrans %}</td>
+            <td>{% trans %}Date{% endtrans %}</td>
+          </tr>
         </thead>
         <tbody>
-            {% for m in trombi_user.memberships.all() %}
+          {% for m in trombi_user.memberships.all() %}
             <tr>
-                <td>{{ m.club }}</td>
-                <td>{{ m.role }}</td>
-                <td>{{ m.start }} - {{ m.end }}</td>
+              <td>{{ m.club }}</td>
+              <td>{{ m.role }}</td>
+              <td>{{ m.start }} - {{ m.end }}</td>
             </tr>
-            {% endfor %}
+          {% endfor %}
         </tbody>
-    </table>
+      </table>
     {% endif %}
     <dl>
-    {% for c in trombi_user.received_comments.filter(is_moderated=True) %}
+      {% for c in trombi_user.received_comments.filter(is_moderated=True) %}
         <dt style="font-weight: bold; font-size: 110%">{{ c.author.user.get_display_name() }}</dt>
         <dd><pre>{{ c.content }}</pre></dd>
-    {% endfor %}
+      {% endfor %}
     </dl>
-</div>
+  </div>
 {% endblock %}
 
diff --git a/trombi/templates/trombi/user_tools.jinja b/trombi/templates/trombi/user_tools.jinja
index 0a45742b2..4997ed3f2 100644
--- a/trombi/templates/trombi/user_tools.jinja
+++ b/trombi/templates/trombi/user_tools.jinja
@@ -1,60 +1,60 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-	{% trans user_name=user.get_display_name() %}{{ user_name }}'s Trombi{% endtrans %}
+  {% trans user_name=user.get_display_name() %}{{ user_name }}'s Trombi{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h3>{% trans%}Trombi'{% endtrans %}</h3>
-{% if subscribe_form %}
-<form action="" method="post">
-    {% csrf_token %}
-    {{ subscribe_form.as_p() }}
-    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-</form>
-{% endif %}
-{% if trombi %}
-<p>{% trans trombi = user.trombi_user.trombi %}You are subscribed to the Trombi {{ trombi }}{% endtrans %}</p>
-<hr>
-{% set can_comment = trombi.subscription_deadline < date.today() and
+  <h3>{% trans%}Trombi'{% endtrans %}</h3>
+  {% if subscribe_form %}
+    <form action="" method="post">
+      {% csrf_token %}
+      {{ subscribe_form.as_p() }}
+      <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+    </form>
+  {% endif %}
+  {% if trombi %}
+    <p>{% trans trombi = user.trombi_user.trombi %}You are subscribed to the Trombi {{ trombi }}{% endtrans %}</p>
+    <hr>
+    {% set can_comment = trombi.subscription_deadline < date.today() and
     date.today() <= trombi.comments_deadline %}
-{% if not can_comment %}
-<p>{% trans %}You can not write comments at this date.{% endtrans %}</p>
-<p>
-{% trans start=trombi.subscription_deadline|date(DATE_FORMAT), end=trombi.comments_deadline|date(DATE_FORMAT) %}Comments are only allowed between {{ start }} (excluded) and {{ end }} (included){% endtrans %}</p>
-<hr>
-{% endif %}
-<div>
-{% for u in user.trombi_user.trombi.users.exclude(id=user.trombi_user.id).order_by('user__nick_name') %}
-    <div class="ib" style="border: solid 1px grey; text-align: center">
-        {% set file = None %}
-        {% if u.profile_pict %}
+    {% if not can_comment %}
+      <p>{% trans %}You can not write comments at this date.{% endtrans %}</p>
+      <p>
+        {% trans start=trombi.subscription_deadline|date(DATE_FORMAT), end=trombi.comments_deadline|date(DATE_FORMAT) %}Comments are only allowed between {{ start }} (excluded) and {{ end }} (included){% endtrans %}</p>
+      <hr>
+    {% endif %}
+    <div>
+      {% for u in user.trombi_user.trombi.users.exclude(id=user.trombi_user.id).order_by('user__nick_name') %}
+        <div class="ib" style="border: solid 1px grey; text-align: center">
+          {% set file = None %}
+          {% if u.profile_pict %}
             {% set file = u.profile_pict.url %}
-        {% else %}
+          {% else %}
             {% set file = static('core/img/na.gif') %}
-        {% endif %}
-        <div style="max-width: 100px; margin: auto;">
+          {% endif %}
+          <div style="max-width: 100px; margin: auto;">
             <img src="{{ file }}" alt="" style="max-width: 100px">
-        </div>
-        <div>{{ u.user.get_display_name() }}</div>
-        {% if trombi.show_profiles %}
+          </div>
+          <div>{{ u.user.get_display_name() }}</div>
+          {% if trombi.show_profiles %}
             <div>
-                <a href="{{ url('trombi:user_profile', user_id=u.id) }}">{% trans %}Profile{% endtrans %}</a>
+              <a href="{{ url('trombi:user_profile', user_id=u.id) }}">{% trans %}Profile{% endtrans %}</a>
             </div>
-        {% endif %}
-        <div>
+          {% endif %}
+          <div>
             {% if can_comment %}
-                {% set comment = u.received_comments.filter(author__id=user.trombi_user.id).first() %}
-                {% if comment %}
-                    <a href="{{ url('trombi:edit_comment', comment_id=comment.id) }}">{% trans %}Edit comment{% endtrans %}</a>
-                {% else %}
-                    <a href="{{ url('trombi:new_comment', user_id=u.id) }}">{% trans %}Comment{% endtrans %}</a>
-                {% endif %}
+              {% set comment = u.received_comments.filter(author__id=user.trombi_user.id).first() %}
+              {% if comment %}
+                <a href="{{ url('trombi:edit_comment', comment_id=comment.id) }}">{% trans %}Edit comment{% endtrans %}</a>
+              {% else %}
+                <a href="{{ url('trombi:new_comment', user_id=u.id) }}">{% trans %}Comment{% endtrans %}</a>
+              {% endif %}
             {% endif %}
+          </div>
         </div>
+      {% endfor %}
     </div>
-{% endfor %}
-</div>
-{% endif %}
+  {% endif %}
 {% endblock %}