diff --git a/assets/apps/components/package.json b/assets/apps/components/package.json
index 47217897cf..314474f3e3 100644
--- a/assets/apps/components/package.json
+++ b/assets/apps/components/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@neve-wp/components",
-    "version": "0.0.50",
+    "version": "0.0.51",
     "description": "Neve React Components",
     "author": "themeisle <friends@themeisle.com>",
     "license": "GPL-2.0-or-later",
diff --git a/assets/apps/components/src/Common/GlobalColorsPicker.js b/assets/apps/components/src/Common/GlobalColorsPicker.js
index 4b7778747b..15ddf73120 100644
--- a/assets/apps/components/src/Common/GlobalColorsPicker.js
+++ b/assets/apps/components/src/Common/GlobalColorsPicker.js
@@ -33,6 +33,9 @@ const GlobalColorsPicker = ({ onChange, activeColor, isGlobal }) => {
 					/>
 				</>
 			)}
+			popoverProps={{
+				inline: true,
+			}}
 		/>
 	);
 };
diff --git a/assets/apps/components/src/Controls/ColorControl.js b/assets/apps/components/src/Controls/ColorControl.js
index 7f6906a412..44ed0ea76e 100644
--- a/assets/apps/components/src/Controls/ColorControl.js
+++ b/assets/apps/components/src/Controls/ColorControl.js
@@ -88,6 +88,9 @@ const ColorControl = ({
 						? ''
 						: 'neve-color-picker-dropdown'
 				}
+				popoverProps={{
+					inline: true,
+				}}
 				renderToggle={({ isOpen, onToggle }) => {
 					toggle = onToggle;
 					return (
diff --git a/assets/apps/components/src/Controls/MultiSelect.js b/assets/apps/components/src/Controls/MultiSelect.js
index 104b27a748..95057e7e26 100644
--- a/assets/apps/components/src/Controls/MultiSelect.js
+++ b/assets/apps/components/src/Controls/MultiSelect.js
@@ -52,6 +52,9 @@ const MultiSelect = ({ choices, onChange, currentValue, label }) => {
 				<Dropdown
 					className="dd-toggle"
 					focusOnMount={false}
+					popoverProps={{
+						inline: true,
+					}}
 					renderToggle={({ isOpen, onToggle }) => (
 						<Button
 							isSmall
diff --git a/bin/envs/cli-setup.sh b/bin/envs/cli-setup.sh
index f852c6998b..e1a98de0c5 100755
--- a/bin/envs/cli-setup.sh
+++ b/bin/envs/cli-setup.sh
@@ -22,7 +22,7 @@ init_environment(){
 	wp --allow-root theme install --activate $NEVE_LOCATION
 	wp --allow-root option update fresh_site 0
   echo "Installing Theme API Plugin"
-  wp --allow-root plugin install https://github.com/cristian-ungureanu/wp-thememods-api/archive/refs/heads/main.zip --force --activate
+  wp --allow-root plugin install https://github.com/codeinwp/wp-thememods-api/archive/refs/heads/main.zip --force --activate
 }
 
 
diff --git a/e2e-tests/playwright.config.ts b/e2e-tests/playwright.config.ts
index 427501183a..a60069d819 100644
--- a/e2e-tests/playwright.config.ts
+++ b/e2e-tests/playwright.config.ts
@@ -5,7 +5,7 @@ export default defineConfig({
 	forbidOnly: !!process.env.CI,
 	workers: process.env.CI ? 6 : undefined,
 	retries: 0,
-	timeout: parseInt(process.env.TIMEOUT || '', 10) || 100_000, // Defaults to 100 seconds.
+	timeout: parseInt(process.env.TIMEOUT || '', 10) || 150_000, // Defaults to 100 seconds.
 	fullyParallel: true,
 	projects: [
 		// Setup project
diff --git a/e2e-tests/specs/customizer/general/color-control.spec.ts b/e2e-tests/specs/customizer/general/color-control.spec.ts
index e6febef5ac..9a36a5a67d 100755
--- a/e2e-tests/specs/customizer/general/color-control.spec.ts
+++ b/e2e-tests/specs/customizer/general/color-control.spec.ts
@@ -11,7 +11,7 @@ test.describe('Color Control', () => {
 	});
 
 	test('Test Color Control - Front End', async ({ page }) => {
-		page.goto('/?test_name=colorControl');
+		await page.goto('/?test_name=colorControl');
 		await expect(
 			page.locator('.hide-on-mobile .header-main-inner')
 		).toHaveCSS('color', 'rgb(253, 143, 106)');
diff --git a/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts b/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts
index 0e7b28152d..6a71257c4a 100644
--- a/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts
+++ b/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts
@@ -36,7 +36,7 @@ test.describe('Custom Global Color Control', () => {
 		await page.locator('.block-editor-rich-text__editable').first().click();
 		// use Background color control to open the color picker, available since WP 6.1
 		await page.getByRole('button', { name: 'Background' }).click();
-		await page.getByRole('button', { name: 'Color: Custom 1' }).click();
+		await page.getByRole('option', { name: 'Color: Custom 1' }).click();
 		await page
 			.locator('.block-editor-panel-color-gradient-settings__color-name')
 			.getByText('Text')
@@ -72,6 +72,6 @@ test.describe('Custom Global Color Control', () => {
 		await page.goto('/hello-world/?test_name=custom-global-colors');
 		await expect(
 			await page.locator('.nv-content-wrap p').first()
-		).toHaveClass(/has-custom-1-color/);
+		).toHaveClass(/has-custom-1-background-color/);
 	});
 });
diff --git a/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-3-chromium.png b/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-3-chromium.png
index 7014305049..71976017db 100644
Binary files a/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-3-chromium.png and b/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-3-chromium.png differ
diff --git a/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-7-chromium.png b/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-7-chromium.png
index f60606ca40..9822e964ac 100644
Binary files a/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-7-chromium.png and b/e2e-tests/specs/visual-regression/starter-sites.spec.ts-snapshots/Starter-sites-check-Check-frontpage-7-chromium.png differ
diff --git a/e2e-tests/specs/woo-visual-regression/checkout.spec.ts b/e2e-tests/specs/woo-visual-regression/checkout.spec.ts
index e2578d4f7f..db8c6176ec 100644
--- a/e2e-tests/specs/woo-visual-regression/checkout.spec.ts
+++ b/e2e-tests/specs/woo-visual-regression/checkout.spec.ts
@@ -5,14 +5,21 @@ test.describe('Checkout page check', () => {
 		await page.goto('/product/album/');
 		await page.locator('.single_add_to_cart_button').click();
 		await page.goto('/checkout/');
-		await page.locator('#place_order').click();
+		await page.getByRole('button', { name: 'Place Order' }).click();
 		await page.waitForTimeout(1000);
-		await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.2 });
+		await page
+			.getByRole('heading', { name: 'Checkout' })
+			.scrollIntoViewIfNeeded();
+		await expect(page).toHaveScreenshot({
+			maxDiffPixelRatio: 0.2,
+		});
 	});
 
 	test('Check MyAccount errors', async ({ page }) => {
 		await page.goto('/my-account/edit-account/');
 		await page.locator('.woocommerce-Button').first().click();
-		await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.2 });
+		await expect(page).toHaveScreenshot({
+			maxDiffPixelRatio: 0.2,
+		});
 	});
 });
diff --git a/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-MyAccount-errors-1-chromium-linux.png b/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-MyAccount-errors-1-chromium-linux.png
index f302796acb..e6af98b8e3 100644
Binary files a/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-MyAccount-errors-1-chromium-linux.png and b/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-MyAccount-errors-1-chromium-linux.png differ
diff --git a/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-checkout-errors-1-chromium-linux.png b/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-checkout-errors-1-chromium-linux.png
index 0218d1e081..163ae3a267 100644
Binary files a/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-checkout-errors-1-chromium-linux.png and b/e2e-tests/specs/woo-visual-regression/checkout.spec.ts-snapshots/Checkout-page-check-Check-checkout-errors-1-chromium-linux.png differ