diff --git a/core/modules/action/migration_templates/action_settings.yml b/core/modules/action/migration_templates/action_settings.yml
index df69e33..3bb94f8 100644
--- a/core/modules/action/migration_templates/action_settings.yml
+++ b/core/modules/action/migration_templates/action_settings.yml
@@ -3,6 +3,7 @@ label: Action configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/action/migration_templates/d6_action.yml b/core/modules/action/migration_templates/d6_action.yml
index 592ed18..5902ed8 100644
--- a/core/modules/action/migration_templates/d6_action.yml
+++ b/core/modules/action/migration_templates/d6_action.yml
@@ -2,6 +2,7 @@ id: d6_action
 label: Actions
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: action
 process:
diff --git a/core/modules/action/migration_templates/d7_action.yml b/core/modules/action/migration_templates/d7_action.yml
index 03b869a..9d5e2de 100644
--- a/core/modules/action/migration_templates/d7_action.yml
+++ b/core/modules/action/migration_templates/d7_action.yml
@@ -2,6 +2,7 @@ id: d7_action
 label: Actions
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: action
 process:
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
index cad1553..9be0bdf 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
@@ -2,6 +2,7 @@ id: d6_aggregator_feed
 label: Aggregator feeds
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: aggregator_feed
 process:
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
index e14dbd6..456e69b 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
@@ -2,6 +2,7 @@ id: d6_aggregator_item
 label: Aggregator items
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: aggregator_item
 process:
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
index 72372e4..237a96c 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
@@ -2,6 +2,7 @@ id: d6_aggregator_settings
 label: Aggregator configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
index 5dbeb25..7b6ff67 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
@@ -2,6 +2,7 @@ id: d7_aggregator_feed
 label: Aggregator feeds
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: aggregator_feed
 process:
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_item.yml b/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
index 054ba43..89eda73 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
@@ -2,6 +2,7 @@ id: d7_aggregator_item
 label: Aggregator items
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: aggregator_item
 process:
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
index c8c793f..2710b27 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
@@ -2,6 +2,7 @@ id: d7_aggregator_settings
 label: Aggregator configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/ban/migration_templates/d7_blocked_ips.yml b/core/modules/ban/migration_templates/d7_blocked_ips.yml
index 0122dc6..ce85b54 100644
--- a/core/modules/ban/migration_templates/d7_blocked_ips.yml
+++ b/core/modules/ban/migration_templates/d7_blocked_ips.yml
@@ -2,6 +2,7 @@ id: d7_blocked_ips
 label: Blocked IPs
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_blocked_ips
 process:
diff --git a/core/modules/block/migration_templates/d6_block.yml b/core/modules/block/migration_templates/d6_block.yml
index 1386b18..abe4fb5 100644
--- a/core/modules/block/migration_templates/d6_block.yml
+++ b/core/modules/block/migration_templates/d6_block.yml
@@ -2,6 +2,7 @@ id: d6_block
 label: Blocks
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: block
 process:
diff --git a/core/modules/block/migration_templates/d7_block.yml b/core/modules/block/migration_templates/d7_block.yml
index 96b204e..154f635 100644
--- a/core/modules/block/migration_templates/d7_block.yml
+++ b/core/modules/block/migration_templates/d7_block.yml
@@ -2,6 +2,7 @@ id: d7_block
 label: Blocks
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: block
 process:
diff --git a/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migration_templates/block_content_body_field.yml
index b51d032..00a0fee 100644
--- a/core/modules/block_content/migration_templates/block_content_body_field.yml
+++ b/core/modules/block_content/migration_templates/block_content_body_field.yml
@@ -3,6 +3,7 @@ label: Block content body field configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migration_templates/block_content_entity_display.yml b/core/modules/block_content/migration_templates/block_content_entity_display.yml
index 06a35d7..9e6d6e7 100644
--- a/core/modules/block_content/migration_templates/block_content_entity_display.yml
+++ b/core/modules/block_content/migration_templates/block_content_entity_display.yml
@@ -3,6 +3,7 @@ label: Body field display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migration_templates/block_content_entity_form_display.yml b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml
index 92b5a10..9cded03 100644
--- a/core/modules/block_content/migration_templates/block_content_entity_form_display.yml
+++ b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml
@@ -3,6 +3,7 @@ label: Body field form display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migration_templates/block_content_type.yml
index bc75eea..362c743 100644
--- a/core/modules/block_content/migration_templates/block_content_type.yml
+++ b/core/modules/block_content/migration_templates/block_content_type.yml
@@ -3,6 +3,7 @@ label: Block content type
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migration_templates/d6_custom_block.yml b/core/modules/block_content/migration_templates/d6_custom_block.yml
index 55fbcb5..54a5603 100644
--- a/core/modules/block_content/migration_templates/d6_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -2,6 +2,7 @@ id: d6_custom_block
 label: Custom blocks
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_box
 process:
diff --git a/core/modules/block_content/migration_templates/d7_custom_block.yml b/core/modules/block_content/migration_templates/d7_custom_block.yml
index ca06cf0..09d5706 100644
--- a/core/modules/block_content/migration_templates/d7_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d7_custom_block.yml
@@ -2,6 +2,7 @@ id: d7_custom_block
 label: Custom blocks
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_block_custom
 process:
diff --git a/core/modules/book/migration_templates/d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
index 94d7a8f..8964ba0 100644
--- a/core/modules/book/migration_templates/d6_book.yml
+++ b/core/modules/book/migration_templates/d6_book.yml
@@ -2,6 +2,7 @@ id: d6_book
 label: Books
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_book
 process:
diff --git a/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml
index 16e6695..3288ce9 100644
--- a/core/modules/book/migration_templates/d6_book_settings.yml
+++ b/core/modules/book/migration_templates/d6_book_settings.yml
@@ -2,6 +2,7 @@ id: d6_book_settings
 label: Book configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/comment/migration_templates/d6_comment.yml b/core/modules/comment/migration_templates/d6_comment.yml
index 06820d4..6d8f619 100644
--- a/core/modules/comment/migration_templates/d6_comment.yml
+++ b/core/modules/comment/migration_templates/d6_comment.yml
@@ -2,6 +2,7 @@ id: d6_comment
 label: Comments
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_comment
   constants:
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
index c650673..3881366 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
@@ -2,6 +2,7 @@ id: d6_comment_entity_display
 label: Comment display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_comment_variable
   constants:
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
index c33685f..cb65061 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d6_comment_entity_form_display
 label: Comment field form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_comment_variable
   constants:
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
index abe6191..200cfe2 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
@@ -2,6 +2,7 @@ id: d6_comment_entity_form_display_subject
 label: Comment subject form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_comment_variable_per_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml
index d14d1aa..da1ffd5 100644
--- a/core/modules/comment/migration_templates/d6_comment_field.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field.yml
@@ -2,6 +2,7 @@ id: d6_comment_field
 label: Comment field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_comment_variable_per_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d6_comment_field_instance.yml b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
index d708619..e802079 100644
--- a/core/modules/comment/migration_templates/d6_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_comment_field_instance
 label: Comment field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_comment_variable
   constants:
diff --git a/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml
index 69a2bd8..5e9b377 100644
--- a/core/modules/comment/migration_templates/d6_comment_type.yml
+++ b/core/modules/comment/migration_templates/d6_comment_type.yml
@@ -2,6 +2,7 @@ id: d6_comment_type
 label: Comment type
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_comment_variable_per_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
index 94a2884..ac9f144 100644
--- a/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -2,6 +2,7 @@ id: d7_comment
 label: Comments
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_comment
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
index 2004505..a8014ff 100644
--- a/core/modules/comment/migration_templates/d7_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
@@ -2,6 +2,7 @@ id: d7_comment_entity_display
 label: Comment display configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
index 0315c4a..882c1a9 100644
--- a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d7_comment_entity_form_display
 label: Comment field form display configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
index c27303e..d63fcfc 100644
--- a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
@@ -2,6 +2,7 @@ id: d7_comment_entity_form_display_subject
 label: Comment subject form display configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migration_templates/d7_comment_field.yml
index b4b3543..8045c6b 100644
--- a/core/modules/comment/migration_templates/d7_comment_field.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -2,6 +2,7 @@ id: d7_comment_field
 label: Comment field configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment_field_instance.yml b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
index 80a1a51..b1482e3 100644
--- a/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -2,6 +2,7 @@ id: d7_comment_field_instance
 label: Comment field instance configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_comment_type
   constants:
diff --git a/core/modules/comment/migration_templates/d7_comment_type.yml b/core/modules/comment/migration_templates/d7_comment_type.yml
index 090bfdd..7be9857 100644
--- a/core/modules/comment/migration_templates/d7_comment_type.yml
+++ b/core/modules/comment/migration_templates/d7_comment_type.yml
@@ -2,6 +2,7 @@ id: d7_comment_type
 label: Comment type
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_comment_type
   constants:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
index 1c99961..61f7c60 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
+++ b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
@@ -2,6 +2,7 @@ id: d6_i18n_system_maintenance
 label: Maintenance page configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: i18n_variable
   variables:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
index 3c80821..1fa9df0 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
+++ b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
@@ -2,6 +2,7 @@ id: d6_i18n_system_site
 label: Site configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: i18n_variable
   constants:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
index d1e5db5..e751fb3 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
+++ b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
@@ -2,6 +2,7 @@ id: d6_i18n_user_mail
 label: User mail configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: i18n_variable
   variables:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
index f2c6f95..397cae6 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
+++ b/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_i18n_user_profile_field_instance
 label: User profile field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_i18n_profile_field
   constants:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
index 36b0fa6c..37282fa 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
+++ b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
@@ -2,6 +2,7 @@ id: d6_i18n_user_settings
 label: User configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: i18n_variable
   variables:
diff --git a/core/modules/contact/migration_templates/contact_category.yml b/core/modules/contact/migration_templates/contact_category.yml
index 3d89a6f..7b292eb 100644
--- a/core/modules/contact/migration_templates/contact_category.yml
+++ b/core/modules/contact/migration_templates/contact_category.yml
@@ -3,6 +3,7 @@ label: Contact category configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: contact_category
 process:
diff --git a/core/modules/contact/migration_templates/d6_contact_settings.yml b/core/modules/contact/migration_templates/d6_contact_settings.yml
index dbe0205..a91a9fb 100644
--- a/core/modules/contact/migration_templates/d6_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d6_contact_settings.yml
@@ -2,6 +2,7 @@ id: d6_contact_settings
 label: Contact configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: contact_settings
   variables:
diff --git a/core/modules/contact/migration_templates/d7_contact_settings.yml b/core/modules/contact/migration_templates/d7_contact_settings.yml
index 9feebe5..2820646 100644
--- a/core/modules/contact/migration_templates/d7_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d7_contact_settings.yml
@@ -2,6 +2,7 @@ id: d7_contact_settings
 label: Contact configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: contact_settings
   variables:
diff --git a/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
index 64da0a7..abc31b2 100644
--- a/core/modules/dblog/migration_templates/d6_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
@@ -2,6 +2,7 @@ id: d6_dblog_settings
 label: Database logging configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
index e22768f..14fe011 100644
--- a/core/modules/dblog/migration_templates/d7_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
@@ -2,6 +2,7 @@ id: d7_dblog_settings
 label: Database logging configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index eb02178..849fc61 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -2,6 +2,7 @@ id: d6_field
 label: Field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processField
 source:
diff --git a/core/modules/field/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
index 534501d..5cfebc4 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -2,6 +2,7 @@ id: d6_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldFormatter
 source:
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index 1934303..cc7dd96 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldInstance
 source:
diff --git a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
index 85c7036..9507549 100644
--- a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
@@ -2,6 +2,7 @@ id: d6_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldWidget
 source:
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 15079d8..1fca99e 100644
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -2,6 +2,7 @@ id: d7_field
 label: Field configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processField
 source:
diff --git a/core/modules/field/migration_templates/d7_field_formatter_settings.yml b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
index 126fd29..e87da3b 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -2,6 +2,7 @@ id: d7_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldFormatter
 source:
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index f3518c9..0b5539d 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -2,6 +2,7 @@ id: d7_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldInstance
 source:
diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
index e2bbcf4..aefe71b 100644
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -2,6 +2,7 @@ id: d7_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldWidget
 source:
diff --git a/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migration_templates/d7_view_modes.yml
index fd17138..394ca14 100644
--- a/core/modules/field/migration_templates/d7_view_modes.yml
+++ b/core/modules/field/migration_templates/d7_view_modes.yml
@@ -2,6 +2,7 @@ id: d7_view_modes
 label: View modes
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_view_mode
 process:
diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
index 8371d45..19206d8 100644
--- a/core/modules/file/migration_templates/d6_file.yml
+++ b/core/modules/file/migration_templates/d6_file.yml
@@ -4,6 +4,7 @@ id: d6_file
 label: Files
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_file
   constants:
diff --git a/core/modules/file/migration_templates/d6_upload.yml b/core/modules/file/migration_templates/d6_upload.yml
index a497099..74d25ec 100644
--- a/core/modules/file/migration_templates/d6_upload.yml
+++ b/core/modules/file/migration_templates/d6_upload.yml
@@ -2,6 +2,7 @@ id: d6_upload
 label: File uploads
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_upload
 process:
diff --git a/core/modules/file/migration_templates/d6_upload_entity_display.yml b/core/modules/file/migration_templates/d6_upload_entity_display.yml
index 576bb68..945dad5 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_display.yml
@@ -2,6 +2,7 @@ id: d6_upload_entity_display
 label: Upload display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_upload_instance
   constants:
diff --git a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
index 055749a..8e08f3b 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d6_upload_entity_form_display
 label: Upload form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_upload_instance
   constants:
diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml
index a919f91..04e23e6 100644
--- a/core/modules/file/migration_templates/d6_upload_field.yml
+++ b/core/modules/file/migration_templates/d6_upload_field.yml
@@ -2,6 +2,7 @@ id: d6_upload_field
 label: Upload field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   # We do an empty source and a proper destination to have an idmap for
   # migration_dependencies.
diff --git a/core/modules/file/migration_templates/d6_upload_field_instance.yml b/core/modules/file/migration_templates/d6_upload_field_instance.yml
index 732153a..4a2ba60 100644
--- a/core/modules/file/migration_templates/d6_upload_field_instance.yml
+++ b/core/modules/file/migration_templates/d6_upload_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_upload_field_instance
 label: Upload field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_upload_instance
   constants:
diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
index 3fee046..42a6e9c 100644
--- a/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -4,6 +4,7 @@ id: d7_file
 label: Files
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_file
   scheme: public
diff --git a/core/modules/file/migration_templates/d7_file_private.yml b/core/modules/file/migration_templates/d7_file_private.yml
index 9c6b8e2..c34ad4b 100644
--- a/core/modules/file/migration_templates/d7_file_private.yml
+++ b/core/modules/file/migration_templates/d7_file_private.yml
@@ -2,6 +2,7 @@ id: d7_file_private
 label: Files
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_file
   scheme: private
diff --git a/core/modules/file/migration_templates/file_settings.yml b/core/modules/file/migration_templates/file_settings.yml
index 36584cc..31f7266 100644
--- a/core/modules/file/migration_templates/file_settings.yml
+++ b/core/modules/file/migration_templates/file_settings.yml
@@ -3,6 +3,7 @@ label: File configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
index d6bf7f2..87491f3 100644
--- a/core/modules/filter/migration_templates/d6_filter_format.yml
+++ b/core/modules/filter/migration_templates/d6_filter_format.yml
@@ -2,6 +2,7 @@ id: d6_filter_format
 label: Filter format configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_filter_format
 process:
diff --git a/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml
index 3bac484..b749120 100644
--- a/core/modules/filter/migration_templates/d7_filter_format.yml
+++ b/core/modules/filter/migration_templates/d7_filter_format.yml
@@ -2,6 +2,7 @@ id: d7_filter_format
 label: Filter format configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_filter_format
 process:
diff --git a/core/modules/filter/migration_templates/d7_filter_settings.yml b/core/modules/filter/migration_templates/d7_filter_settings.yml
index d6239fc..96e48a1 100644
--- a/core/modules/filter/migration_templates/d7_filter_settings.yml
+++ b/core/modules/filter/migration_templates/d7_filter_settings.yml
@@ -2,6 +2,7 @@ id: d7_filter_settings
 label: Drupal 7 filter settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml
index 18ba8d4..9286fb9 100644
--- a/core/modules/forum/migration_templates/d6_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d6_forum_settings.yml
@@ -2,6 +2,7 @@ id: d6_forum_settings
 label: Forum configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/forum/migration_templates/d7_forum_settings.yml b/core/modules/forum/migration_templates/d7_forum_settings.yml
index 086d3e6..e0ebba7 100644
--- a/core/modules/forum/migration_templates/d7_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d7_forum_settings.yml
@@ -2,6 +2,7 @@ id: d7_forum_settings
 label: Forum configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/image/migration_templates/d6_imagecache_presets.yml b/core/modules/image/migration_templates/d6_imagecache_presets.yml
index bda0258..d34da74 100644
--- a/core/modules/image/migration_templates/d6_imagecache_presets.yml
+++ b/core/modules/image/migration_templates/d6_imagecache_presets.yml
@@ -2,6 +2,7 @@ id: d6_imagecache_presets
 label: ImageCache Presets
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_imagecache_presets
 process:
diff --git a/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migration_templates/d7_image_settings.yml
index bfae4d5..2b8dba7 100644
--- a/core/modules/image/migration_templates/d7_image_settings.yml
+++ b/core/modules/image/migration_templates/d7_image_settings.yml
@@ -2,6 +2,7 @@ id: d7_image_settings
 label: Image configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/image/migration_templates/d7_image_styles.yml b/core/modules/image/migration_templates/d7_image_styles.yml
index b2b14b0..2beabae 100644
--- a/core/modules/image/migration_templates/d7_image_styles.yml
+++ b/core/modules/image/migration_templates/d7_image_styles.yml
@@ -2,6 +2,7 @@ id: d7_image_styles
 label: Image styles
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_image_styles
 process:
diff --git a/core/modules/language/migration_templates/d6_language_content_settings.yml b/core/modules/language/migration_templates/d6_language_content_settings.yml
index 3bf9078..6d9171a 100644
--- a/core/modules/language/migration_templates/d6_language_content_settings.yml
+++ b/core/modules/language/migration_templates/d6_language_content_settings.yml
@@ -1,8 +1,8 @@
 id: d6_language_content_settings
 label: Drupal 6 language content settings
-
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_language_content_settings
   constants:
diff --git a/core/modules/language/migration_templates/d6_language_negotiation_settings.yml b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml
index abc71f6..c9549e8 100644
--- a/core/modules/language/migration_templates/d6_language_negotiation_settings.yml
+++ b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml
@@ -2,6 +2,7 @@ id: d6_language_negotiation_settings
 label: Language negotiation settings
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migration_templates/d6_language_types.yml b/core/modules/language/migration_templates/d6_language_types.yml
index 05ce300..4a5694e 100644
--- a/core/modules/language/migration_templates/d6_language_types.yml
+++ b/core/modules/language/migration_templates/d6_language_types.yml
@@ -2,6 +2,7 @@ id: d6_language_types
 label: Language types
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migration_templates/d7_language_content_settings.yml b/core/modules/language/migration_templates/d7_language_content_settings.yml
index 09437fa..ba170a4 100644
--- a/core/modules/language/migration_templates/d7_language_content_settings.yml
+++ b/core/modules/language/migration_templates/d7_language_content_settings.yml
@@ -2,6 +2,7 @@ id: d7_language_content_settings
 label: Drupal 7 language content settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_language_content_settings
   constants:
diff --git a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
index 7759965..494acb8 100644
--- a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
+++ b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
@@ -2,6 +2,7 @@ id: d7_language_negotiation_settings
 label: Language negotiation settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migration_templates/d7_language_types.yml b/core/modules/language/migration_templates/d7_language_types.yml
index 3a634a2..e6ab430 100644
--- a/core/modules/language/migration_templates/d7_language_types.yml
+++ b/core/modules/language/migration_templates/d7_language_types.yml
@@ -2,6 +2,7 @@ id: d7_language_types
 label: Language types
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migration_templates/default_language.yml b/core/modules/language/migration_templates/default_language.yml
index 6d7604d..fcd9ca5 100644
--- a/core/modules/language/migration_templates/default_language.yml
+++ b/core/modules/language/migration_templates/default_language.yml
@@ -3,6 +3,7 @@ label: Default language
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migration_templates/language.yml b/core/modules/language/migration_templates/language.yml
index 6ca9c6d..36317f5 100644
--- a/core/modules/language/migration_templates/language.yml
+++ b/core/modules/language/migration_templates/language.yml
@@ -3,6 +3,7 @@ label: Languages
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: language
 process:
diff --git a/core/modules/language/migration_templates/language_prefixes_and_domains.yml b/core/modules/language/migration_templates/language_prefixes_and_domains.yml
index edc5b54..898f311 100644
--- a/core/modules/language/migration_templates/language_prefixes_and_domains.yml
+++ b/core/modules/language/migration_templates/language_prefixes_and_domains.yml
@@ -3,6 +3,7 @@ label: Language prefixes and domains
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: language
   fetch_all: true
diff --git a/core/modules/locale/migration_templates/locale_settings.yml b/core/modules/locale/migration_templates/locale_settings.yml
index 6eebe20..8d5ae2c 100644
--- a/core/modules/locale/migration_templates/locale_settings.yml
+++ b/core/modules/locale/migration_templates/locale_settings.yml
@@ -3,6 +3,7 @@ label: Locale configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/menu_link_content/migration_templates/d6_menu_links.yml b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
index 2c8ad4a..8237e10 100644
--- a/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
@@ -2,6 +2,7 @@ id: d6_menu_links
 label: Menu links
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: menu_link
 process:
diff --git a/core/modules/menu_link_content/migration_templates/d7_menu_links.yml b/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
index 200a792..f2a1a54 100644
--- a/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
@@ -2,6 +2,7 @@ id: d7_menu_links
 label: Menu links
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: menu_link
   constants:
diff --git a/core/modules/menu_ui/migration_templates/menu_settings.yml b/core/modules/menu_ui/migration_templates/menu_settings.yml
index dee5f9e..7a64312 100644
--- a/core/modules/menu_ui/migration_templates/menu_settings.yml
+++ b/core/modules/menu_ui/migration_templates/menu_settings.yml
@@ -4,6 +4,7 @@ label: Menu UI configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
new file mode 100644
index 0000000..fdf78dd
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
@@ -0,0 +1,233 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel\Plugin;
+
+use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
+use Drupal\migrate\Annotation\MigrateDestination;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+
+/**
+ * Tests that all migrations are tagged as either content or configuration.
+ *
+ * @coversDefaultClass \Drupal\migrate\Plugin\MigrationPluginManager
+ *
+ * @group migrate
+ */
+class DestinationCategoryTest extends MigrateDrupalTestBase {
+
+  use FileSystemModuleDiscoveryDataProviderTrait;
+
+  /**
+   * The migration plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManager $migrationManager
+   */
+  protected $migrationManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Enable all modules.
+    self::$modules = array_keys($this->coreModuleListDataProvider());
+    parent::setUp();
+    $this->migrationManager = \Drupal::service('plugin.manager.migration');
+  }
+
+  /**
+   * @covers ::getDefinitions
+   *
+   * @dataProvider providerMigrationCategoriesGrouped
+   */
+  public function testGetGroupedDefinitions($groupedMigrations) {
+    $definitions = $this->migrationManager->getDefinitions();
+    foreach ($definitions as $id => $definition) {
+      if (in_array('Configuration', $definition['migration_tags'])) {
+        $this->assertTrue(in_array($id, $groupedMigrations['Configuration']));
+      }
+      elseif (in_array('Content', $definition['migration_tags'])) {
+        $this->assertTrue(in_array($id, $groupedMigrations['Content']));
+      }
+      else {
+        $this->fail("The migration $id is not tagged as either content or configuration.");
+      }
+    }
+  }
+
+  /**
+   * Provides test data for category testing.
+   */
+  public function providerMigrationCategoriesGrouped() {
+    return [
+      [
+        'all migrations' => [
+          'Configuration' => [
+            'action_settings',
+            'd6_action',
+            'd7_action',
+            'd6_aggregator_settings',
+            'd7_aggregator_settings',
+            'block_content_body_field',
+            'block_content_type',
+            'd6_block',
+            'd7_block',
+            'block_content_entity_display',
+            'block_content_entity_form_display',
+            'd6_book_settings',
+            'd6_comment_entity_display',
+            'd7_comment_entity_display',
+            'd6_comment_field',
+            'd7_comment_field',
+            'd6_comment_entity_form_display',
+            'd7_comment_entity_form_display',
+            'd6_comment_field_instance',
+            'd7_comment_field_instance',
+            'd6_comment_entity_form_display_subject',
+            'd7_comment_entity_form_display_subject',
+            'd6_comment_type',
+            'd7_comment_type',
+            'contact_category',
+            'd6_contact_settings',
+            'd7_contact_settings',
+            'd6_system_cron',
+            'd7_global_theme_settings',
+            'd7_theme_settings',
+            'd6_dblog_settings',
+            'd7_dblog_settings',
+            'd6_date_formats',
+            'default_language',
+            'd6_language_content_settings',
+            'd7_system_authorize',
+            'd7_system_cron',
+            'd7_system_date',
+            'd7_system_file',
+            'd7_filter_settings',
+            'd7_language_content_settings',
+            'd7_system_mail',
+            'd7_system_performance',
+            'text_settings',
+            'd6_field',
+            'd7_field',
+            'd6_field_formatter_settings',
+            'd7_field_formatter_settings',
+            'd6_field_instance',
+            'd7_field_instance',
+            'd6_field_instance_widget_settings',
+            'd7_field_instance_widget_settings',
+            'file_settings',
+            'd6_system_file',
+            'd6_filter_format',
+            'd7_filter_format',
+            'd6_forum_settings',
+            'd7_forum_settings',
+            'd6_imagecache_presets',
+            'd7_image_settings',
+            'system_image_gd',
+            'd7_image_styles',
+            'system_image',
+            'd6_language_negotiation_settings',
+            'd7_language_negotiation_settings',
+            'language_prefixes_and_domains',
+            'language',
+            'd6_language_types',
+            'd7_language_types',
+            'locale_settings',
+            'd6_i18n_system_maintenance',
+            'system_maintenance',
+            'd6_menu',
+            'd7_menu',
+            'menu_settings',
+            'd6_node_settings',
+            'd7_node_settings',
+            'd7_node_title_label',
+            'd6_node_setting_promote',
+            'd6_node_setting_status',
+            'd6_node_setting_sticky',
+            'd6_node_type',
+            'd7_node_type',
+            'd6_system_performance',
+            'system_rss',
+            'd6_search_settings',
+            'd7_search_settings',
+            'search_page',
+            'd7_shortcut_set',
+            'd6_simpletest_settings',
+            'd7_simpletest_settings',
+            'd6_i18n_system_site',
+            'system_site',
+            'statistics_settings',
+            'd7_syslog_settings',
+            'd6_system_date',
+            'd6_syslog_settings',
+            'system_logging',
+            'taxonomy_settings',
+            'd6_taxonomy_vocabulary',
+            'd6_taxonomy_vocabulary_translation',
+            'd7_taxonomy_vocabulary',
+            'd7_tracker_settings',
+            'update_settings',
+            'd6_upload_entity_display',
+            'd6_upload_field',
+            'd6_upload_field_instance',
+            'd6_upload_entity_form_display',
+            'd6_i18n_user_settings',
+            'd6_user_settings',
+            'd7_user_flood',
+            'd6_i18n_user_mail',
+            'd6_user_mail',
+            'd7_user_mail',
+            'user_picture_entity_display',
+            'user_picture_field',
+            'user_picture_field_instance',
+            'user_picture_entity_form_display',
+            'user_profile_entity_display',
+            'user_profile_field',
+            'd6_i18n_user_profile_field_instance',
+            'user_profile_field_instance',
+            'user_profile_entity_form_display',
+            'd6_user_role',
+            'd7_user_role',
+            'd6_view_modes',
+            'd7_view_modes',
+            'd6_vocabulary_entity_display',
+            'd6_vocabulary_field',
+            'd6_vocabulary_field_instance',
+            'd6_vocabulary_entity_form_display',
+          ],
+          'Content' => [
+            'd6_aggregator_feed',
+            'd7_aggregator_feed',
+            'd6_aggregator_item',
+            'd7_aggregator_item',
+            'd7_blocked_ips',
+            'd6_book',
+            'd6_comment',
+            'd7_comment',
+            'd6_custom_block',
+            'd7_custom_block',
+            'd6_file',
+            'd7_file',
+            'd6_upload',
+            'd6_menu_links',
+            'd7_menu_links',
+            'd7_file_private',
+            'd6_profile_values',
+            'd7_shortcut',
+            'd7_shortcut_set_users',
+            'd6_taxonomy_term',
+            'd6_taxonomy_term_translation',
+            'd7_tracker_node',
+            'd7_tracker_user',
+            'd6_url_alias',
+            'd7_url_alias',
+            'd6_user',
+            'd7_user',
+            'd6_user_contact_settings',
+            'd6_user_picture_file',
+          ],
+        ],
+      ],
+    ];
+  }
+
+}
diff --git a/core/modules/node/migration_templates/d6_node_setting_promote.yml b/core/modules/node/migration_templates/d6_node_setting_promote.yml
index 469083d..e04dac6 100644
--- a/core/modules/node/migration_templates/d6_node_setting_promote.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_promote.yml
@@ -2,6 +2,7 @@ id: d6_node_setting_promote
 label: Node type 'promote' setting
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migration_templates/d6_node_setting_status.yml b/core/modules/node/migration_templates/d6_node_setting_status.yml
index 7c5a8de..bcc7409 100644
--- a/core/modules/node/migration_templates/d6_node_setting_status.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_status.yml
@@ -2,6 +2,7 @@ id: d6_node_setting_status
 label: Node type 'status' setting
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migration_templates/d6_node_setting_sticky.yml b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
index 77ad6cd..3f4c6aa 100644
--- a/core/modules/node/migration_templates/d6_node_setting_sticky.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
@@ -2,6 +2,7 @@ id: d6_node_setting_sticky
 label: Node type 'sticky' setting
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migration_templates/d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml
index 17b0857..25025be 100644
--- a/core/modules/node/migration_templates/d6_node_settings.yml
+++ b/core/modules/node/migration_templates/d6_node_settings.yml
@@ -2,6 +2,7 @@ id: d6_node_settings
 label: Node configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/node/migration_templates/d6_node_type.yml b/core/modules/node/migration_templates/d6_node_type.yml
index 5587ef5..3afe4bc 100644
--- a/core/modules/node/migration_templates/d6_node_type.yml
+++ b/core/modules/node/migration_templates/d6_node_type.yml
@@ -2,6 +2,7 @@ id: d6_node_type
 label: Node type configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migration_templates/d6_view_modes.yml b/core/modules/node/migration_templates/d6_view_modes.yml
index 815709b..bf49b9a 100644
--- a/core/modules/node/migration_templates/d6_view_modes.yml
+++ b/core/modules/node/migration_templates/d6_view_modes.yml
@@ -2,6 +2,7 @@ id: d6_view_modes
 label: View modes
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_view_mode
   constants:
diff --git a/core/modules/node/migration_templates/d7_node_settings.yml b/core/modules/node/migration_templates/d7_node_settings.yml
index 0461754..3b2d219 100644
--- a/core/modules/node/migration_templates/d7_node_settings.yml
+++ b/core/modules/node/migration_templates/d7_node_settings.yml
@@ -2,6 +2,7 @@ id: d7_node_settings
 label: Node configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/node/migration_templates/d7_node_title_label.yml b/core/modules/node/migration_templates/d7_node_title_label.yml
index 53ae6ea..9b3051a 100644
--- a/core/modules/node/migration_templates/d7_node_title_label.yml
+++ b/core/modules/node/migration_templates/d7_node_title_label.yml
@@ -2,6 +2,7 @@ id: d7_node_title_label
 label: Node title label
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/node/migration_templates/d7_node_type.yml b/core/modules/node/migration_templates/d7_node_type.yml
index f61bad8..1be9cd1 100644
--- a/core/modules/node/migration_templates/d7_node_type.yml
+++ b/core/modules/node/migration_templates/d7_node_type.yml
@@ -2,6 +2,7 @@ id: d7_node_type
 label: Node type configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/path/migration_templates/d6_url_alias.yml b/core/modules/path/migration_templates/d6_url_alias.yml
index fcf2036..7907d16 100644
--- a/core/modules/path/migration_templates/d6_url_alias.yml
+++ b/core/modules/path/migration_templates/d6_url_alias.yml
@@ -2,6 +2,7 @@ id: d6_url_alias
 label: URL aliases
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_url_alias
   constants:
diff --git a/core/modules/path/migration_templates/d7_url_alias.yml b/core/modules/path/migration_templates/d7_url_alias.yml
index dffaf46..03dbff6 100644
--- a/core/modules/path/migration_templates/d7_url_alias.yml
+++ b/core/modules/path/migration_templates/d7_url_alias.yml
@@ -2,6 +2,7 @@ id: d7_url_alias
 label: URL aliases
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_url_alias
   constants:
diff --git a/core/modules/search/migration_templates/d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml
index 28f8600..b221ef5 100644
--- a/core/modules/search/migration_templates/d6_search_settings.yml
+++ b/core/modules/search/migration_templates/d6_search_settings.yml
@@ -2,6 +2,7 @@ id: d6_search_settings
 label: Search configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   constants:
diff --git a/core/modules/search/migration_templates/d7_search_settings.yml b/core/modules/search/migration_templates/d7_search_settings.yml
index 57db8b9..f8fd8d6 100644
--- a/core/modules/search/migration_templates/d7_search_settings.yml
+++ b/core/modules/search/migration_templates/d7_search_settings.yml
@@ -2,6 +2,7 @@ id: d7_search_settings
 label: Search configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   constants:
diff --git a/core/modules/search/migration_templates/search_page.yml b/core/modules/search/migration_templates/search_page.yml
index 8ddc02a..1989bca 100644
--- a/core/modules/search/migration_templates/search_page.yml
+++ b/core/modules/search/migration_templates/search_page.yml
@@ -3,6 +3,7 @@ label: Search page configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut.yml b/core/modules/shortcut/migration_templates/d7_shortcut.yml
index dac9354..f4265a8 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut.yml
@@ -2,6 +2,7 @@ id: d7_shortcut
 label: Shortcut links
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_shortcut
   constants:
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut_set.yml b/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
index 784178e..bd951d7 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
@@ -2,6 +2,7 @@ id: d7_shortcut_set
 label: Shortcut sets
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_shortcut_set
 process:
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml b/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
index d0eb219..ff3d3e8 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
@@ -2,6 +2,7 @@ id: d7_shortcut_set_users
 label: Shortcut set user mapping
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_shortcut_set_users
 process:
diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
index c9eedbb..318ba86 100644
--- a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
@@ -2,6 +2,7 @@ id: d6_simpletest_settings
 label: Simpletest configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
index b77f76a..929e17c 100644
--- a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
@@ -2,6 +2,7 @@ id: d7_simpletest_settings
 label: SimpleTest configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/statistics/migration_templates/statistics_settings.yml b/core/modules/statistics/migration_templates/statistics_settings.yml
index 1f5b5bb..869e425 100644
--- a/core/modules/statistics/migration_templates/statistics_settings.yml
+++ b/core/modules/statistics/migration_templates/statistics_settings.yml
@@ -3,6 +3,7 @@ label: Statistics configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/syslog/migration_templates/d6_syslog_settings.yml b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
index 86a7017..d29f326 100644
--- a/core/modules/syslog/migration_templates/d6_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
@@ -2,6 +2,7 @@ id: d6_syslog_settings
 label: System log configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
index 4000572..90ac655 100644
--- a/core/modules/syslog/migration_templates/d7_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
@@ -2,6 +2,7 @@ id: d7_syslog_settings
 label: Syslog configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml
index 71257d4..7d22c25 100644
--- a/core/modules/system/migration_templates/d6_date_formats.yml
+++ b/core/modules/system/migration_templates/d6_date_formats.yml
@@ -2,6 +2,7 @@ id: d6_date_formats
 label: Date format configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable_multirow
   variables:
diff --git a/core/modules/system/migration_templates/d6_menu.yml b/core/modules/system/migration_templates/d6_menu.yml
index 25ad0af..4dd2f15 100644
--- a/core/modules/system/migration_templates/d6_menu.yml
+++ b/core/modules/system/migration_templates/d6_menu.yml
@@ -3,6 +3,7 @@ id: d6_menu
 label: Menus
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: menu
 process:
diff --git a/core/modules/system/migration_templates/d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml
index 7dd3a2b..f3e5495 100644
--- a/core/modules/system/migration_templates/d6_system_cron.yml
+++ b/core/modules/system/migration_templates/d6_system_cron.yml
@@ -2,6 +2,7 @@ id: d6_system_cron
 label: Cron settings
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d6_system_date.yml b/core/modules/system/migration_templates/d6_system_date.yml
index 25f6728..f003df5 100644
--- a/core/modules/system/migration_templates/d6_system_date.yml
+++ b/core/modules/system/migration_templates/d6_system_date.yml
@@ -2,6 +2,7 @@ id: d6_system_date
 label: System date configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml
index 60cd616..5e448b4 100644
--- a/core/modules/system/migration_templates/d6_system_file.yml
+++ b/core/modules/system/migration_templates/d6_system_file.yml
@@ -2,6 +2,7 @@ id: d6_system_file
 label: File system configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml
index 70a03d6..92be846 100644
--- a/core/modules/system/migration_templates/d6_system_performance.yml
+++ b/core/modules/system/migration_templates/d6_system_performance.yml
@@ -2,6 +2,7 @@ id: d6_system_performance
 label: Performance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_global_theme_settings.yml b/core/modules/system/migration_templates/d7_global_theme_settings.yml
index 42c5177..4fc9c73 100644
--- a/core/modules/system/migration_templates/d7_global_theme_settings.yml
+++ b/core/modules/system/migration_templates/d7_global_theme_settings.yml
@@ -2,6 +2,7 @@ id: d7_global_theme_settings
 label: D7 global theme settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_menu.yml b/core/modules/system/migration_templates/d7_menu.yml
index da47b36..ce97f65 100644
--- a/core/modules/system/migration_templates/d7_menu.yml
+++ b/core/modules/system/migration_templates/d7_menu.yml
@@ -2,6 +2,7 @@ id: d7_menu
 label: Menus
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: menu
 process:
diff --git a/core/modules/system/migration_templates/d7_system_authorize.yml b/core/modules/system/migration_templates/d7_system_authorize.yml
index 420497b..098001f 100644
--- a/core/modules/system/migration_templates/d7_system_authorize.yml
+++ b/core/modules/system/migration_templates/d7_system_authorize.yml
@@ -1,6 +1,7 @@
 id: d7_system_authorize
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_system_cron.yml b/core/modules/system/migration_templates/d7_system_cron.yml
index a603af3..b54bf5c 100644
--- a/core/modules/system/migration_templates/d7_system_cron.yml
+++ b/core/modules/system/migration_templates/d7_system_cron.yml
@@ -2,6 +2,7 @@ id: d7_system_cron
 label: Drupal 7 cron settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_system_date.yml b/core/modules/system/migration_templates/d7_system_date.yml
index b380c89..91ace6e 100644
--- a/core/modules/system/migration_templates/d7_system_date.yml
+++ b/core/modules/system/migration_templates/d7_system_date.yml
@@ -1,6 +1,7 @@
 id: d7_system_date
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_system_file.yml b/core/modules/system/migration_templates/d7_system_file.yml
index 2295e0e..0e43eb1 100644
--- a/core/modules/system/migration_templates/d7_system_file.yml
+++ b/core/modules/system/migration_templates/d7_system_file.yml
@@ -2,6 +2,7 @@ id: d7_system_file
 label: Drupal 7 file system configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_system_mail.yml b/core/modules/system/migration_templates/d7_system_mail.yml
index d4a569c..c44833e 100644
--- a/core/modules/system/migration_templates/d7_system_mail.yml
+++ b/core/modules/system/migration_templates/d7_system_mail.yml
@@ -1,6 +1,7 @@
 id: d7_system_mail
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_system_performance.yml b/core/modules/system/migration_templates/d7_system_performance.yml
index abeb008..94a2ff0 100644
--- a/core/modules/system/migration_templates/d7_system_performance.yml
+++ b/core/modules/system/migration_templates/d7_system_performance.yml
@@ -2,6 +2,7 @@ id: d7_system_performance
 label: Drupal 7 performance configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/d7_theme_settings.yml b/core/modules/system/migration_templates/d7_theme_settings.yml
index 09f5fe1..ad789fa 100644
--- a/core/modules/system/migration_templates/d7_theme_settings.yml
+++ b/core/modules/system/migration_templates/d7_theme_settings.yml
@@ -2,6 +2,7 @@ id: d7_theme_settings
 label: D7 theme settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_theme_settings
   constants:
diff --git a/core/modules/system/migration_templates/system_image.yml b/core/modules/system/migration_templates/system_image.yml
index 7bb16b1..456cd2a 100644
--- a/core/modules/system/migration_templates/system_image.yml
+++ b/core/modules/system/migration_templates/system_image.yml
@@ -3,6 +3,7 @@ label: Image toolkit configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/system_image_gd.yml b/core/modules/system/migration_templates/system_image_gd.yml
index 685116e..2d30f70 100644
--- a/core/modules/system/migration_templates/system_image_gd.yml
+++ b/core/modules/system/migration_templates/system_image_gd.yml
@@ -3,6 +3,7 @@ label: Image quality configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/system_logging.yml b/core/modules/system/migration_templates/system_logging.yml
index c1e8114..b970391 100644
--- a/core/modules/system/migration_templates/system_logging.yml
+++ b/core/modules/system/migration_templates/system_logging.yml
@@ -3,6 +3,7 @@ label: System logging
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/system_maintenance.yml b/core/modules/system/migration_templates/system_maintenance.yml
index b9f6c34..5895c79 100644
--- a/core/modules/system/migration_templates/system_maintenance.yml
+++ b/core/modules/system/migration_templates/system_maintenance.yml
@@ -3,6 +3,7 @@ label: Maintenance page configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/system_rss.yml b/core/modules/system/migration_templates/system_rss.yml
index 92ce45a..c7c8f31 100644
--- a/core/modules/system/migration_templates/system_rss.yml
+++ b/core/modules/system/migration_templates/system_rss.yml
@@ -3,6 +3,7 @@ label: RSS configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migration_templates/system_site.yml b/core/modules/system/migration_templates/system_site.yml
index c8fd849..e7e5d5a 100644
--- a/core/modules/system/migration_templates/system_site.yml
+++ b/core/modules/system/migration_templates/system_site.yml
@@ -3,6 +3,7 @@ label: Site configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   constants:
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index e3c3e3d..fd2bf9d 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_term
 label: Taxonomy terms
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_taxonomy_term
 process:
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term_translation.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term_translation.yml
index 11af8cd..0b42dcf 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term_translation.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term_translation.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_term_translation
 label: Taxonomy terms
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_taxonomy_term
   translations: true
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 932f9b3..af32fd0 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_vocabulary
 label: Taxonomy vocabularies
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary
 process:
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary_translation.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary_translation.yml
index dbb1793..2ac7760 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary_translation.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary_translation.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_vocabulary_translation
 label: Taxonomy vocabularies
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_translation
 process:
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
index e0f4625..50e66e6 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_entity_display
 label: Vocabulary display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_per_type
   constants:
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
index 20bb0e4..c33d85b 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_entity_form_display
 label: Vocabulary form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_per_type
   constants:
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index bb4a942..d6730ed 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_field
 label: Vocabulary field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary
   constants:
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
index 6d9ffa6..9bb08d3 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_field_instance
 label: Vocabulary field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_per_type
   constants:
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
index 355a69c..ffefa63 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -2,6 +2,7 @@ id: d7_taxonomy_vocabulary
 label: Taxonomy vocabularies
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_taxonomy_vocabulary
 process:
diff --git a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
index c20372c..cf98814 100644
--- a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
+++ b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
@@ -3,6 +3,7 @@ label: Taxonomy configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/text/migration_templates/text_settings.yml b/core/modules/text/migration_templates/text_settings.yml
index 45d426d..2c72c4a 100644
--- a/core/modules/text/migration_templates/text_settings.yml
+++ b/core/modules/text/migration_templates/text_settings.yml
@@ -3,6 +3,7 @@ label: Drupal teaser length configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/tracker/migration_templates/d7_tracker_node.yml b/core/modules/tracker/migration_templates/d7_tracker_node.yml
index 02645d7..1b94842 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_node.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_node.yml
@@ -2,6 +2,7 @@ id: d7_tracker_node
 label: Tracker node
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_tracker_node
 process:
diff --git a/core/modules/tracker/migration_templates/d7_tracker_settings.yml b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
index ce06cbd..96856c9 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_settings.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
@@ -2,6 +2,7 @@ id: d7_tracker_settings
 label: Tracker settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/tracker/migration_templates/d7_tracker_user.yml b/core/modules/tracker/migration_templates/d7_tracker_user.yml
index ae3c51d..ff62775 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_user.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_user.yml
@@ -2,6 +2,7 @@ id: d7_tracker_user
 label: Tracker user
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_tracker_user
 process:
diff --git a/core/modules/update/migration_templates/update_settings.yml b/core/modules/update/migration_templates/update_settings.yml
index ad22472..b205880 100644
--- a/core/modules/update/migration_templates/update_settings.yml
+++ b/core/modules/update/migration_templates/update_settings.yml
@@ -3,6 +3,7 @@ label: Update configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migration_templates/d6_profile_values.yml b/core/modules/user/migration_templates/d6_profile_values.yml
index 5530ca5..2d6d51d 100644
--- a/core/modules/user/migration_templates/d6_profile_values.yml
+++ b/core/modules/user/migration_templates/d6_profile_values.yml
@@ -3,6 +3,7 @@ label: Profile values
 class: Drupal\user\Plugin\migrate\ProfileValues
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_profile_field_values
 process:
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index d58607b..c1a4ffa 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -2,6 +2,7 @@ id: d6_user
 label: User accounts
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_user
 process:
diff --git a/core/modules/user/migration_templates/d6_user_contact_settings.yml b/core/modules/user/migration_templates/d6_user_contact_settings.yml
index 0d9a228..7777d37 100644
--- a/core/modules/user/migration_templates/d6_user_contact_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_contact_settings.yml
@@ -2,6 +2,7 @@ id: d6_user_contact_settings
 label: User contact settings
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_user
   constants:
diff --git a/core/modules/user/migration_templates/d6_user_mail.yml b/core/modules/user/migration_templates/d6_user_mail.yml
index b06b6ea..b7759b7 100644
--- a/core/modules/user/migration_templates/d6_user_mail.yml
+++ b/core/modules/user/migration_templates/d6_user_mail.yml
@@ -2,6 +2,7 @@ id: d6_user_mail
 label: User mail configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migration_templates/d6_user_picture_file.yml b/core/modules/user/migration_templates/d6_user_picture_file.yml
index 3518d7a..f654849 100644
--- a/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ b/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -2,6 +2,7 @@ id: d6_user_picture_file
 label: User pictures
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_user_picture_file
   constants:
diff --git a/core/modules/user/migration_templates/d6_user_role.yml b/core/modules/user/migration_templates/d6_user_role.yml
index 1d224f4..d6c2ca9 100644
--- a/core/modules/user/migration_templates/d6_user_role.yml
+++ b/core/modules/user/migration_templates/d6_user_role.yml
@@ -2,6 +2,7 @@ id: d6_user_role
 label: User roles
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_user_role
 process:
diff --git a/core/modules/user/migration_templates/d6_user_settings.yml b/core/modules/user/migration_templates/d6_user_settings.yml
index 6e25ece..f47421e 100644
--- a/core/modules/user/migration_templates/d6_user_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_settings.yml
@@ -2,6 +2,7 @@ id: d6_user_settings
 label: User configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
index ae52384..3a71331 100644
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -2,6 +2,7 @@ id: d7_user
 label: User accounts
 migration_tags:
   - Drupal 7
+  - Content
 class: Drupal\user\Plugin\migrate\User
 source:
   plugin: d7_user
diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migration_templates/d7_user_flood.yml
index ae00ce0..94df1c5 100644
--- a/core/modules/user/migration_templates/d7_user_flood.yml
+++ b/core/modules/user/migration_templates/d7_user_flood.yml
@@ -2,6 +2,7 @@ id: d7_user_flood
 label: User flood configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migration_templates/d7_user_mail.yml b/core/modules/user/migration_templates/d7_user_mail.yml
index 0c5e74c..6ee6147 100644
--- a/core/modules/user/migration_templates/d7_user_mail.yml
+++ b/core/modules/user/migration_templates/d7_user_mail.yml
@@ -2,6 +2,7 @@ id: d7_user_mail
 label: User mail configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml
index 5f88757..46885d7 100644
--- a/core/modules/user/migration_templates/d7_user_role.yml
+++ b/core/modules/user/migration_templates/d7_user_role.yml
@@ -2,6 +2,7 @@ id: d7_user_role
 label: User roles
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_user_role
 process:
diff --git a/core/modules/user/migration_templates/user_picture_entity_display.yml b/core/modules/user/migration_templates/user_picture_entity_display.yml
index 3f404d6..9bd5d80 100644
--- a/core/modules/user/migration_templates/user_picture_entity_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_display.yml
@@ -3,6 +3,7 @@ label: User picture display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: user_picture_instance
   constants:
diff --git a/core/modules/user/migration_templates/user_picture_entity_form_display.yml b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
index 4d0f8bc..6acd19f 100644
--- a/core/modules/user/migration_templates/user_picture_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
@@ -3,6 +3,7 @@ label: User picture form display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: user_picture_instance
   constants:
diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml
index ff8bd82..a909a5a 100644
--- a/core/modules/user/migration_templates/user_picture_field.yml
+++ b/core/modules/user/migration_templates/user_picture_field.yml
@@ -3,6 +3,7 @@ label: User picture field configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   # We do an empty source and a proper destination to have an idmap for
   # dependencies.
diff --git a/core/modules/user/migration_templates/user_picture_field_instance.yml b/core/modules/user/migration_templates/user_picture_field_instance.yml
index 4332e09..ef1415f 100644
--- a/core/modules/user/migration_templates/user_picture_field_instance.yml
+++ b/core/modules/user/migration_templates/user_picture_field_instance.yml
@@ -3,6 +3,7 @@ label: User picture field instance configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: user_picture_instance
   constants:
diff --git a/core/modules/user/migration_templates/user_profile_entity_display.yml b/core/modules/user/migration_templates/user_profile_entity_display.yml
index f4353dd..7336636 100644
--- a/core/modules/user/migration_templates/user_profile_entity_display.yml
+++ b/core/modules/user/migration_templates/user_profile_entity_display.yml
@@ -3,6 +3,7 @@ label: User profile display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
diff --git a/core/modules/user/migration_templates/user_profile_entity_form_display.yml b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
index cfabd76..44a5c53 100644
--- a/core/modules/user/migration_templates/user_profile_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
@@ -3,6 +3,7 @@ label: User profile form display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
diff --git a/core/modules/user/migration_templates/user_profile_field.yml b/core/modules/user/migration_templates/user_profile_field.yml
index 3ba0eee..94d7def 100644
--- a/core/modules/user/migration_templates/user_profile_field.yml
+++ b/core/modules/user/migration_templates/user_profile_field.yml
@@ -3,6 +3,7 @@ label: User profile field configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
diff --git a/core/modules/user/migration_templates/user_profile_field_instance.yml b/core/modules/user/migration_templates/user_profile_field_instance.yml
index b9f213b..50e0bd2 100644
--- a/core/modules/user/migration_templates/user_profile_field_instance.yml
+++ b/core/modules/user/migration_templates/user_profile_field_instance.yml
@@ -3,6 +3,7 @@ label: User profile field instance configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
