diff --git a/CODE_OWNERS.md b/CODE_OWNERS.md
index 56a053548..f8b14ee9f 100644
--- a/CODE_OWNERS.md
+++ b/CODE_OWNERS.md
@@ -79,11 +79,11 @@ In addition to @arendst the following code is mainly owned by:
 | xdrv_65_tuyamcubr            | David Gwynne
 | xdrv_66_tm1638               | @arendst
 | xdrv_67_mcp23xxx             | @arendst
-| xdrv_68_zerocrossDimmer.ino  | @stefanbode
+| xdrv_68_zerocrossDimmer      | @stefanbode
 | xdrv_69_pca9557              | @cctweaker
-| xdrv_70                      |
-| xdrv_71                      |
-| xdrv_72                      |
+| xdrv_70_1_hdmi_cec           | @s-hadinger
+| xdrv_71_magic_switch         | @barbudor
+| xdrv_72_pipsolar             | @chefpro
 | xdrv_73                      |
 | xdrv_74                      |
 | xdrv_75                      |
@@ -100,8 +100,12 @@ In addition to @arendst the following code is mainly owned by:
 | xdrv_88_esp32_shelly_pro     | @arendst
 | xdrv_89_esp32_dali           | @eeak
 | xdrv_90_esp32_dingtian_relay | @barbudor
-| xdrv_92_pipsolar             | @chefpro
+| xdrv_91_                     |
+| xdrv_92_                     |
+| xdrv_93_                     |
+| xdrv_94_                     |
 |                              |
+| xdrv_121_gpioviewer          | @arendst
 | xdrv_122_file_settings_demo  | @arendst
 | xdrv_127_debug               | @arendst
 |                              |
diff --git a/tasmota/tasmota_support/support_features.ino b/tasmota/tasmota_support/support_features.ino
index 5c0e4e03b..ef586a482 100644
--- a/tasmota/tasmota_support/support_features.ino
+++ b/tasmota/tasmota_support/support_features.ino
@@ -888,7 +888,7 @@ constexpr uint32_t feature[] = {
   0x10000000 |  // xsns_113_hc8.ino
 #endif
 #ifdef USE_HDMI_CEC
-  0x20000000 |  // xdrv_70_0_hdmi_cec.ino
+  0x20000000 |  // xdrv_70_1_hdmi_cec.ino
 #endif
 #ifdef USE_BLE_ESP32
   0x40000000 |  // xdrv_79_esp32_ble.ino
@@ -897,9 +897,15 @@ constexpr uint32_t feature[] = {
   0x80000000 |  // xdrv_52_9_berry.ino
 #endif
   0,
-//  0x00000001 |  // 
-//  0x00000002 |  // 
-//  0x00000004 |  // 
+#ifdef USE_MAGIC_SWITCH
+  0x00000001 |  // xdrv_71_magic_switch.ino
+#endif
+#ifdef USE_PIPSOLAR
+  0x00000002 |  // xdrv_72_pipsolar.ino
+#endif
+#ifdef USE_GPIO_VIEWER
+  0x00000004 |  // xdrv_121_gpioviewer.ino
+#endif
 //  0x00000008 |  // 
 //  0x00000010 |  // 
 //  0x00000020 |  // 
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_91_magic_switch.ino b/tasmota/tasmota_xdrv_driver/xdrv_71_magic_switch.ino
similarity index 97%
rename from tasmota/tasmota_xdrv_driver/xdrv_91_magic_switch.ino
rename to tasmota/tasmota_xdrv_driver/xdrv_71_magic_switch.ino
index c0c128bcd..a0c097b28 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_91_magic_switch.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_71_magic_switch.ino
@@ -1,7 +1,7 @@
 /*
-  xdrv_91_magic_switch.ino - Driver for MagicSwitch as implemented in Sonoff BasicR4
+  xdrv_71_magic_switch.ino - Driver for MagicSwitch as implemented in Sonoff BasicR4
 
-  Copyright (C) 2021 Barbudor
+  Copyright (C) 2023 Barbudor
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #ifdef USE_MAGIC_SWITCH
 
-#define XDRV_91           91
+#define XDRV_71           71
 
 /********************************************************************************************************
  * Check defines
@@ -162,7 +162,7 @@ void CmndMagicSwitchPulse(void)
  * Interface
 \*********************************************************************************************/
 
-bool Xdrv91(uint32_t function) {
+bool Xdrv71(uint32_t function) {
   bool result = false;
 
   if (FUNC_SETUP_RING2 == function) {
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_92_pipsolar.ino b/tasmota/tasmota_xdrv_driver/xdrv_72_pipsolar.ino
similarity index 99%
rename from tasmota/tasmota_xdrv_driver/xdrv_92_pipsolar.ino
rename to tasmota/tasmota_xdrv_driver/xdrv_72_pipsolar.ino
index 747704f43..047a29800 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_92_pipsolar.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_72_pipsolar.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_92_pipsolar.ino - modbus bridge support for Tasmota
+  xdrv_72_pipsolar.ino - pipsolar support for Tasmota
 
   Copyright (C) 2023 Peter Rustler
 
@@ -17,9 +17,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(USE_PIPSOLAR)
+#ifdef USE_PIPSOLAR
 
-#define XDRV_92 92
+#define XDRV_72 72
 
 #define PIPSOLAR_RECEIVEBUFFER_SIZE TM_SERIAL_BUFFER_SIZE * 2 // 128
 #define PIPSOLAR_SENDBUFFER_SIZE TM_SERIAL_BUFFER_SIZE        // 64
@@ -1010,7 +1010,7 @@ void PIPSOLARShow(bool json)
  * Interface
 \*********************************************************************************************/
 
-bool Xdrv92(uint32_t function)
+bool Xdrv72(uint32_t function)
 {
   bool result = true;
 
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 3b8af81b4..922472118 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -302,7 +302,7 @@ a_features = [[
     "USE_SGP4X","USE_MAX17043","USE_ENS16x","USE_ENS210",
     "USE_HC8","USE_HDMI_CEC","USE_BLE_ESP32","USE_MATTER_DEVICE"
     ],[
-    "","","","",
+    "USE_MAGIC_SWITCH","USE_PIPSOLAR","USE_GPIO_VIEWER","",
     "","","","",
     "","","","",
     "","","","",
@@ -337,7 +337,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v13.2.0.2 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v13.3.0.2 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))