diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d44f65c..e942af8 100755
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Composer
         run: composer install
       - name: Autoformat
-        run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
+        run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
       - name: Check for modified files
         id: git-check
         run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index c3df473..b93c464 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -8,89 +8,89 @@ use phpOMS\Router\RouteVerb;
 return [
     '^.*/messages/dashboard.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageInbox',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageInbox',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/outbox.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageOutbox',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageOutbox',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/trash.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTrash',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageTrash',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/spam.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSpam',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageSpam',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/settings.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSettings',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageSettings',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/mail/create.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageCreate',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageCreate',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::CREATE,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::CREATE,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/mail/single.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageView',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
     '^.*/messages/mail/single.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\Messages\Controller\BackendController:viewMessageView',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::MESSAGE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::MESSAGE,
             ],
         ],
     ],
diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index c34d6c4..e4c0f2a 100755
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <td><?= $this->getHtml('Date'); ?>
             <tbody>
                 <?php $count = 0; foreach ($unseen as $key => $value) : ++$count;
-                $url = UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
+                $url         = UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
                 <tr>
                     <td><span class="check"><input type="checkbox"></span>
                     <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index 802b854..03e54d9 100755
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
-$sent = $mail->getInboxAll();
+$sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();
 
 echo $this->getData('nav')->render(); ?>
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
         <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
-        $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
+        $url         = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 802b854..03e54d9 100755
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
-$sent = $mail->getInboxAll();
+$sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();
 
 echo $this->getData('nav')->render(); ?>
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
         <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
-        $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
+        $url         = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 802b854..03e54d9 100755
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
-$sent = $mail->getInboxAll();
+$sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();
 
 echo $this->getData('nav')->render(); ?>
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
         <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
-        $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
+        $url         = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>