diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/base.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/base.html
new file mode 100644
index 0000000..80b89eb
--- /dev/null
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/base.html
@@ -0,0 +1,9 @@
+{% extends "authentic2/base-page.html"%}
+{% load staticfiles %}
+
+{% block extra-css %}
+<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>
+<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>
+{% enblock %}
+
+{% block bodyargs %}class="narrow-page"{% endblock %}
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html
index 45ca6d1..4b90297 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html
@@ -1,11 +1,18 @@
-{% extends "base.html"%}
-{% load staticfiles authentic2 %}
+{% extends "authentic2_msp_auth/base.html"%}
+{% load staticfiles %}
 
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/domready.js" %}"></script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/getElementsByClassName-1.0.1.js" %}"></script>{% endaddtoblock %}
-{% addtoblock "js-endpage" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/oauth.js" %}"></script>{% endaddtoblock %}
+{% block extra-scripts %}
+<script type="text/javascript" src="{% static "authentic2_auth_msp/js/domready.js" %}"></script>
+<script type="text/javascript" src="{% static "authentic2_auth_msp/js/getElementsByClassName-1.0.1.js" %}"></script>
+{% endblock %}
+
+{% block js-endpage %}
+<script type="text/javascript" src="{% static "authentic2_auth_msp/js/oauth.js" %}"></script>
+{% endblock %}
+
+{% block content_header %}
+  <div id='single-title'>Gestion des liaisons&nbsp;: confirmation de suppression</div>
+{% endblock %}
 
 {% block content %}
 
@@ -13,7 +20,6 @@
     <div class="msp">
       <div class="cadre">
         <div class="bordure">
-          <h1>Gestion des liaisons&nbsp;: confirmation de suppression</h1>
           <p>
           <small><a href="{{ done }}" class="roll">Retour</a></small>
           </p>
@@ -39,11 +45,9 @@
               </p>
             </div>
           </div>
-          
           <span class="retablir"><br /></span>
         </div>
       </div>
     </div>
   </div>
-
 {% endblock %}
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html
index 3c0e23f..3db93c6 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html
@@ -1,8 +1,9 @@
-{% extends "base.html"%}
+{% extends "authentic2_auth_msp/base.html"%}
 {% load staticfiles authentic2 %}
 
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>{% endaddtoblock %}
+{% block content_header %}
+  <div id='single-title'>Gestion des liaisons avec mon.service-public.fr</div>
+{% endblock %}
 
 {% block content %}
 
@@ -10,7 +11,6 @@
     <div class="msp">
       <div class="cadre">
         <div class="bordure">
-          <h1>Gestion des liaisons avec mon.service-public.fr</h1>
           <p>
           <small><a href="{{ next }}" class="roll">Retour</a></small>
           </p>
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html
index 28ac9cc..19f1fde 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html
@@ -1,7 +1,5 @@
-{% extends "base.html"%}
-{% load staticfiles authentic2 %}
-
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
+{% extends "authentic2_auth_msp/base.html"%}
+{% load staticfiles %}
 
 {% block content %}
 		<div class="msp">