diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
index 6da5683d01..dece3a65f7 100644
--- a/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
+++ b/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
@@ -129,7 +129,7 @@ public function testQuickEditLinks() {
       $this->clickContextualLink($block_selector, "Quick edit");
       $this->waitForOffCanvasToOpen();
       // QuickEdit toolbar should be closed when opening off-canvas dialog.
-      $web_assert->elementNotExists('css', $quick_edit_selector);
+      $web_assert->waitForElementRemoved('css', $quick_edit_selector);
       // Open QuickEdit toolbar via contextual link while in Edit mode.
       $this->clickContextualLink($node_selector, "Quick edit", FALSE);
       $this->waitForOffCanvasToClose();
diff --git a/core/profiles/standard/config/optional/block.block.olivero_account_menu.yml b/core/themes/olivero/config/optional/block.block.olivero_account_menu.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_account_menu.yml
rename to core/themes/olivero/config/optional/block.block.olivero_account_menu.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_breadcrumbs.yml b/core/themes/olivero/config/optional/block.block.olivero_breadcrumbs.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_breadcrumbs.yml
rename to core/themes/olivero/config/optional/block.block.olivero_breadcrumbs.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_content.yml b/core/themes/olivero/config/optional/block.block.olivero_content.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_content.yml
rename to core/themes/olivero/config/optional/block.block.olivero_content.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_main_menu.yml b/core/themes/olivero/config/optional/block.block.olivero_main_menu.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_main_menu.yml
rename to core/themes/olivero/config/optional/block.block.olivero_main_menu.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_messages.yml b/core/themes/olivero/config/optional/block.block.olivero_messages.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_messages.yml
rename to core/themes/olivero/config/optional/block.block.olivero_messages.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_page_title.yml b/core/themes/olivero/config/optional/block.block.olivero_page_title.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_page_title.yml
rename to core/themes/olivero/config/optional/block.block.olivero_page_title.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_powered.yml b/core/themes/olivero/config/optional/block.block.olivero_powered.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_powered.yml
rename to core/themes/olivero/config/optional/block.block.olivero_powered.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_primary_local_tasks.yml b/core/themes/olivero/config/optional/block.block.olivero_primary_local_tasks.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_primary_local_tasks.yml
rename to core/themes/olivero/config/optional/block.block.olivero_primary_local_tasks.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_secondary_local_tasks.yml b/core/themes/olivero/config/optional/block.block.olivero_secondary_local_tasks.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_secondary_local_tasks.yml
rename to core/themes/olivero/config/optional/block.block.olivero_secondary_local_tasks.yml
diff --git a/core/profiles/standard/config/optional/block.block.olivero_site_branding.yml b/core/themes/olivero/config/optional/block.block.olivero_site_branding.yml
similarity index 100%
rename from core/profiles/standard/config/optional/block.block.olivero_site_branding.yml
rename to core/themes/olivero/config/optional/block.block.olivero_site_branding.yml