diff --git a/core/drupalci.yml b/core/drupalci.yml
index 94aa2ad22f..bdc1f55771 100644
--- a/core/drupalci.yml
+++ b/core/drupalci.yml
@@ -4,43 +4,4 @@
 build:
   assessment:
     testing:
-      # Run code quality checks.
-      container_command.commit-checks:
-        commands:
-          - "core/scripts/dev/commit-code-check.sh --drupalci"
-        halt-on-fail: true
-      # run_tests task is executed several times in order of performance speeds.
-      # halt-on-fail can be set on the run_tests tasks in order to fail fast.
-      # suppress-deprecations is false in order to be alerted to usages of
-      # deprecated code.
-      run_tests.phpunit:
-        types: 'PHPUnit-Unit'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.kernel:
-        types: 'PHPUnit-Kernel'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.build:
-        # Limit concurrency due to disk space concerns.
-        concurrency: 15
-        types: 'PHPUnit-Build'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.functional:
-        types: 'PHPUnit-Functional'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.javascript:
-        concurrency: 15
-        types: 'PHPUnit-FunctionalJavascript'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      # Run nightwatch testing.
-      # @see https://www.drupal.org/project/drupal/issues/2869825
       nightwatchjs: {}
diff --git a/core/modules/comment/tests/src/Functional/CommentPreviewTest.php b/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
index 23222f1fb5..f54f7d0542 100644
--- a/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
@@ -121,7 +121,7 @@ public function testCommentPreviewDuplicateSubmission() {
     // Store the content of this page.
     $this->submitForm([], 'Save');
     $this->assertSession()->pageTextContains('Your comment has been posted.');
-    $elements = $this->xpath('//section[contains(@class, "comment-wrapper")]/article');
+    $elements = $this->xpath('//section[contains(@class, "comments")]/article');
     $this->assertCount(1, $elements);
 
     // Go back and re-submit the form.
@@ -129,7 +129,7 @@ public function testCommentPreviewDuplicateSubmission() {
     $submit_button = $this->assertSession()->buttonExists('Save');
     $submit_button->click();
     $this->assertSession()->pageTextContains('Your comment has been posted.');
-    $this->assertSession()->elementsCount('xpath', '//section[contains(@class, "comment-wrapper")]/article', 2);
+    $this->assertSession()->elementsCount('xpath', '//section[contains(@class, "comments")]/article', 2);
   }
 
   /**
@@ -156,7 +156,7 @@ public function testCommentEditPreviewSave() {
     $edit['date[date]'] = $date->format('Y-m-d');
     $edit['date[time]'] = $date->format('H:i:s');
     $raw_date = $date->getTimestamp();
-    $expected_text_date = $this->container->get('date.formatter')->format($raw_date);
+    $expected_text_date = $this->container->get('date.formatter')->formatInterval(\Drupal::time()->getRequestTime() - $raw_date);
     $expected_form_date = $date->format('Y-m-d');
     $expected_form_time = $date->format('H:i:s');
     $comment = $this->postComment($this->node, $edit['subject[0][value]'], $edit['comment_body[0][value]'], TRUE);
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index 93d6a28985..d14d64ca56 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -70,7 +70,7 @@ protected function getSourceBasePath() {
    */
   protected function getEntityCounts() {
     return [
-      'block' => 34,
+      'block' => 36,
       'block_content' => 2,
       'block_content_type' => 1,
       'comment' => 8,
@@ -104,7 +104,7 @@ protected function getEntityCounts() {
       'user_role' => 7,
       'menu_link_content' => 10,
       'view' => 14,
-      'date_format' => 11,
+      'date_format' => 12,
       'entity_form_display' => 31,
       'entity_form_mode' => 1,
       'entity_view_display' => 58,
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index b8690c2d76..fa601ee9de 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -73,7 +73,7 @@ protected function getSourceBasePath() {
    */
   protected function getEntityCounts() {
     return [
-      'block' => 25,
+      'block' => 27,
       'block_content' => 1,
       'block_content_type' => 1,
       'comment' => 4,
@@ -107,7 +107,7 @@ protected function getEntityCounts() {
       'user_role' => 4,
       'menu_link_content' => 12,
       'view' => 14,
-      'date_format' => 11,
+      'date_format' => 12,
       'entity_form_display' => 24,
       'entity_form_mode' => 1,
       'entity_view_display' => 34,
diff --git a/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
index 73a2d2875f..96acf10a54 100644
--- a/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
@@ -13,13 +13,14 @@
  *
  * @group Cache
  * @see \Drupal\Tests\page_cache\Functional\PageCacheTest
- * @see \Drupal\node\Tests\NodePageCacheTest
- * @see \Drupal\menu_ui\Tests\MenuTest::testMenuBlockPageCacheTags()
  */
 class PageCacheTagsIntegrationTest extends BrowserTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   protected $profile = 'standard';
 
   protected $dumpHeaders = TRUE;
@@ -80,6 +81,7 @@ public function testPageCacheTags() {
       // These two cache contexts are added by BigPipe.
       'cookies:big_pipe_nojs',
       'session.exists',
+      'user.permissions',
       'user.roles:authenticated',
     ];
 
@@ -90,29 +92,28 @@ public function testPageCacheTags() {
       'block_view',
       'local_task',
       'config:block_list',
-      'config:block.block.bartik_branding',
-      'config:block.block.bartik_breadcrumbs',
-      'config:block.block.bartik_content',
-      'config:block.block.bartik_tools',
-      'config:block.block.bartik_footer',
-      'config:block.block.bartik_help',
-      'config:block.block.bartik_search',
+      'config:block.block.olivero_site_branding',
+      'config:block.block.olivero_breadcrumbs',
+      'config:block.block.olivero_content',
+      'config:block.block.olivero_help',
+      'config:block.block.olivero_search_form_narrow',
+      'config:block.block.olivero_search_form_wide',
       'config:block.block.' . $block->id(),
-      'config:block.block.bartik_powered',
-      'config:block.block.bartik_main_menu',
-      'config:block.block.bartik_account_menu',
-      'config:block.block.bartik_messages',
-      'config:block.block.bartik_local_actions',
-      'config:block.block.bartik_local_tasks',
-      'config:block.block.bartik_page_title',
+      'config:block.block.olivero_powered',
+      'config:block.block.olivero_main_menu',
+      'config:block.block.olivero_account_menu',
+      'config:block.block.olivero_messages',
+      'config:block.block.olivero_primary_local_tasks',
+      'config:block.block.olivero_secondary_local_tasks',
+      'config:block.block.olivero_syndicate',
+      'config:block.block.primary_admin_actions',
+      'config:block.block.olivero_page_title',
       'node_view',
       'node:' . $node_1->id(),
       'user:' . $author_1->id(),
       'config:filter.format.basic_html',
-      'config:node_type_list',
+      'config:search.settings',
       'config:system.menu.account',
-      'config:system.menu.tools',
-      'config:system.menu.footer',
       'config:system.menu.main',
       'config:system.site',
       // FinishResponseSubscriber adds this cache tag to responses that have the
@@ -130,29 +131,28 @@ public function testPageCacheTags() {
       'block_view',
       'local_task',
       'config:block_list',
-      'config:block.block.bartik_branding',
-      'config:block.block.bartik_breadcrumbs',
-      'config:block.block.bartik_content',
-      'config:block.block.bartik_tools',
-      'config:block.block.bartik_help',
-      'config:block.block.bartik_search',
+      'config:block.block.olivero_site_branding',
+      'config:block.block.olivero_breadcrumbs',
+      'config:block.block.olivero_content',
+      'config:block.block.olivero_help',
+      'config:block.block.olivero_search_form_narrow',
+      'config:block.block.olivero_search_form_wide',
       'config:block.block.' . $block->id(),
-      'config:block.block.bartik_footer',
-      'config:block.block.bartik_powered',
-      'config:block.block.bartik_main_menu',
-      'config:block.block.bartik_account_menu',
-      'config:block.block.bartik_messages',
-      'config:block.block.bartik_local_actions',
-      'config:block.block.bartik_local_tasks',
-      'config:block.block.bartik_page_title',
+      'config:block.block.olivero_powered',
+      'config:block.block.olivero_main_menu',
+      'config:block.block.olivero_account_menu',
+      'config:block.block.olivero_messages',
+      'config:block.block.olivero_primary_local_tasks',
+      'config:block.block.olivero_secondary_local_tasks',
+      'config:block.block.olivero_syndicate',
+      'config:block.block.primary_admin_actions',
+      'config:block.block.olivero_page_title',
       'node_view',
       'node:' . $node_2->id(),
       'user:' . $author_2->id(),
       'config:filter.format.full_html',
-      'config:node_type_list',
+      'config:search.settings',
       'config:system.menu.account',
-      'config:system.menu.tools',
-      'config:system.menu.footer',
       'config:system.menu.main',
       'config:system.site',
       'comment_list',
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/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php b/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php
index 74d9aa49c4..0edf193c98 100644
--- a/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php
+++ b/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php
@@ -50,14 +50,14 @@ protected function getEntityCounts() {
     return [
       'action' => 21,
       'base_field_override' => 2,
-      'block' => 30,
+      'block' => 31,
       'block_content' => 0,
       'block_content_type' => 1,
       'comment' => 0,
       'comment_type' => 5,
       'contact_form' => 2,
       'contact_message' => 0,
-      'date_format' => 11,
+      'date_format' => 12,
       'editor' => 2,
       'entity_form_display' => 11,
       'entity_form_mode' => 1,
diff --git a/core/themes/olivero/config/install/block.block.olivero_secondary_local_tasks.yml b/core/modules/system/tests/modules/olivero_test/config/optional/block.block.olivero_secondary_local_tasks.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_secondary_local_tasks.yml
rename to core/modules/system/tests/modules/olivero_test/config/optional/block.block.olivero_secondary_local_tasks.yml
diff --git a/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php b/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
index 18be520369..7be89a1b63 100644
--- a/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
+++ b/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
@@ -100,7 +100,7 @@ protected function assertBreadcrumbParts($trail) {
    */
   protected function getBreadcrumbParts() {
     $parts = [];
-    $elements = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]/ol/li/a');
+    $elements = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]//ol/li/a');
     if (!empty($elements)) {
       foreach ($elements as $element) {
         $parts[] = [
diff --git a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index 1246112571..5533d4b825 100644
--- a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -55,11 +55,15 @@ protected function setUp(): void {
 
     // This test puts menu links in the Tools menu and then tests for their
     // presence on the page, so we need to ensure that the Tools block will be
-    // displayed in the admin theme.
+    // displayed in the admin theme and olivero.
     $this->drupalPlaceBlock('system_menu_block:tools', [
       'region' => 'content',
       'theme' => $this->config('system.theme')->get('admin'),
     ]);
+    $this->drupalPlaceBlock('system_menu_block:tools', [
+      'region' => 'content',
+      'theme' => 'olivero',
+    ]);
   }
 
   /**
@@ -298,8 +302,8 @@ public function testBreadCrumbs() {
       // untranslated menu links automatically generated from menu router items
       // ('taxonomy/term/%') should never be translated and appear in any menu
       // other than the breadcrumb trail.
-      $elements = $this->xpath('//nav[@id=:menu]/descendant::a[@href=:href]', [
-        ':menu' => 'block-bartik-tools',
+      $elements = $this->xpath('//nav[contains(@class, :menu-class)]/descendant::a[@href=:href]', [
+        ':menu-class' => 'menu--tools',
         ':href' => Url::fromUri('base:' . $link_path)->toString(),
       ]);
       $this->assertCount(1, $elements, "Link to {$link_path} appears only once.");
@@ -422,7 +426,7 @@ public function testAssertBreadcrumbTrait() {
 
     // Remove the breadcrumb block to test the trait when breadcrumbs are not
     // shown.
-    Block::load('bartik_breadcrumbs')->delete();
+    Block::load('olivero_breadcrumbs')->delete();
 
     // If there is no trail, this should pass as there is no breadcrumb.
     $this->assertBreadcrumb('menu-test/breadcrumb1', []);
diff --git a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
deleted file mode 100644
index 0a88322e7b..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.account
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_account_menu
-theme: bartik
-region: secondary_menu
-weight: 0
-provider: null
-plugin: 'system_menu_block:account'
-settings:
-  id: 'system_menu_block:account'
-  label: 'User account menu'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 1
-  expand_all_items: false
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_branding.yml b/core/profiles/standard/config/install/block.block.bartik_branding.yml
deleted file mode 100644
index 2846213b91..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_branding.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_branding
-theme: bartik
-region: header
-weight: 0
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: true
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
deleted file mode 100644
index 5d036c5f48..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_breadcrumbs
-theme: bartik
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_content.yml b/core/profiles/standard/config/install/block.block.bartik_content.yml
deleted file mode 100644
index 007a65b827..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_content.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_content
-theme: bartik
-region: content
-weight: 0
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml
deleted file mode 100644
index 87ea1193b4..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_footer.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.footer
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_footer
-theme: bartik
-region: footer_fifth
-weight: 0
-provider: null
-plugin: 'system_menu_block:footer'
-settings:
-  id: 'system_menu_block:footer'
-  label: 'Footer menu'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 0
-  expand_all_items: false
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml
deleted file mode 100644
index 9d52ab412a..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_help.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - bartik
-id: bartik_help
-theme: bartik
-region: content
-weight: -30
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml
deleted file mode 100644
index cd2e4e2063..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bartik
-id: bartik_local_actions
-theme: bartik
-region: content
-weight: -20
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
deleted file mode 100644
index ddc3454a4a..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_main_menu
-theme: bartik
-region: primary_menu
-weight: 0
-provider: null
-plugin: 'system_menu_block:main'
-settings:
-  id: 'system_menu_block:main'
-  label: 'Main navigation'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 1
-  expand_all_items: false
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_messages.yml b/core/profiles/standard/config/install/block.block.bartik_messages.yml
deleted file mode 100644
index f5d3cc2ab9..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_messages.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_messages
-theme: bartik
-region: highlighted
-weight: 0
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_page_title.yml b/core/profiles/standard/config/install/block.block.bartik_page_title.yml
deleted file mode 100644
index 26eadb6b08..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_page_title.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bartik
-id: bartik_page_title
-theme: bartik
-region: content
-weight: -50
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_powered.yml b/core/profiles/standard/config/install/block.block.bartik_powered.yml
deleted file mode 100644
index 447b92630c..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_powered.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_powered
-theme: bartik
-region: footer_fifth
-weight: 10
-provider: null
-plugin: system_powered_by_block
-settings:
-  id: system_powered_by_block
-  label: 'Powered by Drupal'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_search.yml b/core/profiles/standard/config/install/block.block.bartik_search.yml
deleted file mode 100644
index 6e11e33439..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_search.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - search
-  theme:
-    - bartik
-id: bartik_search
-theme: bartik
-region: sidebar_first
-weight: -1
-provider: null
-plugin: search_form_block
-settings:
-  id: search_form_block
-  label: Search
-  label_display: visible
-  provider: search
-  page_id: node_search
-visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.bartik_tools.yml b/core/profiles/standard/config/install/block.block.bartik_tools.yml
deleted file mode 100644
index baf222491f..0000000000
--- a/core/profiles/standard/config/install/block.block.bartik_tools.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.tools
-  module:
-    - system
-  theme:
-    - bartik
-id: bartik_tools
-theme: bartik
-region: sidebar_first
-weight: 0
-provider: null
-plugin: 'system_menu_block:tools'
-settings:
-  id: 'system_menu_block:tools'
-  label: Tools
-  label_display: visible
-  provider: system
-  level: 1
-  depth: 0
-  expand_all_items: false
-visibility: {  }
diff --git a/core/profiles/standard/config/install/system.theme.yml b/core/profiles/standard/config/install/system.theme.yml
index 4e59d20b0a..24b0bae04e 100644
--- a/core/profiles/standard/config/install/system.theme.yml
+++ b/core/profiles/standard/config/install/system.theme.yml
@@ -1,2 +1,2 @@
 admin: claro
-default: bartik
+default: olivero
diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml
index 073a4f4843..e6af5c213a 100644
--- a/core/profiles/standard/standard.info.yml
+++ b/core/profiles/standard/standard.info.yml
@@ -37,5 +37,5 @@ install:
   - tour
   - automated_cron
 themes:
-  - bartik
+  - olivero
   - claro
diff --git a/core/profiles/standard/tests/src/Functional/StandardTest.php b/core/profiles/standard/tests/src/Functional/StandardTest.php
index 667dd752cb..4aa21f1486 100644
--- a/core/profiles/standard/tests/src/Functional/StandardTest.php
+++ b/core/profiles/standard/tests/src/Functional/StandardTest.php
@@ -38,9 +38,7 @@ class StandardTest extends BrowserTestBase {
    */
   public function testStandard() {
     $this->drupalGet('');
-    $this->assertSession()->linkExists('Contact');
-    $this->clickLink('Contact');
-    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextContains('Powered by Drupal');
 
     // Test anonymous user can access 'Main navigation' block.
     $this->adminUser = $this->drupalCreateUser([
@@ -52,9 +50,9 @@ public function testStandard() {
     ]);
     $this->drupalLogin($this->adminUser);
     // Configure the block.
-    $this->drupalGet('admin/structure/block/add/system_menu_block:main/bartik');
+    $this->drupalGet('admin/structure/block/add/system_menu_block:main/olivero');
     $this->submitForm([
-      'region' => 'sidebar_first',
+      'region' => 'sidebar',
       'id' => 'main_navigation',
     ], 'Save block');
     // Verify admin user can see the block.
@@ -63,7 +61,7 @@ public function testStandard() {
 
     // Verify we have role = complementary on help_block blocks.
     $this->drupalGet('admin/structure/block');
-    $this->assertSession()->elementAttributeContains('xpath', "//div[@id='block-bartik-help']", 'role', 'complementary');
+    $this->assertSession()->elementAttributeContains('xpath', "//div[@id='block-olivero-help']", 'role', 'complementary');
 
     // Verify anonymous user can see the block.
     $this->drupalLogout();
diff --git a/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php b/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
index 466c537359..0f758a885b 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
@@ -18,13 +18,9 @@ class StandardInstallerTest extends ConfigAfterInstallerTestBase {
    * Ensures that the user page is available after installation.
    */
   public function testInstaller() {
-    // Verify that the Standard install profile's default frontpage appears.
-    $this->assertSession()->pageTextContains('No front page content has been created yet.');
-    // Ensure that the contact link enabled in standard_install() works as
-    // expected.
-    $this->clickLink('Contact');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('contact');
+    // Verify that Olivero's default frontpage appears.
+    $this->assertSession()->pageTextContains('Congratulations and welcome to the Drupal community!');
+    $this->assertSession()->elementTextContains('css', '#block-olivero-powered', 'Powered by Drupal');
   }
 
   /**
@@ -32,7 +28,7 @@ public function testInstaller() {
    */
   protected function setUpSite() {
     // Test that the correct theme is being used.
-    $this->assertSession()->responseNotContains('bartik');
+    $this->assertSession()->responseNotContains('olivero');
     $this->assertSession()->responseContains('themes/seven/css/theme/install-page.css');
     parent::setUpSite();
   }
diff --git a/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php b/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php
index fff24199df..4a0e8d09d4 100644
--- a/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php
+++ b/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php
@@ -25,9 +25,9 @@ class OliveroTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp(): void {
-    parent::setUp();
-  }
+  protected static $modules = [
+    'olivero_test',
+  ];
 
   /**
    * Tests that the Olivero theme always adds base library files.
diff --git a/core/themes/olivero/config/install/block.block.olivero_account_menu.yml b/core/themes/olivero/config/optional/block.block.olivero_account_menu.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_account_menu.yml
rename to core/themes/olivero/config/optional/block.block.olivero_account_menu.yml
diff --git a/core/themes/olivero/config/install/block.block.olivero_breadcrumbs.yml b/core/themes/olivero/config/optional/block.block.olivero_breadcrumbs.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_breadcrumbs.yml
rename to core/themes/olivero/config/optional/block.block.olivero_breadcrumbs.yml
diff --git a/core/themes/olivero/config/install/block.block.olivero_content.yml b/core/themes/olivero/config/optional/block.block.olivero_content.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_content.yml
rename to core/themes/olivero/config/optional/block.block.olivero_content.yml
diff --git a/core/themes/olivero/config/install/block.block.olivero_main_menu.yml b/core/themes/olivero/config/optional/block.block.olivero_main_menu.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_main_menu.yml
rename to core/themes/olivero/config/optional/block.block.olivero_main_menu.yml
diff --git a/core/themes/olivero/config/install/block.block.olivero_messages.yml b/core/themes/olivero/config/optional/block.block.olivero_messages.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_messages.yml
rename to core/themes/olivero/config/optional/block.block.olivero_messages.yml
diff --git a/core/themes/olivero/config/install/block.block.olivero_page_title.yml b/core/themes/olivero/config/optional/block.block.olivero_page_title.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_page_title.yml
rename to core/themes/olivero/config/optional/block.block.olivero_page_title.yml
diff --git a/core/themes/olivero/config/install/block.block.olivero_powered.yml b/core/themes/olivero/config/optional/block.block.olivero_powered.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_powered.yml
rename to core/themes/olivero/config/optional/block.block.olivero_powered.yml
diff --git a/core/themes/olivero/config/install/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/themes/olivero/config/install/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/install/block.block.bartik_local_tasks.yml b/core/themes/olivero/config/optional/block.block.olivero_secondary_local_tasks.yml
similarity index 58%
rename from core/profiles/standard/config/install/block.block.bartik_local_tasks.yml
rename to core/themes/olivero/config/optional/block.block.olivero_secondary_local_tasks.yml
index 11d56655d1..8c124da997 100644
--- a/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml
+++ b/core/themes/olivero/config/optional/block.block.olivero_secondary_local_tasks.yml
@@ -2,18 +2,18 @@ langcode: en
 status: true
 dependencies:
   theme:
-    - bartik
-id: bartik_local_tasks
-theme: bartik
-region: content
-weight: -40
+    - olivero
+id: olivero_secondary_local_tasks
+theme: olivero
+region: highlighted
+weight: -2
 provider: null
 plugin: local_tasks_block
 settings:
   id: local_tasks_block
-  label: Tabs
-  label_display: '0'
+  label: 'Secondary tabs'
   provider: core
-  primary: true
+  label_display: '0'
+  primary: false
   secondary: true
 visibility: {  }
diff --git a/core/themes/olivero/config/install/block.block.olivero_site_branding.yml b/core/themes/olivero/config/optional/block.block.olivero_site_branding.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.olivero_site_branding.yml
rename to core/themes/olivero/config/optional/block.block.olivero_site_branding.yml
diff --git a/core/themes/olivero/config/install/block.block.primary_admin_actions.yml b/core/themes/olivero/config/optional/block.block.primary_admin_actions.yml
similarity index 100%
rename from core/themes/olivero/config/install/block.block.primary_admin_actions.yml
rename to core/themes/olivero/config/optional/block.block.primary_admin_actions.yml