diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 677b945be..5f8909db7 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1604,7 +1604,7 @@ const mapping = {
     'C4': [cfg.sensor_action],
     'GL-D-003ZS': [cfg.light_brightness_colortemp_colorxy],
     '66492-001': [cfg.lock, cfg.sensor_battery],
-    '798.09': [cfg.light_brightness_colortemp_colorxy],
+    '371000002': [cfg.light_brightness_colortemp_colorxy],
     'U202DST600ZB': [lightEndpoint('light_brightness', 'l1'), lightEndpoint('light_brightness', 'l2')],
     'SM10ZW': [cfg.binary_sensor_contact, cfg.sensor_battery],
     'ICZB-R11D': [cfg.light_brightness],
@@ -1857,6 +1857,13 @@ const mapping = {
     ],
     'FL 120 C': [cfg.light_brightness_colortemp_colorxy],
     '9290022267': [cfg.light_brightness_colortemp],
+    'ZNTGMK11LM': [cfg.light_brightness_colortemp_colorxy],
+    'HLQDQ01LM': [cfg.light_brightness],
+    'TS0502A': [cfg.light_brightness_colortemp],
+    'TS0004': [switchEndpoint('l1'), switchEndpoint('l2'), switchEndpoint('l3'), switchEndpoint('l4')],
+    'U86KWF-ZPSJ': [thermostat(5, 30, 'current_heating_setpoint', 0.5)],
+    'D3-DPWK-TY': [thermostat(5, 30, 'current_heating_setpoint', 0.5)],
+    '100.075.74': [cfg.light_brightness_colortemp_colorxy],
 };
 
 const defaultStatusTopic = 'homeassistant/status';
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ce26eda45..3a058334a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -14834,9 +14834,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "12.0.160",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.160.tgz",
-      "integrity": "sha512-40J0u35p2f2lOFuoehgR1+B6uTJ0x0fSZkn0T60WTnp6NYSUVoNRgBZW75fIGqZtCDGfj+ER1r0BR+G6PMP6vQ==",
+      "version": "12.0.161",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.161.tgz",
+      "integrity": "sha512-iufUoZL86uTplW8vEjevFtAb7KITox2vXHB+0l9dE7lJqYyiGKyEoRqbjkmqBNqFjkJXD4eAM0VpsVAbHGbDMg==",
       "requires": {
         "axios": "^0.19.2",
         "https-proxy-agent": "^5.0.0",
diff --git a/package.json b/package.json
index e775fd812..b52994bd9 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "winston": "^3.3.3",
     "winston-syslog": "^2.4.4",
     "zigbee-herdsman": "0.12.116",
-    "zigbee-herdsman-converters": "12.0.160"
+    "zigbee-herdsman-converters": "12.0.161"
   },
   "devDependencies": {
     "eslint": "*",