diff -u b/core/recipes/article_comment/recipe.yml b/core/recipes/article_comment/recipe.yml
--- b/core/recipes/article_comment/recipe.yml
+++ b/core/recipes/article_comment/recipe.yml
@@ -4,29 +4,3 @@
 recipes:
   - article_content_type
   - comment_comment_type
-#config:
-#  actions:
-#    core.entity_view_display.node.article.default:
-#      setComponent:
-#        comment:
-#        -
-#          type: comment_default
-#          label: above
-#          settings:
-#            view_mode: default
-#            pager_id: 0
-#          third_party_settings: {  }
-#          weight: 110
-#          region: content
-#    core.entity_view_display.node.article.teaser:
-#      removeComponent:
-#        comment
-#    core.entity_form_display.node.article.default:
-#      setComponent:
-#        comment:
-#        -
-#          type: comment_default
-#          weight: 20
-#          region: content
-#          settings: {  }
-#          third_party_settings: {  }
diff -u b/core/recipes/article_content_type/recipe.yml b/core/recipes/article_content_type/recipe.yml
--- b/core/recipes/article_content_type/recipe.yml
+++ b/core/recipes/article_content_type/recipe.yml
@@ -3,6 +3,7 @@
 type: 'Content type'
 recipes:
   - content_editor_role
+  - comment_comment_type
 install:
   - field
   - file
@@ -11,6 +12,7 @@
   - path
   - text
   - user
+  - comment
 config:
   import:
     node:
diff -u b/core/recipes/article_tags/recipe.yml b/core/recipes/article_tags/recipe.yml
--- b/core/recipes/article_tags/recipe.yml
+++ b/core/recipes/article_tags/recipe.yml
@@ -30,8 +30,6 @@
           third_party_settings: {  }
           weight: 10
           region: content
-      # removeComponent:
-      #   field_tags
     core.entity_view_display.node.article.default:
       setComponent:
         name: field_tags
reverted:
--- b/core/recipes/basic_html_editor/config/editor.editor.basic_html.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.basic_html
-  module:
-    - ckeditor5
-format: basic_html
-editor: ckeditor5
-settings:
-  toolbar:
-    items:
-      - bold
-      - italic
-      - '|'
-      - link
-      - '|'
-      - bulletedList
-      - numberedList
-      - '|'
-      - blockQuote
-      - drupalInsertImage
-      - '|'
-      - heading
-      - code
-      - '|'
-      - sourceEditing
-  plugins:
-    ckeditor5_heading:
-      enabled_headings:
-        - heading2
-        - heading3
-        - heading4
-        - heading5
-        - heading6
-    ckeditor5_imageResize:
-      allow_resize: true
-    ckeditor5_list:
-      properties:
-        reversed: false
-        startIndex: true
-      multiBlock: true
-    ckeditor5_sourceEditing:
-      allowed_tags:
-        - '<cite>'
-        - '<dl>'
-        - '<dt>'
-        - '<dd>'
-        - '<a hreflang>'
-        - '<blockquote cite>'
-        - '<ul type>'
-        - '<ol type>'
-        - '<h2 id>'
-        - '<h3 id>'
-        - '<h4 id>'
-        - '<h5 id>'
-        - '<h6 id>'
-image_upload:
-  status: true
-  scheme: public
-  directory: inline-images
-  max_size: ''
-  max_dimensions:
-    width: 0
-    height: 0
reverted:
--- b/core/recipes/basic_html_editor/recipe.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: 'Basic HTML editor'
-description: 'Provides "Basic HTML" text editor and related configuration.'
-type: 'Editor'
-install:
-  - editor
-  - ckeditor5
-recipes:
-  - basic_html_format
-config:
-  import:
-    ckeditor5: '*'
-    editor: '*'
-#  actions:
-#    filter.format.full_html:
-#      setFilterConfig:
-#        editor_file_reference:
-#        -
-#          id: editor_file_reference
-#          provider: editor
-#          status: true
-#          weight: 11
-#          settings: {  }
reverted:
--- b/core/recipes/basic_html_format/config/filter.format.basic_html.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - editor
-name: 'Basic HTML'
-format: basic_html
-weight: 0
-roles:
-  - authenticated
-filters:
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: true
-    weight: 7
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: true
-    weight: 8
-    settings: {  }
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: true
-    weight: -10
-    settings:
-      allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <a hreflang href> <blockquote cite> <ul type> <ol start type> <strong> <em> <code> <li> <img src alt data-entity-uuid data-entity-type height width data-caption data-align>'
-      filter_html_help: false
-      filter_html_nofollow: false
-  filter_html_image_secure:
-    id: filter_html_image_secure
-    provider: filter
-    status: true
-    weight: 9
-    settings: {  }
-  filter_image_lazy_load:
-    id: filter_image_lazy_load
-    provider: filter
-    status: true
-    weight: 15
-    settings: {  }
reverted:
--- b/core/recipes/basic_html_format/recipe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Basic HTML text format'
-description: 'Provides "Basic HTML" text format.'
-type: 'Text format'
-install:
-  - filter
reverted:
--- b/core/recipes/full_html_editor/config/editor.editor.full_html.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.full_html
-  module:
-    - ckeditor5
-format: full_html
-editor: ckeditor5
-settings:
-  toolbar:
-    items:
-      - bold
-      - italic
-      - strikethrough
-      - superscript
-      - subscript
-      - removeFormat
-      - '|'
-      - link
-      - '|'
-      - bulletedList
-      - numberedList
-      - '|'
-      - blockQuote
-      - drupalInsertImage
-      - insertTable
-      - horizontalLine
-      - '|'
-      - heading
-      - codeBlock
-      - '|'
-      - sourceEditing
-  plugins:
-    ckeditor5_codeBlock:
-      languages:
-        -
-          label: 'Plain text'
-          language: plaintext
-        -
-          label: C
-          language: c
-        -
-          label: 'C#'
-          language: cs
-        -
-          label: C++
-          language: cpp
-        -
-          label: CSS
-          language: css
-        -
-          label: Diff
-          language: diff
-        -
-          label: HTML
-          language: html
-        -
-          label: Java
-          language: java
-        -
-          label: JavaScript
-          language: javascript
-        -
-          label: PHP
-          language: php
-        -
-          label: Python
-          language: python
-        -
-          label: Ruby
-          language: ruby
-        -
-          label: TypeScript
-          language: typescript
-        -
-          label: XML
-          language: xml
-    ckeditor5_heading:
-      enabled_headings:
-        - heading2
-        - heading3
-        - heading4
-        - heading5
-        - heading6
-    ckeditor5_imageResize:
-      allow_resize: true
-    ckeditor5_list:
-      properties:
-        reversed: true
-        startIndex: true
-      multiBlock: true
-    ckeditor5_sourceEditing:
-      allowed_tags: {  }
-image_upload:
-  status: true
-  scheme: public
-  directory: inline-images
-  max_size: ''
-  max_dimensions:
-    width: 0
-    height: 0
reverted:
--- b/core/recipes/full_html_editor/recipe.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: 'Full HTML editor'
-description: 'Provides "Full HTML" text editor.'
-type: 'Editor'
-recipes:
-  - full_html_format
-install:
-  - ckeditor5
-  - editor
-config:
-  import:
-    ckeditor5: '*'
-    editor: '*'
-#  actions:
-#    filter.format.full_html:
-#      setFilterConfig:
-#        editor_file_reference:
-#        -
-#          id: editor_file_reference
-#          provider: editor
-#          status: true
-#          weight: 11
-#          settings: {  }
reverted:
--- b/core/recipes/full_html_format/config/filter.format.full_html.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - editor
-name: 'Full HTML'
-format: full_html
-weight: 2
-roles:
-  - administrator
-filters:
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: true
-    weight: 8
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: true
-    weight: 9
-    settings: {  }
-  filter_htmlcorrector:
-    id: filter_htmlcorrector
-    provider: filter
-    status: true
-    weight: 10
-    settings: {  }
-  filter_image_lazy_load:
-    id: filter_image_lazy_load
-    provider: filter
-    status: true
-    weight: 15
-    settings: {  }
reverted:
--- b/core/recipes/full_html_format/recipe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: 'Full HTML text format'
-description: 'Provides "Full HTML" text format.'
-type: 'Text format'
-install:
-  - filter
-config:
-  import:
-    filter: '*'
diff -u b/core/recipes/standard/recipe.yml b/core/recipes/standard/recipe.yml
--- b/core/recipes/standard/recipe.yml
+++ b/core/recipes/standard/recipe.yml
@@ -13,12 +13,14 @@
   - standard_roles
   - user_user_type
   - restricted_html_format
+  - core_recommended_performance
+  - core_recommended_maintenance
+  - core_recommended_themes
 install:
   - node
   - history
   - block
   - breakpoint
-  - ckeditor5
   - config
   - comment
   - contextual
@@ -26,15 +28,11 @@
   - menu_link_content
   - datetime
   - block_content
-  - editor
   - help
   - image
   - menu_ui
   - options
   - path
-  - page_cache
-  - dynamic_page_cache
-  - big_pipe
   - taxonomy
   - dblog
   - search
@@ -44,39 +42,8 @@
   - file
   - views
   - views_ui
-  - automated_cron
-  - announcements_feed
-  - olivero
-  - claro
 config:
   import:
-    claro:
-      - block.block.claro_breadcrumbs
-      - block.block.claro_content
-      - block.block.claro_help
-      - block.block.claro_local_actions
-      - block.block.claro_messages
-      - block.block.claro_page_title
-      - block.block.claro_primary_local_tasks
-      - block.block.claro_secondary_local_tasks
-    olivero:
-      - block.block.olivero_account_menu
-      - block.block.olivero_breadcrumbs
-      - block.block.olivero_content
-      - block.block.olivero_help
-      - block.block.olivero_main_menu
-      - block.block.olivero_messages
-      - block.block.olivero_page_title
-      - block.block.olivero_powered
-      - block.block.olivero_primary_admin_actions
-      - block.block.olivero_primary_local_tasks
-      - block.block.olivero_search_form_narrow
-      - block.block.olivero_search_form_wide
-      - block.block.olivero_secondary_local_tasks
-      - block.block.olivero_site_branding
-      - block.block.olivero_syndicate
-      - block_content.type.basic
-      - core.date_format.olivero_medium
     block_content:
       - field.storage.block_content.body
       - core.entity_view_mode.block_content.full
diff -u b/core/recipes/standard_editors/recipe.yml b/core/recipes/standard_editors/recipe.yml
--- b/core/recipes/standard_editors/recipe.yml
+++ b/core/recipes/standard_editors/recipe.yml
@@ -2,5 +2,5 @@
 description: 'Provides a standard set of WYSIWYG editors and accompanying text formats.'
 type: 'Editor'
 recipes:
-  - basic_html_editor
-  - full_html_editor
+  - basic_html_format_editor
+  - full_html_format_editor
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/basic_html_format_editor/config/editor.editor.basic_html.yml
@@ -0,0 +1,65 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - filter.format.basic_html
+  module:
+    - ckeditor5
+format: basic_html
+editor: ckeditor5
+settings:
+  toolbar:
+    items:
+      - bold
+      - italic
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalInsertImage
+      - '|'
+      - heading
+      - code
+      - '|'
+      - sourceEditing
+  plugins:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_imageResize:
+      allow_resize: true
+    ckeditor5_list:
+      properties:
+        reversed: false
+        startIndex: true
+      multiBlock: true
+    ckeditor5_sourceEditing:
+      allowed_tags:
+        - '<cite>'
+        - '<dl>'
+        - '<dt>'
+        - '<dd>'
+        - '<a hreflang>'
+        - '<blockquote cite>'
+        - '<ul type>'
+        - '<ol type>'
+        - '<h2 id>'
+        - '<h3 id>'
+        - '<h4 id>'
+        - '<h5 id>'
+        - '<h6 id>'
+image_upload:
+  status: true
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: 0
+    height: 0
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/basic_html_format_editor/config/filter.format.basic_html.yml
@@ -0,0 +1,50 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - editor
+name: 'Basic HTML'
+format: basic_html
+weight: 0
+roles:
+  - authenticated
+filters:
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: 11
+    settings: {  }
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: true
+    weight: 7
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: true
+    weight: 8
+    settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -10
+    settings:
+      allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <a hreflang href> <blockquote cite> <ul type> <ol start type> <strong> <em> <code> <li> <img src alt data-entity-uuid data-entity-type height width data-caption data-align>'
+      filter_html_help: false
+      filter_html_nofollow: false
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: true
+    weight: 9
+    settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: 15
+    settings: {  }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/basic_html_format_editor/recipe.yml
@@ -0,0 +1,7 @@
+name: 'Basic HTML format editor'
+description: 'Provides "Basic HTML" text format along with WYSIWYG editor and related configuration.'
+type: 'Text format editor'
+install:
+  - ckeditor5
+  - editor
+  - filter
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/core_recommended_maintenance/recipe.yml
@@ -0,0 +1,6 @@
+name: 'Maintenance recipe'
+description: 'Core recommended maintenance related recipe.'
+type: 'Maintenance'
+install:
+  - automated_cron
+  - announcements_feed
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/core_recommended_performance/recipe.yml
@@ -0,0 +1,7 @@
+name: 'Performance recipe'
+description: 'Core recommended performance related recipe.'
+type: 'Performance'
+install:
+  - page_cache
+  - dynamic_page_cache
+  - big_pipe
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/core_recommended_themes/recipe.yml
@@ -0,0 +1,39 @@
+name: 'Recommended themes'
+description: 'Core recommended themes.'
+type: 'Themes'
+install:
+  - olivero
+  - claro
+  - help
+  - search
+  - block
+  - node
+config:
+  import:
+    claro:
+      - block.block.claro_breadcrumbs
+      - block.block.claro_content
+      - block.block.claro_help
+      - block.block.claro_local_actions
+      - block.block.claro_messages
+      - block.block.claro_page_title
+      - block.block.claro_primary_local_tasks
+      - block.block.claro_secondary_local_tasks
+    olivero:
+      - block.block.olivero_account_menu
+      - block.block.olivero_breadcrumbs
+      - block.block.olivero_content
+      - block.block.olivero_help
+      - block.block.olivero_main_menu
+      - block.block.olivero_messages
+      - block.block.olivero_page_title
+      - block.block.olivero_powered
+      - block.block.olivero_primary_admin_actions
+      - block.block.olivero_primary_local_tasks
+      - block.block.olivero_search_form_narrow
+      - block.block.olivero_search_form_wide
+      - block.block.olivero_secondary_local_tasks
+      - block.block.olivero_site_branding
+      - block.block.olivero_syndicate
+      - block_content.type.basic
+      - core.date_format.olivero_medium
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/full_html_format_editor/config/editor.editor.full_html.yml
@@ -0,0 +1,102 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - filter.format.full_html
+  module:
+    - ckeditor5
+format: full_html
+editor: ckeditor5
+settings:
+  toolbar:
+    items:
+      - bold
+      - italic
+      - strikethrough
+      - superscript
+      - subscript
+      - removeFormat
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalInsertImage
+      - insertTable
+      - horizontalLine
+      - '|'
+      - heading
+      - codeBlock
+      - '|'
+      - sourceEditing
+  plugins:
+    ckeditor5_codeBlock:
+      languages:
+        -
+          label: 'Plain text'
+          language: plaintext
+        -
+          label: C
+          language: c
+        -
+          label: 'C#'
+          language: cs
+        -
+          label: C++
+          language: cpp
+        -
+          label: CSS
+          language: css
+        -
+          label: Diff
+          language: diff
+        -
+          label: HTML
+          language: html
+        -
+          label: Java
+          language: java
+        -
+          label: JavaScript
+          language: javascript
+        -
+          label: PHP
+          language: php
+        -
+          label: Python
+          language: python
+        -
+          label: Ruby
+          language: ruby
+        -
+          label: TypeScript
+          language: typescript
+        -
+          label: XML
+          language: xml
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_imageResize:
+      allow_resize: true
+    ckeditor5_list:
+      properties:
+        reversed: true
+        startIndex: true
+      multiBlock: true
+    ckeditor5_sourceEditing:
+      allowed_tags: {  }
+image_upload:
+  status: true
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: 0
+    height: 0
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/full_html_format_editor/config/filter.format.full_html.yml
@@ -0,0 +1,41 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - editor
+name: 'Full HTML'
+format: full_html
+weight: 2
+roles:
+  - administrator
+filters:
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: 11
+    settings: {  }
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: true
+    weight: 8
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: true
+    weight: 9
+    settings: {  }
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: true
+    weight: 10
+    settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: 15
+    settings: {  }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/recipes/full_html_format_editor/recipe.yml
@@ -0,0 +1,7 @@
+name: 'Full HTML format editor'
+description: 'Provides "Full HTML" text format along with WYSIWYG editor and related configuration.'
+type: 'Text format editor'
+install:
+  - ckeditor5
+  - editor
+  - filter