diff --git a/composer.json b/composer.json
index 13b0e811a1106573bc697e45905dea849d6c1105..2e61d69051caae25c6e8de706229562111c8956b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name" : "quiqqer/bricks",
-    "type" : "quiqqer-plugin",
+    "type" : "quiqqer-module",
     "description" : "Bricks Module",
 
     "version" : "dev-dev",
diff --git a/lib/QUI/Bricks/Events.php b/lib/QUI/Bricks/Events.php
index 78172d8cdde16e8e58f83207e059f6704b1dd959..1f88ce3e497de541ef16f8d65f590965813138b3 100644
--- a/lib/QUI/Bricks/Events.php
+++ b/lib/QUI/Bricks/Events.php
@@ -99,7 +99,12 @@ static function onSiteSave($Site)
     static function onSmartyInit($Smarty)
     {
         // {brickarea}
-        $Smarty->registerPlugin("function", "brickarea", "\QUI\Bricks\Events::brickarea");
+        if ( !isset( $Smarty->registered_plugins['function'] ) ||
+             !isset( $Smarty->registered_plugins['function']['brickarea'] )
+        )
+        {
+            $Smarty->registerPlugin("function", "brickarea", "\QUI\Bricks\Events::brickarea");
+        }
     }
 
     /**
diff --git a/lib/QUI/Bricks/Manager.php b/lib/QUI/Bricks/Manager.php
index 0fdc4cffbeaa1b76d5785676d057f83983313d64..dba619a074d1507ae33dbd06d9fddbd3fac62a88 100644
--- a/lib/QUI/Bricks/Manager.php
+++ b/lib/QUI/Bricks/Manager.php
@@ -100,6 +100,10 @@ public function getAreasByProject(Project $Project, $layoutType=false)
 //            $layoutType = $Project->getAttribute( 'layout' );
 //        }
 
+        if ( $Project->getAttribute( 'template' ) ) {
+            $templates[] = $Project->getAttribute( 'template' );
+        }
+
         // get all vhosts, and the used templates of the project
         $vhosts = QUI::getRewrite()->getVHosts();
 
diff --git a/locale.xml b/locale.xml
index 3374c670a49c0a362372c6353ac8a667f2b667e6..cc55db13a62d1affd214241f2007cfe0bd276cc9 100644
--- a/locale.xml
+++ b/locale.xml
@@ -139,8 +139,8 @@
     <groups name="quiqqer/bricks" datatype="php">
 
         <locale name="site.panel.bricks.category.title">
-            <de><![CDATA[Bausteine]]></de>
-            <en><![CDATA[Bricks]]></en>
+            <de><![CDATA[Bausteine...]]></de>
+            <en><![CDATA[Bricks...]]></en>
         </locale>
         <locale name="continue.reading">
             <de><![CDATA[weiterlesen]]></de>