diff --git a/templates/theme.html b/templates/theme.html
index 4c8d012..e3dcd2d 100644
--- a/templates/theme.html
+++ b/templates/theme.html
@@ -1,157 +1,60 @@
-<!DOCTYPE html>
+{% extends "theme.html" %}
 {% load i18n static %}
-<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
-  <head>
-    <meta charset="UTF-8"><!-- 🔥 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{% firstof global_title "Compte Citoyen" %} {% block title %}{% endblock %}</title>
-    {% if favicon %}
-    <link rel="shortcut icon" href="{{site_base}}{% static "" %}{{favicon}}" />
-    {% endif %}
-    {% if theme_color %}
-    <meta name="theme-color" content="{{theme_color}}">
-    <meta name="msapplication-navbutton-color" content="{{theme_color}}">
-    {% endif %}
-    {% block extra_top_head %}
-    {% endblock %}
-    {{ media }}
-    {% if css_variant %}
-      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">
-    {% else %}
-      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{statics_hash}}">
-    {% endif %}
-    {% block extra_css %}
-    {% endblock %}
-    {% block extra_scripts %}
-    {% endblock %}
-  </head>
-  <body {% block bodyargs %}class="{% block bodyclasses %}{% endblock %}" {% block bodyattrs %}{% endblock %}{% endblock %}>
-   <div id="nav-skip">
-    <div>
-     <a href="#main-content">Aller au contenu</a>
-     <a href="#nav">Aller au menu</a>
-    </div>
-   </div>
 
-   <div id="page" {% block page-args %}{% endblock %}>
-    <header>
-    <div id="header-wrapper" >
-    <div id="header">
-      {% block header-top %}
-      {% if request.partner or a2_return_url %}
-      <div id="return">
-        {% if request.partner %}
-        <a href="{{ request.partner.url }}" class="highlight" style="color: {{ request.partner.color }}">{{ request.partner.name }}</a>
-        {% else %}
-        <a href="{{ a2_return_url }}" class="highlight">Mon compte</a>
-        {% endif %}
-      </div>
+{% block header-top %}
+    {% if request.partner or a2_return_url %}
+    <div id="return">
+      {% if request.partner %}
+      <a href="{{ request.partner.url }}" class="highlight" style="color: {{ request.partner.color }}">{{ request.partner.name }}</a>
+      {% else %}
+      <a href="{{ a2_return_url }}" class="highlight">Mon compte</a>
       {% endif %}
-
-      {% if help_url %}
-      <div id="help" class="desktop-only">
-        <a href="{{ help_url }}" target="_blank" rel="noopener">Besoin d'aide</a>
       </div>
-      {% endif %}
-      {% endblock %}
-     <div id="top">
-       {% block header-title %}
-       <h1 id="logo"{% if not request.partner %} style="background-position: 50% center;"{% endif %}>
-         <a accesskey="1" href="{% if request.partner %}{{ request.partner.url }}{% else %}{{ logo_link_url|default:'/' }}{% endif %}" style="background-image: {% if request.partner %}url({{ request.partner.logo_url }}){% endif %}">{{ global_title }}</a>
-       </h1>
-       {% endblock %}
-       {% include 'includes/user-info.html' %}
-     </div>
-     {% block header-bottom %}{% endblock %}
-    </div> <!-- header -->
-    </div> <!-- header-wrapper -->
-    </header>
+    {% endif %}
 
-{% block nav %}
-<nav>
-<div id="nav-wrapper" >
-<div id="nav" class="togglable">
-  <button id="nav-button" class="togglable" aria-label="Menu">
-    <span class="sr-only">Ouvrir le menu</span>
-    <span class="icon-bar icon-bar-1"></span>
-    <span class="icon-bar icon-bar-2"></span>
-    <span class="icon-bar icon-bar-3"></span>
-  </button>
-{% block menu %}
-  <ul>
-    <li class="link-accueil"><a href="{{combo_url}}">Accueil</a></li>
-    <li class="link-demarches"><a href="{{wcs_url}}/login">Démarches</a></li>
-    <li class="link-profil"><a href="{{authentic_url}}/accounts/">Profil</a></li>
-    <li class="link-aide"><a href="{{help_url}}" target="_blank" rel="noopener">Aide</a></li>
-  </ul>
-{% endblock %}
-</div> <!-- nav -->
-</div> <!-- nav-wrapper -->
-</nav>
-{% endblock %}
-
-  {% block before-main-content %}
-  {% endblock %}
-
-  <div id="main-content-wrapper">
-    <div id="main-content">
-
-{% block messages %}
-{% if messages %}
-  <div id="messages" class="messages-login">
-    <ul class="messages">
-        {% for message in messages %}
-        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-        {% endfor %}
-    </ul>
-  </div>
-{% endif %}
-{% endblock %}
-
-    <div id="content" class="gru-content large">
-            {% block content %}
-            {% endblock %}
-    </div> <!-- #content -->
-    </div> <!-- #main-content -->
-    </div> <!-- #main-content-wrapper -->
-
-   <footer>
-    {% block footer-top %}{% endblock %}
-    <div id="footer-wrapper">
-    <div id="footer">
-      {% block footer %}
-      <div class="textcell grid-1-3 securise desktop-only">
-        <div>
-          <h3>Sécurisé</h3>
-          <p>Effectuez vos démarches en toute <strong>sécurité</strong></p>
-        </div>
-      </div>
-
-      <div class="textcell grid-1-3 unique desktop-only">
-        <div><h3>Unique</h3>
-          <p>Accédez à vos services en ligne avec <strong>un seul compte</strong></p>
-        </div>
-      </div>
-
-      <div class="textcell grid-1-3 simple desktop-only">
-        <div>
-          <h3>Simple</h3>
-          <p><strong>Facilitez</strong> vos démarches<br /> en ligne</p>
-        </div>
-      </div>
-
-      <div class="cell textcell clear desktop-only"><div><p>&nbsp;</p><p>&nbsp;</p></div></div>
-      <div class="cell textcell desktop-only " >
-        <div><p><strong>Un seul compte pour accéder à vos services numériques<br>
-              situés sur le territoire de la Métropole de Lyon</strong>
-          </p>
-        </div>
-      </div>
-      {% endblock %}
+    {% if help_url %}
+    <div id="help" class="desktop-only">
+      <a href="{{ help_url }}" target="_blank" rel="noopener">Besoin d'aide</a>
     </div>
+    {% endif %}
+{% endblock %}
+
+{% block header-title %}
+    <h1 id="logo"{% if not request.partner %} style="background-position: 50% center;"{% endif %}>
+      <a accesskey="1" href="{% if request.partner %}{{ request.partner.url }}{% else %}{{ logo_link_url|default:'/' }}{% endif %}" style="background-image: {% if request.partner %}url({{ request.partner.logo_url }}){% endif %}">{{ global_title }}</a>
+    </h1>
+{% endblock %}
+
+{% block footer %}
+    <div class="textcell grid-1-3 securise desktop-only">
+      <div>
+        <h3>Sécurisé</h3>
+        <p>Effectuez vos démarches en toute <strong>sécurité</strong></p>
+      </div>
     </div>
-    {% block footer-bottom %}
+
+    <div class="textcell grid-1-3 unique desktop-only">
+      <div><h3>Unique</h3>
+        <p>Accédez à vos services en ligne avec <strong>un seul compte</strong></p>
+      </div>
+    </div>
+    <div class="textcell grid-1-3 simple desktop-only">
+      <div>
+        <h3>Simple</h3>
+        <p><strong>Facilitez</strong> vos démarches<br /> en ligne</p>
+      </div>
+    </div>
+
+    <div class="cell textcell clear desktop-only"><div><p>&nbsp;</p><p>&nbsp;</p></div></div>
+    <div class="cell textcell desktop-only " >
+      <div><p><strong>Un seul compte pour accéder à vos services numériques<br>
+            situés sur le territoire de la Métropole de Lyon</strong>
+        </p>
+      </div>
+    </div>
+{% endblock %}
+
+{% block footer-post %}
     <div id="footnote">
       <div class="footnote-top desktop-only">
         <div>
@@ -184,11 +87,9 @@
         </div>
       </div>
     </div>
-    {% endblock %}
-   </footer>
-   </div> <!-- #page -->
-   {% if environment_label %}<span id="environment-label">{{ environment_label }}</span>{% endif %}
-   <a style="display: none" href="#" accesskey="t">Retour en haut de page</a>
+{% endblock %}
+
+{% block body-bottom %}
    {% if smarttag_js %}
      <script type="text/javascript" src="{{ smarttag_js }}"></script>
      <script type="text/javascript" src="{{ site_base }}{% static 'js/cookie_usage_consent.js' %}?{{statics_hash}}"></script>
@@ -200,6 +101,4 @@
        }
      </script>
    {% endif %}
-   {% include "includes/tracking.html" %}
-  </body>
-</html>
+{% endblock %}
