diff --git a/docs/images/devices/D1821.jpg b/docs/images/devices/D1821.jpg
new file mode 100644
index 00000000..3f1a0d72
Binary files /dev/null and b/docs/images/devices/D1821.jpg differ
diff --git a/docs/images/devices/ZNLDP12LM.jpg b/docs/images/devices/ZNLDP12LM.jpg
new file mode 100644
index 00000000..3517ea91
Binary files /dev/null and b/docs/images/devices/ZNLDP12LM.jpg differ
diff --git a/docs/information/supported_devices.md b/docs/information/supported_devices.md
index e78610f8..3e341b8e 100644
--- a/docs/information/supported_devices.md
+++ b/docs/information/supported_devices.md
@@ -2,7 +2,7 @@
 
 *NOTE: This file has been generated, do not edit this file manually!*
 
-Currently **146** devices are supported from **30** different vendors.
+Currently **148** devices are supported from **31** different vendors.
 
 In case you own a Zigbee device which is **NOT** listed here, please see
 [How to support new devices](https://koenkk.github.io/zigbee2mqtt/how_tos/how_to_support_new_devices.html).
@@ -65,6 +65,12 @@ In case you own a Zigbee device which is **NOT** listed here, please see
 | ------------- | ------------- | -------------------------- |
 | PLUG EDP RE:DY | EDP re:dy plug (on/off, power measurement) | ![../images/devices/PLUG-EDP-RE-DY.jpg](../images/devices/PLUG-EDP-RE-DY.jpg) |
 
+### EcoSmart
+
+| Model | Description | Picture |
+| ------------- | ------------- | -------------------------- |
+| D1821 | EcoSmart A19 RGB bulb (on/off, brightness, color temperature, color xy) | ![../images/devices/D1821.jpg](../images/devices/D1821.jpg) |
+
 ### GE
 
 | Model | Description | Picture |
@@ -273,6 +279,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see
 
 | Model | Description | Picture |
 | ------------- | ------------- | -------------------------- |
+| ZNLDP12LM | Xiaomi Aqara smart LED bulb (on/off, brightness, color temperature) | ![../images/devices/ZNLDP12LM.jpg](../images/devices/ZNLDP12LM.jpg) |
 | WXKG01LM | Xiaomi MiJia wireless switch (single, double, triple, quadruple, many, long, long_release click) | ![../images/devices/WXKG01LM.jpg](../images/devices/WXKG01LM.jpg) |
 | WXKG11LM | Xiaomi Aqara wireless switch (single, double click (and triple, quadruple, hold, release depending on model)) | ![../images/devices/WXKG11LM.jpg](../images/devices/WXKG11LM.jpg) |
 | WXKG12LM | Xiaomi Aqara wireless switch (with gyroscope) (single, double, shake, hold, release) | ![../images/devices/WXKG12LM.jpg](../images/devices/WXKG12LM.jpg) |
diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md
index a9b2b500..48502b7f 100644
--- a/docs/integration/home_assistant.md
+++ b/docs/integration/home_assistant.md
@@ -210,6 +210,20 @@ automation:
 
 ## Configuration when NOT using Home Assistant MQTT discovery
 
+### ZNLDP12LM
+{% raw %}
+```yaml
+light:
+  - platform: "mqtt"
+    state_topic: "zigbee2mqtt/<FRIENDLY_NAME>"
+    availability_topic: "zigbee2mqtt/bridge/state"
+    brightness: true
+    color_temp: true
+    schema: "json"
+    command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/set"
+```
+{% endraw %}
+
 ### WXKG01LM
 {% raw %}
 ```yaml
@@ -2795,4 +2809,19 @@ light:
 ```
 {% endraw %}
 
+### D1821
+{% raw %}
+```yaml
+light:
+  - platform: "mqtt"
+    state_topic: "zigbee2mqtt/<FRIENDLY_NAME>"
+    availability_topic: "zigbee2mqtt/bridge/state"
+    brightness: true
+    color_temp: true
+    xy: true
+    schema: "json"
+    command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/set"
+```
+{% endraw %}
+
 
diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 8b1d4177..38668c24 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -414,6 +414,8 @@ const mapping = {
     '421786': [configurations.light_brightness],
     'ZPIR-8000': [configurations.binary_sensor_occupancy],
     'ZCTS-808': [configurations.binary_sensor_contact],
+    'ZNLDP12LM': [configurations.light_brightness_colortemp],
+    'D1821': [configurations.light_brightness_colortemp_colorxy],
 };
 
 /**
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index cf37a132..883471d5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4792,9 +4792,9 @@
       }
     },
     "zigbee-shepherd-converters": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.3.tgz",
-      "integrity": "sha512-z/o0EXZ9KaPljv8n2r1CZtdEdD2dOjJYU0aXwMo9SQE24JfxD8N+xMXzt9Y+YmuIbzg7psjpLTIFfnZGv6fr7A==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.4.tgz",
+      "integrity": "sha512-yFgF+TTQ5j6fjf0GG6JxIM5KsrKdlGnXM9wpJPR7W48WEwUwGAlB4x9ioRYCjWWEvX03ngR5RoOqTdGyr8P8Gw==",
       "requires": {
         "debounce": "*",
         "debug": "3.2.6",
diff --git a/package.json b/package.json
index 6466f613..a3fa6fed 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "winston": "2.4.2",
     "ziee": "*",
     "zigbee-shepherd": "git+https://github.com/Koenkk/zigbee-shepherd.git#ce52ac4131e2a505af6197b4a26d2b5360e4eb80",
-    "zigbee-shepherd-converters": "7.0.3",
+    "zigbee-shepherd-converters": "7.0.4",
     "zive": "*"
   },
   "devDependencies": {