Updated external content (Jenkins build 792)

2022-02-14 03:36:30 +00:00 · 2022-02-14 03:36:30 +00:00 · 5dcef8d451
parent e030f66db0
commit 5dcef8d451
27 changed files with 48 additions and 124 deletions
--- a/_thing_types/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
@ -174,7 +174,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Light Brightness</label>
 		<description>The brightness level of the fan's light</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>
 	<channel-type id="light-auto">
 		<item-type>Switch</item-type>
--- a/_thing_types/org.openhab.binding.cbus/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.cbus/src/main/resources/OH-INF/thing/thing-types.xml
@ -113,7 +113,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Level Channel</label>
 		<description>Group channel for CBus variable value lighting groups</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<!-- Temperature Group Channel Type -->
--- a/_thing_types/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
@ -70,7 +70,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Light Level</label>
 		<description>Increase/decrease the light level</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<state min="0" max="100" pattern="%.0f %%"/>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
@ -80,7 +80,7 @@
 				<label>Calculated Room Temperature</label>
 				<description>Calculated Room Temperature</description>
 			</channel>
-			<channel id="outdoor_temp" typeId="temperature">
+			<channel id="outdoor_temp" typeId="system.outdoor-temperature">
 				<label>Outdoor Temperature</label>
 				<description>Temperature of the air outside</description>
 			</channel>
@ -89,7 +89,8 @@
 	<channel-group-type id="humidity">
 		<label>Humidity</label>
 		<channels>
-			<channel id="humidity" typeId="humidity">
+			<channel id="humidity" typeId="system.atmospheric-humidity">
+				<label>Humidity</label>
 				<description>Current relative humidity measured by the air unit</description>
 			</channel>
 		</channels>
@ -200,17 +201,6 @@
 		<description>Read only percentage</description>
 		<state pattern="%.0f %%" readOnly="true" min="0" max="100"/>
 	</channel-type>
-	<channel-type id="humidity">
-		<item-type>Number:Dimensionless</item-type>
-		<label>Humidity</label>
-		<category>Humidity</category>
-		<tags>
-			<tag>Measurement</tag>
-			<tag>Humidity</tag>
-		</tags>
-		<state pattern="%.0f %%" readOnly="true" min="0" max="100">
-		</state>
-	</channel-type>
 	<channel-type id="switch">
 		<item-type>Switch</item-type>
 		<label>Something that can be turned on or off</label>
--- a/_thing_types/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
+++ b/_thing_types/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
@ -28,10 +28,6 @@
 		<item-type>Switch</item-type>
 		<label>All On</label>
 		<description>"On" if all lights in this group are "On", otherwise "Off".</description>
-		<tags>
-			<tag>Status</tag>
-			<tag>Light</tag>
-		</tags>
 		<state readOnly="true"/>
 	</channel-type>

@ -39,20 +35,12 @@
 		<item-type>Switch</item-type>
 		<label>Any On</label>
 		<description>"On" if any light in this group is "On", otherwise "Off".</description>
-		<tags>
-			<tag>Status</tag>
-			<tag>Light</tag>
-		</tags>
 		<state readOnly="true"/>
 	</channel-type>

 	<channel-type id="scene">
 		<item-type>String</item-type>
 		<label>Recall Scene</label>
-		<tags>
-			<tag>Control</tag>
-			<tag>Light</tag>
-		</tags>
 	</channel-type>

 </thing:thing-descriptions>
--- a/_thing_types/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
+++ b/_thing_types/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
@ -166,19 +166,11 @@
 	<channel-type id="effect">
 		<item-type>String</item-type>
 		<label>Effect Channel</label>
-		<tags>
-			<tag>Control</tag>
-			<tag>Light</tag>
-		</tags>
 	</channel-type>

 	<channel-type id="effectSpeed">
 		<item-type>Number</item-type>
 		<label>Effect Speed Channel</label>
-		<tags>
-			<tag>Control</tag>
-			<tag>Light</tag>
-		</tags>
 		<state min="0" max="10" step="1"/>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/channels.xml
@ -8,7 +8,7 @@
 		<label>Brightness</label>
 		<description>Allows to send a brightness value to the thing. If the thing is associated with more than one DMX
 			channel, the values is used for ALL DMX channels.</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<tags>
 			<tag>Control</tag>
 			<tag>Light</tag>
@ -22,7 +22,7 @@
 		<category>ColorLight</category>
 		<tags>
 			<tag>Control</tag>
-			<tag>Light</tag>
+			<tag>ColorTemperature</tag>
 		</tags>
 	</channel-type>
 	<!-- Color Channel -->
--- a/_thing_types/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml
@ -67,7 +67,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Dimmer</label>
 		<description>Dimmer</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<config-description>
 			<parameter name="rampingTime" type="integer">
 				<label>Ramping Time</label>
--- a/_thing_types/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
+++ b/_thing_types/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
@ -27,7 +27,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Dimmer</label>
 		<description>Dimmer</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<config-description-ref uri="channel-type:enocean:genericChannel"/>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.freebox/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.freebox/src/main/resources/OH-INF/thing/thing-types.xml
@ -325,7 +325,7 @@
 		<item-type>Number</item-type>
 		<label>Screen Brightness</label>
 		<description>Brightness level of the screen in percent</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<state pattern="%d %%"/>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/thing/channels.xml
@ -17,7 +17,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Dimmer</label>
 		<description>Dimms the connected light</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<!-- RollerShutter Channel -->
--- a/_thing_types/org.openhab.binding.lifx/src/main/resources/OH-INF/thing/channel.xml
+++ b/_thing_types/org.openhab.binding.lifx/src/main/resources/OH-INF/thing/channel.xml
@ -8,7 +8,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Brightness</label>
 		<description>Controls the brightness and switches the light on and off</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<tags>
 			<tag>Control</tag>
 			<tag>Light</tag>
@ -32,10 +32,6 @@
 		<item-type>Switch</item-type>
 		<label>HEV Cycle</label>
 		<description>Controls the HEV clean cycle of the light</description>
-		<tags>
-			<tag>Control</tag>
-			<tag>Light</tag>
-		</tags>
 		<config-description-ref uri="channel-type:lifx:hevcycle"/>
 	</channel-type>

@ -43,10 +39,6 @@
 		<item-type>Dimmer</item-type>
 		<label>Infrared</label>
 		<description>Controls the infrared level of the light</description>
-		<tags>
-			<tag>Control</tag>
-			<tag>Light</tag>
-		</tags>
 	</channel-type>

 	<channel-type id="temperature">
@ -65,10 +57,6 @@
 		<item-type>String</item-type>
 		<label>Effect</label>
 		<description>Controls the effect of the light</description>
-		<tags>
-			<tag>Control</tag>
-			<tag>Light</tag>
-		</tags>
 		<state>
 			<options>
 				<option value="off">Off</option>
--- a/_thing_types/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml
@ -1272,7 +1272,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Light Level</label>
 		<description>Increase/decrease the light level</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<state min="0" max="100" pattern="%d %%"/>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/channel.xml
+++ b/_thing_types/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/channel.xml
@ -27,7 +27,7 @@
 		<label>Brightness</label>
 		<description>The brightness channel allows to control the brightness of a light. It is also possible to switch the
 			light on and off.</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<tags>
 			<tag>Control</tag>
 			<tag>Light</tag>
--- a/_thing_types/org.openhab.binding.openweathermap/src/main/resources/OH-INF/thing/channel-types.xml
+++ b/_thing_types/org.openhab.binding.openweathermap/src/main/resources/OH-INF/thing/channel-types.xml
@ -455,10 +455,6 @@
 		<label>Apparent Temperature</label>
 		<description>Current apparent temperature.</description>
 		<category>Temperature</category>
-		<tags>
-			<tag>Measurement</tag>
-			<tag>Temperature</tag>
-		</tags>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>

@ -507,10 +503,6 @@
 		<label>Precipitation</label>
 		<description>Precipitation volume of the related timespan.</description>
 		<category>Rain</category>
-		<tags>
-			<tag>Measurement</tag>
-			<tag>Rain</tag>
-		</tags>
 		<state readOnly="true" pattern="%.2f %unit%"/>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
@ -21,7 +21,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Brightness</label>
 		<description>Control the brightness and switch the light ON and OFF</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<tags>
 			<tag>Control</tag>
 			<tag>Light</tag>
@ -35,7 +35,8 @@
 		<description>Control the roller shutter position</description>
 		<category>Blinds</category>
 		<tags>
-			<tag>Blinds</tag>
+			<tag>OpenLevel</tag>
+			<tag>Opening</tag>
 		</tags>
 	</channel-type>

--- a/_thing_types/org.openhab.binding.sagercaster/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.sagercaster/src/main/resources/OH-INF/thing/thing-types.xml
@ -181,10 +181,6 @@
 		<label>@text/timestampChannelLabel</label>
 		<description>@text/timestampChannelDescription</description>
 		<category>Time</category>
-		<tags>
-			<tag>Status</tag>
-			<tag>Timestamp</tag>
-		</tags>
 		<state readOnly="true"/>
 	</channel-type>

@ -214,7 +210,7 @@
 		<description>@text/rainingDescription</description>
 		<category>Rain</category>
 		<tags>
-			<tag>Status</tag>
+			<tag>Measurement</tag>
 			<tag>Rain</tag>
 		</tags>
 	</channel-type>
--- a/_thing_types/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/lights.xml
+++ b/_thing_types/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/lights.xml
@ -241,7 +241,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Brightness</label>
 		<description>Brightness: 0..100%</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<state min="0" max="100" step="1" readOnly="false"></state>
 	</channel-type>
 	<channel-type id="colorEffectBulb">
--- a/_thing_types/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
+++ b/_thing_types/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
@ -254,7 +254,6 @@
 	<thing-type id="shellydimmer">
 		<label>Shelly Dimmer (SHDM-1)</label>
 		<description>Shelly Dimmer</description>
-		<category>DimmableLight</category>
 		<channel-groups>
 			<channel-group id="relay" typeId="dimmerChannel"/>
 			<channel-group id="meter" typeId="meter"/>
@ -268,7 +267,6 @@
 	<thing-type id="shellydimmer2">
 		<label>Shelly Dimmer 2 (SHDM-2)</label>
 		<description>Shelly Dimmer 2</description>
-		<category>DimmableLight</category>
 		<channel-groups>
 			<channel-group id="relay" typeId="dimmerChannel"/>
 			<channel-group id="meter" typeId="meter"/>
@ -447,7 +445,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Brightness</label>
 		<description>Light brightness in %</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>
 	<channel-type id="meterWatts">
 		<item-type>Number:Power</item-type>
--- a/_thing_types/org.openhab.binding.smartthings/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.smartthings/src/main/resources/OH-INF/thing/thing-types.xml
@ -1387,7 +1387,7 @@
 	<channel-type id="level-channel">
 		<item-type>Dimmer</item-type>
 		<label>Light Level</label>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="volumeLevel-channel">
--- a/_thing_types/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/thing/channels.xml
@ -10,7 +10,6 @@
 		<description>Current detailed power state of the projector</description>
 		<tags>
 			<tag>Status</tag>
-			<tag>Power</tag>
 		</tags>
 		<state readOnly="true">
 			<options>
--- a/_thing_types/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
@ -1142,9 +1142,6 @@
 		<item-type>Number</item-type>
 		<label>Healthy</label>
 		<description>Souliss Healthy</description>
-		<tags>
-			<tag>QualityOfService</tag>
-		</tags>
 		<state readOnly="true" pattern="%.0f"/>
 	</channel-type>

@ -1152,9 +1149,6 @@
 		<item-type>Number</item-type>
 		<label>Value</label>
 		<description>Floating Point Input</description>
-		<tags>
-			<tag>sensors</tag>
-		</tags>
 		<state readOnly="true" pattern="%.1f "/>
 	</channel-type>

@ -1171,9 +1165,10 @@
 		<item-type>Number</item-type>
 		<label>Humidity</label>
 		<description>Current humidity in %</description>
-		<category>Temperature</category>
+		<category>Humidity</category>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Measurement</tag>
+			<tag>Humidity</tag>
 		</tags>
 		<state readOnly="true" pattern="%d %%"/>
 	</channel-type>
@ -1185,7 +1180,8 @@
 		<description>Current temperature</description>
 		<category>Temperature</category>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Measurement</tag>
+			<tag>Temperature</tag>
 		</tags>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
@ -1196,7 +1192,8 @@
 		<description>Setpoint temperature</description>
 		<category>Temperature</category>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Setpoint</tag>
+			<tag>Temperature</tag>
 		</tags>
 		<state min="12" max="30" step="0.5" pattern="%.1f %unit%" readOnly="false"/>
 	</channel-type>
@ -1206,7 +1203,8 @@
 		<label>Illuminance</label>
 		<description>Lux</description>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Measurement</tag>
+			<tag>Light</tag>
 		</tags>
 		<state readOnly="true" pattern="%.1f kLux"/>
 	</channel-type>
@ -1217,7 +1215,8 @@
 		<description>Current Voltage</description>
 		<category>Energy</category>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Measurement</tag>
+			<tag>Voltage</tag>
 		</tags>
 		<state readOnly="true" pattern="%.1f V"/>
 	</channel-type>
@ -1227,7 +1226,8 @@
 		<description>Current Ampere</description>
 		<category>Energy</category>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Measurement</tag>
+			<tag>Current</tag>
 		</tags>
 		<state readOnly="true" pattern="%.1f A"/>
 	</channel-type>
@ -1237,9 +1237,6 @@
 		<label>Power</label>
 		<description>Current Power</description>
 		<category>Energy</category>
-		<tags>
-			<tag>sensors</tag>
-		</tags>
 		<state readOnly="true" pattern="%d W"/>
 	</channel-type>

@ -1248,7 +1245,8 @@
 		<label>Pressure</label>
 		<description>Pressure</description>
 		<tags>
-			<tag>sensors</tag>
+			<tag>Measurement</tag>
+			<tag>Pressure</tag>
 		</tags>
 		<state readOnly="true" pattern="%.1f hPa"/>
 	</channel-type>
@ -1265,7 +1263,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Dimmer Brightness</label>
 		<description>The brightness can be set in 16 steps for RGBW/White leds and in 64 steps for RGBWW leds</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<state min="0" max="100" step="1" pattern="%d"/>
 	</channel-type>

@ -1273,14 +1271,14 @@
 		<item-type>Switch</item-type>
 		<label>White Mode</label>
 		<description>Switch lamp to white mode</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="rollerBrightness">
 		<item-type>RollerShutter</item-type>
 		<label>Roller Brightness</label>
 		<description>Brightness Up/Down</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<state readOnly="false"/>
 	</channel-type>
 </thing:thing-descriptions>
--- a/_thing_types/org.openhab.binding.velbus/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.velbus/src/main/resources/OH-INF/thing/thing-types.xml
@ -916,7 +916,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Brightness</label>
 		<description>Brightness control for dimmer action in Velbus</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>
 	<channel-type id="rollershutter">
 		<item-type>Rollershutter</item-type>
--- a/_thing_types/org.openhab.binding.vigicrues/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.vigicrues/src/main/resources/OH-INF/thing/thing-types.xml
@ -49,10 +49,6 @@
 		<label>Current Flow</label>
 		<description>Current river flow</description>
 		<category>flow</category>
-		<tags>
-			<tag>Measurement</tag>
-			<tag>Level</tag>
-		</tags>
 		<state readOnly="true" pattern="%.2f %unit%"/>
 	</channel-type>

@ -61,10 +57,6 @@
 		<label>Observation Time</label>
 		<description>Observation date and time</description>
 		<category>time</category>
-		<tags>
-			<tag>Status</tag>
-			<tag>Timestamp</tag>
-		</tags>
 		<state readOnly="true"/>
 	</channel-type>

@ -83,10 +75,6 @@
 	<channel-type id="gauge">
 		<item-type>Number:Dimensionless</item-type>
 		<label>Relative Measure</label>
-		<tags>
-			<tag>Measurement</tag>
-			<tag>Level</tag>
-		</tags>
 		<state readOnly="true" pattern="%.2f %unit%"/>
 	</channel-type>

@ -113,9 +101,6 @@
 		<label>Comment</label>
 		<description>Detailed comment</description>
 		<category>text</category>
-		<tags>
-			<tag>Status</tag>
-		</tags>
 		<state readOnly="true" pattern="%s"/>
 	</channel-type>

@ -123,9 +108,6 @@
 		<item-type>Image</item-type>
 		<label>Pictogram</label>
 		<description>Official pictogram associated to alert level.</description>
-		<tags>
-			<tag>Status</tag>
-		</tags>
 		<state readOnly="true"/>
 	</channel-type>
 </thing:thing-descriptions>
--- a/_thing_types/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
@ -342,7 +342,7 @@
 			It is also possible to switch the
 			light on and off.
 		</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="relay">
--- a/_thing_types/org.openhab.binding.wled/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.wled/src/main/resources/OH-INF/thing/thing-types.xml
@ -87,7 +87,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Segment Brightness</label>
 		<description>Changes the brightness of the whole segment</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="primaryColor" advanced="true">
@ -101,7 +101,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Primary White</label>
 		<description>Changes the brightness of the primary white LED</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="secondaryColor" advanced="true">
@ -115,7 +115,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Secondary White</label>
 		<description>Changes the brightness of the secondary white LED</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="tertiaryColor" advanced="true">
@ -129,7 +129,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Tertiary White</label>
 		<description>Changes the brightness of the third white LED</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 	</channel-type>

 	<channel-type id="palettes">
--- a/_thing_types/org.openhab.binding.yeelight/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.yeelight/src/main/resources/OH-INF/thing/channels.xml
@ -12,7 +12,7 @@
 			It is also possible to switch the
 			light on and off.
 		</description>
-		<category>DimmableLight</category>
+		<category>Light</category>
 		<tags>
 			<tag>Control</tag>
 			<tag>Light</tag>
@ -36,7 +36,7 @@
 		<item-type>Dimmer</item-type>
 		<label>Color Temperature</label>
 		<description>The CT channel allows to control the CT of a light.</description>
-		<category>DimmableCT</category>
+		<category>ColorLight</category>
 		<tags>
 			<tag>Control</tag>
 			<tag>ColorTemperature</tag>