diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 6096acb5b6c21d..04f3e961f3a78a 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -148,15 +148,9 @@
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
         "text": {
-            "defaultResponsePolicy": [
-                "Always",
-                "Conditional",
-                "Never"
-            ]
+            "defaultResponsePolicy": ["Always", "Conditional", "Never"]
         },
-        "bool": [
-            "commandDiscovery"
-        ]
+        "bool": ["commandDiscovery"]
     },
     "defaults": {
         "text": {
@@ -202,17 +196,9 @@
             "SpecificationVersion",
             "MaxPathsPerInvoke"
         ],
-        "Bridged Device Basic Information": [
-            "ProductAppearance"
-        ],
-        "Chime": [
-            "ActiveChimeID",
-            "Enabled"
-        ],
-        "Descriptor": [
-            "ClusterRevision",
-            "FeatureMap"
-        ],
+        "Bridged Device Basic Information": ["ProductAppearance"],
+        "Chime": ["ActiveChimeID", "Enabled"],
+        "Descriptor": ["ClusterRevision", "FeatureMap"],
         "Device Energy Management": [
             "ESAType",
             "ESACanGenerate",
@@ -264,11 +250,7 @@
             "SessionEnergyDischarged",
             "FeatureMap"
         ],
-        "Energy EVSE Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Ethernet Network Diagnostics": [
             "PHYRate",
             "FullDuplex",
@@ -312,11 +294,7 @@
             "ICDCounter",
             "ClientsSupportedPerFabric"
         ],
-        "Occupancy Sensing": [
-            "HoldTimeLimits",
-            "HoldTime",
-            "FeatureMap"
-        ],
+        "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"],
         "Operational Credentials": [
             "SupportedFabrics",
             "CommissionedFabrics",
@@ -423,21 +401,14 @@
             "CurrentMaxRate",
             "OverrunCount"
         ],
-        "Channel": [
-            "Lineup",
-            "CurrentChannel"
-        ],
+        "Channel": ["Lineup", "CurrentChannel"],
         "Media Playback": [
             "SampledPosition",
             "ActiveAudioTrack",
             "ActiveTextTrack"
         ],
-        "Application Launcher": [
-            "CurrentApp"
-        ],
-        "Application Basic": [
-            "Application"
-        ],
+        "Application Launcher": ["CurrentApp"],
+        "Application Basic": ["Application"],
         "Time Synchronization": [
             "TrustedTimeSource",
             "DefaultNTP",
@@ -449,19 +420,9 @@
             "TimeZoneListMaxSize",
             "DSTOffsetListMaxSize"
         ],
-        "Temperature Control": [
-            "SupportedTemperatureLevels"
-        ],
-        "Dishwasher Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
-        "Microwave Oven Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "Temperature Control": ["SupportedTemperatureLevels"],
+        "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Microwave Oven Control": [
             "CookTime",
             "MaxCookTime",
@@ -474,26 +435,14 @@
             "WattRating",
             "FeatureMap"
         ],
-        "Laundry Washer Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Refrigerator And Temperature Controlled Cabinet Mode": [
             "SupportedModes",
             "CurrentMode",
             "FeatureMap"
         ],
-        "RVC Clean Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
-        "RVC Run Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Operational State": [
             "OperationalState",
             "OperationalError",
@@ -670,10 +619,7 @@
             "LevelValue",
             "FeatureMap"
         ],
-        "Air Quality": [
-            "AirQuality",
-            "FeatureMap"
-        ],
+        "Air Quality": ["AirQuality", "FeatureMap"],
         "Electrical Energy Measurement": [
             "Accuracy",
             "CumulativeEnergyImported",
@@ -705,15 +651,9 @@
             "NeutralCurrent",
             "FeatureMap"
         ],
-        "Power Topology": [
-            "FeatureMap"
-        ],
-        "Valve Configuration and Control": [
-            "RemainingDuration"
-        ],
-        "Boolean State Configuration": [
-            "CurrentSensitivityLevel"
-        ],
+        "Power Topology": ["FeatureMap"],
+        "Valve Configuration and Control": ["RemainingDuration"],
+        "Boolean State Configuration": ["CurrentSensitivityLevel"],
         "Water Heater Management": [
             "HeaterTypes",
             "HeatDemand",
@@ -724,25 +664,14 @@
             "FeatureMap",
             "ClusterRevision"
         ],
-        "Water Heater Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
-        "Wi-Fi Network Management": [
-            "SSID",
-            "PassphraseSurrogate"
-        ],
+        "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"],
         "Thread Network Directory": [
             "PreferredExtendedPanID",
             "ThreadNetworks",
             "ThreadNetworkTableSize"
         ],
-        "Service Area": [
-            "CurrentArea",
-            "EstimatedEndTime",
-            "FeatureMap"
-        ],
+        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
         "Camera AV Stream Management": [
             "VideoSensorParams",
             "MinViewport",
@@ -753,14 +682,7 @@
     },
     "mandatoryDeviceTypes": "0x0016",
     "defaultReportingPolicy": "mandatory",
-    "ZCLDataTypes": [
-        "ARRAY",
-        "BITMAP",
-        "ENUM",
-        "NUMBER",
-        "STRING",
-        "STRUCT"
-    ],
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
     "fabricHandling": {
         "automaticallyCreateFields": true,
         "indexFieldId": 254,
@@ -770,4 +692,4 @@
     "uiOptions": {
         "showProfileId": false
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 741ff82219e6ea..3c780935defcd4 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -3,11 +3,7 @@
     "category": "matter",
     "version": 1,
     "requiredFeatureLevel": 102,
-    "xmlRoot": [
-        ".",
-        "./data-model/chip/",
-        "./data-model/silabs/"
-    ],
+    "xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"],
     "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
     "xmlFile": [
         "access-control-definitions.xml",
@@ -146,15 +142,9 @@
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
         "text": {
-            "defaultResponsePolicy": [
-                "Always",
-                "Conditional",
-                "Never"
-            ]
+            "defaultResponsePolicy": ["Always", "Conditional", "Never"]
         },
-        "bool": [
-            "commandDiscovery"
-        ]
+        "bool": ["commandDiscovery"]
     },
     "defaults": {
         "text": {
@@ -200,17 +190,9 @@
             "SpecificationVersion",
             "MaxPathsPerInvoke"
         ],
-        "Bridged Device Basic Information": [
-            "ProductAppearance"
-        ],
-        "Chime": [
-            "ActiveChimeID",
-            "Enabled"
-        ],
-        "Descriptor": [
-            "ClusterRevision",
-            "FeatureMap"
-        ],
+        "Bridged Device Basic Information": ["ProductAppearance"],
+        "Chime": ["ActiveChimeID", "Enabled"],
+        "Descriptor": ["ClusterRevision", "FeatureMap"],
         "Device Energy Management": [
             "ESAType",
             "ESACanGenerate",
@@ -262,11 +244,7 @@
             "SessionEnergyDischarged",
             "FeatureMap"
         ],
-        "Energy EVSE Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Ethernet Network Diagnostics": [
             "PHYRate",
             "FullDuplex",
@@ -310,11 +288,7 @@
             "ICDCounter",
             "ClientsSupportedPerFabric"
         ],
-        "Occupancy Sensing": [
-            "HoldTimeLimits",
-            "HoldTime",
-            "FeatureMap"
-        ],
+        "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"],
         "Operational Credentials": [
             "SupportedFabrics",
             "CommissionedFabrics",
@@ -421,21 +395,14 @@
             "CurrentMaxRate",
             "OverrunCount"
         ],
-        "Channel": [
-            "Lineup",
-            "CurrentChannel"
-        ],
+        "Channel": ["Lineup", "CurrentChannel"],
         "Media Playback": [
             "SampledPosition",
             "ActiveAudioTrack",
             "ActiveTextTrack"
         ],
-        "Application Launcher": [
-            "CurrentApp"
-        ],
-        "Application Basic": [
-            "Application"
-        ],
+        "Application Launcher": ["CurrentApp"],
+        "Application Basic": ["Application"],
         "Time Synchronization": [
             "TrustedTimeSource",
             "DefaultNTP",
@@ -447,19 +414,9 @@
             "TimeZoneListMaxSize",
             "DSTOffsetListMaxSize"
         ],
-        "Temperature Control": [
-            "SupportedTemperatureLevels"
-        ],
-        "Dishwasher Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
-        "Microwave Oven Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "Temperature Control": ["SupportedTemperatureLevels"],
+        "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Microwave Oven Control": [
             "CookTime",
             "MaxCookTime",
@@ -472,26 +429,14 @@
             "WattRating",
             "FeatureMap"
         ],
-        "Laundry Washer Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Refrigerator And Temperature Controlled Cabinet Mode": [
             "SupportedModes",
             "CurrentMode",
             "FeatureMap"
         ],
-        "RVC Clean Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
-        "RVC Run Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
+        "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
         "Operational State": [
             "OperationalState",
             "OperationalError",
@@ -668,10 +613,7 @@
             "LevelValue",
             "FeatureMap"
         ],
-        "Air Quality": [
-            "AirQuality",
-            "FeatureMap"
-        ],
+        "Air Quality": ["AirQuality", "FeatureMap"],
         "Electrical Energy Measurement": [
             "Accuracy",
             "CumulativeEnergyImported",
@@ -703,15 +645,9 @@
             "NeutralCurrent",
             "FeatureMap"
         ],
-        "Power Topology": [
-            "FeatureMap"
-        ],
-        "Valve Configuration and Control": [
-            "RemainingDuration"
-        ],
-        "Boolean State Configuration": [
-            "CurrentSensitivityLevel"
-        ],
+        "Power Topology": ["FeatureMap"],
+        "Valve Configuration and Control": ["RemainingDuration"],
+        "Boolean State Configuration": ["CurrentSensitivityLevel"],
         "Water Heater Management": [
             "HeaterTypes",
             "HeatDemand",
@@ -722,25 +658,14 @@
             "FeatureMap",
             "ClusterRevision"
         ],
-        "Water Heater Mode": [
-            "SupportedModes",
-            "CurrentMode",
-            "FeatureMap"
-        ],
-        "Wi-Fi Network Management": [
-            "SSID",
-            "PassphraseSurrogate"
-        ],
+        "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"],
         "Thread Network Directory": [
             "PreferredExtendedPanID",
             "ThreadNetworks",
             "ThreadNetworkTableSize"
         ],
-        "Service Area": [
-            "CurrentArea",
-            "EstimatedEndTime",
-            "FeatureMap"
-        ],
+        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
         "Camera AV Stream Management": [
             "VideoSensorParams",
             "MinViewport",
@@ -751,14 +676,7 @@
     },
     "mandatoryDeviceTypes": "0x0016",
     "defaultReportingPolicy": "mandatory",
-    "ZCLDataTypes": [
-        "ARRAY",
-        "BITMAP",
-        "ENUM",
-        "NUMBER",
-        "STRING",
-        "STRUCT"
-    ],
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
     "fabricHandling": {
         "automaticallyCreateFields": true,
         "indexFieldId": 254,
@@ -768,4 +686,4 @@
     "uiOptions": {
         "showProfileId": false
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index 0effe2ac3a536f..81d9329baf9257 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -112,9 +112,7 @@
         "TARGET_NAVIGATOR_CLUSTER": [],
         "TEMPERATURE_CONTROL_CLUSTER": [],
         "TEMPERATURE_MEASUREMENT_CLUSTER": [],
-        "THERMOSTAT_CLUSTER": [
-            "thermostat-client"
-        ],
+        "THERMOSTAT_CLUSTER": ["thermostat-client"],
         "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [],
         "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [],
         "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [],
@@ -142,12 +140,8 @@
         "ZONE_MANAGEMENT_CLUSTER": []
     },
     "ServerDirectories": {
-        "ACCESS_CONTROL_CLUSTER": [
-            "access-control-server"
-        ],
-        "ACCOUNT_LOGIN_CLUSTER": [
-            "account-login-server"
-        ],
+        "ACCESS_CONTROL_CLUSTER": ["access-control-server"],
+        "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"],
         "ACTIONS_CLUSTER": [],
         "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [
             "resource-monitoring-server"
@@ -155,26 +149,14 @@
         "ADMINISTRATOR_COMMISSIONING_CLUSTER": [
             "administrator-commissioning-server"
         ],
-        "AIR_QUALITY_CLUSTER": [
-            "air-quality-server"
-        ],
+        "AIR_QUALITY_CLUSTER": ["air-quality-server"],
         "ALARM_CLUSTER": [],
-        "APPLICATION_BASIC_CLUSTER": [
-            "application-basic-server"
-        ],
-        "APPLICATION_LAUNCHER_CLUSTER": [
-            "application-launcher-server"
-        ],
-        "AUDIO_OUTPUT_CLUSTER": [
-            "audio-output-server"
-        ],
+        "APPLICATION_BASIC_CLUSTER": ["application-basic-server"],
+        "APPLICATION_LAUNCHER_CLUSTER": ["application-launcher-server"],
+        "AUDIO_OUTPUT_CLUSTER": ["audio-output-server"],
         "BALLAST_CONFIGURATION_CLUSTER": [],
-        "BASIC_INFORMATION_CLUSTER": [
-            "basic-information"
-        ],
-        "BINDING_CLUSTER": [
-            "bindings"
-        ],
+        "BASIC_INFORMATION_CLUSTER": ["basic-information"],
+        "BINDING_CLUSTER": ["bindings"],
         "BOOLEAN_STATE_CLUSTER": [],
         "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [
             "boolean-state-configuration-server"
@@ -189,179 +171,79 @@
         "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
-        "CHANNEL_CLUSTER": [
-            "channel-server"
-        ],
-        "CHIME_CLUSTER": [
-            "chime-server"
-        ],
-        "COLOR_CONTROL_CLUSTER": [
-            "color-control-server"
-        ],
-        "COMMISSIONER_CONTROL_CLUSTER": [
-            "commissioner-control-server"
-        ],
+        "CHANNEL_CLUSTER": ["channel-server"],
+        "CHIME_CLUSTER": ["chime-server"],
+        "COLOR_CONTROL_CLUSTER": ["color-control-server"],
+        "COMMISSIONER_CONTROL_CLUSTER": ["commissioner-control-server"],
         "COMMISSIONING_CLUSTER": [],
-        "CONTENT_LAUNCHER_CLUSTER": [
-            "content-launch-server"
-        ],
-        "CONTENT_CONTROL_CLUSTER": [
-            "content-control-server"
-        ],
-        "CONTENT_APP_OBSERVER_CLUSTER": [
-            "content-app-observer"
-        ],
-        "DESCRIPTOR_CLUSTER": [
-            "descriptor"
-        ],
-        "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [
-            "device-energy-management-server"
-        ],
-        "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
+        "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"],
+        "CONTENT_CONTROL_CLUSTER": ["content-control-server"],
+        "CONTENT_APP_OBSERVER_CLUSTER": ["content-app-observer"],
+        "DESCRIPTOR_CLUSTER": ["descriptor"],
+        "DEVICE_ENERGY_MANAGEMENT_CLUSTER": ["device-energy-management-server"],
+        "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": ["mode-base-server"],
         "DEVICE_TEMP_CLUSTER": [],
-        "DIAGNOSTIC_LOGS_CLUSTER": [
-            "diagnostic-logs-server"
-        ],
-        "DISHWASHER_ALARM_CLUSTER": [
-            "dishwasher-alarm-server"
-        ],
-        "DISHWASHER_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
-        "MICROWAVE_OVEN_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
-        "DOOR_LOCK_CLUSTER": [
-            "door-lock-server"
-        ],
-        "ECOSYSTEM_INFORMATION_CLUSTER": [
-            "ecosystem-information-server"
-        ],
+        "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
+        "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
+        "DISHWASHER_MODE_CLUSTER": ["mode-base-server"],
+        "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"],
+        "DOOR_LOCK_CLUSTER": ["door-lock-server"],
+        "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"],
         "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [
             "electrical-energy-measurement-server"
         ],
         "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [
             "electrical-power-measurement-server"
         ],
-        "ENERGY_EVSE_CLUSTER": [
-            "energy-evse-server"
-        ],
-        "ENERGY_EVSE_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
+        "ENERGY_EVSE_CLUSTER": ["energy-evse-server"],
+        "ENERGY_EVSE_MODE_CLUSTER": ["mode-base-server"],
         "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [
             "ethernet-network-diagnostics-server"
         ],
-        "ENERGY_PREFERENCE_CLUSTER": [
-            "energy-preference-server"
-        ],
-        "FAN_CONTROL_CLUSTER": [
-            "fan-control-server"
-        ],
-        "FAULT_INJECTION_CLUSTER": [
-            "fault-injection-server"
-        ],
-        "FIXED_LABEL_CLUSTER": [
-            "fixed-label-server"
-        ],
+        "ENERGY_PREFERENCE_CLUSTER": ["energy-preference-server"],
+        "FAN_CONTROL_CLUSTER": ["fan-control-server"],
+        "FAULT_INJECTION_CLUSTER": ["fault-injection-server"],
+        "FIXED_LABEL_CLUSTER": ["fixed-label-server"],
         "FLOW_MEASUREMENT_CLUSTER": [],
         "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
-        "GENERAL_COMMISSIONING_CLUSTER": [
-            "general-commissioning-server"
-        ],
-        "GENERAL_DIAGNOSTICS_CLUSTER": [
-            "general-diagnostics-server"
-        ],
-        "GROUPS_CLUSTER": [
-            "groups-server"
-        ],
-        "HEPA_FILTER_MONITORING_CLUSTER": [
-            "resource-monitoring-server"
-        ],
-        "GROUP_KEY_MANAGEMENT_CLUSTER": [
-            "group-key-mgmt-server"
-        ],
-        "ICD_MANAGEMENT_CLUSTER": [
-            "icd-management-server"
-        ],
-        "IDENTIFY_CLUSTER": [
-            "identify-server"
-        ],
+        "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"],
+        "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"],
+        "GROUPS_CLUSTER": ["groups-server"],
+        "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"],
+        "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"],
+        "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"],
+        "IDENTIFY_CLUSTER": ["identify-server"],
         "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
-        "KEYPAD_INPUT_CLUSTER": [
-            "keypad-input-server"
-        ],
-        "LAUNDRY_WASHER_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
-        "LEVEL_CONTROL_CLUSTER": [
-            "level-control"
-        ],
+        "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"],
+        "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-base-server"],
+        "LEVEL_CONTROL_CLUSTER": ["level-control"],
         "LOCALIZATION_CONFIGURATION_CLUSTER": [
             "localization-configuration-server"
         ],
-        "LOW_POWER_CLUSTER": [
-            "low-power-server"
-        ],
-        "MEDIA_INPUT_CLUSTER": [
-            "media-input-server"
-        ],
-        "MEDIA_PLAYBACK_CLUSTER": [
-            "media-playback-server"
-        ],
-        "MICROWAVE_OVEN_CONTROL_CLUSTER": [
-            "microwave-oven-control-server"
-        ],
-        "MESSAGES_CLUSTER": [
-            "messages-server"
-        ],
-        "MODE_SELECT_CLUSTER": [
-            "mode-select-server"
-        ],
-        "NETWORK_COMMISSIONING_CLUSTER": [
-            "network-commissioning"
-        ],
+        "LOW_POWER_CLUSTER": ["low-power-server"],
+        "MEDIA_INPUT_CLUSTER": ["media-input-server"],
+        "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"],
+        "MICROWAVE_OVEN_CONTROL_CLUSTER": ["microwave-oven-control-server"],
+        "MESSAGES_CLUSTER": ["messages-server"],
+        "MODE_SELECT_CLUSTER": ["mode-select-server"],
+        "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"],
         "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
-        "SAMPLE_MEI_CLUSTER": [
-            "sample-mei-server"
-        ],
-        "OCCUPANCY_SENSING_CLUSTER": [
-            "occupancy-sensor-server"
-        ],
-        "ON_OFF_CLUSTER": [
-            "on-off-server"
-        ],
-        "POWER_TOPOLOGY_CLUSTER": [
-            "power-topology-server"
-        ],
-        "OPERATIONAL_CREDENTIALS_CLUSTER": [
-            "operational-credentials-server"
-        ],
-        "OPERATIONAL_STATE_CLUSTER": [
-            "operational-state-server"
-        ],
-        "OPERATIONAL_STATE_OVEN_CLUSTER": [
-            "operational-state-server"
-        ],
-        "OPERATIONAL_STATE_RVC_CLUSTER": [
-            "operational-state-server"
-        ],
+        "SAMPLE_MEI_CLUSTER": ["sample-mei-server"],
+        "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
+        "ON_OFF_CLUSTER": ["on-off-server"],
+        "POWER_TOPOLOGY_CLUSTER": ["power-topology-server"],
+        "OPERATIONAL_CREDENTIALS_CLUSTER": ["operational-credentials-server"],
+        "OPERATIONAL_STATE_CLUSTER": ["operational-state-server"],
+        "OPERATIONAL_STATE_OVEN_CLUSTER": ["operational-state-server"],
+        "OPERATIONAL_STATE_RVC_CLUSTER": ["operational-state-server"],
         "OTA_BOOTLOAD_CLUSTER": [],
-        "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [
-            "ota-provider"
-        ],
-        "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [
-            "ota-requestor"
-        ],
-        "OVEN_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
+        "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"],
+        "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"],
+        "OVEN_MODE_CLUSTER": ["mode-base-server"],
         "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
@@ -377,9 +259,7 @@
         "POLL_CONTROL_CLUSTER": [],
         "POWER_CONFIG_CLUSTER": [],
         "POWER_PROFILE_CLUSTER": [],
-        "POWER_SOURCE_CLUSTER": [
-            "power-source-server"
-        ],
+        "POWER_SOURCE_CLUSTER": ["power-source-server"],
         "POWER_SOURCE_CONFIGURATION_CLUSTER": [
             "power-source-configuration-server"
         ],
@@ -394,44 +274,22 @@
         "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
-        "REFRIGERATOR_ALARM_CLUSTER": [
-            "refrigerator-alarm-server"
-        ],
+        "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"],
         "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [
             "mode-base-server"
         ],
         "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
-        "RVC_CLEAN_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
-        "RVC_RUN_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
-        "SCENES_CLUSTER": [
-            "scenes-server"
-        ],
-        "SERVICE_AREA_CLUSTER": [
-            "service-area-server"
-        ],
-        "SMOKE_CO_ALARM_CLUSTER": [
-            "smoke-co-alarm-server"
-        ],
-        "SOFTWARE_DIAGNOSTICS_CLUSTER": [
-            "software-diagnostics-server"
-        ],
-        "SWITCH_CLUSTER": [
-            "switch-server"
-        ],
-        "TARGET_NAVIGATOR_CLUSTER": [
-            "target-navigator-server"
-        ],
-        "TEMPERATURE_CONTROL_CLUSTER": [
-            "temperature-control-server"
-        ],
+        "RVC_CLEAN_MODE_CLUSTER": ["mode-base-server"],
+        "RVC_RUN_MODE_CLUSTER": ["mode-base-server"],
+        "SCENES_CLUSTER": ["scenes-server"],
+        "SERVICE_AREA_CLUSTER": ["service-area-server"],
+        "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"],
+        "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"],
+        "SWITCH_CLUSTER": ["switch-server"],
+        "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"],
+        "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"],
         "TEMPERATURE_MEASUREMENT_CLUSTER": [],
-        "THERMOSTAT_CLUSTER": [
-            "thermostat-server"
-        ],
+        "THERMOSTAT_CLUSTER": ["thermostat-server"],
         "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [
             "thermostat-user-interface-configuration-server"
         ],
@@ -441,59 +299,31 @@
         "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [
             "thread-network-diagnostics-server"
         ],
-        "THREAD_NETWORK_DIRECTORY_CLUSTER": [
-            "thread-network-directory-server"
-        ],
+        "THREAD_NETWORK_DIRECTORY_CLUSTER": ["thread-network-directory-server"],
         "TIME_CLUSTER": [],
-        "TIME_FORMAT_LOCALIZATION_CLUSTER": [
-            "time-format-localization-server"
-        ],
-        "TIME_SYNCHRONIZATION_CLUSTER": [
-            "time-synchronization-server"
-        ],
-        "TIMER_CLUSTER": [
-            "timer-server"
-        ],
+        "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"],
+        "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"],
+        "TIMER_CLUSTER": ["timer-server"],
         "TLS_CERTIFICATE_MANAGEMENT_CLUSTER": [],
         "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
         "UNIT_LOCALIZATION_CLUSTER": [],
-        "UNIT_TESTING_CLUSTER": [
-            "test-cluster-server"
-        ],
-        "USER_LABEL_CLUSTER": [
-            "user-label-server"
-        ],
+        "UNIT_TESTING_CLUSTER": ["test-cluster-server"],
+        "USER_LABEL_CLUSTER": ["user-label-server"],
         "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [
             "valve-configuration-and-control-server"
         ],
-        "WAKE_ON_LAN_CLUSTER": [
-            "wake-on-lan-server"
-        ],
-        "LAUNDRY_WASHER_CONTROLS_CLUSTER": [
-            "laundry-washer-controls-server"
-        ],
-        "LAUNDRY_DRYER_CONTROLS_CLUSTER": [
-            "laundry-dryer-controls-server"
-        ],
+        "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"],
+        "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"],
+        "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"],
         "WEB_RTC_PROVIDER_CLUSTER": [],
         "WEBRTC_REQUESTOR_CLUSTER": [],
-        "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [
-            "wifi-network-diagnostics-server"
-        ],
-        "WIFI_NETWORK_MANAGEMENT_CLUSTER": [
-            "wifi-network-management-server"
-        ],
-        "WINDOW_COVERING_CLUSTER": [
-            "window-covering-server"
-        ],
-        "WATER_HEATER_MANAGEMENT_CLUSTER": [
-            "water-heater-management-server"
-        ],
-        "WATER_HEATER_MODE_CLUSTER": [
-            "mode-base-server"
-        ],
+        "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"],
+        "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"],
+        "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
+        "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
+        "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"],
         "ZONE_MANAGEMENT_CLUSTER": []
     }
-}
\ No newline at end of file
+}