diff --git a/app/templates/about.html b/app/templates/about.html
index 2dc506915..0b2eed389 100644
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/change_password.html b/app/templates/auth/change_password.html
index 2bec77622..57db80c71 100644
--- a/app/templates/auth/change_password.html
+++ b/app/templates/auth/change_password.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/login.html b/app/templates/auth/login.html
index d636e053e..1764e2d23 100644
--- a/app/templates/auth/login.html
+++ b/app/templates/auth/login.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/register.html b/app/templates/auth/register.html
index 35e6a2abd..3c720079c 100644
--- a/app/templates/auth/register.html
+++ b/app/templates/auth/register.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/reset_password.html b/app/templates/auth/reset_password.html
index 261e37db0..fdf1215aa 100644
--- a/app/templates/auth/reset_password.html
+++ b/app/templates/auth/reset_password.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
@@ -5,7 +6,7 @@
 <h1>Changez votre mot de passe ScoDoc</h1>
 
 <div class="row" style="margin-top: 30px;">
-<div class="col-md-4">Votre identifiant: <b>{{user.user_name}}</b></div>
+    <div class="col-md-4">Votre identifiant: <b>{{user.user_name}}</b></div>
 </div>
 
 <div class="row" style="margin-top: 30px;">
diff --git a/app/templates/auth/reset_password_request.html b/app/templates/auth/reset_password_request.html
index 99a37fb2f..a5b661558 100644
--- a/app/templates/auth/reset_password_request.html
+++ b/app/templates/auth/reset_password_request.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/toogle_active_user.html b/app/templates/auth/toogle_active_user.html
index d5ec678d4..381531007 100644
--- a/app/templates/auth/toogle_active_user.html
+++ b/app/templates/auth/toogle_active_user.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/user_info_page.html b/app/templates/auth/user_info_page.html
index 695929991..8a287c01d 100644
--- a/app/templates/auth/user_info_page.html
+++ b/app/templates/auth/user_info_page.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
@@ -5,16 +6,16 @@
 
 <h2>Utilisateur: {{user.user_name}} ({{'actif' if user.active else 'fermé'}})</h2>
 <p>
-<b>Login :</b> {{user.user_name}}<br/>
-<b>Nom :</b> {{user.nom or ""}}<br/>
-<b>Prénom :</b> {{user.prenom or ""}}<br/>
-<b>Mail :</b> {{user.email}}<br/>
-<b>Roles :</b> {{user.get_roles_string()}}<br/>
-<b>Dept :</b> {{user.dept or ""}}<br/>
-<b>Dernière modif mot de passe:</b> 
-{{user.date_modif_passwd.isoformat() if user.date_modif_passwd else ""}}<br/>
-<b>Date d'expiration:</b> 
-{{user.date_expiration.isoformat() if user.date_expiration else "(sans limite)"}}
+    <b>Login :</b> {{user.user_name}}<br>
+    <b>Nom :</b> {{user.nom or ""}}<br>
+    <b>Prénom :</b> {{user.prenom or ""}}<br>
+    <b>Mail :</b> {{user.email}}<br>
+    <b>Roles :</b> {{user.get_roles_string()}}<br>
+    <b>Dept :</b> {{user.dept or ""}}<br>
+    <b>Dernière modif mot de passe:</b>
+    {{user.date_modif_passwd.isoformat() if user.date_modif_passwd else ""}}<br>
+    <b>Date d'expiration:</b>
+    {{user.date_expiration.isoformat() if user.date_expiration else "(sans limite)"}}
 <p>
 <ul>
     <li><a class="stdlink" href="{{
@@ -27,33 +28,33 @@
             url_for('users.create_user_form', scodoc_dept=g.scodoc_dept, 
             user_name=user.user_name, edit=1)
         }}">modifier ce compte</a>
-        </li>
-        <li><a class="stdlink" href="{{
+    </li>
+    <li><a class="stdlink" href="{{
             url_for('users.toggle_active_user', scodoc_dept=g.scodoc_dept, 
             user_name=user.user_name)
         }}">{{"désactiver" if user.active else "activer"}} ce compte</a>
-        </li>
+    </li>
     {% endif %}
 </ul>
 
 {% if current_user.id == user.id %}
-<p><b>Se déconnecter: 
-<a class="stdlink" href="{{url_for('auth.logout')}}">logout</a>
-</b></p>
+<p><b>Se déconnecter:
+        <a class="stdlink" href="{{url_for('auth.logout')}}">logout</a>
+    </b></p>
 {% endif %}
 
 {# Liste des permissions #}
 <div class="permissions">
-<p>Permissions de cet utilisateur dans le département {dept}:</p>
-<ul>
-{% for p in Permission.description %}
-    <li>{{Permission.description[p]}} : 
-    {{
-        "oui" if user.has_permission(Permission.get_by_name(p), dept) else "non"
-    }}
-    </li>
-{% endfor %}
-</ul>
+    <p>Permissions de cet utilisateur dans le département {dept}:</p>
+    <ul>
+        {% for p in Permission.description %}
+        <li>{{Permission.description[p]}} :
+            {{
+            "oui" if user.has_permission(Permission.get_by_name(p), dept) else "non"
+            }}
+        </li>
+        {% endfor %}
+    </ul>
 </div>
 
 {% if current_user.has_permission(Permission.ScoUsersAdmin, dept) %}
diff --git a/app/templates/base.html b/app/templates/base.html
index 815ba7b76..adf70171b 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'bootstrap/base.html' %}
 
 {% block styles %}
diff --git a/app/templates/but/bulletin.html b/app/templates/but/bulletin.html
index 27146ed4a..ff0682fce 100644
--- a/app/templates/but/bulletin.html
+++ b/app/templates/but/bulletin.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "sco_page.html" %}
 
 {% block styles %}
diff --git a/app/templates/but/refcomp_assoc.html b/app/templates/but/refcomp_assoc.html
index 1b30d4636..9f8335be2 100644
--- a/app/templates/but/refcomp_assoc.html
+++ b/app/templates/but/refcomp_assoc.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/but/refcomp_load.html b/app/templates/but/refcomp_load.html
index caac1a5e3..9bf70470b 100644
--- a/app/templates/but/refcomp_load.html
+++ b/app/templates/but/refcomp_load.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/but/refcomp_show.html b/app/templates/but/refcomp_show.html
index 07e45543f..fb7357d21 100644
--- a/app/templates/but/refcomp_show.html
+++ b/app/templates/but/refcomp_show.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "sco_page.html" %}
 
 {% block app_content %}
diff --git a/app/templates/but/refcomp_table.html b/app/templates/but/refcomp_table.html
index 2095dc9ff..6c7b05f0c 100644
--- a/app/templates/but/refcomp_table.html
+++ b/app/templates/but/refcomp_table.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "sco_page.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/config_dept.html b/app/templates/config_dept.html
index c602c5f32..bb5ed80c1 100644
--- a/app/templates/config_dept.html
+++ b/app/templates/config_dept.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% macro render_field(field) %}
 <div>
     <span class="wtf-field">{{ field.label }} :</span>
diff --git a/app/templates/configuration.html b/app/templates/configuration.html
index b874d48db..d4df6ed4a 100644
--- a/app/templates/configuration.html
+++ b/app/templates/configuration.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/create_dept.html b/app/templates/create_dept.html
index 4e3f8a467..7745af7a0 100644
--- a/app/templates/create_dept.html
+++ b/app/templates/create_dept.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/error_500.html b/app/templates/error_500.html
index d986a00da..23a5c6095 100644
--- a/app/templates/error_500.html
+++ b/app/templates/error_500.html
@@ -1,11 +1,13 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
 {% block title %}Une erreur est survenue !{% endblock %}
 {% block body %}
 <h1>Une erreur est survenue !</h1>
-<p>Oups...</tt> <span style="color:red;"><b>ScoDoc version <span style="font-size: 120%;">{{SCOVERSION}}</span></b></span> a
-    un problème, désolé.</p>
+<p>Oups...</tt> <span style="color:red;"><b>ScoDoc version
+    <span style="font-size: 120%;">{{SCOVERSION}}</span></b></span> 
+    a un problème, désolé.</p>
 <p><tt style="font-size:60%">{{date}}</tt></p>
 
 <p> Si le problème persiste, contacter l'administrateur de votre site,
diff --git a/app/templates/error_access_denied.html b/app/templates/error_access_denied.html
index 5a765b761..516361d5c 100644
--- a/app/templates/error_access_denied.html
+++ b/app/templates/error_access_denied.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/formsemestre_header.html b/app/templates/formsemestre_header.html
index 441a32872..aa8464ef4 100644
--- a/app/templates/formsemestre_header.html
+++ b/app/templates/formsemestre_header.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Description un semestre (barre de menu et infos) #}
 <!-- formsemestre_header -->
 <div class="formsemestre_page_title">
diff --git a/app/templates/main/index.html b/app/templates/main/index.html
index 6e21ac465..35005c95d 100644
--- a/app/templates/main/index.html
+++ b/app/templates/main/index.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/pn/form_descr.html b/app/templates/pn/form_descr.html
index 347180257..6a0cda4ea 100644
--- a/app/templates/pn/form_descr.html
+++ b/app/templates/pn/form_descr.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Chapeau description d'une formation #}
 
 <div class="formation_descr">
diff --git a/app/templates/pn/form_mods.html b/app/templates/pn/form_mods.html
index 90faee024..cba283478 100644
--- a/app/templates/pn/form_mods.html
+++ b/app/templates/pn/form_mods.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Édition liste modules APC (SAÉ ou ressources) #}
 
 <div class="formation_list_modules formation_list_modules_{{module_type.name}}">
diff --git a/app/templates/pn/form_modules_ue_coefs.html b/app/templates/pn/form_modules_ue_coefs.html
index c94fe60c1..186a8e7fd 100644
--- a/app/templates/pn/form_modules_ue_coefs.html
+++ b/app/templates/pn/form_modules_ue_coefs.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 <h2>Édition des coefficients des modules vers les UEs</h2>
 <div class="help">
     Double-cliquer pour changer une valeur.
diff --git a/app/templates/pn/form_ues.html b/app/templates/pn/form_ues.html
index 69d698391..cc9812dc5 100644
--- a/app/templates/pn/form_ues.html
+++ b/app/templates/pn/form_ues.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Édition liste UEs APC #}
 <div class="formation_list_ues">
     <div class="formation_list_ues_titre">Unités d'Enseignement (UEs)</div>
diff --git a/app/templates/pn/ue_infos.html b/app/templates/pn/ue_infos.html
index f1757c734..b45c0b9bc 100644
--- a/app/templates/pn/ue_infos.html
+++ b/app/templates/pn/ue_infos.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Informations sur une UE #}
 {% extends "sco_page.html" %}
 
diff --git a/app/templates/sco_page.html b/app/templates/sco_page.html
index 249bfb39e..e593d9c0c 100644
--- a/app/templates/sco_page.html
+++ b/app/templates/sco_page.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'bootstrap/base.html' %}
 
 {% block styles %}
diff --git a/app/templates/sco_value_error.html b/app/templates/sco_value_error.html
index 9b7f3b547..36ed8d206 100644
--- a/app/templates/sco_value_error.html
+++ b/app/templates/sco_value_error.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/scodoc.html b/app/templates/scodoc.html
index 2aaf9e22c..2b8255e51 100644
--- a/app/templates/scodoc.html
+++ b/app/templates/scodoc.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
@@ -23,7 +24,7 @@
     </li>
     {% endfor %}
     {% if current_user.is_administrator() %}
-        <li><a href="{{ url_for('scodoc.create_dept') }}">créer un nouveau département</a></li>
+    <li><a href="{{ url_for('scodoc.create_dept') }}">créer un nouveau département</a></li>
     {% endif %}
 </ul>
 
diff --git a/app/templates/scolar/affect_groups.html b/app/templates/scolar/affect_groups.html
index 56393575d..2dc3a1f60 100644
--- a/app/templates/scolar/affect_groups.html
+++ b/app/templates/scolar/affect_groups.html
@@ -1,4 +1,4 @@
-
+{# -*- mode: jinja-html -*- #}
 {{ sco_header|safe }}
 <h2 class="formsemestre">Affectation aux groupes de {{ partition["partition_name"] }}</h2>
 
diff --git a/app/templates/scolar/photos_import_files.html b/app/templates/scolar/photos_import_files.html
index f4bae574a..460d7d7e4 100644
--- a/app/templates/scolar/photos_import_files.html
+++ b/app/templates/scolar/photos_import_files.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 
 {% block app_content %}
diff --git a/app/templates/scolar/photos_import_files.txt b/app/templates/scolar/photos_import_files.txt
index d9aab53ee..cb6777b5c 100755
--- a/app/templates/scolar/photos_import_files.txt
+++ b/app/templates/scolar/photos_import_files.txt
@@ -1,4 +1,4 @@
-
+{# -*- mode: jinja-raw -*- #}
 Importation des photo effectuée
 
 {% if ignored_zipfiles %}
diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html
index 3334dbb6a..eb5df4afa 100644
--- a/app/templates/sidebar.html
+++ b/app/templates/sidebar.html
@@ -1,13 +1,14 @@
 {# Barre marge gauche ScoDoc #}
+{# -*- mode: jinja-html -*- #}
 <!-- sidebar -->
 <div class="sidebar">
     {# sidebar_common #}
     <a class="scodoc_title" href="{{
-        url_for("scodoc.index", scodoc_dept=g.scodoc_dept) }}">ScoDoc 9.2a</a>
+        url_for(" scodoc.index", scodoc_dept=g.scodoc_dept) }}">ScoDoc 9.2a</a>
     <div id="authuser"><a id="authuserlink" href="{{
-            url_for("users.user_info_page", scodoc_dept=g.scodoc_dept, user_name=current_user.user_name)
+            url_for(" users.user_info_page", scodoc_dept=g.scodoc_dept, user_name=current_user.user_name)
             }}">{{current_user.user_name}}</a>
-        <br /><a id="deconnectlink" href="{{url_for("auth.logout")}}">déconnexion</a>
+        <br /><a id="deconnectlink" href="{{url_for(" auth.logout")}}">déconnexion</a>
     </div>
 
     {% block sidebar_dept %}
@@ -21,18 +22,18 @@
     {% endblock %}
 
     <h2 class="insidebar">Scolarité</h2>
-    <a href="{{url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Semestres</a> <br>
-    <a href="{{url_for("notes.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Programmes</a> <br>
-    <a href="{{url_for("absences.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Absences</a> <br>
+    <a href="{{url_for(" scolar.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Semestres</a> <br>
+    <a href="{{url_for(" notes.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Programmes</a> <br>
+    <a href="{{url_for(" absences.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Absences</a> <br>
 
     {% if current_user.has_permission(sco.Permission.ScoUsersAdmin)
     or current_user.has_permission(sco.Permission.ScoUsersView)
     %}
-    <a href="{{url_for("users.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Utilisateurs</a> <br />
+    <a href="{{url_for(" users.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Utilisateurs</a> <br />
     {% endif %}
 
     {% if current_user.has_permission(sco.Permission.ScoChangePreferences) %}
-    <a href="{{url_for("scolar.edit_preferences", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Paramétrage</a> <br>
+    <a href="{{url_for(" scolar.edit_preferences", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Paramétrage</a> <br>
     {% endif %}
     {# /sidebar_common #}
 
@@ -48,7 +49,7 @@
     <div class="etud-insidebar">
         {% if sco.etud %}
         <h2 id="insidebar-etud"><a href="{{url_for(
-            "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=sco.etud.id )}}" class="sidebar">
+            " scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=sco.etud.id )}}" class="sidebar">
                 <span class="fontred">{{sco.etud.nomprenom}}</span></a>
         </h2>
         <b>Absences</b>
diff --git a/app/templates/sidebar_dept.html b/app/templates/sidebar_dept.html
index 2e694b438..d8458f51e 100644
--- a/app/templates/sidebar_dept.html
+++ b/app/templates/sidebar_dept.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 <h2 class="insidebar"><a href="{{ 
     url_for('scolar.index_html', scodoc_dept=g.scodoc_dept) 
     }}">Dépt. {{ prefs["DeptName"] }}</a>