From 7faa5b568d41b8d5962de6a9e242b3858d43b1b4 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Mon, 30 Jan 2023 09:31:10 +0100
Subject: [PATCH] [cluster] Move ColorControl cluster to a dedicated file

---
 .github/workflows/tests.yaml                  |   2 +-
 scripts/rules.matterlint                      |   1 +
 src/app/zap-templates/zcl/data-model/all.xml  |   2 +-
 .../data-model/chip/color-control-cluster.xml | 459 ++++++++++++++++++
 .../data-model/draft/types/color-control.xml  |  28 ++
 .../zcl/data-model/silabs/ha.xml              | 253 ----------
 .../zcl/data-model/silabs/types-silabs.xml    |  38 --
 .../zcl/data-model/silabs/zll.xml             | 145 ------
 .../zcl/zcl-with-test-extensions.json         |   3 +-
 src/app/zap-templates/zcl/zcl.json            |   3 +-
 10 files changed, 494 insertions(+), 440 deletions(-)
 create mode 100644 src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
 create mode 100644 src/app/zap-templates/zcl/data-model/draft/types/color-control.xml
 delete mode 100644 src/app/zap-templates/zcl/data-model/silabs/zll.xml

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index a0370261e34ccb..8665962679de20 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -125,6 +125,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/chip-types.xml \
                       src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml \
+                      src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
@@ -182,7 +183,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/silabs/lo-devices.xml \
                       src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml \
                       src/app/zap-templates/zcl/data-model/silabs/zll-devices.xml \
-                      src/app/zap-templates/zcl/data-model/silabs/zll.xml \
                     "
             - name: Build Apps
               timeout-minutes: 60
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index bf2b540d23cf8b..74d9cbcbb1e6ad 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -17,6 +17,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 12093a14df4b68..7d1687fc2565f7 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -15,6 +15,7 @@
    <xi:include href="chip/chip-types.xml" />
    <xi:include href="chip/client-monitoring-cluster.xml" />
    <xi:include href="chip/clusters-extensions.xml" />
+   <xi:include href="chip/color-control-cluster.xml" />
    <xi:include href="chip/content-launch-cluster.xml" />
    <xi:include href="chip/descriptor-cluster.xml" />
    <xi:include href="chip/diagnostic-logs-cluster.xml" />
@@ -72,5 +73,4 @@
    <xi:include href="silabs/lo-devices.xml" />
    <xi:include href="silabs/types-silabs.xml" />
    <xi:include href="silabs/zll-devices.xml" />
-   <xi:include href="silabs/zll.xml" />
 </all>
diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
new file mode 100644
index 00000000000000..af32bca3ebea24
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <bitmap name="ColorControlFeature" type="BITMAP32">
+    <cluster code="0x0300" />
+    <field name="HueAndSaturation" mask="0x01" />
+    <field name="EnhancedHue" mask="0x02" />
+    <field name="ColorLoop" mask="0x04" />
+    <field name="XY" mask="0x08" />
+    <field name="ColorTemperature" mask="0x10" />
+  </bitmap>
+
+  <enum name="HueDirection" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="ShortestDistance" value="0x0"/>
+    <item name="LongestDistance" value="0x1"/>
+    <item name="Up" value="0x2"/>
+    <item name="Down" value="0x3"/>
+  </enum>
+
+  <enum name="HueMoveMode" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="Stop" value="0x0"/>
+    <item name="Up" value="0x1"/>
+    <item name="Down" value="0x3"/>
+  </enum>
+
+  <enum name="HueStepMode" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="Up" value="0x1"/>
+    <item name="Down" value="0x3"/>
+  </enum>
+
+  <enum name="SaturationMoveMode" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="Stop" value="0x0"/>
+    <item name="Up" value="0x1"/>
+    <item name="Down" value="0x3"/>
+  </enum>
+
+  <enum name="SaturationStepMode" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="Up" value="0x1"/>
+    <item name="Down" value="0x3"/>
+  </enum>
+
+  <enum name="ColorMode" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="CurrentHueAndCurrentSaturation" value="0x00"/>
+    <item name="CurrentXAndCurrentY" value="0x01"/>
+    <item name="ColorTemperature" value="0x02"/>
+  </enum>
+
+  <bitmap name="ColorCapabilities" type="BITMAP16">
+    <cluster code="0x0300"/>
+    <field name="HueSaturationSupported" mask="0x0001"/>
+    <field name="EnhancedHueSupported" mask="0x0002"/>
+    <field name="ColorLoopSupported" mask="0x0004"/>
+    <field name="XYAttributesSupported" mask="0x0008"/>
+    <field name="ColorTemperatureSupported" mask="0x0010"/>
+  </bitmap>
+
+  <bitmap name="ColorLoopUpdateFlags" type="BITMAP8">
+    <cluster code="0x0300"/>
+    <field name="UpdateAction" mask="0x01"/>
+    <field name="UpdateDirection" mask="0x02"/>
+    <field name="UpdateTime" mask="0x04"/>
+    <field name="UpdateStartHue" mask="0x08"/>
+  </bitmap>
+
+  <enum name="ColorLoopAction" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="Deactivate" value="0x00"/>
+    <item name="ActivateFromColorLoopStartEnhancedHue" value="0x01"/>
+    <item name="ActivateFromEnhancedCurrentHue" value="0x02"/>
+  </enum>
+
+  <enum name="ColorLoopDirection" type="ENUM8">
+    <cluster code="0x0300"/>
+    <item name="DecrementHue" value="0x00"/>
+    <item name="IncrementHue" value="0x01"/>
+  </enum>
+
+  <cluster>
+    <name>Color Control</name>
+    <domain>Lighting</domain>
+    <description>Attributes and commands for controlling the color properties of a color-capable light.</description>
+    <code>0x0300</code>
+    <define>COLOR_CONTROL_CLUSTER</define>
+
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+
+    <globalAttribute side="either" code="0xFFFD" value="5"/>
+
+    <attribute side="server" code="0x0000" define="COLOR_CONTROL_CURRENT_HUE" type="INT8U" min="0x00" max="0xFE" writable="false" reportable="true" default="0x00" optional="true">CurrentHue</attribute>
+    <!-- CURRENT_HUE -->
+    <attribute side="server" code="0x0001" define="COLOR_CONTROL_CURRENT_SATURATION" type="INT8U" min="0x00" max="0xFE" writable="false" reportable="true" default="0x00" optional="true">CurrentSaturation</attribute>
+    <!-- CURRENT_SATURATION -->
+    <attribute side="server" code="0x0002" define="COLOR_CONTROL_REMAINING_TIME" type="INT16U" min="0x0000" max="0xFFFE" writable="false" default="0x0000" optional="true">RemainingTime</attribute>
+    <!-- REMAINING_TIME -->
+    <attribute side="server" code="0x0003" define="COLOR_CONTROL_CURRENT_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" reportable="true" default="0x616B" optional="true">CurrentX</attribute>
+    <!-- CURRENT_X -->
+    <attribute side="server" code="0x0004" define="COLOR_CONTROL_CURRENT_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" reportable="true" default="0x607D" optional="true">CurrentY</attribute>
+    <!-- CURRENT_Y -->
+    <attribute side="server" code="0x0005" define="COLOR_CONTROL_DRIFT_COMPENSATION" type="ENUM8" min="0x00" max="0x04" writable="false" optional="true">DriftCompensation</attribute>
+    <!-- DRIFT_COMPENSATION -->
+    <attribute side="server" code="0x0006" define="COLOR_CONTROL_COMPENSATION_TEXT" type="CHAR_STRING" length="254" writable="false" optional="true">CompensationText</attribute>
+    <!-- COMPENSATION_TEXT -->
+    <attribute side="server" code="0x0007" define="COLOR_CONTROL_COLOR_TEMPERATURE" type="INT16U" min="0x0000" max="0xFEFF" writable="false" reportable="true" default="0x00FA" optional="true">ColorTemperatureMireds</attribute>
+    <!-- COLOR_TEMPERATURE -->
+    <attribute side="server" code="0x0008" define="COLOR_CONTROL_COLOR_MODE" type="ENUM8" min="0x00" max="0x02" writable="false" default="0x01">ColorMode</attribute>
+    <!-- COLOR_MODE -->
+    <attribute side="server" code="0x000F" define="COLOR_CONTROL_OPTIONS" type="BITMAP8" writable="true" default="0x00">Options</attribute>
+    <!-- COLOR_CONTROL_OPTIONS -->
+    <attribute side="server" code="0x0010" define="COLOR_CONTROL_NUMBER_OF_PRIMARIES" type="INT8U" min="0x00" max="0x06" isNullable="true" writable="false">NumberOfPrimaries</attribute>
+    <!-- NUMBER_OF_PRIMARIES -->
+    <attribute side="server" code="0x0011" define="COLOR_CONTROL_PRIMARY_1_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary1X</attribute>
+    <!-- PRIMARY_1_X -->
+    <attribute side="server" code="0x0012" define="COLOR_CONTROL_PRIMARY_1_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary1Y</attribute>
+    <!-- PRIMARY_1_Y -->
+    <attribute side="server" code="0x0013" define="COLOR_CONTROL_PRIMARY_1_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary1Intensity</attribute>
+    <!-- PRIMARY_1_INTENSITY -->
+    <attribute side="server" code="0x0015" define="COLOR_CONTROL_PRIMARY_2_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary2X</attribute>
+    <!-- PRIMARY_2_X -->
+    <attribute side="server" code="0x0016" define="COLOR_CONTROL_PRIMARY_2_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary2Y</attribute>
+    <!-- PRIMARY_2_Y -->
+    <attribute side="server" code="0x0017" define="COLOR_CONTROL_PRIMARY_2_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary2Intensity</attribute>
+    <!-- PRIMARY_2_INTENSITY -->
+    <attribute side="server" code="0x0019" define="COLOR_CONTROL_PRIMARY_3_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary3X</attribute>
+    <!-- PRIMARY_3_X -->
+    <attribute side="server" code="0x001A" define="COLOR_CONTROL_PRIMARY_3_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary3Y</attribute>
+    <!-- PRIMARY_3_Y -->
+    <attribute side="server" code="0x001B" define="COLOR_CONTROL_PRIMARY_3_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary3Intensity</attribute>
+    <!-- PRIMARY_3_INTENSITY -->
+    <attribute side="server" code="0x0020" define="COLOR_CONTROL_PRIMARY_4_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary4X</attribute>
+    <!-- PRIMARY_4_X -->
+    <attribute side="server" code="0x0021" define="COLOR_CONTROL_PRIMARY_4_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary4Y</attribute>
+    <!-- PRIMARY_4_Y -->
+    <attribute side="server" code="0x0022" define="COLOR_CONTROL_PRIMARY_4_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary4Intensity</attribute>
+    <!-- PRIMARY_4_INTENSITY -->
+    <attribute side="server" code="0x0024" define="COLOR_CONTROL_PRIMARY_5_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary5X</attribute>
+    <!-- PRIMARY_5_X -->
+    <attribute side="server" code="0x0025" define="COLOR_CONTROL_PRIMARY_5_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary5Y</attribute>
+    <!-- PRIMARY_5_Y -->
+    <attribute side="server" code="0x0026" define="COLOR_CONTROL_PRIMARY_5_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary5Intensity</attribute>
+    <!-- PRIMARY_5_INTENSITY -->
+    <attribute side="server" code="0x0028" define="COLOR_CONTROL_PRIMARY_6_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary6X</attribute>
+    <!-- PRIMARY_6_X -->
+    <attribute side="server" code="0x0029" define="COLOR_CONTROL_PRIMARY_6_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary6Y</attribute>
+    <!-- PRIMARY_6_Y -->
+    <attribute side="server" code="0x002A" define="COLOR_CONTROL_PRIMARY_6_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary6Intensity</attribute>
+    <!-- PRIMARY_6_INTENSITY -->
+    <attribute side="server" code="0x0030" define="COLOR_CONTROL_WHITE_POINT_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>WhitePointX</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- WHITE_POINT_X -->
+    <attribute side="server" code="0x0031" define="COLOR_CONTROL_WHITE_POINT_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>WhitePointY</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- WHITE_POINT_Y -->
+    <attribute side="server" code="0x0032" define="COLOR_CONTROL_COLOR_POINT_R_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>ColorPointRX</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_R_X -->
+    <attribute side="server" code="0x0033" define="COLOR_CONTROL_COLOR_POINT_R_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>ColorPointRY</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_R_Y -->
+    <attribute side="server" code="0x0034" define="COLOR_CONTROL_COLOR_POINT_R_INTENSITY" type="INT8U" isNullable="true" writable="true" optional="true">
+      <description>ColorPointRIntensity</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_R_INTENSITY -->
+    <attribute side="server" code="0x0036" define="COLOR_CONTROL_COLOR_POINT_G_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>ColorPointGX</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_G_X -->
+    <attribute side="server" code="0x0037" define="COLOR_CONTROL_COLOR_POINT_G_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>ColorPointGY</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_G_Y -->
+    <attribute side="server" code="0x0038" define="COLOR_CONTROL_COLOR_POINT_G_INTENSITY" type="INT8U" isNullable="true" writable="true" optional="true">
+      <description>ColorPointGIntensity</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_G_INTENSITY -->
+    <attribute side="server" code="0x003A" define="COLOR_CONTROL_COLOR_POINT_B_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>ColorPointBX</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_B_X -->
+    <attribute side="server" code="0x003B" define="COLOR_CONTROL_COLOR_POINT_B_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+      <description>ColorPointBY</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_B_Y -->
+    <attribute side="server" code="0x003C" define="COLOR_CONTROL_COLOR_POINT_B_INTENSITY" type="INT8U" isNullable="true" writable="true" optional="true">
+      <description>ColorPointBIntensity</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+    <!-- COLOR_POINT_B_INTENSITY -->
+    <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="INT16U" min="0x0000" max="0xFFFF" writable="false" optional="true">CoupleColorTempToLevelMinMireds</attribute>
+    <attribute side="server" code="0x4010" define="START_UP_COLOR_TEMPERATURE_MIREDS" type="INT16U" min="0x0000" max="0xFEFF" writable="true" isNullable="true" optional="true">
+      <description>StartUpColorTemperatureMireds</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <command source="client" code="0x00" name="MoveToHue" optional="true" cli="zcl color-control movetohue">
+      <description>
+        Move to specified hue.
+      </description>
+      <arg name="Hue" type="INT8U"/>
+      <arg name="Direction" type="HueDirection"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x01" name="MoveHue" optional="true" cli="zcl color-control movehue">
+      <description>
+        Move hue up or down at specified rate.
+      </description>
+      <arg name="MoveMode" type="HueMoveMode"/>
+      <arg name="Rate" type="INT8U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x02" name="StepHue" optional="true" cli="zcl color-control stephue">
+      <description>
+        Step hue up or down by specified size at specified rate.
+      </description>
+      <arg name="StepMode" type="HueStepMode"/>
+      <arg name="StepSize" type="INT8U"/>
+      <arg name="TransitionTime" type="INT8U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x03" name="MoveToSaturation" optional="true" cli="zcl color-control movetosat">
+      <description>
+        Move to specified saturation.
+      </description>
+      <arg name="Saturation" type="INT8U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x04" name="MoveSaturation" optional="true" cli="zcl color-control movesat">
+      <description>
+        Move saturation up or down at specified rate.
+      </description>
+      <arg name="MoveMode" type="SaturationMoveMode"/>
+      <arg name="Rate" type="INT8U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x05" name="StepSaturation" optional="true" cli="zcl color-control stepsat">
+      <description>
+        Step saturation up or down by specified size at specified rate.
+      </description>
+      <arg name="StepMode" type="SaturationStepMode"/>
+      <arg name="StepSize" type="INT8U"/>
+      <arg name="TransitionTime" type="INT8U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x06" name="MoveToHueAndSaturation" optional="true" cli="zcl color-control movetohueandsat">
+      <description>
+        Move to hue and saturation.
+      </description>
+      <arg name="Hue" type="INT8U"/>
+      <arg name="Saturation" type="INT8U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x07" name="MoveToColor" optional="true" cli="zcl color-control movetocolor">
+      <description>
+        Move to specified color.
+      </description>
+      <arg name="ColorX" type="INT16U"/>
+      <arg name="ColorY" type="INT16U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x08" name="MoveColor" optional="true" cli="zcl color-control movecolor">
+      <description>
+        Moves the color.
+      </description>
+      <arg name="RateX" type="INT16S"/>
+      <arg name="RateY" type="INT16S"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x09" name="StepColor" optional="true" cli="zcl color-control stepcolor">
+      <description>
+        Steps the lighting to a specific color.
+      </description>
+      <arg name="StepX" type="INT16S"/>
+      <arg name="StepY" type="INT16S"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x0A" name="MoveToColorTemperature" optional="true" cli="zcl color-control movetocolortemp">
+      <description>
+        Move to a specific color temperature.
+      </description>
+      <arg name="ColorTemperatureMireds" type="INT16U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+  </cluster>
+
+  <clusterExtension code="0x0300">
+    <attribute side="server" code="0x4000" define="COLOR_CONTROL_ENHANCED_CURRENT_HUE" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">EnhancedCurrentHue</attribute>
+    <attribute side="server" code="0x4001" define="COLOR_CONTROL_ENHANCED_COLOR_MODE" type="ENUM8" min="0x00" max="0xFF" writable="false" default="0x01">EnhancedColorMode</attribute>
+    <attribute side="server" code="0x4002" define="COLOR_CONTROL_COLOR_LOOP_ACTIVE" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopActive</attribute>
+    <attribute side="server" code="0x4003" define="COLOR_CONTROL_COLOR_LOOP_DIRECTION" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopDirection</attribute>
+    <attribute side="server" code="0x4004" define="COLOR_CONTROL_COLOR_LOOP_TIME" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0019" optional="true">ColorLoopTime</attribute>
+    <attribute side="server" code="0x4005" define="COLOR_CONTROL_COLOR_LOOP_START_ENHANCED_HUE" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x2300" optional="true">ColorLoopStartEnhancedHue</attribute>
+    <attribute side="server" code="0x4006" define="COLOR_CONTROL_COLOR_LOOP_STORED_ENHANCED_HUE" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">ColorLoopStoredEnhancedHue</attribute>
+    <attribute side="server" code="0x400A" define="COLOR_CONTROL_COLOR_CAPABILITIES" type="BITMAP16" min="0x0000" max="0x001F" writable="false" default="0x0000">ColorCapabilities</attribute>
+    <attribute side="server" code="0x400B" define="COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MIN" type="INT16U" min="0x0000" max="0xFEFF" writable="false" default="0x0000" optional="true">ColorTempPhysicalMinMireds</attribute>
+    <attribute side="server" code="0x400C" define="COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MAX" type="INT16U" min="0x0000" max="0xFEFF" writable="false" default="0xFEFF" optional="true">ColorTempPhysicalMaxMireds</attribute>
+
+    <command source="client" code="0x40" name="EnhancedMoveToHue" optional="true" noDefaultImplementation="true" cli="zcl color-control emovetohue">
+      <description>
+        Command description for EnhancedMoveToHue
+      </description>
+      <arg name="EnhancedHue" type="INT16U"/>
+      <arg name="Direction" type="HueDirection"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x41" name="EnhancedMoveHue" optional="true" noDefaultImplementation="true" cli="zcl color-control emovehue">
+      <description>
+        Command description for EnhancedMoveHue
+      </description>
+      <arg name="MoveMode" type="HueMoveMode"/>
+      <arg name="Rate" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x42" name="EnhancedStepHue" optional="true" noDefaultImplementation="true" cli="zcl color-control estephue">
+      <description>
+        Command description for EnhancedStepHue
+      </description>
+      <arg name="StepMode" type="HueStepMode"/>
+      <arg name="StepSize" type="INT16U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x43" name="EnhancedMoveToHueAndSaturation" optional="true" noDefaultImplementation="true" cli="zcl color-control emovetohueandsat">
+      <description>
+        Command description for EnhancedMoveToHueAndSaturation
+      </description>
+      <arg name="EnhancedHue" type="INT16U"/>
+      <arg name="Saturation" type="INT8U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x44" name="ColorLoopSet" optional="true" noDefaultImplementation="true" cli="zcl color-control loop">
+      <description>
+        Command description for ColorLoopSet
+      </description>
+      <arg name="UpdateFlags" type="ColorLoopUpdateFlags"/>
+      <arg name="Action" type="ColorLoopAction"/>
+      <arg name="Direction" type="ColorLoopDirection"/>
+      <arg name="Time" type="INT16U"/>
+      <arg name="StartHue" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x47" name="StopMoveStep" optional="true" noDefaultImplementation="true" cli="zcl color-control stopmovestep">
+      <description>
+        Command description for StopMoveStep
+      </description>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x4B" name="MoveColorTemperature" optional="true" noDefaultImplementation="true" cli="zcl color-control movecolortemp">
+      <description>
+        Command description for MoveColorTemperature
+      </description>
+      <arg name="MoveMode" type="HueMoveMode"/>
+      <arg name="Rate" type="INT16U"/>
+      <arg name="ColorTemperatureMinimumMireds" type="INT16U"/>
+      <arg name="ColorTemperatureMaximumMireds" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+
+    <command source="client" code="0x4C" name="StepColorTemperature" optional="true" noDefaultImplementation="true" cli="zcl color-control stepcolortemp">
+      <description>
+        Command description for StepColorTemperature
+      </description>
+      <arg name="StepMode" type="HueStepMode"/>
+      <arg name="StepSize" type="INT16U"/>
+      <arg name="TransitionTime" type="INT16U"/>
+      <arg name="ColorTemperatureMinimumMireds" type="INT16U"/>
+      <arg name="ColorTemperatureMaximumMireds" type="INT16U"/>
+      <arg name="OptionsMask" type="BITMAP8"/>
+      <arg name="OptionsOverride" type="BITMAP8"/>
+    </command>
+  </clusterExtension>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/color-control.xml b/src/app/zap-templates/zcl/data-model/draft/types/color-control.xml
new file mode 100644
index 00000000000000..5f42386d635c64
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/color-control.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <enum name="ColorControlOptions" type="BITMAP8">
+    <item name="ExecuteIfOff" value="0x1"/>
+  </enum>
+
+  <enum name="EnhancedColorMode" type="ENUM8">
+    <item name="CurrentHueAndCurrentSaturation" value="0x00"/>
+    <item name="CurrentXAndCurrentY" value="0x01"/>
+    <item name="ColorTemperature" value="0x02"/>
+    <item name="EnhancedCurrentHueAndCurrentSaturation" value="0x03"/>
+  </enum>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
index f078db7c9cfe96..96e38ca40b90a5 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -110,259 +110,6 @@ limitations under the License.
       <access op="write" role="manage"/>
     </attribute>
   </cluster>
-  <cluster>
-    <name>Color Control</name>
-    <domain>Lighting</domain>
-    <description>Attributes and commands for controlling the color properties of a color-capable light.</description>
-    <code>0x0300</code>
-    <define>COLOR_CONTROL_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="5"/>
-    <attribute side="server" code="0x0000" define="COLOR_CONTROL_CURRENT_HUE" type="INT8U" min="0x00" max="0xFE" writable="false" reportable="true" default="0x00" optional="true">CurrentHue</attribute>
-    <!-- CURRENT_HUE -->
-    <attribute side="server" code="0x0001" define="COLOR_CONTROL_CURRENT_SATURATION" type="INT8U" min="0x00" max="0xFE" writable="false" reportable="true" default="0x00" optional="true">CurrentSaturation</attribute>
-    <!-- CURRENT_SATURATION -->
-    <attribute side="server" code="0x0002" define="COLOR_CONTROL_REMAINING_TIME" type="INT16U" min="0x0000" max="0xFFFE" writable="false" default="0x0000" optional="true">RemainingTime</attribute>
-    <!-- REMAINING_TIME -->
-    <attribute side="server" code="0x0003" define="COLOR_CONTROL_CURRENT_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" reportable="true" default="0x616B" optional="true">CurrentX</attribute>
-    <!-- CURRENT_X -->
-    <attribute side="server" code="0x0004" define="COLOR_CONTROL_CURRENT_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" reportable="true" default="0x607D" optional="true">CurrentY</attribute>
-    <!-- CURRENT_Y -->
-    <attribute side="server" code="0x0005" define="COLOR_CONTROL_DRIFT_COMPENSATION" type="ENUM8" min="0x00" max="0x04" writable="false" optional="true">DriftCompensation</attribute>
-    <!-- DRIFT_COMPENSATION -->
-    <attribute side="server" code="0x0006" define="COLOR_CONTROL_COMPENSATION_TEXT" type="CHAR_STRING" length="254" writable="false" optional="true">CompensationText</attribute>
-    <!-- COMPENSATION_TEXT -->
-    <attribute side="server" code="0x0007" define="COLOR_CONTROL_COLOR_TEMPERATURE" type="INT16U" min="0x0000" max="0xFEFF" writable="false" reportable="true" default="0x00FA" optional="true">ColorTemperatureMireds</attribute>
-    <!-- COLOR_TEMPERATURE -->
-    <attribute side="server" code="0x0008" define="COLOR_CONTROL_COLOR_MODE" type="ENUM8" min="0x00" max="0x02" writable="false" default="0x01">ColorMode</attribute>
-    <!-- COLOR_MODE -->
-    <attribute side="server" code="0x000F" define="COLOR_CONTROL_OPTIONS" type="BITMAP8" writable="true" default="0x00">Options</attribute>
-    <!-- COLOR_CONTROL_OPTIONS -->
-    <attribute side="server" code="0x0010" define="COLOR_CONTROL_NUMBER_OF_PRIMARIES" type="INT8U" min="0x00" max="0x06" isNullable="true" writable="false">NumberOfPrimaries</attribute>
-    <!-- NUMBER_OF_PRIMARIES -->
-    <attribute side="server" code="0x0011" define="COLOR_CONTROL_PRIMARY_1_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary1X</attribute>
-    <!-- PRIMARY_1_X -->
-    <attribute side="server" code="0x0012" define="COLOR_CONTROL_PRIMARY_1_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary1Y</attribute>
-    <!-- PRIMARY_1_Y -->
-    <attribute side="server" code="0x0013" define="COLOR_CONTROL_PRIMARY_1_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary1Intensity</attribute>
-    <!-- PRIMARY_1_INTENSITY -->
-    <attribute side="server" code="0x0015" define="COLOR_CONTROL_PRIMARY_2_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary2X</attribute>
-    <!-- PRIMARY_2_X -->
-    <attribute side="server" code="0x0016" define="COLOR_CONTROL_PRIMARY_2_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary2Y</attribute>
-    <!-- PRIMARY_2_Y -->
-    <attribute side="server" code="0x0017" define="COLOR_CONTROL_PRIMARY_2_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary2Intensity</attribute>
-    <!-- PRIMARY_2_INTENSITY -->
-    <attribute side="server" code="0x0019" define="COLOR_CONTROL_PRIMARY_3_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary3X</attribute>
-    <!-- PRIMARY_3_X -->
-    <attribute side="server" code="0x001A" define="COLOR_CONTROL_PRIMARY_3_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary3Y</attribute>
-    <!-- PRIMARY_3_Y -->
-    <attribute side="server" code="0x001B" define="COLOR_CONTROL_PRIMARY_3_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary3Intensity</attribute>
-    <!-- PRIMARY_3_INTENSITY -->
-    <attribute side="server" code="0x0020" define="COLOR_CONTROL_PRIMARY_4_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary4X</attribute>
-    <!-- PRIMARY_4_X -->
-    <attribute side="server" code="0x0021" define="COLOR_CONTROL_PRIMARY_4_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary4Y</attribute>
-    <!-- PRIMARY_4_Y -->
-    <attribute side="server" code="0x0022" define="COLOR_CONTROL_PRIMARY_4_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary4Intensity</attribute>
-    <!-- PRIMARY_4_INTENSITY -->
-    <attribute side="server" code="0x0024" define="COLOR_CONTROL_PRIMARY_5_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary5X</attribute>
-    <!-- PRIMARY_5_X -->
-    <attribute side="server" code="0x0025" define="COLOR_CONTROL_PRIMARY_5_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary5Y</attribute>
-    <!-- PRIMARY_5_Y -->
-    <attribute side="server" code="0x0026" define="COLOR_CONTROL_PRIMARY_5_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary5Intensity</attribute>
-    <!-- PRIMARY_5_INTENSITY -->
-    <attribute side="server" code="0x0028" define="COLOR_CONTROL_PRIMARY_6_X" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary6X</attribute>
-    <!-- PRIMARY_6_X -->
-    <attribute side="server" code="0x0029" define="COLOR_CONTROL_PRIMARY_6_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="false" optional="true">Primary6Y</attribute>
-    <!-- PRIMARY_6_Y -->
-    <attribute side="server" code="0x002A" define="COLOR_CONTROL_PRIMARY_6_INTENSITY" type="INT8U" min="0x00" max="0xFF" isNullable="true" writable="false" optional="true">Primary6Intensity</attribute>
-    <!-- PRIMARY_6_INTENSITY -->
-    <attribute side="server" code="0x0030" define="COLOR_CONTROL_WHITE_POINT_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>WhitePointX</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- WHITE_POINT_X -->
-    <attribute side="server" code="0x0031" define="COLOR_CONTROL_WHITE_POINT_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>WhitePointY</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- WHITE_POINT_Y -->
-    <attribute side="server" code="0x0032" define="COLOR_CONTROL_COLOR_POINT_R_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>ColorPointRX</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_R_X -->
-    <attribute side="server" code="0x0033" define="COLOR_CONTROL_COLOR_POINT_R_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>ColorPointRY</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_R_Y -->
-    <attribute side="server" code="0x0034" define="COLOR_CONTROL_COLOR_POINT_R_INTENSITY" type="INT8U" isNullable="true" writable="true" optional="true">
-      <description>ColorPointRIntensity</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_R_INTENSITY -->
-    <attribute side="server" code="0x0036" define="COLOR_CONTROL_COLOR_POINT_G_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>ColorPointGX</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_G_X -->
-    <attribute side="server" code="0x0037" define="COLOR_CONTROL_COLOR_POINT_G_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>ColorPointGY</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_G_Y -->
-    <attribute side="server" code="0x0038" define="COLOR_CONTROL_COLOR_POINT_G_INTENSITY" type="INT8U" isNullable="true" writable="true" optional="true">
-      <description>ColorPointGIntensity</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_G_INTENSITY -->
-    <attribute side="server" code="0x003A" define="COLOR_CONTROL_COLOR_POINT_B_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>ColorPointBX</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_B_X -->
-    <attribute side="server" code="0x003B" define="COLOR_CONTROL_COLOR_POINT_B_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
-      <description>ColorPointBY</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_B_Y -->
-    <attribute side="server" code="0x003C" define="COLOR_CONTROL_COLOR_POINT_B_INTENSITY" type="INT8U" isNullable="true" writable="true" optional="true">
-      <description>ColorPointBIntensity</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <!-- COLOR_POINT_B_INTENSITY -->
-    <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="INT16U" min="0x0000" max="0xFFFF" writable="false" optional="true">CoupleColorTempToLevelMinMireds</attribute>
-    <attribute side="server" code="0x4010" define="START_UP_COLOR_TEMPERATURE_MIREDS" type="INT16U" min="0x0000" max="0xFEFF" writable="true" isNullable="true" optional="true">
-      <description>StartUpColorTemperatureMireds</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <command source="client" code="0x00" name="MoveToHue" optional="true" cli="zcl color-control movetohue">
-      <description>
-        Move to specified hue.
-      </description>
-      <arg name="Hue" type="INT8U"/>
-      <arg name="Direction" type="HueDirection"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x01" name="MoveHue" optional="true" cli="zcl color-control movehue">
-      <description>
-        Move hue up or down at specified rate.
-      </description>
-      <arg name="MoveMode" type="HueMoveMode"/>
-      <arg name="Rate" type="INT8U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x02" name="StepHue" optional="true" cli="zcl color-control stephue">
-      <description>
-        Step hue up or down by specified size at specified rate.
-      </description>
-      <arg name="StepMode" type="HueStepMode"/>
-      <arg name="StepSize" type="INT8U"/>
-      <arg name="TransitionTime" type="INT8U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x03" name="MoveToSaturation" optional="true" cli="zcl color-control movetosat">
-      <description>
-        Move to specified saturation.
-      </description>
-      <arg name="Saturation" type="INT8U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x04" name="MoveSaturation" optional="true" cli="zcl color-control movesat">
-      <description>
-        Move saturation up or down at specified rate.
-      </description>
-      <arg name="MoveMode" type="SaturationMoveMode"/>
-      <arg name="Rate" type="INT8U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x05" name="StepSaturation" optional="true" cli="zcl color-control stepsat">
-      <description>
-        Step saturation up or down by specified size at specified rate.
-      </description>
-      <arg name="StepMode" type="SaturationStepMode"/>
-      <arg name="StepSize" type="INT8U"/>
-      <arg name="TransitionTime" type="INT8U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x06" name="MoveToHueAndSaturation" optional="true" cli="zcl color-control movetohueandsat">
-      <description>
-        Move to hue and saturation.
-      </description>
-      <arg name="Hue" type="INT8U"/>
-      <arg name="Saturation" type="INT8U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x07" name="MoveToColor" optional="true" cli="zcl color-control movetocolor">
-      <description>
-        Move to specified color.
-      </description>
-      <arg name="ColorX" type="INT16U"/>
-      <arg name="ColorY" type="INT16U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x08" name="MoveColor" optional="true" cli="zcl color-control movecolor">
-      <description>
-        Moves the color.
-      </description>
-      <arg name="RateX" type="INT16S"/>
-      <arg name="RateY" type="INT16S"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x09" name="StepColor" optional="true" cli="zcl color-control stepcolor">
-      <description>
-        Steps the lighting to a specific color.
-      </description>
-      <arg name="StepX" type="INT16S"/>
-      <arg name="StepY" type="INT16S"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x0A" name="MoveToColorTemperature" optional="true" cli="zcl color-control movetocolortemp">
-      <description>
-        Move to a specific color temperature.
-      </description>
-      <arg name="ColorTemperatureMireds" type="INT16U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-  </cluster>
-  <bitmap name="ColorControlFeature" type="BITMAP32">
-    <cluster code="0x0300" />
-    <field name="HueAndSaturation" mask="0x01" />
-    <field name="EnhancedHue" mask="0x02" />
-    <field name="ColorLoop" mask="0x04" />
-    <field name="XY" mask="0x08" />
-    <field name="ColorTemperature" mask="0x10" />
-  </bitmap>
   <cluster>
     <name>Ballast Configuration</name>
     <domain>Lighting</domain>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
index 571516eac006f8..0594d6a8f3e13d 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
@@ -159,44 +159,6 @@ limitations under the License.
     <item name="levelFourLockout" value="0x4"/>
     <item name="levelfiveLockout" value="0x5"/>
   </enum>
-  <enum name="HueDirection" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="ShortestDistance" value="0x0"/>
-    <item name="LongestDistance" value="0x1"/>
-    <item name="Up" value="0x2"/>
-    <item name="Down" value="0x3"/>
-  </enum>
-  <enum name="HueMoveMode" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="Stop" value="0x0"/>
-    <item name="Up" value="0x1"/>
-    <item name="Down" value="0x3"/>
-  </enum>
-  <enum name="HueStepMode" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="Up" value="0x1"/>
-    <item name="Down" value="0x3"/>
-  </enum>
-  <enum name="SaturationMoveMode" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="Stop" value="0x0"/>
-    <item name="Up" value="0x1"/>
-    <item name="Down" value="0x3"/>
-  </enum>
-  <enum name="SaturationStepMode" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="Up" value="0x1"/>
-    <item name="Down" value="0x3"/>
-  </enum>
-  <enum name="ColorMode" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="CurrentHueAndCurrentSaturation" value="0x00"/>
-    <item name="CurrentXAndCurrentY" value="0x01"/>
-    <item name="ColorTemperature" value="0x02"/>
-  </enum>
-  <enum name="ColorControlOptions" type="BITMAP8">
-    <item name="ExecuteIfOff" value="0x1"/>
-  </enum>
   <enum name="LevelStatus" type="ENUM8">
     <item name="OnTarget" value="0x0"/>
     <item name="BelowTarget" value="0x1"/>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/zll.xml b/src/app/zap-templates/zcl/data-model/silabs/zll.xml
deleted file mode 100644
index 3457a99f900089..00000000000000
--- a/src/app/zap-templates/zcl/data-model/silabs/zll.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2008,2020 Silicon Labs.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <domain name="ZLL" spec="zll-1.0-11-0037-10" dependsOn="zcl-1.0-07-5123-03">
-  </domain>
-  <enum name="EnhancedColorMode" type="ENUM8">
-    <item name="CurrentHueAndCurrentSaturation" value="0x00"/>
-    <item name="CurrentXAndCurrentY" value="0x01"/>
-    <item name="ColorTemperature" value="0x02"/>
-    <item name="EnhancedCurrentHueAndCurrentSaturation" value="0x03"/>
-  </enum>
-  <bitmap name="ColorCapabilities" type="BITMAP16">
-    <cluster code="0x0300"/>
-    <field name="HueSaturationSupported" mask="0x0001"/>
-    <field name="EnhancedHueSupported" mask="0x0002"/>
-    <field name="ColorLoopSupported" mask="0x0004"/>
-    <field name="XYAttributesSupported" mask="0x0008"/>
-    <field name="ColorTemperatureSupported" mask="0x0010"/>
-  </bitmap>
-  <bitmap name="ColorLoopUpdateFlags" type="BITMAP8">
-    <cluster code="0x0300"/>
-    <field name="UpdateAction" mask="0x01"/>
-    <field name="UpdateDirection" mask="0x02"/>
-    <field name="UpdateTime" mask="0x04"/>
-    <field name="UpdateStartHue" mask="0x08"/>
-  </bitmap>
-  <enum name="ColorLoopAction" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="Deactivate" value="0x00"/>
-    <item name="ActivateFromColorLoopStartEnhancedHue" value="0x01"/>
-    <item name="ActivateFromEnhancedCurrentHue" value="0x02"/>
-  </enum>
-  <enum name="ColorLoopDirection" type="ENUM8">
-    <cluster code="0x0300"/>
-    <item name="DecrementHue" value="0x00"/>
-    <item name="IncrementHue" value="0x01"/>
-  </enum>
-  <clusterExtension code="0x0300">
-    <attribute side="server" code="0x4000" define="COLOR_CONTROL_ENHANCED_CURRENT_HUE" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">EnhancedCurrentHue</attribute>
-    <attribute side="server" code="0x4001" define="COLOR_CONTROL_ENHANCED_COLOR_MODE" type="ENUM8" min="0x00" max="0xFF" writable="false" default="0x01">EnhancedColorMode</attribute>
-    <attribute side="server" code="0x4002" define="COLOR_CONTROL_COLOR_LOOP_ACTIVE" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopActive</attribute>
-    <attribute side="server" code="0x4003" define="COLOR_CONTROL_COLOR_LOOP_DIRECTION" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopDirection</attribute>
-    <attribute side="server" code="0x4004" define="COLOR_CONTROL_COLOR_LOOP_TIME" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0019" optional="true">ColorLoopTime</attribute>
-    <attribute side="server" code="0x4005" define="COLOR_CONTROL_COLOR_LOOP_START_ENHANCED_HUE" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x2300" optional="true">ColorLoopStartEnhancedHue</attribute>
-    <attribute side="server" code="0x4006" define="COLOR_CONTROL_COLOR_LOOP_STORED_ENHANCED_HUE" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">ColorLoopStoredEnhancedHue</attribute>
-    <attribute side="server" code="0x400A" define="COLOR_CONTROL_COLOR_CAPABILITIES" type="BITMAP16" min="0x0000" max="0x001F" writable="false" default="0x0000">ColorCapabilities</attribute>
-    <attribute side="server" code="0x400B" define="COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MIN" type="INT16U" min="0x0000" max="0xFEFF" writable="false" default="0x0000" optional="true">ColorTempPhysicalMinMireds</attribute>
-    <attribute side="server" code="0x400C" define="COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MAX" type="INT16U" min="0x0000" max="0xFEFF" writable="false" default="0xFEFF" optional="true">ColorTempPhysicalMaxMireds</attribute>
-    <command source="client" code="0x40" name="EnhancedMoveToHue" optional="true" noDefaultImplementation="true" cli="zcl color-control emovetohue">
-      <description>
-        Command description for EnhancedMoveToHue
-      </description>
-      <arg name="EnhancedHue" type="INT16U"/>
-      <arg name="Direction" type="HueDirection"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x41" name="EnhancedMoveHue" optional="true" noDefaultImplementation="true" cli="zcl color-control emovehue">
-      <description>
-        Command description for EnhancedMoveHue
-      </description>
-      <arg name="MoveMode" type="HueMoveMode"/>
-      <arg name="Rate" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x42" name="EnhancedStepHue" optional="true" noDefaultImplementation="true" cli="zcl color-control estephue">
-      <description>
-        Command description for EnhancedStepHue
-      </description>
-      <arg name="StepMode" type="HueStepMode"/>
-      <arg name="StepSize" type="INT16U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x43" name="EnhancedMoveToHueAndSaturation" optional="true" noDefaultImplementation="true" cli="zcl color-control emovetohueandsat">
-      <description>
-        Command description for EnhancedMoveToHueAndSaturation
-      </description>
-      <arg name="EnhancedHue" type="INT16U"/>
-      <arg name="Saturation" type="INT8U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x44" name="ColorLoopSet" optional="true" noDefaultImplementation="true" cli="zcl color-control loop">
-      <description>
-        Command description for ColorLoopSet
-      </description>
-      <arg name="UpdateFlags" type="ColorLoopUpdateFlags"/>
-      <arg name="Action" type="ColorLoopAction"/>
-      <arg name="Direction" type="ColorLoopDirection"/>
-      <arg name="Time" type="INT16U"/>
-      <arg name="StartHue" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x47" name="StopMoveStep" optional="true" noDefaultImplementation="true" cli="zcl color-control stopmovestep">
-      <description>
-        Command description for StopMoveStep
-      </description>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x4B" name="MoveColorTemperature" optional="true" noDefaultImplementation="true" cli="zcl color-control movecolortemp">
-      <description>
-        Command description for MoveColorTemperature
-      </description>
-      <arg name="MoveMode" type="HueMoveMode"/>
-      <arg name="Rate" type="INT16U"/>
-      <arg name="ColorTemperatureMinimumMireds" type="INT16U"/>
-      <arg name="ColorTemperatureMaximumMireds" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-    <command source="client" code="0x4C" name="StepColorTemperature" optional="true" noDefaultImplementation="true" cli="zcl color-control stepcolortemp">
-      <description>
-        Command description for StepColorTemperature
-      </description>
-      <arg name="StepMode" type="HueStepMode"/>
-      <arg name="StepSize" type="INT16U"/>
-      <arg name="TransitionTime" type="INT16U"/>
-      <arg name="ColorTemperatureMinimumMireds" type="INT16U"/>
-      <arg name="ColorTemperatureMaximumMireds" type="INT16U"/>
-      <arg name="OptionsMask" type="BITMAP8"/>
-      <arg name="OptionsOverride" type="BITMAP8"/>
-    </command>
-  </clusterExtension>
-</configurator>
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 f82bcaecbfb3c5..39ff80947915fa 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -30,6 +30,7 @@
         "channel-cluster.xml",
         "client-monitoring-cluster.xml",
         "clusters-extensions.xml",
+        "color-control-cluster.xml",
         "content-launch-cluster.xml",
         "descriptor-cluster.xml",
         "diagnostic-logs-cluster.xml",
@@ -86,7 +87,7 @@
         "ha.xml",
         "lo-devices.xml",
         "zll-devices.xml",
-        "zll.xml"
+        "types/color-control.xml"
     ],
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 11c0a1e837fda4..32a5a0bdc6784b 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -29,6 +29,7 @@
         "channel-cluster.xml",
         "client-monitoring-cluster.xml",
         "clusters-extensions.xml",
+        "color-control-cluster.xml",
         "content-launch-cluster.xml",
         "descriptor-cluster.xml",
         "diagnostic-logs-cluster.xml",
@@ -84,7 +85,7 @@
         "ha.xml",
         "lo-devices.xml",
         "zll-devices.xml",
-        "zll.xml"
+        "types/color-control.xml"
     ],
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {