diff --git a/Makefile b/Makefile
index 63d65a4..1e9ea1b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,12 @@ build: clean
 	done
 
 install:
-	mkdir -p $(DESTDIR)$(prefix)/share/authentic2/montpellier
-	mkdir -p $(DESTDIR)$(prefix)/share/portail-citoyen2/montpellier
+	mkdir -p $(DESTDIR)$(prefix)/share/montpellier-theme/templates
 	mkdir -p $(DESTDIR)$(prefix)/share/wcs/themes/montpellier2
 	mkdir -p $(DESTDIR)$(prefix)/share/wcs/themes/montpellier-commune
 	mkdir -p $(DESTDIR)$(prefix)/share/montpellier-theme/static
 	cp -r static/* $(DESTDIR)$(prefix)/share/montpellier-theme/static
+	cp -r templates/* $(DESTDIR)$(prefix)/share/montpellier-theme/templates/
 	cp -r idp/* $(DESTDIR)$(prefix)/share/authentic2/montpellier
 	cp -r portail-citoyen/* $(DESTDIR)$(prefix)/share/portail-citoyen2/montpellier
 	cp -ar wcs/montpellier2/* $(DESTDIR)$(prefix)/share/wcs/themes/montpellier2/
diff --git a/portail-citoyen/templates/block.html b/portail-citoyen/templates/block.html
deleted file mode 100644
index 68ade7f..0000000
--- a/portail-citoyen/templates/block.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="block">
-  {{ body|safe }}
-</div>
diff --git a/portail-citoyen/templates/blurps/categories.html b/portail-citoyen/templates/blurps/categories.html
deleted file mode 100644
index f55d67b..0000000
--- a/portail-citoyen/templates/blurps/categories.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% load i18n sekizai_tags %}
-test
diff --git a/portail-citoyen/templates/blurps/demarches.html b/portail-citoyen/templates/blurps/demarches.html
deleted file mode 100644
index 272c714..0000000
--- a/portail-citoyen/templates/blurps/demarches.html
+++ /dev/null
@@ -1,151 +0,0 @@
-{% load i18n sekizai_tags static blurp_tags %}
-{% with demarches=agglo.data %}
-{% if demarches %}
-<h3 class="aq-catgr-plg-title"><a href="{{ wcs_url }}/login">Démarches de Montpellier Méditerranée Métropole</a></h3>
-<ul class="aq-forms-plg-listing demarches-agglo" {% if demarches|length <= 1 %}style="-moz-column-count: 1; -webkit-column-count: 1; column-count: 1"{% endif %}>
-    {% for data in demarches %}
-    <li class="aq-forms-plg-item">
-      <a class="aq-forms-plg-link" href="{{ wcs_url}}/login/?ReturnUrl={{ data.url }}">{{ data.title }}</a>
-    </li>
-  {% endfor %}
-</ul>
-{% endif %}
-{% endwith %}
-
-<div class="ma_commune">
-<ul class="aq-forms-plg-listing">
-</ul>
-</div>
-
-<div class="aq-catgr-plg" data-empty="{% trans "Other procedures.." %}">
-  <h3 class="aq-catgr-plg-title">{% trans "Les démarches dans les autres communes" %}</h3>
-  <div class="aq-catgr-plg-selector-container">
-  </div>
-</div>
-
-{% addtoblock "js" %}
-<script type="text/javascript">
-
-function get_base_url(url) {
-    var urlArray = url.split('/');
-    return urlArray[0] + '//' + urlArray[2];
-}
-
-$(document).ready(function () {
-    var demarches = {};
-    var city_to_id_map = {};
-    var id_to_city_map = {};
-    {% if clapiers %}
-    demarches['clapiers'] = {{ clapiers.data|jsonify }};
-    city_to_id_map['Clapiers'] = 'clapiers';
-    id_to_city_map['clapiers'] = 'Clapiers';
-    {% endif %}
-    {% if laverune %}
-    demarches['laverune'] = {{ laverune.data|jsonify }};
-    city_to_id_map['Lavérune'] = 'laverune';
-    id_to_city_map['laverune'] = 'Lavérune';
-    {% endif %}
-    {% if vendargues %}
-    demarches['vendargues'] = {{ vendargues.data|jsonify }};
-    city_to_id_map['Vendargues'] = 'vendargues';
-    id_to_city_map['vendargues'] = 'Vendargues';
-    {% endif %}
-    {% if villeneuve %}
-    demarches['villeneuve'] = {{ villeneuve.data|jsonify }};
-    city_to_id_map['Villeneuve-lès-Maguelone'] = 'villeneuve';
-    id_to_city_map['villeneuve'] = 'Villeneuve-lès-Maguelone';
-    {% endif %}
-    {% if fabregues %}
-    demarches['fabregues'] = {{ fabregues.data|jsonify }};
-    city_to_id_map['Fabrègues'] = 'fabregues';
-    id_to_city_map['fabregues'] = 'Fabrègues';
-    {% endif %}
-    {% if saint_georges_dorques %}
-    demarches['saint-georges'] = {{ saint_georges_dorques.data|jsonify }};
-    city_to_id_map['Saint-Georges-d\'Orques'] = 'saint-georges';
-    id_to_city_map['saint-georges'] = 'Saint-Georges-d\'Orques';
-    {% endif %}
-    {% if sussargues %}
-    demarches['sussargues'] = {{ sussargues.data|jsonify }};
-    city_to_id_map['Sussargues'] = 'sussargues';
-    id_to_city_map['sussargues'] = 'Sussargues';
-    {% endif %}
-    {% if cournonterral %}
-    demarches['cournonterral'] = {{ cournonterral.data|jsonify }};
-    city_to_id_map['Cournonterral'] = 'cournonterral';
-    id_to_city_map['cournonterral'] = 'Cournonterral';
-    {% endif %}
-    {% if lattes %}
-    demarches['lattes'] = {{ lattes.data|jsonify }};
-    city_to_id_map['Lattes'] = 'lattes';
-    id_to_city_map['lattes'] = 'Lattes';
-    {% endif %}
-    var city = '{{ user.socialaccount_set.all.0.extra_data.ville }}';
-    var city_id = city_to_id_map[city];
-    if (demarches[city_id] != undefined && demarches[city_id].length > 0) {
-        var base_url = get_base_url(demarches[city_id][0].url) + '/login/';
-        var ma_commune = '{% trans "Démarches de ma commune : " %} <a href="'+ base_url + '">' + city + '</a>';
-        var h3 = '<h3 class="aq-catgr-plg-title">' + ma_commune + '</h3>';
-        $('.ma_commune').prepend(h3);
-        $.each(demarches[city_id], function(index, value) {
-            var li = '<li class="aq-forms-plg-item"><a class="aq-forms-plg-link" href="' + base_url + '?ReturnUrl=' + value.url + '">' + value.title + '</a><li>';
-            $('.ma_commune .aq-forms-plg-listing').append(li);
-        });
-    }
-
-    var $p = $('<p/>');
-    var $select = $('<select/>');
-    $select.append('<option value="">Vos Communes...</option>');
-    $.each(demarches, function (name, elements) {
-        if (name == city_id)
-            return;
-        if (elements.length == 0) return;
-        var $option = $('<option/>');
-        var id = name;
-        var city_name = id_to_city_map[name];
-        $option.text(city_name);
-        $option.val(id);
-        $select.append($option);
-        var $container = $('<div/>');
-        var $title = $('<h3/>');
-        var $listing = $('<ul/>');
-        if (elements.length <= 1)
-            $listing.attr('style', "-moz-column-count: 1; -webkit-column-count: 1; column-count: 1");
-        $listing.attr('class', 'aq-forms-plg-listing');
-        $container.attr({'id': id, 'class': "aq-catgr-plg-body"});
-        $title.attr('class', "aq-catgr-plg-title");
-        var base_url;
-        if (elements.length > 0) {
-            base_url = get_base_url(elements[0].url) + '/login/';
-            var title_link = '<a href="' + base_url + '">{% trans "Démarches de" %} ' + city_name + '</a>';
-            $title.append(title_link);
-        } else {
-            $title.text(name);
-        }
-        $container.append($title);
-        $.each(elements, function(index, elt) {
-            var item = '<li class="aq-forms-plg-item"><a class="aq-forms-plg-link" href="' + base_url + '?ReturnUrl=' + elt.url + '">' + elt.title + '</a><li>';
-            $listing.append(item);
-        });
-        $container.append($listing);
-        $("div.aq-catgr-plg").append($container);
-        $container.hide();
-    });
-    $p.append($select);
-    $('.aq-catgr-plg-selector-container').append($p);
-
-    // Show selected categories
-    var on_select_change = function(event) {
-        var $option = $('option:selected', event.target);
-        if ($option.val()) {
-            var id = '#' + $option.val();
-            $('.aq-catgr-plg .aq-catgr-plg-body').not(id).hide();
-            $(id).show();
-        } else {
-            $('.aq-catgr-plg .aq-catgr-plg-body').hide();
-        }
-    }
-    $select.bind('change', on_select_change);
-  });
-</script>
-{% endaddtoblock %}
diff --git a/portail-citoyen/templates/blurps/demarches_en_cours.html b/portail-citoyen/templates/blurps/demarches_en_cours.html
deleted file mode 100644
index e0bcd25..0000000
--- a/portail-citoyen/templates/blurps/demarches_en_cours.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% if demarches_en_cours %}
-<ul class="aq-forms-plg-listing" {% if demarches_en_cours|length <= 1 %}style="-moz-column-count: 1; -webkit-column-count: 1; column-count: 1"{% endif %}>
-    {% for data in demarches_en_cours %}
-    {% if data.url and data.title and not data.form_status_is_endpoint %}
-    <li class="aq-forms-plg-item">
-      <a class="aq-forms-plg-link"
-         href="{{ data.url }}">{{ data.title }}</a>
-    </li>
-    {% endif %}
-  {% endfor %}
-</ul>
-{% endif %}
diff --git a/portail-citoyen/templates/form.html b/templates/authentic2/form.html
similarity index 88%
rename from portail-citoyen/templates/form.html
rename to templates/authentic2/form.html
index c2beb48..0251ad7 100644
--- a/portail-citoyen/templates/form.html
+++ b/templates/authentic2/form.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <form method="post" action="." class="{% if form.non_field_errors %}form-with-errors {% endif %}">
   {% csrf_token %}
-  {% include "form_fields.html" with form=form %}
+  {% include "authentic2/form_fields.html" with form=form %}
 
   <input type="submit" {% if submit_name %}name="{{ submit_name }}"{% endif %}
     value="{% if submit_value %}{{ submit_value }}{% else %}{% trans 'Submit' %}{% endif %}" />
diff --git a/idp/templates/form_fields.html b/templates/authentic2/form_fields.html
similarity index 100%
rename from idp/templates/form_fields.html
rename to templates/authentic2/form_fields.html
diff --git a/idp/templates/authentic2/login.html b/templates/authentic2/login.html
similarity index 100%
rename from idp/templates/authentic2/login.html
rename to templates/authentic2/login.html
diff --git a/idp/templates/authentic2/login_password_form.html b/templates/authentic2/login_password_form.html
similarity index 91%
rename from idp/templates/authentic2/login_password_form.html
rename to templates/authentic2/login_password_form.html
index 7482360..db90152 100644
--- a/idp/templates/authentic2/login_password_form.html
+++ b/templates/authentic2/login_password_form.html
@@ -2,7 +2,7 @@
 <div>
 <form method="post" action="">
 {% csrf_token %}
-{% include "form_fields.html" with form=form %}
+{% include "authentic2/form_fields.html" with form=form %}
 <input type="submit" name="{{ submit_name }}" value="{% trans "Log in" %}"/>
 {% if cancel %}
 <input type="submit" name="cancel" value="{% trans 'Cancel' %}"/>
diff --git a/idp/templates/base.html b/templates/base.html
similarity index 91%
rename from idp/templates/base.html
rename to templates/base.html
index 00d0499..07faf02 100644
--- a/idp/templates/base.html
+++ b/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load i18n static sekizai_tags %}
+{% load i18n static  %}
 <html>
   <head>
     <meta charset="UTF-8"><!-- ☭ -->
@@ -9,8 +9,9 @@
     <meta http-equiv="content-language" content="fr" />
     <title>Compte Citoyen :: Montpellier Méditerranée Métropole :: {% block title %}{% endblock %}</title>
     <link rel="shortcut icon" href="{% static "themes/django-montpellier/favicon.png" %}" />
-    {% render_block "css" %}
     <link rel="stylesheet" type="text/css" href="{% static "themes/django-montpellier/style.css" %}" >
+    {% block extra_styles %}
+    {% endblock %}
     <link href='https://fonts.googleapis.com/css?family=Lato:400,700,700italic,400italic|Carme|Arvo' rel='stylesheet' type='text/css'>
     <script src="//d3nslu0hdya83q.cloudfront.net/dist/1.0/raven.min.js"></script>
     <script>
@@ -19,7 +20,6 @@
     {% block extra_scripts %}
     {% endblock %}
     {{ PIWIK_JS|safe }}
-    {% render_block "js" %}
   </head>
   <body {% block bodyargs %}{% endblock %}>
     <div id="page">
@@ -76,23 +76,23 @@
           {% endif %}
          </div>
         <div id="menu">
-        {% block menu %}
-<ul>
-<li id="top-menu-accueil" class="sibling">
-	<a href="{{ portal_url }}">Accueil</a>
-</li>
-<li id="top-menu-mon-compte" class="selected">
-	<a href="{{ idp_url }}/accounts">Mon compte</a>
-</li>
-<li id="top-menu-mes-abonnements" class="sibling">
-        <a href="{{ portal_url }}/mes-abonnements/">Mes abonnements</a>
-
-</li>
-
-<li id="top-menu-aide" class="sibling">
-	<a href="{{ portal_url }}/aide/">Aide</a>
-</li>
-</ul>
+          {% block menu %}
+          {% if user.is_authenticated %}
+          <ul>
+            <li id="top-menu-accueil" class="sibling">
+              <a href="{{ portal_url }}">Accueil</a>
+            </li>
+            <li id="top-menu-mon-compte" class="selected">
+              <a href="{{ idp_url }}/accounts">Mon compte</a>
+            </li>
+            <li id="top-menu-mes-abonnements" class="sibling">
+              <a href="{{ portal_url }}/mes-abonnements/">Mes abonnements</a>
+            </li>
+            <li id="top-menu-aide" class="sibling">
+              <a href="{{ portal_url }}/aide/">Aide</a>
+            </li>
+          </ul>
+          {% endif %}
         {% endblock %}
         </div>
         {% block content_header %}{% endblock %}
@@ -178,6 +178,7 @@
         </ul>
       </div>
     </div>
-    {% render_block "js-endpage" %}
+    {% block js-endpage %}
+    {% endblock %}
   </body>
 </html>
diff --git a/portail-citoyen/templates/blurps/compte_lecteur.html b/templates/blurps/compte_lecteur.html
similarity index 100%
rename from portail-citoyen/templates/blurps/compte_lecteur.html
rename to templates/blurps/compte_lecteur.html
diff --git a/portail-citoyen/templates/blurps/tipi.html b/templates/blurps/tipi.html
similarity index 100%
rename from portail-citoyen/templates/blurps/tipi.html
rename to templates/blurps/tipi.html
diff --git a/portail-citoyen/templates/404.html b/templates/combo/404.html
similarity index 100%
rename from portail-citoyen/templates/404.html
rename to templates/combo/404.html
diff --git a/portail-citoyen/templates/500.html b/templates/combo/500.html
similarity index 100%
rename from portail-citoyen/templates/500.html
rename to templates/combo/500.html
diff --git a/portail-citoyen/templates/base.html b/templates/combo/base.html
similarity index 100%
rename from portail-citoyen/templates/base.html
rename to templates/combo/base.html
diff --git a/portail-citoyen/templates/base_empty.html b/templates/combo/base_empty.html
similarity index 100%
rename from portail-citoyen/templates/base_empty.html
rename to templates/combo/base_empty.html
diff --git a/portail-citoyen/templates/base_help.html b/templates/combo/base_help.html
similarity index 100%
rename from portail-citoyen/templates/base_help.html
rename to templates/combo/base_help.html
diff --git a/portail-citoyen/templates/base_one_column.html b/templates/combo/base_one_column.html
similarity index 100%
rename from portail-citoyen/templates/base_one_column.html
rename to templates/combo/base_one_column.html
diff --git a/portail-citoyen/templates/base_two_columns.html b/templates/combo/base_two_columns.html
similarity index 100%
rename from portail-citoyen/templates/base_two_columns.html
rename to templates/combo/base_two_columns.html
diff --git a/portail-citoyen/templates/compte-agglo-montpellier/footer-menu.html b/templates/combo/compte-agglo-montpellier/footer-menu.html
similarity index 100%
rename from portail-citoyen/templates/compte-agglo-montpellier/footer-menu.html
rename to templates/combo/compte-agglo-montpellier/footer-menu.html
diff --git a/portail-citoyen/templates/compte-agglo-montpellier/top-menu.html b/templates/combo/compte-agglo-montpellier/top-menu.html
similarity index 100%
rename from portail-citoyen/templates/compte-agglo-montpellier/top-menu.html
rename to templates/combo/compte-agglo-montpellier/top-menu.html
diff --git a/idp/templates/form.html b/templates/combo/form.html
similarity index 100%
rename from idp/templates/form.html
rename to templates/combo/form.html
diff --git a/portail-citoyen/templates/form_fields.html b/templates/combo/form_fields.html
similarity index 100%
rename from portail-citoyen/templates/form_fields.html
rename to templates/combo/form_fields.html
diff --git a/templates/combo/page_template.html b/templates/combo/page_template.html
new file mode 100644
index 0000000..5c0eaa7
--- /dev/null
+++ b/templates/combo/page_template.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load combo %}
+
+{% block title %}{{ page.title }}{% endblock %}
+
+{% block menu %}
+  {% show_menu %}
+{% endblock %}
+
+{% block content %}
+  {% placeholder "content" %}
+{% endblock %}
diff --git a/templates/combo/page_template_two_columns.html b/templates/combo/page_template_two_columns.html
new file mode 100644
index 0000000..53ef4a0
--- /dev/null
+++ b/templates/combo/page_template_two_columns.html
@@ -0,0 +1,12 @@
+{% extends "combo/page_template.html" %}
+{% load combo %}
+
+{% block content %}
+<div id="left">
+  {% placeholder "left" %}
+</div>
+<div id="right">
+  {% placeholder "right" %}
+</div>
+<br style="clear"/>
+{% endblock %}
diff --git a/portail-citoyen/templates/passerelle_register_plugin/plugin.html b/templates/combo/passerelle_register_plugin/plugin.html
similarity index 100%
rename from portail-citoyen/templates/passerelle_register_plugin/plugin.html
rename to templates/combo/passerelle_register_plugin/plugin.html
diff --git a/idp/templates/idp/account_management.html b/templates/idp/account_management.html
similarity index 100%
rename from idp/templates/idp/account_management.html
rename to templates/idp/account_management.html
diff --git a/idp/templates/idp/homepage.html b/templates/idp/homepage.html
similarity index 100%
rename from idp/templates/idp/homepage.html
rename to templates/idp/homepage.html
diff --git a/idp/templates/idp/logout.html b/templates/idp/logout.html
similarity index 100%
rename from idp/templates/idp/logout.html
rename to templates/idp/logout.html
diff --git a/idp/templates/idp/openid/decide.html b/templates/idp/openid/decide.html
similarity index 100%
rename from idp/templates/idp/openid/decide.html
rename to templates/idp/openid/decide.html
diff --git a/idp/templates/profiles/edit_profile.html b/templates/profiles/edit_profile.html
similarity index 100%
rename from idp/templates/profiles/edit_profile.html
rename to templates/profiles/edit_profile.html
diff --git a/idp/templates/profiles/email_change.html b/templates/profiles/email_change.html
similarity index 93%
rename from idp/templates/profiles/email_change.html
rename to templates/profiles/email_change.html
index 2b1b669..d71062d 100644
--- a/idp/templates/profiles/email_change.html
+++ b/templates/profiles/email_change.html
@@ -22,7 +22,7 @@ lien pour valider le changement d'adresse de courriel.
 <div class="right">
 <form method="post" action="." class="password_change_form">
   {% csrf_token %}
-  {% include "form_fields.html" with form=form %}
+  {% include "authentic2/form_fields.html" with form=form %}
 
   <input type="submit" value="{% trans 'Submit' %}" />
   <button type="button" onclick="location.href = '/'">{% trans "Back" %}</button>
diff --git a/idp/templates/profiles/email_change_body.txt b/templates/profiles/email_change_body.txt
similarity index 100%
rename from idp/templates/profiles/email_change_body.txt
rename to templates/profiles/email_change_body.txt
diff --git a/idp/templates/profiles/email_change_subject.txt b/templates/profiles/email_change_subject.txt
similarity index 100%
rename from idp/templates/profiles/email_change_subject.txt
rename to templates/profiles/email_change_subject.txt
diff --git a/idp/templates/registration/activation_complete.html b/templates/registration/activation_complete.html
similarity index 100%
rename from idp/templates/registration/activation_complete.html
rename to templates/registration/activation_complete.html
diff --git a/idp/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
similarity index 92%
rename from idp/templates/registration/activation_email.txt
rename to templates/registration/activation_email.txt
index 9b7fb68..e283b0a 100644
--- a/idp/templates/registration/activation_email.txt
+++ b/templates/registration/activation_email.txt
@@ -4,8 +4,6 @@ Vous avez demandé à ouvrir un compte citoyen sur le portail de Montpellier
 Méditerranée Métropole ou sur le portail de votre commune, nous vous en
 remercions.
 
-Votre identifiant d’accès est : {{ user.username }}
-
 Vous pourrez utiliser ce même compte aussi bien pour vos démarches sur le
 portail de Montpellier Méditerranée Métropole que sur le portail de démarches
 en ligne de votre commune si celle-ci le propose.
@@ -13,7 +11,7 @@ en ligne de votre commune si celle-ci le propose.
 Pour confirmer la création et activer votre compte, cliquez sur le lien
 suivant :
 
-http://{{ site.domain }}{% url 'registration_activate' activation_key %}
+{{ registration_url }}
 
 Ce lien est valable pendant {{ expiration_days }} jours.
 
diff --git a/idp/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
similarity index 100%
rename from idp/templates/registration/activation_email_subject.txt
rename to templates/registration/activation_email_subject.txt
diff --git a/idp/templates/registration/delete_account.html b/templates/registration/delete_account.html
similarity index 100%
rename from idp/templates/registration/delete_account.html
rename to templates/registration/delete_account.html
diff --git a/idp/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
similarity index 93%
rename from idp/templates/registration/password_change_form.html
rename to templates/registration/password_change_form.html
index 480c4b1..990ea58 100644
--- a/idp/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -28,7 +28,7 @@ effet.
 <div class="right">
 <form method="post" action="." class="password_change_form">
   {% csrf_token %}
-  {% include "form_fields.html" with form=form %}
+  {% include "authentic2/form_fields.html" with form=form %}
 
   <input type="submit" value="{% trans 'Submit' %}" />
   <button type="button" onclick="location.href = '/'">{% trans "Back" %}</button>
diff --git a/idp/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
similarity index 100%
rename from idp/templates/registration/password_reset_complete.html
rename to templates/registration/password_reset_complete.html
diff --git a/idp/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
similarity index 93%
rename from idp/templates/registration/password_reset_confirm.html
rename to templates/registration/password_reset_confirm.html
index 8143b21..6387b5c 100644
--- a/idp/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -31,7 +31,7 @@ nouvelle fois à l'identique.
 
 <form method="post" action=".">
   {% csrf_token %}
-  {% include "form_fields.html" with form=form %}
+  {% include "authentic2/form_fields.html" with form=form %}
 
   <input type="submit" value="{% trans 'Submit' %}" />
   <button type="button" onclick="location.href = '/'">{% trans "Back" %}</button>
diff --git a/idp/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
similarity index 100%
rename from idp/templates/registration/password_reset_done.html
rename to templates/registration/password_reset_done.html
diff --git a/idp/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html
similarity index 100%
rename from idp/templates/registration/password_reset_email.html
rename to templates/registration/password_reset_email.html
diff --git a/idp/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
similarity index 93%
rename from idp/templates/registration/password_reset_form.html
rename to templates/registration/password_reset_form.html
index bf4958a..ae834bb 100644
--- a/idp/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -24,11 +24,10 @@ courriel vous permettant de définir un nouveau mot de passe.
 
 </div>
 
-
 <div class="right">
 <form method="post" action=".">
   {% csrf_token %}
-  {% include "form_fields.html" with form=form %}
+  {% include "authentic2/form_fields.html" with form=form %}
 
   <input type="submit" value="{% trans 'Submit' %}" />
   <button type="button" onclick="location.href = '/'">{% trans "Back" %}</button>
diff --git a/idp/templates/registration/password_reset_subject.txt b/templates/registration/password_reset_subject.txt
similarity index 100%
rename from idp/templates/registration/password_reset_subject.txt
rename to templates/registration/password_reset_subject.txt
diff --git a/idp/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
similarity index 100%
rename from idp/templates/registration/registration_complete.html
rename to templates/registration/registration_complete.html
diff --git a/idp/templates/registration/registration_form.html b/templates/registration/registration_form.html
similarity index 95%
rename from idp/templates/registration/registration_form.html
rename to templates/registration/registration_form.html
index 87ed245..441e9aa 100644
--- a/idp/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -22,7 +22,7 @@ class="narrow-page"
   </div>
 
   <div class="right">
-    {% include 'form.html' with form=form %}
+    {% include 'authentic2/form.html' with form=form %}
   </div>
 <br class="clear"/>