diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6dcd721..e8d598e 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, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "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": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": 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_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": {"replacements": {"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": 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, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "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": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": 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_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": {"replacements": {"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": 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/Api.php b/Admin/Routes/Web/Api.php
index 675e26d..ec826dd 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -48,5 +48,5 @@ return [
                 'state'  => PermissionCategory::SALES_ITEM,
             ],
         ],
-    ]
+    ],
 ];
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index e223566..67b3256 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -48,7 +48,6 @@ use phpOMS\Localization\NullBaseStringL11nType;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Model\Message\FormValidation;
@@ -508,7 +507,6 @@ final class ApiController extends Controller
      */
     private function updateItemAttributeFromRequest(RequestAbstract $request, Attribute $attribute) : Attribute
     {
-
         if ($attribute->type->custom) {
             // @question: we are overwriting the old value, could there be a use case where we want to create a new value and keep the old one?
             $attribute->value->setValue($request->getData('value'), $attribute->type->datatype);
diff --git a/Models/ItemAttributeValueMapper.php b/Models/ItemAttributeValueMapper.php
index 2308eda..d969539 100755
--- a/Models/ItemAttributeValueMapper.php
+++ b/Models/ItemAttributeValueMapper.php
@@ -37,14 +37,14 @@ final class ItemAttributeValueMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'itemmgmt_attr_value_id'            => ['name' => 'itemmgmt_attr_value_id',       'type' => 'int',      'internal' => 'id'],
-        'itemmgmt_attr_value_default'       => ['name' => 'itemmgmt_attr_value_default',  'type' => 'bool',     'internal' => 'isDefault'],
-        'itemmgmt_attr_value_valueStr'      => ['name' => 'itemmgmt_attr_value_valueStr', 'type' => 'string',   'internal' => 'valueStr'],
-        'itemmgmt_attr_value_valueInt'      => ['name' => 'itemmgmt_attr_value_valueInt', 'type' => 'int',      'internal' => 'valueInt'],
-        'itemmgmt_attr_value_valueDec'      => ['name' => 'itemmgmt_attr_value_valueDec', 'type' => 'float',    'internal' => 'valueDec'],
-        'itemmgmt_attr_value_valueDat'      => ['name' => 'itemmgmt_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
-        'itemmgmt_attr_value_unit'          => ['name' => 'itemmgmt_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
-        'itemmgmt_attr_value_deptype'          => ['name' => 'itemmgmt_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
+        'itemmgmt_attr_value_id'                => ['name' => 'itemmgmt_attr_value_id',       'type' => 'int',      'internal' => 'id'],
+        'itemmgmt_attr_value_default'           => ['name' => 'itemmgmt_attr_value_default',  'type' => 'bool',     'internal' => 'isDefault'],
+        'itemmgmt_attr_value_valueStr'          => ['name' => 'itemmgmt_attr_value_valueStr', 'type' => 'string',   'internal' => 'valueStr'],
+        'itemmgmt_attr_value_valueInt'          => ['name' => 'itemmgmt_attr_value_valueInt', 'type' => 'int',      'internal' => 'valueInt'],
+        'itemmgmt_attr_value_valueDec'          => ['name' => 'itemmgmt_attr_value_valueDec', 'type' => 'float',    'internal' => 'valueDec'],
+        'itemmgmt_attr_value_valueDat'          => ['name' => 'itemmgmt_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
+        'itemmgmt_attr_value_unit'              => ['name' => 'itemmgmt_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
+        'itemmgmt_attr_value_deptype'           => ['name' => 'itemmgmt_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
         'itemmgmt_attr_value_depvalue'          => ['name' => 'itemmgmt_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'],
     ];
 
diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php
index 61e59a2..4a4189d 100755
--- a/Models/ItemMapper.php
+++ b/Models/ItemMapper.php
@@ -121,22 +121,22 @@ final class ItemMapper extends DataMapperFactory
         SQL;
 
         $itemsResult = self::$db->con->query($query)->fetchAll();
-        $items = [];
+        $items       = [];
 
         foreach ($itemsResult as $res) {
             $media = null;
             if ($res['media_id'] !== null) {
-                $mediaType = new MediaType();
-                $mediaType->id = $res['media_type_id'];
+                $mediaType       = new MediaType();
+                $mediaType->id   = $res['media_type_id'];
                 $mediaType->name = $res['media_type_name'];
 
-                $media = new Media();
+                $media     = new Media();
                 $media->id = $res['media_id'];
                 $media->setPath($res['media_file']);
             }
 
-            $item = new Item();
-            $item->id = $res['itemmgmt_item_id'];
+            $item         = new Item();
+            $item->id     = $res['itemmgmt_item_id'];
             $item->number = $res['itemmgmt_item_no'];
             $item->salesPrice->setInt($res['itemmgmt_item_salesprice']);
 
@@ -171,14 +171,14 @@ final class ItemMapper extends DataMapperFactory
         $l11nsResult = $sth->fetchAll();
 
         foreach ($l11nsResult as $res) {
-            $l11nType = new BaseStringL11nType();
-            $l11nType->id = $res['itemmgmt_item_l11n_typeref'];
+            $l11nType       = new BaseStringL11nType();
+            $l11nType->id   = $res['itemmgmt_item_l11n_typeref'];
             $l11nType->title= $res['itemmgmt_item_l11n_type_title'];
 
-            $l11n = new BaseStringL11n();
-            $l11n->id = $res['itemmgmt_item_l11n_id'];
-            $l11n->ref = $res['itemmgmt_item_id'];
-            $l11n->type = $l11nType;
+            $l11n          = new BaseStringL11n();
+            $l11n->id      = $res['itemmgmt_item_l11n_id'];
+            $l11n->ref     = $res['itemmgmt_item_id'];
+            $l11n->type    = $l11nType;
             $l11n->content = $res['itemmgmt_item_l11n_description'];
             $l11n->setLanguage($res['itemmgmt_item_l11n_lang']);
 
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index d7d52ab..b4c4bae 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 return ['Navigation' => [
     'Analyze'        => 'Analyze',
-    'Items'        => 'Items',
+    'Items'          => 'Items',
     'Attributes'     => 'Attributes',
     'Create'         => 'Create',
     'ItemManagement' => 'Item Management',
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 6494755..01a68d0 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -13,140 +13,140 @@
 declare(strict_types=1);
 
 return ['ItemManagement' => [
-    'SalesPricing'         => 'Sales Pricing',
-    'ItemGroup'         => 'Item Group',
-    'ItemSegment'         => 'Item Segment',
-    'ItemSection'         => 'Item Section',
-    'ItemType'         => 'Item Type',
-    'ClientGroup'         => 'Client Group',
-    'ClientSegment'         => 'Client Segment',
-    'ClientSection'         => 'Client Section',
-    'ClientType'         => 'Client Type',
-    'Accounting'       => 'Accounting',
-    'Address'          => 'Address',
-    'All'              => 'All',
-    'Article'          => 'Article',
-    'Articlegroup'     => 'Articlegroup',
-    'Attribute'        => 'Attribute',
-    'AttributeTypes'   => 'Attribute types',
-    'Attributes'       => 'Attributes',
-    'Available'        => 'Available',
-    'AvgPrice'         => 'Avg. Price',
-    'Bills'            => 'Bills',
-    'Bonus'            => 'Bonus',
-    'ClientGroup'      => 'Client/Group',
-    'Commission'       => 'Commission',
-    'Container'        => 'Container',
-    'CostCenter'       => 'CostCenter',
-    'CostIndicator'    => 'Cost Indicator',
-    'CostObject'       => 'CostObject',
-    'Countries'        => 'Countries',
-    'Country'          => 'Country',
-    'Created'          => 'Created',
-    'CreatedAt'        => 'Created',
-    'Customer'         => 'Customer',
-    'CustomerGroup'    => 'Customer Group',
-    'CustomsID'        => 'Customs ID',
-    'Date'             => 'Date',
-    'Description'      => 'Description',
-    'Discount'         => 'Discount',
-    'DiscountP'        => 'Discount in %',
-    'Disposal'         => 'Disposal',
-    'Documents'        => 'Documents',
-    'EarningIndicator' => 'Earning Indicator',
-    'End'              => 'End',
-    'Files'            => 'Files',
-    'General'          => 'General',
-    'GrossWeight'      => 'Gross Weight',
-    'Group'            => 'Group',
-    'Groups'           => 'Groups',
-    'Height'           => 'Height',
-    'ID'               => 'ID',
-    'ILV'              => 'ILV',
-    'Info'             => 'Info',
-    'IsActive'         => 'Active?',
-    'Item'             => 'Item',
-    'Items'            => 'Items',
-    'Language'         => 'Language',
-    'LastOrder'        => 'Last Order',
-    'Leadtime'         => 'Lead time',
-    'Length'           => 'Length',
-    'Localization'     => 'Localization',
-    'Localizations'    => 'Localizations',
-    'Location'         => 'Location',
-    'Log'              => 'Log',
-    'Logs'             => 'Logs',
-    'Lot'              => 'Lot',
-    'MRR'              => 'MRR',
-    'MTDSales'         => 'MTD Sales',
-    'Makespan'         => 'Makespan',
-    'Margin'           => 'Margin',
-    'Master'           => 'Master',
-    'MaximumLevel'     => 'Maximum stock level',
-    'Media'            => 'Media',
-    'MinimumLevel'     => 'Minimum stock level',
-    'Modified'         => 'Modified',
-    'Name'             => 'Name',
-    'Name1'            => 'Name1',
-    'Name2'            => 'Name2',
-    'Name3'            => 'Name3',
-    'Name4'            => 'Name4',
-    'Name5'            => 'Name5',
-    'Net'              => 'Net',
-    'NetWeight'        => 'Net Weight',
-    'None'             => 'None',
-    'Notes'            => 'Notes',
-    'Number'           => 'Number',
-    'Ordered'          => 'Ordered',
-    'Packaging'        => 'Packaging',
-    'Price'            => 'Price',
-    'PriceChange'      => 'Price Change',
-    'PriceUnit'        => 'Unit of price',
-    'Prices'           => 'Prices',
-    'Pricing'          => 'Pricing',
-    'Productgroup'     => 'Productgroup',
-    'Production'       => 'Production',
-    'Profile'          => 'Profile',
-    'Properties'       => 'Properties',
-    'Property'         => 'Property',
-    'Purchase'         => 'Purchase',
-    'Procurement'         => 'Procurement',
-    'PurchasePrice'    => 'Purchase Price',
-    'Purchasing'       => 'Purchasing',
-    'QA'               => 'QA',
-    'QM'               => 'QM',
-    'Quantity'         => 'Quantity',
-    'QuantityUnit'     => 'Unit of quantity',
-    'RecentInvoices'   => 'Recent invoices',
-    'ReorderLevel'     => 'Reorder level',
-    'Reserved'         => 'Reserved',
-    'SN'               => 'SN',
-    'Sales'            => 'Sales',
-    'SalesPrice'       => 'Sales Price',
-    'Segment'          => 'Segment',
-    'ShelfLife'        => 'Shelf life',
-    'Source'           => 'Source',
-    'Start'            => 'Start',
-    'Status'           => 'Status',
-    'Stock'            => 'Stock',
-    'StockList'        => 'Stock list',
-    'Successor'        => 'Successor',
-    'Supplier'         => 'Supplier',
-    'Tax'              => 'Tax',
-    'Text'             => 'Text',
-    'TimeUnit'         => 'Unit of time',
-    'Title'            => 'Title',
-    'Tracking'         => 'Tracking',
-    'TradingUnit'      => 'Trading Unit',
-    'Translation'      => 'Translation',
-    'Type'             => 'Type',
-    'Unit'             => 'Unit',
-    'Value'            => 'Value',
-    'Variation'        => 'Variation',
-    'Variations'       => 'Variations',
-    'Volume'           => 'Volume',
-    'Warehouse'        => 'Warehouse',
-    'Width'            => 'Width',
+    'SalesPricing'            => 'Sales Pricing',
+    'ItemGroup'               => 'Item Group',
+    'ItemSegment'             => 'Item Segment',
+    'ItemSection'             => 'Item Section',
+    'ItemType'                => 'Item Type',
+    'ClientGroup'             => 'Client Group',
+    'ClientSegment'           => 'Client Segment',
+    'ClientSection'           => 'Client Section',
+    'ClientType'              => 'Client Type',
+    'Accounting'              => 'Accounting',
+    'Address'                 => 'Address',
+    'All'                     => 'All',
+    'Article'                 => 'Article',
+    'Articlegroup'            => 'Articlegroup',
+    'Attribute'               => 'Attribute',
+    'AttributeTypes'          => 'Attribute types',
+    'Attributes'              => 'Attributes',
+    'Available'               => 'Available',
+    'AvgPrice'                => 'Avg. Price',
+    'Bills'                   => 'Bills',
+    'Bonus'                   => 'Bonus',
+    'ClientGroup'             => 'Client/Group',
+    'Commission'              => 'Commission',
+    'Container'               => 'Container',
+    'CostCenter'              => 'CostCenter',
+    'CostIndicator'           => 'Cost Indicator',
+    'CostObject'              => 'CostObject',
+    'Countries'               => 'Countries',
+    'Country'                 => 'Country',
+    'Created'                 => 'Created',
+    'CreatedAt'               => 'Created',
+    'Customer'                => 'Customer',
+    'CustomerGroup'           => 'Customer Group',
+    'CustomsID'               => 'Customs ID',
+    'Date'                    => 'Date',
+    'Description'             => 'Description',
+    'Discount'                => 'Discount',
+    'DiscountP'               => 'Discount in %',
+    'Disposal'                => 'Disposal',
+    'Documents'               => 'Documents',
+    'EarningIndicator'        => 'Earning Indicator',
+    'End'                     => 'End',
+    'Files'                   => 'Files',
+    'General'                 => 'General',
+    'GrossWeight'             => 'Gross Weight',
+    'Group'                   => 'Group',
+    'Groups'                  => 'Groups',
+    'Height'                  => 'Height',
+    'ID'                      => 'ID',
+    'ILV'                     => 'ILV',
+    'Info'                    => 'Info',
+    'IsActive'                => 'Active?',
+    'Item'                    => 'Item',
+    'Items'                   => 'Items',
+    'Language'                => 'Language',
+    'LastOrder'               => 'Last Order',
+    'Leadtime'                => 'Lead time',
+    'Length'                  => 'Length',
+    'Localization'            => 'Localization',
+    'Localizations'           => 'Localizations',
+    'Location'                => 'Location',
+    'Log'                     => 'Log',
+    'Logs'                    => 'Logs',
+    'Lot'                     => 'Lot',
+    'MRR'                     => 'MRR',
+    'MTDSales'                => 'MTD Sales',
+    'Makespan'                => 'Makespan',
+    'Margin'                  => 'Margin',
+    'Master'                  => 'Master',
+    'MaximumLevel'            => 'Maximum stock level',
+    'Media'                   => 'Media',
+    'MinimumLevel'            => 'Minimum stock level',
+    'Modified'                => 'Modified',
+    'Name'                    => 'Name',
+    'Name1'                   => 'Name1',
+    'Name2'                   => 'Name2',
+    'Name3'                   => 'Name3',
+    'Name4'                   => 'Name4',
+    'Name5'                   => 'Name5',
+    'Net'                     => 'Net',
+    'NetWeight'               => 'Net Weight',
+    'None'                    => 'None',
+    'Notes'                   => 'Notes',
+    'Number'                  => 'Number',
+    'Ordered'                 => 'Ordered',
+    'Packaging'               => 'Packaging',
+    'Price'                   => 'Price',
+    'PriceChange'             => 'Price Change',
+    'PriceUnit'               => 'Unit of price',
+    'Prices'                  => 'Prices',
+    'Pricing'                 => 'Pricing',
+    'Productgroup'            => 'Productgroup',
+    'Production'              => 'Production',
+    'Profile'                 => 'Profile',
+    'Properties'              => 'Properties',
+    'Property'                => 'Property',
+    'Purchase'                => 'Purchase',
+    'Procurement'             => 'Procurement',
+    'PurchasePrice'           => 'Purchase Price',
+    'Purchasing'              => 'Purchasing',
+    'QA'                      => 'QA',
+    'QM'                      => 'QM',
+    'Quantity'                => 'Quantity',
+    'QuantityUnit'            => 'Unit of quantity',
+    'RecentInvoices'          => 'Recent invoices',
+    'ReorderLevel'            => 'Reorder level',
+    'Reserved'                => 'Reserved',
+    'SN'                      => 'SN',
+    'Sales'                   => 'Sales',
+    'SalesPrice'              => 'Sales Price',
+    'Segment'                 => 'Segment',
+    'ShelfLife'               => 'Shelf life',
+    'Source'                  => 'Source',
+    'Start'                   => 'Start',
+    'Status'                  => 'Status',
+    'Stock'                   => 'Stock',
+    'StockList'               => 'Stock list',
+    'Successor'               => 'Successor',
+    'Supplier'                => 'Supplier',
+    'Tax'                     => 'Tax',
+    'Text'                    => 'Text',
+    'TimeUnit'                => 'Unit of time',
+    'Title'                   => 'Title',
+    'Tracking'                => 'Tracking',
+    'TradingUnit'             => 'Trading Unit',
+    'Translation'             => 'Translation',
+    'Type'                    => 'Type',
+    'Unit'                    => 'Unit',
+    'Value'                   => 'Value',
+    'Variation'               => 'Variation',
+    'Variations'              => 'Variations',
+    'Volume'                  => 'Volume',
+    'Warehouse'               => 'Warehouse',
+    'Width'                   => 'Width',
     'TopCustomers'            => 'Top Customers',
-    'YTDSales'         => 'YTD Sales',
+    'YTDSales'                => 'YTD Sales',
 ]];
diff --git a/Theme/Backend/attribute-type.tpl.php b/Theme/Backend/attribute-type.tpl.php
index 378a585..bed6997 100755
--- a/Theme/Backend/attribute-type.tpl.php
+++ b/Theme/Backend/attribute-type.tpl.php
@@ -18,7 +18,7 @@ use phpOMS\Localization\ISO639Enum;
 $types = AttributeValueType::getConstants();
 
 $attribute = $this->getData('attribute');
-$l11ns = $this->getData('l11ns');
+$l11ns     = $this->getData('l11ns');
 
 echo $this->getData('nav')->render(); ?>
 
diff --git a/Theme/Backend/item-list.tpl.php b/Theme/Backend/item-list.tpl.php
index aac0426..1c18d6b 100755
--- a/Theme/Backend/item-list.tpl.php
+++ b/Theme/Backend/item-list.tpl.php
@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
diff --git a/Theme/Backend/item-profile.tpl.php b/Theme/Backend/item-profile.tpl.php
index 9fe4223..aee71e1 100755
--- a/Theme/Backend/item-profile.tpl.php
+++ b/Theme/Backend/item-profile.tpl.php
@@ -25,8 +25,8 @@ $item = $this->getData('item');
 
 $attribute = $item->getAttributes();
 
-$notes = $item->getNotes();
-$files = $item->getFiles();
+$notes     = $item->getNotes();
+$files     = $item->getFiles();
 $itemImage = $this->getData('itemImage') ?? new NullMedia();
 
 $newestInvoices    = $this->getData('newestInvoices') ?? [];
@@ -539,7 +539,7 @@ echo $this->getData('nav')->render();
                                     </tr>
                                 </template>
                                 <?php
-                                $c = 0;
+                                $c        = 0;
                                 $itemL11n = $this->getData('l11nValues');
                                 foreach ($itemL11n as $value) : ++$c; ?>
                                     <tr data-id="<?= $value->id; ?>">
@@ -782,7 +782,7 @@ echo $this->getData('nav')->render();
                                     <td><?= $this->getHtml('End'); ?>
                             <tbody>
                                 <?php
-                                $c = 0;
+                                $c      = 0;
                                 $prices = $this->getData('prices');
                                 foreach ($prices as $key => $value) : ++$c;
                                     $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
@@ -1206,8 +1206,8 @@ echo $this->getData('nav')->render();
                                 <td><?= $this->getHtml('Date', 'Auditor'); ?>
                             <tbody>
                             <?php
-                                $count = 0;
-                                $audits = $this->getData('audits') ?? [];
+                                $count    = 0;
+                                $audits   = $this->getData('audits') ?? [];
                                 $previous = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \reset($audits)->id . '&ptype=p#{\#}';
                                 $next     = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \end($audits)->id . '&ptype=n#{\#}';
 
diff --git a/Theme/Backend/purchase-item-list.tpl.php b/Theme/Backend/purchase-item-list.tpl.php
index b96b48d..61ca57d 100755
--- a/Theme/Backend/purchase-item-list.tpl.php
+++ b/Theme/Backend/purchase-item-list.tpl.php
@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php
index c77cfa0..3c175e5 100755
--- a/Theme/Backend/sales-item-list.tpl.php
+++ b/Theme/Backend/sales-item-list.tpl.php
@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
diff --git a/Theme/Backend/sales-item-profile.tpl.php b/Theme/Backend/sales-item-profile.tpl.php
index 46c931e..61796bf 100755
--- a/Theme/Backend/sales-item-profile.tpl.php
+++ b/Theme/Backend/sales-item-profile.tpl.php
@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Localization\ISO639Enum;
 use phpOMS\Localization\Money;
 use phpOMS\Localization\NullLocalization;
@@ -22,7 +21,7 @@ use phpOMS\Uri\UriFactory;
 $item = $this->getData('item');
 
 $itemL11n      = $item->getL11ns();
-$Attribute = $item->getAttributes();
+$Attribute     = $item->getAttributes();
 
 $notes = $item->getNotes();
 $files = $item->getFiles();
diff --git a/Theme/Backend/stock-item-list.tpl.php b/Theme/Backend/stock-item-list.tpl.php
index 07e1d5b..bd3bb70 100755
--- a/Theme/Backend/stock-item-list.tpl.php
+++ b/Theme/Backend/stock-item-list.tpl.php
@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php
index 5689bd6..d4a2f39 100755
--- a/tests/Controller/Api/ApiControllerAttributeTrait.php
+++ b/tests/Controller/Api/ApiControllerAttributeTrait.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\ItemManagement\tests\Controller\Api;
 
-use Modules\ItemManagement\Models\AttributeValueType;
 use phpOMS\Localization\ISO3166TwoEnum;
 use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\HttpRequest;
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 7d6050f..f6a21c0 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -55,13 +55,13 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
             protected string $appName = 'Api';
         };
 
-        $this->app->dbPool         = $GLOBALS['dbpool'];
+        $this->app->dbPool          = $GLOBALS['dbpool'];
         $this->app->unitId          = 1;
-        $this->app->accountManager = new AccountManager($GLOBALS['session']);
-        $this->app->appSettings    = new CoreSettings();
-        $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
-        $this->app->dispatcher     = new Dispatcher($this->app);
-        $this->app->eventManager   = new EventManager($this->app->dispatcher);
+        $this->app->accountManager  = new AccountManager($GLOBALS['session']);
+        $this->app->appSettings     = new CoreSettings();
+        $this->app->moduleManager   = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
+        $this->app->dispatcher      = new Dispatcher($this->app);
+        $this->app->eventManager    = new EventManager($this->app->dispatcher);
         $this->app->eventManager->importFromFile(__DIR__ . '/../../../../Web/Api/Hooks.php');
         $this->app->sessionManager = new HttpSession(36000);
         $this->app->l11nManager    = new L11nManager();
diff --git a/tests/Models/ItemTest.php b/tests/Models/ItemTest.php
index f6217f7..2a74fbf 100755
--- a/tests/Models/ItemTest.php
+++ b/tests/Models/ItemTest.php
@@ -14,9 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\ItemManagement\tests\Models;
 
+use Modules\Attribute\Models\Attribute;
 use Modules\Editor\Models\EditorDoc;
 use Modules\ItemManagement\Models\Item;
-use Modules\Attribute\Models\Attribute;
 use Modules\ItemManagement\Models\ItemStatus;
 use Modules\Media\Models\Media;
 use phpOMS\Localization\BaseStringL11n;