diff --git a/bin/BrickEdit.js b/bin/BrickEdit.js
index 4784866d018e49c22bf3af1035390ded5b9f87c7..76fbb1f87bc1a878d7da5f655340293f4ed48430 100644
--- a/bin/BrickEdit.js
+++ b/bin/BrickEdit.js
@@ -5,6 +5,7 @@
  * @module package/quiqqer/bricks/bin/BrickEdit
  * @author www.pcsg.de (Henning Leutz)
  *
+ * @event onQuiqqerBricksEditPanelCreate [this] (global)
  * @event onLoaded [ this ]
  * @event onSave [ this ]
  * @event onDelete [ this ]
@@ -207,6 +208,8 @@ define('package/quiqqer/bricks/bin/BrickEdit', [
                     onClick: this.showUsage
                 }
             });
+
+            QUI.fireEvent('quiqqerBricksEditPanelCreate', [this]);
         },
 
         /**
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
index 8b0bd2759377666a97064e1e3e5d171b30714e9d..2015c7c175e03b2fc6d67e438d5cecb5dc2c09db 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
@@ -1,5 +1,4 @@
 {assign var=siteLang value=$Project->getLang()}
-{assign var=siteLang value=$Project->getLang()}
 {assign var=all value=$this->getAttribute('all')}
 {assign var=path value=$this->getAttribute('flagFolderPath')}
 
@@ -9,10 +8,15 @@
     {foreach from=$langs item=lang}
     {if $all || $siteLang != $lang}
 
+    {assign var=activeLang value=''}
+    {if $siteLang == $lang}
+        {assign var=activeLang value='active'}
+    {/if}
+
     {if $Site->getId($lang)}
-    <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=$Site->getId($lang) lang=$lang}">
+    <a class="quiqqer-bricks-languageswitch-flag-entry {$activeLang}" href="{url id=$Site->getId($lang) lang=$lang}">
     {else}
-    <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=1 lang=$lang}">
+    <a class="quiqqer-bricks-languageswitch-flag-entry {$activeLang}" href="{url id=1 lang=$lang}">
     {/if}
 
         {if $this->getAttribute('showFlags')}
diff --git a/src/QUI/Bricks/Manager.php b/src/QUI/Bricks/Manager.php
index f3c2dcc577d574f0113b551264e731f7a42a3b7c..bd0d9f4ac93b501397090ececaae2f84768e0b97 100644
--- a/src/QUI/Bricks/Manager.php
+++ b/src/QUI/Bricks/Manager.php
@@ -277,6 +277,8 @@ public function deleteBrick(int $brickId)
         // check if brick exist
         $Brick = $this->getBrickById($brickId);
 
+        QUI::getEvents()->fireEvent('quiqqerBricksBrickDeleteBefore', [$Brick]);
+
         QUI::getDataBase()->delete($this->getTable(), [
             'id' => $brickId
         ]);
@@ -285,7 +287,6 @@ public function deleteBrick(int $brickId)
             unset($this->bricks[$brickId]);
         }
 
-
         $uniqueBrickIds = QUI::getDataBase()->fetch([
             'select' => 'siteId, project, lang',
             'from'   => QUI\Bricks\Manager::getUIDTable(),
@@ -316,6 +317,8 @@ public function deleteBrick(int $brickId)
             'project' => $Brick->getAttribute('project'),
             'lang'    => $Brick->getAttribute('lang')
         ]);
+
+        QUI::getEvents()->fireEvent('quiqqerBricksBrickDeleteAfter', [$brickId]);
     }
 
     /**
@@ -368,7 +371,7 @@ public function getAreasByProject(Project $Project, $layoutType = false): array
 
         // get bricks
         foreach ($templates as $template) {
-            $brickXML = realpath(OPT_DIR . $template . '/bricks.xml');
+            $brickXML = realpath(OPT_DIR.$template.'/bricks.xml');
 
             if (!$brickXML) {
                 continue;
@@ -587,7 +590,7 @@ public function getBrickByUID(string $uid, ?QUI\Interfaces\Projects\Site $Site =
      */
     public function getAvailableBrickSettingsByBrickType($brickType): array
     {
-        $cache = 'quiqqer/bricks/brickType/' . md5($brickType);
+        $cache = 'quiqqer/bricks/brickType/'.md5($brickType);
 
         try {
             return QUI\Cache\Manager::get($cache);
@@ -937,7 +940,7 @@ public function saveBrick($brickId, array $brickData)
         }
 
         if (!empty($areas)) {
-            $areaString = ',' . implode(',', $areas) . ',';
+            $areaString = ','.implode(',', $areas).',';
         }
 
         $Brick->setAttributes($brickData);
@@ -1091,9 +1094,9 @@ public function saveBrick($brickId, array $brickData)
         QUI\Cache\Manager::clear($cache);
 
         QUI\Cache\Manager::clear(
-            self::getBrickCacheNamespace() . md5($Brick->getType())
+            self::getBrickCacheNamespace().md5($Brick->getType())
         );
- 
+
         QUI::getEvents()->fireEvent('quiqqerBricksSave', [$brickId]);
     }
 
@@ -1294,7 +1297,7 @@ public function getAlternateClass($control, $template = false): string
             // package bricks
             foreach ($packages as $package) {
                 $packageName = $package['name'];
-                $bricksXML   = OPT_DIR . $packageName . '/bricks.xml';
+                $bricksXML   = OPT_DIR.$packageName.'/bricks.xml';
 
                 if (!file_exists($bricksXML)) {
                     continue;