diff --git a/Zigbee.md b/Zigbee.md
index 47837d2b..d800ccf1 100644
--- a/Zigbee.md
+++ b/Zigbee.md
@@ -405,19 +405,14 @@ Supported values:
 |`ModelId`|Model name of the Zigbee device (string)<BR>Ex: `lumi.weather`|
 
 ### Other commands
-
 You can dump the internal information gathered about connected Zigbee devices with the command `ZigbeeStatus`.  
 
-List all connected devices with `ZigbeeStatus`
-
-```json
-07:55:36 CMD: ZigbeeStatus
-07:55:36 MQT: stat/sonoff/Zigbee_home/RESULT = {"ZigbeeStatus-99":[{"ShortAddr":"0x6B58"},{"ShortAddr":"0xE9C3"},{"ShortAddr":"0x3D82"}]}
+List all connected devices with `ZigbeeStatus`  
+```yaml
+{"ZigbeeStatus-99":[{"ShortAddr":"0x6B58"},{"ShortAddr":"0xE9C3"},{"ShortAddr":"0x3D82"}]}
 ```
 
-
-`ZigbeeStatus` command example:  
-_(JSON pretty-printed for readability)_
+_(JSON pretty-printed for readability)_  
 ```yaml
 {
     "ZigbeeStatus-99": [
@@ -434,17 +429,14 @@ _(JSON pretty-printed for readability)_
 }
 ```
 
-Get detailed information for each device, including long address, model and manufacturer with `ZigbeeStatus 1`:
-
-```json
-07:55:49 CMD: ZigbeeStatus 1
-07:55:49 MQT: stat/sonoff/Zigbee_home/RESULT = {"ZigbeeStatus1":[{"ShortAddr":"0x6B58","IEEEAddr":"7CB03EAA0A0292DD","ModelId":"Plug 01","Manufacturer":"OSRAM"},{"ShortAddr":"0xE9C3","IEEEAddr":"00158D00036B50AE","ModelId":"lumi.weather","Manufacturer":"LUMI"},{"ShortAddr":"0x3D82","IEEEAddr":"0017880102FE1DBD","ModelId":"LWB010","Manufacturer":"Philips"}]}
+Get detailed information for each device, including long address, model and manufacturer with `ZigbeeStatus 1`:  
+```yaml
+{"ZigbeeStatus1":[{"ShortAddr":"0x6B58","IEEEAddr":"7CB03EAA0A0292DD","ModelId":"Plug 01","Manufacturer":"OSRAM"},{"ShortAddr":"0xE9C3","IEEEAddr":"00158D00036B50AE","ModelId":"lumi.weather","Manufacturer":"LUMI"},{"ShortAddr":"0x3D82","IEEEAddr":"0017880102FE1DBD","ModelId":"LWB010","Manufacturer":"Philips"}]}
 ```
 
-`ZigbeeStatus 1` command example:  
 _(JSON pretty-printed for readability)_  
-
 ```yaml
+{
     "ZigbeeStatus1": [
         {
             "ShortAddr": "0x6B58",
@@ -465,41 +457,72 @@ _(JSON pretty-printed for readability)_
             "Manufacturer": "Philips"
         }
     ]
+}
 ```
 
-
-Get information about endpoints and ZCL clusters supported with `ZigbeeStatus 2`:
-
-```json
-07:56:32 CMD: ZigbeeStatus 2
-07:56:32 MQT: stat/sonoff/Zigbee_home/RESULT = {"ZigbeeStatus2":[{"ShortAddr":"0x6B58","Endpoints":{"0x03":{"ProfileId":"0xC05E","ProfileIdName":"ZigBee Light Link","ClustersIn":["0x1000","0x0000","0x0003","0x0004","0x0005","0x0006","0x0B04","0xFC0F"],"ClustersOut":["0x0019"]}}},{"ShortAddr":"0xE9C3","Endpoints":{"0x01":{"ProfileId":"0x0104","ClustersIn":["0x0000","0x0003","0xFFFF","0x0402","0x0403","0x0405"],"ClustersOut":["0x0000","0x0004","0xFFFF"]}}},{"ShortAddr":"0x3D82","Endpoints":{"0x0B":{"ProfileId":"0xC05E"," ...
+Get information about endpoints and ZCL clusters supported with `ZigbeeStatus 2`:  
+```yaml
+{"ZigbeeStatus2":[{"ShortAddr":"0x6B58","Endpoints":{"0x03":{"ProfileId":"0xC05E","ProfileIdName":"ZigBee Light Link","ClustersIn":["0x1000","0x0000","0x0003","0x0004","0x0005","0x0006","0x0B04","0xFC0F"],"ClustersOut":["0x0019"]}}},{"ShortAddr":"0xE9C3","Endpoints":{"0x01":{"ProfileId":"0x0104","ClustersIn":["0x0000","0x0003","0xFFFF","0x0402","0x0403","0x0405"],"ClustersOut":["0x0000","0x0004","0xFFFF"]}}},{"ShortAddr":"0x3D82","Endpoints":{"0x0B":{"ProfileId":"0xC05E"," ...
 ```
 
-Example: ZigbeeStatus 2 for Philips Hue Zigbee bulb (after pairing)  
 _(JSON pretty-printed for readability)_  
 ```yaml
-    "ZigbeeStatus":
+{
+  "ZigbeeStatus2": [
     {
-        "ZigbeeDevices": 
-        {
-            "0x3D82": 
-            {
-                "ShortAddr": "0x3D82",
-                "IEEEAddr": "0017880102FE1DBD",
-                "Endpoints": ["0x0B","0xF2"],
-                "Clusters_in": 
-                {
-                   "0x0B":["0x0000","0x0003","0x0004","0x0005","0x0006","0x0008","0x1000"],
-                   "0xF2":["0x0021"]
-                },
-                "Clusters_out": 
-                {
-                   "0x0B":["0x0019"],
-                   "0xF2":["0x0021"]
-                }
-            }
+      "ShortAddr": "0x6B58",
+      "Endpoints": {
+        "0x03": {
+          "ProfileId": "0xC05E",
+          "ProfileIdName": "ZigBee Light Link",
+          "ClustersIn": [
+            "0x1000",
+            "0x0000",
+            "0x0003",
+            "0x0004",
+            "0x0005",
+            "0x0006",
+            "0x0B04",
+            "0xFC0F"
+          ],
+          "ClustersOut": [
+            "0x0019"
+          ]
         }
+      }
+    },
+    {
+      "ShortAddr": "0xE9C3",
+      "Endpoints": {
+        "0x01": {
+          "ProfileId": "0x0104",
+          "ClustersIn": [
+            "0x0000",
+            "0x0003",
+            "0xFFFF",
+            "0x0402",
+            "0x0403",
+            "0x0405"
+          ],
+          "ClustersOut": [
+            "0x0000",
+            "0x0004",
+            "0xFFFF"
+          ]
+        }
+      }
+    },
+    {
+      "ShortAddr": "0x3D82",
+      "Endpoints": {
+        "0x0B": {
+          "ProfileId": "0xC05E",
+          " ...
+        }
+      }
     }
+  ]
+}
 ```
 
 ## Why another Zigbee project?