diff --git a/back/device_heuristics_rules.json b/back/device_heuristics_rules.json
index 3ff278cd..996c42d8 100755
--- a/back/device_heuristics_rules.json
+++ b/back/device_heuristics_rules.json
@@ -23,7 +23,33 @@
     "matching_pattern": [
       { "mac_prefix": "2887BA", "vendor": "TP-Link" }
     ],
-    "name_pattern": ["kp115", "hs100", "hs103", "hs105", "smart plug", "outlet"]
+    "name_pattern": ["kp115", "hs100", "hs103", "hs105", "smart plug", "outlet", "plug"]
+  },
+  {
+    "dev_type": "Smart Speaker",
+    "icon_html": "<i class=\"fa fa-volume-up\"></i>",
+    "matching_pattern": [
+      { "mac_prefix": "14C14E", "vendor": "Google" },
+      { "mac_prefix": "44650D", "vendor": "Amazon" },
+      { "mac_prefix": "74ACB9", "vendor": "Google" }
+    ],
+    "name_pattern": ["echo", "alexa", "dot", "nest-audio", "nest-mini", "google-home"]
+  },
+  {
+    "dev_type": "Smart Home",
+    "icon_html": "<i class=\"fa fa-house\"></i>",
+    "matching_pattern": [],
+    "name_pattern": ["google", "chromecast", "nest", "hub"]
+  },
+  {
+    "dev_type": "Phone",
+    "icon_html": "<i class=\"fa-solid fa-mobile\"></i>",
+    "matching_pattern": [
+      { "mac_prefix": "001A79", "vendor": "Apple" },
+      { "mac_prefix": "B0BE83", "vendor": "Samsung" },
+      { "mac_prefix": "BC926B", "vendor": "Motorola" }
+    ],
+    "name_pattern": ["iphone", "ipad", "pixel", "galaxy", "redmi", "android", "samsung"]
   },
   {
     "dev_type": "Access Point",
@@ -36,24 +62,6 @@
     ],
     "name_pattern": ["router", "gateway", "ap", "access point", "access-point", "switch", "sg105", "sg108", "managed switch", "unmanaged switch", "poe switch", "ethernet switch"]
   },
-  {
-    "dev_type": "Phone",
-    "icon_html": "<i class=\"fa-solid fa-mobile\"></i>",
-    "matching_pattern": [
-      { "mac_prefix": "001A79", "vendor": "Apple" },
-      { "mac_prefix": "B0BE83", "vendor": "Samsung" },
-      { "mac_prefix": "BC926B", "vendor": "Motorola" },
-      { "mac_prefix": "", "vendor": "google" }
-    ],
-    "name_pattern": ["iphone", "ipad", "pixel", "galaxy", "redmi"]
-  },
-  {
-    "dev_type": "Phone",
-    "icon_html": "<i class=\"fa-solid fa-mobile\"></i>",
-    "matching_pattern": [
-    ],
-    "name_pattern": ["android","samsung"]
-  },
   {
     "dev_type": "Tablet",
     "icon_html": "<i class=\"fa fa-tablet\"></i>",
@@ -63,24 +71,18 @@
     ],
     "name_pattern": ["tablet", "pad"]
   },
-  {
-    "dev_type": "IoT",
-    "icon_html": "<i class=\"fa-brands fa-raspberry-pi\"></i>",
-    "matching_pattern": [
-      { "mac_prefix": "B827EB", "vendor": "Raspberry Pi" },
-      { "mac_prefix": "DCA632", "vendor": "Raspberry Pi" }
-    ],
-    "name_pattern": ["raspberry", "pi"]
-  },
   {
     "dev_type": "IoT",
     "icon_html": "<i class=\"fa-solid fa-microchip\"></i>",
     "matching_pattern": [
+      { "mac_prefix": "B827EB", "vendor": "Raspberry Pi" },
+      { "mac_prefix": "DCA632", "vendor": "Raspberry Pi" },
       { "mac_prefix": "840D8E", "vendor": "Espressif" },
       { "mac_prefix": "ECFABC", "vendor": "Espressif" },
-      { "mac_prefix": "7C9EBD", "vendor": "Espressif" }
+      { "mac_prefix": "7C9EBD", "vendor": "Espressif" },
+      { "mac_prefix": "286DCD", "vendor": "Beijing Winner Microelectronics" }
     ],
-    "name_pattern": ["raspberry", "pi"]
+    "name_pattern": ["raspberry", "pi", "thingsturn", "w600", "w601"]
   },
   {
     "dev_type": "Desktop",
@@ -157,15 +159,6 @@
     ],
     "name_pattern": ["camera", "cam", "webcam"]
   },
-  {
-    "dev_type": "Smart Speaker",
-    "icon_html": "<i class=\"fa fa-volume-up\"></i>",
-    "matching_pattern": [
-      { "mac_prefix": "44650D", "vendor": "Amazon" },
-      { "mac_prefix": "74ACB9", "vendor": "Google" }
-    ],
-    "name_pattern": ["echo", "alexa", "dot"]
-  },
   {
     "dev_type": "Router",
     "icon_html": "<i class=\"fa fa-random\"></i>",
@@ -173,7 +166,7 @@
       { "mac_prefix": "000C29", "vendor": "Cisco" },
       { "mac_prefix": "00155D", "vendor": "MikroTik" }
     ],
-    "name_pattern": ["router", "gateway", "ap", "access point", "access-point"],
+    "name_pattern": ["router", "gateway", "ap", "access point"],
     "ip_pattern": [
       "^192\\.168\\.[0-1]\\.1$",
       "^10\\.0\\.0\\.1$"
@@ -185,12 +178,6 @@
     "matching_pattern": [],
     "name_pattern": ["hue", "lifx", "bulb", "light"]
   },
-  {
-    "dev_type": "Smart Home",
-    "icon_html": "<i class=\"fa fa-house\"></i>",
-    "matching_pattern": [],
-    "name_pattern": ["google", "chromecast", "nest"]
-  },
   {
     "dev_type": "Smartwatch",
     "icon_html": "<i class=\"fa fa-watch\"></i>",
@@ -206,7 +193,9 @@
   {
     "dev_type": "Security Device",
     "icon_html": "<i class=\"fa fa-shield-alt\"></i>",
-    "matching_pattern": [],
-    "name_pattern": ["doorbell", "lock", "security"]
+    "matching_pattern": [
+      { "mac_prefix": "047BCB", "vendor": "Universal Global Scientific" }
+    ],
+    "name_pattern": ["doorbell", "lock", "security", "mmd-", "ring"]
   }
-]
+]
\ No newline at end of file