diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35534baa8..4270d4838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,14 +11,14 @@ All notable changes to this project will be documented in this file.
 - ESP32 Hybrid compile take custom boards settings in account (#22542)
 
 ### Breaking Changed
-- ArtNet on ESP32 switches from GRB to RGB encoding
+- ESP32 ArtNet switches from GRB to RGB encoding (#22556)
 
 ### Changed
 - ESP32 max number of supported switches/buttons/relays from 28 to 32
 - ESP32 max number of interlocks from 14 to 16
 - ESP32 Platform from 2024.11.30 to 2024.11.31, Framework (Arduino Core) from v3.1.0.241030 to v3.1.0.241117 and IDF to 5.3.1.241024 (#22504)
 - Prevent active BLE operations with unencrypted MI-format beacons (#22453)
-- Replace NeoPixelBus with TasmotaLED on ESP32x
+- ESP32 replaced NeoPixelBus with TasmotaLED (#22556)
 
 ### Fixed
 - ESP32 upgrade by file upload response based on file size (#22500)
@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
 - Use HTML escape on File System Edit File load (#22492)
 - Magic switch applying masking window to any power change (#22535)
 - Shift595 output offsets and restart relay toggles
+- Shutter wrong power ON state (#22548)
 
 ### Removed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ca9c3883b..526d1a88d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -147,10 +147,12 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - HASPmota `haspmota.get_pages()` to get the sorted list of pages [#22358](https://github.com/arendst/Tasmota/issues/22358)
 
 ### Breaking Changed
+- ESP32 ArtNet switches from GRB to RGB encoding [#22556](https://github.com/arendst/Tasmota/issues/22556)
 
 ### Changed
 - ESP32 Platform from 2024.09.30 to 2024.11.31, Framework (Arduino Core) from v3.1.0.240926 to v3.1.0.241117 and IDF to 5.3.1.241024 [#22504](https://github.com/arendst/Tasmota/issues/22504)
 - ESP32 LVGL library from v9.2.0 to v9.2.2 [#22385](https://github.com/arendst/Tasmota/issues/22385)
+- ESP32 replaced NeoPixelBus with TasmotaLED [#22556](https://github.com/arendst/Tasmota/issues/22556)
 - Redesign GUI adding feedback to buttons, shutters and lights
 - Use command `WebButton1` to change GUI shutter 1 name
 - Unit (k)VAr(h) to (k)var(h) [#22435](https://github.com/arendst/Tasmota/issues/22435)
@@ -173,6 +175,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - Use HTML escape on File System Edit File load [#22492](https://github.com/arendst/Tasmota/issues/22492)
 - Prevent crashing when `display.ini` is missing end `#` [#22471](https://github.com/arendst/Tasmota/issues/22471)
 - Magic switch applying masking window to any power change [#22535](https://github.com/arendst/Tasmota/issues/22535)
+- Shutter wrong power ON state [#22548](https://github.com/arendst/Tasmota/issues/22548)
 - Alexa Hue with multiple devices [#22383](https://github.com/arendst/Tasmota/issues/22383)
 - Mitsubishi Electric HVAC Standby Stage for MiElHVAC [#22430](https://github.com/arendst/Tasmota/issues/22430)
 - EQ3 TRV firmware version 1.46 fails if the default true is used in subscribe on the notify characteristic [#22328](https://github.com/arendst/Tasmota/issues/22328)
diff --git a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
index 26f5f61ec..31f15d109 100644
--- a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
+++ b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
@@ -33,14 +33,17 @@
  * {"NAME":"Shelly Pro 1PM","GPIO":[9568,1,9472,1,768,0,0,0,672,704,736,0,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,3459,0,0,32,4736,0,160,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350"}
  * {"NAME":"Shelly Pro 2PM","GPIO":[9568,1,9472,1,768,0,0,0,672,704,736,9569,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,3460,0,0,32,4736,4737,160,161],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350;AdcParam2 2,5600,4700,3350"}
  * {"NAME":"Shelly Pro 4PM","GPIO":[0,6210,0,6214,9568,0,0,0,0,0,9569,0,768,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,736,704,3461,0,4736,0,0,672],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350"}
- *
+ * {"NAME":"Shelly 2PM Gen3","GPIO":[9472,3458,576,225,4736,224,640,608,1,1,193,0,0,0,0,0,0,0,192,32,1,1],"FLAG":0,"BASE":1,"CMND":"ADCGPIO4 10000,10000,4000"}
+ * 
  * Based on datasheet from https://www.analog.com/en/products/ade7953.html
  *
  * Model differences:
  * Function                        Model1   Model2   Model3   Model4  Model5  Model6  Remark
  * ------------------------------  -------  -------  -------  ------  ------  ------  -------------------------------------------------
- * Shelly                          2.5      EM       Plus2PM  Pro1PM  Pro2PM  Pro4PM
+ * Shelly                          2.5      EM       Plus2PM  Pro1PM  Pro2PM  Pro4PM  Shelly hardware
+ *                                                   2PMGen3
  * Processor                       ESP8266  ESP8266  ESP32    ESP32   ESP32   ESP32
+ *                                                   ESP32C3                          Shelly Gen3
  * Interface                       I2C      I2C      I2C      SPI     SPI     SPI     Interface type used
  * Number of inputs                2        2        2        1       2       4       Count of ADE9753 inputs used
  * Number of ADE9753 chips         1        1        1        1       2       2       Count of ADE9753 chips