diff --git a/brands/amorvue.json b/brands/amorvue.json
index 2d91085..c1a5df1 100644
--- a/brands/amorvue.json
+++ b/brands/amorvue.json
@@ -54,6 +54,26 @@
       "models": [
         "RC720AW"
       ]
+    },
+    {
+      "id": "amorvue-6",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - ESeeCloud/dvr163 NVR firmware"
+    },
+    {
+      "id": "amorvue-7",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - ESeeCloud/dvr163 NVR firmware"
     }
   ]
 }
diff --git a/brands/annke.json b/brands/annke.json
index 4c0788d..19d66ff 100644
--- a/brands/annke.json
+++ b/brands/annke.json
@@ -41,33 +41,23 @@
     },
     {
       "id": "annke-5",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "annke-6",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "annke-7",
diff --git a/brands/anran.json b/brands/anran.json
index 14eb6c7..b7068ff 100644
--- a/brands/anran.json
+++ b/brands/anran.json
@@ -551,6 +551,26 @@
       "models": [
         "wifi_1080p"
       ]
+    },
+    {
+      "id": "anran-35",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "anran-36",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }
diff --git a/brands/besder.json b/brands/besder.json
index a1257af..93bc435 100644
--- a/brands/besder.json
+++ b/brands/besder.json
@@ -501,6 +501,26 @@
       "models": [
         "Sec"
       ]
+    },
+    {
+      "id": "besder-29",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "besder-30",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }
diff --git a/brands/floureon.json b/brands/floureon.json
index 77dd0a8..b9a6a40 100644
--- a/brands/floureon.json
+++ b/brands/floureon.json
@@ -5,33 +5,23 @@
   "streams": [
     {
       "id": "floureon-1",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "floureon-2",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "floureon-3",
diff --git a/brands/gadinan.json b/brands/gadinan.json
index 82ffd25..2df25d9 100644
--- a/brands/gadinan.json
+++ b/brands/gadinan.json
@@ -42,6 +42,26 @@
       "models": [
         "pk1100"
       ]
+    },
+    {
+      "id": "gadinan-5",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "gadinan-6",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }
diff --git a/brands/genbolt.json b/brands/genbolt.json
index 4f3bf0d..66f594d 100644
--- a/brands/genbolt.json
+++ b/brands/genbolt.json
@@ -210,6 +210,26 @@
       "models": [
         "tit"
       ]
+    },
+    {
+      "id": "genbolt-14",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "genbolt-15",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }
diff --git a/brands/hamrolte.json b/brands/hamrolte.json
index cb7e055..3ec3edc 100644
--- a/brands/hamrolte.json
+++ b/brands/hamrolte.json
@@ -49,6 +49,26 @@
       "models": [
         "HKBQ15L-I50"
       ]
+    },
+    {
+      "id": "hamrolte-6",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "hamrolte-7",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }
diff --git a/brands/hiseeu.json b/brands/hiseeu.json
index d2b41bd..dea4230 100644
--- a/brands/hiseeu.json
+++ b/brands/hiseeu.json
@@ -465,6 +465,26 @@
       "models": [
         "WHD812B"
       ]
+    },
+    {
+      "id": "hiseeu-37",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
+    },
+    {
+      "id": "hiseeu-38",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     }
   ]
 }
diff --git a/brands/sannce.json b/brands/sannce.json
index abfe77a..aecc4d3 100644
--- a/brands/sannce.json
+++ b/brands/sannce.json
@@ -5,33 +5,23 @@
   "streams": [
     {
       "id": "sannce-1",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "sannce-2",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "sannce-3",
diff --git a/brands/smartwares.json b/brands/smartwares.json
index d740136..618210c 100644
--- a/brands/smartwares.json
+++ b/brands/smartwares.json
@@ -190,6 +190,26 @@
       "models": [
         "CP35IP"
       ]
+    },
+    {
+      "id": "smartwares-16",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol main stream - confirmed on CIP-39220"
+    },
+    {
+      "id": "smartwares-17",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
+      "protocol": "bubble",
+      "port": 80,
+      "models": [
+        "*"
+      ],
+      "notes": "Bubble protocol sub stream - confirmed on CIP-39220"
     }
   ]
 }
diff --git a/brands/xmeye.json b/brands/xmeye.json
index 67d64b3..07b8d40 100644
--- a/brands/xmeye.json
+++ b/brands/xmeye.json
@@ -5,33 +5,23 @@
   "streams": [
     {
       "id": "xmeye-1",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "xmeye-2",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "xmeye-3",
diff --git a/brands/zosi.json b/brands/zosi.json
index 6c3cf3f..10839db 100644
--- a/brands/zosi.json
+++ b/brands/zosi.json
@@ -5,33 +5,23 @@
   "streams": [
     {
       "id": "zosi-1",
-      "url": "/bubble/live?ch={channel}&stream=0",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=0",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - main stream (works with go2rtc bubble:// source)"
+      "notes": "Bubble protocol main stream - XiongMai/XM-based firmware"
     },
     {
       "id": "zosi-2",
-      "url": "/bubble/live?ch={channel}&stream=1",
+      "url": "/bubble/live?ch=[CHANNEL]&stream=1",
       "protocol": "bubble",
       "port": 80,
       "models": [
-        "NVR",
-        "DVR",
-        "H.264",
-        "H.265",
-        "HiSilicon",
-        "Other"
+        "*"
       ],
-      "notes": "Bubble Protocol - sub stream (lower quality)"
+      "notes": "Bubble protocol sub stream - XiongMai/XM-based firmware"
     },
     {
       "id": "zosi-3",