diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
index f2af605..0257298 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
@@ -12,8 +12,6 @@
  */
 declare(strict_types=1);
 
-use phpOMS\Uri\UriFactory;
-
 ?>
 
 <div class="content">
diff --git a/Admin/Install/CMS.php b/Admin/Install/CMS.php
index ca5df1b..2098e61 100755
--- a/Admin/Install/CMS.php
+++ b/Admin/Install/CMS.php
@@ -14,8 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\Shop\Admin\Install;
 
-use Model\Setting;
-use Model\SettingMapper;
 use phpOMS\Application\ApplicationAbstract;
 
 /**
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 5f72582..9a4dbe0 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -16,10 +16,10 @@ namespace Modules\Support\Admin;
 
 use Modules\Support\Models\SupportApp;
 use Modules\Support\Models\SupportAppMapper;
-use phpOMS\Module\InstallerAbstract;
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\Module\ModuleInfo;
 use phpOMS\Config\SettingsInterface;
+use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\Module\InstallerAbstract;
+use phpOMS\Module\ModuleInfo;
 
 /**
  * Installer class.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 69aa9c5..6876067 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -15,24 +15,13 @@ declare(strict_types=1);
 namespace Modules\Support\Controller;
 
 use Modules\Admin\Models\NullAccount;
-use Modules\Tag\Models\NullTag;
-use Modules\Support\Models\Ticket;
-use Modules\Support\Models\TicketElement;
-use Modules\Support\Models\TicketElementMapper;
-use Modules\Support\Models\TicketMapper;
-use Modules\Support\Models\SupportApp;
-use Modules\Support\Models\NullSupportApp;
-use Modules\Support\Models\SupportAppMapper;
-use Modules\Tasks\Models\TaskStatus;
-use Modules\Tasks\Models\TaskType;
-use phpOMS\Message\Http\HttpResponse;
-use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Message\NotificationLevel;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
-use phpOMS\Model\Message\FormValidation;
-use phpOMS\Utils\Parser\Markdown\Markdown;
 use Modules\Support\Models\AttributeValueType;
+use Modules\Support\Models\NullSupportApp;
+use Modules\Support\Models\NullTicketAttributeType;
+use Modules\Support\Models\NullTicketAttributeValue;
+use Modules\Support\Models\SupportApp;
+use Modules\Support\Models\SupportAppMapper;
+use Modules\Support\Models\Ticket;
 use Modules\Support\Models\TicketAttribute;
 use Modules\Support\Models\TicketAttributeMapper;
 use Modules\Support\Models\TicketAttributeType;
@@ -41,8 +30,17 @@ use Modules\Support\Models\TicketAttributeTypeL11nMapper;
 use Modules\Support\Models\TicketAttributeTypeMapper;
 use Modules\Support\Models\TicketAttributeValue;
 use Modules\Support\Models\TicketAttributeValueMapper;
-use Modules\Support\Models\NullTicketAttributeType;
-use Modules\Support\Models\NullTicketAttributeValue;
+use Modules\Support\Models\TicketElement;
+use Modules\Support\Models\TicketElementMapper;
+use Modules\Support\Models\TicketMapper;
+use Modules\Tasks\Models\TaskStatus;
+use Modules\Tasks\Models\TaskType;
+use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\Message\NotificationLevel;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Model\Message\FormValidation;
+use phpOMS\Utils\Parser\Markdown\Markdown;
 
 /**
  * Api controller for the tickets module.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b79db26..43aa0c4 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -16,15 +16,14 @@ namespace Modules\Support\Controller;
 
 use Model\NullSetting;
 use Model\SettingMapper;
-use Modules\Support\Models\SupportApp;
+use Modules\Support\Models\SupportAppMapper;
 use Modules\Support\Models\TicketMapper;
 use Modules\Support\Views\TicketView;
+use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
-use phpOMS\Asset\AssetType;
-use Modules\Support\Models\SupportAppMapper;
 
 /**
  * Support controller class.
diff --git a/Models/TicketAttributeMapper.php b/Models/TicketAttributeMapper.php
index 955661f..71692d8 100755
--- a/Models/TicketAttributeMapper.php
+++ b/Models/TicketAttributeMapper.php
@@ -33,10 +33,10 @@ final class TicketAttributeMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'support_ticket_attr_id'    => ['name' => 'support_ticket_attr_id',    'type' => 'int', 'internal' => 'id'],
+        'support_ticket_attr_id'      => ['name' => 'support_ticket_attr_id',    'type' => 'int', 'internal' => 'id'],
         'support_ticket_attr_ticket'  => ['name' => 'support_ticket_attr_ticket',  'type' => 'int', 'internal' => 'ticket'],
-        'support_ticket_attr_type'  => ['name' => 'support_ticket_attr_type',  'type' => 'int', 'internal' => 'type'],
-        'support_ticket_attr_value' => ['name' => 'support_ticket_attr_value', 'type' => 'int', 'internal' => 'value'],
+        'support_ticket_attr_type'    => ['name' => 'support_ticket_attr_type',  'type' => 'int', 'internal' => 'type'],
+        'support_ticket_attr_value'   => ['name' => 'support_ticket_attr_value', 'type' => 'int', 'internal' => 'value'],
     ];
 
     /**
diff --git a/Models/TicketElementMapper.php b/Models/TicketElementMapper.php
index 2b7e318..9bc0615 100644
--- a/Models/TicketElementMapper.php
+++ b/Models/TicketElementMapper.php
@@ -34,10 +34,10 @@ final class TicketElementMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'support_ticket_element_id'   => ['name' => 'support_ticket_element_id',   'type' => 'int', 'internal' => 'id'],
+        'support_ticket_element_id'           => ['name' => 'support_ticket_element_id',   'type' => 'int', 'internal' => 'id'],
         'support_ticket_element_task_element' => ['name' => 'support_ticket_element_task_element', 'type' => 'int', 'internal' => 'taskElement'],
-        'support_ticket_element_time' => ['name' => 'support_ticket_element_time', 'type' => 'int', 'internal' => 'time'],
-        'support_ticket_element_ticket' => ['name' => 'support_ticket_element_ticket', 'type' => 'int', 'internal' => 'ticket'],
+        'support_ticket_element_time'         => ['name' => 'support_ticket_element_time', 'type' => 'int', 'internal' => 'time'],
+        'support_ticket_element_ticket'       => ['name' => 'support_ticket_element_ticket', 'type' => 'int', 'internal' => 'ticket'],
     ];
 
     /**
diff --git a/Models/TicketMapper.php b/Models/TicketMapper.php
index 3812f03..c32e26b 100755
--- a/Models/TicketMapper.php
+++ b/Models/TicketMapper.php
@@ -37,8 +37,8 @@ final class TicketMapper extends DataMapperAbstract
     protected static array $columns = [
         'support_ticket_id'   => ['name' => 'support_ticket_id',   'type' => 'int', 'internal' => 'id'],
         'support_ticket_task' => ['name' => 'support_ticket_task', 'type' => 'int', 'internal' => 'task'],
-        'support_ticket_for' => ['name' => 'support_ticket_for', 'type' => 'int', 'internal' => 'for'],
-        'support_ticket_app' => ['name' => 'support_ticket_app', 'type' => 'int', 'internal' => 'app'],
+        'support_ticket_for'  => ['name' => 'support_ticket_for', 'type' => 'int', 'internal' => 'for'],
+        'support_ticket_app'  => ['name' => 'support_ticket_app', 'type' => 'int', 'internal' => 'app'],
     ];
 
     /**
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 4336434..1cb9c3f 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -13,7 +13,7 @@
 declare(strict_types=1);
 
 return ['Navigation' => [
-    'Support' => 'Support',
-    'Ticket'  => 'Ticket',
+    'Support'  => 'Support',
+    'Ticket'   => 'Ticket',
     'Tickets'  => 'Tickets',
 ]];
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index 9be40fc..2c324cf 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 return ['Support' => [
     'Account'            => 'حساب',
     'All'                => 'الجميع',
-    'AverageAmount'      => 'متوسط ​​المبلغ',
+    'AverageAmount'      => "متوسط \u{200b}\u{200b}المبلغ",
     'AverageProcessTime' => 'متوسط وقت المعالجة',
     'Created'            => 'مخلوق',
     'Creator'            => 'المنشئ',
diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php
index ee8c01f..5b08e71 100755
--- a/Theme/Backend/support-list.tpl.php
+++ b/Theme/Backend/support-list.tpl.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 /**
- * @var \phpOMS\Views\View           $this
+ * @var \phpOMS\Views\View               $this
  * @var \Modules\Support\Models\Ticket[] $tickets
  */
 $tickets = $this->getData('tickets');
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php
index 2f20a03..bc7acef 100755
--- a/Theme/Backend/support-ticket.tpl.php
+++ b/Theme/Backend/support-ticket.tpl.php
@@ -23,11 +23,11 @@ use phpOMS\Uri\UriFactory;
  * @var \Modules\Support\Models\Ticket $ticket
  */
 $ticket      = $this->getData('ticket');
-$task      = $ticket->task;
-$taskMedia = $task->getMedia();
-$elements  = $task->invertTaskElements();
-$cElements = \count($elements);
-$color     = 'red'; //$this->getStatus($task->getStatus());
+$task        = $ticket->task;
+$taskMedia   = $task->getMedia();
+$elements    = $task->invertTaskElements();
+$cElements   = \count($elements);
+$color       = 'red'; //$this->getStatus($task->getStatus());
 
 echo $this->getData('nav')->render(); ?>
 
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 051ac7e..f5fc99c 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -392,4 +392,4 @@ function phpServe() : void
     });
 }
 
-phpServe();
+\phpServe();