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
index 3623ce1ccf925c..fda1529d82df98 100644
--- 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
@@ -127,141 +127,410 @@ limitations under the License.
- CurrentHue
+
+ CurrentHue
+
+
+
+
- CurrentSaturation
+
+ CurrentSaturation
+
+
+
+
- RemainingTime
+
+ RemainingTime
+
+
- CurrentX
+
+ CurrentX
+
+
+
+
- CurrentY
+
+ CurrentY
+
+
+
+
- DriftCompensation
+
+ DriftCompensation
+
+
- CompensationText
+
+ CompensationText
+
+
- ColorTemperatureMireds
+
+ ColorTemperatureMireds
+
+
+
+
- ColorMode
+
+ ColorMode
+
+
- Options
+
+ Options
+
+
- NumberOfPrimaries
+
+ NumberOfPrimaries
+
+
- Primary1X
+
+ Primary1X
+
+
+
+
+
+
+
+
+
+
- Primary1Y
+
+ Primary1Y
+
+
+
+
+
+
+
+
+
+
- Primary1Intensity
+
+ Primary1Intensity
+
+
+
+
+
+
+
+
+
+
- Primary2X
+
+ Primary2X
+
+
+
+
+
+
+
+
+
+
- Primary2Y
+
+ Primary2Y
+
+
+
+
+
+
+
+
+
+
- Primary2Intensity
+
+ Primary2Intensity
+
+
+
+
+
+
+
+
+
+
- Primary3X
+
+ Primary3X
+
+
+
+
+
+
+
+
+
+
- Primary3Y
+
+ Primary3Y
+
+
+
+
+
+
+
+
+
+
- Primary3Intensity
+
+ Primary3Intensity
+
+
+
+
+
+
+
+
+
+
- Primary4X
+
+ Primary4X
+
+
+
+
+
+
+
+
+
+
- Primary4Y
+
+ Primary4Y
+
+
+
+
+
+
+
+
+
+
- Primary4Intensity
+
+ Primary4Intensity
+
+
+
+
+
+
+
+
+
+
- Primary5X
+
+ Primary5X
+
+
+
+
+
+
+
+
+
+
- Primary5Y
+
+ Primary5Y
+
+
+
+
+
+
+
+
+
+
- Primary5Intensity
+
+ Primary5Intensity
+
+
+
+
+
+
+
+
+
+
- Primary6X
+
+ Primary6X
+
+
+
+
+
+
+
+
+
+
- Primary6Y
+
+ Primary6Y
+
+
+
+
+
+
+
+
+
+
- Primary6Intensity
+
+ Primary6Intensity
+
+
+
+
+
+
+
+
+
+
WhitePointX
+
WhitePointY
+
ColorPointRX
+
ColorPointRY
+
ColorPointRIntensity
+
ColorPointGX
+
ColorPointGY
+
ColorPointGIntensity
+
ColorPointBX
+
ColorPointBY
+
ColorPointBIntensity
+
- CoupleColorTempToLevelMinMireds
+
+ CoupleColorTempToLevelMinMireds
+
+
+
+
+
+
+
StartUpColorTemperatureMireds
+
+
+
+
+
+
Move to specified hue.
+
+
+
@@ -273,6 +542,9 @@ limitations under the License.
Move hue up or down at specified rate.
+
+
+
@@ -283,6 +555,9 @@ limitations under the License.
Step hue up or down by specified size at specified rate.
+
+
+
@@ -294,6 +569,9 @@ limitations under the License.
Move to specified saturation.
+
+
+
@@ -304,6 +582,9 @@ limitations under the License.
Move saturation up or down at specified rate.
+
+
+
@@ -314,6 +595,9 @@ limitations under the License.
Step saturation up or down by specified size at specified rate.
+
+
+
@@ -325,6 +609,9 @@ limitations under the License.
Move to hue and saturation.
+
+
+
@@ -336,6 +623,9 @@ limitations under the License.
Move to specified color.
+
+
+
@@ -347,6 +637,9 @@ limitations under the License.
Moves the color.
+
+
+
@@ -357,6 +650,9 @@ limitations under the License.
Steps the lighting to a specific color.
+
+
+
@@ -368,6 +664,9 @@ limitations under the License.
Move to a specific color temperature.
+
+
+
@@ -376,21 +675,70 @@ limitations under the License.
- EnhancedCurrentHue
- EnhancedColorMode
- ColorLoopActive
- ColorLoopDirection
- ColorLoopTime
- ColorLoopStartEnhancedHue
- ColorLoopStoredEnhancedHue
- ColorCapabilities
- ColorTempPhysicalMinMireds
- ColorTempPhysicalMaxMireds
+
+ EnhancedCurrentHue
+
+
+
+
+
+ EnhancedColorMode
+
+
+
+ ColorLoopActive
+
+
+
+
+
+ ColorLoopDirection
+
+
+
+
+
+ ColorLoopTime
+
+
+
+
+
+ ColorLoopStartEnhancedHue
+
+
+
+
+
+ ColorLoopStoredEnhancedHue
+
+
+
+
+
+ ColorCapabilities
+
+
+
+ ColorTempPhysicalMinMireds
+
+
+
+
+
+ ColorTempPhysicalMaxMireds
+
+
+
+
Command description for EnhancedMoveToHue
+
+
+
@@ -402,6 +750,9 @@ limitations under the License.
Command description for EnhancedMoveHue
+
+
+
@@ -412,6 +763,9 @@ limitations under the License.
Command description for EnhancedStepHue
+
+
+
@@ -423,6 +777,9 @@ limitations under the License.
Command description for EnhancedMoveToHueAndSaturation
+
+
+
@@ -434,6 +791,9 @@ limitations under the License.
Command description for ColorLoopSet
+
+
+
@@ -447,6 +807,13 @@ limitations under the License.
Command description for StopMoveStep
+
+
+
+
+
+
+
@@ -455,6 +822,9 @@ limitations under the License.
Command description for MoveColorTemperature
+
+
+
@@ -467,6 +837,9 @@ limitations under the License.
Command description for StepColorTemperature
+
+
+