diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/CategoryTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/CategoryTest.php
index d0d937f..ff82756 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/CategoryTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/CategoryTest.php
@@ -46,7 +46,7 @@ public function testGetCategories() {
     $this->enableAllModules();
     $expected = [MigrateDestination::CATEGORY_CONFIGURATION, MigrateDestination::CATEGORY_CONTENT];
     $categories = $this->migrationManager->getCategories();
-    $this->assertEquals($expected, $categories);
+    $this->assertEquals($expected, array_values($categories));
   }
 
   /**
@@ -111,6 +111,7 @@ public function providerMigrationCategoriesSorted() {
           'd7_contact_settings',
           'd6_system_cron',
           'd7_global_theme_settings',
+          'd7_theme_settings',
           'd6_dblog_settings',
           'd7_dblog_settings',
           'd6_date_formats',
@@ -221,7 +222,6 @@ public function providerMigrationCategoriesSorted() {
           'd7_comment',
           'd6_custom_block',
           'd7_custom_block',
-          'd7_theme_settings',
           'd6_file',
           'd7_file',
           'd6_upload',
@@ -281,6 +281,7 @@ public function providerMigrationCategoriesGrouped() {
             'd7_contact_settings',
             'd6_system_cron',
             'd7_global_theme_settings',
+            'd7_theme_settings',
             'd6_dblog_settings',
             'd7_dblog_settings',
             'd6_date_formats',
@@ -393,7 +394,6 @@ public function providerMigrationCategoriesGrouped() {
             'd7_comment',
             'd6_custom_block',
             'd7_custom_block',
-            'd7_theme_settings',
             'd6_file',
             'd7_file',
             'd6_upload',
diff --git a/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php b/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php
index 55ac721..7e1d023 100644
--- a/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php
+++ b/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\migrate\Annotation\MigrateDestination;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
@@ -91,4 +92,13 @@ public function fields(MigrationInterface $migration = NULL) {
     return [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getPluginDefinition() {
+    $definition = parent::getPluginDefinition();
+    $definition['category'] = MigrateDestination::CATEGORY_CONFIGURATION;
+    return $definition;
+  }
+
 }