diff --git a/Admin/Activate.php b/Admin/Activate.php
index 437a587..5394eeb 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\News\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 92aa62e..44a29b1 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\News\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 60a4be6..a853ec1 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\News\Admin\Install;
 use phpOMS\DataStorage\Database\DatabasePool;
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 9468a21..bd03441 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\News\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index b698175..928c663 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\News\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Update.php b/Admin/Update.php
index 32315ee..9c957b4 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\News\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Controller.php b/Controller.php
index 53d7ddd..c618f24 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\News;
 
 use Model\Message\FormValidation;
diff --git a/Models/Badge.php b/Models/Badge.php
index f7b6789..91f1ae9 100644
--- a/Models/Badge.php
+++ b/Models/Badge.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\News\Models;
 
 /**
diff --git a/Models/BadgeMapper.php b/Models/BadgeMapper.php
index 4c672f0..e0f6c0b 100644
--- a/Models/BadgeMapper.php
+++ b/Models/BadgeMapper.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\News\Models;
 
 use Modules\Admin\Models\AccountMapper;
@@ -65,7 +65,7 @@ class BadgeMapper 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/NewsArticle.php b/Models/NewsArticle.php
index f3441d9..9f5b2fb 100644
--- a/Models/NewsArticle.php
+++ b/Models/NewsArticle.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\News\Models;
 
 use phpOMS\Contract\ArrayableInterface;
@@ -240,7 +240,7 @@ class NewsArticle implements ArrayableInterface, \JsonSerializable
      */
     public function setLanguage(string $language)
     {
-        if(!ISO639x1Enum::isValidValue($language)) {
+        if (!ISO639x1Enum::isValidValue($language)) {
             throw new InvalidEnumValue($language);
         }
 
@@ -332,7 +332,7 @@ class NewsArticle implements ArrayableInterface, \JsonSerializable
      */
     public function setType(int $type)
     {
-        if(!NewsType::isValidValue($type)) {
+        if (!NewsType::isValidValue($type)) {
             throw new InvalidEnumValue((string) $type);
         }
 
@@ -360,7 +360,7 @@ class NewsArticle implements ArrayableInterface, \JsonSerializable
      */
     public function setStatus(int $status)
     {
-        if(!NewsStatus::isValidValue($status)) {
+        if (!NewsStatus::isValidValue($status)) {
             throw new InvalidEnumValue((string) $status);
         }
 
diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php
index 48386ed..65ff012 100644
--- a/Models/NewsArticleMapper.php
+++ b/Models/NewsArticleMapper.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\News\Models;
 
 use Modules\Admin\Models\AccountMapper;
@@ -89,7 +89,7 @@ class NewsArticleMapper 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/NewsStatus.php b/Models/NewsStatus.php
index 3370221..7e7a5a2 100644
--- a/Models/NewsStatus.php
+++ b/Models/NewsStatus.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\News\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Models/NewsType.php b/Models/NewsType.php
index 23491bd..586b1d8 100644
--- a/Models/NewsType.php
+++ b/Models/NewsType.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\News\Models;
 
 use phpOMS\Stdlib\Base\Enum;
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index 05ca66e..1c9dfdb 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\News\Models;
 
diff --git a/Theme/Backend/dashboard-news.tpl.php b/Theme/Backend/dashboard-news.tpl.php
index 4834b62..d5f0750 100644
--- a/Theme/Backend/dashboard-news.tpl.php
+++ b/Theme/Backend/dashboard-news.tpl.php
@@ -27,19 +27,19 @@ $newsList = $this->getData('news');
                 <td><?= $this->getHtml('Type', 'News') ?>
                 <td class="wf-100"><?= $this->getHtml('Title', 'News') ?>
             <tbody>
-            <?php $count = 0; foreach($newsList as $key => $news) : $count++;
+            <?php $count = 0; foreach ($newsList as $key => $news) : $count++;
             $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
             $color = 'darkred';
-            if($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
-            elseif($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
-            elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
+            if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
+            elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
+            elseif ($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
             ?>
             <tr data-href="<?= $url; ?>">
                 <td data-label=""><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
                 <td data-label="<?= $this->getHtml('Type', 'News') ?>"><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType(), 'News') ?></span></a>
                 <td data-label="<?= $this->getHtml('Title', 'News') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getTitle()); ?></a>
                     <?php endforeach; ?>
-                    <?php if($count === 0) : ?>
+                    <?php if ($count === 0) : ?>
             <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                     <?php endif; ?>
         </table>
diff --git a/Theme/Backend/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php
index ea84b87..2552581 100644
--- a/Theme/Backend/news-archive.tpl.php
+++ b/Theme/Backend/news-archive.tpl.php
@@ -39,11 +39,11 @@ echo $this->getData('nav')->render(); ?>
                 <tr>
                     <td colspan="4"><?= $footerView->render(); ?>
                         <tbody>
-                        <?php $count = 0; foreach($articles as $key => $news) : $count++; $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
+                        <?php $count = 0; foreach ($articles as $key => $news) : $count++; $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
                             $color = 'darkred';
-                            if($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
-                            elseif($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
-                            elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; } 
+                            if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
+                            elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
+                            elseif ($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; } 
                         ?>
                             <tr>
                                 <td><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType()) ?></span></a>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($news->getCreatedBy()->getName1()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($news->getPublish()->format('Y-m-d')); ?></a>
                         <?php endforeach; ?>
-                        <?php if($count === 0) : ?>
+                        <?php if ($count === 0) : ?>
                 <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                         <?php endif; ?>
             </table>
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index ebc706c..124825f 100644
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -32,12 +32,12 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('Author') ?>
                     <td><?= $this->getHtml('Date') ?>
                 <tbody>
-                <?php $count = 0; foreach($newsList as $key => $news) : $count++;
+                <?php $count = 0; foreach ($newsList as $key => $news) : $count++;
                 $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
                 $color = 'darkred';
-                if($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
-                elseif($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
-                elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
+                if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
+                elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
+                elseif ($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td data-label=""><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
                     <td data-label="<?= $this->getHtml('Author') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getCreatedBy()->getName1()); ?></a>
                     <td data-label="<?= $this->getHtml('Date') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getPublish()->format('Y-m-d')); ?></a>
                         <?php endforeach; ?>
-                        <?php if($count === 0) : ?>
+                        <?php if ($count === 0) : ?>
                 <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                         <?php endif; ?>
             </table>