diff --git a/Admin/Activate.php b/Admin/Activate.php
index 52ead4a..05239ef 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 4c637a7..7d2d7c8 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index af86273..968ec13 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Admin\Install;
 use phpOMS\DataStorage\Database\DatabasePool;
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 2c05287..816fe97 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 6767119..8ced7b9 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Update.php b/Admin/Update.php
index 540fc38..8d91819 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Controller.php b/Controller.php
index 293c9e3..bd45357 100644
--- a/Controller.php
+++ b/Controller.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks;
 
 use Model\Message\FormValidation;
diff --git a/Models/NullTask.php b/Models/NullTask.php
index 03b882b..8113b35 100644
--- a/Models/NullTask.php
+++ b/Models/NullTask.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 
diff --git a/Models/NullTaskElement.php b/Models/NullTaskElement.php
index 197197a..57809a2 100644
--- a/Models/NullTaskElement.php
+++ b/Models/NullTaskElement.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index 8564b6a..c3b6d87 100644
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Models/Task.php b/Models/Task.php
index 9a0b9e8..00e27b8 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 use Modules\Calendar\Models\Schedule;
 use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
@@ -191,8 +191,8 @@ class Task implements \JsonSerializable
 
     public function isForwarded(int $id) : bool
     {
-        foreach($this->taskElements as $element) {
-            if($element->getForwarded()->getId() === $id) {
+        foreach ($this->taskElements as $element) {
+            if ($element->getForwarded()->getId() === $id) {
                 return true;
             }
         }
@@ -350,7 +350,7 @@ class Task implements \JsonSerializable
      */
     public function setStatus(int $status)
     {
-        if(!TaskStatus::isValidValue($status)) {
+        if (!TaskStatus::isValidValue($status)) {
             throw new InvalidEnumValue((string) $status);
         }
 
@@ -376,7 +376,7 @@ class Task implements \JsonSerializable
      */
     public function setPriority(int $priority)
     {
-        if(!TaskStatus::isValidValue($priority)) {
+        if (!TaskStatus::isValidValue($priority)) {
             throw new InvalidEnumValue((string) $priority);
         }
 
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index 522fec5..1f9da15 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 
@@ -154,7 +154,7 @@ class TaskElement implements \JsonSerializable
     {
         $this->createdBy = $creator;
 
-        if($this->forwarded === 0) {
+        if ($this->forwarded === 0) {
             $this->setForwarded($this->createdBy);
         }
     }
@@ -266,7 +266,7 @@ class TaskElement implements \JsonSerializable
      */
     public function setStatus(int $status)
     {
-        if(!TaskStatus::isValidValue($status)) {
+        if (!TaskStatus::isValidValue($status)) {
             throw new InvalidEnumValue((string) $status);
         }
 
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index e50a062..82a25f5 100644
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use Modules\Admin\Models\AccountMapper;
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index 7c02e7e..4a4b45d 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use Modules\Admin\Models\AccountMapper;
@@ -137,7 +137,7 @@ class TaskMapper extends DataMapperAbstract
         try {
             $objId = parent::create($obj, $relations);
 
-            if($objId === null || !is_scalar($objId)) {
+            if ($objId === null || !is_scalar($objId)) {
                 return $objId;
             }
         } catch (\Exception $e) {
diff --git a/Models/TaskPriority.php b/Models/TaskPriority.php
index df28191..e4c3d36 100644
--- a/Models/TaskPriority.php
+++ b/Models/TaskPriority.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Models/TaskStatus.php b/Models/TaskStatus.php
index 172da34..e1c2096 100644
--- a/Models/TaskStatus.php
+++ b/Models/TaskStatus.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php
index 0edaca4..7205cc9 100644
--- a/Models/TaskTemplate.php
+++ b/Models/TaskTemplate.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 /**
diff --git a/Models/TaskType.php b/Models/TaskType.php
index e040109..86b32a1 100644
--- a/Models/TaskType.php
+++ b/Models/TaskType.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Models/TaskVisibility.php b/Models/TaskVisibility.php
index 24a661c..f04b890 100644
--- a/Models/TaskVisibility.php
+++ b/Models/TaskVisibility.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Theme/Backend/Components/Tasks/BaseView.php b/Theme/Backend/Components/Tasks/BaseView.php
index 20bbf2b..d47d000 100644
--- a/Theme/Backend/Components/Tasks/BaseView.php
+++ b/Theme/Backend/Components/Tasks/BaseView.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Modules\Tasks\Theme\Backend\Components\Tasks;
 
diff --git a/Theme/Backend/Components/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php
index ec788e4..8ae7b76 100644
--- a/Theme/Backend/Components/Tasks/list.tpl.php
+++ b/Theme/Backend/Components/Tasks/list.tpl.php
@@ -6,19 +6,19 @@
         <td class="full"><?= $this->getHtml('Title', 'Tasks') ?>
     <tfoot>
     <tbody>
-    <?php $c = 0; foreach($this->tasks as $key => $task) : $c++;
+    <?php $c = 0; foreach ($this->tasks as $key => $task) : $c++;
     $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId());
     $color = 'darkred';
-    if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
-    elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-    elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-    elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-    elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ;?>
+    if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
+    elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
+    elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
+    elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
+    elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ;?>
         <tr data-href="<?= $url; ?>">
             <td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus(), 'Tasks') ?></span></a>
             <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?></a>
             <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a>
-    <?php endforeach; if($c == 0) : ?>
+    <?php endforeach; if ($c == 0) : ?>
     <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
     <?php endif; ?>
 </table>
\ No newline at end of file
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index 0703e61..fc7181a 100644
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -31,21 +31,21 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('Created') ?>
                 <tfoot>
                 <tbody>
-                <?php $c = 0; foreach($tasks as $key => $task) : $c++;
+                <?php $c = 0; foreach ($tasks as $key => $task) : $c++;
                 $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId());
                 $color = 'darkred';
-                if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
-                elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-                elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-                elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-                elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
+                if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
+                elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
+                elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
+                elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
+                elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
                     <tr data-href="<?= $url; ?>">
                         <td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus()) ?></span></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedBy()->getName1()); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedAt()->format('Y-m-d H:i')); ?></a>
-                <?php endforeach; if($c == 0) : ?>
+                <?php endforeach; if ($c == 0) : ?>
                 <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                 <?php endif; ?>
             </table>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 3068142..8201f30 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -20,10 +20,10 @@ $taskMedia = $task->getMedia();
 $elements  = $task->getTaskElements();
 $cElements = count($elements);
 
-if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; }
+if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
+elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
+elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
+elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; }
 
 echo $this->getData('nav')->render(); ?>
 
@@ -41,9 +41,9 @@ echo $this->getData('nav')->render(); ?>
                 </blockquote>
             </div>
 
-            <?php if(!empty($taskMedia)) : ?>
+            <?php if (!empty($taskMedia)) : ?>
             <div class="inner">
-                <?php foreach($taskMedia as $media) : ?>
+                <?php foreach ($taskMedia as $media) : ?>
                 <span><?= $media->getName(); ?></span>
                 <?php endforeach; ?>
             </div>
@@ -59,11 +59,11 @@ echo $this->getData('nav')->render(); ?>
 
         <?php $c = 0;
         foreach ($elements as $key => $element) : $c++;
-            if($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
-            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
+            if ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
+            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
+            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
+            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
+            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
             <section class="box wf-100">
                 <div class="inner pAlignTable">
                     <div class="vCenterTable wf-100"><?= $this->printHtml($element->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?></div>
@@ -78,9 +78,9 @@ echo $this->getData('nav')->render(); ?>
                     </div>
                 <?php endif; ?>
 
-                <?php $elementMedia = $element->getMedia(); if(!empty($elementMedia)) : ?>
+                <?php $elementMedia = $element->getMedia(); if (!empty($elementMedia)) : ?>
                 <div class="inner">
-                    <?php foreach($elementMedia as $media) : ?>
+                    <?php foreach ($elementMedia as $media) : ?>
                     <span><?= $media->getName(); ?></span>
                     <?php endforeach; ?>
                 </div>