diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index 41334f0a6..2beb71f2f 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -1,9 +1,11 @@
 /* 5.12.0h
  * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190)
  * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182)
+ * Add support for Zengge WF017 PWM Led strip controller (#2202)
  * Add PWM status to command State if PWM enabled (#2203)
  * Add command HSBColor Hue,Sat,Bri (#1642, #2203)
  * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203)
+ * Change default option SetOption15 from 0 to 1 providing better initial PWM experience
  *
  * 5.12.0f
  * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690)
diff --git a/sonoff/settings.ino b/sonoff/settings.ino
index 8b8123741..ac706f4aa 100644
--- a/sonoff/settings.ino
+++ b/sonoff/settings.ino
@@ -450,6 +450,7 @@ void SettingsDefaultSet2()
   Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
   Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
   Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
+  Settings.flag.pwm_control = 1;
   Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
 
   Settings.flag2.emulation = EMULATION;
@@ -525,14 +526,14 @@ void SettingsDefaultSet2()
 //  Settings.energy_max_voltage = 0;
 //  Settings.energy_min_current = 0;
 //  Settings.energy_max_current = 0;
-//  Settings.energy_max_power_limit = 0;                              // MaxPowerLimit
+//  Settings.energy_max_power_limit = 0;                            // MaxPowerLimit
   Settings.energy_max_power_limit_hold = MAX_POWER_HOLD;
   Settings.energy_max_power_limit_window = MAX_POWER_WINDOW;
-//  Settings.energy_max_power_safe_limit = 0;                             // MaxSafePowerLimit
+//  Settings.energy_max_power_safe_limit = 0;                       // MaxSafePowerLimit
   Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD;
   Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW;
-//  Settings.energy_max_energy = 0;                             // MaxEnergy
-//  Settings.energy_max_energy_start = 0;                            // MaxEnergyStart
+//  Settings.energy_max_energy = 0;                                 // MaxEnergy
+//  Settings.energy_max_energy_start = 0;                           // MaxEnergyStart
 
   SettingsDefaultSet_3_2_4();
 
diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
index f5a68bbfa..2fba23102 100644
--- a/sonoff/sonoff_template.h
+++ b/sonoff/sonoff_template.h
@@ -180,6 +180,7 @@ enum SupportedModules {
   SONOFF_DUAL_R2,
   ARILUX_LC06,
   SONOFF_S31,
+  ZENGGE_ZF_WF017,
   MAXMODULE };
 
 /********************************************************************************************/
@@ -234,6 +235,7 @@ const uint8_t kNiceList[MAXMODULE] PROGMEM = {
   ARILUX_LC01,
   ARILUX_LC06,
   ARILUX_LC11,
+  ZENGGE_ZF_WF017,
   HUAFAN_SS,
   KMC_70011,
   AILIGHT,
@@ -789,6 +791,19 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_REL1,        // GPIO12 Red Led and Relay (0 = Off, 1 = On)
      GPIO_LED1_INV,    // GPIO13 Green Led (0 = On, 1 = Off)
      0, 0, 0, 0
+  },
+  { "Zengge WF017",    // Zenggee ZJ-WF017-A (ESP12S)) - https://www.ebay.com/p/Smartphone-Android-IOS-WiFi-Music-Controller-for-RGB-5050-3528-LED-Strip-Light/534446632?_trksid=p2047675.l2644
+     GPIO_KEY1,        // GPIO00 Optional Button
+     0,
+     GPIO_USER,        // GPIO02 Empty pad
+     0,
+     GPIO_USER,        // GPIO04 W2 - PWM5
+     0,
+     0, 0, 0, 0, 0, 0, // Flash connection
+     GPIO_PWM2,        // GPIO12 RGB LED Green
+     GPIO_PWM1,        // GPIO13 RGB LED Red
+     GPIO_PWM3,        // GPIO14 RGB LED Blue
+     0, 0, 0
   }
 };
 
@@ -819,20 +834,6 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      0, 0
   }
 
-  { "Zengge WF017",    // Zenggee ZJ-WF017-A (ESP12S)) - https://www.ebay.com/p/Smartphone-Android-IOS-WiFi-Music-Controller-for-RGB-5050-3528-LED-Strip-Light/534446632?_trksid=p2047675.l2644
-     GPIO_KEY1,        // GPIO00 Optional Button
-     0,
-     GPIO_USER,        // GPIO02 Empty pad
-     0,
-     GPIO_USER,        // GPIO04 W2 - PWM5
-     0,
-     0, 0, 0, 0, 0, 0, // Flash connection
-     GPIO_PWM2,        // GPIO12 RGB LED Green
-     GPIO_PWM1,        // GPIO13 RGB LED Red
-     GPIO_PWM3,        // GPIO14 RGB LED Blue
-     0, 0, 0
-  }
-
   { "SMPW701E",        // SM-PW701E WLAN Socket (#1190)
      0, 0, 0, 0,
      GPIO_LED1_INV,    // GPIO04 Blue Led (0 = On, 1 = Off)