Merge pull request #6132 from nextcloud/chore/update-feature-outbox

Merge main into feature/outbox

156 files changed, 2666 insertions, 2493 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report_form.yml
index 12eb40627..9de7b51fc 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_form.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_form.yml
@@ -1,94 +1,94 @@
 name: "Bug"
 description: "Have you encountered a bug? Submit a report and help us improve Nextcloud Mail"
-labels: ["bug", "0. Needs triage"]
+labels: ["bug", "0. to triage"]
 body:
-    - type: textarea
-      id: Expected-behavior
-      attributes:
-          label: Expected behavior
-          description: |
-              Tell us what should happen
-      validations:
-          required: true
-    - type: textarea
-      id: actual-behavior
-      attributes:
-          label: Actual behavior
-          description: Describe what you expected to happen instead.
-      validations:
-          required: true
-    - type: textarea
-      id: reproduce
-      attributes:
-          label: Steps to reproduce
-          description: |
-              Describe the steps to reproduce the bug.
-              The better your description is _(go 'here', click 'there'...)_ the fastest you'll get an _(accurate)_ answer.
-          value: |
-              1.
-              2.
-              3.
-      validations:
-          required: true
-    - type: input
-      id: mail-app-version
-      attributes:
-          label: Mail app version
-          description: |
-              See apps admin page, e.g. 0.5.3
-    - type: input
-      id: mail-server-service
-      attributes:
-          label: Mailserver or service
-          description: |
-              e.g. Outlook, Yahoo, Gmail, Exchange...
-    - type: input
-      id: system
-      attributes:
-          label: Operating system
-          description: |
-              Write down the operating system where Nextcloud Mail app is installed.
-    - type: dropdown
-      id: php
-      attributes:
-          label: PHP engine version
-          description: |
-              Select PHP engine version serving Nextcloud Server.
-              _Describe in the "Additional info" section if you chose "Other"._
-          options:
-              - "PHP 7.3"
-              - "PHP 7.4"
-              - "PHP 8.0"
-              - "PHP 8.1"
-              - "Other"
-    - type: dropdown
-      id: webserver
-      attributes:
-          label: Web server
-          description: |
-              Select Webserver serving Nextcloud Server.
-              _Describe in the "Additional info" section if you chose "Other"._
-          options:
-              - "Apache (supported)"
-              - "Nginx"
-              - "Lighttpd"
-              - "Other"
-    - type: dropdown
-      id: database
-      attributes:
-          label: Database
-          description: |
-              Select Database engine serving Nextcloud Server.
-              _Describe in the "Additional info" section if you chose "Other"._
-          options:
-              - "MySQL"
-              - "MariaDB"
-              - "PostgreSQL"
-              - "SQLite"
-              - "Oracle"
-              - "Other"
-    - type: textarea
-      id: additional-info
-      attributes:
-          label: Additional info
-          description: Any additional information related to the issue (ex. browser console errors, software versions).
+- type: textarea
+  id: reproduce
+  attributes:
+      label: Steps to reproduce
+      description: |
+          Describe the steps to reproduce the bug.
+          The better your description is _(go 'here', click 'there'...)_ the fastest you'll get an _(accurate)_ answer.
+      value: |
+          1.
+          2.
+          3.
+  validations:
+      required: true
+- type: textarea
+  id: Expected-behavior
+  attributes:
+      label: Expected behavior
+      description: |
+          Tell us what should happen
+  validations:
+      required: true
+- type: textarea
+  id: actual-behavior
+  attributes:
+      label: Actual behavior
+      description: Tell us what happens instead
+  validations:
+      required: true
+- type: input
+  id: mail-app-version
+  attributes:
+      label: Mail app version
+      description: |
+          See apps admin page, e.g. 0.5.3
+- type: input
+  id: mail-server-service
+  attributes:
+      label: Mailserver or service
+      description: |
+          e.g. Outlook, Yahoo, Gmail, Exchange...
+- type: input
+  id: system
+  attributes:
+      label: Operating system
+      description: |
+          Write down the operating system where Nextcloud Mail app is installed.
+- type: dropdown
+  id: php
+  attributes:
+      label: PHP engine version
+      description: |
+          Select PHP engine version serving Nextcloud Server.
+          _Describe in the "Additional info" section if you chose "Other"._
+      options:
+          - "PHP 7.3"
+          - "PHP 7.4"
+          - "PHP 8.0"
+          - "PHP 8.1"
+          - "Other"
+- type: dropdown
+  id: webserver
+  attributes:
+      label: Web server
+      description: |
+          Select Webserver serving Nextcloud Server.
+          _Describe in the "Additional info" section if you chose "Other"._
+      options:
+          - "Apache (supported)"
+          - "Nginx"
+          - "Lighttpd"
+          - "Other"
+- type: dropdown
+  id: database
+  attributes:
+      label: Database
+      description: |
+          Select Database engine serving Nextcloud Server.
+          _Describe in the "Additional info" section if you chose "Other"._
+      options:
+          - "MySQL"
+          - "MariaDB"
+          - "PostgreSQL"
+          - "SQLite"
+          - "Oracle"
+          - "Other"
+- type: textarea
+  id: additional-info
+  attributes:
+      label: Additional info
+      description: Any additional information related to the issue (ex. browser console errors, software versions).
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 6c324f3d8..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: "\U0001F680 Feature Request"
-about: You have a neat idea that should be implemented?
-title: ''
-labels: enhancement, 0. to triage
-assignees: ''
-
----
-
-### Feature Request
-
-<!-- Fill in the relevant information below to help triage your issue. -->
-
-#### Summary
-
-<!-- Provide a summary of the feature you would like to see implemented. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..dc0b98d00
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,28 @@
+name: "Feature request"
+description: "You have a neat idea that should be implemented?"
+labels: ["enhancement", "0. to triage"]
+body:
+  - type: textarea
+    id: description-problem
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: |
+          A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  - type: textarea
+    id: description-solution
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+          A clear and concise description of what you want to happen.
+  - type: textarea
+    id: description-alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+          A clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+          Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml
index e4eb59e14..06945b83c 100644
--- a/.github/workflows/appstore-build-publish.yml
+++ b/.github/workflows/appstore-build-publish.yml
@@ -27,7 +27,7 @@ jobs:
           echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ${{ env.APP_NAME }}
 
@@ -51,7 +51,7 @@ jobs:
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
         # Skip if no package.json
         if: ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -107,7 +107,7 @@ jobs:
           unzip latest-$NCVERSION.zip
 
       - name: Checkout server master fallback
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         if: ${{ steps.server-checkout.outcome != 'success' }}
         with:
           repository: nextcloud/server
diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml
index 48ffcfd2a..6092cc3a5 100644
--- a/.github/workflows/fixup.yml
+++ b/.github/workflows/fixup.yml
@@ -1,13 +1,20 @@
-on: pull_request
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 
 name: Pull request checks
 
+on: pull_request
+
 jobs:
   commit-message-check:
     name: Block fixup and squash commits
+
     runs-on: ubuntu-latest
+
     steps:
       - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@main
+        uses: xt0rted/block-autosquash-commits-action@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b05fbb84a..4efa88ca0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Download schema
       run: wget https://apps.nextcloud.com/schema/apps/info.xsd
     - name: Lint info.xml
@@ -23,7 +23,7 @@ jobs:
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Set up php${{ matrix.php-versions }}
       uses: shivammathur/setup-php@master
       with:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Set up php
       uses: shivammathur/setup-php@master
       with:
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     name: ESLint
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: Set up Node
-      uses: actions/setup-node@v2.5.0
+      uses: actions/setup-node@v3
       with:
         node-version: 14.x
     - name: npm install
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index f7b46f281..b24b533b8 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -13,9 +13,9 @@ jobs:
     name: Build release tarball
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
       - name: Set up Node
-        uses: actions/setup-node@v2.5.0
+        uses: actions/setup-node@v3
         with:
           node-version: 14.x
       - name: Set up php$
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index c8c2862c4..fa865f8a5 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -16,7 +16,7 @@ jobs:
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout
-            uses: actions/checkout@master
+            uses: actions/checkout@v3
           - name: Set up php
             uses: shivammathur/setup-php@master
             with:
@@ -25,7 +25,11 @@ jobs:
                 coverage: none
           - name: Install dependencies
             run: composer i
-          - name: Install dependencies
+          - name: Install OCP package
+            if: ${{ matrix.ocp-version != 'dev-master' }}
             run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
+          - name: Install OCP package
+            if: ${{ matrix.ocp-version == 'dev-master' }}
+            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} --ignore-platform-reqs
           - name: Run coding standards check
             run: composer run psalm
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c65fae2f..61523b086 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
       working-directory: nextcloud/3rdparty
       run: composer require nikic/php-parser:4.10
     - name: Checkout Mail
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
       with:
         path: nextcloud/apps/mail
     - name: Install dependencies
@@ -116,7 +116,7 @@ jobs:
           - name: Install Nextcloud
             run: php -f nextcloud/occ maintenance:install --database-host 127.0.0.1 --database-name nextcloud --database-user nextcloud --database-pass nextcloud --admin-user admin --admin-pass admin --database ${{ matrix.db }}
           - name: Checkout Mail
-            uses: actions/checkout@master
+            uses: actions/checkout@v3
             with:
                 path: nextcloud/apps/mail
           - name: Install dependencies
@@ -128,6 +128,12 @@ jobs:
             run: |
                 php -f nextcloud/occ config:system:set debug --type bool --value true
                 php -f nextcloud/occ config:system:set app.mail.verify-tls-peer --type bool --value false
+          - name: Enable slow mysql query logs
+            if: ${{ matrix.db == 'mysql' }}
+            run: |
+              echo "SET GLOBAL log_queries_not_using_indexes = 1;" | mysql -h 127.0.0.1 -u root -pmy-secret-pw
+              echo "SET GLOBAL slow_query_log=1;" | mysql -h 127.0.0.1 -u root -pmy-secret-pw
+              echo "SET GLOBAL log_output = 'table';" | mysql -h 127.0.0.1 -u root -pmy-secret-pw
           - name: Run tests
             working-directory: nextcloud/apps/mail
             run: |
@@ -136,6 +142,9 @@ jobs:
                 composer run test:integration
             env:
                 XDEBUG_MODE: coverage
+          - name: Read slow queries
+            if: ${{ always() }}
+            run: echo "SELECT * FROM mysql.slow_log WHERE sql_text LIKE '%oc_mail%' AND sql_text NOT LIKE '%information_schema%'" | mysql -h 127.0.0.1 -u root -pmy-secret-pw
           - name: Print debug logs
             if: ${{ always() }}
             run: cat nextcloud/data/horde_*.log
@@ -150,9 +159,9 @@ jobs:
       runs-on: ubuntu-latest
       name: Front-end unit tests
       steps:
-          - uses: actions/checkout@master
+          - uses: actions/checkout@v3
           - name: Set up Node
-            uses: actions/setup-node@v2.5.0
+            uses: actions/setup-node@v3
             with:
                 node-version: 12.x
           - name: npm install
diff --git a/composer.json b/composer.json
index b0bf1e8b0..7dfd4cf52 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
 		"php": ">=7.3",
 		"arthurhoaro/favicon": "^1.2",
 		"bamarni/composer-bin-plugin": "^1.4",
-		"cerdic/css-tidy": "v2.0.0",
+		"cerdic/css-tidy": "v2.0.1",
 		"christophwurst/kitinerary": "^0.2",
 		"christophwurst/kitinerary-bin": "^0.2",
 		"christophwurst/kitinerary-flatpak": "^0.2",
@@ -42,7 +42,7 @@
 		"pear-pear.horde.org/horde_text_flowed": "^2.0.3@stable",
 		"pear-pear.horde.org/horde_util": "^2.5.8@stable",
 		"psr/log": "^1",
-		"rubix/ml": "0.4.1",
+		"rubix/ml": "0.4.2",
 		"sabberworm/php-css-parser": "^8.3",
 		"youthweb/urllinker": "^1.3"
 	},
diff --git a/composer.lock b/composer.lock
index eff53182c..bc368f52e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "644a61f389e95e8416af0e7f7badda5b",
+    "content-hash": "1d7e95275c7b85c9ba465ce894cb6f61",
     "packages": [
         {
             "name": "amphp/amp",
@@ -39,13 +39,13 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Amp\\": "lib"
-                },
                 "files": [
                     "lib/functions.php",
                     "lib/Internal/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\": "lib"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -123,12 +123,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
-                },
                 "files": [
                     "lib/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\ByteStream\\": "lib"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -192,14 +192,14 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Amp\\Parallel\\": "lib"
-                },
                 "files": [
                     "lib/Context/functions.php",
                     "lib/Sync/functions.php",
                     "lib/Worker/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\Parallel\\": "lib"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -309,12 +309,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Amp\\Process\\": "lib"
-                },
                 "files": [
                     "lib/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\Process\\": "lib"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -367,12 +367,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Amp\\Serialization\\": "src"
-                },
                 "files": [
                     "src/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\Serialization\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -423,13 +423,13 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Amp\\Sync\\": "src"
-                },
                 "files": [
                     "src/functions.php",
                     "src/ConcurrentIterator/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\Sync\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -517,16 +517,16 @@
         },
         {
             "name": "bamarni/composer-bin-plugin",
-            "version": "1.4.1",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bamarni/composer-bin-plugin.git",
-                "reference": "9329fb0fbe29e0e1b2db8f4639a193e4f5406225"
+                "reference": "49934ffea764864788334c1485fbb08a4b852031"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/9329fb0fbe29e0e1b2db8f4639a193e4f5406225",
-                "reference": "9329fb0fbe29e0e1b2db8f4639a193e4f5406225",
+                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/49934ffea764864788334c1485fbb08a4b852031",
+                "reference": "49934ffea764864788334c1485fbb08a4b852031",
                 "shasum": ""
             },
             "require": {
@@ -559,20 +559,20 @@
                 "isolation",
                 "tool"
             ],
-            "time": "2020-05-03T08:27:20+00:00"
+            "time": "2022-02-22T21:01:25+00:00"
         },
         {
             "name": "cerdic/css-tidy",
-            "version": "v2.0.0",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Cerdic/CSSTidy.git",
-                "reference": "3eaaedd862563bbaa8f85606cfda65c8f6ad513b"
+                "reference": "9efced88f9fc31ecbd52c798b6c01283966c0e48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Cerdic/CSSTidy/zipball/3eaaedd862563bbaa8f85606cfda65c8f6ad513b",
-                "reference": "3eaaedd862563bbaa8f85606cfda65c8f6ad513b",
+                "url": "https://api.github.com/repos/Cerdic/CSSTidy/zipball/9efced88f9fc31ecbd52c798b6c01283966c0e48",
+                "reference": "9efced88f9fc31ecbd52c798b6c01283966c0e48",
                 "shasum": ""
             },
             "require": {
@@ -604,7 +604,7 @@
                 }
             ],
             "description": "CSSTidy is a CSS minifier",
-            "time": "2022-01-10T15:58:08+00:00"
+            "time": "2022-02-21T15:33:09+00:00"
         },
         {
             "name": "christophwurst/kitinerary",
@@ -776,12 +776,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "HTMLPurifier": "library/"
-                },
                 "files": [
                     "library/HTMLPurifier.composer.php"
                 ],
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
                 "exclude-from-classmap": [
                     "/library/HTMLPurifier/Language/"
                 ]
@@ -1695,16 +1695,16 @@
         },
         {
             "name": "rubix/ml",
-            "version": "0.4.1",
+            "version": "0.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/RubixML/ML.git",
-                "reference": "d34f8aedce1228a8c9eccc52075a06430e2de92b"
+                "reference": "51f6f02f3d719b8f1c8641ff10accd9339fe691e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/RubixML/ML/zipball/d34f8aedce1228a8c9eccc52075a06430e2de92b",
-                "reference": "d34f8aedce1228a8c9eccc52075a06430e2de92b",
+                "url": "https://api.github.com/repos/RubixML/ML/zipball/51f6f02f3d719b8f1c8641ff10accd9339fe691e",
+                "reference": "51f6f02f3d719b8f1c8641ff10accd9339fe691e",
                 "shasum": ""
             },
             "require": {
@@ -1738,13 +1738,13 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Rubix\\ML\\": "src/"
-                },
                 "files": [
                     "src/constants.php",
                     "src/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Rubix\\ML\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1753,8 +1753,9 @@
             "authors": [
                 {
                     "name": "Andrew DalPino",
+                    "email": "support@andrewdalpino.com",
                     "homepage": "https://github.com/andrewdalpino",
-                    "role": "Lead Engineer"
+                    "role": "Project Lead"
                 },
                 {
                     "name": "Contributors",
@@ -1849,7 +1850,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-28T01:48:47+00:00"
+            "time": "2022-02-12T00:57:06+00:00"
         },
         {
             "name": "rubix/tensor",
@@ -1879,14 +1880,14 @@
             },
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/constants.php"
+                ],
                 "psr-4": {
-                    "Tensor\\": "src/",
                     "JAMA\\": "lib/JAMA",
+                    "Tensor\\": "src/",
                     "Zephir\\Optimizers\\FunctionCall\\": "optimizers/"
-                },
-                "files": [
-                    "src/constants.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2004,7 +2005,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -2036,12 +2037,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2110,12 +2111,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2160,16 +2161,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
                 "shasum": ""
             },
             "require": {
@@ -2186,12 +2187,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2236,7 +2237,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-03-04T08:16:47+00:00"
         },
         {
             "name": "youthweb/urllinker",
diff --git a/l10n/bg.js b/l10n/bg.js
index 61dfe76e5..2998dc40f 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -116,21 +116,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "Няма съобщения в тази пощенска кутия",
     "No messages" : "Няма съобщения.",
     "Draft: " : "Чернова: ",
-    "Mark unimportant" : "Маркиране като маловажно",
-    "Mark important" : "Маркиране като важно",
-    "Mark unfavorite" : "Маркиране като непредпочитано",
-    "Mark favorite" : "Маркиране като любими",
-    "Mark unread" : "Маркирай като непрочетено",
-    "Mark read" : "Маркирай като прочетено",
     "Mark not spam" : "Маркиране, че не е спам",
     "Mark as spam" : "Маркира като спам",
     "Unselect" : "Размаркирай",
     "Select" : "Избери",
     "Edit tags" : "Редактиране на етикетите",
     "Move thread" : "Преместване на нишката",
-    "Create event" : "Създаване на събитие",
-    "Edit as new message" : "Редактиране като ново съобщение",
     "Delete thread" : "Изтриване на нишката",
+    "Edit as new message" : "Редактиране като ново съобщение",
+    "Create event" : "Създаване на събитие",
     "Blind copy recipients only" : "Само получателите на слепи копия",
     "No trash mailbox configured" : "Няма конфигурирана пощенска кутия за боклук",
     "Could not delete message" : "Съобщението не може да бъде изтрито",
@@ -168,9 +162,9 @@ OC.L10N.register(
     "Reply to sender only" : "Отговор само на подателя",
     "Forward" : "Напред",
     "Move message" : "Преместване на съобщението",
+    "Delete message" : "Изтриване на съобщението",
     "View source" : "Преглед на източника",
     "Download thread data for debugging" : "Изтегля данните за нишките за отстраняване на грешки",
-    "Delete message" : "Изтриване на съобщението",
     "Message source" : "Източник на съобщение",
     "Message body" : "Тяло на съобщението",
     "Import into calendar" : "Импортиране в календар",
diff --git a/l10n/bg.json b/l10n/bg.json
index 9c8add13f..982f64426 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -114,21 +114,15 @@
     "No messages in this mailbox" : "Няма съобщения в тази пощенска кутия",
     "No messages" : "Няма съобщения.",
     "Draft: " : "Чернова: ",
-    "Mark unimportant" : "Маркиране като маловажно",
-    "Mark important" : "Маркиране като важно",
-    "Mark unfavorite" : "Маркиране като непредпочитано",
-    "Mark favorite" : "Маркиране като любими",
-    "Mark unread" : "Маркирай като непрочетено",
-    "Mark read" : "Маркирай като прочетено",
     "Mark not spam" : "Маркиране, че не е спам",
     "Mark as spam" : "Маркира като спам",
     "Unselect" : "Размаркирай",
     "Select" : "Избери",
     "Edit tags" : "Редактиране на етикетите",
     "Move thread" : "Преместване на нишката",
-    "Create event" : "Създаване на събитие",
-    "Edit as new message" : "Редактиране като ново съобщение",
     "Delete thread" : "Изтриване на нишката",
+    "Edit as new message" : "Редактиране като ново съобщение",
+    "Create event" : "Създаване на събитие",
     "Blind copy recipients only" : "Само получателите на слепи копия",
     "No trash mailbox configured" : "Няма конфигурирана пощенска кутия за боклук",
     "Could not delete message" : "Съобщението не може да бъде изтрито",
@@ -166,9 +160,9 @@
     "Reply to sender only" : "Отговор само на подателя",
     "Forward" : "Напред",
     "Move message" : "Преместване на съобщението",
+    "Delete message" : "Изтриване на съобщението",
     "View source" : "Преглед на източника",
     "Download thread data for debugging" : "Изтегля данните за нишките за отстраняване на грешки",
-    "Delete message" : "Изтриване на съобщението",
     "Message source" : "Източник на съобщение",
     "Message body" : "Тяло на съобщението",
     "Import into calendar" : "Импортиране в календар",
diff --git a/l10n/ca.js b/l10n/ca.js
index a3fdc9239..70ce7b63a 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -83,12 +83,6 @@ OC.L10N.register(
     "Rich text" : "Text enriquit",
     "No messages" : "No hi ha missatges",
     "Draft: " : "Esborrany: ",
-    "Mark unimportant" : "Marca com a no important",
-    "Mark important" : "Marca com a important",
-    "Mark unfavorite" : "Marca no preferit",
-    "Mark favorite" : "Marca preferit",
-    "Mark unread" : "Marca com a no llegit",
-    "Mark read" : "Marca com a llegit",
     "Mark not spam" : "Marca com a no spam",
     "Mark as spam" : "Marca com a spam",
     "Unselect" : "No seleccionis",
@@ -147,6 +141,8 @@ OC.L10N.register(
     "Could not load your draft" : "No s’ha pogut carregar el vostre esborrany",
     "Could not load original message" : "No s'ha pogut carregar el missatge original",
     "No message selected" : "No s'ha seleccionat cap missatge",
+    "Disabled" : "Inhabilitat",
+    "Enabled" : "Habilitat",
     "Signature …" : "Signatura …",
     "Save signature" : "Desa la signatura",
     "Delete" : "Suprimeix",
diff --git a/l10n/ca.json b/l10n/ca.json
index 16d6ff53e..63042c659 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -81,12 +81,6 @@
     "Rich text" : "Text enriquit",
     "No messages" : "No hi ha missatges",
     "Draft: " : "Esborrany: ",
-    "Mark unimportant" : "Marca com a no important",
-    "Mark important" : "Marca com a important",
-    "Mark unfavorite" : "Marca no preferit",
-    "Mark favorite" : "Marca preferit",
-    "Mark unread" : "Marca com a no llegit",
-    "Mark read" : "Marca com a llegit",
     "Mark not spam" : "Marca com a no spam",
     "Mark as spam" : "Marca com a spam",
     "Unselect" : "No seleccionis",
@@ -145,6 +139,8 @@
     "Could not load your draft" : "No s’ha pogut carregar el vostre esborrany",
     "Could not load original message" : "No s'ha pogut carregar el missatge original",
     "No message selected" : "No s'ha seleccionat cap missatge",
+    "Disabled" : "Inhabilitat",
+    "Enabled" : "Habilitat",
     "Signature …" : "Signatura …",
     "Save signature" : "Desa la signatura",
     "Delete" : "Suprimeix",
diff --git a/l10n/cs.js b/l10n/cs.js
index a443d846b..bbb1ee6a3 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "V této schránce nejsou žádné zprávy",
     "No messages" : "Žádné zprávy",
     "Draft: " : "Koncept:",
-    "Mark unimportant" : "Označit jako nedůležité",
-    "Mark important" : "Označit jako důležité",
-    "Mark unfavorite" : "Zrušit označení jako oblíbeného",
-    "Mark favorite" : "Označit jako oblíbené",
-    "Mark unread" : "Označit jako nepřečtené",
-    "Mark read" : "Označit jako přečtené",
+    "Unfavorite" : "Odebrat z oblíbených",
+    "Favorite" : "Přidat do oblíbených",
+    "Unread" : "Nastavit jako nepřečtené",
+    "Read" : "Nastavit jako přečtené",
+    "Unimportant" : "Označit jako nedůležité",
     "Mark not spam" : "Zrušit označení jako spam",
     "Mark as spam" : "Označit jako spam",
     "Unselect" : "Zrušit výběr",
     "Select" : "Vybrat",
     "Edit tags" : "Upravit štítky",
     "Move thread" : "Přesunout vlákno",
-    "Create event" : "Vytvořit událost",
-    "Edit as new message" : "Upravit jako novou zprávu",
+    "More actions" : "Další akce",
     "Delete thread" : "Smazat vlákno",
+    "Edit as new message" : "Upravit jako novou zprávu",
+    "Create event" : "Vytvořit událost",
     "Blind copy recipients only" : "Pouze příjemci skryté kopie",
     "No trash mailbox configured" : "Není nastavena žádná složka pro Koš",
     "Could not delete message" : "Zprávu se nedaří smazat",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "Odpovědět pouze odesílateli",
     "Forward" : "Přeposlat",
     "Move message" : "Přesunout zprávu",
+    "Delete message" : "Smazat zprávu",
     "View source" : "Zobrazit zdroj",
     "Download thread data for debugging" : "Stáhnout si data vlákna pro účely ladění",
-    "Delete message" : "Smazat zprávu",
     "Message source" : "Zdrojový kód správy",
     "Message body" : "Tělo zprávy",
     "Import into calendar" : "Importovat do kalendáře",
diff --git a/l10n/cs.json b/l10n/cs.json
index adc792eff..71b48a8d3 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "V této schránce nejsou žádné zprávy",
     "No messages" : "Žádné zprávy",
     "Draft: " : "Koncept:",
-    "Mark unimportant" : "Označit jako nedůležité",
-    "Mark important" : "Označit jako důležité",
-    "Mark unfavorite" : "Zrušit označení jako oblíbeného",
-    "Mark favorite" : "Označit jako oblíbené",
-    "Mark unread" : "Označit jako nepřečtené",
-    "Mark read" : "Označit jako přečtené",
+    "Unfavorite" : "Odebrat z oblíbených",
+    "Favorite" : "Přidat do oblíbených",
+    "Unread" : "Nastavit jako nepřečtené",
+    "Read" : "Nastavit jako přečtené",
+    "Unimportant" : "Označit jako nedůležité",
     "Mark not spam" : "Zrušit označení jako spam",
     "Mark as spam" : "Označit jako spam",
     "Unselect" : "Zrušit výběr",
     "Select" : "Vybrat",
     "Edit tags" : "Upravit štítky",
     "Move thread" : "Přesunout vlákno",
-    "Create event" : "Vytvořit událost",
-    "Edit as new message" : "Upravit jako novou zprávu",
+    "More actions" : "Další akce",
     "Delete thread" : "Smazat vlákno",
+    "Edit as new message" : "Upravit jako novou zprávu",
+    "Create event" : "Vytvořit událost",
     "Blind copy recipients only" : "Pouze příjemci skryté kopie",
     "No trash mailbox configured" : "Není nastavena žádná složka pro Koš",
     "Could not delete message" : "Zprávu se nedaří smazat",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "Odpovědět pouze odesílateli",
     "Forward" : "Přeposlat",
     "Move message" : "Přesunout zprávu",
+    "Delete message" : "Smazat zprávu",
     "View source" : "Zobrazit zdroj",
     "Download thread data for debugging" : "Stáhnout si data vlákna pro účely ladění",
-    "Delete message" : "Smazat zprávu",
     "Message source" : "Zdrojový kód správy",
     "Message body" : "Tělo zprávy",
     "Import into calendar" : "Importovat do kalendáře",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index 27172fb35..a388fcc83 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -48,8 +48,6 @@ OC.L10N.register(
     "Uploading {percent}% …" : "Llwytho {percent}% ...",
     "Choose a file to add as attachment" : "Dewiswch ffeil i'w hychwanegu fel atodiad",
     "Draft: " : "Drafft:",
-    "Mark unread" : "Nodi heb ei ddarllen",
-    "Mark read" : "Marcio wedi'i ddarllen",
     "Select" : "Select",
     "Report this bug" : "Cofnodi'r gwall",
     "Choose" : "Dewisa",
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index a10a16962..f182ee27b 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -46,8 +46,6 @@
     "Uploading {percent}% …" : "Llwytho {percent}% ...",
     "Choose a file to add as attachment" : "Dewiswch ffeil i'w hychwanegu fel atodiad",
     "Draft: " : "Drafft:",
-    "Mark unread" : "Nodi heb ei ddarllen",
-    "Mark read" : "Marcio wedi'i ddarllen",
     "Select" : "Select",
     "Report this bug" : "Cofnodi'r gwall",
     "Choose" : "Dewisa",
diff --git a/l10n/da.js b/l10n/da.js
index af0e32550..2acfd43b4 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -105,12 +105,6 @@ OC.L10N.register(
     "No messages in this mailbox" : "Ingen beskeder i denne postkasse",
     "No messages" : "Ingen beskeder",
     "Draft: " : "Kladde:",
-    "Mark unimportant" : "Marker ikke vigtig",
-    "Mark important" : "Marker som vigtig",
-    "Mark unfavorite" : "Marker ikke favorit",
-    "Mark favorite" : "Marker som favorit",
-    "Mark unread" : "Marker som ulæst",
-    "Mark read" : "Marker som læst",
     "Unselect" : "Fravælg",
     "Select" : "Vælg",
     "Choose" : "Vælg",
diff --git a/l10n/da.json b/l10n/da.json
index 99b3d5840..1832e6f00 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -103,12 +103,6 @@
     "No messages in this mailbox" : "Ingen beskeder i denne postkasse",
     "No messages" : "Ingen beskeder",
     "Draft: " : "Kladde:",
-    "Mark unimportant" : "Marker ikke vigtig",
-    "Mark important" : "Marker som vigtig",
-    "Mark unfavorite" : "Marker ikke favorit",
-    "Mark favorite" : "Marker som favorit",
-    "Mark unread" : "Marker som ulæst",
-    "Mark read" : "Marker som læst",
     "Unselect" : "Fravælg",
     "Select" : "Vælg",
     "Choose" : "Vælg",
diff --git a/l10n/de.js b/l10n/de.js
index eea1486bf..bbaf45b44 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
     "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
-    "Mark unimportant" : "Als unwichtig markieren",
-    "Mark important" : "Als wichtig markieren",
-    "Mark unfavorite" : "Als nicht favorisiert markieren",
-    "Mark favorite" : "Als favorisiert markieren",
-    "Mark unread" : "Als ungelesen markieren",
-    "Mark read" : "Als gelesen markieren",
+    "Unfavorite" : "Von Favoriten entfernen",
+    "Favorite" : "Zu Favoriten hinzufügen",
+    "Unread" : "Ungelesen",
+    "Read" : "Gelesen",
+    "Unimportant" : "Unwichtig",
     "Mark not spam" : "Als „Kein Spam“ markieren",
     "Mark as spam" : "Als Spam markieren",
     "Unselect" : "Abwählen",
     "Select" : "Auswählen",
     "Edit tags" : "Schlagworte bearbeiten",
     "Move thread" : "Unterhaltung verschieben",
-    "Create event" : "Termin erstellen",
-    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "More actions" : "Weitere Aktionen",
     "Delete thread" : "Unterhaltung löschen",
+    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "Create event" : "Termin erstellen",
     "Blind copy recipients only" : "Nur BCC-Empfänger",
     "No trash mailbox configured" : "Kein Papierkorb-Postfach konfiguriert",
     "Could not delete message" : "Nachricht konnte nicht gelöscht werden",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "Nur dem Absender antworten",
     "Forward" : "Weiterleiten",
     "Move message" : "Nachricht verschieben",
+    "Delete message" : "Nachricht löschen",
     "View source" : "Quelle ansehen",
     "Download thread data for debugging" : "Thread-Daten zum Debuggen herunterladen",
-    "Delete message" : "Nachricht löschen",
     "Message source" : "Nachrichtenquelle",
     "Message body" : "Nachrichtentext",
     "Import into calendar" : "In Kalender importieren",
@@ -312,6 +312,8 @@ OC.L10N.register(
     "Add the email address of your anti spam report service here." : "Füge hier die E-Mail-Adresse Deines Anti-Spam-Dienstes hinzu.",
     "When using this setting, a report email will be sent to the SPAM report server when a user clicks \"Mark as spam\"." : "Bei Verwendung dieser Einstellung wird eine Berichts-E-Mail an den SPAM-Berichtsserver gesendet, sobald ein Benutzer auf \"Als Spam markieren\" klickt.",
     "The original message will be attached as a \"message/rfc822\" attachment." : "Die Originalnachricht wird als \"message/rfc822\"-Anhang angehängt.",
+    "\"Mark as Spam\" Email Address" : "\"Als Spam markieren\" E-Mail-Adresse",
+    "\"Mark Not Junk\" Email Address" : "\"Nicht als Junk markieren\" E-Mail-Adresse",
     "Reset" : "Zurücksetzen",
     "Successfully set up anti spam email addresses" : "Erfolgreich Anti-Spam-E-Mail-Adressen eingerichtet",
     "Error saving anti spam email addresses" : "Fehler beim Speichern der Anti-Spam-E-Mail-Adressen",
diff --git a/l10n/de.json b/l10n/de.json
index 38b9fab9f..d17aab884 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
     "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
-    "Mark unimportant" : "Als unwichtig markieren",
-    "Mark important" : "Als wichtig markieren",
-    "Mark unfavorite" : "Als nicht favorisiert markieren",
-    "Mark favorite" : "Als favorisiert markieren",
-    "Mark unread" : "Als ungelesen markieren",
-    "Mark read" : "Als gelesen markieren",
+    "Unfavorite" : "Von Favoriten entfernen",
+    "Favorite" : "Zu Favoriten hinzufügen",
+    "Unread" : "Ungelesen",
+    "Read" : "Gelesen",
+    "Unimportant" : "Unwichtig",
     "Mark not spam" : "Als „Kein Spam“ markieren",
     "Mark as spam" : "Als Spam markieren",
     "Unselect" : "Abwählen",
     "Select" : "Auswählen",
     "Edit tags" : "Schlagworte bearbeiten",
     "Move thread" : "Unterhaltung verschieben",
-    "Create event" : "Termin erstellen",
-    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "More actions" : "Weitere Aktionen",
     "Delete thread" : "Unterhaltung löschen",
+    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "Create event" : "Termin erstellen",
     "Blind copy recipients only" : "Nur BCC-Empfänger",
     "No trash mailbox configured" : "Kein Papierkorb-Postfach konfiguriert",
     "Could not delete message" : "Nachricht konnte nicht gelöscht werden",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "Nur dem Absender antworten",
     "Forward" : "Weiterleiten",
     "Move message" : "Nachricht verschieben",
+    "Delete message" : "Nachricht löschen",
     "View source" : "Quelle ansehen",
     "Download thread data for debugging" : "Thread-Daten zum Debuggen herunterladen",
-    "Delete message" : "Nachricht löschen",
     "Message source" : "Nachrichtenquelle",
     "Message body" : "Nachrichtentext",
     "Import into calendar" : "In Kalender importieren",
@@ -310,6 +310,8 @@
     "Add the email address of your anti spam report service here." : "Füge hier die E-Mail-Adresse Deines Anti-Spam-Dienstes hinzu.",
     "When using this setting, a report email will be sent to the SPAM report server when a user clicks \"Mark as spam\"." : "Bei Verwendung dieser Einstellung wird eine Berichts-E-Mail an den SPAM-Berichtsserver gesendet, sobald ein Benutzer auf \"Als Spam markieren\" klickt.",
     "The original message will be attached as a \"message/rfc822\" attachment." : "Die Originalnachricht wird als \"message/rfc822\"-Anhang angehängt.",
+    "\"Mark as Spam\" Email Address" : "\"Als Spam markieren\" E-Mail-Adresse",
+    "\"Mark Not Junk\" Email Address" : "\"Nicht als Junk markieren\" E-Mail-Adresse",
     "Reset" : "Zurücksetzen",
     "Successfully set up anti spam email addresses" : "Erfolgreich Anti-Spam-E-Mail-Adressen eingerichtet",
     "Error saving anti spam email addresses" : "Fehler beim Speichern der Anti-Spam-E-Mail-Adressen",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index fa91d2f77..b9a1410fd 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
     "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
-    "Mark unimportant" : "Als unwichtig markieren",
-    "Mark important" : "Als wichtig markieren",
-    "Mark unfavorite" : "Als nicht favorisiert markieren",
-    "Mark favorite" : "Als favorisiert markieren",
-    "Mark unread" : "Als ungelesen markieren",
-    "Mark read" : "Als gelesen markieren",
+    "Unfavorite" : "Nicht favorisieren",
+    "Favorite" : "Favorisieren",
+    "Unread" : "Ungelesen",
+    "Read" : "Gelesen",
+    "Unimportant" : "Unwichtig",
     "Mark not spam" : "Als „Kein Spam“ markieren",
     "Mark as spam" : "Als Spam markieren",
     "Unselect" : "Abwählen",
     "Select" : "Auswählen",
     "Edit tags" : "Schlagworte bearbeiten",
     "Move thread" : "Unterhaltung verschieben",
-    "Create event" : "Termin erstellen",
-    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "More actions" : "Weitere Aktionen",
     "Delete thread" : "Unterhaltung löschen",
+    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "Create event" : "Termin erstellen",
     "Blind copy recipients only" : "Nur Bcc-Empfänger",
     "No trash mailbox configured" : "Kein Papierkorb-Postfach konfiguriert",
     "Could not delete message" : "Nachricht konnte nicht gelöscht werden",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "Nur dem Absender antworten",
     "Forward" : "Weiterleiten",
     "Move message" : "Nachricht verschieben",
+    "Delete message" : "Nachricht löschen",
     "View source" : "Quelle ansehen",
     "Download thread data for debugging" : "Thread-Daten zum Debuggen herunterladen",
-    "Delete message" : "Nachricht löschen",
     "Message source" : "Nachrichtenquelle",
     "Message body" : "Nachrichtentext",
     "Import into calendar" : "In Kalender importieren",
@@ -266,8 +266,8 @@ OC.L10N.register(
     "Unset" : "Entfernt",
     "Add tag" : "Schlagwort hinzufügen",
     "Saving tag …" : "Speichere Schlagwort …",
-    "An error occurred, unable to create the tag." : "Ein Fehler ist aufgetreten, das Schlagwort kann nicht erstellt werden.",
-    "An error occurred, unable to rename the tag." : "Ein Fehler ist aufgetreten. Das Schlagwort konnte nicht umbenannt werden.",
+    "An error occurred, unable to create the tag." : "Es ist ein Fehler aufgetreten, das Schlagwort kann nicht erstellt werden.",
+    "An error occurred, unable to rename the tag." : "Es ist ein Fehler aufgetreten. Das Schlagwort konnte nicht umbenannt werden.",
     "Could not load your message thread" : "Nachrichtenverlauf konnte nicht geöffnet werden",
     "Remove" : "Entfernen",
     "No senders are trusted at the moment." : "Derzeit sind keine Absender vertrauenswürdig.",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 252460232..35ceaa3fc 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "Keine Nachrichten in diesem Postfach",
     "No messages" : "Keine Nachrichten",
     "Draft: " : "Entwurf:",
-    "Mark unimportant" : "Als unwichtig markieren",
-    "Mark important" : "Als wichtig markieren",
-    "Mark unfavorite" : "Als nicht favorisiert markieren",
-    "Mark favorite" : "Als favorisiert markieren",
-    "Mark unread" : "Als ungelesen markieren",
-    "Mark read" : "Als gelesen markieren",
+    "Unfavorite" : "Nicht favorisieren",
+    "Favorite" : "Favorisieren",
+    "Unread" : "Ungelesen",
+    "Read" : "Gelesen",
+    "Unimportant" : "Unwichtig",
     "Mark not spam" : "Als „Kein Spam“ markieren",
     "Mark as spam" : "Als Spam markieren",
     "Unselect" : "Abwählen",
     "Select" : "Auswählen",
     "Edit tags" : "Schlagworte bearbeiten",
     "Move thread" : "Unterhaltung verschieben",
-    "Create event" : "Termin erstellen",
-    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "More actions" : "Weitere Aktionen",
     "Delete thread" : "Unterhaltung löschen",
+    "Edit as new message" : "Als neue Nachricht bearbeiten",
+    "Create event" : "Termin erstellen",
     "Blind copy recipients only" : "Nur Bcc-Empfänger",
     "No trash mailbox configured" : "Kein Papierkorb-Postfach konfiguriert",
     "Could not delete message" : "Nachricht konnte nicht gelöscht werden",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "Nur dem Absender antworten",
     "Forward" : "Weiterleiten",
     "Move message" : "Nachricht verschieben",
+    "Delete message" : "Nachricht löschen",
     "View source" : "Quelle ansehen",
     "Download thread data for debugging" : "Thread-Daten zum Debuggen herunterladen",
-    "Delete message" : "Nachricht löschen",
     "Message source" : "Nachrichtenquelle",
     "Message body" : "Nachrichtentext",
     "Import into calendar" : "In Kalender importieren",
@@ -264,8 +264,8 @@
     "Unset" : "Entfernt",
     "Add tag" : "Schlagwort hinzufügen",
     "Saving tag …" : "Speichere Schlagwort …",
-    "An error occurred, unable to create the tag." : "Ein Fehler ist aufgetreten, das Schlagwort kann nicht erstellt werden.",
-    "An error occurred, unable to rename the tag." : "Ein Fehler ist aufgetreten. Das Schlagwort konnte nicht umbenannt werden.",
+    "An error occurred, unable to create the tag." : "Es ist ein Fehler aufgetreten, das Schlagwort kann nicht erstellt werden.",
+    "An error occurred, unable to rename the tag." : "Es ist ein Fehler aufgetreten. Das Schlagwort konnte nicht umbenannt werden.",
     "Could not load your message thread" : "Nachrichtenverlauf konnte nicht geöffnet werden",
     "Remove" : "Entfernen",
     "No senders are trusted at the moment." : "Derzeit sind keine Absender vertrauenswürdig.",
diff --git a/l10n/el.js b/l10n/el.js
index a79b42cb0..582aed581 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -96,12 +96,6 @@ OC.L10N.register(
     "No messages in this mailbox" : "Δεν υπάρχουν μηνύματα σε αυτό το γραμματοκιβώτιο.",
     "No messages" : "Κανένα μήνυμα",
     "Draft: " : "Πρόχειρο:",
-    "Mark unimportant" : "Επισήμανση ασήμαντων",
-    "Mark important" : "Επισήμανση σημαντικών",
-    "Mark unfavorite" : "Επισήμανση μη αγαπημένου",
-    "Mark favorite" : "Επισήμανση αγαπημένου",
-    "Mark unread" : "σημειώστε ως μη αναγνωσμένο",
-    "Mark read" : "Σημείωση ως ανεγνωσμένου",
     "Mark not spam" : "Σήμανση ως μη ανεπιθύμητο",
     "Mark as spam" : "Σήμανση ως ανεπιθύμητο",
     "Unselect" : "Αναίρεση επιλογής",
diff --git a/l10n/el.json b/l10n/el.json
index 501895b24..ca51dfb94 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -94,12 +94,6 @@
     "No messages in this mailbox" : "Δεν υπάρχουν μηνύματα σε αυτό το γραμματοκιβώτιο.",
     "No messages" : "Κανένα μήνυμα",
     "Draft: " : "Πρόχειρο:",
-    "Mark unimportant" : "Επισήμανση ασήμαντων",
-    "Mark important" : "Επισήμανση σημαντικών",
-    "Mark unfavorite" : "Επισήμανση μη αγαπημένου",
-    "Mark favorite" : "Επισήμανση αγαπημένου",
-    "Mark unread" : "σημειώστε ως μη αναγνωσμένο",
-    "Mark read" : "Σημείωση ως ανεγνωσμένου",
     "Mark not spam" : "Σήμανση ως μη ανεπιθύμητο",
     "Mark as spam" : "Σήμανση ως ανεπιθύμητο",
     "Unselect" : "Αναίρεση επιλογής",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 69bd02ae8..142ff6812 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -36,7 +36,6 @@ OC.L10N.register(
     "Message sent!" : "Message sent!",
     "Send" : "Send",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
-    "Mark read" : "Mark read",
     "Unselect" : "Unselect",
     "Select" : "Select",
     "Choose" : "Choose",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 4e2301dff..a64de1ecd 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -34,7 +34,6 @@
     "Message sent!" : "Message sent!",
     "Send" : "Send",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
-    "Mark read" : "Mark read",
     "Unselect" : "Unselect",
     "Select" : "Select",
     "Choose" : "Choose",
diff --git a/l10n/eo.js b/l10n/eo.js
index da553716f..087d0e59c 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -67,8 +67,6 @@ OC.L10N.register(
     "Choose a file to add as attachment" : "Elektu dosieron aldonotan kiel kunsendaĵon",
     "Plain text" : "Ebenaĵa teksto",
     "Draft: " : "Malneto:",
-    "Mark unread" : "Marki kiel nelegita",
-    "Mark read" : "Marki kiel legita",
     "Unselect" : "Malelekti",
     "Select" : "Elekti",
     "Blind copy recipients only" : "Nur blindkopiaj ricevontoj",
diff --git a/l10n/eo.json b/l10n/eo.json
index 878e81a61..5917901a4 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -65,8 +65,6 @@
     "Choose a file to add as attachment" : "Elektu dosieron aldonotan kiel kunsendaĵon",
     "Plain text" : "Ebenaĵa teksto",
     "Draft: " : "Malneto:",
-    "Mark unread" : "Marki kiel nelegita",
-    "Mark read" : "Marki kiel legita",
     "Unselect" : "Malelekti",
     "Select" : "Elekti",
     "Blind copy recipients only" : "Nur blindkopiaj ricevontoj",
diff --git a/l10n/es.js b/l10n/es.js
index 026017d2b..d7c09e3eb 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "No hay mensajes en esta bandeja",
     "No messages" : "No hay mensajes",
     "Draft: " : "Borrador:",
-    "Mark unimportant" : "Marcar como no importante",
-    "Mark important" : "Marcar como importante",
-    "Mark unfavorite" : "Marcar como no favorito",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como no leído",
-    "Mark read" : "Marcar como leído",
     "Mark not spam" : "Marcar como correo deseado",
     "Mark as spam" : "Marcar como correo no deseado",
     "Unselect" : "Deseleccionar",
     "Select" : "Seleccionar",
     "Edit tags" : "Editar etiquetas",
     "Move thread" : "Mover hilo",
-    "Create event" : "Crear un evento",
-    "Edit as new message" : "Editar como nuevo mensaje",
     "Delete thread" : "Borrar hilo",
+    "Edit as new message" : "Editar como nuevo mensaje",
+    "Create event" : "Crear un evento",
     "Blind copy recipients only" : "Sólo a destinatarios con copia oculta (CCO)",
     "No trash mailbox configured" : "No hay configurada una bandeja de papelera",
     "Could not delete message" : "No se pudo eliminar el mensaje",
@@ -173,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "Responder sólo al remitente",
     "Forward" : "Reenviar",
     "Move message" : "Mover mensaje",
+    "Delete message" : "Borrar mensaje",
     "View source" : "Ver fuente",
     "Download thread data for debugging" : "Descarga los datos del hilo para depuración",
-    "Delete message" : "Borrar mensaje",
     "Message source" : "Origen del mensaje",
     "Message body" : "Cuerpo del mensaje",
     "Import into calendar" : "Importar al calendario",
@@ -239,6 +233,7 @@ OC.L10N.register(
     "Contacts with this address" : "Contactos con esta dirección",
     "Add to Contact" : "Añadir a Contacto",
     "New Contact" : "Nuevo Contacto",
+    "Copy to clipboard" : "Copiar al portapapeles",
     "Contact name …" : "Nombre del contacto …",
     "Add" : "Añadir",
     "Disabled" : "Desactivado",
diff --git a/l10n/es.json b/l10n/es.json
index c7304f826..e751966f6 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "No hay mensajes en esta bandeja",
     "No messages" : "No hay mensajes",
     "Draft: " : "Borrador:",
-    "Mark unimportant" : "Marcar como no importante",
-    "Mark important" : "Marcar como importante",
-    "Mark unfavorite" : "Marcar como no favorito",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como no leído",
-    "Mark read" : "Marcar como leído",
     "Mark not spam" : "Marcar como correo deseado",
     "Mark as spam" : "Marcar como correo no deseado",
     "Unselect" : "Deseleccionar",
     "Select" : "Seleccionar",
     "Edit tags" : "Editar etiquetas",
     "Move thread" : "Mover hilo",
-    "Create event" : "Crear un evento",
-    "Edit as new message" : "Editar como nuevo mensaje",
     "Delete thread" : "Borrar hilo",
+    "Edit as new message" : "Editar como nuevo mensaje",
+    "Create event" : "Crear un evento",
     "Blind copy recipients only" : "Sólo a destinatarios con copia oculta (CCO)",
     "No trash mailbox configured" : "No hay configurada una bandeja de papelera",
     "Could not delete message" : "No se pudo eliminar el mensaje",
@@ -171,9 +165,9 @@
     "Reply to sender only" : "Responder sólo al remitente",
     "Forward" : "Reenviar",
     "Move message" : "Mover mensaje",
+    "Delete message" : "Borrar mensaje",
     "View source" : "Ver fuente",
     "Download thread data for debugging" : "Descarga los datos del hilo para depuración",
-    "Delete message" : "Borrar mensaje",
     "Message source" : "Origen del mensaje",
     "Message body" : "Cuerpo del mensaje",
     "Import into calendar" : "Importar al calendario",
@@ -237,6 +231,7 @@
     "Contacts with this address" : "Contactos con esta dirección",
     "Add to Contact" : "Añadir a Contacto",
     "New Contact" : "Nuevo Contacto",
+    "Copy to clipboard" : "Copiar al portapapeles",
     "Contact name …" : "Nombre del contacto …",
     "Add" : "Añadir",
     "Disabled" : "Desactivado",
diff --git a/l10n/es_419.js b/l10n/es_419.js
index 20a119f7c..b8207194b 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_419.json b/l10n/es_419.json
index 1db1ebbcc..b0fb2aaa7 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index 248e51447..0ce72f3ba 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Seleccione el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Elige",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index 5d260dc75..9052d0152 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Seleccione el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Elige",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index ea107c9ee..c4d75a313 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index 87f870e77..1e6249728 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index 7229a9df7..72443f73d 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index bf1452952..10f7d9484 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index ea107c9ee..c4d75a313 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 87f870e77..1e6249728 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index ea107c9ee..c4d75a313 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 87f870e77..1e6249728 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index ea107c9ee..c4d75a313 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index 87f870e77..1e6249728 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 7229a9df7..72443f73d 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index bf1452952..10f7d9484 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index be4dc11b4..538331ee1 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index ba4d3b803..99814b892 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index ea107c9ee..c4d75a313 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 87f870e77..1e6249728 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index 66d8952dc..2db872ed9 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index 816baa0b3..75f0309bf 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index be4dc11b4..538331ee1 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index ba4d3b803..99814b892 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 66d8952dc..2db872ed9 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index 816baa0b3..75f0309bf 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index 66d8952dc..2db872ed9 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index 816baa0b3..75f0309bf 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index be4dc11b4..538331ee1 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index ba4d3b803..99814b892 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index ea107c9ee..c4d75a313 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index 87f870e77..1e6249728 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -33,7 +33,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index be4dc11b4..538331ee1 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index ba4d3b803..99814b892 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -32,7 +32,6 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
-    "Mark read" : "Marcar como leído",
     "Select" : "Seleccionar",
     "Choose" : "Seleccionar",
     "Favorites" : "Favoritos",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 0c3ed511b..83afe7bae 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -29,7 +29,6 @@ OC.L10N.register(
     "Message sent!" : "Sõnum on saadetud!",
     "Send" : "Saada",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
-    "Mark read" : "Märgi loetuks",
     "Select" : "Vali",
     "Choose" : "Vali",
     "Favorites" : "Lemmikud",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index e85fb085e..ab300d35c 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -27,7 +27,6 @@
     "Message sent!" : "Sõnum on saadetud!",
     "Send" : "Saada",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
-    "Mark read" : "Märgi loetuks",
     "Select" : "Vali",
     "Choose" : "Vali",
     "Favorites" : "Lemmikud",
diff --git a/l10n/eu.js b/l10n/eu.js
index 16db92fe5..edb8e7b0e 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -81,6 +81,8 @@ OC.L10N.register(
     "This message came from a noreply address so your reply will probably not be read." : "Mezu hau noreply helbide batetik dator, beraz, ziur aski, zure erantzuna ez dute irakurriko.",
     "The following recipients do not have a PGP key: {recipients}." : " \nHartzaile hauek ez dute PGP gakorik: {recipients}.",
     "Write message …" : "Idatzi mezua...",
+    "Discard & close draft" : "Baztertu eta itxi zirriborroa",
+    "Discard draft" : "Baztertu zirriborroa",
     "Cannot save draft because this account does not have a drafts mailbox configured." : "Ezin da zirriborroa gorde kontu honek ez duelako zirriborro postontzirik konfiguratuta.",
     "Saving draft …" : "Zirriborroa gordetzen...",
     "Draft saved" : "Zirriborroa gorde egin da",
@@ -92,6 +94,8 @@ OC.L10N.register(
     "Looking for a way to encrypt your emails? Install the Mailvelope browser extension!" : "Zure posta elektroniko mezuak zifratzeko era seguru baten bila zabiltza? Instalatu Mailvelope gehigarria zure nabigatzailean!",
     "Uploading attachments …" : "Fitxategi erantsiak kargatzen...",
     "Sending …" : "Bidaltzen...",
+    "Discarding …" : "Baztertzen ...",
+    "Draft was discarded!" : "Zirriborroa baztetuta!",
     "Error sending your message" : "Errorea zure mezua bidaltzerakoan",
     "Go back" : "Egin atzera",
     "Retry" : "Saiatu berriro",
@@ -116,21 +120,19 @@ OC.L10N.register(
     "No messages in this mailbox" : "Mezurik ez postontzi honetan",
     "No messages" : "Mezurik ez",
     "Draft: " : "Zirriborroa: ",
-    "Mark unimportant" : "Markatu garrantzi gabekoa",
-    "Mark important" : "Markatu garrantzizkoa",
-    "Mark unfavorite" : "Kendu gogokoetatik.",
-    "Mark favorite" : "Markatu gogoko gisa",
-    "Mark unread" : "Markatu irakurri gabe bezala",
-    "Mark read" : "Markatu irakurrita bezala",
+    "Unfavorite" : "Kendu gogokoetatik",
+    "Favorite" : "Egin gogoko",
+    "Read" : "Irakurri",
     "Mark not spam" : "Markatu ez spam gisa",
     "Mark as spam" : "Markatu spam bezala",
     "Unselect" : "Desautatu",
     "Select" : "Hautatu",
     "Edit tags" : "Editatu etiketak",
     "Move thread" : "Mugitu haria",
-    "Create event" : "Sortu gertaera",
-    "Edit as new message" : "Aldatu mezu berri gisa",
+    "More actions" : "Ekintza gehiago",
     "Delete thread" : "Ezabatu haria",
+    "Edit as new message" : "Aldatu mezu berri gisa",
+    "Create event" : "Sortu gertaera",
     "Blind copy recipients only" : "Kopia itsuen jasotzaileek besterik ez",
     "No trash mailbox configured" : "Ez da zakarrontzirik konfiguratu",
     "Could not delete message" : "Ezin izan da mezua ezabatu",
@@ -169,9 +171,9 @@ OC.L10N.register(
     "Reply to sender only" : "Erantzun bakarrik igorleari",
     "Forward" : "Birbidali",
     "Move message" : "Mugitu mezua",
+    "Delete message" : "Mezua ezabatzen",
     "View source" : "Ikusi iturburua",
     "Download thread data for debugging" : "Deskargatu hariaren datuak arazteko",
-    "Delete message" : "Mezua ezabatzen",
     "Message source" : "Mezuaren iturburua",
     "Message body" : "Mezuaren gorputza",
     "Import into calendar" : "Inportatu egutegira",
diff --git a/l10n/eu.json b/l10n/eu.json
index 80a6e70d7..eeb3672a4 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -79,6 +79,8 @@
     "This message came from a noreply address so your reply will probably not be read." : "Mezu hau noreply helbide batetik dator, beraz, ziur aski, zure erantzuna ez dute irakurriko.",
     "The following recipients do not have a PGP key: {recipients}." : " \nHartzaile hauek ez dute PGP gakorik: {recipients}.",
     "Write message …" : "Idatzi mezua...",
+    "Discard & close draft" : "Baztertu eta itxi zirriborroa",
+    "Discard draft" : "Baztertu zirriborroa",
     "Cannot save draft because this account does not have a drafts mailbox configured." : "Ezin da zirriborroa gorde kontu honek ez duelako zirriborro postontzirik konfiguratuta.",
     "Saving draft …" : "Zirriborroa gordetzen...",
     "Draft saved" : "Zirriborroa gorde egin da",
@@ -90,6 +92,8 @@
     "Looking for a way to encrypt your emails? Install the Mailvelope browser extension!" : "Zure posta elektroniko mezuak zifratzeko era seguru baten bila zabiltza? Instalatu Mailvelope gehigarria zure nabigatzailean!",
     "Uploading attachments …" : "Fitxategi erantsiak kargatzen...",
     "Sending …" : "Bidaltzen...",
+    "Discarding …" : "Baztertzen ...",
+    "Draft was discarded!" : "Zirriborroa baztetuta!",
     "Error sending your message" : "Errorea zure mezua bidaltzerakoan",
     "Go back" : "Egin atzera",
     "Retry" : "Saiatu berriro",
@@ -114,21 +118,19 @@
     "No messages in this mailbox" : "Mezurik ez postontzi honetan",
     "No messages" : "Mezurik ez",
     "Draft: " : "Zirriborroa: ",
-    "Mark unimportant" : "Markatu garrantzi gabekoa",
-    "Mark important" : "Markatu garrantzizkoa",
-    "Mark unfavorite" : "Kendu gogokoetatik.",
-    "Mark favorite" : "Markatu gogoko gisa",
-    "Mark unread" : "Markatu irakurri gabe bezala",
-    "Mark read" : "Markatu irakurrita bezala",
+    "Unfavorite" : "Kendu gogokoetatik",
+    "Favorite" : "Egin gogoko",
+    "Read" : "Irakurri",
     "Mark not spam" : "Markatu ez spam gisa",
     "Mark as spam" : "Markatu spam bezala",
     "Unselect" : "Desautatu",
     "Select" : "Hautatu",
     "Edit tags" : "Editatu etiketak",
     "Move thread" : "Mugitu haria",
-    "Create event" : "Sortu gertaera",
-    "Edit as new message" : "Aldatu mezu berri gisa",
+    "More actions" : "Ekintza gehiago",
     "Delete thread" : "Ezabatu haria",
+    "Edit as new message" : "Aldatu mezu berri gisa",
+    "Create event" : "Sortu gertaera",
     "Blind copy recipients only" : "Kopia itsuen jasotzaileek besterik ez",
     "No trash mailbox configured" : "Ez da zakarrontzirik konfiguratu",
     "Could not delete message" : "Ezin izan da mezua ezabatu",
@@ -167,9 +169,9 @@
     "Reply to sender only" : "Erantzun bakarrik igorleari",
     "Forward" : "Birbidali",
     "Move message" : "Mugitu mezua",
+    "Delete message" : "Mezua ezabatzen",
     "View source" : "Ikusi iturburua",
     "Download thread data for debugging" : "Deskargatu hariaren datuak arazteko",
-    "Delete message" : "Mezua ezabatzen",
     "Message source" : "Mezuaren iturburua",
     "Message body" : "Mezuaren gorputza",
     "Import into calendar" : "Inportatu egutegira",
diff --git a/l10n/fa.js b/l10n/fa.js
index 05545f83e..22346018c 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -69,8 +69,6 @@ OC.L10N.register(
     "Plain text" : "متن ساده",
     "Rich text" : "متن غنی",
     "Draft: " : "پیش نویس:",
-    "Mark unread" : "علامت گذاری به عنوان خوانده نشده",
-    "Mark read" : "علامت گذاری به عنوان خوانده شده",
     "Unselect" : "لغو انتخاب",
     "Select" : "انتخاب",
     "Blind copy recipients only" : "فقط گیرندگان کپی کور",
diff --git a/l10n/fa.json b/l10n/fa.json
index 1736943fb..cc95abf2c 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -67,8 +67,6 @@
     "Plain text" : "متن ساده",
     "Rich text" : "متن غنی",
     "Draft: " : "پیش نویس:",
-    "Mark unread" : "علامت گذاری به عنوان خوانده نشده",
-    "Mark read" : "علامت گذاری به عنوان خوانده شده",
     "Unselect" : "لغو انتخاب",
     "Select" : "انتخاب",
     "Blind copy recipients only" : "فقط گیرندگان کپی کور",
diff --git a/l10n/fi.js b/l10n/fi.js
index 6830dc6ae..5bb9faa2c 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -103,20 +103,14 @@ OC.L10N.register(
     "No messages in this mailbox" : "Ei viestejä tässä postilaatikossa",
     "No messages" : "Ei viestejä",
     "Draft: " : "Luonnos: ",
-    "Mark unimportant" : "Merkitse ei tärkeäksi",
-    "Mark important" : "Merkitse tärkeäksi",
-    "Mark unfavorite" : "Merkitse ei suosikiksi",
-    "Mark favorite" : "Merkitse suosikiksi",
-    "Mark unread" : "Merkitse lukemattomaksi",
-    "Mark read" : "Merkitse luetuksi",
     "Mark not spam" : "Merkitse ei roskapostiksi",
     "Mark as spam" : "Merkitse roskapostiksi",
     "Unselect" : "Poista valinta",
     "Select" : "Valitse",
     "Move thread" : "Siirrä ketju",
-    "Create event" : "Luo tapahtuma",
-    "Edit as new message" : "Muokkaa uutena viestinä",
     "Delete thread" : "Poista ketju",
+    "Edit as new message" : "Muokkaa uutena viestinä",
+    "Create event" : "Luo tapahtuma",
     "Blind copy recipients only" : "Vain piilokopion vastaanottajat",
     "Could not delete message" : "Ei voitu poistaa viestiä",
     "Load more" : "Lataa lisää",
@@ -139,9 +133,9 @@ OC.L10N.register(
     "Reply to sender only" : "Vastaa vain lähettäjälle",
     "Forward" : "Lähetä edelleen",
     "Move message" : "Siirrä viesti",
+    "Delete message" : "Poista viesti",
     "View source" : "Näytä lähde",
     "Download thread data for debugging" : "Lataa ketjun data vianjäljitystä varten",
-    "Delete message" : "Poista viesti",
     "Message source" : "Viestin lähde",
     "Message body" : "Viestin runko",
     "Import into calendar" : "Tuo kalenteriin",
diff --git a/l10n/fi.json b/l10n/fi.json
index 2bb1b0933..90ecadee5 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -101,20 +101,14 @@
     "No messages in this mailbox" : "Ei viestejä tässä postilaatikossa",
     "No messages" : "Ei viestejä",
     "Draft: " : "Luonnos: ",
-    "Mark unimportant" : "Merkitse ei tärkeäksi",
-    "Mark important" : "Merkitse tärkeäksi",
-    "Mark unfavorite" : "Merkitse ei suosikiksi",
-    "Mark favorite" : "Merkitse suosikiksi",
-    "Mark unread" : "Merkitse lukemattomaksi",
-    "Mark read" : "Merkitse luetuksi",
     "Mark not spam" : "Merkitse ei roskapostiksi",
     "Mark as spam" : "Merkitse roskapostiksi",
     "Unselect" : "Poista valinta",
     "Select" : "Valitse",
     "Move thread" : "Siirrä ketju",
-    "Create event" : "Luo tapahtuma",
-    "Edit as new message" : "Muokkaa uutena viestinä",
     "Delete thread" : "Poista ketju",
+    "Edit as new message" : "Muokkaa uutena viestinä",
+    "Create event" : "Luo tapahtuma",
     "Blind copy recipients only" : "Vain piilokopion vastaanottajat",
     "Could not delete message" : "Ei voitu poistaa viestiä",
     "Load more" : "Lataa lisää",
@@ -137,9 +131,9 @@
     "Reply to sender only" : "Vastaa vain lähettäjälle",
     "Forward" : "Lähetä edelleen",
     "Move message" : "Siirrä viesti",
+    "Delete message" : "Poista viesti",
     "View source" : "Näytä lähde",
     "Download thread data for debugging" : "Lataa ketjun data vianjäljitystä varten",
-    "Delete message" : "Poista viesti",
     "Message source" : "Viestin lähde",
     "Message body" : "Viestin runko",
     "Import into calendar" : "Tuo kalenteriin",
diff --git a/l10n/fr.js b/l10n/fr.js
index b07e876be..e940255b8 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -120,21 +120,20 @@ OC.L10N.register(
     "No messages in this mailbox" : "Aucun message dans ce dossier",
     "No messages" : "Aucun message",
     "Draft: " : "Brouillon :",
-    "Mark unimportant" : "Marquer comme non important",
-    "Mark important" : "Marquer comme important",
-    "Mark unfavorite" : "Ne plus marquer comme favori",
-    "Mark favorite" : "Marquer comme favori",
-    "Mark unread" : "Marquer comme non-lu",
-    "Mark read" : "Marquer comme lu",
+    "Unfavorite" : "Retirer des favoris",
+    "Favorite" : "Favoris",
+    "Unread" : "Non lu",
+    "Read" : "Lu",
     "Mark not spam" : "Marquer comme non spam",
     "Mark as spam" : "Marquer comme spam",
     "Unselect" : "Désélectionner",
     "Select" : "Sélectionner",
     "Edit tags" : "Éditer les étiquettes",
     "Move thread" : "Déplacer ce fil de messages",
-    "Create event" : "Créer un événement",
-    "Edit as new message" : "Modifier comme nouveau message",
+    "More actions" : "Autres actions",
     "Delete thread" : "Supprimer ce fil de messages",
+    "Edit as new message" : "Modifier comme nouveau message",
+    "Create event" : "Créer un événement",
     "Blind copy recipients only" : "Destinataires en copie cachée seulement",
     "No trash mailbox configured" : "Aucune boîte aux lettres de corbeille configurée",
     "Could not delete message" : "Impossible de supprimer le message",
@@ -173,9 +172,9 @@ OC.L10N.register(
     "Reply to sender only" : "Répondre à l'émetteur uniquement",
     "Forward" : "Transférer",
     "Move message" : "Déplacer le message",
+    "Delete message" : "Supprimer le message",
     "View source" : "Afficher la source",
     "Download thread data for debugging" : "Télécharger les données du fil pour débug",
-    "Delete message" : "Supprimer le message",
     "Message source" : "Source du message",
     "Message body" : "Corps du message",
     "Import into calendar" : "Importer dans le calendrier",
@@ -239,6 +238,7 @@ OC.L10N.register(
     "Contacts with this address" : "Contacts ayant cette adresse",
     "Add to Contact" : "Ajouter au contact",
     "New Contact" : "Nouveau contact",
+    "Copy to clipboard" : "Copier dans le presse-papiers",
     "Contact name …" : "Nom du contact …",
     "Add" : "Ajouter",
     "Disabled" : "Désactivé",
diff --git a/l10n/fr.json b/l10n/fr.json
index f95f2b15f..4b897392b 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -118,21 +118,20 @@
     "No messages in this mailbox" : "Aucun message dans ce dossier",
     "No messages" : "Aucun message",
     "Draft: " : "Brouillon :",
-    "Mark unimportant" : "Marquer comme non important",
-    "Mark important" : "Marquer comme important",
-    "Mark unfavorite" : "Ne plus marquer comme favori",
-    "Mark favorite" : "Marquer comme favori",
-    "Mark unread" : "Marquer comme non-lu",
-    "Mark read" : "Marquer comme lu",
+    "Unfavorite" : "Retirer des favoris",
+    "Favorite" : "Favoris",
+    "Unread" : "Non lu",
+    "Read" : "Lu",
     "Mark not spam" : "Marquer comme non spam",
     "Mark as spam" : "Marquer comme spam",
     "Unselect" : "Désélectionner",
     "Select" : "Sélectionner",
     "Edit tags" : "Éditer les étiquettes",
     "Move thread" : "Déplacer ce fil de messages",
-    "Create event" : "Créer un événement",
-    "Edit as new message" : "Modifier comme nouveau message",
+    "More actions" : "Autres actions",
     "Delete thread" : "Supprimer ce fil de messages",
+    "Edit as new message" : "Modifier comme nouveau message",
+    "Create event" : "Créer un événement",
     "Blind copy recipients only" : "Destinataires en copie cachée seulement",
     "No trash mailbox configured" : "Aucune boîte aux lettres de corbeille configurée",
     "Could not delete message" : "Impossible de supprimer le message",
@@ -171,9 +170,9 @@
     "Reply to sender only" : "Répondre à l'émetteur uniquement",
     "Forward" : "Transférer",
     "Move message" : "Déplacer le message",
+    "Delete message" : "Supprimer le message",
     "View source" : "Afficher la source",
     "Download thread data for debugging" : "Télécharger les données du fil pour débug",
-    "Delete message" : "Supprimer le message",
     "Message source" : "Source du message",
     "Message body" : "Corps du message",
     "Import into calendar" : "Importer dans le calendrier",
@@ -237,6 +236,7 @@
     "Contacts with this address" : "Contacts ayant cette adresse",
     "Add to Contact" : "Ajouter au contact",
     "New Contact" : "Nouveau contact",
+    "Copy to clipboard" : "Copier dans le presse-papiers",
     "Contact name …" : "Nom du contact …",
     "Add" : "Ajouter",
     "Disabled" : "Désactivé",
diff --git a/l10n/gl.js b/l10n/gl.js
index 75a0a98f4..3b6105dda 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -99,12 +99,6 @@ OC.L10N.register(
     "No messages in this mailbox" : "Non hai mensaxes nesta caixa de correo",
     "No messages" : "Non hai mensaxes",
     "Draft: " : "Borrador:",
-    "Mark unimportant" : "Marcar como sen importancia",
-    "Mark important" : "Marcar como importante",
-    "Mark unfavorite" : "Marcar como non favorito",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como sen ler",
-    "Mark read" : "Marcar como lido",
     "Mark not spam" : "Marcar que non é correo non desexado",
     "Mark as spam" : "Marcar como correo non desexado",
     "Unselect" : "Desmarcar",
diff --git a/l10n/gl.json b/l10n/gl.json
index ef7108367..a789c02c8 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -97,12 +97,6 @@
     "No messages in this mailbox" : "Non hai mensaxes nesta caixa de correo",
     "No messages" : "Non hai mensaxes",
     "Draft: " : "Borrador:",
-    "Mark unimportant" : "Marcar como sen importancia",
-    "Mark important" : "Marcar como importante",
-    "Mark unfavorite" : "Marcar como non favorito",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como sen ler",
-    "Mark read" : "Marcar como lido",
     "Mark not spam" : "Marcar que non é correo non desexado",
     "Mark as spam" : "Marcar como correo non desexado",
     "Unselect" : "Desmarcar",
diff --git a/l10n/he.js b/l10n/he.js
index 4c32ceb68..2ef13f8f1 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -99,18 +99,14 @@ OC.L10N.register(
     "No messages in this mailbox" : "אין הודעות בתיבת הדוא״ל הזאת",
     "No messages" : "אין הודעות",
     "Draft: " : "טיוטה:",
-    "Mark unimportant" : "סימון כלא חשוב",
-    "Mark important" : "סימון כחשוב",
-    "Mark unread" : "סימון כלא נקרא",
-    "Mark read" : "סימון כנקרא",
     "Mark not spam" : "לסמן שזה לא ספאם",
     "Mark as spam" : "לסמן כספאם",
     "Unselect" : "ביטול בחירה",
     "Select" : "בחירה",
     "Edit tags" : "עריכת תגיות",
     "Move thread" : "העברת שרשור",
-    "Edit as new message" : "עריכה כהודעה חדשה",
     "Delete thread" : "מחיקת שרשור",
+    "Edit as new message" : "עריכה כהודעה חדשה",
     "Blind copy recipients only" : "נמענים נסתרים בלבד",
     "No trash mailbox configured" : "לא הוגדרה תיבת דוא״ל לאשפה",
     "Could not delete message" : "לא ניתן למחוק הודעה",
diff --git a/l10n/he.json b/l10n/he.json
index cc721522f..2fe34f18e 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -97,18 +97,14 @@
     "No messages in this mailbox" : "אין הודעות בתיבת הדוא״ל הזאת",
     "No messages" : "אין הודעות",
     "Draft: " : "טיוטה:",
-    "Mark unimportant" : "סימון כלא חשוב",
-    "Mark important" : "סימון כחשוב",
-    "Mark unread" : "סימון כלא נקרא",
-    "Mark read" : "סימון כנקרא",
     "Mark not spam" : "לסמן שזה לא ספאם",
     "Mark as spam" : "לסמן כספאם",
     "Unselect" : "ביטול בחירה",
     "Select" : "בחירה",
     "Edit tags" : "עריכת תגיות",
     "Move thread" : "העברת שרשור",
-    "Edit as new message" : "עריכה כהודעה חדשה",
     "Delete thread" : "מחיקת שרשור",
+    "Edit as new message" : "עריכה כהודעה חדשה",
     "Blind copy recipients only" : "נמענים נסתרים בלבד",
     "No trash mailbox configured" : "לא הוגדרה תיבת דוא״ל לאשפה",
     "Could not delete message" : "לא ניתן למחוק הודעה",
diff --git a/l10n/hr.js b/l10n/hr.js
index 1e6df5270..ce425f160 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -116,21 +116,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "Nema poruka u ovom sandučiću",
     "No messages" : "Nema poruka",
     "Draft: " : "Skica: ",
-    "Mark unimportant" : "Označi kao nevažno",
-    "Mark important" : "Označi kao važno",
-    "Mark unfavorite" : "Označi za uklanjanje iz favorita",
-    "Mark favorite" : "Označi kao favorit",
-    "Mark unread" : "Označi kao nepročitano",
-    "Mark read" : "Označi kao pročitano",
     "Mark not spam" : "Označi da nije neželjena pošta",
     "Mark as spam" : "Označi kao neželjenu poštu",
     "Unselect" : "Poništi odabir",
     "Select" : "Odaberi",
     "Edit tags" : "Uredi oznake",
     "Move thread" : "Premjesti dretvu",
-    "Create event" : "Stvori događaj",
-    "Edit as new message" : "Uredi kao novu poruku",
     "Delete thread" : "Izbriši dretvu",
+    "Edit as new message" : "Uredi kao novu poruku",
+    "Create event" : "Stvori događaj",
     "Blind copy recipients only" : "Samo primatelji skrivenih kopija poruke",
     "No trash mailbox configured" : "Nije konfiguriran sandučić za izbrisanu poštu",
     "Could not delete message" : "Brisanje poruke nije uspjelo",
@@ -168,9 +162,9 @@ OC.L10N.register(
     "Reply to sender only" : "Odgovori pošiljatelju",
     "Forward" : "Naprijed",
     "Move message" : "Premjesti poruku",
+    "Delete message" : "Izbriši poruku",
     "View source" : "Vidi izvor",
     "Download thread data for debugging" : "Preuzmi podatke o dretvi radi otklanjanje pogrešaka",
-    "Delete message" : "Izbriši poruku",
     "Message source" : "Izvor poruke",
     "Message body" : "Tijelo poruke",
     "Import into calendar" : "Dodaj u kalendar",
diff --git a/l10n/hr.json b/l10n/hr.json
index 398048776..cc38b0a44 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -114,21 +114,15 @@
     "No messages in this mailbox" : "Nema poruka u ovom sandučiću",
     "No messages" : "Nema poruka",
     "Draft: " : "Skica: ",
-    "Mark unimportant" : "Označi kao nevažno",
-    "Mark important" : "Označi kao važno",
-    "Mark unfavorite" : "Označi za uklanjanje iz favorita",
-    "Mark favorite" : "Označi kao favorit",
-    "Mark unread" : "Označi kao nepročitano",
-    "Mark read" : "Označi kao pročitano",
     "Mark not spam" : "Označi da nije neželjena pošta",
     "Mark as spam" : "Označi kao neželjenu poštu",
     "Unselect" : "Poništi odabir",
     "Select" : "Odaberi",
     "Edit tags" : "Uredi oznake",
     "Move thread" : "Premjesti dretvu",
-    "Create event" : "Stvori događaj",
-    "Edit as new message" : "Uredi kao novu poruku",
     "Delete thread" : "Izbriši dretvu",
+    "Edit as new message" : "Uredi kao novu poruku",
+    "Create event" : "Stvori događaj",
     "Blind copy recipients only" : "Samo primatelji skrivenih kopija poruke",
     "No trash mailbox configured" : "Nije konfiguriran sandučić za izbrisanu poštu",
     "Could not delete message" : "Brisanje poruke nije uspjelo",
@@ -166,9 +160,9 @@
     "Reply to sender only" : "Odgovori pošiljatelju",
     "Forward" : "Naprijed",
     "Move message" : "Premjesti poruku",
+    "Delete message" : "Izbriši poruku",
     "View source" : "Vidi izvor",
     "Download thread data for debugging" : "Preuzmi podatke o dretvi radi otklanjanje pogrešaka",
-    "Delete message" : "Izbriši poruku",
     "Message source" : "Izvor poruke",
     "Message body" : "Tijelo poruke",
     "Import into calendar" : "Dodaj u kalendar",
diff --git a/l10n/hu.js b/l10n/hu.js
index d7bcf6fa9..ba71cfe24 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "Nincs üzenet ebben a postafiókban",
     "No messages" : "Nincs üzenet",
     "Draft: " : "Vázlat: ",
-    "Mark unimportant" : "Fontosnak jelölés visszavonása",
-    "Mark important" : "Fontosnak jelölés",
-    "Mark unfavorite" : "Kedvencnek jelölés visszavonása",
-    "Mark favorite" : "Kedvencnek jelölés",
-    "Mark unread" : "Olvasatlannak jelölés",
-    "Mark read" : "Olvasottnak jelölés",
     "Mark not spam" : "Levélszemétnek jelölés visszavonása",
     "Mark as spam" : "Levélszemétnek jelölés",
     "Unselect" : "Kiválasztás megszüntetése",
     "Select" : "Kiválasztás",
     "Edit tags" : "Címkék szerkesztése",
     "Move thread" : "Szál áthelyezése",
-    "Create event" : "Esemény létrehozása",
-    "Edit as new message" : "Szerkesztés új üzenetként",
     "Delete thread" : "Szál törlése",
+    "Edit as new message" : "Szerkesztés új üzenetként",
+    "Create event" : "Esemény létrehozása",
     "Blind copy recipients only" : "Csak a rejtett másolatok címzettjei",
     "No trash mailbox configured" : "Nincs mappa beállítva a törölt üzenetek számára",
     "Could not delete message" : "Az üzenet törlése sikertelen",
@@ -173,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "Válasz csak a feladónak",
     "Forward" : "Továbbítás",
     "Move message" : "Üzenet áthelyezése",
+    "Delete message" : "Üzenet törlése",
     "View source" : "Forrás megtekintése",
     "Download thread data for debugging" : "Szálak adatainak letöltése hibakeresés céljából",
-    "Delete message" : "Üzenet törlése",
     "Message source" : "Üzenet forrása",
     "Message body" : "Üzenet törzse",
     "Import into calendar" : "Betöltés a naptárba",
diff --git a/l10n/hu.json b/l10n/hu.json
index 35cb4ee9a..e42cb5afe 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "Nincs üzenet ebben a postafiókban",
     "No messages" : "Nincs üzenet",
     "Draft: " : "Vázlat: ",
-    "Mark unimportant" : "Fontosnak jelölés visszavonása",
-    "Mark important" : "Fontosnak jelölés",
-    "Mark unfavorite" : "Kedvencnek jelölés visszavonása",
-    "Mark favorite" : "Kedvencnek jelölés",
-    "Mark unread" : "Olvasatlannak jelölés",
-    "Mark read" : "Olvasottnak jelölés",
     "Mark not spam" : "Levélszemétnek jelölés visszavonása",
     "Mark as spam" : "Levélszemétnek jelölés",
     "Unselect" : "Kiválasztás megszüntetése",
     "Select" : "Kiválasztás",
     "Edit tags" : "Címkék szerkesztése",
     "Move thread" : "Szál áthelyezése",
-    "Create event" : "Esemény létrehozása",
-    "Edit as new message" : "Szerkesztés új üzenetként",
     "Delete thread" : "Szál törlése",
+    "Edit as new message" : "Szerkesztés új üzenetként",
+    "Create event" : "Esemény létrehozása",
     "Blind copy recipients only" : "Csak a rejtett másolatok címzettjei",
     "No trash mailbox configured" : "Nincs mappa beállítva a törölt üzenetek számára",
     "Could not delete message" : "Az üzenet törlése sikertelen",
@@ -171,9 +165,9 @@
     "Reply to sender only" : "Válasz csak a feladónak",
     "Forward" : "Továbbítás",
     "Move message" : "Üzenet áthelyezése",
+    "Delete message" : "Üzenet törlése",
     "View source" : "Forrás megtekintése",
     "Download thread data for debugging" : "Szálak adatainak letöltése hibakeresés céljából",
-    "Delete message" : "Üzenet törlése",
     "Message source" : "Üzenet forrása",
     "Message body" : "Üzenet törzse",
     "Import into calendar" : "Betöltés a naptárba",
diff --git a/l10n/is.js b/l10n/is.js
index cb1a219f5..2937f92c2 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -83,12 +83,6 @@ OC.L10N.register(
     "Rich text" : "Sniðinn texti",
     "No messages" : "Engin skilaboð",
     "Draft: " : "Drög: ",
-    "Mark unimportant" : "Merkja sem ekki-mikilvægt",
-    "Mark important" : "Merkja sem mikilvægt",
-    "Mark unfavorite" : "Taka úr eftirlætum",
-    "Mark favorite" : "Merkja sem eftirlæti",
-    "Mark unread" : "Merkja sem ólesið",
-    "Mark read" : "Merkja sem lesið",
     "Mark not spam" : "Merkja sem ekki-ruslpóst",
     "Mark as spam" : "Merkja sem ruslpóst",
     "Unselect" : "Afvelja",
diff --git a/l10n/is.json b/l10n/is.json
index 6c05ef769..dd2b3e20c 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -81,12 +81,6 @@
     "Rich text" : "Sniðinn texti",
     "No messages" : "Engin skilaboð",
     "Draft: " : "Drög: ",
-    "Mark unimportant" : "Merkja sem ekki-mikilvægt",
-    "Mark important" : "Merkja sem mikilvægt",
-    "Mark unfavorite" : "Taka úr eftirlætum",
-    "Mark favorite" : "Merkja sem eftirlæti",
-    "Mark unread" : "Merkja sem ólesið",
-    "Mark read" : "Merkja sem lesið",
     "Mark not spam" : "Merkja sem ekki-ruslpóst",
     "Mark as spam" : "Merkja sem ruslpóst",
     "Unselect" : "Afvelja",
diff --git a/l10n/it.js b/l10n/it.js
index 4809003a8..88abc4dd7 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Mails" : "Messaggi di posta",
     "Mail" : "Posta",
     "💌 A mail app for Nextcloud" : "💌 Un'applicazione di posta per Nextcloud",
+    "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We don’t have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!" : "**💌 Un'applicazione di posta elettronica per Nextcloud**\n\n- **🚀 Integrazione con altre applicazioni Nextcloud!** Attualmente Contatti, Calendario e File – altri sono in arrivo.\n- **📥 Account di posta elettronica multipli!** Account personale e aziendale? Nessun problema e una bella casella di posta elettronica unificata. Collega qualsiasi account IMAP.\n- **🔒 Invia e ricevi e-mail crittografate!** Usa la fantastica estensione del browser [Mailvelope](https://mailvelope.com).\n- **🙈 Non stiamo reinventando la ruota!** Basato sulle fantastiche librerie di [Horde](https://horde.org).\n- **📬 Vuoi ospitare il tuo server di posta?** Non è necessario reimplementarlo poiché potresti configurare [Mail-in-a-Box](https://mailinabox.email)!",
     "Drafts are saved in:" : "Le bozze sono salvate in:",
     "Sent messages are saved in:" : "I messaggi inviati sono salvati in:",
     "Deleted messages are moved in:" : "I messaggi eliminati sono spostati in:",
@@ -80,6 +81,8 @@ OC.L10N.register(
     "This message came from a noreply address so your reply will probably not be read." : "Nota che il messaggio è arrivato da un indirizzo noreply, perciò la tua risposta non sarà probabilmente letta.",
     "The following recipients do not have a PGP key: {recipients}." : "I seguenti destinatari non hanno una chiave PGP: {recipients}.",
     "Write message …" : "Scrivi messaggio...",
+    "Discard & close draft" : "Scarta e chiudi bozza",
+    "Discard draft" : "Scarta bozza",
     "Cannot save draft because this account does not have a drafts mailbox configured." : "Impossibile salvare la bozza perché questo account non dispone di una casella delle bozze configurata.",
     "Saving draft …" : "Salvataggio bozza…",
     "Draft saved" : "Bozza salvata",
@@ -91,6 +94,8 @@ OC.L10N.register(
     "Looking for a way to encrypt your emails? Install the Mailvelope browser extension!" : "Stai cercando un modo per cifrare le tue email? Installa l'estensione per browser Mailvelope!",
     "Uploading attachments …" : "Caricamento allegati…",
     "Sending …" : "Invio in corso...",
+    "Discarding …" : "Scartando …",
+    "Draft was discarded!" : "La bozza è stata scartata!",
     "Error sending your message" : "Errore di invio del messaggio",
     "Go back" : "Indietro",
     "Retry" : "Riprova",
@@ -115,26 +120,23 @@ OC.L10N.register(
     "No messages in this mailbox" : "Nessun messaggio in questa casella di posta",
     "No messages" : "Nessun messaggio",
     "Draft: " : "Bozza:",
-    "Mark unimportant" : "Marca come non importante",
-    "Mark important" : "Marca come importante",
-    "Mark unfavorite" : "Marca come non preferito",
-    "Mark favorite" : "Marca come preferito",
-    "Mark unread" : "Marca come non letto",
-    "Mark read" : "Marca come letto",
     "Mark not spam" : "Marca come posta non indesiderata",
     "Mark as spam" : "Marca come posta indesiderata",
     "Unselect" : "Deseleziona",
     "Select" : "Seleziona",
     "Edit tags" : "Modifica etichette",
     "Move thread" : "Sposta conversazione",
-    "Edit as new message" : "Modifica come nuovo messaggio",
     "Delete thread" : "Elimina conversazione",
+    "Edit as new message" : "Modifica come nuovo messaggio",
+    "Create event" : "Crea evento",
     "Blind copy recipients only" : "Solo destinatari in copia nascosta",
     "No trash mailbox configured" : "Nessuna casella del cestino configurata",
     "Could not delete message" : "Impossibile eliminare il messaggio",
     "Load more" : "Carica altro",
     "_Mark {number} unread_::_Mark {number} unread_" : ["Marca {number} come non letto","Marca {number} come non letti"],
     "_Mark {number} read_::_Mark {number} read_" : ["Marca {number} come letto","Marca {number} come letti"],
+    "_Mark {number} as important_::_Mark {number} as important_" : ["Marca {number} come importante","Marca {number} come importante"],
+    "_Mark {number} as unimportant_::_Mark {number} as unimportant_" : ["Marca {number} come non importante","Marca {number} come non importante"],
     "_Unfavorite {number}_::_Unfavorite {number}_" : ["Rimuovi dai preferiti {number}","Rimuovi dai preferiti {number}"],
     "_Favorite {number}_::_Favorite {number}_" : ["Aggiungi ai preferiti {number}","Aggiungi ai preferiti {number}"],
     "_Unselect {number}_::_Unselect {number}_" : ["Deseleziona {number}","Deseleziona {number}"],
@@ -142,8 +144,12 @@ OC.L10N.register(
     "_Forward {number} as attachment_::_Forward {number} as attachment_" : ["Inoltra {number} come allegato","Inoltra {number} come allegati"],
     "_Delete {number} thread_::_Delete {number} threads_" : ["Elimina {number} conversazione","Elimina {number} conversazioni"],
     "Report this bug" : "Segnala questo bug",
+    "All day" : "Tutto il giorno",
+    "Create" : "Crea",
+    "Event created" : "Evento creato",
     "Could not create event" : "Impossibile creare l'evento",
     "Could not open mailbox" : "Impossibile aprire la casella di posta",
+    "Loading messages …" : "Caricamento messaggi ...",
     "Indexing your messages. This can take a bit longer for larger mailboxes." : "Indicizzazione dei tuoi messaggi. Può richiedere più tempo per le caselle di posta più grandi.",
     "Choose target mailbox" : "Scegli la casella di posta di destinazione",
     "No more submailboxes in here" : "Qui non ci sono altre sotto-caselle di posta",
@@ -161,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "Rispondi solo al mittente",
     "Forward" : "Inoltra",
     "Move message" : "Sposta messaggio",
+    "Delete message" : "Elimina messaggio",
     "View source" : "Visualizza sorgente",
     "Download thread data for debugging" : "Scarica i dati del conversazione per il debug",
-    "Delete message" : "Elimina messaggio",
     "Message source" : "Sorgente del messaggio",
     "Message body" : "Corpo del messaggio",
     "Import into calendar" : "Importa nel calendario",
@@ -227,6 +233,7 @@ OC.L10N.register(
     "Contacts with this address" : "Contatti con questo indirizzo",
     "Add to Contact" : "Aggiungi ai contatti",
     "New Contact" : "Nuovo contatto",
+    "Copy to clipboard" : "Copia negli appunti",
     "Contact name …" : "Nome contatto …",
     "Add" : "Aggiungi",
     "Disabled" : "Disabilitata",
@@ -246,9 +253,15 @@ OC.L10N.register(
     "Place signature above quoted text" : "Posiziona la firma sopra il testo citato",
     "Save signature" : "Salva firma",
     "Delete" : "Elimina",
+    "Add default tags" : "Aggiungi etichette predefiniti",
+    "Rename tag" : "Rinomina l'etichetta",
+    "Saving new tag name …" : "Salvataggio nuovo nome della etichetta...",
+    "Set" : "Imposta",
+    "Unset" : "Rimuovi",
     "Add tag" : "Aggiungi etichetta",
     "Saving tag …" : "Salvataggio etichetta …",
     "An error occurred, unable to create the tag." : "Si è verificato un errore, impossibile creare l'etichetta.",
+    "An error occurred, unable to rename the tag." : "Si è verificato un errore, impossibile rinominare l'etichetta.",
     "Could not load your message thread" : "Impossibile caricare la tua discussione",
     "Remove" : "Rimuovi",
     "No senders are trusted at the moment." : "Nessun mittente è fidato al momento.",
@@ -266,15 +279,49 @@ OC.L10N.register(
     "Mail app" : "Applicazione di posta",
     "The mail app allows users to read mails on their IMAP accounts." : "L'applicazione di posta consente agli utenti di leggere i messaggi dei propri account IMAP.",
     "Here you can find instance-wide settings. User specific settings are found in the app itself (bottom-left corner)." : "Qui puoi trovare le impostazioni a livello di istanza. Le impostazioni specifiche dell'utente si trovano nell'applicazione stessa (angolo in basso a sinistra).",
+    "Account provisioning" : "Account approvvigionato.",
     "A provisioning configuration will provision all accounts with a matching email address." : "Una configurazione predisposta preparerà tutti gli account con un indirizzo email corrispondente.",
     "Using the wildcard (*) in the provisioning domain field will create a configuration that applies to all users, provided they do not match another configuration." : "Usando il metacarattere (*) nel campo del dominio di predisposizione, si creerà una configurazione che si applica a tutti gli utenti, a patto che non dipendano da un'altra configurazione.",
+    "The provisioning mechanism will prioritise specific domain configurations over the wildcard domain configuration." : "Il meccanismo di approvvigionamento darà la priorità alle configurazioni di dominio specifiche rispetto alla configurazione di dominio con caratteri jolly.",
+    "Should a new matching configuration be found after the user was already provisioned with another configuration, the new configuration will take precedence and the user will be reprovisioned with the configuration." : "Se viene trovata una nuova configurazione corrispondente dopo che all'utente è già stato eseguito il approvvigionamento con un'altra configurazione, la nuova configurazione avrà la precedenza e all'utente verrà effettuato nuovamente il approvvigionamento con la configurazione.",
+    "There can only be one configuration per domain and only one wildcard domain configuration." : "Può esistere una sola configurazione per dominio e una sola configurazione di dominio con caratteri jolly.",
+    "These settings can be used in conjunction with each other." : "Queste impostazioni possono essere utilizzate con altri.",
+    "If you only want to provision one domain for all users, use the wildcard (*)." : "Se desideri eseguire il approvvigionamento di un solo dominio per tutti gli utenti, utilizza il carattere jolly (*).",
+    "This setting only makes most sense if you use the same user back-end for your Nextcloud and mail server of your organization." : "Questa impostazione ha più senso se utilizzi lo stesso back-end utente per la Nextcloud e il server di posta della tua organizzazione.",
+    "Provisioning Configurations" : "Configurazione di approvvigionamento",
     "Add new config" : "Aggiungi nuova configurazione",
     "Provision all accounts" : "Predisponi tutti gli account",
+    "Anti Spam Service" : "Servizio Anti-Spam",
+    "You can set up an anti spam service email address here." : "È possibile impostare un indirizzo e-mail del servizio Anti-Spam qui.",
+    "Any email that is marked as spam will be sent to the anti spam service." : "Qualsiasi email contrassegnata come posta indesiderata verrà inviata al servizio Anti-Spam.",
+    "Successfully updated config for \"{domain}\"" : "Configurazione aggiornata con successo per \"{domain}\"",
+    "Error saving config" : "Errore durante il salvataggio della configurazione",
+    "Saved config for \"{domain}\"" : "Configurazione salvata per \"{domain}\"",
+    "Could not save provisioning setting" : "Impossibile salvare l'impostazione di approvvigionamento",
+    "There was an error when provisioning accounts." : "Si è verificato un errore durante il approvvigionamento degli account.",
+    "Successfully deleted and deprovisioned accounts for \"{domain}\"" : " Account eliminati e approvvigionato correttamente per \"{domain}\"",
+    "Error when deleting and deprovisioning accounts for \"{domain}\"" : "Errore durante l'eliminazione e il approvvigionamento degli account per \"{domain}\"",
+    "_Successfully provisioned {count} account._::_Successfully provisioned {count} accounts._" : ["Approvvigionamento di {count} account completato con successo.","Approvvigionamento di {count} account completato con successo."],
+    "Anti Spam" : "Anti-Spam",
+    "Add the email address of your anti spam report service here." : "Aggiungi qui l'indirizzo email del tuo servizio di segnalazione Anti-Spam.",
+    "When using this setting, a report email will be sent to the SPAM report server when a user clicks \"Mark as spam\"." : "Quando si utilizza questa impostazione, viene inviata un'e-mail di rapporto al server di rapporto SPAM quando un utente fa clic su \"Segna come posta indesiderata\".",
+    "The original message will be attached as a \"message/rfc822\" attachment." : "Il messaggio originale verrà allegato come tipo \"message/rfc822\".",
+    "\"Mark as Spam\" Email Address" : "\"Segna come spam\" l'indirizzo e-mail",
+    "\"Mark Not Junk\" Email Address" : "\"Segna come posta indesiderata\" l'indirizzo e-mail",
+    "Reset" : "Ripristina",
+    "Successfully set up anti spam email addresses" : "Impostare correttamente gli indirizzi e-mail Anti-Spam",
+    "Error saving anti spam email addresses" : "Errore durante il salvataggio degli indirizzi email Anti-Spam",
+    "Successfully deleted anti spam reporting email" : "Email di segnalazione Anti-Spam eliminata con successo",
+    "Error deleting anti spam reporting email" : "Errore durante l'eliminazione dell'e-mail di segnalazione Anti-Spam",
+    "Domain Match: {provisioningDomain}" : "Corrispondenza di dominio: {provisioningDomain}",
     "Email: {email}" : "Email: {email}",
     "IMAP: {user} on {host}:{port} ({ssl} encryption)" : "IMAP: {user} su {host}:{port} (cifratura {ssl})",
     "SMTP: {user} on {host}:{port} ({ssl} encryption)" : "SMTP: {user} su {host}:{port} (cifratura {ssl})",
     "Sieve: {user} on {host}:{port} ({ssl} encryption)" : "Sieve: {user} su {host}:{port} ({ssl} encryption)",
+    "Configuration for \"{provisioningDomain}\"" : "Configurazione per \"{provisioningDomain}\"",
     "General" : "Generale",
+    "Provisioning domain" : "Approvvigionamento dominio",
+    "Email address template" : "Modello d'indirizzo email",
     "IMAP" : "IMAP",
     "User" : "Utente",
     "Host" : "Host",
@@ -282,7 +329,14 @@ OC.L10N.register(
     "SMTP" : "SMTP",
     "Sieve" : "Sieve",
     "Enable sieve integration" : "Abilita l'integrazione Sieve",
+    "LDAP aliases integration" : "Integrazione degli alias LDAP",
+    "Enable LDAP aliases integration" : "Abilita l'integrazione degli alias LDAP",
+    "The LDAP aliases integration reads an attribute from the configured LDAP directory to provision email aliases." : "L'integrazione degli alias LDAP legge un attributo dalla directory LDAP configurata per eseguire il approvvigionamento degli e-mail alias.",
+    "LDAP attribute for aliases" : "Attributo LDAP per gli alias",
+    "A multi value attribute to provision email aliases. For each value an alias is created. Aliases existing in Nextcloud which are not in the LDAP directory are deleted." : "Un attributo multi valore per il approvvigionamento di e-mail alias. Per ogni valore viene creato un alias. Gli alias esistenti in Nextcloud che non si trovano nella directory LDAP vengono eliminati.",
     "Save Config" : "Salva configurazione",
+    "Unprovision & Delete Config" : "Annullare il approvvigionamento ed eliminare la configurazione",
+    "* %USERID% and %EMAIL% will be replaced with the user's UID and email" : "* %USERID% e %EMAIL% verranno sostituiti con l'UID e l'e-mail dell'utente",
     "With the settings above, the app will create account settings in the following way:" : "Con le impostazioni precedenti, l'applicazione creerà le impostazioni dell'account nel modo seguente:",
     "Keyboard shortcut" : "Scorciatoia da tastiera",
     "Keyboard shortcuts" : "Scorciatoie da tastiera",
diff --git a/l10n/it.json b/l10n/it.json
index a1ea93c46..b4da73c39 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -13,6 +13,7 @@
     "Mails" : "Messaggi di posta",
     "Mail" : "Posta",
     "💌 A mail app for Nextcloud" : "💌 Un'applicazione di posta per Nextcloud",
+    "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We don’t have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!" : "**💌 Un'applicazione di posta elettronica per Nextcloud**\n\n- **🚀 Integrazione con altre applicazioni Nextcloud!** Attualmente Contatti, Calendario e File – altri sono in arrivo.\n- **📥 Account di posta elettronica multipli!** Account personale e aziendale? Nessun problema e una bella casella di posta elettronica unificata. Collega qualsiasi account IMAP.\n- **🔒 Invia e ricevi e-mail crittografate!** Usa la fantastica estensione del browser [Mailvelope](https://mailvelope.com).\n- **🙈 Non stiamo reinventando la ruota!** Basato sulle fantastiche librerie di [Horde](https://horde.org).\n- **📬 Vuoi ospitare il tuo server di posta?** Non è necessario reimplementarlo poiché potresti configurare [Mail-in-a-Box](https://mailinabox.email)!",
     "Drafts are saved in:" : "Le bozze sono salvate in:",
     "Sent messages are saved in:" : "I messaggi inviati sono salvati in:",
     "Deleted messages are moved in:" : "I messaggi eliminati sono spostati in:",
@@ -78,6 +79,8 @@
     "This message came from a noreply address so your reply will probably not be read." : "Nota che il messaggio è arrivato da un indirizzo noreply, perciò la tua risposta non sarà probabilmente letta.",
     "The following recipients do not have a PGP key: {recipients}." : "I seguenti destinatari non hanno una chiave PGP: {recipients}.",
     "Write message …" : "Scrivi messaggio...",
+    "Discard & close draft" : "Scarta e chiudi bozza",
+    "Discard draft" : "Scarta bozza",
     "Cannot save draft because this account does not have a drafts mailbox configured." : "Impossibile salvare la bozza perché questo account non dispone di una casella delle bozze configurata.",
     "Saving draft …" : "Salvataggio bozza…",
     "Draft saved" : "Bozza salvata",
@@ -89,6 +92,8 @@
     "Looking for a way to encrypt your emails? Install the Mailvelope browser extension!" : "Stai cercando un modo per cifrare le tue email? Installa l'estensione per browser Mailvelope!",
     "Uploading attachments …" : "Caricamento allegati…",
     "Sending …" : "Invio in corso...",
+    "Discarding …" : "Scartando …",
+    "Draft was discarded!" : "La bozza è stata scartata!",
     "Error sending your message" : "Errore di invio del messaggio",
     "Go back" : "Indietro",
     "Retry" : "Riprova",
@@ -113,26 +118,23 @@
     "No messages in this mailbox" : "Nessun messaggio in questa casella di posta",
     "No messages" : "Nessun messaggio",
     "Draft: " : "Bozza:",
-    "Mark unimportant" : "Marca come non importante",
-    "Mark important" : "Marca come importante",
-    "Mark unfavorite" : "Marca come non preferito",
-    "Mark favorite" : "Marca come preferito",
-    "Mark unread" : "Marca come non letto",
-    "Mark read" : "Marca come letto",
     "Mark not spam" : "Marca come posta non indesiderata",
     "Mark as spam" : "Marca come posta indesiderata",
     "Unselect" : "Deseleziona",
     "Select" : "Seleziona",
     "Edit tags" : "Modifica etichette",
     "Move thread" : "Sposta conversazione",
-    "Edit as new message" : "Modifica come nuovo messaggio",
     "Delete thread" : "Elimina conversazione",
+    "Edit as new message" : "Modifica come nuovo messaggio",
+    "Create event" : "Crea evento",
     "Blind copy recipients only" : "Solo destinatari in copia nascosta",
     "No trash mailbox configured" : "Nessuna casella del cestino configurata",
     "Could not delete message" : "Impossibile eliminare il messaggio",
     "Load more" : "Carica altro",
     "_Mark {number} unread_::_Mark {number} unread_" : ["Marca {number} come non letto","Marca {number} come non letti"],
     "_Mark {number} read_::_Mark {number} read_" : ["Marca {number} come letto","Marca {number} come letti"],
+    "_Mark {number} as important_::_Mark {number} as important_" : ["Marca {number} come importante","Marca {number} come importante"],
+    "_Mark {number} as unimportant_::_Mark {number} as unimportant_" : ["Marca {number} come non importante","Marca {number} come non importante"],
     "_Unfavorite {number}_::_Unfavorite {number}_" : ["Rimuovi dai preferiti {number}","Rimuovi dai preferiti {number}"],
     "_Favorite {number}_::_Favorite {number}_" : ["Aggiungi ai preferiti {number}","Aggiungi ai preferiti {number}"],
     "_Unselect {number}_::_Unselect {number}_" : ["Deseleziona {number}","Deseleziona {number}"],
@@ -140,8 +142,12 @@
     "_Forward {number} as attachment_::_Forward {number} as attachment_" : ["Inoltra {number} come allegato","Inoltra {number} come allegati"],
     "_Delete {number} thread_::_Delete {number} threads_" : ["Elimina {number} conversazione","Elimina {number} conversazioni"],
     "Report this bug" : "Segnala questo bug",
+    "All day" : "Tutto il giorno",
+    "Create" : "Crea",
+    "Event created" : "Evento creato",
     "Could not create event" : "Impossibile creare l'evento",
     "Could not open mailbox" : "Impossibile aprire la casella di posta",
+    "Loading messages …" : "Caricamento messaggi ...",
     "Indexing your messages. This can take a bit longer for larger mailboxes." : "Indicizzazione dei tuoi messaggi. Può richiedere più tempo per le caselle di posta più grandi.",
     "Choose target mailbox" : "Scegli la casella di posta di destinazione",
     "No more submailboxes in here" : "Qui non ci sono altre sotto-caselle di posta",
@@ -159,9 +165,9 @@
     "Reply to sender only" : "Rispondi solo al mittente",
     "Forward" : "Inoltra",
     "Move message" : "Sposta messaggio",
+    "Delete message" : "Elimina messaggio",
     "View source" : "Visualizza sorgente",
     "Download thread data for debugging" : "Scarica i dati del conversazione per il debug",
-    "Delete message" : "Elimina messaggio",
     "Message source" : "Sorgente del messaggio",
     "Message body" : "Corpo del messaggio",
     "Import into calendar" : "Importa nel calendario",
@@ -225,6 +231,7 @@
     "Contacts with this address" : "Contatti con questo indirizzo",
     "Add to Contact" : "Aggiungi ai contatti",
     "New Contact" : "Nuovo contatto",
+    "Copy to clipboard" : "Copia negli appunti",
     "Contact name …" : "Nome contatto …",
     "Add" : "Aggiungi",
     "Disabled" : "Disabilitata",
@@ -244,9 +251,15 @@
     "Place signature above quoted text" : "Posiziona la firma sopra il testo citato",
     "Save signature" : "Salva firma",
     "Delete" : "Elimina",
+    "Add default tags" : "Aggiungi etichette predefiniti",
+    "Rename tag" : "Rinomina l'etichetta",
+    "Saving new tag name …" : "Salvataggio nuovo nome della etichetta...",
+    "Set" : "Imposta",
+    "Unset" : "Rimuovi",
     "Add tag" : "Aggiungi etichetta",
     "Saving tag …" : "Salvataggio etichetta …",
     "An error occurred, unable to create the tag." : "Si è verificato un errore, impossibile creare l'etichetta.",
+    "An error occurred, unable to rename the tag." : "Si è verificato un errore, impossibile rinominare l'etichetta.",
     "Could not load your message thread" : "Impossibile caricare la tua discussione",
     "Remove" : "Rimuovi",
     "No senders are trusted at the moment." : "Nessun mittente è fidato al momento.",
@@ -264,15 +277,49 @@
     "Mail app" : "Applicazione di posta",
     "The mail app allows users to read mails on their IMAP accounts." : "L'applicazione di posta consente agli utenti di leggere i messaggi dei propri account IMAP.",
     "Here you can find instance-wide settings. User specific settings are found in the app itself (bottom-left corner)." : "Qui puoi trovare le impostazioni a livello di istanza. Le impostazioni specifiche dell'utente si trovano nell'applicazione stessa (angolo in basso a sinistra).",
+    "Account provisioning" : "Account approvvigionato.",
     "A provisioning configuration will provision all accounts with a matching email address." : "Una configurazione predisposta preparerà tutti gli account con un indirizzo email corrispondente.",
     "Using the wildcard (*) in the provisioning domain field will create a configuration that applies to all users, provided they do not match another configuration." : "Usando il metacarattere (*) nel campo del dominio di predisposizione, si creerà una configurazione che si applica a tutti gli utenti, a patto che non dipendano da un'altra configurazione.",
+    "The provisioning mechanism will prioritise specific domain configurations over the wildcard domain configuration." : "Il meccanismo di approvvigionamento darà la priorità alle configurazioni di dominio specifiche rispetto alla configurazione di dominio con caratteri jolly.",
+    "Should a new matching configuration be found after the user was already provisioned with another configuration, the new configuration will take precedence and the user will be reprovisioned with the configuration." : "Se viene trovata una nuova configurazione corrispondente dopo che all'utente è già stato eseguito il approvvigionamento con un'altra configurazione, la nuova configurazione avrà la precedenza e all'utente verrà effettuato nuovamente il approvvigionamento con la configurazione.",
+    "There can only be one configuration per domain and only one wildcard domain configuration." : "Può esistere una sola configurazione per dominio e una sola configurazione di dominio con caratteri jolly.",
+    "These settings can be used in conjunction with each other." : "Queste impostazioni possono essere utilizzate con altri.",
+    "If you only want to provision one domain for all users, use the wildcard (*)." : "Se desideri eseguire il approvvigionamento di un solo dominio per tutti gli utenti, utilizza il carattere jolly (*).",
+    "This setting only makes most sense if you use the same user back-end for your Nextcloud and mail server of your organization." : "Questa impostazione ha più senso se utilizzi lo stesso back-end utente per la Nextcloud e il server di posta della tua organizzazione.",
+    "Provisioning Configurations" : "Configurazione di approvvigionamento",
     "Add new config" : "Aggiungi nuova configurazione",
     "Provision all accounts" : "Predisponi tutti gli account",
+    "Anti Spam Service" : "Servizio Anti-Spam",
+    "You can set up an anti spam service email address here." : "È possibile impostare un indirizzo e-mail del servizio Anti-Spam qui.",
+    "Any email that is marked as spam will be sent to the anti spam service." : "Qualsiasi email contrassegnata come posta indesiderata verrà inviata al servizio Anti-Spam.",
+    "Successfully updated config for \"{domain}\"" : "Configurazione aggiornata con successo per \"{domain}\"",
+    "Error saving config" : "Errore durante il salvataggio della configurazione",
+    "Saved config for \"{domain}\"" : "Configurazione salvata per \"{domain}\"",
+    "Could not save provisioning setting" : "Impossibile salvare l'impostazione di approvvigionamento",
+    "There was an error when provisioning accounts." : "Si è verificato un errore durante il approvvigionamento degli account.",
+    "Successfully deleted and deprovisioned accounts for \"{domain}\"" : " Account eliminati e approvvigionato correttamente per \"{domain}\"",
+    "Error when deleting and deprovisioning accounts for \"{domain}\"" : "Errore durante l'eliminazione e il approvvigionamento degli account per \"{domain}\"",
+    "_Successfully provisioned {count} account._::_Successfully provisioned {count} accounts._" : ["Approvvigionamento di {count} account completato con successo.","Approvvigionamento di {count} account completato con successo."],
+    "Anti Spam" : "Anti-Spam",
+    "Add the email address of your anti spam report service here." : "Aggiungi qui l'indirizzo email del tuo servizio di segnalazione Anti-Spam.",
+    "When using this setting, a report email will be sent to the SPAM report server when a user clicks \"Mark as spam\"." : "Quando si utilizza questa impostazione, viene inviata un'e-mail di rapporto al server di rapporto SPAM quando un utente fa clic su \"Segna come posta indesiderata\".",
+    "The original message will be attached as a \"message/rfc822\" attachment." : "Il messaggio originale verrà allegato come tipo \"message/rfc822\".",
+    "\"Mark as Spam\" Email Address" : "\"Segna come spam\" l'indirizzo e-mail",
+    "\"Mark Not Junk\" Email Address" : "\"Segna come posta indesiderata\" l'indirizzo e-mail",
+    "Reset" : "Ripristina",
+    "Successfully set up anti spam email addresses" : "Impostare correttamente gli indirizzi e-mail Anti-Spam",
+    "Error saving anti spam email addresses" : "Errore durante il salvataggio degli indirizzi email Anti-Spam",
+    "Successfully deleted anti spam reporting email" : "Email di segnalazione Anti-Spam eliminata con successo",
+    "Error deleting anti spam reporting email" : "Errore durante l'eliminazione dell'e-mail di segnalazione Anti-Spam",
+    "Domain Match: {provisioningDomain}" : "Corrispondenza di dominio: {provisioningDomain}",
     "Email: {email}" : "Email: {email}",
     "IMAP: {user} on {host}:{port} ({ssl} encryption)" : "IMAP: {user} su {host}:{port} (cifratura {ssl})",
     "SMTP: {user} on {host}:{port} ({ssl} encryption)" : "SMTP: {user} su {host}:{port} (cifratura {ssl})",
     "Sieve: {user} on {host}:{port} ({ssl} encryption)" : "Sieve: {user} su {host}:{port} ({ssl} encryption)",
+    "Configuration for \"{provisioningDomain}\"" : "Configurazione per \"{provisioningDomain}\"",
     "General" : "Generale",
+    "Provisioning domain" : "Approvvigionamento dominio",
+    "Email address template" : "Modello d'indirizzo email",
     "IMAP" : "IMAP",
     "User" : "Utente",
     "Host" : "Host",
@@ -280,7 +327,14 @@
     "SMTP" : "SMTP",
     "Sieve" : "Sieve",
     "Enable sieve integration" : "Abilita l'integrazione Sieve",
+    "LDAP aliases integration" : "Integrazione degli alias LDAP",
+    "Enable LDAP aliases integration" : "Abilita l'integrazione degli alias LDAP",
+    "The LDAP aliases integration reads an attribute from the configured LDAP directory to provision email aliases." : "L'integrazione degli alias LDAP legge un attributo dalla directory LDAP configurata per eseguire il approvvigionamento degli e-mail alias.",
+    "LDAP attribute for aliases" : "Attributo LDAP per gli alias",
+    "A multi value attribute to provision email aliases. For each value an alias is created. Aliases existing in Nextcloud which are not in the LDAP directory are deleted." : "Un attributo multi valore per il approvvigionamento di e-mail alias. Per ogni valore viene creato un alias. Gli alias esistenti in Nextcloud che non si trovano nella directory LDAP vengono eliminati.",
     "Save Config" : "Salva configurazione",
+    "Unprovision & Delete Config" : "Annullare il approvvigionamento ed eliminare la configurazione",
+    "* %USERID% and %EMAIL% will be replaced with the user's UID and email" : "* %USERID% e %EMAIL% verranno sostituiti con l'UID e l'e-mail dell'utente",
     "With the settings above, the app will create account settings in the following way:" : "Con le impostazioni precedenti, l'applicazione creerà le impostazioni dell'account nel modo seguente:",
     "Keyboard shortcut" : "Scorciatoia da tastiera",
     "Keyboard shortcuts" : "Scorciatoie da tastiera",
diff --git a/l10n/ja.js b/l10n/ja.js
index f705e9895..d8aec7a97 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -103,20 +103,14 @@ OC.L10N.register(
     "No messages in this mailbox" : "このメールボックスにメッセージはありません",
     "No messages" : "メッセージはありません",
     "Draft: " : "下書き",
-    "Mark unimportant" : "重要マークを外す",
-    "Mark important" : "重要マークをつける",
-    "Mark unfavorite" : "お気に入りマークを外す",
-    "Mark favorite" : "お気に入りとしてマーク",
-    "Mark unread" : "未読にする",
-    "Mark read" : "既読にする",
     "Mark not spam" : "迷惑メールとしない",
     "Mark as spam" : "迷惑メールとする",
     "Unselect" : "選択解除",
     "Select" : "選択",
     "Edit tags" : "タグを編集",
-    "Create event" : "イベントを作成",
-    "Edit as new message" : "新しいメッセージとして編集",
     "Delete thread" : "スレッドを削除",
+    "Edit as new message" : "新しいメッセージとして編集",
+    "Create event" : "イベントを作成",
     "Blind copy recipients only" : "BCC受信者のみ",
     "Could not delete message" : "メッセージを削除できませんでした",
     "Load more" : "さらに読み込む",
@@ -140,8 +134,8 @@ OC.L10N.register(
     "Reply to sender only" : "送信者のみに返信",
     "Forward" : "転送",
     "Move message" : "メッセージを移動",
-    "View source" : "ソースを表示",
     "Delete message" : "メッセージを削除",
+    "View source" : "ソースを表示",
     "Message source" : "メッセージソース",
     "Import into calendar" : "カレンダーにインポート",
     "Download attachment" : "添付ファイルをダウンロード",
diff --git a/l10n/ja.json b/l10n/ja.json
index ef0b2fca2..5cd873842 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -101,20 +101,14 @@
     "No messages in this mailbox" : "このメールボックスにメッセージはありません",
     "No messages" : "メッセージはありません",
     "Draft: " : "下書き",
-    "Mark unimportant" : "重要マークを外す",
-    "Mark important" : "重要マークをつける",
-    "Mark unfavorite" : "お気に入りマークを外す",
-    "Mark favorite" : "お気に入りとしてマーク",
-    "Mark unread" : "未読にする",
-    "Mark read" : "既読にする",
     "Mark not spam" : "迷惑メールとしない",
     "Mark as spam" : "迷惑メールとする",
     "Unselect" : "選択解除",
     "Select" : "選択",
     "Edit tags" : "タグを編集",
-    "Create event" : "イベントを作成",
-    "Edit as new message" : "新しいメッセージとして編集",
     "Delete thread" : "スレッドを削除",
+    "Edit as new message" : "新しいメッセージとして編集",
+    "Create event" : "イベントを作成",
     "Blind copy recipients only" : "BCC受信者のみ",
     "Could not delete message" : "メッセージを削除できませんでした",
     "Load more" : "さらに読み込む",
@@ -138,8 +132,8 @@
     "Reply to sender only" : "送信者のみに返信",
     "Forward" : "転送",
     "Move message" : "メッセージを移動",
-    "View source" : "ソースを表示",
     "Delete message" : "メッセージを削除",
+    "View source" : "ソースを表示",
     "Message source" : "メッセージソース",
     "Import into calendar" : "カレンダーにインポート",
     "Download attachment" : "添付ファイルをダウンロード",
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index ce2e9e732..ca000ad14 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Message sent!" : "წერილი გაგზავნილია!",
     "Send" : "გაგზავნა",
     "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
-    "Mark read" : "მონიშნეთ წაკითხულად",
     "Select" : "არჩევა",
     "Choose" : "აირჩიეთ",
     "Favorites" : "რჩეულები",
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 4a7604c1f..3b7bc955d 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -33,7 +33,6 @@
     "Message sent!" : "წერილი გაგზავნილია!",
     "Send" : "გაგზავნა",
     "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
-    "Mark read" : "მონიშნეთ წაკითხულად",
     "Select" : "არჩევა",
     "Choose" : "აირჩიეთ",
     "Favorites" : "რჩეულები",
diff --git a/l10n/ko.js b/l10n/ko.js
index 042f6ce9e..97d8d2274 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -78,12 +78,6 @@ OC.L10N.register(
     "Rich text" : "서식 있는 텍스트",
     "No messages" : "메시지가 없음",
     "Draft: " : "임시 보관함",
-    "Mark unimportant" : "중요하지 않음 표시",
-    "Mark important" : "중요함 표시",
-    "Mark unfavorite" : "즐겨찾기 표시 제거",
-    "Mark favorite" : "즐겨찾기 표시",
-    "Mark unread" : "읽지 않음 상태로 표시",
-    "Mark read" : "읽은 상태로 표시",
     "Mark not spam" : "스팸 해제",
     "Mark as spam" : "스팸 신고",
     "Unselect" : "선택 해제",
diff --git a/l10n/ko.json b/l10n/ko.json
index 552b64a57..b0da01595 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -76,12 +76,6 @@
     "Rich text" : "서식 있는 텍스트",
     "No messages" : "메시지가 없음",
     "Draft: " : "임시 보관함",
-    "Mark unimportant" : "중요하지 않음 표시",
-    "Mark important" : "중요함 표시",
-    "Mark unfavorite" : "즐겨찾기 표시 제거",
-    "Mark favorite" : "즐겨찾기 표시",
-    "Mark unread" : "읽지 않음 상태로 표시",
-    "Mark read" : "읽은 상태로 표시",
     "Mark not spam" : "스팸 해제",
     "Mark as spam" : "스팸 신고",
     "Unselect" : "선택 해제",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 35f81c397..382bbf93c 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -91,12 +91,6 @@ OC.L10N.register(
     "Rich text" : "Raiškusis tekstas",
     "No messages" : "Nėra laiškų",
     "Draft: " : "Juodraštis: ",
-    "Mark unimportant" : "Žymėti kaip nesvarbų",
-    "Mark important" : "Žymėti kaip svarbų",
-    "Mark unfavorite" : "Žymėti kaip nebemėgstamą",
-    "Mark favorite" : "Žymėti kaip mėgstamą",
-    "Mark unread" : "Žymėti kaip neskaitytą",
-    "Mark read" : "Žymėti kaip skaitytą",
     "Unselect" : "Nuimti žymėjimą",
     "Select" : "Pasirinkti",
     "Edit as new message" : "Taisyti kaip naują laišką",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index a65cedd8b..63725cf19 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -89,12 +89,6 @@
     "Rich text" : "Raiškusis tekstas",
     "No messages" : "Nėra laiškų",
     "Draft: " : "Juodraštis: ",
-    "Mark unimportant" : "Žymėti kaip nesvarbų",
-    "Mark important" : "Žymėti kaip svarbų",
-    "Mark unfavorite" : "Žymėti kaip nebemėgstamą",
-    "Mark favorite" : "Žymėti kaip mėgstamą",
-    "Mark unread" : "Žymėti kaip neskaitytą",
-    "Mark read" : "Žymėti kaip skaitytą",
     "Unselect" : "Nuimti žymėjimą",
     "Select" : "Pasirinkti",
     "Edit as new message" : "Taisyti kaip naują laišką",
diff --git a/l10n/mk.js b/l10n/mk.js
index 98707c03c..8da49abb5 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -97,19 +97,13 @@ OC.L10N.register(
     "No messages in this mailbox" : "Нема пораки во ова сандаче",
     "No messages" : "Нема пораки",
     "Draft: " : "Нацрт:",
-    "Mark unimportant" : "Од-означи важна",
-    "Mark important" : "Означи важна",
-    "Mark unfavorite" : "Од-означи омилена",
-    "Mark favorite" : "Означи како омилена",
-    "Mark unread" : "Означи како непрочитано",
-    "Mark read" : "Означи како прочитано",
     "Mark not spam" : "Од-означи СПАМ",
     "Mark as spam" : "Означи како СПАМ",
     "Unselect" : "Поништи избор",
     "Select" : "Select",
     "Edit tags" : "Удери ознаки",
-    "Create event" : "Креирај настан",
     "Edit as new message" : "Измени како нова порака",
+    "Create event" : "Креирај настан",
     "Blind copy recipients only" : "Само приматели на слепи копии",
     "No trash mailbox configured" : "Нема конфигурирано сандаче за отпадоци",
     "Could not delete message" : "Неможе да се избрише пораката",
@@ -130,9 +124,9 @@ OC.L10N.register(
     "Reply to sender only" : "Одговор само до испраќачот",
     "Forward" : "Препрати",
     "Move message" : "Премести порака",
+    "Delete message" : "Избриши порака",
     "View source" : "Погледни извор",
     "Download thread data for debugging" : "Преземи информации за развивачи",
-    "Delete message" : "Избриши порака",
     "Message source" : "Извор на пораката",
     "Import into calendar" : "Увези во календар",
     "Download attachment" : "Преземи прилог",
diff --git a/l10n/mk.json b/l10n/mk.json
index 5372baefd..c7dd56d88 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -95,19 +95,13 @@
     "No messages in this mailbox" : "Нема пораки во ова сандаче",
     "No messages" : "Нема пораки",
     "Draft: " : "Нацрт:",
-    "Mark unimportant" : "Од-означи важна",
-    "Mark important" : "Означи важна",
-    "Mark unfavorite" : "Од-означи омилена",
-    "Mark favorite" : "Означи како омилена",
-    "Mark unread" : "Означи како непрочитано",
-    "Mark read" : "Означи како прочитано",
     "Mark not spam" : "Од-означи СПАМ",
     "Mark as spam" : "Означи како СПАМ",
     "Unselect" : "Поништи избор",
     "Select" : "Select",
     "Edit tags" : "Удери ознаки",
-    "Create event" : "Креирај настан",
     "Edit as new message" : "Измени како нова порака",
+    "Create event" : "Креирај настан",
     "Blind copy recipients only" : "Само приматели на слепи копии",
     "No trash mailbox configured" : "Нема конфигурирано сандаче за отпадоци",
     "Could not delete message" : "Неможе да се избрише пораката",
@@ -128,9 +122,9 @@
     "Reply to sender only" : "Одговор само до испраќачот",
     "Forward" : "Препрати",
     "Move message" : "Премести порака",
+    "Delete message" : "Избриши порака",
     "View source" : "Погледни извор",
     "Download thread data for debugging" : "Преземи информации за развивачи",
-    "Delete message" : "Избриши порака",
     "Message source" : "Извор на пораката",
     "Import into calendar" : "Увези во календар",
     "Download attachment" : "Преземи прилог",
diff --git a/l10n/nb.js b/l10n/nb.js
index 1268ab2e3..97bb0620c 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -48,8 +48,6 @@ OC.L10N.register(
     "Send" : "Send",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
     "Draft: " : "Kladd:",
-    "Mark unread" : "Marker som ulest",
-    "Mark read" : "Marker som lest",
     "Unselect" : "Velg bort",
     "Select" : "Velg",
     "Report this bug" : "Rapporter denne feilen",
diff --git a/l10n/nb.json b/l10n/nb.json
index 270c679f1..c3d2fbcc3 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -46,8 +46,6 @@
     "Send" : "Send",
     "Choose a file to add as attachment" : "Velg en fil å legge til som vedlegg",
     "Draft: " : "Kladd:",
-    "Mark unread" : "Marker som ulest",
-    "Mark read" : "Marker som lest",
     "Unselect" : "Velg bort",
     "Select" : "Velg",
     "Report this bug" : "Rapporter denne feilen",
diff --git a/l10n/nl.js b/l10n/nl.js
index 8bb3115cd..2e6becc86 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "Geen berichten in deze inbak",
     "No messages" : "Geen berichten",
     "Draft: " : "Concept:",
-    "Mark unimportant" : "Markeer als niet belangrijk",
-    "Mark important" : "Markeer als belangrijk",
-    "Mark unfavorite" : "Favoriet weghalen",
-    "Mark favorite" : "Markeer als favoriet",
-    "Mark unread" : "Markeer ongelezen",
-    "Mark read" : "Markeer gelezen",
     "Mark not spam" : "Markeer als geen-spam",
     "Mark as spam" : "Markeren als spam",
     "Unselect" : "Deselecteren",
     "Select" : "Selecteer",
     "Edit tags" : "Bewerken tags",
     "Move thread" : "Verplaats draadje",
-    "Create event" : "Creëer afspraak",
-    "Edit as new message" : "Bewerk als nieuw bericht",
     "Delete thread" : "Verwijder draadje",
+    "Edit as new message" : "Bewerk als nieuw bericht",
+    "Create event" : "Creëer afspraak",
     "Blind copy recipients only" : "Alleen ontvangers van blinde kopie",
     "No trash mailbox configured" : "Geen verwijderde berichtenmap ingesteld",
     "Could not delete message" : "Kon bericht niet verwijderen",
@@ -173,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "Antwoord alleen op afzender",
     "Forward" : "Doorsturen",
     "Move message" : "Verplaats bericht",
+    "Delete message" : "Verwijderen bericht",
     "View source" : "Bekijk bron",
     "Download thread data for debugging" : "Download draadgegevens voor debuggen",
-    "Delete message" : "Verwijderen bericht",
     "Message source" : "Bericht brontekst",
     "Message body" : "Berichttekst",
     "Import into calendar" : "Toevoegen aan agenda",
diff --git a/l10n/nl.json b/l10n/nl.json
index 733054d23..86c8e61e8 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "Geen berichten in deze inbak",
     "No messages" : "Geen berichten",
     "Draft: " : "Concept:",
-    "Mark unimportant" : "Markeer als niet belangrijk",
-    "Mark important" : "Markeer als belangrijk",
-    "Mark unfavorite" : "Favoriet weghalen",
-    "Mark favorite" : "Markeer als favoriet",
-    "Mark unread" : "Markeer ongelezen",
-    "Mark read" : "Markeer gelezen",
     "Mark not spam" : "Markeer als geen-spam",
     "Mark as spam" : "Markeren als spam",
     "Unselect" : "Deselecteren",
     "Select" : "Selecteer",
     "Edit tags" : "Bewerken tags",
     "Move thread" : "Verplaats draadje",
-    "Create event" : "Creëer afspraak",
-    "Edit as new message" : "Bewerk als nieuw bericht",
     "Delete thread" : "Verwijder draadje",
+    "Edit as new message" : "Bewerk als nieuw bericht",
+    "Create event" : "Creëer afspraak",
     "Blind copy recipients only" : "Alleen ontvangers van blinde kopie",
     "No trash mailbox configured" : "Geen verwijderde berichtenmap ingesteld",
     "Could not delete message" : "Kon bericht niet verwijderen",
@@ -171,9 +165,9 @@
     "Reply to sender only" : "Antwoord alleen op afzender",
     "Forward" : "Doorsturen",
     "Move message" : "Verplaats bericht",
+    "Delete message" : "Verwijderen bericht",
     "View source" : "Bekijk bron",
     "Download thread data for debugging" : "Download draadgegevens voor debuggen",
-    "Delete message" : "Verwijderen bericht",
     "Message source" : "Bericht brontekst",
     "Message body" : "Berichttekst",
     "Import into calendar" : "Toevoegen aan agenda",
diff --git a/l10n/pl.js b/l10n/pl.js
index 68308a2a9..595cb771f 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "Brak wiadomości w skrzynce pocztowej",
     "No messages" : "Brak wiadomości",
     "Draft: " : "Wersja robocza:",
-    "Mark unimportant" : "Oznacz jako nieważne",
-    "Mark important" : "Oznacz jako ważne",
-    "Mark unfavorite" : "Oznacz jako nieulubione",
-    "Mark favorite" : "Oznacz jako ulubione",
-    "Mark unread" : "Oznacz jako nie przeczytane",
-    "Mark read" : "Oznacz jako przeczytane",
+    "Unfavorite" : "Nie ulubione",
+    "Favorite" : "Ulubione",
+    "Unread" : "Nieprzeczytane",
+    "Read" : "Przeczytane",
+    "Unimportant" : "Nieważne",
     "Mark not spam" : "Nie spam",
     "Mark as spam" : "Oznacz jako spam",
     "Unselect" : "Odznacz",
     "Select" : "Zaznacz",
     "Edit tags" : "Edytuj etykiety",
     "Move thread" : "Przenieś wątek",
-    "Create event" : "Utwórz wydarzenie",
-    "Edit as new message" : "Edytuj jako nową wiadomość",
+    "More actions" : "Więcej akcji",
     "Delete thread" : "Usuń wątek",
+    "Edit as new message" : "Edytuj jako nową wiadomość",
+    "Create event" : "Utwórz wydarzenie",
     "Blind copy recipients only" : "Tylko dla niewidocznych kopii",
     "No trash mailbox configured" : "Nie skonfigurowano skrzynki pocztowej dla kosza",
     "Could not delete message" : "Nie udało się usunąć wiadomości",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "Odpowiedz tylko nadawcy",
     "Forward" : "Przekaż dalej",
     "Move message" : "Przenieś wiadomość",
+    "Delete message" : "Usuń wiadomość",
     "View source" : "Pokaż źródło",
     "Download thread data for debugging" : "Pobierz dane wątku do debugowania",
-    "Delete message" : "Usuń wiadomość",
     "Message source" : "Źródło wiadomości",
     "Message body" : "Treść wiadomości",
     "Import into calendar" : "Importuj do kalendarza",
diff --git a/l10n/pl.json b/l10n/pl.json
index 32f62c7ff..5cb6f9ece 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "Brak wiadomości w skrzynce pocztowej",
     "No messages" : "Brak wiadomości",
     "Draft: " : "Wersja robocza:",
-    "Mark unimportant" : "Oznacz jako nieważne",
-    "Mark important" : "Oznacz jako ważne",
-    "Mark unfavorite" : "Oznacz jako nieulubione",
-    "Mark favorite" : "Oznacz jako ulubione",
-    "Mark unread" : "Oznacz jako nie przeczytane",
-    "Mark read" : "Oznacz jako przeczytane",
+    "Unfavorite" : "Nie ulubione",
+    "Favorite" : "Ulubione",
+    "Unread" : "Nieprzeczytane",
+    "Read" : "Przeczytane",
+    "Unimportant" : "Nieważne",
     "Mark not spam" : "Nie spam",
     "Mark as spam" : "Oznacz jako spam",
     "Unselect" : "Odznacz",
     "Select" : "Zaznacz",
     "Edit tags" : "Edytuj etykiety",
     "Move thread" : "Przenieś wątek",
-    "Create event" : "Utwórz wydarzenie",
-    "Edit as new message" : "Edytuj jako nową wiadomość",
+    "More actions" : "Więcej akcji",
     "Delete thread" : "Usuń wątek",
+    "Edit as new message" : "Edytuj jako nową wiadomość",
+    "Create event" : "Utwórz wydarzenie",
     "Blind copy recipients only" : "Tylko dla niewidocznych kopii",
     "No trash mailbox configured" : "Nie skonfigurowano skrzynki pocztowej dla kosza",
     "Could not delete message" : "Nie udało się usunąć wiadomości",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "Odpowiedz tylko nadawcy",
     "Forward" : "Przekaż dalej",
     "Move message" : "Przenieś wiadomość",
+    "Delete message" : "Usuń wiadomość",
     "View source" : "Pokaż źródło",
     "Download thread data for debugging" : "Pobierz dane wątku do debugowania",
-    "Delete message" : "Usuń wiadomość",
     "Message source" : "Źródło wiadomości",
     "Message body" : "Treść wiadomości",
     "Import into calendar" : "Importuj do kalendarza",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 74ac2d752..2b4b529f2 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "Nenhuma mensagem nesta caixa de correio",
     "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
-    "Mark unimportant" : "Marcar como não importante",
-    "Mark important" : "Marcar como importante",
-    "Mark unfavorite" : "Desmarcar como favorito",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como não lida",
-    "Mark read" : "Marcar como lida",
     "Mark not spam" : "Marcar como não spam",
     "Mark as spam" : "Marcar como spam",
     "Unselect" : "Desmarcar",
     "Select" : "Selecionar",
     "Edit tags" : "Editar etiquetas",
     "Move thread" : "Mover tópico",
-    "Create event" : "Criar evento",
-    "Edit as new message" : "Editar como nova mensagem",
     "Delete thread" : "Apagar tópico",
+    "Edit as new message" : "Editar como nova mensagem",
+    "Create event" : "Criar evento",
     "Blind copy recipients only" : "Somente destinatários de cópia oculta",
     "No trash mailbox configured" : "Não há uma lixeira configurada",
     "Could not delete message" : "Não foi possível excluir a mensagem",
@@ -173,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "Responder somente ao remetente",
     "Forward" : "Encaminhar",
     "Move message" : "Mover mensagem",
+    "Delete message" : "Excluir mensagem",
     "View source" : "Ver o código-fonte",
     "Download thread data for debugging" : "Baixar dados da discussão para depuração",
-    "Delete message" : "Excluir mensagem",
     "Message source" : "Fonte da mensagem",
     "Message body" : "Conteúdo da mensagem",
     "Import into calendar" : "Importar para o calendário",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 03bffbe78..dbf2428f2 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "Nenhuma mensagem nesta caixa de correio",
     "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
-    "Mark unimportant" : "Marcar como não importante",
-    "Mark important" : "Marcar como importante",
-    "Mark unfavorite" : "Desmarcar como favorito",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como não lida",
-    "Mark read" : "Marcar como lida",
     "Mark not spam" : "Marcar como não spam",
     "Mark as spam" : "Marcar como spam",
     "Unselect" : "Desmarcar",
     "Select" : "Selecionar",
     "Edit tags" : "Editar etiquetas",
     "Move thread" : "Mover tópico",
-    "Create event" : "Criar evento",
-    "Edit as new message" : "Editar como nova mensagem",
     "Delete thread" : "Apagar tópico",
+    "Edit as new message" : "Editar como nova mensagem",
+    "Create event" : "Criar evento",
     "Blind copy recipients only" : "Somente destinatários de cópia oculta",
     "No trash mailbox configured" : "Não há uma lixeira configurada",
     "Could not delete message" : "Não foi possível excluir a mensagem",
@@ -171,9 +165,9 @@
     "Reply to sender only" : "Responder somente ao remetente",
     "Forward" : "Encaminhar",
     "Move message" : "Mover mensagem",
+    "Delete message" : "Excluir mensagem",
     "View source" : "Ver o código-fonte",
     "Download thread data for debugging" : "Baixar dados da discussão para depuração",
-    "Delete message" : "Excluir mensagem",
     "Message source" : "Fonte da mensagem",
     "Message body" : "Conteúdo da mensagem",
     "Import into calendar" : "Importar para o calendário",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index fd1f9646f..a42b4a063 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -89,11 +89,6 @@ OC.L10N.register(
     "Plain text" : "Texto simples",
     "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
-    "Mark unimportant" : "Marcar como sem importancia",
-    "Mark important" : "Marcar como importante",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como não lido",
-    "Mark read" : "Marcar como lido",
     "Mark as spam" : "Marcar como spam",
     "Select" : "Seleccionar",
     "Edit as new message" : "Editar como nova mensagem",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 3c1772a89..f17fbc932 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -87,11 +87,6 @@
     "Plain text" : "Texto simples",
     "No messages" : "Sem mensagens",
     "Draft: " : "Rascunho:",
-    "Mark unimportant" : "Marcar como sem importancia",
-    "Mark important" : "Marcar como importante",
-    "Mark favorite" : "Marcar como favorito",
-    "Mark unread" : "Marcar como não lido",
-    "Mark read" : "Marcar como lido",
     "Mark as spam" : "Marcar como spam",
     "Select" : "Seleccionar",
     "Edit as new message" : "Editar como nova mensagem",
diff --git a/l10n/ru.js b/l10n/ru.js
index 36653bfdd..60ecc7720 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "В этой папке нет сообщений",
     "No messages" : "Нет ни одного сообщения",
     "Draft: " : "Черновик:",
-    "Mark unimportant" : "Пометить как неважное",
-    "Mark important" : "Пометить как важное",
-    "Mark unfavorite" : "Убрать из избранного",
-    "Mark favorite" : "Добавить в избранное",
-    "Mark unread" : "Пометить как непрочитанное",
-    "Mark read" : "Пометить как прочитанное",
     "Mark not spam" : "Пометить как не являющееся спамом",
     "Mark as spam" : "Пометить как спам",
     "Unselect" : "Снять выбор",
     "Select" : "Выбрать",
     "Edit tags" : "Изменить метки",
     "Move thread" : "Переместить ветку",
-    "Create event" : "Создать событие",
-    "Edit as new message" : "Редактировать как новое сообщение",
     "Delete thread" : "Удалить ветку",
+    "Edit as new message" : "Редактировать как новое сообщение",
+    "Create event" : "Создать событие",
     "Blind copy recipients only" : "Только получатели скрытой копии",
     "No trash mailbox configured" : "Папка «Удалённые» не настроена",
     "Could not delete message" : "Не удалось удалить сообщение",
@@ -173,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "Ответить только отправителю",
     "Forward" : "Переслать",
     "Move message" : "Переместить сообщение",
+    "Delete message" : "Удалить сообщение",
     "View source" : "Просмотреть исходный текст",
     "Download thread data for debugging" : "Скачать ветку для отладки",
-    "Delete message" : "Удалить сообщение",
     "Message source" : "Исходный текст сообщения",
     "Message body" : "Тело сообщения",
     "Import into calendar" : "Импортировать в календарь",
diff --git a/l10n/ru.json b/l10n/ru.json
index 96a6d6e45..766a311ea 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "В этой папке нет сообщений",
     "No messages" : "Нет ни одного сообщения",
     "Draft: " : "Черновик:",
-    "Mark unimportant" : "Пометить как неважное",
-    "Mark important" : "Пометить как важное",
-    "Mark unfavorite" : "Убрать из избранного",
-    "Mark favorite" : "Добавить в избранное",
-    "Mark unread" : "Пометить как непрочитанное",
-    "Mark read" : "Пометить как прочитанное",
     "Mark not spam" : "Пометить как не являющееся спамом",
     "Mark as spam" : "Пометить как спам",
     "Unselect" : "Снять выбор",
     "Select" : "Выбрать",
     "Edit tags" : "Изменить метки",
     "Move thread" : "Переместить ветку",
-    "Create event" : "Создать событие",
-    "Edit as new message" : "Редактировать как новое сообщение",
     "Delete thread" : "Удалить ветку",
+    "Edit as new message" : "Редактировать как новое сообщение",
+    "Create event" : "Создать событие",
     "Blind copy recipients only" : "Только получатели скрытой копии",
     "No trash mailbox configured" : "Папка «Удалённые» не настроена",
     "Could not delete message" : "Не удалось удалить сообщение",
@@ -171,9 +165,9 @@
     "Reply to sender only" : "Ответить только отправителю",
     "Forward" : "Переслать",
     "Move message" : "Переместить сообщение",
+    "Delete message" : "Удалить сообщение",
     "View source" : "Просмотреть исходный текст",
     "Download thread data for debugging" : "Скачать ветку для отладки",
-    "Delete message" : "Удалить сообщение",
     "Message source" : "Исходный текст сообщения",
     "Message body" : "Тело сообщения",
     "Import into calendar" : "Импортировать в календарь",
diff --git a/l10n/sc.js b/l10n/sc.js
index 4ee5c00ca..c3a9034d0 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -116,20 +116,14 @@ OC.L10N.register(
     "No messages in this mailbox" : "Perunu messàgiu in custa casella de posta",
     "No messages" : "Perunu messàgiu",
     "Draft: " : "Brutacòpia:",
-    "Mark unimportant" : "Marca comente no importante",
-    "Mark important" : "Marca comente importante",
-    "Mark unfavorite" : "Marca comente no preferidu",
-    "Mark favorite" : "Marca comente preferidu",
-    "Mark unread" : "Marca comente no lèghidu",
-    "Mark read" : "Marca comente lèghidu",
     "Mark not spam" : "Marca comente no spam",
     "Mark as spam" : "Marca comente spam",
     "Unselect" : "Deseletziona",
     "Select" : "Seletziona",
     "Edit tags" : "Modìfica etichetas",
     "Move thread" : "Tràmuda dibata",
-    "Edit as new message" : "Modìfica comente messàgiu nou",
     "Delete thread" : "Cantzella dibata",
+    "Edit as new message" : "Modìfica comente messàgiu nou",
     "Blind copy recipients only" : "Isceti persones destinatàrias in còpia cuada",
     "No trash mailbox configured" : "Peruna casella de àliga cunfigurada",
     "Could not delete message" : "No at fatu a cantzellare su messàgiu",
@@ -162,9 +156,9 @@ OC.L10N.register(
     "Reply to sender only" : "Responde isceti a chi at imbiadu",
     "Forward" : "Torra a imbiare",
     "Move message" : "Tràmuda messàgiu",
+    "Delete message" : "Cantzella messàgiu",
     "View source" : "Visualiza sa fonte",
     "Download thread data for debugging" : "Iscàrriga is datos de sa dibata pro sa curretzione",
-    "Delete message" : "Cantzella messàgiu",
     "Message source" : "Fonte de su messàgiu",
     "Message body" : "Corpus de su messàgiu",
     "Import into calendar" : "Importa in su calendàriu",
diff --git a/l10n/sc.json b/l10n/sc.json
index 5939b24c0..628894a49 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -114,20 +114,14 @@
     "No messages in this mailbox" : "Perunu messàgiu in custa casella de posta",
     "No messages" : "Perunu messàgiu",
     "Draft: " : "Brutacòpia:",
-    "Mark unimportant" : "Marca comente no importante",
-    "Mark important" : "Marca comente importante",
-    "Mark unfavorite" : "Marca comente no preferidu",
-    "Mark favorite" : "Marca comente preferidu",
-    "Mark unread" : "Marca comente no lèghidu",
-    "Mark read" : "Marca comente lèghidu",
     "Mark not spam" : "Marca comente no spam",
     "Mark as spam" : "Marca comente spam",
     "Unselect" : "Deseletziona",
     "Select" : "Seletziona",
     "Edit tags" : "Modìfica etichetas",
     "Move thread" : "Tràmuda dibata",
-    "Edit as new message" : "Modìfica comente messàgiu nou",
     "Delete thread" : "Cantzella dibata",
+    "Edit as new message" : "Modìfica comente messàgiu nou",
     "Blind copy recipients only" : "Isceti persones destinatàrias in còpia cuada",
     "No trash mailbox configured" : "Peruna casella de àliga cunfigurada",
     "Could not delete message" : "No at fatu a cantzellare su messàgiu",
@@ -160,9 +154,9 @@
     "Reply to sender only" : "Responde isceti a chi at imbiadu",
     "Forward" : "Torra a imbiare",
     "Move message" : "Tràmuda messàgiu",
+    "Delete message" : "Cantzella messàgiu",
     "View source" : "Visualiza sa fonte",
     "Download thread data for debugging" : "Iscàrriga is datos de sa dibata pro sa curretzione",
-    "Delete message" : "Cantzella messàgiu",
     "Message source" : "Fonte de su messàgiu",
     "Message body" : "Corpus de su messàgiu",
     "Import into calendar" : "Importa in su calendàriu",
diff --git a/l10n/sk.js b/l10n/sk.js
index ed8f5f4ba..37e80a8ff 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "V tejto poštovej schránke sa nenachádzajú žiadne správy",
     "No messages" : "Žiadne správy",
     "Draft: " : "Koncept: ",
-    "Mark unimportant" : "Označiť ako nedôležité",
-    "Mark important" : "Označiť ako dôležité",
-    "Mark unfavorite" : "Zrušiť označenie ako obľúbené",
-    "Mark favorite" : "Označiť ako obľúbené",
-    "Mark unread" : "Označiť ako neprečítané",
-    "Mark read" : "Označiť ako prečítané",
+    "Unfavorite" : "Odstrániť z obľúbených",
+    "Favorite" : "Obľúbené",
+    "Unread" : "Neprečítané",
+    "Read" : "Prečítané",
+    "Unimportant" : "Nedôležité",
     "Mark not spam" : "Zrušiť označenie ako odpad",
     "Mark as spam" : "Označiť ako odpad",
     "Unselect" : "Zrušiť výber",
     "Select" : "Vybrať",
     "Edit tags" : "Upraviť štítky",
     "Move thread" : "Presunúť konverzáciu",
-    "Create event" : "Vytvoriť udalosť",
-    "Edit as new message" : "Upraviť ako novú správu",
+    "More actions" : "Viac akcií",
     "Delete thread" : "Vymazať konverzáciu",
+    "Edit as new message" : "Upraviť ako novú správu",
+    "Create event" : "Vytvoriť udalosť",
     "Blind copy recipients only" : "Iba príjemcovia slepej kópie",
     "No trash mailbox configured" : "Nie je nakonfigurovaný žiadny priečinok pre Kôš",
     "Could not delete message" : "Správu sa nepodarilo odstrániť",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "Odpovedať iba odosielateľovi",
     "Forward" : "Preposlať",
     "Move message" : "Presunúť správu",
+    "Delete message" : "Zmazať správu",
     "View source" : "Zobraziť zdrojový kód",
     "Download thread data for debugging" : "Prevziať dáta vlákna pre účely ladenia",
-    "Delete message" : "Zmazať správu",
     "Message source" : "Zdrojový kód správy",
     "Message body" : "Telo správy",
     "Import into calendar" : "Importovať do kalendára",
diff --git a/l10n/sk.json b/l10n/sk.json
index d201a16d9..1e095e380 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "V tejto poštovej schránke sa nenachádzajú žiadne správy",
     "No messages" : "Žiadne správy",
     "Draft: " : "Koncept: ",
-    "Mark unimportant" : "Označiť ako nedôležité",
-    "Mark important" : "Označiť ako dôležité",
-    "Mark unfavorite" : "Zrušiť označenie ako obľúbené",
-    "Mark favorite" : "Označiť ako obľúbené",
-    "Mark unread" : "Označiť ako neprečítané",
-    "Mark read" : "Označiť ako prečítané",
+    "Unfavorite" : "Odstrániť z obľúbených",
+    "Favorite" : "Obľúbené",
+    "Unread" : "Neprečítané",
+    "Read" : "Prečítané",
+    "Unimportant" : "Nedôležité",
     "Mark not spam" : "Zrušiť označenie ako odpad",
     "Mark as spam" : "Označiť ako odpad",
     "Unselect" : "Zrušiť výber",
     "Select" : "Vybrať",
     "Edit tags" : "Upraviť štítky",
     "Move thread" : "Presunúť konverzáciu",
-    "Create event" : "Vytvoriť udalosť",
-    "Edit as new message" : "Upraviť ako novú správu",
+    "More actions" : "Viac akcií",
     "Delete thread" : "Vymazať konverzáciu",
+    "Edit as new message" : "Upraviť ako novú správu",
+    "Create event" : "Vytvoriť udalosť",
     "Blind copy recipients only" : "Iba príjemcovia slepej kópie",
     "No trash mailbox configured" : "Nie je nakonfigurovaný žiadny priečinok pre Kôš",
     "Could not delete message" : "Správu sa nepodarilo odstrániť",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "Odpovedať iba odosielateľovi",
     "Forward" : "Preposlať",
     "Move message" : "Presunúť správu",
+    "Delete message" : "Zmazať správu",
     "View source" : "Zobraziť zdrojový kód",
     "Download thread data for debugging" : "Prevziať dáta vlákna pre účely ladenia",
-    "Delete message" : "Zmazať správu",
     "Message source" : "Zdrojový kód správy",
     "Message body" : "Telo správy",
     "Import into calendar" : "Importovať do kalendára",
diff --git a/l10n/sl.js b/l10n/sl.js
index d806790c1..1567cef62 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "V poštnem predalu ni sporočil.",
     "No messages" : "Ni sporočil",
     "Draft: " : "Osnutek:",
-    "Mark unimportant" : "Označi kot nepomembno",
-    "Mark important" : "Označi kot pomembno",
-    "Mark unfavorite" : "Označi kot nepriljubljeno",
-    "Mark favorite" : "Označi kot priljubljeno",
-    "Mark unread" : "Označi kot neprebrano",
-    "Mark read" : "Označi kot prebrano",
     "Mark not spam" : "Označi kot običajno",
     "Mark as spam" : "Označi kot neželeno",
     "Unselect" : "Odstrani izbor",
     "Select" : "Izbor",
     "Edit tags" : "Uredi oznake",
     "Move thread" : "Premakni nit",
-    "Create event" : "Ustvari dogodek",
-    "Edit as new message" : "Uredi kot novo sporočilo",
     "Delete thread" : "Izbriši nit",
+    "Edit as new message" : "Uredi kot novo sporočilo",
+    "Create event" : "Ustvari dogodek",
     "Blind copy recipients only" : "Le prejemniki skrite kopije",
     "No trash mailbox configured" : "Ni nastavljenega poštne mape za smeti",
     "Could not delete message" : "Sporočila ni mogoče izbrisati",
@@ -171,9 +165,9 @@ OC.L10N.register(
     "Reply to sender only" : "Odgovori le pošiljatelju",
     "Forward" : "Posreduj",
     "Move message" : "Premakni sporočilo",
+    "Delete message" : "Izbriši sporočilo",
     "View source" : "Pokaži kode sporočila",
     "Download thread data for debugging" : "Prejmi podatke niti za razhroščevanje",
-    "Delete message" : "Izbriši sporočilo",
     "Message source" : "Vir sporočila",
     "Message body" : "Telo sporočila",
     "Import into calendar" : "Uvozi v koledar",
diff --git a/l10n/sl.json b/l10n/sl.json
index 8b8ce9d1b..03b28d59a 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "V poštnem predalu ni sporočil.",
     "No messages" : "Ni sporočil",
     "Draft: " : "Osnutek:",
-    "Mark unimportant" : "Označi kot nepomembno",
-    "Mark important" : "Označi kot pomembno",
-    "Mark unfavorite" : "Označi kot nepriljubljeno",
-    "Mark favorite" : "Označi kot priljubljeno",
-    "Mark unread" : "Označi kot neprebrano",
-    "Mark read" : "Označi kot prebrano",
     "Mark not spam" : "Označi kot običajno",
     "Mark as spam" : "Označi kot neželeno",
     "Unselect" : "Odstrani izbor",
     "Select" : "Izbor",
     "Edit tags" : "Uredi oznake",
     "Move thread" : "Premakni nit",
-    "Create event" : "Ustvari dogodek",
-    "Edit as new message" : "Uredi kot novo sporočilo",
     "Delete thread" : "Izbriši nit",
+    "Edit as new message" : "Uredi kot novo sporočilo",
+    "Create event" : "Ustvari dogodek",
     "Blind copy recipients only" : "Le prejemniki skrite kopije",
     "No trash mailbox configured" : "Ni nastavljenega poštne mape za smeti",
     "Could not delete message" : "Sporočila ni mogoče izbrisati",
@@ -169,9 +163,9 @@
     "Reply to sender only" : "Odgovori le pošiljatelju",
     "Forward" : "Posreduj",
     "Move message" : "Premakni sporočilo",
+    "Delete message" : "Izbriši sporočilo",
     "View source" : "Pokaži kode sporočila",
     "Download thread data for debugging" : "Prejmi podatke niti za razhroščevanje",
-    "Delete message" : "Izbriši sporočilo",
     "Message source" : "Vir sporočila",
     "Message body" : "Telo sporočila",
     "Import into calendar" : "Uvozi v koledar",
diff --git a/l10n/sq.js b/l10n/sq.js
index 4bc9f49bf..6c88268ce 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Message sent!" : "Mesazhi u dërgua!",
     "Send" : "Dërgo",
     "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
-    "Mark read" : "Shëno të lexuar",
     "Select" : "Zgjidhni",
     "Choose" : "Zgjidhni",
     "Favorites" : "Favorites",
diff --git a/l10n/sq.json b/l10n/sq.json
index 846072f7c..adc4b6232 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -31,7 +31,6 @@
     "Message sent!" : "Mesazhi u dërgua!",
     "Send" : "Dërgo",
     "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
-    "Mark read" : "Shëno të lexuar",
     "Select" : "Zgjidhni",
     "Choose" : "Zgjidhni",
     "Favorites" : "Favorites",
diff --git a/l10n/sr.js b/l10n/sr.js
index 1546b29f5..0bb1639a3 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -83,12 +83,6 @@ OC.L10N.register(
     "Rich text" : "Обогаћени текст",
     "No messages" : "Нема порука",
     "Draft: " : "Нацрт: ",
-    "Mark unimportant" : "Означи да није битно",
-    "Mark important" : "Означи као битно",
-    "Mark unfavorite" : "Склони ознаку да је омиљено",
-    "Mark favorite" : "Означи као омиљено",
-    "Mark unread" : "Означи као непрочитано",
-    "Mark read" : "Означи као прочитано",
     "Mark not spam" : "Означи да није спам",
     "Mark as spam" : "Означи као спам",
     "Unselect" : "Уклони избор",
diff --git a/l10n/sr.json b/l10n/sr.json
index 3e8549d86..f6c7b4e07 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -81,12 +81,6 @@
     "Rich text" : "Обогаћени текст",
     "No messages" : "Нема порука",
     "Draft: " : "Нацрт: ",
-    "Mark unimportant" : "Означи да није битно",
-    "Mark important" : "Означи као битно",
-    "Mark unfavorite" : "Склони ознаку да је омиљено",
-    "Mark favorite" : "Означи као омиљено",
-    "Mark unread" : "Означи као непрочитано",
-    "Mark read" : "Означи као прочитано",
     "Mark not spam" : "Означи да није спам",
     "Mark as spam" : "Означи као спам",
     "Unselect" : "Уклони избор",
diff --git a/l10n/sv.js b/l10n/sv.js
index 63773602c..35f22058f 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -105,21 +105,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "Inga meddelanden i den här brevlådan",
     "No messages" : "Inga meddelanden",
     "Draft: " : "Utkast:",
-    "Mark unimportant" : "Markera som oviktigt",
-    "Mark important" : "Markera som viktigt",
-    "Mark unfavorite" : "Ta bort favorit-markering",
-    "Mark favorite" : "Markera som favorit",
-    "Mark unread" : "Markera som oläst",
-    "Mark read" : "Markera som läst",
     "Mark not spam" : "Markera som ej skräppost",
     "Mark as spam" : "Markera som skräppost",
     "Unselect" : "Avmarkera",
     "Select" : "Välj",
     "Edit tags" : "Redigera taggar",
     "Move thread" : "Flytta tråd",
-    "Create event" : "Skapa evenemang",
-    "Edit as new message" : "Redigera som nytt meddelande",
     "Delete thread" : "Radera tråd",
+    "Edit as new message" : "Redigera som nytt meddelande",
+    "Create event" : "Skapa evenemang",
     "Blind copy recipients only" : "Endast mottagare för blindkopior",
     "Could not delete message" : "Kunde inte radera meddelande",
     "Load more" : "Ladda mer",
@@ -147,8 +141,8 @@ OC.L10N.register(
     "Reply to sender only" : "Svara endast avsändaren",
     "Forward" : "Vidarebefordra",
     "Move message" : "Flytta meddelande",
-    "View source" : "Visa källa",
     "Delete message" : "Radera meddelande",
+    "View source" : "Visa källa",
     "Message source" : "Meddelandekälla",
     "Message body" : "Meddelandetext",
     "Import into calendar" : "Importera till kalender",
diff --git a/l10n/sv.json b/l10n/sv.json
index 587043772..c0dfd52ce 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -103,21 +103,15 @@
     "No messages in this mailbox" : "Inga meddelanden i den här brevlådan",
     "No messages" : "Inga meddelanden",
     "Draft: " : "Utkast:",
-    "Mark unimportant" : "Markera som oviktigt",
-    "Mark important" : "Markera som viktigt",
-    "Mark unfavorite" : "Ta bort favorit-markering",
-    "Mark favorite" : "Markera som favorit",
-    "Mark unread" : "Markera som oläst",
-    "Mark read" : "Markera som läst",
     "Mark not spam" : "Markera som ej skräppost",
     "Mark as spam" : "Markera som skräppost",
     "Unselect" : "Avmarkera",
     "Select" : "Välj",
     "Edit tags" : "Redigera taggar",
     "Move thread" : "Flytta tråd",
-    "Create event" : "Skapa evenemang",
-    "Edit as new message" : "Redigera som nytt meddelande",
     "Delete thread" : "Radera tråd",
+    "Edit as new message" : "Redigera som nytt meddelande",
+    "Create event" : "Skapa evenemang",
     "Blind copy recipients only" : "Endast mottagare för blindkopior",
     "Could not delete message" : "Kunde inte radera meddelande",
     "Load more" : "Ladda mer",
@@ -145,8 +139,8 @@
     "Reply to sender only" : "Svara endast avsändaren",
     "Forward" : "Vidarebefordra",
     "Move message" : "Flytta meddelande",
-    "View source" : "Visa källa",
     "Delete message" : "Radera meddelande",
+    "View source" : "Visa källa",
     "Message source" : "Meddelandekälla",
     "Message body" : "Meddelandetext",
     "Import into calendar" : "Importera till kalender",
diff --git a/l10n/tr.js b/l10n/tr.js
index 090b0e140..90e9b0774 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "Bu e-posta kutusunda herhangi bir ileti yok",
     "No messages" : "Herhangi bir ileti yok",
     "Draft: " : "Taslak",
-    "Mark unimportant" : "Önemsiz olarak işaretle",
-    "Mark important" : "Önemli olarak işaretle",
-    "Mark unfavorite" : "Sık kullanılanlardan kaldır",
-    "Mark favorite" : "Sık kullanılanlara ekle",
-    "Mark unread" : "Okunmamış olarak işaretle",
-    "Mark read" : "Okunmuş olarak işaretle",
+    "Unfavorite" : "Sık kullanılanlardan kaldır",
+    "Favorite" : "Sık kullanılanlara ekle",
+    "Unread" : "Okunmamış",
+    "Read" : "Okunmuş",
+    "Unimportant" : "Önemsiz",
     "Mark not spam" : "İstenmeyen değil olarak işaretle",
     "Mark as spam" : "İstenmeyen olarak işaretle",
     "Unselect" : "Bırak",
     "Select" : "Seç",
     "Edit tags" : "Etiketleri düzenle",
     "Move thread" : "Konuyu taşı",
-    "Create event" : "Etkinlik ekle",
-    "Edit as new message" : "Yeni ileti olarak düzenle",
+    "More actions" : "Diğer işlemler",
     "Delete thread" : "Konuyu sil",
+    "Edit as new message" : "Yeni ileti olarak düzenle",
+    "Create event" : "Etkinlik ekle",
     "Blind copy recipients only" : "Alıcılar gizli kopya olarak eklensin",
     "No trash mailbox configured" : "Silinmiş iletiler kutusu yapılandırılmamış",
     "Could not delete message" : "İleti silinemedi",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "Yalnız gönderene yanıtla",
     "Forward" : "İlet",
     "Move message" : "İletiyi taşı",
+    "Delete message" : "İletiyi sil",
     "View source" : "Kaynağı görüntüle",
     "Download thread data for debugging" : "Hata ayıklama için görüşme verilerini indir",
-    "Delete message" : "İletiyi sil",
     "Message source" : "İleti kaynağı",
     "Message body" : "İleti gövdesi",
     "Import into calendar" : "Şu takvimin içine aktar",
diff --git a/l10n/tr.json b/l10n/tr.json
index 727931183..1627528ae 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "Bu e-posta kutusunda herhangi bir ileti yok",
     "No messages" : "Herhangi bir ileti yok",
     "Draft: " : "Taslak",
-    "Mark unimportant" : "Önemsiz olarak işaretle",
-    "Mark important" : "Önemli olarak işaretle",
-    "Mark unfavorite" : "Sık kullanılanlardan kaldır",
-    "Mark favorite" : "Sık kullanılanlara ekle",
-    "Mark unread" : "Okunmamış olarak işaretle",
-    "Mark read" : "Okunmuş olarak işaretle",
+    "Unfavorite" : "Sık kullanılanlardan kaldır",
+    "Favorite" : "Sık kullanılanlara ekle",
+    "Unread" : "Okunmamış",
+    "Read" : "Okunmuş",
+    "Unimportant" : "Önemsiz",
     "Mark not spam" : "İstenmeyen değil olarak işaretle",
     "Mark as spam" : "İstenmeyen olarak işaretle",
     "Unselect" : "Bırak",
     "Select" : "Seç",
     "Edit tags" : "Etiketleri düzenle",
     "Move thread" : "Konuyu taşı",
-    "Create event" : "Etkinlik ekle",
-    "Edit as new message" : "Yeni ileti olarak düzenle",
+    "More actions" : "Diğer işlemler",
     "Delete thread" : "Konuyu sil",
+    "Edit as new message" : "Yeni ileti olarak düzenle",
+    "Create event" : "Etkinlik ekle",
     "Blind copy recipients only" : "Alıcılar gizli kopya olarak eklensin",
     "No trash mailbox configured" : "Silinmiş iletiler kutusu yapılandırılmamış",
     "Could not delete message" : "İleti silinemedi",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "Yalnız gönderene yanıtla",
     "Forward" : "İlet",
     "Move message" : "İletiyi taşı",
+    "Delete message" : "İletiyi sil",
     "View source" : "Kaynağı görüntüle",
     "Download thread data for debugging" : "Hata ayıklama için görüşme verilerini indir",
-    "Delete message" : "İletiyi sil",
     "Message source" : "İleti kaynağı",
     "Message body" : "İleti gövdesi",
     "Import into calendar" : "Şu takvimin içine aktar",
diff --git a/l10n/uk.js b/l10n/uk.js
index 930462e39..46ff1dfa5 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -76,10 +76,6 @@ OC.L10N.register(
     "Rich text" : "Текст з форматуванням",
     "No messages" : "Відсутні повідомлення",
     "Draft: " : "Чернетка:",
-    "Mark unimportant" : "Позначити як неважливе",
-    "Mark important" : "Позначити як важливе",
-    "Mark unread" : "Позначити як не прочитане",
-    "Mark read" : "Позначити як прочитане",
     "Mark not spam" : "Позначити як не спам",
     "Mark as spam" : "Позначити як спам",
     "Unselect" : "Зняти виділення",
diff --git a/l10n/uk.json b/l10n/uk.json
index 4891da239..3cb35229a 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -74,10 +74,6 @@
     "Rich text" : "Текст з форматуванням",
     "No messages" : "Відсутні повідомлення",
     "Draft: " : "Чернетка:",
-    "Mark unimportant" : "Позначити як неважливе",
-    "Mark important" : "Позначити як важливе",
-    "Mark unread" : "Позначити як не прочитане",
-    "Mark read" : "Позначити як прочитане",
     "Mark not spam" : "Позначити як не спам",
     "Mark as spam" : "Позначити як спам",
     "Unselect" : "Зняти виділення",
diff --git a/l10n/vi.js b/l10n/vi.js
index 8351e7163..90b838abf 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -95,12 +95,6 @@ OC.L10N.register(
     "No messages in this mailbox" : "Không có thư nào trong hộp thư này",
     "No messages" : "Không có tin nhắn",
     "Draft: " : "Bản nháp: ",
-    "Mark unimportant" : "Đánh dấu là không quan trọng",
-    "Mark important" : "Đánh dấu là quan trọng",
-    "Mark unfavorite" : "Đánh dấu là không yêu thích",
-    "Mark favorite" : "Đánh dấu yêu thích",
-    "Mark unread" : "Đánh dấu là chưa đọc",
-    "Mark read" : "Đánh dấu là đã đọc",
     "Mark not spam" : "Đánh dấu không phải là thư rác",
     "Mark as spam" : "đánh dấu spam",
     "Unselect" : "Bỏ chọn",
diff --git a/l10n/vi.json b/l10n/vi.json
index 7f658f85b..6e23ae653 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -93,12 +93,6 @@
     "No messages in this mailbox" : "Không có thư nào trong hộp thư này",
     "No messages" : "Không có tin nhắn",
     "Draft: " : "Bản nháp: ",
-    "Mark unimportant" : "Đánh dấu là không quan trọng",
-    "Mark important" : "Đánh dấu là quan trọng",
-    "Mark unfavorite" : "Đánh dấu là không yêu thích",
-    "Mark favorite" : "Đánh dấu yêu thích",
-    "Mark unread" : "Đánh dấu là chưa đọc",
-    "Mark read" : "Đánh dấu là đã đọc",
     "Mark not spam" : "Đánh dấu không phải là thư rác",
     "Mark as spam" : "đánh dấu spam",
     "Unselect" : "Bỏ chọn",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index a920dbbbb..405b97eef 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -120,21 +120,15 @@ OC.L10N.register(
     "No messages in this mailbox" : "此邮箱中没有消息",
     "No messages" : "没有消息",
     "Draft: " : "草稿: ",
-    "Mark unimportant" : "标记为不重要",
-    "Mark important" : "标记为重要",
-    "Mark unfavorite" : "取消收藏",
-    "Mark favorite" : "收藏",
-    "Mark unread" : "标记为未读",
-    "Mark read" : "标记为已读",
     "Mark not spam" : "标记为非垃圾邮件",
     "Mark as spam" : "标记为垃圾邮件",
     "Unselect" : "取消选择",
     "Select" : "选择",
     "Edit tags" : "编辑标签",
     "Move thread" : "移动线程",
-    "Create event" : "创建事件",
-    "Edit as new message" : "编辑为新消息",
     "Delete thread" : "删除线程",
+    "Edit as new message" : "编辑为新消息",
+    "Create event" : "创建事件",
     "Blind copy recipients only" : "仅向收件人发送无信头副本",
     "No trash mailbox configured" : "没有配置垃圾邮箱",
     "Could not delete message" : "无法删除消息",
@@ -173,9 +167,9 @@ OC.L10N.register(
     "Reply to sender only" : "只回复发送者",
     "Forward" : "转发",
     "Move message" : "移动消息",
+    "Delete message" : "删除消息",
     "View source" : "查看来源",
     "Download thread data for debugging" : "下载线程数据以进行调试",
-    "Delete message" : "删除消息",
     "Message source" : "消息来源",
     "Message body" : "消息正文",
     "Import into calendar" : "导入到日历",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 476f58edd..2529dc9ef 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -118,21 +118,15 @@
     "No messages in this mailbox" : "此邮箱中没有消息",
     "No messages" : "没有消息",
     "Draft: " : "草稿: ",
-    "Mark unimportant" : "标记为不重要",
-    "Mark important" : "标记为重要",
-    "Mark unfavorite" : "取消收藏",
-    "Mark favorite" : "收藏",
-    "Mark unread" : "标记为未读",
-    "Mark read" : "标记为已读",
     "Mark not spam" : "标记为非垃圾邮件",
     "Mark as spam" : "标记为垃圾邮件",
     "Unselect" : "取消选择",
     "Select" : "选择",
     "Edit tags" : "编辑标签",
     "Move thread" : "移动线程",
-    "Create event" : "创建事件",
-    "Edit as new message" : "编辑为新消息",
     "Delete thread" : "删除线程",
+    "Edit as new message" : "编辑为新消息",
+    "Create event" : "创建事件",
     "Blind copy recipients only" : "仅向收件人发送无信头副本",
     "No trash mailbox configured" : "没有配置垃圾邮箱",
     "Could not delete message" : "无法删除消息",
@@ -171,9 +165,9 @@
     "Reply to sender only" : "只回复发送者",
     "Forward" : "转发",
     "Move message" : "移动消息",
+    "Delete message" : "删除消息",
     "View source" : "查看来源",
     "Download thread data for debugging" : "下载线程数据以进行调试",
-    "Delete message" : "删除消息",
     "Message source" : "消息来源",
     "Message body" : "消息正文",
     "Import into calendar" : "导入到日历",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 9a93e1479..b541b8986 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "此信箱中沒有郵件",
     "No messages" : "沒有郵件",
     "Draft: " : "草稿：",
-    "Mark unimportant" : "標記為不重要",
-    "Mark important" : "標記為重要",
-    "Mark unfavorite" : "取消標記我的最愛",
-    "Mark favorite" : "標記為我的最愛",
-    "Mark unread" : "標記為未讀",
-    "Mark read" : "標記為已讀",
+    "Unfavorite" : "取消我的最愛",
+    "Favorite" : "我的最愛",
+    "Unread" : "未讀",
+    "Read" : "已讀",
+    "Unimportant" : "不重要",
     "Mark not spam" : "標記為非垃圾郵件",
     "Mark as spam" : "標記為垃圾郵件",
     "Unselect" : "取消選擇",
     "Select" : "選擇",
     "Edit tags" : "編輯標籤",
     "Move thread" : "移動主題",
-    "Create event" : "創建活動",
-    "Edit as new message" : "以新郵件的方式編輯",
+    "More actions" : "更多操作",
     "Delete thread" : "刪除主題",
+    "Edit as new message" : "以新郵件的方式編輯",
+    "Create event" : "創建活動",
     "Blind copy recipients only" : "僅密件副本收件者",
     "No trash mailbox configured" : "未設定垃圾信箱",
     "Could not delete message" : "無法刪除郵件",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "僅回覆寄件人",
     "Forward" : "轉寄",
     "Move message" : "移動訊息",
+    "Delete message" : "刪除訊息",
     "View source" : "檢視原始碼",
     "Download thread data for debugging" : "下載郵件串的資料以供除錯",
-    "Delete message" : "刪除訊息",
     "Message source" : "郵件原始碼",
     "Message body" : "郵件正文",
     "Import into calendar" : "導入到日曆",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index d7a71cc7c..0701f0341 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "此信箱中沒有郵件",
     "No messages" : "沒有郵件",
     "Draft: " : "草稿：",
-    "Mark unimportant" : "標記為不重要",
-    "Mark important" : "標記為重要",
-    "Mark unfavorite" : "取消標記我的最愛",
-    "Mark favorite" : "標記為我的最愛",
-    "Mark unread" : "標記為未讀",
-    "Mark read" : "標記為已讀",
+    "Unfavorite" : "取消我的最愛",
+    "Favorite" : "我的最愛",
+    "Unread" : "未讀",
+    "Read" : "已讀",
+    "Unimportant" : "不重要",
     "Mark not spam" : "標記為非垃圾郵件",
     "Mark as spam" : "標記為垃圾郵件",
     "Unselect" : "取消選擇",
     "Select" : "選擇",
     "Edit tags" : "編輯標籤",
     "Move thread" : "移動主題",
-    "Create event" : "創建活動",
-    "Edit as new message" : "以新郵件的方式編輯",
+    "More actions" : "更多操作",
     "Delete thread" : "刪除主題",
+    "Edit as new message" : "以新郵件的方式編輯",
+    "Create event" : "創建活動",
     "Blind copy recipients only" : "僅密件副本收件者",
     "No trash mailbox configured" : "未設定垃圾信箱",
     "Could not delete message" : "無法刪除郵件",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "僅回覆寄件人",
     "Forward" : "轉寄",
     "Move message" : "移動訊息",
+    "Delete message" : "刪除訊息",
     "View source" : "檢視原始碼",
     "Download thread data for debugging" : "下載郵件串的資料以供除錯",
-    "Delete message" : "刪除訊息",
     "Message source" : "郵件原始碼",
     "Message body" : "郵件正文",
     "Import into calendar" : "導入到日曆",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 7db8959e8..d1e3c99b5 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -120,21 +120,21 @@ OC.L10N.register(
     "No messages in this mailbox" : "此信箱中沒有郵件",
     "No messages" : "沒有郵件",
     "Draft: " : "草稿：",
-    "Mark unimportant" : "標記為不重要",
-    "Mark important" : "標記為重要",
-    "Mark unfavorite" : "取消標記我的最愛",
-    "Mark favorite" : "標記為我的最愛",
-    "Mark unread" : "標記為未讀",
-    "Mark read" : "標記為已讀",
+    "Unfavorite" : "取消收藏",
+    "Favorite" : "收藏",
+    "Unread" : "未讀",
+    "Read" : "已讀",
+    "Unimportant" : "不重要",
     "Mark not spam" : "標記為非垃圾郵件",
     "Mark as spam" : "標記為垃圾郵件",
     "Unselect" : "取消選取",
     "Select" : "選取",
     "Edit tags" : "編輯標籤",
     "Move thread" : "移動討論串",
-    "Create event" : "建立事件",
-    "Edit as new message" : "以新郵件的方式編輯",
+    "More actions" : "更多動作",
     "Delete thread" : "刪除討論串",
+    "Edit as new message" : "以新郵件的方式編輯",
+    "Create event" : "建立事件",
     "Blind copy recipients only" : "僅密件副本收件者",
     "No trash mailbox configured" : "未設定垃圾信箱",
     "Could not delete message" : "無法刪除郵件",
@@ -173,9 +173,9 @@ OC.L10N.register(
     "Reply to sender only" : "僅回覆寄件者",
     "Forward" : "轉寄",
     "Move message" : "移動訊息",
+    "Delete message" : "刪除訊息",
     "View source" : "檢視原始碼",
     "Download thread data for debugging" : "下載郵件串的資料以供除錯",
-    "Delete message" : "刪除訊息",
     "Message source" : "郵件原始碼",
     "Message body" : "郵件正文",
     "Import into calendar" : "匯入到日曆",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 2d46fdba0..46b9880da 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -118,21 +118,21 @@
     "No messages in this mailbox" : "此信箱中沒有郵件",
     "No messages" : "沒有郵件",
     "Draft: " : "草稿：",
-    "Mark unimportant" : "標記為不重要",
-    "Mark important" : "標記為重要",
-    "Mark unfavorite" : "取消標記我的最愛",
-    "Mark favorite" : "標記為我的最愛",
-    "Mark unread" : "標記為未讀",
-    "Mark read" : "標記為已讀",
+    "Unfavorite" : "取消收藏",
+    "Favorite" : "收藏",
+    "Unread" : "未讀",
+    "Read" : "已讀",
+    "Unimportant" : "不重要",
     "Mark not spam" : "標記為非垃圾郵件",
     "Mark as spam" : "標記為垃圾郵件",
     "Unselect" : "取消選取",
     "Select" : "選取",
     "Edit tags" : "編輯標籤",
     "Move thread" : "移動討論串",
-    "Create event" : "建立事件",
-    "Edit as new message" : "以新郵件的方式編輯",
+    "More actions" : "更多動作",
     "Delete thread" : "刪除討論串",
+    "Edit as new message" : "以新郵件的方式編輯",
+    "Create event" : "建立事件",
     "Blind copy recipients only" : "僅密件副本收件者",
     "No trash mailbox configured" : "未設定垃圾信箱",
     "Could not delete message" : "無法刪除郵件",
@@ -171,9 +171,9 @@
     "Reply to sender only" : "僅回覆寄件者",
     "Forward" : "轉寄",
     "Move message" : "移動訊息",
+    "Delete message" : "刪除訊息",
     "View source" : "檢視原始碼",
     "Download thread data for debugging" : "下載郵件串的資料以供除錯",
-    "Delete message" : "刪除訊息",
     "Message source" : "郵件原始碼",
     "Message body" : "郵件正文",
     "Import into calendar" : "匯入到日曆",
diff --git a/lib/BackgroundJob/CleanupJob.php b/lib/BackgroundJob/CleanupJob.php
index 96270db24..faf857afc 100644
--- a/lib/BackgroundJob/CleanupJob.php
+++ b/lib/BackgroundJob/CleanupJob.php
@@ -28,6 +28,8 @@ namespace OCA\Mail\BackgroundJob;
 use OCA\Mail\Service\CleanupService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
+use function defined;
+use function method_exists;
 
 class CleanupJob extends TimedJob {
 
@@ -40,6 +42,12 @@ class CleanupJob extends TimedJob {
 		$this->cleanupService = $cleanupService;
 
 		$this->setInterval(24 * 60 * 60);
+		/**
+		 * @todo remove checks with 24+
+		 */
+		if (defined('\OCP\BackgroundJob\IJob::TIME_INSENSITIVE') && method_exists($this, 'setTimeSensitivity')) {
+			$this->setTimeSensitivity(self::TIME_INSENSITIVE);
+		}
 	}
 
 	protected function run($argument): void {
diff --git a/lib/BackgroundJob/MigrateImportantJob.php b/lib/BackgroundJob/MigrateImportantJob.php
index b094ec126..e9b0724d8 100644
--- a/lib/BackgroundJob/MigrateImportantJob.php
+++ b/lib/BackgroundJob/MigrateImportantJob.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright 2021 Anna Larch <anna.larch@nextcloud.com>
  *
diff --git a/lib/BackgroundJob/SyncJob.php b/lib/BackgroundJob/SyncJob.php
index ba9998016..548d238e7 100644
--- a/lib/BackgroundJob/SyncJob.php
+++ b/lib/BackgroundJob/SyncJob.php
@@ -36,6 +36,8 @@ use OCP\BackgroundJob\TimedJob;
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 use Throwable;
+use function defined;
+use function method_exists;
 use function sprintf;
 
 class SyncJob extends TimedJob {
@@ -75,6 +77,12 @@ class SyncJob extends TimedJob {
 		$this->jobList = $jobList;
 
 		$this->setInterval(3600);
+		/**
+		 * @todo remove checks with 24+
+		 */
+		if (defined('\OCP\BackgroundJob\IJob::TIME_SENSITIVE') && method_exists($this, 'setTimeSensitivity')) {
+			$this->setTimeSensitivity(self::TIME_SENSITIVE);
+		}
 	}
 
 	/**
diff --git a/lib/BackgroundJob/TrainImportanceClassifierJob.php b/lib/BackgroundJob/TrainImportanceClassifierJob.php
index ac7bdfb91..92034bef6 100644
--- a/lib/BackgroundJob/TrainImportanceClassifierJob.php
+++ b/lib/BackgroundJob/TrainImportanceClassifierJob.php
@@ -33,6 +33,8 @@ use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\TimedJob;
 use Psr\Log\LoggerInterface;
 use Throwable;
+use function defined;
+use function method_exists;
 
 class TrainImportanceClassifierJob extends TimedJob {
 
@@ -60,7 +62,13 @@ class TrainImportanceClassifierJob extends TimedJob {
 		$this->jobList = $jobList;
 		$this->logger = $logger;
 
-		$this->setInterval(3600);
+		$this->setInterval(24 * 60 * 60);
+		/**
+		 * @todo remove checks with 24+
+		 */
+		if (defined('\OCP\BackgroundJob\IJob::TIME_INSENSITIVE') && method_exists($this, 'setTimeSensitivity')) {
+			$this->setTimeSensitivity(self::TIME_INSENSITIVE);
+		}
 	}
 
 	/**
diff --git a/lib/Db/MessageMapper.php b/lib/Db/MessageMapper.php
index c827049ec..5320f4248 100644
--- a/lib/Db/MessageMapper.php
+++ b/lib/Db/MessageMapper.php
@@ -950,7 +950,7 @@ class MessageMapper extends QBMapper {
 			$qb->setParameter('ids', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
 			$results[] = $this->findRelatedData($this->findEntities($qb), $userId);
 		}
-		return array_merge(...$results);
+		return array_merge([], ...$results);
 	}
 
 	/**
@@ -980,7 +980,7 @@ class MessageMapper extends QBMapper {
 			$result->closeCursor();
 		}
 
-		$recipientsResults = array_merge(...$recipientsResults);
+		$recipientsResults = array_merge([], ...$recipientsResults);
 
 		foreach ($recipientsResults as $recipient) {
 			$message = $indexedMessages[(int)$recipient['message_id']];
diff --git a/package-lock.json b/package-lock.json
index 21687ded4..a3c1fe05c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,22 +9,22 @@
       "version": "1.11.0",
       "license": "agpl",
       "dependencies": {
-        "@ckeditor/ckeditor5-alignment": "~31.1.0",
-        "@ckeditor/ckeditor5-basic-styles": "~31.1.0",
-        "@ckeditor/ckeditor5-block-quote": "~31.1.0",
-        "@ckeditor/ckeditor5-build-balloon": "~31.1.0",
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-dev-utils": "~27.0.0",
-        "@ckeditor/ckeditor5-dev-webpack-plugin": "~27.0.0",
-        "@ckeditor/ckeditor5-editor-balloon": "~31.1.0",
-        "@ckeditor/ckeditor5-essentials": "~31.1.0",
-        "@ckeditor/ckeditor5-font": "^31.1.0",
-        "@ckeditor/ckeditor5-heading": "~31.1.0",
-        "@ckeditor/ckeditor5-link": "~31.1.0",
-        "@ckeditor/ckeditor5-list": "~31.1.0",
-        "@ckeditor/ckeditor5-paragraph": "~31.1.0",
-        "@ckeditor/ckeditor5-remove-format": "^31.1.0",
-        "@ckeditor/ckeditor5-theme-lark": "~31.1.0",
+        "@ckeditor/ckeditor5-alignment": "~32.0.0",
+        "@ckeditor/ckeditor5-basic-styles": "~32.0.0",
+        "@ckeditor/ckeditor5-block-quote": "~32.0.0",
+        "@ckeditor/ckeditor5-build-balloon": "~32.0.0",
+        "@ckeditor/ckeditor5-core": "~32.0.0",
+        "@ckeditor/ckeditor5-dev-utils": "~28.1.1",
+        "@ckeditor/ckeditor5-dev-webpack-plugin": "~28.1.0",
+        "@ckeditor/ckeditor5-editor-balloon": "~32.0.0",
+        "@ckeditor/ckeditor5-essentials": "~32.0.0",
+        "@ckeditor/ckeditor5-font": "^32.0.0",
+        "@ckeditor/ckeditor5-heading": "~32.0.0",
+        "@ckeditor/ckeditor5-link": "~32.0.0",
+        "@ckeditor/ckeditor5-list": "~32.0.0",
+        "@ckeditor/ckeditor5-paragraph": "~32.0.0",
+        "@ckeditor/ckeditor5-remove-format": "~32.0.0",
+        "@ckeditor/ckeditor5-theme-lark": "~32.0.0",
         "@ckeditor/ckeditor5-vue2": "^1.0.5",
         "@nextcloud/auth": "^1.3.0",
         "@nextcloud/axios": "^1.9.0",
@@ -41,9 +41,9 @@
         "@riophae/vue-treeselect": "^0.4.0",
         "@vue/babel-preset-app": "^4.5.15",
         "color-convert": "^2.0.1",
-        "core-js": "^3.20.3",
+        "core-js": "^3.21.1",
         "debounce-promise": "^3.1.2",
-        "dompurify": "^2.3.4",
+        "dompurify": "^2.3.5",
         "html-to-text": "^8.1.0",
         "ical.js": "^1.5.0",
         "iframe-resizer": "^4.3.2",
@@ -54,9 +54,9 @@
         "nextcloud_issuetemplate_builder": "^0.1.0",
         "postcss-loader": "^3.0.0",
         "printscout": "2.0.3",
-        "ramda": "^0.27.2",
+        "ramda": "^0.28.0",
         "raw-loader": "^4.0.2",
-        "stylelint": "^14.2.0",
+        "stylelint": "^14.5.3",
         "v-tooltip": "^2.1.3",
         "vue": "^2.6.14",
         "vue-autosize": "^1.0.2",
@@ -75,7 +75,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.16.12",
-        "@babel/eslint-parser": "^7.16.5",
+        "@babel/eslint-parser": "^7.17.0",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/preset-env": "^7.16.11",
         "@nextcloud/browserslist-config": "^2.2.0",
@@ -84,7 +84,7 @@
         "@vue/test-utils": "^1.3.0",
         "babel-loader": "^8.2.3",
         "babel-loader-exclude-node-modules-except": "^1.2.1",
-        "chai": "^4.3.4",
+        "chai": "^4.3.6",
         "css-loader": "^5.2.7",
         "eslint": "^7.32.0",
         "eslint-config-standard": "^16.0.3",
@@ -97,11 +97,11 @@
         "file-loader": "^6.2.0",
         "jsdom": "^19.0.0",
         "jsdom-global": "^3.0.2",
-        "mocha": "^9.1.4",
+        "mocha": "^9.2.1",
         "mochapack": "^2.1.2",
         "sass": "^1.49.0",
         "sass-loader": "^10.1.1",
-        "sinon": "^12.0.1",
+        "sinon": "^13.0.1",
         "sinon-chai": "^3.7.0",
         "style-loader": "^2.0.0",
         "svg-inline-loader": "^0.8.2",
@@ -1194,9 +1194,9 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.16.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz",
-      "integrity": "sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "dev": true,
       "dependencies": {
         "eslint-scope": "^5.1.1",
@@ -2824,163 +2824,166 @@
       }
     },
     "node_modules/@ckeditor/ckeditor5-adapter-ckfinder": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-31.1.0.tgz",
-      "integrity": "sha512-KAXL4erWg9cL0+Xd4sBBSEQmbJERL5g0DsG/B1CB5bND6JRVPPzfpbQp7yAMK7xGdS5ObpmHhilHYW+/Ujl5jw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-32.0.0.tgz",
+      "integrity": "sha512-DCK4CPW4M4pEJW/zC6yo8zGGGDXfjsEQRGkTiF4QjHODh3QYBc6O0Oy4mzCuEIobkyMfcUAqEh3UQQVgEM8B+Q==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-alignment": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-31.1.0.tgz",
-      "integrity": "sha512-G5H8hWUMpjctlxaJKUa5HVbavEukghSOfOJjKL47MFSlp46fDgdotmGYnW8BLqFJItsccO8PJJy20KaO6Gj9BQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-32.0.0.tgz",
+      "integrity": "sha512-PY6gX6LTY9P6nxm4VM0DtUIdV+FDaj0prViQ73aCuCJ8jUYg0kU/DAwmJzH9IsdYLNhcfgtQj6bIHMvGLkXIMQ==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-autoformat": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-31.1.0.tgz",
-      "integrity": "sha512-77tNW5nqyG2RXErS7wChXr5syK2g/pLMsVzjbt/4yZJr86tJ6eEIlKEGNvJocP1a1uazy5QARXQlyZeY8zqp6w==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-32.0.0.tgz",
+      "integrity": "sha512-9zg1Rm/ak+zflH+p3zUjxZgK0iPAhDA+/vElBXQSVANATYqNxa4gszM/PDIl71tMpy6Yc+De9/eTFiazxsR9zA==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-basic-styles": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-31.1.0.tgz",
-      "integrity": "sha512-NqxlHwAN14istEMpIYgwRHljs7DHvntWE9k9VxThNjSUeWedv5JmQgyMXnexXwm2GY/K4Sx1wT6/FrlVsJq4NQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-32.0.0.tgz",
+      "integrity": "sha512-Y3YzhHkCIbh1XqMGJKMOWnKtoLY7AbwquBI4rC1i2bGbO5iAlwfyiLeikstMM8ft2PbWFsXDeVPa3kRnBBQwDQ==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-block-quote": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-31.1.0.tgz",
-      "integrity": "sha512-rdnNUItJmPZV1ipgMIkDYE+AW+g4TXlp/d52bUzsq+uyDpDg3YIuu81NrKWDOEaV6LYOh+ePeSbkqQivsEIjeQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-32.0.0.tgz",
+      "integrity": "sha512-A+htu5dwy5+lcbdwwFIBntcqVdD87ELyDIfOsrW4KUNOFpE1nnlFE2TPlYl5+kKWkhFcYPU/dVl9Ebnj/bb0ng==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-build-balloon": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-balloon/-/ckeditor5-build-balloon-31.1.0.tgz",
-      "integrity": "sha512-eaoK9Qc5eBP3iphIo1jInvM71Ywo9PQI6hNCMjfiUvdcP14mbtw7HSZKphtPLO7O0zgoc+p/yFSH6dwplk1z/A==",
-      "dependencies": {
-        "@ckeditor/ckeditor5-adapter-ckfinder": "^31.1.0",
-        "@ckeditor/ckeditor5-autoformat": "^31.1.0",
-        "@ckeditor/ckeditor5-basic-styles": "^31.1.0",
-        "@ckeditor/ckeditor5-block-quote": "^31.1.0",
-        "@ckeditor/ckeditor5-ckfinder": "^31.1.0",
-        "@ckeditor/ckeditor5-cloud-services": "^31.1.0",
-        "@ckeditor/ckeditor5-easy-image": "^31.1.0",
-        "@ckeditor/ckeditor5-editor-balloon": "^31.1.0",
-        "@ckeditor/ckeditor5-essentials": "^31.1.0",
-        "@ckeditor/ckeditor5-heading": "^31.1.0",
-        "@ckeditor/ckeditor5-image": "^31.1.0",
-        "@ckeditor/ckeditor5-indent": "^31.1.0",
-        "@ckeditor/ckeditor5-link": "^31.1.0",
-        "@ckeditor/ckeditor5-list": "^31.1.0",
-        "@ckeditor/ckeditor5-media-embed": "^31.1.0",
-        "@ckeditor/ckeditor5-paragraph": "^31.1.0",
-        "@ckeditor/ckeditor5-paste-from-office": "^31.1.0",
-        "@ckeditor/ckeditor5-table": "^31.1.0",
-        "@ckeditor/ckeditor5-typing": "^31.1.0"
-      },
-      "engines": {
-        "node": ">=12.0.0",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-balloon/-/ckeditor5-build-balloon-32.0.0.tgz",
+      "integrity": "sha512-Bjb8bLhs162uQ5LN8LRqOee/my+9AY83CUJjwKbYY79W93CvL80Vv7gt8Bu+gzHTmm9dGW7DwwBtdm1z2+h96w==",
+      "dependencies": {
+        "@ckeditor/ckeditor5-adapter-ckfinder": "^32.0.0",
+        "@ckeditor/ckeditor5-autoformat": "^32.0.0",
+        "@ckeditor/ckeditor5-basic-styles": "^32.0.0",
+        "@ckeditor/ckeditor5-block-quote": "^32.0.0",
+        "@ckeditor/ckeditor5-ckfinder": "^32.0.0",
+        "@ckeditor/ckeditor5-cloud-services": "^32.0.0",
+        "@ckeditor/ckeditor5-easy-image": "^32.0.0",
+        "@ckeditor/ckeditor5-editor-balloon": "^32.0.0",
+        "@ckeditor/ckeditor5-essentials": "^32.0.0",
+        "@ckeditor/ckeditor5-heading": "^32.0.0",
+        "@ckeditor/ckeditor5-image": "^32.0.0",
+        "@ckeditor/ckeditor5-indent": "^32.0.0",
+        "@ckeditor/ckeditor5-link": "^32.0.0",
+        "@ckeditor/ckeditor5-list": "^32.0.0",
+        "@ckeditor/ckeditor5-media-embed": "^32.0.0",
+        "@ckeditor/ckeditor5-paragraph": "^32.0.0",
+        "@ckeditor/ckeditor5-paste-from-office": "^32.0.0",
+        "@ckeditor/ckeditor5-table": "^32.0.0",
+        "@ckeditor/ckeditor5-typing": "^32.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-ckfinder": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-31.1.0.tgz",
-      "integrity": "sha512-aFYWVbOabQ9p03E97QPV1t/mWla2rPA+9fXBIk4ug5+jcLOG6GNt+B/RTFG5QxxfgWJWh/I2C3UR82Ia8Kq29A==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-32.0.0.tgz",
+      "integrity": "sha512-1XOr+S26Gt2CNZxnIzxURwCpZXGnNW56ZTPqHa2NHLgemm+KYs3+iR8/AQj9HCW5za+ZFmj0I5Ztqq9Pssya1w==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-clipboard": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-31.1.0.tgz",
-      "integrity": "sha512-rHvswGs4Q/ZiKPGk0J7+Nrb3mqNugKQFOXA7SSecOI9ZRt6hIxr4fgj4ccb8ceuHNr2vJNmTGC8jjKX7wGHPbw==",
-      "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
-        "@ckeditor/ckeditor5-widget": "^31.1.0",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-32.0.0.tgz",
+      "integrity": "sha512-Irk+XMCaG6lEBHh4ffPVfP66CEfOIGokADM0w7Z11xrPGqz1UCWrdu2CGoEaEDWw3+7c5/IjDh9jmZ5xG8TZmQ==",
+      "dependencies": {
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
+        "@ckeditor/ckeditor5-widget": "^32.0.0",
         "lodash-es": "^4.17.11"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-cloud-services": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-31.1.0.tgz",
-      "integrity": "sha512-QTmADTvwnxx0FukZiTstCNYbf11La9Xarw61kv/W+g3JnkIGzguj3H4MJ2WYKLAuEZIr5czOATVRPvS11lFZNA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-32.0.0.tgz",
+      "integrity": "sha512-hpbZP4Ue9glkK35+6/Tv+Zw6S/gWA7qNhuUWFEQ22kClKpiEH+2SOnQrTWBRrHVMLRm3GXIfq9sIvv3Ndi0a2w==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-core": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-31.1.0.tgz",
-      "integrity": "sha512-5BUosLrUliV2NZ9DAW48Za/4P3QWmwKMoHohCvq7Jq9Us6TQCnEKauUNexJFDAWqUAdN2WlqaVdSL+FmfhmzSA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-32.0.0.tgz",
+      "integrity": "sha512-Vf13S2EQ/R7ULFHt13Is6lOunq3tWROqNsE9oclSuzL0kTWoYuzu3JFyEnyMwDMRisl3CDpU7/Bp5VJ76BsRsA==",
       "dependencies": {
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-dev-utils": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-27.0.0.tgz",
-      "integrity": "sha512-r421mh6eb75dTneo2M+qqM78tzOimXVMTY/A+c2Ut/YxkTCFxRJSwOqDETNgWEeQU6IVkflMGf8rcFR4rfdhJw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-28.1.1.tgz",
+      "integrity": "sha512-zxTT2IkW9i3nU+e9ZEwFNle7HKMVDRC9M9DZfg7kWGUilILB8uk8JZFkSazAJUWXYN1evEwIvqn2ur5KaSCT9g==",
       "dependencies": {
-        "@ckeditor/ckeditor5-dev-webpack-plugin": "~27.0.0",
+        "@ckeditor/ckeditor5-dev-webpack-plugin": "^28.1.1",
         "acorn": "^6.2.1",
         "acorn-walk": "^6.2.0",
         "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.6.1",
         "cssnano": "^4.0.0",
         "del": "^5.0.0",
         "escodegen": "^1.9.0",
         "fs-extra": "^8.1.0",
+        "is-interactive": "^1.0.0",
         "javascript-stringify": "^1.6.0",
         "pofile": "^1.0.9",
         "postcss": "^7.0.39",
@@ -3002,130 +3005,12 @@
         "webpack": "^4.43.0 || ^5.24.0"
       }
     },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/terser-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
-      "dependencies": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.5.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.3.4",
-        "webpack-sources": "^1.4.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/terser-webpack-plugin/node_modules/acorn": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
-      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/terser-webpack-plugin/node_modules/terser": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
-      "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "acorn": "^8.5.0"
-      },
-      "peerDependenciesMeta": {
-        "acorn": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/terser-webpack-plugin/node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@ckeditor/ckeditor5-dev-utils/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
     "node_modules/@ckeditor/ckeditor5-dev-webpack-plugin": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-webpack-plugin/-/ckeditor5-dev-webpack-plugin-27.0.0.tgz",
-      "integrity": "sha512-PkLN+Jftxbk0E9LlROOobi+UXYDcefUIsCn5OI7j4eF8mmFKh+9lgeqyavWU8RIjADM65qc0bxbcJvhkwsPFtg==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-webpack-plugin/-/ckeditor5-dev-webpack-plugin-28.1.1.tgz",
+      "integrity": "sha512-psr+RP21MSSnuuZ3aD2UXzbFLBhO6SAlibot3DulK2MxkxkTNcCGHTRE8EvzFj1hpknh5KCONiDmh2y7O28NuQ==",
       "dependencies": {
-        "@ckeditor/ckeditor5-dev-utils": "^27.0.0",
+        "@ckeditor/ckeditor5-dev-utils": "~28.1.1",
         "chalk": "^4.0.0",
         "rimraf": "^3.0.2",
         "semver": "^7.3.4",
@@ -3185,301 +3070,302 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/@ckeditor/ckeditor5-easy-image": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-31.1.0.tgz",
-      "integrity": "sha512-eS6VJw6b7baoS76m3oYpCmhjITKXYom5qAOOfvYyH0FOHLhU0iGJPj7Apy7NYNpj1/MlntBz5S3kz/j0HAbrtw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-32.0.0.tgz",
+      "integrity": "sha512-PLt4xRGs9eTl0zaDHqBiw1m5EngOFDFMdsCb3au7XBDDZ7Q7UhXIbGvA6waAUHniJaZLCVppU7J+knTlmsZfRQ==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-editor-balloon": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-31.1.0.tgz",
-      "integrity": "sha512-vL9l/BranIZp/ZcQ9iN6JirXW5gcxuOTP+wM8QsXvpihtq+Gt5a8w2TPGtF+d4BoJYbXpqnA3fR+OBtu86dEvA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-32.0.0.tgz",
+      "integrity": "sha512-6BHPow/jN3rDNqQ6X9FWSPmiSWtrSOID0AJ/wTvJ48P5UqjsylgmZj078q0IhPlS+dnj2r0trXy4fJJ0FdR8gQ==",
       "dependencies": {
-        "ckeditor5": "^31.1.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-engine": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-31.1.0.tgz",
-      "integrity": "sha512-lHZjdKKeBWR4N2rk4rdnxDtdE3F1Q7Z2Ag2RgHG8GT3J6s2BNx/z++9GxhlCKPR3TQ70XWCLBLGXuFHXIvU0Kg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-32.0.0.tgz",
+      "integrity": "sha512-UuAEnGBdib0hVhCIJByLQ8tKDjdOJkJF/aKsAQth9an95Z7TJ8oqUqhwhUQWtsULu0ugaqb/95t7FUFA+3BJqw==",
       "dependencies": {
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-enter": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-31.1.0.tgz",
-      "integrity": "sha512-9K5d12lCfvnUGESwxpu2UJCLsAaa40QR4JgVHKV0CZpERfcsvcF3XdM8cggS/Ovin2TBq1w+tXhOKbop5Why9Q==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-32.0.0.tgz",
+      "integrity": "sha512-1V0M9wyTWZmLJ07eqb7ZICEQTDzi2NwsKaTpAavOlMG04+L4q5Ha9H0EXxgZtKjN4iq0cQEv6sog06xDkRrTDw==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-essentials": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-31.1.0.tgz",
-      "integrity": "sha512-QXFDBHfovjJ5BtIh2YEi37Y3L3/5tvV3XB+W04vTyPP7fkK/kAf7+0I8XpQzW9v2OMQEPvCyeSBOHWXD2P4G2Q==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-32.0.0.tgz",
+      "integrity": "sha512-haHmUIdvz0ykMBM4YOyNFBbh6Ymku19yoPyX8xMIzMVbniI+DtB1k0fGZu7OqUNjjf5jPZJlz5sW+KHzzySVXg==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-font": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-31.1.0.tgz",
-      "integrity": "sha512-hl2uxS0IvHIH4H4BopfM+DyMiBJIQ7W80dKJOenE7eL48IyMGbNeS4LZ22Zyo5J1nr//s7SdNRuSKPXrlqJl9g==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-32.0.0.tgz",
+      "integrity": "sha512-l3wXRxrO/KWLHz9zdNZzND89yJT8bL36xYABh6FPJamN4PFaz29zTVAIC7T3xLZ+H6/V+kcDXWhYBJQKdbvXXg==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-heading": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-31.1.0.tgz",
-      "integrity": "sha512-KVRl0aTT/2XBOp/hVrVa2lq9/WXc78XMT2a2cnXPHcbH8hbE0jvBSSHK6HM4SrbM1Xjv+l02a9syluNMPK3PDg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-32.0.0.tgz",
+      "integrity": "sha512-XxB1yDP3aU1ePYAUE2XiQ/yjHkSdrRllVsihBtDKh5DTcoKxZHafmVEZXBiJaLrv5OPNmfvXyR+eC6yet35sMA==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-image": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-31.1.0.tgz",
-      "integrity": "sha512-TvEVrq6fRazITt2CMU8rPLQPCW8DrP5tE/fyXsh1cwfFzPYKxyMqFrNb65GMSTFIVWgJ1RfWac9GLTMw6c1tRg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-32.0.0.tgz",
+      "integrity": "sha512-sBdFbWH5YdmnvEIQsEY4Xj4kkHcSmLgFDjgtAQdjqdQi3GZI81kMYIepPNELtUtpEqNd0WyS3ReWYHMlbjOpfw==",
       "dependencies": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "ckeditor5": "^31.1.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-indent": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-31.1.0.tgz",
-      "integrity": "sha512-kHme0J60/y8NCD2VBkYPY0fb3ypx1FqlE1Dt+2rujd2d+boSbML72eAkDDhHODcBohUDyudjm8wflJSsadBbhw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-32.0.0.tgz",
+      "integrity": "sha512-I1zHBv1kRCRUyOevKzSpVyd/Df1IdmYeKsVYmEKvDCUQMp126DEdOjlxCbSkq66gFJ1VLUlV+lev5BXg0w2NRA==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-link": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-31.1.0.tgz",
-      "integrity": "sha512-N81EmhslyZoDocbamYEXDsC2MJChSlG8N7ZsVd5+TGF2ZrGlY/5cczY/hEgJcs4CGMaXOboCGRZjGsQQ2Z4u0g==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-32.0.0.tgz",
+      "integrity": "sha512-xJHLp+SZn/fzcDHFU80IOEkZ6aBWSAMgJyp2pDMFOJMz2eWTKwNNh6XJW18f4ELHVWaCMVNgdp/DuSZxxUGxfg==",
       "dependencies": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "ckeditor5": "^31.1.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-list": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-31.1.0.tgz",
-      "integrity": "sha512-/L/wsqeW4r7VF+HNDs58tXtSCIPODqlAJ82zMt3Pk5wx8BgXmFgguZ3RRZJdC3CyP6VZwfDMAzDNgU6H51+Tuw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-32.0.0.tgz",
+      "integrity": "sha512-xjIfi142oso1H5m89BKB7uaOsWzMUb14BGzO9poTvSQjIpavBRYPTrin2qb0euuEY2XvUjVJF7GqPJ4zJdPDzA==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-media-embed": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-31.1.0.tgz",
-      "integrity": "sha512-/MflPFvjWnbdL2Pv+MtgKQPubLYPdH/I2BUKQkRGPdFBhdfiC9fcZWC+JzGw+GQzs4jVcgjKrnaz0fGHlIpjtA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-32.0.0.tgz",
+      "integrity": "sha512-GoCaEqAW0Pu2mPOBKzNxdpqD2beM5KmxhaIANOR8xR404cYSMgXM6g5bL6eQPRRwtzqw60/qTj2k9QGIqg30xw==",
       "dependencies": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "ckeditor5": "^31.1.0"
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-paragraph": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-31.1.0.tgz",
-      "integrity": "sha512-rltzxwcKwR6mxZqomKLkrdLuVkkeKiESv7bweVY9VcPb7hk0BiLZcYkLqsOlfkZHWHWCiQ+5UDR8ctuaVmiUjg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-32.0.0.tgz",
+      "integrity": "sha512-GRpMOb0pjZHvUtyTrX9jlH7gQ5n1/33ljX3Ty31Lyovz4KPfR3YNzyjNAVHb/fOk72zoPFUrhpd/NLum836DNA==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-paste-from-office": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-31.1.0.tgz",
-      "integrity": "sha512-2BUHw2KmX7+YjR1IqMAPMiiSf01SEK64CPCmnOdNgV1XcM3Kjc2svdFCslulW6gT8C3WNFPD+aeAyp4O9LLnGw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-32.0.0.tgz",
+      "integrity": "sha512-dX/vfBwp0e7938Y1j0lEyqfClsEInnQHG/MD4gz9AVcCixVxl12F2uL52WMm/nSVrVax5zcUSOz1QV9/0UG/mg==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-remove-format": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-31.1.0.tgz",
-      "integrity": "sha512-02Q7wxWt4D5J6Ze5drha+9yd1RxBnbdn4tHoTseaoZAvuyYjt1e43jmXFfnS8/mBU2YetbM4CJ61f+lkzW5fcw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-32.0.0.tgz",
+      "integrity": "sha512-sI1yiHas9SNP/LzESkHKlQ8mZD2aEFCNdAArY2HsdB6cWP9VceUQZPvLGH0/fY+/oglcjo7t8H8lHMcwlDV9zw==",
       "dependencies": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-select-all": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-31.1.0.tgz",
-      "integrity": "sha512-d6bTtuZLoBN61jPjbY562awfRYy+xhnCEIilsoRLb04mFNa6HnFs/mZtNIFqrm7dYZWSkJz9+1XwQouYW+kGqQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-32.0.0.tgz",
+      "integrity": "sha512-HmkR1hivslj9N+x3KAf0hghIpTafxmGqV2nit8iE0WE4YCcBw0cubJHbDsdiFmniIQXrbsBgI7RUnXs4nXdaCg==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-table": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-31.1.0.tgz",
-      "integrity": "sha512-GIVnraBOG5bPkF3KTV4anPIQo8CnMUkdwA3EYkdgpdOBSaaYYK4d66ej0OXCHSfKyJ+jwg9VoxVnQB/zZiCJLA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-32.0.0.tgz",
+      "integrity": "sha512-pWNeDCKMcNp/XpRU/hqu1K7rmzrDB++WIPzG5KDwkQQ83iwlbTqrfa7xsLLVX6bz6g2/fy2B3Ipt5BIndhlhjQ==",
       "dependencies": {
-        "ckeditor5": "^31.1.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-theme-lark": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-31.1.0.tgz",
-      "integrity": "sha512-fPtDEMmr7HFS3w9X1fr2ipzQv7DeVYF4vyJjybhsQht1Stoa8w7T8By7k+/5h7HIl2/EjHP4P1oPuMGXaXV9OA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-32.0.0.tgz",
+      "integrity": "sha512-g/yqNXUg7gwS4WeWDDBjfp/v9DOb4eRy3k4U1iC7IzhTaF2dNYnCi52E+Y0rHWociYI3MG4y4fn1hEX7oK3agw==",
       "dependencies": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0"
+        "@ckeditor/ckeditor5-ui": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-typing": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-31.1.0.tgz",
-      "integrity": "sha512-juskFEb1YrXLS+wcLEnc3GZtqkq95Q13sNAAyvKaEXzNphy4PBv+odLAwP7KCrxifVf278bgVxGDV5GPPAenOA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-32.0.0.tgz",
+      "integrity": "sha512-MkbFfgvwMgU4P5/2LZa473w2XA4DQmb7N+3VzqMQfn2y7YdsRk8tt54GxilwL0bTE/AiSqcR6f+LcnHFGj/coQ==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-ui": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-31.1.0.tgz",
-      "integrity": "sha512-fHBLsRK7XRxeewm1NH9idU4zUguhysQPEmEhqWOi+GRt2I0pYrc22GYNJF3yKMqp1LfiLi7GAT66X2RL9rCEaQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-32.0.0.tgz",
+      "integrity": "sha512-tkn5Y0ZYkhby8iFnAAZMLyh9zub/okOhzR2IJvS6T95J/w1z2HpJO/yNkdSrU43qXQtmp77o0UQ53PU4PvIp0Q==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-undo": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-31.1.0.tgz",
-      "integrity": "sha512-eNWEP9E5Ji2W7NU6vCKOqjYW0+/xwXGkiExboTApudJDT1IWu2hqoaVQ+3eEWHWJbqCxIRSHif6+uYEBIoInXg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-32.0.0.tgz",
+      "integrity": "sha512-4diY4FcmX3Wbi0Gr0U1HsswwJ3HIjdRJV9x4zEm7rXz1PbH+IIQKPIJQSoyd1dSkE2F4DslUhfIGsZH5vzmQ8w==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-upload": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-31.1.0.tgz",
-      "integrity": "sha512-j+FNllYawZgTWCVOUSce/34SMfwgqNa2F7yvdmw4pmPSl8mlSZxSEYA9mLqbKpXwsuFY0iY14JQEB2bngNgTbA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-32.0.0.tgz",
+      "integrity": "sha512-MSzZqB65zzrvwUOjzdUvuNp7syY5ZGZG3qdQeJBQNAS9G14f5WdzH4tKGK2j4dDX3KGhoCA1RJagpCmwDXqRWw==",
       "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
     "node_modules/@ckeditor/ckeditor5-utils": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-31.1.0.tgz",
-      "integrity": "sha512-l2C2m8uLxKTblXX6SY+k40tK9U4pFZ2WCYP1dc3B0qz5an+h7e5EqRz3kFs+MVw0HM6VCYWDFql/JZDAFonOmQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-32.0.0.tgz",
+      "integrity": "sha512-4O0TW/oeFRGbB+mrXMhx47zEzASdDz87ftiJiI9jcB+S6Pq5+aSqCNc0ZVQBKaj2URNGqFkkT6Kp6eEEsMBVWA==",
       "dependencies": {
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
@@ -3493,20 +3379,20 @@
       }
     },
     "node_modules/@ckeditor/ckeditor5-widget": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-31.1.0.tgz",
-      "integrity": "sha512-e/B2qjgwXHuj/Qo+cGAM7j3NTPXvTikL+wjEF5sh5a0w5el9Sv97tzew5rojkZ6ypQykE+1ue+F579b74n7QiQ==",
-      "dependencies": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-enter": "^31.1.0",
-        "@ckeditor/ckeditor5-typing": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-32.0.0.tgz",
+      "integrity": "sha512-YcF5iVtMwYC8/3sxv00Du/9bvdhx6br0gJdxfjkiNP1/7GY+WSwjhZSNJZhT30xp+iLHt4tGIUUQqFHIk3Ui6Q==",
+      "dependencies": {
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-enter": "^32.0.0",
+        "@ckeditor/ckeditor5-typing": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       },
       "engines": {
-        "node": ">=12.0.0",
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
@@ -4237,18 +4123,18 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
-      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.0.tgz",
+      "integrity": "sha512-M8vapsv9qQupMdzrVzkn5rb9jG7aUTEPAZdMtME2PuBaefksFZVE2C1g4LBRTkF/k3nRDNbDc5tp5NFC1PEYxA==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
     },
     "node_modules/@sinonjs/samsam": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz",
-      "integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz",
+      "integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^1.6.0",
@@ -6401,15 +6287,16 @@
       "peer": true
     },
     "node_modules/chai": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
       "dev": true,
       "dependencies": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
         "deep-eql": "^3.0.1",
         "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
         "pathval": "^1.1.1",
         "type-detect": "^4.0.5"
       },
@@ -6455,10 +6342,16 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "devOptional": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -6504,25 +6397,25 @@
       }
     },
     "node_modules/ckeditor5": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-31.1.0.tgz",
-      "integrity": "sha512-uuU5JNeiLFIv6oMtSmHdKOmgO8ZjqoSqV/rJWSpc9yxXbhjjs3Gdb6lbF9f0V5OCvQSIBCTtYVYllzfXAXMyqA==",
-      "dependencies": {
-        "@ckeditor/ckeditor5-clipboard": "^31.1.0",
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-enter": "^31.1.0",
-        "@ckeditor/ckeditor5-paragraph": "^31.1.0",
-        "@ckeditor/ckeditor5-select-all": "^31.1.0",
-        "@ckeditor/ckeditor5-typing": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-undo": "^31.1.0",
-        "@ckeditor/ckeditor5-upload": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
-        "@ckeditor/ckeditor5-widget": "^31.1.0"
-      },
-      "engines": {
-        "node": ">=12.0.0",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-32.0.0.tgz",
+      "integrity": "sha512-PehBSDwclMcZcVIRFZRUv6BSEdQCK+9kUbnWdcAOtM9LJL8aWCwCTg6VZTq6+aDEzoz6BfkjO1eF3ZtQVJT97w==",
+      "dependencies": {
+        "@ckeditor/ckeditor5-clipboard": "^32.0.0",
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-enter": "^32.0.0",
+        "@ckeditor/ckeditor5-paragraph": "^32.0.0",
+        "@ckeditor/ckeditor5-select-all": "^32.0.0",
+        "@ckeditor/ckeditor5-typing": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-undo": "^32.0.0",
+        "@ckeditor/ckeditor5-upload": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
+        "@ckeditor/ckeditor5-widget": "^32.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0",
         "npm": ">=5.7.1"
       }
     },
@@ -6539,6 +6432,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/clipboard": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
@@ -6804,9 +6719,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
+      "version": "3.21.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -6920,6 +6835,14 @@
         "node": ">4"
       }
     },
+    "node_modules/css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
     "node_modules/css-loader": {
       "version": "5.2.7",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",
@@ -7962,9 +7885,9 @@
       "integrity": "sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg=="
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -8202,9 +8125,9 @@
       ]
     },
     "node_modules/dompurify": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz",
-      "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ=="
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.5.tgz",
+      "integrity": "sha512-kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ=="
     },
     "node_modules/domutils": {
       "version": "2.8.0",
@@ -9353,9 +9276,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -9364,7 +9287,7 @@
         "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-json-stable-stringify": {
@@ -9642,9 +9565,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "funding": [
         {
           "type": "individual",
@@ -10355,9 +10278,9 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true,
       "optional": true,
       "peer": true
@@ -10965,6 +10888,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-negative-zero": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
@@ -11140,7 +11071,10 @@
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
@@ -11735,6 +11669,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/loupe": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.1.tgz",
+      "integrity": "sha512-EN1D3jyVmaX4tnajVlfbREU4axL647hLec1h/PXAb8CPDMJiYitcWF2UeLVNttRqaIqQs4x+mRvXf+d+TlDrCA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -12123,7 +12066,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -12240,32 +12182,32 @@
       }
     },
     "node_modules/mocha": {
-      "version": "9.1.4",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.4.tgz",
-      "integrity": "sha512-+q2aV5VlJZuLgCWoBvGI5zEwPF9eEI0kr/sAA9Jm4xMND7RfIEyF8JE7C0JIg8WXRG+P1sdIAb5ccoHPlXLzcw==",
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz",
+      "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==",
       "dev": true,
       "dependencies": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.2",
+        "chokidar": "3.5.3",
+        "debug": "4.3.3",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
-        "glob": "7.1.7",
+        "glob": "7.2.0",
         "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "4.1.0",
         "log-symbols": "4.1.0",
         "minimatch": "3.0.4",
         "ms": "2.1.3",
-        "nanoid": "3.1.25",
+        "nanoid": "3.2.0",
         "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
         "which": "2.0.2",
-        "workerpool": "6.1.5",
+        "workerpool": "6.2.0",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
@@ -12300,6 +12242,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/mocha/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -12617,10 +12579,9 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
-      "dev": true,
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -13263,13 +13224,13 @@
       "integrity": "sha512-b+0geJAVygUKPpIOyJiIuuGFFdxLGyRAqf+Ap25BdPWplNiLq6mpUFYEGdVaroKx41cn6j83MpDOSkVK5plJvg=="
     },
     "node_modules/nise": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
-      "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz",
+      "integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==",
       "dev": true,
       "dependencies": {
-        "@sinonjs/commons": "^1.7.0",
-        "@sinonjs/fake-timers": "^7.0.4",
+        "@sinonjs/commons": "^1.8.3",
+        "@sinonjs/fake-timers": ">=5",
         "@sinonjs/text-encoding": "^0.7.1",
         "just-extend": "^4.0.2",
         "path-to-regexp": "^1.7.0"
@@ -13661,7 +13622,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -13886,9 +13846,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-posix": {
       "version": "1.0.0",
@@ -15188,9 +15148,9 @@
       "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4="
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
-      "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -15221,9 +15181,9 @@
       }
     },
     "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "node_modules/postcss/node_modules/picocolors": {
       "version": "0.2.1",
@@ -15405,9 +15365,13 @@
       "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234="
     },
     "node_modules/ramda": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz",
-      "integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA=="
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz",
+      "integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ramda"
+      }
     },
     "node_modules/randexp": {
       "version": "0.4.6",
@@ -15811,6 +15775,18 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "deprecated": "https://github.com/lydell/resolve-url#deprecated"
     },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -16468,9 +16444,9 @@
       }
     },
     "node_modules/shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
       "dependencies": {
         "glob": "^7.0.0",
         "interpret": "^1.0.0",
@@ -16503,21 +16479,21 @@
       "dev": true
     },
     "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sinon": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz",
-      "integrity": "sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-13.0.1.tgz",
+      "integrity": "sha512-8yx2wIvkBjIq/MGY1D9h1LMraYW+z1X0mb648KZnKSdvLasvDu7maa0dFaNYdTDczFgbjNw2tOmWdTk9saVfwQ==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^1.8.3",
-        "@sinonjs/fake-timers": "^8.1.0",
-        "@sinonjs/samsam": "^6.0.2",
+        "@sinonjs/fake-timers": "^9.0.0",
+        "@sinonjs/samsam": "^6.1.1",
         "diff": "^5.0.0",
-        "nise": "^5.1.0",
+        "nise": "^5.1.1",
         "supports-color": "^7.2.0"
       },
       "funding": {
@@ -16535,15 +16511,6 @@
         "sinon": ">=4.0.0"
       }
     },
-    "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
     "node_modules/slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -16585,6 +16552,7 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
       "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16704,9 +16672,9 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dependencies": {
         "figgy-pudding": "^3.5.1"
       }
@@ -16936,9 +16904,9 @@
       }
     },
     "node_modules/striptags": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.1.1.tgz",
-      "integrity": "sha1-yMPn/db7S7OjKjt1LltePjgJPr0="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw=="
     },
     "node_modules/style-loader": {
       "version": "2.0.0",
@@ -16995,21 +16963,22 @@
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI="
     },
     "node_modules/stylelint": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz",
-      "integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==",
+      "version": "14.5.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz",
+      "integrity": "sha512-omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ==",
       "dependencies": {
         "balanced-match": "^2.0.0",
         "colord": "^2.9.2",
         "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
         "debug": "^4.3.3",
         "execall": "^2.0.0",
-        "fast-glob": "^3.2.7",
+        "fast-glob": "^3.2.11",
         "fastest-levenshtein": "^1.0.12",
         "file-entry-cache": "^6.0.1",
         "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
+        "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
         "ignore": "^5.2.0",
@@ -17023,21 +16992,22 @@
         "normalize-path": "^3.0.0",
         "normalize-selector": "^0.2.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.3.11",
+        "postcss": "^8.4.6",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.7",
-        "postcss-value-parser": "^4.1.0",
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "specificity": "^0.4.1",
         "string-width": "^4.2.3",
         "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.7.5",
+        "table": "^6.8.0",
         "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^3.0.3"
+        "write-file-atomic": "^4.0.1"
       },
       "bin": {
         "stylelint": "bin/stylelint.js"
@@ -17113,22 +17083,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/stylelint/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/stylelint/node_modules/decamelize-keys": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
@@ -17165,15 +17119,15 @@
       }
     },
     "node_modules/stylelint/node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -17184,9 +17138,9 @@
       }
     },
     "node_modules/stylelint/node_modules/hosted-git-info": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.0.tgz",
-      "integrity": "sha512-fqhGdjk4av7mT9fU/B01dUtZ+WZSc/XEXMoLXDVZukiQRXxeHSSz3AqbeWRJHtF8EQYHlAgB1NSAHU0Cm7aqZA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -17301,17 +17255,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/stylelint/node_modules/nanoid": {
-      "version": "3.1.30",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/stylelint/node_modules/normalize-package-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.1.tgz",
@@ -17369,13 +17312,13 @@
       }
     },
     "node_modules/stylelint/node_modules/postcss": {
-      "version": "8.3.11",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+      "version": "8.4.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
+      "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
       "dependencies": {
-        "nanoid": "^3.1.30",
+        "nanoid": "^3.2.0",
         "picocolors": "^1.0.0",
-        "source-map-js": "^0.6.2"
+        "source-map-js": "^1.0.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -17439,9 +17382,9 @@
       }
     },
     "node_modules/stylelint/node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
     "node_modules/stylelint/node_modules/read-pkg/node_modules/normalize-package-data": {
       "version": "2.5.0",
@@ -17512,6 +17455,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/stylelint/node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/stylelint/node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -17577,6 +17528,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/svg-inline-loader": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/svg-inline-loader/-/svg-inline-loader-0.8.2.tgz",
@@ -17606,9 +17569,9 @@
       "dev": true
     },
     "node_modules/table": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.5.tgz",
-      "integrity": "sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -17668,9 +17631,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -17715,6 +17678,115 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/terser-webpack-plugin": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
+      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
+      "dependencies": {
+        "cacache": "^15.0.5",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.5.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
+        "source-map": "^0.6.1",
+        "terser": "^5.3.4",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/terser": {
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz",
+      "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==",
+      "dependencies": {
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -18045,14 +18117,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "node_modules/unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -18304,9 +18368,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -21708,9 +21772,9 @@
       }
     },
     "node_modules/workerpool": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-      "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
       "dev": true
     },
     "node_modules/wrap-ansi": {
@@ -21757,14 +21821,15 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
       }
     },
     "node_modules/ws": {
@@ -22785,9 +22850,9 @@
       }
     },
     "@babel/eslint-parser": {
-      "version": "7.16.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz",
-      "integrity": "sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "dev": true,
       "requires": {
         "eslint-scope": "^5.1.1",
@@ -23910,123 +23975,126 @@
       }
     },
     "@ckeditor/ckeditor5-adapter-ckfinder": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-31.1.0.tgz",
-      "integrity": "sha512-KAXL4erWg9cL0+Xd4sBBSEQmbJERL5g0DsG/B1CB5bND6JRVPPzfpbQp7yAMK7xGdS5ObpmHhilHYW+/Ujl5jw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-32.0.0.tgz",
+      "integrity": "sha512-DCK4CPW4M4pEJW/zC6yo8zGGGDXfjsEQRGkTiF4QjHODh3QYBc6O0Oy4mzCuEIobkyMfcUAqEh3UQQVgEM8B+Q==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-alignment": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-31.1.0.tgz",
-      "integrity": "sha512-G5H8hWUMpjctlxaJKUa5HVbavEukghSOfOJjKL47MFSlp46fDgdotmGYnW8BLqFJItsccO8PJJy20KaO6Gj9BQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-32.0.0.tgz",
+      "integrity": "sha512-PY6gX6LTY9P6nxm4VM0DtUIdV+FDaj0prViQ73aCuCJ8jUYg0kU/DAwmJzH9IsdYLNhcfgtQj6bIHMvGLkXIMQ==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-autoformat": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-31.1.0.tgz",
-      "integrity": "sha512-77tNW5nqyG2RXErS7wChXr5syK2g/pLMsVzjbt/4yZJr86tJ6eEIlKEGNvJocP1a1uazy5QARXQlyZeY8zqp6w==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-32.0.0.tgz",
+      "integrity": "sha512-9zg1Rm/ak+zflH+p3zUjxZgK0iPAhDA+/vElBXQSVANATYqNxa4gszM/PDIl71tMpy6Yc+De9/eTFiazxsR9zA==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-basic-styles": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-31.1.0.tgz",
-      "integrity": "sha512-NqxlHwAN14istEMpIYgwRHljs7DHvntWE9k9VxThNjSUeWedv5JmQgyMXnexXwm2GY/K4Sx1wT6/FrlVsJq4NQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-32.0.0.tgz",
+      "integrity": "sha512-Y3YzhHkCIbh1XqMGJKMOWnKtoLY7AbwquBI4rC1i2bGbO5iAlwfyiLeikstMM8ft2PbWFsXDeVPa3kRnBBQwDQ==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-block-quote": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-31.1.0.tgz",
-      "integrity": "sha512-rdnNUItJmPZV1ipgMIkDYE+AW+g4TXlp/d52bUzsq+uyDpDg3YIuu81NrKWDOEaV6LYOh+ePeSbkqQivsEIjeQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-32.0.0.tgz",
+      "integrity": "sha512-A+htu5dwy5+lcbdwwFIBntcqVdD87ELyDIfOsrW4KUNOFpE1nnlFE2TPlYl5+kKWkhFcYPU/dVl9Ebnj/bb0ng==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-build-balloon": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-balloon/-/ckeditor5-build-balloon-31.1.0.tgz",
-      "integrity": "sha512-eaoK9Qc5eBP3iphIo1jInvM71Ywo9PQI6hNCMjfiUvdcP14mbtw7HSZKphtPLO7O0zgoc+p/yFSH6dwplk1z/A==",
-      "requires": {
-        "@ckeditor/ckeditor5-adapter-ckfinder": "^31.1.0",
-        "@ckeditor/ckeditor5-autoformat": "^31.1.0",
-        "@ckeditor/ckeditor5-basic-styles": "^31.1.0",
-        "@ckeditor/ckeditor5-block-quote": "^31.1.0",
-        "@ckeditor/ckeditor5-ckfinder": "^31.1.0",
-        "@ckeditor/ckeditor5-cloud-services": "^31.1.0",
-        "@ckeditor/ckeditor5-easy-image": "^31.1.0",
-        "@ckeditor/ckeditor5-editor-balloon": "^31.1.0",
-        "@ckeditor/ckeditor5-essentials": "^31.1.0",
-        "@ckeditor/ckeditor5-heading": "^31.1.0",
-        "@ckeditor/ckeditor5-image": "^31.1.0",
-        "@ckeditor/ckeditor5-indent": "^31.1.0",
-        "@ckeditor/ckeditor5-link": "^31.1.0",
-        "@ckeditor/ckeditor5-list": "^31.1.0",
-        "@ckeditor/ckeditor5-media-embed": "^31.1.0",
-        "@ckeditor/ckeditor5-paragraph": "^31.1.0",
-        "@ckeditor/ckeditor5-paste-from-office": "^31.1.0",
-        "@ckeditor/ckeditor5-table": "^31.1.0",
-        "@ckeditor/ckeditor5-typing": "^31.1.0"
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-balloon/-/ckeditor5-build-balloon-32.0.0.tgz",
+      "integrity": "sha512-Bjb8bLhs162uQ5LN8LRqOee/my+9AY83CUJjwKbYY79W93CvL80Vv7gt8Bu+gzHTmm9dGW7DwwBtdm1z2+h96w==",
+      "requires": {
+        "@ckeditor/ckeditor5-adapter-ckfinder": "^32.0.0",
+        "@ckeditor/ckeditor5-autoformat": "^32.0.0",
+        "@ckeditor/ckeditor5-basic-styles": "^32.0.0",
+        "@ckeditor/ckeditor5-block-quote": "^32.0.0",
+        "@ckeditor/ckeditor5-ckfinder": "^32.0.0",
+        "@ckeditor/ckeditor5-cloud-services": "^32.0.0",
+        "@ckeditor/ckeditor5-easy-image": "^32.0.0",
+        "@ckeditor/ckeditor5-editor-balloon": "^32.0.0",
+        "@ckeditor/ckeditor5-essentials": "^32.0.0",
+        "@ckeditor/ckeditor5-heading": "^32.0.0",
+        "@ckeditor/ckeditor5-image": "^32.0.0",
+        "@ckeditor/ckeditor5-indent": "^32.0.0",
+        "@ckeditor/ckeditor5-link": "^32.0.0",
+        "@ckeditor/ckeditor5-list": "^32.0.0",
+        "@ckeditor/ckeditor5-media-embed": "^32.0.0",
+        "@ckeditor/ckeditor5-paragraph": "^32.0.0",
+        "@ckeditor/ckeditor5-paste-from-office": "^32.0.0",
+        "@ckeditor/ckeditor5-table": "^32.0.0",
+        "@ckeditor/ckeditor5-typing": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-ckfinder": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-31.1.0.tgz",
-      "integrity": "sha512-aFYWVbOabQ9p03E97QPV1t/mWla2rPA+9fXBIk4ug5+jcLOG6GNt+B/RTFG5QxxfgWJWh/I2C3UR82Ia8Kq29A==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-32.0.0.tgz",
+      "integrity": "sha512-1XOr+S26Gt2CNZxnIzxURwCpZXGnNW56ZTPqHa2NHLgemm+KYs3+iR8/AQj9HCW5za+ZFmj0I5Ztqq9Pssya1w==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-clipboard": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-31.1.0.tgz",
-      "integrity": "sha512-rHvswGs4Q/ZiKPGk0J7+Nrb3mqNugKQFOXA7SSecOI9ZRt6hIxr4fgj4ccb8ceuHNr2vJNmTGC8jjKX7wGHPbw==",
-      "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
-        "@ckeditor/ckeditor5-widget": "^31.1.0",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-32.0.0.tgz",
+      "integrity": "sha512-Irk+XMCaG6lEBHh4ffPVfP66CEfOIGokADM0w7Z11xrPGqz1UCWrdu2CGoEaEDWw3+7c5/IjDh9jmZ5xG8TZmQ==",
+      "requires": {
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
+        "@ckeditor/ckeditor5-widget": "^32.0.0",
         "lodash-es": "^4.17.11"
       }
     },
     "@ckeditor/ckeditor5-cloud-services": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-31.1.0.tgz",
-      "integrity": "sha512-QTmADTvwnxx0FukZiTstCNYbf11La9Xarw61kv/W+g3JnkIGzguj3H4MJ2WYKLAuEZIr5czOATVRPvS11lFZNA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-32.0.0.tgz",
+      "integrity": "sha512-hpbZP4Ue9glkK35+6/Tv+Zw6S/gWA7qNhuUWFEQ22kClKpiEH+2SOnQrTWBRrHVMLRm3GXIfq9sIvv3Ndi0a2w==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-core": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-31.1.0.tgz",
-      "integrity": "sha512-5BUosLrUliV2NZ9DAW48Za/4P3QWmwKMoHohCvq7Jq9Us6TQCnEKauUNexJFDAWqUAdN2WlqaVdSL+FmfhmzSA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-32.0.0.tgz",
+      "integrity": "sha512-Vf13S2EQ/R7ULFHt13Is6lOunq3tWROqNsE9oclSuzL0kTWoYuzu3JFyEnyMwDMRisl3CDpU7/Bp5VJ76BsRsA==",
       "requires": {
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-dev-utils": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-27.0.0.tgz",
-      "integrity": "sha512-r421mh6eb75dTneo2M+qqM78tzOimXVMTY/A+c2Ut/YxkTCFxRJSwOqDETNgWEeQU6IVkflMGf8rcFR4rfdhJw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-28.1.1.tgz",
+      "integrity": "sha512-zxTT2IkW9i3nU+e9ZEwFNle7HKMVDRC9M9DZfg7kWGUilILB8uk8JZFkSazAJUWXYN1evEwIvqn2ur5KaSCT9g==",
       "requires": {
-        "@ckeditor/ckeditor5-dev-webpack-plugin": "~27.0.0",
+        "@ckeditor/ckeditor5-dev-webpack-plugin": "^28.1.1",
         "acorn": "^6.2.1",
         "acorn-walk": "^6.2.0",
         "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.6.1",
         "cssnano": "^4.0.0",
         "del": "^5.0.0",
         "escodegen": "^1.9.0",
         "fs-extra": "^8.1.0",
+        "is-interactive": "^1.0.0",
         "javascript-stringify": "^1.6.0",
         "pofile": "^1.0.9",
         "postcss": "^7.0.39",
@@ -24039,95 +24107,14 @@
         "style-loader": "^2.0.0",
         "terser-webpack-plugin": "^4.2.3",
         "through2": "^3.0.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "serialize-javascript": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "terser-webpack-plugin": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-          "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
-          "requires": {
-            "cacache": "^15.0.5",
-            "find-cache-dir": "^3.3.1",
-            "jest-worker": "^26.5.0",
-            "p-limit": "^3.0.2",
-            "schema-utils": "^3.0.0",
-            "serialize-javascript": "^5.0.1",
-            "source-map": "^0.6.1",
-            "terser": "^5.3.4",
-            "webpack-sources": "^1.4.3"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "8.6.0",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
-              "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
-              "optional": true,
-              "peer": true
-            },
-            "terser": {
-              "version": "5.10.0",
-              "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
-              "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
-              "requires": {
-                "commander": "^2.20.0",
-                "source-map": "~0.7.2",
-                "source-map-support": "~0.5.20"
-              },
-              "dependencies": {
-                "source-map": {
-                  "version": "0.7.3",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                  "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-                }
-              }
-            }
-          }
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
       }
     },
     "@ckeditor/ckeditor5-dev-webpack-plugin": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-webpack-plugin/-/ckeditor5-dev-webpack-plugin-27.0.0.tgz",
-      "integrity": "sha512-PkLN+Jftxbk0E9LlROOobi+UXYDcefUIsCn5OI7j4eF8mmFKh+9lgeqyavWU8RIjADM65qc0bxbcJvhkwsPFtg==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-dev-webpack-plugin/-/ckeditor5-dev-webpack-plugin-28.1.1.tgz",
+      "integrity": "sha512-psr+RP21MSSnuuZ3aD2UXzbFLBhO6SAlibot3DulK2MxkxkTNcCGHTRE8EvzFj1hpknh5KCONiDmh2y7O28NuQ==",
       "requires": {
-        "@ckeditor/ckeditor5-dev-utils": "^27.0.0",
+        "@ckeditor/ckeditor5-dev-utils": "~28.1.1",
         "chalk": "^4.0.0",
         "rimraf": "^3.0.2",
         "semver": "^7.3.4",
@@ -24167,208 +24154,209 @@
       }
     },
     "@ckeditor/ckeditor5-easy-image": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-31.1.0.tgz",
-      "integrity": "sha512-eS6VJw6b7baoS76m3oYpCmhjITKXYom5qAOOfvYyH0FOHLhU0iGJPj7Apy7NYNpj1/MlntBz5S3kz/j0HAbrtw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-32.0.0.tgz",
+      "integrity": "sha512-PLt4xRGs9eTl0zaDHqBiw1m5EngOFDFMdsCb3au7XBDDZ7Q7UhXIbGvA6waAUHniJaZLCVppU7J+knTlmsZfRQ==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-editor-balloon": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-31.1.0.tgz",
-      "integrity": "sha512-vL9l/BranIZp/ZcQ9iN6JirXW5gcxuOTP+wM8QsXvpihtq+Gt5a8w2TPGtF+d4BoJYbXpqnA3fR+OBtu86dEvA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-32.0.0.tgz",
+      "integrity": "sha512-6BHPow/jN3rDNqQ6X9FWSPmiSWtrSOID0AJ/wTvJ48P5UqjsylgmZj078q0IhPlS+dnj2r0trXy4fJJ0FdR8gQ==",
       "requires": {
-        "ckeditor5": "^31.1.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-engine": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-31.1.0.tgz",
-      "integrity": "sha512-lHZjdKKeBWR4N2rk4rdnxDtdE3F1Q7Z2Ag2RgHG8GT3J6s2BNx/z++9GxhlCKPR3TQ70XWCLBLGXuFHXIvU0Kg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-32.0.0.tgz",
+      "integrity": "sha512-UuAEnGBdib0hVhCIJByLQ8tKDjdOJkJF/aKsAQth9an95Z7TJ8oqUqhwhUQWtsULu0ugaqb/95t7FUFA+3BJqw==",
       "requires": {
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-enter": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-31.1.0.tgz",
-      "integrity": "sha512-9K5d12lCfvnUGESwxpu2UJCLsAaa40QR4JgVHKV0CZpERfcsvcF3XdM8cggS/Ovin2TBq1w+tXhOKbop5Why9Q==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-32.0.0.tgz",
+      "integrity": "sha512-1V0M9wyTWZmLJ07eqb7ZICEQTDzi2NwsKaTpAavOlMG04+L4q5Ha9H0EXxgZtKjN4iq0cQEv6sog06xDkRrTDw==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-essentials": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-31.1.0.tgz",
-      "integrity": "sha512-QXFDBHfovjJ5BtIh2YEi37Y3L3/5tvV3XB+W04vTyPP7fkK/kAf7+0I8XpQzW9v2OMQEPvCyeSBOHWXD2P4G2Q==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-32.0.0.tgz",
+      "integrity": "sha512-haHmUIdvz0ykMBM4YOyNFBbh6Ymku19yoPyX8xMIzMVbniI+DtB1k0fGZu7OqUNjjf5jPZJlz5sW+KHzzySVXg==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-font": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-31.1.0.tgz",
-      "integrity": "sha512-hl2uxS0IvHIH4H4BopfM+DyMiBJIQ7W80dKJOenE7eL48IyMGbNeS4LZ22Zyo5J1nr//s7SdNRuSKPXrlqJl9g==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-32.0.0.tgz",
+      "integrity": "sha512-l3wXRxrO/KWLHz9zdNZzND89yJT8bL36xYABh6FPJamN4PFaz29zTVAIC7T3xLZ+H6/V+kcDXWhYBJQKdbvXXg==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-heading": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-31.1.0.tgz",
-      "integrity": "sha512-KVRl0aTT/2XBOp/hVrVa2lq9/WXc78XMT2a2cnXPHcbH8hbE0jvBSSHK6HM4SrbM1Xjv+l02a9syluNMPK3PDg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-32.0.0.tgz",
+      "integrity": "sha512-XxB1yDP3aU1ePYAUE2XiQ/yjHkSdrRllVsihBtDKh5DTcoKxZHafmVEZXBiJaLrv5OPNmfvXyR+eC6yet35sMA==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-image": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-31.1.0.tgz",
-      "integrity": "sha512-TvEVrq6fRazITt2CMU8rPLQPCW8DrP5tE/fyXsh1cwfFzPYKxyMqFrNb65GMSTFIVWgJ1RfWac9GLTMw6c1tRg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-32.0.0.tgz",
+      "integrity": "sha512-sBdFbWH5YdmnvEIQsEY4Xj4kkHcSmLgFDjgtAQdjqdQi3GZI81kMYIepPNELtUtpEqNd0WyS3ReWYHMlbjOpfw==",
       "requires": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "ckeditor5": "^31.1.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-indent": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-31.1.0.tgz",
-      "integrity": "sha512-kHme0J60/y8NCD2VBkYPY0fb3ypx1FqlE1Dt+2rujd2d+boSbML72eAkDDhHODcBohUDyudjm8wflJSsadBbhw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-32.0.0.tgz",
+      "integrity": "sha512-I1zHBv1kRCRUyOevKzSpVyd/Df1IdmYeKsVYmEKvDCUQMp126DEdOjlxCbSkq66gFJ1VLUlV+lev5BXg0w2NRA==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-link": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-31.1.0.tgz",
-      "integrity": "sha512-N81EmhslyZoDocbamYEXDsC2MJChSlG8N7ZsVd5+TGF2ZrGlY/5cczY/hEgJcs4CGMaXOboCGRZjGsQQ2Z4u0g==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-32.0.0.tgz",
+      "integrity": "sha512-xJHLp+SZn/fzcDHFU80IOEkZ6aBWSAMgJyp2pDMFOJMz2eWTKwNNh6XJW18f4ELHVWaCMVNgdp/DuSZxxUGxfg==",
       "requires": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "ckeditor5": "^31.1.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-list": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-31.1.0.tgz",
-      "integrity": "sha512-/L/wsqeW4r7VF+HNDs58tXtSCIPODqlAJ82zMt3Pk5wx8BgXmFgguZ3RRZJdC3CyP6VZwfDMAzDNgU6H51+Tuw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-32.0.0.tgz",
+      "integrity": "sha512-xjIfi142oso1H5m89BKB7uaOsWzMUb14BGzO9poTvSQjIpavBRYPTrin2qb0euuEY2XvUjVJF7GqPJ4zJdPDzA==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-media-embed": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-31.1.0.tgz",
-      "integrity": "sha512-/MflPFvjWnbdL2Pv+MtgKQPubLYPdH/I2BUKQkRGPdFBhdfiC9fcZWC+JzGw+GQzs4jVcgjKrnaz0fGHlIpjtA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-32.0.0.tgz",
+      "integrity": "sha512-GoCaEqAW0Pu2mPOBKzNxdpqD2beM5KmxhaIANOR8xR404cYSMgXM6g5bL6eQPRRwtzqw60/qTj2k9QGIqg30xw==",
       "requires": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "ckeditor5": "^31.1.0"
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-paragraph": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-31.1.0.tgz",
-      "integrity": "sha512-rltzxwcKwR6mxZqomKLkrdLuVkkeKiESv7bweVY9VcPb7hk0BiLZcYkLqsOlfkZHWHWCiQ+5UDR8ctuaVmiUjg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-32.0.0.tgz",
+      "integrity": "sha512-GRpMOb0pjZHvUtyTrX9jlH7gQ5n1/33ljX3Ty31Lyovz4KPfR3YNzyjNAVHb/fOk72zoPFUrhpd/NLum836DNA==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-paste-from-office": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-31.1.0.tgz",
-      "integrity": "sha512-2BUHw2KmX7+YjR1IqMAPMiiSf01SEK64CPCmnOdNgV1XcM3Kjc2svdFCslulW6gT8C3WNFPD+aeAyp4O9LLnGw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-32.0.0.tgz",
+      "integrity": "sha512-dX/vfBwp0e7938Y1j0lEyqfClsEInnQHG/MD4gz9AVcCixVxl12F2uL52WMm/nSVrVax5zcUSOz1QV9/0UG/mg==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-remove-format": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-31.1.0.tgz",
-      "integrity": "sha512-02Q7wxWt4D5J6Ze5drha+9yd1RxBnbdn4tHoTseaoZAvuyYjt1e43jmXFfnS8/mBU2YetbM4CJ61f+lkzW5fcw==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-32.0.0.tgz",
+      "integrity": "sha512-sI1yiHas9SNP/LzESkHKlQ8mZD2aEFCNdAArY2HsdB6cWP9VceUQZPvLGH0/fY+/oglcjo7t8H8lHMcwlDV9zw==",
       "requires": {
-        "ckeditor5": "^31.1.0"
+        "ckeditor5": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-select-all": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-31.1.0.tgz",
-      "integrity": "sha512-d6bTtuZLoBN61jPjbY562awfRYy+xhnCEIilsoRLb04mFNa6HnFs/mZtNIFqrm7dYZWSkJz9+1XwQouYW+kGqQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-32.0.0.tgz",
+      "integrity": "sha512-HmkR1hivslj9N+x3KAf0hghIpTafxmGqV2nit8iE0WE4YCcBw0cubJHbDsdiFmniIQXrbsBgI7RUnXs4nXdaCg==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-table": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-31.1.0.tgz",
-      "integrity": "sha512-GIVnraBOG5bPkF3KTV4anPIQo8CnMUkdwA3EYkdgpdOBSaaYYK4d66ej0OXCHSfKyJ+jwg9VoxVnQB/zZiCJLA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-32.0.0.tgz",
+      "integrity": "sha512-pWNeDCKMcNp/XpRU/hqu1K7rmzrDB++WIPzG5KDwkQQ83iwlbTqrfa7xsLLVX6bz6g2/fy2B3Ipt5BIndhlhjQ==",
       "requires": {
-        "ckeditor5": "^31.1.0",
+        "ckeditor5": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-theme-lark": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-31.1.0.tgz",
-      "integrity": "sha512-fPtDEMmr7HFS3w9X1fr2ipzQv7DeVYF4vyJjybhsQht1Stoa8w7T8By7k+/5h7HIl2/EjHP4P1oPuMGXaXV9OA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-32.0.0.tgz",
+      "integrity": "sha512-g/yqNXUg7gwS4WeWDDBjfp/v9DOb4eRy3k4U1iC7IzhTaF2dNYnCi52E+Y0rHWociYI3MG4y4fn1hEX7oK3agw==",
       "requires": {
-        "@ckeditor/ckeditor5-ui": "^31.1.0"
+        "@ckeditor/ckeditor5-ui": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-typing": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-31.1.0.tgz",
-      "integrity": "sha512-juskFEb1YrXLS+wcLEnc3GZtqkq95Q13sNAAyvKaEXzNphy4PBv+odLAwP7KCrxifVf278bgVxGDV5GPPAenOA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-32.0.0.tgz",
+      "integrity": "sha512-MkbFfgvwMgU4P5/2LZa473w2XA4DQmb7N+3VzqMQfn2y7YdsRk8tt54GxilwL0bTE/AiSqcR6f+LcnHFGj/coQ==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-ui": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-31.1.0.tgz",
-      "integrity": "sha512-fHBLsRK7XRxeewm1NH9idU4zUguhysQPEmEhqWOi+GRt2I0pYrc22GYNJF3yKMqp1LfiLi7GAT66X2RL9rCEaQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-32.0.0.tgz",
+      "integrity": "sha512-tkn5Y0ZYkhby8iFnAAZMLyh9zub/okOhzR2IJvS6T95J/w1z2HpJO/yNkdSrU43qXQtmp77o0UQ53PU4PvIp0Q==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@ckeditor/ckeditor5-undo": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-31.1.0.tgz",
-      "integrity": "sha512-eNWEP9E5Ji2W7NU6vCKOqjYW0+/xwXGkiExboTApudJDT1IWu2hqoaVQ+3eEWHWJbqCxIRSHif6+uYEBIoInXg==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-32.0.0.tgz",
+      "integrity": "sha512-4diY4FcmX3Wbi0Gr0U1HsswwJ3HIjdRJV9x4zEm7rXz1PbH+IIQKPIJQSoyd1dSkE2F4DslUhfIGsZH5vzmQ8w==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-upload": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-31.1.0.tgz",
-      "integrity": "sha512-j+FNllYawZgTWCVOUSce/34SMfwgqNa2F7yvdmw4pmPSl8mlSZxSEYA9mLqbKpXwsuFY0iY14JQEB2bngNgTbA==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-32.0.0.tgz",
+      "integrity": "sha512-MSzZqB65zzrvwUOjzdUvuNp7syY5ZGZG3qdQeJBQNAS9G14f5WdzH4tKGK2j4dDX3KGhoCA1RJagpCmwDXqRWw==",
       "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0"
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0"
       }
     },
     "@ckeditor/ckeditor5-utils": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-31.1.0.tgz",
-      "integrity": "sha512-l2C2m8uLxKTblXX6SY+k40tK9U4pFZ2WCYP1dc3B0qz5an+h7e5EqRz3kFs+MVw0HM6VCYWDFql/JZDAFonOmQ==",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-32.0.0.tgz",
+      "integrity": "sha512-4O0TW/oeFRGbB+mrXMhx47zEzASdDz87ftiJiI9jcB+S6Pq5+aSqCNc0ZVQBKaj2URNGqFkkT6Kp6eEEsMBVWA==",
       "requires": {
         "lodash-es": "^4.17.15"
       }
@@ -24379,16 +24367,16 @@
       "integrity": "sha512-snsNB/2oWfKw0drGJAmMGpTatmt//L1rQsOwkBw+1uKUuOJPKN3xwyUZVWT906VguIMXm4E9OHzquZ3bdkijiA=="
     },
     "@ckeditor/ckeditor5-widget": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-31.1.0.tgz",
-      "integrity": "sha512-e/B2qjgwXHuj/Qo+cGAM7j3NTPXvTikL+wjEF5sh5a0w5el9Sv97tzew5rojkZ6ypQykE+1ue+F579b74n7QiQ==",
-      "requires": {
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-enter": "^31.1.0",
-        "@ckeditor/ckeditor5-typing": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-32.0.0.tgz",
+      "integrity": "sha512-YcF5iVtMwYC8/3sxv00Du/9bvdhx6br0gJdxfjkiNP1/7GY+WSwjhZSNJZhT30xp+iLHt4tGIUUQqFHIk3Ui6Q==",
+      "requires": {
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-enter": "^32.0.0",
+        "@ckeditor/ckeditor5-typing": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
         "lodash-es": "^4.17.15"
       }
     },
@@ -24992,18 +24980,18 @@
       }
     },
     "@sinonjs/fake-timers": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
-      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.0.tgz",
+      "integrity": "sha512-M8vapsv9qQupMdzrVzkn5rb9jG7aUTEPAZdMtME2PuBaefksFZVE2C1g4LBRTkF/k3nRDNbDc5tp5NFC1PEYxA==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.7.0"
       }
     },
     "@sinonjs/samsam": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz",
-      "integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz",
+      "integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.6.0",
@@ -26828,15 +26816,16 @@
       "peer": true
     },
     "chai": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
         "deep-eql": "^3.0.1",
         "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
         "pathval": "^1.1.1",
         "type-detect": "^4.0.5"
       }
@@ -26867,9 +26856,9 @@
       "dev": true
     },
     "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "devOptional": true,
       "requires": {
         "anymatch": "~3.1.2",
@@ -26905,22 +26894,22 @@
       }
     },
     "ckeditor5": {
-      "version": "31.1.0",
-      "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-31.1.0.tgz",
-      "integrity": "sha512-uuU5JNeiLFIv6oMtSmHdKOmgO8ZjqoSqV/rJWSpc9yxXbhjjs3Gdb6lbF9f0V5OCvQSIBCTtYVYllzfXAXMyqA==",
-      "requires": {
-        "@ckeditor/ckeditor5-clipboard": "^31.1.0",
-        "@ckeditor/ckeditor5-core": "^31.1.0",
-        "@ckeditor/ckeditor5-engine": "^31.1.0",
-        "@ckeditor/ckeditor5-enter": "^31.1.0",
-        "@ckeditor/ckeditor5-paragraph": "^31.1.0",
-        "@ckeditor/ckeditor5-select-all": "^31.1.0",
-        "@ckeditor/ckeditor5-typing": "^31.1.0",
-        "@ckeditor/ckeditor5-ui": "^31.1.0",
-        "@ckeditor/ckeditor5-undo": "^31.1.0",
-        "@ckeditor/ckeditor5-upload": "^31.1.0",
-        "@ckeditor/ckeditor5-utils": "^31.1.0",
-        "@ckeditor/ckeditor5-widget": "^31.1.0"
+      "version": "32.0.0",
+      "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-32.0.0.tgz",
+      "integrity": "sha512-PehBSDwclMcZcVIRFZRUv6BSEdQCK+9kUbnWdcAOtM9LJL8aWCwCTg6VZTq6+aDEzoz6BfkjO1eF3ZtQVJT97w==",
+      "requires": {
+        "@ckeditor/ckeditor5-clipboard": "^32.0.0",
+        "@ckeditor/ckeditor5-core": "^32.0.0",
+        "@ckeditor/ckeditor5-engine": "^32.0.0",
+        "@ckeditor/ckeditor5-enter": "^32.0.0",
+        "@ckeditor/ckeditor5-paragraph": "^32.0.0",
+        "@ckeditor/ckeditor5-select-all": "^32.0.0",
+        "@ckeditor/ckeditor5-typing": "^32.0.0",
+        "@ckeditor/ckeditor5-ui": "^32.0.0",
+        "@ckeditor/ckeditor5-undo": "^32.0.0",
+        "@ckeditor/ckeditor5-upload": "^32.0.0",
+        "@ckeditor/ckeditor5-utils": "^32.0.0",
+        "@ckeditor/ckeditor5-widget": "^32.0.0"
       }
     },
     "clamp": {
@@ -26933,6 +26922,19 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
     },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-spinners": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
+    },
     "clipboard": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
@@ -27170,9 +27172,9 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="
+      "version": "3.21.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
     },
     "core-js-compat": {
       "version": "3.20.2",
@@ -27261,6 +27263,11 @@
         "timsort": "^0.3.0"
       }
     },
+    "css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw=="
+    },
     "css-loader": {
       "version": "5.2.7",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",
@@ -28126,9 +28133,9 @@
       "integrity": "sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg=="
     },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -28303,9 +28310,9 @@
       }
     },
     "dompurify": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz",
-      "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ=="
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.5.tgz",
+      "integrity": "sha512-kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ=="
     },
     "domutils": {
       "version": "2.8.0",
@@ -29168,9 +29175,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -29385,9 +29392,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -29936,9 +29943,9 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true,
       "optional": true,
       "peer": true
@@ -30388,6 +30395,11 @@
         "is-extglob": "^2.1.1"
       }
     },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
+    },
     "is-negative-zero": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
@@ -30503,7 +30515,10 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "is-unicode-supported": {
       "version": "0.1.0",
@@ -30978,6 +30993,15 @@
         "signal-exit": "^3.0.0"
       }
     },
+    "loupe": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.1.tgz",
+      "integrity": "sha512-EN1D3jyVmaX4tnajVlfbREU4axL647hLec1h/PXAb8CPDMJiYitcWF2UeLVNttRqaIqQs4x+mRvXf+d+TlDrCA==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.0"
+      }
+    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -31291,8 +31315,7 @@
     "mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "min-indent": {
       "version": "1.0.1",
@@ -31386,32 +31409,32 @@
       }
     },
     "mocha": {
-      "version": "9.1.4",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.4.tgz",
-      "integrity": "sha512-+q2aV5VlJZuLgCWoBvGI5zEwPF9eEI0kr/sAA9Jm4xMND7RfIEyF8JE7C0JIg8WXRG+P1sdIAb5ccoHPlXLzcw==",
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz",
+      "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==",
       "dev": true,
       "requires": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.2",
+        "chokidar": "3.5.3",
+        "debug": "4.3.3",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
-        "glob": "7.1.7",
+        "glob": "7.2.0",
         "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "4.1.0",
         "log-symbols": "4.1.0",
         "minimatch": "3.0.4",
         "ms": "2.1.3",
-        "nanoid": "3.1.25",
+        "nanoid": "3.2.0",
         "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
         "which": "2.0.2",
-        "workerpool": "6.1.5",
+        "workerpool": "6.2.0",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
@@ -31429,6 +31452,20 @@
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -31686,10 +31723,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
-      "dev": true
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -32201,13 +32237,13 @@
       "integrity": "sha512-b+0geJAVygUKPpIOyJiIuuGFFdxLGyRAqf+Ap25BdPWplNiLq6mpUFYEGdVaroKx41cn6j83MpDOSkVK5plJvg=="
     },
     "nise": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
-      "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz",
+      "integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==",
       "dev": true,
       "requires": {
-        "@sinonjs/commons": "^1.7.0",
-        "@sinonjs/fake-timers": "^7.0.4",
+        "@sinonjs/commons": "^1.8.3",
+        "@sinonjs/fake-timers": ">=5",
         "@sinonjs/text-encoding": "^0.7.1",
         "just-extend": "^4.0.2",
         "path-to-regexp": "^1.7.0"
@@ -32516,7 +32552,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
       }
@@ -32696,9 +32731,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-posix": {
       "version": "1.0.0",
@@ -33757,9 +33792,9 @@
       "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4="
     },
     "postcss-selector-parser": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
-      "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "requires": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -33784,9 +33819,9 @@
       }
     },
     "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "prelude-ls": {
       "version": "1.1.2",
@@ -33907,9 +33942,9 @@
       "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234="
     },
     "ramda": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz",
-      "integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA=="
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz",
+      "integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA=="
     },
     "randexp": {
       "version": "0.4.6",
@@ -34229,6 +34264,15 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -34734,9 +34778,9 @@
       "dev": true
     },
     "shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
       "requires": {
         "glob": "^7.0.0",
         "interpret": "^1.0.0",
@@ -34760,33 +34804,22 @@
       "dev": true
     },
     "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sinon": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz",
-      "integrity": "sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-13.0.1.tgz",
+      "integrity": "sha512-8yx2wIvkBjIq/MGY1D9h1LMraYW+z1X0mb648KZnKSdvLasvDu7maa0dFaNYdTDczFgbjNw2tOmWdTk9saVfwQ==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.8.3",
-        "@sinonjs/fake-timers": "^8.1.0",
-        "@sinonjs/samsam": "^6.0.2",
+        "@sinonjs/fake-timers": "^9.0.0",
+        "@sinonjs/samsam": "^6.1.1",
         "diff": "^5.0.0",
-        "nise": "^5.1.0",
+        "nise": "^5.1.1",
         "supports-color": "^7.2.0"
-      },
-      "dependencies": {
-        "@sinonjs/fake-timers": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-          "dev": true,
-          "requires": {
-            "@sinonjs/commons": "^1.7.0"
-          }
-        }
       }
     },
     "sinon-chai": {
@@ -34824,7 +34857,8 @@
     "source-map-js": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="
+      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "dev": true
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -34930,9 +34964,9 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "requires": {
         "figgy-pudding": "^3.5.1"
       }
@@ -35125,9 +35159,9 @@
       "dev": true
     },
     "striptags": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.1.1.tgz",
-      "integrity": "sha1-yMPn/db7S7OjKjt1LltePjgJPr0="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw=="
     },
     "style-loader": {
       "version": "2.0.0",
@@ -35166,21 +35200,22 @@
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI="
     },
     "stylelint": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz",
-      "integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==",
+      "version": "14.5.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz",
+      "integrity": "sha512-omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ==",
       "requires": {
         "balanced-match": "^2.0.0",
         "colord": "^2.9.2",
         "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
         "debug": "^4.3.3",
         "execall": "^2.0.0",
-        "fast-glob": "^3.2.7",
+        "fast-glob": "^3.2.11",
         "fastest-levenshtein": "^1.0.12",
         "file-entry-cache": "^6.0.1",
         "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
+        "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
         "ignore": "^5.2.0",
@@ -35194,21 +35229,22 @@
         "normalize-path": "^3.0.0",
         "normalize-selector": "^0.2.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.3.11",
+        "postcss": "^8.4.6",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.7",
-        "postcss-value-parser": "^4.1.0",
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "specificity": "^0.4.1",
         "string-width": "^4.2.3",
         "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.7.5",
+        "table": "^6.8.0",
         "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^3.0.3"
+        "write-file-atomic": "^4.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -35255,14 +35291,6 @@
             "yaml": "^1.10.0"
           }
         },
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "decamelize-keys": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
@@ -35287,22 +35315,22 @@
           "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
         },
         "globby": {
-          "version": "11.0.4",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-          "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
           "requires": {
             "array-union": "^2.1.0",
             "dir-glob": "^3.0.1",
-            "fast-glob": "^3.1.1",
-            "ignore": "^5.1.4",
-            "merge2": "^1.3.0",
+            "fast-glob": "^3.2.9",
+            "ignore": "^5.2.0",
+            "merge2": "^1.4.1",
             "slash": "^3.0.0"
           }
         },
         "hosted-git-info": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.0.tgz",
-          "integrity": "sha512-fqhGdjk4av7mT9fU/B01dUtZ+WZSc/XEXMoLXDVZukiQRXxeHSSz3AqbeWRJHtF8EQYHlAgB1NSAHU0Cm7aqZA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -35383,11 +35411,6 @@
             "kind-of": "^6.0.3"
           }
         },
-        "nanoid": {
-          "version": "3.1.30",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-          "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="
-        },
         "normalize-package-data": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.1.tgz",
@@ -35427,13 +35450,13 @@
           }
         },
         "postcss": {
-          "version": "8.3.11",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-          "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+          "version": "8.4.6",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
+          "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
           "requires": {
-            "nanoid": "^3.1.30",
+            "nanoid": "^3.2.0",
             "picocolors": "^1.0.0",
-            "source-map-js": "^0.6.2"
+            "source-map-js": "^1.0.2"
           }
         },
         "postcss-safe-parser": {
@@ -35454,9 +35477,9 @@
           },
           "dependencies": {
             "hosted-git-info": {
-              "version": "2.8.8",
-              "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-              "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+              "version": "2.8.9",
+              "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+              "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
             },
             "normalize-package-data": {
               "version": "2.5.0",
@@ -35525,6 +35548,11 @@
           "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
           "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
         },
+        "source-map-js": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+          "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+        },
         "strip-ansi": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -35574,6 +35602,15 @@
         "has-flag": "^4.0.0"
       }
     },
+    "supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "requires": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
     "svg-inline-loader": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/svg-inline-loader/-/svg-inline-loader-0.8.2.tgz",
@@ -35605,9 +35642,9 @@
       "dev": true
     },
     "table": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.5.tgz",
-      "integrity": "sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "requires": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -35653,9 +35690,9 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -35699,6 +35736,84 @@
         }
       }
     },
+    "terser-webpack-plugin": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
+      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
+      "requires": {
+        "cacache": "^15.0.5",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.5.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
+        "source-map": "^0.6.1",
+        "terser": "^5.3.4",
+        "webpack-sources": "^1.4.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
+        },
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "serialize-javascript": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "terser": {
+          "version": "5.11.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz",
+          "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==",
+          "requires": {
+            "acorn": "^8.5.0",
+            "commander": "^2.20.0",
+            "source-map": "~0.7.2",
+            "source-map-support": "~0.5.20"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.3",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+            }
+          }
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -35959,14 +36074,6 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -36160,9 +36267,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -38983,9 +39090,9 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
     "workerpool": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-      "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
       "dev": true
     },
     "wrap-ansi": {
@@ -39022,14 +39129,12 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
       "requires": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
       }
     },
     "ws": {
diff --git a/package.json b/package.json
index 53facdff1..de5517687 100644
--- a/package.json
+++ b/package.json
@@ -15,22 +15,22 @@
     "test:watch": "NODE_ENV=testing mochapack -w --webpack-config webpack.test.js --require src/tests/setup.js \"src/tests/**/*.spec.js\""
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-alignment": "~31.1.0",
-    "@ckeditor/ckeditor5-basic-styles": "~31.1.0",
-    "@ckeditor/ckeditor5-block-quote": "~31.1.0",
-    "@ckeditor/ckeditor5-build-balloon": "~31.1.0",
-    "@ckeditor/ckeditor5-core": "^31.1.0",
-    "@ckeditor/ckeditor5-dev-utils": "~27.0.0",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "~27.0.0",
-    "@ckeditor/ckeditor5-editor-balloon": "~31.1.0",
-    "@ckeditor/ckeditor5-essentials": "~31.1.0",
-    "@ckeditor/ckeditor5-font": "^31.1.0",
-    "@ckeditor/ckeditor5-heading": "~31.1.0",
-    "@ckeditor/ckeditor5-link": "~31.1.0",
-    "@ckeditor/ckeditor5-list": "~31.1.0",
-    "@ckeditor/ckeditor5-paragraph": "~31.1.0",
-    "@ckeditor/ckeditor5-remove-format": "^31.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "~31.1.0",
+    "@ckeditor/ckeditor5-alignment": "~32.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "~32.0.0",
+    "@ckeditor/ckeditor5-block-quote": "~32.0.0",
+    "@ckeditor/ckeditor5-build-balloon": "~32.0.0",
+    "@ckeditor/ckeditor5-core": "~32.0.0",
+    "@ckeditor/ckeditor5-dev-utils": "~28.1.1",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "~28.1.0",
+    "@ckeditor/ckeditor5-editor-balloon": "~32.0.0",
+    "@ckeditor/ckeditor5-essentials": "~32.0.0",
+    "@ckeditor/ckeditor5-font": "^32.0.0",
+    "@ckeditor/ckeditor5-heading": "~32.0.0",
+    "@ckeditor/ckeditor5-link": "~32.0.0",
+    "@ckeditor/ckeditor5-list": "~32.0.0",
+    "@ckeditor/ckeditor5-paragraph": "~32.0.0",
+    "@ckeditor/ckeditor5-remove-format": "~32.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "~32.0.0",
     "@ckeditor/ckeditor5-vue2": "^1.0.5",
     "@nextcloud/auth": "^1.3.0",
     "@nextcloud/axios": "^1.9.0",
@@ -47,9 +47,9 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "@vue/babel-preset-app": "^4.5.15",
     "color-convert": "^2.0.1",
-    "core-js": "^3.20.3",
+    "core-js": "^3.21.1",
     "debounce-promise": "^3.1.2",
-    "dompurify": "^2.3.4",
+    "dompurify": "^2.3.5",
     "html-to-text": "^8.1.0",
     "ical.js": "^1.5.0",
     "iframe-resizer": "^4.3.2",
@@ -60,9 +60,9 @@
     "nextcloud_issuetemplate_builder": "^0.1.0",
     "postcss-loader": "^3.0.0",
     "printscout": "2.0.3",
-    "ramda": "^0.27.2",
+    "ramda": "^0.28.0",
     "raw-loader": "^4.0.2",
-    "stylelint": "^14.2.0",
+    "stylelint": "^14.5.3",
     "v-tooltip": "^2.1.3",
     "vue": "^2.6.14",
     "vue-autosize": "^1.0.2",
@@ -88,7 +88,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.16.12",
-    "@babel/eslint-parser": "^7.16.5",
+    "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.16.11",
     "@nextcloud/browserslist-config": "^2.2.0",
@@ -97,7 +97,7 @@
     "@vue/test-utils": "^1.3.0",
     "babel-loader": "^8.2.3",
     "babel-loader-exclude-node-modules-except": "^1.2.1",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "css-loader": "^5.2.7",
     "eslint": "^7.32.0",
     "eslint-config-standard": "^16.0.3",
@@ -110,11 +110,11 @@
     "file-loader": "^6.2.0",
     "jsdom": "^19.0.0",
     "jsdom-global": "^3.0.2",
-    "mocha": "^9.1.4",
+    "mocha": "^9.2.1",
     "mochapack": "^2.1.2",
     "sass": "^1.49.0",
     "sass-loader": "^10.1.1",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "style-loader": "^2.0.0",
     "svg-inline-loader": "^0.8.2",
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 3ce00b6ad..54c4b026d 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -36,9 +36,10 @@
 				:show-no-options="false"
 				:preserve-search="true"
 				:hide-selected="true"
+				:loading="loadingIndicatorTo"
 				@keyup="onInputChanged"
 				@tag="onNewToAddr"
-				@search-change="onAutocomplete" />
+				@search-change="onAutocomplete($event, 'to')" />
 			<a v-if="!showCC"
 				class="copy-toggle"
 				href="#"
@@ -62,9 +63,10 @@
 				:clear-on-select="true"
 				:show-no-options="false"
 				:preserve-search="true"
+				:loading="loadingIndicatorCc"
 				@keyup="onInputChanged"
 				@tag="onNewCcAddr"
-				@search-change="onAutocomplete">
+				@search-change="onAutocomplete($event, 'cc')">
 				<span slot="noOptions">{{ t('mail', 'No contacts found.') }}</span>
 			</Multiselect>
 		</div>
@@ -83,9 +85,10 @@
 				:placeholder="t('mail', '')"
 				:show-no-options="false"
 				:preserve-search="true"
+				:loading="loadingIndicatorBcc"
 				@keyup="onInputChanged"
 				@tag="onNewBccAddr"
-				@search-change="onAutocomplete">
+				@search-change="onAutocomplete($event, 'bcc')">
 				<span slot="noOptions">{{ t('mail', 'No contacts found.') }}</span>
 			</Multiselect>
 		</div>
@@ -408,6 +411,9 @@ export default {
 			addShareLink: t('mail', 'Add share link from {productName} Files', { productName: OC?.theme?.name ?? 'Nextcloud' }),
 			requestMdn: false,
 			appendSignature: true,
+			loadingIndicatorTo: false,
+			loadingIndicatorCc: false,
+			loadingIndicatorBcc: false,
 		}
 	},
 	computed: {
@@ -694,11 +700,21 @@ export default {
 		onAddCloudAttachmentLink() {
 			this.bus.$emit('onAddCloudAttachmentLink')
 		},
-		onAutocomplete(term) {
+		onAutocomplete(term, loadingIndicator) {
 			if (term === undefined || term === '') {
 				return
 			}
+			this.loadingIndicatorTo = loadingIndicator === 'to'
+			this.loadingIndicatorCc = loadingIndicator === 'cc'
+			this.loadingIndicatorBcc = loadingIndicator === 'bcc'
 			debouncedSearch(term).then((results) => {
+				if (loadingIndicator === 'to') {
+					this.loadingIndicatorTo = false
+				} else if (loadingIndicator === 'cc') {
+					this.loadingIndicatorCc = false
+				} else if (loadingIndicator === 'bcc') {
+					this.loadingIndicatorBcc = false
+				}
 				this.autocompleteRecipients = uniqBy('email')(this.autocompleteRecipients.concat(results))
 			})
 		},
diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index 0058ab900..2ebc9ff2c 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -57,67 +57,90 @@
 			{{ data.subject }}
 		</template>
 		<template #actions>
-			<ActionButton icon="icon-important"
-				:close-after-click="true"
-				@click.prevent="onToggleImportant">
-				{{
-					isImportant ? t('mail', 'Mark unimportant') : t('mail', 'Mark important')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-starred"
-				:close-after-click="true"
-				@click.prevent="onToggleFlagged">
-				{{
-					data.flags.flagged ? t('mail', 'Mark unfavorite') : t('mail', 'Mark favorite')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-mail"
-				:close-after-click="true"
-				@click.prevent="onToggleSeen">
-				{{
-					data.flags.seen ? t('mail', 'Mark unread') : t('mail', 'Mark read')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-junk"
-				:close-after-click="true"
-				@click.prevent="onToggleJunk">
-				{{
-					data.flags.$junk ? t('mail', 'Mark not spam') : t('mail', 'Mark as spam')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-checkmark"
-				:close-after-click="true"
-				@click.prevent="toggleSelected">
-				{{
-					selected ? t('mail', 'Unselect') : t('mail', 'Select')
-				}}
-			</ActionButton>
-			<ActionButton
-				icon="icon-tag"
-				:close-after-click="true"
-				@click.prevent="onOpenTagModal">
-				{{ t('mail', 'Edit tags') }}
-			</ActionButton>
-			<ActionButton icon="icon-external"
-				:close-after-click="true"
-				@click.prevent="onOpenMoveModal">
-				{{ t('mail', 'Move thread') }}
-			</ActionButton>
-			<ActionButton icon="icon-calendar-dark"
-				:close-after-click="true"
-				@click.prevent="showEventModal = true">
-				{{ t('mail', 'Create event') }}
-			</ActionButton>
-			<ActionButton icon="icon-add"
-				:close-after-click="true"
-				@click.prevent="onOpenEditAsNew">
-				{{ t('mail', 'Edit as new message') }}
-			</ActionButton>
-			<ActionButton icon="icon-delete"
-				:close-after-click="true"
-				@click.prevent="onDelete">
-				{{ t('mail', 'Delete thread') }}
-			</ActionButton>
+			<EnvelopePrimaryActions v-if="!moreActionsOpen">
+				<ActionButton icon="icon-starred"
+					class="action--primary"
+					:close-after-click="true"
+					@click.prevent="onToggleFlagged">
+					{{
+						data.flags.flagged ? t('mail', 'Unfavorite') : t('mail', 'Favorite')
+					}}
+				</ActionButton>
+				<ActionButton icon="icon-mail"
+					class="action--primary"
+					:close-after-click="true"
+					@click.prevent="onToggleSeen">
+					{{
+						data.flags.seen ? t('mail', 'Unread') : t('mail', 'Read')
+					}}
+				</ActionButton>
+				<ActionButton icon="icon-important"
+					class="action--primary"
+					:close-after-click="true"
+					@click.prevent="onToggleImportant">
+					{{
+						isImportant ? t('mail', 'Unimportant') : t('mail', 'Important')
+					}}
+				</ActionButton>
+			</EnvelopePrimaryActions>
+			<template v-if="!moreActionsOpen">
+				<ActionButton icon="icon-junk"
+					:close-after-click="true"
+					@click.prevent="onToggleJunk">
+					{{
+						data.flags.$junk ? t('mail', 'Mark not spam') : t('mail', 'Mark as spam')
+					}}
+				</ActionButton>
+				<ActionButton icon="icon-checkmark"
+					:close-after-click="true"
+					@click.prevent="toggleSelected">
+					{{
+						selected ? t('mail', 'Unselect') : t('mail', 'Select')
+					}}
+				</ActionButton>
+				<ActionButton
+					icon="icon-tag"
+					:close-after-click="true"
+					@click.prevent="onOpenTagModal">
+					{{ t('mail', 'Edit tags') }}
+				</ActionButton>
+				<ActionButton icon="icon-external"
+					:close-after-click="true"
+					@click.prevent="onOpenMoveModal">
+					{{ t('mail', 'Move thread') }}
+				</ActionButton>
+				<ActionButton icon="icon-more"
+					:close-after-click="false"
+					@click="moreActionsOpen=true">
+					{{ t('mail', 'More actions') }}
+				</ActionButton>
+				<ActionButton icon="icon-delete"
+					:close-after-click="true"
+					@click.prevent="onDelete">
+					{{ t('mail', 'Delete thread') }}
+				</ActionButton>
+			</template>
+			<template v-if="moreActionsOpen">
+				<ActionButton :close-after-click="false"
+					@click="moreActionsOpen=false">
+					<template #icon>
+						<ChevronLeft
+							:title="t('mail', 'More actions')"
+							:size="20" />
+						{{ t('mail', 'More actions') }}
+					</template>
+				</ActionButton>
+				<ActionButton icon="icon-add"
+					:close-after-click="true"
+					@click.prevent="onOpenEditAsNew">
+					{{ t('mail', 'Edit as new message') }}
+				</ActionButton>
+				<ActionButton icon="icon-calendar-dark"
+					:close-after-click="true"
+					@click.prevent="showEventModal = true">
+					{{ t('mail', 'Create event') }}
+				</ActionButton>
+			</template>
 		</template>
 		<template #extra>
 			<div
@@ -157,6 +180,7 @@ import ListItem from '@nextcloud/vue/dist/Components/ListItem'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import Avatar from './Avatar'
 import { calculateAccountColor } from '../util/AccountColor'
+import ChevronLeft from 'vue-material-design-icons/ChevronLeft'
 import moment from '@nextcloud/moment'
 import importantSvg from '../../img/important.svg'
 import { DraggableEnvelopeDirective } from '../directives/drag-and-drop/draggable-envelope'
@@ -169,15 +193,18 @@ import { matchError } from '../errors/match'
 import MoveModal from './MoveModal'
 import TagModal from './TagModal'
 import EventModal from './EventModal'
+import EnvelopePrimaryActions from './EnvelopePrimaryActions'
 import NewMessageModal from './NewMessageModal'
 
 export default {
 	name: 'Envelope',
 	components: {
+		EnvelopePrimaryActions,
 		EventModal,
 		ListItem,
 		Avatar,
 		ActionButton,
+		ChevronLeft,
 		MoveModal,
 		TagModal,
 		NewMessageModal,
@@ -221,6 +248,7 @@ export default {
 			showEventModal: false,
 			showTagModal: false,
 			showNewMessage: false,
+			moreActionsOpen: false,
 		}
 	},
 	computed: {
@@ -244,7 +272,7 @@ export default {
 			return this.data.flags.draft
 		},
 		account() {
-			const accountId = this.data.accountId ?? this.data.accountId
+			const accountId = this.data.accountId
 			return this.$store.getters.getAccount(accountId)
 		},
 		link() {
diff --git a/src/components/EnvelopePrimaryActions.vue b/src/components/EnvelopePrimaryActions.vue
new file mode 100644
index 000000000..67847e98e
--- /dev/null
+++ b/src/components/EnvelopePrimaryActions.vue
@@ -0,0 +1,41 @@
+<template>
+	<ul class="list-item-content__actions--primary">
+		<slot />
+	</ul>
+</template>
+
+<script>
+export default {
+	name: 'EnvelopePrimaryActions',
+}
+</script>
+
+<style>
+.list-item-content__actions--primary {
+	display: flex;
+	justify-content: space-between;
+}
+
+.list-item-content__actions--primary .action--primary:first-child {
+	padding-left: 5px;
+}
+
+.list-item-content__actions--primary .action--primary:last-child {
+	padding-right: 5px;
+}
+
+.list-item-content__actions--primary .action--primary .action-button {
+	align-items: center;
+	flex-direction: column;
+	padding: 10px 10px 0 10px;
+}
+
+.list-item-content__actions--primary .action--primary .action-button__text {
+	font-size: 14px;
+}
+
+.list-item-content__actions--primary .action--primary .action-button__text,
+.list-item-content__actions--primary .action--primary .action-button__icon {
+	height: auto;
+}
+</style>
diff --git a/src/components/MenuEnvelope.vue b/src/components/MenuEnvelope.vue
index 80bf79c98..265f18fcc 100644
--- a/src/components/MenuEnvelope.vue
+++ b/src/components/MenuEnvelope.vue
@@ -5,99 +5,122 @@
 			menu-align="right"
 			event=""
 			@click.native.prevent>
-			<ActionRouter v-if="withReply"
-				:icon="hasMultipleRecipients ? 'icon-reply-all' : 'icon-reply'"
-				:close-after-click="true"
-				:to="hasMultipleRecipients ? replyAllLink : replyOneLink">
-				{{ t('mail', 'Reply') }}
-			</ActionRouter>
-			<ActionRouter v-if="hasMultipleRecipients"
-				icon="icon-reply"
-				:close-after-click="true"
-				:to="replyOneLink">
-				{{ t('mail', 'Reply to sender only') }}
-			</ActionRouter>
-			<ActionRouter icon="icon-forward"
-				:close-after-click="true"
-				:to="forwardLink">
-				{{ t('mail', 'Forward') }}
-			</ActionRouter>
-			<ActionButton icon="icon-important"
-				:close-after-click="true"
-				@click.prevent="onToggleImportant">
-				{{
-					isImportant ? t('mail', 'Mark unimportant') : t('mail', 'Mark important')
-				}}
-			</ActionButton>
-			<ActionButton :icon="iconFavorite"
-				:close-after-click="true"
-				@click.prevent="onToggleFlagged">
-				{{
-					envelope.flags.flagged ? t('mail', 'Mark unfavorite') : t('mail', 'Mark favorite')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-mail"
-				:close-after-click="true"
-				@click.prevent="onToggleSeen">
-				{{
-					envelope.flags.seen ? t('mail', 'Mark unread') : t('mail', 'Mark read')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-junk"
-				:close-after-click="true"
-				@click.prevent="onToggleJunk">
-				{{
-					envelope.flags.$junk ? t('mail', 'Mark not spam') : t('mail', 'Mark as spam')
-				}}
-			</ActionButton>
-			<ActionButton
-				icon="icon-tag"
-				:close-after-click="true"
-				@click.prevent="onOpenTagModal">
-				{{ t('mail', 'Edit tags') }}
-			</ActionButton>
-			<ActionButton v-if="withSelect"
-				icon="icon-checkmark"
-				:close-after-click="true"
-				@click.prevent="toggleSelected">
-				{{
-					isSelected ? t('mail', 'Unselect') : t('mail', 'Select')
-				}}
-			</ActionButton>
-			<ActionButton icon="icon-external"
-				:close-after-click="true"
-				@click.prevent="onOpenMoveModal">
-				{{ t('mail', 'Move message') }}
-			</ActionButton>
-			<ActionButton icon="icon-calendar-dark"
-				:close-after-click="true"
-				@click.prevent="showEventModal = true">
-				{{ t('mail', 'Create event') }}
-			</ActionButton>
-			<ActionButton icon="icon-add"
-				:close-after-click="true"
-				@click="onOpenEditAsNew">
-				{{ t('mail', 'Edit as new message') }}
-			</ActionButton>
-			<ActionButton v-if="withShowSource"
-				:icon="sourceLoading ? 'icon-loading-small' : 'icon-details'"
-				:disabled="sourceLoading"
-				:close-after-click="true"
-				@click.prevent="onShowSourceModal">
-				{{ t('mail', 'View source') }}
-			</ActionButton>
-			<ActionLink v-if="debug"
-				icon="icon-download"
-				:download="threadingFileName"
-				:href="threadingFile"
-				:close-after-click="true">
-				{{ t('mail', 'Download thread data for debugging') }}
-			</ActionLink>
-			<ActionButton icon="icon-delete"
-				:close-after-click="true"
-				@click.prevent="onDelete">
-				{{ t('mail', 'Delete message') }}
-			</ActionButton>
+			<template v-if="!moreActionsOpen">
+				<EnvelopePrimaryActions>
+					<ActionButton :icon="iconFavorite"
+						class="action--primary"
+						:close-after-click="true"
+						@click.prevent="onToggleFlagged">
+						{{
+							envelope.flags.flagged ? t('mail', 'Unfavorite') : t('mail', 'Favorite')
+						}}
+					</ActionButton>
+					<ActionButton icon="icon-mail"
+						class="action--primary"
+						:close-after-click="true"
+						@click.prevent="onToggleSeen">
+						{{
+							envelope.flags.seen ? t('mail', 'Unread') : t('mail', 'Read')
+						}}
+					</ActionButton>
+					<ActionButton icon="icon-important"
+						class="action--primary"
+						:close-after-click="true"
+						@click.prevent="onToggleImportant">
+						{{
+							isImportant ? t('mail', 'Unimportant') : t('mail', 'Important')
+						}}
+					</ActionButton>
+				</EnvelopePrimaryActions>
+				<ActionRouter v-if="withReply"
+					:icon="hasMultipleRecipients ? 'icon-reply-all' : 'icon-reply'"
+					:close-after-click="true"
+					:to="hasMultipleRecipients ? replyAllLink : replyOneLink">
+					{{ t('mail', 'Reply') }}
+				</ActionRouter>
+				<ActionRouter v-if="hasMultipleRecipients"
+					icon="icon-reply"
+					:close-after-click="true"
+					:to="replyOneLink">
+					{{ t('mail', 'Reply to sender only') }}
+				</ActionRouter>
+				<ActionRouter icon="icon-forward"
+					:close-after-click="true"
+					:to="forwardLink">
+					{{ t('mail', 'Forward') }}
+				</ActionRouter>
+				<ActionButton icon="icon-junk"
+					:close-after-click="true"
+					@click.prevent="onToggleJunk">
+					{{
+						envelope.flags.$junk ? t('mail', 'Mark not spam') : t('mail', 'Mark as spam')
+					}}
+				</ActionButton>
+				<ActionButton
+					icon="icon-tag"
+					:close-after-click="true"
+					@click.prevent="onOpenTagModal">
+					{{ t('mail', 'Edit tags') }}
+				</ActionButton>
+				<ActionButton v-if="withSelect"
+					icon="icon-checkmark"
+					:close-after-click="true"
+					@click.prevent="toggleSelected">
+					{{
+						isSelected ? t('mail', 'Unselect') : t('mail', 'Select')
+					}}
+				</ActionButton>
+				<ActionButton icon="icon-external"
+					:close-after-click="true"
+					@click.prevent="onOpenMoveModal">
+					{{ t('mail', 'Move message') }}
+				</ActionButton>
+				<ActionButton icon="icon-more"
+					:close-after-click="false"
+					@click="moreActionsOpen=true">
+					{{ t('mail', 'More actions') }}
+				</ActionButton>
+				<ActionButton icon="icon-delete"
+					:close-after-click="true"
+					@click.prevent="onDelete">
+					{{ t('mail', 'Delete message') }}
+				</ActionButton>
+			</template>
+			<template v-if="moreActionsOpen">
+				<ActionButton :close-after-click="false"
+					@click="moreActionsOpen=false">
+					<template #icon>
+						<ChevronLeft
+							:title="t('mail', 'More actions')"
+							:size="20" />
+						{{ t('mail', 'More actions') }}
+					</template>
+				</ActionButton>
+				<ActionButton icon="icon-add"
+					:close-after-click="true"
+					@click="onOpenEditAsNew">
+					{{ t('mail', 'Edit as new message') }}
+				</ActionButton>
+				<ActionButton icon="icon-calendar-dark"
+					:close-after-click="true"
+					@click.prevent="showEventModal = true">
+					{{ t('mail', 'Create event') }}
+				</ActionButton>
+				<ActionButton v-if="withShowSource"
+					:icon="sourceLoading ? 'icon-loading-small' : 'icon-details'"
+					:disabled="sourceLoading"
+					:close-after-click="true"
+					@click.prevent="onShowSourceModal">
+					{{ t('mail', 'View source') }}
+				</ActionButton>
+				<ActionLink v-if="debug"
+					icon="icon-download"
+					:download="threadingFileName"
+					:href="threadingFile"
+					:close-after-click="true">
+					{{ t('mail', 'Download thread data for debugging') }}
+				</ActionLink>
+			</template>
 		</Actions>
 		<Modal v-if="showSourceModal" class="source-modal" @close="onCloseSourceModal">
 			<div class="source-modal-content">
@@ -133,8 +156,10 @@ import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
 import ActionRouter from '@nextcloud/vue/dist/Components/ActionRouter'
 import { Base64 } from 'js-base64'
+import ChevronLeft from 'vue-material-design-icons/ChevronLeft'
 import { buildRecipients as buildReplyRecipients } from '../ReplyBuilder'
 import EventModal from './EventModal'
+import EnvelopePrimaryActions from './EnvelopePrimaryActions'
 import { generateUrl } from '@nextcloud/router'
 import logger from '../logger'
 import { matchError } from '../errors/match'
@@ -152,11 +177,13 @@ export default {
 		ActionButton,
 		ActionLink,
 		ActionRouter,
+		ChevronLeft,
 		EventModal,
 		Modal,
 		MoveModal,
 		TagModal,
 		NewMessageModal,
+		EnvelopePrimaryActions,
 	},
 	props: {
 		envelope: {
@@ -202,6 +229,7 @@ export default {
 			showEventModal: false,
 			showTagModal: false,
 			showNewMessage: false,
+			moreActionsOpen: false,
 		}
 	},
 	computed: {
@@ -379,4 +407,5 @@ export default {
 			overflow-y: scroll !important;
 		}
 	}
+
 </style>
diff --git a/src/components/MessagePlainTextBody.vue b/src/components/MessagePlainTextBody.vue
index 39d8b1b58..d71840da6 100644
--- a/src/components/MessagePlainTextBody.vue
+++ b/src/components/MessagePlainTextBody.vue
@@ -69,6 +69,10 @@ export default {
 <style lang="scss">
 .quoted-text {
 	color: var(--color-text-maxcontrast)
+
+	summary {
+		cursor: pointer
+	}
 }
 </style>
 <style lang="scss" scoped>
@@ -77,5 +81,9 @@ export default {
 }
 .mail-signature, .quoted {
 	color: var(--color-text-maxcontrast)
+
+	summary {
+		cursor: pointer
+	}
 }
 </style>
diff --git a/src/store/index.js b/src/store/index.js
index 962955c7e..278b1435e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -43,6 +43,7 @@ export default new Vuex.Store({
 				accountId: UNIFIED_ACCOUNT_ID,
 				isUnified: true,
 				mailboxes: [PRIORITY_INBOX_ID, UNIFIED_INBOX_ID],
+				aliases: [],
 				collapsed: false,
 				emailAddress: '',
 				name: '',
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 45ce84e3b..f6fdd76b0 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -117,6 +117,7 @@ export default {
 		// Save the mailboxes to the store, but only keep IDs in the account's mailboxes list
 		const mailboxes = sortMailboxes(account.mailboxes || [])
 		Vue.set(account, 'mailboxes', [])
+		Vue.set(account, 'aliases', [])
 		mailboxes.map(addMailboxToState(state, account))
 	},
 	editAccount(state, account) {
diff --git a/src/tests/unit/store/mutations.spec.js b/src/tests/unit/store/mutations.spec.js
index ac19054f3..fb1a611d5 100644
--- a/src/tests/unit/store/mutations.spec.js
+++ b/src/tests/unit/store/mutations.spec.js
@@ -41,6 +41,7 @@ describe('Vuex store mutations', () => {
 			accountId: 13,
 			id: 13,
 			mailboxes: [],
+			aliases: [],
 		})
 
 		expect(state).to.deep.equal({
@@ -50,6 +51,7 @@ describe('Vuex store mutations', () => {
 					accountId: 13,
 					id: 13,
 					mailboxes: [],
+					aliases: [],
 					collapsed: true,
 				},
 			},
@@ -80,6 +82,7 @@ describe('Vuex store mutations', () => {
 					delimiter: '.',
 				},
 			],
+			aliases: []
 		})
 
 		expect(state).to.deep.equal({
@@ -91,6 +94,7 @@ describe('Vuex store mutations', () => {
 					mailboxes: [
 						345,
 					],
+					aliases: [],
 					collapsed: true,
 				},
 			},
@@ -141,6 +145,7 @@ describe('Vuex store mutations', () => {
 					specialRole: 'sent',
 				},
 			],
+			aliases: [],
 			personalNamespace: 'INBOX.',
 		})
 
@@ -154,6 +159,7 @@ describe('Vuex store mutations', () => {
 						345,
 						346,
 					],
+					aliases: [],
 					collapsed: true,
 					personalNamespace: 'INBOX.',
 				},
@@ -219,6 +225,7 @@ describe('Vuex store mutations', () => {
 					specialRole: 'archive',
 				},
 			],
+			aliases: []
 		})
 
 		expect(state).to.deep.equal({
@@ -230,6 +237,7 @@ describe('Vuex store mutations', () => {
 					mailboxes: [
 						345,
 					],
+					aliases: [],
 					collapsed: true,
 				},
 			},
@@ -303,6 +311,7 @@ describe('Vuex store mutations', () => {
 					specialRole: 'archive',
 				},
 			],
+			aliases: []
 		})
 
 		expect(state).to.deep.equal({
@@ -314,6 +323,7 @@ describe('Vuex store mutations', () => {
 					mailboxes: [
 						345,
 					],
+					aliases: [],
 					collapsed: true,
 				},
 			},
diff --git a/tests/Integration/Service/AvatarServiceIntegrationTest.php b/tests/Integration/Service/AvatarServiceIntegrationTest.php
index ee8fe4b58..a143e592e 100644
--- a/tests/Integration/Service/AvatarServiceIntegrationTest.php
+++ b/tests/Integration/Service/AvatarServiceIntegrationTest.php
@@ -53,6 +53,14 @@ class AvatarServiceIntegrationTest extends TestCase {
 		$this->service = OC::$server->query(IAvatarService::class);
 	}
 
+	public function testJansGravatar() {
+		$avatar = $this->service->getAvatar('hey@jancborchardt.net', 'john');
+		$this->assertNotNull($avatar);
+		$this->assertEquals('https://secure.gravatar.com/avatar/2fd3f4d5d762955e5b603794a888fa97?size=128&d=404', $avatar->getUrl());
+		$image = $this->service->getAvatarImage('hey@jancborchardt.net', 'john');
+		$this->assertNotNull($image);
+	}
+
 	public function testChristophsFavicon() {
 		$avatar = $this->service->getAvatar('christoph@winzerhof-wurst.at', 'jan');
 		$this->assertNull($avatar); // There is none
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
index c06f740d9..cd651e223 100644
--- a/vendor-bin/cs-fixer/composer.lock
+++ b/vendor-bin/cs-fixer/composer.lock
@@ -8,24 +8,91 @@
     "packages": [],
     "packages-dev": [
         {
+            "name": "composer/pcre",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-21T20:24:37+00:00"
+        },
+        {
             "name": "composer/semver",
-            "version": "3.2.6",
+            "version": "3.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "83e511e247de329283478496f7a1e114c9517506"
+                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
-                "reference": "83e511e247de329283478496f7a1e114c9517506",
+                "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649",
+                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
+                "phpstan/phpstan": "^1.4",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "type": "library",
@@ -81,29 +148,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-25T11:34:17+00:00"
+            "time": "2022-02-04T13:58:43+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.2",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339"
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
                 "shasum": ""
             },
             "require": {
+                "composer/pcre": "^1",
                 "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
             },
             "type": "library",
             "autoload": {
@@ -140,7 +209,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-31T17:03:58+00:00"
+            "time": "2022-02-24T20:20:32+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -212,32 +281,28 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+                "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
-                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
+                "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpstan/phpstan": "^0.11.8",
-                "phpunit/phpunit": "^8.2"
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "1.3",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
@@ -284,20 +349,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-25T17:44:05+00:00"
+            "time": "2022-01-12T08:27:12+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.3.2",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "06bdbdfcd619183dd7a1a6948360f8af73b9ecec"
+                "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/06bdbdfcd619183dd7a1a6948360f8af73b9ecec",
-                "reference": "06bdbdfcd619183dd7a1a6948360f8af73b9ecec",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
+                "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
                 "shasum": ""
             },
             "require": {
@@ -308,33 +373,32 @@
                 "ext-tokenizer": "*",
                 "php": "^7.2.5 || ^8.0",
                 "php-cs-fixer/diff": "^2.0",
-                "symfony/console": "^5.1.3",
-                "symfony/event-dispatcher": "^5.0",
-                "symfony/filesystem": "^5.0",
-                "symfony/finder": "^5.0",
-                "symfony/options-resolver": "^5.0",
+                "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0",
+                "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0",
+                "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0",
+                "symfony/finder": "^4.4.20 || ^5.0 || ^6.0",
+                "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0",
                 "symfony/polyfill-mbstring": "^1.23",
-                "symfony/polyfill-php72": "^1.23",
                 "symfony/polyfill-php80": "^1.23",
                 "symfony/polyfill-php81": "^1.23",
-                "symfony/process": "^5.0",
-                "symfony/stopwatch": "^5.0"
+                "symfony/process": "^4.4.20 || ^5.0 || ^6.0",
+                "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0"
             },
             "require-dev": {
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^1.5",
                 "mikey179/vfsstream": "^1.6.8",
-                "php-coveralls/php-coveralls": "^2.4.3",
+                "php-coveralls/php-coveralls": "^2.5.2",
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy": "^1.10.3",
+                "phpspec/prophecy": "^1.15",
                 "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5",
+                "phpunit/phpunit": "^8.5.21 || ^9.5",
                 "phpunitgoodpractices/polyfill": "^1.5",
                 "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^5.2.4",
-                "symfony/yaml": "^5.0"
+                "symfony/phpunit-bridge": "^5.2.4 || ^6.0",
+                "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -370,7 +434,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-15T18:06:47+00:00"
+            "time": "2021-12-11T16:25:08+00:00"
         },
         {
             "name": "nextcloud/coding-standard",
@@ -642,28 +706,29 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.3.11",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "3e7ab8f5905058984899b05a4648096f558bfeba"
+                "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/3e7ab8f5905058984899b05a4648096f558bfeba",
-                "reference": "3e7ab8f5905058984899b05a4648096f558bfeba",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a2a86ec353d825c75856c6fd14fac416a7bdb6b8",
+                "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.8",
+                "symfony/polyfill-php73": "^1.9",
                 "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/string": "^5.1"
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.1|^6.0"
             },
             "conflict": {
+                "psr/log": ">=3",
                 "symfony/dependency-injection": "<4.4",
                 "symfony/dotenv": "<5.1",
                 "symfony/event-dispatcher": "<4.4",
@@ -675,12 +740,12 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^4.4|^5.0",
-                "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "symfony/var-dumper": "^4.4|^5.0"
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -733,7 +798,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-21T19:41:05+00:00"
+            "time": "2022-01-26T16:28:35+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -801,22 +866,22 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.3.11",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "661a7a6e085394f8513945669e31f7c1338a7e69"
+                "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/661a7a6e085394f8513945669e31f7c1338a7e69",
-                "reference": "661a7a6e085394f8513945669e31f7c1338a7e69",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d",
+                "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/event-dispatcher-contracts": "^2",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/event-dispatcher-contracts": "^2|^3",
                 "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
@@ -828,13 +893,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/http-foundation": "^4.4|^5.0",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/stopwatch": "^4.4|^5.0"
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/stopwatch": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -879,7 +944,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-17T12:16:12+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -959,21 +1024,22 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.3.4",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32"
+                "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32",
-                "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f0c4bf1840420f4aef3f32044a9dbb24682731b",
+                "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
@@ -1015,24 +1081,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-21T12:40:44+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.3.7",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "a10000ada1e600d109a6c7632e9ac42e8bf2fb93"
+                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/a10000ada1e600d109a6c7632e9ac42e8bf2fb93",
-                "reference": "a10000ada1e600d109a6c7632e9ac42e8bf2fb93",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
+                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
@@ -1074,25 +1141,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-04T21:20:46+00:00"
+            "time": "2022-01-26T16:34:36+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.3.7",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e"
+                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4b78e55b179003a42523a362cc0e8327f7a69b5e",
-                "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8",
+                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-php73": "~1.0",
                 "symfony/polyfill-php80": "^1.16"
             },
@@ -1140,25 +1207,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-04T21:20:46+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
@@ -1216,20 +1286,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
                 "shasum": ""
             },
             "require": {
@@ -1249,12 +1319,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1294,11 +1364,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2021-11-23T21:10:46+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1327,12 +1397,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1379,21 +1449,24 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-mbstring": "*"
+            },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
@@ -1408,12 +1481,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1452,93 +1525,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:26:48+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-05-27T09:17:38+00:00"
+            "time": "2021-11-30T18:21:41+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
                 "shasum": ""
             },
             "require": {
@@ -1555,12 +1555,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1601,20 +1601,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-06-05T21:20:04+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
                 "shasum": ""
             },
             "require": {
@@ -1631,12 +1631,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1681,20 +1681,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-28T13:41:28+00:00"
+            "time": "2021-09-13T13:58:33+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436"
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
                 "shasum": ""
             },
             "require": {
@@ -1711,12 +1711,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1757,20 +1757,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-21T13:25:03+00:00"
+            "time": "2021-09-13T13:58:11+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.3.12",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "e498803a6e95ede78e9d5646ad32a2255c033a6a"
+                "reference": "553f50487389a977eb31cf6b37faae56da00f753"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/e498803a6e95ede78e9d5646ad32a2255c033a6a",
-                "reference": "e498803a6e95ede78e9d5646ad32a2255c033a6a",
+                "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753",
+                "reference": "553f50487389a977eb31cf6b37faae56da00f753",
                 "shasum": ""
             },
             "require": {
@@ -1816,7 +1816,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-22T22:39:13+00:00"
+            "time": "2022-01-26T16:28:35+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1900,21 +1900,21 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.3.4",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "b24c6a92c6db316fee69e38c80591e080e41536c"
+                "reference": "395220730edceb6bd745236ccb5c9125c748f779"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c",
-                "reference": "b24c6a92c6db316fee69e38c80591e080e41536c",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/395220730edceb6bd745236ccb5c9125c748f779",
+                "reference": "395220730edceb6bd745236ccb5c9125c748f779",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/service-contracts": "^1.0|^2"
+                "symfony/service-contracts": "^1|^2|^3"
             },
             "type": "library",
             "autoload": {
@@ -1955,20 +1955,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-10T08:58:57+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.3.10",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c"
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c",
-                "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c",
+                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
                 "shasum": ""
             },
             "require": {
@@ -1979,11 +1979,14 @@
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php80": "~1.15"
             },
+            "conflict": {
+                "symfony/translation-contracts": ">=3.0"
+            },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-client": "^4.4|^5.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
                 "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0"
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -2035,7 +2038,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-27T18:21:46+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         }
     ],
     "aliases": [],
diff --git a/vendor-bin/mozart/composer.json b/vendor-bin/mozart/composer.json
index f2b0a29c3..0404603a1 100644
--- a/vendor-bin/mozart/composer.json
+++ b/vendor-bin/mozart/composer.json
@@ -1,4 +1,10 @@
 {
+	"config": {
+		"platform": {
+			"php": "7.3"
+		},
+		"sort-packages": true
+	},
     "require": {
         "coenjacobs/mozart": "^0.7.1"
     }
diff --git a/vendor-bin/mozart/composer.lock b/vendor-bin/mozart/composer.lock
index c93633f55..e2c57da74 100644
--- a/vendor-bin/mozart/composer.lock
+++ b/vendor-bin/mozart/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "374a2f74f2ed6737d95fee931106a5c6",
+    "content-hash": "158cf2d7db6ee13775ddf4330bafbee2",
     "packages": [
         {
             "name": "coenjacobs/mozart",
@@ -62,16 +62,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.1.4",
+            "version": "1.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32"
+                "reference": "094defdb4a7001845300334e7c1ee2335925ef99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
-                "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99",
+                "reference": "094defdb4a7001845300334e7c1ee2335925ef99",
                 "shasum": ""
             },
             "require": {
@@ -148,20 +148,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2021-06-23T21:56:05+00:00"
+            "time": "2021-12-09T09:40:50+00:00"
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.7.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3"
+                "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
-                "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69",
+                "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69",
                 "shasum": ""
             },
             "require": {
@@ -169,7 +169,7 @@
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.18",
+                "friendsofphp/php-cs-fixer": "^3.2",
                 "phpstan/phpstan": "^0.12.68",
                 "phpunit/phpunit": "^8.5.8 || ^9.3"
             },
@@ -200,7 +200,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-18T20:58:21+00:00"
+            "time": "2021-11-21T11:48:40+00:00"
         },
         {
             "name": "psr/container",
@@ -248,27 +248,29 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.2.6",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
+                "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a2a86ec353d825c75856c6fd14fac416a7bdb6b8",
+                "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.8",
-                "symfony/polyfill-php80": "^1.15",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/string": "^5.1"
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.1|^6.0"
             },
             "conflict": {
+                "psr/log": ">=3",
                 "symfony/dependency-injection": "<4.4",
                 "symfony/dotenv": "<5.1",
                 "symfony/event-dispatcher": "<4.4",
@@ -276,16 +278,16 @@
                 "symfony/process": "<4.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^4.4|^5.0",
-                "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "symfony/var-dumper": "^4.4|^5.0"
+                "psr/log": "^1|^2",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -338,24 +340,90 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2022-01-26T16:28:35+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-12T14:48:14+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.2.4",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "0d639a0943822626290d169965804f79400e6a04"
+                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
-                "reference": "0d639a0943822626290d169965804f79400e6a04",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
+                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -396,32 +464,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-15T18:55:04+00:00"
+            "time": "2022-01-26T16:34:36+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -472,20 +543,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
-                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
                 "shasum": ""
             },
             "require": {
@@ -497,7 +568,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -505,12 +576,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -550,20 +621,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-11-23T21:10:46+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
                 "shasum": ""
             },
             "require": {
@@ -575,7 +646,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -583,12 +654,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -631,32 +702,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-mbstring": "*"
+            },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -664,12 +738,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -708,20 +782,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-11-30T18:21:41+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
-                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
                 "shasum": ""
             },
             "require": {
@@ -730,7 +804,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -738,12 +812,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -784,20 +858,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-06-05T21:20:04+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
                 "shasum": ""
             },
             "require": {
@@ -806,7 +880,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -814,12 +888,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -864,25 +938,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-09-13T13:58:33+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.2.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
+                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
-                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.0"
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -890,7 +968,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -940,20 +1018,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-07T11:33:47+00:00"
+            "time": "2021-11-04T16:48:04+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.2.6",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
+                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
                 "shasum": ""
             },
             "require": {
@@ -964,11 +1042,14 @@
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php80": "~1.15"
             },
+            "conflict": {
+                "symfony/translation-contracts": ">=3.0"
+            },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-client": "^4.4|^5.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
                 "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0"
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -1020,7 +1101,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-17T17:12:15+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         }
     ],
     "packages-dev": [],
@@ -1031,5 +1112,8 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.3"
+    },
     "plugin-api-version": "1.1.0"
 }
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json
index d95b805e8..9aa117e73 100644
--- a/vendor-bin/phpunit/composer.json
+++ b/vendor-bin/phpunit/composer.json
@@ -1,4 +1,10 @@
 {
+	"config": {
+		"platform": {
+			"php": "7.3"
+		},
+		"sort-packages": true
+	},
     "require-dev": {
         "christophwurst/nextcloud_testing": "^0.12.4"
     }
diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock
index 710b00819..ddd1e2517 100644
--- a/vendor-bin/phpunit/composer.lock
+++ b/vendor-bin/phpunit/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1b73c10d96a562539d21751bcd116d12",
+    "content-hash": "c233690f8f795e6bc659e8269c525c0e",
     "packages": [],
     "packages-dev": [
         {
@@ -169,16 +169,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.4",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
@@ -217,20 +217,20 @@
                 "parser",
                 "php"
             ],
-            "time": "2020-12-20T10:01:03+00:00"
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -273,20 +273,20 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2020-06-27T14:33:11+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
@@ -320,20 +320,20 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2021-02-23T14:00:09+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
             "name": "php-webdriver/webdriver",
-            "version": "1.10.0",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211"
+                "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/cd9290b95b7651d495bd69253d6e3ef469a7f211",
-                "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
+                "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
                 "shasum": ""
             },
             "require": {
@@ -342,30 +342,24 @@
                 "ext-zip": "*",
                 "php": "^5.6 || ~7.0 || ^8.0",
                 "symfony/polyfill-mbstring": "^1.12",
-                "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
+                "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0"
             },
             "replace": {
                 "facebook/webdriver": "*"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.0",
                 "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
                 "php-coveralls/php-coveralls": "^2.4",
                 "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9",
                 "squizlabs/php_codesniffer": "^3.5",
-                "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
+                "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0"
             },
             "suggest": {
                 "ext-SimpleXML": "For Firefox profile creation"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.8.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Facebook\\WebDriver\\": "lib/"
@@ -387,7 +381,7 @@
                 "selenium",
                 "webdriver"
             ],
-            "time": "2021-02-25T13:38:09+00:00"
+            "time": "2021-10-14T09:30:02+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -440,16 +434,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
                 "shasum": ""
             },
             "require": {
@@ -460,7 +454,8 @@
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2"
+                "mockery/mockery": "~1.3.2",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -488,20 +483,20 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2020-09-03T19:13:55+00:00"
+            "time": "2021-10-19T17:43:47+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
                 "shasum": ""
             },
             "require": {
@@ -509,7 +504,8 @@
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "*"
+                "ext-tokenizer": "*",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -533,37 +529,37 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-09-17T18:55:26+00:00"
+            "time": "2022-01-04T19:58:01+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.13.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.1",
+                "php": "^7.2 || ~8.0, <8.2",
                 "phpdocumentor/reflection-docblock": "^5.2",
                 "sebastian/comparator": "^3.0 || ^4.0",
                 "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^6.0",
+                "phpspec/phpspec": "^6.0 || ^7.0",
                 "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -596,27 +592,27 @@
                 "spy",
                 "stub"
             ],
-            "time": "2021-03-17T13:42:18+00:00"
+            "time": "2021-12-08T12:19:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.6",
+            "version": "9.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
+                "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/deac8540cb7bd40b2b8cfa679b76202834fd04e8",
+                "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.10.2",
+                "nikic/php-parser": "^4.13.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -669,20 +665,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-28T07:26:59+00:00"
+            "time": "2022-02-23T17:02:38+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -725,7 +721,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -898,16 +894,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.4",
+            "version": "9.5.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741"
+                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741",
-                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
                 "shasum": ""
             },
             "require": {
@@ -919,11 +915,11 @@
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
                 "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.1",
+                "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.3",
+                "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
@@ -937,7 +933,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3",
+                "sebastian/type": "^2.3.4",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -958,11 +954,11 @@
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ],
                 "files": [
                     "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -985,7 +981,7 @@
             ],
             "funding": [
                 {
-                    "url": "https://phpunit.de/donate.html",
+                    "url": "https://phpunit.de/sponsors.html",
                     "type": "custom"
                 },
                 {
@@ -993,7 +989,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-23T07:16:29+00:00"
+            "time": "2022-02-23T17:10:58+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1396,16 +1392,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
@@ -1454,7 +1450,7 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
@@ -1465,20 +1461,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.2",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
@@ -1525,7 +1521,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:55:19+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -1796,16 +1792,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.1",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2"
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
-                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
                 "shasum": ""
             },
             "require": {
@@ -1844,7 +1840,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:18:59+00:00"
+            "time": "2021-06-15T12:49:02+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1897,28 +1893,31 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1969,32 +1968,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-mbstring": "*"
+            },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2002,12 +2004,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2046,20 +2048,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-11-30T18:21:41+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
                 "shasum": ""
             },
             "require": {
@@ -2068,7 +2070,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2076,12 +2078,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2126,25 +2128,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-09-13T13:58:33+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.2.4",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
+                "reference": "553f50487389a977eb31cf6b37faae56da00f753"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
+                "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753",
+                "reference": "553f50487389a977eb31cf6b37faae56da00f753",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -2185,20 +2187,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:15:41+00:00"
+            "time": "2022-01-26T16:28:35+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -2231,7 +2233,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -2295,5 +2297,8 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.3"
+    },
     "plugin-api-version": "1.1.0"
 }