diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index c46ef45b..5be47068 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -40,7 +40,7 @@
             ]
         ],
         'no_leading_import_slash' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_singleline_whitespace_before_semicolons' => true,
         'no_unused_imports' => true,
         'concat_space' => ['spacing' => 'one'],
@@ -67,5 +67,8 @@
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('.build')
+            ->exclude('config')
+            ->exclude('node_modules')
+            ->exclude('var')
             ->in(__DIR__)
     );
diff --git a/Classes/Mail/MailContent.php b/Classes/Mail/MailContent.php
index a9238926..612a0fd3 100644
--- a/Classes/Mail/MailContent.php
+++ b/Classes/Mail/MailContent.php
@@ -17,7 +17,6 @@
 
 class MailContent
 {
-
     /**
      * @param string $template
      * @param array $arguments
diff --git a/Classes/Notification/Processor/AuthorNotificationProcessor.php b/Classes/Notification/Processor/AuthorNotificationProcessor.php
index 41d3744a..0ddadc9b 100644
--- a/Classes/Notification/Processor/AuthorNotificationProcessor.php
+++ b/Classes/Notification/Processor/AuthorNotificationProcessor.php
@@ -21,7 +21,6 @@
 
 class AuthorNotificationProcessor implements ProcessorInterface
 {
-
     /**
      * Process the notification
      *
diff --git a/composer.json b/composer.json
index 1d886fb6..8f8c7dee 100644
--- a/composer.json
+++ b/composer.json
@@ -32,6 +32,7 @@
     "config": {
         "bin-dir": ".build/bin",
         "discard-changes": true,
+        "sort-packages": true,
         "optimize-autoloader": true,
         "vendor-dir": ".build/vendor",
         "allow-plugins": {
@@ -87,6 +88,8 @@
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "ext-pdo": "*",
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
         "typo3/cms-backend": "^11.5",
         "typo3/cms-core": "^11.5",
@@ -96,24 +99,22 @@
         "typo3/cms-form": "^11.5",
         "typo3/cms-frontend": "^11.5",
         "typo3/cms-install": "^11.5",
-        "typo3fluid/fluid": "^2.6",
-        "psr/http-client": "^1.0",
-        "psr/http-factory": "^1.0"
+        "typo3fluid/fluid": "^2.6"
     },
     "require-dev": {
+        "bk2k/bootstrap-package": "^13.0",
+        "bk2k/extension-helper": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.14",
+        "overtrue/phplint": "^2.4",
         "typo3/cms-belog": "^11.5",
         "typo3/cms-beuser": "^11.5",
-        "typo3/cms-seo": "^11.5",
         "typo3/cms-filelist": "^11.5",
         "typo3/cms-fluid-styled-content": "^11.5",
         "typo3/cms-lowlevel": "^11.5",
+        "typo3/cms-rte-ckeditor": "^11.5",
+        "typo3/cms-seo": "^11.5",
         "typo3/cms-setup": "^11.5",
         "typo3/cms-tstemplate": "^11.5",
-        "typo3/cms-rte-ckeditor": "^11.5",
-        "friendsofphp/php-cs-fixer": "^3.1",
-        "typo3/testing-framework": "^6.4",
-        "bk2k/bootstrap-package": "^13.0",
-        "bk2k/extension-helper": "^2.0",
-        "overtrue/phplint": "^2.4"
+        "typo3/testing-framework": "^6.4"
     }
 }
diff --git a/ext_tables.php b/ext_tables.php
index eadcddcf..914ebe34 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -12,7 +12,6 @@
 }
 
 call_user_func(function () {
-
     // Add new page type:
     $GLOBALS['PAGES_TYPES'][\T3G\AgencyPack\Blog\Constants::DOKTYPE_BLOG_POST] = [
         'type' => 'web',