diff --git a/content/assets/css/style-add-ans.css b/content/assets/css/style-add-ans.css
index 26344f3..6febaa6 100644
--- a/content/assets/css/style-add-ans.css
+++ b/content/assets/css/style-add-ans.css
@@ -18,7 +18,7 @@
 
 
 #hl7-search-lnk >img {
-    height: 50px;
+    height: 40px;
 }
 
 
diff --git a/content/searchform.html b/content/searchform.html
index 5afda39..779ec73 100644
--- a/content/searchform.html
+++ b/content/searchform.html
@@ -8,41 +8,66 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
   <meta name="author" content="http://www.hl7.org"/>
 
-  <link href="{{site.data.info.assets}}fhir.css" rel="stylesheet"/>
-
-    <!-- Bootstrap core CSS -->
-  <link href="http://hl7.org/fhir/dist-hist/css/bootstrap.css" rel="stylesheet"/>
-  <link href="http://hl7.org/fhir/assets-hist/css/bootstrap-fhir.css" rel="stylesheet"/>
-
-    <!-- Project extras -->
-  <link href="http://hl7.org/fhir/assets-hist/css/project.css" rel="stylesheet"/>
-  <link href="http://hl7.org/fhir/assets-hist/css/pygments-manni.css" rel="stylesheet"/>
-	<link href="http://hl7.org/fhir/jquery-ui.css" rel="stylesheet"/>
-
-    <!-- Favicons -->
-  <link rel="fhir-logo" sizes="144x144" href="{{site.data.info.assets}}assets/ico/icon-fhir-144.png"/>
-  <link rel="fhir-logo" sizes="114x114" href="{{site.data.info.assets}}assets/ico/icon-fhir-114.png"/>
-  <link rel="fhir-logo" sizes="72x72" href="{{site.data.info.assets}}assets/ico/icon-fhir-72.png"/>
-  <link rel="fhir-logo" href="{{site.data.info.assets}}assets/ico/icon-fhir-57.png"/>
-  <link rel="shortcut icon" href="http://hl7.org/fhir/assets-hist/ico/favicon.png"/>
-  <link href="http://hl7.org/fhir/history.css" rel="stylesheet"/>
+  <link rel="stylesheet" href="fhir.css"/>
+
+  <!-- Bootstrap core CSS -->
+<link rel="stylesheet" href="assets/css/bootstrap-fhir.css"/>
+
+  <!-- Project extras -->
+<link rel="stylesheet" href="assets/css/project.css"/>
+<link rel="stylesheet" href="assets/css/pygments-manni.css"/>
+<link rel="stylesheet" href="assets/css/jquery-ui.css"/>
+<link rel="stylesheet" href="assets/css/prism.css"/>
+<link rel="stylesheet" href="assets/css/style-ans.css"/>
+<link rel="stylesheet" href="assets/css/style-add-ans.css"/>
+  <!-- Placeholder for child template CSS declarations -->
+
+<script src="fhir-table-scripts.js" type="text/javascript"> </script>
+
+  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- [if lt IE 9]>
+<script src="assets/js/html5shiv.js"></script>
+<script src="assets/js/respond.min.js"></script>
+<![endif] -->
+
+  <!-- Favicons -->
+<link sizes="144x144" rel="fhir-logo" href="assets/ico/icon-fhir-144.png"/>
+<link sizes="114x114" rel="fhir-logo" href="assets/ico/icon-fhir-114.png"/>
+<link sizes="72x72" rel="fhir-logo" href="assets/ico/icon-fhir-72.png"/>
+<link rel="fhir-logo" href="assets/ico/icon-fhir-57.png"/>
+<link rel="shortcut icon" href="assets/ico/favicon.png"/>
 </head>
 
 <body>
-	<div id="segment-header" class="segment">  <!-- segment-header -->	
-		<div class="container">  <!-- container -->
-   <a id="logo" no-external="true" href="http://hl7.org/fhir"><img src="http://hl7.org/fhir/assets-hist/images/fhir-logo-www.png" alt="logo fhir" width="249" height="60"></a>
-<div>
-<a id="hl7-logo" no-external="true" href="http://www.hl7.org">
-     <img alt="visit the hl7 website" width="42" height="50" src="http://hl7.org/fhir/assets-hist/images/hl7-logo-n.png"/>
-    </a>
-			</div>       	
-      <div id="ig-status" style="font-size:24px;padding-top: 20px;">
-        <b id="ig-title">Search {{title}} (Current Build)</b>
-			</div>       	
-		</div>
-		<div class="container">  <!-- container -->
-	</div></div>  <!-- /segment-header -->	
+
+  <div id="segment-header" class="segment">  <!-- segment-header -->
+    <div class="container">  <!-- container -->
+      <!-- Placeholder for child template header declarations -->
+<div id="family-nav">
+  <a id="hl7-search-lnk" no-external="true" href="http://hl7.org/fhir"><img height="50" alt="Visit the FHIR website" src="assets/images/fhir-logo-www.png"> </a>
+</div>
+<div id="ans-nav" style="line-height: 50px; float: left; margin-top: 4px; margin-bottom: 8px; color: #808080; ">
+  <a id="hl7-logo" no-external="true" href="https://esante.gouv.fr/"><img height="50" alt="ANS Logo" src="assets/images/logo-ANS.svg"></a>
+</div>
+
+
+      <div id="ig-status">
+        <p><span style="font-size:12pt;font-weight:bold">Recherche sur {{title}} (Current Build)</span>
+  
+<img alt="France flag" src="assets/images/fra.svg" height="16" title="France">
+
+
+          </span>
+        </p>
+      </div>
+    </div> <!-- /container -->
+  </div>
+
+
+
+
+
+
 
 
 	<div id="segment-navbar" class="segment">  <!-- segment-navbar -->
@@ -61,9 +86,7 @@
 					<div class="nav-collapse collapse navbar-inverse-collapse">
             <ul class="nav navbar-nav">
               <li><a href="index.html">Specification</a></li>
-              <li><a href="history.html">History</a></li>
             </ul>
-
 					</div>  <!-- /.nav-collapse -->
 				</div>  <!-- /.container -->
 			</nav>  <!-- /.navbar -->
@@ -87,15 +110,18 @@
 
 <div class="col-12">
 
-<h2>Search {{title}} (Current Build)</h2>
+<h2>Recherche {{title}} (Current Build)</h2>
+
+<form id="searchForm">
+  <input type="text" name="q" id="q" placeholder="Recherche..." aria-label="Recherche sur qwant"/>
+  <button type="submit" id="search">Lancer la recherche</button>
+</form>
+
 
-<iframe src="https://duckduckgo.com/search.html?site={{url}}&amp;prefill=Search {{title}}&amp;focus=yes" style="overflow:hidden;margin:0;padding:0;width:408px;height:40px;" frameborder="0"></iframe>
 
 <hr/>
 
-<p>
-Note: this search searches the curent build of {{title}}.
-</p>
+
 </div>
 
     </div>  <!-- /inner-wrapper -->
@@ -119,10 +145,7 @@ <h2>Search {{title}} (Current Build)</h2>
 		<div class="container">  <!-- container -->
 			<div class="inner-wrapper">
 				<p>
-          <span id="ig-footer">hl7.fhir.us.hai: Healthcare Associated Infection Implementation Guide </span> &reg;&copy; <a style="color: #81BEF7" href="http://hl7.org">HL7</a> |
-             <!--  <a style="color: #81BEF7" rel="license"  <href="../license.html"><img style="border-style: none;" alt="CC0" src="cc0.png"/></a> -->
-                <a style="color: #81BEF7" rel="license" href="http://hl7.org/fhir/license.html"><img style="border-style: none;" alt="CC0" src="cc0.png"/></a>
-        </p>
+                  </p>
 			</div>  <!-- /inner-wrapper -->
 		</div>  <!-- /container -->
 	</div>  <!-- /segment-footer -->
@@ -134,8 +157,115 @@ <h2>Search {{title}} (Current Build)</h2>
 		<div class="container">  <!-- container -->
 		</div>  <!-- /container -->
 	</div>  <!-- /segment-post-footer -->
-    
-
+  <footer class="footer footer-principal" role="contentinfo">
+    <div class="footer__region1">
+      <div class="container">
+        <div class="row">
+  
+          <div class="col-md-6 col-lg-4 text-center text-md-left">
+            <div class="logos">        
+              <div class="logo logo--0">
+                <a href="https://solidarites-sante.gouv.fr" title="Ministère des Solidarités et de la Santé (nouvelle fenêtre)" target="_blank" rel="nofollow">
+                  
+                  <img src="assets/images/logo-ministere.svg" alt="Ministère des Solidarités et de la Santé" width="133" height="77" loading="lazy">
+                  
+                </a>
+              </div>
+          
+              <div class="logo logo--1">
+                <a href="https://esante.gouv.fr/" title="Agence du numérique en santé (nouvelle fenêtre)" target="_blank" rel="nofollow">
+                  
+                  <img src="assets/images/logo-ANS-footer.svg" alt="Agence du numérique en santé" width="106" height="74" loading="lazy">
+                </a>
+              </div>
+            </div>
+          </div>
+          
+          <div class="col-md-6 col-lg-4 text-center text-md-left">
+            <p class="footer__title">Agence du Numérique en Santé</p>
+            <p>2-10 Rue d'Oradour-sur-Glane 75015 Paris</p>
+  
+            <!-- <div class="m-social">
+              <ul class="m-social__list">        
+                <li class="m-social__item">
+                  <a class="m-social__link" href="https://www.linkedin.com/company/agence-du-numerique-en-sante/" target="_blank" rel="nofollow">
+                    <div class="m-social__icon">
+                      <svg class="svg-icon svg-linkedin" aria-hidden="true" focusable="false"><use href="assets/images/icon-sprite.svg#linkedin"></use></svg>
+                    </div>
+                    <span class="sr-only">linkedin</span>
+                  </a>
+                </li>
+                <li class="m-social__item">
+                  <a class="m-social__link" href="https://twitter.com/esante_gouv_fr" target="_blank" rel="nofollow">
+                    <div class="m-social__icon">
+                      <svg class="svg-icon svg-twitter" aria-hidden="true" focusable="false"><use href="assets/images/icon-sprite.svg#twitter"></use></svg>
+                    </div>
+                    <span class="sr-only">twitter</span>
+                  </a>
+                </li>
+                <li class="m-social__item">
+                  <a class="m-social__link" href="https://www.youtube.com/channel/UCd1zuSaU5cE1lRCpwv_HSMA" target="_blank" rel="nofollow">
+                    <div class="m-social__icon">
+                      <svg class="svg-icon svg-youtube" aria-hidden="true" focusable="false"><use href="assets/images/icon-sprite.svg#youtube"></use></svg>
+                    </div>
+                    <span class="sr-only">youtube</span>
+                  </a>
+                </li>
+                <li class="m-social__item">
+                  <a class="m-social__link" href="https://esante.gouv.fr/rss.xml" target="_blank" rel="nofollow">
+                    <div class="m-social__icon">
+                      <svg class="svg-icon svg-rss" aria-hidden="true" focusable="false"><use href="assets/images/icon-sprite.svg#rss"></use></svg>
+                    </div>
+                    <span class="sr-only">rss</span>
+                  </a>
+                </li>
+              </ul>
+            </div> -->
+          </div>
+          
+          <div class="col-6 col-lg-4">
+            <ul class="footer-list">
+              <li class="footer-list__item footer-list__item--hasIcon">
+                <a href="mailto:ci-sis@esante.gouv.fr" class="mailto-link">
+                  <svg class="svg-icon svg-angle-right" aria-hidden="true" focusable="false"><use href="assets/images/icon-sprite.svg#angle-right"></use></svg>Contact</a>
+                </li>
+                <!-- <li class="footer-list__item">
+                  <a href="https://interop-pprod.esante.gouv.fr/ci-sis-specifications/wp-content/uploads/CGU_espace_de_tests_v1.1.pdf" class="file-link">Mentions légales</a>
+                </li>
+                 -->
+              </ul>
+            </div>
+  
+          </div>
+        </div>
+      </div>
+      
+      <!-- <div class="footer__region2">
+        <div class="container">
+          <div class="footer-contentinfo">
+            <ul class="footer-list footer-list--inline">
+  
+            </ul>
+          </div>
+        </div>
+      </div> -->
+    </footer>
+    <script src="assets/js/jquery.js" type="text/javascript"> </script>       <!-- note keep space here, otherwise it will be transformed to empty tag -> fails -->
+    <script src="assets/js/jquery-ui.min.js" type="text/javascript"> </script>
+    <script language="javascript">
+      $( document ).ready(function() {
+          $("#searchForm").submit(function(e){ 
+              e.preventDefault(); 
+              urlSearch = "https://search.brave.com/search?q=site:";
+              hrefurl=$(location).attr("href");
+              urlSearch += hrefurl.substr(0,hrefurl.lastIndexOf('/') + 1);
+              urlSearch += "+" + $("#q").val();
+              window.open(urlSearch, '_blank');
+          });
+        });
+      </script>
+      
+  <script src="assets/js/window-hash.js" type="text/javascript"> </script>
 </body>
 </html>
 
diff --git a/includes/fragment-header.html b/includes/fragment-header.html
index 90f0596..858b473 100644
--- a/includes/fragment-header.html
+++ b/includes/fragment-header.html
@@ -4,4 +4,8 @@
   </div>
   <div id="ans-nav" style="line-height: 50px; float: left; margin-top: 4px; margin-bottom: 8px; color: #808080; ">
     <a id="hl7-logo" no-external="true" href="https://esante.gouv.fr/"><img height="50" alt="ANS Logo" src="{{site.data.info.assets}}assets/images/logo-ANS.svg"/></a>
-  </div>
\ No newline at end of file
+    <a id="hl7-search-lnk" no-external="true" href="searchform.html"><img alt="Search FHIR" src="{{site.data.info.assets}}assets/images/search.png"/></a>
+  </div>
+
+  <div id="ig-search">
+ </div>
