diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
index ff2ba6401..f6ae3aced 100644
--- a/sonoff/sonoff_template.h
+++ b/sonoff/sonoff_template.h
@@ -162,8 +162,8 @@ enum UserSelectablePins {
   GPIO_MCP39F5_TX,     // MCP39F501 Serial interface (Shelly2)
   GPIO_MCP39F5_RX,     // MCP39F501 Serial interface (Shelly2)
   GPIO_MCP39F5_RST,    // MCP39F501 Reset (Shelly2)
-  GPIO_PN532_RXD,      // PN532 NFC Serial Rx
   GPIO_PN532_TXD,      // PN532 NFC Serial Tx
+  GPIO_PN532_RXD,      // PN532 NFC Serial Rx
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality offset by user selectable GPIOs
@@ -228,7 +228,7 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_BUTTON "1i|" D_SENSOR_BUTTON "2i|" D_SENSOR_BUTTON "3i|" D_SENSOR_BUTTON "4i|"
   D_SENSOR_BUTTON "1in|" D_SENSOR_BUTTON "2in|" D_SENSOR_BUTTON "3in|" D_SENSOR_BUTTON "4in|"
   D_SENSOR_NRG_SEL "|" D_SENSOR_NRG_SEL "i|" D_SENSOR_NRG_CF1 "|" D_SENSOR_HLW_CF "|" D_SENSOR_HJL_CF "|"
-  D_SENSOR_MCP39F5_TX "|" D_SENSOR_MCP39F5_RX "|" D_SENSOR_MCP39F5_RST
+  D_SENSOR_MCP39F5_TX "|" D_SENSOR_MCP39F5_RX "|" D_SENSOR_MCP39F5_RST "|"
   D_SENSOR_PN532_TX "|" D_SENSOR_PN532_RX
   ;
 
@@ -536,23 +536,23 @@ const uint8_t kGpioNiceList[] PROGMEM = {
   GPIO_TUYA_TX,        // Tuya Serial interface
   GPIO_TUYA_RX,        // Tuya Serial interface
 #endif
-#ifdef USE_MGC3130
-  GPIO_MGC3130_XFER,
-  GPIO_MGC3130_RESET,
-#endif
 #ifdef USE_AZ7798
   GPIO_AZ_TXD,         // AZ-Instrument 7798 CO2 datalogger Serial interface
   GPIO_AZ_RXD,         // AZ-Instrument 7798 CO2 datalogger Serial interface
 #endif
+#ifdef USE_PN532_HSU
+  GPIO_PN532_TXD,      // PN532 HSU Tx
+  GPIO_PN532_RXD,      // PN532 HSU Rx
+#endif
+#ifdef USE_MGC3130
+  GPIO_MGC3130_XFER,
+  GPIO_MGC3130_RESET,
+#endif
 #ifdef USE_MAX31855
   GPIO_MAX31855CS,     // MAX31855 Serial interface
   GPIO_MAX31855CLK,    // MAX31855 Serial interface
   GPIO_MAX31855DO,     // MAX31855 Serial interface
 #endif
-#ifdef USE_PN532_HSU
-  GPIO_PN532_RXD,      // PN532 HSU Rx
-  GPIO_PN532_TXD,      // PN532 HSU Tx
-#endif
 };
 
 const uint8_t kModuleNiceList[MAXMODULE] PROGMEM = {