Panagiotis Moutsopoulos
--- a/core/lib/Drupal/Core/Theme/ComponentPluginManager.php
+++ b/core/lib/Drupal/Core/Theme/ComponentPluginManager.php
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSortedDefinitions(?array $definitions = NULL) {
+    // Sort the plugins first by group, then by label.
+    $definitions = $definitions ?? $this->getDefinitions();
+    uasort($definitions, static function ($a, $b) {
+      $a_group = isset($a['group']) ? (string) $a['group'] : '';
+      $b_group = isset($b['group']) ? (string) $b['group'] : '';
+      if ($a_group !== $b_group) {
+        return strnatcasecmp($a_group, $b_group);
+      }
+      $a_label = preg_replace("/[^A-Za-z0-9 ]/", '', $a['name']);
+      $b_label = preg_replace("/[^A-Za-z0-9 ]/", '', $b['name']);
--- a/core/lib/Drupal/Core/Theme/ComponentPluginManager.php
+++ b/core/lib/Drupal/Core/Theme/ComponentPluginManager.php
+      $b_group = isset($b['group']) ? (string) $b['group'] : '';
+      if ($a_group !== $b_group) {
+        return strnatcasecmp($a_group, $b_group);
+      }
+      $a_label = preg_replace("/[^A-Za-z0-9 ]/", '', $a['name']);
+      $b_label = preg_replace("/[^A-Za-z0-9 ]/", '', $b['name']);
+      return strnatcasecmp($a_label, $b_label);
+    });
+    return $definitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getGroupedDefinitions(?array $definitions = NULL) {
+    $definitions = $definitions ?: $this->getSortedDefinitions();
-    $definitions = $definitions ?: $this->getSortedDefinitions();
+    $definitions = $this->getSortedDefinitions($definitions);
--- a/core/lib/Drupal/Core/Theme/ComponentPluginManager.php
+++ b/core/lib/Drupal/Core/Theme/ComponentPluginManager.php
    $this->componentNegotiator->clearCache();
  }

+  /**
+   * {@inheritdoc}
+   */
+  public function getCategories() {
+    // Fetch all categories from definitions and remove duplicates.
+    $categories = array_unique(array_values(array_map(static function ($definition) {
+        return $definition['group'] ?? t('Other');
+    }, $this->getDefinitions())));
-    $categories = array_unique(array_values(array_map(static function ($definition) {
-        return $definition['group'] ?? t('Other');
-    }, $this->getDefinitions())));
+    $categories = array_map(static fn($definition) => $definition['group'] ?? t('Other'), $this->getDefinitions());
+    $categories = array_unique(array_values($categories));