diff --git a/core/templates/core/403.html b/core/templates/core/403.jinja
similarity index 66%
rename from core/templates/core/403.html
rename to core/templates/core/403.jinja
index 8e8c65a1..5e83a7b7 100644
--- a/core/templates/core/403.html
+++ b/core/templates/core/403.jinja
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 
diff --git a/core/templates/core/404.html b/core/templates/core/404.html
index 46d4abe2..35755bfd 100644
--- a/core/templates/core/404.html
+++ b/core/templates/core/404.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 
diff --git a/core/templates/core/base.html b/core/templates/core/base.html
deleted file mode 100644
index f6019f7d..00000000
--- a/core/templates/core/base.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load staticfiles %}
-<!DOCTYPE html>
-<html lang="fr">
-<head>
-    {% block head %}
-    <title>{% block title %}Bienvenue sur le Sith de l'AE!{% endblock %}</title>
-    <link rel="stylesheet" href="{% static 'core/style.css' %}">
-    <script src="{% static 'core/script.js' %}"></script>
-    <script src="http://code.jquery.com/jquery-2.2.0.min.js"></script>
-    {% endblock %}
-</head>
-
-<body>
-    <header>
-        {% block header %}
-        {% if user.is_authenticated %}Hello, {{ user.username }}!{% endif %}
-        <ul>
-            {% if not user.is_authenticated %}
-            <li><a href="{% url 'core:register' %}">Register</a></li>
-            <li><a href="{% url 'core:login' %}">Login</a></li>
-            {% else %}
-            <li><a href="{% url 'core:logout' %}">Logout</a></li>
-            {% endif %}
-        </ul>
-        {% if user.is_authenticated %}
-        <ul>
-            <li><a href="{% url 'core:user_profile' user.id %}">Profile</a></li>
-            <li><a href="{% url 'core:user_list' %}">Users</a></li>
-            <li><a href="{% url 'core:page_list' %}">Pages</a></li>
-        </ul>
-        {% endif %}
-        {% endblock %}
-    </header>
-
-    <div id="content">
-        {% if error %}
-            {{ error }}
-        {% endif %}
-        {% block content %}{% endblock %}
-    </div>
-
-    <footer>
-        {% block footer %}
-        Site réalisé par des gens biens
-        {% endblock %}
-    </footer>
-    <!--
-    {% block tests %}
-        {{ tests }}
-    {% endblock %}
-    -->
-</body>
-</html>
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
new file mode 100644
index 00000000..d638caea
--- /dev/null
+++ b/core/templates/core/base.jinja
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    {% block head %}
+    <title>{% block title %}Bienvenue sur le Sith de l'AE!{% endblock %}</title>
+    <link rel="stylesheet" href="{{ static('core/style.css') }}">
+    <script src="{{ static('core/script.js') }}"></script>
+    <script src="http://code.jquery.com/jquery-2.2.0.min.js"></script>
+    {% endblock %}
+</head>
+
+<body>
+    <header>
+        {% block header %}
+        {% if user.is_authenticated() %}Hello, {{ user.username }}!{% endif %}
+        <ul>
+            {% if not user.is_authenticated() %}
+            <li><a href="{{ url('core:register') }}">Register</a></li>
+            <li><a href="{{ url('core:login') }}">Login</a></li>
+            {% else %}
+            <li><a href="{{ url('core:logout') }}">Logout</a></li>
+            {% endif %}
+        </ul>
+        {% if user.is_authenticated() %}
+        <ul>
+            <li><a href="{{ url('core:user_profile', user_id=user.id) }}">Profile</a></li>
+            <li><a href="{{ url('core:user_list') }}">Users</a></li>
+            <li><a href="{{ url('core:page_list') }}">Pages</a></li>
+        </ul>
+        {% endif %}
+        {% endblock %}
+    </header>
+
+    <div id="content">
+        {% if error %}
+            {{ error }}
+        {% endif %}
+        {% block content %}{% endblock %}
+    </div>
+
+    <footer>
+        {% block footer %}
+        Site réalisé par des gens biens
+        {% endblock %}
+    </footer>
+</body>
+</html>
diff --git a/core/templates/core/edit_user.html b/core/templates/core/edit_user.html
index 16845557..2e827339 100644
--- a/core/templates/core/edit_user.html
+++ b/core/templates/core/edit_user.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block title %}
 {% if profile %}
diff --git a/core/templates/core/group_edit.html b/core/templates/core/group_edit.html
index 570bf419..1e730337 100644
--- a/core/templates/core/group_edit.html
+++ b/core/templates/core/group_edit.html
@@ -1,11 +1,11 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
-<p><a href="{% url 'core:group_list' %}">Back to list</a></p>
+<p><a href="{{ url('core:group_list') }}">Back to list</a></p>
     <h2>Edit group</h2>
     <form action="" method="post">
-        {% csrf_token %}
-        {{ form.as_p }}
+        {{ csrf_input }}
+        {{ form.as_p() }}
         <p><input type="submit" value="Update" /></p>
     </form>
 {% endblock %}
diff --git a/core/templates/core/group_list.html b/core/templates/core/group_list.html
index c0c9f67d..ff74aac9 100644
--- a/core/templates/core/group_list.html
+++ b/core/templates/core/group_list.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block title %}
 Group list
@@ -8,7 +8,7 @@ Group list
 <h3>Group list</h3>
 <ul>
 {% for g in group_list %}
-<li><a href="{% url 'core:group_edit' g.id %}">{{ g.name }}</a></li>
+<li><a href="{{ url('core:group_edit', kwargs={'group_id': g.id} }}">{{ g.name }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
deleted file mode 100644
index 639fc4a7..00000000
--- a/core/templates/core/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "core/base.html" %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block content %}
-Hello, world. You're at the core index.
-{% endblock %}
diff --git a/core/templates/core/index.jinja b/core/templates/core/index.jinja
new file mode 100644
index 00000000..aa25fa80
--- /dev/null
+++ b/core/templates/core/index.jinja
@@ -0,0 +1,7 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block content %}
+Hello, world. You're at the core index using Jinja2.
+{% endblock %}
diff --git a/core/templates/core/login.html b/core/templates/core/login.jinja
similarity index 69%
rename from core/templates/core/login.html
rename to core/templates/core/login.jinja
index 56c05f14..38407356 100644
--- a/core/templates/core/login.html
+++ b/core/templates/core/login.jinja
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 
@@ -7,7 +7,7 @@
 {% endif %}
 
 {% if next %}
-    {% if user.is_authenticated %}
+    {% if user.is_authenticated() %}
     <p>Your account doesn't have access to this page. To proceed,
     please login with an account that has access.</p>
     {% else %}
@@ -15,15 +15,15 @@
     {% endif %}
 {% endif %}
 
-<form method="post" action="{% url 'core:login' %}">
+<form method="post" action="{{ url('core:login') }}">
 {% csrf_token %}
 <table>
 <tr>
-    <td>{{ form.username.label_tag }}</td>
+    <td>{{ form.username.label_tag() }}</td>
     <td>{{ form.username }}</td>
 </tr>
 <tr>
-    <td>{{ form.password.label_tag }}</td>
+    <td>{{ form.password.label_tag() }}</td>
     <td>{{ form.password }}</td>
 </tr>
 </table>
@@ -33,6 +33,6 @@
 </form>
 
 {# Assumes you setup the password_reset view in your URLconf #}
-<p><a href="{% url 'core:password_reset' %}">Lost password?</a></p>
+<p><a href="{{ url('core:password_reset') }}">Lost password?</a></p>
 
 {% endblock %}
diff --git a/core/templates/core/page.html b/core/templates/core/page.jinja
similarity index 66%
rename from core/templates/core/page.html
rename to core/templates/core/page.jinja
index dcb2932b..b421fdd8 100644
--- a/core/templates/core/page.html
+++ b/core/templates/core/page.jinja
@@ -1,8 +1,8 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block title %}
     {% if page %}
-        {{ page.get_display_name }}
+        {{ page.get_display_name() }}
     {% elif page_list %}
         Page list
     {% else %}
@@ -16,6 +16,6 @@
         {% endblock %}
     {% else %}
         <h2>Page does not exist</h2>
-        <p><a href="{% url 'core:page_prop' new_page %}">Create it?</a></p>
+        <p><a href="{{ url('core:page_prop', page_name=new_page) }}">Create it?</a></p>
     {% endif %}
 {% endblock %}
diff --git a/core/templates/core/page_detail.html b/core/templates/core/page_detail.html
deleted file mode 100644
index 536fee92..00000000
--- a/core/templates/core/page_detail.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "core/page.html" %}
-{% load renderer %}
-
-{% block page %}
-    <h3>Page</h3>
-    <p><a href="{% url 'core:page_list' %}">Back to list</a></p>
-    {% if can_edit %}
-        <p><a href="{% url 'core:page_edit' page.get_full_name %}">Edit</a></p>
-    {% endif %}
-    {% if can_edit_prop %}
-        <p><a href="{% url 'core:page_prop' page.get_full_name %}">Prop</a></p>
-    {% endif %}
-    <p>You're seeing the page <strong>{{ page.get_display_name }}</strong> -
-    <a href="{% url 'core:page_hist' page.get_full_name %}">History</a></p>
-    {% if rev %}
-        <h4>This may not be the last update, you are seeing revision {{ rev.id }}!</h4>
-        <h3>{{ rev.title }}</h3>
-        <p>{{ rev.content|markdown }}</p>
-    {% else %}
-        <h3>{{ page.revisions.last.title }}</h3>
-        <p>{{ page.revisions.last.content|markdown }}</p>
-    {% endif %}
-{% endblock %}
-
-
-
diff --git a/core/templates/core/page_detail.jinja b/core/templates/core/page_detail.jinja
new file mode 100644
index 00000000..6ca0e222
--- /dev/null
+++ b/core/templates/core/page_detail.jinja
@@ -0,0 +1,25 @@
+{% extends "core/page.jinja" %}
+
+{% block page %}
+    <h3>Page</h3>
+    <p><a href="{{ url('core:page_list') }}">Back to list</a></p>
+    {% if can_edit %}
+        <p><a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">Edit</a></p>
+    {% endif %}
+    {% if can_edit_prop %}
+        <p><a href="{{ url('core:page_prop', page_name=page.get_full_name()) }}">Prop</a></p>
+    {% endif %}
+    <p>You're seeing the page <strong>{{ page.get_display_name() }}</strong> -
+    <a href="{{ url('core:page_hist', page_name=page.get_full_name()) }}">History</a></p>
+    {% if rev %}
+        <h4>This may not be the last update, you are seeing revision {{ rev.id }}!</h4>
+        <h3>{{ rev.title }}</h3>
+        <p>{{ rev.content|markdown }}</p>
+    {% else %}
+        <h3>{{ page.revisions.last().title }}</h3>
+        <p>{{ page.revisions.last().content|markdown }}</p>
+    {% endif %}
+{% endblock %}
+
+
+
diff --git a/core/templates/core/page_hist.html b/core/templates/core/page_hist.html
deleted file mode 100644
index 746d6115..00000000
--- a/core/templates/core/page_hist.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "core/page.html" %}
-
-{% block page %}
-    <h3>Page history</h3>
-    <p><a href="{% url 'core:page' page.get_full_name %}">Back to page</a></p>
-    <p>You're seeing the history of page <strong>{{ page.get_display_name }}</strong></p>
-    <ul>
-        <li><a href="{% url 'core:page' page_name=page.get_full_name %}">
-            last - {{ page.revisions.last.author }} - {{ page.revisions.last.date }}</a></li>
-        {% for r in page.revisions.all|dictsortreversed:'date'|slice:'1:' %}
-        <li><a href="{% url 'core:page_rev' page_name=page.get_full_name rev=r.id %}">
-            {{ r.author }} - {{ r.date }}</a></li>
-        {% endfor %}
-    </ul>
-{% endblock %}
-
-
-
-
diff --git a/core/templates/core/page_hist.jinja b/core/templates/core/page_hist.jinja
new file mode 100644
index 00000000..6401da6e
--- /dev/null
+++ b/core/templates/core/page_hist.jinja
@@ -0,0 +1,19 @@
+{% extends "core/page.jinja" %}
+
+{% block page %}
+    <h3>Page history</h3>
+    <p><a href="{{ url('core:page', page.get_full_name()) }}">Back to page</a></p>
+    <p>You're seeing the history of page <strong>{{ page.get_display_name() }}</strong></p>
+    <ul>
+        <li><a href="{{ url('core:page', page_name=page.get_full_name()) }}">
+            last - {{ page.revisions.last().author }} - {{ page.revisions.last().date|date('Y-m-d H:i') }}</a></li>
+        {% for r in (page.revisions.all()|sort(attribute='date', reverse=True))[1:] %}
+        <li><a href="{{ url('core:page_rev', page_name=page.get_full_name(), rev=r['id']) }}">
+            {{ r['author'] }} - {{ r['date']|date('Y-m-d H:i') }}</a></li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+
+
+
+
diff --git a/core/templates/core/page_list.html b/core/templates/core/page_list.jinja
similarity index 66%
rename from core/templates/core/page_list.html
rename to core/templates/core/page_list.jinja
index 9c9fdbaa..7862ffa0 100644
--- a/core/templates/core/page_list.html
+++ b/core/templates/core/page_list.jinja
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block title %}
     Page list
@@ -9,7 +9,7 @@
         <h3>Page list</h3>
         <ul>
             {% for p in page_list %}
-                <li><a href="{% url 'core:page' p.get_full_name %}">{{ p.get_display_name }}</a></li>
+                <li><a href="{{ url('core:page', page_name=p.get_full_name()) }}">{{ p.get_display_name() }}</a></li>
             {% endfor %}
         </ul>
     {% else %}
diff --git a/core/templates/core/page_prop.html b/core/templates/core/page_prop.jinja
similarity index 76%
rename from core/templates/core/page_prop.html
rename to core/templates/core/page_prop.jinja
index 98436b94..302b1e67 100644
--- a/core/templates/core/page_prop.html
+++ b/core/templates/core/page_prop.jinja
@@ -1,10 +1,10 @@
-{% extends "core/page.html" %}
+{% extends "core/page.jinja" %}
 
 {% block content %}
     <h2>Page properties</h2>
     <form action="" method="post">
         {% csrf_token %}
-        {{ form.as_p }}
+        {{ form.as_p() }}
         <p><input type="submit" value="Save!" /></p>
     </form>
 {% endblock %}
diff --git a/core/templates/core/pagerev_edit.html b/core/templates/core/pagerev_edit.jinja
similarity index 70%
rename from core/templates/core/pagerev_edit.html
rename to core/templates/core/pagerev_edit.jinja
index 513898cd..6b7b88dc 100644
--- a/core/templates/core/pagerev_edit.html
+++ b/core/templates/core/pagerev_edit.jinja
@@ -1,11 +1,11 @@
-{% extends "core/page.html" %}
+{% extends "core/page.jinja" %}
 
 {% block head %}
-{{ block.super }}
+{{ super() }}
 <script>
 function make_preview() {
     $.ajax({
-        url: "{% url 'core:api_markdown' %}",
+        url: "{{ url('core:api_markdown') }}",
         method: "GET",
         data: { text: $("#id_content").val() }
     }).done(function (msg) {
@@ -17,9 +17,9 @@ function make_preview() {
 
 {% block page %}
     <h2>Edit page</h2>
-    <form action="{% url 'core:page_edit' page_name=page.get_full_name %}" method="post">
+    <form action="{{ url('core:page_edit', page_name=page.get_full_name()) }}" method="post">
         {% csrf_token %}
-        {{ form.as_p }}
+        {{ form.as_p() }}
         <p><input type="button" value="Preview" onclick="javascript:make_preview();" /></p>
         <p><input type="submit" value="Save!" /></p>
     </form>
diff --git a/core/templates/core/password_change.html b/core/templates/core/password_change.html
index 0c41975d..64243611 100644
--- a/core/templates/core/password_change.html
+++ b/core/templates/core/password_change.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 
diff --git a/core/templates/core/password_change_done.html b/core/templates/core/password_change_done.html
index f3fa2d2a..0f70542e 100644
--- a/core/templates/core/password_change_done.html
+++ b/core/templates/core/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 
diff --git a/core/templates/core/password_reset.html b/core/templates/core/password_reset.html
index 16f7591c..a0e88e9a 100644
--- a/core/templates/core/password_reset.html
+++ b/core/templates/core/password_reset.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 <form method="post" action="">
diff --git a/core/templates/core/password_reset_complete.html b/core/templates/core/password_reset_complete.html
index c524fdbe..eab86537 100644
--- a/core/templates/core/password_reset_complete.html
+++ b/core/templates/core/password_reset_complete.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 <p>You successfully reset your password!</p>
diff --git a/core/templates/core/password_reset_confirm.html b/core/templates/core/password_reset_confirm.html
index 07b667b6..14ce549e 100644
--- a/core/templates/core/password_reset_confirm.html
+++ b/core/templates/core/password_reset_confirm.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 <form method="post" action="">
diff --git a/core/templates/core/password_reset_done.html b/core/templates/core/password_reset_done.html
index 19759ed7..73d621c7 100644
--- a/core/templates/core/password_reset_done.html
+++ b/core/templates/core/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
 <h2>Password reset sent</h2>
diff --git a/core/templates/core/register.html b/core/templates/core/register.html
index 2d051d12..1105a4c2 100644
--- a/core/templates/core/register.html
+++ b/core/templates/core/register.html
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/core/templates/core/user_detail.html b/core/templates/core/user_detail.html
deleted file mode 100644
index 2c87943e..00000000
--- a/core/templates/core/user_detail.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "core/base.html" %}
-
-{% block title %}
-    {{ profile.get_display_name }}'s profile
-{% endblock %}
-
-{% block content %}
-<h3>User Profile</h3>
-<p><a href="{% url 'core:user_list' %}">Back to list</a></p>
-
-<ul>
-{% if user.id == profile.id %}
-    <li><a href="{% url 'core:user_tools' %}">Tools</a></li>
-{% endif %}
-{% if perms.core.change_user or user.id == profile.id %}
-    <li><a href="{% url 'core:user_edit' profile.id %}">Edit</a></li>
-{% endif %}
-{% if perms.core.change_prop_user %}
-    <li><a href="{% url 'core:user_prop' profile.id %}">Props</a></li>
-{% endif %}
-</ul>
-
-<p>
-You're seeing the profile of <strong>{{ profile.get_full_name }}</strong><br/>
-<strong>{{ profile.nick_name }}</strong><br/>
-<em>{{ profile.date_of_birth|date:"d/m/Y" }}</em>
-
-</p>
-{% endblock %}
-
-
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
new file mode 100644
index 00000000..5e4603a2
--- /dev/null
+++ b/core/templates/core/user_detail.jinja
@@ -0,0 +1,31 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}
+    {{ profile.get_display_name() }}'s profile
+{% endblock %}
+
+{% block content %}
+<h3>User Profile</h3>
+<p><a href="{{ url('core:user_list') }}">Back to list</a></p>
+
+<ul>
+{% if request.user.id == profile.id %}
+    <li><a href="{{ url('core:user_tools') }}">Tools</a></li>
+{% endif %}
+{% if user.has_perms('core.change_user') or user.id == profile.id %}
+    <li><a href="{{ url('core:user_edit', user_id=profile.id) }}">Edit</a></li>
+{% endif %}
+{% if user.has_perms('core.change_prop_user') %}
+    <li><a href="{{ url('core:user_prop', user_id=profile.id) }}">Props</a></li>
+{% endif %}
+</ul>
+
+<p>
+You're seeing the profile of <strong>{{ profile.get_full_name() }}</strong><br/>
+<strong>{{ profile.nick_name }}</strong><br/>
+<em>{{ profile.date_of_birth|date("d/m/Y") }}</em>
+
+</p>
+{% endblock %}
+
+
diff --git a/core/templates/core/user_edit.html b/core/templates/core/user_edit.jinja
similarity index 77%
rename from core/templates/core/user_edit.html
rename to core/templates/core/user_edit.jinja
index f12c56ec..5833d766 100644
--- a/core/templates/core/user_edit.html
+++ b/core/templates/core/user_edit.jinja
@@ -1,10 +1,10 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
     <h2>Edit user profile</h2>
     <form action="" method="post">
         {% csrf_token %}
-        {{ form.as_p }}
+        {{ form.as_p() }}
         <p><input type="submit" value="Update" /></p>
     </form>
 {% endblock %}
diff --git a/core/templates/core/user_list.html b/core/templates/core/user_list.jinja
similarity index 53%
rename from core/templates/core/user_list.html
rename to core/templates/core/user_list.jinja
index 7ce02182..eaf4e93d 100644
--- a/core/templates/core/user_list.html
+++ b/core/templates/core/user_list.jinja
@@ -1,4 +1,4 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block title %}
 User list
@@ -8,7 +8,7 @@ User list
 <h3>User list</h3>
 <ul>
 {% for u in user_list %}
-<li><a href="{% url 'core:user_profile' u.id %}">{{ u.get_display_name }}</a></li>
+<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_prop.html b/core/templates/core/user_prop.jinja
similarity index 57%
rename from core/templates/core/user_prop.html
rename to core/templates/core/user_prop.jinja
index 544d5b52..f8cd12b4 100644
--- a/core/templates/core/user_prop.html
+++ b/core/templates/core/user_prop.jinja
@@ -1,10 +1,10 @@
-{% extends "core/base.html" %}
+{% extends "core/base.jinja" %}
 
 {% block content %}
-    <h2>Edit user groups</h2>
+    <h2>Edit user groups for {{ profile.get_full_name() }}</h2>
     <form action="" method="post">
         {% csrf_token %}
-        {{ form.as_p }}
+        {{ form.as_p() }}
         <p><input type="submit" value="Update" /></p>
     </form>
 {% endblock %}
diff --git a/core/templates/core/user_tools.html b/core/templates/core/user_tools.html
deleted file mode 100644
index 670e75dd..00000000
--- a/core/templates/core/user_tools.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "core/base.html" %}
-
-{% block title %}
-    {{ user.get_display_name }}'s tools
-{% endblock %}
-
-{% block content %}
-<h3>User Tools</h3>
-<p><a href="{% url 'core:user_profile' user.id %}">Back to profile</a></p>
-
-<ul>
-{% if perms.core.add_group %}
-    <li><a href="{% url 'core:group_list' %}">Groups</a></li>
-{% endif %}
-</ul>
-
-{% endblock %}
-
-
-
diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
new file mode 100644
index 00000000..7db4670d
--- /dev/null
+++ b/core/templates/core/user_tools.jinja
@@ -0,0 +1,20 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}
+    {{ user.get_display_name() }}'s tools
+{% endblock %}
+
+{% block content %}
+<h3>User Tools</h3>
+<p><a href="{{ url('core:user_profile', user_id=request.user.id) }}">Back to profile</a></p>
+
+<ul>
+{% if user.has_perms('core.add_group') %}
+    <li><a href="{{ url('core:group_list') }}">Groups</a></li>
+{% endif %}
+</ul>
+
+{% endblock %}
+
+
+
diff --git a/core/views/__init__.py b/core/views/__init__.py
index 22131fef..e893bae8 100644
--- a/core/views/__init__.py
+++ b/core/views/__init__.py
@@ -7,10 +7,10 @@ from django.views.generic.base import View
 from core.models import Group
 
 def forbidden(request):
-    return render(request, "core/403.html")
+    return render(request, "core/403.jinja")
 
 def not_found(request):
-    return render(request, "core/404.html")
+    return render(request, "core/404.jinja")
 
 
 class CanEditPropMixin(View):
diff --git a/core/views/page.py b/core/views/page.py
index fbcaada2..70410d62 100644
--- a/core/views/page.py
+++ b/core/views/page.py
@@ -11,6 +11,7 @@ from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin
 
 class PageListView(ListView):
     model = Page
+    template_name = 'core/page_list.jinja'
 
     def get_context_data(self, **kwargs):
         context = super(PageListView, self).get_context_data(**kwargs)
@@ -18,6 +19,7 @@ class PageListView(ListView):
 
 class PageView(CanViewMixin, DetailView):
     model = Page
+    template_name = 'core/page_detail.jinja'
 
     def get_object(self):
         self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
@@ -36,7 +38,7 @@ class PageView(CanViewMixin, DetailView):
 
 class PageHistView(CanViewMixin, DetailView):
     model = Page
-    template_name_suffix = '_hist'
+    template_name = 'core/page_hist.jinja'
 
     def get_object(self):
         self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
@@ -44,7 +46,7 @@ class PageHistView(CanViewMixin, DetailView):
 
 class PageRevView(CanViewMixin, DetailView):
     model = Page
-    template_name = 'core/page_detail.html'
+    template_name = 'core/page_detail.jinja'
 
     def get_object(self):
         self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
@@ -67,7 +69,7 @@ class PageRevView(CanViewMixin, DetailView):
 class PagePropView(CanEditPropMixin, UpdateView):
     model = Page
     form_class = PagePropForm
-    template_name_suffix = '_prop'
+    template_name = 'core/page_prop.jinja'
 
     def get_object(self):
         page_name = self.kwargs['page_name']
@@ -97,7 +99,7 @@ class PagePropView(CanEditPropMixin, UpdateView):
 class PageEditView(CanEditMixin, UpdateView):
     model = PageRev
     fields = ['title', 'content',]
-    template_name_suffix = '_edit'
+    template_name = 'core/pagerev_edit.jinja'
 
     def get_object(self):
         self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
diff --git a/core/views/site.py b/core/views/site.py
index 17fc13a9..ac1a3631 100644
--- a/core/views/site.py
+++ b/core/views/site.py
@@ -4,7 +4,7 @@ from django.db import models
 
 def index(request, context=None):
     if context == None:
-        return render(request, "core/index.html", {'title': 'Bienvenue!'})
+        return render(request, "core/index.jinja", {'title': 'Bienvenue!'})
     else:
-        return render(request, "core/index.html", context)
+        return render(request, "core/index.jinja", context)
 
diff --git a/core/views/user.py b/core/views/user.py
index e8b0f857..5f65092b 100644
--- a/core/views/user.py
+++ b/core/views/user.py
@@ -16,7 +16,7 @@ def login(request):
 
     Needs to be improve with correct handling of form exceptions
     """
-    return views.login(request, template_name="core/login.html")
+    return views.login(request, template_name="core/login.jinja")
 
 def logout(request):
     """
@@ -28,21 +28,21 @@ def password_change(request):
     """
     Allows a user to change its password
     """
-    return views.password_change(request, template_name="core/password_change.html", post_change_redirect=reverse("core:password_change_done"))
+    return views.password_change(request, template_name="core/password_change.jinja", post_change_redirect=reverse("core:password_change_done"))
 
 def password_change_done(request):
     """
     Allows a user to change its password
     """
-    return views.password_change_done(request, template_name="core/password_change_done.html")
+    return views.password_change_done(request, template_name="core/password_change_done.jinja")
 
 def password_reset(request):
     """
     Allows someone to enter an email adresse for resetting password
     """
     return views.password_reset(request,
-                                template_name="core/password_reset.html",
-                                email_template_name="core/password_reset_email.html",
+                                template_name="core/password_reset.jinja",
+                                email_template_name="core/password_reset_email.jinja",
                                 post_reset_redirect="core:password_reset_done",
                                )
 
@@ -50,7 +50,7 @@ def password_reset_done(request):
     """
     Confirm that the reset email has been sent
     """
-    return views.password_reset_done(request, template_name="core/password_reset_done.html")
+    return views.password_reset_done(request, template_name="core/password_reset_done.jinja")
 
 def password_reset_confirm(request, uidb64=None, token=None):
     """
@@ -58,7 +58,7 @@ def password_reset_confirm(request, uidb64=None, token=None):
     """
     return views.password_reset_confirm(request, uidb64=uidb64, token=token,
                                         post_reset_redirect="core:password_reset_complete",
-                                        template_name="core/password_reset_confirm.html",
+                                        template_name="core/password_reset_confirm.jinja",
                                        )
 
 def password_reset_complete(request):
@@ -66,7 +66,7 @@ def password_reset_complete(request):
     Confirm the password has sucessfully been reset
     """
     return views.password_reset_complete(request,
-                                         template_name="core/password_reset_complete.html",
+                                         template_name="core/password_reset_complete.jinja",
                                         )
 
 
@@ -86,7 +86,7 @@ def register(request):
     else:
         form = RegisteringForm()
     context['form'] = form.as_p()
-    return render(request, "core/register.html", context)
+    return render(request, "core/register.jinja", context)
 
 class UserView(CanViewMixin, DetailView):
     """
@@ -95,12 +95,14 @@ class UserView(CanViewMixin, DetailView):
     model = User
     pk_url_kwarg = "user_id"
     context_object_name = "profile"
+    template_name = "core/user_detail.jinja"
 
 class UserListView(ListView):
     """
     Displays the user list
     """
     model = User
+    template_name = "core/user_list.jinja"
 
 class UserUpdateProfileView(CanEditMixin, UpdateView):
     """
@@ -108,7 +110,7 @@ class UserUpdateProfileView(CanEditMixin, UpdateView):
     """
     model = User
     pk_url_kwarg = "user_id"
-    template_name = "core/user_edit.html"
+    template_name = "core/user_edit.jinja"
     fields = ('first_name', 'last_name', 'nick_name', 'email', 'date_of_birth', )
 
 class UserUpdatePropView(CanEditPropMixin, UpdateView):
@@ -117,11 +119,12 @@ class UserUpdatePropView(CanEditPropMixin, UpdateView):
     """
     model = User
     pk_url_kwarg = "user_id"
-    template_name = "core/user_prop.html"
+    template_name = "core/user_prop.jinja"
     form_class = UserPropForm
+    context_object_name = "profile"
 
 class UserToolsView(TemplateView):
     """
     Displays the logged user's tools
     """
-    template_name = "core/user_tools.html"
+    template_name = "core/user_tools.jinja"
diff --git a/requirements.txt b/requirements.txt
index 90e5e3fa..62ef29f6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 # Django 1.8 LTS is required, version 1.9 is not supported
 Django >=1.8,<1.9
 Pillow
+django-jinja
diff --git a/sith/settings.py b/sith/settings.py
index f4d3ce0c..7094be85 100644
--- a/sith/settings.py
+++ b/sith/settings.py
@@ -37,6 +37,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_jinja',
     'core',
     'club',
     'subscription',
@@ -58,6 +59,50 @@ MIDDLEWARE_CLASSES = (
 ROOT_URLCONF = 'sith.urls'
 
 TEMPLATES = [
+    {
+        "NAME": "jinja2",
+        "BACKEND": "django_jinja.backend.Jinja2",
+        "APP_DIRS": True,
+        "OPTIONS": {
+            # Match the template names ending in .html but not the ones in the admin folder.
+            "match_extension": ".jinja",
+            "app_dirname": "templates",
+            "newstyle_gettext": True,
+            "context_processors": [
+                    "django.contrib.auth.context_processors.auth",
+                    "django.template.context_processors.debug",
+                    "django.template.context_processors.i18n",
+                    "django.template.context_processors.media",
+                    "django.template.context_processors.static",
+                    "django.template.context_processors.tz",
+                    "django.contrib.messages.context_processors.messages",
+                ],
+            "extensions": [
+                "jinja2.ext.do",
+                "jinja2.ext.loopcontrols",
+                "jinja2.ext.with_",
+                "jinja2.ext.i18n",
+                "jinja2.ext.autoescape",
+                "django_jinja.builtins.extensions.CsrfExtension",
+                "django_jinja.builtins.extensions.CacheExtension",
+                "django_jinja.builtins.extensions.TimezoneExtension",
+                "django_jinja.builtins.extensions.UrlsExtension",
+                "django_jinja.builtins.extensions.StaticFilesExtension",
+                "django_jinja.builtins.extensions.DjangoFiltersExtension",
+            ],
+            "filters": {
+                "markdown": "core.templatetags.renderer.markdown",
+            },
+            "bytecode_cache": {
+                "name": "default",
+                "backend": "django_jinja.cache.BytecodeCache",
+                "enabled": False,
+            },
+            "autoescape": True,
+            "auto_reload": DEBUG,
+            "translation_engine": "django.utils.translation",
+        }
+    },
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [],

{{ form.username.label_tag }}	{{ form.username.label_tag() }}	{{ form.username }}
{{ form.password.label_tag }}	{{ form.password.label_tag() }}	{{ form.password }}