diff --git a/automation/run-e2e/docker/mxbuild.Dockerfile b/automation/run-e2e/docker/mxbuild.Dockerfile
index c6a3934271..739fdc3985 100644
--- a/automation/run-e2e/docker/mxbuild.Dockerfile
+++ b/automation/run-e2e/docker/mxbuild.Dockerfile
@@ -3,6 +3,8 @@ FROM --platform=$BUILDPLATFORM eclipse-temurin:21-jdk-jammy
 ARG MENDIX_VERSION
 ARG BUILDPLATFORM
 
+ENV LD_PRELOAD=libfontconfig.so.1
+
 SHELL ["/bin/bash", "-c"]
 RUN \
 echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATFORM}..." \
@@ -26,7 +28,7 @@ echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATF
 \
     rm -rf /var/lib/apt/lists/* && \
     apt-get update --allow-insecure-repositories -qqy && \
-    apt-get install -qqy --allow-unauthenticated libicu70 && \
+    apt-get install -qqy --allow-unauthenticated libicu70 libgdiplus libfontconfig1 && \
     apt-get -qqy remove --auto-remove wget && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
diff --git a/automation/run-e2e/docker/mxbuildRC.Dockerfile b/automation/run-e2e/docker/mxbuildRC.Dockerfile
index 70ee17b970..37d631356f 100644
--- a/automation/run-e2e/docker/mxbuildRC.Dockerfile
+++ b/automation/run-e2e/docker/mxbuildRC.Dockerfile
@@ -2,6 +2,8 @@ FROM eclipse-temurin:21-jdk-jammy
 
 ARG MENDIX_VERSION
 
+ENV LD_PRELOAD=libfontconfig.so.1
+
 COPY --link mxbuild.tar.gz /tmp/mxbuild.tar.gz
 
 SHELL ["/bin/bash", "-c"]
@@ -11,7 +13,7 @@ RUN \
     tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
     \
     apt-get update -qqy && \
-    apt-get install -qqy libicu70 && \
+    apt-get install -qqy libicu70 libgdiplus libfontconfig1 && \
     apt-get -qqy remove --auto-remove wget && \
     apt-get clean && \
     \
diff --git a/automation/run-e2e/lib/ci.mjs b/automation/run-e2e/lib/ci.mjs
index 4d7bd0b716..db394bdd67 100644
--- a/automation/run-e2e/lib/ci.mjs
+++ b/automation/run-e2e/lib/ci.mjs
@@ -91,7 +91,7 @@ async function runWithCompose({ mendixVersion, ip, freePort }) {
         WORKSPACE: workspace,
         MPR_PATH: mprRelPath,
         RUNTIME_PORT: String(freePort),
-        ...(process.env.MODERN_CLIENT ? { MODERN_CLIENT: `--modern-client` } : {})
+        ...(process.env.MODERN_CLIENT ? { MODERN_CLIENT: `--modern-web-client` } : {})
     };
 
     try {
diff --git a/automation/scripts/update-screenshots-local.mjs b/automation/scripts/update-screenshots-local.mjs
index 22245ae5ac..376db648bf 100644
--- a/automation/scripts/update-screenshots-local.mjs
+++ b/automation/scripts/update-screenshots-local.mjs
@@ -590,6 +590,7 @@ async function buildWidget(widgetName, widgetPkg) {
 async function buildDeploymentBundle(mendixVersion) {
     const mxbuildImage = `mxbuild:${mendixVersion}`;
     const spinner = new Spinner(`Building deployment bundle ${DIM(`(${mxbuildImage})`)}`).start();
+    const modernClientFlag = process.env.MODERN_CLIENT ? "--modern-web-client" : "";
 
     try {
         const mprFiles = fs.readdirSync(PATHS.testProject);
@@ -601,7 +602,7 @@ async function buildDeploymentBundle(mendixVersion) {
             "docker run --tty --rm",
             `--volume ${REPO_ROOT}:/source`,
             mxbuildImage,
-            `bash -c "mx update-widgets --loose-version-check ${mprPath} && mxbuild --output=/source/automation.mda ${mprPath}"`
+            `bash -c "mx update-widgets --loose-version-check ${mprPath} && mxbuild ${modernClientFlag} --output=/source/automation.mda ${mprPath}"`
         ].join(" ");
 
         log(`Running: ${cmd}`);
diff --git a/packages/pluggableWidgets/badge-web/e2e/badge.spec.js-snapshots/badge-chromium-linux.png b/packages/pluggableWidgets/badge-web/e2e/badge.spec.js-snapshots/badge-chromium-linux.png
index 7eae3007d3..7bb7e46af0 100644
Binary files a/packages/pluggableWidgets/badge-web/e2e/badge.spec.js-snapshots/badge-chromium-linux.png and b/packages/pluggableWidgets/badge-web/e2e/badge.spec.js-snapshots/badge-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/badge-web/package.json b/packages/pluggableWidgets/badge-web/package.json
index 8b4dea16d9..57b49e6bd3 100644
--- a/packages/pluggableWidgets/badge-web/package.json
+++ b/packages/pluggableWidgets/badge-web/package.json
@@ -23,14 +23,16 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "badge-web"
+        "branchName": "badge-web-mx11-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "cross-env MPKOUTPUT=Badge.mpk pluggable-widgets-tools build:web",
         "create-gh-release": "rui-create-gh-release",
         "create-translation": "rui-create-translation",
         "dev": "cross-env MPKOUTPUT=Badge.mpk pluggable-widgets-tools start:web",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
         "lint": "eslint src/ package.json",
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js
index ec6b9443a3..acceaf147b 100644
--- a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js
+++ b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js
@@ -11,7 +11,7 @@ test.describe("combobox-web", () => {
 
     test.describe("data source types", () => {
         test("renders combobox using association", async ({ page }) => {
-            const comboBox = page.locator(".mx-name-comboBox1");
+            const comboBox = page.locator(".modal-body .mx-name-comboBox1");
             await expect(comboBox).toBeVisible({ timeout: 10000 });
             await expect(comboBox).toHaveScreenshot(`comboBoxAssociation.png`);
             await comboBox.click();
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociation-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociation-chromium-linux.png
index fab8f118dd..a5b3cbfa05 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociation-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociation-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationOpen-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationOpen-chromium-linux.png
index e1d33e63da..0130fba570 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationOpen-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationOpen-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClick-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClick-chromium-linux.png
index d5fc7ab485..003ec69d7c 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClick-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClick-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClickOpen-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClickOpen-chromium-linux.png
index 83959a26f2..9e7729f747 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClickOpen-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxAssociationRowClickOpen-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBoolean-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBoolean-chromium-linux.png
index a7b4093591..188257fdbb 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBoolean-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBoolean-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBooleanOpen-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBooleanOpen-chromium-linux.png
index 07726f7c60..f3b9ba2f7c 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBooleanOpen-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxBooleanOpen-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabase-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabase-chromium-linux.png
index 608a837302..ca0e4be5ea 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabase-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabase-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabaseOpen-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabaseOpen-chromium-linux.png
index b95b13c99e..8b2a864299 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabaseOpen-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxDatabaseOpen-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnum-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnum-chromium-linux.png
index 81427668af..e433a139b6 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnum-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnum-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumFooter-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumFooter-chromium-linux.png
index 3b64441886..46712e8180 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumFooter-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumFooter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumOpen-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumOpen-chromium-linux.png
index 3c3df705fc..9ae919e883 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumOpen-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxEnumOpen-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxFiltering-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxFiltering-chromium-linux.png
index 8fb40c5766..622b5d5f54 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxFiltering-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxFiltering-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxReadOnly-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxReadOnly-chromium-linux.png
index cfa4368a21..b3069adc88 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxReadOnly-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxReadOnly-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveAllSelection-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveAllSelection-chromium-linux.png
index bd463f8f04..a2e8fcee7d 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveAllSelection-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveAllSelection-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveSelection-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveSelection-chromium-linux.png
index e0ced0328c..f6418e89c6 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveSelection-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxRemoveSelection-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStatic-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStatic-chromium-linux.png
index 63b4d19f3e..7ae404277e 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStatic-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStatic-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStaticOpen-chromium-linux.png b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStaticOpen-chromium-linux.png
index c3c6d83305..af40cb38eb 100644
Binary files a/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStaticOpen-chromium-linux.png and b/packages/pluggableWidgets/combobox-web/e2e/Combobox.spec.js-snapshots/comboBoxStaticOpen-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/combobox-web/package.json b/packages/pluggableWidgets/combobox-web/package.json
index b3f81e9e30..3302618163 100644
--- a/packages/pluggableWidgets/combobox-web/package.json
+++ b/packages/pluggableWidgets/combobox-web/package.json
@@ -27,7 +27,9 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "combobox-web"
+        "branchName": "combobox-web-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "prebuild": "rui-create-translation",
@@ -35,7 +37,7 @@
         "create-gh-release": "rui-create-gh-release",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:web",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
         "lint": "eslint src/ package.json",
diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/e2e/DataGridDateFilter.spec.js-snapshots/dataGridDateFilter-chromium-linux.png b/packages/pluggableWidgets/datagrid-date-filter-web/e2e/DataGridDateFilter.spec.js-snapshots/dataGridDateFilter-chromium-linux.png
index b681a703e7..9be3f8531d 100644
Binary files a/packages/pluggableWidgets/datagrid-date-filter-web/e2e/DataGridDateFilter.spec.js-snapshots/dataGridDateFilter-chromium-linux.png and b/packages/pluggableWidgets/datagrid-date-filter-web/e2e/DataGridDateFilter.spec.js-snapshots/dataGridDateFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/package.json b/packages/pluggableWidgets/datagrid-date-filter-web/package.json
index 048d8d3ed5..e7e566ea7f 100644
--- a/packages/pluggableWidgets/datagrid-date-filter-web/package.json
+++ b/packages/pluggableWidgets/datagrid-date-filter-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "datagrid-date-filter-web/data-widgets-3.0"
+        "branchName": "datagrid-date-filter-web/data-widgets-3.0-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:ts",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:ts",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/e2e/DataGridDropDownFilter.spec.js-snapshots/dataGridDropDownFilter-undefined-chromium-linux.png b/packages/pluggableWidgets/datagrid-dropdown-filter-web/e2e/DataGridDropDownFilter.spec.js-snapshots/dataGridDropDownFilter-undefined-chromium-linux.png
index c1255198e0..e4eb90ac8b 100644
Binary files a/packages/pluggableWidgets/datagrid-dropdown-filter-web/e2e/DataGridDropDownFilter.spec.js-snapshots/dataGridDropDownFilter-undefined-chromium-linux.png and b/packages/pluggableWidgets/datagrid-dropdown-filter-web/e2e/DataGridDropDownFilter.spec.js-snapshots/dataGridDropDownFilter-undefined-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json b/packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json
index f425bb63d2..c04244a0ca 100644
--- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json
+++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "datagrid-dropdown-filter-web/dw3.0-dropdown-rework"
+        "branchName": "datagrid-dropdown-filter-web/dw3.0-dropdown-rework-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:ts",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:ts",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/e2e/DataGridNumberFilter.spec.js-snapshots/dataGridNumberFilter-chromium-linux.png b/packages/pluggableWidgets/datagrid-number-filter-web/e2e/DataGridNumberFilter.spec.js-snapshots/dataGridNumberFilter-chromium-linux.png
index 9ba8804411..004e3ec083 100644
Binary files a/packages/pluggableWidgets/datagrid-number-filter-web/e2e/DataGridNumberFilter.spec.js-snapshots/dataGridNumberFilter-chromium-linux.png and b/packages/pluggableWidgets/datagrid-number-filter-web/e2e/DataGridNumberFilter.spec.js-snapshots/dataGridNumberFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/package.json b/packages/pluggableWidgets/datagrid-number-filter-web/package.json
index cc0ac6b3ec..ef460ac7ac 100644
--- a/packages/pluggableWidgets/datagrid-number-filter-web/package.json
+++ b/packages/pluggableWidgets/datagrid-number-filter-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "datagrid-number-filter-web/data-widgets-3.0"
+        "branchName": "datagrid-number-filter-web/data-widgets-3.0-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:ts",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:ts",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/e2e/DataGridTextFilter.spec.js-snapshots/dataGridTextFilter-chromium-linux.png b/packages/pluggableWidgets/datagrid-text-filter-web/e2e/DataGridTextFilter.spec.js-snapshots/dataGridTextFilter-chromium-linux.png
index 3d9501e795..28508e1539 100644
Binary files a/packages/pluggableWidgets/datagrid-text-filter-web/e2e/DataGridTextFilter.spec.js-snapshots/dataGridTextFilter-chromium-linux.png and b/packages/pluggableWidgets/datagrid-text-filter-web/e2e/DataGridTextFilter.spec.js-snapshots/dataGridTextFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/package.json b/packages/pluggableWidgets/datagrid-text-filter-web/package.json
index cf93ef30f2..3b5be30b4b 100644
--- a/packages/pluggableWidgets/datagrid-text-filter-web/package.json
+++ b/packages/pluggableWidgets/datagrid-text-filter-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "datagrid-text-filter-web/data-widgets-3.0"
+        "branchName": "datagrid-text-filter-web/data-widgets-3.0-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:ts",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:ts",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/dataGridColumnContent-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/dataGridColumnContent-chromium-linux.png
index a3ae98b972..6a2fcf8c9e 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/dataGridColumnContent-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/dataGridColumnContent-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-chromium-linux.png
index 1582876cbc..63b2ee74ab 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-virtual-scrolling-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-virtual-scrolling-chromium-linux.png
index 5fe78fa677..c98d2561c4 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-virtual-scrolling-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js-snapshots/datagrid-virtual-scrolling-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionCheckbox-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionCheckbox-chromium-linux.png
index 7d0ee4dc08..6efdc892d4 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionCheckbox-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionCheckbox-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionRowClick-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionRowClick-chromium-linux.png
index 77cc40c234..ba4cb2e8db 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionRowClick-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridMultiSelectionRowClick-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionCheckbox-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionCheckbox-chromium-linux.png
index e60cfd925c..0905c845cc 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionCheckbox-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionCheckbox-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionRowClick-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionRowClick-chromium-linux.png
index d57f8151da..2fcc78e164 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionRowClick-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/DataGridSelection.spec.js-snapshots/datagridSingleSelectionRowClick-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringIntegration.spec.js-snapshots/datagridFilteringIntegration-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringIntegration.spec.js-snapshots/datagridFilteringIntegration-chromium-linux.png
index fd79236deb..3b376602d8 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringIntegration.spec.js-snapshots/datagridFilteringIntegration-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringIntegration.spec.js-snapshots/datagridFilteringIntegration-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringSingle.spec.js-snapshots/datagridFilteringSingle-chromium-linux.png b/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringSingle.spec.js-snapshots/datagridFilteringSingle-chromium-linux.png
index d7aea8d85e..5c96d2eaf7 100644
Binary files a/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringSingle.spec.js-snapshots/datagridFilteringSingle-chromium-linux.png and b/packages/pluggableWidgets/datagrid-web/e2e/filtering/DataGridFilteringSingle.spec.js-snapshots/datagridFilteringSingle-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/datagrid-web/package.json b/packages/pluggableWidgets/datagrid-web/package.json
index f32c007d1a..c648af308a 100644
--- a/packages/pluggableWidgets/datagrid-web/package.json
+++ b/packages/pluggableWidgets/datagrid-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "datagrid-web/data-widgets-3.0"
+        "branchName": "datagrid-web/data-widgets-3.0-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:ts",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:ts",
-        "e2e": "MENDIX_VERSION=10.24.12.86709 run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "MENDIX_VERSION=10.24.12.86709 run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/dropdown-sort-web/package.json b/packages/pluggableWidgets/dropdown-sort-web/package.json
index edb2db3fcb..eb68cb1d33 100644
--- a/packages/pluggableWidgets/dropdown-sort-web/package.json
+++ b/packages/pluggableWidgets/dropdown-sort-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "dropdown-sort-web/data-widgets-3.0"
+        "branchName": "dropdown-sort-web/data-widgets-3.0-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:ts",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:ts",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryContent-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryContent-chromium-linux.png
index 23d356fe58..ee0695f972 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryContent-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryContent-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDateFilter-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDateFilter-chromium-linux.png
index 60106a1bb3..de39b4ee9d 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDateFilter-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDateFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownFilter-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownFilter-chromium-linux.png
index 457a334a3d..b2d2de5a38 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownFilter-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownSort-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownSort-chromium-linux.png
index b549e3e936..d675444788 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownSort-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryDropdownSort-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryNumberFilter-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryNumberFilter-chromium-linux.png
index 6a31741e4f..c2433040ae 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryNumberFilter-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryNumberFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryTextFilter-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryTextFilter-chromium-linux.png
index 748088431d..1910828d1d 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryTextFilter-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/Gallery.spec.js-snapshots/galleryTextFilter-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js b/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js
index 573cfd4223..3b92417ac7 100644
--- a/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js
+++ b/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js
@@ -10,7 +10,7 @@ test.describe("gallery-web", () => {
             await expect(page.locator(".mx-name-gallery1")).toBeVisible();
             await page.locator(".mx-name-image1").first().click();
             await page.locator(".mx-name-feedback1").isHidden();
-            await expect(page.locator(".mx-name-layoutGrid1").nth(1)).toHaveScreenshot(`gallerySingleSelection.png`);
+            await expect(page.locator(".mx-name-layoutGrid1")).toHaveScreenshot(`gallerySingleSelection.png`);
         });
 
         test("applies multi select", async ({ page }) => {
@@ -22,7 +22,7 @@ test.describe("gallery-web", () => {
             await page.locator(".mx-name-image1").nth(1).click();
             await page.locator(".mx-name-image1").nth(2).click();
             await page.locator(".mx-name-feedback1").isHidden();
-            await expect(page.locator(".mx-name-layoutGrid1").nth(1)).toHaveScreenshot(`galleryMultiSelection.png`);
+            await expect(page.locator(".mx-name-layoutGrid1")).toHaveScreenshot(`galleryMultiSelection.png`);
         });
     });
 
diff --git a/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/galleryMultiSelection-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/galleryMultiSelection-chromium-linux.png
index dd1c05c125..3e6a5c7422 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/galleryMultiSelection-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/galleryMultiSelection-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/gallerySingleSelection-chromium-linux.png b/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/gallerySingleSelection-chromium-linux.png
index 63d9bfe7ee..be78dc3617 100644
Binary files a/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/gallerySingleSelection-chromium-linux.png and b/packages/pluggableWidgets/gallery-web/e2e/GallerySelection.spec.js-snapshots/gallerySingleSelection-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/gallery-web/package.json b/packages/pluggableWidgets/gallery-web/package.json
index b5726e985f..75697dc376 100644
--- a/packages/pluggableWidgets/gallery-web/package.json
+++ b/packages/pluggableWidgets/gallery-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "gallery-web/dw3.0-dropdown-rework"
+        "branchName": "gallery-web/gallery-web-mx11-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:web",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:web",
-        "e2e": "run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",
diff --git a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeCollapsed-chromium-linux.png b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeCollapsed-chromium-linux.png
index cb3a395f66..c79330616d 100644
Binary files a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeCollapsed-chromium-linux.png and b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeCollapsed-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeExpanded-chromium-linux.png b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeExpanded-chromium-linux.png
index 0ba160f3ff..1febcd7f62 100644
Binary files a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeExpanded-chromium-linux.png and b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeExpanded-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleCollapsed-chromium-linux.png b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleCollapsed-chromium-linux.png
index 494c54ccfd..c79330616d 100644
Binary files a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleCollapsed-chromium-linux.png and b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleCollapsed-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleExpanded-chromium-linux.png b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleExpanded-chromium-linux.png
index 96fa694f31..9ab3a43d0f 100644
Binary files a/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleExpanded-chromium-linux.png and b/packages/pluggableWidgets/tree-node-web/e2e/TreeNode.spec.js-snapshots/treeNodeMultipleExpanded-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedCollapsed-chromium-linux.png b/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedCollapsed-chromium-linux.png
index 4d4ae870a5..96a6faa806 100644
Binary files a/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedCollapsed-chromium-linux.png and b/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedCollapsed-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedExpanded-chromium-linux.png b/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedExpanded-chromium-linux.png
index 3a14033e9b..2be460a311 100644
Binary files a/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedExpanded-chromium-linux.png and b/packages/pluggableWidgets/tree-node-web/e2e/TreeNodeV2Reorder.spec.js-snapshots/treeNodeV2AdvancedExpanded-chromium-linux.png differ
diff --git a/packages/pluggableWidgets/tree-node-web/package.json b/packages/pluggableWidgets/tree-node-web/package.json
index 54fabaaa1c..5fb79405d4 100644
--- a/packages/pluggableWidgets/tree-node-web/package.json
+++ b/packages/pluggableWidgets/tree-node-web/package.json
@@ -23,13 +23,15 @@
     },
     "testProject": {
         "githubUrl": "https://github.com/mendix/testProjects",
-        "branchName": "tree-node-web/v2"
+        "branchName": "tree-node-web/v2-atlas4",
+        "atlasCoreVersion": "4.5.0",
+        "atlasThemeTag": "atlasui-theme-files-2025-10-08"
     },
     "scripts": {
         "build": "pluggable-widgets-tools build:web",
         "create-translation": "rui-create-translation",
         "dev": "pluggable-widgets-tools start:web",
-        "e2e": "MENDIX_VERSION=11.12.0 run-e2e ci",
+        "e2e": "MENDIX_VERSION=11.15.0 MODERN_CLIENT=--modern-web-client run-e2e ci",
         "e2e-update-project": "pnpm --filter @mendix/data-widgets run build:include-deps",
         "e2edev": "MENDIX_VERSION=11.12.0 run-e2e dev --with-preps",
         "format": "prettier --ignore-path ./node_modules/@mendix/prettier-config-web-widgets/global-prettierignore --write .",