diff --git a/docs/DeviceProfiles/nodemcu_esp32.json b/docs/DeviceProfiles/nodemcu_esp32.json
index a42af371..d7f6a614 100644
--- a/docs/DeviceProfiles/nodemcu_esp32.json
+++ b/docs/DeviceProfiles/nodemcu_esp32.json
@@ -1,6 +1,6 @@
 [
     {
-        "name": "Generic NodeMCU 32",
+        "name": "NRF24",
         "nrf24": {
             "miso": 19,
             "mosi": 23,
@@ -10,17 +10,11 @@
             "cs": 5
         },
         "eth": {
-            "enabled": false,
-            "phy_addr": -1,
-            "power": -1,
-            "mdc": -1,
-            "mdio": -1,
-            "type": 0,
-            "clk_mode": 0
+            "enabled": false
         }
     },
     {
-        "name": "Generic NodeMCU 32 with CMT2300A",
+        "name": "CMT2300A",
         "nrf24": {
             "miso": -1,
             "mosi": -1,
@@ -38,17 +32,11 @@
             "gpio3": 16
         },
         "eth": {
-            "enabled": false,
-            "phy_addr": -1,
-            "power": -1,
-            "mdc": -1,
-            "mdio": -1,
-            "type": 0,
-            "clk_mode": 0
+            "enabled": false
         }
     },
     {
-        "name": "Generic NodeMCU 32 with SSD1306",
+        "name": "NRF24 with SSD1306",
         "nrf24": {
             "miso": 19,
             "mosi": 23,
@@ -58,13 +46,7 @@
             "cs": 5
         },
         "eth": {
-            "enabled": false,
-            "phy_addr": -1,
-            "power": -1,
-            "mdc": -1,
-            "mdio": -1,
-            "type": 0,
-            "clk_mode": 0
+            "enabled": false
         },
         "display": {
             "type": 2,
@@ -73,7 +55,7 @@
         }
     },
     {
-        "name": "Generic NodeMCU 32 with SH1106",
+        "name": "NRF24 with SH1106",
         "nrf24": {
             "miso": 19,
             "mosi": 23,
@@ -83,13 +65,7 @@
             "cs": 5
         },
         "eth": {
-            "enabled": false,
-            "phy_addr": -1,
-            "power": -1,
-            "mdc": -1,
-            "mdio": -1,
-            "type": 0,
-            "clk_mode": 0
+            "enabled": false
         },
         "display": {
             "type": 3,
@@ -98,7 +74,61 @@
         }
     },
     {
-        "name": "Generic NodeMCU 32 with NRF + CMT Module",
+        "name": "CMT2300A with SSD1306",
+        "nrf24": {
+            "miso": -1,
+            "mosi": -1,
+            "clk": -1,
+            "irq": -1,
+            "en": -1,
+            "cs": -1
+        },
+        "cmt": {
+            "clk": 18,
+            "cs": 4,
+            "fcs": 5,
+            "sdio": 23,
+            "gpio2": 19,
+            "gpio3": 16
+        },
+        "eth": {
+            "enabled": false
+        },
+        "display": {
+            "type": 2,
+            "data": 21,
+            "clk": 22
+        }
+    },
+    {
+        "name": "CMT2300A with SH1106",
+        "nrf24": {
+            "miso": -1,
+            "mosi": -1,
+            "clk": -1,
+            "irq": -1,
+            "en": -1,
+            "cs": -1
+        },
+        "cmt": {
+            "clk": 18,
+            "cs": 4,
+            "fcs": 5,
+            "sdio": 23,
+            "gpio2": 19,
+            "gpio3": 16
+        },
+        "eth": {
+            "enabled": false
+        },
+        "display": {
+            "type": 3,
+            "data": 21,
+            "clk": 22
+        }
+    },
+    {
+        "name": "NRF24 + CMT2300A",
         "nrf24": {
             "miso": 19,
             "mosi": 23,