diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Description.php b/lib/Alchemy/Phrasea/Controller/Admin/Description.php
index 671c5bbb7e..79b3194f4a 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Description.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Description.php
@@ -241,7 +241,7 @@ class Description implements ControllerProviderInterface
                     'vocabularies'        => VocabularyController::getAvailable(),
                 );
 
-                return new Response($app['twig']->render('admin/databox/doc_structure.twig', $params));
+                return new Response($app['twig']->render('admin/databox/doc_structure.html.twig', $params));
             })->before(function(Request $request) use ($app) {
                 if (false === $app['phraseanet.core']->getAuthenticatedUser()->ACL()
                         ->has_right_on_sbas($request->get('sbas_id'), 'bas_modify_struct')) {
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
index d4e513a4c4..206f4f331e 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
@@ -35,7 +35,7 @@ class Publications implements ControllerProviderInterface
                 );
 
                 return $app['twig']
-                        ->render('admin/publications/list.html', array('feeds' => $feeds));
+                        ->render('admin/publications/list.html.twig', array('feeds' => $feeds));
             });
 
         $controllers->post('/create/', function(PhraseaApplication $app, Request $request) {
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php b/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php
index f4051d4c25..4ed5e79b76 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php
@@ -35,7 +35,7 @@ class Subdefs implements ControllerProviderInterface
                 $databox = \databox::get_instance((int) $sbas_id);
 
                 return new response($app['twig']->render(
-                            'admin/subdefs.twig', array(
+                            'admin/subdefs.html.twig', array(
                             'databox' => $databox,
                             'subdefs' => $databox->get_subdef_structure()
                             )
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
index eb5dbc0db1..42a2931ca8 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
@@ -36,14 +36,14 @@ class Users implements ControllerProviderInterface
         $controllers->post('/rights/', function(Application $app) {
                 $rights = new UserHelper\Edit($app['phraseanet.core'], $app['request']);
 
-                return $app['twig']->render('admin/editusers.twig', $rights->get_users_rights());
+                return $app['twig']->render('admin/editusers.html.twig', $rights->get_users_rights());
             }
         );
 
         $controllers->get('/rights/', function(Application $app) {
                 $rights = new UserHelper\Edit($app['phraseanet.core'], $app['request']);
 
-                return $app['twig']->render('admin/editusers.twig', $rights->get_users_rights());
+                return $app['twig']->render('admin/editusers.html.twig', $rights->get_users_rights());
             }
         );
 
@@ -106,7 +106,7 @@ class Users implements ControllerProviderInterface
         $controllers->post('/rights/quotas/', function(Application $app) {
                 $rights = new UserHelper\Edit($app['phraseanet.core'], $app['request']);
 
-                return $app['twig']->render('admin/editusers_quotas.twig', $rights->get_quotas());
+                return $app['twig']->render('admin/editusers_quotas.html.twig', $rights->get_quotas());
             }
         );
 
@@ -121,7 +121,7 @@ class Users implements ControllerProviderInterface
         $controllers->post('/rights/time/', function(Application $app) {
                 $rights = new UserHelper\Edit($app['phraseanet.core'], $app['request']);
 
-                return $app['twig']->render('admin/editusers_timelimit.twig', $rights->get_time());
+                return $app['twig']->render('admin/editusers_timelimit.html.twig', $rights->get_time());
             }
         );
 
@@ -136,7 +136,7 @@ class Users implements ControllerProviderInterface
         $controllers->post('/rights/masks/', function(Application $app) {
                 $rights = new UserHelper\Edit($app['phraseanet.core'], $app['request']);
 
-                return $app['twig']->render('admin/editusers_masks.twig', $rights->get_masks());
+                return $app['twig']->render('admin/editusers_masks.html.twig', $rights->get_masks());
             }
         );
 
@@ -151,7 +151,7 @@ class Users implements ControllerProviderInterface
         $controllers->match('/search/', function(Application $app) {
                 $users = new UserHelper\Manage($app['phraseanet.core'], $app['request']);
 
-                return $app['twig']->render('admin/users.html', $users->search());
+                return $app['twig']->render('admin/users.html.twig', $users->search());
             }
         );
 
diff --git a/templates/web/admin/common/ajax_wrap.html b/templates/web/admin/common/ajax_wrap.html.twig
similarity index 100%
rename from templates/web/admin/common/ajax_wrap.html
rename to templates/web/admin/common/ajax_wrap.html.twig
diff --git a/templates/web/admin/common/iframe_wrap.html b/templates/web/admin/common/iframe_wrap.html.twig
similarity index 100%
rename from templates/web/admin/common/iframe_wrap.html
rename to templates/web/admin/common/iframe_wrap.html.twig
diff --git a/templates/web/admin/databox/doc_structure.twig b/templates/web/admin/databox/doc_structure.html.twig
similarity index 100%
rename from templates/web/admin/databox/doc_structure.twig
rename to templates/web/admin/databox/doc_structure.html.twig
diff --git a/templates/web/admin/editusers.twig b/templates/web/admin/editusers.html.twig
similarity index 100%
rename from templates/web/admin/editusers.twig
rename to templates/web/admin/editusers.html.twig
diff --git a/templates/web/admin/editusers_masks.twig b/templates/web/admin/editusers_masks.html.twig
similarity index 100%
rename from templates/web/admin/editusers_masks.twig
rename to templates/web/admin/editusers_masks.html.twig
diff --git a/templates/web/admin/editusers_quotas.twig b/templates/web/admin/editusers_quotas.html.twig
similarity index 100%
rename from templates/web/admin/editusers_quotas.twig
rename to templates/web/admin/editusers_quotas.html.twig
diff --git a/templates/web/admin/editusers_timelimit.twig b/templates/web/admin/editusers_timelimit.html.twig
similarity index 100%
rename from templates/web/admin/editusers_timelimit.twig
rename to templates/web/admin/editusers_timelimit.html.twig
diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig
index 9252423518..cc0465c02a 100644
--- a/templates/web/admin/publications/fiche.html.twig
+++ b/templates/web/admin/publications/fiche.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/publications/wrapper.html' %}
+{% extends 'admin/publications/wrapper.html.twig' %}
 
 {% block content %}
 
diff --git a/templates/web/admin/publications/list.html b/templates/web/admin/publications/list.html.twig
similarity index 98%
rename from templates/web/admin/publications/list.html
rename to templates/web/admin/publications/list.html.twig
index b9ecd33548..e5d5f828b6 100644
--- a/templates/web/admin/publications/list.html
+++ b/templates/web/admin/publications/list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/publications/wrapper.html' %}
+{% extends 'admin/publications/wrapper.html.twig' %}
 
 {% block content %}
 
diff --git a/templates/web/admin/publications/wrapper.html b/templates/web/admin/publications/wrapper.html.twig
similarity index 100%
rename from templates/web/admin/publications/wrapper.html
rename to templates/web/admin/publications/wrapper.html.twig
diff --git a/templates/web/admin/subdefs.twig b/templates/web/admin/subdefs.html.twig
similarity index 99%
rename from templates/web/admin/subdefs.twig
rename to templates/web/admin/subdefs.html.twig
index 21d5dc16c7..94e87b5c12 100644
--- a/templates/web/admin/subdefs.twig
+++ b/templates/web/admin/subdefs.html.twig
@@ -1,5 +1,5 @@
 
-{% extends "admin/common/iframe_wrap.html" %}
+{% extends "admin/common/iframe_wrap.html.twig" %}
 
 {% block stylesheet %}
 
diff --git a/templates/web/admin/task.html b/templates/web/admin/task.html.twig
similarity index 100%
rename from templates/web/admin/task.html
rename to templates/web/admin/task.html.twig
diff --git a/templates/web/admin/users.html b/templates/web/admin/users.html.twig
similarity index 99%
rename from templates/web/admin/users.html
rename to templates/web/admin/users.html.twig
index a5409eb688..892f7b3841 100644
--- a/templates/web/admin/users.html
+++ b/templates/web/admin/users.html.twig
@@ -1,5 +1,5 @@
 
-{% extends request.is_ajax ? "admin/common/ajax_wrap.html" : "admin/common/iframe_wrap.html" %}
+{% extends request.is_ajax ? "admin/common/ajax_wrap.html.twig" : "admin/common/iframe_wrap.html.twig" %}
 
 {% block content %}
 
diff --git a/www/admin/task2.php b/www/admin/task2.php
index 3d1825e888..801d8b6f10 100644
--- a/www/admin/task2.php
+++ b/www/admin/task2.php
@@ -73,4 +73,4 @@ $twig = $core->getTwig();
 
     $parm['view'] = 'XML';
 
-echo $twig->render('admin/task.html', array('task' => $task, 'view' => $parm['view']));
+echo $twig->render('admin/task.html.twig', array('task' => $task, 'view' => $parm['view']));