diff --git a/src/IDF/Middleware.php b/src/IDF/Middleware.php
index 0d4f6ad..e21658a 100644
--- a/src/IDF/Middleware.php
+++ b/src/IDF/Middleware.php
@@ -69,6 +69,29 @@ class IDF_Middleware
             $request->rights[$val] = (true === IDF_Precondition::accessTabGeneric($request, $key));
         }
     }
+
+    /**
+     * Update the template tags and modifiers to not have them in the config.
+     *
+     * This is here at the moment because we do not want to put that
+     * in a IDF_Template class just for one method.
+     *
+     */
+    public static function updateTemplateTagsModifiers($sender, &$params)
+    {
+        $params['tags'] = array_merge($params['tags'],
+                                      array(
+                              'hotkey' => 'IDF_Template_HotKey',
+                              'issuetext' => 'IDF_Template_IssueComment',
+                              'timeline' => 'IDF_Template_TimelineFragment',
+                              'markdown' => 'IDF_Template_Markdown',
+                                            ));
+        $params['modifiers'] = array_merge($params['modifiers'],
+                                           array(
+                                   'size' => 'IDF_Views_Source_PrettySize',
+                                   'ssize' => 'IDF_Views_Source_PrettySizeSimple',
+                                                 ));
+    }
 }
 
 
diff --git a/src/IDF/conf/idf.php-dist b/src/IDF/conf/idf.php-dist
index 1426eaf..bf63988 100644
--- a/src/IDF/conf/idf.php-dist
+++ b/src/IDF/conf/idf.php-dist
@@ -179,16 +179,6 @@ $cfg['middleware_classes'] = array(
          );
 $cfg['template_context_processors'] = array('IDF_Middleware_ContextPreProcessor');
 $cfg['idf_views'] = dirname(__FILE__).'/urls.php';
-$cfg['template_tags'] = array(
-                              'hotkey' => 'IDF_Template_HotKey',
-                              'issuetext' => 'IDF_Template_IssueComment',
-                              'timeline' => 'IDF_Template_TimelineFragment',
-                              'markdown' => 'IDF_Template_Markdown',
-                              );
-$cfg['template_modifiers'] = array(
-                                   'size' => 'IDF_Views_Source_PrettySize',
-                                   'ssize' => 'IDF_Views_Source_PrettySizeSimple',
-                                   );
 
 # available languages
 $cfg['languages'] = array('en', 'fr'); 
diff --git a/src/IDF/relations.php b/src/IDF/relations.php
index 652a2d3..fdb412c 100644
--- a/src/IDF/relations.php
+++ b/src/IDF/relations.php
@@ -39,6 +39,9 @@ $m['IDF_Review_Patch'] = array('relate_to' => array('IDF_Review', 'Pluf_User'));
 $m['IDF_Review_FileComment'] = array('relate_to' => array('IDF_Review_Patch', 'Pluf_User'));
 
 
+Pluf_Signal::connect('Pluf_Template_Compiler::construct_template_tags_modifiers',
+                     array('IDF_Middleware', 'updateTemplateTagsModifiers'));
+
 # -- Standard plugins, they will run only if configured --
 #
 # Subversion synchronization