diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index aa0a3b0..88d936e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -3136,8 +3136,8 @@ final class ApiController extends Controller
     /**
      * Method to update Application from request.
      *
-     * @param RequestAbstract  $request Request
-     * @param App              $new     Model to modify
+     * @param RequestAbstract $request Request
+     * @param App             $new     Model to modify
      *
      * @return App
      *
diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php
index 173dfb3..6085930 100755
--- a/Models/AccountPermissionMapper.php
+++ b/Models/AccountPermissionMapper.php
@@ -36,22 +36,22 @@ final class AccountPermissionMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'account_permission_id'             => ['name' => 'account_permission_id',         'type' => 'int',    'internal' => 'id'],
-        'account_permission_account'        => ['name' => 'account_permission_account',    'type' => 'int',    'internal' => 'account'],
-        'account_permission_unit'           => ['name' => 'account_permission_unit',       'type' => 'int',    'internal' => 'unit'],
-        'account_permission_app'            => ['name' => 'account_permission_app',        'type' => 'int', 'internal' => 'app'],
-        'account_permission_module'         => ['name' => 'account_permission_module',     'type' => 'string', 'internal' => 'module'],
-        'account_permission_from'           => ['name' => 'account_permission_from',       'type' => 'string',    'internal' => 'from'],
-        'account_permission_category'       => ['name' => 'account_permission_category',       'type' => 'int',    'internal' => 'category'],
-        'account_permission_element'        => ['name' => 'account_permission_element',    'type' => 'int',    'internal' => 'element'],
-        'account_permission_component'      => ['name' => 'account_permission_component',  'type' => 'int',    'internal' => 'component'],
-        'account_permission_hasread'        => ['name' => 'account_permission_hasread', 'type' => 'bool',    'internal' => 'hasRead'],
-        'account_permission_hascreate'      => ['name' => 'account_permission_hascreate', 'type' => 'bool',    'internal' => 'hasCreate'],
+        'account_permission_id'                => ['name' => 'account_permission_id',         'type' => 'int',    'internal' => 'id'],
+        'account_permission_account'           => ['name' => 'account_permission_account',    'type' => 'int',    'internal' => 'account'],
+        'account_permission_unit'              => ['name' => 'account_permission_unit',       'type' => 'int',    'internal' => 'unit'],
+        'account_permission_app'               => ['name' => 'account_permission_app',        'type' => 'int', 'internal' => 'app'],
+        'account_permission_module'            => ['name' => 'account_permission_module',     'type' => 'string', 'internal' => 'module'],
+        'account_permission_from'              => ['name' => 'account_permission_from',       'type' => 'string',    'internal' => 'from'],
+        'account_permission_category'          => ['name' => 'account_permission_category',       'type' => 'int',    'internal' => 'category'],
+        'account_permission_element'           => ['name' => 'account_permission_element',    'type' => 'int',    'internal' => 'element'],
+        'account_permission_component'         => ['name' => 'account_permission_component',  'type' => 'int',    'internal' => 'component'],
+        'account_permission_hasread'           => ['name' => 'account_permission_hasread', 'type' => 'bool',    'internal' => 'hasRead'],
+        'account_permission_hascreate'         => ['name' => 'account_permission_hascreate', 'type' => 'bool',    'internal' => 'hasCreate'],
         'account_permission_defaultcperm'      => ['name' => 'account_permission_defaultcperm', 'type' => 'string',    'internal' => 'defaultCPermissions'],
-        'account_permission_hasmodify'      => ['name' => 'account_permission_hasmodify', 'type' => 'bool',    'internal' => 'hasModify'],
-        'account_permission_hasdelete'      => ['name' => 'account_permission_hasdelete', 'type' => 'bool',    'internal' => 'hasDelete'],
-        'account_permission_haspermission'  => ['name' => 'account_permission_haspermission', 'type' => 'bool',    'internal' => 'hasPermission'],
-        'account_permission_defaultpperm'  => ['name' => 'account_permission_defaultpperm', 'type' => 'string',    'internal' => 'defaultPPermissions'],
+        'account_permission_hasmodify'         => ['name' => 'account_permission_hasmodify', 'type' => 'bool',    'internal' => 'hasModify'],
+        'account_permission_hasdelete'         => ['name' => 'account_permission_hasdelete', 'type' => 'bool',    'internal' => 'hasDelete'],
+        'account_permission_haspermission'     => ['name' => 'account_permission_haspermission', 'type' => 'bool',    'internal' => 'hasPermission'],
+        'account_permission_defaultpperm'      => ['name' => 'account_permission_defaultpperm', 'type' => 'string',    'internal' => 'defaultPPermissions'],
     ];
 
     /**
diff --git a/Models/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php
index 258c641..c2a00f9 100755
--- a/Models/GroupPermissionMapper.php
+++ b/Models/GroupPermissionMapper.php
@@ -36,22 +36,22 @@ final class GroupPermissionMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'group_permission_id'             => ['name' => 'group_permission_id',         'type' => 'int',    'internal' => 'id'],
-        'group_permission_group'          => ['name' => 'group_permission_group',      'type' => 'int',    'internal' => 'group'],
-        'group_permission_unit'           => ['name' => 'group_permission_unit',       'type' => 'int',    'internal' => 'unit'],
-        'group_permission_app'            => ['name' => 'group_permission_app',        'type' => 'int', 'internal' => 'app'],
-        'group_permission_module'         => ['name' => 'group_permission_module',     'type' => 'string', 'internal' => 'module'],
-        'group_permission_from'           => ['name' => 'group_permission_from',       'type' => 'string',    'internal' => 'from'],
-        'group_permission_category'       => ['name' => 'group_permission_category',       'type' => 'int',    'internal' => 'category'],
-        'group_permission_element'        => ['name' => 'group_permission_element',    'type' => 'int',    'internal' => 'element'],
-        'group_permission_component'      => ['name' => 'group_permission_component',  'type' => 'int',    'internal' => 'component'],
-        'group_permission_hasread'        => ['name' => 'group_permission_hasread', 'type' => 'bool',    'internal' => 'hasRead'],
-        'group_permission_hascreate'      => ['name' => 'group_permission_hascreate', 'type' => 'bool',    'internal' => 'hasCreate'],
+        'group_permission_id'                => ['name' => 'group_permission_id',         'type' => 'int',    'internal' => 'id'],
+        'group_permission_group'             => ['name' => 'group_permission_group',      'type' => 'int',    'internal' => 'group'],
+        'group_permission_unit'              => ['name' => 'group_permission_unit',       'type' => 'int',    'internal' => 'unit'],
+        'group_permission_app'               => ['name' => 'group_permission_app',        'type' => 'int', 'internal' => 'app'],
+        'group_permission_module'            => ['name' => 'group_permission_module',     'type' => 'string', 'internal' => 'module'],
+        'group_permission_from'              => ['name' => 'group_permission_from',       'type' => 'string',    'internal' => 'from'],
+        'group_permission_category'          => ['name' => 'group_permission_category',       'type' => 'int',    'internal' => 'category'],
+        'group_permission_element'           => ['name' => 'group_permission_element',    'type' => 'int',    'internal' => 'element'],
+        'group_permission_component'         => ['name' => 'group_permission_component',  'type' => 'int',    'internal' => 'component'],
+        'group_permission_hasread'           => ['name' => 'group_permission_hasread', 'type' => 'bool',    'internal' => 'hasRead'],
+        'group_permission_hascreate'         => ['name' => 'group_permission_hascreate', 'type' => 'bool',    'internal' => 'hasCreate'],
         'group_permission_defaultcperm'      => ['name' => 'group_permission_defaultcperm', 'type' => 'string',    'internal' => 'defaultCPermissions'],
-        'group_permission_hasmodify'      => ['name' => 'group_permission_hasmodify', 'type' => 'bool',    'internal' => 'hasModify'],
-        'group_permission_hasdelete'      => ['name' => 'group_permission_hasdelete', 'type' => 'bool',    'internal' => 'hasDelete'],
-        'group_permission_haspermission'  => ['name' => 'group_permission_haspermission', 'type' => 'bool',    'internal' => 'hasPermission'],
-        'group_permission_defaultpperm'  => ['name' => 'group_permission_defaultpperm', 'type' => 'string',    'internal' => 'defaultPPermissions'],
+        'group_permission_hasmodify'         => ['name' => 'group_permission_hasmodify', 'type' => 'bool',    'internal' => 'hasModify'],
+        'group_permission_hasdelete'         => ['name' => 'group_permission_hasdelete', 'type' => 'bool',    'internal' => 'hasDelete'],
+        'group_permission_haspermission'     => ['name' => 'group_permission_haspermission', 'type' => 'bool',    'internal' => 'hasPermission'],
+        'group_permission_defaultpperm'      => ['name' => 'group_permission_defaultpperm', 'type' => 'string',    'internal' => 'defaultPPermissions'],
     ];
 
     /**
diff --git a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
index 752b3fb..ac454db 100644
--- a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
+++ b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
@@ -14,10 +14,9 @@ declare(strict_types=1);
 
 use phpOMS\Account\PermissionType;
 use phpOMS\Localization\ISO639Enum;
-use phpOMS\Uri\UriFactory;
 
 $permissions = $this->permissions;
-$categories = ISO639Enum::getConstants();
+$categories  = ISO639Enum::getConstants();
 
 ?>
 
@@ -188,7 +187,7 @@ $categories = ISO639Enum::getConstants();
                 </div>
             </div>
             <div class="portlet-foot">
-                <input type="Submit" value="<?= $this->getHtml('Add', '0', '0') ?>">
+                <input type="Submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
             </div>
         </section>
     </div>