From 7c10bc5d87a773ac081ba445d08c120be491a65c Mon Sep 17 00:00:00 2001
From: Tutik Alexsandr <sanchezzzhak@ya.ru>
Date: Fri, 5 Apr 2024 11:39:34 +0300
Subject: [PATCH] Detect new brands: CCIT, PAGRAER, DIALN, AUPO and Detect
 devices for exist brands (#7650)

feat(device) detect new brand PAGRAER: P50 Pro
feat(device) detect brand Huawei: Nova 11 (FOA-AL00), Nova 11 Active Edition (FIN-AL60a), Nova 12 Ultra (ADA-AL00U), Nova 12 Pro (ADA-AL00), Enjoy 70 Pro (CTR-AL20), Pocket S (BAL-AL60), Nova 11 SE (BON-AL00), Mate 60 (BRA-AL00), Honor Play 7T 5G (RKY-AN10), MatePad 11 (2023) WiFi (DBR-W19)
feat(device) detect brand Blu: G52L, Studio Mini (2023)
feat(device) detect brand General Mobile: GM 23 (G316)
feat(device) detect brand Yuandao: N70
feat(device) detect brand PEAQ: PET 101-H232E
feat(device) detect brand Sharp: Aquos Pad SHT21
feat(device) detect brand Prestigio: Geo Vision 7777 (GV7777)
feat(device) detect brand Gplus: X20 (GMC-7127M), Q20S (GMC-668N), Q20 (GMC-668M)
feat(device) detect new brand DIALN: X8 Ultra
feat(device) detect brand MSI: GP70 2OD
feat(device) detect brand General Mobile: GM 23 SE (G314)
feat(device) detect brand VGO TEL: New 16
feat(device) detect brand Sparx: Neo 6 Plus, Neo 5 Pro, Neo X
feat(device) detect brand Condor: Griffe G5 Plus (PAM524)
feat(device) detect brand NUU Mobile: Tab 8 (T0802L, T0801L)
feat(device) detect brand Planet Computers: Gemini 4G
feat(device) detect new brand AUPO: Zeus 10 Pro
feat(device) detect brand Ravoz: V5
feat(device) detect brand Symphony: i85, i80
feat(device) detect brand Sigma: X-Style S5502
feat(device) detect brand Zuum: Covet X
feat(device) detect brand Ace: Clever 3
feat(device) detect brand Konrow: City 4
feat(device) detect brand Blu: Bold N2
feat(device) detect brand Huawei: Honor X7b (CLK-LX1)
feat(device) detect brand OPPO: F25 Pro 5G (CPH2603), Reno 11 (CPH2599), A59 5G (CPH2617), A79 5G (CPH2553), Reno 3 5G (CPH2048)
feat(device) detect brand OnePlus: 12R (CPH2611), 12 (CPH2583, CPH2581, CPH2573)
feat(device) detect new brand CCIT: X Edition, Vogue 405, A100W, A170W, A8W, A160W, A120W, CW200, A9W, A755G, A725G, A708G, A703+, A715G
feat(device) detect brand Phicomm: Clue 2S (C6051)
feat(device) detect brand Starmobile: Play Dash
feat(device) detect brand CKK Mobile: DUKE 7
feat(device) detect brand Doro: 8020X
feat(device) detect brand Lenovo: A397i
---
 Parser/Device/AbstractDeviceParser.php |   4 +
 Tests/fixtures/desktop.yml             |  18 +
 Tests/fixtures/smartphone-38.yml       | 862 +++++++++++++++++++++++++
 Tests/fixtures/tablet-11.yml           | 342 ++++++++++
 Tests/fixtures/tablet-4.yml            |  54 ++
 Tests/fixtures/tablet-6.yml            |   4 +-
 Tests/fixtures/tablet-7.yml            |   4 +-
 Tests/fixtures/unknown.yml             |  54 --
 regexes/device/mobiles.yml             | 203 ++++--
 9 files changed, 1435 insertions(+), 110 deletions(-)

diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
index fe34541132..051d640b0d 100644
--- a/Parser/Device/AbstractDeviceParser.php
+++ b/Parser/Device/AbstractDeviceParser.php
@@ -196,6 +196,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'AX'  => 'Audiovox',
         'AJ'  => 'AURIS',
         'YZ'  => 'Autan',
+        'AUP' => 'AUPO',
         'ZA'  => 'Avenzo',
         'AH'  => 'AVH',
         'AV'  => 'Avvio',
@@ -309,6 +310,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'CAN' => 'Canal+',
         '4D'  => 'Canal Digital',
         'CNG' => 'Canguro',
+        'CNT' => 'CCIT',
         'CEC' => 'Cecotec',
         'CEI' => 'Ceibal',
         '02'  => 'Cell-C',
@@ -406,6 +408,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '8D'  => 'DF',
         'DGT' => 'DGTEC',
         'DG'  => 'Dialog',
+        'DIA' => 'DIALN',
         'DI'  => 'Dicam',
         'D4'  => 'Digi',
         'D3'  => 'Digicel',
@@ -1228,6 +1231,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'OLL' => 'Ollee',
         '7P'  => 'P-UP',
         'PRA' => 'Pacific Research Alliance',
+        'PAG' => 'PAGRAER',
         'YP'  => 'Paladin',
         'PM'  => 'Palm',
         'PN'  => 'Panacom',
diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
index dd872e674a..a4c28af4bd 100644
--- a/Tests/fixtures/desktop.yml
+++ b/Tests/fixtures/desktop.yml
@@ -9765,3 +9765,21 @@
     model: LifeBook AH532
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.1.1; GP70 2OD) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36
+  os:
+    name: Android
+    version: 7.1.1
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 71.0.3578.99
+    engine: Blink
+    engine_version: 71.0.3578.99
+  device:
+    type: desktop
+    brand: MSI
+    model: GP70 2OD
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml
index 1534c7a800..30f9d38636 100644
--- a/Tests/fixtures/smartphone-38.yml
+++ b/Tests/fixtures/smartphone-38.yml
@@ -3625,3 +3625,865 @@
     model: Mate 60 Pro
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12.0; PAGRAER P50 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Mobile Safari/537.36 OPR/81.2.4292.78581
+  os:
+    name: Android
+    version: "12.0"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 81.2.4292.78581
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: PAGRAER
+    model: P50 Pro
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; FOA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 78.0.3904.96
+    engine: Blink
+    engine_version: 78.0.3904.96
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Nova 11
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; G52L Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: Blu
+    model: G52L
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; G316) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 105.0.0.0
+    engine: Blink
+    engine_version: 105.0.0.0
+  device:
+    type: smartphone
+    brand: General Mobile
+    model: GM 23
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; GMC-7127M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Mobile Safari/537.36 OPR/81.1.4292.78446
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 81.1.4292.78446
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: Gplus
+    model: X20
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; GMC-668N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 105.0.0.0
+    engine: Blink
+    engine_version: 105.0.0.0
+  device:
+    type: smartphone
+    brand: Gplus
+    model: Q20S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; GMC-668M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/23.0 Chrome/115.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Samsung Browser
+    version: "23.0"
+    engine: Blink
+    engine_version: 115.0.0.0
+  device:
+    type: smartphone
+    brand: Gplus
+    model: Q20
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; FIN-AL60a; HMSCore 6.13.0.309) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Nova 11 Active Edition
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; ADA-AL00U; HMSCore 6.13.0.322) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Nova 12 Ultra
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; ADA-AL00; HMSCore 6.13.0.322) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Nova 12 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; CTR-AL20; HMSCore 6.13.0.322) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Enjoy 70 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; BAL-AL60; HMSCore 6.13.0.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Pocket S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; BON-AL00; HMSCore 6.13.0.322) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Nova 11 SE
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; BRA-AL00; HMSCore 6.13.0.309) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.7.302 Mobile Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.7.302
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Mate 60
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; RKY-AN10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 103.0.0.0
+    engine: Blink
+    engine_version: 103.0.0.0
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor Play 7T 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; Studio Mini 2023) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 102.0.0.0
+    engine: Blink
+    engine_version: 102.0.0.0
+  device:
+    type: smartphone
+    brand: Blu
+    model: Studio Mini (2023)
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; G314) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/23.0 Chrome/115.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Samsung Browser
+    version: "23.0"
+    engine: Blink
+    engine_version: 115.0.0.0
+  device:
+    type: smartphone
+    brand: General Mobile
+    model: GM 23 SE
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; NEW 16) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 111.0.0.0
+    engine: Blink
+    engine_version: 111.0.0.0
+  device:
+    type: smartphone
+    brand: VGO TEL
+    model: New 16
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; Neo_6_plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 111.0.0.0
+    engine: Blink
+    engine_version: 111.0.0.0
+  device:
+    type: smartphone
+    brand: Sparx
+    model: Neo 6 Plus
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; Neo 5 Pro Build/T00624) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: Sparx
+    model: Neo 5 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; Neo X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 111.0.0.0
+    engine: Blink
+    engine_version: 111.0.0.0
+  device:
+    type: smartphone
+    brand: Sparx
+    model: Neo X
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; PAM524) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 71.0.3578.99
+    engine: Blink
+    engine_version: 71.0.3578.99
+  device:
+    type: smartphone
+    brand: Condor
+    model: Griffe G5 Plus
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 12; en-US; RAVOZ V5 Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.6.2.1316 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    version: 13.6.2.1316
+    engine: Blink
+    engine_version: 78.0.3904.108
+  device:
+    type: smartphone
+    brand: Ravoz
+    model: V5
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 12; en-US; i85 Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.6.2.1316 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    version: 13.6.2.1316
+    engine: Blink
+    engine_version: 78.0.3904.108
+  device:
+    type: smartphone
+    brand: Symphony
+    model: i85
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 11; X-Style_S5502 Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36 OPR/79.0.2254.70805
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 79.0.2254.70805
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: Sigma
+    model: X-Style S5502
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 11; i80 Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36 OPR/79.0.2254.70805
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 79.0.2254.70805
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: Symphony
+    model: i80
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: 'Mozilla/5.0 (Linux; Android 14; CPH2611 Build/TP1A.220905.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/121.0.6167.178 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/458.0.0.38.86;]'
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: mobile app
+    name: Facebook
+    version: 458.0.0.38.86
+  device:
+    type: smartphone
+    brand: OnePlus
+    model: 12R
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; CPH2583 Build/UKQ1.230924.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.40 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 123.0.6312.40
+    engine: Blink
+    engine_version: 123.0.6312.40
+  device:
+    type: smartphone
+    brand: OnePlus
+    model: "12"
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; CPH2603 Build/UP1A.230620.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: OPPO
+    model: F25 Pro 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; CPH2599 Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: OPPO
+    model: Reno 11
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; CPH2581) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/23.0 Chrome/115.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Samsung Browser
+    version: "23.0"
+    engine: Blink
+    engine_version: 115.0.0.0
+  device:
+    type: smartphone
+    brand: OnePlus
+    model: "12"
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; CPH2573 Build/UKQ1.230924.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.66 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.66
+    engine: Blink
+    engine_version: 122.0.6261.66
+  device:
+    type: smartphone
+    brand: OnePlus
+    model: "12"
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; CPH2617) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Mobile Safari/537.36 OPR/81.2.4292.78581
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 81.2.4292.78581
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: smartphone
+    brand: OPPO
+    model: A59 5G
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; CPH2553) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.6099.280 Mobile Safari/537.36 OPR/80.6.4244.78244
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 80.6.4244.78244
+    engine: Blink
+    engine_version: 120.0.6099.280
+  device:
+    type: smartphone
+    brand: OPPO
+    model: A79 5G
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; CPH2048) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 87.0.4280.141
+    engine: Blink
+    engine_version: 87.0.4280.141
+  device:
+    type: smartphone
+    brand: OPPO
+    model: Reno 3 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; COVET X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 94.0.4606.85
+    engine: Blink
+    engine_version: 94.0.4606.85
+  device:
+    type: smartphone
+    brand: Zuum
+    model: Covet X
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; CLEVER 3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.101 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 98.0.4758.101
+    engine: Blink
+    engine_version: 98.0.4758.101
+  device:
+    type: smartphone
+    brand: Ace
+    model: Clever 3
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; CITY4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.210 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 90.0.4430.210
+    engine: Blink
+    engine_version: 90.0.4430.210
+  device:
+    type: smartphone
+    brand: Konrow
+    model: City 4
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; BOLD N2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 94.0.4606.85
+    engine: Blink
+    engine_version: 94.0.4606.85
+  device:
+    type: smartphone
+    brand: Blu
+    model: Bold N2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 13; CLK-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 BroPP/1.0 SA/1 YandexSearch/20.85.1 YandexSearchWebView/20.85.1 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Chrome
+    version: 84.0.4147.135
+    engine: Blink
+    engine_version: 84.0.4147.135
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor X7b
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; Play Dash) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 70.0.3538.110
+    engine: Blink
+    engine_version: 70.0.3538.110
+  device:
+    type: smartphone
+    brand: Starmobile
+    model: Play Dash
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; PHICOMM C6051) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 70.0.3538.110
+    engine: Blink
+    engine_version: 70.0.3538.110
+  device:
+    type: smartphone
+    brand: Phicomm
+    model: Clue 2S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; DUKE7 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/71.0.3578.99 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 71.0.3578.99
+    engine: Blink
+    engine_version: 71.0.3578.99
+  device:
+    type: smartphone
+    brand: CKK Mobile
+    model: DUKE 7
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; Doro_8020x) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 95.0.4638.74
+    engine: Blink
+    engine_version: 95.0.4638.74
+  device:
+    type: smartphone
+    brand: Doro
+    model: 8020X
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; CCIT Xedition) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 70.0.3538.80
+    engine: Blink
+    engine_version: 70.0.3538.80
+  device:
+    type: smartphone
+    brand: CCIT
+    model: X Edition
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; OPSSON IVO 6677 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: Opsson
+    model: IVO 6677
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; fa-ir; CCIT 405 Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: CCIT
+    model: Vogue 405
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; A397i) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 73.0.3683.90
+    engine: Blink
+    engine_version: 73.0.3683.90
+  device:
+    type: smartphone
+    brand: Lenovo
+    model: A397i
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml
index 7c5dabbaa4..79c25fb384 100644
--- a/Tests/fixtures/tablet-11.yml
+++ b/Tests/fixtures/tablet-11.yml
@@ -1662,3 +1662,345 @@
     model: Optima 8404D 4G
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; DBR-W19; HMSCore 6.13.0.322) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.5.303 Safari/537.36
+  os:
+    name: HarmonyOS
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 14.0.5.303
+    engine: Blink
+    engine_version: 99.0.4844.88
+  device:
+    type: tablet
+    brand: Huawei
+    model: MatePad 11 (2023) WiFi
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; PET 101-H232E Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: tablet
+    brand: PEAQ
+    model: PET 101-H232E
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; T0802L Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: tablet
+    brand: NUU Mobile
+    model: Tab 8
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; T0801L Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: tablet
+    brand: NUU Mobile
+    model: Tab 8
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; X8ULTRA Build/S00812; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 122.0.6261.119
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: tablet
+    brand: DIALN
+    model: X8 Ultra
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.1.1; Gemini 4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 7.1.1
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 71.0.3578.99
+    engine: Blink
+    engine_version: 71.0.3578.99
+  device:
+    type: tablet
+    brand: Planet Computers
+    model: Gemini 4G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; AUPO Zeus 10 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Safari/537.36 OPR/81.2.4292.78581
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Opera
+    version: 81.2.4292.78581
+    engine: Blink
+    engine_version: 122.0.6261.119
+  device:
+    type: tablet
+    brand: AUPO
+    model: Zeus 10 Pro
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; CCIT A100W Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A100W
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; CCIT A170W Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A170W
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; CCIT A8W Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A8W
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; fa-ir; CCIT A160W Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A160W
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; ar-eg; CCIT A120W Build/JZO54K) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.1.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A120W
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; CCIT CW200 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36
+  os:
+    name: Android
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 30.0.0.0
+    engine: Blink
+    engine_version: 30.0.0.0
+  device:
+    type: tablet
+    brand: CCIT
+    model: CW200
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; ar-SA; CCIT A9W Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 UCBrowser/10.0.2.523 U3/0.8.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    version: 10.0.2.523
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A9W
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; fa-ir; CCIT A755G Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A755G
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; CCIT A725G Build/JDQ39) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A725G
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; CCIT A708G Build/IMM76D) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.1.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: CCIT
+    model: A708G
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; CCIT A703+ Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 51.0.2704.81
+    engine: Blink
+    engine_version: 51.0.2704.81
+  device:
+    type: tablet
+    brand: CCIT
+    model: A703+
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: UCWEB/2.0 (Linux; U; Adr 4.2; en-US; CCITA715G) U2/1.0.0 UCBrowser/9.2.3.324 U2/1.0.0 Mobile
+  os:
+    name: Android
+    version: "4.2"
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    version: 9.2.3.324
+    engine: ""
+    engine_version: ""
+  device:
+    type: tablet
+    brand: CCIT
+    model: A715G
+  os_family: Android
+  browser_family: Unknown
diff --git a/Tests/fixtures/tablet-4.yml b/Tests/fixtures/tablet-4.yml
index bb0bcc8edc..2451dd52b8 100644
--- a/Tests/fixtures/tablet-4.yml
+++ b/Tests/fixtures/tablet-4.yml
@@ -9240,3 +9240,57 @@
     model: Gravity 2 Max
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ja-jp; N70 DUAL CORE Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: "4.0.4"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: Yuandao
+    model: N70
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ja-jp; SHT21 Build/SC170) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: "4.0.4"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: Sharp
+    model: Aquos Pad SHT21
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ro-ro; GV7777 Build/GV7777) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: 4.0.3
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: Prestigio
+    model: Geo Vision 7777
+  os_family: Android
+  browser_family: Android Browser
diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml
index 96b83357a3..7f2a37c6f5 100644
--- a/Tests/fixtures/tablet-6.yml
+++ b/Tests/fixtures/tablet-6.yml
@@ -374,8 +374,8 @@
     engine_version: "90.0.4430.210"
   device:
     type: tablet
-    brand: TrekStor
-    model: PEAQ PET 100
+    brand: PEAQ
+    model: PET 100
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml
index 8c1a820084..a4427ea880 100644
--- a/Tests/fixtures/tablet-7.yml
+++ b/Tests/fixtures/tablet-7.yml
@@ -5121,8 +5121,8 @@
     engine_version: 81.0.4044.111
   device:
     type: tablet
-    brand: TrekStor
-    model: PEAQ PET 100
+    brand: PEAQ
+    model: PET 100 LTE
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/unknown.yml b/Tests/fixtures/unknown.yml
index 522d29998a..4dfa6d7322 100644
--- a/Tests/fixtures/unknown.yml
+++ b/Tests/fixtures/unknown.yml
@@ -871,24 +871,6 @@
     model: ""
   os_family: Android
   browser_family: Android Browser
--
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ro-ro; GV7777 Build/GV7777) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
-  os:
-    name: Android
-    version: "4.0.3"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: ""
-    brand: ""
-    model: ""
-  os_family: Android
-  browser_family: Android Browser
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ru-ru; T-800 Build/ICS.g04w138188ref.20121030) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os:
@@ -1843,42 +1825,6 @@
     model: ""
   os_family: Android
   browser_family: Android Browser
--
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ja-jp; N70 DUAL CORE Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
-  os:
-    name: Android
-    version: "4.0.4"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: ""
-    brand: ""
-    model: ""
-  os_family: Android
-  browser_family: Android Browser
--
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ja-jp; SHT21 Build/SC170) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
-  os:
-    name: Android
-    version: "4.0.4"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: ""
-    brand: ""
-    model: ""
-  os_family: Android
-  browser_family: Android Browser
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ms-my; MID Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 171360abab..27e3984885 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -7,7 +7,7 @@
 
 # Ace or ACE France (www.acemobile.fr)
 Ace:
-  regex: '(?:BUZZ [1-4]|CLEVER 1|URBAN [13](?: Pro)?)(?:[);/ ]|$)'
+  regex: '(?:BUZZ [1-4]|CLEVER [13]|URBAN [13](?: Pro)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BUZZ 4 Ultra'
@@ -20,8 +20,8 @@ Ace:
       model: 'Buzz $1 Plus'
     - regex: 'BUZZ ([123])'
       model: 'Buzz $1'
-    - regex: 'CLEVER 1'
-      model: 'Clever 1'
+    - regex: 'CLEVER ([13])'
+      model: 'Clever $1'
     - regex: 'URBAN 1 Pro'
       model: 'Urban 1 Pro'
     - regex: 'URBAN ([13])'
@@ -3861,7 +3861,7 @@ Bitel:
 
 # Blu
 Blu:
-  regex: 'BLU[ _]|(?:blu|(?<!DROIDZ )Dash)[ _]([^/;)]+)(?: Build|[;)])|(?:Studio[ _](G3|J8M|X10L|X12|5\.0K|5\.5|View(?: XL)?|Mega(?: LTE)?|C 8\+8|[CGM][ _]HD|G2 HD|G4|[CGX]|SELFIE|Selfie LTE|Touch|M[45] Plus|J[1258]|X[89] HD|X10\+?|XL(?: 2)?)|Advance (4\.0 ?[LM]|5\.[02](?: HD)?|A4|L[45])|M6 2021|ENERGY (DIAMOND|XL)|ENERGY[_ ]DIAMOND[_ ]MINI|Energy X 2|LIFE XL|B110DL|Dash (?:X[2L]|L3)|PURE (?:X[LR]|MINI|View)|Life One X2|G50 (?:Mega|Plus)|G51 Plus|G90(?: PRO)?|G91 Pro|GRAND (?:M3|Max|5\.5 HD|XL LTE|Mini|Energy)|R1 (?:HD|PLUS)|R2 (?:LTE|Plus)|Tank Xtreme [45]\.0|Tank Xtreme(?: Pro)?|Touchbook M7 Pro|DASH X PLUS|C[456] 2019|BOLD (?:M7|N1)|B1[34]0DL|Vivo (?:5 Mini|One Plus|5R|XL[234]| Plus|8L|XI[+]?|GO)|(?<!Neffos )C[56]L(?: 2020)?|C6 2020|G9 PRO|D701|VIEW 1|B13[15]DL|R2 3G|Grand (?:M2X?|XL|M2 LTE)|D600|D5[01]0|DIAMOND M|M8L Plus|STUDIO ENERGY|M8L 2022|LIFE X8|M10L Pro)(?:[);/ ]|$)'
+  regex: 'BLU[ _]|(?:blu|(?<!DROIDZ )Dash)[ _]([^/;)]+)(?: Build|[;)])|(?:Studio[ _](G3|J8M|X10L|X12|5\.0K|5\.5|View(?: XL)?|Mega(?: LTE)?|C 8\+8|[CGM][ _]HD|G2 HD|G4|[CGX]|SELFIE|Selfie LTE|Touch|M[45] Plus|J[1258]|X[89] HD|X10\+?|XL(?: 2)?)|Advance (4\.0 ?[LM]|5\.[02](?: HD)?|A4|L[45])|M6 2021|ENERGY (DIAMOND|XL)|ENERGY[_ ]DIAMOND[_ ]MINI|Energy X 2|LIFE XL|B110DL|Dash (?:X[2L]|L3)|PURE (?:X[LR]|MINI|View)|Life One X2|G50 (?:Mega|Plus)|G51 Plus|G90(?: PRO)?|G91 Pro|GRAND (?:M3|Max|5\.5 HD|XL LTE|Mini|Energy)|R1 (?:HD|PLUS)|R2 (?:LTE|Plus)|Tank Xtreme [45]\.0|Tank Xtreme(?: Pro)?|Touchbook M7 Pro|DASH X PLUS|C[456] 2019|BOLD (?:M7|N[12])|B1[34]0DL|Vivo (?:5 Mini|One Plus|5R|XL[234]| Plus|8L|XI[+]?|GO)|(?<!Neffos )C[56]L(?: 2020)?|C6 2020|G9 PRO|D701|VIEW 1|B13[15]DL|R2 3G|Grand (?:M2X?|XL|M2 LTE)|D600|D5[01]0|DIAMOND M|M8L Plus|STUDIO ENERGY|M8L 2022|LIFE X8|M10L Pro|G52L|Studio Mini 2023)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Advance (4\.0 ?[LM]|4\.0|5\.[02](?: HD)?|A4|L[54])'
@@ -3872,6 +3872,8 @@ Blu:
       model: 'Studio X Mini'
     - regex: 'Studio X10 2022'
       model: 'Studio X10 (2022)'
+    - regex: 'Studio Mini 2023'
+      model: 'Studio Mini (2023)'
     - regex: '(?:BLU[_ ])?Studio[ _](G3|J8M|5\.0 C|5\.5|C 5\+5 LTE|View(?: XL)?|Mega(?: LTE)?|C 8\+8|G HD LTE|[CG][ _]HD|C|G|Touch|M HD|G2 HD|M[45] Plus|J[1258]|X[89] HD|X5|X10\+?|XL(?: 2)?|X|G4)(?:[);/ ]|$)'
       model: 'Studio $1'
     - regex: '(?:BLU[_ ])?Studio[ _]5\.0 ?K(?:[);/ ]|$)'
@@ -3920,7 +3922,7 @@ Blu:
       model: 'Pure $1'
     - regex: 'PURE MINI'
       model: 'Pure Mini'
-    - regex: 'BOLD (M7|N1)'
+    - regex: 'BOLD (M7|N[123])'
       model: 'Bold $1'
     - regex: 'Life One X2 Mini'
       model: 'Life One X2 Mini'
@@ -3948,7 +3950,7 @@ Blu:
       model: 'G$1 Pro'
     - regex: 'G91 PRO'
       model: 'G91 Pro'
-    - regex: '(G90|D701|R2 3G)(?:[);/ ]|$)'
+    - regex: '(G90|D701|R2 3G|G52L)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'GRAND 5\.5 HD'
       model: 'Grand 5.5 HD'
@@ -4249,7 +4251,7 @@ Brondi:
 
 # VGO TEL (vgotel.com)
 VGO TEL:
-  regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[125]|22|[57])|i_Smart)(?:[);/ ]|$)'
+  regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[1256]|22|[57])|i_Smart)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Venture ?V([278]|1[02])(?:[);/ ]|$)'
@@ -5959,7 +5961,7 @@ ConCorde:
 
 # Condor (www.condor.dz)
 Condor:
-  regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX71[12]G|TFX71[34]L|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411|SP413)(?:[);/ ]|$)|CTAB[^/;]+ Build'
+  regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX71[12]G|TFX71[34]L|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411|SP413|PAM524)(?:[);/ ]|$)|CTAB[^/;]+ Build'
   device: 'smartphone'
   models:
     - regex: 'CTAB([^/;]+) Build'
@@ -6017,6 +6019,8 @@ Condor:
       model: 'Griffe G4S'
     - regex: 'PHQ520'
       model: 'Griffe G5'
+    - regex: 'PAM524'
+      model: 'Griffe G5 Plus'
     - regex: 'PHQ525'
       model: 'Griffe G6'
     - regex: 'PHQ526'
@@ -7233,6 +7237,8 @@ Doro:
   models:
     - regex: 'DSB-0230(?:[);/ ]|$)'
       model: '8050'
+    - regex: 'Doro[_ ]8020x(?:[);/ ]|$)'
+      model: '8020X'
     - regex: 'DSB-0220(?:[);/ ]|$)'
       model: '8080'
     - regex: 'Doro[ _-]?([^;/)]+) Build'
@@ -9122,7 +9128,7 @@ Explay:
 
 # General Mobile (www.generalmobile.com)
 General Mobile:
-  regex: 'General_Mobile_|GM 5 Plus|GM8 go|GM[ _][568][ _]d|GM [86]|General Mobile 4G|GM6_Tur|GM 9 (?:Pro|Plus)|(?: GM 5|e-tab 20|Android 1[012];(?: [\w-]+;)? (?:G[35]01|G[35]10|G702|(?<!Huawei )G700)|Discovery(?![_ ]XT) (?:Air|Elite(?: Plus)?)|GM Discovery II|GM Discovery tab 8|Discovery II Mini| GM6|G300|G008|android 4([\d.]*);(?: [\w-]+;)? Discovery|e-?tab5|G512|G312)(?:[);/ ]|$)'
+  regex: 'General_Mobile_|GM 5 Plus|GM8 go|GM[ _][568][ _]d|GM [86]|General Mobile 4G|GM6_Tur|GM 9 (?:Pro|Plus)|(?: GM 5|e-tab 20|Android 1[012];(?: [\w-]+;)? (?:G[35]01|G[35]10|G702|(?<!Huawei )G700)|Discovery(?![_ ]XT) (?:Air|Elite(?: Plus)?)|GM Discovery II|GM Discovery tab 8|Discovery II Mini| GM6|G300|G008|android 4([\d.]*);(?: [\w-]+;)? Discovery|e-?tab5|G512|G31[246])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GM 5 Plus'
@@ -9135,6 +9141,10 @@ General Mobile:
       model: 'GM 21 Plus'
     - regex: 'G312'
       model: 'GM 22'
+    - regex: 'G316'
+      model: 'GM 23'
+    - regex: 'G314'
+      model: 'GM 23 SE'
     - regex: 'G512'
       model: 'GM 22 Plus'
     - regex: 'G702'
@@ -10038,7 +10048,7 @@ TD Tech:
 
 # Huawei
 Huawei:
-  regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ultym5|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[234]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR(?!-[AH]0)|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U|LX3)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N[23]9|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-(?:TN10|AN[12]0)|AQM-([AT]L[01]0|LX1)|MOA-([AT]L[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?|L28)|MED-(?:[AT]L00|LX[29]N?|AL20)|EBG-(?:AN[01]0|TN00|N19)|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN[07]0|MXW-[AT]N00|JKM-AL00[ab]|TAH-(?:N29|AN00)m?|C8817D|T1-821W|d-01[JKH]|d-02[HK]|KRJ-(?:W09|AN00)|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|NOH-(?:NX9|AN0[01]|AN[58]0|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2K-L09|KOB2-(?:AL00|[LW]09|L03)|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN[10]0|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[0568]0|LX9)|AGS5-(?:L09|W09)|AGS3K-(?:W20|[WL]0[09])|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-(?:AL00|L49)|BZI-(?:AL00|W00)|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-(?:AL[0689]0|LX9)|GIA-AN[08]0|LEO-DLXXE?|BZA-L00|MGI-AN00|CMA-(?:LX[123]|AN[04]0)|NEW-AN90|KRJ2-(?:W09|AN00)|BRT-(?:W09|AN09)|ANY-(?:[LN]X1|LX[23]|AN00)|JLN-(?:LX[13]|AL00)|LGE-(?:NX[19]|AN[012]0)|TNA-AN00|TFY-(?:LX[123]|AN[04]0)|DIO-AN00|BZW-AL[01]0|MOGOLIA|CM990|MGA-(?:AL[04]0|LX[39])|60[56]HW|Peppa-(?:L2[23]B|L0[23]B)|KANT-\d{3}[BCS]?|Kobe3-L09|FNE-(?:NX9|AN00)|HPB-AN00|Mate ?(?:[34]0 RS|Xs|30)|Y530|SDY-AN00|EC6108V[89]|CTR-(?:LX[123]|AL00)|VNE-(?:LX[123]|N41|AN[04]0)|HMW-W09|GLA-(?:LX[13]|AL00)|HEY2?-W09|GOT-(?:AL09|W[02]9)|PAL-(?:AL00|LX9)|PAN-L29|NNH-AN00|P Smart S|NCO-(?:LX[13]|AL00)|DCO-(?:AL00|LX9)|CET-(?:AL[06]0|LX9)|ADT-AN00|RMO-(?:AN00|NX[13])|RKY-(?:AN00|LX[123])|M300-L09|EVE-LX9N?|BNE-(?:LX1|AL00)|dtab01|BZT4-W19|ROD-W09|ANP-AN00|WGRR-W09|HN3-U01|Holly-U19|BLM-00|ANN-AN00|VNA-(?:LX[23]|L29)|CRT-(?:NX1|LX[123]|AN00)|AGM-W09HN|PGT-(?:AN[12]0|N[01]9)|GLL-AL01|MNA-(?:LX9|AL00)|LNA-(?:AL00|LX9)|ALT-(?:L29|AL[01]0)|MAO-(?:LX9N?|AL00)|Enjoy 20 SE|ANB-AN00|STG-(?:AL00|LX1)|LTK-LX3|GOA-(?:LX9|AL80)|nova (?:6 5G|6SE|Lite3Plus|5T Pro)| Angela-L|DBR-W09|WOD-LX[123]|REP-AN00|WDY-(?:LX[123]|AN00)|FOA-LX9|ALI-(?:AN00|NX1)|DBY2-(?:W09|L09)|REA-(?:NX9|AN00)|AMZ-L29|AGT-AN00|VER-(?:AN[01]0|N49)|ELN-[WL]09|BTK-(?:AL09|W09)|FRI-NX9|LLY-(?:LX[123]|AN00)|MAA-AN[01]0|BVL-AN16|MAG-AN00|RBN-NX1|PCE-W29|ALN-AL[018]0'
+  regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ultym5|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[234]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR(?!-[AH]0)|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U|LX3)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N[23]9|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-(?:TN10|AN[12]0)|AQM-([AT]L[01]0|LX1)|MOA-([AT]L[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?|L28)|MED-(?:[AT]L00|LX[29]N?|AL20)|EBG-(?:AN[01]0|TN00|N19)|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN[07]0|MXW-[AT]N00|JKM-AL00[ab]|TAH-(?:N29|AN00)m?|C8817D|T1-821W|d-01[JKH]|d-02[HK]|KRJ-(?:W09|AN00)|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|NOH-(?:NX9|AN0[01]|AN[58]0|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2K-L09|KOB2-(?:AL00|[LW]09|L03)|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN[10]0|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[0568]0|LX9)|AGS5-(?:L09|W09)|AGS3K-(?:W20|[WL]0[09])|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-(?:AL00|AL60|L49)|BZI-(?:AL00|W00)|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-(?:AL[0689]0|LX9)|GIA-AN[08]0|LEO-DLXXE?|BZA-L00|MGI-AN00|CMA-(?:LX[123]|AN[04]0)|NEW-AN90|KRJ2-(?:W09|AN00)|BRT-(?:W09|AN09)|ANY-(?:[LN]X1|LX[23]|AN00)|JLN-(?:LX[13]|AL00)|LGE-(?:NX[19]|AN[012]0)|TNA-AN00|TFY-(?:LX[123]|AN[04]0)|DIO-AN00|BZW-AL[01]0|MOGOLIA|CM990|MGA-(?:AL[04]0|LX[39])|60[56]HW|Peppa-(?:L2[23]B|L0[23]B)|KANT-\d{3}[BCS]?|Kobe3-L09|FNE-(?:NX9|AN00)|HPB-AN00|Mate ?(?:[34]0 RS|Xs|30)|Y530|SDY-AN00|EC6108V[89]|CTR-(?:LX[123]|AL[02]0)|VNE-(?:LX[123]|N41|AN[04]0)|HMW-W09|GLA-(?:LX[13]|AL00)|HEY2?-W09|GOT-(?:AL09|W[02]9)|PAL-(?:AL00|LX9)|PAN-L29|NNH-AN00|P Smart S|NCO-(?:LX[13]|AL00)|DCO-(?:AL00|LX9)|CET-(?:AL[06]0|LX9)|ADT-AN00|RMO-(?:AN00|NX[13])|RKY-(?:AN[01]0|LX[123])|M300-L09|EVE-LX9N?|BNE-(?:LX1|AL00)|dtab01|BZT4-W19|ROD-W09|ANP-AN00|WGRR-W09|HN3-U01|Holly-U19|BLM-00|ANN-AN00|VNA-(?:LX[23]|L29)|CRT-(?:NX1|LX[123]|AN00)|AGM-W09HN|PGT-(?:AN[12]0|N[01]9)|GLL-AL01|MNA-(?:LX9|AL00)|LNA-(?:AL00|LX9)|ALT-(?:L29|AL[01]0)|MAO-(?:LX9N?|AL00)|Enjoy 20 SE|ANB-AN00|STG-(?:AL00|LX1)|LTK-LX3|GOA-(?:LX9|AL80)|nova (?:6 5G|6SE|Lite3Plus|5T Pro)| Angela-L|DBR-W[01]9|WOD-LX[123]|REP-AN00|WDY-(?:LX[123]|AN00)|FOA-(?:LX9|AL00)|ALI-(?:AN00|NX1)|DBY2-(?:W09|L09)|REA-(?:NX9|AN00)|AMZ-L29|AGT-AN00|VER-(?:AN[01]0|N49)|ELN-[WL]09|BTK-(?:AL09|W09)|FRI-NX9|LLY-(?:LX[123]|AN00)|MAA-AN[01]0|BVL-AN16|MAG-AN00|RBN-NX1|PCE-W29|ALN-AL[018]0|FIN-AL60|ADA-AL00U?|BON-AL00|BRA-AL00|CLK-LX1'
   device: 'smartphone'
   models:
     - regex: 'CRT-NX1'
@@ -10135,6 +10145,8 @@ Huawei:
       model: 'Enjoy 50 Pro'
     - regex: 'STG-AL00'
       model: 'Enjoy 60X'
+    - regex: 'CTR-AL20'
+      model: 'Enjoy 70 Pro'
     - regex: 'TAG-(?:L0[13]|L32|L13|L2[123])(?:[);/ ]|$)'
       model: 'GR3'
     - regex: 'NCE-(AL[10]0|TL10)(?:[);/ ]|$)'
@@ -10199,6 +10211,8 @@ Huawei:
       model: 'P50E'
     - regex: 'BAL-(?:AL00|L49)'
       model: 'P50 Pocket'
+    - regex: 'BAL-AL60'
+      model: 'Pocket S'
     - regex: 'U8860(?:[);/ ]|$)'
       model: 'Honor'
     - regex: 'COL-(?:AL[01]0|TL[01]0|L29|L10)(?:[);/ ]|$)'
@@ -10417,12 +10431,16 @@ Huawei:
       model: 'Honor Play 4 Pro'
     - regex: '(?:AKA-AL10|Honor Play 4T)(?:[);/ ]|$)'
       model: 'Honor Play 4T'
-    - regex: 'RKY-AN00(?:[);/ ]|$)'
+    - regex: 'RKY-AN00'
       model: 'Honor Play 40 Plus'
+    - regex: 'RKY-AN10'
+      model: 'Honor Play 7T 5G'
     - regex: 'WDY-AN00'
       model: 'Honor Play 40C'
     - regex: 'RKY-LX[123]'
       model: 'Honor X7a'
+    - regex: 'CLK-LX1'
+      model: 'Honor X7b'
     - regex: '(?:NZA-AL00?|KOZ-AL40)(?:[);/ ]|$)'
       model: 'Honor Play 5T' # Vitality Edition
     - regex: 'NEW-AN90'
@@ -10616,6 +10634,8 @@ Huawei:
       model: 'Mate 60 Pro'
     - regex: 'ALN-AL10'
       model: 'Mate 60 Pro+'
+    - regex: 'BRA-AL00'
+      model: 'Mate 60'
     - regex: 'NXT-(?:AL10|L[02]9)(?:[);/ ]|$)'
       model: 'Mate 8'
     - regex: '(?:MHA-(?:L[02]9|[AT]L00)|M300-L09)(?:[);/ ]|$)'
@@ -10690,8 +10710,16 @@ Huawei:
       model: 'Nova 11i'
     - regex: 'GOA-(?:LX9|AL80)'
       model: 'Nova 11 Pro'
-    - regex: 'FOA-LX9'
+    - regex: 'FOA-(?:LX9|AL00)'
       model: 'Nova 11'
+    - regex: 'FIN-AL60a'
+      model: 'Nova 11 Active Edition'
+    - regex: 'BON-AL00'
+      model: 'Nova 11 SE'
+    - regex: 'ADA-AL00U'
+      model: 'Nova 12 Ultra'
+    - regex: 'ADA-AL00'
+      model: 'Nova 12 Pro'
     - regex: 'JNY-LX2(?:[);/ ]|$)'
       model: 'Nova 7i'
     - regex: '(?:ANG-LX[12]|Angela-(?:L2[12]B|L02B))(?:[);/ ]|$)'
@@ -10933,7 +10961,10 @@ Huawei:
       model: 'MatePad 10.4" 5G'
       device: 'tablet'
     - regex: 'DB[YR]-W09(?:[);/ ]|$)'
+      device: 'tablet'
       model: 'MatePad 11 WiFi'
+    - regex: 'DBR-W19'
+      model: 'MatePad 11 (2023) WiFi'
       device: 'tablet'
     - regex: 'GOT-AL09(?:[);/ ]|$)'
       model: 'MatePad Pro 11'
@@ -14092,7 +14123,7 @@ Aligator:
 
 # lenovo (lenovo.com)
 Lenovo:
-  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|ZUK[ -_]|(?:TB2-X30L|TB3-710I|TB128FU|YT3-X50[MFL]|K50a40|TB-(?:X103F|8504F|X304F|X704V|X704A)|A5500-H|A2107A-H|A3500-HV|A2109A|S6000|Z2 Plus|Vibe[ _](?:P1|S6i Plus|S[23567]i|C|[ZX]2|K5(?: Plus)?|V7)|P2A42|L38011|L18011|[5-8]01LV|[67]02LV|Z2131|K350t|K31-t3|TAB 2 A8-50LC|S90-A|A101LV|P70-A|VR-1541F|d-42A|lineage_A6020|EveryPad2|A2010l36|F0CU0028RK|TB310XU|TB132FU|TB32(?:8[FX]U|0FC)|TB138FC|PB-6505Y|TB-X505[FL]|TB-8704V|TB3[05]0[FX]U|TB-X605[FL]|L38043|TB3-X70L|TB-X605[LF]C|A7600-HV?|YT-X703F|TB371FC|TB3[17]0FU|TB331FC)(?:[);/ ]|$)'
+  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|ZUK[ -_]|(?:TB2-X30L|TB3-710I|TB128FU|YT3-X50[MFL]|K50a40|TB-(?:X103F|8504F|X304F|X704V|X704A)|A5500-H|A2107A-H|A3500-HV|A2109A|S6000|Z2 Plus|Vibe[ _](?:P1|S6i Plus|S[23567]i|C|[ZX]2|K5(?: Plus)?|V7)|P2A42|L38011|L18011|[5-8]01LV|[67]02LV|Z2131|K350t|K31-t3|TAB 2 A8-50LC|S90-A|A101LV|P70-A|VR-1541F|d-42A|lineage_A6020|EveryPad2|A2010l36|F0CU0028RK|TB310XU|TB132FU|TB32(?:8[FX]U|0FC)|TB138FC|PB-6505Y|TB-X505[FL]|TB-8704V|TB3[05]0[FX]U|TB-X605[FL]|L38043|TB3-X70L|TB-X605[LF]C|A7600-HV?|YT-X703F|TB371FC|TB3[17]0FU|TB331FC|A397i)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Lenovo ?G780'
@@ -14531,7 +14562,7 @@ Lenovo:
       model: 'Phab'
     - regex: 'PB1-770M(?:[);/ ]|$)'
       model: 'Phab Plus'
-    - regex: '(S90-A|P70-A)(?:[);/ ]|$)'
+    - regex: '(S90-A|P70-A|A397i)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'IdeaPad ?([^;/]*) Build'
       model: 'IdeaPad $1'
@@ -15567,7 +15598,7 @@ Konka:
 
 # Konrow (konrow.com)
 Konrow:
-  regex: 'KONROW[_ ]|(?:LINK55|KTAB_1003|BIGCOOL|SOFT5|COOLFIVE|COOL-K|Just5|Link5|EASY ?(?:5|62|K55)|EASY_5_EEA|EASY55|CITY55?|Cool55|SKY_?55_EEA|android 11;(?: [\w-]+;)? SWEET5|SWEET 55)(?:[);/ ]|$)'
+  regex: 'KONROW[_ ]|(?:LINK55|KTAB_1003|BIGCOOL|SOFT5|COOLFIVE|COOL-K|Just5|Link5|EASY ?(?:5|62|K55)|EASY_5_EEA|EASY55|CITY55?|CITY4|Cool55|SKY_?55_EEA|android 11;(?: [\w-]+;)? SWEET5|SWEET 55)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BIGCOOL(?:[);/ ]|$)'
@@ -15590,10 +15621,8 @@ Konrow:
       model: 'Easy $1'
     - regex: 'EASY_5_EEA(?:[);/ ]|$)'
       model: 'Easy 5'
-    - regex: 'CITY5(?:[);/ ]|$)'
-      model: 'City 5'
-    - regex: 'CITY55(?:[);/ ]|$)'
-      model: 'City 55'
+    - regex: 'CITY(55?|4)(?:[);/ ]|$)'
+      model: 'City $1'
     - regex: 'SKY_?55_EEA(?:[);/ ]|$)'
       model: 'Sky 55'
     - regex: 'SWEET ?(55?)(?:[);/ ]|$)'
@@ -16498,7 +16527,7 @@ Mobile Kingdom:
 
 # MSI (msi.com)
 MSI:
-  regex: 'Primo ?(?:9[13]|81|76)|Enjoy 7 Plus'
+  regex: 'Primo ?(?:9[13]|81|76)|(?:Enjoy 7 Plus|GP70 2OD)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     # explicit tablet models
@@ -16506,6 +16535,10 @@ MSI:
       model: 'Primo $1'
     - regex: 'Enjoy 7 Plus'
       model: 'Enjoy 7 Plus'
+    # explicit notebook models
+    - regex: '(GP70 2OD)'
+      device: 'desktop'
+      model: '$1'
 
 # MLLED
 MLLED:
@@ -17797,9 +17830,13 @@ Nomi:
 
 # NUU Mobile
 NUU Mobile:
-  regex: 'NUU_|(?:(?:N(570[24]|500[12])L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L|S6501L|S6303L)(?:[);/ ]|$)'
+  regex: 'NUU_|(?:(?:N(570[24]|500[12])L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L|S6501L|S6303L|T080[12]L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'T080[12]L'
+      device: 'tablet'
+      model: 'Tab 8'
+
     - regex: 'NUU_A([13]L?)'
       model: 'A$1'
     - regex: 'NUU_M([32])(?:[);/ ]|$)'
@@ -18326,12 +18363,12 @@ Onda:
 
 # OnePlus (www.oneplus.com or oneplus.com.ru)
 OnePlus:
-  regex: '(?:du_)?ONEPLUS|(?:PGKM10|CPH251[35]|CPH2551|CPH2569|CPH249[31]|CPH244[79]|CPH240[19]|CPH24[12]3|CPH246[579]|CPH2487|CPH241[157]|CPH2419|CPH245[91]|CPH2399|CPH238[19]|CPH2585|A0001|A200[135]|AC200[13]|A300[03]|A3010|A5000|A600[03]|A601[03]|BE201[1235]|BE202[5689]|E100[135]|GM191[03517]|GM190[0135]|GM192[05]|HD191[0137]|HD190[01357]|HD1925|IN201[013579]|IN202[0135]|KB200[01357]|LE211[01357]|LE212[035]|GN2200|Nord N10 5G|LE210[01]|LE212[17]|DE211[78]|DN210[13]|EB210[13]|MT211[01]|IV2201|NE221[01357]|PG[PZ]110|PH[BKP]110|OPD2203|PJ[ADE]110)(?: Build|[;)])'
+  regex: '(?:du_)?ONEPLUS|(?:PGKM10|CPH251[35]|CPH2551|CPH2569|CPH249[31]|CPH244[79]|CPH240[19]|CPH24[12]3|CPH246[579]|CPH2487|CPH241[157]|CPH2419|CPH245[91]|CPH2399|CPH238[19]|CPH258[135]|CPH2573|CPH2611|A0001|A200[135]|AC200[13]|A300[03]|A3010|A5000|A600[03]|A601[03]|BE201[1235]|BE202[5689]|E100[135]|GM191[03517]|GM190[0135]|GM192[05]|HD191[0137]|HD190[01357]|HD1925|IN201[013579]|IN202[0135]|KB200[01357]|LE211[01357]|LE212[035]|GN2200|Nord N10 5G|LE210[01]|LE212[17]|DE211[78]|DN210[13]|EB210[13]|MT211[01]|IV2201|NE221[01357]|PG[PZ]110|PH[BKP]110|OPD2203|PJ[ADE]110)(?: Build|[;)])'
   device: 'smartphone'
   models:
-    - regex: '(?:CPH2585)(?:[);/ ]|$)'
+    - regex: '(?:CPH2585|CPH2611)(?:[);/ ]|$)'
       model: '12R'
-    - regex: 'PJD110(?:[);/ ]|$)'
+    - regex: '(?:PJD110|CPH258[13]|CPH2573)(?:[);/ ]|$)'
       model: '12'
     - regex: '(?:CPH244[79]|PHB110|CPH2451)(?:[);/ ]|$)'
       model: '11'
@@ -18892,7 +18929,7 @@ OPPO:
       model: 'A78'
     - regex: '(?:OPPO[ _]?)?A79kt'
       model: 'A79'
-    - regex: '(?:OPPO[ _]?)?CPH2557'
+    - regex: '(?:OPPO[ _]?)?CPH255[37]'
       model: 'A79 5G'
     - regex: '(?:OPPO[ _]?)?CPH2473'
       model: 'A77s'
@@ -18946,6 +18983,8 @@ OPPO:
       model: 'F1 Plus'
     - regex: 'CPH2527'
       model: 'F23 5G'
+    - regex: 'CPH2603'
+      model: 'F25 Pro 5G'
     - regex: 'CPH191[135](?:[);/ ]|$)'
       model: 'F11'
     - regex: 'CPH19(?:69|87)(?:[);/ ]|$)'
@@ -19160,6 +19199,8 @@ OPPO:
       model: 'Reno 10 Pro+ 5G'
     - regex: 'PJJ110'
       model: 'Reno 11 Pro'
+    - regex: 'CPH2599'
+      model: 'Reno 11'
     - regex: '(?:PCKM00|CPH1907)(?:[);/ ]|$)'
       model: 'Reno 2'
     - regex: 'CPH1989(?:[);/ ]|$)'
@@ -19170,7 +19211,7 @@ OPPO:
       model: 'Reno 3'
     - regex: '(?:CPH2013|A002OP)(?:[);/ ]|$)'
       model: 'Reno 3A'
-    - regex: '(?:PDCM00|A001OP)(?:[);/ ]|$)'
+    - regex: '(?:PDCM00|A001OP|CPH2048)(?:[);/ ]|$)'
       model: 'Reno 3 5G'
     - regex: '(?:PCR[MT]00|CPH203[567]|CPH2009)'
       model: 'Reno 3 Pro'
@@ -19266,6 +19307,8 @@ OPPO:
       model: 'Reno Z'
     - regex: 'A59st(?:[);/ ]|$)'
       model: 'A59s'
+    - regex: 'CPH2617'
+      model: 'A59 5G'
 
     - regex: 'OPPO ?(CNM632)'
       device: 'tv'
@@ -22654,7 +22697,7 @@ Positivo:
 
 # Prestigio (prestigio.ru)
 Prestigio:
-  regex: 'Prestigio 5500 DUO|(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+(?:[);/ ]|$)|Muze C3|PTV50SS04X_CIS_BK|PTV32SS08Z|PTV40SS04Y_CIS_ML|PTV32SS04Z_CIS_(?:ML|BK)|SILVER POS|PAB4411'
+  regex: 'Prestigio 5500 DUO|(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+(?:[);/ ]|$)|Muze C3|PTV50SS04X_CIS_BK|PTV32SS08Z|PTV40SS04Y_CIS_ML|PTV32SS04Z_CIS_(?:ML|BK)|SILVER POS|PAB4411|GV7777'
   device: 'tablet'
   models:
     # explicit smartphone models
@@ -22828,6 +22871,8 @@ Prestigio:
       model: 'MultiPad 4 Diamond 7.0" 3G'
     - regex: 'PGPS7799CIS08GBPG(?:[);/ ]|$)'
       model: 'Geo Vision Tour 3'
+    - regex: 'GV7777(?:[);/ ]|$)'
+      model: 'Geo Vision 7777'
     - regex: 'PGPS7797(?:[);/ ]|$)'
       model: 'Geo Vision Tour 2'
     - regex: 'PMT(3118|38[74]8|3[123]01|3[12]57|778[18]|4[789]91|5588|5718|5791|577[18]|4327|3768)[_ ]([34])G'
@@ -23159,7 +23204,7 @@ Ophone:
 
 # Sigma or Sigma Mobile (sigmamobile.net)
 Sigma:
-  regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|X[-_ ]?treme[-_ ]?PQ[0-9]{2}|X-Style_(?:S5501|S3502)|Tab A1015)(?:[);/ ]|$)'
+  regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|X[-_ ]?treme[-_ ]?PQ[0-9]{2}|X-Style_(?:S550[12]|S3502)|Tab A1015)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2}) Max(?:[);/ ]|$)'
@@ -23215,7 +23260,7 @@ SGIN:
 
 # Sharp (jp.sharp)
 Sharp:
-  regex: 'SHARP(?!_2|1)|SBM|SH-?[0-9]+[a-z]?(?:[);/ ]|$)|AQUOS|(?:SH-T01|SH-M0[14-9]|SH-M1[1-7](?:-y)?|S[357]-SH|SH-[MZ]([12]0|01|22)|SH-[CL]02|SH-RM(?:1[1258]|02)|SH-R?M19s?|SH-R10A|[34]04SH|401SH|[45]02SH|306SH|[36]05SH|70[1246]SH|80[138]SH|90[1678]SH|50[3679]SH|SHL2[1235]|SHV4[0-8]|SHV3[1-9](?:[-_]u)?|FS80(?:1[08]|32|28|0[29])|TG-L900S|NP601SH|403SH|603SH|SHF3[1-4]|SHV4[035][-_]u|SW001SH|SHG0[1-8]|X4-SH|A002SH|DM-01[JH]|A[01]01SH|606SH|FS801[56]|d-41A|d-51C|NP80[567]SH|NP501SH|A00[34]SH|A102SH|IS05|SH-(?:S50|53A|51B|[HDA]01|01FDQ|S40P|M24)|LP-0[12]|FS8014|SBM00[35]SH|SBM103SH|A10[345]SH|lineage_ss2|LCD_xxSUFOC475A|A20[1248]SH|FS802[56]|ADS1|STTM21VAPP|NPA205SH|SHG10)(?:[);/ ]|$)'
+  regex: 'SHARP(?!_2|1)|SBM|SH-?[0-9]+[a-z]?(?:[);/ ]|$)|AQUOS|(?:SH-T01|SH-M0[14-9]|SH-M1[1-7](?:-y)?|S[357]-SH|SH-[MZ]([12]0|01|22)|SH-[CL]02|SH-RM(?:1[1258]|02)|SH-R?M19s?|SH-R10A|[34]04SH|401SH|[45]02SH|306SH|[36]05SH|70[1246]SH|80[138]SH|90[1678]SH|50[3679]SH|SHL2[1235]|SHV4[0-8]|SHV3[1-9](?:[-_]u)?|FS80(?:1[08]|32|28|0[29])|TG-L900S|NP601SH|403SH|603SH|SHF3[1-4]|SHV4[035][-_]u|SW001SH|SHG0[1-8]|X4-SH|A002SH|DM-01[JH]|A[01]01SH|606SH|FS801[56]|d-41A|d-51C|NP80[567]SH|NP501SH|A00[34]SH|A102SH|IS05|SH-(?:S50|53A|51B|[HDA]01|01FDQ|S40P|M24)|LP-0[12]|FS8014|SBM00[35]SH|SBM103SH|A10[345]SH|lineage_ss2|LCD_xxSUFOC475A|A20[1248]SH|FS802[56]|ADS1|STTM21VAPP|NPA205SH|SHG10|SHT21)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -23416,6 +23461,9 @@ Sharp:
     - regex: 'SH-08E(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Sharp Aquos Pad'
+    - regex: 'SHT21(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Aquos Pad SHT21'
     - regex: '(d-41A|d-51C)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'dtab $1'
@@ -23495,7 +23543,7 @@ Star:
 
 # Starmobile (starmobile.ph)
 Starmobile:
-  regex: '(?:Starmobile (?:Play (?:Neo|Spark|GO|Click|Max)|Astra)|DIAMOND D1|UP[_ ](?:Sense|Rave|Groove|Octa|Prime|Selfie|Snap|Xtreme|XL|Max|Vision|Neo)|PLAY (?:Club|Style|Click LTE)|ENGAGE7\+)(?:[);/ ]|$)'
+  regex: '(?:Starmobile (?:Play (?:Neo|Spark|GO|Click|Max)|Astra)|DIAMOND D1|UP[_ ](?:Sense|Rave|Groove|Octa|Prime|Selfie|Snap|Xtreme|XL|Max|Vision|Neo)|PLAY (?:Club|Style|Click LTE|Dash)|ENGAGE7\+)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Starmobile PLAY GO(?:[);/ ]|$)'
@@ -23504,7 +23552,7 @@ Starmobile:
       model: 'Astra'
     - regex: 'DIAMOND D1(?:[);/ ]|$)'
       model: 'Diamond D1'
-    - regex: '(?:Starmobile )?Play (Neo|Spark|Click|Club|Style|Max)(?:[);/ ]|$)'
+    - regex: '(?:Starmobile )?Play (Neo|Spark|Click|Club|Style|Max|Dash)(?:[);/ ]|$)'
       model: 'Play $1'
     - regex: 'UP[_ ](Sense|Rave|Groove|Octa|Prime|Selfie|Snap|Xtreme|XL|Max|Vision|Neo)(?:[);/ ]|$)'
       model: 'UP $1'
@@ -23728,7 +23776,7 @@ Syco:
 
 # Symphony
 Symphony:
-  regex: 'SYMPHONY[ \_]([a-z0-9]+)|(?:(?:roar[ _](?:V20|A50|V78|E80|V150))|roarV95|ZVIII?|V10[25]|V1[23]0|V128|V14[012]|V1[45]5|SYMTAB\d+| (?:i97|i7[245]|i6[58]|i30|i1[58]|i120|Z30 pro|[ZR]30|V9[246789]|V75m)|INOVA|Android 7(?:[\d.]*);(?: [\w-]+;)? P11|Android 6.*; (?:V75|i2[015])|EASY_NAV_2|G10\+)(?:[);/ ]|$)'
+  regex: 'SYMPHONY[ \_]([a-z0-9]+)|(?:(?:roar[ _](?:V20|A50|V78|E80|V150))|roarV95|ZVIII?|V10[25]|V1[23]0|V128|V14[012]|V1[45]5|SYMTAB\d+| (?:i97|i7[245]|i8[05]|i6[58]|i30|i1[58]|i120|Z30 pro|[ZR]30|V9[246789]|V75m)|INOVA|Android 7(?:[\d.]*);(?: [\w-]+;)? P11|Android 6.*; (?:V75|i2[015])|EASY_NAV_2|G10\+)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ZVIII'
@@ -23745,7 +23793,7 @@ Symphony:
       model: '$1 Pro'
     - regex: ' G10\+'
       model: 'G10 Plus'
-    - regex: ' (V141|V1[23]0|V10[25]|V128|V14[012]|i97|i7[245]|i6[58]|i30|i1[58]|i120|V1[45]5|[ZR]30|V9[246789]|V75m?|i2[015]|P11)(?:[);/ ]|$)'
+    - regex: ' (V141|V1[23]0|V10[25]|V128|V14[012]|i97|i7[245]|i8[05]|i6[58]|i30|i1[58]|i120|V1[45]5|[ZR]30|V9[246789]|V75m?|i2[015]|P11)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'SYMPHONY[ \_]([a-z0-9]+)'
       model: '$1'
@@ -24727,9 +24775,17 @@ Touchmate:
     - regex: 'Touchmate ([^/;]+) Build'
       model: '$1'
 
+# PEAQ (peaq-online.com)
+PEAQ:
+  regex: 'PEAQ[ _]|PET \d{3}'
+  device: 'tablet'
+  models:
+    - regex: 'PET ([^/;)]+)(?: Build|[;)])'
+      model: 'PET $1'
+
 # TrekStor (www.trekstor.de)
 TrekStor:
-  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|ST13416-1|VT10416-[12]|TFQCOAL01232|TFMTKAW01232|PEAQ PET 100|Xintroni10\.1'
+  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|ST13416-1|VT10416-[12]|TFQCOAL01232|TFMTKAW01232|Xintroni10\.1'
   device: 'tablet'
   models:
     - regex: 'ST10216-2A|VT10416-[12]'
@@ -24752,8 +24808,6 @@ TrekStor:
       model: '$1'
     - regex: 'Xintroni10\.1'
       model: 'SurfTab Xintron I 10.1"'
-    - regex: '(PEAQ PET 100)'
-      model: '$1'
 
 # Trevi
 Trevi:
@@ -27293,11 +27347,13 @@ Yu:
     - regex: 'YU (Yureka Black)(?:[);/ ]|$)'
       model: '$1'
 
-# Yuandao
+# Yuandao or YuanDao
 Yuandao:
-  regex: 'N101[ _]DUAL(?:[ _]CORE)?(?:[ _]?2)?(?:[ _]V11)?(?:[);/ ]|$)'
+  regex: '(?:N101[ _]DUAL(?:[ _]CORE)?(?:[ _]?2)?(?:[ _]V11)?|N70 DUAL CORE)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'N101'
+  models:
+    - regex: 'N(101|70)[ _]DUAL(?:[ _]CORE)?(?:[ _]?2)?'
+      model: 'N$1'
 
 # Yusun
 Yusun:
@@ -28667,7 +28723,7 @@ Zuum:
       model: 'Covet Pro'
     - regex: 'COVET Mini'
       model: 'Covet Mini'
-    - regex: 'COVET( Z)?'
+    - regex: 'COVET( [XZ])?'
       model: 'Covet$1'
     - regex: 'MAGNO PLUS'
       model: 'Magno Plus'
@@ -29984,6 +30040,8 @@ Phicomm:
       model: 'Energy 3+'
     - regex: 'E5051(?:[);/ ]|$)'
       model: 'Energy 4S'
+    - regex: 'C6051(?:[);/ ]|$)'
+      model: 'Clue 2S'
     - regex: 'PHICOMM[ _]Clue[ _]([^/;)]+)(?: Build|[);])'
       model: 'Clue $1'
 
@@ -30738,7 +30796,7 @@ TD Systems:
 
 # Ravoz (https://www.ravoz.online/)
 Ravoz:
-  regex: 'RAVOZ[ _](Z[357] (?:Lite|Pro)|Z[3-7]|R[4789]|V[123])(?:[);/ ]|$)'
+  regex: 'RAVOZ[ _](Z[357] (?:Lite|Pro)|Z[3-7]|R[4789]|V[1235])(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -32373,12 +32431,12 @@ Bluedot:
 
 # Planet Computers (https://www.www3.planetcom.co.uk/)
 Planet Computers:
-  regex: '(?:Cosmo_Communicator|Gemini_4G)(?:[);/ ]|$)'
+  regex: '(?:Cosmo_Communicator|Gemini[_ ]4G)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(Cosmo_Communicator)(?:[);/ ]|$)'
       model: '$1'
-    - regex: '(?:Gemini_4G)(?:[);/ ]|$)'
+    - regex: '(?:Gemini[_ ]4G)(?:[);/ ]|$)'
       model: 'Gemini 4G'
 
 # Play Now (https://www.play.pl/)
@@ -32672,17 +32730,17 @@ Spark:
     - regex: 'Plus 3'
       model: 'Plus 3'
 
-# Sparx (https://sparx.pk/)
+# Sparx or SparX (https://sparx.pk/)
 Sparx:
-  regex: 'Sparx[ _]|(?:NEO_6|NEO 5)(?: Build|[;)])'
+  regex: 'Sparx[ _]|(?:NEO_6|NEO 5|Neo_6_plus|Neo 5 Pro|Neo X)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Neo 7 Ultra'
       model: 'Neo 7 Ultra'
-    - regex: 'Neo 7 Pro'
-      model: 'Neo 7 Pro'
-    - regex: 'Neo 5 Plus'
-      model: 'Neo 5 Plus'
+    - regex: 'Neo ([57]) Pro'
+      model: 'Neo $1 Pro'
+    - regex: 'Neo[ _]([56])[ _]Plus'
+      model: 'Neo $1 Plus'
     - regex: 'Neo[ _]([567])'
       model: 'Neo $1'
     - regex: 'Neo X'
@@ -35923,9 +35981,15 @@ Microtech:
 
 # Gplus (gpluselectronics.com)
 Gplus:
-  regex: 'GTV-|Gplus[ _]([ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus|S10)(?:[);/ ]|$)'
+  regex: 'GTV-|(?:Gplus[ _](?:[ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus|S10)|GMC-(?:7127M|668[NM]))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'GMC-7127M'
+      model: 'X20'
+    - regex: 'GMC-668N'
+      model: 'Q20S'
+    - regex: 'GMC-668M'
+      model: 'Q20'
     - regex: 'Gplus[ _]([ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus|S10)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'GTV-(50PU744N)(?:[);/ ]|$)'
@@ -38965,10 +39029,10 @@ BAUHN:
 
 # CKK Mobile
 CKK Mobile:
-  regex: 'CKK (Inspire 1|Garnet)|(?:DUKE8|DUKE 3|DUKE\s+II)(?:[);/ ]|$)'
+  regex: 'CKK (Inspire 1|Garnet)|(?:DUKE[78]|DUKE 3|DUKE\s+II)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'DUKE ?([38])'
+    - regex: 'DUKE ?([378])'
       model: 'DUKE $1'
     - regex: 'DUKE\s+II'
       model: 'DUKE 2'
@@ -39273,6 +39337,41 @@ HiGrace:
   device: 'tablet'
   model: '$1'
 
+# PAGRAER
+PAGRAER:
+  regex: 'PAGRAER (P50 Pro)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# DIALN
+DIALN:
+  regex: 'X8ULTRA(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'X8 Ultra'
+
+# AUPO
+AUPO:
+  regex: 'AUPO[ _]Zeus'
+  device: 'tablet'
+  models:
+    - regex: 'AUPO[ _]Zeus 10 Pro'
+      model: 'Zeus 10 Pro'
+
+# CCIT
+CCIT:
+  regex: 'CCIT[_ ]|CCITA715G'
+  device: 'tablet'
+  models:
+    - regex: 'CCIT[ _]Xedition'
+      device: 'smartphone'
+      model: 'X Edition'
+    - regex: 'CCIT[ _]405(?: Build|[);])'
+      model: 'Vogue 405'
+      device: 'smartphone'
+    - regex: 'CCIT[_ ]?([^;/)]+)(?: Build|[);])'
+      model: '$1'
+
+
 # Devices with undectable brand, but detectable model
 Unknown:
   regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro| BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|(?:M10 Ultra|FO-R15|TVBOX|Smart[ _-]?TV|SmartATV|M8S\+ 4K|PCBox|rk(?:3128|322x|3368)(?:[_-]box)?|H10 PLAY|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|mips.+(?:Opera TV|wireless|wired)|smartbox|TV BOX|BOX TV|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|tv001 on rtd289x|hx322x_box|X98_S500|8K3528-T|MX10|V88|H8S|X92|AI PONT|tv\.plus)(?:[);/ ]|$)'