diff --git a/core/lib/Thelia/Config/Resources/smarty-plugin.xml b/core/lib/Thelia/Config/Resources/smarty-plugin.xml
index c3c6a1312..8019b0688 100644
--- a/core/lib/Thelia/Config/Resources/smarty-plugin.xml
+++ b/core/lib/Thelia/Config/Resources/smarty-plugin.xml
@@ -58,7 +58,9 @@
             <argument type="service" id="thelia.translator" />
         </service>
 
-        <service id="smarty.plugin.module" class="Thelia\Core\Template\Smarty\Plugins\Module" >
+        <service id="smarty.plugin.module" class="Thelia\Core\Template\Smarty\Plugins\Module" scope="request">
+            <argument>%kernel.debug%</argument>
+            <argument type="service" id="request"/>
             <tag name="thelia.parser.register_plugin"/>
         </service>
 
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
index 4d1ed3060..9b86410de 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
@@ -23,12 +23,28 @@
 
 namespace Thelia\Core\Template\Smarty\Plugins;
 
+use Thelia\Core\HttpFoundation\Request;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Model\ModuleQuery;
 
 class Module extends AbstractSmartyPlugin
 {
+    /**
+     * @var bool application debug mode
+     */
+    protected $debug;
+
+    /**
+     * @var Request $request
+     */
+    protected $request;
+
+    public function __construct($debug, Request $request)
+    {
+        $this->debug = $debug;
+        $this->request = $request;
+    }
     /**
      * Process theliaModule template inclusion function
      *
@@ -44,6 +60,10 @@ class Module extends AbstractSmartyPlugin
 
         if (false !== $location = $this->getParam($params, 'location', false)) {
 
+            if($this->debug === true && $this->request->get('SHOW_INCLUDE')) {
+                echo sprintf('<div style="background-color: #C82D26; border-color: #000000; border: solid;">%s</div>', $location);
+            }
+
             $moduleLimit = $this->getParam($params, 'module', null);
 
             $modules = ModuleQuery::getActivated();
diff --git a/core/lib/Thelia/Core/Template/TemplateHelper.php b/core/lib/Thelia/Core/Template/TemplateHelper.php
index 9b93aae96..acaf1117e 100644
--- a/core/lib/Thelia/Core/Template/TemplateHelper.php
+++ b/core/lib/Thelia/Core/Template/TemplateHelper.php
@@ -240,20 +240,18 @@ class TemplateHelper
             fwrite($fp, '<' . "?php\n\n");
             fwrite($fp, "return array(\n");
 
-            $idx = 0;
+            // Sort keys alphabetically while keeping index
+            asort($texts);
 
-            foreach($texts as $text)
-            {
+            foreach ($texts as $key => $text) {
                 // Write only defined (not empty) translations
-                if (! empty($translations[$idx])) {
+                if (! empty($translations[$key])) {
                     $text = str_replace("'", "\'", $text);
 
-                    $translation = str_replace("'", "\'", $translations[$idx]);
+                    $translation = str_replace("'", "\'", $translations[$key]);
 
                     fwrite($fp, sprintf("\t'%s' => '%s',\n", $text, $translation));
                 }
-
-                $idx++;
             }
 
             fwrite($fp, ");\n");