From 723846d6c7594433cef53db97b9099022c2fa1c0 Mon Sep 17 00:00:00 2001
From: Bert Verhelst <verhelstbert@gmail.com>
Date: Tue, 30 Jun 2026 10:27:12 +0200
Subject: [PATCH 1/2] feat(ARC-3762): make the default text input control a
 text input

not a rich text editor
less duplicate code
---
 api/package-lock.json                         |  37 +--
 ui/all-translations-het-archief.json          |  48 ++--
 ui/all-translations-het-archief.sql           |  32 +--
 ui/package-lock.json                          | 252 +++++++++++++-----
 ui/package.json                               |   3 +
 .../BlockAvoHero/BlockAvoHero.editorconfig.ts |  41 ++-
 ...lockAvoImageTextBackground.editorconfig.ts |  39 ++-
 .../BlockBreadcrumbs.editorconfig.ts          |   7 +-
 .../BlockButtons/BlockButtons.editorconfig.ts |  13 +-
 .../BlockCTAs/BlockCTAs.editorconfig.ts       |  27 +-
 ...ockCardsWithoutDescription.editorconfig.ts |  16 +-
 .../BlockContentEnclose.editorconfig.ts       |  17 +-
 .../BlockEventbrite.editorconfig.ts           |  19 +-
 .../BlockHeading/BlockHeading.editorconfig.ts |  10 +-
 ...lockHetArchiefHeaderSearch.editorconfig.ts |  73 +++--
 ...ArchiefImageTextBackground.editorconfig.ts |  43 ++-
 .../BlockIFrame/BlockIFrame.editorconfig.ts   |  15 +-
 .../BlockImage/BlockImage.editorconfig.ts     |  32 +--
 .../BlockImageGrid.editorconfig.ts            |  45 ++--
 .../BlockLogoGrid.editorconfig.ts             |   9 +-
 .../BlockUspGrid.editorconfig.ts              |  41 ++-
 .../BlockImageTitleTextButton.editorconfig.ts |  38 ++-
 .../BlockIntro/BlockIntro.editorconfig.ts     |  29 +-
 .../BlockKlaar/BlockKlaar.editorconfig.ts     |  36 ++-
 .../BlockMaintainersGrid.editorconfig.ts      |  46 ++--
 .../BlockMediaGrid.editorconfig.ts            | 203 +++++++-------
 .../overviewNewspaperTitles.editorconfig.ts   |  67 ++---
 .../BlockPageOverview.editorconfig.ts         |  14 +-
 .../BlockQuote/BlockQuote.editorconfig.ts     |  28 +-
 .../BlockRichText.editorconfig.ts             |  16 +-
 .../BlockRichTextTwoColumns.editorconfig.ts   |  35 +--
 .../BlockProjectSpotlight.editorconfig.ts     |  13 +-
 .../BlockSpotlight.editorconfig.ts            |   9 +-
 .../BlockTagsWithLink.editorconfig.ts         |  10 +-
 .../BlockThreeClickableTiles.editorconfig.ts  |  14 +-
 .../BlockUitgeklaard.editorconfig.ts          |  28 +-
 .../BlockVideo/BlockVideo.editorconfig.ts     |  46 ++--
 .../BlockVideoTitleTextButton.editorconfig.ts |  56 ++--
 .../components/blocks/anchor-links.ts         |  10 +-
 .../components/blocks/defaults.ts             |  15 +-
 .../views/MaintenanceAlertsEditForm.tsx       |   8 +-
 41 files changed, 732 insertions(+), 808 deletions(-)

diff --git a/api/package-lock.json b/api/package-lock.json
index 6b1de2bdd..6b8ce2511 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -601,7 +601,6 @@
       "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.716.0.tgz",
       "integrity": "sha512-lA4IB9FzR2KjH7EVCo+mHGFKqdViVyeBQEIX9oVratL/l7P0bMS1fMwgfHOc3ACazqNxBxDES7x08ZCp32y6Lw==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
@@ -655,7 +654,6 @@
       "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.716.0.tgz",
       "integrity": "sha512-i4SVNsrdXudp8T4bkm7Fi3YWlRnvXCSwvNDqf6nLqSJxqr4CN3VlBELueDyjBK7TAt453/qSif+eNx+bHmwo4Q==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
@@ -1289,7 +1287,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
       "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.10",
@@ -4379,7 +4376,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -4577,7 +4573,6 @@
       "version": "9.4.3",
       "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-9.4.3.tgz",
       "integrity": "sha512-Gd6D4IaYj01o14Bwv81ukidn4w3bPHCblMUq+SmUmWLyosK+XQmInCS09SbDDZyL8jy86PngtBLTdhJ2bXSUig==",
-      "peer": true,
       "dependencies": {
         "iterare": "1.2.1",
         "tslib": "2.5.3",
@@ -4650,7 +4645,6 @@
       "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-9.4.3.tgz",
       "integrity": "sha512-Qi63+wi55Jh4sDyaj5Hhx2jOpKqT386aeo+VOKsxnd+Ql9VvkO/FjmuwBGUyzkJt29ENYc+P0Sx/k5LtstNpPQ==",
       "hasInstallScript": true,
-      "peer": true,
       "dependencies": {
         "@nuxtjs/opencollective": "0.3.2",
         "fast-safe-stringify": "2.1.1",
@@ -4712,7 +4706,6 @@
       "version": "9.4.3",
       "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-9.4.3.tgz",
       "integrity": "sha512-FpdczWoRSC0zz2dNL9u2AQLXKXRVtq4HgHklAhbL59X0uy+mcxhlSThG7DHzDMkoSnuuHY8ojDVf7mDxk+GtCw==",
-      "peer": true,
       "dependencies": {
         "body-parser": "1.20.2",
         "cors": "2.8.5",
@@ -6196,7 +6189,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@swc/counter": "^0.1.3",
         "@swc/types": "^0.1.19"
@@ -6517,7 +6509,6 @@
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
       "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -6629,7 +6620,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.0.tgz",
       "integrity": "sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -6789,7 +6779,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.5.0.tgz",
       "integrity": "sha512-cj+XGhNujfD2/wzR1tabNsidnYRaFfEkcULdcIyVBYcXjBvBKOes+mpMBP7hMpOyk+gBcfXsrg4NBGAStQyxjQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "7.5.0",
         "@typescript-eslint/types": "7.5.0",
@@ -7876,7 +7865,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
       "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -8534,7 +8522,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001517",
         "electron-to-chromium": "^1.4.477",
@@ -8645,7 +8632,6 @@
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-5.2.3.tgz",
       "integrity": "sha512-9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog==",
-      "peer": true,
       "dependencies": {
         "lodash.clonedeep": "^4.5.0",
         "lru-cache": "^9.1.2"
@@ -8850,14 +8836,12 @@
     "node_modules/class-transformer": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz",
-      "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==",
-      "peer": true
+      "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw=="
     },
     "node_modules/class-validator": {
       "version": "0.13.2",
       "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.13.2.tgz",
       "integrity": "sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==",
-      "peer": true,
       "dependencies": {
         "libphonenumber-js": "^1.9.43",
         "validator": "^13.7.0"
@@ -9308,7 +9292,6 @@
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
       "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.21.0"
       },
@@ -9963,7 +9946,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
       "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -10019,7 +10001,6 @@
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
       "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -10103,7 +10084,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
       "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.7",
         "array.prototype.findlastindex": "^1.2.3",
@@ -11539,7 +11519,6 @@
       "version": "16.6.0",
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz",
       "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -14100,7 +14079,6 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
       "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
       "dev": true,
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -14503,8 +14481,7 @@
     "node_modules/reflect-metadata": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "peer": true
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
     },
     "node_modules/regenerator-runtime": {
       "version": "0.14.0",
@@ -14765,7 +14742,6 @@
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
       "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -14881,7 +14857,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -15898,7 +15873,6 @@
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
       "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -16068,7 +16042,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16471,7 +16444,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -16798,7 +16770,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -17015,7 +16986,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -17029,7 +16999,6 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -17207,6 +17176,7 @@
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -17388,7 +17358,6 @@
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/ui/all-translations-het-archief.json b/ui/all-translations-het-archief.json
index 997e6442c..4624ea439 100644
--- a/ui/all-translations-het-archief.json
+++ b/ui/all-translations-het-archief.json
@@ -25952,7 +25952,7 @@
     "location": "modules/cp/views/cp-admin-visitors",
     "key": "materiaal-aanvraag-goedkeuren-blade-aria-label",
     "language": "en",
-    "value": "Materiaal aanvraag goedkeuren [BLADE_ARIA_LABEL]",
+    "value": "Approve material request [BLADE_ARIA_LABEL]",
     "value_type": "TEXT"
   },
   {
@@ -28616,7 +28616,7 @@
     "location": "modules/account/components/edit-folder-blade/edit-folder-blade",
     "key": "beschrijving-van-de-map-input-aria-label",
     "language": "en",
-    "value": "Beschrijving van de map [INPUT_ARIA_LABEL]",
+    "value": "Description of the folder [INPUT_ARIA_LABEL]",
     "value_type": "TEXT"
   },
   {
@@ -29705,7 +29705,7 @@
     "location": "modules/account/components/material-request-detail-blade/material-request-content-info",
     "key": "pid",
     "language": "nl",
-    "value": "Pid",
+    "value": "PID",
     "value_type": "TEXT"
   },
   {
@@ -29714,7 +29714,7 @@
     "location": "modules/account/components/material-request-detail-blade/material-request-content-info",
     "key": "pid",
     "language": "en",
-    "value": "Pid",
+    "value": "PID",
     "value_type": "TEXT"
   },
   {
@@ -29825,6 +29825,24 @@
     "value": "The message was not sent",
     "value_type": "TEXT"
   },
+  {
+    "app": "HET_ARCHIEF",
+    "component": "FRONTEND",
+    "location": "modules/account/components/material-request-detail-blade/material-request-conversation-input",
+    "key": "er-zijn-bestanden-geselecteerd-maar-nog-niet-verzonden",
+    "language": "nl",
+    "value": "Er zijn bestanden geselecteerd maar nog niet verzonden",
+    "value_type": "HTML"
+  },
+  {
+    "app": "HET_ARCHIEF",
+    "component": "FRONTEND",
+    "location": "modules/account/components/material-request-detail-blade/material-request-conversation-input",
+    "key": "er-zijn-bestanden-geselecteerd-maar-nog-niet-verzonden",
+    "language": "en",
+    "value": "Er zijn bestanden geselecteerd maar nog niet verzonden",
+    "value_type": "HTML"
+  },
   {
     "app": "HET_ARCHIEF",
     "component": "FRONTEND",
@@ -30092,7 +30110,7 @@
     "location": "modules/account/components/material-request-detail-blade/material-request-conversation-message",
     "key": "name-weigerde-de-bijkomende-gebruiksvoorwaarden-de-aanvraag-wordt-afgesloten",
     "language": "en",
-    "value": "{{name}} weigerde de bijkomende gebruiksvoorwaarden. De aanvraag wordt afgesloten.",
+    "value": "{{name}} refused the additional conditions. The request will be closed.",
     "value_type": "HTML"
   },
   {
@@ -30326,7 +30344,7 @@
     "location": "modules/account/components/material-request-detail-blade/material-request-detail-blade",
     "key": "download-is-beschikbaar-tot-en-met",
     "language": "en",
-    "value": "Download is available until {{downloadExpirationDate}} (engels)",
+    "value": "Download is available until {{downloadExpirationDate}}",
     "value_type": "TEXT"
   },
   {
@@ -31334,7 +31352,7 @@
     "location": "modules/account/components/material-request-evaluator-options/material-request-evaluator-options",
     "key": "aanvraag-beoordelen-descriptive-title",
     "language": "en",
-    "value": "Aanvraag beoordelen descriptive title",
+    "value": "Make a decision about the request",
     "value_type": "TEXT"
   },
   {
@@ -31388,7 +31406,7 @@
     "location": "modules/account/components/material-request-evaluator-options/material-request-evaluator-options",
     "key": "goedkeuren-knop-beschrijving",
     "language": "en",
-    "value": "Goedkeuren knop beschrijving",
+    "value": "In this case the material will be made available for download immediately.",
     "value_type": "TEXT"
   },
   {
@@ -31415,7 +31433,7 @@
     "location": "modules/account/components/material-request-evaluator-options/material-request-evaluator-options",
     "key": "goedkeuren-mit-voorwaarden-knop-beschrijving",
     "language": "nl",
-    "value": "Goedkeuren mits voorwaarden beschrijving",
+    "value": "In dit geval kunt u bijkomende gebruiksvoorwaarden opleggen voordat goedkeuring gegeven kan worden.",
     "value_type": "TEXT"
   },
   {
@@ -31424,7 +31442,7 @@
     "location": "modules/account/components/material-request-evaluator-options/material-request-evaluator-options",
     "key": "goedkeuren-mit-voorwaarden-knop-beschrijving",
     "language": "en",
-    "value": "Goedkeuren mit voorwaarden knop beschrijving",
+    "value": "In this case you may impose additional conditions prior to approval.",
     "value_type": "TEXT"
   },
   {
@@ -31451,7 +31469,7 @@
     "location": "modules/account/components/material-request-evaluator-options/material-request-evaluator-options",
     "key": "afkeuren-knop-beschrijving",
     "language": "nl",
-    "value": "Afkeuren knop beschrijving",
+    "value": "In dit geval wordt de materiaalaanvraag onmiddellijk gesloten.",
     "value_type": "TEXT"
   },
   {
@@ -31460,7 +31478,7 @@
     "location": "modules/account/components/material-request-evaluator-options/material-request-evaluator-options",
     "key": "afkeuren-knop-beschrijving",
     "language": "en",
-    "value": "Afkeuren knop beschrijving",
+    "value": "In this case the request will be closed immediately.",
     "value_type": "TEXT"
   },
   {
@@ -31622,7 +31640,7 @@
     "location": "modules/account/components/material-request-status-update-blade/material-request-status-update-blade",
     "key": "aanvraag-goedkeuren-titel",
     "language": "en",
-    "value": "Aanvraag goedkeuren titel",
+    "value": "Approve request",
     "value_type": "TEXT"
   },
   {
@@ -31658,7 +31676,7 @@
     "location": "modules/account/components/material-request-status-update-blade/material-request-status-update-blade",
     "key": "materiaal-aanvraag-goedkeuren-of-afkeuren-blade-aria-label",
     "language": "en",
-    "value": "Materiaal aanvraag goedkeuren of afkeuren [BLADE_ARIA_LABEL]",
+    "value": "Approve or reject request [BLADE_ARIA_LABEL]",
     "value_type": "TEXT"
   },
   {
@@ -31676,7 +31694,7 @@
     "location": "modules/account/components/material-request-status-update-blade/material-request-status-update-blade",
     "key": "aanvraag-goedkeuren-description",
     "language": "en",
-    "value": "Aanvraag goedkeuren description",
+    "value": "<p>The request will be approved immediately and the download will be prepared for the requester.</p><p></p><p>If you wish to impose additional conditions, return from this page and select the option &quot;Additinal conditions&quot;.</p>",
     "value_type": "HTML"
   },
   {
diff --git a/ui/all-translations-het-archief.sql b/ui/all-translations-het-archief.sql
index eabb1b09e..f2885c24b 100644
--- a/ui/all-translations-het-archief.sql
+++ b/ui/all-translations-het-archief.sql
@@ -2277,8 +2277,8 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/create-folder-button/create-folder-button', 'nieuwe-map-naam-input-aria-label', 'Nieuwe map naam [INPUT_ARIA_LABEL]', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Nieuwe map naam [INPUT_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'beschrijving', 'Beschrijving', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Beschrijving', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'beschrijving', 'Description', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Description', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'beschrijving-van-de-map-input-aria-label', 'Beschrijving van de map [INPUT_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Beschrijving van de map [INPUT_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'beschrijving-van-de-map-input-aria-label', 'Beschrijving van de map [INPUT_ARIA_LABEL]', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Beschrijving van de map [INPUT_ARIA_LABEL]', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'beschrijving-van-de-map-input-aria-label', 'Description of the folder [INPUT_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Description of the folder [INPUT_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'bewaar', 'Bewaar', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Bewaar', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'bewaar', 'Save', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Save', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/edit-folder-blade/edit-folder-blade', 'bewaar-mobiel', 'Bewaar', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Bewaar', value_type = 'TEXT';
@@ -2397,8 +2397,8 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'geschiedenis', 'History', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'History', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'naamsvermelding-content-info', 'Attribution', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Attribution', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'naamsvermelding-content-info', 'Naamsvermelding', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Naamsvermelding', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'pid', 'Pid', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Pid', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'pid', 'Pid', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Pid', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'pid', 'PID', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'PID', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'pid', 'PID', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'PID', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'toestemming-rechthebbende-content-info', 'Permission rights holder', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Permission rights holder', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'toestemming-rechthebbende-content-info', 'Toestemming rechthebbende', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Toestemming rechthebbende', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-content-info', 'type-aanvraag', 'Type aanvraag', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Type aanvraag', value_type = 'TEXT';
@@ -2431,13 +2431,15 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation', 'name-keurde-de-aanvraag-goed-met-de-volgende-boodschap', '{{name}} keurde de aanvraag goed met de volgende boodschap:', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} keurde de aanvraag goed met de volgende boodschap:', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-input', 'bericht-versturen', 'Bericht versturen', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Bericht versturen', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-input', 'bericht-versturen', 'Send message', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Send message', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-input', 'er-zijn-bestanden-geselecteerd-maar-nog-niet-verzonden', 'Er zijn bestanden geselecteerd maar nog niet verzonden', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Er zijn bestanden geselecteerd maar nog niet verzonden', value_type = 'HTML';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-input', 'er-zijn-bestanden-geselecteerd-maar-nog-niet-verzonden', 'Er zijn bestanden geselecteerd maar nog niet verzonden', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Er zijn bestanden geselecteerd maar nog niet verzonden', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'de-aanvraag-werd-afgesloten-hieronder-vind-je-een-samenvatting-alle-documenten-worden-nog-tot-en-met-date-bijgehouden', 'De aanvraag werd afgesloten, hieronder vind je een samenvatting. Alle documenten worden nog tot en met {{date}} bijgehouden.', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'De aanvraag werd afgesloten, hieronder vind je een samenvatting. Alle documenten worden nog tot en met {{date}} bijgehouden.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'de-aanvraag-werd-afgesloten-hieronder-vind-je-een-samenvatting-alle-documenten-worden-nog-tot-en-met-date-bijgehouden', 'The request has been closed. You will find a summary below. All documents will be saved until  {{date}}.', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'The request has been closed. You will find a summary below. All documents will be saved until  {{date}}.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-aanvaardde-de-bijkomende-gebruiksvoorwaarden-aanvrager', '{{name}} aanvaardde de bijkomende gebruiksvoorwaarden.', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} aanvaardde de bijkomende gebruiksvoorwaarden.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-aanvaardde-de-bijkomende-gebruiksvoorwaarden-aanvrager', '{{name}} accepted the additional conditions for use.', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} accepted the additional conditions for use.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-aanvaardde-de-bijkomende-gebruiksvoorwaarden-de-download-wordt-beschikbaar-gemaakt-na-finale-goedkeuring-van-de-aanbieder', '{{name}} aanvaardde de bijkomende gebruiksvoorwaarden. De download wordt beschikbaar gemaakt na finale goedkeuring van de aanbieder.', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} aanvaardde de bijkomende gebruiksvoorwaarden. De download wordt beschikbaar gemaakt na finale goedkeuring van de aanbieder.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-aanvaardde-de-bijkomende-gebruiksvoorwaarden-de-download-wordt-beschikbaar-gemaakt-na-finale-goedkeuring-van-de-aanbieder', '{{name}} accepted the additional conditions. The download will be available after the final approval by the organisation that manages the item.', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} accepted the additional conditions. The download will be available after the final approval by the organisation that manages the item.', value_type = 'HTML';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-weigerde-de-bijkomende-gebruiksvoorwaarden-de-aanvraag-wordt-afgesloten', '{{name}} weigerde de bijkomende gebruiksvoorwaarden. De aanvraag wordt afgesloten.', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} weigerde de bijkomende gebruiksvoorwaarden. De aanvraag wordt afgesloten.', value_type = 'HTML';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-weigerde-de-bijkomende-gebruiksvoorwaarden-de-aanvraag-wordt-afgesloten', '{{name}} refused the additional conditions. The request will be closed.', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} refused the additional conditions. The request will be closed.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'name-weigerde-de-bijkomende-gebruiksvoorwaarden-de-aanvraag-wordt-afgesloten', '{{name}} weigerde de bijkomende gebruiksvoorwaarden. De aanvraag wordt afgesloten.', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '{{name}} weigerde de bijkomende gebruiksvoorwaarden. De aanvraag wordt afgesloten.', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'strong-name-strong-stuurde-bijkomende-gebruiksvoorwaarden', '<p><span style="color:#000000"><span style="font-size:16px"><span style="background-color:#ffffff"><strong>{{name}}</strong></span></span></span> stuurde bijkomende gebruiksvoorwaarden</p>', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '<p><span style="color:#000000"><span style="font-size:16px"><span style="background-color:#ffffff"><strong>{{name}}</strong></span></span></span> stuurde bijkomende gebruiksvoorwaarden</p>', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-conversation-message', 'strong-name-strong-stuurde-bijkomende-gebruiksvoorwaarden', '<p><strong>{{name}}</strong> has sent additional conditions</p>', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '<p><strong>{{name}}</strong> has sent additional conditions</p>', value_type = 'HTML';
@@ -2483,7 +2485,7 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-beschikbaar-van-tot', 'Download beschikbaar van {{availableAt}} tot {{expiresAt}}', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download beschikbaar van {{availableAt}} tot {{expiresAt}}', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-in-voorbereiding', 'Download in voorbereiding', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download in voorbereiding', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-in-voorbereiding', 'Preparing download', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Preparing download', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-is-beschikbaar-tot-en-met', 'Download is available until {{downloadExpirationDate}} (engels)', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download is available until {{downloadExpirationDate}} (engels)', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-is-beschikbaar-tot-en-met', 'Download is available until {{downloadExpirationDate}}', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download is available until {{downloadExpirationDate}}', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-is-beschikbaar-tot-en-met', 'Download is beschikbaar tot en met {{downloadExpirationDate}}', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download is beschikbaar tot en met {{downloadExpirationDate}}', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-is-verlopen-op', 'Download is expired on {{downloadExpirationDate}}', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download is expired on {{downloadExpirationDate}}', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-detail-blade/material-request-detail-blade', 'download-is-verlopen-op', 'Download is verlopen op {{downloadExpirationDate}}', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Download is verlopen op {{downloadExpirationDate}}', value_type = 'TEXT';
@@ -2617,18 +2619,18 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluate-conditions-blade/material-request-evaluate-conditions-blade', 'voorwaarden-accepteren-mobile', 'Voorwaarden accepteren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Voorwaarden accepteren', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluate-conditions-blade/material-request-evaluate-conditions-blade', 'voorwaarden-geaccepteerd', 'Conditions accepted', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Conditions accepted', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluate-conditions-blade/material-request-evaluate-conditions-blade', 'voorwaarden-geaccepteerd', 'Voorwaarden geaccepteerd', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Voorwaarden geaccepteerd', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'aanvraag-beoordelen-descriptive-title', 'Aanvraag beoordelen descriptive title', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag beoordelen descriptive title', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'aanvraag-beoordelen-descriptive-title', 'Aanvraag beoordelen descriptive title', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag beoordelen descriptive title', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'afkeuren-knop-beschrijving', 'Afkeuren knop beschrijving', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Afkeuren knop beschrijving', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'afkeuren-knop-beschrijving', 'Afkeuren knop beschrijving', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Afkeuren knop beschrijving', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'aanvraag-beoordelen-descriptive-title', 'Make a decision about the request', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Make a decision about the request', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'afkeuren-knop-beschrijving', 'In dit geval wordt de materiaalaanvraag onmiddellijk gesloten.', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'In dit geval wordt de materiaalaanvraag onmiddellijk gesloten.', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'afkeuren-knop-beschrijving', 'In this case the request will be closed immediately.', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'In this case the request will be closed immediately.', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'afkeuren-knop-label', 'Afkeuren knop label', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Afkeuren knop label', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'afkeuren-knop-label', 'Afkeuren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Afkeuren', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-knop-beschrijving', 'Goedkeuren knop beschrijving', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren knop beschrijving', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-knop-beschrijving', 'In dit geval zal het materiaal onmiddellijk klaargemaakt worden voor download.', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'In dit geval zal het materiaal onmiddellijk klaargemaakt worden voor download.', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-knop-beschrijving', 'In this case the material will be made available for download immediately.', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'In this case the material will be made available for download immediately.', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-knop-label', 'Goedkeuren knop label', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren knop label', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-knop-label', 'Goedkeuren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-mit-voorwaarden-knop-beschrijving', 'Goedkeuren mit voorwaarden knop beschrijving', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren mit voorwaarden knop beschrijving', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-mit-voorwaarden-knop-beschrijving', 'Goedkeuren mits voorwaarden beschrijving', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren mits voorwaarden beschrijving', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-mit-voorwaarden-knop-beschrijving', 'In dit geval kunt u bijkomende gebruiksvoorwaarden opleggen voordat goedkeuring gegeven kan worden.', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'In dit geval kunt u bijkomende gebruiksvoorwaarden opleggen voordat goedkeuring gegeven kan worden.', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-mit-voorwaarden-knop-beschrijving', 'In this case you may impose additional conditions prior to approval.', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'In this case you may impose additional conditions prior to approval.', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-mit-voorwaarden-knop-label', 'Goedkeuren mit voorwaarden knop label', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren mit voorwaarden knop label', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'goedkeuren-mit-voorwaarden-knop-label', 'Goedkeuren mits voorwaarden', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Goedkeuren mits voorwaarden', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-evaluator-options/material-request-evaluator-options', 'kies-voor-de-gewenste-optie-om-de-aanvraag-te-beoordelen', 'Choose your preferred option for reviewing this request', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Choose your preferred option for reviewing this request', value_type = 'TEXT';
@@ -2644,11 +2646,11 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren', 'Aanvraag goedkeuren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag goedkeuren', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren', 'Approve request', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Approve request', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-description', '<p>De aanvraag wordt meteen goedgekeurd en de download wordt klaargezet voor de aanvrager. 
</p><p></p><p>Indien je bijkomende voorwaarden wil voorleggen, keer dan terug en kies de optie &#x27;Bijkomende voorwaarden&#x27;.</p>', 'HTML', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '<p>De aanvraag wordt meteen goedgekeurd en de download wordt klaargezet voor de aanvrager. 
</p><p></p><p>Indien je bijkomende voorwaarden wil voorleggen, keer dan terug en kies de optie &#x27;Bijkomende voorwaarden&#x27;.</p>', value_type = 'HTML';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-description', 'Aanvraag goedkeuren description', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag goedkeuren description', value_type = 'HTML';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-description', '<p>The request will be approved immediately and the download will be prepared for the requester.</p><p></p><p>If you wish to impose additional conditions, return from this page and select the option &quot;Additinal conditions&quot;.</p>', 'HTML', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = '<p>The request will be approved immediately and the download will be prepared for the requester.</p><p></p><p>If you wish to impose additional conditions, return from this page and select the option &quot;Additinal conditions&quot;.</p>', value_type = 'HTML';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-mobiel', 'Aanvraag goedkeuren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag goedkeuren', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-mobiel', 'Approve request', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Approve request', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-titel', 'Aanvraag goedkeuren titel', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag goedkeuren titel', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-titel', 'Aanvraag goedkeuren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Aanvraag goedkeuren', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'aanvraag-goedkeuren-titel', 'Approve request', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Approve request', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'afkeuren-en-bijkomende-gebruiksvoorwaarden-verwijderen', 'Afkeuren en bijkomende gebruiksvoorwaarden verwijderen', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Afkeuren en bijkomende gebruiksvoorwaarden verwijderen', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'afkeuren-en-bijkomende-gebruiksvoorwaarden-verwijderen', 'Reject and delete additional conditions', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Reject and delete additional conditions', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'als-je-de-aanvraag-afkeurt-worden-de-verzonden-bijkomende-gebruiksvoorwaarden-verwijderd-weet-je-zeker-dat-je-wil-doorgaan', 'Als je de aanvraag afkeurt, worden de verzonden bijkomende gebruiksvoorwaarden verwijderd. Weet je zeker dat je wil doorgaan?', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Als je de aanvraag afkeurt, worden de verzonden bijkomende gebruiksvoorwaarden verwijderd. Weet je zeker dat je wil doorgaan?', value_type = 'TEXT';
@@ -2657,7 +2659,7 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'annuleer-mobiel', 'Cancel', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Cancel', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'ja-aanvraag-afkeuren-en-verwijder-bijkomende-gebruiksvoorwaarden', 'Ja, aanvraag afkeuren en verwijder bijkomende gebruiksvoorwaarden', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Ja, aanvraag afkeuren en verwijder bijkomende gebruiksvoorwaarden', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'ja-aanvraag-afkeuren-en-verwijder-bijkomende-gebruiksvoorwaarden', 'Yes, reject the request and delete the additional conditions', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Yes, reject the request and delete the additional conditions', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'materiaal-aanvraag-goedkeuren-of-afkeuren-blade-aria-label', 'Materiaal aanvraag goedkeuren of afkeuren [BLADE_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Materiaal aanvraag goedkeuren of afkeuren [BLADE_ARIA_LABEL]', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'materiaal-aanvraag-goedkeuren-of-afkeuren-blade-aria-label', 'Approve or reject request [BLADE_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Approve or reject request [BLADE_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'materiaal-aanvraag-goedkeuren-of-afkeuren-blade-aria-label', 'Materiaal aanvraag goedkeuren of afkeuren [BLADE_ARIA_LABEL]', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Materiaal aanvraag goedkeuren of afkeuren [BLADE_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'motivatie-aanvraag-afkeuren', 'Motivatie voor afkeuren', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Motivatie voor afkeuren', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/account/components/material-request-status-update-blade/material-request-status-update-blade', 'motivatie-aanvraag-afkeuren', 'Motivation for refusal', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Motivation for refusal', value_type = 'TEXT';
@@ -3319,7 +3321,7 @@ INSERT INTO app.translations ("component", "location", "key", "value", "value_ty
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visit-requests-page', 'beheer', 'Beheer', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Beheer', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'beheer', 'Admin', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Admin', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'beheer', 'Beheer', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Beheer', value_type = 'TEXT';
-INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'materiaal-aanvraag-goedkeuren-blade-aria-label', 'Materiaal aanvraag goedkeuren [BLADE_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Materiaal aanvraag goedkeuren [BLADE_ARIA_LABEL]', value_type = 'TEXT';
+INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'materiaal-aanvraag-goedkeuren-blade-aria-label', 'Approve material request [BLADE_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Approve material request [BLADE_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'materiaal-aanvraag-goedkeuren-blade-aria-label', 'Materiaal aanvraag goedkeuren [BLADE_ARIA_LABEL]', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Materiaal aanvraag goedkeuren [BLADE_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'zoek-bezoekers-input-aria-label', 'Zoek bezoekers [INPUT_ARIA_LABEL]', 'TEXT', 'en') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Zoek bezoekers [INPUT_ARIA_LABEL]', value_type = 'TEXT';
 INSERT INTO app.translations ("component", "location", "key", "value", "value_type", "language") VALUES ('FRONTEND', 'modules/cp/views/cp-admin-visitors', 'zoek-bezoekers-input-aria-label', 'Zoek bezoekers [INPUT_ARIA_LABEL]', 'TEXT', 'nl') ON CONFLICT (component, location, key, language) DO UPDATE SET value = 'Zoek bezoekers [INPUT_ARIA_LABEL]', value_type = 'TEXT';
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 039a9292b..e1ff4ecbd 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -214,7 +214,6 @@
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -1642,7 +1641,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1686,7 +1684,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -1764,6 +1761,7 @@
     "node_modules/@emotion/babel-plugin": {
       "version": "11.11.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.16.7",
         "@babel/runtime": "^7.18.3",
@@ -1780,11 +1778,13 @@
     },
     "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": {
       "version": "1.9.0",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -1795,6 +1795,7 @@
     "node_modules/@emotion/babel-plugin/node_modules/source-map": {
       "version": "0.5.7",
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1802,6 +1803,7 @@
     "node_modules/@emotion/cache": {
       "version": "11.11.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/memoize": "^0.8.1",
         "@emotion/sheet": "^1.2.2",
@@ -1812,11 +1814,13 @@
     },
     "node_modules/@emotion/hash": {
       "version": "0.9.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/memoize": {
       "version": "0.8.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/react": {
       "version": "11.11.1",
@@ -1844,6 +1848,7 @@
     "node_modules/@emotion/serialize": {
       "version": "1.1.4",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/hash": "^0.9.1",
         "@emotion/memoize": "^0.8.1",
@@ -1854,26 +1859,31 @@
     },
     "node_modules/@emotion/sheet": {
       "version": "1.2.2",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/unitless": {
       "version": "0.8.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
       "version": "1.0.1",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "react": ">=16.8.0"
       }
     },
     "node_modules/@emotion/utils": {
       "version": "1.2.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/weak-memoize": {
       "version": "0.3.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.5",
@@ -1955,6 +1965,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -2158,6 +2169,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -2319,6 +2331,7 @@
       "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz",
       "integrity": "sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@floating-ui/utils": "^0.2.10"
       }
@@ -2328,6 +2341,7 @@
       "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz",
       "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@floating-ui/core": "^1.7.4",
         "@floating-ui/utils": "^0.2.10"
@@ -2354,6 +2368,7 @@
       "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.7.tgz",
       "integrity": "sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@floating-ui/dom": "^1.7.5"
       },
@@ -2366,13 +2381,15 @@
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
       "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@flowplayer/player": {
       "version": "3.32.1",
       "resolved": "https://registry.npmjs.org/@flowplayer/player/-/player-3.32.1.tgz",
       "integrity": "sha512-oICxPIRI3n+Gmqs7PEE76ZAWyCaDkJ7S9BLhaaO3svMPmCgOysjN2DC2o20D2RUHc3ellnC0FxS/USuU7ZRHGw==",
       "license": "https://flowplayer.com/commercial-license",
+      "peer": true,
       "dependencies": {
         "dashjs": "5.0.3",
         "hls.js": "1.6.12",
@@ -2384,6 +2401,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.2.0.tgz",
       "integrity": "sha512-xxCJm+Bckc6kQBknN7i9fnP/xobQRsRQxR01CztFkp/h++yfVxUUcmMgfR2HttJx/dpWjS9ubVuyspJv24Q9DA==",
       "license": "(MIT OR CC0-1.0)",
+      "peer": true,
       "dependencies": {
         "tagged-tag": "^1.0.0"
       },
@@ -2405,6 +2423,7 @@
     "node_modules/@icons/material": {
       "version": "0.2.4",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "react": "*"
       }
@@ -3223,7 +3242,8 @@
     },
     "node_modules/@one-ini/wasm": {
       "version": "0.1.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@parcel/watcher": {
       "version": "2.5.1",
@@ -4275,13 +4295,15 @@
       "version": "0.12.4",
       "resolved": "https://registry.npmjs.org/@svta/common-media-library/-/common-media-library-0.12.4.tgz",
       "integrity": "sha512-9EuOoaNmz7JrfGwjsrD9SxF9otU5TNMnbLu1yU4BeLK0W5cDxVXXR58Z89q9u2AnHjIctscjMTYdlqQ1gojTuw==",
-      "license": "Apache-2.0"
+      "license": "Apache-2.0",
+      "peer": true
     },
     "node_modules/@tanstack/query-core": {
       "version": "5.90.8",
       "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.8.tgz",
       "integrity": "sha512-4E0RP/0GJCxSNiRF2kAqE/LQkTJVlL/QNU7gIJSptaseV9HP6kOuA+N11y4bZKZxa3QopK3ZuewwutHx6DqDXQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
@@ -4327,6 +4349,7 @@
       "version": "4.1.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4342,6 +4365,7 @@
       "version": "7.2.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4478,7 +4502,8 @@
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -4721,7 +4746,6 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz",
       "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.2.2"
@@ -4741,7 +4765,6 @@
       "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "@types/react": "^18.0.0"
       }
@@ -4757,6 +4780,7 @@
     "node_modules/@types/react-transition-group": {
       "version": "4.4.10",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -4862,6 +4886,7 @@
       "version": "6.2.16",
       "resolved": "http://do-prd-mvn-01.do.viaa.be:8081/repository/npm-viaa/@viaa/avo2-components/-/avo2-components-6.2.16.tgz",
       "integrity": "sha512-IWhmRLYWi/OnwQ6wxArtRjzGeUk8pXYBygpSB+hSUsf8SYnRB3nDU6ETE5oBgEmstKbjvcHtKHsMgPyn+5KNpQ==",
+      "peer": true,
       "optionalDependencies": {
         "@esbuild/darwin-arm64": "^0.20.1",
         "@esbuild/linux-x64": "^0.20.1",
@@ -4896,6 +4921,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -5154,6 +5180,7 @@
     "node_modules/abbrev": {
       "version": "2.0.0",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -5162,7 +5189,6 @@
       "version": "8.10.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5429,7 +5455,8 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/assertion-error": {
       "version": "2.0.1",
@@ -5607,6 +5634,7 @@
     "node_modules/babel-plugin-macros": {
       "version": "3.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "cosmiconfig": "^7.0.0",
@@ -5663,6 +5691,7 @@
       "resolved": "https://registry.npmjs.org/bcp-47/-/bcp-47-2.1.0.tgz",
       "integrity": "sha512-9IIS3UPrvIa1Ej+lVDdDwO7zLehjqsaByECw0bu2RRGP73jALm6FYbzI5gWbgHLvNdkvfXB5YrSbocZdOS0c0w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "is-alphabetical": "^2.0.0",
         "is-alphanumerical": "^2.0.0",
@@ -5678,6 +5707,7 @@
       "resolved": "https://registry.npmjs.org/bcp-47-match/-/bcp-47-match-2.0.3.tgz",
       "integrity": "sha512-JtTezzbAibu8G0R9op9zb3vcWZd9JF6M0xOYGPn0fNCd7wOpRB1mU2mH9T8gaBGbAAyIIVgB2G7xG0GP98zMAQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -5688,6 +5718,7 @@
       "resolved": "https://registry.npmjs.org/bcp-47-normalize/-/bcp-47-normalize-2.3.0.tgz",
       "integrity": "sha512-8I/wfzqQvttUFz7HVJgIZ7+dj3vUaIyIxYXaTRP1YWoSDfzt6TUmxaKZeuXR62qBmYr+nvuWINFRl6pZ5DlN4Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "bcp-47": "^2.0.0",
         "bcp-47-match": "^2.0.0"
@@ -5777,6 +5808,7 @@
       "resolved": "https://registry.npmjs.org/braft-finder/-/braft-finder-0.0.19.tgz",
       "integrity": "sha512-0kzI6/KbomJJhYX1hpjn4edCKhblyUyWdUrsgBmOrwy0vrj+pPkm69+Uf8Uj6KGAULM6LF0ooC++p7fqUGgFHw==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "react": "^16.4.1",
         "react-dom": "^16.4.1"
@@ -5787,6 +5819,7 @@
       "resolved": "https://registry.npmjs.org/braft-utils/-/braft-utils-3.0.13.tgz",
       "integrity": "sha512-92YNlc5RW3mNMo0zbWhnqz8PWr21AAPPhnfn3ZUoXM9+wBIuJQe6UyvOas+MEG9UOGFrvTDPbq60P3fdEhyMQQ==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "braft-convert": "^2.1.4",
         "draft-js": "^0.10.5",
@@ -5829,6 +5862,7 @@
       "resolved": "https://registry.npmjs.org/braft-utils/-/braft-utils-3.0.13.tgz",
       "integrity": "sha512-92YNlc5RW3mNMo0zbWhnqz8PWr21AAPPhnfn3ZUoXM9+wBIuJQe6UyvOas+MEG9UOGFrvTDPbq60P3fdEhyMQQ==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "braft-convert": "^2.1.4",
         "draft-js": "^0.10.5",
@@ -5854,7 +5888,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001718",
         "electron-to-chromium": "^1.5.160",
@@ -6001,8 +6034,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "CC-BY-4.0",
-      "peer": true
+      "license": "CC-BY-4.0"
     },
     "node_modules/capture-stack-trace": {
       "version": "1.0.1",
@@ -6207,7 +6239,8 @@
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/codem-isoboxer/-/codem-isoboxer-0.3.10.tgz",
       "integrity": "sha512-eNk3TRV+xQMJ1PEj0FQGY8KD4m0GPxT487XJ+Iftm7mVa9WpPFDMWqPt+46buiP5j5Wzqe5oMIhqBcAeKfygSA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
@@ -6283,6 +6316,7 @@
     "node_modules/config-chain": {
       "version": "1.1.13",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -6290,7 +6324,8 @@
     },
     "node_modules/config-chain/node_modules/ini": {
       "version": "1.3.8",
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/console-log-colors": {
       "version": "0.5.0",
@@ -6354,6 +6389,7 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.0.tgz",
       "integrity": "sha512-vXiThu1/rlos7EGu8TuNZQEg2e9TvhH9dmS4T4ZVzB7Ao1agEZ6EG3sn5n+hZRYUgduISd1HpngFzAZiDGm5vQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -6375,7 +6411,8 @@
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
       "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/cosmiconfig": {
       "version": "7.1.0",
@@ -6489,6 +6526,7 @@
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
       "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-fetch": "^2.6.12"
       }
@@ -6498,6 +6536,7 @@
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
       "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -6634,6 +6673,7 @@
       "resolved": "https://registry.npmjs.org/dashjs/-/dashjs-5.0.3.tgz",
       "integrity": "sha512-TXndNnCUjFjF2nYBxDVba+hWRpVkadkQ8flLp7kHkem+5+wZTfRShJCnVkPUosmjS0YPE9fVNLbYPJxHBeQZvA==",
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "@svta/common-media-library": "^0.12.4",
         "bcp-47-match": "^2.0.3",
@@ -6666,6 +6706,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "bin": {
         "ua-parser-js": "script/cli.js"
       },
@@ -6864,6 +6905,7 @@
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10"
       }
@@ -7257,11 +7299,13 @@
     "node_modules/dom-accessibility-api": {
       "version": "0.5.16",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.8.7",
         "csstype": "^3.0.2"
@@ -7379,6 +7423,7 @@
       "resolved": "https://registry.npmjs.org/draft-convert/-/draft-convert-2.1.13.tgz",
       "integrity": "sha512-/h/n4JCfyO8aWby7wKBkccHdsuVbbDyHWXi/B3Zf2pN++lN1lDOIVt5ulXCcbH2Y5YJEFzMJw/YGfN+R0axxxg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.5.5",
         "immutable": "~3.7.4",
@@ -7411,6 +7456,7 @@
       "resolved": "https://registry.npmjs.org/draft-js-multidecorators/-/draft-js-multidecorators-1.0.0.tgz",
       "integrity": "sha512-7qdy+YQol5iq38AoEerhgSJWhCzxvZLn1x5ODfUlGfWlg0SrZ9AXJbaxHVIjdSIZNrbVIm+WANujNxMqCmDSZQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "immutable": "*"
       }
@@ -7465,6 +7511,7 @@
     "node_modules/editorconfig": {
       "version": "1.0.4",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@one-ini/wasm": "0.1.1",
         "commander": "^10.0.0",
@@ -7481,6 +7528,7 @@
     "node_modules/editorconfig/node_modules/brace-expansion": {
       "version": "2.0.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -7488,6 +7536,7 @@
     "node_modules/editorconfig/node_modules/commander": {
       "version": "10.0.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14"
       }
@@ -7495,6 +7544,7 @@
     "node_modules/editorconfig/node_modules/minimatch": {
       "version": "9.0.1",
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -7508,6 +7558,7 @@
     "node_modules/editorconfig/node_modules/semver": {
       "version": "7.7.1",
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -7559,6 +7610,7 @@
     "node_modules/encoding": {
       "version": "0.1.13",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -7601,7 +7653,6 @@
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "array.prototype.flat": "^1.2.3",
         "cheerio": "^1.0.0-rc.3",
@@ -8056,7 +8107,8 @@
     },
     "node_modules/exenv": {
       "version": "1.2.2",
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/exit": {
       "version": "0.1.2",
@@ -8112,7 +8164,8 @@
     },
     "node_modules/extend": {
       "version": "3.0.2",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -8180,6 +8233,7 @@
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz",
       "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "core-js": "^1.0.0",
         "isomorphic-fetch": "^2.1.1",
@@ -8350,13 +8404,15 @@
     "node_modules/filter-obj": {
       "version": "1.1.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/find-root": {
       "version": "1.1.0",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/find-up": {
       "version": "5.0.0",
@@ -8670,6 +8726,7 @@
     "node_modules/glob": {
       "version": "10.4.5",
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -8688,6 +8745,7 @@
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "2.0.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -8695,6 +8753,7 @@
     "node_modules/glob/node_modules/jackspeak": {
       "version": "3.4.3",
       "license": "BlueOak-1.0.0",
+      "peer": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
@@ -8708,6 +8767,7 @@
     "node_modules/glob/node_modules/minimatch": {
       "version": "9.0.5",
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -8990,13 +9050,15 @@
       "version": "1.6.12",
       "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.6.12.tgz",
       "integrity": "sha512-Pz+7IzvkbAht/zXvwLzA/stUHNqztqKvlLbfpq6ZYU68+gZ+CZMlsbQBPUviRap+3IQ41E39ke7Ia+yvhsehEQ==",
-      "license": "Apache-2.0"
+      "license": "Apache-2.0",
+      "peer": true
     },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "react-is": "^16.7.0"
       }
@@ -9005,7 +9067,8 @@
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/hookified": {
       "version": "1.13.0",
@@ -9080,7 +9143,8 @@
           "url": "https://patreon.com/mdevils"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
@@ -9205,6 +9269,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.4"
       },
@@ -9233,6 +9298,7 @@
       "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -9240,6 +9306,7 @@
     "node_modules/iconv-lite": {
       "version": "0.6.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -9270,7 +9337,8 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/immer": {
       "version": "9.0.12",
@@ -9341,6 +9409,7 @@
       "resolved": "https://registry.npmjs.org/imsc/-/imsc-1.1.5.tgz",
       "integrity": "sha512-V8je+CGkcvGhgl2C1GlhqFFiUOIEdwXbXLiu1Fcubvvbo+g9inauqT3l0pNYXGoLPBj3jxtZz9t+wCopMkwadQ==",
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "sax": "1.2.1"
       }
@@ -9412,6 +9481,7 @@
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
@@ -9421,6 +9491,7 @@
       "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz",
       "integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -9431,6 +9502,7 @@
       "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz",
       "integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "is-alphabetical": "^2.0.0",
         "is-decimal": "^2.0.0"
@@ -9542,6 +9614,7 @@
       "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz",
       "integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -9857,6 +9930,7 @@
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
       "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-fetch": "^1.0.1",
         "whatwg-fetch": ">=0.10.0"
@@ -9867,6 +9941,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9876,6 +9951,7 @@
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
       "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "encoding": "^0.1.11",
         "is-stream": "^1.0.1"
@@ -11239,6 +11315,7 @@
     "node_modules/js-cookie": {
       "version": "3.0.5",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14"
       }
@@ -11431,7 +11508,6 @@
       "integrity": "sha512-eohl3hKTiVyD1ilYdw9T0OiB4hnjef89e3dMYKz+mVKDzj+5IteTseASUsOB+EU9Tf6VNTCjDePcP6wkDGmLKQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@keyv/serialize": "^1.1.1"
       }
@@ -11636,6 +11712,7 @@
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
       "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -11665,6 +11742,7 @@
       "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
       "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "lie": "3.1.1"
       }
@@ -11691,7 +11769,8 @@
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.escape": {
       "version": "4.0.1",
@@ -11710,7 +11789,8 @@
     },
     "node_modules/lodash.omit": {
       "version": "4.5.0",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
@@ -11722,6 +11802,7 @@
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -11779,6 +11860,7 @@
       "version": "1.5.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -11855,7 +11937,8 @@
     },
     "node_modules/material-colors": {
       "version": "1.2.6",
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
@@ -11885,7 +11968,8 @@
     },
     "node_modules/memoize-one": {
       "version": "6.0.0",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/memoizee": {
       "version": "0.4.17",
@@ -12294,6 +12378,7 @@
     "node_modules/nopt": {
       "version": "7.2.1",
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "abbrev": "^2.0.0"
       },
@@ -12536,7 +12621,8 @@
     },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
-      "license": "BlueOak-1.0.0"
+      "license": "BlueOak-1.0.0",
+      "peer": true
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
@@ -12651,7 +12737,8 @@
     },
     "node_modules/perfect-scrollbar": {
       "version": "1.5.5",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
@@ -12775,7 +12862,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -12857,7 +12943,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -12924,6 +13009,7 @@
       "version": "27.5.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -12937,6 +13023,7 @@
       "version": "5.2.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -12957,6 +13044,7 @@
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "asap": "~2.0.3"
       }
@@ -12976,6 +13064,7 @@
     "node_modules/prop-types": {
       "version": "15.8.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -12984,15 +13073,18 @@
     },
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/property-expr": {
       "version": "2.0.6",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/proto-list": {
       "version": "1.2.4",
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/punycode": {
       "version": "2.3.1",
@@ -13042,6 +13134,7 @@
     "node_modules/qs": {
       "version": "6.9.6",
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
         "node": ">=0.6"
       },
@@ -13116,7 +13209,6 @@
     "node_modules/raf": {
       "version": "3.4.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "performance-now": "^2.1.0"
       }
@@ -13210,6 +13302,7 @@
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
       "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -13219,6 +13312,7 @@
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
       "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
@@ -13240,7 +13334,8 @@
     },
     "node_modules/react-fast-compare": {
       "version": "3.2.2",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/react-hook-form": {
       "version": "7.66.0",
@@ -13304,7 +13399,8 @@
     },
     "node_modules/react-lifecycles-compat": {
       "version": "3.0.4",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/react-modal": {
       "version": "3.14.4",
@@ -13472,6 +13568,7 @@
     "node_modules/react-transition-group": {
       "version": "4.4.5",
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.5.5",
         "dom-helpers": "^5.0.1",
@@ -13486,6 +13583,7 @@
     "node_modules/reactcss": {
       "version": "1.2.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "lodash": "^4.0.1"
       }
@@ -13874,7 +13972,6 @@
       "version": "4.44.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -14007,7 +14104,8 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/sass": {
       "version": "1.93.3",
@@ -14063,7 +14161,8 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
       "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==",
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/saxes": {
       "version": "6.0.0",
@@ -14081,6 +14180,7 @@
     "node_modules/scheduler": {
       "version": "0.23.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
@@ -14119,7 +14219,8 @@
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
       "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
@@ -14155,7 +14256,8 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
@@ -14444,6 +14546,7 @@
     "node_modules/split-on-first": {
       "version": "1.1.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -14505,6 +14608,7 @@
     "node_modules/strict-uri-encode": {
       "version": "2.0.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -14734,7 +14838,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@csstools/css-parser-algorithms": "^3.0.5",
         "@csstools/css-tokenizer": "^3.0.4",
@@ -15035,7 +15138,8 @@
     },
     "node_modules/stylis": {
       "version": "4.2.0",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/stylus-lookup": {
       "version": "5.0.1",
@@ -15133,7 +15237,8 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
       "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/table": {
       "version": "6.9.0",
@@ -15179,6 +15284,7 @@
       "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz",
       "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20"
       },
@@ -15307,7 +15413,8 @@
     },
     "node_modules/tiny-case": {
       "version": "1.0.3",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/tinybench": {
       "version": "2.9.0",
@@ -15318,7 +15425,8 @@
     },
     "node_modules/tinycolor2": {
       "version": "1.6.0",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/tinyexec": {
       "version": "1.0.2",
@@ -15371,7 +15479,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15424,7 +15531,8 @@
     },
     "node_modules/to-no-case": {
       "version": "1.0.2",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
@@ -15448,17 +15556,20 @@
     "node_modules/to-space-case": {
       "version": "1.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "to-no-case": "^1.0.0"
       }
     },
     "node_modules/toggle-selection": {
       "version": "1.0.6",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/toposort": {
       "version": "2.0.2",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/tough-cookie": {
       "version": "6.0.0",
@@ -15477,7 +15588,8 @@
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/trim-newlines": {
       "version": "3.0.1",
@@ -16221,6 +16333,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "bin": {
         "ua-parser-js": "script/cli.js"
       },
@@ -16303,6 +16416,7 @@
       "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.1.tgz",
       "integrity": "sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
@@ -16360,7 +16474,6 @@
       "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -16512,7 +16625,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16648,6 +16760,7 @@
     "node_modules/warning": {
       "version": "4.0.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
@@ -16682,13 +16795,15 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "license": "BSD-2-Clause"
+      "license": "BSD-2-Clause",
+      "peer": true
     },
     "node_modules/whatwg-fetch": {
       "version": "3.6.20",
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
       "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/whatwg-mimetype": {
       "version": "4.0.0",
@@ -16705,6 +16820,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -16995,6 +17111,7 @@
     "node_modules/yup": {
       "version": "1.4.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "property-expr": "^2.0.5",
         "tiny-case": "^1.0.3",
@@ -17005,6 +17122,7 @@
     "node_modules/yup/node_modules/type-fest": {
       "version": "2.19.0",
       "license": "(MIT OR CC0-1.0)",
+      "peer": true,
       "engines": {
         "node": ">=12.20"
       },
diff --git a/ui/package.json b/ui/package.json
index 3bd61a016..b5b82d9d6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -202,5 +202,8 @@
   "dependencies": {
     "jsdom": "27.4.0",
     "memoizee": "^0.4.17"
+  },
+  "allowScripts": {
+    "@parcel/watcher@2.5.1": true
   }
 }
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts
index 1c314c31b..a50e99dae 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts
@@ -55,19 +55,18 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_AVO_HERO_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(undefined, {
+			title: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/hero___titel', {}, [AVO]),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			}),
+			}, undefined),
 			titleColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/hero___titel-kleur', {}, [AVO])
 			),
-			content: TEXT_FIELD(undefined, {
+			content: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/hero___beschrijving', {}, [AVO]),
 				editorType: ContentBlockEditor.TextArea,
 				validator: undefined,
-			}),
+			}, undefined),
 			contentColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/hero___beschrijving-kleur', {}, [AVO])
 			),
@@ -82,20 +81,15 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 							options: AdminConfigManager.getConfig().components.buttonTypes(),
 						},
 					},
-					label: TEXT_FIELD(
-						tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht', {}, [
-							AVO,
-						]),
-						{
-							label: tText('admin/content-block/helpers/generators/buttons___tekst', {}, [AVO]),
-							editorType: ContentBlockEditor.TextInput,
-						}
-					),
-					altTitle: TEXT_FIELD(undefined, {
+					label: TEXT_FIELD({
+						label: tText('admin/content-block/helpers/generators/buttons___tekst', {}, [AVO]),
+					}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht', {}, [
+						AVO,
+					])),
+					altTitle: TEXT_FIELD({
 						label: tText('admin/content-block/helpers/generators/hero___alt-title-text'),
-						editorType: ContentBlockEditor.TextInput,
 						validator: undefined,
-					}),
+					}, undefined),
 					icon: {
 						label: tText('admin/content-block/helpers/generators/buttons___icoon', {}, [AVO]),
 						editorType: ContentBlockEditor.IconPicker,
@@ -124,20 +118,20 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 			} as ContentBlockFieldGroup,
 
-			textBelowButtons: TEXT_FIELD(undefined, {
+			textBelowButtons: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/hero___text-onder-knoppen', {}, [AVO]),
+				editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
 				editorProps: {
 					controls: RICH_TEXT_EDITOR_OPTIONS_FULL,
 				},
 				validator: undefined,
-			}),
-			src: TEXT_FIELD(undefined, {
+			}, undefined),
+			src: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/generators/hero___eigen-video-url-van-flowplayer-com',
 					{},
 					[AVO]
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: validateFlowplayerVideoUrl,
 				editorProps: {
 					placeholder: tText(
@@ -146,7 +140,7 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 						[AVO]
 					),
 				} as TextInputProps,
-			}),
+			}, undefined),
 			poster: FILE_FIELD(undefined, {
 				label: tText('admin/content-block/helpers/generators/hero___eigen-poster-uploaden', {}, [
 					AVO,
@@ -160,13 +154,12 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					onDeleteFile: noop, // images will be deleted from the assets service when the user saves the content page
 				} as Partial<FileUploadProps>,
 			}),
-			altText: TEXT_FIELD(undefined, {
+			altText: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/generators/hero___alt-tekst-voor-video-afbeelding',
 					{},
 					[AVO]
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
 			}),
 		},
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts
index 45ed9340d..2ae3fe688 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts
@@ -59,18 +59,14 @@ export const AVO_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (position = 0): ContentBlo
 	components: {
 		state: INITIAL_AVO_IMAGE_TEXT_BACKGROUND_COMPONENTS_STATE(),
 		fields: {
-			heading: TEXT_FIELD(
-				tText(
-					'admin/content-block/helpers/image-text-background/image-text-background___titel-is-verplicht'
+			heading: TEXT_FIELD({
+				label: tText(
+					'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
 				),
-				{
-					label: tText(
-						'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
-					),
-					editorType: ContentBlockEditor.TextInput,
-					validator: undefined,
-				}
-			),
+				validator: undefined,
+			}, tText(
+				'admin/content-block/helpers/image-text-background/image-text-background___titel-is-verplicht'
+			)),
 			headingType: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___titel-stijl'
@@ -94,8 +90,7 @@ export const AVO_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (position = 0): ContentBlo
 					options: GET_HEADING_SIZE_OPTIONS(),
 				},
 			},
-			content: TEXT_FIELD(undefined, {
-				editorType: ContentBlockEditor.TextInput,
+			content: TEXT_FIELD({
 				validator: undefined,
 			}),
 			textAlign: {
@@ -172,20 +167,18 @@ export const AVO_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (position = 0): ContentBlo
 					imageDimensions: { width: 1920, height: 385 },
 				} as FileUploadProps,
 			},
-			imageAttribution: {
+			imageAttribution: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-image-text-background/block-image-text-background___bijschrift-bronvermelding'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			},
-			imageAttributionText: {
+			}),
+			imageAttributionText: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-image-text-background/block-image-text-background___bijschrift-beschrijving'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			},
+			}),
 			buttonType: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___knop-type'
@@ -195,17 +188,15 @@ export const AVO_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (position = 0): ContentBlo
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: {
+			buttonLabel: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___knop-tekst'
 				),
-				editorType: ContentBlockEditor.TextInput,
-			},
-			buttonAltTitle: TEXT_FIELD(undefined, {
+			}),
+			buttonAltTitle: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___alt-title-text'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
 			}),
 			buttonAction: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts
index 699ca6249..833e92cec 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts
@@ -1,5 +1,5 @@
 import type { AvoCoreContentPickerType } from '@viaa/avo2-types';
-import { BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS } from '~content-blocks/defaults';
+import {BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS, TEXT_FIELD} from '~content-blocks/defaults';
 import { GET_FOREGROUND_COLOR_OPTIONS_ARCHIEF } from '~modules/content-page/const/get-color-options';
 import type {
 	ContentBlockConfig,
@@ -60,14 +60,13 @@ export const CONTENT_BREADCRUMBS_CONFIG = (position = 0): ContentBlockConfig =>
 			elements: {
 				label: 'breadcrumb',
 				fields: {
-					label: {
+					label: TEXT_FIELD({
 						label: tText(
 							'modules/content-page/components/blocks/block-breadcrumbs/block-breadcrumbs___label',
 							{},
 							[HET_ARCHIEF]
 						),
-						editorType: ContentBlockEditor.TextInput,
-					},
+					}),
 					link: {
 						label: tText(
 							'modules/content-page/components/blocks/block-breadcrumbs/block-breadcrumbs___link',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts
index 70e221680..99a1f3d6f 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts
@@ -44,16 +44,11 @@ export const BUTTONS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			label: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
-			altTitle: TEXT_FIELD(undefined, {
+			label: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+			}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
+			altTitle: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/buttons___alt-title-text'),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
 			}),
 			icon: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts
index 9b93d7ceb..0f8ff048b 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts
@@ -61,17 +61,15 @@ export const CTAS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: GET_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			heading: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/ctas___titel-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/ctas___titel-tekst'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			heading: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/ctas___titel-tekst'),
+			}, tText('admin/content-block/helpers/generators/ctas___titel-is-verplicht')),
 			headingColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/ctas___titel-kleur')
 			),
-			content: TEXT_FIELD(),
+			content: TEXT_FIELD({
+				editorType: ContentBlockEditor.RICH_TEXT_EDITOR
+			}),
 			contentColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/ctas___tekst-kleur')
 			),
@@ -82,16 +80,11 @@ export const CTAS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/ctas___knoptekst-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
-			buttonAltTitle: TEXT_FIELD(undefined, {
+			buttonLabel: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
+			}, tText('admin/content-block/helpers/generators/ctas___knoptekst-is-verplicht')),
+			buttonAltTitle: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/ctas___alt-button-text'),
-				editorType: ContentBlockEditor.TextInput,
 			}),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/ctas___knop-icoon'),
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts
index 5c320592b..9b3d830f4 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts
@@ -47,17 +47,13 @@ export const CARDS_WITHOUT_DESCRIPTION_BLOCK_CONFIG = (position = 0): ContentBlo
 			'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___card'
 		),
 		fields: {
-			title: TEXT_FIELD(
-				tText(
-					'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label-is-verplicht'
+			title: TEXT_FIELD({
+				label: tText(
+					'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label'
 				),
-				{
-					label: tText(
-						'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label'
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			}, tText(
+				'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label-is-verplicht'
+			)),
 			image: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___image'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts
index 484a2ba75..3521e7bc4 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts
@@ -49,14 +49,13 @@ export const CONTENT_ENCLOSE_BLOCK_CONFIG = (position = 0): ContentBlockConfig =
 	components: {
 		state: INITIAL_CONTENT_ENCLOSE_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD('title', {
+			title: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___title',
 					undefined,
 					[HET_ARCHIEF]
 				),
-				editorType: ContentBlockEditor.TextInput,
-			}),
+			}, tText('Titel is verplicht')),
 			titleType: {
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___titletype',
@@ -68,14 +67,14 @@ export const CONTENT_ENCLOSE_BLOCK_CONFIG = (position = 0): ContentBlockConfig =
 					options: GET_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			description: {
+			description: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___beschrijving',
 					undefined,
 					[HET_ARCHIEF]
 				),
-				editorType: ContentBlockEditor.TextInput,
-			},
+				validator: undefined
+			}),
 			buttonType: {
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___button-type',
@@ -87,21 +86,19 @@ export const CONTENT_ENCLOSE_BLOCK_CONFIG = (position = 0): ContentBlockConfig =
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD(undefined, {
+			buttonLabel: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___button-label',
 					undefined,
 					[HET_ARCHIEF]
 				),
-				editorType: ContentBlockEditor.TextInput,
 			}),
-			buttonAltTitle: TEXT_FIELD(undefined, {
+			buttonAltTitle: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___button-alt-title',
 					undefined,
 					[HET_ARCHIEF]
 				),
-				editorType: ContentBlockEditor.TextInput,
 			}),
 			buttonIcon: {
 				label: tText(
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts
index e261bbc92..f1fda857f 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts
@@ -32,11 +32,10 @@ export const EVENTBRITE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_EVENTBRITE_COMPONENTS_STATE(),
 		fields: {
-			eventId: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/eventbrite___event-id'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			eventId: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/eventbrite___event-id'),
+                validator: undefined,
+            }),
 			type: {
 				label: tText('admin/content-block/helpers/generators/buttons___type'),
 				editorType: ContentBlockEditor.Select,
@@ -44,13 +43,9 @@ export const EVENTBRITE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			label: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			label: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+            }, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
 			icon: {
 				label: tText('admin/content-block/helpers/generators/buttons___icoon'),
 				editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts
index ca6f1e1cf..f8a6c3866 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts
@@ -36,13 +36,9 @@ export const HEADING_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_HEADING_COMPONENTS_STATE(),
 		fields: {
-			children: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/heading___titel-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/heading___titel'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			children: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/heading___titel'),
+            }, tText('admin/content-block/helpers/generators/heading___titel-is-verplicht')),
 			color: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/heading___titel-kleur')
 			),
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts
index 58457d8b2..0fd081db4 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts
@@ -34,21 +34,17 @@ export const HET_ARCHIEF_HEADER_SEARCH_BLOCK_CONFIG = (position = 0): ContentBlo
 	components: {
 		state: INITIAL_HET_ARCHIEF_HEADER_SEARCH_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(
-				tText(
-					'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___is-verplicht',
-					{},
-					[HET_ARCHIEF]
-				),
-				{
-					label: tText(
-						'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___titel',
-						{},
-						[HET_ARCHIEF]
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			title: TEXT_FIELD({
+                label: tText(
+                    'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___titel',
+                    {},
+                    [HET_ARCHIEF]
+                ),
+            }, tText(
+                'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___is-verplicht',
+                {},
+                [HET_ARCHIEF]
+            )),
 			subtitles: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___animatie-teksten',
@@ -56,14 +52,14 @@ export const HET_ARCHIEF_HEADER_SEARCH_BLOCK_CONFIG = (position = 0): ContentBlo
 					[HET_ARCHIEF]
 				),
 				fields: {
-					label: {
+					label: TEXT_FIELD({
 						label: tText(
 							'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___animatie-tekst',
 							{},
 							[HET_ARCHIEF]
 						),
-						editorType: ContentBlockEditor.TextInput,
-					},
+						validator: undefined
+					}),
 				},
 				type: 'fieldGroup',
 				repeat: {
@@ -80,29 +76,24 @@ export const HET_ARCHIEF_HEADER_SEARCH_BLOCK_CONFIG = (position = 0): ContentBlo
 					),
 				},
 			} as ContentBlockFieldGroup,
-			textBelowSearch: TEXT_FIELD(undefined, {
-				label: tText(
-					'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___tekst-onder-zoekveld',
-					{},
-					[HET_ARCHIEF]
-				),
-				editorType: ContentBlockEditor.TextInput,
-			}),
-			searchAriaLabel: TEXT_FIELD(
-				tText(
-					'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-verplicht',
-					{},
-					[HET_ARCHIEF]
-				),
-				{
-					label: tText(
-						'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-voor-zoekveld',
-						{},
-						[HET_ARCHIEF]
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			textBelowSearch: TEXT_FIELD({
+                label: tText(
+                    'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___tekst-onder-zoekveld',
+                    {},
+                    [HET_ARCHIEF]
+                ),
+            }),
+			searchAriaLabel: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-voor-zoekveld',
+                    {},
+                    [HET_ARCHIEF]
+                ),
+            }, tText(
+                'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-verplicht',
+                {},
+                [HET_ARCHIEF]
+            )),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts
index 83bb00516..23fa50624 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts
@@ -67,18 +67,12 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 	components: {
 		state: INITIAL_HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_COMPONENTS_STATE(),
 		fields: {
-			heading: TEXT_FIELD(
-				tText(
-					'admin/content-block/helpers/image-text-background/image-text-background___titel-is-verplicht'
-				),
-				{
-					label: tText(
-						'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
-					),
-					editorType: ContentBlockEditor.TextInput,
-					validator: undefined,
-				}
-			),
+			heading: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
+                ),
+                validator: undefined,
+            }),
 			headingType: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___titel-stijl'
@@ -97,10 +91,9 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 					options: GET_HEADING_SIZE_OPTIONS(),
 				},
 			},
-			content: TEXT_FIELD(undefined, {
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			content: TEXT_FIELD({
+                validator: undefined,
+            }),
 			textAlign: {
 				label: tText('admin/content-block/helpers/generators/image-grid___text-alignatie'),
 				editorType: ContentBlockEditor.Select,
@@ -157,7 +150,6 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 				label: tText(
 					'modules/content-page/components/blocks/block-het-archief-image-text-background/block-het-archief-image-text-background___afbeelding-alt-tekst'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				editorProps: {
 					validator: undefined,
 				},
@@ -171,19 +163,18 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: {
+			buttonLabel: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___knop-tekst'
 				),
-				editorType: ContentBlockEditor.TextInput,
-			},
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/image-text-background/image-text-background___alt-title-text'
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
+				validator: undefined
 			}),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/image-text-background/image-text-background___alt-title-text'
+                ),
+                validator: undefined,
+            }),
 			buttonAction: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___knop-actie'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts
index 9cec1df62..05b5f8003 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts
@@ -28,17 +28,12 @@ export const IFRAME_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_IFRAME_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/iframe___titel-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/iframe___titel'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
-			src: TEXT_FIELD(tText('admin/content-block/helpers/generators/iframe___url-is-verplicht'), {
+			title: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/iframe___titel'),
+			}, tText('admin/content-block/helpers/generators/iframe___titel-is-verplicht')),
+			src: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/iframe___url'),
-				editorType: ContentBlockEditor.TextInput,
-			}),
+			}, tText('admin/content-block/helpers/generators/iframe___url-is-verplicht')),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts
index c04ffc447..c6a11fe5d 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts
@@ -37,16 +37,14 @@ export const IMAGE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_IMAGE_COMPONENTS_STATE(),
 		fields: {
-			title: {
+			title: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/image___bijschift-titel'),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			},
-			text: {
+			}),
+			text: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/image___bijschrift-beschrijving'),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			},
+			}),
 			imageSource: FILE_FIELD(
 				tText('admin/content-block/helpers/generators/image___een-afbeelding-is-verplicht'),
 				{
@@ -88,11 +86,10 @@ export const IMAGE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					],
 				},
 			},
-			imageAlt: TEXT_FIELD(undefined, {
+			imageAlt: TEXT_FIELD({
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-image/block-image___alt-tekst-voor-de-afbeelding'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
 			}),
 			buttonType: {
@@ -104,22 +101,17 @@ export const IMAGE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD(
-				tText(
-					'react-admin/modules/content-page/components/blocks/block-image/block-image___knoptekst-is-verplicht'
+			buttonLabel: TEXT_FIELD({
+				label: tText(
+					'react-admin/modules/content-page/components/blocks/block-image/block-image___knop-tekst'
 				),
-				{
-					label: tText(
-						'react-admin/modules/content-page/components/blocks/block-image/block-image___knop-tekst'
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
-			buttonAltTitle: TEXT_FIELD(undefined, {
+			}, tText(
+				'react-admin/modules/content-page/components/blocks/block-image/block-image___knoptekst-is-verplicht'
+			)),
+			buttonAltTitle: TEXT_FIELD({
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-image/block-image___alt-knop-text'
 				),
-				editorType: ContentBlockEditor.TextInput,
 			}),
 			buttonAction: {
 				label: tText(
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts
index c4f915cb7..d964daac2 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts
@@ -64,31 +64,26 @@ export const IMAGE_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					} as FileUploadProps,
 				}
 			),
-			title: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___titel'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			text: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			buttonLabel: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___alt-title-text'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			buttonTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			title: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___titel'),
+                validator: undefined,
+            }),
+			text: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
+                validator: undefined,
+            }),
+			buttonLabel: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
+                validator: undefined,
+            }),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___alt-title-text'),
+                validator: undefined,
+            }),
+			buttonTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
+                validator: undefined,
+            }),
 			buttonType: {
 				label: tText('admin/content-block/helpers/generators/image-grid___knop-type-kleur'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts
index d7420614b..30ebc35ed 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts
@@ -50,11 +50,10 @@ export const LOGO_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		name: tText('admin/content-block/helpers/generators/image-grid___item'),
 		state: INITIAL_LOGO_GRID_COMPONENTS_STATE(),
 		fields: {
-			textAbove: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/logo-grid___tekst-boven-afbeelding'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			textAbove: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/logo-grid___tekst-boven-afbeelding'),
+                validator: undefined,
+            }, undefined),
 			source: FILE_FIELD(
 				tText('admin/content-block/helpers/generators/image-grid___een-afbeelding-is-verplicht'),
 				{
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts
index 114b3a8c9..d8675df69 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts
@@ -58,24 +58,20 @@ export const USP_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					} as FileUploadProps,
 				}
 			),
-			title: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___titel'),
-				editorType: ContentBlockEditor.TextInput,
-			}),
-			text: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
-				editorType: ContentBlockEditor.TextInput,
-			}),
-			buttonLabel: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			buttonTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			title: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___titel'),
+            }),
+			text: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
+            }),
+			buttonLabel: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
+                validator: undefined,
+            }),
+			buttonTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
+                validator: undefined,
+            }),
 			buttonType: {
 				label: tText('admin/content-block/helpers/generators/image-grid___knop-type-kleur'),
 				editorType: ContentBlockEditor.Select,
@@ -84,11 +80,10 @@ export const USP_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 				validator: undefined,
 			},
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/usp-grid___alt-title-text'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/usp-grid___alt-title-text'),
+                validator: undefined,
+            }),
 			action: {
 				label: tText('admin/content-block/helpers/generators/image-grid___link'),
 				editorType: ContentBlockEditor.ContentPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts
index 5b8b7f60e..fcdd885b1 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts
@@ -50,13 +50,12 @@ export const IMAGE_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): ContentBlock
 				),
 				editorType: ContentBlockEditor.ContentPicker,
 			},
-			imageAlt: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/image-title-text-button___alt-tekst-voor-de-afbeelding'
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			imageAlt: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/image-title-text-button___alt-tekst-voor-de-afbeelding'
+                ),
+                validator: undefined,
+            }),
 			imagePosition: {
 				label: tText(
 					'admin/content-block/helpers/generators/image-title-text-button___positie-van-de-afbeelding'
@@ -66,11 +65,10 @@ export const IMAGE_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): ContentBlock
 					options: GET_ALIGN_OPTIONS().filter((option) => ['left', 'right'].includes(option.value)),
 				},
 			},
-			headingTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/heading___titel'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			headingTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/heading___titel'),
+                validator: undefined,
+            }),
 			headingType: {
 				label: tText('admin/content-block/helpers/generators/heading___stijl'),
 				editorType: ContentBlockEditor.Select,
@@ -86,18 +84,16 @@ export const IMAGE_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): ContentBlock
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: {
+			buttonLabel: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			},
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
-				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
 			}),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
+                ),
+                validator: undefined,
+            }),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/ctas___knop-icoon'),
 				editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts
index c90ccc813..90d95193b 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts
@@ -29,13 +29,9 @@ export const INTRO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_INTRO_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/intro___titel-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/intro___titel'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			title: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/intro___titel'),
+			}, tText('admin/content-block/helpers/generators/intro___titel-is-verplicht')),
 			headingType: {
 				label: tText('admin/content-block/helpers/generators/heading___stijl'),
 				editorType: ContentBlockEditor.Select,
@@ -43,17 +39,14 @@ export const INTRO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: GET_FULL_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			content: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/intro___tekst-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/defaults___tekst'),
-					editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
-					editorProps: {
-						controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL_WITHOUT_ALIGN, 'media'],
-						fileType: 'CONTENT_BLOCK_IMAGE',
-					},
-				}
-			),
+			content: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/defaults___tekst'),
+				editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
+				editorProps: {
+					controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL_WITHOUT_ALIGN, 'media'],
+					fileType: 'CONTENT_BLOCK_IMAGE',
+				},
+			}, tText('admin/content-block/helpers/generators/intro___tekst-is-verplicht')),
 			align: ALIGN_FIELD(tText('admin/content-block/helpers/generators/intro___uitlijning')),
 		},
 	},
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts
index 3859daa21..edd73e68e 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts
@@ -35,26 +35,22 @@ export const KLAAR_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		},
 		state: INITIAL_KLAAR_COMPONENTS_STATE(),
 		fields: {
-			titles: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/klaar___titel-is-verplicht', {}, [AVO]),
-				{
-					label: tText('admin/content-block/helpers/generators/klaar___titel', {}, [AVO]),
-					editorType: ContentBlockEditor.TextInput,
-					repeat: {
-						defaultState: '',
-						addButtonLabel: tText(
-							'admin/content-block/helpers/generators/klaar___voeg-titel-toe',
-							{},
-							[AVO]
-						),
-						deleteButtonLabel: tText(
-							'admin/content-block/helpers/generators/klaar___verwijder-titel',
-							{},
-							[AVO]
-						),
-					},
-				}
-			) as ContentBlockField,
+			titles: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/klaar___titel', {}, [AVO]),
+				repeat: {
+					defaultState: '',
+					addButtonLabel: tText(
+						'admin/content-block/helpers/generators/klaar___voeg-titel-toe',
+						{},
+						[AVO]
+					),
+					deleteButtonLabel: tText(
+						'admin/content-block/helpers/generators/klaar___verwijder-titel',
+						{},
+						[AVO]
+					),
+				},
+			}, tText('admin/content-block/helpers/generators/klaar___titel-is-verplicht', {}, [AVO])) as ContentBlockField,
 			date: {
 				label: 'Datum',
 				editorType: ContentBlockEditor.DatePicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts
index ec625f594..ab07ff72e 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts
@@ -40,21 +40,17 @@ export const MAINTAINERS_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig
 	components: {
 		state: INITIAL_MAINTAINERS_GRID_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(
-				tText(
-					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___is-verplicht',
-					{},
-					[HET_ARCHIEF]
-				),
-				{
-					label: tText(
-						'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___titel',
-						{},
-						[HET_ARCHIEF]
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			title: TEXT_FIELD({
+                label: tText(
+                    'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___titel',
+                    {},
+                    [HET_ARCHIEF]
+                ),
+            }, tText(
+                'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___is-verplicht',
+                {},
+                [HET_ARCHIEF]
+            )),
 			titleType: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___titel-grootte',
@@ -66,22 +62,20 @@ export const MAINTAINERS_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig
 					options: GET_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			subtitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___subtitel',
-					{},
-					[HET_ARCHIEF]
-				),
-				editorType: ContentBlockEditor.TextInput,
-			}),
-			buttonLabel: {
+			subtitle: TEXT_FIELD({
+                label: tText(
+                    'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___subtitel',
+                    {},
+                    [HET_ARCHIEF]
+                ),
+            }),
+			buttonLabel: TEXT_FIELD({
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___link-tekst',
 					{},
 					[HET_ARCHIEF]
 				),
-				editorType: ContentBlockEditor.TextInput,
-			},
+			}),
 			buttonAction: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___link-actie',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts
index 68b0b99a0..6ebccdc64 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts
@@ -89,53 +89,44 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 				fieldsToResetOnChange: ['startCuePoint', 'endCuePoint'],
 			},
-			startCuePoint: TEXT_FIELD(
-				tText(
-					'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-is-verplicht',
-					{},
-					[AVO]
-				),
-				{
-					label: tText(
-						'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-seconden',
-						{},
-						[AVO]
-					),
-					editorType: ContentBlockEditor.TextInput,
-					editorProps: {
-						type: 'number',
-					},
-					isVisible: cuePointsIsVisible,
-				}
-			),
-			endCuePoint: TEXT_FIELD(
-				tText(
-					'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-is-verplicht',
-					{},
-					[AVO]
-				),
-				{
-					label: tText(
-						'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-seconden',
-						{},
-						[AVO]
-					),
-					editorType: ContentBlockEditor.TextInput,
-					editorProps: {
-						type: 'number',
-					},
-					isVisible: cuePointsIsVisible,
-				}
-			),
-			mediaItemLabel: TEXT_FIELD(undefined, {
-				label: tText(
-					'modules/content-page/components/blocks/block-media-grid/block-media-grid___alternatieve-titel',
-					{},
-					[AVO]
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			startCuePoint: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-seconden',
+                    {},
+                    [AVO]
+                ),
+                editorProps: {
+                    type: 'number',
+                },
+                isVisible: cuePointsIsVisible,
+            }, tText(
+                'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-is-verplicht',
+                {},
+                [AVO]
+            )),
+			endCuePoint: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-seconden',
+                    {},
+                    [AVO]
+                ),
+                editorProps: {
+                    type: 'number',
+                },
+                isVisible: cuePointsIsVisible,
+            }, tText(
+                'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-is-verplicht',
+                {},
+                [AVO]
+            )),
+			mediaItemLabel: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/block-media-grid/block-media-grid___alternatieve-titel',
+                    {},
+                    [AVO]
+                ),
+                validator: undefined,
+            }),
 			copyrightImage: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-media-grid/block-media-grid___afbeelding',
@@ -179,18 +170,16 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					return errorArray;
 				},
 			},
-			buttonLabel: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___knop-tekst', {}, [AVO]),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
-					AVO,
-				]),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			buttonLabel: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___knop-tekst', {}, [AVO]),
+                validator: undefined,
+            }),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
+                    AVO,
+                ]),
+                validator: undefined,
+            }),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/media-grid___knop-icoon', {}, [AVO]),
 				editorType: ContentBlockEditor.IconPicker,
@@ -214,13 +203,12 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	block: {
 		state: INITIAL_MEDIA_GRID_BLOCK_STATE(),
 		fields: {
-			title: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___algemene-titel', {}, [
-					AVO,
-				]),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			title: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___algemene-titel', {}, [
+                    AVO,
+                ]),
+                validator: undefined,
+            }),
 			titleType: {
 				label: tText(
 					'modules/content-page/components/blocks/block-media-grid/block-media-grid___stijl',
@@ -232,22 +220,20 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: GET_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			buttonLabel: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-grid___algemene-knop-tekst',
-					{},
-					[AVO]
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
-					AVO,
-				]),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			buttonLabel: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-grid___algemene-knop-tekst',
+                    {},
+                    [AVO]
+                ),
+                validator: undefined,
+            }),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
+                    AVO,
+                ]),
+                validator: undefined,
+            }),
 			buttonAction: {
 				label: tText(
 					'admin/content-block/helpers/generators/media-grid___algemene-knop-actie',
@@ -326,11 +312,10 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 						(component) => component.mediaItem?.type === 'ITEM_WITH_CUE_POINTS'
 					),
 			},
-			ctaTitle: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___cta-titel', {}, [AVO]),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			ctaTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___cta-titel', {}, [AVO]),
+                validator: undefined,
+            }),
 			ctaTitleColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/media-grid___cta-titel-kleur', {}, [AVO])
 			),
@@ -350,34 +335,32 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: GET_FULL_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			ctaContent: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___cta-omschrijving', {}, [
-					AVO,
-				]),
-				editorType: ContentBlockEditor.TextArea,
-				validator: undefined,
-			}),
+			ctaContent: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___cta-omschrijving', {}, [
+                    AVO,
+                ]),
+                editorType: ContentBlockEditor.TextArea,
+                validator: undefined,
+            }),
 			ctaContentColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/media-grid___cta-omschrijving-kleur', {}, [
 					AVO,
 				])
 			),
-			ctaButtonLabel: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/media-grid___cta-knop-tekst', {}, [
-					AVO,
-				]),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			ctaButtonAltTitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-grid___alt-button-title-text',
-					{},
-					[AVO]
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			ctaButtonLabel: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/media-grid___cta-knop-tekst', {}, [
+                    AVO,
+                ]),
+                validator: undefined,
+            }),
+			ctaButtonAltTitle: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-grid___alt-button-title-text',
+                    {},
+                    [AVO]
+                ),
+                validator: undefined,
+            }),
 			ctaButtonIcon: {
 				label: tText('admin/content-block/helpers/generators/media-grid___cta-knop-icoon', {}, [
 					AVO,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts
index b7f41af2d..a7fba42cb 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts
@@ -39,21 +39,17 @@ export const OVERVIEW_NEWSPAPER_TITLES_BLOCK_CONFIG = (position = 0): ContentBlo
 	components: {
 		state: INITIAL_OVERVIEW_NEWSPAPER_TITLES_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(
-				tText(
-					'modules/content-page/components/blocks/overview-newspaper-titles___is-verplicht',
-					undefined,
-					[HET_ARCHIEF]
-				),
-				{
-					label: tText(
-						'modules/content-page/components/blocks/overview-newspaper-titles___titel',
-						undefined,
-						[HET_ARCHIEF]
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			title: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/overview-newspaper-titles___titel',
+                    undefined,
+                    [HET_ARCHIEF]
+                ),
+            }, tText(
+                'modules/content-page/components/blocks/overview-newspaper-titles___is-verplicht',
+                undefined,
+                [HET_ARCHIEF]
+            )),
 			titleType: {
 				label: tText(
 					'modules/content-page/components/blocks/overview-newspaper-titles___titel-grootte',
@@ -76,29 +72,24 @@ export const OVERVIEW_NEWSPAPER_TITLES_BLOCK_CONFIG = (position = 0): ContentBlo
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD(
-				tText(
-					'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knoptekst-is-verplicht',
-					undefined,
-					[HET_ARCHIEF]
-				),
-				{
-					label: tText(
-						'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knop-tekst',
-						undefined,
-						[HET_ARCHIEF]
-					),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___alternative',
-					undefined,
-					[HET_ARCHIEF]
-				),
-				editorType: ContentBlockEditor.TextInput,
-			}),
+			buttonLabel: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knop-tekst',
+                    undefined,
+                    [HET_ARCHIEF]
+                ),
+            }, tText(
+                'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knoptekst-is-verplicht',
+                undefined,
+                [HET_ARCHIEF]
+            )),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText(
+                    'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___alternative',
+                    undefined,
+                    [HET_ARCHIEF]
+                ),
+            }),
 			buttonIcon: {
 				label: tText(
 					'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knop-icoon',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts
index b40ddaaa1..832febdf4 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts
@@ -19,7 +19,7 @@ import {
 	BACKGROUND_COLOR_FIELD,
 	BLOCK_FIELD_DEFAULTS,
 	BLOCK_STATE_DEFAULTS,
-	CONTENT_TYPE_AND_LABELS_INPUT,
+	CONTENT_TYPE_AND_LABELS_INPUT, TEXT_FIELD,
 } from '../defaults';
 
 export const INITIAL_PAGE_OVERVIEW_COMPONENTS_STATE =
@@ -170,16 +170,16 @@ export const PAGE_OVERVIEW_BLOCK_CONFIG = (position = 0): ContentBlockConfig =>
 						);
 					},
 				},
-				buttonLabel: {
+				buttonLabel: TEXT_FIELD({
 					label: tText(
 						'admin/content-block/helpers/generators/page-overview___label-voor-de-button-lijst-item'
 					),
-					editorType: ContentBlockEditor.TextInput,
-				},
-				buttonAltTitle: {
+					validator: undefined
+				}),
+				buttonAltTitle: TEXT_FIELD({
 					label: tText('admin/content-block/helpers/generators/page-overview___alt-title-text'),
-					editorType: ContentBlockEditor.TextInput,
-				},
+					validator: undefined
+				}),
 				itemsPerPage: {
 					label: tText('admin/content-block/helpers/generators/page-overview___items-per-pagina'),
 					editorType: ContentBlockEditor.MultiRange,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts
index 544b35352..d8043a61e 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts
@@ -30,23 +30,17 @@ export const QUOTE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_QUOTE_COMPONENTS_STATE(),
 		fields: {
-			quote: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/quote___quote-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/quote___quote'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
-			authorName: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/quote___auteur'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
-			authorInitials: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/quote___initialen'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			quote: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/quote___quote'),
+            }, tText('admin/content-block/helpers/generators/quote___quote-is-verplicht')),
+			authorName: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/quote___auteur'),
+                validator: undefined,
+            }, undefined),
+			authorInitials: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/quote___initialen'),
+                validator: undefined,
+            }, undefined),
 			authorImage: FILE_FIELD(
 				tText('admin/content-block/helpers/generators/image___een-afbeelding-is-verplicht'),
 				{
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts
index 8a5ad7698..7a524ba24 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts
@@ -34,15 +34,13 @@ export const RICH_TEXT_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		},
 		state: INITIAL_RICH_TEXT_COMPONENTS_STATE(),
 		fields: {
-			content: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/rich-text___tekst-is-verplicht'),
-				{
-					editorProps: {
-						controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
-						fileType: 'CONTENT_BLOCK_IMAGE',
-					},
-				}
-			),
+			content: TEXT_FIELD({
+				editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
+				editorProps: {
+					controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
+					fileType: 'CONTENT_BLOCK_IMAGE',
+				},
+			}, tText('admin/content-block/helpers/generators/rich-text___tekst-is-verplicht')),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts
index c94436a3f..0e03e6920 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts
@@ -53,17 +53,15 @@ export const RICH_TEXT_TWO_COLUMNS_BLOCK_CONFIG = (position = 0): ContentBlockCo
 		state: INITIAL_RICH_TEXT_TWO_COLUMNS_COMPONENTS_STATE(),
 		fields: {
 			content: {
-				...TEXT_FIELD(
-					tText(
-						'admin/content-block/helpers/generators/rich-text-two-columns___tekst-is-verplicht'
-					),
-					{
-						editorProps: {
-							controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
-							fileType: 'CONTENT_BLOCK_IMAGE',
-						},
-					}
-				),
+				...TEXT_FIELD({
+					editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
+					editorProps: {
+						controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
+						fileType: 'CONTENT_BLOCK_IMAGE',
+					},
+				}, tText(
+					'admin/content-block/helpers/generators/rich-text-two-columns___tekst-is-verplicht'
+				)),
 			},
 			buttons: {
 				label: tText('admin/content-block/helpers/generators/rich-text-two-columns___knop'),
@@ -75,20 +73,15 @@ export const RICH_TEXT_TWO_COLUMNS_BLOCK_CONFIG = (position = 0): ContentBlockCo
 							options: AdminConfigManager.getConfig().components.buttonTypes(),
 						},
 					},
-					label: TEXT_FIELD(
-						tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht'),
-						{
-							label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-							editorType: ContentBlockEditor.TextInput,
-						}
-					),
-					altTitle: TEXT_FIELD(undefined, {
+					label: TEXT_FIELD({
+						label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+					}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
+					altTitle: TEXT_FIELD({
 						label: tText(
 							'admin/content-block/helpers/generators/rich-text-two-columns___alt-title-text'
 						),
-						editorType: ContentBlockEditor.TextInput,
 						validator: undefined,
-					}),
+					}, undefined),
 					icon: {
 						label: tText('admin/content-block/helpers/generators/buttons___icoon'),
 						editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts
index ae54318ad..a806b7347 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts
@@ -59,13 +59,12 @@ export const PROJECTS_SPOTLIGHT_BLOCK_CONFIG = (position = 0): ContentBlockConfi
 				} as FileUploadProps,
 				validator: undefined,
 			}),
-			customTitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/project-spotlight___aangepaste-titel-optioneel'
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			customTitle: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/project-spotlight___aangepaste-titel-optioneel'
+                ),
+                validator: undefined,
+            }),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts
index cb6c5244c..4eaf84b63 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts
@@ -50,11 +50,10 @@ export const SPOTLIGHT_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					} as FileUploadProps,
 				}
 			),
-			title: TEXT_FIELD(undefined, {
-				label: tText('admin/content-block/helpers/generators/spotlight___titel'),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
-			}),
+			title: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/spotlight___titel'),
+                validator: undefined,
+            }, undefined),
 			buttonAction: {
 				label: tText('admin/content-block/helpers/generators/spotlight___link'),
 				editorType: ContentBlockEditor.ContentPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts
index 7128acb03..9cc70ce2e 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts
@@ -25,13 +25,9 @@ export const TAGS_WITH_LINK_BLOCK_CONFIG = (position = 0): ContentBlockConfig =>
 		state: INITIAL_TAGS_WITH_LINK_COMPONENTS_STATE(),
 		name: tText('admin/content-block/helpers/generators/tag-with-link___tag'),
 		fields: {
-			label: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/tag-with-link___label-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/tag-with-link___label'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			label: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/tag-with-link___label'),
+            }, tText('admin/content-block/helpers/generators/tag-with-link___label-is-verplicht')),
 			link: {
 				label: tText('admin/content-block/helpers/generators/tag-with-link___link'),
 				editorType: ContentBlockEditor.ContentPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts
index a24a9fa9e..480d0f5ee 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts
@@ -44,15 +44,11 @@ export const THREE_CLICKABLE_TILES_BLOCK_CONFIG = (position = 0): ContentBlockCo
 					editorProps: { assetType: 'CONTENT_BLOCK_IMAGE' } as FileUploadProps,
 				}
 			),
-			title: TEXT_FIELD(
-				tText(
-					'admin/content-block/helpers/generators/three-clickable-tiles___subtitel-is-verplicht'
-				),
-				{
-					label: tText('admin/content-block/helpers/generators/three-clickable-tiles___subtitel'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			title: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/three-clickable-tiles___subtitel'),
+            }, tText(
+                'admin/content-block/helpers/generators/three-clickable-tiles___subtitel-is-verplicht'
+            )),
 			titleType: {
 				label: tText('admin/content-block/helpers/generators/heading___type'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts
index fc755ad26..1526726ea 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts
@@ -36,22 +36,18 @@ export const UITGEKLAARD_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		},
 		state: INITIAL_UITGEKLAARD_COMPONENTS_STATE(),
 		fields: {
-			titles: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/uitgeklaard___titel-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/uitgeklaard___titel'),
-					editorType: ContentBlockEditor.TextInput,
-					repeat: {
-						defaultState: '',
-						addButtonLabel: tText(
-							'admin/content-block/helpers/generators/uitgeklaard___voeg-titel-toe'
-						),
-						deleteButtonLabel: tText(
-							'admin/content-block/helpers/generators/uitgeklaard___verwijder-titel'
-						),
-					},
-				}
-			) as ContentBlockField,
+			titles: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/uitgeklaard___titel'),
+                repeat: {
+                    defaultState: '',
+                    addButtonLabel: tText(
+                        'admin/content-block/helpers/generators/uitgeklaard___voeg-titel-toe'
+                    ),
+                    deleteButtonLabel: tText(
+                        'admin/content-block/helpers/generators/uitgeklaard___verwijder-titel'
+                    ),
+                },
+            }, tText('admin/content-block/helpers/generators/uitgeklaard___titel-is-verplicht')) as ContentBlockField,
 			date: {
 				label: tText(
 					'modules/content-page/components/blocks/block-uitgeklaard/block-uitgeklaard___datum',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts
index b29cba592..b8cf4a464 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts
@@ -37,28 +37,26 @@ export const MEDIA_PLAYER_BLOCK_CONFIG = (position = 0): ContentBlockConfig => (
 	components: {
 		state: INITIAL_MEDIA_PLAYER_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-player___toegankelijkheidstitel'
-				),
-				validator: undefined,
-				editorType: ContentBlockEditor.TextInput,
-			}),
+			title: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-player___toegankelijkheidstitel'
+                ),
+                validator: undefined,
+            }),
 			item: ITEM_PICKER_FIELD(undefined, {
 				validator: undefined,
 			}),
-			src: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-player___eigen-video-url-van-flowplayer-com-optioneel'
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: validateFlowplayerVideoUrl,
-				editorProps: {
-					placeholder: tText(
-						'admin/content-block/helpers/generators/media-player___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
-					),
-				} as TextInputProps,
-			}),
+			src: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-player___eigen-video-url-van-flowplayer-com-optioneel'
+                ),
+                validator: validateFlowplayerVideoUrl,
+                editorProps: {
+                    placeholder: tText(
+                        'admin/content-block/helpers/generators/media-player___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
+                    ),
+                } as TextInputProps,
+            }),
 			poster: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-video/block-video___poster'
@@ -73,20 +71,18 @@ export const MEDIA_PLAYER_BLOCK_CONFIG = (position = 0): ContentBlockConfig => (
 					),
 				} as CheckboxProps,
 			},
-			annotationTitle: {
+			annotationTitle: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-video/block-video___bijschift-titel'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			},
-			annotationText: {
+			}),
+			annotationText: TEXT_FIELD({
 				label: tText(
 					'modules/content-page/components/blocks/block-video/block-video___bijschrift-beschrijving'
 				),
-				editorType: ContentBlockEditor.TextInput,
 				validator: undefined,
-			},
+			}),
 			width: {
 				label: tText('admin/content-block/helpers/generators/media-player___breedte'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts
index 7186ce32e..03e95c382 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts
@@ -42,25 +42,24 @@ export const MEDIA_PLAYER_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): Conte
 	components: {
 		state: INITIAL_MEDIA_PLAYER_TITLE_TEXT_BUTTON_COMPONENTS_STATE(),
 		fields: {
-			mediaTitle: {
+			mediaTitle: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/generators/media-player-title-text-button___video-of-audio-item-toegankelijkheidstitel'
 				),
-				editorType: ContentBlockEditor.TextInput,
-			},
-			mediaItem: ITEM_PICKER_FIELD(),
-			mediaSrc: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-player-title-text-button___eigen-video-url-van-flowplayer-com-optioneel'
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: validateFlowplayerVideoUrl,
-				editorProps: {
-					placeholder: tText(
-						'admin/content-block/helpers/generators/media-player-title-text-button___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
-					),
-				} as TextInputProps,
+				validator: undefined
 			}),
+			mediaItem: ITEM_PICKER_FIELD(),
+			mediaSrc: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-player-title-text-button___eigen-video-url-van-flowplayer-com-optioneel'
+                ),
+                validator: validateFlowplayerVideoUrl,
+                editorProps: {
+                    placeholder: tText(
+                        'admin/content-block/helpers/generators/media-player-title-text-button___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
+                    ),
+                } as TextInputProps,
+            }, undefined),
 			mediaPoster: {
 				label: tText(
 					'admin/content-block/helpers/generators/media-player-title-text-button___eigen-poster-uploaden-optioneel'
@@ -83,13 +82,9 @@ export const MEDIA_PLAYER_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): Conte
 					),
 				} as CheckboxProps,
 			},
-			headingTitle: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/heading___titel-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/heading___titel'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			headingTitle: TEXT_FIELD({
+                label: tText('admin/content-block/helpers/generators/heading___titel'),
+            }, tText('admin/content-block/helpers/generators/heading___titel-is-verplicht')),
 			headingType: {
 				label: tText('admin/content-block/helpers/generators/heading___stijl'),
 				editorType: ContentBlockEditor.Select,
@@ -105,17 +100,16 @@ export const MEDIA_PLAYER_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): Conte
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: {
+			buttonLabel: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
-				editorType: ContentBlockEditor.TextInput,
-			},
-			buttonAltTitle: TEXT_FIELD(undefined, {
-				label: tText(
-					'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
-				),
-				editorType: ContentBlockEditor.TextInput,
-				validator: undefined,
+				validator: undefined
 			}),
+			buttonAltTitle: TEXT_FIELD({
+                label: tText(
+                    'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
+                ),
+                validator: undefined,
+            }, undefined),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/ctas___knop-icoon'),
 				editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts b/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts
index 1ac3bc892..66ba75e5d 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts
@@ -35,13 +35,9 @@ export const ANCHOR_LINKS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => (
 		name: tText('admin/content-block/helpers/generators/anchor-links___link'),
 		state: INITIAL_ANCHOR_LINKS_COMPONENTS_STATE(),
 		fields: {
-			label: TEXT_FIELD(
-				tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht'),
-				{
-					label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-					editorType: ContentBlockEditor.TextInput,
-				}
-			),
+			label: TEXT_FIELD({
+				label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+			}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
 			type: {
 				label: tText('admin/content-block/helpers/generators/anchor-links___kleur'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts b/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts
index cb3085fe4..dc091f040 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts
@@ -64,8 +64,9 @@ export const BLOCK_FIELD_DEFAULTS = () => ({
 	),
 
 	// Used to link to this block from inside the same page using the anchors-block
-	anchor: INPUT_FIELD({
+	anchor: TEXT_FIELD({
 		label: tText('admin/content-block/helpers/generators/defaults___anchor-id'),
+		validator: undefined
 	}),
 });
 
@@ -143,11 +144,11 @@ export const ALIGN_FIELD = (label: string): ContentBlockField => ({
 });
 
 export const TEXT_FIELD = (
-	emptyFieldValidatorMessage?: string,
-	propOverride?: Partial<ContentBlockField>
+	propOverride?: Partial<ContentBlockField>,
+	emptyFieldValidatorMessage?: string
 ): ContentBlockField => ({
 	label: tText('admin/content-block/helpers/generators/defaults___tekst'),
-	editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
+	editorType: ContentBlockEditor.TextInput, // Default text input type. also supported: textarea and rich text editor
 	validator: (value: string) => {
 		const errorArray: string[] = [];
 
@@ -167,12 +168,6 @@ export const TEXT_FIELD = (
 	...propOverride,
 });
 
-export const INPUT_FIELD = (propOverride?: Partial<ContentBlockField>): ContentBlockField => ({
-	label: tText('admin/content-block/helpers/generators/defaults___tekst'),
-	editorType: ContentBlockEditor.TextInput,
-	...propOverride,
-});
-
 export const FILE_FIELD = (
 	emptyFieldValidatorMessage = tText(
 		'admin/content-block/helpers/generators/defaults___een-bestand-is-verplicht'
diff --git a/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx b/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx
index 49ed7db22..c8d3e61ef 100644
--- a/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx
+++ b/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx
@@ -435,9 +435,7 @@ const MaintenanceAlertsEditForm: FunctionComponent<MaintenanceAlertsEditFormProp
 					onBlur={isFormValid}
 					onChange={handleNewFromDate}
 					selected={
-						currentMaintenanceAlert?.fromDate
-							? new Date(currentMaintenanceAlert.fromDate)
-							: null
+						currentMaintenanceAlert?.fromDate ? new Date(currentMaintenanceAlert.fromDate) : null
 					}
 				/>
 
@@ -482,9 +480,7 @@ const MaintenanceAlertsEditForm: FunctionComponent<MaintenanceAlertsEditFormProp
 					onBlur={isFormValid}
 					onChange={handleNewUntilDate}
 					selected={
-						currentMaintenanceAlert?.untilDate
-							? new Date(currentMaintenanceAlert.untilDate)
-							: null
+						currentMaintenanceAlert?.untilDate ? new Date(currentMaintenanceAlert.untilDate) : null
 					}
 				/>
 

From 7004ad9cc0df3334aff4dcdfa190b370c0a4193e Mon Sep 17 00:00:00 2001
From: Bert Verhelst <verhelstbert@gmail.com>
Date: Tue, 30 Jun 2026 11:32:29 +0200
Subject: [PATCH 2/2] feat(ARC-3762): remove some optional undefined, fix
 linting

https://meemoo.atlassian.net/browse/ARC-3762
---
 .../ContentEditForm/ContentEditForm.tsx       |  10 +-
 .../BlockAvoHero/BlockAvoHero.editorconfig.ts |  23 ++-
 ...lockAvoImageTextBackground.editorconfig.ts |  19 +-
 .../BlockBreadcrumbs.editorconfig.ts          |   2 +-
 .../BlockButtons/BlockButtons.editorconfig.ts |   9 +-
 .../BlockCTAs/BlockCTAs.editorconfig.ts       |  20 +-
 ...ockCardsWithoutDescription.editorconfig.ts |  17 +-
 .../BlockContentEnclose.editorconfig.ts       |  19 +-
 .../BlockEventbrite.editorconfig.ts           |  15 +-
 .../BlockHeading/BlockHeading.editorconfig.ts |   9 +-
 ...lockHetArchiefHeaderSearch.editorconfig.ts |  70 +++----
 ...ArchiefImageTextBackground.editorconfig.ts |  26 +--
 .../BlockIFrame/BlockIFrame.editorconfig.ts   |  20 +-
 .../BlockImage/BlockImage.editorconfig.ts     |  17 +-
 .../BlockImageGrid.editorconfig.ts            |  30 +--
 .../BlockLogoGrid.editorconfig.ts             |   6 +-
 .../BlockUspGrid.editorconfig.ts              |  26 +--
 .../BlockImageTitleTextButton.editorconfig.ts |  26 +--
 .../BlockIntro/BlockIntro.editorconfig.ts     |  26 ++-
 .../BlockKlaar/BlockKlaar.editorconfig.ts     |  33 ++--
 .../BlockMaintainersGrid.editorconfig.ts      |  37 ++--
 .../BlockMediaGrid.editorconfig.ts            | 172 +++++++++---------
 .../BlockOverviewNewspaperTitles.tsx          |   2 +-
 .../overviewNewspaperTitles.editorconfig.ts   |  62 ++++---
 .../BlockPageOverview.editorconfig.ts         |   7 +-
 .../BlockQuote/BlockQuote.editorconfig.ts     |  23 ++-
 .../BlockRichText.editorconfig.ts             |  15 +-
 .../BlockRichTextTwoColumns.editorconfig.ts   |  22 ++-
 .../BlockProjectSpotlight.editorconfig.ts     |  10 +-
 .../BlockSpotlight.editorconfig.ts            |   6 +-
 .../BlockTagsWithLink.editorconfig.ts         |   9 +-
 .../BlockThreeClickableTiles.editorconfig.ts  |  13 +-
 .../BlockUitgeklaard.editorconfig.ts          |  27 +--
 .../BlockVideo/BlockVideo.editorconfig.ts     |  30 +--
 .../BlockVideoTitleTextButton.editorconfig.ts |  43 +++--
 .../components/blocks/anchor-links.ts         |   9 +-
 .../components/blocks/defaults.ts             |   2 +-
 .../views/ContentPageOverview.tsx             |   2 +-
 .../views/MaintenanceAlertsEditForm.tsx       |   2 +-
 .../components/FilterTable/FilterTable.tsx    |   1 -
 .../modules/shared/helpers/sanitize/index.ts  |   4 +-
 .../user-group/views/UserGroupOverview.tsx    |   3 +-
 .../render-user-overview-table-cells.tsx      |   2 +
 .../modules/user/views/UserOverview.tsx       |   3 +-
 44 files changed, 508 insertions(+), 421 deletions(-)

diff --git a/ui/src/react-admin/modules/content-page/components/ContentEditForm/ContentEditForm.tsx b/ui/src/react-admin/modules/content-page/components/ContentEditForm/ContentEditForm.tsx
index 9d88e148f..671f7ee48 100644
--- a/ui/src/react-admin/modules/content-page/components/ContentEditForm/ContentEditForm.tsx
+++ b/ui/src/react-admin/modules/content-page/components/ContentEditForm/ContentEditForm.tsx
@@ -529,7 +529,7 @@ export const ContentEditForm: FunctionComponent<ContentEditFormProps> = ({
 				<Column size="5">{renderSeoImageField()}</Column>
 				<Column size="7">{renderTitleField()}</Column>
 				<Column size="5">
-					{/* Empty for keeping the area next to title empty */}
+					{/** biome-ignore lint/complexity/noUselessFragments: Empty for keeping the area next to title empty */}
 					<>&nbsp;</>
 				</Column>
 				<Column size="7">{renderDescriptionField()}</Column>
@@ -541,14 +541,14 @@ export const ContentEditForm: FunctionComponent<ContentEditFormProps> = ({
 					<>
 						<Column size="7">{renderIsProtectedField()}</Column>
 						<Column size="5">
-							{/* Empty for keeping the area next to title empty */}
+							{/** biome-ignore lint/complexity/noUselessFragments: Empty for keeping the area next to title empty */}
 							<>&nbsp;</>
 						</Column>
 					</>
 				)}
 				<Column size="7">{renderPathField()}</Column>
 				<Column size="5">
-					{/* Empty for keeping the area next to title empty */}
+					{/** biome-ignore lint/complexity/noUselessFragments: Empty for keeping the area next to title empty */}
 					<>&nbsp;</>
 				</Column>
 				{commonUser?.permissions?.includes(PermissionName.EDIT_CONTENT_PAGE_AUTHOR) &&
@@ -556,7 +556,7 @@ export const ContentEditForm: FunctionComponent<ContentEditFormProps> = ({
 						<>
 							<Column size="7">{renderAuthorField()}</Column>
 							<Column size="5">
-								{/* Empty for keeping the area next to title empty */}
+								{/** biome-ignore lint/complexity/noUselessFragments: Empty for keeping the area next to title empty */}
 								<>&nbsp;</>
 							</Column>
 						</>
@@ -567,7 +567,7 @@ export const ContentEditForm: FunctionComponent<ContentEditFormProps> = ({
 					{renderLabelsField()}
 				</Column>
 				<Column size="5">
-					{/* Empty for keeping the area next to title empty */}
+					{/** biome-ignore lint/complexity/noUselessFragments: Empty for keeping the area next to title empty */}
 					<>&nbsp;</>
 				</Column>
 				{isMultiLanguageEnabled() && <Column size="7">{renderLanguageField()}</Column>}
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts
index a50e99dae..b5654e50d 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoHero/BlockAvoHero.editorconfig.ts
@@ -58,7 +58,7 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 			title: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/hero___titel', {}, [AVO]),
 				validator: undefined,
-			}, undefined),
+			}),
 			titleColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/hero___titel-kleur', {}, [AVO])
 			),
@@ -66,7 +66,7 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				label: tText('admin/content-block/helpers/generators/hero___beschrijving', {}, [AVO]),
 				editorType: ContentBlockEditor.TextArea,
 				validator: undefined,
-			}, undefined),
+			}),
 			contentColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/hero___beschrijving-kleur', {}, [AVO])
 			),
@@ -81,15 +81,18 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 							options: AdminConfigManager.getConfig().components.buttonTypes(),
 						},
 					},
-					label: TEXT_FIELD({
-						label: tText('admin/content-block/helpers/generators/buttons___tekst', {}, [AVO]),
-					}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht', {}, [
-						AVO,
-					])),
+					label: TEXT_FIELD(
+						{
+							label: tText('admin/content-block/helpers/generators/buttons___tekst', {}, [AVO]),
+						},
+						tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht', {}, [
+							AVO,
+						])
+					),
 					altTitle: TEXT_FIELD({
 						label: tText('admin/content-block/helpers/generators/hero___alt-title-text'),
 						validator: undefined,
-					}, undefined),
+					}),
 					icon: {
 						label: tText('admin/content-block/helpers/generators/buttons___icoon', {}, [AVO]),
 						editorType: ContentBlockEditor.IconPicker,
@@ -125,7 +128,7 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					controls: RICH_TEXT_EDITOR_OPTIONS_FULL,
 				},
 				validator: undefined,
-			}, undefined),
+			}),
 			src: TEXT_FIELD({
 				label: tText(
 					'admin/content-block/helpers/generators/hero___eigen-video-url-van-flowplayer-com',
@@ -140,7 +143,7 @@ export const AVO_HERO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 						[AVO]
 					),
 				} as TextInputProps,
-			}, undefined),
+			}),
 			poster: FILE_FIELD(undefined, {
 				label: tText('admin/content-block/helpers/generators/hero___eigen-poster-uploaden', {}, [
 					AVO,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts
index 2ae3fe688..dbc8a73dd 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockAvoImageTextBackground/BlockAvoImageTextBackground.editorconfig.ts
@@ -59,14 +59,17 @@ export const AVO_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (position = 0): ContentBlo
 	components: {
 		state: INITIAL_AVO_IMAGE_TEXT_BACKGROUND_COMPONENTS_STATE(),
 		fields: {
-			heading: TEXT_FIELD({
-				label: tText(
-					'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
-				),
-				validator: undefined,
-			}, tText(
-				'admin/content-block/helpers/image-text-background/image-text-background___titel-is-verplicht'
-			)),
+			heading: TEXT_FIELD(
+				{
+					label: tText(
+						'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
+					),
+					validator: undefined,
+				},
+				tText(
+					'admin/content-block/helpers/image-text-background/image-text-background___titel-is-verplicht'
+				)
+			),
 			headingType: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___titel-stijl'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts
index 833e92cec..4186f0609 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockBreadcrumbs/BlockBreadcrumbs.editorconfig.ts
@@ -1,5 +1,5 @@
 import type { AvoCoreContentPickerType } from '@viaa/avo2-types';
-import {BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS, TEXT_FIELD} from '~content-blocks/defaults';
+import { BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS, TEXT_FIELD } from '~content-blocks/defaults';
 import { GET_FOREGROUND_COLOR_OPTIONS_ARCHIEF } from '~modules/content-page/const/get-color-options';
 import type {
 	ContentBlockConfig,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts
index 99a1f3d6f..5fb34b71a 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockButtons/BlockButtons.editorconfig.ts
@@ -44,9 +44,12 @@ export const BUTTONS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			label: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-			}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
+			label: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+				},
+				tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')
+			),
 			altTitle: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/buttons___alt-title-text'),
 				validator: undefined,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts
index 0f8ff048b..eb2a006b0 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockCTAs/BlockCTAs.editorconfig.ts
@@ -61,14 +61,17 @@ export const CTAS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: GET_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			heading: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/ctas___titel-tekst'),
-			}, tText('admin/content-block/helpers/generators/ctas___titel-is-verplicht')),
+			heading: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/ctas___titel-tekst'),
+				},
+				tText('admin/content-block/helpers/generators/ctas___titel-is-verplicht')
+			),
 			headingColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/ctas___titel-kleur')
 			),
 			content: TEXT_FIELD({
-				editorType: ContentBlockEditor.RICH_TEXT_EDITOR
+				editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
 			}),
 			contentColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/ctas___tekst-kleur')
@@ -80,9 +83,12 @@ export const CTAS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
-			}, tText('admin/content-block/helpers/generators/ctas___knoptekst-is-verplicht')),
+			buttonLabel: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
+				},
+				tText('admin/content-block/helpers/generators/ctas___knoptekst-is-verplicht')
+			),
 			buttonAltTitle: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/ctas___alt-button-text'),
 			}),
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts
index 9b3d830f4..129b58265 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockCardsWithoutDescription/BlockCardsWithoutDescription.editorconfig.ts
@@ -47,13 +47,16 @@ export const CARDS_WITHOUT_DESCRIPTION_BLOCK_CONFIG = (position = 0): ContentBlo
 			'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___card'
 		),
 		fields: {
-			title: TEXT_FIELD({
-				label: tText(
-					'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label'
-				),
-			}, tText(
-				'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label-is-verplicht'
-			)),
+			title: TEXT_FIELD(
+				{
+					label: tText(
+						'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label'
+					),
+				},
+				tText(
+					'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___label-is-verplicht'
+				)
+			),
 			image: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-cards-without-description/block-cards-without-description___image'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts
index 3521e7bc4..c23bbd0fc 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockContentEnclose/BlockContentEnclose.editorconfig.ts
@@ -49,13 +49,16 @@ export const CONTENT_ENCLOSE_BLOCK_CONFIG = (position = 0): ContentBlockConfig =
 	components: {
 		state: INITIAL_CONTENT_ENCLOSE_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD({
-				label: tText(
-					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___title',
-					undefined,
-					[HET_ARCHIEF]
-				),
-			}, tText('Titel is verplicht')),
+			title: TEXT_FIELD(
+				{
+					label: tText(
+						'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___title',
+						undefined,
+						[HET_ARCHIEF]
+					),
+				},
+				tText('Titel is verplicht')
+			),
 			titleType: {
 				label: tText(
 					'modules/content-page/components/blocks/block-content-enclose/block-content-enclose___titletype',
@@ -73,7 +76,7 @@ export const CONTENT_ENCLOSE_BLOCK_CONFIG = (position = 0): ContentBlockConfig =
 					undefined,
 					[HET_ARCHIEF]
 				),
-				validator: undefined
+				validator: undefined,
 			}),
 			buttonType: {
 				label: tText(
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts
index f1fda857f..967a3cb52 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockEventbrite/BlockEventbrite.editorconfig.ts
@@ -33,9 +33,9 @@ export const EVENTBRITE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		state: INITIAL_EVENTBRITE_COMPONENTS_STATE(),
 		fields: {
 			eventId: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/eventbrite___event-id'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/eventbrite___event-id'),
+				validator: undefined,
+			}),
 			type: {
 				label: tText('admin/content-block/helpers/generators/buttons___type'),
 				editorType: ContentBlockEditor.Select,
@@ -43,9 +43,12 @@ export const EVENTBRITE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			label: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-            }, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
+			label: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+				},
+				tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')
+			),
 			icon: {
 				label: tText('admin/content-block/helpers/generators/buttons___icoon'),
 				editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts
index f8a6c3866..d5cd9b352 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockHeading/BlockHeading.editorconfig.ts
@@ -36,9 +36,12 @@ export const HEADING_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_HEADING_COMPONENTS_STATE(),
 		fields: {
-			children: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/heading___titel'),
-            }, tText('admin/content-block/helpers/generators/heading___titel-is-verplicht')),
+			children: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/heading___titel'),
+				},
+				tText('admin/content-block/helpers/generators/heading___titel-is-verplicht')
+			),
 			color: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/heading___titel-kleur')
 			),
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts
index 0fd081db4..35ec40dfa 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefHeaderSearch/BlockHetArchiefHeaderSearch.editorconfig.ts
@@ -6,11 +6,7 @@ import type {
 	DefaultContentBlockState,
 	HetArchiefHeaderSearchBlockComponentState,
 } from '../../../types/content-block.types';
-import {
-	ContentBlockEditor,
-	ContentBlockType,
-	DEFAULT_BUTTON_PROPS,
-} from '../../../types/content-block.types';
+import { ContentBlockType, DEFAULT_BUTTON_PROPS } from '../../../types/content-block.types';
 import { BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS, TEXT_FIELD } from '../defaults';
 
 export const INITIAL_HET_ARCHIEF_HEADER_SEARCH_COMPONENTS_STATE =
@@ -34,17 +30,20 @@ export const HET_ARCHIEF_HEADER_SEARCH_BLOCK_CONFIG = (position = 0): ContentBlo
 	components: {
 		state: INITIAL_HET_ARCHIEF_HEADER_SEARCH_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD({
-                label: tText(
-                    'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___titel',
-                    {},
-                    [HET_ARCHIEF]
-                ),
-            }, tText(
-                'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___is-verplicht',
-                {},
-                [HET_ARCHIEF]
-            )),
+			title: TEXT_FIELD(
+				{
+					label: tText(
+						'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___titel',
+						{},
+						[HET_ARCHIEF]
+					),
+				},
+				tText(
+					'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___is-verplicht',
+					{},
+					[HET_ARCHIEF]
+				)
+			),
 			subtitles: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___animatie-teksten',
@@ -58,7 +57,7 @@ export const HET_ARCHIEF_HEADER_SEARCH_BLOCK_CONFIG = (position = 0): ContentBlo
 							{},
 							[HET_ARCHIEF]
 						),
-						validator: undefined
+						validator: undefined,
 					}),
 				},
 				type: 'fieldGroup',
@@ -77,23 +76,26 @@ export const HET_ARCHIEF_HEADER_SEARCH_BLOCK_CONFIG = (position = 0): ContentBlo
 				},
 			} as ContentBlockFieldGroup,
 			textBelowSearch: TEXT_FIELD({
-                label: tText(
-                    'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___tekst-onder-zoekveld',
-                    {},
-                    [HET_ARCHIEF]
-                ),
-            }),
-			searchAriaLabel: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-voor-zoekveld',
-                    {},
-                    [HET_ARCHIEF]
-                ),
-            }, tText(
-                'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-verplicht',
-                {},
-                [HET_ARCHIEF]
-            )),
+				label: tText(
+					'react-admin/modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___tekst-onder-zoekveld',
+					{},
+					[HET_ARCHIEF]
+				),
+			}),
+			searchAriaLabel: TEXT_FIELD(
+				{
+					label: tText(
+						'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-voor-zoekveld',
+						{},
+						[HET_ARCHIEF]
+					),
+				},
+				tText(
+					'modules/content-page/components/blocks/block-het-archief-header-search/block-het-archief-header-search___aria-label-verplicht',
+					{},
+					[HET_ARCHIEF]
+				)
+			),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts
index 23fa50624..0df73cf49 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockHetArchiefImageTextBackground/BlockHetArchiefImageTextBackground.editorconfig.ts
@@ -68,11 +68,11 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 		state: INITIAL_HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_COMPONENTS_STATE(),
 		fields: {
 			heading: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/image-text-background/image-text-background___titel-tekst'
+				),
+				validator: undefined,
+			}),
 			headingType: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___titel-stijl'
@@ -92,8 +92,8 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 				},
 			},
 			content: TEXT_FIELD({
-                validator: undefined,
-            }),
+				validator: undefined,
+			}),
 			textAlign: {
 				label: tText('admin/content-block/helpers/generators/image-grid___text-alignatie'),
 				editorType: ContentBlockEditor.Select,
@@ -167,14 +167,14 @@ export const HET_ARCHIEF_IMAGE_TEXT_BACKGROUND_BLOCK_CONFIG = (
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___knop-tekst'
 				),
-				validator: undefined
+				validator: undefined,
 			}),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/image-text-background/image-text-background___alt-title-text'
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/image-text-background/image-text-background___alt-title-text'
+				),
+				validator: undefined,
+			}),
 			buttonAction: {
 				label: tText(
 					'admin/content-block/helpers/image-text-background/image-text-background___knop-actie'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts
index 05b5f8003..8976dc227 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockIFrame/BlockIFrame.editorconfig.ts
@@ -4,7 +4,7 @@ import type {
 	DefaultContentBlockState,
 	IFrameBlockComponentState,
 } from '../../../types/content-block.types';
-import { ContentBlockEditor, ContentBlockType } from '../../../types/content-block.types';
+import { ContentBlockType } from '../../../types/content-block.types';
 
 import { BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS, TEXT_FIELD } from '../defaults';
 
@@ -28,12 +28,18 @@ export const IFRAME_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_IFRAME_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/iframe___titel'),
-			}, tText('admin/content-block/helpers/generators/iframe___titel-is-verplicht')),
-			src: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/iframe___url'),
-			}, tText('admin/content-block/helpers/generators/iframe___url-is-verplicht')),
+			title: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/iframe___titel'),
+				},
+				tText('admin/content-block/helpers/generators/iframe___titel-is-verplicht')
+			),
+			src: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/iframe___url'),
+				},
+				tText('admin/content-block/helpers/generators/iframe___url-is-verplicht')
+			),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts
index c6a11fe5d..2fab0ef41 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImage/BlockImage.editorconfig.ts
@@ -101,13 +101,16 @@ export const IMAGE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD({
-				label: tText(
-					'react-admin/modules/content-page/components/blocks/block-image/block-image___knop-tekst'
-				),
-			}, tText(
-				'react-admin/modules/content-page/components/blocks/block-image/block-image___knoptekst-is-verplicht'
-			)),
+			buttonLabel: TEXT_FIELD(
+				{
+					label: tText(
+						'react-admin/modules/content-page/components/blocks/block-image/block-image___knop-tekst'
+					),
+				},
+				tText(
+					'react-admin/modules/content-page/components/blocks/block-image/block-image___knoptekst-is-verplicht'
+				)
+			),
 			buttonAltTitle: TEXT_FIELD({
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-image/block-image___alt-knop-text'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts
index d964daac2..f8fe26295 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockImageGrid.editorconfig.ts
@@ -65,25 +65,25 @@ export const IMAGE_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				}
 			),
 			title: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___titel'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___titel'),
+				validator: undefined,
+			}),
 			text: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
+				validator: undefined,
+			}),
 			buttonLabel: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
+				validator: undefined,
+			}),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___alt-title-text'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___alt-title-text'),
+				validator: undefined,
+			}),
 			buttonTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
+				validator: undefined,
+			}),
 			buttonType: {
 				label: tText('admin/content-block/helpers/generators/image-grid___knop-type-kleur'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts
index 30ebc35ed..e0ac26c0d 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockLogoGrid.editorconfig.ts
@@ -51,9 +51,9 @@ export const LOGO_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		state: INITIAL_LOGO_GRID_COMPONENTS_STATE(),
 		fields: {
 			textAbove: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/logo-grid___tekst-boven-afbeelding'),
-                validator: undefined,
-            }, undefined),
+				label: tText('admin/content-block/helpers/generators/logo-grid___tekst-boven-afbeelding'),
+				validator: undefined,
+			}),
 			source: FILE_FIELD(
 				tText('admin/content-block/helpers/generators/image-grid___een-afbeelding-is-verplicht'),
 				{
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts
index d8675df69..9cdc8293a 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageGrid/BlockUspGrid.editorconfig.ts
@@ -59,19 +59,19 @@ export const USP_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				}
 			),
 			title: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___titel'),
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___titel'),
+			}),
 			text: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___tekst'),
+			}),
 			buttonLabel: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___knop-tekst'),
+				validator: undefined,
+			}),
 			buttonTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/image-grid___knop-tooltip'),
+				validator: undefined,
+			}),
 			buttonType: {
 				label: tText('admin/content-block/helpers/generators/image-grid___knop-type-kleur'),
 				editorType: ContentBlockEditor.Select,
@@ -81,9 +81,9 @@ export const USP_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				validator: undefined,
 			},
 			buttonAltTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/usp-grid___alt-title-text'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/usp-grid___alt-title-text'),
+				validator: undefined,
+			}),
 			action: {
 				label: tText('admin/content-block/helpers/generators/image-grid___link'),
 				editorType: ContentBlockEditor.ContentPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts
index fcdd885b1..9016dc148 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockImageTitleTextButton/BlockImageTitleTextButton.editorconfig.ts
@@ -51,11 +51,11 @@ export const IMAGE_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): ContentBlock
 				editorType: ContentBlockEditor.ContentPicker,
 			},
 			imageAlt: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/image-title-text-button___alt-tekst-voor-de-afbeelding'
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/image-title-text-button___alt-tekst-voor-de-afbeelding'
+				),
+				validator: undefined,
+			}),
 			imagePosition: {
 				label: tText(
 					'admin/content-block/helpers/generators/image-title-text-button___positie-van-de-afbeelding'
@@ -66,9 +66,9 @@ export const IMAGE_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): ContentBlock
 				},
 			},
 			headingTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/heading___titel'),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/heading___titel'),
+				validator: undefined,
+			}),
 			headingType: {
 				label: tText('admin/content-block/helpers/generators/heading___stijl'),
 				editorType: ContentBlockEditor.Select,
@@ -89,11 +89,11 @@ export const IMAGE_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): ContentBlock
 				validator: undefined,
 			}),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
+				),
+				validator: undefined,
+			}),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/ctas___knop-icoon'),
 				editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts
index 90d95193b..07eaae2ed 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockIntro/BlockIntro.editorconfig.ts
@@ -29,9 +29,12 @@ export const INTRO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_INTRO_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/intro___titel'),
-			}, tText('admin/content-block/helpers/generators/intro___titel-is-verplicht')),
+			title: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/intro___titel'),
+				},
+				tText('admin/content-block/helpers/generators/intro___titel-is-verplicht')
+			),
 			headingType: {
 				label: tText('admin/content-block/helpers/generators/heading___stijl'),
 				editorType: ContentBlockEditor.Select,
@@ -39,14 +42,17 @@ export const INTRO_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					options: GET_FULL_HEADING_TYPE_OPTIONS(),
 				},
 			},
-			content: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/defaults___tekst'),
-				editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
-				editorProps: {
-					controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL_WITHOUT_ALIGN, 'media'],
-					fileType: 'CONTENT_BLOCK_IMAGE',
+			content: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/defaults___tekst'),
+					editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
+					editorProps: {
+						controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL_WITHOUT_ALIGN, 'media'],
+						fileType: 'CONTENT_BLOCK_IMAGE',
+					},
 				},
-			}, tText('admin/content-block/helpers/generators/intro___tekst-is-verplicht')),
+				tText('admin/content-block/helpers/generators/intro___tekst-is-verplicht')
+			),
 			align: ALIGN_FIELD(tText('admin/content-block/helpers/generators/intro___uitlijning')),
 		},
 	},
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts
index edd73e68e..7722f3349 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockKlaar/BlockKlaar.editorconfig.ts
@@ -35,22 +35,25 @@ export const KLAAR_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		},
 		state: INITIAL_KLAAR_COMPONENTS_STATE(),
 		fields: {
-			titles: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/klaar___titel', {}, [AVO]),
-				repeat: {
-					defaultState: '',
-					addButtonLabel: tText(
-						'admin/content-block/helpers/generators/klaar___voeg-titel-toe',
-						{},
-						[AVO]
-					),
-					deleteButtonLabel: tText(
-						'admin/content-block/helpers/generators/klaar___verwijder-titel',
-						{},
-						[AVO]
-					),
+			titles: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/klaar___titel', {}, [AVO]),
+					repeat: {
+						defaultState: '',
+						addButtonLabel: tText(
+							'admin/content-block/helpers/generators/klaar___voeg-titel-toe',
+							{},
+							[AVO]
+						),
+						deleteButtonLabel: tText(
+							'admin/content-block/helpers/generators/klaar___verwijder-titel',
+							{},
+							[AVO]
+						),
+					},
 				},
-			}, tText('admin/content-block/helpers/generators/klaar___titel-is-verplicht', {}, [AVO])) as ContentBlockField,
+				tText('admin/content-block/helpers/generators/klaar___titel-is-verplicht', {}, [AVO])
+			) as ContentBlockField,
 			date: {
 				label: 'Datum',
 				editorType: ContentBlockEditor.DatePicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts
index ab07ff72e..dcfd7354f 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockMaintainersGrid/BlockMaintainersGrid.editorconfig.ts
@@ -40,17 +40,20 @@ export const MAINTAINERS_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig
 	components: {
 		state: INITIAL_MAINTAINERS_GRID_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD({
-                label: tText(
-                    'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___titel',
-                    {},
-                    [HET_ARCHIEF]
-                ),
-            }, tText(
-                'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___is-verplicht',
-                {},
-                [HET_ARCHIEF]
-            )),
+			title: TEXT_FIELD(
+				{
+					label: tText(
+						'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___titel',
+						{},
+						[HET_ARCHIEF]
+					),
+				},
+				tText(
+					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___is-verplicht',
+					{},
+					[HET_ARCHIEF]
+				)
+			),
 			titleType: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___titel-grootte',
@@ -63,12 +66,12 @@ export const MAINTAINERS_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig
 				},
 			},
 			subtitle: TEXT_FIELD({
-                label: tText(
-                    'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___subtitel',
-                    {},
-                    [HET_ARCHIEF]
-                ),
-            }),
+				label: tText(
+					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___subtitel',
+					{},
+					[HET_ARCHIEF]
+				),
+			}),
 			buttonLabel: TEXT_FIELD({
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-maintainers-grid/block-maintainers-grid___link-tekst',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts
index 6ebccdc64..1d63bf335 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockMediaGrid/BlockMediaGrid.editorconfig.ts
@@ -89,44 +89,50 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 				fieldsToResetOnChange: ['startCuePoint', 'endCuePoint'],
 			},
-			startCuePoint: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-seconden',
-                    {},
-                    [AVO]
-                ),
-                editorProps: {
-                    type: 'number',
-                },
-                isVisible: cuePointsIsVisible,
-            }, tText(
-                'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-is-verplicht',
-                {},
-                [AVO]
-            )),
-			endCuePoint: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-seconden',
-                    {},
-                    [AVO]
-                ),
-                editorProps: {
-                    type: 'number',
-                },
-                isVisible: cuePointsIsVisible,
-            }, tText(
-                'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-is-verplicht',
-                {},
-                [AVO]
-            )),
+			startCuePoint: TEXT_FIELD(
+				{
+					label: tText(
+						'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-seconden',
+						{},
+						[AVO]
+					),
+					editorProps: {
+						type: 'number',
+					},
+					isVisible: cuePointsIsVisible,
+				},
+				tText(
+					'modules/content-page/components/blocks/block-media-grid/block-media-grid___startknippunt-is-verplicht',
+					{},
+					[AVO]
+				)
+			),
+			endCuePoint: TEXT_FIELD(
+				{
+					label: tText(
+						'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-seconden',
+						{},
+						[AVO]
+					),
+					editorProps: {
+						type: 'number',
+					},
+					isVisible: cuePointsIsVisible,
+				},
+				tText(
+					'modules/content-page/components/blocks/block-media-grid/block-media-grid___eindknippunt-is-verplicht',
+					{},
+					[AVO]
+				)
+			),
 			mediaItemLabel: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/block-media-grid/block-media-grid___alternatieve-titel',
-                    {},
-                    [AVO]
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'modules/content-page/components/blocks/block-media-grid/block-media-grid___alternatieve-titel',
+					{},
+					[AVO]
+				),
+				validator: undefined,
+			}),
 			copyrightImage: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-media-grid/block-media-grid___afbeelding',
@@ -171,15 +177,15 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 			},
 			buttonLabel: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___knop-tekst', {}, [AVO]),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___knop-tekst', {}, [AVO]),
+				validator: undefined,
+			}),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
-                    AVO,
-                ]),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
+					AVO,
+				]),
+				validator: undefined,
+			}),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/media-grid___knop-icoon', {}, [AVO]),
 				editorType: ContentBlockEditor.IconPicker,
@@ -204,11 +210,11 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		state: INITIAL_MEDIA_GRID_BLOCK_STATE(),
 		fields: {
 			title: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___algemene-titel', {}, [
-                    AVO,
-                ]),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___algemene-titel', {}, [
+					AVO,
+				]),
+				validator: undefined,
+			}),
 			titleType: {
 				label: tText(
 					'modules/content-page/components/blocks/block-media-grid/block-media-grid___stijl',
@@ -221,19 +227,19 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 			},
 			buttonLabel: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-grid___algemene-knop-tekst',
-                    {},
-                    [AVO]
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/media-grid___algemene-knop-tekst',
+					{},
+					[AVO]
+				),
+				validator: undefined,
+			}),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
-                    AVO,
-                ]),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___alt-title-text', {}, [
+					AVO,
+				]),
+				validator: undefined,
+			}),
 			buttonAction: {
 				label: tText(
 					'admin/content-block/helpers/generators/media-grid___algemene-knop-actie',
@@ -313,9 +319,9 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 					),
 			},
 			ctaTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___cta-titel', {}, [AVO]),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___cta-titel', {}, [AVO]),
+				validator: undefined,
+			}),
 			ctaTitleColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/media-grid___cta-titel-kleur', {}, [AVO])
 			),
@@ -336,31 +342,31 @@ export const MEDIA_GRID_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				},
 			},
 			ctaContent: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___cta-omschrijving', {}, [
-                    AVO,
-                ]),
-                editorType: ContentBlockEditor.TextArea,
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___cta-omschrijving', {}, [
+					AVO,
+				]),
+				editorType: ContentBlockEditor.TextArea,
+				validator: undefined,
+			}),
 			ctaContentColor: FOREGROUND_COLOR_FIELD(
 				tText('admin/content-block/helpers/generators/media-grid___cta-omschrijving-kleur', {}, [
 					AVO,
 				])
 			),
 			ctaButtonLabel: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/media-grid___cta-knop-tekst', {}, [
-                    AVO,
-                ]),
-                validator: undefined,
-            }),
+				label: tText('admin/content-block/helpers/generators/media-grid___cta-knop-tekst', {}, [
+					AVO,
+				]),
+				validator: undefined,
+			}),
 			ctaButtonAltTitle: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-grid___alt-button-title-text',
-                    {},
-                    [AVO]
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/media-grid___alt-button-title-text',
+					{},
+					[AVO]
+				),
+				validator: undefined,
+			}),
 			ctaButtonIcon: {
 				label: tText('admin/content-block/helpers/generators/media-grid___cta-knop-icoon', {}, [
 					AVO,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/BlockOverviewNewspaperTitles.tsx b/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/BlockOverviewNewspaperTitles.tsx
index 6300ac57a..8e176a0ed 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/BlockOverviewNewspaperTitles.tsx
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/BlockOverviewNewspaperTitles.tsx
@@ -1,7 +1,7 @@
 import { TextInput } from '@meemoo/react-components';
 import { Button } from '@viaa/avo2-components';
 import { stringifyUrl } from 'query-string';
-import type { ChangeEvent, FC, KeyboardEvent } from 'react';
+import type { ChangeEvent, FC } from 'react';
 import React, { useEffect, useState } from 'react';
 import { BlockHeading } from '~content-blocks/BlockHeading/BlockHeading';
 import { Link } from '~modules/shared/components/Link/Link';
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts
index a7fba42cb..17813748e 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockOverviewNewspaperTitles/overviewNewspaperTitles.editorconfig.ts
@@ -39,17 +39,20 @@ export const OVERVIEW_NEWSPAPER_TITLES_BLOCK_CONFIG = (position = 0): ContentBlo
 	components: {
 		state: INITIAL_OVERVIEW_NEWSPAPER_TITLES_COMPONENTS_STATE(),
 		fields: {
-			title: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/overview-newspaper-titles___titel',
-                    undefined,
-                    [HET_ARCHIEF]
-                ),
-            }, tText(
-                'modules/content-page/components/blocks/overview-newspaper-titles___is-verplicht',
-                undefined,
-                [HET_ARCHIEF]
-            )),
+			title: TEXT_FIELD(
+				{
+					label: tText(
+						'modules/content-page/components/blocks/overview-newspaper-titles___titel',
+						undefined,
+						[HET_ARCHIEF]
+					),
+				},
+				tText(
+					'modules/content-page/components/blocks/overview-newspaper-titles___is-verplicht',
+					undefined,
+					[HET_ARCHIEF]
+				)
+			),
 			titleType: {
 				label: tText(
 					'modules/content-page/components/blocks/overview-newspaper-titles___titel-grootte',
@@ -72,24 +75,27 @@ export const OVERVIEW_NEWSPAPER_TITLES_BLOCK_CONFIG = (position = 0): ContentBlo
 					options: AdminConfigManager.getConfig().components.buttonTypes(),
 				},
 			},
-			buttonLabel: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knop-tekst',
-                    undefined,
-                    [HET_ARCHIEF]
-                ),
-            }, tText(
-                'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knoptekst-is-verplicht',
-                undefined,
-                [HET_ARCHIEF]
-            )),
+			buttonLabel: TEXT_FIELD(
+				{
+					label: tText(
+						'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knop-tekst',
+						undefined,
+						[HET_ARCHIEF]
+					),
+				},
+				tText(
+					'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knoptekst-is-verplicht',
+					undefined,
+					[HET_ARCHIEF]
+				)
+			),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText(
-                    'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___alternative',
-                    undefined,
-                    [HET_ARCHIEF]
-                ),
-            }),
+				label: tText(
+					'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___alternative',
+					undefined,
+					[HET_ARCHIEF]
+				),
+			}),
 			buttonIcon: {
 				label: tText(
 					'modules/content-page/components/blocks/block-overview-newspaper-titles/overview-newspaper-titles___knop-icoon',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts
index 832febdf4..375f7c3b2 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockPageOverview/BlockPageOverview.editorconfig.ts
@@ -19,7 +19,8 @@ import {
 	BACKGROUND_COLOR_FIELD,
 	BLOCK_FIELD_DEFAULTS,
 	BLOCK_STATE_DEFAULTS,
-	CONTENT_TYPE_AND_LABELS_INPUT, TEXT_FIELD,
+	CONTENT_TYPE_AND_LABELS_INPUT,
+	TEXT_FIELD,
 } from '../defaults';
 
 export const INITIAL_PAGE_OVERVIEW_COMPONENTS_STATE =
@@ -174,11 +175,11 @@ export const PAGE_OVERVIEW_BLOCK_CONFIG = (position = 0): ContentBlockConfig =>
 					label: tText(
 						'admin/content-block/helpers/generators/page-overview___label-voor-de-button-lijst-item'
 					),
-					validator: undefined
+					validator: undefined,
 				}),
 				buttonAltTitle: TEXT_FIELD({
 					label: tText('admin/content-block/helpers/generators/page-overview___alt-title-text'),
-					validator: undefined
+					validator: undefined,
 				}),
 				itemsPerPage: {
 					label: tText('admin/content-block/helpers/generators/page-overview___items-per-pagina'),
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts
index d8043a61e..b03e416c0 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockQuote/BlockQuote.editorconfig.ts
@@ -5,7 +5,7 @@ import type {
 	DefaultContentBlockState,
 	QuoteBlockComponentState,
 } from '../../../types/content-block.types';
-import { ContentBlockEditor, ContentBlockType } from '../../../types/content-block.types';
+import { ContentBlockType } from '../../../types/content-block.types';
 
 import { BLOCK_FIELD_DEFAULTS, BLOCK_STATE_DEFAULTS, FILE_FIELD, TEXT_FIELD } from '../defaults';
 
@@ -30,17 +30,20 @@ export const QUOTE_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 	components: {
 		state: INITIAL_QUOTE_COMPONENTS_STATE(),
 		fields: {
-			quote: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/quote___quote'),
-            }, tText('admin/content-block/helpers/generators/quote___quote-is-verplicht')),
+			quote: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/quote___quote'),
+				},
+				tText('admin/content-block/helpers/generators/quote___quote-is-verplicht')
+			),
 			authorName: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/quote___auteur'),
-                validator: undefined,
-            }, undefined),
+				label: tText('admin/content-block/helpers/generators/quote___auteur'),
+				validator: undefined,
+			}),
 			authorInitials: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/quote___initialen'),
-                validator: undefined,
-            }, undefined),
+				label: tText('admin/content-block/helpers/generators/quote___initialen'),
+				validator: undefined,
+			}),
 			authorImage: FILE_FIELD(
 				tText('admin/content-block/helpers/generators/image___een-afbeelding-is-verplicht'),
 				{
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts
index 7a524ba24..47b3f0a61 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichText.editorconfig.ts
@@ -34,13 +34,16 @@ export const RICH_TEXT_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		},
 		state: INITIAL_RICH_TEXT_COMPONENTS_STATE(),
 		fields: {
-			content: TEXT_FIELD({
-				editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
-				editorProps: {
-					controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
-					fileType: 'CONTENT_BLOCK_IMAGE',
+			content: TEXT_FIELD(
+				{
+					editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
+					editorProps: {
+						controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
+						fileType: 'CONTENT_BLOCK_IMAGE',
+					},
 				},
-			}, tText('admin/content-block/helpers/generators/rich-text___tekst-is-verplicht')),
+				tText('admin/content-block/helpers/generators/rich-text___tekst-is-verplicht')
+			),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts
index 0e03e6920..f8fc1b66f 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockRichText/BlockRichTextTwoColumns.editorconfig.ts
@@ -52,17 +52,16 @@ export const RICH_TEXT_TWO_COLUMNS_BLOCK_CONFIG = (position = 0): ContentBlockCo
 		},
 		state: INITIAL_RICH_TEXT_TWO_COLUMNS_COMPONENTS_STATE(),
 		fields: {
-			content: {
-				...TEXT_FIELD({
+			content: TEXT_FIELD(
+				{
 					editorType: ContentBlockEditor.RICH_TEXT_EDITOR,
 					editorProps: {
 						controls: [...RICH_TEXT_EDITOR_OPTIONS_FULL, 'media'],
 						fileType: 'CONTENT_BLOCK_IMAGE',
 					},
-				}, tText(
-					'admin/content-block/helpers/generators/rich-text-two-columns___tekst-is-verplicht'
-				)),
-			},
+				},
+				tText('admin/content-block/helpers/generators/rich-text-two-columns___tekst-is-verplicht')
+			),
 			buttons: {
 				label: tText('admin/content-block/helpers/generators/rich-text-two-columns___knop'),
 				fields: {
@@ -73,15 +72,18 @@ export const RICH_TEXT_TWO_COLUMNS_BLOCK_CONFIG = (position = 0): ContentBlockCo
 							options: AdminConfigManager.getConfig().components.buttonTypes(),
 						},
 					},
-					label: TEXT_FIELD({
-						label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-					}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
+					label: TEXT_FIELD(
+						{
+							label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+						},
+						tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')
+					),
 					altTitle: TEXT_FIELD({
 						label: tText(
 							'admin/content-block/helpers/generators/rich-text-two-columns___alt-title-text'
 						),
 						validator: undefined,
-					}, undefined),
+					}),
 					icon: {
 						label: tText('admin/content-block/helpers/generators/buttons___icoon'),
 						editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts
index a806b7347..08cf43b20 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockProjectSpotlight.editorconfig.ts
@@ -60,11 +60,11 @@ export const PROJECTS_SPOTLIGHT_BLOCK_CONFIG = (position = 0): ContentBlockConfi
 				validator: undefined,
 			}),
 			customTitle: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/project-spotlight___aangepaste-titel-optioneel'
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/project-spotlight___aangepaste-titel-optioneel'
+				),
+				validator: undefined,
+			}),
 		},
 	},
 	block: {
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts
index 4eaf84b63..5a701ba68 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockSpotlight/BlockSpotlight.editorconfig.ts
@@ -51,9 +51,9 @@ export const SPOTLIGHT_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 				}
 			),
 			title: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/spotlight___titel'),
-                validator: undefined,
-            }, undefined),
+				label: tText('admin/content-block/helpers/generators/spotlight___titel'),
+				validator: undefined,
+			}),
 			buttonAction: {
 				label: tText('admin/content-block/helpers/generators/spotlight___link'),
 				editorType: ContentBlockEditor.ContentPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts
index 9cc70ce2e..3790c6b8c 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockTagsWithLink/BlockTagsWithLink.editorconfig.ts
@@ -25,9 +25,12 @@ export const TAGS_WITH_LINK_BLOCK_CONFIG = (position = 0): ContentBlockConfig =>
 		state: INITIAL_TAGS_WITH_LINK_COMPONENTS_STATE(),
 		name: tText('admin/content-block/helpers/generators/tag-with-link___tag'),
 		fields: {
-			label: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/tag-with-link___label'),
-            }, tText('admin/content-block/helpers/generators/tag-with-link___label-is-verplicht')),
+			label: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/tag-with-link___label'),
+				},
+				tText('admin/content-block/helpers/generators/tag-with-link___label-is-verplicht')
+			),
 			link: {
 				label: tText('admin/content-block/helpers/generators/tag-with-link___link'),
 				editorType: ContentBlockEditor.ContentPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts
index 480d0f5ee..89e8138da 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockThreeClickableTiles/BlockThreeClickableTiles.editorconfig.ts
@@ -44,11 +44,14 @@ export const THREE_CLICKABLE_TILES_BLOCK_CONFIG = (position = 0): ContentBlockCo
 					editorProps: { assetType: 'CONTENT_BLOCK_IMAGE' } as FileUploadProps,
 				}
 			),
-			title: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/three-clickable-tiles___subtitel'),
-            }, tText(
-                'admin/content-block/helpers/generators/three-clickable-tiles___subtitel-is-verplicht'
-            )),
+			title: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/three-clickable-tiles___subtitel'),
+				},
+				tText(
+					'admin/content-block/helpers/generators/three-clickable-tiles___subtitel-is-verplicht'
+				)
+			),
 			titleType: {
 				label: tText('admin/content-block/helpers/generators/heading___type'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts
index 1526726ea..7cb2df777 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockUitgeklaard/BlockUitgeklaard.editorconfig.ts
@@ -36,18 +36,21 @@ export const UITGEKLAARD_BLOCK_CONFIG = (position = 0): ContentBlockConfig => ({
 		},
 		state: INITIAL_UITGEKLAARD_COMPONENTS_STATE(),
 		fields: {
-			titles: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/uitgeklaard___titel'),
-                repeat: {
-                    defaultState: '',
-                    addButtonLabel: tText(
-                        'admin/content-block/helpers/generators/uitgeklaard___voeg-titel-toe'
-                    ),
-                    deleteButtonLabel: tText(
-                        'admin/content-block/helpers/generators/uitgeklaard___verwijder-titel'
-                    ),
-                },
-            }, tText('admin/content-block/helpers/generators/uitgeklaard___titel-is-verplicht')) as ContentBlockField,
+			titles: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/uitgeklaard___titel'),
+					repeat: {
+						defaultState: '',
+						addButtonLabel: tText(
+							'admin/content-block/helpers/generators/uitgeklaard___voeg-titel-toe'
+						),
+						deleteButtonLabel: tText(
+							'admin/content-block/helpers/generators/uitgeklaard___verwijder-titel'
+						),
+					},
+				},
+				tText('admin/content-block/helpers/generators/uitgeklaard___titel-is-verplicht')
+			) as ContentBlockField,
 			date: {
 				label: tText(
 					'modules/content-page/components/blocks/block-uitgeklaard/block-uitgeklaard___datum',
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts
index b8cf4a464..fa3445c51 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideo/BlockVideo.editorconfig.ts
@@ -38,25 +38,25 @@ export const MEDIA_PLAYER_BLOCK_CONFIG = (position = 0): ContentBlockConfig => (
 		state: INITIAL_MEDIA_PLAYER_COMPONENTS_STATE(),
 		fields: {
 			title: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-player___toegankelijkheidstitel'
-                ),
-                validator: undefined,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/media-player___toegankelijkheidstitel'
+				),
+				validator: undefined,
+			}),
 			item: ITEM_PICKER_FIELD(undefined, {
 				validator: undefined,
 			}),
 			src: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-player___eigen-video-url-van-flowplayer-com-optioneel'
-                ),
-                validator: validateFlowplayerVideoUrl,
-                editorProps: {
-                    placeholder: tText(
-                        'admin/content-block/helpers/generators/media-player___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
-                    ),
-                } as TextInputProps,
-            }),
+				label: tText(
+					'admin/content-block/helpers/generators/media-player___eigen-video-url-van-flowplayer-com-optioneel'
+				),
+				validator: validateFlowplayerVideoUrl,
+				editorProps: {
+					placeholder: tText(
+						'admin/content-block/helpers/generators/media-player___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
+					),
+				} as TextInputProps,
+			}),
 			poster: {
 				label: tText(
 					'react-admin/modules/content-page/components/blocks/block-video/block-video___poster'
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts
index 03e95c382..657ba9c16 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/BlockVideoTitleTextButton/BlockVideoTitleTextButton.editorconfig.ts
@@ -46,20 +46,20 @@ export const MEDIA_PLAYER_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): Conte
 				label: tText(
 					'admin/content-block/helpers/generators/media-player-title-text-button___video-of-audio-item-toegankelijkheidstitel'
 				),
-				validator: undefined
+				validator: undefined,
 			}),
 			mediaItem: ITEM_PICKER_FIELD(),
 			mediaSrc: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-player-title-text-button___eigen-video-url-van-flowplayer-com-optioneel'
-                ),
-                validator: validateFlowplayerVideoUrl,
-                editorProps: {
-                    placeholder: tText(
-                        'admin/content-block/helpers/generators/media-player-title-text-button___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
-                    ),
-                } as TextInputProps,
-            }, undefined),
+				label: tText(
+					'admin/content-block/helpers/generators/media-player-title-text-button___eigen-video-url-van-flowplayer-com-optioneel'
+				),
+				validator: validateFlowplayerVideoUrl,
+				editorProps: {
+					placeholder: tText(
+						'admin/content-block/helpers/generators/media-player-title-text-button___bv-https-cdn-flowplayer-com-hls-playlist-m-3-u-8'
+					),
+				} as TextInputProps,
+			}),
 			mediaPoster: {
 				label: tText(
 					'admin/content-block/helpers/generators/media-player-title-text-button___eigen-poster-uploaden-optioneel'
@@ -82,9 +82,12 @@ export const MEDIA_PLAYER_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): Conte
 					),
 				} as CheckboxProps,
 			},
-			headingTitle: TEXT_FIELD({
-                label: tText('admin/content-block/helpers/generators/heading___titel'),
-            }, tText('admin/content-block/helpers/generators/heading___titel-is-verplicht')),
+			headingTitle: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/heading___titel'),
+				},
+				tText('admin/content-block/helpers/generators/heading___titel-is-verplicht')
+			),
 			headingType: {
 				label: tText('admin/content-block/helpers/generators/heading___stijl'),
 				editorType: ContentBlockEditor.Select,
@@ -102,14 +105,14 @@ export const MEDIA_PLAYER_TITLE_TEXT_BUTTON_BLOCK_CONFIG = (position = 0): Conte
 			},
 			buttonLabel: TEXT_FIELD({
 				label: tText('admin/content-block/helpers/generators/ctas___knop-tekst'),
-				validator: undefined
+				validator: undefined,
 			}),
 			buttonAltTitle: TEXT_FIELD({
-                label: tText(
-                    'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
-                ),
-                validator: undefined,
-            }, undefined),
+				label: tText(
+					'admin/content-block/helpers/generators/media-player-title-text-button___alt-title-text'
+				),
+				validator: undefined,
+			}),
 			buttonIcon: {
 				label: tText('admin/content-block/helpers/generators/ctas___knop-icoon'),
 				editorType: ContentBlockEditor.IconPicker,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts b/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts
index 66ba75e5d..42b94f90a 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/anchor-links.ts
@@ -35,9 +35,12 @@ export const ANCHOR_LINKS_BLOCK_CONFIG = (position = 0): ContentBlockConfig => (
 		name: tText('admin/content-block/helpers/generators/anchor-links___link'),
 		state: INITIAL_ANCHOR_LINKS_COMPONENTS_STATE(),
 		fields: {
-			label: TEXT_FIELD({
-				label: tText('admin/content-block/helpers/generators/buttons___tekst'),
-			}, tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')),
+			label: TEXT_FIELD(
+				{
+					label: tText('admin/content-block/helpers/generators/buttons___tekst'),
+				},
+				tText('admin/content-block/helpers/generators/buttons___knoptekst-is-verplicht')
+			),
 			type: {
 				label: tText('admin/content-block/helpers/generators/anchor-links___kleur'),
 				editorType: ContentBlockEditor.Select,
diff --git a/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts b/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts
index dc091f040..7bcc4f11f 100644
--- a/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts
+++ b/ui/src/react-admin/modules/content-page/components/blocks/defaults.ts
@@ -66,7 +66,7 @@ export const BLOCK_FIELD_DEFAULTS = () => ({
 	// Used to link to this block from inside the same page using the anchors-block
 	anchor: TEXT_FIELD({
 		label: tText('admin/content-block/helpers/generators/defaults___anchor-id'),
-		validator: undefined
+		validator: undefined,
 	}),
 });
 
diff --git a/ui/src/react-admin/modules/content-page/views/ContentPageOverview.tsx b/ui/src/react-admin/modules/content-page/views/ContentPageOverview.tsx
index 18022553d..0b0eaeb00 100644
--- a/ui/src/react-admin/modules/content-page/views/ContentPageOverview.tsx
+++ b/ui/src/react-admin/modules/content-page/views/ContentPageOverview.tsx
@@ -13,7 +13,7 @@ import { AvoSearchOrderDirection, PermissionName } from '@viaa/avo2-types';
 import clsx from 'clsx';
 import { cloneDeep, compact, isEqual, partition } from 'es-toolkit';
 import { get, set } from 'es-toolkit/compat';
-import React, { type FC, type ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { type FC, type ReactNode, useCallback, useMemo, useState } from 'react';
 import type { LabelObj } from '~content-blocks/BlockPageOverview/BlockPageOverview.types';
 
 import { AdminConfigManager } from '~core/config/config.class';
diff --git a/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx b/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx
index aeb69769c..33779b89e 100644
--- a/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx
+++ b/ui/src/react-admin/modules/maintenance-alerts/views/MaintenanceAlertsEditForm.tsx
@@ -23,7 +23,7 @@ import type {
 } from '~modules/maintenance-alerts/maintenance-alerts.types';
 import { IconPicker } from '~modules/shared/components/IconPicker/IconPicker';
 import { useGetAllLanguages } from '~modules/translations/hooks/use-get-all-languages';
-import { App, Locale } from '~modules/translations/translations.core.types';
+import { Locale } from '~modules/translations/translations.core.types';
 import type { LanguageInfo } from '~modules/translations/translations.types';
 import { useUserGroupOptions } from '~modules/user-group/hooks/useUserGroupOptions';
 import { Icon } from '~shared/components/Icon/Icon';
diff --git a/ui/src/react-admin/modules/shared/components/FilterTable/FilterTable.tsx b/ui/src/react-admin/modules/shared/components/FilterTable/FilterTable.tsx
index 80964c0a8..72f96d1c3 100644
--- a/ui/src/react-admin/modules/shared/components/FilterTable/FilterTable.tsx
+++ b/ui/src/react-admin/modules/shared/components/FilterTable/FilterTable.tsx
@@ -127,7 +127,6 @@ export const FilterTable: FunctionComponent<FilterTableProps> = ({
 	searchTextPlaceholder,
 	noContentMatchingFiltersMessage,
 	errorMessage,
-	renderNoResults,
 	renderCell,
 	className,
 	onTableStateChanged,
diff --git a/ui/src/react-admin/modules/shared/helpers/sanitize/index.ts b/ui/src/react-admin/modules/shared/helpers/sanitize/index.ts
index 1633276da..949f97b0a 100644
--- a/ui/src/react-admin/modules/shared/helpers/sanitize/index.ts
+++ b/ui/src/react-admin/modules/shared/helpers/sanitize/index.ts
@@ -9,7 +9,7 @@ function normalizeModule(requiredModule: any): DOMPurifyI {
 }
 
 let domPurify: DOMPurifyI | undefined;
-let domPurifyInitPromise: Promise<void> | undefined;
+let _domPurifyInitPromise: Promise<void> | undefined;
 
 /**
  * DOMPurify uses the window in browser mode, so we need to conditionally import it
@@ -26,7 +26,7 @@ function initDOMPurify(): void {
 		} as unknown as DOMPurifyI;
 	} else {
 		// Start loading DOMPurify asynchronously
-		domPurifyInitPromise = import('dompurify').then((module) => {
+		_domPurifyInitPromise = import('dompurify').then((module) => {
 			domPurify = normalizeModule(module);
 		});
 	}
diff --git a/ui/src/react-admin/modules/user-group/views/UserGroupOverview.tsx b/ui/src/react-admin/modules/user-group/views/UserGroupOverview.tsx
index 95df1b752..b5ad671c7 100644
--- a/ui/src/react-admin/modules/user-group/views/UserGroupOverview.tsx
+++ b/ui/src/react-admin/modules/user-group/views/UserGroupOverview.tsx
@@ -1,4 +1,4 @@
-import { keysEnter, onKey, Table, TextInput } from '@meemoo/react-components';
+import { Table, TextInput } from '@meemoo/react-components';
 import { cloneDeep, remove, sortBy } from 'es-toolkit';
 import type { ChangeEvent } from 'react';
 import React, {
@@ -278,6 +278,7 @@ export const UserGroupOverview = forwardRef<
 							initialState: {
 								pageSize: permissions?.length,
 							},
+							// biome-ignore lint/suspicious/noExplicitAny: todo
 						} as TableOptions<Record<'id', string | number> & Record<string, any>>
 					}
 					enableRowFocusOnClick={isHetArchief()}
diff --git a/ui/src/react-admin/modules/user/helpers/render-user-overview-table-cells.tsx b/ui/src/react-admin/modules/user/helpers/render-user-overview-table-cells.tsx
index 4e42da9ba..a301fabc3 100644
--- a/ui/src/react-admin/modules/user/helpers/render-user-overview-table-cells.tsx
+++ b/ui/src/react-admin/modules/user/helpers/render-user-overview-table-cells.tsx
@@ -46,6 +46,7 @@ export function renderUserOverviewTableCellReact(
 	const isBlocked = tableRowCommonUser?.isBlocked;
 	// biome-ignore lint/suspicious/noExplicitAny: todo
 	const isKeyUser = (tableRowCommonUser as any)?.isKeyUser ?? false;
+	// biome-ignore lint/suspicious/noExplicitAny: todo
 	const isEvaluator = (tableRowCommonUser as any)?.isEvaluator ?? false;
 
 	switch (columnId) {
@@ -221,6 +222,7 @@ export function renderUserOverviewTableCellText(
 	const isBlocked = tableRowCommonUser?.isBlocked;
 	// biome-ignore lint/suspicious/noExplicitAny: todo
 	const isKeyUser = (tableRowCommonUser as any)?.isKeyUser ?? false;
+	// biome-ignore lint/suspicious/noExplicitAny: todo
 	const isEvaluator = (tableRowCommonUser as any)?.isEvaluator ?? false;
 
 	switch (columnId) {
diff --git a/ui/src/react-admin/modules/user/views/UserOverview.tsx b/ui/src/react-admin/modules/user/views/UserOverview.tsx
index 57c7a65d5..6cfe49c8b 100644
--- a/ui/src/react-admin/modules/user/views/UserOverview.tsx
+++ b/ui/src/react-admin/modules/user/views/UserOverview.tsx
@@ -28,7 +28,6 @@ import type { CheckboxOption } from '~shared/components/CheckboxDropdownModal/Ch
 import { ExportAllToCsvModal } from '~shared/components/ExportAllToCsvModal/ExportAllToCsvModal';
 import { ErrorView } from '~shared/components/error/ErrorView';
 import type { FilterableColumn } from '~shared/components/FilterTable/FilterTable';
-import { CenteredSpinner } from '~shared/components/Spinner/CenteredSpinner';
 import { CustomError } from '~shared/helpers/custom-error';
 import { isHetArchief } from '~shared/helpers/is-hetarchief';
 import { navigate } from '~shared/helpers/routing/link';
@@ -44,7 +43,7 @@ import { SettingsService } from '~shared/services/settings-service/settings.serv
 import FilterTable, { getFilters } from '../../shared/components/FilterTable/FilterTable';
 import UserDeleteModal from '../components/UserDeleteModal';
 import type { UserOverviewTableCol, UserTableState } from '../user.types';
-import { UserBulkAction, USERS_PER_PAGE } from '../user.types';
+import { USERS_PER_PAGE, UserBulkAction } from '../user.types';
 import './UserOverview.scss';
 
 export interface UserOverviewProps {