diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 7bd3fcde5..a446fec30 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1062,8 +1062,8 @@ void CmndGpio(void)
           break;
         }
 #else  // FINAL_ESP32
-        uint32_t midx = pgm_read_word(kGpioNiceList + i) << 5;
-        if (midx == (XdrvMailbox.payload & 0xFFE0)) {
+        uint32_t midx = pgm_read_word(kGpioNiceList + i);
+        if ((XdrvMailbox.payload >= (midx & 0xFFE0)) && (XdrvMailbox.payload < midx)) {
           present = true;
           break;
         }
@@ -1083,16 +1083,17 @@ void CmndGpio(void)
     Response_P(PSTR("{"));
     bool jsflg = false;
     for (uint32_t i = 0; i < ARRAY_SIZE(Settings.my_gp.io); i++) {
-      if (ValidGPIO(i, cmodule.io[i]) || ((GPIO_USER == XdrvMailbox.payload) && !FlashPin(i))) {
+      if (ValidGPIO(i, cmodule.io[i]) || ((AGPIO(GPIO_USER) == XdrvMailbox.payload) && !FlashPin(i))) {
         if (jsflg) { ResponseAppend_P(PSTR(",")); }
         jsflg = true;
         uint32_t sensor_type = Settings.my_gp.io[i];
         if (!ValidGPIO(i, cmodule.io[i])) {
           sensor_type = cmodule.io[i];
-          if (GPIO_USER == sensor_type) {  // A user GPIO equals a not connected (=GPIO_NONE) GPIO here
+          if (AGPIO(GPIO_USER) == sensor_type) {  // A user GPIO equals a not connected (=GPIO_NONE) GPIO here
             sensor_type = GPIO_NONE;
           }
         }
+        char sindex[4] = { 0 };
 #ifdef ESP8266
         uint32_t sensor_name_idx = sensor_type;
 #else  // ESP32
@@ -1100,6 +1101,14 @@ void CmndGpio(void)
         uint32_t sensor_name_idx = sensor_type;
 #else  // FINAL_ESP32
         uint32_t sensor_name_idx = sensor_type >> 5;
+        uint32_t nice_list_search = sensor_type & 0xFFE0;
+        for (uint32_t j = 0; j < ARRAY_SIZE(kGpioNiceList); j++) {
+          uint32_t nls_idx = pgm_read_word(kGpioNiceList + j);
+          if (((nls_idx & 0xFFE0) == nice_list_search) && ((nls_idx & 0x001F) > 0)) {
+            snprintf_P(sindex, sizeof(sindex), PSTR("%d"), (sensor_type & 0x001F) +1);
+            break;
+          }
+        }
 #endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
         const char *sensor_names = kSensorNames;
@@ -1108,8 +1117,8 @@ void CmndGpio(void)
           sensor_names = kSensorNamesFixed;
         }
         char stemp1[TOPSZ];
-        ResponseAppend_P(PSTR("\"" D_CMND_GPIO "%d\":{\"%d\":\"%s\"}"),
-          i, sensor_type, GetTextIndexed(stemp1, sizeof(stemp1), sensor_name_idx, sensor_names));
+        ResponseAppend_P(PSTR("\"" D_CMND_GPIO "%d\":{\"%d\":\"%s%s\"}"),
+          i, sensor_type, GetTextIndexed(stemp1, sizeof(stemp1), sensor_name_idx, sensor_names), sindex);
       }
     }
     if (jsflg) {
@@ -1135,8 +1144,8 @@ void CmndGpios(void)
     uint32_t midx = pgm_read_byte(kGpioNiceList + i);
     uint32_t ridx = midx;
 #else  // FINAL_ESP32
-    uint32_t midx = pgm_read_word(kGpioNiceList + i);
-    uint32_t ridx = midx << 5;
+    uint32_t ridx = pgm_read_word(kGpioNiceList + i) & 0xFFE0;
+    uint32_t midx = ridx >> 5;
 #endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
     if ((XdrvMailbox.payload != 255) && GetUsedInModule(midx, cmodule.io)) { continue; }
diff --git a/tasmota/tasmota_template_ESP32_final.h b/tasmota/tasmota_template_ESP32_final.h
index b48897094..bd8063d33 100644
--- a/tasmota/tasmota_template_ESP32_final.h
+++ b/tasmota/tasmota_template_ESP32_final.h
@@ -297,290 +297,290 @@ const char kSensorNamesFixed[] PROGMEM =
   D_SENSOR_USER;
 
 const uint16_t kGpioNiceList[] PROGMEM = {
-  GPIO_NONE,           // Not used
-  GPIO_KEY1,           // Buttons
-  GPIO_KEY1_NP,
-  GPIO_KEY1_INV,
-  GPIO_KEY1_INV_NP,
-  GPIO_SWT1,           // User connected external switches
-  GPIO_SWT1_NP,
-  GPIO_REL1,           // Relays
-  GPIO_REL1_INV,
-  GPIO_LED1,           // Leds
-  GPIO_LED1_INV,
+  GPIO_NONE,                             // Not used
+  AGPIO(GPIO_KEY1) + MAX_KEYS,          // Buttons
+  AGPIO(GPIO_KEY1_NP) + MAX_KEYS,
+  AGPIO(GPIO_KEY1_INV) + MAX_KEYS,
+  AGPIO(GPIO_KEY1_INV_NP) + MAX_KEYS,
+  AGPIO(GPIO_SWT1) + MAX_SWITCHES,      // User connected external switches
+  AGPIO(GPIO_SWT1_NP) + MAX_SWITCHES,
+  AGPIO(GPIO_REL1) + MAX_RELAYS,        // Relays
+  AGPIO(GPIO_REL1_INV) + MAX_RELAYS,
+  AGPIO(GPIO_LED1) + MAX_LEDS,          // Leds
+  AGPIO(GPIO_LED1_INV) + MAX_LEDS,
 #ifdef USE_COUNTER
-  GPIO_CNTR1,          // Counters
-  GPIO_CNTR1_NP,
+  AGPIO(GPIO_CNTR1) + MAX_COUNTERS,     // Counters
+  AGPIO(GPIO_CNTR1_NP) + MAX_COUNTERS,
 #endif
-  GPIO_PWM1,           // RGB   Red   or C  Cold White
-  GPIO_PWM1_INV,
+  AGPIO(GPIO_PWM1) + MAX_PWMS,          // RGB   Red   or C  Cold White
+  AGPIO(GPIO_PWM1_INV) + MAX_PWMS,
 #ifdef USE_BUZZER
-  GPIO_BUZZER,         // Buzzer
-  GPIO_BUZZER_INV,     // Inverted buzzer
+  AGPIO(GPIO_BUZZER),         // Buzzer
+  AGPIO(GPIO_BUZZER_INV),     // Inverted buzzer
 #endif
-  GPIO_LEDLNK,         // Link led
-  GPIO_LEDLNK_INV,     // Inverted link led
+  AGPIO(GPIO_LEDLNK),         // Link led
+  AGPIO(GPIO_LEDLNK_INV),     // Inverted link led
 #ifdef USE_I2C
-  GPIO_I2C_SCL,        // I2C SCL
-  GPIO_I2C_SDA,        // I2C SDA
+  AGPIO(GPIO_I2C_SCL),        // I2C SCL
+  AGPIO(GPIO_I2C_SDA),        // I2C SDA
 #endif
 #ifdef USE_SPI
-  GPIO_SPI_MISO,       // SPI MISO
-  GPIO_SPI_MOSI,       // SPI MOSI
-  GPIO_SPI_CLK,        // SPI Clk
-  GPIO_SPI_CS,         // SPI Chip Select
-  GPIO_SPI_DC,         // SPI Data Direction
-  GPIO_SSPI_MISO,      // Software SPI Master Input Slave Output
-  GPIO_SSPI_MOSI,      // Software SPI Master Output Slave Input
-  GPIO_SSPI_SCLK,      // Software SPI Serial Clock
-  GPIO_SSPI_CS,        // Software SPI Chip Select
-  GPIO_SSPI_DC,        // Software SPI Data or Command
+  AGPIO(GPIO_SPI_MISO),       // SPI MISO
+  AGPIO(GPIO_SPI_MOSI),       // SPI MOSI
+  AGPIO(GPIO_SPI_CLK),        // SPI Clk
+  AGPIO(GPIO_SPI_CS),         // SPI Chip Select
+  AGPIO(GPIO_SPI_DC),         // SPI Data Direction
+  AGPIO(GPIO_SSPI_MISO),      // Software SPI Master Input Slave Output
+  AGPIO(GPIO_SSPI_MOSI),      // Software SPI Master Output Slave Input
+  AGPIO(GPIO_SSPI_SCLK),      // Software SPI Serial Clock
+  AGPIO(GPIO_SSPI_CS),        // Software SPI Chip Select
+  AGPIO(GPIO_SSPI_DC),        // Software SPI Data or Command
 #endif
 #ifdef USE_DISPLAY
-  GPIO_BACKLIGHT,      // Display backlight control
-  GPIO_OLED_RESET,     // OLED Display Reset
+  AGPIO(GPIO_BACKLIGHT),      // Display backlight control
+  AGPIO(GPIO_OLED_RESET),     // OLED Display Reset
 #endif
 
-  GPIO_TXD,            // Serial interface
-  GPIO_RXD,            // Serial interface
+  AGPIO(GPIO_TXD),            // Serial interface
+  AGPIO(GPIO_RXD),            // Serial interface
 
 #ifdef USE_DHT
-  GPIO_DHT11,          // DHT11
-  GPIO_DHT22,          // DHT21, DHT22, AM2301, AM2302, AM2321
-  GPIO_SI7021,         // iTead SI7021
-  GPIO_DHT11_OUT,      // Pseudo Single wire DHT11, DHT21, DHT22, AM2301, AM2302, AM2321
+  AGPIO(GPIO_DHT11),          // DHT11
+  AGPIO(GPIO_DHT22),          // DHT21, DHT22, AM2301, AM2302, AM2321
+  AGPIO(GPIO_SI7021),         // iTead SI7021
+  AGPIO(GPIO_DHT11_OUT),      // Pseudo Single wire DHT11, DHT21, DHT22, AM2301, AM2302, AM2321
 #endif
 #ifdef USE_DS18x20
-  GPIO_DSB,            // Single wire DS18B20 or DS18S20
-  GPIO_DSB_OUT,        // Pseudo Single wire DS18B20 or DS18S20
+  AGPIO(GPIO_DSB),            // Single wire DS18B20 or DS18S20
+  AGPIO(GPIO_DSB_OUT),        // Pseudo Single wire DS18B20 or DS18S20
 #endif
 
 // Light
 #ifdef USE_LIGHT
 #ifdef USE_WS2812
-  GPIO_WS2812,         // WS2812 Led string
+  AGPIO(GPIO_WS2812),         // WS2812 Led string
 #endif
 #ifdef USE_ARILUX_RF
-  GPIO_ARIRFRCV,       // AriLux RF Receive input
-  GPIO_ARIRFSEL,       // Arilux RF Receive input selected
+  AGPIO(GPIO_ARIRFRCV),       // AriLux RF Receive input
+  AGPIO(GPIO_ARIRFSEL),       // Arilux RF Receive input selected
 #endif
 #ifdef USE_MY92X1
-  GPIO_DI,             // my92x1 PWM input
-  GPIO_DCKI,           // my92x1 CLK input
+  AGPIO(GPIO_DI),             // my92x1 PWM input
+  AGPIO(GPIO_DCKI),           // my92x1 CLK input
 #endif  // USE_MY92X1
 #ifdef USE_SM16716
-  GPIO_SM16716_CLK,    // SM16716 CLOCK
-  GPIO_SM16716_DAT,    // SM16716 DATA
-  GPIO_SM16716_SEL,    // SM16716 SELECT
+  AGPIO(GPIO_SM16716_CLK),    // SM16716 CLOCK
+  AGPIO(GPIO_SM16716_DAT),    // SM16716 DATA
+  AGPIO(GPIO_SM16716_SEL),    // SM16716 SELECT
 #endif  // USE_SM16716
 #ifdef USE_SM2135
-  GPIO_SM2135_CLK,     // SM2135 CLOCK
-  GPIO_SM2135_DAT,     // SM2135 DATA
+  AGPIO(GPIO_SM2135_CLK),     // SM2135 CLOCK
+  AGPIO(GPIO_SM2135_DAT),     // SM2135 DATA
 #endif  // USE_SM2135
 #ifdef USE_TUYA_MCU
-  GPIO_TUYA_TX,        // Tuya Serial interface
-  GPIO_TUYA_RX,        // Tuya Serial interface
+  AGPIO(GPIO_TUYA_TX),        // Tuya Serial interface
+  AGPIO(GPIO_TUYA_RX),        // Tuya Serial interface
 #endif
 #ifdef USE_EXS_DIMMER
-  GPIO_EXS_ENABLE,     // EXS MCU Enable
+  AGPIO(GPIO_EXS_ENABLE),     // EXS MCU Enable
 #endif
 #ifdef USE_ELECTRIQ_MOODL
-  GPIO_ELECTRIQ_MOODL_TX,
+  AGPIO(GPIO_ELECTRIQ_MOODL_TX),
 #endif
 #endif  // USE_LIGHT
 
 #if defined(USE_IR_REMOTE) || defined(USE_IR_REMOTE_FULL)
-  GPIO_IRSEND,         // IR remote
+  AGPIO(GPIO_IRSEND),         // IR remote
 #if defined(USE_IR_RECEIVE) || defined(USE_IR_REMOTE_FULL)
-  GPIO_IRRECV,         // IR receiver
+  AGPIO(GPIO_IRRECV),         // IR receiver
 #endif
 #endif
 
 #ifdef USE_RC_SWITCH
-  GPIO_RFSEND,         // RF transmitter
-  GPIO_RFRECV,         // RF receiver
+  AGPIO(GPIO_RFSEND),         // RF transmitter
+  AGPIO(GPIO_RFRECV),         // RF receiver
 #endif
 #ifdef USE_RF_SENSOR
-  GPIO_RF_SENSOR,      // Rf receiver with sensor decoding
+  AGPIO(GPIO_RF_SENSOR),      // Rf receiver with sensor decoding
 #endif
 #ifdef USE_SR04
-  GPIO_SR04_TRIG,      // SR04 Tri/TXgger pin
-  GPIO_SR04_ECHO,      // SR04 Ech/RXo pin
+  AGPIO(GPIO_SR04_TRIG),      // SR04 Tri/TXgger pin
+  AGPIO(GPIO_SR04_ECHO),      // SR04 Ech/RXo pin
 #endif
 #ifdef USE_TM1638
-  GPIO_TM16CLK,        // TM1638 Clock
-  GPIO_TM16DIO,        // TM1638 Data I/O
-  GPIO_TM16STB,        // TM1638 Strobe
+  AGPIO(GPIO_TM16CLK),        // TM1638 Clock
+  AGPIO(GPIO_TM16DIO),        // TM1638 Data I/O
+  AGPIO(GPIO_TM16STB),        // TM1638 Strobe
 #endif
 #ifdef USE_HX711
-  GPIO_HX711_SCK,      // HX711 Load Cell clock
-  GPIO_HX711_DAT,      // HX711 Load Cell data
+  AGPIO(GPIO_HX711_SCK),      // HX711 Load Cell clock
+  AGPIO(GPIO_HX711_DAT),      // HX711 Load Cell data
 #endif
 
 // Energy sensors
 #ifdef USE_ENERGY_SENSOR
 #ifdef USE_HLW8012
-  GPIO_NRG_SEL,        // HLW8012/HLJ-01 Sel output (1 = Voltage)
-  GPIO_NRG_SEL_INV,    // HLW8012/HLJ-01 Sel output (0 = Voltage)
-  GPIO_NRG_CF1,        // HLW8012/HLJ-01 CF1 voltage / current
-  GPIO_HLW_CF,         // HLW8012 CF power
-  GPIO_HJL_CF,         // HJL-01/BL0937 CF power
+  AGPIO(GPIO_NRG_SEL),        // HLW8012/HLJ-01 Sel output (1 = Voltage)
+  AGPIO(GPIO_NRG_SEL_INV),    // HLW8012/HLJ-01 Sel output (0 = Voltage)
+  AGPIO(GPIO_NRG_CF1),        // HLW8012/HLJ-01 CF1 voltage / current
+  AGPIO(GPIO_HLW_CF),         // HLW8012 CF power
+  AGPIO(GPIO_HJL_CF),         // HJL-01/BL0937 CF power
 #endif
 #if defined(USE_I2C) && defined(USE_ADE7953)
-  GPIO_ADE7953_IRQ,    // ADE7953 IRQ
+  AGPIO(GPIO_ADE7953_IRQ),    // ADE7953 IRQ
 #endif
 #ifdef USE_CSE7766
-  GPIO_CSE7766_TX,     // CSE7766 Serial interface (S31 and Pow R2)
-  GPIO_CSE7766_RX,     // CSE7766 Serial interface (S31 and Pow R2)
+  AGPIO(GPIO_CSE7766_TX),     // CSE7766 Serial interface (S31 and Pow R2)
+  AGPIO(GPIO_CSE7766_RX),     // CSE7766 Serial interface (S31 and Pow R2)
 #endif
 #ifdef USE_MCP39F501
-  GPIO_MCP39F5_TX,     // MCP39F501 Serial interface (Shelly2)
-  GPIO_MCP39F5_RX,     // MCP39F501 Serial interface (Shelly2)
-  GPIO_MCP39F5_RST,    // MCP39F501 Reset (Shelly2)
+  AGPIO(GPIO_MCP39F5_TX),     // MCP39F501 Serial interface (Shelly2)
+  AGPIO(GPIO_MCP39F5_RX),     // MCP39F501 Serial interface (Shelly2)
+  AGPIO(GPIO_MCP39F5_RST),    // MCP39F501 Reset (Shelly2)
 #endif
 #if defined(USE_PZEM004T) || defined(USE_PZEM_AC) || defined(USE_PZEM_DC)
-  GPIO_PZEM0XX_TX,     // PZEM0XX Serial interface
+  AGPIO(GPIO_PZEM0XX_TX),     // PZEM0XX Serial interface
 #endif
 #ifdef USE_PZEM004T
-  GPIO_PZEM004_RX,     // PZEM004T Serial interface
+  AGPIO(GPIO_PZEM004_RX),     // PZEM004T Serial interface
 #endif
 #ifdef USE_PZEM_AC
-  GPIO_PZEM016_RX,     // PZEM-014,016 Serial Modbus interface
+  AGPIO(GPIO_PZEM016_RX),     // PZEM-014,016 Serial Modbus interface
 #endif
 #ifdef USE_PZEM_DC
-  GPIO_PZEM017_RX,     // PZEM-003,017 Serial Modbus interface
+  AGPIO(GPIO_PZEM017_RX),     // PZEM-003,017 Serial Modbus interface
 #endif
 #ifdef USE_SDM120
-  GPIO_SDM120_TX,      // SDM120 Serial interface
-  GPIO_SDM120_RX,      // SDM120 Serial interface
+  AGPIO(GPIO_SDM120_TX),      // SDM120 Serial interface
+  AGPIO(GPIO_SDM120_RX),      // SDM120 Serial interface
 #endif
 #ifdef USE_SDM630
-  GPIO_SDM630_TX,      // SDM630 Serial interface
-  GPIO_SDM630_RX,      // SDM630 Serial interface
+  AGPIO(GPIO_SDM630_TX),      // SDM630 Serial interface
+  AGPIO(GPIO_SDM630_RX),      // SDM630 Serial interface
 #endif
 #ifdef USE_DDS2382
-  GPIO_DDS2382_TX,     // DDS2382 Serial interface
-  GPIO_DDS2382_RX,     // DDS2382 Serial interface
+  AGPIO(GPIO_DDS2382_TX),     // DDS2382 Serial interface
+  AGPIO(GPIO_DDS2382_RX),     // DDS2382 Serial interface
 #endif
 #ifdef USE_DDSU666
-  GPIO_DDSU666_TX,     // DDSU666 Serial interface
-  GPIO_DDSU666_RX,     // DDSU666 Serial interface
+  AGPIO(GPIO_DDSU666_TX),     // DDSU666 Serial interface
+  AGPIO(GPIO_DDSU666_RX),     // DDSU666 Serial interface
 #endif  // USE_DDSU666
 #ifdef USE_SOLAX_X1
-  GPIO_SOLAXX1_TX,     // Solax Inverter tx pin
-  GPIO_SOLAXX1_RX,     // Solax Inverter rx pin
+  AGPIO(GPIO_SOLAXX1_TX),     // Solax Inverter tx pin
+  AGPIO(GPIO_SOLAXX1_RX),     // Solax Inverter rx pin
 #endif // USE_SOLAX_X1
 #ifdef USE_LE01MR
-  GPIO_LE01MR_RX,     // F7F LE-01MR energy meter rx pin
-  GPIO_LE01MR_TX,     // F7F LE-01MR energy meter tx pin
+  AGPIO(GPIO_LE01MR_RX),     // F7F LE-01MR energy meter rx pin
+  AGPIO(GPIO_LE01MR_TX),     // F7F LE-01MR energy meter tx pin
 #endif // IFDEF:USE_LE01MR
 #endif  // USE_ENERGY_SENSOR
 
 // Serial
 #ifdef USE_SERIAL_BRIDGE
-  GPIO_SBR_TX,         // Serial Bridge Serial interface
-  GPIO_SBR_RX,         // Serial Bridge Serial interface
+  AGPIO(GPIO_SBR_TX),         // Serial Bridge Serial interface
+  AGPIO(GPIO_SBR_RX),         // Serial Bridge Serial interface
 #endif
 #ifdef USE_ZIGBEE
-  GPIO_ZIGBEE_TX,      // Zigbee Serial interface
-  GPIO_ZIGBEE_RX,      // Zigbee Serial interface
+  AGPIO(GPIO_ZIGBEE_TX),      // Zigbee Serial interface
+  AGPIO(GPIO_ZIGBEE_RX),      // Zigbee Serial interface
 #endif
 #ifdef USE_MHZ19
-  GPIO_MHZ_TXD,        // MH-Z19 Serial interface
-  GPIO_MHZ_RXD,        // MH-Z19 Serial interface
+  AGPIO(GPIO_MHZ_TXD),        // MH-Z19 Serial interface
+  AGPIO(GPIO_MHZ_RXD),        // MH-Z19 Serial interface
 #endif
 #ifdef USE_SENSEAIR
-  GPIO_SAIR_TX,        // SenseAir Serial interface
-  GPIO_SAIR_RX,        // SenseAir Serial interface
+  AGPIO(GPIO_SAIR_TX),        // SenseAir Serial interface
+  AGPIO(GPIO_SAIR_RX),        // SenseAir Serial interface
 #endif
 #ifdef USE_NOVA_SDS
-  GPIO_SDS0X1_TX,      // Nova Fitness SDS011 Serial interface
-  GPIO_SDS0X1_RX,      // Nova Fitness SDS011 Serial interface
+  AGPIO(GPIO_SDS0X1_TX),      // Nova Fitness SDS011 Serial interface
+  AGPIO(GPIO_SDS0X1_RX),      // Nova Fitness SDS011 Serial interface
 #endif
 #ifdef USE_HPMA
-  GPIO_HPMA_TX,        // Honeywell HPMA115S0 Serial interface
-  GPIO_HPMA_RX,        // Honeywell HPMA115S0 Serial interface
+  AGPIO(GPIO_HPMA_TX),        // Honeywell HPMA115S0 Serial interface
+  AGPIO(GPIO_HPMA_RX),        // Honeywell HPMA115S0 Serial interface
 #endif
 #ifdef USE_PMS5003
-  GPIO_PMS5003_TX,     // Plantower PMS5003 Serial interface
-  GPIO_PMS5003_RX,     // Plantower PMS5003 Serial interface
+  AGPIO(GPIO_PMS5003_TX),     // Plantower PMS5003 Serial interface
+  AGPIO(GPIO_PMS5003_RX),     // Plantower PMS5003 Serial interface
 #endif
 #if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
-  GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin
+  AGPIO(GPIO_TX2X_TXD_BLACK), // TX20/TX23 Transmission Pin
 #endif
 #ifdef USE_MP3_PLAYER
-  GPIO_MP3_DFR562,     // RB-DFR-562, DFPlayer Mini MP3 Player Serial interface
+  AGPIO(GPIO_MP3_DFR562),     // RB-DFR-562, DFPlayer Mini MP3 Player Serial interface
 #endif
 #ifdef USE_AZ7798
-  GPIO_AZ_TXD,         // AZ-Instrument 7798 CO2 datalogger Serial interface
-  GPIO_AZ_RXD,         // AZ-Instrument 7798 CO2 datalogger Serial interface
+  AGPIO(GPIO_AZ_TXD),         // AZ-Instrument 7798 CO2 datalogger Serial interface
+  AGPIO(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
+  AGPIO(GPIO_PN532_TXD),      // PN532 HSU Tx
+  AGPIO(GPIO_PN532_RXD),      // PN532 HSU Rx
 #endif
 #ifdef USE_TASMOTA_SLAVE
-  GPIO_TASMOTASLAVE_TXD,     // Tasmota Slave TX
-  GPIO_TASMOTASLAVE_RXD,     // Tasmota Slave RX
-  GPIO_TASMOTASLAVE_RST,     // Tasmota Slave Reset
-  GPIO_TASMOTASLAVE_RST_INV, // Tasmota Slave Reset Inverted
+  AGPIO(GPIO_TASMOTASLAVE_TXD),     // Tasmota Slave TX
+  AGPIO(GPIO_TASMOTASLAVE_RXD),     // Tasmota Slave RX
+  AGPIO(GPIO_TASMOTASLAVE_RST),     // Tasmota Slave Reset
+  AGPIO(GPIO_TASMOTASLAVE_RST_INV), // Tasmota Slave Reset Inverted
 #endif
 #ifdef USE_RDM6300
-  GPIO_RDM6300_RX,
+  AGPIO(GPIO_RDM6300_RX),
 #endif
 #ifdef USE_IBEACON
-  GPIO_IBEACON_RX,
-  GPIO_IBEACON_TX,
+  AGPIO(GPIO_IBEACON_RX),
+  AGPIO(GPIO_IBEACON_TX),
 #endif
 #ifdef USE_GPS
-  GPIO_GPS_RX,         // GPS serial interface
-  GPIO_GPS_TX,         // GPS serial interface
+  AGPIO(GPIO_GPS_RX),         // GPS serial interface
+  AGPIO(GPIO_GPS_TX),         // GPS serial interface
 #endif
 #ifdef USE_HM10
-  GPIO_HM10_RX,         // GPS serial interface
-  GPIO_HM10_TX,         // GPS serial interface
+  AGPIO(GPIO_HM10_RX),         // GPS serial interface
+  AGPIO(GPIO_HM10_TX),         // GPS serial interface
 #endif
 
 #ifdef USE_MGC3130
-  GPIO_MGC3130_XFER,
-  GPIO_MGC3130_RESET,
+  AGPIO(GPIO_MGC3130_XFER),
+  AGPIO(GPIO_MGC3130_RESET),
 #endif
 #ifdef USE_MAX31855
-  GPIO_MAX31855CS,     // MAX31855 Serial interface
-  GPIO_MAX31855CLK,    // MAX31855 Serial interface
-  GPIO_MAX31855DO,     // MAX31855 Serial interface
+  AGPIO(GPIO_MAX31855CS),     // MAX31855 Serial interface
+  AGPIO(GPIO_MAX31855CLK),    // MAX31855 Serial interface
+  AGPIO(GPIO_MAX31855DO),     // MAX31855 Serial interface
 #endif
 #ifdef ROTARY_V1
-  GPIO_ROT1A,          // Rotary switch1 A Pin
-  GPIO_ROT1B,          // Rotary switch1 B Pin
-  GPIO_ROT2A,          // Rotary switch2 A Pin
-  GPIO_ROT2B,          // Rotary switch2 B Pin
+  AGPIO(GPIO_ROT1A),          // Rotary switch1 A Pin
+  AGPIO(GPIO_ROT1B),          // Rotary switch1 B Pin
+  AGPIO(GPIO_ROT2A),          // Rotary switch2 A Pin
+  AGPIO(GPIO_ROT2B),          // Rotary switch2 B Pin
 #endif
 #ifdef USE_HRE
-  GPIO_HRE_CLOCK,
-  GPIO_HRE_DATA,
+  AGPIO(GPIO_HRE_CLOCK),
+  AGPIO(GPIO_HRE_DATA),
 #endif
 #ifdef USE_A4988_STEPPER
-  GPIO_A4988_DIR,     // A4988 direction pin
-  GPIO_A4988_STP,     // A4988 step pin
+  AGPIO(GPIO_A4988_DIR),     // A4988 direction pin
+  AGPIO(GPIO_A4988_STP),     // A4988 step pin
   // folowing are not mandatory
-  GPIO_A4988_ENA,     // A4988 enabled pin
-  GPIO_A4988_MS1,     // A4988 microstep pin1
-  GPIO_A4988_MS2,     // A4988 microstep pin2
-  GPIO_A4988_MS3,     // A4988 microstep pin3
+  AGPIO(GPIO_A4988_ENA),     // A4988 enabled pin
+  AGPIO(GPIO_A4988_MS1),     // A4988 microstep pin1
+  AGPIO(GPIO_A4988_MS2),     // A4988 microstep pin2
+  AGPIO(GPIO_A4988_MS3),     // A4988 microstep pin3
 #endif
 #ifdef USE_DEEPSLEEP
-  GPIO_DEEPSLEEP,
+  AGPIO(GPIO_DEEPSLEEP),
 #endif
 #ifdef USE_KEELOQ
-  GPIO_CC1101_GDO0,    // CC1101 pin for RX
-  GPIO_CC1101_GDO2,    // CC1101 pin for RX
+  AGPIO(GPIO_CC1101_GDO0),    // CC1101 pin for RX
+  AGPIO(GPIO_CC1101_GDO2),    // CC1101 pin for RX
 #endif
 #ifdef USE_HRXL
-  GPIO_HRXL_RX,
+  AGPIO(GPIO_HRXL_RX),
 #endif
 #ifdef USE_AS3935
-  GPIO_AS3935,
+  AGPIO(GPIO_AS3935),
 #endif
 /*
   ADC0_INPUT,          // Analog input
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index a4f43b6c6..beeaa31a3 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -231,12 +231,46 @@ const char HTTP_MODULE_TEMPLATE_REPLACE[] PROGMEM =
   "}2%d'>%s (%d}3";                       // }2 and }3 are used in below os.replace
 
 const char HTTP_SCRIPT_MODULE_TEMPLATE[] PROGMEM =
+#ifdef ESP8266
   "var os;"
   "function sk(s,g){"                     // s = value, g = id and name
     "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\")</option>\");"
     "eb('g'+g).innerHTML=o;"
     "eb('g'+g).value=s;"
   "}"
+#else  // ESP32
+#ifndef FINAL_ESP32
+  "var os;"
+  "function sk(s,g){"                     // s = value, g = id and name
+    "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\")</option>\");"
+    "eb('g'+g).innerHTML=o;"
+    "eb('g'+g).value=s;"
+  "}"
+#else  // FINAL_ESP32
+  "var os,hs;"
+  "function ce(i,q){"                     // Create index select
+    "var o=document.createElement('option');"
+    "o.textContent=i;"
+    "q.appendChild(o);"
+  "}"
+  "function ot(g,s){"                     // g = id and name, s = value
+    "var p,l,t=qs('#h'+g),u=s&0x001f;"
+    "l=t.options.length;"                 // Remove current options
+    "for(i=l;i;i--){p=t.options[i-1].parentNode;p.removeChild(t.options[i-1]);}"
+    "s>>=5;"                              // Add options
+    "for(i=1;i<=hs[s];i++){ce((i<10)?(' '+i):i,t);}"
+    "eb('h'+g).value=u+1;"                // Set selected value
+    "t.style.visibility=(hs[s]>0)?'':'hidden';"
+  "}"
+  "function sk(s,g){"                     // s = value, g = id and name
+    "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\"</option>\");"
+    "eb('g'+g).innerHTML=o;"
+    "eb('g'+g).value=s&0xffe0;"
+    "if(g<99){ot(g,s);}"
+  "}"
+#endif  // FINAL_ESP32
+#endif  // ESP8266 - ESP32
+
   "function ld(u,f){"
     "var x=new XMLHttpRequest();"
     "x.onreadystatechange=function(){"
@@ -1441,8 +1475,8 @@ void HandleTemplateConfiguration(void)
     uint32_t midx = pgm_read_byte(kGpioNiceList + i);
     uint32_t ridx = midx;
 #else  // FINAL_ESP32
-    uint32_t midx = pgm_read_word(kGpioNiceList + i);
-    uint32_t ridx = midx << 5;
+    uint32_t ridx = pgm_read_word(kGpioNiceList + i);
+    uint32_t midx = ridx >> 5;
 #endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
     WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ridx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), ridx);
@@ -1566,15 +1600,31 @@ void HandleModuleConfiguration(void)
     midx = pgm_read_byte(kGpioNiceList + i);
     uint32_t ridx = midx;
 #else  // FINAL_ESP32
-    midx = pgm_read_word(kGpioNiceList + i);
-    uint32_t ridx = midx << 5;
+    uint32_t ridx = pgm_read_word(kGpioNiceList + i) & 0xFFE0;
+    midx = ridx >> 5;
 #endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
     if (!GetUsedInModule(midx, cmodule.io)) {
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ridx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), ridx);
+//      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ridx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), ridx);
+      WSContentSend_P(PSTR("}2%d'>%s}3"), ridx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames));
     }
   }
   WSContentSend_P(PSTR("\";"));
+
+#ifdef ESP32
+#ifdef FINAL_ESP32
+  WSContentSend_P(PSTR("hs=["));
+  bool first_done = false;
+  for (uint32_t i = 0; i < ARRAY_SIZE(kGpioNiceList); i++) {
+    midx = pgm_read_word(kGpioNiceList + i) & 0x001F;
+    if (first_done) { WSContentSend_P(PSTR(",")); }
+    WSContentSend_P(PSTR("%d"), midx);
+    first_done = true;
+  }
+  WSContentSend_P(PSTR("];"));
+#endif  // FINAL_ESP32
+#endif  // ESP32
+
   for (uint32_t i = 0; i < ARRAY_SIZE(cmodule.io); i++) {
     if (ValidGPIO(i, cmodule.io[i])) {
       WSContentSend_P(PSTR("sk(%d,%d);"), my_module.io[i], i);  // g0 - g16
@@ -1600,8 +1650,14 @@ void HandleModuleConfiguration(void)
       WSContentSend_P(PSTR("<tr><td style='width:190px'>%s <b>" D_GPIO "%d</b> %s</td><td style='width:176px'><select id='g%d'></select></td></tr>"),
         (WEMOS==my_module_type)?stemp:"", i, (0==i)? D_SENSOR_BUTTON "1":(1==i)? D_SERIAL_OUT :(3==i)? D_SERIAL_IN :((9==i)||(10==i))? sesp8285 :(12==i)? D_SENSOR_RELAY "1":(13==i)? D_SENSOR_LED "1i":(14==i)? D_SENSOR :"", i);
 #else  // ESP32
+#ifndef FINAL_ESP32
       WSContentSend_P(PSTR("<tr><td style='width:140px'>%s <b>" D_GPIO "%d</b></td><td style='width:176px'><select id='g%d'></select></td></tr>"),
         (WEMOS==my_module_type)?stemp:"", i, i);
+#else  // FINAL_ESP32
+      WSContentSend_P(PSTR("<tr><td style='width:110px'>%s <b>" D_GPIO "%d</b></td><td style='width:156px'><select id='g%d' onchange='ot(%d,this.value)'></select></td>"),
+        (WEMOS==my_module_type)?stemp:"", i, i, i);
+      WSContentSend_P(PSTR("<td style='width:50px'><select id='h%d'></select></td></tr>"), i);
+#endif  //
 #endif  // ESP8266
     }
   }
@@ -1642,11 +1698,25 @@ void ModuleSaveSettings(void)
 #ifdef ESP8266
         Settings.my_gp.io[i] = value;
 #else  // ESP32
+#ifndef FINAL_ESP32
         if (i == ADC0_PIN) {
           Settings.my_adc0 = value;
         } else {
           Settings.my_gp.io[i] = value;
         }
+#else  // FINAL_ESP32
+        char tmp2[8];         // WebGetArg numbers only
+        char webindex2[5];    // WebGetArg name
+        snprintf_P(webindex2, sizeof(webindex2), PSTR("h%d"), i);
+        WebGetArg(webindex2, tmp2, sizeof(tmp2));
+        uint32_t value2 = (!strlen(tmp2)) ? 0 : atoi(tmp2) -1;
+        value += value2;
+        if (i == ADC0_PIN) {
+          Settings.my_adc0 = value;
+        } else {
+          Settings.my_gp.io[i] = value;
+        }
+#endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
         gpios += F(", " D_GPIO ); gpios += String(i); gpios += F(" "); gpios += String(value);
       }