From dcc4563c8c020334c28c982049512669aa844ffc Mon Sep 17 00:00:00 2001
From: Heiko <61519853+htcfreek@users.noreply.github.com>
Date: Mon, 6 Sep 2021 12:46:14 +0200
Subject: [PATCH] [WindowsSettings Plugin] Improve subtitle and area naming
 (#12915)

* Update WindowsSettings clas

* Update TranslationHelper

* Adding ToDos to code

* Adding ToDo notes

* Introduce AreaPathHelper

* Small improvement

* Improve helper class

* Update ResultHelper

* Fix spelling

* adding todo marker

* Improve calling of <WindowsSettingsPathHelper>: Update class <WindowsSetting>

* Improve calling of <WindowsSettingsPathHelper>: Update helper class

* Improve calling of <WindowsSettingsPathHelper>: Implement method call

* TranslationHelper: Small fixes

* Fix scoring for areas property

* Fix search filters for area property

* small fixes

* Update WindowsSettings.json

* adding todos

* Code cleanup, improvements and fixes

* Small changes

* Update resource strings

* Fix msitakes

* Update settings

* resolve review feedback
---
 .../Classes/WindowsSetting.cs                 |  19 +-
 .../Helper/JsonSettingsListHelper.cs          |   2 +-
 .../Helper/ResultHelper.cs                    |  10 +-
 .../Helper/TranslationHelper.cs               |  57 +-
 .../Helper/WindowsSettingsPathHelper.cs       |  67 +++
 .../Main.cs                                   |  24 +-
 .../Properties/Resources.Designer.cs          |  18 -
 .../Properties/Resources.resx                 |   7 -
 .../WindowsSettings.json                      | 540 +++++++++---------
 9 files changed, 415 insertions(+), 329 deletions(-)
 create mode 100644 src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/WindowsSettingsPathHelper.cs

diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Classes/WindowsSetting.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Classes/WindowsSetting.cs
index 5c5d2654ad..6c4f23fe99 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Classes/WindowsSetting.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Classes/WindowsSetting.cs
@@ -17,7 +17,6 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
         public WindowsSetting()
         {
             Name = string.Empty;
-            Area = string.Empty;
             Command = string.Empty;
             Type = string.Empty;
         }
@@ -28,9 +27,9 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the area of this setting.
+        /// Gets or sets the areas of this setting. The order is fixed to the order in json.
         /// </summary>
-        public string Area { get; set; }
+        public IList<string>? Areas { get; set; }
 
         /// <summary>
         /// Gets or sets the command of this setting.
@@ -62,5 +61,19 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
         /// Gets or sets the Windows build since this settings is not longer present.
         /// </summary>
         public uint? DeprecatedInBuild { get; set; }
+
+        /// <summary>
+        /// Gets or sets the the value with the generated area path as string.
+        /// This Property IS NOT PART OF THE DATA IN "WindowsSettings.json".
+        /// This property will be filled on runtime by "WindowsSettingsPathHelper".
+        /// </summary>
+        public string? JoinedAreaPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the the value with the generated full settings path (App and areas) as string.
+        /// This Property IS NOT PART OF THE DATA IN "WindowsSettings.json".
+        /// This property will be filled on runtime by "WindowsSettingsPathHelper".
+        /// </summary>
+        public string? JoinedFullSettingsPath { get; set; }
     }
 }
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs
index 0ec818589e..32cddf0944 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs
@@ -53,7 +53,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
             }
             catch (Exception exception)
             {
-                Log.Exception("Error loading settings JSON file", exception, typeof(Main));
+                Log.Exception("Error loading settings JSON file", exception, typeof(JsonSettingsListHelper));
             }
 
             return settingsList ?? Enumerable.Empty<WindowsSetting>();
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs
index fbea9bab1b..0146a273e4 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs
@@ -37,7 +37,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                 {
                     Action = (_) => DoOpenSettingsAction(entry),
                     IcoPath = iconPath,
-                    SubTitle = $"{Resources.Area} \"{entry.Area}\" {Resources.SubtitlePreposition} {entry.Type}",
+                    SubTitle = entry.JoinedFullSettingsPath,
                     Title = entry.Name,
                     ContextData = entry,
                 };
@@ -62,7 +62,11 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
             var toolTipText = new StringBuilder();
 
             toolTipText.AppendLine($"{Resources.Application}: {entry.Type}");
-            toolTipText.AppendLine($"{Resources.Area}: {entry.Area}");
+
+            if (entry.Areas != null && entry.Areas.Any())
+            {
+                toolTipText.AppendLine($"{Resources.Area}: {entry.JoinedAreaPath}");
+            }
 
             if (entry.AltNames != null && entry.AltNames.Any())
             {
@@ -163,7 +167,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                     continue;
                 }
 
-                if (windowsSetting.Area.StartsWith(query, StringComparison.CurrentCultureIgnoreCase))
+                if (windowsSetting.Areas.Any(x => x.StartsWith(query, StringComparison.CurrentCultureIgnoreCase)))
                 {
                     result.Score = lowScore--;
                     continue;
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs
index ee3d92c36a..4a1c225d63 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs
@@ -28,40 +28,49 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
 
             foreach (var settings in settingsList)
             {
-                var area = Resources.ResourceManager.GetString($"Area{settings.Area}");
+                // Translate Name
                 var name = Resources.ResourceManager.GetString(settings.Name);
-                var type = Resources.ResourceManager.GetString(settings.Type);
-
-                if (string.IsNullOrEmpty(area))
-                {
-                    Log.Warn($"Resource string for [Area{settings.Area}] not found", typeof(Main));
-                }
-
                 if (string.IsNullOrEmpty(name))
                 {
-                    Log.Warn($"Resource string for [{settings.Name}] not found", typeof(Main));
+                    Log.Warn($"Resource string for [{settings.Name}] not found", typeof(TranslationHelper));
                 }
 
+                settings.Name = name ?? settings.Name ?? string.Empty;
+
+                // Translate Type (App)
+                var type = Resources.ResourceManager.GetString(settings.Type);
                 if (string.IsNullOrEmpty(type))
                 {
-                    Log.Warn($"Resource string for [{settings.Name}] not found", typeof(Main));
+                    Log.Warn($"Resource string for [{settings.Type}] not found", typeof(TranslationHelper));
                 }
 
-                settings.Area = area ?? settings.Area ?? string.Empty;
-                settings.Name = name ?? settings.Name ?? string.Empty;
                 settings.Type = type ?? settings.Type ?? string.Empty;
 
-                if (!string.IsNullOrEmpty(settings.Note))
+                // Translate Areas
+                if (!(settings.Areas is null) && settings.Areas.Any())
                 {
-                    var note = Resources.ResourceManager.GetString(settings.Note);
-                    if (string.IsNullOrEmpty(note))
+                    var translatedAreas = new List<string>();
+
+                    foreach (var area in settings.Areas)
                     {
-                        Log.Warn($"Resource string for [{settings.Note}] not found", typeof(Main));
+                        if (string.IsNullOrWhiteSpace(area))
+                        {
+                            continue;
+                        }
+
+                        var translatedArea = Resources.ResourceManager.GetString(area);
+                        if (string.IsNullOrEmpty(translatedArea))
+                        {
+                            Log.Warn($"Resource string for [{area}] not found", typeof(TranslationHelper));
+                        }
+
+                        translatedAreas.Add(translatedArea ?? area);
                     }
 
-                    settings.Note = note ?? settings.Note ?? string.Empty;
+                    settings.Areas = translatedAreas;
                 }
 
+                // Translate Alternative names
                 if (!(settings.AltNames is null) && settings.AltNames.Any())
                 {
                     var translatedAltNames = new Collection<string>();
@@ -76,7 +85,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                         var translatedAltName = Resources.ResourceManager.GetString(altName);
                         if (string.IsNullOrEmpty(translatedAltName))
                         {
-                            Log.Warn($"Resource string for [{altName}] not found", typeof(Main));
+                            Log.Warn($"Resource string for [{altName}] not found", typeof(TranslationHelper));
                         }
 
                         translatedAltNames.Add(translatedAltName ?? altName);
@@ -84,6 +93,18 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
 
                     settings.AltNames = translatedAltNames;
                 }
+
+                // Translate Note
+                if (!string.IsNullOrEmpty(settings.Note))
+                {
+                    var note = Resources.ResourceManager.GetString(settings.Note);
+                    if (string.IsNullOrEmpty(note))
+                    {
+                        Log.Warn($"Resource string for [{settings.Note}] not found", typeof(TranslationHelper));
+                    }
+
+                    settings.Note = note ?? settings.Note ?? string.Empty;
+                }
             }
         }
     }
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/WindowsSettingsPathHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/WindowsSettingsPathHelper.cs
new file mode 100644
index 0000000000..15c854c635
--- /dev/null
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/WindowsSettingsPathHelper.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Wox.Plugin.Logger;
+
+namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
+{
+    /// <summary>
+    /// Helper class to help with the path of a <see cref="WindowsSetting"/>. The settings path shows where to find a setting within Windows' user interface.
+    /// </summary>
+    internal static class WindowsSettingsPathHelper
+    {
+        /// <summary>
+        /// The symbol which is used as delimiter between the parts of the path.
+        /// </summary>
+        private const string _pathDelimiterSequence = "\u0020\u0020\u02C3\u0020\u0020"; // = "<space><space><arrow><space><space>"
+
+        /// <summary>
+        /// Generates the values for <see cref="WindowsSetting.JoinedAreaPath"/> and <see cref="WindowsSetting.JoinedFullSettingsPath"/> on all settings of the given list with <see cref="WindowsSetting"/>.
+        /// </summary>
+        /// <param name="settingsList">The list that contains <see cref="WindowsSetting"/> to translate.</param>
+        internal static void GenerateSettingsPathValues(in IEnumerable<WindowsSetting>? settingsList)
+        {
+            if (settingsList is null)
+            {
+                return;
+            }
+
+            foreach (var settings in settingsList)
+            {
+                // Check if type value is filled. If not, then write log warning.
+                if (string.IsNullOrEmpty(settings.Type))
+                {
+                    Log.Warn($"The type property is not set for setting [{settings.Name}] in json. Skipping generating of settings path.", typeof(WindowsSettingsPathHelper));
+                    continue;
+                }
+
+                // Check if "JoinedAreaPath" and "JoinedFullSettingsPath" are filled. Then log debug message.
+                if (!string.IsNullOrEmpty(settings.JoinedAreaPath))
+                {
+                    Log.Debug($"The property [JoinedAreaPath] of setting [{settings.Name}] was filled from the json. This value is not used and will be overwritten.", typeof(WindowsSettingsPathHelper));
+                }
+
+                if (!string.IsNullOrEmpty(settings.JoinedFullSettingsPath))
+                {
+                    Log.Debug($"The property [JoinedFullSettingsPath] of setting [{settings.Name}] was filled from the json. This value is not used and will be overwritten.", typeof(WindowsSettingsPathHelper));
+                }
+
+                // Generating path values.
+                if (!(settings.Areas is null) && settings.Areas.Any())
+                {
+                    var areaValue = string.Join(WindowsSettingsPathHelper._pathDelimiterSequence, settings.Areas);
+                    settings.JoinedAreaPath = areaValue;
+                    settings.JoinedFullSettingsPath = $"{settings.Type}{WindowsSettingsPathHelper._pathDelimiterSequence}{areaValue}";
+                }
+                else
+                {
+                    settings.JoinedAreaPath = string.Empty;
+                    settings.JoinedFullSettingsPath = settings.Type;
+                }
+            }
+        }
+    }
+}
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
index 9c6fabbf1d..2aa1363a06 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
@@ -86,6 +86,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
             _settingsList = UnsupportedSettingsHelper.FilterByBuild(_settingsList);
 
             TranslationHelper.TranslateAllSettings(_settingsList);
+            WindowsSettingsPathHelper.GenerateSettingsPathValues(_settingsList);
         }
 
         /// <summary>
@@ -114,16 +115,23 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
                     return true;
                 }
 
-                // Search for Area only by key char
-                if (found.Area.Contains(query.Search.Replace(":", string.Empty), StringComparison.CurrentCultureIgnoreCase)
-                && query.Search.EndsWith(":"))
+                if (!(found.Areas is null))
                 {
-                    return true;
-                }
+                    foreach (var area in found.Areas)
+                    {
+                        // Search for areas on normal queries.
+                        if (area.Contains(query.Search, StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            return true;
+                        }
 
-                if (found.Area.Contains(query.Search, StringComparison.CurrentCultureIgnoreCase))
-                {
-                    return true;
+                        // Search for Area only on queries with action char.
+                        if (area.Contains(query.Search.Replace(":", string.Empty), StringComparison.CurrentCultureIgnoreCase)
+                        && query.Search.EndsWith(":"))
+                        {
+                            return true;
+                        }
+                    }
                 }
 
                 if (!(found.AltNames is null))
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs
index 37a3d1e427..79e673bb1b 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs
@@ -384,15 +384,6 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Control Panel.
-        /// </summary>
-        internal static string AreaControlPanel {
-            get {
-                return ResourceManager.GetString("AreaControlPanel", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Cortana.
         /// </summary>
@@ -3273,15 +3264,6 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to in.
-        /// </summary>
-        internal static string SubtitlePreposition {
-            get {
-                return ResourceManager.GetString("SubtitlePreposition", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Sync center.
         /// </summary>
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx
index 6bb283e7b9..4205a01ea0 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx
@@ -253,9 +253,6 @@
   <data name="AreaClockAndRegion" xml:space="preserve">
     <value>Clock and Region</value>
   </data>
-  <data name="AreaControlPanel" xml:space="preserve">
-    <value>Control Panel</value>
-  </data>
   <data name="AreaCortana" xml:space="preserve">
     <value>Cortana</value>
   </data>
@@ -1449,10 +1446,6 @@
     <value>Storage Sense</value>
     <comment>Area System</comment>
   </data>
-  <data name="SubtitlePreposition" xml:space="preserve">
-    <value>in</value>
-    <comment>Example: Area "System" in System settings</comment>
-  </data>
   <data name="SyncCenter" xml:space="preserve">
     <value>Sync center</value>
     <comment>Area Control Panel (legacy settings)</comment>
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json
index 82c8d8f14f..6c33f104d4 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json
@@ -1,185 +1,185 @@
 [
   {
     "Name": "AccessWorkOrSchool",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Workplace" ],
     "Command": "ms-settings:workplace"
   },
   {
     "Name": "EmailAndAppAccounts",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:emailandaccounts"
   },
   {
     "Name": "FamilyAndOtherPeople",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "OtherUsers" ],
     "Command": "ms-settings:otherusers"
   },
   {
     "Name": "SetUpKiosk",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "AssignedAccess" ],
     "Command": "ms-settings:assignedaccess"
   },
   {
     "Name": "SignInOptions",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:signinoptions"
   },
   {
     "Name": "SignInOptionsDynamicLock",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:signinoptions-dynamiclock"
   },
   {
     "Name": "SyncYourSettings",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:sync"
   },
   {
     "Name": "WindowsHelloSetupFace",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:signinoptions-launchfaceenrollment"
   },
   {
     "Name": "WindowsHelloSetupFingerprint",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:signinoptions-launchfingerprintenrollment"
   },
   {
     "Name": "YourInfo",
-    "Area": "Accounts",
+    "Areas": [ "AreaAccounts" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:yourinfo"
   },
   {
     "Name": "AppsAndFeatures",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:appsfeatures"
   },
   {
     "Name": "AppFeatures",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:appsfeatures-app"
   },
   {
     "Name": "AppsForWebsites",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:appsforwebsites"
   },
   {
     "Name": "DefaultApps",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:defaultapps"
   },
   {
     "Name": "ManageOptionalFeatures",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:optionalfeatures"
   },
   {
     "Name": "OfflineMaps",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:maps"
   },
   {
     "Name": "OfflineMapsDownloadMaps",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:maps-downloadmaps"
   },
   {
     "Name": "StartupApps",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:startupapps"
   },
   {
     "Name": "VideoPlayback",
-    "Area": "Apps",
+    "Areas": [ "AreaApps" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:videoplayback"
   },
   {
     "Name": "Notifications",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:cortana-notifications"
   },
   {
     "Name": "MoreDetails",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:cortana-moredetails"
   },
   {
     "Name": "PermissionsAndHistory",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:cortana-permissions"
   },
   {
     "Name": "WindowsSearch",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:cortana-windowssearch"
   },
   {
     "Name": "CortanaLanguage",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Talk" ],
     "Command": "ms-settings:cortana-language"
   },
   {
     "Name": "Cortana",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:cortana"
   },
   {
     "Name": "TalkToCortana",
-    "Area": "Cortana",
+    "Areas": [ "AreaCortana" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:cortana-talktocortana"
   },
   {
     "Name": "AutoPlay",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:autoplay"
   },
   {
     "Name": "Bluetooth",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:bluetooth"
   },
   {
     "Name": "ConnectedDevices",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:connecteddevices"
   },
   {
     "Name": "DefaultCamera",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -187,99 +187,99 @@
   },
   {
     "Name": "MouseAndTouchpad",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Note": "NoteTouchpad",
     "Command": "ms-settings:mousetouchpad"
   },
   {
     "Name": "PenAndWindowsInk",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:pen"
   },
   {
     "Name": "PrintersAndScanners",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:printers"
   },
   {
     "Name": "Touchpad",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Note": "NoteTouchpad",
     "Command": "ms-settings:devices-touchpad"
   },
   {
     "Name": "Typing",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:typing"
   },
   {
     "Name": "Usb",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:usb"
   },
   {
     "Name": "Wheel",
-    "Area": "Devices",
+    "Areas": [ "AreaDevices" ],
     "Type": "AppSettingsApp",
     "Note": "NoteDialPaired",
     "Command": "ms-settings:wheel"
   },
   {
     "Name": "Phone",
-    "Area": "Phone",
+    "Areas": [ "AreaPhone" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "MobileDevices" ],
     "Command": "ms-settings:mobile-devices"
   },
   {
     "Name": "Audio",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Mono", "Volume", "AudioAlerts" ],
     "Command": "ms-settings:easeofaccess-audio"
   },
   {
     "Name": "ClosedCaptions",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:easeofaccess-closedcaptioning"
   },
   {
     "Name": "ColorFilters",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "InvertedColors", "Grayscale", "RedGreen", "BlueYellow", "GreenWeek", "RedWeek", "deuteranopia", "protanopia", "tritanopia" ],
     "Command": "ms-settings:easeofaccess-colorfilter"
   },
   {
     "Name": "MousePointer",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "TouchFeedback" ],
     "Command": "ms-settings:easeofaccess-MousePointer"
   },
   {
     "Name": "Display",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Transparency", "Animations", "ScrollBars", "Size" ],
     "Command": "ms-settings:easeofaccess-display"
   },
   {
     "Name": "EyeControl",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:easeofaccess-eyecontrol"
   },
   {
     "Name": "Fonts",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -287,40 +287,40 @@
   },
   {
     "Name": "HighContrast",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:easeofaccess-highcontrast"
   },
   {
     "Name": "Keyboard",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "PrintScreen", "Shortcuts", "OnScreen", "Keys", "ScrollLock", "CapsLock", "NumLock" ],
     "Command": "ms-settings:easeofaccess-keyboard"
   },
   {
     "Name": "Magnifier",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Zoom" ],
     "Command": "ms-settings:easeofaccess-magnifier"
   },
   {
     "Name": "Mouse",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Keypad", "Touch" ],
     "Command": "ms-settings:easeofaccess-mouse"
   },
   {
     "Name": "Narrator",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:easeofaccess-narrator"
   },
   {
     "Name": "OtherOptions",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -328,52 +328,52 @@
   },
   {
     "Name": "Speech",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Recognition", "Talk" ],
     "Command": "ms-settings:easeofaccess-speechrecognition"
   },
   {
     "Name": "Extras",
-    "Area": "Extras",
+    "Areas": [ "AreaExtras" ],
     "Type": "AppSettingsApp",
     "Note": "NoteThirdParty",
     "Command": "ms-settings:extras"
   },
   {
     "Name": "Broadcasting",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:gaming-broadcasting"
   },
   {
     "Name": "GameBar",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:gaming-gamebar"
   },
   {
     "Name": "GameDvr",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:gaming-gamedvr"
   },
   {
     "Name": "GameMode",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:gaming-gamemode"
   },
   {
     "Name": "PlayingGameFullScreen",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "QuietMomentsGame" ],
     "Command": "ms-settings:quietmomentsgame"
   },
   {
     "Name": "TruePlay",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -381,19 +381,19 @@
   },
   {
     "Name": "XboxNetworking",
-    "Area": "Gaming",
+    "Areas": [ "AreaGaming" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:gaming-xboxnetworking"
   },
   {
     "Name": "SettingsHomePage",
-    "Area": "HomePage",
+    "Areas": [ "AreaHomePage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:"
   },
   {
     "Name": "AudioAndSpeech",
-    "Area": "MixedReality",
+    "Areas": [ "AreaMixedReality" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "HolographicAudio" ],
     "Note": "NoteMixedReality",
@@ -401,7 +401,7 @@
   },
   {
     "Name": "Environment",
-    "Area": "MixedReality",
+    "Areas": [ "AreaMixedReality" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "HolographicEnvironment" ],
     "Note": "NoteMixedReality",
@@ -409,7 +409,7 @@
   },
   {
     "Name": "HeadsetDisplay",
-    "Area": "MixedReality",
+    "Areas": [ "AreaMixedReality" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "HolographicHeadset" ],
     "Note": "NoteMixedReality",
@@ -417,7 +417,7 @@
   },
   {
     "Name": "Uninstall",
-    "Area": "MixedReality",
+    "Areas": [ "AreaMixedReality" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "HolographicManagement" ],
     "Note": "NoteMixedReality",
@@ -425,51 +425,51 @@
   },
   {
     "Name": "AirplaneMode",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-airplanemode"
   },
   {
     "Name": "Proximity",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:proximity"
   },
   {
     "Name": "CellularAndSim",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-cellular"
   },
   {
     "Name": "DataUsage",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:datausage"
   },
   {
     "Name": "DialUp",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-dialup"
   },
   {
     "Name": "DirectAccess",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Note": "NoteDirectAccess",
     "Command": "ms-settings:network-directaccess"
   },
   {
     "Name": "Ethernet",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "DNS", "Sdns", "SecureDNS", "Gateway", "Dhcp", "Ip" ],
     "Command": "ms-settings:network-ethernet"
   },
   {
     "Name": "ManageKnownNetworks",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "WiFiSettings", "ShortNameWiFi" ],
     "Note": "NoteWiFiAdapter",
@@ -477,45 +477,45 @@
   },
   {
     "Name": "MobileHotspot",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-mobilehotspot"
   },
   {
     "Name": "NFC",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "NFCTransactions" ],
     "Command": "ms-settings:nfctransactions"
   },
   {
     "Name": "Proxy",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-proxy"
   },
   {
     "Name": "NetworkStatus",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-status"
   },
   {
     "Name": "Network",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "DNS", "Sdns", "SecureDNS", "Gateway", "Dhcp", "Ip" ],
     "Command": "ms-settings:network"
   },
   {
     "Name": "Vpn",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:network-vpn"
   },
   {
     "Name": "WiFi",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Wireless", "MeteredConnection", "ShortNameWiFi" ],
     "Note": "NoteWiFiAdapter",
@@ -523,7 +523,7 @@
   },
   {
     "Name": "WiFiCalling",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "ShortNameWiFi" ],
     "Note": "NoteWiFiAdapter",
@@ -531,28 +531,28 @@
   },
   {
     "Name": "Background",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Wallpaper", "Picture", "Image" ],
     "Command": "ms-settings:personalization-background"
   },
   {
     "Name": "ChooseWhichFoldersAppearOnStart",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "StartPlaces" ],
     "Command": "ms-settings:personalization-start-places"
   },
   {
     "Name": "Colors",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "DarkMode", "LightMode", "DarkColor", "LightColor", "AppColor", "TaskbarColor", "WindowBorder" ],
     "Command": "ms-settings:colors"
   },
   {
     "Name": "Glance",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -560,14 +560,14 @@
   },
   {
     "Name": "LockScreen",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Image", "Picture" ],
     "Command": "ms-settings:lockscreen"
   },
   {
     "Name": "NavigationBar",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -575,45 +575,44 @@
   },
   {
     "Name": "PersonalizationCategory",
-    "Area": "Personalization",
     "Type": "AppSettingsApp",
     "Command": "ms-settings:personalization"
   },
   {
     "Name": "Start",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:personalization-start"
   },
   {
     "Name": "Taskbar",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:taskbar"
   },
   {
     "Name": "Themes",
-    "Area": "Personalization",
+    "Areas": [ "AreaPersonalization" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:themes"
   },
   {
     "Name": "AddYourPhone",
-    "Area": "Phone",
+    "Areas": [ "AreaPhone" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:mobile-devices-addphone",
     "Note": "NoteAddYourPhone"
   },
   {
     "Name": "DirectOpenYourPhone",
-    "Area": "Phone",
+    "Areas": [ "AreaPhone" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:mobile-devices-addphone-direct",
     "Note": "NoteAddYourPhone"
   },
   {
     "Name": "AccessoryApps",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -621,19 +620,19 @@
   },
   {
     "Name": "AccountInfo",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-accountinfo"
   },
   {
     "Name": "ActivityHistory",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-activityhistory"
   },
   {
     "Name": "AdvertisingId",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -641,217 +640,217 @@
   },
   {
     "Name": "AppDiagnostics",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-appdiagnostics"
   },
   {
     "Name": "AutomaticFileDownloads",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-automaticfiledownloads"
   },
   {
     "Name": "BackgroundApps",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-backgroundapps"
   },
   {
     "Name": "Calendar",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-calendar"
   },
   {
     "Name": "CallHistory",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-callhistory"
   },
   {
     "Name": "Camera",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-webcam"
   },
   {
     "Name": "Contacts",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-contacts"
   },
   {
     "Name": "Documents",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-documents"
   },
   {
     "Name": "Email",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-email"
   },
   {
     "Name": "EyeTracker",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Note": "NoteEyetrackerHardware",
     "Command": "ms-settings:privacy-eyetracker"
   },
   {
     "Name": "FeedbackAndDiagnostics",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-feedback"
   },
   {
     "Name": "FileSystem",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-broadfilesystemaccess"
   },
   {
     "Name": "General",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
-    "Command": "ms-settings:privacy or privacy-general"
+    "Command": "ms-settings:privacy-general"
   },
   {
     "Name": "InkingAndTyping",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "SpeechTyping" ],
     "Command": "ms-settings:privacy-speechtyping"
   },
   {
     "Name": "Location",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-location"
   },
   {
     "Name": "Messaging",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-messaging"
   },
   {
     "Name": "Microphone",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-microphone"
   },
   {
     "Name": "Motion",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-motion"
   },
   {
     "Name": "Notifications",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-notifications"
   },
   {
     "Name": "OtherDevices",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "CustomDevices" ],
     "Command": "ms-settings:privacy-customdevices"
   },
   {
     "Name": "PhoneCalls",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-phonecalls"
   },
   {
     "Name": "Pictures",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-pictures"
   },
   {
     "Name": "Radios",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-radios"
   },
   {
     "Name": "Speech",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-speech"
   },
   {
     "Name": "Tasks",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-tasks"
   },
   {
     "Name": "Videos",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-videos"
   },
   {
     "Name": "VoiceActivation",
-    "Area": "Privacy",
+    "Areas": [ "AreaPrivacy" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:privacy-voiceactivation"
   },
   {
     "Name": "Accounts",
-    "Area": "SurfaceHub",
+    "Areas": [ "AreaSurfaceHub" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:surfacehub-accounts"
   },
   {
     "Name": "SessionCleanup",
-    "Area": "SurfaceHub",
+    "Areas": [ "AreaSurfaceHub" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:surfacehub-sessioncleanup"
   },
   {
     "Name": "TeamConferencing",
-    "Area": "SurfaceHub",
+    "Areas": [ "AreaSurfaceHub" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "calling" ],
     "Command": "ms-settings:surfacehub-calling"
   },
   {
     "Name": "TeamDeviceManagement",
-    "Area": "SurfaceHub",
+    "Areas": [ "AreaSurfaceHub" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:surfacehub-devicemanagenent"
   },
   {
     "Name": "WelcomeScreen",
-    "Area": "SurfaceHub",
+    "Areas": [ "AreaSurfaceHub" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:surfacehub-welcome"
   },
   {
     "Name": "About",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Ram", "Processor", "Os", "Id", "Edition", "Version" ],
     "Command": "ms-settings:about"
   },
   {
     "Name": "AdvancedDisplaySettings",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Note": "NoteDisplayGraphics",
     "Command": "ms-settings:display-advanced"
   },
   {
     "Name": "AppVolumeAndDevicePreferences",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "IntroducedInBuild": 18362,
     "Note": "NoteSince18362",
@@ -859,21 +858,21 @@
   },
   {
     "Name": "BatterySaver",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Note": "NoteBattery",
     "Command": "ms-settings:batterysaver"
   },
   {
     "Name": "BatterySaverSettings",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Note": "NoteBattery",
     "Command": "ms-settings:batterysaver-settings"
   },
   {
     "Name": "BatteryUse",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "BatterySaverUsageDetails" ],
     "Note": "NoteBattery",
@@ -881,64 +880,64 @@
   },
   {
     "Name": "Clipboard",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:clipboard"
   },
   {
     "Name": "Display",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "NightLight", "BlueLight", "WarmerColor", "RedEye" ],
     "Command": "ms-settings:display"
   },
   {
     "Name": "DefaultSaveLocations",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:savelocations"
   },
   {
     "Name": "ScreenRotation",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:screenrotation"
   },
   {
     "Name": "DuplicatingMyDisplay",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Presentation" ],
     "Command": "ms-settings:quietmomentspresentation"
   },
   {
     "Name": "DuringTheseHours",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Scheduled" ],
     "Command": "ms-settings:quietmomentsscheduled"
   },
   {
     "Name": "Encryption",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:deviceencryption"
   },
   {
     "Name": "FocusAssistQuietHours",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:quiethours"
   },
   {
     "Name": "FocusAssistQuietMoments",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:quietmomentshome"
   },
   {
     "Name": "GraphicsSettings",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "AdvancedGraphics" ],
     "Note": "NoteAdvancedGraphics",
@@ -946,69 +945,69 @@
   },
   {
     "Name": "Messaging",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:messaging"
   },
   {
     "Name": "Multitasking",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Timeline", "Tab", "AltAndTab", "VirtualDesktops" ],
     "Command": "ms-settings:multitasking"
   },
   {
     "Name": "NightLightSettings",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:nightlight"
   },
   {
     "Name": "PhoneDefaultApps",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:phone-defaultapps"
   },
   {
     "Name": "ProjectingToThisPc",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:project"
   },
   {
     "Name": "SharedExperiences",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "Crossdevice" ],
     "Command": "ms-settings:crossdevice"
   },
   {
     "Name": "TabletMode",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:tabletmode"
   },
   {
     "Name": "Taskbar",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:taskbar"
   },
   {
     "Name": "NotificationsAndActions",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:notifications"
   },
   {
     "Name": "RemoteDesktop",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:remotedesktop"
   },
   {
     "Name": "Phone",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "DeprecatedInBuild": 17763,
     "Note": "NoteDeprecated17763",
@@ -1016,37 +1015,37 @@
   },
   {
     "Name": "PowerAndSleep",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:powersleep"
   },
   {
     "Name": "Sound",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:sound"
   },
   {
     "Name": "StorageSense",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:storagesense"
   },
   {
     "Name": "StoragePolicies",
-    "Area": "System",
+    "Areas": [ "AreaSystem" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:storagepolicies"
   },
   {
     "Name": "DateAndTime",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:dateandtime"
   },
   {
     "Name": "JapanImeSettings",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "jpnime" ],
     "Note": "NoteImeJapan",
@@ -1054,175 +1053,175 @@
   },
   {
     "Name": "Region",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "RegionFormatting" ],
     "Command": "ms-settings:regionformatting"
   },
   {
     "Name": "Keyboard",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:keyboard"
   },
   {
     "Name": "RegionalLanguage",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage"
   },
   {
     "Name": "BopomofoIme",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "bpmf" ],
     "Command": "ms-settings:regionlanguage-bpmfime"
   },
   {
     "Name": "CangjieIme",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage-cangjieime"
   },
   {
     "Name": "PinyinImeSettingsDomainLexicon",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage-chsime-pinyin-domainlexicon"
   },
   {
     "Name": "PinyinImeSettingsKeyConfiguration",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage-chsime-pinyin-keyconfig"
   },
   {
     "Name": "PinyinImeSettingsUdp",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage-chsime-pinyin-udp"
   },
   {
     "Name": "WubiImeSettingsUdp",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage-chsime-wubi-udp"
   },
   {
     "Name": "Quickime",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:regionlanguage-quickime"
   },
   {
     "Name": "PinyinImeSettings",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Note": "NoteImePinyin",
     "Command": "ms-settings:regionlanguage-chsime-pinyin"
   },
   {
     "Name": "Speech",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:speech"
   },
   {
     "Name": "WubiImeSettings",
-    "Area": "TimeAndLanguage",
+    "Areas": [ "AreaTimeAndLanguage" ],
     "Type": "AppSettingsApp",
     "Note": "NoteImeWubi",
     "Command": "ms-settings:regionlanguage-chsime-wubi"
   },
   {
     "Name": "Activation",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:activation"
   },
   {
     "Name": "Backup",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:backup"
   },
   {
     "Name": "DeliveryOptimization",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:delivery-optimization"
   },
   {
     "Name": "FindMyDevice",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:findmydevice"
   },
   {
     "Name": "ForDevelopers",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:developers"
   },
   {
     "Name": "Recovery",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:recovery"
   },
   {
     "Name": "Troubleshoot",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:troubleshoot"
   },
   {
     "Name": "WindowsSecurity",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "AltNames": [ "WindowsDefender", "Firewall", "Virus", "CoreIsolation", "SecurityProcessor", "IsolatedBrowsing", "ExploitProtection" ],
     "Command": "ms-settings:windowsdefender"
   },
   {
     "Name": "WindowsInsiderProgram",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Note": "NoteEnrolledWIP",
     "Command": "ms-settings:windowsinsider"
   },
   {
     "Name": "WindowsUpdate",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:windowsupdate"
   },
   {
     "Name": "WindowsUpdateCheckForUpdates",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:windowsupdate-action"
   },
   {
     "Name": "WindowsUpdateAdvancedOptions",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:windowsupdate-options"
   },
   {
     "Name": "WindowsUpdateRestartOptions",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:windowsupdate-restartoptions"
   },
   {
     "Name": "WindowsUpdateViewUpdateHistory",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "Command": "ms-settings:windowsupdate-history"
   },
   {
     "Name": "WindowsUpdateViewOptionalUpdates",
-    "Area": "UpdateAndSecurity",
+    "Areas": [ "AreaUpdateAndSecurity" ],
     "Type": "AppSettingsApp",
     "IntroducedInBuild": 19041,
     "Note": "NoteSince19041",
@@ -1230,508 +1229,507 @@
   },
   {
     "Name": "WorkplaceProvisioning",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "AppSettingsApp",
     "Note": "NoteWorkplaceProvisioning",
     "Command": "ms-settings:workplace-provisioning"
   },
   {
     "Name": "Provisioning",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "AppSettingsApp",
     "Note": "NoteMobileProvisioning",
     "Command": "ms-settings:provisioning"
   },
   {
     "Name": "WindowsAnywhere",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "AppSettingsApp",
     "Note": "NoteWindowsAnywhere",
     "Command": "ms-settings:windowsanywhere"
   },
   {
     "Name": "AccessibilityOptions",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "ControlPanel",
     "AltNames": [ "access.cpl" ],
     "Command": "control access.cpl"
   },
   {
     "Name": "ActionCenter",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.ActionCenter"
   },
   {
     "Name": "AddHardware",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.AddHardware"
   },
   {
     "Name": "AddRemovePrograms",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "appwiz.cpl" ],
     "Command": "control appwiz.cpl"
   },
   {
     "Name": "AdministrativeTools",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.AdministrativeTools"
   },
   {
     "Name": "AutoPlay",
-    "Area": "Programs",
+    "Areas": [ "AreaPrograms" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.AutoPlay"
   },
   {
     "Name": "BackupAndRestore",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.BackupAndRestore"
   },
   {
     "Name": "BiometricDevices",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.BiometricDevices"
   },
   {
     "Name": "BitLockerDriveEncryption",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.BitLockerDriveEncryption"
   },
   {
     "Name": "BluetoothDevices",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.BluetoothDevices"
   },
   {
     "Name": "ColorManagement",
-    "Area": "AppearanceAndPersonalization",
+    "Areas": [ "AreaAppearanceAndPersonalization" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.ColorManagement"
   },
   {
     "Name": "CredentialManager",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "ControlPanel",
     "AltNames": [ "Password" ],
     "Command": "control /name Microsoft.CredentialManager"
   },
   {
     "Name": "ClientServiceForNetWare",
-    "Area": "Programs",
+    "Areas": [ "AreaPrograms" ],
     "Type": "ControlPanel",
     "AltNames": [ "nwc.cpl" ],
     "Command": "control nwc.cpl"
   },
   {
     "Name": "DateAndTime",
-    "Area": "ClockAndRegion",
+    "Areas": [ "AreaClockAndRegion" ],
     "Type": "ControlPanel",
     "AltNames": [ "timedate.cpl" ],
     "Command": "control /name Microsoft.DateAndTime"
   },
   {
     "Name": "DefaultLocation",
-    "Area": "ClockAndRegion",
+    "Areas": [ "AreaClockAndRegion" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.DefaultLocation"
   },
   {
     "Name": "DefaultPrograms",
-    "Area": "Programs",
+    "Areas": [ "AreaPrograms" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.DefaultPrograms"
   },
   {
     "Name": "DeviceManager",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.DeviceManager"
   },
   {
     "Name": "DevicesAndPrinters",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.DevicesAndPrinters"
   },
   {
     "Name": "EaseOfAccessCenter",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.EaseOfAccessCenter"
   },
   {
     "Name": "FolderOptions",
-    "Area": "AppearanceAndPersonalization",
+    "Areas": [ "AreaAppearanceAndPersonalization" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.FolderOptions"
   },
   {
     "Name": "Fonts",
-    "Area": "AppearanceAndPersonalization",
+    "Areas": [ "AreaAppearanceAndPersonalization" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.Fonts"
   },
   {
     "Name": "GameControllers",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.GameControllers"
   },
   {
     "Name": "GetPrograms",
-    "Area": "Programs",
+    "Areas": [ "AreaPrograms" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.GetPrograms"
   },
   {
     "Name": "GettingStarted",
-    "Area": "ControlPanel",
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.GettingStarted"
   },
   {
     "Name": "HomeGroup",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.HomeGroup"
   },
   {
     "Name": "IndexingOptions",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.IndexingOptions"
   },
   {
     "Name": "Infrared",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.Infrared"
   },
   {
     "Name": "InternetOptions",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "AltNames": [ "inetcpl.cpl" ],
     "Command": "control /name Microsoft.InternetOptions"
   },
   {
     "Name": "MailMicrosoftExchangeOrWindowsMessaging",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "AltNames": [ "mlcfg32.cpl" ],
     "Command": "control mlcfg32.cpl"
   },
   {
     "Name": "Mouse",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.Mouse"
   },
   {
     "Name": "NetworkAndSharingCenter",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.NetworkAndSharingCenter"
   },
   {
     "Name": "NetworkConnection",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control netconnections"
   },
   {
     "Name": "NetworkSetupWizard",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "AltNames": [ "netsetup.cpl" ],
     "Command": "control netsetup.cpl"
   },
   {
     "Name": "OdbcDataSourceAdministrator32Bit",
-    "Area": "AdministrativeTools",
+    "Areas": [ "AreaSystemAndSecurity", "AreaAdministrativeTools" ],
     "Type": "ControlPanel",
     "AltNames": [ "odbccp32.cpl" ],
     "Command": "%windir%/syswow64/odbcad32.exe"
   },
   {
     "Name": "OdbcDataSourceAdministrator64Bit",
-    "Area": "AdministrativeTools",
+    "Areas": [ "AreaSystemAndSecurity", "AreaAdministrativeTools" ],
     "Type": "ControlPanel",
     "Command": "%windir%/system32/odbcad32.exe"
   },
   {
     "Name": "OfflineFiles",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.OfflineFiles"
   },
   {
     "Name": "ParentalControls",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.ParentalControls"
   },
   {
     "Name": "PenAndInputDevices",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.PenAndInputDevices"
   },
   {
     "Name": "PenAndTouch",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.PenAndTouch"
   },
   {
     "Name": "PeopleNearMe",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.PeopleNearMe"
   },
   {
     "Name": "PerformanceInformationAndTools",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.PerformanceInformationAndTools"
   },
   {
     "Name": "PhoneAndModemOptions",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.PhoneAndModemOptions"
   },
   {
     "Name": "PhoneAndModem",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "AltNames": [ "modem.cpl" ],
     "Command": "control /name Microsoft.PhoneAndModem"
   },
   {
     "Name": "PowerOptions",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "AltNames": [ "powercfg.cpl" ],
     "Command": "control /name Microsoft.PowerOptions"
   },
   {
     "Name": "Printers",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.Printers"
   },
   {
     "Name": "ProblemReportsAndSolutions",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.ProblemReportsAndSolutions"
   },
   {
     "Name": "ProgramsAndFeatures",
-    "Area": "Programs",
+    "Areas": [ "AreaPrograms" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.ProgramsAndFeatures"
   },
   {
     "Name": "Recovery",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.Recovery"
   },
   {
     "Name": "RegionAndLanguage",
-    "Area": "ClockAndRegion",
+    "Areas": [ "AreaClockAndRegion" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.RegionAndLanguage"
   },
   {
     "Name": "RemoteAppAndDesktopConnections",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.RemoteAppAndDesktopConnections"
   },
   {
     "Name": "ScannersAndCameras",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "sticpl.cpl" ],
     "Command": "control /name Microsoft.ScannersAndCameras"
   },
   {
     "Name": "ScheduledTasks",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "AltNames": [ "schedtasks" ],
     "Command": "control schedtasks"
   },
   {
     "Name": "SecurityCenter",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.SecurityCenter"
   },
   {
     "Name": "Sound",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.Sound"
   },
   {
     "Name": "SpeechRecognition",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.SpeechRecognition"
   },
   {
     "Name": "SyncCenter",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.SyncCenter"
   },
   {
     "Name": "System",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "AltNames": [ "sysdm.cpl" ],
     "Command": "control sysdm.cpl"
   },
   {
     "Name": "TabletPcSettings",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.TabletPCSettings"
   },
   {
     "Name": "TextToSpeech",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.TextToSpeech"
   },
   {
     "Name": "UserAccounts",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.UserAccounts"
   },
   {
     "Name": "WelcomeCenter",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.WelcomeCenter"
   },
   {
     "Name": "WindowsAnytimeUpgrade",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.WindowsAnytimeUpgrade"
   },
   {
     "Name": "WindowsCardSpace",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.CardSpace"
   },
   {
     "Name": "WindowsDefender",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.WindowsDefender"
   },
   {
     "Name": "WindowsFirewall",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.WindowsFirewall"
   },
   {
     "Name": "WindowsMobilityCenter",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "Command": "control /name Microsoft.MobilityCenter"
   },
   {
     "Name": "DisplayProperties",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "desk.cpl" ],
     "Command": "control Desk.cpl"
   },
   {
     "Name": "FindFast",
-    "Area": "SystemAndSecurity",
+    "Areas": [ "AreaSystemAndSecurity" ],
     "Type": "ControlPanel",
     "AltNames": [ "findfast.cpl" ],
     "Command": "control FindFast.cpl"
   },
   {
     "Name": "RegionalSettingsProperties",
-    "Area": "EaseOfAccess",
+    "Areas": [ "AreaEaseOfAccess" ],
     "Type": "ControlPanel",
     "AltNames": [ "intl.cpl" ],
     "Command": "control Intl.cpl"
   },
   {
     "Name": "JoystickProperties",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "joy.cpl" ],
     "Command": "control Joy.cpl"
   },
   {
     "Name": "MouseFontsKeyboardAndPrintersProperties",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "main.cpl" ],
     "Command": "control Main.cpl"
   },
   {
     "Name": "MultimediaProperties",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "mmsys.cpl" ],
     "Command": "control Mmsys.cpl"
   },
   {
     "Name": "NetworkProperties",
-    "Area": "NetworkAndInternet",
+    "Areas": [ "AreaNetworkAndInternet" ],
     "Type": "ControlPanel",
     "AltNames": [ "netcpl.cpl" ],
     "Command": "control Netcpl.cpl"
   },
   {
     "Name": "PasswordProperties",
-    "Area": "UserAccounts",
+    "Areas": [ "AreaUserAccounts" ],
     "Type": "ControlPanel",
     "AltNames": [ "password.cpl" ],
     "Command": "control Password.cpl"
   },
   {
     "Name": "SystemPropertiesAndAddNewHardwareWizard",
-    "Area": "HardwareAndSound",
+    "Areas": [ "AreaHardwareAndSound" ],
     "Type": "ControlPanel",
     "AltNames": [ "sysdm.cpl" ],
     "Command": "control Sysdm.cpl"
   },
   {
     "Name": "DesktopThemes",
-    "Area": "AppearanceAndPersonalization",
+    "Areas": [ "AreaAppearanceAndPersonalization" ],
     "Type": "ControlPanel",
     "AltNames": [ "themes.cpl" ],
     "Command": "control Themes.cpl"
   },
   {
     "Name": "MicrosoftMailPostOffice",
-    "Area": "Programs",
+    "Areas": [ "AreaPrograms" ],
     "Type": "ControlPanel",
     "AltNames": [ "wgpocpl.cpl" ],
     "Command": "control Wgpocpl.cpl"