diff --git a/tasmota/include/tasmota_configurations.h b/tasmota/include/tasmota_configurations.h
index 1eb21552f..49908f033 100644
--- a/tasmota/include/tasmota_configurations.h
+++ b/tasmota/include/tasmota_configurations.h
@@ -919,11 +919,11 @@
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "mini-custom"
 
-#undef FIRMWARE_LITE                            // Disable tasmota-lite with no sensors
-#undef FIRMWARE_SENSORS                         // Disable tasmota-sensors with useful sensors enabled
-#undef FIRMWARE_KNX_NO_EMULATION                // Disable tasmota-knx with KNX but without Emulation
-#undef FIRMWARE_DISPLAYS                        // Disable tasmota-display with display drivers enabled
-#undef FIRMWARE_IR                              // Disable tasmota-ir with IR full protocols activated
+#undef FIRMWARE_LITE                             // Disable tasmota-lite with no sensors
+#undef FIRMWARE_SENSORS                          // Disable tasmota-sensors with useful sensors enabled
+#undef FIRMWARE_KNX_NO_EMULATION                 // Disable tasmota-knx with KNX but without Emulation
+#undef FIRMWARE_DISPLAYS                         // Disable tasmota-display with display drivers enabled
+#undef FIRMWARE_IR                               // Disable tasmota-ir with IR full protocols activated
 #undef FIRMWARE_WEBCAM
 #undef FIRMWARE_ODROID_GO
 #undef FIRMWARE_M5STACK_CORE2
@@ -953,12 +953,12 @@
 // IR_SEND has two mode: minimal or full (USE_IR_REMOTE_FULL)
 #ifdef USE_IR_REMOTE_FULL
   // Enable all protocols except PRONTO
-  #ifndef _IR_ENABLE_DEFAULT_                  // it is possible to define this value previously in config
-    #define _IR_ENABLE_DEFAULT_ true           // Enable all protocols except exluded below
+  #ifndef _IR_ENABLE_DEFAULT_                    // it is possible to define this value previously in config
+    #define _IR_ENABLE_DEFAULT_ true             // Enable all protocols except exluded below
   #endif
   // PRONTO protocol cannot be supported because it requires specific APIs which are not supported in Tasmota
-  #define DECODE_PRONTO false                  // Exclude PRONTO protocol
-  #define SEND_PRONTO false                    // Exclude PRONTO protocol
+  #define DECODE_PRONTO false                    // Exclude PRONTO protocol
+  #define SEND_PRONTO false                      // Exclude PRONTO protocol
 #else
   #define _IR_ENABLE_DEFAULT_ false              // disable all protocols by default
   // below are the default IR protocols
@@ -982,7 +982,7 @@
 \*********************************************************************************************/
 
 #ifndef ESP8266_1M
-  #ifndef FIRMWARE_MINIMAL    // there might be a ESP32-minimal
+  #ifndef FIRMWARE_MINIMAL                       // There might be a ESP32-minimal
     #define USE_UFILESYS
       #define GUI_TRASH_FILE
       #define GUI_EDIT_FILE
@@ -1035,17 +1035,20 @@
 #endif
 
 #ifdef USE_SCRIPT
-#define USE_UNISHOX_COMPRESSION                // Add support for string compression
+#define USE_UNISHOX_COMPRESSION                  // Add support for string compression
 #endif
 #ifdef USE_ZIGBEE
-#define USE_UNISHOX_COMPRESSION                // Add support for string compression
+#define USE_UNISHOX_COMPRESSION                  // Add support for string compression
 #endif
 #ifdef USE_EMULATION_HUE
-#define USE_UNISHOX_COMPRESSION                // Add support for string compression
+#define USE_UNISHOX_COMPRESSION                  // Add support for string compression
 #endif
 
-#if defined(USE_MQTT_TLS)                      // Enable TLS if required:
-  #define USE_TLS                              // flag indicates we need to include TLS code
-#endif                                         // USE_MQTT_TLS
+#if defined(USE_MQTT_TLS)                        // Enable TLS if required:
+  #define USE_TLS                                // flag indicates we need to include TLS code
+#endif                                           // USE_MQTT_TLS
+
+// -- Basic features ------------------------------
+#define USE_BISTABLE_RELAY_SUPPORT               // Add support for bistable (latching) relays using GPIO Relay_b or Relay_bi
 
 #endif  // _TASMOTA_CONFIGURATIONS_H_
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 9e0dde67a..2e25186a1 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -397,9 +397,6 @@
 //#define MY_LANGUAGE            zh_CN           // Chinese (Simplified) in China
 //#define MY_LANGUAGE            zh_TW           // Chinese (Traditional) in Taiwan
 
-// -- Basic features ------------------------------
-#define USE_BISTABLE_RELAY_SUPPORT               // Add support for bistable (latching) relays using GPIO Relay_b or Relay_bi
-
 // -- Wifi Config tools ---------------------------
 #define WIFI_SOFT_AP_CHANNEL   1                 // Soft Access Point Channel number between 1 and 13 as used by Wi-Fi Manager web GUI
 #define USE_IMPROV                               // Add support for IMPROV serial protocol as used by esp-web-tools (+2k code)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_87_tm1621_sonoff.ino b/tasmota/tasmota_xdrv_driver/xdrv_87_tm1621_sonoff.ino
index 17a1d486b..c4a809afa 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_87_tm1621_sonoff.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_87_tm1621_sonoff.ino
@@ -11,7 +11,7 @@
  * Sonoff POWR3xxD and THR3xxD LCD support
  *
  * {"NAME":"Sonoff POWR316D","GPIO":[32,0,0,0,0,576,0,0,0,224,9280,0,3104,0,320,0,0,0,0,0,0,9184,9248,9216,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
- * {"NAME":"Sonoff POWR320D","GPIO":[32,0,224,0,225,576,0,0,0,0,9280,0,3104,0,320,0,0,0,0,0,0,9184,9248,9216,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
+ * {"NAME":"Sonoff POWR320D","GPIO":[32,0,9312,0,9313,576,0,0,0,0,9280,0,3104,0,320,0,0,0,0,0,0,9184,9248,9216,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
  * {"NAME":"Sonoff THR316D","GPIO":[32,0,0,0,225,9280,0,0,0,321,0,576,320,9184,9216,0,0,224,0,9248,0,1,0,3840,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 \*********************************************************************************************/