diff --git a/templates/mobile/lightbox/basket_element.twig b/templates/mobile/lightbox/basket_element.html.twig
similarity index 97%
rename from templates/mobile/lightbox/basket_element.twig
rename to templates/mobile/lightbox/basket_element.html.twig
index 78fa9a075b..d694ed4f3b 100644
--- a/templates/mobile/lightbox/basket_element.twig
+++ b/templates/mobile/lightbox/basket_element.html.twig
@@ -37,7 +37,7 @@
       </div>
       <div>
         <ul data-role="listview" id="notes_{{basket_element.getId()}}">
-          {% include 'lightbox/sc_note.twig' %}
+          {% include 'lightbox/sc_note.html.twig' %}
         </ul>
       </div>
     {% endif %}
diff --git a/templates/mobile/lightbox/error.twig b/templates/mobile/lightbox/error.html.twig
similarity index 100%
rename from templates/mobile/lightbox/error.twig
rename to templates/mobile/lightbox/error.html.twig
diff --git a/templates/mobile/lightbox/feed.twig b/templates/mobile/lightbox/feed.html.twig
similarity index 100%
rename from templates/mobile/lightbox/feed.twig
rename to templates/mobile/lightbox/feed.html.twig
diff --git a/templates/mobile/lightbox/feed_element.twig b/templates/mobile/lightbox/feed_element.html.twig
similarity index 100%
rename from templates/mobile/lightbox/feed_element.twig
rename to templates/mobile/lightbox/feed_element.html.twig
diff --git a/templates/mobile/lightbox/index.twig b/templates/mobile/lightbox/index.html.twig
similarity index 100%
rename from templates/mobile/lightbox/index.twig
rename to templates/mobile/lightbox/index.html.twig
diff --git a/templates/mobile/lightbox/note_form.twig b/templates/mobile/lightbox/note_form.html.twig
similarity index 100%
rename from templates/mobile/lightbox/note_form.twig
rename to templates/mobile/lightbox/note_form.html.twig
diff --git a/templates/mobile/lightbox/sc_note.twig b/templates/mobile/lightbox/sc_note.html.twig
similarity index 100%
rename from templates/mobile/lightbox/sc_note.twig
rename to templates/mobile/lightbox/sc_note.html.twig
diff --git a/templates/mobile/lightbox/validate.twig b/templates/mobile/lightbox/validate.html.twig
similarity index 100%
rename from templates/mobile/lightbox/validate.twig
rename to templates/mobile/lightbox/validate.html.twig
diff --git a/templates/mobile/login/index.twig b/templates/mobile/login/index.html.twig
similarity index 100%
rename from templates/mobile/login/index.twig
rename to templates/mobile/login/index.html.twig
diff --git a/templates/web/geonames/city_list.twig b/templates/web/geonames/city_list.html.twig
similarity index 100%
rename from templates/web/geonames/city_list.twig
rename to templates/web/geonames/city_list.html.twig
diff --git a/templates/web/lightbox/IE6/agreement_box.twig b/templates/web/lightbox/IE6/agreement_box.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/agreement_box.twig
rename to templates/web/lightbox/IE6/agreement_box.html.twig
diff --git a/templates/web/lightbox/IE6/basket_options.twig b/templates/web/lightbox/IE6/basket_options.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/basket_options.twig
rename to templates/web/lightbox/IE6/basket_options.html.twig
diff --git a/templates/web/lightbox/IE6/feed.twig b/templates/web/lightbox/IE6/feed.html.twig
similarity index 98%
rename from templates/web/lightbox/IE6/feed.twig
rename to templates/web/lightbox/IE6/feed.html.twig
index 465495c057..3c42e1a2bc 100644
--- a/templates/web/lightbox/IE6/feed.twig
+++ b/templates/web/lightbox/IE6/feed.html.twig
@@ -124,7 +124,7 @@
 
             <div class="" style="width:100%;position:relative;height:166px;overflow-x:hidden;overflow-y:hidden;">
                 <div class="" id="sc_wrapper" style="width:100%;position:relative;overflow-x:auto;overflow-y:hidden;">
-                    {% include 'lightbox/IE6/feed_container.twig' %}
+                    {% include 'lightbox/IE6/feed_container.html.twig' %}
                 </div>
             </div>
         </div>
diff --git a/templates/web/lightbox/IE6/feed_container.twig b/templates/web/lightbox/IE6/feed_container.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/feed_container.twig
rename to templates/web/lightbox/IE6/feed_container.html.twig
diff --git a/templates/web/lightbox/IE6/feed_options_box.twig b/templates/web/lightbox/IE6/feed_options_box.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/feed_options_box.twig
rename to templates/web/lightbox/IE6/feed_options_box.html.twig
diff --git a/templates/web/lightbox/IE6/index.twig b/templates/web/lightbox/IE6/index.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/index.twig
rename to templates/web/lightbox/IE6/index.html.twig
diff --git a/templates/web/lightbox/IE6/sc_container.twig b/templates/web/lightbox/IE6/sc_container.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/sc_container.twig
rename to templates/web/lightbox/IE6/sc_container.html.twig
diff --git a/templates/web/lightbox/IE6/sc_options_box.twig b/templates/web/lightbox/IE6/sc_options_box.html.twig
similarity index 100%
rename from templates/web/lightbox/IE6/sc_options_box.twig
rename to templates/web/lightbox/IE6/sc_options_box.html.twig
diff --git a/templates/web/lightbox/IE6/validate.twig b/templates/web/lightbox/IE6/validate.html.twig
similarity index 97%
rename from templates/web/lightbox/IE6/validate.twig
rename to templates/web/lightbox/IE6/validate.html.twig
index 35bc908bcb..8d861da826 100644
--- a/templates/web/lightbox/IE6/validate.twig
+++ b/templates/web/lightbox/IE6/validate.html.twig
@@ -36,7 +36,7 @@
                                 </td>
                                 <td style="text-align:right;width:230px;">
                                     <div class="options">
-                                        {% include 'lightbox/IE6/sc_options_box.twig' %}
+                                        {% include 'lightbox/IE6/sc_options_box.html.twig' %}
                                     </div>
                                 </td>
                             </tr>
@@ -53,8 +53,8 @@
                             {{ thumbnail.format(bask_prev, width,height, '', session, false) }}
 
                         {% endif %}
-                        {% include 'lightbox/selector_box.twig' %}
-                        {% include 'lightbox/sc_note.twig' %}
+                        {% include 'lightbox/selector_box.html.twig' %}
+                        {% include 'lightbox/sc_note.html.twig' %}
                     </div>
                 </div>
                 <div id="record_compare" class="record_display_box PNBleft">
@@ -110,9 +110,9 @@
                 </div>
         {% if basket.getValidation() %}
                 <div style="width:230px;height:auto;" id="basket_infos" class="right_column_wrapper unselectable right_column_wrapper_user left">
-                            {% include 'lightbox/IE6/agreement_box.twig' %}
+                            {% include 'lightbox/IE6/agreement_box.html.twig' %}
                     <div id="basket_options" class="ui-corner-all unselectable left" style="height:35px;xmargin-top:10px;">
-                        {% include 'lightbox/IE6/basket_options.twig' %}
+                        {% include 'lightbox/IE6/basket_options.html.twig' %}
                     </div>
                 </div>
         {% endif %}
@@ -162,7 +162,7 @@
 
             <div class="" style="width:100%;position:relative;height:166px;overflow-x:hidden;overflow-y:hidden;">
                 <div class="" id="sc_wrapper" style="width:100%;position:relative;overflow-x:auto;overflow-y:hidden;">
-                    {% include 'lightbox/IE6/sc_container.twig' %}
+                    {% include 'lightbox/IE6/sc_container.html.twig' %}
                 </div>
             </div>
         </div>
diff --git a/templates/web/lightbox/agreement_box.twig b/templates/web/lightbox/agreement_box.html.twig
similarity index 100%
rename from templates/web/lightbox/agreement_box.twig
rename to templates/web/lightbox/agreement_box.html.twig
diff --git a/templates/web/lightbox/basket_content_report.twig b/templates/web/lightbox/basket_content_report.html.twig
similarity index 100%
rename from templates/web/lightbox/basket_content_report.twig
rename to templates/web/lightbox/basket_content_report.html.twig
diff --git a/templates/web/lightbox/basket_options.twig b/templates/web/lightbox/basket_options.html.twig
similarity index 100%
rename from templates/web/lightbox/basket_options.twig
rename to templates/web/lightbox/basket_options.html.twig
diff --git a/templates/web/lightbox/error.twig b/templates/web/lightbox/error.html.twig
similarity index 100%
rename from templates/web/lightbox/error.twig
rename to templates/web/lightbox/error.html.twig
diff --git a/templates/web/lightbox/feed.twig b/templates/web/lightbox/feed.html.twig
similarity index 98%
rename from templates/web/lightbox/feed.twig
rename to templates/web/lightbox/feed.html.twig
index cc0cb3b6d5..a10ef2a98f 100644
--- a/templates/web/lightbox/feed.twig
+++ b/templates/web/lightbox/feed.html.twig
@@ -37,7 +37,7 @@
                                 <td style="text-align:right;width:230px;">
                                     <div class="options">
                     {% set feed_element = first_item %}
-                                        {% include 'lightbox/feed_options_box.twig' %}
+                                        {% include 'lightbox/feed_options_box.html.twig' %}
                                     </div>
                                 </td>
                             </tr>
@@ -112,7 +112,7 @@
                 <div id="left_scroller" class="PNB clickable">
                 </div>
                 <div class="PNB" id="sc_wrapper">
-                    {% include 'lightbox/feed_container.twig' %}
+                    {% include 'lightbox/feed_container.html.twig' %}
                 </div>
                 <div id="right_scroller" class="PNB clickable">
                 </div>
diff --git a/templates/web/lightbox/feed_container.twig b/templates/web/lightbox/feed_container.html.twig
similarity index 100%
rename from templates/web/lightbox/feed_container.twig
rename to templates/web/lightbox/feed_container.html.twig
diff --git a/templates/web/lightbox/feed_options_box.twig b/templates/web/lightbox/feed_options_box.html.twig
similarity index 100%
rename from templates/web/lightbox/feed_options_box.twig
rename to templates/web/lightbox/feed_options_box.html.twig
diff --git a/templates/web/lightbox/index.twig b/templates/web/lightbox/index.html.twig
similarity index 100%
rename from templates/web/lightbox/index.twig
rename to templates/web/lightbox/index.html.twig
diff --git a/templates/web/lightbox/sc_container.twig b/templates/web/lightbox/sc_container.html.twig
similarity index 100%
rename from templates/web/lightbox/sc_container.twig
rename to templates/web/lightbox/sc_container.html.twig
diff --git a/templates/web/lightbox/sc_note.twig b/templates/web/lightbox/sc_note.html.twig
similarity index 100%
rename from templates/web/lightbox/sc_note.twig
rename to templates/web/lightbox/sc_note.html.twig
diff --git a/templates/web/lightbox/sc_options_box.twig b/templates/web/lightbox/sc_options_box.html.twig
similarity index 100%
rename from templates/web/lightbox/sc_options_box.twig
rename to templates/web/lightbox/sc_options_box.html.twig
diff --git a/templates/web/lightbox/selector_box.twig b/templates/web/lightbox/selector_box.html.twig
similarity index 100%
rename from templates/web/lightbox/selector_box.twig
rename to templates/web/lightbox/selector_box.html.twig
diff --git a/templates/web/lightbox/validate.twig b/templates/web/lightbox/validate.html.twig
similarity index 96%
rename from templates/web/lightbox/validate.twig
rename to templates/web/lightbox/validate.html.twig
index d7dbd51d9d..83a9391271 100644
--- a/templates/web/lightbox/validate.twig
+++ b/templates/web/lightbox/validate.html.twig
@@ -44,7 +44,7 @@
                                 </td>
                                 <td style="text-align:right;width:230px;">
                                     <div class="options">
-                                        {% include 'lightbox/sc_options_box.twig' %}
+                                        {% include 'lightbox/sc_options_box.html.twig' %}
                                     </div>
                                 </td>
                             </tr>
@@ -61,8 +61,8 @@
                             {{ thumbnail.format(bask_prev, width,height, '', session, false) }}
 
                         {% endif %}
-                        {% include 'lightbox/selector_box.twig' %}
-                        {% include 'lightbox/sc_note.twig' %}
+                        {% include 'lightbox/selector_box.html.twig' %}
+                        {% include 'lightbox/sc_note.html.twig' %}
                     </div>
                 </div>
                 <div id="record_compare" class="PNB record_display_box">
@@ -109,7 +109,7 @@
                 {% if basket.getValidation() %}
                 <div class="right_column_wrapper unselectable right_column_wrapper_user PNB">
                     <div id="basket_infos" class="PNB ui-corner-all">
-                            {% include 'lightbox/agreement_box.twig' %}
+                            {% include 'lightbox/agreement_box.html.twig' %}
                     </div>
                 </div>
                 <div id="right_column_validation_toggle" class="PNB ui-corner-all title15">
@@ -117,7 +117,7 @@
                     {% trans 'VALIDATION' %}
                 </div>
                 <div id="basket_options" class="PNB ui-corner-all unselectable">
-                    {% include 'lightbox/basket_options.twig' %}
+                    {% include 'lightbox/basket_options.html.twig' %}
                 </div>
                 {% endif %}
             </div>
@@ -170,7 +170,7 @@
                 <div id="left_scroller" class="PNB clickable">
                 </div>
                 <div class="PNB" id="sc_wrapper">
-                    {% include 'lightbox/sc_container.twig' %}
+                    {% include 'lightbox/sc_container.html.twig' %}
                 </div>
                 <div id="right_scroller" class="PNB clickable">
                 </div>
diff --git a/templates/web/login/head.twig b/templates/web/login/head.html.twig
similarity index 100%
rename from templates/web/login/head.twig
rename to templates/web/login/head.html.twig
diff --git a/templates/web/login/index.twig b/templates/web/login/index.html.twig
similarity index 98%
rename from templates/web/login/index.twig
rename to templates/web/login/index.html.twig
index 7cdb1493e6..e399456e48 100644
--- a/templates/web/login/index.twig
+++ b/templates/web/login/index.html.twig
@@ -1,6 +1,6 @@
 <html lang="{{session.get_I18n}}">
     <head>
-        {% include 'login/head.twig' %}
+        {% include 'login/head.html.twig' %}
     </head>
     <body>
         <div style="display:none;">{{meta_description}}</div>
@@ -133,15 +133,15 @@
                 <div id="id-main" class="tab-content" style="display:block;">
                     <form name="send" action="/login/authenticate/" method="post" >
                         {% if display_layout == 'DISPLAYx1' %}
-                            {% include 'login/index_layout_displayx1.twig' %}
+                            {% include 'login/index_layout_displayx1.html.twig' %}
                         {% elseif display_layout == 'DISPLAYx4' %}
 
                         {% elseif display_layout == 'COOLIRIS' %}
-                            {% include 'login/index_layout_displaycooliris.twig' %}
+                            {% include 'login/index_layout_displaycooliris.html.twig' %}
                         {% elseif display_layout == 'SCROLL' %}
-                            {% include 'login/index_layout_displayscroll.twig' %}
+                            {% include 'login/index_layout_displayscroll.html.twig' %}
                         {% else %}
-                            {% include 'login/index_layout_displayx1.twig' %}
+                            {% include 'login/index_layout_displayx1.html.twig' %}
                         {% endif %}
                         <input type="hidden" name="redirect" value="{{redirect}}">
                     </form>
diff --git a/templates/web/login/index_layout_displaycooliris.twig b/templates/web/login/index_layout_displaycooliris.html.twig
similarity index 100%
rename from templates/web/login/index_layout_displaycooliris.twig
rename to templates/web/login/index_layout_displaycooliris.html.twig
diff --git a/templates/web/login/index_layout_displayscroll.twig b/templates/web/login/index_layout_displayscroll.html.twig
similarity index 100%
rename from templates/web/login/index_layout_displayscroll.twig
rename to templates/web/login/index_layout_displayscroll.html.twig
diff --git a/templates/web/login/index_layout_displayx1.twig b/templates/web/login/index_layout_displayx1.html.twig
similarity index 100%
rename from templates/web/login/index_layout_displayx1.twig
rename to templates/web/login/index_layout_displayx1.html.twig
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index efdeb2d6c9..a16a679e32 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -65,7 +65,7 @@
 
 {% set basket_scope = 'objects'%}
 
-{% import 'prod/WorkZone/Macros.twig' as Macros %}
+{% import 'prod/WorkZone/Macros.html.twig' as Macros %}
 
 {% if basket.getValidation() %}
     {{ Macros.display_validation(basket, ordre, user, session) }}
diff --git a/templates/web/prod/WorkZone/Macros.twig b/templates/web/prod/WorkZone/Macros.html.twig
similarity index 100%
rename from templates/web/prod/WorkZone/Macros.twig
rename to templates/web/prod/WorkZone/Macros.html.twig
diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig
index c8a4864db5..99800b2479 100644
--- a/templates/web/prod/WorkZone/Story.html.twig
+++ b/templates/web/prod/WorkZone/Story.html.twig
@@ -69,7 +69,7 @@
     {% endif %}
 
     {% set basket_scope = 'groupings'%}
-    {% import 'prod/WorkZone/Macros.twig' as Macros %}
+    {% import 'prod/WorkZone/Macros.html.twig' as Macros %}
 
     {% for record in Story.get_children().get_elements() %}
         <span class="wrapCHIM_{{ record.get_serialize_key() }}">
diff --git a/templates/web/prod/WorkZone/WorkZone.html.twig b/templates/web/prod/WorkZone/WorkZone.html.twig
index c2f0a0833a..abe57e06ef 100644
--- a/templates/web/prod/WorkZone/WorkZone.html.twig
+++ b/templates/web/prod/WorkZone/WorkZone.html.twig
@@ -1,2 +1,2 @@
-{% import 'prod/WorkZone/Macros.twig'  as WorkZoneMacros %}
+{% import 'prod/WorkZone/Macros.html.twig'  as WorkZoneMacros %}
 {{WorkZoneMacros.make_bloc(WorkZone, selected_type, selected_id, srt)}}
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 6b18e81161..d061fabec6 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -167,7 +167,7 @@
                         </li>
                     </ul>
                     <div id="baskets" class="PNB ui-tabs-panel ui-accordion" style="top:52px;">
-                        {% import 'prod/WorkZone/Macros.twig'  as  WorkZoneMacros %}
+                        {% import 'prod/WorkZone/Macros.html.twig'  as  WorkZoneMacros %}
                         {{WorkZoneMacros.make_bloc(WorkZone)}}
                     </div>
                     {% if GV_thesaurus %}
diff --git a/templates/web/report/ajax_dashboard_content.twig b/templates/web/report/ajax_dashboard_content.html.twig
similarity index 100%
rename from templates/web/report/ajax_dashboard_content.twig
rename to templates/web/report/ajax_dashboard_content.html.twig
diff --git a/templates/web/report/ajax_dashboard_content_child.twig b/templates/web/report/ajax_dashboard_content_child.html.twig
similarity index 97%
rename from templates/web/report/ajax_dashboard_content_child.twig
rename to templates/web/report/ajax_dashboard_content_child.html.twig
index 515640e88e..7020fa8776 100644
--- a/templates/web/report/ajax_dashboard_content_child.twig
+++ b/templates/web/report/ajax_dashboard_content_child.html.twig
@@ -1,5 +1,5 @@
-{% extends "report/ajax_dashboard_content.twig" %}
-{% import "report/dashboard_macro.twig" as dash %}
+{% extends "report/ajax_dashboard_content.html.twig" %}
+{% import "report/dashboard_macro.html.twig" as dash %}
 
 
 
diff --git a/templates/web/report/ajax_data_content.twig b/templates/web/report/ajax_data_content.html.twig
similarity index 96%
rename from templates/web/report/ajax_data_content.twig
rename to templates/web/report/ajax_data_content.html.twig
index 966a2d75ae..1a8a448f3d 100644
--- a/templates/web/report/ajax_data_content.twig
+++ b/templates/web/report/ajax_data_content.html.twig
@@ -68,7 +68,7 @@
         {% for key, result in result %}
         {% set index = key %}
             <div class="graph">
-                {% include "report/generate_tab.twig" %}
+                {% include "report/generate_tab.html.twig" %}
                 <table class="navi">
                     <caption></caption>
                     <thead>
@@ -93,7 +93,7 @@
             </div>
         {% endfor %}
     {% elseif is_plot %}
-        {% include "report/generate_tab.twig" %}
+        {% include "report/generate_tab.html.twig" %}
             <table class="tblsite" style="visibility:hidden;">
                 <caption></caption>
                 <thead>
@@ -119,7 +119,7 @@
 
         </script>
     {% else %}
-            {% include "report/generate_tab.twig" %}
+            {% include "report/generate_tab.html.twig" %}
     {% endif %}
 {% endblock %}
 
diff --git a/templates/web/report/ajax_report_content.twig b/templates/web/report/ajax_report_content.html.twig
similarity index 100%
rename from templates/web/report/ajax_report_content.twig
rename to templates/web/report/ajax_report_content.html.twig
diff --git a/templates/web/report/ajax_report_dashboard.twig b/templates/web/report/ajax_report_dashboard.html.twig
similarity index 100%
rename from templates/web/report/ajax_report_dashboard.twig
rename to templates/web/report/ajax_report_dashboard.html.twig
diff --git a/templates/web/report/all_content.twig b/templates/web/report/all_content.html.twig
similarity index 100%
rename from templates/web/report/all_content.twig
rename to templates/web/report/all_content.html.twig
diff --git a/templates/web/report/base.twig b/templates/web/report/base.html.twig
similarity index 100%
rename from templates/web/report/base.twig
rename to templates/web/report/base.html.twig
diff --git a/templates/web/report/chart.twig b/templates/web/report/chart.html.twig
similarity index 100%
rename from templates/web/report/chart.twig
rename to templates/web/report/chart.html.twig
diff --git a/templates/web/report/colFilter.twig b/templates/web/report/colFilter.html.twig
similarity index 100%
rename from templates/web/report/colFilter.twig
rename to templates/web/report/colFilter.html.twig
diff --git a/templates/web/report/dashboard_macro.twig b/templates/web/report/dashboard_macro.html.twig
similarity index 100%
rename from templates/web/report/dashboard_macro.twig
rename to templates/web/report/dashboard_macro.html.twig
diff --git a/templates/web/report/form_date_and_base.twig b/templates/web/report/form_date_and_base.html.twig
similarity index 100%
rename from templates/web/report/form_date_and_base.twig
rename to templates/web/report/form_date_and_base.html.twig
diff --git a/templates/web/report/generate_tab.twig b/templates/web/report/generate_tab.html.twig
similarity index 100%
rename from templates/web/report/generate_tab.twig
rename to templates/web/report/generate_tab.html.twig
diff --git a/templates/web/report/listColumn.twig b/templates/web/report/listColumn.html.twig
similarity index 100%
rename from templates/web/report/listColumn.twig
rename to templates/web/report/listColumn.html.twig
diff --git a/templates/web/report/panel_hide_button.twig b/templates/web/report/panel_hide_button.html.twig
similarity index 100%
rename from templates/web/report/panel_hide_button.twig
rename to templates/web/report/panel_hide_button.html.twig
diff --git a/templates/web/report/report_layout.twig b/templates/web/report/report_layout.html.twig
similarity index 96%
rename from templates/web/report/report_layout.twig
rename to templates/web/report/report_layout.html.twig
index e2d0388166..f1932ec228 100644
--- a/templates/web/report/report_layout.twig
+++ b/templates/web/report/report_layout.html.twig
@@ -1,4 +1,4 @@
-{% extends "report/all_content.twig" %}
+{% extends "report/all_content.html.twig" %}
 
 {% block report_layout %}
     <div id="form-container" >
diff --git a/templates/web/report/report_layout_child.twig b/templates/web/report/report_layout_child.html.twig
similarity index 94%
rename from templates/web/report/report_layout_child.twig
rename to templates/web/report/report_layout_child.html.twig
index 4614ec02ec..ca667b930c 100644
--- a/templates/web/report/report_layout_child.twig
+++ b/templates/web/report/report_layout_child.html.twig
@@ -1,4 +1,4 @@
-{% extends "report/report_layout.twig" %}
+{% extends "report/report_layout.html.twig" %}
 
 {% block report_dashboard_layout %}
     <div id="dash" class="inside-container">
@@ -33,7 +33,7 @@
 
                     <div id="dashdash" style="float:left;width:100%;">
                         {% if ajax_dash %}
-                            {% include "report/ajax_dashboard_content_child.twig" %}
+                            {% include "report/ajax_dashboard_content_child.html.twig" %}
                         {% endif %}
                     </div>
                 </div>
@@ -46,7 +46,7 @@
 {% block report_connexion_layout %}
     <div id="report-connexions" class="inside-container">
         <form class="form" >
-            {% include "report/form_date_and_base.twig" %}
+            {% include "report/form_date_and_base.html.twig" %}
             {% block form_connexion %}
                 <div class="form3">
                     <div class="form_titre">{% trans "report:: 3 - Type de report" %} </div>
@@ -78,11 +78,11 @@
                 </div>
             {% endblock form_connexion %}
         </form>
-        {% include "report/panel_hide_button.twig" %}
+        {% include "report/panel_hide_button.html.twig" %}
         <div class="answers">
             <div class="content">
                 {% if ajax %}
-                    {% include "report/ajax_report_content.twig" %}
+                    {% include "report/ajax_report_content.html.twig" %}
                 {%endif%}
             </div>
         </div>
@@ -92,7 +92,7 @@
 {% block report_telechargement_layout %}
     <div id="report-telechargement" class="inside-container">
         <form class="form"  >
-            {% include "report/form_date_and_base.twig" %}
+            {% include "report/form_date_and_base.html.twig" %}
             {% block form_telechargement %}
                 <div  class="form3">
                     <div class="form_titre">{%trans "report:: 3 - Type de report" %}</div>
@@ -134,11 +134,11 @@
                 </div>
             {% endblock form_telechargement %}
         </form>
-        {% include "report/panel_hide_button.twig" %}
+        {% include "report/panel_hide_button.html.twig" %}
         <div class="answers">
             <div class="content">
                 {% if ajax %}
-                    {% include "report/ajax_report_content.twig" %}
+                    {% include "report/ajax_report_content.html.twig" %}
                 {%endif%}
             </div>
         </div>
@@ -148,7 +148,7 @@
 {% block report_activite_layout %}
     <div id="report-activite" class="inside-container">
         <form class="form"  >
-            {% include "report/form_date_and_base.twig" %}
+            {% include "report/form_date_and_base.html.twig" %}
             {% block form_activite %}
                 <div class="form3">
                     <div class="form_titre">{% trans "report:: 3 - Type de report" %} </div>
@@ -184,11 +184,11 @@
                 </div>
             {% endblock  form_activite %}
         </form>
-        {% include "report/panel_hide_button.twig" %}
+        {% include "report/panel_hide_button.html.twig" %}
         <div class="answers">
             <div class="content">
                 {% if ajax %}
-                    {% include "report/ajax_report_content.twig" %}
+                    {% include "report/ajax_report_content.html.twig" %}
                 {%endif%}
             </div>
         </div>