diff --git a/lib/classes/module/console/systemTemplateGenerator.class.php b/lib/classes/module/console/systemTemplateGenerator.class.php
index 561f930dd6..bc2420e613 100644
--- a/lib/classes/module/console/systemTemplateGenerator.class.php
+++ b/lib/classes/module/console/systemTemplateGenerator.class.php
@@ -58,6 +58,9 @@ class module_console_systemTemplateGenerator extends Command
             $twig->addExtension(new Twig_Extensions_Extension_I18n());
             $twig->addExtension(new \Alchemy\Phrasea\Twig\JSUniqueID());
 
+            $twig->addTest('null', new \Twig_Test_Function('is_null'));
+
+            $twig->addFilter('AppName', new \Twig_Filter_Function('Alchemy\Phrasea\Controller\Admin\ConnectedUsers::appName'));
             $twig->addFilter('serialize', new \Twig_Filter_Function('serialize'));
             $twig->addFilter('stristr', new \Twig_Filter_Function('stristr'));
             $twig->addFilter('implode', new \Twig_Filter_Function('implode'));
@@ -77,6 +80,7 @@ class module_console_systemTemplateGenerator extends Command
             $twig->addFilter('prettyDate', new \Twig_Filter_Function('phraseadate::getPrettyString'));
             $twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets'));
             $twig->addFilter('geoname_name_from_id', new \Twig_Filter_Function('geonames::name_from_id'));
+            $twig->addFilter('base_from_coll', new \Twig_Filter_Function('phrasea::baseFromColl'));
 
             $finder = new Symfony\Component\Finder\Finder();
             foreach ($finder->files()->in(array($tplDir))->exclude('Mustache') as $file) {
diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig
index d694ed4f3b..123b03295e 100644
--- a/templates/mobile/lightbox/basket_element.html.twig
+++ b/templates/mobile/lightbox/basket_element.html.twig
@@ -1,6 +1,6 @@
-{% import "common/thumbnail.twig" as thumbnail %}
+{% import "common/thumbnail.html.twig" as thumbnail %}
 
-{% extends "common/index.twig" %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
 <script type="text/javascript" src="/include/minify/f=skins/lightbox/jquery.validator.mobile.js"></script>
diff --git a/templates/mobile/lightbox/error.html.twig b/templates/mobile/lightbox/error.html.twig
index 1dbf6740b0..71a9d2bf40 100644
--- a/templates/mobile/lightbox/error.html.twig
+++ b/templates/mobile/lightbox/error.html.twig
@@ -1,4 +1,4 @@
-{% extends "common/index.twig" %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
 {% endblock %}
diff --git a/templates/mobile/lightbox/feed.html.twig b/templates/mobile/lightbox/feed.html.twig
index 933e7385be..c0cba7182d 100644
--- a/templates/mobile/lightbox/feed.html.twig
+++ b/templates/mobile/lightbox/feed.html.twig
@@ -1,5 +1,5 @@
-{% import "common/thumbnail.twig" as thumbnail %}
-{% extends "common/index.twig" %}
+{% import "common/thumbnail.html.twig" as thumbnail %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
   <script type="text/javascript" src="/include/minify/f=skins/lightbox/jquery.validator.mobile.js"></script>
diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig
index 907a6c05b7..e7f7c0e31b 100644
--- a/templates/mobile/lightbox/feed_element.html.twig
+++ b/templates/mobile/lightbox/feed_element.html.twig
@@ -1,6 +1,6 @@
-{% import "common/thumbnail.twig" as thumbnail %}
+{% import "common/thumbnail.html.twig" as thumbnail %}
 
-{% extends "common/index.twig" %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
 <script type="text/javascript" src="/include/minify/f=skins/lightbox/jquery.validator.mobile.js"></script>
diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig
index a9f8533d0f..a3227b0d11 100644
--- a/templates/mobile/lightbox/index.html.twig
+++ b/templates/mobile/lightbox/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "common/index.twig" %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
   <script type="text/javascript" src="/include/minify/f=skins/lightbox/jquery.validator.mobile.js"></script>
diff --git a/templates/mobile/lightbox/note_form.html.twig b/templates/mobile/lightbox/note_form.html.twig
index 25ac74de76..d48ef93d13 100644
--- a/templates/mobile/lightbox/note_form.html.twig
+++ b/templates/mobile/lightbox/note_form.html.twig
@@ -1,6 +1,6 @@
-{% import "common/thumbnail.twig" as thumbnail %}
+{% import "common/thumbnail.html.twig" as thumbnail %}
 
-{% extends "common/index.twig" %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
   <script type="text/javascript" src="/skins/lightbox/jquery.validator.mobile.js"></script>
diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig
index ac5aba23c2..08300062b1 100644
--- a/templates/mobile/lightbox/validate.html.twig
+++ b/templates/mobile/lightbox/validate.html.twig
@@ -1,5 +1,5 @@
-{% import "common/thumbnail.twig" as thumbnail %}
-{% extends "common/index.twig" %}
+{% import "common/thumbnail.html.twig" as thumbnail %}
+{% extends "common/index.html.twig" %}
 
 {% block javascript %}
   <script type="text/javascript" src="/include/minify/f=skins/lightbox/jquery.validator.mobile.js"></script>