diff --git a/Admin/Routes/Console.php b/Admin/Routes/Console.php
index ad2f6a9..9448746 100644
--- a/Admin/Routes/Console.php
+++ b/Admin/Routes/Console.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use phpOMS\Router\RouteVerb;
 
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 8d47c86..2dafd29 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use Modules\Admin\Controller\ApiController;
 use Modules\Admin\Models\PermissionState;
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index ea340b1..582f914 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use Modules\Admin\Controller\BackendController;
 use Modules\Admin\Models\PermissionState;
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5e1f26e..efb0598 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -71,7 +71,7 @@ final class ApiController extends Controller
         $response->set(
             $request->getUri()->__toString(),
             [
-                'response' => $this->app->appSettings->get((int) $request->getData('id'))
+                'response' => $this->app->appSettings->get((int) $request->getData('id')),
             ]
         );
     }
@@ -559,7 +559,7 @@ final class ApiController extends Controller
                 'status' => 'warning',
                 'title' => 'Module',
                 'message' => 'Invalid module or status',
-                'response' => []
+                'response' => [],
             ]);
 
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php
index 0d7fb60..a1d4e5f 100644
--- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php
+++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php
@@ -1,62 +1,62 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.2
- *
- * @package    TBD
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://website.orange-management.de
- */
-declare(strict_types=1);
-
-namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector;
-
-use phpOMS\ApplicationAbstract;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
-use phpOMS\Views\View;
-
-/**
- * Component view.
- *
- * @package    TBD
- * @license    OMS License 1.0
- * @link       http://website.orange-management.de
- * @since      1.0.0
- * @codeCoverageIgnore
- */
-class GroupTagSelectorPopupView extends View
-{
-    private $id = '';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
-    {
-        parent::__construct($app, $request, $response);
-        $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector-popup');
-    }
-
-    public function setId(string $id) : void
-    {
-        $this->id = $id;
-    }
-
-    public function getId() : string
-    {
-        return $this->id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function render(...$data) : string
-    {
-        $this->id = $data[0] ?? $this->id;
-        return parent::render();
-    }
-}
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.2
+ *
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://website.orange-management.de
+ */
+declare(strict_types=1);
+
+namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector;
+
+use phpOMS\ApplicationAbstract;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Views\View;
+
+/**
+ * Component view.
+ *
+ * @package    TBD
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
+ * @since      1.0.0
+ * @codeCoverageIgnore
+ */
+class GroupTagSelectorPopupView extends View
+{
+    private $id = '';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    {
+        parent::__construct($app, $request, $response);
+        $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector-popup');
+    }
+
+    public function setId(string $id) : void
+    {
+        $this->id = $id;
+    }
+
+    public function getId() : string
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render(...$data) : string
+    {
+        $this->id = $data[0] ?? $this->id;
+        return parent::render();
+    }
+}
diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php
index 5b5307e..ba212f3 100644
--- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php
+++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php
@@ -1,69 +1,69 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.2
- *
- * @package    TBD
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://website.orange-management.de
- */
-declare(strict_types=1);
-
-namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector;
-
-use phpOMS\ApplicationAbstract;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
-use phpOMS\Views\View;
-
-/**
- * Component view.
- *
- * @package    TBD
- * @license    OMS License 1.0
- * @link       http://website.orange-management.de
- * @since      1.0.0
- * @codeCoverageIgnore
- */
-class GroupTagSelectorView extends View
-{
-    private $id         = '';
-    private $isRequired = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
-    {
-        parent::__construct($app, $request, $response);
-        $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector');
-
-        $view = new GroupTagSelectorPopupView($app, $request, $response);
-        $this->addData('group-selector-popup', $view);
-    }
-
-    public function getId() : string
-    {
-        return $this->id;
-    }
-
-    public function isRequired() : bool
-    {
-        return $this->isRequired;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function render(...$data) : string
-    {
-        $this->id         = $data[0];
-        $this->isRequired = $data[1] ?? false;
-        $this->getData('group-selector-popup')->setId($this->id);
-
-        return parent::render();
-    }
-}
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.2
+ *
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://website.orange-management.de
+ */
+declare(strict_types=1);
+
+namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector;
+
+use phpOMS\ApplicationAbstract;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Views\View;
+
+/**
+ * Component view.
+ *
+ * @package    TBD
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
+ * @since      1.0.0
+ * @codeCoverageIgnore
+ */
+class GroupTagSelectorView extends View
+{
+    private $id         = '';
+    private $isRequired = false;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    {
+        parent::__construct($app, $request, $response);
+        $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector');
+
+        $view = new GroupTagSelectorPopupView($app, $request, $response);
+        $this->addData('group-selector-popup', $view);
+    }
+
+    public function getId() : string
+    {
+        return $this->id;
+    }
+
+    public function isRequired() : bool
+    {
+        return $this->isRequired;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render(...$data) : string
+    {
+        $this->id         = $data[0];
+        $this->isRequired = $data[1] ?? false;
+        $this->getData('group-selector-popup')->setId($this->id);
+
+        return parent::render();
+    }
+}
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 9a2cdd8..c9fed5a 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index 6d40823..f761dcb 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.en.lang.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 09a6826..2e51b00 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index 24cae40..03c92c5 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 2127ff0..aadb9da 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
@@ -13,7 +13,7 @@
 
  use \phpOMS\Account\AccountStatus;
 
-/**
+ /**
  * @var \phpOMS\Views\View $this
  */
 echo $this->getData('nav')->render(); ?>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index c682d7e..a9577f7 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index ea7e979..a353a91 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index 87dfc7a..f768a91 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index c51483a..7823428 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index e022f0d..29c1555 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index f30f87a..fbfa28c 100644
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *
@@ -31,7 +31,7 @@ if ($nav !== null) {
 <div class="row">
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->printHtml($modules[$id]['name']['external'] ); ?></h1></header>
+            <header><h1><?= $this->printHtml($modules[$id]['name']['external']); ?></h1></header>
 
             <div class="inner">
                 <table class="list wf-100">
@@ -41,16 +41,16 @@ if ($nav !== null) {
                         <td><?= $this->printHtml($modules[$id]['name']['external']); ?>
                     <tr>
                         <td><?= $this->getHtml('Version'); ?>
-                        <td><?= $this->printHtml($modules[$id]['version'] ); ?>
+                        <td><?= $this->printHtml($modules[$id]['version']); ?>
                     <tr>
                         <td><?= $this->getHtml('CreatedBy'); ?>
-                        <td><?= $this->printHtml($modules[$id]['creator']['name'] ); ?>
+                        <td><?= $this->printHtml($modules[$id]['creator']['name']); ?>
                     <tr>
                         <td><?= $this->getHtml('Website'); ?>
-                        <td><?= $this->printHtml($modules[$id]['creator']['website'] ); ?>
+                        <td><?= $this->printHtml($modules[$id]['creator']['website']); ?>
                     <tr>
                         <td><?= $this->getHtml('Description'); ?>
-                        <td><?= $this->printHtml($modules[$id]['description'] ); ?>
+                        <td><?= $this->printHtml($modules[$id]['description']); ?>
                     <tr>
                         <td colspan="2">
                             <?php if (isset($active[$id])) : ?>
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 94acef6..efd0371 100644
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Orange Management
  *