zigbee-herdsman-converters 16.3.0 → 16.3.1

package/devices/philips.js

@@ -37,7 +37,6 @@ const extend_1 = __importDefault(require("../lib/extend"));
 const modernExtend_1 = require("../lib/modernExtend");
 const e = exposes.presets;
 const ea = exposes.access;
-const { philipsLight } = philips.philipsModernExtend;
 const fzLocal = {
     philips_contact: {
         cluster: 'genOnOff',
@@ -58,28 +57,28 @@ const definitions = [
         model: '929003598001',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Surimu square panel 30x30',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003597601'],
         model: '929003597601',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle square panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCU001'],
         model: '8719514491229',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance E14',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTV006'],
         model: '929003596101',
         vendor: 'Philips',
         description: 'Hue Filament Edison bulb ST64 550lm E26',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['SOC001'],
@@ -108,1029 +107,1029 @@ const definitions = [
         model: '9290030516',
         vendor: 'Philips',
         description: 'Hue filament standard A60/E27 Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTA013'],
         model: '929003596001',
         vendor: 'Philips',
         description: 'Hue filament A60 550lm E26',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LWV006'],
         model: '9290030518',
         vendor: 'Philips',
         description: 'Philips filament E26 bulb',
-        extend: [philipsLight({ hueEffect: true })],
+        extend: philips.extend.light_onoff_brightness({ disableHueEffects: false }),
     },
     {
         zigbeeModel: ['LWO005'],
         model: '9290030519',
         vendor: 'Philips',
         description: 'Hue white G93 E27 filament globe',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWO006'],
         model: '9290030520',
         vendor: 'Philips',
         description: 'Hue white filament globe G25',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWO007'],
         model: '9290030521',
         vendor: 'Philips',
         description: 'Hue white G125 B22 LED bulb filament giant globe',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LEDtube T8 5FT V2.0'],
         model: 'LP_CF_7904008_EU',
         vendor: 'Philips',
         description: 'MasterConnect LEDtube EM/mains T8',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['MWM001'],
         model: '13190230',
         vendor: 'Philips',
         description: 'Hue white dimmer 1-10V',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['929003055801'],
         model: '929003055801',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom ceiling light Adore with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCZ001'],
         model: '8719514419278',
         vendor: 'Philips',
         description: 'Hue Ellipse E27 smart bulb',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003056701'],
         model: '929003056701',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore ceiling light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003045301_01', '929003045301_02', '929003045301_03'],
         model: '929003045301',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10 (Centura)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003045201_01', '929003045201_02', '929003045201_03'],
         model: '929003045201',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10 (Centura round white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003047401'],
         model: '929003047401',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10 (Centura)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003056901'],
         model: '929003056901',
         vendor: 'Philips',
         description: 'Hue Struana 27W',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWA018', 'LWA028'],
         model: '9290024693',
         vendor: 'Philips',
         description: 'Hue white A60 bulb B22 1055lm with Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LCX004'],
         model: '929002994901',
         vendor: 'Philips',
         description: 'Hue gradient lightstrip',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003045401'],
         model: '929003045401',
         vendor: 'Philips',
         description: 'Hue Centura recessed spotlight white and color ambiance GU10 (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003045501_01', '929003045501_02', '929003045501_03'],
         model: '929003045501',
         vendor: 'Philips',
         description: 'Hue Centura recessed spotlight white and color ambiance GU10 (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003047601'],
         model: '929003047601',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10 (Centura)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003047501'],
         model: '929003047501',
         vendor: 'Philips',
         description: 'Centura recessed spotlight',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005996401', '915005996501'],
         model: '915005996401',
         vendor: 'Philips',
         description: 'Hue white ambiance ceiling light Enrave S with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005996701'],
         model: '915005996701',
         vendor: 'Philips',
         description: 'Hue white ambiance ceiling black Enrave M with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005996601'],
         model: '915005996601',
         vendor: 'Philips',
         description: 'Hue white ambiance ceiling white Enrave M with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005996801', '915005996901', '929003574401', '929003531602'],
         model: '915005996901',
         vendor: 'Philips',
         description: 'Hue white ambiance ceiling light Enrave L with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005997001', '915005997101'],
         model: '915005997001',
         vendor: 'Philips',
         description: 'Hue white ambiance ceiling light Enrave XL with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005997601'],
         model: '915005997601',
         vendor: 'Philips',
         description: 'Hue Devere M white ambiance white & dimmer',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005997701'],
         model: '915005997701',
         vendor: 'Philips',
         description: 'Hue Devere L white ambiance white & dimmer',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003054001'],
         model: '929003054001',
         vendor: 'Philips',
         description: 'Hue Wellness table lamp',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['4076131P6'],
         model: '4076131P6',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Cher with bluetooth 3000lm',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['4076130P6'],
         model: '4076130P6',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Cher with bluetooth 3000lm',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003054301'],
         model: '929003054301',
         vendor: 'Philips',
         description: 'Hue White Ambiance Cher Pendant',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5063131P7'],
         model: '5063131P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance spot Fugato white (1 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5633031P9'],
         model: '5633031P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Pillar spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003046001', '929003045801'],
         model: '5309031P8',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner spot white (1 spot)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929002376301'],
         model: '929002376301',
         vendor: 'Philips',
         description: 'Hue Iris rose limited edition (generation 4) ',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002401201'],
         model: '929002401201',
         vendor: 'Philips',
         description: 'Hue Iris copper special edition (generation 4) ',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376803'],
         model: '929002376803',
         vendor: 'Philips',
         description: 'Hue Iris copper special edition (generation 4)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003536001'],
         model: '929003536001',
         vendor: 'Philips',
         description: 'Hue Iris copper special edition (generation 4)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002401001'],
         model: '929002401001',
         vendor: 'Philips',
         description: 'Hue Iris gold special edition (generation 4)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376901'],
         model: '929002376901',
         vendor: 'Philips',
         description: 'Hue Iris white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063130P7'],
         model: '5063130P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance spot Fugato black (1 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['3418931P6'],
         model: '3418931P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Struana bathroom ceiling with bluetooth 2400lm',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWU001'],
         model: '9290024406',
         vendor: 'Philips',
         description: 'Hue P45 light bulb',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTC002'],
         model: '4034031P7',
         vendor: 'Philips',
         description: 'Hue Fair',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4034031P6'],
         model: '4034031P6',
         vendor: 'Philips',
         description: 'Hue Fair with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4034030P6'],
         model: '4034030P6',
         vendor: 'Philips',
         description: 'Hue Fair with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LWO003'],
         model: '8719514279131',
         vendor: 'Philips',
         description: 'Hue white E27 LED bulb filament giant globe',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWO004'],
         model: '8719514279155',
         vendor: 'Philips',
         description: 'Hue white G125 B22 LED bulb filament giant globe',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTD011'],
         model: '5110131H5',
         vendor: 'Philips',
         description: 'Garnea downlight',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTD012'],
         model: '5111531H5',
         vendor: 'Philips',
         description: 'Garnea downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWA010'],
         model: '929002335001',
         vendor: 'Philips',
         description: 'Hue white A21 bulb B22 with Bluetooth (1600 Lumen)',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTC012'],
         model: '3306431P7',
         vendor: 'Philips',
         description: 'Hue Struana',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['1746130P7'],
         model: '1746130P7',
         vendor: 'Philips',
         description: 'Hue Attract',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1745630P7'],
         model: '1745630P7',
         vendor: 'Philips',
         description: 'Hue Nyro',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1745530P7'],
         model: '1745530P7',
         vendor: 'Philips',
         description: 'Hue Nyro',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LDT001'],
         model: '5900131C5',
         vendor: 'Philips',
         description: 'Hue Aphelion downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LLC012', 'LLC011', 'LLC013'],
         model: '7299760PH',
         vendor: 'Philips',
         description: 'Hue Bloom',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_color(),
     },
     {
         zigbeeModel: ['929002375901'],
         model: '929002375901',
         vendor: 'Philips',
         description: 'Hue Bloom with Bluetooth (White) - EU/UK',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['929002376501'],
         model: '929002376501',
         vendor: 'Philips',
         description: 'Hue Bloom Gen4 with Bluetooth (White) - US',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376001'],
         model: '929002376001',
         vendor: 'Philips',
         description: 'Hue Bloom with Bluetooth (Black)',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCP001', 'LCP002', '4090331P9_01', '4090331P9_02', '929003053301_01', '929003053301_02'],
         model: '4090331P9',
         vendor: 'Philips',
         description: 'Hue Ensis (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['4090330P9_01', '4090330P9_02', '929003052501_01', '929003052501_02'],
         model: '4090330P9',
         vendor: 'Philips',
         description: 'Hue Ensis (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003055901', '929003055901_01', '929003055901_02', '929003055901_03'],
         model: '929003055901',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom ceiling light Adore with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['7602031N6'],
         model: '7602031N6',
         vendor: 'Philips',
         description: 'Hue Go portable light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003128501'],
         model: '929003128501',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp black',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003128701'],
         model: '929003128701',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp black',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003521501'],
         model: '929003521501',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp black',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003521701'],
         model: '929003521701',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp black',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['7602031K6'],
         model: '7602031K6',
         vendor: 'Philips',
         description: 'Hue Go portable light',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LLC020'],
         model: '7146060PH',
         vendor: 'Philips',
         description: 'Hue Go',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LWA005'],
         model: '9290022411',
         vendor: 'Philips',
         description: 'Hue white single filament bulb A19 E26 with Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWE001'],
         model: '929002039801',
         vendor: 'Philips',
         description: 'Hue white E12 with Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTE001'],
         model: '9290022943',
         vendor: 'Philips',
         description: 'Hue white E12',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTE004'],
         model: '9290031451',
         vendor: 'Philips',
         description: 'Hue white ambiance filament E12 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWA007'],
         model: '929002277501',
         vendor: 'Philips',
         description: 'Hue white A19 bulb E26 with Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA008'],
         model: '9290023351',
         vendor: 'Philips',
         description: 'Hue white A21 bulb E26 with Bluetooth (1600 Lumen)',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA009'],
         model: '9290023349',
         vendor: 'Philips',
         description: 'Hue white A67 bulb E26 with Bluetooth (1600 Lumen)',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LCT026', '7602031P7', '7602031U7', '7602031PU', '7602031J6'],
         model: '7602031P7',
         vendor: 'Philips',
         description: 'Hue Go with Bluetooth',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCF002', 'LCF001'],
         model: '8718696167991',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCF005'],
         model: '8718696170557',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1742030P7'],
         model: '1742030P7',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003098601'],
         model: '929003098601',
         vendor: 'Philips',
         description: 'Hue Calla outdoor Pedestal',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1742330P7'],
         model: '1742330P7',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1743730P7'],
         model: '1743730P7',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1741930V7'],
         model: '1741930V7',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1744130P7'],
         model: '1744130P7',
         vendor: 'Philips',
         description: 'Hue Econic outdoor Pedestal',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1744230P7'],
         model: '1744230P7',
         vendor: 'Philips',
         description: 'Hue Econic outdoor post light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1745730V7'],
         model: '1745730V7',
         vendor: 'Philips',
         description: 'Hue Econic outdoor Pedestal',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1743830V7'],
         model: '1743830V7',
         vendor: 'Philips',
         description: 'Hue Econic outdoor wall lamp',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1743830P7'],
         model: '1743830P7',
         vendor: 'Philips',
         description: 'Hue Econic outdoor wall lamp',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1743130P7'],
         model: '1743130P7',
         vendor: 'Philips',
         description: 'Hue Impress outdoor Pedestal',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1743430P7'],
         model: '1743430P7',
         vendor: 'Philips',
         description: 'Hue Impress outdoor Pedestal',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1740193P0'],
         model: '1740193P0',
         vendor: 'Philips',
         description: 'Hue White Lucca wall light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['929003089301'],
         model: '929003089301',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance Lucca wall light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1740293P0'],
         model: '1740293P0',
         vendor: 'Philips',
         description: 'Hue Lucca Pedestal',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['1746630V7'],
         model: '1746630V7',
         vendor: 'Philips',
         description: 'Amarant linear outdoor light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCC001'],
         model: '4090531P7',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance ceiling light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['4090531P9', '929003053601', '929003053501'],
         model: '4090531P9',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance ceiling light with Bluetooth',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['4090431P9'],
         model: '4090431P9',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance table light with Bluetooth',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003052601'],
         model: '929003052601',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance table light with Bluetooth',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWU002'],
         model: '9290024406A',
         vendor: 'Philips',
         description: 'Hue P45 light bulb',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['915005987801'],
         model: '915005987801',
         vendor: 'Philips',
         description: 'Hue white and color ambiance gradient Signe floor lamp (black)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTU001'],
         model: '8719514491106',
         vendor: 'Philips',
         description: 'Hue white ambiance E14',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003053401'],
         model: '929003053401',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance table light with Bluetooth',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005988401'],
         model: '915005988401',
         vendor: 'Philips',
         description: 'Hue Gradient light tube compact black',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005988001'],
         model: '915005988001',
         vendor: 'Philips',
         description: 'Hue Gradient light tube compact black',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCG002', '929003047701', '929003047701', '929003526202_01', '929003526202_02', '929003526202_03', '929003526101'],
         model: '929001953101',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCG003'],
         model: '9290035753',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU5.3',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWA003', 'LWW002', 'LWA025'],
         model: '9290022268',
         vendor: 'Philips',
         description: 'Hue White A19 bulb with Bluetooth',
-        extend: [philipsLight({ hueEffect: true })],
+        extend: philips.extend.light_onoff_brightness({ disableHueEffects: false }),
     },
     {
         zigbeeModel: ['LWO002'],
         model: '9290022415',
         vendor: 'Philips',
         description: 'Hue White G25 E26 Edison Filament Globe Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA004'],
         model: '8718699688820',
         vendor: 'Philips',
         description: 'Hue Filament Standard A60/E27 bluetooth',
-        extend: [philipsLight({ hueEffect: true })],
+        extend: philips.extend.light_onoff_brightness({ disableHueEffects: false }),
     },
     {
         zigbeeModel: ['LWA021'],
         model: '9290030514',
         vendor: 'Philips',
         description: 'Hue Filament Standard A60/E27 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LCB001'],
         model: '548727',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance BR30 with bluetooth',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCB002'],
         model: '046677577957',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance BR30 with bluetooth',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWB004'],
         model: '433714',
         vendor: 'Philips',
         description: 'Hue Lux A19 bulb E27',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWB006', 'LWB014'],
         model: '9290011370',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27/B22',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LDD001'],
         model: '8718696153055',
         vendor: 'Philips',
         description: 'Hue white table light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LDD002'],
         model: '8718696153062',
         vendor: 'Philips',
         description: 'Hue Muscari floor light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA001'],
         model: '8718699673147',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWW003', 'LWF003'],
         model: '9290018216',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA011'],
         model: '929001821618',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA024'],
         model: '9290018216A',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27 806lm bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA012'],
         model: '9290018217',
         vendor: 'Philips',
         description: 'Hue white A60 bulb B22 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['929003047001'],
         model: '929003047001',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin (round)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWA017'],
         model: '929002469202',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27 1050lm with Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA002'],
         model: '9290018215',
         vendor: 'Philips',
         description: 'Hue white A19 bulb E26 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTA001', '4080130P6', '4300631P6'],
         model: '9290022169',
         vendor: 'Philips',
         description: 'Hue white ambiance E27 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTA004'],
         model: '8719514328242',
         vendor: 'Philips',
         description: 'Hue white ambiance E27 800lm with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTA009'],
         model: '9290024684',
         vendor: 'Philips',
         description: 'Hue white ambiance E27 1100lm with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTA010'],
         model: '9290024683',
         vendor: 'Philips',
         description: 'Hue white ambiance A19 1100lm with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTA011'],
         model: '929002471901',
         vendor: 'Philips',
         description: 'Hue white ambiance E27 1600lm with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTA012'],
         model: '929002335105',
         vendor: 'Philips',
         description: 'Hue white ambiance E26 1600lm with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTA008'],
         model: '9290022267A',
         vendor: 'Philips',
         description: 'Hue white ambiance E27 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 434] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 434] }),
     },
     {
         zigbeeModel: ['LCP003'],
         model: '4090631P7',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance pendant light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['4090631P9'],
         model: '4090631P9',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance pendant light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWB010'],
         model: '8718696449691',
         vendor: 'Philips',
         description: 'Hue White A60 Single bulb E27/B22',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWG001'],
         model: '9290018195',
         vendor: 'Philips',
         description: 'Hue white GU10',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWG003'],
         model: '9290019536',
         vendor: 'Philips',
         description: 'Hue white GU10',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWG004'],
         model: 'LWG004',
         vendor: 'Philips',
         description: 'Hue white GU10 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWO001'],
         model: '8718699688882',
         vendor: 'Philips',
         description: 'Hue white Filament bulb G93 E27 bluetooth',
-        extend: [philipsLight({ hueEffect: true })],
+        extend: philips.extend.light_onoff_brightness({ disableHueEffects: false }),
     },
     {
         zigbeeModel: ['LST001'],
         model: '7299355PH',
         vendor: 'Philips',
         description: 'Hue white and color ambiance LightStrip',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_color(),
     },
     {
         zigbeeModel: ['LST002'],
         model: '915005106701',
         vendor: 'Philips',
         description: 'Hue white and color ambiance LightStrip plus',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LST003', 'LST004'],
         model: '9290018187B',
         vendor: 'Philips',
         description: 'Hue white and color ambiance LightStrip outdoor',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCL001', 'LCL006'],
         model: '8718699703424',
         vendor: 'Philips',
         description: 'Hue white and color ambiance LightStrip plus',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCL002'],
         model: '9290022890',
         vendor: 'Philips',
         description: 'Hue white and color ambiance LightStrip outdoor 2m',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCA001', 'LCA002', 'LCA003'],
         model: '9290022166',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E26/E27',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
         endpoint: (device) => {
             return { 'default': 11 };
         },
@@ -1140,1008 +1139,1008 @@ const definitions = [
         model: '9290024896',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E27',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCA006'],
         model: '9290024688',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E27 1100lm',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCA008'],
         model: '929002471601',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E26/E27 1600lm',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCA009'],
         model: '9290024717',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E26/A19 1600lm',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCT001', 'LCT007', 'LCT010', 'LCT012', 'LCT014', 'LCT015', 'LCT016', 'LCT021'],
         model: '9290012573A',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E26/E27/E14',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1743930P7', '1744030P7', '1744030V7', '1743930V7'],
         model: '1743930P7',
         vendor: 'Philips',
         description: 'Hue Outdoor Econic wall lantern',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003053001'],
         model: '929003053001',
         vendor: 'Philips',
         description: 'Hue Sana wall light (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003052901'],
         model: '929003052901',
         vendor: 'Philips',
         description: 'Hue Sana wall light (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCE001'],
         model: '929002294101',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance E12 with bluetooth',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCE002'],
         model: '929002294203',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance E14 with bluetooth',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCT002', 'LCT011'],
         model: '9290002579A',
         vendor: 'Philips',
         description: 'Hue white and color ambiance BR30',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LWB022'],
         model: '9290018194',
         vendor: 'Philips',
         description: 'Hue white BR30',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LCT003'],
         model: '8718696485880',
         vendor: 'Philips',
         description: 'Hue white and color ambiance GU10',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCT024', '440400982841', '440400982842', 'PCM002'],
         model: '915005733701',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Play Lightbar',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005988501'],
         model: '915005988501',
         vendor: 'Philips',
         description: 'Play gradient light tube large',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTW011', 'LTB002'],
         model: '464800',
         vendor: 'Philips',
         description: 'Hue white ambiance BR30 flood light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTW012'],
         model: '8718696695203',
         vendor: 'Philips',
         description: 'Hue white ambiance E14',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTE002'],
         model: '9290022944',
         vendor: 'Philips',
         description: 'Hue white ambiance E14 (with Bluetooth)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWE002'],
         model: '9290020399',
         vendor: 'Philips',
         description: 'Hue white E14',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTW013'],
         model: '8718696598283',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTG002'],
         model: '929001953301',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTD005'],
         model: '5995111U5',
         vendor: 'Philips',
         description: 'Hue white ambiance 5/6" retrofit recessed downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTD008'],
         model: '929003123801',
         vendor: 'Philips',
         description: 'Hue white ambiance 6" downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTG001'],
         model: '9290019534',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3417831P6', '929003056101'],
         model: '3417831P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore spotlight with Bluetooth (1 spot)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3418131P6', '929003056401', '929003056401_01', '929003056401_02', '929003056401_03'],
         model: '3418131P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore GU10 with Bluetooth (3 spots)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3417931P6', '929003056201'],
         model: '3417931P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore GU10 with Bluetooth (2 spots)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3418031P6', '929003056301', '929003056301_01', '929003056301_02', '929003056301_03'],
         model: '3418031P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore GU10 with Bluetooth (3 spots)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003046801'],
         model: '33850000',
         vendor: 'Philips',
         description: 'Philips Hue white ambiance pillar spot (1 spot)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5633231P6'],
         model: '915005916901',
         vendor: 'Philips',
         description: 'Philips Hue white ambiance pillar double spot (2 spot) with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3417711P6'],
         model: '3417711P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore wall light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003056001'],
         model: '929003056001',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore bathroom mirror light with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTW015'],
         model: '9290011998B',
         vendor: 'Philips',
         description: 'Hue white ambiance E26',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTA002'],
         model: '9290022167',
         vendor: 'Philips',
         description: 'Hue white ambiance E26 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTA003'],
         model: '9290022267',
         vendor: 'Philips',
         description: 'Hue white ambiance E26 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTO003'],
         model: '9290024782',
         vendor: 'Philips',
         description: 'Hue G125 B22 White Ambiance filament bulb',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTW010', 'LTW001', 'LTW004'],
         model: '8718696548738',
         vendor: 'Philips',
         description: 'Hue white ambiance E26/E27',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTW017'],
         model: '915005587401',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3402831P7'],
         model: '3402831P7',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom mirror light Adore',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3418411P6'],
         model: '3418411P6',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom ceiling light Adore with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTC021'],
         model: '3435011P7',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom ceiling light Adore',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4503748C6'],
         model: '4503748C6',
         vendor: 'Philips',
         description: 'Hue white ambiance Muscari ceiling light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTD003'],
         model: '4503848C5',
         vendor: 'Philips',
         description: 'Hue white ambiance Muscari pendant light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTD004'],
         model: '801480',
         vendor: 'Philips',
         description: 'Hue white ambiance 4" retrofit recessed downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTD009'],
         model: '5996311U5',
         vendor: 'Philips',
         description: 'Hue white ambiance 4" retrofit recessed downlight',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTD010'],
         model: '5996411U5',
         vendor: 'Philips',
         description: 'Hue white ambiance 5/6" retrofit recessed downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCD001'],
         model: '5996511U5',
         vendor: 'Philips',
         description: 'Hue white and color ambiance 4" retrofit recessed downlight',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCD002'],
         model: '5996611U5',
         vendor: 'Philips',
         description: 'Hue white and color ambiance 5/6" retrofit recessed downlight',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCW001'],
         model: '4090130P7',
         vendor: 'Philips',
         description: 'Hue Sana',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['4090130P9'],
         model: '4090130P9',
         vendor: 'Philips',
         description: 'Hue Sana',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCW002', '4090230P9', '929003053101'],
         model: '4090230P9',
         vendor: 'Philips',
         description: 'Hue Liane (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003053201'],
         model: '929003053201',
         vendor: 'Philips',
         description: 'Hue Liane (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['4090231P9'],
         model: '4090231P9',
         vendor: 'Philips',
         description: 'Hue Liane',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTC001'],
         model: '3261030P7',
         vendor: 'Philips',
         description: 'Hue Being',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3261030P6'],
         model: '3261030P6',
         vendor: 'Philips',
         description: 'Hue Being black',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3261031P6', '929003055001', '929003055101'],
         model: '3261031P6',
         vendor: 'Philips',
         description: 'Hue Being white',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3261048P6'],
         model: '3261048P6',
         vendor: 'Philips',
         description: 'Hue Being aluminium',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3216431P6'],
         model: '3216431P6',
         vendor: 'Philips',
         description: 'Hue Aurelle',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTP007'],
         model: '4505748C5',
         vendor: 'Philips',
         description: 'Hue Ambiance Pendant',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTP008'],
         model: '4098430P7',
         vendor: 'Philips',
         description: 'Hue Being Pendant',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTP011'],
         model: '4507748C5',
         vendor: 'Philips',
         description: 'Hue Semeru Ambiance Pendant',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3261348P6'],
         model: '3261348P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Still',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3261331P6', '929003055301'],
         model: '3261331P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Still (white)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003054101'],
         model: '929003054101',
         vendor: 'Philips',
         description: 'Hue Wellner white ambiance E27 806lm with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3261330P6'],
         model: '3261330P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Still',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003055401'],
         model: '929003055401',
         vendor: 'Philips',
         description: 'Hue white ambiance Still (aluminium)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003055501'],
         model: '929003055501',
         vendor: 'Philips',
         description: 'Hue white ambiance Still (black)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTC003'],
         model: '3261331P7',
         vendor: 'Philips',
         description: 'Hue white ambiance Still',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['LTC011'],
         model: '4096730U7',
         vendor: 'Philips',
         description: 'Hue Cher ceiling light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4096730P6', '929003055601'],
         model: '4096730P6',
         vendor: 'Philips',
         description: 'Hue Cher ceiling light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4096730U9'],
         model: '046677803087',
         vendor: 'Philips',
         description: 'Hue White ambiance Cher ceiling light',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTC013'],
         model: '3216131P5',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle square panel light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3216131P6', 'LTC005', '929003597801'],
         model: '3216131P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle square panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3216231P6'],
         model: '3216231P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle square panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003099001', '929003099201'],
         model: '929003099001',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle square panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTC015'],
         model: '3216331P5',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle rectangle panel light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3216331P6'],
         model: '3216331P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle rectangle panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003099101'],
         model: '929003099101',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle rectangle panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTC016'],
         model: '3216431P5',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle round panel light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4033930P6'],
         model: '4033930P6',
         vendor: 'Philips',
         description: 'Hue black ambiance suspension Fair',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4033931P6'],
         model: '4033931P6',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Fair',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTP003', 'LTP001'],
         model: '4033930P7',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Fair',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['929003054401'],
         model: '929003054401',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Fair',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTP002', '929003054901'],
         model: '4023330P7',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Amaze',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['4023330P6'],
         model: '4023330P6',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Amaze',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['4023331P6'],
         model: '4023331P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Amaze',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003054801'],
         model: '929003054801',
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Amaze with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWF001', 'LWF002', 'LWW001'],
         model: '9290011370B',
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWB015'],
         model: '046677476816',
         vendor: 'Philips',
         description: 'Hue white PAR38 outdoor',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWS001'],
         model: '9290018189',
         vendor: 'Philips',
         description: 'Hue white PAR38 outdoor',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LLC010'],
         model: '7199960PH',
         vendor: 'Philips',
         description: 'Hue Iris',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_color(),
     },
     {
         zigbeeModel: ['929002376101'],
         model: '929002376101',
         vendor: 'Philips',
         description: 'Hue Iris (generation 2, white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376201'],
         model: '929002376201',
         vendor: 'Philips',
         description: 'Hue Iris (generation 2, black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376801'],
         model: '929002376801',
         vendor: 'Philips',
         description: 'Hue Iris kobber limited edition (generation 4)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376701'],
         model: '929002376701',
         vendor: 'Philips',
         description: 'Hue Iris silver limited edition (generation 4) ',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376703'],
         model: '929002376703',
         vendor: 'Philips',
         description: 'Hue Iris silver special edition (generation 4) ',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002376401', '929002376402'],
         model: '929002376401',
         vendor: 'Philips',
         description: 'Hue Iris gold limited edition (generation 4) ',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1742930P7'],
         model: '1742930P7',
         vendor: 'Philips',
         description: 'Hue outdoor Impress wall lamp',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1743030P7'],
         model: '1743030P7',
         vendor: 'Philips',
         description: 'Hue outdoor Impress wall lamp',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1745930P7'],
         model: '1745930P7',
         vendor: 'Philips',
         description: 'Hue outdoor Impress wall lamp (low voltage)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1743230P7'],
         model: '1743230P7',
         vendor: 'Philips',
         description: 'Hue outdoor Impress lantern',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1746430P7', '929003098701'],
         model: '1746430P7',
         vendor: 'Philips',
         description: 'Hue outdoor Resonate wall lamp (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1746447P7'],
         model: '1746447P7',
         vendor: 'Philips',
         description: 'Hue outdoor Resonate wall lamp (silver)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LLC006'],
         model: '7099930PH',
         vendor: 'Philips',
         description: 'Hue Iris (Generation 2)',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_color(),
     },
     {
         zigbeeModel: ['4080248P9'],
         model: '4080248P9',
         vendor: 'Philips',
         description: 'Hue Signe floor light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCF003', '4080248P7'],
         model: '4080248P7',
         vendor: 'Philips',
         description: 'Hue Signe floor light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['4080248U9', '915005987201'],
         model: '4080248U9',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Signe floor light',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005987601'],
         model: '915005987601',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (black)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005987501'],
         model: '915005987501',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (white)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003479701', '915005987701'],
         model: '915005987701',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (wood)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003516101'],
         model: '929003516101',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (wood)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCT020'],
         model: '4080148P7',
         vendor: 'Philips',
         description: 'Hue Signe table light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['4080148P9'],
         model: '4080148P9',
         vendor: 'Philips',
         description: 'Hue Signe table light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['4080148U9'],
         model: '4080148U9',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Signe table light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005986901'],
         model: '915005986901',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Gradient Signe table lamp (white)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005987001'],
         model: '915005987001',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Gradient Signe table lamp (black)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5060730P7_01', '5060730P7_02', '5060730P7_03', '5060730P7_04', '5060730P7_05'],
         model: '5060730P7',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (4 spots)',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['5060731P7_01', '5060731P7_02', '5060731P7_03', '5060731P7_04', '5060731P7_05'],
         model: '5060731P7',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (4 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003621101_01', '929003621101_02', '929003621101_03', '929003621101_04', '929003621101_05'],
         model: '929003621101',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (4 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5060830P7_01', '5060830P7_02', '5060830P7_03', '5060830P7_04'],
         model: '5060830P7',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5060831P7_01', '5060831P7_02', '5060831P7_03', '5060831P7_04'],
         model: '5060831P7',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5061031P7_01', '5061031P7_02', '5061031P7_03'],
         model: '5061031P7',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (2 spots) (white)',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['5061030P7_01', '5061030P7_02', '5061030P7_03'],
         model: '5061030P7',
         vendor: 'Philips',
         description: 'Hue White & Color ambience Centris ceiling light (2 spots) (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062131P7'],
         model: '5062131P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot white (1 spot)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062148P7'],
         model: '5062148P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot aluminium (1 spot)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062231P7'],
         model: '5062231P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot white (2 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062248P7'],
         model: '5062248P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot aluminium (2 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062331P7'],
         model: '5062331P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot white (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062348P7'],
         model: '5062348P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot aluminium (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5047330P6'],
         model: '5047330P6',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot black (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062431P7'],
         model: '5062431P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot white (4 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5062448P7'],
         model: '5062448P7',
         vendor: 'Philips',
         description: 'Hue white and color ambience Argenta spot aluminium (4 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063231P7'],
         model: '5063231P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance spot Fugato white (2 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063230P7'],
         model: '5063230P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance spot Fugato black (2 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063331P7'],
         model: '5063331P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance spot Fugato white (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063330P7'],
         model: '5063330P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance spot Fugato black (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063431P7'],
         model: '5063431P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth White & Color Ambiance spot Fugato white (4 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5063430P7'],
         model: '5063430P7',
         vendor: 'Philips',
         description: 'Hue Bluetooth White & Color Ambiance spot Fugato black (4 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCO005'],
         model: '9290031512',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance bulb',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5045131P7'],
         model: '5045131P7',
         vendor: 'Philips',
         description: 'Hue Centura',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['5045148P7'],
         model: '5045148P7',
         vendor: 'Philips',
         description: 'Hue Centura',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LWV007'],
         model: '9290030523',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST72 LED',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['5055148P7'],
         model: '5055148P7',
         vendor: 'Philips',
         description: 'Hue Centura Aluminium (square)',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['5055131P7'],
         model: '5055131P7',
         vendor: 'Philips',
         description: 'Hue Centura White (square)',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['RDM001', '9290030171', 'RDM004'],
@@ -2290,49 +2289,49 @@ const definitions = [
         model: '929003128401',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003128601'],
         model: '929003128601',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003521401'],
         model: '929003521401',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003521601'],
         model: '929003521601',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003128801'],
         model: '929003128801',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003128901'],
         model: '929003128901',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003129001'],
         model: '929003129001',
         vendor: 'Philips',
         description: 'Hue Go portable table lamp white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['SML003'],
@@ -2433,7 +2432,7 @@ const definitions = [
         model: '915005987401',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Gradient Signe table lamp (black)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LOM005'],
@@ -2510,413 +2509,413 @@ const definitions = [
         model: '7099860PH',
         vendor: 'Philips',
         description: 'LivingColors Aura',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_color(),
     },
     {
         zigbeeModel: ['LTC014'],
         model: '3216231P5',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle rectangle panel light',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['1744830P7'],
         model: '8718696170656',
         vendor: 'Philips',
         description: 'Hue White Fuzo outdoor floor light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['929003098901'],
         model: '929003098901',
         vendor: 'Philips',
         description: 'Hue White Inara outdoor light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['1744530P7', '1744630P7', '1744430P7', '1744730P7'],
         model: '8718696170625',
         vendor: 'Philips',
         description: 'Hue Fuzo outdoor wall light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['929003055201'],
         model: '929003055201',
         vendor: 'Philips',
         description: 'Hue Being',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['4100448U9'],
         model: '4100448U9',
         vendor: 'Philips',
         description: 'Hue Being',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['1743630P7', '1743630V7'],
         model: '17436/30/P7',
         vendor: 'Philips',
         description: 'Hue Welcome white flood light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['1743530P7', '1743530V7'],
         model: '17435/30/P7',
         vendor: 'Philips',
         description: 'Hue Discover white and color ambiance flood light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['1746330P7', '1746330V7', '1746347P7'],
         model: '1746330P7',
         vendor: 'Philips',
         description: 'Hue Appear outdoor wall light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LCS001', '1741830P7'],
         model: '1741830P7',
         vendor: 'Philips',
         description: 'Hue Lily outdoor spot light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCS002'],
         model: '9290031508',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance PAR38 outdoor spotlight',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1742730P7', '1742830P7'],
         model: '1742830P7',
         vendor: 'Philips',
         description: 'Hue Lily outdoor spot light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1741530P7', '1741430P7'],
         model: '1741530P7',
         vendor: 'Philips',
         description: 'Hue Lily outdoor spot light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1741730V7'],
         model: '1741730V7',
         vendor: 'Philips',
         description: 'Hue Lily outdoor spot light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1746730V7'],
         model: '1746730V7',
         vendor: 'Philips',
         description: 'Hue Lily outdoor spot light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1746230V7', '1746230P7'],
         model: '1746230V7',
         vendor: 'Philips',
         description: 'Hue Lily XL outdoor spot light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCL003'],
         model: '9290022891',
         vendor: 'Philips',
         description: 'Hue Lily outdoor led strip',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LWV001'],
         model: '929002241201',
         vendor: 'Philips',
         description: 'Hue white filament Edison E27 LED',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTV002'],
         model: '929002477901',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST72 E27 LED warm-to-cool',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTV003'],
         model: '8719514301528',
         vendor: 'Philips',
         description: 'Hue Filament White Ambiance ST72 B22 LED warm-to-cool',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTV004'],
         model: '929002478401',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST19 E26 LED warm-to-cool',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTV005'],
         model: '9290029808',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST23 E26 LED warm-to-cool',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTO004'],
         model: '9290024785',
         vendor: 'Philips',
         description: 'Hue White Ambinance G25 E26 Edison Filament Globe',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LWE005'],
         model: '9290024796',
         vendor: 'Philips',
         description: 'Hue Filament White E12',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTA007'],
         model: '9290024783',
         vendor: 'Philips',
         description: 'Hue Filament White Ambiance A60/E27 Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LWV002'],
         model: '046677551780',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST19 LED',
-        extend: [philipsLight({ hueEffect: true })],
+        extend: philips.extend.light_onoff_brightness({ disableHueEffects: false }),
     },
     {
         zigbeeModel: ['LWV003'],
         model: '929002459201',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST72 E27 LED',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWV004'],
         model: '8719514279193',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST72 B22 LED',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWV005'],
         model: '9290030517',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST64 E27 LED',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['HML004'],
         model: '3115331PH',
         vendor: 'Philips',
         description: 'Phoenix light',
-        extend: [philipsLight({ color: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['LLM001'],
         model: '7121131PU/7120031PH/7120131PH/7120231PU',
         vendor: 'Philips',
         description: 'Hue Beyond white and color ambiance suspension/ceiling/table lamp',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5041131P9', '5041148P9', '929003047301'],
         model: '5041131P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['5042131P9'],
         model: '5042131P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin (square)',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['929003047101', '929003045101_03', '929003045101_01', '929003045101_02'],
         model: '929003047101',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin (round)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047131P9', '5047131P6'],
         model: '5047131P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram single spotlight with bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047231P6'],
         model: '5047231P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram double spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047331P6'],
         model: '5047331P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram triple spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047130P9'],
         model: '5047130P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram single spotlight with bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047130P6'],
         model: '5047130P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram single spotlight with bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['HML006'],
         model: '7531609',
         vendor: 'Philips',
         description: 'Hue Phoenix downlight',
-        extend: [philipsLight({ colorTemp: { range: undefined } })],
+        extend: philips.extend.light_onoff_brightness_colortemp(),
     },
     {
         zigbeeModel: ['3418631P6'],
         model: '3418631P6',
         vendor: 'Philips',
         description: 'Hue Adore bathroom mirror',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTW018'],
         model: '3435731P7',
         vendor: 'Philips',
         description: 'Hue Adore white ambiance bathroom mirror',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LXC006'],
         model: '929003498601',
         vendor: 'Philips',
         description: 'Play gradient lightstrip for PC (32-34)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCX001'],
         model: '929002422702',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 55',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCX002'],
         model: '929002422801',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 65',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCX003'],
         model: '929002422901',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 75',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003099301'],
         model: '929003099301',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle round panel light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3418331P6'],
         model: '3418331P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore bathroom mirror light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003046201_01', '929003046201_02', '929003046201_03'],
         model: '929003046201',
         vendor: 'Philips',
         description: 'Hue White Ambiance Runner triple spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5309331P6', '5309330P6', '929003046301_03', '929003046301_02', '929003046301_01'],
         model: '5309331P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner triple spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5309230P6', '5309231P6', '929003045701_01', '929003045701_02'],
         model: '5309230P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner double spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003045601_01', '929003045601_02'],
         model: '8719514338142',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner double spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047230P6', '5047230P6'],
         model: '5047230P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram double spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047430P6'],
         model: '5047430P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram quadruple spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5633030P6', '929003046501'],
         model: '5633030P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Pillar spotlamp',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCG001'],
         model: '9290019532',
         vendor: 'Philips',
         description: 'Hue White and color ambiance GU10 spot LED with Bluetooth',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5309030P9', '5309031P9', '5309030P6', '5309031P6', '929003046101'],
         model: '5309030P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner single spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCA007'],
         model: '9290024687',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance A19 1100 lumen',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['RDM002'],
@@ -2961,623 +2960,634 @@ const definitions = [
         model: '9290022266A',
         vendor: 'Philips',
         description: 'Hue White and color ambiance A19 800 lumen',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003553001'],
         model: '929003553001',
         vendor: 'Philips',
         description: 'Hue outdoor Resonate downward wall lamp',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWE003'],
         model: '9290020400',
         vendor: 'Philips',
         description: 'Hue White E17 470 lumen',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['1746630P7'],
         model: '1746630P7',
         vendor: 'Philips',
         description: 'Hue White and Colour Ambiance Amarant linear outdoor light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1745430P7'],
         model: '1745430P7',
         vendor: 'Philips',
         description: 'Hue Impress outdoor Pedestal',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1745130P7'],
         model: '1745130P7',
         vendor: 'Philips',
         description: 'Hue Calla outdoor',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTO002'],
         model: '8719514301542',
         vendor: 'Philips',
         description: 'Hue Filament Globe XL Ambiance E27',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTV001'],
         model: '92900244777',
         vendor: 'Philips',
         description: 'Hue White Ambiance E27 ST64 filament bulb',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTO001'],
         model: '8719514301481',
         vendor: 'Philips',
         description: 'Hue Filament Globe Ambiance E27',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['915005997801'],
         model: '915005997801',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Xamento M',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005997901'],
         model: '915005997901',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Xamento L',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002966401'],
         model: '929002966401',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Surimu square panel',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929002966501'],
         model: '929002966501',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance Surimu rectangle panel',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003598101'],
         model: '929003598101',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Surimu round panel',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5060930P7_01', '5060930P7_02', '5060930P7_03', '5060930P7_04'],
         model: '5060930P7',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Centris ceiling light (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['5060931P7_01', '5060931P7_02', '5060931P7_03', '5060931P7_04'],
         model: '5060931P7',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Centris ceiling light (3 spots)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTF001'],
         model: '6109231C5',
         vendor: 'Philips',
         description: 'Hue white ambiance Apogee square',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTF002'],
         model: '6109331C5',
         vendor: 'Philips',
         description: 'Hue white ambiance Apogee round',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['5047131P8'],
         model: '5047131P8',
         vendor: 'Philips',
         description: 'Hue White ambiance Buckram single spotlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['1746530P7'],
         model: '1746530P7',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Daylo outdoor wall lamp',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['1746547P7'],
         model: '1746547P7',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Daylo outdoor wall lamp',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTA005'],
         model: '8719514392830',
         vendor: 'Philips',
         description: 'Hue White Ambiance E27 filament screw globe',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTA006'],
         model: '8719514301443',
         vendor: 'Philips',
         description: 'Hue White Ambiance B22 filament screw globe',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LWE006'],
         model: '929002294102',
         vendor: 'Philips',
         description: 'Hue white candle bulb E14 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWE007'],
         model: '9290030211',
         vendor: 'Philips',
         description: 'Hue white Candle bulb E14 bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LCD003'],
         model: '8719514344723',
         vendor: 'Philips',
         description: 'Akari downlight',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCD004'],
         model: '8719514382350',
         vendor: 'Philips',
         description: 'Akari downlight',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCD005'],
         model: '9290031345',
         vendor: 'Philips',
         description: 'Hue white and color ambiance 4" retrofit recessed downlight',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCD006'],
         model: '9290031346',
         vendor: 'Philips',
         description: 'Hue white and color ambiance 5/6" retrofit recessed downlight',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LCD007'],
         model: '579573',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance Slim Downlight 6"',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LWE004'],
         model: '8719514302235',
         vendor: 'Philips',
         description: 'Hue White Filament Bulb E14',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA019'],
         model: '9290024691',
         vendor: 'Philips',
         description: 'Hue white single filament bulb A19 E26 with Bluetooth (1100 Lumen)',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LWA029'],
         model: '9290024691A',
         vendor: 'Philips',
         description: 'Hue white single filament bulb A19 E26 with Bluetooth (1100 Lumen)',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['915005998201'],
         model: '915005998201',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005997301', '915005997201'],
         model: '915005997301',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse medium',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005997501', '915005997401', '929003542401'],
         model: '915005997501',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse large',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003531702'],
         model: '929003531702',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse medium',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003045001_01', '929003045001_02', '929003045001_03'],
         model: '9290019533',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['3417611P6', '3417511P9'],
         model: '3417511P9',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom recessed downlight Adore with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LWS002'],
         model: '046677562229',
         vendor: 'Philips',
         description: 'Hue White PAR20 with Bluetooth',
-        extend: [philipsLight({ hueEffect: true })],
+        extend: philips.extend.light_onoff_brightness({ disableHueEffects: false }),
     },
     {
         zigbeeModel: ['LTO005', '929002980901'],
         model: '929002980901',
         vendor: 'Philips',
         description: 'Hue white ambiance G40 E26 filament globe with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LWB016'],
         model: '9290018609',
         vendor: 'Philips',
         description: 'Hue White E26 806 lumen',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['3402931P7', '3418231P6'],
         model: '8718696175798',
         vendor: 'Philips',
         description: 'Philips Hue Adore Bathroom Mirror Light',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003045901'],
         model: '929003045901',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner spot white (1 spot)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['915005998101'],
         model: '915005998101',
         vendor: 'Philips',
         description: 'Hue white ambiance pendant black Enrave',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['1740447P0'],
         model: '8718696166079',
         vendor: 'Philips',
         description: 'Hue Tuar outdoor wall light',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['915005998001'],
         model: '915005998001',
         vendor: 'Philips',
         description: 'Hue white ambiance pendant white Enrave',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003054501'],
         model: '929003054501',
         vendor: 'Philips',
         description: 'Hue white ambiance Fair ceiling with Bluetooth (white)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003054601'],
         model: '929003054601',
         vendor: 'Philips',
         description: 'Hue white ambiance Fair ceiling with Bluetooth white',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003054701'],
         model: '929003054701',
         vendor: 'Philips',
         description: 'Hue white ambiance Fair ceiling with Bluetooth (black)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003048301_01', '929003048301_02', '929003048301_03', '929003048301_04'],
         model: '8719514339163',
         vendor: 'Philips',
         description: 'Hue white ambiance Buckram quadruple spotlight with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003048101_01', '929003048101_02', '929003048101_03'],
         model: '8719514339125',
         vendor: 'Philips',
         description: 'Hue white ambiance Buckram triple spotlight with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003047901_01', '929003047901_02'],
         model: '871951433908',
         vendor: 'Philips',
         description: 'Hue white ambiance Buckram double spotlight with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['4090131P9'],
         model: '8718696174548',
         vendor: 'Philips',
         description: 'Hue Sana wall lamp with Bluetooth white',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTD007'],
         model: '5110731H5',
         vendor: 'Philips',
         description: 'Hue white ambiance Garnea downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTE005'],
         model: '9290031452',
         vendor: 'Philips',
         description: 'Hue white ambiance filament E14 (with Bluetooth)',
-        extend: [philipsLight({ colorTemp: { range: [222, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [222, 454] }),
     },
     {
         zigbeeModel: ['LTB003'],
         model: '046677578138',
         vendor: 'Philips',
         description: 'Hue White ambiance BR30 E26',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCX012'],
         model: '929003535301',
         vendor: 'Philips',
         description: 'Hue Festavia gradient light string 250',
-        extend: [philipsLight({ color: true, gradient: { extraEffects: ['sparkle', 'opal', 'glisten'] }, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({
+            colorTempRange: [153, 500],
+            extraEffects: ['sparkle', 'opal', 'glisten'],
+        }),
     },
     {
         zigbeeModel: ['LCX017'],
         model: '929003674601',
         vendor: 'Philips',
         description: 'Hue Festavia gradient light string 500',
-        extend: [philipsLight({ color: true, gradient: { extraEffects: ['sparkle', 'opal', 'glisten'] }, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({
+            colorTempRange: [153, 500],
+            extraEffects: ['sparkle', 'opal', 'glisten'],
+        }),
     },
     {
         zigbeeModel: ['LCX016'],
         model: '9290036745',
         vendor: 'Philips',
         description: 'Hue Festavia gradient light string 100',
-        extend: [philipsLight({ color: true, gradient: { extraEffects: ['sparkle', 'opal', 'glisten'] }, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({
+            colorTempRange: [153, 500],
+            extraEffects: ['sparkle', 'opal', 'glisten'],
+        }),
     },
     {
         zigbeeModel: ['915005987101'],
         model: '915005987101',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (white)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005987301'],
         model: '915005987301',
         vendor: 'Philips',
         description: 'Hue Gradient Signe table lamp (white)',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003526301'],
         model: '929003526301',
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Xamento M',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003074801_01', '929003074801_02', '929003074801_03'],
         model: '929003074801',
         vendor: 'Philips',
         description: 'Hue Xamento White and Color Ambiance GU10',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] }, turnsOffAtBrightness1: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
+        meta: { turnsOffAtBrightness1: true },
     },
     {
         zigbeeModel: ['929003074701'],
         model: '929003074701',
         vendor: 'Philips',
         description: 'Hue Xamento White and Color Ambiance GU10 (chrome)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] }, turnsOffAtBrightness1: true })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
+        meta: { turnsOffAtBrightness1: true },
     },
     {
         zigbeeModel: ['LWE008'],
         model: '929003021301',
         vendor: 'Philips',
         description: 'Hue White E17 470 lumen',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['929003046901'],
         model: '8719514338524',
         vendor: 'Philips',
         description: 'Hue white ambiance Pillar spotlight with Bluetooth (black)',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['8719514288232'],
         model: '929002469216',
         vendor: 'Philips',
         description: 'Hue white E27 1100lm with Bluetooth',
-        extend: [philipsLight({})],
+        extend: philips.extend.light_onoff_brightness(),
     },
     {
         zigbeeModel: ['LTD016'],
         model: '9290031347',
         vendor: 'Philips',
         description: 'Hue white ambiance extra bright high lumen dimmable LED smart retrofit recessed 4" downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LTD017'],
         model: '578526',
         vendor: 'Philips',
         description: 'Hue white ambiance extra bright high lumen dimmable LED smart retrofit recessed 6" downlight',
-        extend: [philipsLight({ colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003115801'],
         model: '929003115801',
         vendor: 'Philips',
         description: 'Hue Perifo cylinder spotlight (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003115701'],
         model: '929003115701',
         vendor: 'Philips',
         description: 'Hue Perifo cylinder spotlight (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003116201'],
         model: '929003116201',
         vendor: 'Philips',
         description: 'Hue Perifo linear light bar (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003116101'],
         model: '929003116101',
         vendor: 'Philips',
         description: 'Hue Perifo linear light bar (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003115901'],
         model: '929003117101',
         vendor: 'Philips',
         description: 'Hue Perifo ceiling light, 3 pendant (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003117201'],
         model: '929003117201',
         vendor: 'Philips',
         description: 'Hue Perifo ceiling light, 3 pendant (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003117301'],
         model: '929003117301',
         vendor: 'Philips',
         description: 'Hue Perifo ceiling light, 4 spotlights (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003117401'],
         model: '929003117401',
         vendor: 'Philips',
         description: 'Hue Perifo ceiling light, 4 spotlights (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003117701'],
         model: '929003117701',
         vendor: 'Philips',
         description: 'Hue Perifo Wall Light, 3 spotlights (black)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003117801'],
         model: '929003117801',
         vendor: 'Philips',
         description: 'Hue Perifo Wall Light, 3 spotlights (white)',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005988101'],
         model: '915005988101',
         vendor: 'Philips',
         description: 'Hue Gradient light tube large',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005987901'],
         model: '915005987901',
         vendor: 'Philips',
         description: 'Hue Gradient light tube compact',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['915005988201'],
         model: '915005988201',
         vendor: 'Philips',
         description: 'Hue Gradient light tube large black EU',
-        extend: [philipsLight({ color: true, gradient: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003597701'],
         model: '929003597701',
         vendor: 'Philips',
         description: 'Hue white ambiance Aurelle square panel light 120x30',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['929003055701'],
         model: '929003055701',
         vendor: 'Philips',
         description: 'Hue White Ambiance Devote',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['LLM011'],
         model: '800094',
         vendor: 'Philips',
         description: 'Hue Phoenix dimmable LED smart pendant light',
-        extend: [philipsLight({ color: true, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
     },
     {
         zigbeeModel: ['929003046601_01', '929003046601_02'],
         model: '929003046601',
         vendor: 'Philips',
         description: 'Philips Hue white ambiance pillar double spot (2 spot) with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LTG003'],
         model: '8719514491342',
         vendor: 'Philips',
         description: 'Hue white ambiance MR16 with Bluetooth',
-        extend: [philipsLight({ colorTemp: { range: [153, 454] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp({ colorTempRange: [153, 454] }),
     },
     {
         zigbeeModel: ['LCX015'],
         model: '9290036744',
         vendor: 'Philips',
         description: 'Hue Festavia gradient light string 250',
-        extend: [philipsLight({ color: true, gradient: { extraEffects: ['sparkle'] }, colorTemp: { range: [153, 500] } })],
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({ colorTempRange: [153, 500], extraEffects: ['sparkle'] }),
     },
 ];
 exports.default = definitions;