From f7d77f2fda3846adf6dd3c10e37bfad4e4f7dc50 Mon Sep 17 00:00:00 2001
From: Pierre Lannoy <pierre@hosterra.eu>
Date: Tue, 28 May 2024 13:59:11 +0200
Subject: [PATCH] Updates UDD from version 6.3.1 to version 6.3.2

---
 CHANGELOG.md                                  |   12 +
 includes/libraries/decalog-sdk/Engine.php     |   30 +-
 .../libraries/decalog-sdk/EventsLogger.php    |    2 +-
 includes/libraries/udd/DeviceDetector.php     |    4 +-
 .../libraries/udd/Parser/Client/Browser.php   |    6 +-
 .../Parser/Device/AbstractDeviceParser.php    |   44 +
 .../libraries/udd/Parser/OperatingSystem.php  |    7 +-
 includes/libraries/udd/regexes/bots.yml       |  128 +-
 .../libraries/udd/regexes/client/browsers.yml |   18 +-
 .../udd/regexes/client/feed_readers.yml       |    2 +-
 .../udd/regexes/client/hints/apps.yml         |    4 +-
 .../udd/regexes/client/libraries.yml          |    5 +
 .../udd/regexes/client/mobile_apps.yml        |   80 +-
 includes/libraries/udd/regexes/client/pim.yml |    4 +
 .../libraries/udd/regexes/device/mobiles.yml  | 1739 +++++++++++++----
 includes/libraries/udd/regexes/oss.yml        |   27 +-
 16 files changed, 1661 insertions(+), 451 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ade4776..cc49f35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to **Device Detector** are documented in this *changelog*.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and **Device Detector** adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.0] - 2024-05-xx
+
+### Added
+- [BC] To enable installation on more heterogeneous platforms, the plugin now adapts its internal logging mode to already loaded libraries.
+
+### Changed
+- Updated DecaLog SDK from version 4.1.0 to version 5.0.0.
+- Upgraded UDD from version 6.3.1 to version 6.3.2: dozens of added and improved detections.
+
+### Fixed
+- PHP error with some plugins like Woocommerce Paypal Payments.
+
 ## [3.8.0] - 2024-05-07
 
 ### Changed
diff --git a/includes/libraries/decalog-sdk/Engine.php b/includes/libraries/decalog-sdk/Engine.php
index cafbec4..f48cda3 100644
--- a/includes/libraries/decalog-sdk/Engine.php
+++ b/includes/libraries/decalog-sdk/Engine.php
@@ -26,7 +26,7 @@ class Engine {
 	 * @since  1.0.0
 	 * @var    string    $version    Maintains the engine version.
 	 */
-	private static $version = '4.2.0';
+	private static $version = '5.0.0';
 
 	/**
 	 * The logger instances and parameters.
@@ -89,19 +89,27 @@ public static function getSdkVersion() {
 	 * @since 4.2.0
 	 */
 	public static function getPsrVersion() {
-		if ( class_exists( '\Psr\Log\NullLogger') ) {
-			$reflection = new \ReflectionMethod(\Psr\Log\NullLogger::class, 'log');
-			foreach ( $reflection->getParameters() as $param ) {
-				if ( 'message' === $param->getName() ) {
-					if ( str_contains($param->getType() ?? '', '|') ) {
-						return 3;
+		$required = 1;
+		if ( ! defined( 'DECALOG_PSR_LOG_VERSION') ) {
+			define( 'DECALOG_PSR_LOG_VERSION', 'V1' );
+		}
+		switch ( strtolower( DECALOG_PSR_LOG_VERSION ) ) {
+			case 'v3':
+				$required = 3;
+				break;
+			case 'auto':
+				if ( class_exists( '\Psr\Log\NullLogger') ) {
+					$reflection = new \ReflectionMethod(\Psr\Log\NullLogger::class, 'log');
+					foreach ( $reflection->getParameters() as $param ) {
+						if ( 'message' === $param->getName() ) {
+							if ( str_contains($param->getType() ?? '', '|') ) {
+								$required = 3;
+							}
+						}
 					}
 				}
-			}
-		} else {
-			return 0;
 		}
-		return 1;
+		return $required;
 	}
 
 	/**
diff --git a/includes/libraries/decalog-sdk/EventsLogger.php b/includes/libraries/decalog-sdk/EventsLogger.php
index bbe90d7..7954270 100644
--- a/includes/libraries/decalog-sdk/EventsLogger.php
+++ b/includes/libraries/decalog-sdk/EventsLogger.php
@@ -266,7 +266,7 @@ public function log( $level, string|\Stringable $message, array $context = [] ):
 		}
 	}
 
-} else { // if version in not detected or equal to 1
+} else {
 
 	/**
 	 * DecaLog PSR-3 logger class. Failsafe for old PSR-3 versions.
diff --git a/includes/libraries/udd/DeviceDetector.php b/includes/libraries/udd/DeviceDetector.php
index af70527..ff7d390 100644
--- a/includes/libraries/udd/DeviceDetector.php
+++ b/includes/libraries/udd/DeviceDetector.php
@@ -68,7 +68,7 @@ class DeviceDetector
     /**
      * Current version number of DeviceDetector
      */
-    public const VERSION = '6.3.1';
+    public const VERSION = '6.3.2';
 
     /**
      * Constant used as value for unknown browser / os
@@ -776,7 +776,7 @@ protected function getOsAttribute(string $attr): string
      */
     protected function hasAndroidTableFragment(): bool
     {
-        $regex = 'Android( [\.0-9]+)?; Tablet;|.*\-tablet$';
+        $regex = 'Android( [\.0-9]+)?; Tablet;|Tablet(?! PC)|.*\-tablet$';
 
         return !!$this->matchUserAgent($regex);
     }
diff --git a/includes/libraries/udd/Parser/Client/Browser.php b/includes/libraries/udd/Parser/Client/Browser.php
index 74edcc2..d90f701 100644
--- a/includes/libraries/udd/Parser/Client/Browser.php
+++ b/includes/libraries/udd/Parser/Client/Browser.php
@@ -403,6 +403,7 @@ class Browser extends AbstractClientParser
         'MY' => 'Mypal',
         'MR' => 'Monument Browser',
         'MW' => 'MAUI WAP Browser',
+        'N7' => 'Naenara Browser',
         'NW' => 'Navigateur Web',
         'NK' => 'Naked Browser',
         'NA' => 'Naked Browser Pro',
@@ -414,6 +415,7 @@ class Browser extends AbstractClientParser
         'N2' => 'Norton Private Browser',
         'NX' => 'Nox Browser',
         'N1' => 'NOMone VR Browser',
+        'N6' => 'NOOK Browser',
         'NE' => 'NetSurf',
         'NF' => 'NetFront',
         'NL' => 'NetFront Life',
@@ -723,7 +725,7 @@ class Browser extends AbstractClientParser
             'IW', 'LH', 'LY', 'MB', 'MN', 'MO', 'MY', 'OA', 'OS',
             'PI', 'PX', 'QA', 'S5', 'SX', 'TF', 'TO', 'WF', 'ZV',
             'FP', 'AD', 'WL', '2I', 'P9', 'KJ', 'WY', 'VK', 'W5',
-            '7C',
+            '7C', 'N7',
         ],
         'Internet Explorer'  => ['IE', 'CZ', 'BZ', 'IM', 'PS', '3A', '4A', 'RN'],
         'Konqueror'          => ['KO'],
@@ -761,7 +763,7 @@ class Browser extends AbstractClientParser
         'H5', 'V3', 'G2', 'BG', 'OL', 'II', 'TL', 'M6', 'Y3',
         'M7', 'GN', 'D3', 'IG', 'HW', '4O', 'OU', '5P', 'KE',
         '5A', 'TT', '6P', 'G3', '7P', 'VU', 'F8', 'L4', 'DK',
-        'DP', 'KL', 'K4',
+        'DP', 'KL', 'K4', 'N6',
     ];
 
     /**
diff --git a/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php b/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php
index 9fa9448..591b060 100644
--- a/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php
+++ b/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php
@@ -99,6 +99,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ACC' => 'Accesstyle',
         'AE'  => 'Ace',
         'AC'  => 'Acer',
+        'ACL' => 'Aceline',
         '3K'  => 'Acteck',
         'ACT' => 'actiMirror',
         'A9'  => 'Advan',
@@ -155,6 +156,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '60'  => 'Andowl',
         'ANX' => 'ANXONIT',
         '6J'  => 'Angelcare',
+        'ANG' => 'AngelTech',
         '7A'  => 'Anry',
         'A0'  => 'ANS',
         '74'  => 'Anker',
@@ -168,6 +170,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ARC' => 'Arçelik',
         'AR'  => 'Archos',
         'AB'  => 'Arian Space',
+        'ARI' => 'Arival',
         'A6'  => 'Ark',
         '5A'  => 'ArmPhone',
         'AN'  => 'Arnova',
@@ -208,6 +211,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'YR'  => 'AYYA',
         'XA'  => 'Axioo',
         'AM'  => 'Azumi Mobile',
+        'AZE' => 'Azeyou',
         'WW'  => 'Awow',
         'AWO' => 'AWOX',
         'XU'  => 'AUX',
@@ -296,6 +300,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'Y8'  => 'Bubblegum',
         'BMW' => 'BMW',
         'C9'  => 'CAGI',
+        'CAD' => 'CADENA',
         'CT'  => 'Capitel',
         'G3'  => 'CG Mobile',
         '37'  => 'CGV',
@@ -312,6 +317,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'CNG' => 'Canguro',
         'CNT' => 'CCIT',
         'CEC' => 'Cecotec',
+        'CEP' => 'CEPTER',
         'CEI' => 'Ceibal',
         '02'  => 'Cell-C',
         'CEL' => 'Cellacom',
@@ -328,12 +334,14 @@ abstract class AbstractDeviceParser extends AbstractParser
         'C3'  => 'China Mobile',
         'U9'  => 'China Telecom',
         'CI'  => 'Chico Mobile',
+        'CIA' => 'C Idea',
         'CIP' => 'CipherLab',
         'CIT' => 'Citycall',
         '1C'  => 'Chuwi',
         'L8'  => 'Clarmin',
         '25'  => 'Claresta',
         'CLA' => 'CLAYTON',
+        'CLT' => 'Clovertek',
         '1J'  => 'Cloud',
         'CD'  => 'Cloudfone',
         '6C'  => 'Cloudpad',
@@ -378,6 +386,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'CTR' => 'Ctroniq',
         'CU'  => 'Cube',
         'CB'  => 'CUBOT',
+        'CUI' => 'Cuiud',
         'CV'  => 'CVTE',
         'CWO' => 'Cwowdefu',
         'C4'  => 'Cyrus',
@@ -385,6 +394,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DA'  => 'Danew',
         'DAN' => 'Dany',
         'DA1' => 'DangcapHD',
+        'DAR' => 'Daria',
         'DT'  => 'Datang',
         'D7'  => 'Datawind',
         '7D'  => 'Datamini',
@@ -465,6 +475,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DLI' => 'D-Link',
         'ENO' => 'eNOVA',
         'IN2' => 'iNOVA',
+        'IN3' => 'inovo',
         'INH' => 'Inhon',
         'EB'  => 'E-Boda',
         'EJ'  => 'Engel',
@@ -475,6 +486,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EAS' => 'EAS Electric',
         'EP'  => 'Easypix',
         'EQ'  => 'Eagle',
+        'EGS' => 'EagleSoar',
         'EA'  => 'EBEST',
         'YC'  => 'EBEN',
         'E4'  => 'Echo Mobiles',
@@ -543,6 +555,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EX'  => 'Explay',
         'EXP' => 'Express LUCK',
         'E5'  => 'Extrem',
+        'EXL' => 'ExtraLink',
         'EF'  => 'EXCEED',
         'QE'  => 'EWIS',
         'EI'  => 'Ezio',
@@ -579,6 +592,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'FIL' => 'FILIX',
         'FL'  => 'Fly',
         'QC'  => 'FLYCAT',
+        'FLY' => 'FLYCOAY',
         'FLU' => 'Fluo',
         'FN'  => 'FNB',
         'FOB' => 'Fobem',
@@ -651,6 +665,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'GB'  => 'Gol Mobile',
         'GL'  => 'Goly',
         'GOL' => 'GoldMaster',
+        'GOB' => 'GOLDBERG',
         'GX'  => 'GLX',
         'G5'  => 'Gome',
         'G1'  => 'GoMobile',
@@ -679,6 +694,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '9F'  => 'HAOVM',
         'HAQ' => 'HAOQIN',
         'HA'  => 'Haier',
+        'HEC' => 'HEC',
         'XH'  => 'Haipai',
         'HAN' => 'Handheld',
         'HE'  => 'HannSpree',
@@ -695,9 +711,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ZH'  => 'Hezire',
         'HEX' => 'HexaByte',
         'HEW' => 'HeadWolf',
+        'HEI' => 'Heimat',
         'HL'  => 'Hi-Level',
         '3H'  => 'Hi',
         'HIB' => 'Hiberg',
+        'HBY' => 'HiBy',
         'HIH' => 'HiHi',
         'HIK' => 'HiKing',
         'H2'  => 'Highscreen',
@@ -718,6 +736,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'H1'  => 'Hoffmann',
         'HOM' => 'Homatics',
         'H0'  => 'Hometech',
+        'HLB' => 'HOLLEBERG',
         'HM'  => 'Homtom',
         'HZ'  => 'Hoozo',
         'H7'  => 'Horizon',
@@ -841,6 +860,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'JF'  => 'JFone',
         'JI'  => 'Jiayu',
         'JG'  => 'Jinga',
+        'JIN' => 'Jin Tu',
         'JX'  => 'Jio',
         'VJ'  => 'Jivi',
         'JK'  => 'JKL',
@@ -871,6 +891,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'KHA' => 'Khadas',
         'KS'  => 'Kempler & Strauss',
         'K3'  => 'Keneksi',
+        'KHI' => 'KENSHI',
         'KX'  => 'Kenxinda',
         'KEN' => 'Kenbo',
         'KND' => 'Kendo',
@@ -884,6 +905,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '46'  => 'Kiowa',
         'KV'  => 'Kivi',
         '64'  => 'Kvant',
+        'KVA' => 'KVADRA',
         '0K'  => 'Klipad',
         'KNM' => 'KN Mobile',
         'KC'  => 'Kocaso',
@@ -923,6 +945,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'Z3'  => 'Laurus',
         'LEC' => 'Lectrus',
         'LV'  => 'Lava',
+        'LVI' => 'Lville',
         'LC'  => 'LCT',
         'L5'  => 'Leagoo',
         'U3'  => 'Leben',
@@ -950,6 +973,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'LIN' => 'Linsay',
         'LF'  => 'Lifemaxx',
         'LI'  => 'Lingwin',
+        'LIB' => 'Lingbo',
         'LIM' => 'Lime',
         'LJ'  => 'L-Max',
         'LW'  => 'Linnex',
@@ -978,6 +1002,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '92'  => 'MAC AUDIO',
         'MJ'  => 'Majestic',
         'FQ'  => 'Mafe',
+        'MAG' => 'MAG',
         '6Y'  => 'Magicsee',
         '23'  => 'Magnus',
         'NH'  => 'Manhattan',
@@ -1008,6 +1033,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MAU' => 'Maunfeld',
         '28'  => 'MBOX',
         'FK'  => 'MBI',
+        'MBK' => 'MBK',
         '3D'  => 'MDC Store',
         '1Y'  => 'MDTV',
         '09'  => 'meanIT',
@@ -1030,6 +1056,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MEO' => 'MEO',
         'MX'  => 'MEU',
         'MI'  => 'MicroMax',
+        'MIP' => 'mipo',
         'MS'  => 'Microsoft',
         '6Q'  => 'Microtech',
         '1X'  => 'Minix',
@@ -1091,6 +1118,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MYG' => 'MygPad',
         'MWA' => 'MwalimuPlus',
         'NEO' => 'neoCore',
+        'NER' => 'Neoregent',
         '08'  => 'Nabi',
         'N7'  => 'National',
         'NC'  => 'Navcity',
@@ -1145,6 +1173,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'N1'  => 'Noain',
         'N6'  => 'Nobby',
         'NOC' => 'Novacom',
+        'NOS' => 'NoviSea',
         'NOV' => 'Novey',
         'NO1' => 'NOVO',
         '57'  => 'Nubia',
@@ -1235,6 +1264,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '7P'  => 'P-UP',
         'PRA' => 'Pacific Research Alliance',
         'PAG' => 'PAGRAER',
+        'PAD' => 'Padpro',
         'YP'  => 'Paladin',
         'PM'  => 'Palm',
         'PN'  => 'Panacom',
@@ -1319,6 +1349,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'QH'  => 'Q-Touch',
         'QB'  => 'Q.Bell',
         'QI'  => 'Qilive',
+        'QIN' => 'QIN',
         'QM'  => 'QMobile',
         'QT'  => 'Qtek',
         'Q9'  => 'QTECH',
@@ -1356,6 +1387,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'RP'  => 'Revo',
         'REV' => 'Revomovil',
         '8R'  => 'Retroid Pocket',
+        'REN' => 'Renova',
         'RIC' => 'Ricoh',
         'RI'  => 'Rikomagic',
         'RM'  => 'RIM',
@@ -1387,6 +1419,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'RY'  => 'Ryte',
         'X5'  => 'Saba',
         '8L'  => 'S-TELL',
+        '8L1' => 'S-Color',
         '4O'  => 'S2Tel',
         '89'  => 'Seatel',
         'SEW' => 'Sewoo',
@@ -1484,6 +1517,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SO'  => 'Sony',
         'SE'  => 'Sony Ericsson',
         'X2'  => 'Soundmax',
+        'SUL' => 'SoulLink',
         '8S'  => 'Soyes',
         '77'  => 'SONOS',
         '68'  => 'Soho Style',
@@ -1559,6 +1593,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'TE1' => 'TechSmart',
         'TX'  => 'TechniSat',
         'TT'  => 'TechnoTrend',
+        'TTS' => 'TECHNOSAT',
         'TP'  => 'TechPad',
         'TPS' => 'TPS',
         '9E'  => 'Techwood',
@@ -1642,6 +1677,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '5T'  => 'TurboKids',
         'UR'  => 'Turkcell',
         '4U'  => 'TuCEL',
+        'TUV' => 'Tuvio',
         '2U'  => 'Türk Telekom',
         'TV'  => 'TVC',
         'TW'  => 'TWM',
@@ -1691,6 +1727,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VAW' => 'VANWIN',
         'VB'  => 'VC',
         'VN'  => 'Venso',
+        'VNP' => 'VNPT Technology',
         'VEN' => 'Venstar',
         'UV'  => 'Venturer',
         'VQ'  => 'Vega',
@@ -1735,6 +1772,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VIT' => 'Vityaz',
         '9V'  => 'Vision Touch',
         'VIL' => 'Visual Land',
+        'VI1' => 'VILLAON',
         'VK'  => 'VK Mobile',
         'JM'  => 'v-mobile',
         'VHO' => 'V-HOPE',
@@ -1742,6 +1780,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VGE' => 'V-Gen',
         'V0'  => 'VKworld',
         'VM'  => 'Vodacom',
+        'VOC' => 'VOCAL',
         'VF'  => 'Vodafone',
         '7W'  => 'VOGA',
         'V2'  => 'Vonino',
@@ -1769,8 +1808,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WAK' => 'Walker',
         'WA'  => 'Walton',
         'WAF' => 'WAF',
+        'WAO' => 'W&O',
         'WAL' => 'Waltter',
+        'WAI' => 'Wainyok',
         'WHI' => 'White Mobile',
+        'WHO' => 'Whoop',
         'WBL' => 'We. by Loewe.',
         'WCP' => 'WeChip',
         'WM'  => 'Weimei',
@@ -1827,6 +1869,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'XO'  => 'Xolo',
         'XR'  => 'Xoro',
         'XS'  => 'Xshitou',
+        'XSM' => 'Xsmart',
         '4X'  => 'Xtouch',
         'X8'  => 'Xtratech',
         'XCR' => 'Xcruiser',
@@ -1890,6 +1933,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'Z4'  => 'ZH&K',
         'OW'  => 'öwn',
         'WBF' => 'Webfleet',
+        'WSS' => 'WS',
         // legacy brands, might be removed in future versions
         'WB'  => 'Web TV',
         'XX'  => 'Unknown',
diff --git a/includes/libraries/udd/Parser/OperatingSystem.php b/includes/libraries/udd/Parser/OperatingSystem.php
index 7bf60cb..d53c11e 100644
--- a/includes/libraries/udd/Parser/OperatingSystem.php
+++ b/includes/libraries/udd/Parser/OperatingSystem.php
@@ -147,6 +147,7 @@ class OperatingSystem extends AbstractParser
         'PIO' => 'Raspberry Pi OS',
         'RAS' => 'Raspbian',
         'RHT' => 'Red Hat',
+        'RST' => 'Red Star',
         'RED' => 'RedOS',
         'REV' => 'Revenge OS',
         'ROS' => 'RISC OS',
@@ -232,7 +233,7 @@ class OperatingSystem extends AbstractParser
             'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', 'CST',
             'NOV', 'ROU', 'ZOR', 'RED', 'KAL', 'ORA', 'VID', 'TIV', 'BSN', 'RAS',
             'UOS', 'PIO', 'FRI', 'LIR', 'WEB', 'SER', 'ASP', 'AOS', 'LOO', 'EUL',
-            'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE',
+            'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE', 'RST',
         ],
         'Mac'                   => ['MAC'],
         'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'],
@@ -667,7 +668,7 @@ protected function parsePlatform(): string
             }
         }
 
-        if ($this->matchUserAgent('arm|aarch64|Apple ?TV|Watch ?OS|Watch1,[12]')) {
+        if ($this->matchUserAgent('arm|.*arm64|aarch64|Apple ?TV|Watch ?OS|Watch1,[12]')) {
             return 'ARM';
         }
 
@@ -691,7 +692,7 @@ protected function parsePlatform(): string
             return 'x64';
         }
 
-        if ($this->matchUserAgent('.+32bit|.+win32|(?:i[0-9]|x)86|i86pc')) {
+        if ($this->matchUserAgent('.*32bit|.*win32|(?:i[0-9]|x)86|i86pc')) {
             return 'x86';
         }
 
diff --git a/includes/libraries/udd/regexes/bots.yml b/includes/libraries/udd/regexes/bots.yml
index afcc4c7..f5ef176 100644
--- a/includes/libraries/udd/regexes/bots.yml
+++ b/includes/libraries/udd/regexes/bots.yml
@@ -551,10 +551,10 @@
     name: 'SEOmoz, Inc.'
     url: 'http://moz.com/'
 
-- regex: 'facebookexternalhit|facebookplatform|facebookexternalua|facebookcatalog'
-  name: 'Facebook External Hit'
+- regex: 'facebook(?:catalog|externalhit|externalua|platform|scraper)'
+  name: 'Facebook Crawler'
   category: 'Social Media Agent'
-  url: 'https://www.facebook.com/externalhit_uatext.php'
+  url: 'https://developers.facebook.com/docs/sharing/webmasters/crawler/'
   producer:
     name: 'Meta Platforms, Inc.'
     url: 'https://www.meta.com/'
@@ -961,7 +961,7 @@
     name: 'BIZON, OOO'
     url: 'https://bi.zone/'
 
-- regex: 'masscan'
+- regex: '.*masscan'
   name: 'masscan'
   url: 'https://github.com/robertdavidgraham/masscan'
   category: 'Crawler'
@@ -2455,7 +2455,7 @@
     name: 'PPC Labs LLC'
     url: 'https://www.adbeat.com/'
 
-- regex: 'BW/[\d.]+'
+- regex: '(?:BuiltWith|BW)/[\d.]+'
   name: 'BuiltWith'
   category: 'Crawler'
   url: 'https://builtwith.com/biup'
@@ -3707,6 +3707,11 @@
   category: 'Crawler'
   url: 'https://geedo.com/bot/'
 
+- regex: 'GeedoProductSearch'
+  name: 'GeedoProductSearch'
+  category: 'Crawler'
+  url: 'https://geedo.com/product-search/'
+
 - regex: 'BackupLand(?:/([\d+.]+))?'
   name: 'BackupLand'
   category: 'Crawler'
@@ -4374,10 +4379,119 @@
     name: 'Library and Archives Canada'
     url: 'https://library-archives.canada.ca/'
 
+- regex: 'InsytfulBot/[\d.]+'
+  name: 'InsytfulBot'
+  category: 'Crawler'
+  url: 'https://www.insytful.com/'
+  producer:
+    name: 'Zengenti Limited'
+    url: 'https://www.zengenti.com/'
+
+- regex: 'statista\.com'
+  name: 'Statista'
+  category: 'Crawler'
+  url: 'https://www.statista.com/'
+  producer:
+    name: 'Statista, Inc.'
+    url: 'https://www.statista.com/'
+
+- regex: 'SubstackContentFetch/[\d.]+'
+  name: 'Substack Content Fetch'
+  category: 'Crawler'
+  url: 'https://substack.com/'
+  producer:
+    name: 'Substack, Inc.'
+    url: 'https://substack.com/'
+
+- regex: '^ds9'
+  name: 'Deep SEARCH 9'
+  category: 'Crawler'
+  url: 'https://www.copyright.com/blog/ccc-expands-corporate-solutions-offering-with-new-technology/'
+  producer:
+    name: 'Copyright Clearance Center, Inc.'
+    url: 'https://www.copyright.com/'
+
+- regex: 'LiveJournal\.com'
+  name: 'LiveJournal'
+  url: 'https://www.livejournal.com/'
+  category: 'Feed Fetcher'
+  producer:
+    name: 'ООО "СИМ"'
+    url: 'https://www.livejournal.com/'
+
+- regex: 'bitdiscovery'
+  name: 'Tenable.asm'
+  category: 'Security Checker'
+  url: 'https://bitdiscovery.com/'
+  producer:
+    name: 'Tenable, Inc.'
+    url: 'https://www.tenable.com/'
+
+- regex: 'Castopod/[\d.]+'
+  name: 'Castopod'
+  category: 'Crawler'
+  url: 'https://www.castopod.org/'
+
+- regex: 'Elastic/Synthetics'
+  name: 'Elastic Synthetics'
+  category: 'Site Monitor'
+  url: 'https://github.com/elastic/synthetics'
+  producer:
+    name: 'Elasticsearch B.V.'
+    url: 'https://www.elastic.co/'
+
+- regex: 'WDG_Validator/[\d.]+'
+  name: 'WDG HTML Validator'
+  category: 'Validator'
+  url: 'http://www.htmlhelp.com/tools/validator/'
+
+- regex: 'scan@aegis.network'
+  name: 'Aegis'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20180910002802/http://www.aegis.network/'
+
+- regex: 'CrawlyProjectCrawler/[\d.]+'
+  name: 'Crawly Project'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20240326141952/https://crawlyproject.digitaldragon.dev/'
+
+- regex: 'BDFetch'
+  name: 'BDFetch'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20130821043949/http://www.branddimensions.com/'
+
+- regex: 'PunkMap'
+  name: 'Punk Map'
+  category: 'Security Checker'
+  url: 'https://github.com/openeasm/punkmap'
+
+- regex: 'GenomeCrawlerd/[\d.]+'
+  name: 'Deepfield Genome'
+  category: 'Crawler'
+  url: 'https://www.nokia.com/networks/ip-networks/deepfield/genome/'
+  producer:
+    name: 'Nokia Corporation'
+    url: 'https://www.nokia.com/'
+
+- regex: 'Gaisbot/[\d.]+'
+  name: 'Gaisbot'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20090604121511/https://gais.cs.ccu.edu.tw/robot.php'
+
+- regex: 'FAST-WebCrawler/[\d.]+'
+  name: 'AlltheWeb'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20041020050801/http://www.alltheweb.com/help/webmaster/crawler'
+
+- regex: 'ducks\.party'
+  name: 'ducks.party'
+  category: 'Security Checker'
+  url: 'https://ducks.party/'
+
 # Generic bots
-- regex: 'nuhk|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr\.com|teoma|oegp|http%20client|htdig|mogimogi|larbin|scrubby|searchsight|semanticdiscovery|snappy|vortex(?!(?: Build|Plus))|zeal(?!ot)|dataparksearch|findlinks|BrowserMob|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|7Siters|centuryb\.o\.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|cortex|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello,? world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99|^revolt|nvd0rz|xfa1|Hakai|gbrmss|fuck-your-hp|IDBTE4M CODE87|Antoine|Insomania|Hells-Net|b3astmode|Linux Gnu \(cow\)|Test Certificate Info|iplabel|Magellan|TheSafex?Internetx?Search|Searcherweb|kirkland-signature|LinkChain|survey-security-dot-txt|^xenu|^ZmEu|^(?:chrome|firefox|Zeus)$'
+- regex: 'nuhk|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr\.com|teoma|oegp|http%20client|htdig|mogimogi|larbin|scrubby|searchsight|semanticdiscovery|snappy|vortex(?!(?: Build|Plus| CM62| HD65))|zeal(?!ot)|dataparksearch|findlinks|BrowserMob|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|7Siters|centuryb\.o\.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|cortex|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello,? world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99|^revolt|nvd0rz|xfa1|Hakai|gbrmss|fuck-your-hp|IDBTE4M CODE87|Antoine|Insomania|Hells-Net|b3astmode|Linux Gnu \(cow\)|Test Certificate Info|iplabel|Magellan|TheSafex?Internetx?Search|Searcherweb|kirkland-signature|LinkChain|survey-security-dot-txt|infrawatch|Time/|r00ts3c-owned-you|nvdorz|Root Slut|NiggaBalls|BotPoke|^xenu|^(?:chrome|firefox|Abcd|Dark|KvshClient|url|Zeus|ZmEu)$'
   name: 'Generic Bot'
 
 # Generic detections
-- regex: '[a-z0-9_-]*(?:(?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|analyzer|appengine|archiver?|checker|collector|crawl|crawler|fetcher|indexer|inspector|monitor|project(?!or)|(?<!Google Wap )proxy|research|resolver|robots|scanner|scraper|script|searcher|(?<!-)security|spider|study|transcoder|uptime|user[ _]?agent|validator)(?:[^a-z]|$)'
+- regex: '[a-z0-9_-]*(?:(?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|analyzer|appengine|archiver?|checker|collector|crawl|crawler|(?<!node-|uclient-|Mikrotik/\d\.[x\d] |electron-)fetch(?:er)?|indexer|inspector|monitor|(?<!Microsoft |banshee-)project(?!or)|(?<!Google Wap |Blue )proxy|research|resolver|robots|(?<!Cam)scanner|scraper|script|searcher|(?<!-)security|spider(?! 8)|study|transcoder|uptime|user[ _]?agent|validator)(?:[^a-z]|$)'
   name: 'Generic Bot'
diff --git a/includes/libraries/udd/regexes/client/browsers.yml b/includes/libraries/udd/regexes/client/browsers.yml
index 786021e..58a529e 100644
--- a/includes/libraries/udd/regexes/client/browsers.yml
+++ b/includes/libraries/udd/regexes/client/browsers.yml
@@ -5,6 +5,18 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Naenara Browser (https://en.wikipedia.org/wiki/Naenara_(browser))
+- regex: 'NaenaraBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Naenara Browser'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# NOOK Browser
+- regex: 'nook browser(?:/(\d+[\.\d]+))?'
+  name: 'NOOK Browser'
+  version: '$1'
+
 # Arachne (https://www.glennmcc.org/)
 - regex: 'xChaos_Arachne/5\.(\d+\.[\.\d]+)'
   name: 'Arachne'
@@ -1534,7 +1546,7 @@
     default: 'Gecko'
 
 # Microsoft Edge (Spartan Edge)
-- regex: '(?<!motorola )Edge[ /](\d+[\.\d]+)'
+- regex: '(?<!motorola |; )Edge[ /](\d+[\.\d]+)'
   name: 'Microsoft Edge'
   version: '$1'
   engine:
@@ -2336,7 +2348,7 @@
     default: '' # multi engine -- WebKit or Blink
 
 # QQ Browser
-- regex: 'M?QQBrowser(?:/([\.\d]+))?'
+- regex: 'M?QQ(?:Browser|浏览器)(?:/([\.\d]+))?'
   name: 'QQ Browser'
   version: '$1'
   engine:
@@ -3198,7 +3210,7 @@
     default: 'WebKit'
 
 # Firefox
-- regex: '(?<!like )Gecko'
+- regex: '(?<!like )Gecko(?!/\d+ SlimerJS)'
   name: 'Firefox'
   version: ''
   engine:
diff --git a/includes/libraries/udd/regexes/client/feed_readers.yml b/includes/libraries/udd/regexes/client/feed_readers.yml
index 74ebcf1..78b6d9d 100644
--- a/includes/libraries/udd/regexes/client/feed_readers.yml
+++ b/includes/libraries/udd/regexes/client/feed_readers.yml
@@ -108,7 +108,7 @@
 - regex: 'RSSOwl(?:[/ ](\d+[\.\d]+))?'
   name: 'RSSOwl'
   version: '$1'
-  url: 'http://www.rssowl.org/'
+  url: 'https://www.rssowl.org/'
 
 - regex: 'Stringer'
   name: 'Stringer'
diff --git a/includes/libraries/udd/regexes/client/hints/apps.yml b/includes/libraries/udd/regexes/client/hints/apps.yml
index 1b8528b..bf58ac3 100644
--- a/includes/libraries/udd/regexes/client/hints/apps.yml
+++ b/includes/libraries/udd/regexes/client/hints/apps.yml
@@ -41,7 +41,8 @@
 'com.noxgroup.app.security': 'Nox Security'
 'phone.cleaner.antivirus.speed.booster': 'Super Cleaner'
 'com.yy.hiyo': 'Hago'
-'com.instagram.android': 'Instagram App'
+'com.instagram.android': 'Instagram'
+'com.instagram.barcelona': 'Threads'
 'com.microsoft.office.outlook': 'Microsoft Outlook'
 'com.microsoft.bing': 'Microsoft Bing'
 'com.microsoft.bingintl': 'Microsoft Bing'
@@ -134,6 +135,7 @@
 'com.droidlogic.xlauncher': 'X Launcher'
 'nu.bi.moya': 'Moya'
 'com.microsoft.copilot': 'Microsoft Copilot'
+'com.nate.android.portalmini': 'nate'
 
 # Vpns
 'org.torproject.android': 'Orbot'
diff --git a/includes/libraries/udd/regexes/client/libraries.yml b/includes/libraries/udd/regexes/client/libraries.yml
index 10c865c..9363f67 100644
--- a/includes/libraries/udd/regexes/client/libraries.yml
+++ b/includes/libraries/udd/regexes/client/libraries.yml
@@ -606,3 +606,8 @@
   name: 'httprs'
   version: '$1'
   url: 'https://github.com/http-server-rs/http-server'
+
+- regex: 'Boto3(?:/(\d+[\.\d]+))?'
+  name: 'Boto3'
+  version: '$1'
+  url: 'https://github.com/boto/boto3'
diff --git a/includes/libraries/udd/regexes/client/mobile_apps.yml b/includes/libraries/udd/regexes/client/mobile_apps.yml
index 8a8a224..c6068a9 100644
--- a/includes/libraries/udd/regexes/client/mobile_apps.yml
+++ b/includes/libraries/udd/regexes/client/mobile_apps.yml
@@ -5,6 +5,11 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Report Runner (https://reportrunner.com/)
+- regex: 'Report Runner'
+  name: 'Report Runner'
+  version: ''
+
 # Ameba (https://ameblo.jp/ | https://play.google.com/store/apps/details?id=jp.ameba)
 - regex: 'jpameblo;(\d+\.[\.\d]+)'
   name: 'Ameba'
@@ -101,6 +106,16 @@
   name: 'Facebook'
   version: ''
 
+# Instagram
+- regex: 'Instagram[ /]([\d\.]+)?'
+  name: 'Instagram'
+  version: '$1'
+
+# Threads
+- regex: 'Barcelona[ /]([\d\.]+)?'
+  name: 'Threads'
+  version: '$1'
+
 # FeedR
 - regex: 'FeedR(?!eader)(?:/([\d\.]+))?'
   name: 'FeedR'
@@ -230,6 +245,11 @@
   name: 'Yo WhatsApp'
   version: '$1'
 
+# AN WhatsApp (https://anwhats.com/)
+- regex: 'ANWhatsApp(?:/(\d+[\.\d]+))?'
+  name: 'AN WhatsApp'
+  version: '$1'
+
 # https://music.youtube.com
 - regex: '(?:^com\.google\.android\.apps\.youtube\.music/|^YouTubeMusic(?:Dev)?/)([\d\.]+)?'
   name: 'Youtube Music'
@@ -327,9 +347,6 @@
 - regex: 'Flipboard/([\d\.]+)?'
   name: 'Flipboard App'
   version: '$1'
-- regex: 'Instagram[ /]([\d\.]+)?'
-  name: 'Instagram App'
-  version: '$1'
 - regex: 'baiduboxapp/([\d\.]+)?'
   name: 'Baidu Box App'
   version: '$1'
@@ -499,6 +516,9 @@
 - regex: 'Microsoft Lync ([\d\.]+)'
   name: 'Microsoft Lync'
   version: '$1'
+- regex: 'Microsoft\.Data\.Mashup'
+  name: 'Microsoft Power Query' # It can be Excel or Power BI
+  version: ''
 
 # https://play.google.com/store/apps/details?id=cn.wps.moffice_eng
 - regex: 'WpsM?office/([\d\.]+)'
@@ -621,7 +641,7 @@
   version: '$1'
 
 # https://apps.apple.com/us/app/zalo/id579523206
-- regex: 'Zalo/([\d\.]+)|Zalo android'
+- regex: 'Zalo/([\d\.]+)|Zalo (?:android|iOS)'
   name: 'Zalo'
   version: '$1'
 
@@ -760,7 +780,7 @@
   version: '$1'
 
 # Microsoft Teams (https://www.microsoft.com/en/microsoft-teams/group-chat-software)
-- regex: 'Teams/(\d+[\.\d]+)'
+- regex: '(?:maglev|Teams)/(\d+[\.\d]+)'
   name: 'Teams'
   version: '$1'
 
@@ -1412,7 +1432,7 @@
   version: ''
 
 # Browser-Anonymizer (https://www.almisoft.de/)
-- regex: 'Anonymisiert durch AlMiSoft'
+- regex: 'Anonymisiert durch AlMiSoft(?! Browser-Maulkorb)'
   name: 'Browser-Anonymizer'
   version: ''
 
@@ -1837,7 +1857,8 @@
   name: 'JioSaavn'
   version: '$1'
 
-- regex: ' Kajabi|KajabiPodcast'
+# Kajabi (https://kajabi.com/)
+- regex: 'KajabiMobileApp|KajabiPodcast'
   name: 'Kajabi'
   version: ''
 
@@ -2421,6 +2442,51 @@
   name: 'BuzzVideo'
   version: '$1'
 
+# GlobalProtect (https://www.paloaltonetworks.com/sase/globalprotect)
+- regex: 'GlobalProtect'
+  name: 'GlobalProtect'
+  version: ''
+
+# Trade Me (https://play.google.com/store/apps/details?id=nz.co.trademe.trademe)
+- regex: 'Trade Me(?:/([\d\.]+))?'
+  name: 'Trade Me'
+  version: '$1'
+
+# XING (https://www.xing.com/)
+- regex: 'XING(?:-iPhone)?/([\d\.]+)'
+  name: 'XING'
+  version: '$1'
+
+# Bridge (https://quixel.com/bridge)
+- regex: 'Bridge/([\d\.]+)'
+  name: 'Bridge'
+  version: '$1'
+
+# iPlayTV (https://apps.apple.com/us/app/iplaytv-iptv-m3u-player/id1072226801)
+- regex: 'iPlayTV/([\d\.]+)'
+  name: 'iPlayTV'
+  version: '$1'
+
+# MOMO (https://www.immomo.com/)
+- regex: 'momoWebView/([\d\.]+)'
+  name: 'MOMO'
+  version: '$1'
+
+# nate (https://play.google.com/store/apps/details?id=com.nate.android.portalmini)
+- regex: 'nate_app;appver:([\d\.]+)'
+  name: 'nate'
+  version: '$1'
+
+# SoFi (https://play.google.com/store/apps/details?id=com.sofi.mobile)
+- regex: 'SOFI_APP_VERSION=([\d\.]+)'
+  name: 'SoFi'
+  version: '$1'
+
+# Electron generic apps
+- regex:  ' (?!(?:AppleWebKit|brave|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|TweakStyle|Colibri|Polypane|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/'
+  name: '$1'
+  version: '$2'
+
 # Generic app
 - regex: 'appname/([^/; ]*)'
   name: '$1'
diff --git a/includes/libraries/udd/regexes/client/pim.yml b/includes/libraries/udd/regexes/client/pim.yml
index 55f8f9a..46e1347 100644
--- a/includes/libraries/udd/regexes/client/pim.yml
+++ b/includes/libraries/udd/regexes/client/pim.yml
@@ -151,3 +151,7 @@
 - regex: 'BlueMail/(\d+[\.\d]+)'
   name: 'BlueMail'
   version: '$1'
+
+- regex: 'mailapp/(\d+\.[\.\d]+)'
+  name: 'mailapp'
+  version: '$1'
diff --git a/includes/libraries/udd/regexes/device/mobiles.yml b/includes/libraries/udd/regexes/device/mobiles.yml
index 2f2a6fa..caa52f5 100644
--- a/includes/libraries/udd/regexes/device/mobiles.yml
+++ b/includes/libraries/udd/regexes/device/mobiles.yml
@@ -7,18 +7,24 @@
 
 # Ace or ACE France (www.acemobile.fr)
 Ace:
-  regex: '(?:BUZZ [1-4]|CLEVER [13]|URBAN [13](?: Pro)?)(?:[);/ ]|$)'
+  regex: '(?:BUZZ [1-4]|BUZZ 4(?:Pro|S|Lite)|CLEVER [13]|URBAN [13](?: Pro)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BUZZ 4 Ultra'
       model: 'Buzz 4 Ultra'
     - regex: 'BUZZ 4 Note'
       model: 'Buzz 4 Note'
-    - regex: 'BUZZ ([12]) Lite'
+    - regex: 'BUZZ 4 Prime'
+      model: 'Buzz 4 Prime'
+    - regex: 'BUZZ 4Pro'
+      model: 'Buzz 4 Pro'
+    - regex: 'BUZZ ([124]) ?Lite'
       model: 'Buzz $1 Lite'
     - regex: 'BUZZ ([123]) Plus'
       model: 'Buzz $1 Plus'
-    - regex: 'BUZZ ([123])'
+    - regex: 'BUZZ 4S'
+      model: 'Buzz 4S'
+    - regex: 'BUZZ ([1-4])'
       model: 'Buzz $1'
     - regex: 'CLEVER ([13])'
       model: 'Clever $1'
@@ -107,7 +113,7 @@ Adronix:
 
 # Cherry Mobile (cherrymobile.com)
 'Cherry Mobile':
-  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2\.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2|DSR_(?:R8|R7P?)|CUBIX CUBE 3'
+  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(Selfie|2\.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2|DSR_(?:R8|R7P?)|CUBIX CUBE 3'
   device: 'smartphone'
   models:
     - regex: '(Flare2X|Aqua S9(?: (?:Max|Lite|Pro))?)'
@@ -165,7 +171,7 @@ Adronix:
       model: 'Flare Infinity'
     - regex: 'Flare[_ ]Lite[_ ]3S'
       model: 'Flare Lite S3'
-    - regex: 'Flare(?:[ _])?(A1_Roam|A[123]|J8 LTE|J1s|J[1235678]|P[13]|S[4-8]|X2|Y3s|Y7_LTE|Y[3567]|[45])'
+    - regex: 'Flare(?:[ _])?(Selfie|A1_Roam|A[123]|J8 LTE|J1s|J[1235678]|P[13]|S[4-8]|X2|Y3s|Y7_LTE|Y[3567]|[45])'
       model: 'Flare $1'
     - regex: 'Touch XL 2'
       model: 'Touch XL 2'
@@ -258,6 +264,8 @@ HTC:
       model: 'Evo 3G'
     - regex: 'PC36100(?:[);/ ]|$)'
       model: 'Evo 4G'
+    - regex: 'HTC[_ ]D628u'
+      model: 'Desire 628 Dual SIM'
     - regex: '(?:HTC[_ ])?(?:HTV33|601HT|2PZC100|2PZC5|U-3[uw])(?:[);/ ]|$)'
       model: 'U11'
     - regex: '(?:HTC_)?(?:801e|802[wdt]|PN071)'
@@ -383,10 +391,10 @@ HTC:
     - regex: 'HTC[ _-]Flyer Build'
       device: 'tablet'
       model: 'Flyer'
-    - regex: 'HTC[ _-](A103) Plus'
+    - regex: 'HTC[ _-](A10[13]) Plus'
       device: 'tablet'
       model: '$1 Plus'
-    - regex: 'HTC[ _-](A103)'
+    - regex: 'HTC[ _-](A10[0123])'
       device: 'tablet'
       model: '$1'
     - regex: 'HTC[ _-]Flyer[ _\-]([\w]{1,5})'
@@ -506,7 +514,7 @@ Microsoft:
 
 # NOKIA (www.nokia.com)
 Nokia:
-  regex: 'Nokia(?!Browser|Webview|; GT-I8750)|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-z0-9]+)$|RX-51 N900|TA-[0-9]{4}|N(?:1374|1530|15[0126])DL|ARM; 909'
+  regex: 'Nokia(?!Browser|Webview|; GT-I8750)|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-z0-9]+)$|RX-51 N900|TA-[0-9]{4}|N(?:1374|1530|15[01256])DL|ARM; 909'
   device: 'smartphone'
   models:
     # Nokia branded phones by HMD Global
@@ -549,6 +557,8 @@ Nokia:
       model: 'G100'
     - regex: 'N1374DL'
       model: 'G300 5G'
+    - regex: 'N155DL'
+      model: 'G300'
     - regex: 'N1530DL'
       model: 'G400 5G'
     - regex: 'Nokia ?X2DS'
@@ -1629,7 +1639,7 @@ Apple:
 
 # micromax
 MicroMax:
-  regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221|(?:YU(?:5012|5040|5530)|AQ5001(?: Canvas Power)?|Android 4(?:[\d.]*);(?: [\w-]+;)? A240|Android 8(?:[\d.]*);(?: [\w-]+;)? B5Pro|N8216|N8301|IN_2b|IN_Note1|ione note)(?:[);/ ]|$)'
+  regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221|(?:YU(?:5012|5040|5530)|AQ5001(?: Canvas Power)?|Android 4(?:[\d.]*);(?: [\w-]+;)? A240|Android 8(?:[\d.]*);(?: [\w-]+;)? B5Pro|N8216|N8301|IN_2b|IN_Note1|ione note|E7446|E7533)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AQ5001 Canvas Power'
@@ -1745,6 +1755,8 @@ MicroMax:
       model: 'iOne Note'
     - regex: 'IN_Note1(?:[);/ ]|$)'
       model: 'IN Note 1'
+    - regex: 'E7446(?:[);/ ]|$)'
+      model: 'IN Note 2'
     - regex: 'E7533(?:[);/ ]|$)'
       model: 'IN 1b'
     - regex: 'B5Pro(?:[);/ ]|$)'
@@ -1841,6 +1853,8 @@ AllCall:
   models:
     - regex: 'SHINE 12T'
       model: 'Shine 12T'
+    - regex: 'SHINE 12 PRO'
+      model: 'Shine 12 Pro'
     - regex: 'SHINE 12'
       model: 'Shine 12'
     - regex: 'AllCall_(Alpha|Atom|Bro|Madrid)'
@@ -1933,6 +1947,9 @@ Bravis:
     - regex: 'BRAVIS NP 103'
       model: 'NP103'
       device: 'tablet'
+    - regex: 'BRAVIS NP 747 SD'
+      model: 'NP747 SD'
+      device: 'tablet'
     - regex: 'BRAVIS NP 844'
       model: 'NP844'
       device: 'tablet'
@@ -1954,7 +1971,7 @@ Brigmton:
 
 # Acer (acer.com)
 Acer:
-  regex: 'acer|ACTAB|TravelMate|(?<!Satellite |ZTE BLADE |ImSmart |ERGO |X-Style Tab )(?<!Optima 7 )a(?:101|110|2[10]0(?! Pro)|211|50[10]|51[10]|70[10])(?:[);/ ]|$)|Android.*V3[67]0(?:[);/ ]|$)|Android.*Z1[23456]0 Build|Android.*Z5\d{2} Build|Android.*T0[234678] Build|Android 5(?:[\d.]*);(?: [\w-]+;)? S59|Android.*S55(?! Nova)(?:[);/ ]|$)|(?:A1-(713(HD)?|7[23]4|830|841|840(?:FHD)?|81[01])|A3-A[1-5][01]|B1-(7[1235-9][01](HD)?|7[23]3|7A0|8[1235]0|A71|860A)|TPA60W|B3-(A[125]0|A3[02]|A40FHD)|E39)(?:[);/ ]|$)|S5[12]0 Build|(DA[0-9]+HQ?L|Aspire (?:V5-121|XC-704G|V5-573G|4349)|Chromebook 14 \(CB3-431\)|Predator G9-793|GT-810|B1-870|B3-A20B|B3-A4[02]|B3-A50FHD|ET-108-11A|AC?TAB(?:721E?|1422E|821|1021(?:E|_A)|1022)|A3-A20FHD|E380|Swift SF113-31)(?:[);/ ]|$)'
+  regex: 'acer|ACTAB|TravelMate|(?<!Satellite |ZTE BLADE |ImSmart |ERGO |X-Style Tab )(?<!Optima 7 )a(?:101|110|2[10]0(?! Pro)|211|50[10]|51[10]|70[10])(?:[);/ ]|$)|Android.*V3[67]0(?:[);/ ]|$)|Android.*Z1[23456]0 Build|Android.*Z5\d{2} Build|Android.*T0[234678] Build|Android 5(?:[\d.]*);(?: [\w-]+;)? S59|android [45]([\d.]*);(?: [\w-]+;)? S55(?! Nova)(?:[);/ ]|$)|(?:A1-(713(HD)?|7[23]4|830|841|840(?:FHD)?|81[01])|A3-A[1-5][01]|B1-(7[1235-9][01](HD)?|7[23]3|7A0|8[1235]0|A71|860A)|TPA60W|B3-(A[125]0|A3[02]|A40FHD)|E39)(?:[);/ ]|$)|S5[12]0 Build|(DA[0-9]+HQ?L|Aspire (?:V5-121|XC-704G|V5-573G|4349)|Chromebook 14 \(CB3-431\)|Predator G9-793|GT-810|B1-870|B3-A20B|M10-12(?:_EEA)?|B3-A4[02]|android 4([\d.]*);(?: [\w-]+;)? Z500|B3-A50FHD|ET-108-11A|AC?TAB(?:721E?|1422E|821|1021(?:E|_A)|1022)|A3-A20FHD|E380|Swift SF113-31|A410_4G|EUT310A-11A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # smart displays
@@ -1969,6 +1986,12 @@ Acer:
       device: 'smart display'
 
     # explicit tablet models
+    - regex: 'A410_4G'
+      model: 'A410 4G'
+      device: 'tablet'
+    - regex: 'M10-12(?:_EEA)?'
+      model: 'BattleZone LTE'
+      device: 'tablet'
     - regex: 'A1-81[01]'
       model: 'Iconia A'
       device: 'tablet'
@@ -2050,6 +2073,9 @@ Acer:
     - regex: 'One 8 T4-82L'
       model: 'One 8 T4-82L'
       device: 'tablet'
+    - regex: 'EUT310A-11A'
+      model: 'Enduro' # Ultimo
+      device: 'tablet'
 
     # explicit smartphone models
     - regex: 'E39(?:[);/ ]|$)'
@@ -2106,7 +2132,7 @@ Acer:
       model: 'Liquid M220'
     - regex: 'AcerTD600'
       model: 'TD600'
-    - regex: 'Android.*S55(?:[);/ ]|$)'
+    - regex: ' S55(?:[);/ ]|$)'
       model: 'Liquid Jade'
     - regex: ' S59(?:[);/ ]|$)'
       model: 'Liquid X2'
@@ -2144,7 +2170,7 @@ Acer:
 
 # Advan or advan digital
 Advan:
-  regex: '(?:ADVAN (?:M4|S40|T5C)|i7U|S45E|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+|S4\+|1011|E1C_3G)(?:[);/ ]|$)| (?:E1C Pro|5505|5202|50(?:[46]1|5[89]|62)|600[234]|6[25]01|Android [56].*; (?:i5C|i7A)|i5G|E1C 3G)(?: Build|[;)])'
+  regex: '(?:ADVAN (?:M4|S40|T5C)|i7U|S45E|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+|S4\+|1011|E1C_3G)(?:[);/ ]|$)| (?:E1C Pro|5505|5202|50(?:[46]1|5[89]|62)|600[234]|6[25]01|Android [56](?:[\d.]*);(?: [\w-]+;)? (?:i5C|i7A)|i5G|E1C 3G)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'ADVAN M4'
@@ -2332,7 +2358,7 @@ Arian Space:
 
 # Alcatel (alcatelmobile.com)
 Alcatel:
-  regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[DEX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034[ADEFGLTX]|4035[ADXY]|4045[ADELX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|4063F|4065F|4087U|4114E|5001[ADJTU]|5002[ABDEFHJLMRSUWX]|5003[ADGU]|5006[ADG]|5007[AGUOS]|5008[ADTUY]|5009[AD]|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AJX]|5017[ABDEOX]|5019D|5022[DEX]|5023[EF]|5024[ADFIJ]|5025[DEG]|5026[ADJ]|5027B|5028[ADY]|5029[ADEFY]|5030[ADEFJMU]|5031[ADGJ]|5032[OW]|5033(?:[DFTXY]R|[EFM]P|[ADEFGJMOQSTXY])|5034D|5036D|5038[ADEX]|5039[DY]|5041[CD]|5042[ADEFGTWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5048[AIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[ADY]|5053[ADKY]|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIJY]|5059[ADIJSTXYZ]|5060[ADJ]|5061[AKU]|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADIUY]|5116J|5145A|6002[AD]|6016[ADEX]|6025[ADH]|6027A|6036[AXY]|6037[BKY]|6039[AHJKSY]|6042D|6043[AD]|6044D|6045[BFIKOXY]|6050[AFY]|6055[ABDHIKPUYZ]|6056[ADH]|6058[ADX]|6060[SXC]|6062W|6070K|7040[ADEFKRT]|7041[DX]|7042A|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7053D|7055A|7070X|7071[ADX]|8030Y|8050[DEGX]|8063|8088[MQX]|8094[MTX]|9001[DIX]|9002X|9003[AX]|9005X|9007[ATX]|9008[ADIJNTUX]|9009[AG]|9010X|9013[ATX]|9020A|9022X|9024O|9026X|9027[FQTWX]|9029[ZW]|9032[TWXZ]|9203A|9309X|A(?:46[46]BG|57[04]BL|576CC|621BL|50[13]DL|57[17]VL)|I213|I216[AX]|(?<!\.)80(?:[89]2|84|91|6[78]|5[124567]))(?:_(?:EEA|RU|TR))?|P3[36]0X|AM-H200)(?:[);/ ]|$)'
+  regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[DEX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034[ADEFGLTX]|4035[ADXY]|4045[ADELX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|4063F|4065F|4087U|4114E|5001[ADJTU]|5002[ABDEFHJLMRSUWX]|5003[ADGU]|5006[ADG]|5007[AGUOS]|5008[ADTUY]|5009[AD]|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AJX]|5017[ABDEOX]|5019D|5022[DEX]|5023[EF]|5024[ADFIJ]|5025[DEG]|5026[ADJ]|5027B|5028[ADY]|5029[ADEFY]|5030[ADEFJMU]|5031[ADGJ]|5032[OW]|5033(?:[DFTXY]R|[EFM]P|[ADEFGJMOQSTXY])|5034D|5036D|5038[ADEX]|5039[DY]|5041[CD]|5042[ADEFGTWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5048[AIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[ADY]|5053[ADKY]|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIJY]|5059[ADIJSTXYZ]|5060[ADJ]|5061[AKU]|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADIUY]|5116J|5145A|6002[AD]|6016[ADEX]|6025[ADH]|6027A|6036[AXY]|6037[BKY]|6039[AHJKSY]|6042D|6043[AD]|6044D|6045[BFIKOXY]|6050[AFY]|6055[ABDHIKPUYZ]|6056[ADH]|6058[ADX]|6060[SXC]|6062W|6070K|7040[ADEFKRT]|7041[DX]|7042A|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7053D|7055A|7070X|7071[ADX]|8030Y|8050[DEGX]|8063|8088[MQX]|8094[MTX]|9001[DIX]|9002X|9003[AX]|9005X|9007[ATX]|9008[ADIJNTUX]|9009[AG]|9010X|9013[ATX]|9020A|9022X|9024O|9026X|9027[FQTWX]|9029[ZW]|9032[TWXZ]|9203A|9309X|A(?:46[46]BG|57[04]BL|576CC|621BL|50[13]DL|57[17]VL)|I213|I216[AX]|(?<!\.)80(?:[89]2|84|91|6[78]|5[124567]))(?:_(?:EEA|RU|TR))?|P3[36]0X|AM-H200|A463BG)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '4087U'
@@ -2487,7 +2513,7 @@ Alcatel:
       model: 'One Touch Pixi Glory'
     - regex: '4014D'
       model: 'One Touch Pixi 2'
-    - regex: '4009[AFIKMSX]'
+    - regex: '4009[AFIKMSX]|A463BG'
       model: 'One Touch Pixi 3 3.5"'
     - regex: '4009[DE]'
       model: 'One Touch Pixi 3 3.5" Dual SIM'
@@ -3324,12 +3350,12 @@ Ask:
     - regex: 'ASK[_ ]([^/;]*) Build'
       model: '$1'
 
-# ANS
+# ANS or ANS Cell
 ANS:
-  regex: 'ANS/|UL40 Build'
+  regex: 'ANS/|(?: UL40)(?: Build|[;)])'
   device: 'smartphone'
   models:
-    - regex: 'UL40 Build'
+    - regex: ' UL40'
       model: 'UL40'
     - regex: 'ANS/L51'
       model: 'L51'
@@ -3439,7 +3465,7 @@ Garmin-Asus:
 
 # Asus
 Asus:
-  regex: 'Asus(?! Update)|Transformer|ZenFone Max|MeMOPad 10|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|(?:P(?:00[128ACIL]|01[MTVWYZ]|01MA|01T_1|02[13478])(?: Build|\))|X015D|X018D|X003|X00[7ABT]D|Z00D|Z00[MTY]D|Z01[7FGHKMR]D)|K01[579N]|AST21|K50IJ)(?:[);/ ]|$)|G55[023]KL|ZB(631|602|633|55[135]|50[01])KL|ZC(55[134]|520|600)KL|ZA550KL|ZE(5[02]0|620|55[2345])KL|ZD55[23]KL|ZS6(?:61|7[02136])KS|ZS(6[0236]0|55[10])KL|ZS590KS|ZB(500KG|601KL)|MeMo Pad FHD 10 LTE|Z00[SV]D|P01Y_S|Zenfone 5Z?|AOSP on Duma|Tinker Board(?: S)?|TX201LA|I005DA'
+  regex: 'Asus(?! Update)|Transformer|ZenFone Max|MeMOPad 10|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|(?:P(?:00[128ACIL]|01[MTVWYZ]|01MA|01T_1|02[13478])(?: Build|\))|X015D|X018D|X003|X00[7ABT]D|Z00D|Z00[MTY]D|Z01[7FGHKMR]D)|K01[579N]|AST21|K50IJ)(?:[);/ ]|$)|G55[023]KL|ZB(631|602|633|55[135]|50[01])KL|ZC(55[134]|520|600)KL|ZA550KL|ZE(5[02]0|620|55[2345])KL|ZD55[23]KL|ZS6(?:61|7[02136])KS|ZS(6[0236]0|55[10])KL|ZS590KS|ZB(500KG|601KL)|MeMo Pad FHD 10 LTE|Z00[SV]D|P01Y_S|Zenfone 5Z?|AOSP on Duma|Tinker Board(?: S)?|TX201LA|I005DA|I003D'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -3590,6 +3616,8 @@ Asus:
       model: 'PadFone Infinity'
     - regex: '(?:ASUS_)?A002(A)?'
       model: 'ZenFone AR'
+    - regex: '(?:ASUS_)?AI2401_H'
+      model: 'ZenFone 11 Ultra'
     - regex: '(?:ASUS_)?(?:I006D|ZS590KS)'
       model: 'ZenFone 8'
     - regex: '(?:ASUS_)?(?:I004D|ZS672KS)'
@@ -3712,6 +3740,8 @@ Asus:
       model: 'ROG Phone 7'
     - regex: '(?:ASUS_)?(?:AI2401)'
       model: 'ROG Phone 8'
+    - regex: '(?:ASUS_)?(?:I007D)'
+      model: 'Smartphone for Snapdragon Insiders'
 
     # desktop detections
     - regex: 'ZN220IC'
@@ -3861,7 +3891,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|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|G91S|Studio Mini 2023|Android 11(?:[\d.]*);(?: [\w-]+;)? J9L)(?:[);/ ]|$)'
+  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 X[23]|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[123])|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|B1550VL|DIAMOND M|M8L Plus|STUDIO ENERGY|M8L 2022|LIFE X8|M10L Pro|G71 PLUS|G52L|G91S|Studio Mini 2023|Android 11(?:[\d.]*);(?: [\w-]+;)? J9L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Advance (4\.0 ?[LM]|4\.0|5\.[02](?: HD)?|A4|L[54])'
@@ -3926,7 +3956,7 @@ Blu:
       model: 'Bold $1'
     - regex: 'Life One X2 Mini'
       model: 'Life One X2 Mini'
-    - regex: 'LIFE ONE (X2?)'
+    - regex: 'LIFE ONE (X[23]?)'
       model: 'Life One $1'
     - regex: 'LIFE ONE'
       model: 'Life One'
@@ -3942,14 +3972,10 @@ Blu:
       model: 'Neo $1'
     - regex: 'G50 Mega'
       model: 'G50 Mega'
-    - regex: 'G50 Plus'
-      model: 'G50 Plus'
-    - regex: 'G51 Plus'
-      model: 'G51 Plus'
-    - regex: 'G(90?) PRO'
+    - regex: 'G(5[01]|71) Plus'
+      model: 'G$1 Plus'
+    - regex: 'G(9[01]?) PRO'
       model: 'G$1 Pro'
-    - regex: 'G91 PRO'
-      model: 'G91 Pro'
     - regex: '(G90|D701|R2 3G|G52L|G91S)(?:[);/ ]|$)'
       model: '$1'
     - regex: ' (J9L)(?:[);/ ]|$)'
@@ -3972,6 +3998,8 @@ Blu:
       model: 'Grand M3'
     - regex: 'B110DL'
       model: 'View Mega'
+    - regex: 'B1550VL'
+      model: 'View Speed 5G'
     - regex: 'B13[01]DL'
       model: 'View 2'
     - regex: 'B135DL'
@@ -4056,12 +4084,12 @@ Bluegood:
 
 # Blackview
 Blackview:
-  regex: 'Blackview|(BL8800|BV([24-9]000|8800|[468]900|(5[1589]|9[135689])00|6[1368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|N6000|Heatwave|DM550|BV9700Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))|(?:SOLID 4 G2|A[86]0Plus|A80S|BL6000Pro|BL8800Pro|R6 Lite|P2Lite|A8 MAX|A30-RU|A20Pro|Android 10;(?: [\w-]+;)? Tab[89]|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:A80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A95)|Android 1[12];(?: [\w-]+;)? (?:A[79]0|A70 Pro|A55 Pro|Tab 1[01356]|Tab 6)|Android 13;(?: [\w-]+;)? (?:A200 Pro|Tab [86]0|Tab 18)|BV500|BV[579]200|SOLID_4G1|BV5300(?: Pro)?|Active 8 Pro|SHARK 8|Tab 8E|Tab (?:50|8|11) WiFi|COLOR 8|Tab 1[23] Pro)(?:[);/ ]|$)'
+  regex: 'Blackview|(BL8[08]00|BV([24-9]000|8800|[468]900|(5[1589]|9[135689])00|6[12368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|N6000|Heatwave|DM550|BV9700Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))|(?:SOLID 4 G2|A[86]0Plus|A80S|BL(?:6000|8800)Pro|R6 Lite|P2Lite|A8 MAX|A30-RU|A20Pro|Android 10(?:[\d.]*);(?: [\w-]+;)? Tab[89]|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:A80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A95|A100)|Android 1[12](?:[\d.]*);(?: [\w-]+;)? (?:A[79]0|A70 Pro|A55 Pro|Tab 1[01356]|Tab 6)|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:A200 Pro|Tab [86]0|Tab 18)|BV500|BV4800|BV[579]200|SOLID_4G1|BV5300(?: Pro)?|Active 8 Pro|Active 8|SHARK 8|Tab 8E|Tab (?:7|[57]0|8|11) WiFi|COLOR 8|Tab 1[23] Pro|MEGA 1|WAVE 6C)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A([2678]0|55) ?Pro(?:[);/ ]|$)'
       model: 'A$1 Pro'
-    - regex: 'A([6798]0|95)(?: Build|[;)])'
+    - regex: 'A([6798]0|95|100)(?: Build|[;)])'
       model: 'A$1'
     - regex: 'A8 MAX(?:[);/ ]|$)'
       model: 'A8 Max'
@@ -4071,7 +4099,7 @@ Blackview:
       model: 'A30'
     - regex: '(A[86]0|BV[59]500)Plus(?:[);/ ]|$)'
       model: '$1 Plus'
-    - regex: '(BV6000S|BL8800|N6000)(?:[);/ ]|$)'
+    - regex: '(BV6000S|BL8[08]00|N6000)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(P2|R6) ?Lite'
       model: '$1 Lite'
@@ -4085,12 +4113,12 @@ Blackview:
       model: 'Color 8'
     - regex: 'SHARK 8'
       model: 'Shark 8'
+    - regex: 'WAVE 6C'
+      model: 'Wave 6C'
     - regex: 'SOLID_4G1'
       model: 'Solid-4 G1'
     - regex: 'SOLID 4 G2'
       model: 'Solid-4 G2'
-    - regex: 'Active 8 Pro'
-      model: 'Active 8 Pro'
     - regex: '(BV6[13]00)(?:[);/ ]|$)'
       model: '$1'
       device: 'phablet'
@@ -4099,13 +4127,22 @@ Blackview:
     - regex: '(BV\d+[\w]?|P10000)(?:[-_](?:RU|F))?(?:[);/ ]|$)'
       model: '$1'
 
+    - regex: 'Active 8 Pro'
+      device: 'tablet'
+      model: 'Active 8 Pro'
+    - regex: 'Active 8'
+      device: 'tablet'
+      model: 'Active 8'
+    - regex: 'MEGA 1'
+      device: 'tablet'
+      model: 'Mega 1'
     - regex: 'Tab (1[0235]) Pro(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1 Pro'
     - regex: ' Tab ?(6 Kids|8E)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1'
-    - regex: 'Tab (50|8|11) WiFi(?:[);/ ]|$)'
+    - regex: 'Tab (7|[57]0|8|11) WiFi(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1 WiFi'
     - regex: 'Tab 11 SE(?:[);/ ]|$)'
@@ -4253,7 +4290,7 @@ Brondi:
 
 # VGO TEL (vgotel.com)
 VGO TEL:
-  regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[1256]|22|[57])|i_Smart)(?:[);/ ]|$)'
+  regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[01256]|2[024]|[57])|i_Smart)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Venture ?V([278]|1[02])(?:[);/ ]|$)'
@@ -4267,15 +4304,25 @@ VGO TEL:
 
 # Vivo (vivo.com.cn, vivo.com)
 Vivo:
-  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|iQOO Neo \d|(?:V1730(D[AT]|GA)|V18(?:01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2044|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[123678]|I2127|I221[23467]|I222[03]|I230[14]|V211[4-8]A?|V204[57]A?|V210[28]A?|I2009|I2017|I2022|V215[4678]A|V215[0-478]|V218[03568]A|V2180GA|V219[069]A|V213[012459]A?|V2023EA|V1962BA|V212[57]|V214[0-79]|V1930|V216[0289]|V2164[KP]A|V216[234568]A|V217[08]A|PA2170|PA2353|V220[37]A|V220[1-9]|V221[789]A|V221[247]|V222[079]A|V222[1589]|V22[34]1A|V224[2345]A|V2241HA|V2236|V224[0246789]|V22[36]6A|V230[12479]A|V230[237]|V232[01245]|V232[349]A|V231[012678]|V231[234]A|V233[12]|V233[489]A|V223[01289]A|V223[01789]|V225[0123]|V2254A?|V227[0189]A|V228[2345]A|V2344A|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|V2234(?:_PK)?|iQOO U[13]x?|NEX 3s 5G)(?:[);/ ]|$)'
+  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|iQOO Neo \d|(?:V1730(D[AT]|GA)|V18(?:01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936TL|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V20[34]4|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[123678]|I2127|I221[234679]|I222[03]|I230[124]|V211[4-8]A?|V204[57]A?|V210[28]A?|I2009|I2017|I2022|V215[4678]A|V215[0-478]|V218[03568]A|V2180GA|V219[069]A|V213[012459]A?|V2023EA|V1962BA|V212[57]|V214[0-79]|V1930|V216[0289]|V2164[KP]A|V216[234568]A|V217[08]A|PA2170|PA23[57]3|V220[37]A|V220[1-9]|V221[789]A|V221[24789]|V222[079]A|V222[12589]|V22[34]1A|V224[2345]A|V2241HA|V2236|V224[0246789]|V22[36]6A|V230[123479]A|V230[23789]|V232[012457]|V232[349]A|V231[0125-8]|V231[23478]A|V2312BA|V233[123469]|V233[4789]A|V223[01289]A|V223[01789]|V225[0123]|V2254A?|V227[01289]A|V228[2345]A|V2344A|V2342|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|V2234(?:_PK)?|iQOO (?:U[13]x?|Z1x 5G)|NEX 3s 5G|Z5x 712|V2230EA|iPA2375|PA2473|V2156FA|V2352A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PA2170'
       device: 'tablet'
       model: 'Pad'
+    - regex: 'PA2373'
+      device: 'tablet'
+      model: 'Pad 2'
+    - regex: 'PA2473'
+      device: 'tablet'
+      model: 'Pad 3 Pro'
     - regex: 'PA2353'
       device: 'tablet'
       model: 'Pad Air'
+    - regex: 'iPA2375'
+      device: 'tablet'
+      model: 'iQOO Pad'
+
     - regex: 'V2170A(?:[);/ ]|$)'
       device: 'phablet'
       model: 'X Note'
@@ -4285,18 +4332,28 @@ Vivo:
     - regex: 'V2266A'
       device: 'phablet'
       model: 'X Fold 2'
+    - regex: 'V2303A'
+      device: 'phablet'
+      model: 'X Fold 3'
+    - regex: 'V2337A'
+      device: 'phablet'
+      model: 'X Fold 3 Pro'
     - regex: 'V2229A'
       device: 'phablet'
       model: 'X Fold+'
 
     - regex: ' (Y20T|Y30g)(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'V2324A'
+    - regex: 'V2318A'
+      model: 'G2'
+    - regex: 'V2324A|V2309(?:[);/ ]|$)'
       model: 'X100 Pro'
-    - regex: 'V2309A'
+    - regex: 'V2309A|V2308'
       model: 'X100'
     - regex: 'V2307(?:[);/ ]|$)'
       model: 'Y200 5G'
+    - regex: 'V2336(?:[);/ ]|$)'
+      model: 'Y200e 5G'
     - regex: 'V1824[B]?A(?:[);/ ]|$)'
       model: 'iQOO'
     - regex: 'V1955A(?:[);/ ]|$)'
@@ -4361,7 +4418,7 @@ Vivo:
       model: 'iQOO Neo'
     - regex: '(?:V1981A|iQOO Neo 3)(?:[);/ ]|$)'
       model: 'iQOO Neo 3'
-    - regex: 'V1936A[L]?(?:[);/ ]|$)'
+    - regex: 'V1936(?:TL|A[L]?)(?:[);/ ]|$)'
       model: 'iQOO Neo 855'
     - regex: 'V2301A'
       model: 'iQOO Neo 8'
@@ -4375,8 +4432,12 @@ Vivo:
       model: 'iQOO Z1'
     - regex: 'V2012A(?:[);/ ]|$)'
       model: 'iQOO Z1x'
+    - regex: 'iQOO Z1x 5G(?:[);/ ]|$)'
+      model: 'iQOO Z1x 5G'
     - regex: '(?:V2073A|I2011)(?:[);/ ]|$)'
       model: 'iQOO Z3'
+    - regex: 'Z5x 712'
+      model: 'Z5x 712'
     - regex: 'V1919A'
       model: 'iQOO Z5x'
     - regex: 'V2131A'
@@ -4395,10 +4456,14 @@ Vivo:
       model: 'iQOO Z6 Lite'
     - regex: 'V2270A'
       model: 'iQOO Z7'
+    - regex: 'V2230EA'
+      model: 'iQOO Z7i'
     - regex: 'I22(?:13|07)(?:[);/ ]|$)'
       model: 'iQOO Z7 5G'
     - regex: 'I2301(?:[);/ ]|$)'
       model: 'iQOO Z7 Pro 5G'
+    - regex: 'V2272A'
+      model: 'iQOO Z7x'
     - regex: 'I2216(?:[);/ ]|$)'
       model: 'iQOO Z7x 5G'
     - regex: 'I2223(?:[);/ ]|$)'
@@ -4407,6 +4472,12 @@ Vivo:
       model: 'iQOO Z8'
     - regex: 'V2312A'
       model: 'iQOO Z8x'
+    - regex: 'I2302'
+      model: 'iQOO Z9 5G'
+    - regex: 'V2352A'
+      model: 'iQOO Z9 Turbo'
+    - regex: 'I2219'
+      model: 'iQOO Z9x 5G'
     - regex: '(?:V2023A|iQOO U1)(?:[);/ ]|$)'
       model: 'iQOO U1'
     - regex: '(?:V2065A|iQOO U1x)(?:[);/ ]|$)'
@@ -4425,6 +4496,8 @@ Vivo:
       model: 'iQOO 8'
     - regex: 'V2141A(?:[);/ ]|$)'
       model: 'iQOO 8 Pro'
+    - regex: 'V2339(?:[);/ ]|$)'
+      model: 'V30e'
     - regex: '(?:V2025)(?:[);/ ]|$)'
       model: 'V20'
     - regex: '(?:V2066|V2108)(?:[);/ ]|$)'
@@ -4461,6 +4534,8 @@ Vivo:
       model: 'Nex Dual Display'
     - regex: 'Vivo ONE(?:[);/ ]|$)'
       model: 'One'
+    - regex: 'V2312BA'
+      model: 'Y100i 5G'
     - regex: 'V2115A|V2141|V2157|V2150'
       model: 'T1 5G'
     - regex: 'V2151'
@@ -4475,10 +4550,14 @@ Vivo:
       model: 'T2x 5G'
     - regex: 'V2320'
       model: 'T2'
+    - regex: 'V2222'
+      model: 'T2 5G'
     - regex: 'V2321'
       model: 'T2 Pro 5G'
     - regex: 'V2240'
       model: 'T2 5G'
+    - regex: 'V2334(?:[);/ ]|$)'
+      model: 'T3 5G'
     - regex: 'V1962BA'
       model: 'G1 5G'
     - regex: 'V2203A(?:[);/ ]|$)'
@@ -4525,12 +4604,20 @@ Vivo:
       model: 'V29 Pro'
     - regex: 'V2303'
       model: 'V29e'
+    - regex: 'V2317A'
+      model: 'Y12 (2023)'
     - regex: 'V2317'
       model: 'V29e 5G'
+    - regex: 'V2315'
+      model: 'Y28 5G'
     - regex: 'V2244(?:[);/ ]|$)'
       model: 'V29 Lite 5G'
     - regex: 'V2318(?:[);/ ]|$)'
       model: 'V30'
+    - regex: 'V2342'
+      model: 'V30 Lite'
+    - regex: 'V2327'
+      model: 'V30 Lite 5G'
     - regex: 'V1932[AT](?:[);/ ]|$)'
       model: 'S5'
     - regex: 'V2207A'
@@ -4617,8 +4704,10 @@ Vivo:
       model: 'X9s Plus'
     - regex: 'vivo X9s(?: [AL])?(?:[);/ ]|$)'
       model: 'X9s'
-    - regex: 'V2241A'
+    - regex: 'V2241A|V2218(?:[);/ ]|$)'
       model: 'X90'
+    - regex: 'V2219(?:[);/ ]|$)'
+      model: 'X90 Pro'
     - regex: 'V2241HA'
       model: 'X90s'
     - regex: 'vivo X5Pro(?:[);/ ]|$)'
@@ -4697,6 +4786,8 @@ Vivo:
       model: 'Y17'
     - regex: 'V2310|V2331'
       model: 'Y17s'
+    - regex: 'V2333(?:[);/ ]|$)'
+      model: 'Y18'
     - regex: 'V22[01]4(?:[);/ ]|$)'
       model: 'Y16'
     - regex: '(?:vivo 1906(?:_20)?|V2236A)(?:[);/ ]|$)'
@@ -4757,7 +4848,7 @@ Vivo:
       model: 'Y25'
     - regex: '(?:V2043_21|V2048)(?:[);/ ]|$)'
       model: 'Y20 (2021)'
-    - regex: '(?:V205[24]|V2070|V2101)(?:[);/ ]|$)'
+    - regex: '(?:V205[24]|V2070|V2101|V2034)(?:[);/ ]|$)'
       model: 'Y20A'
     - regex: 'V2037(?:[);/ ]|$)'
       model: 'Y20G'
@@ -4905,7 +4996,7 @@ Vivo:
       model: 'Y73s'
     - regex: 'V2124(?:[);/ ]|$)'
       model: 'Y76 5G'
-    - regex: 'V2156A'
+    - regex: 'V2156F?A'
       model: 'Y76s'
     - regex: 'V1913[AT](?:[);/ ]|$)'
       model: 'Y7s'
@@ -5070,7 +5161,7 @@ BenQ:
 
 # Blaupunkt (blaupunkt.com)
 Blaupunkt:
-  regex: 'Blaupunkt|(?:Soundphone S2|Atlantis[_ ](?:1001A|1010A|A10[._]G40[23])|SLplus02|Discovery[_ ](?:A10_302|10[28]C|111C|1000C|1001A?)|Endeavour[_ ](?:785|101[GLM]|1000|1001|101[03]|1100)|Polaris[_ ]80[38](?:_BE)?|BP_(?:6010|6110)|B-STREAM|SL05|SM 02 2019)(?:[);/ ]|$)'
+  regex: 'Blaupunkt|(?:Soundphone S2|Atlantis[_ ](?:1001A|1010A|A10[._]G40[23])|SLplus02|Discovery[_ ](?:A10_302|10[28]C|111C|1000C|1001A?)|Endeavour[_ ](?:785|101[GLM]|1000|1001|101[03]|1100)|Polaris[_ ]80[38](?:_BE)?|BP_(?:6010|6110)|B-STREAM|SL05|SM 02 2019|SF04 4G)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Discovery[_ ](1000|111|10[28])C'
@@ -5098,7 +5189,7 @@ Blaupunkt:
     - regex: 'Blaupunkt[_ ](SL[_ ]0[124]|SM[_ ]0[12])'
       device: 'smartphone'
       model: '$1'
-    - regex: '(SF02|SL05)'
+    - regex: '(SF02|SL05|SF04 4G)'
       device: 'smartphone'
       model: '$1'
     - regex: 'SM 02 2019'
@@ -5145,7 +5236,7 @@ Bmobile:
 
 # bq
 bq:
-  regex: 'Aquaris|bq [^/;]+ Build|BQS[-_]([0-9]{4})|(BQ(ru)?[_ -][0-9]{3,4})|BQ5059|BQ1008G|BQru_BQru-|Edison 3|Smart_TV_BQ'
+  regex: 'Aquaris|bq [^/;]+ Build|BQS[-_]([0-9]{4})|(BQ(ru)?[_ -][0-9]{3,4})|BQ5059|BQ1008G|BQru_BQru-|Edison 3|Smart_TV_BQ|Fnac 10 3G'
   device: 'smartphone'
   models:
     - regex: 'BQ(?:ru)?-(?:5209L|5044)(?:[);/ ]|$)'
@@ -5208,6 +5299,9 @@ bq:
     - regex: 'BQ-7022(G)?'
       model: 'Canion'
       device: 'tablet'
+    - regex: 'Fnac 10 3G'
+      model: 'Fnac 10" 3G'
+      device: 'tablet'
     - regex: 'BQ-7021G'
       model: 'Hit'
       device: 'tablet'
@@ -5546,10 +5640,10 @@ bq:
       model: 'Malta'
       device: 'tablet'
     - regex: 'BQ-7000G(?:[);/ ]|$)'
-      model: 'Сharm'
+      model: 'Charm'
       device: 'tablet'
     - regex: 'BQ-7040G(?:[);/ ]|$)'
-      model: 'Сharm Plus'
+      model: 'Charm Plus'
       device: 'tablet'
     - regex: 'BQ-7038G(?:[);/ ]|$)'
       model: 'Light Plus'
@@ -5671,14 +5765,20 @@ Casio:
     - regex: 'C811 4G(?:[);/ ]|$)'
       model: "G'zOne Commando 4G LTE"
 
+# VOCAL or VocalPhone (vocalphone.com)
+VOCAL:
+  regex: 'VOCAL[ _](V[01])(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # Casper (casper.com.tr)
 Casper:
-  regex: 'CASPER[_ ]|VIA[- _](X30(?: Plus)?|[XF]20|F30|T7D|A[34]|E[43]|E30|F[123]|G[345]|M4|M3[05]|[LS]8|S7|P[23]|V8C|A[13]_Plus(?:_64)?|A1(?:_1)?|S[13]0|S48|S|T17_M|T1[07]|T7|[ST]7-3G|T8B|T8D-3G|S1[78]|S48_0|[LS]30_0|L30|F30 Plus|M30 Plus)(?:[);/ ]|$)'
+  regex: 'CASPER[_ ]|VIA[- _](X30(?: Plus)?|[AX]40|[XF]20|F30|T7D|A[34]|E[43]|E30|F[123]|G[345]|M4|M3[05]|[LS]8|S7|P[23]|V8C|A[13]_Plus(?:_64)?|A1(?:_1)?|S[13]0|S48|S|T17_M|T1[07]|T7|[ST]7-3G|T8B|T8D-3G|S1[78]|S48_0|[LS]30_0|L30|F30 Plus|M30 Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:CASPER[_ ])?VIA[_ ](A1|[FMX]30)[_ ]Plus(?:_64)?'
       model: 'VIA $1 Plus'
-    - regex: '(?:CASPER[_ ])?VIA[_ ]([XF]20|F30|X30|G1_Plus|F30 Plus|A3_Plus|G[135]|E[14]|E30|[AE]2|M[123]|V[35689]|V10|G3|V6X|A[34]|E3|F[123]|G4|M4|M3[05]|P[23]|S|V8C|A1(?:_1)?)(?:[);/ ]|$)'
+    - regex: '(?:CASPER[_ ])?VIA[_ ]([AX]40|[XF]20|F30|X30|G1_Plus|F30 Plus|A3_Plus|G[135]|E[14]|E30|[AE]2|M[123]|V[35689]|V10|G3|V6X|A[34]|E3|F[123]|G4|M4|M3[05]|P[23]|S|V8C|A1(?:_1)?)(?:[);/ ]|$)'
       model: 'VIA $1'
     - regex: 'CASPER_VIA_E1c'
       model: 'VIA E1C'
@@ -5700,7 +5800,7 @@ Casper:
 
 # Cat (Caterpillar, Catphones, Bullitt Group)
 Cat:
-  regex: 'BULLITTGROUPLIMITED|B30_Dorado|Cat ?(tablet|stargate|nova)|(?:B15Q|CAT B35|CAT-B100|S62 Pro|S48c|Android 9;(?: [\w-]+;)? S52|Android 10;(?: [\w-]+;)? S42)(?:[);/ ]|$)'
+  regex: 'BULLITTGROUPLIMITED|B30_Dorado|Cat ?(tablet|stargate|nova)|(?:B15Q|CAT B35|CAT-B100|S22 FLIP|S62 Pro|S48c|Android 9(?:[\d.]*);(?: [\w-]+;)? S52|Android 10(?:[\d.]*);(?: [\w-]+;)? S42)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'B15Q'
@@ -5715,6 +5815,9 @@ Cat:
     - regex: 'S62 Pro'
       model: 'S62 Pro'
       device: 'smartphone'
+    - regex: 'S22 FLIP'
+      model: 'S22 Flip'
+      device: 'smartphone'
     - regex: ' (S48c|S[45]2)(?:[);/ ]|$)'
       model: '$1'
       device: 'smartphone'
@@ -5857,9 +5960,13 @@ Compal:
 
 # Artel (artelgroup.org)
 Artel:
-  regex: 'Artel[_ ]|\w+_ARTEL_\w+|(?: GAP|GAP YOQ| ALO|U1 MINI|Android 8(?:[\d.]*);(?: [\w-]+;)? U[124](?!/)|U3_4G)(?:[);/ ]|$)'
+  regex: 'Artel[_ ]|\w+_ARTEL_\w+|(?: GAP|GAP YOQ| ALO|U1 MINI|Android 8(?:[\d.]*);(?: [\w-]+;)? U[124](?!/)|U3_4G| R3G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'R3G(?:[);/ ]|$)'
+      device: 'tv'
+      model: 'R3 GTV'
+
     - regex: ' GAP|GAP YOQ(?:[);/ ]|$)'
       model: 'Gap Yo Q'
     - regex: 'U1 MINI(?:[);/ ]|$)'
@@ -6111,7 +6218,7 @@ Condor:
 
 # Coolpad (coolpad.us)
 Coolpad:
-  regex: '(?:YL-)?Coolpad|(?:Cool_9S|1824-S0|8190Q|1831-A0|8676-[AM]01|1872-A0|CP8298_I00|CP3648AT?|CP8676_I0[23]|REVVLPLUS C3701A|VCR-[AI]0|C105-(?:8|E0)|C106-[789]|C107-9| C106|MTS-T0|cp3705A[S]?|ORL-C0|DLS-E0|182[56]-I01|1825-E0| 1825|8298-(?:M02|A01)|5560S|CP3320AS2|CP3667AT|CP3706AS|CP3669AS|CP3321AT|CP350[34]L|C103|CP03|C1-U02|SAC-A0| 203[29]|CP05)(?:[);/ ]|$)|(8295|5860S) Build'
+  regex: '(?:YL-)?Coolpad|(?:Cool_9S|1824-S0|8190Q|1831-A0|8676-[AM]01|1872-A0|CP8298_I00|CP3648AT?|CP8676_I0[23]|REVVLPLUS C3701A|VCR-[AI]0|C105-(?:8|E0)|C106-[789]|C107-9| C106|MTS-T0|cp3705A[S]?|ORL-C0|DLS-E0|182[56]-I01|1825-E0| 1825|8298-(?:M02|A01)|5560S|CP3320AS2|CP3667AT|CP3706AS|CP3669AS|CP3321AT|CP350[34]L|C103|CP03|C1-U02|SAC-A0| 203[29]|CP05|CP12)(?:[);/ ]|$)|(8295|5860S) Build'
   device: 'smartphone'
   models:
     - regex: 'VCR-[AI]0'
@@ -6172,6 +6279,8 @@ Coolpad:
       model: 'Cool 20'
     - regex: 'CP05(?:[);/ ]|$)'
       model: 'Cool 20 Pro'
+    - regex: '(CP12)(?:[);/ ]|$)'
+      model: '$1'
     - regex: 'SAC-A0(?:[);/ ]|$)'
       model: '26' # Tibetan Peak Edition
     - regex: '5560S(?:[);/ ]|$)'
@@ -6248,11 +6357,13 @@ Cosmote:
 
 # Cricket
 Cricket:
-  regex: 'Cricket-([a-z0-9]+)|(?:U304AC|U325AC|U705AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C)(?:[);/ ]|$)'
+  regex: 'Cricket-([a-z0-9]+)|(?:U304AC|U325AC|U680AC|U705AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'SL101AE'
       model: 'Debut Smart'
+    - regex: 'U680AC'
+      model: 'Outlast'
     - regex: 'EC211001'
       model: 'Dream 5G'
     - regex: 'U304AC'
@@ -6345,11 +6456,13 @@ Crown:
 
 # AllDocube (alldocube.com)
 AllDocube:
-  regex: '(?:T1001XS?|T1006S?|T1001|iPlay[_ ][2345]0|U1006H?|U1005E|U63PLUS|iPlay8|iPlay_?[89]T|iPlay[134]0|iPlay_40H|iPlay50 (?:Pro|Mini)|iPlay_?[25]0[SP]|kPad|X_Game|T806MHE?|Power M3|Smile_X)(?:[);/ ]|$)'
+  regex: '(?:T1001XS?|T1006S?|T1001|T811|iPlay[_ ][2345]0|U1006H?|U1005E|U63PLUS|iPlay8|iPlay_?[89]T|iPlay[134]0|iPlay_40H|iPlay50_mini_Pro|iPlay50 (?:Pro|Mini)|iPlay_?[25]0[SP]|iPlay50|kPad|X_Game|T806MHE?|Power M3|Smile_X)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Smile_X(?:[);/ ]|$)'
       model: 'Smile X'
+    - regex: 'T811(?:[);/ ]|$)'
+      model: 'Kidz Pad Pro'
     - regex: 'T1001XS(?:[);/ ]|$)'
       model: 'M5XS'
     - regex: 'kPad(?:[);/ ]|$)'
@@ -6370,6 +6483,8 @@ AllDocube:
       model: 'X'
     - regex: 'T806MHE?'
       model: 'iPlay 8 Pro'
+    - regex: 'iPlay[_ ]?50[_ ]mini[_ ]Pro'
+      model: 'iPlay 50 Mini Pro'
     - regex: 'iPlay50 Pro'
       model: 'iPlay 50 Pro'
     - regex: 'iPlay50 Mini'
@@ -6381,6 +6496,12 @@ AllDocube:
     - regex: 'Power M3(?:[);/ ]|$)'
       model: 'Power M3'
 
+# Xsmart (xsmart.com.pk)
+Xsmart:
+  regex: 'Xsmart (Nova 7)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # MyTab
 MyTab:
   regex: '(?:MyTAB[ _-](?:8 MINI Dual Core|U55GT)|U103GT1)(?:[);/ ]|$)'
@@ -6465,7 +6586,7 @@ Meta:
 
 # CUBOT (www.cubot.net)
 CUBOT:
-  regex: 'CUBOT|(?<!QUMO |like )QUEST(?!(?:[0-9]|\s[0-9]))(?: LITE)?|(?:(?<!(?:Redmi|Tegra) )NOTE 7|(?<!Galaxy )NOTE 20(?: PRO)?|RAINBOW 2|KING_KONG_3|ZORRO 001|KINGKONG[_ ](?:MINI2?|POWER|STAR|[5-9]|5 Pro)|TAB KINGKONG|KING KONG CS|R15_PRO|S550 Pro| CHEETAH| [RX]19|X19 S|(?<!MI )MAX 3|Android 9;(?: [\w-]+;)? (?:J5|MAX 2|X20 PRO)|Android [89](?:[\d.]*);(?: [\w-]+;)? R15(?! Dream Mirror| Neo)|Android 13;(?: [\w-]+;)? (?:NOTE [345]0|NOTE 21)|Android 11;(?: [\w-]+;)? (?:Pocket|NOTE 9|P50|J10)|POCKET 3)(?:[);/ ]|$)'
+  regex: 'CUBOT|(?<!QUMO |like )QUEST(?!(?:[0-9]|\s[0-9]))(?: LITE)?|(?:(?<!(?:Redmi|Tegra) )NOTE 7|(?<!Galaxy )NOTE 20(?: PRO)?|RAINBOW 2|KING_KONG_3|ZORRO 001|KINGKONG[_ ](?:MINI2?|POWER|STAR|[5-9]|5 Pro|AX)|TAB KINGKONG|KING KONG CS|R15_PRO|S550 Pro| CHEETAH| [RX]19|X19 S|(?<!MI )MAX 3|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:J5|MAX 2|X20 PRO)|Android [89](?:[\d.]*);(?: [\w-]+;)? R15(?! Dream Mirror| Neo)|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:P60)|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:NOTE [345]0|NOTE 21|P80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:Pocket|NOTE 9|P50|J10)|POCKET 3)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TAB KINGKONG'
@@ -6486,6 +6607,8 @@ CUBOT:
       model: 'Dinosaur'
     - regex: 'KINGKONG[ _]POWER'
       model: 'King Kong Power'
+    - regex: 'KINGKONG[ _]AX'
+      model: 'King Kong AX'
     - regex: 'KINGKONG[ _]STAR'
       model: 'King Kong Star'
     - regex: 'KINGKONG MINI2 Pro'
@@ -6538,7 +6661,7 @@ CUBOT:
       model: 'X18 Plus'
     - regex: 'CUBOT[ _](A5|C6W|H3|J3|P7|P20|[RXJ]9|R11|X18)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' (X19 S|[RX]19|R15|J5|P[56]0|J10)(?:[);/ ]|$)'
+    - regex: ' (X19 S|[RX]19|R15|J5|P[568]0|J10)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'CUBOT ([^;/]+) Build'
       model: '$1'
@@ -6732,7 +6855,7 @@ Desay:
 
 # DEXP (dexp.club)
 DEXP:
-  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|Larus_TV1|Ixion(?:ML4\.7|ES250)|M150Storm|(?:SENIOR|F4[38]D8000K|VA(?:[12]10|170)|ML450|MS[56]50|BL(?:[123]50|160|155)|BS(?:155|160|[1256]50)|(?<!ILIUM )S(?:3[78]0|2[89]0|670)|AL(?:[12]40|[23]50)|AS(?:155|[123]60)| (?:B260|B245|H[12]10|H270|L470|N280i|P310|P380i?|R1[18]0|Q110|E1[78]0|E[12]10|B(?:450|340|35[05])|M170|M445|M[12]10|T155|H32F8000C|U43F8000Q|A(?:1[456]0|340|[34]55)|GS15[035]|GL[23]55|G25[035]|G355|G550|G15[05]|ES750|XL150|Z[1-4]55|H[13]70|H[34]10|P[45]10|L2[17]0)|Z250|A440|(?<!MITO )A350(?! TV)|N[13]80i|(?<!Blade )L1[178]0|L3[17]0i|(?<!VOX )G450|G660|Q[123]10|Q[12]80|N[234]10|N[35]70|EX111|S[245]70|S[127]70i|S169|S110|S180i?|S770|A555(?! Universe)|(?:U75H8000K|U50H8000E|U65H8000K|U50G8000QG|U55H8050E|U43G9000CG|U43F8100QG|U55G8000QG|U50G9000CG|H32H8001C|H32G8000CG|H32F8000QG?(?:-[abc])?|H32F8[01]00Q|H39F8000Q|F43H8000K|U43H8000E|U43F8000EG|F43F8000[CQ]G?|F32[FG]8000C|F43G8000C|H24H8000C|H24F8000Q|F43F8000Q-G)(?:-[AbcfedH])?|Android 8(?:[\d.]*);(?: [\w-]+;)? A240|android 10;(?: [\w-]+;)? (?:B[23]1|B38|B1[87]|K28|K[34]1)|android 9;(?: [\w-]+;)? (?:K18|K21|B11)|android 11;(?: [\w-]+;)? (?:D[12]1|T21|K[345]1|K[342]8|K61|C3[78]|B28|B27|H28)|32FCY1|H32H8051C-G|50UCY2-G|55UCY1|H3218000K|U50F8000QG|U50H8050EG|H32I8000K|U65G8000Q|U43G8100QG|Android 11;(?: [\w-]+;)? P11)(?:[);/ ]|$)'
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|Larus_TV1|Ixion(?:ML4\.7|ES250)|M150Storm|(?:SENIOR|F4[38]D8000K|VA(?:[12]10|170)|ML450|MS[56]50|BL(?:[123]50|160|155)|BS(?:155|160|[1256]50)|(?<!ILIUM )S(?:3[78]0|2[89]0|670)|AL(?:[12]40|[23]50)|AS(?:155|[123]60)| (?:B260|B245|H[12]10|H270|L470|N280i|P310|P380i?|R1[18]0|Q110|E1[78]0|E[12]10|B(?:450|340|35[05])|M170|M445|M[12]10|T155|H32F8000CG?|U43F8000Q|A(?:1[456]0|340|[34]55)|GS15[035]|GL[23]55|G25[035]|G355|G550|G15[05]|ES750|XL150|Z[1-4]55|H[13]70|H[34]10|P[45]10|L2[17]0)|Z250|A440|(?<!MITO )A350(?! TV)|N[13]80i|(?<!Blade )L1[178]0|L3[17]0i|(?<!VOX )G450|G660|Q[123]10|Q[12]80|N[234]10|N[35]70|EX111|S[245]70|S[127]70i|S169|S110|S180i?|S770|A555(?! Universe)|(?:U75H8000K|U50H8000E|U65H8000K|F43H8000QG|U50G8000QG|U55H8050E|U43G9000CG|U43F8100QG|U55G8000QG|U50G9000CG|H32H800(?:1C|0[KQ])|H32G8000(?:CG|KW|Q)|H32F8000QG?(?:-[abc])?|H32F8[01]00Q|H39F8000Q|F43H8000K|U43H8000E|F(?:32|43)H8050C|U43F8000EG|F43F8000[CQ]G?|F32[FG]8000C|F43G8000C|H24H8000C|H24F8000Q|F43F8000Q-G)(?:-[AbcfedH])?|Android 8(?:[\d.]*);(?: [\w-]+;)? A240|android 10(?:[\d.]*);(?: [\w-]+;)? (?:B[23]1|B38|B1[87]|K28|K[34]1)|android 9(?:[\d.]*);(?: [\w-]+;)? (?:K18|K21|B11)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:D[12]1|T21|K[345]1|K[342]8|K61|C3[78]|B28|B27|H28)|43UCY1|32FCY1|U43H8050EG|H32H8051C-G|H32H8050CG|65UCY1-[GB]|55UCY1-G|50UCY[12]-G|40FCY1|55UCY1|U5[05]E9100Q|H24F8000C|H3218000K|U50F8000QG?|U50H8050EG|H32I8000K|U65G8000Q|U43G8100QG|F40H8000E|Android 11(?:[\d.]*);(?: [\w-]+;)? P11)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:DEXP_)?(ML450|MS[56]50|ES750|XL150|ES1050)(?:[);/ ]|$)'
@@ -6792,7 +6915,7 @@ DEXP:
       device: 'console'
       model: 'Freya'
 
-    - regex: '([HFU]\d{2}[A-Z]\d{4}[A-Z]{1,2}|AL-2020|32FCY1|H32F8000Q|H32[1I]8000K|H32H8051C-G|F43F8000Q-G|50UCY2-G|55UCY1)(?:-[AbcfedH]|U50H8050EG|U65G8000Q)?(?:[);/ ]|$)'
+    - regex: '([HFU]\d{2}[A-Z]\d{4}[A-Z]{1,2}|AL-2020|43UCY1|40FCY1|32FCY1|F32H8050C|H32F8000Q|H32[1I]8000K|H32H8051C-G|F43F8000Q-G|50UCY[12]-G|55UCY1-G|65UCY1-[GB]|55UCY1)(?:-[AbcfedH])?(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
 
@@ -6862,6 +6985,8 @@ Digicel:
       model: 'DL$1'
     - regex: 'DL810'
       model: 'DL810'
+    - regex: 'DIGICELDL1plus'
+      model: 'DL1 Plus'
     - regex: 'DIGICEL[ _]([^/);]+)(?: Build|[;)])'
       model: '$1'
 
@@ -6896,11 +7021,13 @@ Digiland:
 
 # Digit4G or DIGIT (https://digit4g.com/p)
 Digit4G:
-  regex: 'Digit4G|Digit(?:4G|play1)|DIGIT (?:INFINITY|Glory1)'
+  regex: 'Digit4G|Digit(?:4G|play1|next_Ultra)|DIGIT (?:INFINITY|Glory1)'
   device: 'smartphone'
   models:
     - regex: 'Digitplay1(?:[);/ ]|$)'
       model: 'Play1'
+    - regex: 'Digitnext_Ultra(?:[);/ ]|$)'
+      model: 'Next Ultra'
     - regex: 'Glory1(?:[);/ ]|$)'
       model: 'Glory1'
     - regex: 'INFINITY MAX(?:[);/ ]|$)'
@@ -6909,7 +7036,7 @@ Digit4G:
       model: 'Infinity'
     - regex: 'Energy Max(?:[);/ ]|$)'
       model: 'Energy Max'
-    - regex: 'Digit4G E([23]) pro(?:[);/ ]|$)'
+    - regex: 'Digit4G[ _]E([234])[ _]pro(?:[);/ ]|$)'
       model: 'E$1 Pro'
     - regex: 'Digit4G[ -](Energy|Pro)'
       model: '$1'
@@ -6924,7 +7051,7 @@ COMPUMAX:
 
 # Digma
 Digma:
-  regex: 'Digma[_ ]([^;/]+) Build|iD[sr]Q\d+|DiMagic|HIT HT707[10]MG|CITI (?:7 E401 4G|8 E400 4G|ATL 4G|Kids|Octa [178]0|1902 3G|10 E402|Z530 3G|13 X703 4G)|(CITI[_ ](?:[A-Z0-9]+)[_ ][34]G)[ _][TC][ST](?:[0-9]{4}[PM][LG])|HIT 4G|HT7074ML|IDX5|(iDx10|iDx7)|MVM900H(?:WZ|C)|MVM908HCZ|(iDxD8 3G|iDxD10 3G|iDrQ10 3G|iDxD[45]|iDxQ5|iD[nx]D7(?:[_ ]3G)?)|PS604M|PT452E|Linx.+ [34]G L[TS][0-9]{4}[PM][GL]|Linx PS474S|PS1043MG|HT7071MG|HT5035PG|HT4039PG|NS6902QL|NS9797MG|TS7854M|TS1012E 3G|TT1004PG|TT702[045]MG|TT1002MG|TT7026MW|WS8251PL|VRL42|((?:Optima(?![_ ]T-II)(?: Kids 7)?|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)|DM-LED(?:32SR21|43SR23|42SR24|24SR20|55UR31|43SBB31)|RS1248PL|RS1253PL|RS1249PL|RS1267PL|WS1250PL|WS1262RW'
+  regex: 'Digma[_ ]([^;/)]+)(?: Build|[;)])|iD[sr]Q\d+|DiMagic|HIT HT707[10]MG|CITI (?:7 E401 4G|8 E400 4G|ATL 4G|Kids|Octa [178]0|1902 3G|10 E402|Z530 3G|13 X703 4G)|(CITI[_ ](?:[A-Z0-9]+)[_ ][34]G)[ _][TC][ST](?:[0-9]{4}[PM][LG])|HIT 4G|HT7074ML|IDX5|(iDx10|iDx7)|MVM900H(?:WZ|C)|MVM908HCZ|(iDxD8 3G|iDxD10 3G|iDrQ10 3G|iDxD[45]|iDxQ5|iD[nx]D7(?:[_ ]3G)?)|PS604M|PT452E|Linx.+ [34]G L[TS][0-9]{4}[PM][GL]|Linx PS474S|PS1043MG|HT7071MG|HT5035PG|HT4039PG|NS6902QL|NS9797MG|TS7854M|TS1012E 3G|TT1004PG|TT702[045]MG|TT1002MG|TT7026MW|WS8251PL|VRL42|((?:Optima(?![_ ]T-II)(?: Kids 7)?|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)|DM-LED(?:5[05]UBB31|43UBB31|32SR21|(?:32|40)SBB31|43SR2[23]|42SR24|24SR20|55UR31|43SBB31)|RS1248PL|RS1253PL|RS1249PL|RS1267PL|WS1250PL|WS1262RW|HS1002PL|TS8289PL'
   device: 'smartphone'
   models:
     - regex: 'HIT(?: 3G)? HT707[10]MG'
@@ -6975,12 +7102,25 @@ Digma:
     - regex: '(CITI [A-Z0-9]+ [34]G) C[ST](?:606[32]ML|4024PG|5009PL|5021ML|502[56]PL)'
       model: '$1'
 
+    - regex: 'MS100[123]PL'
+      model: 'Pro Prime 18 11" 3G'
+      device: 'tablet'
+
     - regex: 'TS7854M'
       model: 'Plane 8.1" 3G'
       device: 'tablet'
     - regex: 'RS1249PL'
       model: 'Pro 1800F 4G'
       device: 'tablet'
+    - regex: 'HS1002PL'
+      model: 'Pro Hit 16 10.4"'
+      device: 'tablet'
+    - regex: 'HS1006PL'
+      model: 'Pro Hit 14 10.4"'
+      device: 'tablet'
+    - regex: 'HS1005PL'
+      model: 'Pro Hit 104 10.1"'
+      device: 'tablet'
     - regex: 'PS1043MG'
       model: 'Plane 10.3" 3G'
       device: 'tablet'
@@ -7009,7 +7149,7 @@ Digma:
     - regex: 'DIGMA[_ ]IDSD'
       model: 'IDsD 10 3G'
       device: 'tablet'
-    - regex: 'CITI[_ ](1902 3G|Kids(?:[_ ](?:8[01]|10))?|8527_4G|Octa [178]0|10 E402 4G|8 E400 4G|7 E401 4G|13 X703 4G|1312C 4G|8443E 4G)'
+    - regex: 'CITI[_ ](1902 3G|Kids(?:[_ ](?:8[01]|10))?|8527_4G|8269C 3G|Octa [178]0|10 E402 4G|8 E400 4G|7 E401 4G|13 X703 4G|131[23]C 4G|8443E 4G)'
       model: 'CITI $1'
       device: 'tablet'
     - regex: 'WS1262RW'
@@ -7051,6 +7191,9 @@ Digma:
     - regex: 'Optima ([0-9]+ [AXZE][0-9]+[SC]?) ([43])G'
       model: 'Optima $1 $2G'
       device: 'tablet'
+    - regex: 'TS8289PL'
+      model: 'Optima 8305C 4G'
+      device: 'tablet'
     - regex: 'Optima ([0-9]+ A500S) 3G'
       model: 'Optima $1 3G'
       device: 'tablet'
@@ -7090,7 +7233,7 @@ Digma:
       device: 'wearable'
       model: 'VR L42'
     # TV models
-    - regex: 'DM-LED(\d+[SU]R\d+|43SBB31)(?:[);/ ]|$)'
+    - regex: 'DM-LED(\d+(?:[SU]R|[SU]BB)\d+)(?:[);/ ]|$)'
       device: 'tv'
       model: 'DM-LED$1'
 
@@ -7110,18 +7253,24 @@ DoCoMo:
 
 # Doogee
 Doogee:
-  regex: 'DOOGEE[/ _-]|Valencia2_Y100(?:_?(?:pro|plus))?|Y100_Plus|X5max(?:[_ ]PRO)?|Shoot_[12]|x5_doogee|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)(?:[);/ ]|$)|(?:BL12000|BL5500[_ ]Lite| Y6C|X9 Mini|LEO_DG280|Y9Plus|Y8 Plus|Hitman_DG850|S(?:4[01]|[568]8|9[05678]|59|61|8[69])Pro|X9[567]Pro|S[478]0Lite|S88Plus|BL[579]000|N[24]0Pro|(?<!Lenovo )S90C|Ibiza_F2|S55_Lite|T5_Lite|S60 ?Lite|Iron-bone DG750|X10S|X[569]0L|MIX2|Y6 Max|Y6_Piano(?:_black)?|S100Pro|X[679]pro|S96GT|android 10;(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12;(?: [\w-]+;)? (?:S98|S61|S89|V Max|S100|V30T?)|Y7Plus|S35T|V31GT|Smini|T[23]0Ultra|T10E|T20S|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:N100|Y8)|D60 Pro|Turbo_mini_F1|Y100X|T30Pro|T10S|T20Mini)(?:[);/ ]|$)'
+  regex: 'DOOGEE[/ _-]|Valencia2_Y100(?:_?(?:pro|plus))?|Y100_Plus|X5max(?:[_ ]PRO)?|Shoot_[12]|x5_doogee|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)(?:[);/ ]|$)|(?:BL12000|BL5500[_ ]Lite| Y6C|X9 Mini|LEO_DG280|Y9Plus|Y8 Plus|Hitman_DG850|S(?:4[01]|[568]8|9[05678]|59|61|8[69])Pro|X9[567]Pro|S[478]0Lite|S88Plus|BL[579]000|N[24]0Pro|(?<!Lenovo )S90C|Ibiza_F2|S55_Lite|T5_Lite|S60 ?Lite|Iron-bone DG750|X10S|X[569]0L|MIX2|Y6 Max|Y6_Piano(?:_black)?|S100Pro|X[679]pro|V20Pro|S96GT|android 10(?:[\d.]*);(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12(?:[\d.]*);(?: [\w-]+;)? (?:S98|S61|S89|V Max|S100|V30T?|S51)|Y7Plus|S35T|V31GT|Smini|T[23]0Ultra|T10E|[TV]20S|V30Pro|android 13(?:[\d.]*);(?: [\w-]+;)? (?:R[12]0)|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:N100|N20|Y8)|D60 Pro|Turbo_mini_F1|Y100X|T30Pro|T10S|T10Plus|T20Mini|S41 Max|S41 Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'T30Pro(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T30 Pro'
+    - regex: ' R([12]0)(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'R$1'
     - regex: 'T([12]0)S(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T$1S'
     - regex: 'T10E(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T10E'
+    - regex: 'T10Plus(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T10 Plus'
     - regex: 'T20Mini(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T20 Mini'
@@ -7141,10 +7290,12 @@ Doogee:
       model: 'Leo $1'
     - regex: 'Iron-bone (DG750)'
       model: 'Iron Bone $1'
-    - regex: '(X95i?|BL[579]000|S90C|X10S|X[569]0L|X93|V30T?|V31GT)(?:[);/ ]|$)'
+    - regex: '(X95i?|BL[579]000|S90C|X10S|X[569]0L|X93|V30T?|V31GT|V20S)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'X(9[567])Pro(?:[);/ ]|$)'
       model: 'X$1 Pro'
+    - regex: 'V30Pro(?:[);/ ]|$)'
+      model: 'V30 Pro'
     - regex: 'N([24]0)Pro(?:[);/ ]|$)'
       model: 'N$1 Pro'
     - regex: 'BL12000 PRO'
@@ -7155,9 +7306,13 @@ Doogee:
       model: 'BL5500 Lite'
     - regex: 'BL12000'
       model: 'BL12000'
+    - regex: 'V20Pro'
+      model: 'V20 Pro'
+    - regex: 'S41 Max'
+      model: 'S41 Max'
     - regex: 'S([568]8|9[05678]|59|61|4[01]|8[69]|100)Pro'
       model: 'S$1 Pro'
-    - regex: 'S(88)Plus'
+    - regex: 'S(88|41) ?Plus'
       model: 'S$1 Plus'
     - regex: 'S([4-8]0|55)[_ ]?Lite'
       model: 'S$1 Lite'
@@ -7205,7 +7360,7 @@ Doogee:
       model: 'Turbo Mini F1'
     - regex: 'Y([89]) ?Plus(?:[);/ ]|$)'
       model: 'Y$1 Plus'
-    - regex: ' (S59|S35T?|S98|S89|Y8|Y6C|S61|N30|[NS]100)(?:[);/ ]|$)'
+    - regex: ' (S5[19]|S35T?|S98|S89|Y8|Y6C|S61|N[23]0|[NS]100)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(X5max(?:[_ ]PRO)?)'
       model: '$1'
@@ -7330,7 +7485,7 @@ EBEST:
 
 # Horizont (https://horizont.by/en/)
 Horizont:
-  regex: '(?:Horizont[_ ])?(32LE7011D|43LE7022D|32LE7052D|65LE7053D)'
+  regex: '(?:Horizont[_ ])?(32LE7011D|43LE7022D|32LE705[12]D|65LE7053D)'
   device: 'tv'
   model: '$1'
 
@@ -7409,7 +7564,7 @@ Eks Mobility:
 
 # Elephone
 Elephone:
-  regex: 'Elephone|Vowney(?: Lite)?|P6000(?!_Plus)( ?Pro| ?Plus|\+| ?02| 5.0 01)?|(?<!Chrome/)Soldier|C1_Max|(?:Trunk 1|P8_3D|P8_Max|P8_Mini|A6_mini|P9000(?:_Lite)?|Android 9;(?: [\w-]+;)? PX|PX_Pro| U3H|U_Pro|Android 10;(?: [\w-]+;)? (?:E10_Pro|E10))(?:[);/ ]|$)'
+  regex: 'Elephone|Vowney(?: Lite)?|P6000(?!_Plus)( ?Pro| ?Plus|\+| ?02| 5.0 01)?|(?<!Chrome/)Soldier|C1_Max|(?:Trunk 1|P8_3D|P8_Max|P8_Mini|A6_mini|P9000(?:_Lite)?|Android 9(?:[\d.]*);(?: [\w-]+;)? PX|PX_Pro| U3H|U_Pro|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:E10_Pro|E10))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Elephone[_ ])?Trunk(?: 1)?(?:[);/ ]|$)'
@@ -7440,7 +7595,7 @@ Elephone:
       model: 'U3H'
     - regex: 'C1_Max(?:[);/ ]|$)'
       model: 'C1 Max'
-    - regex: 'Android 9;(?: [\w-]+;)? PX(?:[);/ ]|$)'
+    - regex: ' PX(?: Build|[;)])'
       model: 'PX'
     - regex: '(P8_3D|P8_Max)(?:[);/ ]|$)'
       model: '$1'
@@ -7573,12 +7728,11 @@ Facebook:
 
 # Gateway
 Gateway:
-  regex: 'GWAT8-1'
-  device: 'smartphone'
+  regex: 'GWAT(?:8-1|10-1)'
+  device: 'tablet'
   models:
-    - regex: 'GWAT8-1'
-      device: 'tablet'
-      model: 'Tablet 8"'
+    - regex: 'GWAT(8|10)-1'
+      model: 'Tablet $1"'
 
 # Ricoh (https://www.ricoh.com/)
 Ricoh:
@@ -7616,7 +7770,7 @@ Senseit:
 
 # SunWind (sunwind.ru.com)
 SUNWIND:
-  regex: 'SUNWIND[_ ]|SUN[-_]LED\d+|(?:SKY 9 [EA]\d+ 3G|Sky (?:1262C|1123B|7143B|8244B|8421D|1430D) [43]G|SKY Kids 70 SS7238PG)(?:[);/ ]|$)'
+  regex: 'SUNWIND[_ ]|SUN[-_]LED\d+|(?:SKY 9 [EA]\d+ 3G|Sky (?:126[24]C|1123B|7143B|8244B|8421D|1430D) [43]G|SKY Kids 70 SS7238PG)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'SKY ([79]) ([EA]\d+) 3G'
@@ -7824,7 +7978,7 @@ Sony:
       model: 'Xperia 1 III'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SOG06|XQ-CT72|SO-51C|A201SO|XQ-CT[45]4)(?:[);/ ]|$)'
       model: 'Xperia 1 IV'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:SOG10|SO-51D|XQ-DQ72|XQ-DQ44)(?:[);/ ]|$)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:SOG10|SO-51D|XQ-DQ(?:[67]2|[45]4))(?:[);/ ]|$)'
       model: 'Xperia 1 V'
     - regex: '(?:Sony(?:Ericsson)?)?LT22i|Xperia P'
       model: 'Xperia P'
@@ -7836,11 +7990,11 @@ Sony:
       model: 'Xperia 5'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SOG02|A002SO|XQ-AS[4567]2|SO-52A)'
       model: 'Xperia 5 II'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:XQ-DE72)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:XQ-DE72|XQ-DE[45]4)'
       model: 'Xperia 5 V'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SO-53B|A103SO|SOG05|XQ-BQ[4567]2)'
       model: 'Xperia 5 III'
-    - regex: '(?:SOG09|XQ-CQ72|SO-54C|XQ-CQ[45]4|A204SO)'
+    - regex: '(?:SOG09|XQ-CQ72|SO-54C|XQ-CQ[45]4|XQ-CQ62|A204SO)'
       model: 'Xperia 5 IV'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SOV42|902SO)'
       model: 'Xperia 8'
@@ -8098,7 +8252,7 @@ Sony:
       device: 'wearable'
 
     # SONY: Bravia or TV Box
-    - regex: '(?:BRAVIA )(2K GB ATV3|[48]K UR[123]|4K GB ATV3|4K GB|4K VH2|4K 2015|2015|VH1|VU[12]|VU31)(?:[);/ ]|$)'
+    - regex: '(?:BRAVIA )(2K GB ATV3|[48]K UR[123]|4K GB ATV3|4K GB|4K VH21|4K VH2|4K 2015|2015|VH1|VU[12]|VU31)(?:[);/ ]|$)'
       model: 'Bravia $1'
       device: 'tv'
     - regex: 'SVP-DTV15(?:[);/ ]|$)'
@@ -8423,13 +8577,15 @@ Leotec:
 
 # EVPAD (https://www.evpadpro.com/ or https://evpad.com.my/)
 EVPAD:
-  regex: '(?:EVBOX-PLUS\+|EVPAD-[35]S)(?:[);/ ]|$)'
+  regex: '(?:EVBOX-PLUS\+|EVPAD-[35]S|EVPAD-PRO-MAX)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'EVBOX-PLUS\+'
       model: 'EVBox Plus'
     - regex: 'EVPAD-([35]S)'
       model: '$1'
+    - regex: 'EVPAD-PRO-MAX'
+      model: 'EVBox Pro Max'
 
 # EvroMedia
 EvroMedia:
@@ -8807,7 +8963,7 @@ Gigabyte:
 
 # Gigaset
 Gigaset:
-  regex: 'Gigaset|(?: GX290|GS80|GS1[0189]0|GS1[89]5|GS2[89]0|GS5[357]-6|GS[23]70(?:_Plus)?|E940-2795-00|E940-2849-00)(?:[);/ ]|$)'
+  regex: 'Gigaset|(?: GX290|GS80|GS1[0189]0|GS1[89]5|GS2[89]0|GS5[357]-6|GS[23]70(?:_Plus)?|E940-(?:2766|279[567]|2878|2849)-\d{2})(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Gigaset QV(1030|830)'
@@ -8824,10 +8980,22 @@ Gigaset:
       model: 'ME Pro'
     - regex: 'GS55-6'
       model: 'ME'
+    - regex: 'E940-2797-00'
+      model: 'GX4'
+    - regex: 'E940-2797-01'
+      model: 'GX4 Pro'
+    - regex: 'E940-2766-00'
+      model: 'GS3'
     - regex: 'E940-2795-00'
       model: 'GS4'
     - regex: 'E940-2849-00'
       model: 'GX6'
+    - regex: 'E940-2849-01'
+      model: 'GX6 Pro'
+    - regex: 'E940-2796-00'
+      model: 'GS5'
+    - regex: 'E940-2878-03'
+      model: 'GS5 Lite'
     - regex: 'GS53-6'
       model: 'ME Pure'
 
@@ -8838,12 +9006,12 @@ Gigaset:
 
 # Ginzzu
 Ginzzu:
-  regex: 'GINZZU[_ ]|((?:RS(?:7[14]|81|9[67])D)|S5002|(?<!Wave Pro )S5021|S5230|S50[45]0|S51[24]0|RS(6[12]|9[45])D|S40[23]0|RS850[12]|RS9602)(?:[);/ ]|$)'
+  regex: 'GINZZU[_ ]|((?:RS(?:7[14]|81|9[67])D)|S5002|(?<!Wave Pro )S5021|S5230|S50[45]0|S51[24]0|RS(6[12]|9[45])D|S40[23]0|RS850[12]|RS9602|GT-W170)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GINZZU[_ ]?(S40[17]0|S4710|ST60[14]0|ST6120)'
       model: '$1'
-    - regex: 'GINZZU[_ ]?(GT-(?:1050|7105|70[1-4]0|7115|7210|[WX]831|X[78]70|7810|8[01]10|X853|X890))'
+    - regex: '(?:GINZZU[_ ]?)?(GT-(?:W170|1050|7105|70[1-4]0|7115|7210|[WX]831|X[78]70|7810|8[01]10|X853|X890))'
       model: '$1'
       device: 'tablet'
     - regex: '(RS6[12]D) ULTIMATE'
@@ -8853,7 +9021,7 @@ Ginzzu:
 
 # Gionee
 Gionee:
-  regex: '(?:GIO-)?GIONEE[ _-]?[a-z0-9]+|(?:Dream_D1|V188S?|GN(?!2200)[0-9]{3,4}[a-z]?)(?:[);/ ]|$)|F103(?: Pro)?(?: Build|\))|P5 mini Build|(M7 Power|F106L|F100A|F103S|F103 Pro|M6 mirror|20190620G|20190619G|20190418Q|GNP21M02|GNS2161B|GAU0820|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:P8 Max|P7 Max)|Android 5(?:[\d.]*);(?: [\w-]+;)? M5 (?:mini|Plus)|Android 11;(?: [\w-]+;)? P61|WBL7519|WBL7361|20190419Q|M5 lite CDMA|GLY1620|M2mini)(?:[);/ ]|$)'
+  regex: '(?:GIO-)?GIONEE[ _-]?[a-z0-9]+|(?:Dream_D1|V188S?|GN(?!2200)[0-9]{3,4}[a-z]?)(?:[);/ ]|$)|F103(?: Pro)?(?: Build|\))|P5 mini Build|(M7 Power|F106L|F100A|F103S|F103 Pro|M6 mirror|20190620G|20190619G|20190418Q|GNP21M02|GNS2161B|GAU0820|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:P8 Max|P7 Max)|Android 5(?:[\d.]*);(?: [\w-]+;)? M5 (?:mini|Plus)|Android 11(?:[\d.]*);(?: [\w-]+;)? P61|WBL7519|WBL7361|20190419Q|M5 lite CDMA|GLY1620|M2mini)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GNP21M02'
@@ -8928,9 +9096,9 @@ Gionee:
       model: '$1'
       device: 'feature phone'
 
-# Grape
+# Grape (grapestore.org)
 Grape:
-  regex: '(?:Grape[ _])?GTM-5([^;/]+) Build'
+  regex: '(?:Grape[ _])?GTM[-_]5([^;)/]+)(?: Build|[;)])'
   device: 'smartphone'
   model: 'GTM-5$1'
 
@@ -9082,6 +9250,8 @@ Explay:
       model: 'ActiveD 7.4 3G'
     - regex: 'Scream 3G'
       model: 'Scream 3G'
+    - regex: 'Tornado 8'
+      model: 'Tornado 8'
     - regex: 'Imperium([78])(?:[);/ ]|$)'
       model: 'Imperium $1 3G'
     - regex: 'ActiveD[ _]8\.2[ _]3G'
@@ -9146,7 +9316,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|G31[246])(?:[);/ ]|$)'
+  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](?:\.[\d.]+)?;(?: [\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|G51[24]|G31[246]|(?<!Symphony) G100)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GM 5 Plus'
@@ -9173,6 +9343,8 @@ General Mobile:
       model: 'GM 20'
     - regex: 'G501'
       model: 'GM 20 Pro'
+    - regex: 'G514'
+      model: 'GM 24 Pro'
     - regex: 'GM[ _](\d+)[ _]d'
       model: 'GM $1D'
     - regex: 'GM6_Tur|GM ?6'
@@ -9187,6 +9359,8 @@ General Mobile:
       model: 'GM 9 Pro'
     - regex: 'GM 9 Plus'
       model: 'GM 9 Plus'
+    - regex: 'G100'
+      model: 'GM 6 DS'
     - regex: 'Discovery (Air|Elite(?: Plus)?)'
       model: 'Discovery $1'
     - regex: 'Discovery II Mini'
@@ -9233,7 +9407,7 @@ Goly:
 
 # Google
 Google:
-  regex: 'Nexus(?! 6P)|GoogleTV|Google Fiber|Google Pixel|Glass(?<!Browser)|CrKey[^a-z0-9]|(?:Pixel|sailfish|taimen|blueline|Chromecast(?: HD)?)(?:;? Build|[)])|Pixel (?:XL|C|[2-8]|[2-4] XL|Fold|Tablet)|Google 2XL|PIXEL4X|G011A|AOSP on (?:bramble|HammerHead|Manta|sunfish)|Pipit|ADT-2|GE2AE|G0DZQ|G1MNW|G82U8|G9BQD|G9FPL|GWKK3|GP4BC|GKWS6|GHL1X|GC3VE'
+  regex: 'Nexus(?! 6P)|GoogleTV|Google Fiber|Google Pixel|Glass(?<!Browser)|CrKey[^a-z0-9]|(?:Pixel|sailfish|taimen|blueline|Chromecast(?: HD)?)(?:;? Build|[)])|Pixel (?:XL|C|[2-8]|[2-4] XL|Fold|Tablet)|Google 2XL|PIXEL4X|G011A|AOSP on (?:bramble|HammerHead|Manta|sunfish)|Pipit|ADT-2|GE2AE|G0DZQ|G1MNW|G82U8|G9BQD|G025I|G020[AMP]|G9FPL|GWKK3|GP4BC|GKWS6|GHL1X|GC3VE|GA01180-US'
   device: 'smartphone'
   models:
     - regex: 'Glass'
@@ -9279,21 +9453,25 @@ Google:
       model: 'Pixel XL'
     - regex: 'blueline'
       model: 'Pixel 3'
+    - regex: 'G020A'
+      model: 'Pixel 3a'
     - regex: 'Pixel 3 XL'
       model: 'Pixel 3 XL'
     - regex: 'Pixel 2 XL|taimen'
       model: 'Pixel 2 XL'
     - regex: 'Pixel 3a XL'
       model: 'Pixel 3a XL'
-    - regex: 'Pixel 4 XL'
+    - regex: 'Pixel 4 XL|GA01180-US|G020P'
       model: 'Pixel 4 XL'
+    - regex: 'G020M'
+      model: 'Pixel 4'
     - regex: 'PIXEL4X'
       model: 'Pixel 4 X'
     - regex: 'AOSP on sunfish'
       model: 'Pixel 4a'
-    - regex: 'Pixel 4a \(?5G\)?|AOSP on bramble'
+    - regex: 'Pixel 4a \(?5G\)?|AOSP on bramble|G025I'
       model: 'Pixel 4a (5G)'
-    - regex: 'pixel ([3-7])a'
+    - regex: 'pixel ([3-8])a'
       model: 'Pixel $1a'
     - regex: 'G011A'
       model: 'Pixel 2'
@@ -9376,9 +9554,11 @@ Grundig:
 
 # Gtel (https://gtel.co.zw/)
 Gtel:
-  regex: 'Gtel[ _]'
+  regex: 'Gtel[ _]|A727_Infinity_Pro(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'A727_Infinity_Pro'
+      model: 'A727 Infinity Pro'
     - regex: 'Infinity 8s(?:[);/ ]|$)'
       model: 'Infinity 8s'
     - regex: 'Infinity 9(?:[);/ ]|$)'
@@ -9424,6 +9604,12 @@ Hafury:
     - regex: '(MIX|UMAX)'
       model: '$1'
 
+# HEC (sub brand Haier)
+HEC:
+  regex: '50SSD-SMART TV-R1'
+  device: 'tv'
+  model: 'R1 50S 4K'
+
 # Haier (www.haier.com)
 Haier:
   regex: 'Haier|(?:M53-52401|I6_Infinity|Titan[ _]T[135]|(?:HW-)?W(?:71[67]|757|86[07]|970)|S5 Silk|(?:HM-)?(N505|N700|G(?:152|303|353|552|70[01])?-FL|HM-(?:I559|N50[15]|I560|G553|N70[01])-FL|HR-V101|G(?:303)?-W|I(?:557)?-FL)|(?:PAD[ _](?:D71|G781|d85))|A2_Lite_NFC|A4_Lite|HL810G|Andromax C46B2H|android 8([\d.]*);(?: [\w-]+;)? E13)(?:[);/ ]|$)|Android [67](?:[\d.]*);(?: [\w-]+;)? P2(?: Build|[;)])'
@@ -9939,13 +10125,15 @@ Hosin:
 
 # Hoozo (hoozoelectronics.com)
 Hoozo:
-  regex: '(?:HOOZO[_ ](MT232|MT116|MT Pad 116 LTE|X1001)|MZ104|HZ0010J?|HZ1012|YK_P30(?:_EEA)?)(?:[);/ ]|$)'
+  regex: '(?:HOOZO[_ ](MT232|MT116|MT Pad 116 LTE|X1001)|F13_EEA|MZ104|HZ0010J?|HZ1012|YK_P30(?:_EEA)?)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'HOOZO[_ ](MT232|MT116|MT Pad 116 LTE|X1001|MZ104)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(HZ0010J?|HZ1012)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'F13_EEA(?:[);/ ]|$)'
+      model: 'F13'
     - regex: '(YK_P30)(?:_EEA)?(?:[);/ ]|$)'
       device: 'smartphone'
       model: '$1'
@@ -10017,6 +10205,8 @@ China Telecom:
       model: 'Maimang 10 SE 5G'
     - regex: 'TYH612M'
       model: 'Maimang 10 5G'
+    - regex: 'TYH631M'
+      model: 'Maimang 20 5G'
     - regex: 'TYH211U'
       model: 'Tianyi One (2021)'
     - regex: 'TYH201H'
@@ -10066,9 +10256,21 @@ 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|L[02]9|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-LX[12]'
-  device: 'smartphone'
-  models:
+  regex: '(HW-)?(?:Huawei(?!Browser)|Maimang \d|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|L[02]9|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-(?:AL[08]0|AL60|AN20|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]|L81)|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[012]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|LX[12])|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|NX1)|MAA-AN[01]0|BVL-(?:N49|AN(?:16|[02]0))|MAG-AN00|RBN-NX1|PCE-(?:W29|W[34]0)|ALN-AL[018]0|FIN-AL60|ADA-AL00U?|BON-AL00|BRA-AL00|CLK-(?:LX[123]|AN00)|FGD-AL00|GDI-W09|GAR-AN[06]0|CHA-AL80|MLA-L1[12]|LEM-AL00|ADY-AL00|VCA-AN00|JuliaQN-L21B|HBP-AL00'
+  device: 'smartphone'
+  models:
+    - regex: 'ADY-AL00'
+      model: 'Pura 70' # wiko
+    - regex: 'HBP-AL00'
+      model: 'Pura 70 Ultra'
+    - regex: 'VCA-AN00'
+      model: 'Honor V Purse'
+    - regex: 'GAR-AN60'
+      model: 'Hi Enjoy 60s 5G' # wiko
+    - regex: 'GAR-AN00'
+      model: 'Hi Enjoy 60 5G' # wiko
+    - regex: 'BAL-AN20'
+      model: 'Hi Enjoy 70 Pro 5G' # wiko
     - regex: 'CRT-NX1'
       model: 'Honor 90 Lite'
     - regex: 'REA-(?:NX9|AN00)'
@@ -10165,6 +10367,8 @@ Huawei:
       model: 'Enjoy 60X'
     - regex: 'CTR-AL20'
       model: 'Enjoy 70 Pro'
+    - regex: 'FGD-AL00'
+      model: 'Enjoy 70'
     - regex: 'TAG-(?:L0[13]|L32|L13|L2[123])(?:[);/ ]|$)'
       model: 'GR3'
     - regex: 'NCE-(AL[10]0|TL10)(?:[);/ ]|$)'
@@ -10227,10 +10431,12 @@ Huawei:
       model: 'P50'
     - regex: 'ABR-AL[69]0'
       model: 'P50E'
-    - regex: 'BAL-(?:AL00|L49)'
+    - regex: 'BAL-(?:AL[08]0|L49)'
       model: 'P50 Pocket'
     - regex: 'BAL-AL60'
       model: 'Pocket S'
+    - regex: 'LEM-AL00'
+      model: 'Pocket 2'
     - regex: 'U8860(?:[);/ ]|$)'
       model: 'Honor'
     - regex: 'COL-(?:AL[01]0|TL[01]0|L29|L10)(?:[);/ ]|$)'
@@ -10249,7 +10455,7 @@ Huawei:
       model: 'Honor 20I'
     - regex: 'YAL-(L41|AL10)(?:[);/ ]|$)'
       model: 'Honor 20 Pro'
-    - regex: '(MAR-LX1H|YAL-AL50)(?:[);/ ]|$)'
+    - regex: '(MAR-LX1H|YAL-[AT]L50)(?:[);/ ]|$)'
       model: 'Honor 20S'
     - regex: 'EBG-[AT]N00(?:[);/ ]|$)'
       model: 'Honor 30 Pro'
@@ -10403,7 +10609,7 @@ Huawei:
       model: 'Honor Magic 4 Lite'
     - regex: 'RMO-NX3'
       model: 'Honor Magic 5 Lite'
-    - regex: 'MGI-AN00|PGT-N09'
+    - regex: 'MGI-AN00|PGT-(?:N09|AN00)'
       model: 'Honor Magic 5'
     - regex: 'PGT-(?:AN10|N19)'
       model: 'Honor Magic 5 Pro'
@@ -10411,8 +10617,12 @@ Huawei:
       model: 'Honor Magic 5 Ultimate'
     - regex: 'ALI-NX1'
       model: 'Honor Magic 6 Lite 5G'
-    - regex: 'BVL-AN16'
+    - regex: 'BVL-AN16|BVL-N49'
       model: 'Honor Magic 6 Pro'
+    - regex: 'BVL-AN20'
+      model: 'Honor Magic 6 RSR'
+    - regex: 'BVL-AN00'
+      model: 'Honor Magic 6'
     - regex: 'RVL-AL09(?:[);/ ]|$)'
       model: 'Honor Note 10'
     - regex: 'EDI-AL10(?:[);/ ]|$)'
@@ -10481,6 +10691,8 @@ Huawei:
       model: 'Honor Play 8A'
     - regex: '(?:MOA-(?:AL[02]0|TL00))(?:[);/ ]|$)'
       model: 'Honor Play 9A'
+    - regex: 'CLK-AN00'
+      model: 'Honor Play 8T'
     - regex: 'BKL-(?:AL00|AL20|AL30|L09|TL10)(?:[);/ ]|$)'
       model: 'Honor V10'
     - regex: 'PCT-[TA]L10(?:[);/ ]|$)'
@@ -10493,7 +10705,7 @@ Huawei:
       model: 'Honor V9'
     - regex: 'JMM-[AT]L[01]0(?:[);/ ]|$)'
       model: 'Honor V9 Play'
-    - regex: 'BKL-L04(?:[);/ ]|$)'
+    - regex: 'BKL-(?:L04|L09S)(?:[);/ ]|$)'
       model: 'Honor View 10'
     - regex: 'PCT-L29(?:[);/ ]|$)'
       model: 'Honor View 20'
@@ -10523,6 +10735,8 @@ Huawei:
       model: 'Honor X8a'
     - regex: 'LLY-LX[123]'
       model: 'Honor X8b'
+    - regex: 'LLY-NX1'
+      model: 'Honor 200 Lite'
     - regex: 'VNE-N41'
       model: 'Honor X8 5G'
     - regex: 'VNE-LX[123]'
@@ -10586,6 +10800,8 @@ Huawei:
       model: 'Maimang 9'
     - regex: 'TYH601M'
       model: 'Maimang 9 5G'
+    - regex: 'Maimang (\d)(?:[);/ ]|$)'
+      model: 'Maimang $1'
     - regex: '(?:TAH-(?:N29|AN00)m|Mate Xs)(?:[);/ ]|$)'
       model: 'Mate XS'
     - regex: 'PAL-(?:AL00|LX9)'
@@ -10604,7 +10820,7 @@ Huawei:
       model: 'Mate 10'
     - regex: 'RNE-(?:AL00|L(?:01|03|21|23))(?:[);/ ]|$)'
       model: 'Mate 10 Lite'
-    - regex: 'BLA-(?:A09|L[02]9|[TA]L00)(?:[);/ ]|$)'
+    - regex: 'BLA-(?:A09|L[02]9|L29S|[TA]L00)(?:[);/ ]|$)'
       model: 'Mate 10 Pro'
     - regex: 'HMA-(?:[AT]L00|L[02]9)(?:[);/ ]|$)'
       model: 'Mate 20'
@@ -10726,16 +10942,20 @@ Huawei:
       model: 'Nova 7 SE 5G'
     - regex: 'MAO-LX9'
       model: 'Nova 11i'
+    - regex: 'GOA-AL80U'
+      model: 'Nova 11 Ultra'
     - regex: 'GOA-(?:LX9|AL80)'
       model: 'Nova 11 Pro'
     - regex: 'FOA-(?:LX9|AL00)'
       model: 'Nova 11'
-    - regex: 'FIN-AL60a'
-      model: 'Nova 11 Active Edition'
+    - regex: 'FIN-AL60a?'
+      model: 'Nova 12 Vitality Edition'
     - regex: 'BON-AL00'
       model: 'Nova 11 SE'
     - regex: 'ADA-AL00U'
       model: 'Nova 12 Ultra'
+    - regex: 'CTR-L81'
+      model: 'Nova 12i'
     - regex: 'ADA-AL00'
       model: 'Nova 12 Pro'
     - regex: 'JNY-LX2(?:[);/ ]|$)'
@@ -10760,7 +10980,7 @@ Huawei:
       model: 'Nova 9'
     - regex: 'RTE-AL00(?:[);/ ]|$)'
       model: 'Nova 9 Pro'  # 4G
-    - regex: 'JLN-(?:AL00|LX[13])'
+    - regex: 'JLN-(?:AL00|LX[13])|JuliaQN-L21B'
       model: 'Nova 9 SE'   # 4G
     - regex: 'GLA-(?:LX[13]|AL00)'
       model: 'Nova 10 Pro'
@@ -10768,6 +10988,8 @@ Huawei:
       model: 'Nova 10 4G'
     - regex: 'BNE-(?:LX1|AL00)'
       model: 'Nova 10 SE'
+    - regex: 'CHA-AL80'
+      model: 'Nova 10z'
     - regex: 'MAO-LX9N'
       model: 'Nova 11i'
     - regex: 'DIG-L01(?:[);/ ]|$)'
@@ -10784,11 +11006,11 @@ Huawei:
       model: 'Nova Y70'
     - regex: 'CTR-LX[123]'
       model: 'Nova Y90'
-    - regex: 'STG-LX1'
+    - regex: 'STG-LX[12]'
       model: 'Nova Y91'
     - regex: 'FIG-L(?:A1|X[123]|11)(?:[);/ ]|$)'
       model: 'P smart'
-    - regex: 'POT-(?:LX(?:[13]|1T|2J|1AF)|AL00|L01)(?:[);/ ]|$)'
+    - regex: 'POT-(?:LX(?:[123]|1T|2J|1AF)|AL00|L01)(?:[);/ ]|$)'
       model: 'P smart (2019)'
     - regex: 'POT-LX1A(?:[);/ ]|$)'
       model: 'P smart (2020)'
@@ -10875,7 +11097,7 @@ Huawei:
     - regex: 'AMN-LX[1239](?:[);/ ]|$)'
       model: 'Y5 (2019)'
     - regex: 'DRA-LX5(?:[);/ ]|$)'
-      model: 'Y5 lite'
+      model: 'Y5 Lite'
     - regex: 'DRA-LX9(?:[);/ ]|$)'
       model: 'Y5p'
     - regex: 'CRO-L[02]3(?:[);/ ]|$)'
@@ -10957,6 +11179,9 @@ Huawei:
       device: 'phablet'
       model: 'Nexus 6P'
 
+    - regex: 'GDI-W09'
+      model: 'Honor MagicPad 13 WiFi'
+      device: 'tablet'
     - regex: 'HWT31(?:[);/ ]|$)'
       model: 'Qua Tab 02 10.1"'
       device: 'tablet'
@@ -11134,7 +11359,7 @@ Huawei:
     - regex: 'WGR-AN19(?:[);/ ]|$)'
       device: 'tablet'
       model: 'MatePad Pro 12.6"'
-    - regex: 'PCE-W29'
+    - regex: 'PCE-W(?:29|[34]0)'
       device: 'tablet'
       model: 'MatePad Pro 13.2" WiFi'
     - regex: 'CMR-(?:AL[01]9|W09)(?:[);/ ]|$)'
@@ -11247,7 +11472,7 @@ Huawei:
       model: 'MediaPad C5 10.1'
     - regex: 'BZT-W09(?:[);/ ]|$)'
       device: 'tablet'
-      model: 'MediaPad C5 10.1 WiFi'
+      model: 'MediaPad C5 10.1" WiFi'
     - regex: 'MON-AL19B'
       device: 'tablet'
       model: 'MediaPad C5 8"'
@@ -11339,7 +11564,7 @@ Huawei:
 
 # Hyundai
 Hyundai:
-  regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|L503F Plus|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|(?:Android 9;(?: [\w-]+;)? [EL]553)|10LB1|L601F|10WB1|E601F|E503F|E465GO|H-LED(?:55GU7003|55EU1311|24BS5000|40GS5003|43FS5003|32FS5005)|H-DMP100|HT070[34]W08|Koral 7W4|E435 Plus)(?:[);/ ]|$)'
+  regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|L503F Plus|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|(?:Android 9(?:[\d.]*);(?: [\w-]+;)? [EL]553)|10LB1|L601F|10WB1|E601F|E503F|E465GO|H-LED(?:55[BG]U7003|43BU7003|50FU7001|55EU1311|24BS5000|40GS5003|43FS5003|32FS5005|(?:32|40)BS5003)|H-DMP10[03]|HT070[34]W08|Koral 7W4|E435 Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Ultra[_ ]Vision[_ ]Plus'
@@ -11383,7 +11608,7 @@ Hyundai:
     - regex: '(?:Hyundai[_ ])?(Eternity[_ ](?:G57L?|G[56]0W?)|H7|Aero Plus|E435 Plus)'
       model: '$1'
 
-    - regex: '(H-LED\w+|H-DMP100|2K TV)(?:[);/ ]|$)'
+    - regex: '(H-LED\w+|H-DMP10[03]|2K TV)(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
 
@@ -11538,7 +11763,7 @@ iRulu:
 
 # Irbis (irbis-digital.ru)
 Irbis:
-  regex: 'IRBIS|TZ(1(?:0[04]|42|5[01]|84|65|7[01345-89]|8[356]|9[12578])|200|49|55|72|22|7(?:0[127]|1[1-46789]|2[021567]|3[025-8]|4[257]|5[23457]|6[12]|72|7[137]|8[1]|9[147])|8(?:[34]1|32|5[3-8]|6[2-5]|7[12478]|8[1-5]|9[0127])|96[0-9])|TZ199|TZ85|TZ13|TZ(?:one|art|HIT|81L)|(SP(?:0[56]|2[01]|4[1-36]|40[12]|45[345]|49[34]|50|51[0147]|531|54[12]|55[0124]|571)|32H1YDX000BS2|43F1YDX000BS2|50U1YDX000BS2|32H1YDX000FBS2|39H1YDX000BS2)(?:[);/ ]|$)'
+  regex: 'IRBIS|TZ(1(?:0[04]|42|5[01]|84|65|7[01345-89]|8[356]|9[12578])|200|49|55|72|22|7(?:0[127]|1[1-46789]|2[021567]|3[025-8]|4[257]|5[23457]|6[12]|72|7[137]|8[1]|9[147])|8(?:[34]1|32|5[3-8]|6[2-5]|7[12478]|8[1-5]|9[0127])|96[0-9])|TZ199|TZ85|TZ13|TZ(?:one|art|HIT|81L)|(SP(?:0[56]|2[01]|4[1-36]|40[12]|45[345]|49[34]|50|51[0147]|531|54[12]|55[0124]|571)|32H1YDX000BS2|43F1YDX000BS2|50U1YDX000BS2|32H1YDX000FBS2|39H1YDX000BS2|24H1YDX000BS2)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(TZ(?:[0-9]+)|TZ(?:one|art|HIT|81L))(?:[);/ ]|$)'
@@ -11546,7 +11771,7 @@ Irbis:
     - regex: '(SP[0-9]+)(?:[);/ ]|$)'
       device: 'smartphone'
       model: '$1'
-    - regex: '(43F1YDX000BS2|50U1YDX000BS2|32H1YDX000BS2|32H1YDX000FBS2|39H1YDX000BS2)'
+    - regex: '(43F1YDX000BS2|50U1YDX000BS2|32H1YDX000BS2|32H1YDX000FBS2|39H1YDX000BS2|24H1YDX000BS2)'
       device: 'tv'
       model: '$1'
 
@@ -11562,9 +11787,16 @@ iBerry:
 
 # iHunt
 iHunt:
-  regex: 'iHunt|One_ Love_|TIT?AN[_ ]P\d+|Like_(3|4U|3_Pro)|X300 Elite|S10_Tank_2019|S10 Tank PRO 2020|S60 Discovery Plus|S60_Discovery_2019|AlienXLite2020|Alien X (?:Lite|Pro)|Alien_X|(?:Titan ?P6000|S[23]0 Ultra ApeX 2021|S21 Ultra 4G 2021|Like 11 Panda Pro|Like_Hi10_2021|Like Hi5|S21 Plus 2021|Like_[78]|Cyber DOG 4G|S10 Tank 2020|(?:S100|S90_)Apex)(?:_EEA)?(?:[);/ ]|$)'
+  regex: 'iHunt|One_ Love_|TIT?AN[_ ]P\d+|Like_(3|4U|3_Pro)|X300 Elite|S10_Tank_2019|S10 Tank PRO 2020|S60 Discovery Plus|S60_Discovery_2019|AlienXLite2020|Alien X (?:Lite|Pro)|Alien_X|(?:Titan ?P6000|S[23]0 Ultra ApeX 2021|S21 Ultra 4G 2021|P11000 Pro|Strong Tablet P15000 Pro|Like 11 Panda Pro|Like_Hi10_2021|Like Hi5|S21 Plus 2021|Like_[78]|Cyber DOG 4G|S10 Tank 2020|(?:S100|S90_)Apex|Tablet PC 10 PRO)(?:_EEA)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Strong Tablet P15000 Pro'
+      device: 'tablet'
+      model: 'Strong Tablet P15000 Pro'
+    - regex: 'Tablet PC 10 PRO'
+      device: 'tablet'
+      model: 'Tablet PC 10 Pro'
+
     - regex: 'Cyber DOG 4G'
       model: 'Cyber Dog 4G'
     - regex: 'Like_Hi10_2021'
@@ -11577,7 +11809,7 @@ iHunt:
       model: 'One Love'
     - regex: 'Tian[ _]P3000'
       model: 'Tian P3000'
-    - regex: 'TITAN_P11000_PRO'
+    - regex: 'TITAN_P11000_PRO|P11000 Pro'
       model: 'Titan P11000 Pro'
     - regex: 'TITAN P15000 PRO 5G'
       model: 'Titan P15000 Pro 5G'
@@ -11631,8 +11863,8 @@ iHunt:
       model: 'S$1 Ultra ApeX (2021)'
     - regex: 'S21 Ultra 4G 2021'
       model: 'S21 Ultra 4G (2021)'
-    - regex: 'S22 ULTRA'
-      model: 'S22 Ultra'
+    - regex: 'S(2[234]) ULTRA'
+      model: 'S$1 Ultra'
     - regex: 'S22 PLUS'
       model: 'S22 Plus'
     - regex: 'Like 11 Panda Pro 2022'
@@ -12078,6 +12310,8 @@ Infinix:
       model: 'Hot 30 5G'
     - regex: 'Infinix[ _-]X6528'
       model: 'Hot 40i'
+    - regex: 'Infinix[ _-]X6836'
+      model: 'Hot 40'
     - regex: 'Infinix[ _-]X6837'
       model: 'Hot 40 Pro'
     - regex: 'Infinix[ _-]X622'
@@ -12299,6 +12533,9 @@ Infinix:
     - regex: 'Infinix[ _-]X6711'
       model: 'Note 30 5G'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X6850'
+      model: 'Note 40 Pro'
+      device: 'phablet'
     - regex: 'Infinix[ _-]X685'
       model: 'Note 40'
       device: 'phablet'
@@ -12381,7 +12618,7 @@ Innos:
 
 # Innostream
 Innostream:
-  regex: 'INNO([a-z0-9]+)'
+  regex: 'INNO(?!va[123]0)([a-z0-9]+)'
   device: 'feature phone'
   model: 'INNO$1'
 
@@ -12790,6 +13027,8 @@ iTel:
       model: 'V52 LTE'
     - regex: 'A632W'
       model: 'A04'
+    - regex: 'A663L'
+      model: 'A05s'
     - regex: 'S665LN?'
       model: 'S23'
     - regex: 'S681LN'
@@ -12798,6 +13037,8 @@ iTel:
       model: 'A60s'
     - regex: 'A662L'
       model: 'A60'
+    - regex: 'A665L'
+      model: 'A70'
     - regex: 'W5504'
       model: 'P33'
     - regex: 'W5503'
@@ -12826,6 +13067,14 @@ iTel:
       model: 'P17 Pro'
     - regex: 'P551W'
       model: 'P17'
+    - regex: 'A666L'
+      model: 'P55'
+    - regex: 'P663L'
+      model: 'P55+'
+    - regex: 'P665L'
+      model: 'P55T'
+    - regex: 'P661N'
+      model: 'P55 5G'
     - regex: 'W5003'
       model: 'S32 Mini'
     - regex: 'L5502'
@@ -13261,9 +13510,11 @@ Komu:
 
 # Koobee
 Koobee:
-  regex: 'Koobee|F2_Plus(?:[);/ ]|$)'
+  regex: 'Koobee|(?:F2_Plus|SL004T)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'SL004T'
+      model: 'K100'
     - regex: 'F2[_ ]Plus'
       model: 'F2 Plus'
     - regex: 'Koobee[ _\-]?([^;/]+) Build'
@@ -13306,12 +13557,12 @@ KDDI:
 
 # Kodak
 Kodak:
-  regex: 'KODAK|(?:IM5|KD50|Ektra|Smartway[_ ](?:[FT]1|[LT]2)|D55L|D6[05]LX)(?:[);/ ]|$)'
+  regex: 'KODAK|(?:IM5|KD50|Ektra|Smartway[_ ](?:[FT]1|[LT]2)|D55L|D61L|D6[05]LX)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'IM5'
       model: 'IM5'
-    - regex: '(KD50|D55L|D6[05]LX)'
+    - regex: '(KD50|D55L|D6[05]LX|D61L)'
       model: 'Seren $1'
     - regex: 'Ektra(?:[);/ ]|$)'
       model: 'Ektra'
@@ -13389,13 +13640,13 @@ K-Touch:
 
 # Diva
 Diva:
-  regex: '(QC-(?:703GN|704GA|803GN|1013G|7BHD)|QC7704GM)(?:[);/ ]|$)'
+  regex: '(QC-(?:703GN|704GA|803GN|1013G|7BHD)|QC7704GM|T10K_Plus)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
 # kyocera (kyocera.co.jp, kyocera.com)
 Kyocera:
-  regex: 'Kyocera|KWC-|QC-[0-9]{4}|(?:QC6035|NP501KC|302KC|503KC|602KC|705KC|901KC|C51[27]0|C5155|C5215|C67[35]0|C6522N?|C6530N|C6740N?|C6743|E6[89]10|KYL2[13]|KYV3[1-9]|KYT3[123]|KYF3[1235789]|KYF4[012]|KYX31|KYG01|KYY2[1-4]|S2151|KC-S701|S[468]-KC|S9-KC|S10-KC|KYV40U?|KYY31|KYV4[1-8]|KYV4[47]|KC-S301AE|KC-S302|X3-KC|E6560[CT]|E6782[L]?|E6790(?:TM)?|SZJ-JS20[12]|KCP01K|[47]04KC|A[012]01KC|A205KC|WX10K|URBANO PROGRESSO|E7110|E6921|KY-51B|C6930|A101BM)(?:[-_][uj]2?)?(?:[);/ ]|$)'
+  regex: 'Kyocera|KWC-|QC-[0-9]{4}|(?:QC6035|NP501KC|302KC|503KC|602KC|705KC|901KC|C51[27]0|C5155|C5215|C67[35]0|C6522N?|C6530N|C6740N?|C6743|E6[89]10|KYL2[13]|KYV3[1-9]|KYT3[123]|KYF3[1235789]|KYF4[012]|KYX31|KYG01|KYY2[1-4]|S2151|KC-S701|S[468]-KC|S9-KC|S10-KC|KYV40U?|KYY31|KYV4[1-8]|KYV4[47]|KC-S301AE|KC-S302|X3-KC|E6560[CT]|E6782[L]?|E6790(?:TM)?|SZJ-JS20[12]|KCP01K|[47]04KC|A[012]01KC|A205KC|WX10K|URBANO PROGRESSO|E7110|E6921|KY-(?:42C|51B)|C6930|A101BM)(?:[-_][uj]2?)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -13429,6 +13680,8 @@ Kyocera:
       model: 'Digno BX'
     - regex: 'A101KC(?:[);/ ]|$)'
       model: 'Digno BX 2'
+    - regex: 'KY-42C(?:[);/ ]|$)'
+      model: 'Digno Keitai R'
     - regex: 'KYV39(?:[);/ ]|$)'
       model: 'Miraie F'
     - regex: 'KYX31(?:[);/ ]|$)'
@@ -13574,14 +13827,14 @@ Mymaga:
 
 # Krüger&Matz or Kruger&Matz (www.krugermatz.com)
 Krüger&Matz:
-  regex: 'Kruger[ _&]Matz|KrugerMatz[ _]|K&M|EAGLE_(?:961|1068)|FLOW ?5PLUS|FLOW 4 PLUS|Flow 9|FLOW_5|FLOW7|FLOW6(?:S|Lite)?|DRIVE9|DRIVE 8|DRIVE[_ ]6S?|MOVE8mini|MOVE9|MOVE_|LIVE_6plus|LIVE 5 PLUS|Live [89]|LIVE4_KM043[89]|LIVE 7S?|Flow 7S|KM(?:106[679]|1065G|0701(?:_1)?|0702|080[45](?:_1)?|1070)'
+  regex: 'Kruger[ _&]Matz|KrugerMatz[ _]|K&M|EAGLE_(?:961|1068)|FLOW ?5PLUS|FLOW 10|FLOW 4 PLUS|Flow 9|FLOW_5|FLOW7|FLOW6(?:S|Lite)?|DRIVE9|DRIVE 8|DRIVE[_ ]6S?|MOVE8mini|MOVE9| MOVE 10|MOVE_|LIVE_6plus|LIVE 5 PLUS|Live [89]|LIVE4_KM043[89]|LIVE 7S?|Flow 7S|Eagle 806|KM(?:106[679]|1065G|0701(?:_1)?|0702|080[45](?:_1)?|1070)|Live 10S'
   device: 'smartphone'
   models:
     - regex: 'MOVE8mini'
       model: 'MOVE 8 Mini'
     - regex: 'MOVE_6_mini'
       model: 'MOVE 6 Mini'
-    - regex: 'MOVE[_ ]([78]|6S?)'
+    - regex: 'MOVE[_ ]([78]|6S?|10)'
       model: 'MOVE $1'
     - regex: 'DRIVE 4 mini LTE'
       model: 'DRIVE 4 mini LTE'
@@ -13591,7 +13844,7 @@ Krüger&Matz:
       model: 'FLOW $1 Plus'
     - regex: 'FLOW6Lite(?:[);/ ]|$)'
       model: 'FLOW 6 Lite'
-    - regex: 'FLOW[ _]?([4-7][S]?|9)(?:[);/ ]|$)'
+    - regex: 'FLOW[ _]?([4-7][S]?|9|10)(?:[);/ ]|$)'
       model: 'FLOW $1'
     - regex: 'LIVE4_(KM043[89])(?:[);/ ]|$)'
       model: 'LIVE 4 $1'
@@ -13603,7 +13856,7 @@ Krüger&Matz:
       model: 'LIVE 5 Plus'
     - regex: 'LIVE_6plus(?:[);/ ]|$)'
       model: 'LIVE 6 Plus' # KM0454
-    - regex: 'LIVE ([79])S(?:[);/ ]|$)'
+    - regex: 'LIVE ([79]|10)S(?:[);/ ]|$)'
       model: 'LIVE $1S'
     - regex: 'Live ([789])(?:[);/ ]|$)'
       model: 'LIVE $1'
@@ -13613,6 +13866,9 @@ Krüger&Matz:
     - regex: 'KM(106[679])(?:[);/ ]|$)'
       device: 'tablet'
       model: 'EAGLE $1 10.1"'
+    - regex: 'Eagle 806(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'EAGLE 806 8.0"'
     - regex: 'EAGLE_(961|1068)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'EAGLE $1'
@@ -13684,18 +13940,24 @@ Benco:
 
 # Lava (Lavamobiles.com)
 Lava:
-  regex: 'Lava[ _]|LAVA(?:A1|X10)|(?:DISCOVER136|KKT QUADRA)|iris(?! Plus 2021|_Pad_G)[ _]?([^/;)]+)(?<!Plus 2021)(?: Build|[;)])|A(?:67|76) Build|X1 Selfie Build|X41 Plus Build|X1_atom_L|(?:Flair (?:[ZS]1|P8)|PixelV1|Pixel V2\+?|Z60s|Z61_2GB|A97 IPS|A97 2GB PLUS|L[EH]9920(?:[_ ]P)?|L[NEH]9910|LH9810|Ivory(?:S1|S4G)?|A76Plus|Grand2c|AH9910| A3_mini|T71_w|V23GB|R1_Lite|Atom 2X|AF9030|Z50_Pro| Z(?:[56]1|92)|Android 6(?:[\d.]*);(?: [\w-]+;)? (:?X28|P7plus)|AF9020|Alfa L|T81N(?:_UP)?|LN982[01])(?:[);/ ]|$)'
+  regex: 'Lava[ _]|LAVA(?:A1|X10)|(?:DISCOVER136|KKT QUADRA)|iris(?! Plus 2021|_Pad_G)[ _]?([^/;)]+)(?<!Plus 2021)(?: Build|[;)])|A(?:67|76) Build|X1 Selfie Build|X41 Plus Build|X1_atom_L|(?:Flair (?:[ZS]1|P8)|PixelV1|Pixel V2\+?|Z60s|Z61_2GB|A97 IPS|A97 2GB PLUS|L[EH]9920(?:[_ ]P)?|L[NEH]9910|LH9810|Ivory(?:S1|S4G)?|A76Plus|Grand2c|AH9910| A3_mini|T71_w|V23GB|R1_Lite|Atom 2X|AF9030|Z50_Pro| Z(?:[56]1|92)|Android 6(?:[\d.]*);(?: [\w-]+;)? (:?X28|P7plus)|AF9020|Alfa L|T81N(?:_UP)?|LN982[01]|Fuel F1 Mini)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
     - regex: 'LZX409(?:[);/ ]|$)'
       model: 'Blaze 2'
+    - regex: 'LXX506(?:[);/ ]|$)'
+      model: 'Blaze Pro 5G'
     - regex: 'LZX404(?:[);/ ]|$)'
       model: 'Blaze Pro'
+    - regex: 'LZX411(?:[);/ ]|$)'
+      model: 'Blaze'
     - regex: 'LZX407(?:[);/ ]|$)'
       model: 'Blaze NXT'
     - regex: 'LXX503(?:[);/ ]|$)'
       model: 'Blaze 5G'
+    - regex: 'LXX505'
+      model: 'Blaze Curve'
     - regex: 'Flair ([ZS]1|P8)(?:[);/ ]|$)'
       model: 'Flair $1'
     - regex: 'AF9030(?:[);/ ]|$)'
@@ -13806,12 +14068,20 @@ Lava:
       model: 'R3 Note'
     - regex: 'P7plus'
       model: 'P7 Plus'
+    - regex: 'LZX414'
+      model: 'Yuva 3 Pro'
+    - regex: 'LIX402'
+      model: 'Yuva Pro'
+    - regex: 'LXX508'
+      model: 'Storm 5G'
     - regex: '(X\d+)[ _]Plus(?:[);/ ]|$)'
       model: '$1 Plus'
     - regex: ' (X28)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'iris88[_ ]go'
       model: 'Iris 88 Go'
+    - regex: 'Fuel F1 Mini'
+      model: 'Iris Fuel F1 Mini'
     # explicit feature phone models
     - regex: 'DISCOVER136'
       device: 'feature phone'
@@ -13995,7 +14265,7 @@ LCT:
 
 # Leagoo
 Leagoo:
-  regex: '(?:MY)?LEAGOO[ _-]?|(?:XRover(?: C)?|Shark (5000|1|6300)|M5 EDGE|KIICAA (POWER|MIX)|Leapad[ _](?:X|7s|7Pro)|Alfa [125]|Elite [15Y]|Venture 1|Z10-E|M9 Pro|Power 5|Power[ _]2(?: Pro)?|Android 9;(?: [\w-]+;)? M1[23]|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:Z9A|T8s)|Lead 3| T5c)(?:[);/ ]|$)'
+  regex: '(?:MY)?LEAGOO[ _-]?|(?:XRover(?: C)?|Shark (5000|1|6300)|M5 EDGE|KIICAA (POWER|MIX)|Leapad[ _](?:X|7s|7Pro)|Alfa [125]|Elite [15Y]|Venture 1|Z10-E|M9 Pro|Power 5|Power[ _]2(?: Pro)?|Android 9(?:[\d.]*);(?: [\w-]+;)? M1[23]|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:Z9A|T8s)|Lead 3| T5c)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:LEAGOO[- _])?M([89])[_-]?Pro(?:[);/ ]|$)'
@@ -14032,6 +14302,9 @@ Leagoo:
     - regex: 'Leapad 7Pro'
       device: 'tablet'
       model: 'LeaPad 7 Pro'
+    - regex: 'LEAGOO_LEAPAD7_8'
+      device: 'tablet'
+      model: 'LeaPad 7'
     - regex: '(?:LEAGOO_)?Leapad[ _](7s|10|X|7I)'
       model: 'LeaPad $1'
       device: 'tablet'
@@ -14136,12 +14409,14 @@ Aligator:
   regex: 'ALIGATOR[_ ]|(?:RX[67]00|S5710|RX460)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'RX850'
+      model: 'RX850 eXtremo'
     - regex: '(?:ALIGATOR[ _])?(S4080|S50(?:6[56]|[678]0)|S55[24]0|S5710|RX510|S6[015]00|RX710|RX[678]00|RX460)(?:[);/ ]|$)'
       model: '$1'
 
 # 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|A397i)(?:[);/ ]|$)'
+  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 A1020|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|TB330XU|TB371FC|TB3[17]0FU|TB331FC|A397i|TB330FU|NL5H00X)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Lenovo ?G780'
@@ -14150,6 +14425,9 @@ Lenovo:
     - regex: 'Lenovo ?A3500-FL'
       model: 'IdeaTab A7-40'
       device: 'tablet'
+    - regex: 'Tab A1020'
+      model: 'IdeaTab A1020'
+      device: 'tablet'
     - regex: '(?:Lenovo ?)?A3500-(?:H|HV|F)'
       model: 'IdeaTab A7-50'
       device: 'tablet'
@@ -14240,6 +14518,9 @@ Lenovo:
     - regex: 'TB-X605F(?:[);/ ]|$)'
       model: 'Tab M10'
       device: 'tablet'
+    - regex: 'TB330[FX]U(?:[);/ ]|$)'
+      model: 'Tab M11'
+      device: 'tablet'
     - regex: 'TB310[FX]U(?:[);/ ]|$)'
       model: 'Tab M9'
       device: 'tablet'
@@ -14602,6 +14883,10 @@ Lenovo:
       device: 'wearable'
       model: 'Mirage Solo'
 
+    - regex: 'NL5H00X'  # Laser Projector
+      device: 'peripheral'
+      model: 'Xiaoxin 100'
+
     - regex: 'LENOVO/81W8(?:[);/ ]|$)'
       device: 'desktop'
       model: 'IdeaPad S145-15IIL'
@@ -14625,7 +14910,7 @@ Lenovo:
 
 # Lexand or LEXAND (lexand.ru)
 Lexand:
-  regex: 'Lexand[ _]|(?:S[BC]7 PRO HD|S5A[1-4]|S4A[1-5]|S6A1|A811|A802|LPH7_Smarty)(?:[);/ ]|$)'
+  regex: 'Lexand[ _]|(?:S[BC]7 PRO HD|S5A[1-4]|S4A[1-5]|S6A1|A811|(?<!Tab )A802|LPH7_Smarty)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A(811|802)'
@@ -14724,7 +15009,7 @@ Vargo:
 
 # LG or LGE (lg.com)
 LG:
-  regex: '(?<!TECNO Mobile |TECNO )LG|Web0S; Linux/SmartTV|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:(?!VX20|VX19)VX[0-9]+|L-0[12]D|L-07C|P713|(LM-[A-Z][0-9]{3}[A-Z]{0,3}(?:\(FGN?\)|\(G\)|\.FN|\.F(?:GN?)?)?)|LM-(X625N1|G820QM[0127])|G Watch|lucye)(?:[);/ ]|$)|NetCast|RS98[78]|RS500|VS(?:50[01]|835|876|880|98[05-8]|99[056]|(410|415|425|500|880)PP)|VS820|VS870 4G|Nexsus 5|LML(41[34]D|211B|713D|212V)L|VK810 4G|VK815|X5-LG|L-05[DE]|L-03K|L-01[LJK]|L-52A|L-[45]1A|901LG|A001LG|80[12]LG|402LG|LGT32|L-02K|L-01F|LM-V40|DM-01K|DM-02H|LMX130IM|LMG820UM1|VS810PP|VS425|VM670|VS930 4G'
+  regex: '(?<!TECNO Mobile |TECNO )LG|Web0S; Linux/SmartTV|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:(?!VX20|VX19)VX[0-9]+|L-0[12]D|L-07C|P713|(LM-[A-Z][0-9]{3}[A-Z]{0,3}(?:\(FGN?\)|\(G\)|\.FN|\.F(?:GN?)?)?)|LM-(X625N1|G820QM[0127])|G Watch|lucye)(?:[);/ ]|$)|NetCast|RS98[78]|RS500|VS(?:50[01]|835|876|880|98[05-8]|99[056]|(410|415|425|500|880)PP)|VS820|VS870 4G|Nexsus 5|10A30Q|LML(41[34]D|211B|713D|212V)L|VK810 4G|VK815|X5-LG|L-05[DE]|L-03K|L-01[LJK]|L-52A|L-[45]1A|901LG|A001LG|80[12]LG|402LG|LGT32|L-02K|L-01F|LM-V40|DM-01K|DM-02H|LMX130IM|LMG820UM1|VS810PP|VS425|VM670|VS930 4G'
   device: 'smartphone'
   models:
     - regex: 'DM-(01K|02H)'
@@ -15286,6 +15571,9 @@ LG:
       device: 'phablet'
       model: 'WING'
 
+    - regex: '10A30Q'
+      model: 'Ultra Tab'
+      device: 'tablet'
     - regex: 'LM-T60[05]'
       model: 'G Pad 5 10.1" FHD'
       device: 'tablet'
@@ -15435,6 +15723,14 @@ Lifemaxx:
   device: 'tv'
   model: ''
 
+# Lingbo
+Lingbo:
+  regex: '(?:Venus Pad14)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'Venus Pad14'
+      model: 'Venus Pad 14'
+
 # Lingwin
 Lingwin:
   regex: 'Lingwin[ _\-]'
@@ -15457,12 +15753,17 @@ Logic Instrument:
     - regex: 'Fieldbook K101'
       device: 'tablet'
       model: 'Fieldbook K101'
+    - regex: 'Fieldbook KS80'
+      device: 'tablet'
+      model: 'Fieldbook KS80'
 
 # Logicom (logicom-europe.com)
 Logicom:
-  regex: 'LOGICOM[_ ]|(TAB950|TAB1062|E731|E812|E912|E1031|POWER BOT|La[ _]?Tab[ _]?(?:7[24]|10[57]|11[345]|12[4789]|292|Stand(?:RB)?)|(?:[BCM]|ID|VR)[ _]?BOT[ _]?(?:TAB[ _])?([0-9]+\+?)(?:PLUS)?|KT712A_4\.4|L-?IXIR[0-9]*|L_IXIR_TAB_1047HD|L-ITE|L-EGANTONE(?:-R)?|Le Fizz|L-?EMENT.+|Le[ _]?(?:Up|Connect|Omega|Hop|Hello|Lift|Pulse|Prime|Swipe|Wave|Hola|Moov[2]?|Must(?: 2)?|Starter L|Fit FR|Spark|Prime|Smooth(?: FR)?)|LeFit|logikids4)(?:[);/ ]|$|_)'
+  regex: 'LOGICOM[_ ]|(TAB950|TAB1062|E731|E812|E912|E1031|POWER BOT|La[ _]?Tab[ _]?(?:7[24]|10[57]|11[345]|12[4789]|292|Stand(?:RB)?)|(?:[BCM]|ID|VR)[ _]?BOT[ _]?(?:TAB[ _])?([0-9]+\+?)(?:PLUS)?|KT712A_4\.4|L-?IXIR[0-9]*|L_IXIR_TAB_1047HD|L-ITE|L-EGANTONE(?:-R)?|Le Fizz|L-?EMENT.+|Le[ _]?(?:Up|Connect|Omega|Hop|Hello|Lift|Pulse|Prime|Swipe|Wave|Hola|Moov[2]?|Must(?: 2)?|Starter L|Fit FR|Spark|Prime|Smooth(?: FR)?)|Tab_Stand_Pro|LeFit|logikids4|Le Link)(?:[);/ ]|$|_)'
   device: 'tablet'
   models:
+    - regex: 'Tab_Stand_Pro'
+      model: 'La Tab Stand Pro'
     - regex: 'La[ _]?Tab[ _]?(7[24]|10[57]|11[345]|127 HD|12[89]|105_P|292|Stand)(?:[);/ ]|$)'
       model: 'La Tab $1'
     - regex: 'LaTabStandRB(?:[);/ ]|$)'
@@ -15513,6 +15814,9 @@ Logicom:
     - regex: 'Le Lift'
       model: 'Le Lift'
       device: 'smartphone'
+    - regex: 'Le Link'
+      model: 'Le Link'
+      device: 'smartphone'
     - regex: 'Le Wave'
       model: 'Le Wave'
       device: 'smartphone'
@@ -15616,7 +15920,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?|CITY4|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(?:[\d.]*);(?: [\w-]+;)? SWEET5|SWEET 55)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BIGCOOL(?:[);/ ]|$)'
@@ -15941,7 +16245,7 @@ Maze Speed:
 
 # Maze (mazephone.com)
 Maze:
-  regex: '(?:Alpha[_ ]X|Maze Alpha)(?:[);/ ]|$)|(?:Android [78].+ Blade|Comet)(?: Build|[;)])'
+  regex: '(?:Alpha[_ ]X|Maze Alpha)(?:[);/ ]|$)|(?:Android [78](?:[\d.]*);(?: [\w-]+;)? Blade|Comet)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Alpha[_ ]X(?:[);/ ]|$)'
@@ -16238,8 +16542,12 @@ Mione:
       model: 'P2+'
     - regex: 'Mione_PUBG_1'
       model: 'PUBG 1'
+    - regex: 'Mione XS max'
+      model: 'XS Max'
     - regex: 'Mione_Pro(?:[);/ ]|$)'
       model: 'Pro'
+    - regex: 'Mione Pro Plus(?:[);/ ]|$)'
+      model: 'Pro+'
     - regex: 'Mione[_ ]N10pro(?:[);/ ]|$)'
       model: 'N10 Pro'
 
@@ -16586,7 +16894,7 @@ MobiIoT:
 
 # Mecool
 Mecool:
-  regex: 'Mecool[ _-]|(?:KM9 ?PRO|BB2 PRO|K[I]{1,3} PRO|KI PLUS|KM9_TV_BOX|M8SPROW|M8S (?:PLUS|PRO) (?:DVB|[LW]|PLUS)|M8S (?:MAX|PRO)| KM[13569]| KD1)(?:[);/ ]|$)'
+  regex: 'Mecool[ _-]|(?:ME-COOL S|KM9 ?PRO|BB2 PRO|K[I]{1,3} PRO|KI PLUS|KM9_TV_BOX|M8SPROW|M8S (?:PLUS|PRO) (?:DVB|[LW]|PLUS)|M8S (?:MAX|PRO)| KM[13569]| KD1)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'KM9 ?PRO(?:[);/ ]|$)'
@@ -16613,6 +16921,8 @@ Mecool:
       model: 'M8S Pro'
     - regex: 'M8S MAX(?:[);/ ]|$)'
       model: 'M8S Max'
+    - regex: 'ME-COOL S(?:[);/ ]|$)'
+      model: 'S'
     - regex: ' K([MD]\d+)(?:[);/ ]|$)'
       model: 'K$1'
     - regex: 'Mecool[ _-]([^/);]+)(?: Build|[;)])'
@@ -16686,7 +16996,7 @@ Torque:
 
 # motorola
 Motorola:
-  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2\.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-6|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2243-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT2335-3|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
+  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2\.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-6|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2243-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT2335-3|XT2131-4|XT2301-5|XT2321-2|XT2323-3|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -16702,13 +17012,21 @@ Motorola:
       model: 'Spice'
     - regex: 'ThinkPhone'
       model: 'ThinkPhone'
+    - regex: 'XT2321-2'
+      model: 'Moto Razr 40 Ultra'
+    - regex: 'XT2323-3'
+      model: 'Moto Razr 40'
+    - regex: 'motorola razr plus 2023'
+      model: 'Moto Razr+ (2023)'
+    - regex: 'motorola razr 2023'
+      model: 'Moto Razr (2023)'
     - regex: '(?:MOT-|Motorola-)?XT30[35]'
       model: 'Motosmart ME'
     - regex: '(?:MOT-|Motorola-)?XT31[16]'
       model: 'Fire'
     - regex: '(?:MOT-|Motorola-)?XT2125-4'
       model: 'Edge S'
-    - regex: '(?:MOT-|Motorola-)?edge \((202\d)\)'
+    - regex: '(?:MOT-|Motorola[- ])?edge \(?(202\d)\)?'
       model: 'Edge ($1)'
     - regex: '(?:MOT-|Motorola-)?XT2175-2'
       model: 'Edge S30'
@@ -16894,6 +17212,8 @@ Motorola:
       model: 'Moto S30'
     - regex: '(?:MOT-|Motorola-)?XT2201-6'
       model: 'Moto X30'
+    - regex: '(?:MOT-|Motorola-)?XT2301-5'
+      model: 'Moto X40'
     - regex: '(?:MOT-|Motorola-)?XT1943-1'
       model: 'P30'
     - regex: '(?:MOT-|Motorola-)?XT1941-2'
@@ -16956,7 +17276,7 @@ Motorola:
       model: 'Moto G Stylus ($1)'
     - regex: 'moto g stylus 5G \((2022)\)' #gen-2
       model: 'Moto G Stylus 5G ($1)'
-    - regex: 'moto g stylus 5G'
+    - regex: 'moto g stylus 5G|XT2131-4'
       model: 'Moto G Stylus 5G'
     - regex: 'moto g stylus'
       model: 'Moto G Stylus'
@@ -17114,7 +17434,7 @@ MTN:
 
 # Hammer (hammerphones.com) sub brand MyPhone
 Hammer:
-  regex: '(?:Hammer[_ ](?:Construction|Explorer[_ ](?:Plus|Pro)|FORCE|Blade_[34]|Blade2_PRO|Blade_5G|IRON_[234](?:[_ ]LTE)?|IRON|Explorer|ENERGY(?:_18x9|_2_2022|_2)?|Titan 2|Active2?(?:_LTE)?)|Iron[_ ]2)(?:[);/ ]|$)'
+  regex: '(?:Hammer[_ ](?:Construction|Explorer[_ ](?:Plus|Pro)|FORCE|Blade_[34]|Blade2_PRO|Blade_5G|IRON_[234](?:[_ ]LTE)?|IRON|Explorer|ENERGY(?:_18x9|_2_2022|_[2X])?|Titan 2|Active2?(?:_LTE)?)|Iron[_ ]2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Hammer[_ ]Construction'
@@ -17125,7 +17445,7 @@ Hammer:
       model: 'Explorer Pro'
     - regex: 'HAMMER[ _]ENERGY_2_2022'
       model: 'Energy 2 (2022)'
-    - regex: 'HAMMER[ _]ENERGY[ _](18x9|3G|\d+)'
+    - regex: 'HAMMER[ _]ENERGY[ _](18x9|3G|\d+|X)'
       model: 'Energy $1'
     - regex: 'HAMMER[ _]ENERGY'
       model: 'Energy'
@@ -17133,7 +17453,7 @@ Hammer:
       model: 'Titan 2'
     - regex: 'Hammer[_ ]FORCE'
       model: 'Force'
-    - regex: '(?:Hammer[ _])?Iron[ _]([234])'
+    - regex: '(?:Hammer[ _])?Iron[ _]([234]|V)'
       model: 'Iron $1'
     - regex: 'Hammer[ _]Iron'
       model: 'Iron'
@@ -17152,6 +17472,21 @@ Hammer:
     - regex: 'Hammer_Blade_([34])'
       model: 'Blade $1'
 
+# Rombica (rumbica.ru)
+Rombica:
+  regex: 'Rombica[_ ]|(SSQ-A0500|Smart Box v[0-9]+|Smart Box (?:[ABCDXYZ]1|[GDFQ]2|[AF]3|H4)|myPhone Jet)(?:[);/ ]|$)'
+  device: 'tv'
+  models:
+    - regex: 'myPhone Jet'
+      device: 'smartphone'
+      model: 'myPhone Jet'
+    - regex: 'SSQ-A0500(?:[);/ ]|$)'
+      model: 'Smart Stick 4K'
+    - regex: '(?:Rombica[_ ])?Cinema4K_v01'
+      model: 'Cinema 4K v01'
+    - regex: '(Infinity K8|Smart Box (?:Q1|v00[3-9]|Quad|Ultra HD v002|4K V001|[ABCDXYZ]1|[AGDFQL]2|[AFG]3|H4)|TV (?:Ultima|Fly)|Smart Stick Pro|TV Mercury|TV Air)(?:[);/ ]|$)'
+      model: '$1'
+
 # myphone (myphone.com.ph)
 MyPhone:
   regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/)]+( Build|[);])|(?:HAMMER_)?AXE[_ ]M[_ ]LTE|Hammer[_ ](?:Axe)|Cube_LTE|myTab10II|LUNA_II|C-Smart_pix|myPhone_Fun_8|FUN_18x9|MyPhoneMY27|Prime_4_Lite|myA1[78]|myX12|Pocket_2|Prime_18x9|Prime3Lite|myG1|myA10|myA(10|[789]) DTV|myT[356] DTV|myWX1 Plus|myXI1(?:[ _](?:Plus|Pro))?|my(?:XI[3]|NX1|X[23589]|A1[12356]|29S|807)|Q_Smart_BE|Brown [12]|Q-Smart_Plus|Q-Smart_III_Plus|SmartView_(?:[78]|9_6)_(?:LTE|[34]G)|Android 6(?:[\d.]*);(?: [\w-]+;)? Pocket|Infinit 2|SmartView_9\.6_3G|A898 DUO'
@@ -17430,6 +17765,12 @@ Nobby:
   device: 'smartphone'
   model: '$1'
 
+# NoviSea
+NoviSea:
+  regex: 'NoviSea[ _](A10)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # Novacom (https://www.novacom.com.tr/)
 Novacom:
   regex: 'SPYBOXS11'
@@ -17549,7 +17890,7 @@ NeuImage:
   regex: 'NIM-'
   device: 'smartphone'
   models:
-    - regex: 'NIM-(450D|550O|600Q)'
+    - regex: 'NIM-(450D|550O|[56]00Q)'
       model: '$1'
 
 # NextBook
@@ -17646,7 +17987,7 @@ Noblex:
 
 # NOGA (https://noganet.ar/)
 NOGA:
-  regex: '(?:NOGAPC (?:LIVE|PRO)|NOGAPAD ?(?:7G|10\.1GHD))(?:[);/ ]|$)'
+  regex: '(?:NOGAPC (?:LIVE|PRO)|NOGAPAD ?(?:7G|10\.1GHD|10HD))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NOGAPAD ?7G(?:[);/ ]|$)'
@@ -17655,6 +17996,9 @@ NOGA:
     - regex: 'NOGAPAD ?10\.1GHD(?:[);/ ]|$)'
       device: 'tablet'
       model: 'NOGAPAD 10.1" GHD'
+    - regex: 'NOGAPAD 10HD'
+      device: 'tablet'
+      model: 'NOGAPAD 10HD'
     - regex: 'NOGAPC PRO(?:[);/ ]|$)'
       device: 'tv'
       model: 'PC Pro'
@@ -17848,7 +18192,7 @@ Nomi:
 
 # NUU Mobile
 NUU Mobile:
-  regex: 'NUU_|(?:(?:N(570[24]|500[12])L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L|S6501L|S6303L|T080[12]L)(?:[);/ ]|$)'
+  regex: 'NUU_|(?:(?:N(570[24]|500[12]|6001)L|S6512L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L|S6501L|S6303L|T080[12]L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'T080[12]L'
@@ -17863,6 +18207,8 @@ NUU Mobile:
       model: 'X5'
     - regex: 'N5704L'
       model: 'G1'
+    - regex: 'S6512L'
+      model: 'A15'
     - regex: 'S6001L'
       model: 'G2'
     - regex: 'S5501L'
@@ -17879,6 +18225,8 @@ NUU Mobile:
       model: 'A9L'
     - regex: 'N5502L'
       model: 'A10L'
+    - regex: 'N6001L'
+      model: 'A23'
     - regex: 'S5701L'
       model: 'M4X Pro'
     - regex: '(?:NUU_)?(N5001L|A6L-[CG]|Q500)(?:[);/ ]|$)'
@@ -18100,7 +18448,7 @@ Fusion5:
 
 # Odys (odys.de)
 Odys:
-  regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]|PACE_10_LTE|(?:ADM816HC|ADM8000KP|NEO6_LTE|EOS10|AEON|FALCON_10_PLUS_3G|SPACE_ONE10|FUSION|THANOS_10|MAVEN_X10_HD(?:_LTE)?|JUNIOR_8_PRO|JuniorT8Pro|(?:NOVA|PYRO)_X?7_PLUS_3G|UNO_X8|MAVEN_[GT]10(?:_pro)?|MAVEN_7_PLUS|SLADE_X55|XELIO_PRO_10_LTE|GOAL_10_PLUS_3G|NOTOSplus3G|PACE ?10|Titan_10_LTE|PEDI_PLUS_W|NoteTab_Pro|UNO_X10|NERON)(?:[);/ ]|$)'
+  regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]|PACE_10_LTE|(?:ADM816HC|ADM8000KP|NEO6_LTE|EOS10|AEON|FALCON_10_PLUS_3G|SPACE_ONE_?10(?:SE)?|FUSION|THANOS_10|MAVEN_X10_HD(?:_LTE)?|JUNIOR_8_PRO|JuniorT8Pro|(?:NOVA|PYRO)_X?7_PLUS_3G|UNO_X8|MAVEN_[GT]10(?:_pro)?|MAVEN_7_PLUS|SLADE_X55|XELIO_PRO_10_LTE|GOAL_10_PLUS_3G|NOTOSplus3G|PACE ?10|Titan_10_LTE|PEDI_PLUS_W|NoteTab_Pro|UNO_X10|NERON)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'XELIO[_ ]HD10[_ ]LTE'
@@ -18155,6 +18503,8 @@ Odys:
       model: 'Tao X10'
     - regex: 'SPACE10_PLUS_3G'
       model: 'Space 10 Plus 3G'
+    - regex: 'SPACE_ONE_10SE'
+      model: 'Space One 10 SE'
     - regex: 'SPACE_ONE10'
       model: 'Space One 10'
     - regex: 'SPACE10_PRO_3G'
@@ -18381,10 +18731,10 @@ 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]|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|[;)])'
+  regex: '(?:du_)?ONEPLUS|(?:PGKM10|CPH251[35]|CPH2551|CPH2613|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|CPH2609|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[ADEF]110)(?: Build|[;)])'
   device: 'smartphone'
   models:
-    - regex: '(?:CPH2585|CPH2611)(?:[);/ ]|$)'
+    - regex: '(?:CPH2585|CPH2611|CPH2609)(?:[);/ ]|$)'
       model: '12R'
     - regex: '(?:PJD110|CPH258[13]|CPH2573)(?:[);/ ]|$)'
       model: '12'
@@ -18396,6 +18746,8 @@ OnePlus:
       model: 'Open'
     - regex: 'PJE110(?:[);/ ]|$)'
       model: 'Ace 3'
+    - regex: 'PJF110(?:[);/ ]|$)'
+      model: 'Ace 3V'
     - regex: 'PHK110(?:[);/ ]|$)'
       model: 'Ace 2'
     - regex: 'PJA110(?:[);/ ]|$)'
@@ -18414,6 +18766,8 @@ OnePlus:
       model: 'Nord 2T'
     - regex: 'EB210[13](?:[);/ ]|$)'
       model: 'Nord CE 5G'
+    - regex: 'CPH2613'
+      model: 'Nord CE 4'
     - regex: 'CPH(?:2381|2409)(?:[);/ ]|$)'
       model: 'Nord CE 2 Lite'
     - regex: 'CPH246[57](?:[);/ ]|$)'
@@ -18514,13 +18868,21 @@ OnePlus:
 
 # Realme (sub brand Oppo)
 Realme:
-  regex: 'Realme[ _]|(?:RMX(?:18(0[13579]|11|3[13]|2[1257]|[45]1|53|45)|19(03|4[1235]|19|9[23]|2[1579]|[01379]1|73)|20(?:[025-7]1|42|[0357]2|03|2[257]|63|7[56]|63L1|8[1356]|[2-5]0)|21(?:0[13]|1[27]|[12]1|4[24]|5[156]|6[13]|7[036]|8[0359]|9[345])|220[0125]|30(?:[3468]1|4[23]|9[23]|63|85)|31(?:15|2[125]|42|51|6[16]|71|9[1357])|32(?:0[13]|35|42|[346]1|6[0235689]|86)|33(?:[0157]0|[17]2|71|6[036]|[0186]1|57|88|9[12356])|34(?:30|78|[69]1|[67]2|7[145]|9[23])|35(?:0[1236]|1[1367]|21|[578]1|6[0123]|7[24])|36(?:1[012579]|[39]0|36|2[347](?:_Natv_vf)?|8[67]|6[013])|37(?:0[0689]|62|[14-7]0|[047]1|8[025])|38(?:[39]0|2[03]|34|4[02]|67|88))|(?:OPPO[ _]?)?CPH1861|RMP210[235-8]|4K Google TV Stick)(?:[);/ ]|$)'
+  regex: 'Realme[ _]|(?:RMX(?:18(0[13579]|11|3[13]|2[1257]|[45]1|53|45)|19(03|4[1235]|19|9[23]|2[1579]|[01379]1|73)|20(?:[025-7]1|42|[0357]2|03|2[257]|63|7[56]|63L1|8[1356]|[2-5]0)|21(?:0[13]|1[27]|[12]1|4[24]|5[156]|6[13]|7[036]|8[0359]|9[345])|220[0125]|30(?:[3468]1|4[23]|9[23]|63|85)|31(?:15|2[125]|42|51|6[16]|71|9[1357])|32(?:0[13]|35|42|[346]1|6[0235689]|86)|33(?:[0157]0|[17]2|71|6[036]|[0186]1|57|88|9[12356])|34(?:30|78|[69]1|[67]2|7[145]|9[23])|35(?:0[1236]|1[12367]|21|[578]1|6[0123]|7[24])|36(?:1[0125789]|[39]0|36|2[347](?:_Natv_vf)?|8[67]|6[013])|37(?:0[0689]|6[21]|[14-7]0|[0457]1|8[025])|38(?:[39]0|2[03]|34|4[01234]|5[02]|6[78]|70|88)|399[89])|(?:OPPO[ _]?)?CPH1861|RMP2204|RMP210[235-8]|4K Google TV Stick)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'RMX3844'
+      model: 'P1 Pro 5G'
+    - regex: 'RMX3870'
+      model: 'P1 5G'
     - regex: 'RMX3834'
       model: 'Note 50'
     - regex: 'RMX370[68]'
       model: 'GT Neo 5'
+    - regex: 'RMX3852'
+      model: 'GT Neo 6'
+    - regex: 'RMX3850'
+      model: 'GT Neo 6 SE'
     - regex: 'RMX3700'
       model: 'GT Neo 5 SE'
     - regex: '(?:OPPO[ _]?)?RMX3142(?:[);/ ]|$)'
@@ -18633,16 +18995,24 @@ Realme:
       model: '11 Pro'
     - regex: 'RMX3785'
       model: '11x 5G'
-    - regex: 'RMX3636'
+    - regex: 'RMX3(?:636|751)'
       model: '11'
     - regex: 'RMX3780'
       model: '11 5G'
     - regex: 'RMX3842'
       model: '12 Pro 5G'
+    - regex: 'RMX3843'
+      model: '12 Pro'
+    - regex: 'RMX3841'
+      model: '12 Pro+'
     - regex: 'RMX3840'
       model: '12 Pro+ 5G'
     - regex: 'RMX3867'
       model: '12+ 5G'
+    - regex: 'RMX3999'
+      model: '12 5G'
+    - regex: 'RMX3998'
+      model: '12x 5G'
     - regex: 'RMX1925(?:[);/ ]|$)'
       model: '5S'
     - regex: 'RMX1811(?:[);/ ]|$)'
@@ -18681,7 +19051,7 @@ Realme:
       model: 'C30s'
     - regex: 'RMX362[47]'
       model: 'C33'
-    - regex: 'RMX351[13]'
+    - regex: 'RMX351[123]'
       model: 'C35'
     - regex: 'RMX3710'
       model: 'C55'
@@ -18755,6 +19125,10 @@ Realme:
       model: 'Narzo 50i Prime'
     - regex: 'RMX3750'
       model: 'Narzo 60 5G'
+    - regex: 'RMX3868'
+      model: 'Narzo 70 Pro 5G'
+    - regex: 'RMX3761'
+      model: 'Narzo N53'
     - regex: 'RMX183[13](?:[);/ ]|$)'
       model: 'U1'
     - regex: 'RMX(?:20(?:51|[2]5)|2144)(?:[);/ ]|$)'
@@ -18773,6 +19147,8 @@ Realme:
       model: 'X3 Super Zoom'
     - regex: 'RMX2083'
       model: 'X3'
+    - regex: 'Realme X7 Max 5G'
+      model: 'X7 Max 5G'
     - regex: 'RMX2173'
       model: 'Q2 Pro'
     - regex: 'RMX346[12]'
@@ -18781,6 +19157,8 @@ Realme:
       model: 'V5 5G'
     - regex: 'RMX220[01]'
       model: 'V3 5G'
+    - regex: 'RMX3618'
+      model: 'V30'
     - regex: 'RMX312[12]'
       model: 'V11 5G'
     - regex: 'RMX3125'
@@ -18801,30 +19179,39 @@ Realme:
       model: 'GT 5G'
     - regex: 'Realme[ _]([1-9])[ _]Pro(?:[);/ ]|$)'
       model: '$1 Pro'
+
     - regex: 'RMP210[23](?:[);/ ]|$)'
       device: 'tablet'
       model: 'Pad'
+    - regex: 'RMP220[45]'
+      device: 'tablet'
+      model: 'Pad 2'
     - regex: 'RMP210[78]'
       device: 'tablet'
       model: 'Pad X'
     - regex: 'RMP210[56](?:[);/ ]|$)'
       device: 'tablet'
       model: 'Pad Mini'
+
     - regex: '4K Google TV Stick'
       device: 'tv'
       model: '4K Google TV Stick'
 
 # Oppo (oppo.com)
 OPPO:
-  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|R820[16]|A101OP|OPG0[1-4]|A00[12]OP|(?:X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057]|15 Neo)[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDCT00|PDET10|PDS[TM]00|PEC[MT]30|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10|A103OP|PCCT00|PFTM[12]0|PFFM20|OW19W[123]|OW20W1|PGJM10|PGAM10|PF[EF]M10|Reno[4567]|Find X[23]|Find N| R7sf| 1201|[56].*; (?:R7[gf])|OPD210[12]A?|OPD2201|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PHW110|PHA120|PGGM10|PH[MU]110|PG[WX]110|PGU110|PHJ110|PCCM40|PHQ110|CHP1723|PGT110|PGEM10|RX17Neo|R15 Dream Mirror|R9 Plustm A|PGFM10|A301OP|P(?:J[CGJS]|H[FVSTNYZ])110)(?:[);/ ]|$)'
+  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|R820[16]|A101OP|OPG0[1-4]|A00[12]OP|(?:X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057]|15 Neo)[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|A303OP|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDCT00|PDET10|PDS[TM]00|PEC[MT]30|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10|A103OP|PCCT00|PFTM[12]0|PFFM20|OW19W[123]|OW20W1|PGJM10|PGAM10|PF[EF]M10|Reno[4567]|Find X[23]|Find N| R7sf| 1201|[56].*; (?:R7[gf])|OPD(?:210[12]A?|2201|230[12])|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PHW110|PHA120|PGGM10|PH[MU]110|PG[WX]110|PGU110|PHJ110|PCCM40|PHQ110|CHP1723|PGT110|PGEM10|RX17Neo|R15 Dream Mirror|R9 Plustm A|PGFM10|A301OP|P(?:J[CGJSU]|H[FVSTNYZ])110|K9 Pro 5G| K9[xs]|CPH1821EX|PJH110|PJB110)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PCHM10(?:[);/ ]|$)'
       model: 'A11'
     - regex: 'PHQ110(?:[);/ ]|$)'
       model: 'A1 Pro'
+    - regex: 'PJU110'
+      model: 'A1i 5G'
     - regex: 'PJS110'
       model: 'A2x 5G'
+    - regex: 'PJB110'
+      model: 'A2 5G'
     - regex: 'PCHT30(?:[);/ ]|$)'
       model: 'A11x'
     - regex: '(?:CPH2083|CPH2077)(?:[);/ ]|$)'
@@ -18835,25 +19222,25 @@ OPPO:
       model: 'A16s'
     - regex: 'CPH2421'
       model: 'A16e'
-    - regex: 'CPH2349'
+    - regex: 'CPH2349|CPH2351'
       model: 'A16k'
     - regex: 'CPH2477'
       model: 'A17'
     - regex: 'CPH2471'
       model: 'A17k'
-    - regex: '(?:CPH2185)(?:[);/ ]|$)'
+    - regex: 'CPH2185'
       model: 'A15'
-    - regex: 'PCHM00(?:[);/ ]|$)'
+    - regex: 'PCHM00'
       model: 'A11x'
-    - regex: 'CPH1923(?:[);/ ]|$)'
+    - regex: 'CPH1923'
       model: 'A1k'
-    - regex: 'CPH2071(?:[);/ ]|$)'
+    - regex: 'CPH2071'
       model: 'A11k'
-    - regex: 'CPH1925(?:[);/ ]|$)'
+    - regex: 'CPH1925'
       model: 'A1s'
     - regex: 'CPH22(?:69|75)(?:[);/ ]|$)'
       model: 'A16'
-    - regex: 'CPH2591(?:[);/ ]|$)'
+    - regex: 'CPH2591'
       model: 'A18'
     - regex: '(?:OPPO[ _]?)?(CPH1837|PAD[TM]00)(?:[);/ ]|$)'
       model: 'A3'
@@ -18947,7 +19334,7 @@ OPPO:
       model: 'A78'
     - regex: '(?:OPPO[ _]?)?A79kt'
       model: 'A79'
-    - regex: '(?:OPPO[ _]?)?CPH255[37]'
+    - regex: '(?:OPPO[ _]?)?(?:CPH255[37]|A303OP)'
       model: 'A79 5G'
     - regex: '(?:OPPO[ _]?)?CPH2473'
       model: 'A77s'
@@ -19021,7 +19408,7 @@ OPPO:
       model: 'F5'
     - regex: '(?:OPPO[ _]?)?CPH1725(?:[);/ ]|$)'
       model: 'F5 Youth'
-    - regex: '(?:OPPO[ _]?)?CPH18(?:[15]9|21)(?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?CPH18(?:[15]9|21|21EX)(?:[);/ ]|$)'
       model: 'F7'
     - regex: '(?:OPPO[ _]?)?(?:CPH1825|CPH1881)(?:[);/ ]|$)'
       model: 'F9'
@@ -19045,7 +19432,7 @@ OPPO:
       model: 'Find N 5G'
     - regex: '(?:OPPO[ _]?)?Find N(?:[);/ ]|$)'
       model: 'Find N'
-    - regex: '(?:OPPO[ _]?)?PGU110(?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?(?:PGU110|CPH2439)(?:[);/ ]|$)'
       model: 'Find N2'
     - regex: '(?:OPPO[ _]?)?(?:CPH2437|PGT110)(?:[);/ ]|$)'
       model: 'Find N2 Flip'
@@ -19109,11 +19496,11 @@ OPPO:
       model: 'K7'
     - regex: '(?:OPPO[ _]?)?(PERM00)(?:[);/ ]|$)'
       model: 'K7x'
-    - regex: '(?:OPPO[ _]?)?PGCM10'
+    - regex: '(?:OPPO[ _]?)?PGCM10| K9x(?:[);/ ]|$)'
       model: 'K9x'
     - regex: '(?:OPPO[ _]?)?PGGM10'
       model: 'K10x'
-    - regex: '(?:OPPO[ _]?)?PERM10'
+    - regex: '(?:OPPO[ _]?)?PERM10| K9s(?:[);/ ]|$)'
       model: 'K9s'
     - regex: '(?:OPPO[ _]?)?CPH2373'
       model: 'K10'
@@ -19215,9 +19602,9 @@ OPPO:
       model: 'Reno 10 Pro 5G'
     - regex: 'CPH2521|PHU110'
       model: 'Reno 10 Pro+ 5G'
-    - regex: 'PJJ110'
+    - regex: 'PJJ110|CPH2607'
       model: 'Reno 11 Pro'
-    - regex: 'CPH2599'
+    - regex: 'CPH2599|PJH110'
       model: 'Reno 11'
     - regex: '(?:PCKM00|CPH1907)(?:[);/ ]|$)'
       model: 'Reno 2'
@@ -19311,7 +19698,7 @@ OPPO:
       model: 'Reno 9 Pro'
     - regex: 'CPH2523|A301OP'
       model: 'Reno 9 A'
-    - regex: '(?:PEYM00)(?:[);/ ]|$)'
+    - regex: '(?:PEYM00|K9 Pro 5G)(?:[);/ ]|$)'
       model: 'K9 Pro 5G'
     - regex: '(?:PEXM00)(?:[);/ ]|$)'
       model: 'K9 5G'
@@ -19335,6 +19722,12 @@ OPPO:
     - regex: 'OPD2102A?'
       model: 'Pad Air'
       device: 'tablet'
+    - regex: 'OPD2301'
+      model: 'Pad Air 2'
+      device: 'tablet'
+    - regex: 'OPD2302'
+      model: 'Pad Neo'
+      device: 'tablet'
     - regex: 'OPD2201'
       model: 'Pad 2'
       device: 'tablet'
@@ -19414,14 +19807,16 @@ Orange:
 
 # Oukitel
 Oukitel:
-  regex: 'OU[Kc]ITEL|(?:Android 10;(?: [\w-]+;)? (?:C19|C22)|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:C11|U23)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:C25)|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:C32)|Android 7(?:[\d.]*);(?: [\w-]+;)? (?:U1[78]|U22)|(?:C1[569]|K10000|K[46]000)(?:[ _]Pro)|K4000Pro|C1[18]_Pro|C1[0237] Pro|C2[13] Pro|C12 Plus|[UK]15 Pro|K15_Plus|U16 Max|C11_F|U7 Max|U7 Plus|U11[_ ]Plus|U20_Plus|C21 Plus|OK6000 Plus|WP5000|WP[58] Pro|K[46]000[ _](?:Plus|Lite)|K9 Pro|Y4800|K10000|K7 Power|K[4-8]000| RT[12356]| OT5| WP(?:[15-79]|1[02356789]|2[0123678]|3[023])|K[37]_Pro|K13_Pro|U25_Pro|OKT[13]|UniverseTap|RT7 TITAN(?: 5G)?)(?:[);/ ]|$)'
+  regex: 'OU[Kc]ITEL|(?:Android 10(?:[\d.]*);(?: [\w-]+;)? (?:C19|C22)|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:C11|U23)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:C25)|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:C3[12])|Android 1[23](?:[\d.]*);(?: [\w-]+;)? (?:K16)|Android 7(?:[\d.]*);(?: [\w-]+;)? (?:U1[78]|U22)|(?:C1[569]|K10000|K[46]000)(?:[ _]Pro)|K4000Pro|C1[18]_Pro|C1[0237] Pro|C2[13] Pro|C12 Plus|[UK]15 Pro|K15_Plus|U16 Max|C11_F|U7 Max|U7 Plus|U11[_ ]Plus|U20_Plus|C21 Plus|OK6000 Plus|WP5000|WP[58] Pro|K[46]000[ _](?:Plus|Lite)|K9 Pro|Y4800|K10000|K7 Power|K[4-8]000| RT[12356]| OT[568]| WP(?:[125-79]|1[02356789]|2[0123678]|3[0236])|K[37]_Pro|K13_Pro|U25_Pro|OKT[13]|UniverseTap|RT7 TITAN(?: 5G)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'WP21 Ultra'
       model: 'WP21 Ultra'
-    - regex: '(C1[0-9]|C2[13]|K10000|K[46]000|WP\d+|U[12]5|K[379]|K1[35])[ _]?Pro(?:[);/ ]|$)'
+    - regex: '(C1[0-9]|C2[13]|C31|K10000|K[46]000|WP\d+|U[12]5|K[379]|K1[35])[ _]?Pro(?:[);/ ]|$)'
       model: '$1 Pro'
-    - regex: 'OUKITEL K([37])(?:[);/ ]|$)'
+    - regex: 'K7 Power(?:[);/ ]|$)'
+      model: 'K7 Power'
+    - regex: '(?:OUKITEL)? K([37]|16)(?:[);/ ]|$)'
       model: 'K$1'
     - regex: '(K10000|U16|U7)[ _]Max(?:[);/ ]|$)'
       model: '$1 Max'
@@ -19431,11 +19826,9 @@ Oukitel:
       model: '$1 Lite'
     - regex: '(K10000)[_ ]Mix(?:[);/ ]|$)'
       model: '$1 Mix'
-    - regex: 'K7 Power(?:[);/ ]|$)'
-      model: 'K7 Power'
     - regex: 'UniverseTap(?:[);/ ]|$)'
       model: 'U8 Universe Tap'
-    - regex: '(?:Oukitel-)?(Y4800|K10000|K[4-8]000|WP5000|[CU]2|U1[078]|U2[23]|C1[19]|C[23]2|C3|WP15 S|C25)(?:[);/ ]|$)'
+    - regex: '(?:Oukitel-)?(Y4800|K10000|K[4-8]000|WP5000|[CU]2|U1[078]|U2[23]|C1[19]|C[23]2|C3|C31|WP15 S|C25)(?:[);/ ]|$)'
       model: '$1'
 
     - regex: 'RT7 TITAN 5G'
@@ -19444,7 +19837,7 @@ Oukitel:
     - regex: 'RT7 TITAN'
       device: 'tablet'
       model: 'RT7 Titan'
-    - regex: ' (RT[12356]|OKT[13]|OT5)(?:[);/ ]|$)'
+    - regex: ' (RT[12356]|OKT[13]|OT[568])(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
@@ -19743,7 +20136,7 @@ Pentagram:
 
 # Tcl (tcl.com)
 TCL:
-  regex: 'TCL,|smarttv_AFTMM-TCL|AFTMD002|AFTSHN02|AFTMD001|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|TCL72563C|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRSVO]|5004S|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JMEI]|5133A|5148A|5152D|5159[AJ]|5164D|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9317X1|9161G| 9061| 8182| 8167| 8095|BeyondTV\d?|UnionTV|T507U|T610[KE]|9132G|9166G|9137W|T430W|T431[DU]|T501[CL]|T768S|9494G)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
+  regex: 'TCL,|smarttv_AFTMM-TCL|AFTMD002|AFTSHN02|AFTMD001|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|TCL72563C|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRSVO]|5004S|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JMEI]|5133A|5148A|5152D|5159[AJ]|5164D|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9317X1|916[016]G| 9061| 8182| 8167| 8095|BeyondTV\d?|UnionTV|T507U|5131G|T610[KE]|T612B|9132G|9137W|T430W|T431[DU]|T501[CL]|T768S|9494G|T607DL)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TCLGalaG60(?:\(9108A\))?(?:[);/ ]|$)'
@@ -19760,6 +20153,8 @@ TCL:
       model: '205'
     - regex: '(?:4163D|4188S)(?:[);/ ]|$)'
       model: '304'
+    - regex: '5131G'
+      model: '303'
     - regex: 'T431[DU](?:[);/ ]|$)'
       model: '403'
     - regex: '6102[AD](?:[);/ ]|$)'
@@ -19882,6 +20277,12 @@ TCL:
       model: '10 Pro'
     - regex: 'T771K(?:[);/ ]|$)'
       model: '40R 5G'
+    - regex: 'T607DL(?:[);/ ]|$)'
+      model: 'ION V'
+
+    - regex: 'T612B(?:[);/ ]|$)'
+      device: 'phablet'
+      model: 'NxtPaper 40'
 
     - regex: '9494G'
       device: 'tablet'
@@ -19919,7 +20320,7 @@ TCL:
     - regex: '9060G|9161G'
       device: 'tablet'
       model: 'Tab 10 FHD 4G'
-    - regex: '9060X'
+    - regex: '9060X|9160G'
       device: 'tablet'
       model: 'Tab 10 HD 4G'
     - regex: '9137W'
@@ -20031,6 +20432,14 @@ Pixus:
       model: 'hiPower'
     - regex: 'Pixus[ _]Sprint'
       model: 'Sprint'
+    - regex: 'Pixus[ _]Drive'
+      model: 'Drive'
+    - regex: 'Pixus[ _]Wing'
+      model: 'Wing'
+    - regex: 'Pixus[ _]Line'
+      model: 'Line'
+    - regex: 'Pixus[ _]Titan'
+      model: 'Titan'
     - regex: '(?:Pixus_)?Touch[ _]7[ _]3G'
       model: 'Touch 7 3G'
     - regex: 'Pixus[ _]hiMax'
@@ -20136,12 +20545,12 @@ PPTV:
 
 # ProScan
 ProScan:
-  regex: 'PLT([^;/]+) Build|PLT(?:777[045]|9774|1074|9999)G(?:[);/ ]|$)'
+  regex: 'PLT([^;/]+) Build|PLT(?:777[045]|9774|107[47]|9999)G(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'PLT([^;/]+) Build'
       model: 'PLT$1'
-    - regex: 'PLT(777[045]|9774|1074|9999)G'
+    - regex: 'PLT(777[045]|9774|107[47]|9999)G'
       model: 'PLT$1G'
 
 # RCA Tablets (RCA) ((https://www.rca.com/))
@@ -20217,11 +20626,13 @@ Roku:
     - regex: ''
       model: 'Digital Video Player'
 
-# Rokit (rokitphones.com)
+# Rokit or ROKiT (rokitphones.com)
 Rokit:
-  regex: 'IO (?:Pro|3D|Light)(?:[);/ ]|$)'
+  regex: '(?:IO (?:Pro|3D|Light)|Orb S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Orb S'
+      model: 'Orb S'
     - regex: 'IO Pro'
       model: 'IO Pro'
     - regex: 'IO Light'
@@ -20229,18 +20640,6 @@ Rokit:
     - regex: 'IO 3D'
       model: 'IO 3D'
 
-# Rombica (rumbica.ru)
-Rombica:
-  regex: 'Rombica[_ ]|(SSQ-A0500|Smart Box v[0-9]+|Smart Box (?:[ABCDXYZ]1|[GDFQ]2|[AF]3|H4))(?:[);/ ]|$)'
-  device: 'tv'
-  models:
-    - regex: 'SSQ-A0500(?:[);/ ]|$)'
-      model: 'Smart Stick 4K'
-    - regex: '(?:Rombica[_ ])?Cinema4K_v01'
-      model: 'Cinema 4K v01'
-    - regex: '(Infinity K8|Smart Box (?:Q1|v00[3-9]|Quad|Ultra HD v002|4K V001|[ABCDXYZ]1|[AGDFQL]2|[AFG]3|H4)|TV (?:Ultima|Fly)|Smart Stick Pro|TV Mercury|TV Air)(?:[);/ ]|$)'
-      model: '$1'
-
 # Rover
 Rover:
   regex: 'Rover ([0-9]+)'
@@ -20396,13 +20795,13 @@ Siemens:
 
 # Soundmax
 Soundmax:
-  regex: '((?:SM-LED32M(?:11|04)S)|SM-LED(?:40M04S|65M01SU))(?:_-Ver01)?(?:[);/ ]|$)'
+  regex: '((?:SM-LED32M(?:11|04)S)|SM-QLED50T2SU|SM-LED(?:40M04S|65M01SU))(?:_-Ver01)?(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Samsung
 Samsung:
-  regex: 'SAMSUNG(?! ?(?:Browser|Redmi))|FamilyHub|Maple (?!III)|Maple2012|SMART-TV.+Tizen.+SamsungBrowser|Gear Live|(?:SEC_)?SC-(?:001|01[EFGHKLM]|02[CGHJKLMF]|03[EFJKL]|04[EFJLG]|05[GL]|(?:4[12]|5[1-4])A|5[1-5]B|5[1-5]C|56C|5[23]D)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|beyond[02]q?|crownq?lte|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G21|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
+  regex: 'SAMSUNG(?! ?(?:Browser|Redmi|TicWatch))|FamilyHub|Maple (?!III)|Maple2012|SMART-TV.+Tizen.+SamsungBrowser|Gear Live|(?:SEC_)?SC-(?:001|01[EFGHKLM]|02[CGHJKLMF]|03[EFJKL]|04[EFJLG]|05[GL]|(?:4[12]|5[1-4])A|5[1-5]B|5[1-5]C|56C|5[23]D)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|beyond[02]q?|crownq?lte|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G2[01]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit tv models
@@ -20549,6 +20948,9 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-X216'
       device: 'tablet'
       model: 'Galaxy Tab A9+ 11.0" 5G'
+    - regex: '(?:SAMSUNG-)?SM-X210'
+      device: 'tablet'
+      model: 'Galaxy Tab A9+ 11.0"'
     - regex: '(?:SAMSUNG-)?SM-T11[03]'
       device: 'tablet'
       model: 'Galaxy Tab 3 Lite 7.0" WiFi'
@@ -20606,6 +21008,9 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-X716'
       device: 'tablet'
       model: 'Galaxy Tab S9 12.4" 5G'
+    - regex: '(?:SAMSUNG-)?SM-X616'
+      device: 'tablet'
+      model: 'Galaxy Tab S9 FE+ 12.4" 5G'
     - regex: '(?:SAMSUNG-)?SM-T111'
       device: 'tablet'
       model: 'Galaxy Tab 3 Lite 7.0"'
@@ -20761,13 +21166,13 @@ Samsung:
       model: 'Galaxy Tab A 8.0" LTE'
     - regex: '(?:SAMSUNG-)?SM-T387(?:AA|R4|VK|[TPVW])'
       device: 'tablet'
-      model: 'Galaxy Tab A 8.0" LTE (2018)'
+      model: 'Galaxy Tab A 8.0" (2018) LTE'
     - regex: '(?:SAMSUNG-)?SM-T295'
       device: 'tablet'
-      model: 'Galaxy Tab A 8.0" LTE (2019)'
+      model: 'Galaxy Tab A 8.0" (2019) LTE'
     - regex: '(?:SAMSUNG-)?SM-T290'
       device: 'tablet'
-      model: 'Galaxy Tab A 8.0" WiFi (2019)'
+      model: 'Galaxy Tab A 8.0" (2019) WiFi'
     - regex: '(?:SAMSUNG-)?SM-(?:P355([MY])?|T550)'
       device: 'tablet'
       model: 'Galaxy Tab A 9.7" WiFi'
@@ -20776,13 +21181,13 @@ Samsung:
       model: 'Galaxy Tab A 9.7" LTE'
     - regex: '(?:SAMSUNG-)?SM-(?:T58[05]|P58[05])'
       device: 'tablet'
-      model: 'Galaxy Tab A 10.1" WiFi (2016)'
+      model: 'Galaxy Tab A 10.1" (2016) WiFi'
     - regex: '(?:SAMSUNG-)?SM-T587[P]?'
       device: 'tablet'
-      model: 'Galaxy Tab A 10.1" LTE (2016)'
+      model: 'Galaxy Tab A 10.1" (2016) LTE'
     - regex: '(?:SAMSUNG-)?SM-T59[057]'
       device: 'tablet'
-      model: 'Galaxy Tab A 10.5" LTE (2018)'
+      model: 'Galaxy Tab A 10.5" (2018) LTE'
     - regex: '(?:SAMSUNG-)?SM-T51(?:7P|[057])'
       device: 'tablet'
       model: 'Galaxy Tab A 10.1" (2019)'
@@ -21258,12 +21663,16 @@ Samsung:
       model: 'Galaxy S23'
     - regex: '(?:SAMSUNG-)?SM-S916'
       model: 'Galaxy S23+'
-    - regex: '(?:SAMSUNG-)?(?:SM-S918|SC-52D)'
+    - regex: '(?:SAMSUNG-)?(?:SM-S918|SC-52D|SCG20)'
       model: 'Galaxy S23 Ultra'
     - regex: '(?:SAMSUNG-)?(?:SM-S711)'
       model: 'Galaxy S23 FE'
+    - regex: '(?:SAMSUNG-)?SM-S921'
+      model: 'Galaxy S24'
     - regex: '(?:SAMSUNG-)?(?:SM-S926)'
       model: 'Galaxy S24+'
+    - regex: '(?:SAMSUNG-)?SM-S928'
+      model: 'Galaxy S24 Ultra'
     - regex: '(?:SAMSUNG-)?SM-F700(?:U1|[0FNUW])|SCV47'
       model: 'Galaxy Z Flip'
     - regex: '(?:SAMSUNG-)?SM-F707(?:U1|[0BNUW])|SCG04'
@@ -21314,7 +21723,7 @@ Samsung:
       model: 'Galaxy A14 5G'
     - regex: '(?:SAMSUNG-)?(?:SM-A145)'
       model: 'Galaxy A14'
-    - regex: '(?:SAMSUNG-)?(?:SM-A156)'
+    - regex: '(?:SAMSUNG-)?(?:SM-A156|SM-S156V)'
       model: 'Galaxy A15 5G'
     - regex: '(?:SAMSUNG-)?(?:SM-A155)'
       model: 'Galaxy A15'
@@ -21480,6 +21889,8 @@ Samsung:
       model: 'Galaxy F12'
     - regex: '(?:SAMSUNG-)?SM-E135F'
       model: 'Galaxy F13'
+    - regex: '(?:SAMSUNG-)?SM-E156B'
+      model: 'Galaxy F15 5G'
     - regex: '(?:SAMSUNG-)?SM-E225F(?:[);/ ]|$)'
       model: 'Galaxy F22'
     - regex: '(?:SAMSUNG-)?SM-E236'
@@ -22023,17 +22434,19 @@ Senwa:
 
 # Visual Land (www.visual-land.com)
 Visual Land:
-  regex: '(?:Prime10(?:SE|ES)|Elite(?:9QL|8QI|7QS))(?:[);/ ]|$)'
+  regex: '(?:Prime10(?:SE|ES)|Elite(?:9QL|8QI|7QS|10QHPro))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Prime10(SE|ES)'
       model: 'Prestige Prime 10$1'
+    - regex: 'Elite10QHPro'
+      model: 'Prestige Elite 10QH Pro'
     - regex: 'Elite(9QL|8QI|7QS)'
       model: 'Prestige Elite $1'
 
 # Sky or Sky Devices (skydevices.com)
 Sky:
-  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:PHOTOPRO|5_0T|M45|[45]T|45T|GO|M5Plus|T[46]|[ABCDHP]5|5_5_Octa|Octa|[BCEFGHJPTV]55|[AB]65|N55|T10)|Platinum[_ ](?:5\.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10)|SKYVISION|SKY B(?:lack|63)| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Premier5|Sky,'
+  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:PHOTOPRO|5_0T|M45|[45]T|45T|GO|A63Max|M5Plus|T8Plus|T[46]|[ABCDHP]5|5_5_Octa|Octa|[BCEFGHJPTVR]55|[AB]65|N55|T10)|Platinum[_ ](?:5\.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10|PAD8)|SKYVISION|SKY B(?:lack|63)| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Premier5|Sky,'
   device: 'smartphone'
   models:
     - regex: 'Platinum[_ ](?:5\.0M|M5)'
@@ -22053,9 +22466,15 @@ Sky:
     - regex: 'Platinum[_ ]?VIEW(2)?(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Platinum View$1'
-    - regex: 'SKY[ _]PAD10'
+    - regex: 'SKY[ _]PAD10Max'
+      device: 'tablet'
+      model: 'Pad 10 Max'
+    - regex: 'SKY[ _]PAD8Pro'
       device: 'tablet'
-      model: 'Pad 10'
+      model: 'Pad 8 Pro'
+    - regex: 'SKY[ _]PAD(10|8)'
+      device: 'tablet'
+      model: 'Pad $1'
     - regex: 'SKYVISION'
       device: 'tablet'
       model: 'Vision'
@@ -22065,6 +22484,9 @@ Sky:
     - regex: 'Elite_Octaplus(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Elite OctaPlus'
+    - regex: 'Elite[_ ]T8Plus(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Elite T8 Plus'
     - regex: 'Elite_OctaXS(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Elite Octa XS'
@@ -22083,11 +22505,13 @@ Sky:
       model: 'Elite Photo Pro'
     - regex: 'Elite M5Plus'
       model: 'Elite M5 Plus'
-    - regex: 'Elite E55Max'
-      model: 'Elite E55 Max'
+    - regex: 'Elite ([EP])55Max'
+      model: 'Elite $155 Max'
+    - regex: 'Elite A63Max'
+      model: 'Elite A63 Max'
     - regex: 'SKY B63'
       model: 'Elite B63'
-    - regex: 'Elite[ _](M45|Go|[45]T|T[46]|[ABCDHP]5|[ABCEFGHJPTV]55|[AB]65|45T|N55)(?:[);/ ]|$)'
+    - regex: 'Elite[ _](M45|Go|[45]T|T[46]|[ABCDHP]5|[ABCEFGHJPTVR]55|[AB]65|45T|N55)(?:[);/ ]|$)'
       model: 'Elite $1'
     - regex: 'Elite (T10)'
       device: 'tablet'
@@ -22141,7 +22565,7 @@ Skyworth:
   models:
     - regex: 'FlowBox-F1'
       model: 'FlowBox-F1'
-    - regex: '(SWTV-20AE(?:-PRO)?)'
+    - regex: '(SWTV-2[02]AE(?:-PRO|-FHD)?)'
       model: '$1'
     - regex: 'Sky_?worth ([^;/)]+)(?: Build|[;)])'
       model: '$1'
@@ -22348,7 +22772,7 @@ SWISSMOBILITY:
 
 # Thomson
 Thomson:
-  regex: '(?:Primo(7|8)|QM73[45]-8G|QM734-2|QM736-8G\(HD\)|(?<!\.)8950|MID1002|5014G|TEO(?:13P|10[SM]|8M|7RK|X10[23]|104G)|Friendly_TH101|Delight TH201|HERO10RK|SPTEO10BK16)(?:[);/ ]|$)|(?:Tlink|Every)[0-9]+|THOMSON[, ]'
+  regex: '(?:Primo(7|8)|QM73[45]-8G|QM734-2|QM736-8G\(HD\)|(?<!\.)8950|MID1002|5014G|TEO(?:13P|10[SM]|8M|7RK|X10[23]|104G)|Friendly_TH101|Delight TH201|HERO10RK|SPTEO10BK16|Origin_679)(?:[);/ ]|$)|(?:Tlink|Every)[0-9]+|THOMSON[, ]'
   device: 'tablet'
   models:
     # already detected as manta device
@@ -22379,6 +22803,9 @@ Thomson:
     - regex: 'Tlink([0-9]+)'
       device: 'smartphone'
       model: 'Tlink$1'
+    - regex: 'Origin_679'
+      device: 'smartphone'
+      model: 'Origin 679'
     - regex: 'Every([0-9]+)'
       device: 'smartphone'
       model: 'Every$1'
@@ -22696,6 +23123,8 @@ Positivo:
       model: 'X400'
     - regex: 'Positivo (Q20|Slim)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'Twist 4 Mini'
+      model: 'Twist 4 Mini'
     - regex: 'Twist 4 (Fit|Pro)'
       model: 'Twist 4 $1'
     - regex: 'YOLO'
@@ -22968,7 +23397,7 @@ Quest:
 
 # QMobile or QSmart or Q-Smart (qmobile.com.pk)
 QMobile:
-  regex: 'QMobile|QTab(?!10EW)|Q-?Smart|(?:Mark [25]|E2 Noir|Noir[ _](A[18]|X1S)|LUNA PRO|NICE S|JazzX JS(?:[27]|10)(?: PRO)?|LT[57]00[ _]PRO|LT950|Infinity (?:Cinema 2|triple|santos|Prime 2)|Q Infinity|Hot 5|Hot Pro 2|VITA S|i7i 2020|i10[ _]20(?:20|19)|V2 2018|Z12 PRO|Smart HD Pro|V[67]_Metal|Rocket (?:Lite|Pro)| GLi|i6i 2020|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:J5|S2 Pro|J7 PRO|M350 Pro)|Android 5(?:[\d.]*);(?: [\w-]+;)? Z9 Plus|i8i Dual|View Max Pro)(?:[);/ ]|$)'
+  regex: 'QMobile|QTab(?!10EW)|Q-?Smart|LINQ (?:L10|X100)|(?:Mark [25]|E2 Noir|Noir[ _](A[18]|X1S)|LUNA PRO|NICE S|JazzX JS(?:[27]|10)(?: PRO)?|LT[57]00[ _]PRO|LT950|Infinity (?:Cinema 2|triple|santos|Prime 2)|Q Infinity|Hot 5|Hot Pro 2|VITA S|i7i 2020|i10[ _]20(?:20|19)|V2 2018|Z12 PRO|Smart HD Pro|V[67]_Metal|Rocket (?:Lite|Pro)| GLi|i6i 2020|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:J5|S2 Pro|J7 PRO|M350 Pro)|Android 5(?:[\d.]*);(?: [\w-]+;)? Z9 Plus|i8i Dual|View Max Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'JazzX JS7 PRO'
@@ -22985,6 +23414,8 @@ QMobile:
       model: 'Noir A600'
     - regex: 'Z12 PRO'
       model: 'Noir Z12 Pro'
+    - regex: 'QMobile (Z9|J2)'
+      model: 'Noir $1'
     - regex: 'E2 Noir'
       model: 'E2 Noir'
     - regex: 'Hot Pro 2'
@@ -23055,6 +23486,8 @@ QMobile:
       model: 'Q Infinity $1'
     - regex: ' (LT950|J5)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'LINQ (L10|X100)'
+      model: 'Linq $1'
     - regex: 'GLi Lite(?:[);/ ]|$)'
       model: 'GLi Lite'
     - regex: ' GLi(?:[);/ ]|$)'
@@ -23186,15 +23619,24 @@ Volla:
 
 # IPlus (https://iplus-mobile.com)
 I-Plus:
-  regex: '(Nu65)(?:[);/ ]|$)'
+  regex: '(?:Nu65|iPlus P3)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'iPlus P3'
+      model: 'P3'
+    - regex: '(Nu65)'
+      model: '$1'
 
-# Razer
+# Razer (razer.com)
 Razer:
-  regex: 'Phone 2'
+  regex: '(?:Phone 2|Razer Edge 5G)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'Phone 2'
+  models:
+    - regex: 'Razer Edge 5G'
+      device: 'console'
+      model: 'Edge 5G'
+    - regex: 'Phone 2'
+      model: 'Phone 2'
 
 # Sendo
 Sendo:
@@ -23222,19 +23664,25 @@ Ophone:
 
 # Sigma or Sigma Mobile (sigmamobile.net)
 Sigma:
-  regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|X[-_ ]?treme[-_ ]?PQ[0-9]{2}|X-Style_(?:S550[12]|S3502)|Tab A1015)(?:[);/ ]|$)'
+  regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|Tab_A1025_X-treme|X[-_ ]?treme[-_ ]?(?:PQ[0-9]{2}|PQ18_MAX)|X-Style_(?:S550[12]|S3502)|Tab A1015|Tab A802|Tab_A1010_Neo)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2}) Max(?:[);/ ]|$)'
+    - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2})[_ ]Max(?:[);/ ]|$)'
       model: 'X-Treme PQ$1 Max'
     - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2})(?:[);/ ]|$)'
       model: 'X-Treme PQ$1'
     - regex: 'X[_-]Style[ _]?Tab[_ ]A(\d+)(?:[);/ ]|$)'
       model: 'X-Style Tab A$1'
       device: 'tablet'
-    - regex: 'Tab (A1015)(?:[);/ ]|$)'
+    - regex: 'Tab_A1025_X-treme'
+      model: 'X-Treme Tab A1025'
+      device: 'tablet'
+    - regex: 'Tab (A1015|A802)(?:[);/ ]|$)'
       model: 'Tab $1'
       device: 'tablet'
+    - regex: 'Tab_A1010_Neo(?:[);/ ]|$)'
+      model: 'Tab A1010 Neo'
+      device: 'tablet'
     - regex: '(?:Sigma[ _])?X[-_ ]?Style[-_ ]S([0-9]+)(?:[);/ ]|$)'
       model: 'X-Style S$1'
 
@@ -23276,6 +23724,20 @@ SGIN:
   device: 'tablet'
   model: 'X10'
 
+# F+ or F-Plus (fplusmobile.ru)
+F+:
+  regex: '(?:(?:SH6[05]|SA50|SP65)_(?:2[13]|66)\d{3}|H166|P670|(?:SH6[05]|SA55) \dGB/\d{2}GB \d{4}mAh [HG]MS)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'SA55 2GB'
+      model: 'SA55'
+    - regex: 'SH(6[05]) 2GB'
+      model: 'SH$1'
+    - regex: '(H166|P670)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: '(SH6[05]|SA50|SP65)_(?:2[13]|66)\d{3}'
+      model: '$1'
+
 # 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-9]|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)(?:[);/ ]|$)'
@@ -23428,6 +23890,8 @@ Sharp:
       model: 'Aquos R7'
     - regex: '(?:SH-51D)(?:[);/ ]|$)'
       model: 'Aquos R8 Pro'
+    - regex: '(?:SH-52D)(?:[);/ ]|$)'
+      model: 'Aquos R8'
     - regex: 'SHV3[57](?:_u)?(?:[);/ ]|$)'
       model: 'Aquos U'
     - regex: 'TG-L900S(?:[);/ ]|$)'
@@ -23798,11 +24262,13 @@ 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]|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\+)(?:[);/ ]|$)'
+  regex: 'SYMPHONY[ \_]([a-z0-9]+)|(?:(?:roar[ _](?:V20|A50|V78|E80|V150))|innova[123]0|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'
       model: 'ZVIII'
+    - regex: 'innova([123]0)'
+      model: 'Innova $1'
     - regex: 'ZVII'
       model: 'ZVII'
     - regex: 'INOVA'
@@ -23943,7 +24409,7 @@ T-Mobile:
 
 # Teclast (teclast.com)
 Teclast:
-  regex: 'Teclast|P80_G3M2|TLA00[12]|TLA016|X98 Air III|M20_4G|X98 Air II\(HG5N\)|Tbook|X80 Power\(B2N4\)|P80H\(D1C2\)|T20\(T2E1\)|(?:[TM]40 Plus|T30|P80[XH]|P20HD|P10[_ ]HD|M40|P10SE?|M30_Pro|M40SE|P8[05]|P25(?:_T)?|P[23]0S|P[34]0HD)_(?:ROW|EEA|RUS)|P20HD\(N6H5\)|T40 Plus\(M7T3\)|T40Pro|T40 PRO(?:\(T1A1\))?|T10\(E3C[56]\)|P10S\(N4H5\)|98\(M1E[45789]\)|98\(M3E3\)|X10 \(M1D3\)|M89 Pro|M40\(N9H[123]\)|P20HD\(N6H7\)|M40SE\(M5T3\)|M40(?:SE?|Pro|Air)_(?:ROW|EEA|RUS)| P80X|P30Air|P10HD_Lite|(?:T50|M40_Plus|M40 Pro|T50Pro_W|TLG01)_(?:ROW|EEA)|P40HD_T_EEA|T40 Air'
+  regex: 'Teclast|P80_G3M2|TLA00[12]|TLA016|X98 Air III|M20_4G|X98 Air II\(HG5N\)|Tbook|X80 Power\(B2N4\)|P80H\(D1C2\)|T20\(T2E1\)|(?:[TM]40 Plus|T30|P80[XH]|P20HD|P10[_ ]HD|M40|P10SE?|M30_Pro|M40SE|P8[05]|P25(?:_T)?|P85T|P[23]0S|P[34]0HD|T40S)_(?:ROW|EEA|RUS)|P20HD\(N6H5\)|T40 Plus\(M7T3\)|T40Pro|T40 PRO(?:\(T1A1\))?|T10\(E3C[56]\)|P10S\(N4H5\)|98\(M1E[45789]\)|98\(M3E3\)|X10 \(M1D3\)|M89 Pro|M40\(N9H[123]\)|P20HD\(N6H7\)|M40SE\(M5T3\)|M40(?:SE?|Pro|Air)_(?:ROW|EEA|RUS)|P30Air|P10HD_Lite|(?:T50|M40_?Plus|M40 Pro|T50Pro_W|TLG01|P26T|P40S)_(?:ROW|EEA)|M40Plus_EEA|P40HD_T_(?:EEA|ROW)|T40 Air|(?: (?:T4[05]HD|P30T|P80X|M50HD))|(?:Android 13(?:[\d.]*);(?: [\w-]+;)? M50 Pro)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Tbook[_ -]([^;/]+)(?: Build|[;)]|$)'
@@ -23958,7 +24424,7 @@ Teclast:
       model: 'P10S'
     - regex: 'P20HD_?(?:ROW|EEA|RUS)|P20HD\(N6H[57]\)'
       model: 'P20HD'
-    - regex: 'P40HD_?(?:ROW|EEA|RUS|T_EEA)'
+    - regex: 'P40HD'
       model: 'P40HD'
     - regex: 'P10[_ ]HD_(?:ROW|EEA)'
       model: 'Apex P10HD'
@@ -23972,6 +24438,8 @@ Teclast:
       model: 'P85'
     - regex: 'M([43]0)[_ ]?Pro[_ ](?:ROW|EEA|RUS)'
       model: 'M$1 Pro'
+    - regex: 'M50 Pro'
+      model: 'M50 Pro'
     - regex: 'M20_4G'
       model: 'M20 4G'
     - regex: 'M89 Pro'
@@ -23990,7 +24458,7 @@ Teclast:
       model: 'M40 Plus'
     - regex: 'M40S[_ ](?:ROW|EEA|RUS)'
       model: 'M40S'
-    - regex: 'M40 Plus'
+    - regex: 'M40 Plus|M40Plus_'
       model: 'M40 Plus'
     - regex: 'T40 ?PRO'
       model: 'T40 Pro'
@@ -24000,11 +24468,15 @@ Teclast:
       model: 'T40'
     - regex: 'T40 Plus(?:_(?:ROW|EEA)|\(M7T3\))'
       model: 'T40 Plus'
+    - regex: 'T(4[05])HD'
+      model: 'T$1HD'
+    - regex: 'M(50)HD'
+      model: 'M$1HD'
     - regex: 'T50Pro_W'
       model: 'T50 Pro'
     - regex: 'P80H\(D1C2\)'
       model: 'P80h'
-    - regex: '(P80[Xh]|P30HD|T30|M40|P25(?:_T)?|P10SE|P20S|T50|TLG01)[_ ](?:ROW|EEA)'
+    - regex: '(P80[Xh]|P30HD|T30|M40|P25(?:_T)?|P10SE|T40S|P[24]0S|T50|TLG01|P26T|P85T|P30T)(?:[_ ](?:ROW|EEA))?(?:[);/ ]|$)'
       model: '$1'
     - regex: 'P80X'
       model: 'P80X'
@@ -24144,7 +24616,7 @@ Tecno Mobile:
       model: 'Camon 18P'
     - regex: 'Tecno[ _-](?:CH6i|CI6n?)(?:[);/ ]|$)'
       model: 'Camon 19'
-    - regex: 'Tecno[ _-]CI8n?(?:[);/ ]|$)'
+    - regex: 'Tecno[ _-](?:Mobile )?CI8n?(?:[);/ ]|$)'
       model: 'Camon 19 Pro'
     - regex: 'Tecno[ _-]CI7n(?:[);/ ]|$)'
       model: 'Camon 19 Pro 5G'
@@ -24156,6 +24628,10 @@ Tecno Mobile:
       model: 'Camon 20 Pro 5G'
     - regex: 'Tecno[ _-]CK9n(?:[);/ ]|$)'
       model: 'Camon 20 Premier 5G'
+    - regex: 'Tecno[ _-]CL6[ks]?(?:[);/ ]|$)'
+      model: 'Camon 30'
+    - regex: 'Tecno[ _-]CL9(?:[);/ ]|$)'
+      model: 'Camon 30 Premier 5G'
     - regex: 'Tecno[ _-]CA6S?(?:[);/ ]|$)'
       model: 'Camon CM'
     - regex: 'Tecno[ _-]CA7(?:[);/ ]|$)'
@@ -24385,6 +24861,12 @@ Tecno Mobile:
     - regex: 'TECNO[ _](?:Mobile )?LI9(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Pova 6 Pro 5G'
+    - regex: 'TECNO[ _](?:Mobile )?LI7(?:[);/ ]|$)'
+      device: 'phablet'
+      model: 'Pova 6'
+    - regex: 'TECNO[ _](?:Mobile )?LI6(?:[);/ ]|$)'
+      device: 'phablet'
+      model: 'Pova 6 Neo'
     - regex: 'Tecno (F2) ?LTE'
       model: '$1 LTE'
     - regex: '(?:TECNO[-_])?L8Plus'
@@ -24608,11 +25090,11 @@ teXet:
 
 # Telefunken
 Telefunken:
-  regex: 'TELEFUNKEN|Foxtrot|TEL-1013GIQA|TEL-1014GIQ|TEL-73GIQA|TEL-74GIQ|TF-SP(?:500[12]|4002)|(TF-MID(?:[78]02G|70[78]G|80[46]G|9705RG|9707G|7805G|100[57]G|1010G))| TF5X| TF6|TF500|TF501_EC|(TF-LED(?:50S04T2SU|50S25T2SU|58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU))|LTE_LIMA|LTE Mike|Diamond_LTE|Outdoor (?:LTE|WT4|WT4-S)|TELP-1013KBC'
+  regex: 'TELEFUNKEN|Foxtrot|TEL-1013GIQA|TEL-1014GIQ|TEL-73GIQA|TEL-74GIQ|TF-SP(?:500[12]|4002)|(TF-MID(?:[78]02G|70[78]G|80[46]G|9705RG|9707G|7805G|100[57]G|1010G))| TF5X| TF6|TF500|TF501_EC|(TF-LED(?:32S14T2S|43S9[57]T2SU|50S0[34]T2SU|50S25T2SU|55S11T2SU|58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU)(?:-1)?)|LTE_LIMA|LTE Mike|Diamond_LTE|Outdoor (?:LTE|WT4|WT4-S)|TELP-1013KBC'
   device: 'tablet'
   models:
     - regex: 'TEL-1013GIQA'
-      model: 'Giqa 10.1 3G'
+      model: 'Giqa 10.1" 3G'
     - regex: 'TEL-(1014GIQ|74GIQ|73GIQA(?:11)?)'
       model: 'TEL-$1'
     - regex: 'Foxtrot2'
@@ -24632,7 +25114,7 @@ Telefunken:
       device: 'smartphone'
     - regex: '(TF-MID(?:[78]02G|70[78]G|80[46]G|9705RG|9707G|7805G|100[57]G|1010G)|TF501_EC|TELP-1013KBC)'
       model: '$1'
-    - regex: '(TF-LED(?:50S04T2SU|50S25T2SU|58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU)|TF500)'
+    - regex: '(TF-LED(?:\d{2}S\d{2}T2SU?)|TF500)'
       model: '$1'
       device: 'tv'
     - regex: 'TELEFUNKEN, ([a-z0-9_ \-]+), (?:wired|wireless)'
@@ -24934,7 +25416,7 @@ UTStarcom:
 
 # Ulefone (ulefone.com or ulefone.ru)
 Ulefone:
-  regex: 'Ulefone|Gemini Pro|Power Armor14|Power 3S|Power_[356]|Power_5S|S(?:10|9)_Pro|(?:Note [89]P|Note 1[23]P|Armor(?:[ _](?:[2367]|2S|X[236]|6[SE]|3WT|3W|X))?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?|Note 14|Note (?:11P|7T)|Note 16 Pro|Tiger_lite|Note_7P|Note 10P|Paris_(?:Lite|X)|Paris|P6000_Plus|Vienna|Android 11;(?: [\w-]+;)? Note 6P?)(?:[);/ ]|$)'
+  regex: 'Ulefone|Gemini Pro|Power[ _]Armor14|Power 3S|Power_[356]|Power_5S|S(?:10|9)_Pro|(?:Note [89]P|Note 1[23]P|Armor(?:[ _](?:[2367]|2S|X[236]|6[SE]|3WT|3W|X))?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?|Note 14|Note (?:11P|7T)|Note 16 Pro|Tiger_lite|Note_7P|Note 10P|Paris_(?:Lite|X)|Paris|P6000_Plus|Vienna|Android 11(?:[\d.]*);(?: [\w-]+;)? Note 6P?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S(10|9)_Pro'
@@ -24963,11 +25445,11 @@ Ulefone:
       model: 'Paris'
     - regex: 'Tiger_lite'
       model: 'Tiger Lite'
-    - regex: 'Power Armor ?(\d+) Pro'
+    - regex: 'Power[ _]Armor[ _]?(\d+)[ _]Pro'
       model: 'Power Armor $1 Pro'
     - regex: 'Power Armor X11 Pro'
       model: 'Power Armor X11 Pro'
-    - regex: 'Power Armor (\d+|19T|X11|18T)(?:[);/ ]|$)'
+    - regex: 'Power Armor (\d+|19T|X11|18T|16S)(?:[);/ ]|$)'
       model: 'Power Armor $1'
     - regex: 'Armor[ _]6S(?:[);/ ]|$)'
       model: 'Armor 6S'
@@ -25021,7 +25503,7 @@ Ulefone:
 
 # UMIDIGI or UMI (www.umidigi.com)
 UMIDIGI:
-  regex: 'UMI(?:DIGI)?[ _]|(?:A[5]_Pro|.+; A[79] Pro|S3_Pro|ROME[_ ]X|BISON|hammer_S|S2 LITE|London|Z2_PRO|C NOTE 2|A11 Pro Max|Power 3|Android 10;(?: [\w-]+;)? (?:A3[SX]|A7S(?! 2020))|RP0[1234]|MT01|MP0[1-68]|MP1[78]|Plus E|S2_PRO|RP05|One Pro|Diamond_X|TG3DBG1MA|Android [67](?:[\d.]*);(?: [\w-]+;)? Z Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? A1_PRO|RP08|MP33)(?:[;/) ]|$)'
+  regex: 'UMI(?:DIGI)?[ _]|(?:A[5]_Pro|.+; A[79] Pro|S3_Pro|ROME[_ ]X|BISON|hammer_S|S2 LITE|London|Z2_PRO|C NOTE 2|A11 Pro Max|Power 3|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:A3[SX]|A7S(?! 2020))|RP0[1234]|MT01|MP0[1-9]|MP1[78]|MP27|MP34|Plus E|S2_PRO|RP05|One Pro|Diamond_X|TG3DBG1MA|Android [67](?:[\d.]*);(?: [\w-]+;)? Z Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? A1_PRO|RP08|MP29|MP33)(?:[;/) ]|$)'
   device: 'smartphone'
   models:
     - regex: 'MT01(?:[;/) ]|$)'
@@ -25037,6 +25519,12 @@ UMIDIGI:
       model: 'A11 Pro Max'
     - regex: 'MP17'
       model: 'C1 Max'
+    - regex: 'MP29'
+      model: 'C1 Plus'
+    - regex: 'MP07'
+      model: 'C1'
+    - regex: 'MP09'
+      model: 'F3'
     - regex: 'MP18'
       model: 'G1 Max'
     - regex: 'MP01(?:[;/) ]|$)'
@@ -25045,8 +25533,12 @@ UMIDIGI:
       model: 'A13S'
     - regex: 'MP33(?:[;/) ]|$)'
       model: 'A15'
+    - regex: 'MP34(?:[;/) ]|$)'
+      model: 'A15C'
     - regex: 'RP08(?:[;/) ]|$)'
       model: 'G5 Mecha'
+    - regex: 'MP27(?:[;/) ]|$)'
+      model: 'G5'
     - regex: 'UMI TOUCH X'
       model: 'Touch X'
     - regex: 'UMI TOUCH'
@@ -25863,7 +26355,7 @@ Ober:
 
 # Walton (waltonbd.com)
 Walton:
-  regex: 'Walton|Walpad|RX7 Mini|Primo[ _](C[1234]?|D[1-689]|E[1-589]|F8s|EF[23]?|EM|F[1-79]i?|G[1-9]|GF[234]?|GH[23]?|GM|H[2-689M]|H10|H7s|N[F1]?|NX2?|R[1-68]|R[HM]2?|RX[23]?|S[1-8]|V1|X[1-4]|Z|[ZV]X)|Orbit Y(?:21|50)|XANON X20'
+  regex: 'Walton|Walpad|RX7 Mini|Primo[ _](C[1234]?|D[1-689]|E[1-589]|F8s|EF[23]?|EM|F[1-79]i?|G[1-9]|GF[234]?|GH[23]?|GM|H[2-689M]|H10|H7s|N[F1]?|NX2?|R[1-68]|R[HM]2?|RX[23]?|S[1-8]|V1|X[1-4]|Z|[ZV]X)|Orbit Y(?:21|[57]0)|XANON X20|NEXG N(?:7[01]|6)'
   device: 'smartphone'
   models:
     - regex: 'Walpad[ _]([^;/)]+)(?: Build|[);])'
@@ -25885,6 +26377,8 @@ Walton:
       model: 'Orbit Y$1'
     - regex: 'XANON X20'
       model: 'Xanon X20'
+    - regex: 'NEXG N(7[01]|6)'
+      model: 'Nexg N$1'
 
     # general detections
     - regex: 'Primo[ _]([^;/)]+)[ _]Plus(?: Build|[;)])'
@@ -26245,16 +26739,16 @@ Wileyfox:
       model: 'Pro'
     - regex: 'Wileyfox Spark X'
       model: 'Spark X'
-    - regex: 'Wileyfox (Spark|Swift)'
-      model: '$1'
-    - regex: 'Wileyfox ([^/)]+)(?: Build|\))'
-      model: '$1'
     - regex: 'Swift 2 (X|Plus)(?:[);/ ]|$)'
       model: 'Swift 2 $1'
     - regex: 'Swift 2(?:[);/ ]|$)'
       model: 'Swift 2'
     - regex: 'crackling'
       model: 'Swift'
+    - regex: 'Wileyfox (Spark|Swift)'
+      model: '$1'
+    - regex: 'Wileyfox ([^/)]+)(?: Build|[);])'
+      model: '$1'
 
 # Wolder
 Wolder:
@@ -26361,7 +26855,7 @@ X-View:
 
 # POCO (sub brand Xiaomi)
 POCO:
-  regex: '(?:POCO[ _](?:X[2-6](?:_SN)?|F2 PRO|M[32456]|M5s|F[35]|F4(?: GT)?|C40|C3|C51|C65)|M2010J19(?:C[GI]|GC)|M2007J20C[ITG]|M2012K11AG|M2006C3MI|M2004J19PI|M2102J20S[GI]|M2103K19P[IGY]|21091116AG|21061110AG|M2104K10I|211033MI|220111[67]P[GI]|camellian?|21121210G|2203(?:1116AI|33QPG)|22021211R[GI]|2204121(?:6U?G|9P[GI])|2207(?:1219C[GI]|33SP[IH]|117BPG)|22101320[GI]|22111317P[GI]|23013PC75G|2302EPCC4I|23049PCD8[GI]|2305EPCC4G|22127PC95I|2310FPCA4[GI]|MZB0E6DIN|23076PC4BI|2312(?:FPCA6G|2PCD1[GI]|8PC33I)|2311DRK48[GI])(?:[);/ ]|$)'
+  regex: '(?:POCO[ _](?:X[2-6](?:_SN)?|F2 PRO|M[32456]|M5s|F[35]|F4(?: GT)?|C40|C3|C51|C65)|M2010J19(?:C[GI]|GC)|M2007J20C[ITG]|M2012K11AG|M2006C3MI|M2004J19PI|M2102J20S[GI]|M2103K19P[IGY]|21091116AG|21061110AG|M2104K10I|211033MI|220111[67]P[GI]|camellian?|21121210G|2203(?:1116AI|33QPG)|22021211R[GI]|2204121(?:6U?G|9P[GI])|2207(?:1219C[GI]|33SP[IH]|117BPG)|22101320[GI]|22111317P[GI]|23013PC75G|2302EPCC4I|23049PCD8[GI]|2305EPCC4G|2312BPC51H|22127PC95I|2310FPCA4[GI]|MZB0E6DIN|23076PC4BI|2312(?:FPCA6G|2PCD1[GI]|8PC33I)|2311DRK48[GI])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'POCO X2(?:[);/ ]|$)'
@@ -26410,12 +26904,12 @@ POCO:
       model: 'X3 GT'
     - regex: '(?:M2007J20CI|POCO X3(?:_SN)?)(?:[);/ ]|$)'
       model: 'X3'
-    - regex: '(?:22041216G|POCO X4 GT)(?:[);/ ]|$)'
-      model: 'X4 GT'
     - regex: '(?:22111317P[GI]|POCO X5 5G)(?:[);/ ]|$)'
       model: 'X5 5G'
-    - regex: '(?:22041216UG)(?:[);/ ]|$)'
+    - regex: '(?:22041216UG|POCO X4 GT Pro)(?:[);/ ]|$)'
       model: 'X4 GT Pro'
+    - regex: '(?:22041216G|POCO X4 GT)(?:[);/ ]|$)'
+      model: 'X4 GT'
     - regex: '(?:22101320[GI]|POCO X5 Pro 5G)(?:[);/ ]|$)'
       model: 'X5 Pro 5G'
     - regex: '2201116P[GI]|POCO X4 Pro 5G'
@@ -26438,6 +26932,8 @@ POCO:
       model: 'C50'
     - regex: '22127PC95I'
       model: 'C55'
+    - regex: '2312BPC51H'
+      model: 'C61'
     - regex: '2310FPCA4[GI]|POCO C65'
       model: 'C65'
     - regex: 'POCO F2 PRO(?:[);/ ]|$)'
@@ -26503,9 +26999,19 @@ Zopo:
     - regex: '(?:ZOPO_)?(Flash X3|X1i|ZP[0-9]{2,}[^/;)]+)(?: Build|\))'
       model: '$1'
 
+# QIN or QIN(cn) (sub brand Xiaomi) (qinphone.com)
+QIN:
+  regex: '(?:Android 12(?:[\d.]*);(?: [\w-]+;)? F22 ?Pro|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? (?:F22|F21 Pro))(?: Build|[;)]))'
+  device: 'smartphone'
+  models:
+    - regex: 'F(\d+) ?Pro(?:[);/ ]|$)'
+      model: 'F$1 Pro'
+    - regex: 'F(22)(?:[);/ ]|$)'
+      model: 'F$1'
+
 # Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)| ONC(?: Build|[;)])|MiTV-\w|MiProjA1|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo|AFTBTX4)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?KTUS-[AH]0|(?:SHARK )?(KLE|KSR|MBU|PAR)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002(?:J9[SEG]|F4LG)|HM2014819|WT88047|210611(?:8C|19(?:BI|[AD]G|AL))|M2001(?:J[12]G|C3K3I)|M2004J1(?:5SC|9AG)|M2004J(?:7[AB]|19)[CG]|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J(?:15SC|15SS|6B2G|6A1G)|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG0[124]|2107119DC|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G)|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i|U[GI])|220111(?:7T[LGIY]|19TI|19UY|6S[IRC]|6TG|[67]SG|7SL)|21121(?:119S[CG]|23A[CG]|119VL|210C)|2204121(?:6[CI]|6UC|9[CGI]|9NY|1AC)|220333Q(?:AG|NY|L|BI)|2107113S[IGR]|22031(?:29G|116BG|21C)|PAR-H0|M2105K81A?C|2109119BC|2202(?:1119KR|1211RC|33L2[CGI])|22011(?:2[23][CG]|211C|16TI|17S[YI])|joyeuse|galahad|hydrogen|begonia|kenzo|willow|beryllium|rosemary| MDG1|KLE-AO|Mi ?Pad \d|220612(?:18C|[23]SC)|2207(?:12(?:2MC|12AG|19AI)|33S(?:F?G|[ILH])|43FI)|2208(?:7RA4DI|1212(?:U?G|C)|128(?:1AC|3[GC]))|Black Shark|MZB82(?:98|57)IN|2210(?:1317C|1320C|1316(?:U[PG]|UCP?|[CIG])|1(?:29SG|32[CG]))|2211(?:13(?:3[CG]|17I)|1317G)|23013RK75C|2305(?:3RN02[AYLI]|4RA19C)|2209(?:5RA98C|116AG|129SC)|2212(?:0RN86[GI]|6RN91Y|ARNC4L|2RK93C|7RK46C)|2302(?:6RN54G|1RAA(?:EG|2Y)|7RAD4I|8R(?:N4D[GI]|A60L|NCA[GI]))|angelican|vnd_camellia|2304(?:9RAD8C|FPN6D[GC]|6RP50C|3RP34[CGI]|6PNC9C)|2303(?:0RAC7Y|CRA44A|ERA42L)|M1906G7G|Hongmi 4A|M1912G7BC|2307(?:7RABDC|6RN4BI|6RN8DY|8PND5G|8RKD5C|6RA4BC|3RPBF[GCL]|BRPDCC)|2310(?:6RN0DA|8RN04Y)|2312(?:DRA50G|9RAA4G|9RA5FL|9RN51X|CRAD3C|DRAAB[CGI]|7PN0C[CG]|DRA50[CI]|4RA7EO|4RN87I)|2311(?:6PN5BC|7RA68G|DRN14I|7RK66C|FRAFDC|DRK48C|3RKC6C)|2308CPXD0C|2306EPN60G|23090(?:RA98[CGI])|23100RN82L|2403(?:1PN0DC|0PN60G)|QIN3ULTRA'
+  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)| ONC(?: Build|[;)])|MiTV-\w|Mi9 ?(?:Lite|SE)|MiProj(?:A1|M05)|Mi9 Pro 5G|(?:Mi5X|MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo|AFTBTX4)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?KTUS-[AH]0|(?:SHARK )?(KLE|KSR|MBU|PAR)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002(?:J9[SEG]|F4LG)|HM2014819|WT88047|210611(?:8C|19(?:BI|[AD]G|AL))|M2001(?:J[12]G|C3K3I)|M2004J1(?:5SC|9AG)|M2004J(?:7[AB]|19)[CG]|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J(?:15SC|15SS|6B2G|6A1G)|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG0[1234]|2107119DC|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G)|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i|U[GI])|220111(?:7T[LGIY]|19TI|19UY|6S[IRC]|6TG|[67]SG|7SL)|21121(?:119S[CG]|23A[CG]|119VL|210C)|2204121(?:6[CI]|6UC|9[CGI]|9NY|1AC)|220333Q(?:AG|NY|L|BI)|2107113S[IGR]|22031(?:29G|116BG|21C)|PAR-H0|M2105K81A?C|2109119BC|2202(?:1119KR|1211RC|33L2[CGI])|22011(?:2[23][CG]|211C|16TI|17S[YI])|joyeuse|galahad|hydrogen|begonia|kenzo|willow|beryllium|rosemary| MDG1|KLE-AO|Mi ?Pad ?\d|220612(?:18C|[23]SC)|2207(?:12(?:2MC|12AG|19AI)|33S(?:F?G|[ILH])|43FI)|2208(?:7RA4DI|1212(?:U?G|C)|128(?:1AC|3[GC]))|Black Shark|MZB82(?:98|57)IN|2210(?:1317C|1320C|1316(?:U[PG]|UCP?|[CIG])|1(?:29SG|32[CG]))|2211(?:13(?:3[CG]|17I)|1317G)|23013RK75C|2305(?:3RN02[AYLI]|4RA19C)|2209(?:5RA98C|116AG|129SC)|2212(?:0RN86[GI]|6RN91Y|ARNC4L|2RK93C|7RK46C)|2302(?:6RN54G|1RAA(?:EG|2Y)|7RAD4I|8R(?:N4D[GI]|A60L|NCA[GI]))|angelican|vnd_camellia|2304(?:9RAD8C|FPN6D[GC]|6RP50C|3RP34[CGI]|6PNC9C)|2303(?:0RAC7Y|CRA44A|ERA42L)|M1906G7G|Hongmi 4A|M1912G7BC|2307(?:7RABDC|6RN4BI|6RN8DY|8PND5G|8RKD5C|6RA4BC|3RPBF[GCL]|BRPDCC)|2310(?:6RN0DA|8RN04Y)|2312(?:DRA50G|9RAA4G|9RA5FL|9RN51[HX]|CRAD3C|DRAAB[CGI]|7PN0C[CG]|DRA50[CI]|4RA7EO|4RN87I)|2311(?:6PN5BC|7RA68G|DRN14I|7RK66C|FRAFDC|DRK48C|3RKC6C)|2308CPXD0C|24018RPAC[CG]|24053PY09C|2306EPN60G|23090(?:RA98[CGI])|23100RN82L|2403(?:1PN0DC|0PN60G)|QIN3ULTRA|FengMiProjA2'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -26551,8 +27057,10 @@ Xiaomi:
       model: 'Hongmi 4A'
     - regex: 'MI[_ ]PLAY(?:[);/ ]|$)'
       model: 'Mi Play'
-    - regex: 'Mi 9 SE(?:[);/ ]|$)'
+    - regex: 'Mi ?9 ?SE(?:[);/ ]|$)'
       model: 'Mi 9 SE'
+    - regex: 'Mi ?9 Lite(?:[);/ ]|$)'
+      model: 'Mi 9 Lite'
     - regex: '(?:Xiaomi_)?M1902F1[GT]'
       model: 'Mi 9'
     - regex: 'MI CC 9e|MI CC9e'
@@ -26641,7 +27149,7 @@ Xiaomi:
       model: '13T'
     - regex: '23127PN0C[CG](?:[);/ ]|$)'
       model: '14'
-    - regex: '(?:24031PN0DC|24030PN60G)(?:[);/ ]|$)'
+    - regex: '(?:24031PN0DC|24030PN60G|Xiaomi 14 Ultra)(?:[);/ ]|$)'
       model: '14 Ultra'
     - regex: '(?:23116PN5BC|Xiaomi 14 Pro)(?:[);/ ]|$)'
       model: '14 Pro'
@@ -26661,7 +27169,7 @@ Xiaomi:
       model: 'Mi $1 Lite'
     - regex: 'MI 5s Plus(?:[);/ ]|$)'
       model: 'Mi 5s Plus'
-    - regex: 'Xiaomi_MDT2'
+    - regex: 'Xiaomi_MDT2|Mi5X(?:[);/ ]|$)'
       model: 'Mi 5X'
     - regex: 'Xiaomi_2013061|2013061 Build'
       model: 'Mi 3'
@@ -26673,6 +27181,8 @@ Xiaomi:
       model: 'Mi 4i'
     - regex: 'MI 4 ?LTE(?:[);/ ]|$)'
       model: 'Mi 4 LTE'
+    - regex: 'Mi Max3Pro'
+      model: 'Mi Max 3 Pro'
     - regex: 'MI MAX ([23])(?:[);/ ]|$)'
       model: 'Mi Max $1'
     - regex: '(?:MI MAX|hydrogen)(?:[);/ ]|$)'
@@ -26767,7 +27277,7 @@ Xiaomi:
       model: 'Redmi 12C'
     - regex: '23053RN02[AYLI]'
       model: 'Redmi 12'
-    - regex: '(?:23076RN8DY|23076RN4BI|23077RABDC)(?:[);/ ]|$)'
+    - regex: '(?:23076RN8DY|23076RN4BI|23077RABDC|XIG03|Redmi 12 5G)(?:[);/ ]|$)'
       model: 'Redmi 12 5G'
     - regex: '23100RN82L(?:[);/ ]|$)'
       model: 'Redmi 13C'
@@ -26805,17 +27315,21 @@ Xiaomi:
       model: 'Redmi K30 Ultra'
     - regex: '22041211AC'
       model: 'Redmi K50'
+    - regex: 'Redmi K50 Mercedes-AMG F1 Team'
+      model: 'Redmi K50 Mercedes-AMG F1 Team'
     - regex: '22041216I'
       model: 'Redmi K50i'
     - regex: '21121210C'
       model: 'Redmi K50G'
-    - regex: '22011211C'
+    - regex: '22011211C|Redmi K50 Pro'
       model: 'Redmi K50 Pro'
+    - regex: 'Redmi K50 Ultra'
+      model: 'Redmi K50 Ultra'
     - regex: '23013RK75C'
       model: 'Redmi K60'
     - regex: '22122RK93C'
       model: 'Redmi K60E'
-    - regex: '22127RK46C'
+    - regex: '22127RK46C|Redmi K60 Pro'
       model: 'Redmi K60 Pro'
     - regex: '23078RKD5C'
       model: 'Redmi K60 Ultra'
@@ -26861,6 +27375,8 @@ Xiaomi:
       model: 'Civi 2'
     - regex: '23046PNC9C(?:[);/ ]|$)'
       model: 'Civi 3'
+    - regex: '24053PY09C(?:[);/ ]|$)'
+      model: 'Civi 4'
     - regex: 'Civi 1S(?:[);/ ]|$)'
       model: 'Civi 1S'
 
@@ -26874,19 +27390,25 @@ Xiaomi:
     - regex: 'M2105K81C(?:[);/ ]|$)'
       model: 'Mi Pad 5 Pro 5G'
       device: 'tablet'
-    - regex: '23046RP50C(?:[);/ ]|$)'
+    - regex: '(?:23046RP50C|Pad 6 Pro)(?:[);/ ]|$)'
       model: 'Pad 6 Pro'
       device: 'tablet'
-    - regex: '23043RP34[CGI](?:[);/ ]|$)'
+    - regex: '23043RP34[CGI]|Xiaomi Pad 6(?: Build|[;)])'
       model: 'Pad 6'
       device: 'tablet'
     - regex: '2307BRPDCC(?:[);/ ]|$)'
       model: 'Pad 6 Max 14'
       device: 'tablet'
+    - regex: '(?:24018RPAC[CG]|Xiaomi Pad 6S Pro 12\.4)(?:[);/ ]|$)'
+      model: 'Pad 6S Pro 12.4"'
+      device: 'tablet'
 
-    - regex: 'MI PAD ?4 ?PLUS(?:[);/ ]|$)'
+    - regex: 'MI (?:PAD ?4 ?PLUS|Pad4\+)(?:[);/ ]|$)'
       model: 'Mi Pad 4 Plus'
       device: 'tablet'
+    - regex: 'MI PAD4 Wi-?Fi(?:[);/ ]|$)'
+      model: 'Mi Pad 4 WiFi'
+      device: 'tablet'
     - regex: 'MI PAD 4(?:[);/ ]|$)'
       model: 'Mi Pad 4'
       device: 'tablet'
@@ -26902,15 +27424,22 @@ Xiaomi:
     - regex: '22081283[GC](?:[);/ ]|$)'
       model: 'Redmi Pad'
       device: 'tablet'
-    - regex: '23073RPBF[GCL](?:[);/ ]|$)'
+    - regex: '(?:23073RPBF[GCL]|Redmi Pad SE)(?:[);/ ]|$)'
       model: 'Redmi Pad SE'
       device: 'tablet'
 
     - regex: 'MiProjA1'
       model: 'Mi Laser Projector 150"'
       device: 'peripheral'
+    - regex: 'MiProjM05'
+      model: 'Mi Smart Compact Projector'
+      device: 'peripheral'
 
       # specific tv models
+    - regex: 'FengMiProjA2(?:[);/ ]|$)'
+      model: 'FengMi Projector A2'
+      device: 'tv'
+
     - regex: 'MIBOX3[ _]Pro(?:[);/ ]|$)'
       model: 'Mi Box 3 Pro'
       device: 'tv'
@@ -27092,7 +27621,7 @@ Xiaomi:
     - regex: '(?:2311FRAFDC)(?:[);/ ]|$)'
       model: 'Redmi Note 13R Pro'
       device: 'phablet'
-    - regex: '(?:2312DRA50[GI])(?:[);/ ]|$)'
+    - regex: '(?:2312DRA50[GI]|Redmi Note 13 Pro 5G)(?:[);/ ]|$)'
       model: 'Redmi Note 13 Pro 5G'
       device: 'phablet'
     - regex: '2312(?:4RA7EO|9RAA4G|9RA5FL)(?:[);/ ]|$)'
@@ -27101,10 +27630,10 @@ Xiaomi:
     - regex: '(?:23090RA98C)(?:[);/ ]|$)'
       model: 'Redmi Note 13 Pro+'
       device: 'phablet'
-    - regex: '(?:23090RA98[GI])(?:[);/ ]|$)'
+    - regex: '(?:23090RA98[GI]|Redmi Note 13 Pro\+ 5G)(?:[);/ ]|$)'
       model: 'Redmi Note 13 Pro+ 5G'
       device: 'phablet'
-    - regex: '(?:2312DRAAB[CGI])(?:[);/ ]|$)'
+    - regex: '(?:2312DRAAB[CGI]|Redmi Note 13 5G)(?:[);/ ]|$)'
       model: 'Redmi Note 13 5G'
       device: 'phablet'
     - regex: '(?:2201116SC|Redmi Note 11E Pro)(?:[);/ ]|$)'
@@ -27795,7 +28324,7 @@ Fly:
     - regex: 'FS528'
       model: 'Memory Plus'
     - regex: 'FS529'
-      model: 'Сhamp'
+      model: 'Champ'
     - regex: 'FS530'
       model: 'Power Plus XXL'
     - regex: 'FS454'
@@ -28160,10 +28689,12 @@ Rakuten:
 
 # ZTE
 ZTE:
-  regex: 'ZTE(?!; MegaFon)|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade[ _](?:E01|V0820|L110|L[2357]|L210(?:RU)?|L7A|L8|S6|V[6789]|V8Q|V8 SE|V9 VITA|X7|A(310?|320|460|465|475|510|520|530|602|51|30|3)|V580|V Ultra|Q Lux)|N9[15]8St|N818S|N951[0579]|N91[38]0|N9101|N913[267]|N952[01]|N9560|N9810|N799D|[UV]9180|[UV]9815|Z(?:5151V|610DL|6250CC|6400C|6410S|233V|331|5031O|559DL|6621O|667T|6750M|768G|792|81[25]|818L|82[08]|83[12359]|85[125]|851M|992|(557|71[67]|798|836|861|916)BL|986DL|(232|718|828)TL|(?:233|353|558|717|799|837|862|899|917|963)VL|955A|95[678]|965|97[018]|98[1237]|986U|999|936L)|V769M|Blade Apex2|G (LTE|Lux)|Vec|Z959|V865M|Z3001S|902ZT|KIS II Max|Kis 3|K3DX-V5G|Z930L|Optus X|Blade[ _](A[357] 2019(?:-T)?|A[35] 2020-T|A7S 2020-T|A6 MAX|A0622|X9)|Z3153V|Z836F|Ctyon-A9|602ZT|MO-01[JK]|Z963U|402ZT|P545|P609|P650 Pro|dandelion|901ZT|A00[13]ZT|Z-01K|UZTE (?:GRAND V7|V808)|ZTG01|K8[37]CA|K87CC|VERGATARIO ?5(?:PLUS)?|Axon mini|KIS C341|A103ZT|Z335(?:1S|[23]CA)|Z5156CC|Z5157[VY]|B867RE|MEO Smart A[48]0|SmartA35|P65[10] 2021|Z6201V|Z6252CA|Z6251V?|A2020N3|A202ZT|Z719DL|Z5158|B2017G)(?:[);/ ]|$)'
+  regex: 'ZTE(?!; MegaFon)|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade[ _](?:E01|V0820|L110|L[2357]|L210(?:RU)?|L7A|L8|S6|V[6789]|V8Q|V8 SE|V9 VITA|X7|A(310?|320|460|465|475|510|520|530|602|51|30|3)|V580|V Ultra|Q Lux)|N9[15]8St|N818S|N951[0579]|N91[38]0|N9101|N913[267]|N952[01]|N9560|N9810|N799D|[UV]9180|[UV]9815|Z(?:5151V|610DL|6250CC|6400C|6410S|233V|331|5031O|559DL|6621O|667T|6750M|768G|792|81[25]|818L|82[08]|83[12359]|85[125]|851M|992|(557|71[67]|798|836|861|916)BL|986DL|(232|718|828)TL|(?:233|353|558|717|799|837|862|899|917|963)VL|955A|95[678]|965|97[018]|98[1237]|986U|999|936L)|V769M|Blade Apex2|G (LTE|Lux)|Vec|Z959|V865M|Z3001S|902ZT|KIS II Max|Kis 3|K3DX-V5G|Z930L|Optus X|Blade[ _](A[357] 2019(?:-T)?|A[35] 2020-T|A7S 2020-T|A6 MAX|A0622|X9)|Z3153V|Z836F|Ctyon-A9|602ZT|MO-01[JK]|Z963U|402ZT|P545|P609|P650 Pro|dandelion|901ZT|A00[13]ZT|Z-01K|UZTE (?:GRAND V7|V808)|ZTG01|K8[37]CA|K87CC|VERGATARIO ?5(?:PLUS)?|Axon mini|KIS C341|A103ZT|Z335(?:1S|[23]CA)|Z5156CC|Z5157[VY]|B867RE|MEO Smart A[48]0|SmartA35|P65[10] 2021|Z6201V|Z6252CA|Z6251V?|A2020N3|A202ZT|Z719DL|Z5158|B2017G|5G UG Phone U23|ATLAS[ _]W)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
+    - regex: '5G UG Phone U23|ZTE 7160N'
+      model: '5G UG Phone U23'
     - regex: 'P651 2021(?:[);/ ]|$)'
       model: 'Optus X (2021)'
     - regex: 'P650 2021(?:[);/ ]|$)'
@@ -28172,6 +28703,8 @@ ZTE:
       model: 'Voyage 10'
     - regex: '9040N(?:[);/ ]|$)'
       model: 'Voyage 20 Pro'
+    - regex: '7531N(?:[);/ ]|$)'
+      model: 'Voyage 30S'
     - regex: 'A2122H(?:[);/ ]|$)'
       model: 'S30 Pro 5G'
     - regex: '602ZT(?:[);/ ]|$)'
@@ -28206,6 +28739,8 @@ ZTE:
       model: 'Blade A7p (2020)'
     - regex: 'A7030|A71 5G'
       model: 'Blade A71'
+    - regex: 'ZTE 7060'
+      model: 'Blade A73'
     - regex: 'N939Sc'
       model: 'Blade A711'
     - regex: 'Z5157[VY]'
@@ -28410,6 +28945,8 @@ ZTE:
       model: 'Blade A1'
     - regex: 'Blade A([35]1?) Lite'
       model: 'Blade A$1 Lite'
+    - regex: 'Blade A(53) Pro'
+      model: 'Blade A$1 Pro'
     - regex: 'Blade (S6|A[35]1?) Plus'
       model: 'Blade $1 Plus'
     - regex: '(?:ZTE[ _])?BLADE[ _]A062[02](?:[);/ ]|$)'
@@ -28446,6 +28983,10 @@ ZTE:
       model: 'Blade V$1'
     - regex: '9050N(?:[);/ ]|$)'
       model: 'Blade V50'
+    - regex: 'ZTE 8050(?:[);/ ]|$)'
+      model: 'Blade V50 Design'
+    - regex: 'ZTE 8150N(?:[);/ ]|$)'
+      model: 'Blade V50 Design 5G'
     - regex: 'ZTE 8550(?:[);/ ]|$)'
       model: 'Blade V50 Vita'
     - regex: 'BV0800(?:[);/ ]|$)'
@@ -28664,6 +29205,8 @@ ZTE:
       model: 'MEO Smart A$1'
     - regex: 'Smart ?A(35)'
       model: 'MEO Smart A$1'
+    - regex: 'ATLAS[ _]W'
+      model: 'Atlas W'
 
     - regex: 'A2121[LE]?(?:[);/ ]|$)'
       device: 'phablet'
@@ -28708,6 +29251,10 @@ ZTE:
       model: 'Blade $1'
     - regex: 'ZTE Blade A52'
       model: 'Blade A52'
+    - regex: 'ZTE Blade A53\+'
+      model: 'Blade A53+'
+    - regex: 'ZTE Blade A33s'
+      model: 'Blade A33s'
     - regex: 'Blade[_ ]V0730(?:[);/ ]|$)'
       model: 'Blade V7'
     - regex: 'Blade[_ ]V0800(?:[);/ ]|$)'
@@ -28879,7 +29426,7 @@ MStar:
 
 # MTC (MTS)
 MTC:
-  regex: 'MTC[ _](968|97[82]|970|982[OT]?|1078)|(?:MTC[_ ])?SMART[ _]?(?:Race[2]?|Sprint|Run|Turbo|Surf[2]?)[ _]4G|MTC975|Smart Bit|Smart_(?:LINE|Light)|(?:MTC[ _])?SMART[ _](?:Run|Start[_ ][23])|Redbox Mini 5\(MTS\)|MTS TV|DV8235|DV8304-C|Osmartphona'
+  regex: 'MTC[ _](968|97[82]|970|982[OT]?|1078)|(?:MTC[_ ])?SMART[ _]?(?:Race[2]?|Sprint|Run|Turbo|Surf[2]?)[ _]4G|MTC975|Smart Bit|Smart_(?:LINE|Light)|(?:MTC[ _])?SMART[ _](?:Run|Start[_ ][23])|Redbox Mini 5\(MTS\)|MTS TV|DV8235|DV9135|DV8304-C|Osmartphona'
   device: 'smartphone'
   models:
     - regex: 'Osmartphona'
@@ -28920,7 +29467,7 @@ MTC:
     - regex: 'DV8304-C'
       device: 'tv'
       model: 'SuperWave DV8304-C'
-    - regex: '(DV8235)'
+    - regex: '(DV8235|DV9135)'
       device: 'tv'
       model: '$1'
 
@@ -28948,7 +29495,7 @@ MegaFon:
 
 # Inoi (inoi.com)
 Inoi:
-  regex: 'INOI|(?:A126|A161|A170_Plus|A181_Plus)(?:[);/ ]|$)'
+  regex: 'INOI|(?:A126|A161|A170_Plus|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A17[01]|A180))|A181_Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'inoiPad mini 2\+32 Wi-Fi\+3G'
@@ -28957,21 +29504,29 @@ Inoi:
     - regex: 'inoiPad 2\+32 Wi-Fi\+3G'
       device: 'tablet'
       model: 'Pad 2+32'
+    - regex: 'inoiPad 128\+4GB Wi-Fi\+4G'
+      device: 'tablet'
+      model: 'Pad 4+128'
     - regex: 'inoiPad mini 1\+16 Wi-Fi'
       device: 'tablet'
       model: 'Pad Mini 1+16 WiFi'
+    - regex: 'inoiPad Pro'
+      device: 'tablet'
+      model: 'Pad Pro'
     - regex: 'INOI easyphone'
       model: 'Easy Phone'
     - regex: 'INOI (2|5) Lite (2019|2021)'
       model: '$1 Lite ($2)'
     - regex: 'INOI[_ ]([123])[_ ]LITE'
       model: '$1 Lite'
-    - regex: ' (A126)(?:[);/ ]|$)'
+    - regex: ' (A126|A17[01])(?:[);/ ]|$)'
       model: '$1'
     - regex: 'A170_Plus'
       model: 'A72'
     - regex: 'A181_Plus'
       model: 'A181 Plus'
+    - regex: 'A180'
+      model: 'Note 12'
     - regex: ' A161(?:[);/ ]|$)'
       model: 'A62'
     - regex: 'INOI ([257]) (?:\d\+\d+ )?(2019|202[01])(?:[);/ ]|$)'
@@ -29036,7 +29591,7 @@ Schok:
 
 # Simbans
 Simbans:
-  regex: 'TangoTab|Presto[ )]|PicassoTab_[X9]|Ultimax|Valumax|S72-B|SX2W'
+  regex: 'TangoTab|Presto[ )]|PicassoTab_[X9]|PICASSOTABX14|Ultimax|Valumax|S72-B|SX2W'
   device: 'tablet'
   models:
     - regex: 'TangoTab[_ ]?(\d+|X)'
@@ -29047,7 +29602,7 @@ Simbans:
       model: 'Ultimax'
     - regex: 'Valumax'
       model: 'Valumax'
-    - regex: 'PicassoTab_(XL?|9)'
+    - regex: 'PicassoTab_?(X14|XL?|9)'
       model: 'Picasso Tab $1'
     - regex: 'Presto'
       model: 'Presto'
@@ -29116,11 +29671,13 @@ X-TIGI:
 
 # Hot Pepper (https://www.hotpepperusa.com/)
 Hot Pepper:
-  regex: '(?:HPP-(GS1|L55B)|VLE5|Puya)(?:[);/ ]|$)'
+  regex: '(?:HPP-(GS1|L55B)|VLE5|Puya|HPPL60A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'HPP-GS1'
       model: 'Ghost'
+    - regex: 'HPPL60A'
+      model: 'Chilaca'
     - regex: 'VLE5'
       model: 'Poblano'
     - regex: 'Puya'
@@ -29231,17 +29788,20 @@ NEXBOX:
       model: 'ID TV HPH07'
 
 Yandex:
-  regex: '(?:YNDX-?(?:000SB|0007[12])|YandexModule2-00001)(?:[);/ ]|$)'
+  regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[12]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'YandexModule2-00001'
       device: 'tv'
       model: 'Module'
-    - regex: 'YNDX-?(0007[12])'
+    - regex: 'YNDX-?(0007[12]|0009[12]|0010[12])'
       device: 'tv'
       model: 'YNDX-$1'
     - regex: 'YNDX-?000SB'
       model: 'YNDX-000SB'
+    - regex: 'YNDX-?00055'
+      device: 'smart speaker'
+      model: 'SmartSpeak Duo Max'
 
 # FORME
 FORME:
@@ -29426,9 +29986,9 @@ Globex:
     - regex: '(GU1011C|GU7013C|GU730C)(?:[);/ ]|$)'
       model: '$1'
 
-# Atom
+# Atom or Atom evolution
 Atom:
-  regex: 'ATOM-(108AM|216RK|216AM)(?:[);/ ]|$)'
+  regex: 'ATOM-(108A[ML]|216AL|216RK|216AM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -29709,7 +30269,7 @@ Sunvell:
 
 # Ugoos
 Ugoos:
-  regex: 'UGOOS-|(?:Android 11;(?: [\w-]+;)? UT8|TOX3)(?:[);/ ]|$)'
+  regex: 'UGOOS-|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? UT8|TOX3)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'UGOOS-UT3 ?Plus'
@@ -29846,7 +30406,7 @@ Spectrum:
 
 # Kivi
 Kivi:
-  regex: 'KIVI [24]K|(?:24H600G[RU]|24FR50WU|24HK30B|32HR55GU|32H700GU|32F700WU|4[39]UP50GU|40UR50G[RU]|40U600G[RU]|50U730GR|55U600(?:G[RU]|KD)|65UP50GU|55U[PC]50G[RU]|50U600G[RU]|50UX10S|55UR50G[RU]|40FK30G|40FR5[02]BR|43U(?:800B[RU]|600KD|K35G)|50FK30G|50UK35G|32HR50GR|32F700GR|55UC30G|55U730GR|32HK30G|40FK30G|32HR50GU|43UK30G|32FR50(?:WR|BU)|32FK3[02]G|32H600KD|40U600KD|32H600GR)(?:_-Ver0[0-9])?(?:[);/ ]|$)'
+  regex: 'KIVI [24]K|(?:24H600G[RU]|24FR50WU|24HK30B|32HR55GU|32H700GU|32F700WU|4[39]UP50GU|40UR50G[RU]|40U600G[RU]|50U730GR|55U600(?:G[RU]|KD)|65UP50GU|55U[PC]50G[RU]|50U600G[RU]|50UX10S|55UR50G[RU]|40FK30G|40FR5[02]BR|43U(?:800B[RU]|600KD|K35G)|50FK30G|50UK35G|32HR50GR|32F700GR|55UC30G|55U730GR|32HK30G|40FK30G|32HR50GU|43UK30G|32FR50(?:WR|BU)|32FK3[02]G|32H600KD|40U600KD|32H600G[RU])(?:_-Ver0[0-9])?(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(55UC30G|40FK30G|43UK30G|32HR50G[RU]|32HK30G|32FK32G)_-Ver0([0-9])(?:[);/ ]|$)'
@@ -30180,7 +30740,7 @@ Wigor:
 
 # NEXON (nexon.ua)
 NEXON:
-  regex: 'NEXON[ _](X[13]\+|X[123589]|X10)(?:[);/ ]|$)'
+  regex: 'NEXON[ _](X[135]\+|X[123589]|X10)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -30829,7 +31389,7 @@ TD Systems:
 
 # Ravoz (https://www.ravoz.online/)
 Ravoz:
-  regex: 'RAVOZ[ _](Z[357] (?:Lite|Pro)|Z[3-7]|R[4789]|V[1235])(?:[);/ ]|$)'
+  regex: 'RAVOZ[ _](Z[3567] (?:Lite|Pro)|Z[3-7]|R[4789]|V[1235])(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -30929,7 +31489,7 @@ Winds:
 
 # Asano
 Asano:
-  regex: '(?:32LH7010T|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7011T|24LH7020T|24LH8010T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T|50LU8110T)(?:[);/ ]|$)'
+  regex: '(?:32LH7010T|32LH8030S|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7011T|24LH7020T|24LH8010T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T|50LU8110T|40LF8120T)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(\d{2})(L[FHU]\d+[ST])(?:[);/ ]|$)'
@@ -30976,7 +31536,7 @@ Virzo:
 
 # OzoneHD
 OzoneHD:
-  regex: 'Ozone HD|OzoneHD[ _](T2 WiFi|4K(?: TV)?|Fun)(?:[);/ ]|$)'
+  regex: 'Ozone HD|OzoneHD[ _]?(T2 WiFi|Nexo|4K(?: TV)?|Fun|Neo)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -31135,7 +31695,7 @@ BB Mobile:
     - regex: '(FirstTab TP-17)(?:[);/ ]|$)'
       model: '$1'
 
-    - regex: 'Techno[_ ](9\.7|8\.0) 3G(?:[);/ ]|$)'
+    - regex: 'Techno[_ ](9\.7|[78]\.0) 3G(?:[);/ ]|$)'
       model: 'Techno $1" 3G'
 
     - regex: 'Techno[_ ](?:X595BT)(?:[);/ ]|$)'
@@ -31344,7 +31904,7 @@ Torex:
 
 # Doffler
 Doffler:
-  regex: '(24DHS54|32GHS57|40KFS57|32KHS57|43KUS65)(?:[);/ ]|$)'
+  regex: '(24DHS54|32GHS5[67]|40KFS57|32KHS57|43KUS65|24KHS57|24GHS55|24GHS57|50KUS65|40GHS57|55KUS65)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -31491,7 +32051,7 @@ Völfen:
 
 # Vsmart
 Vsmart:
-  regex: '(?:Joy [123]\+|Joy [34]|Active 1\+|Bee 3|Active [13]|V341U|Bee Lite|Aris| Bee|Star [34])(?:[);/ ]|$)'
+  regex: '(?:Joy [123]\+|Joy [34]|Active 1\+|Bee 3|Active [13]|V341U|Bee Lite|Aris| Bee|Star [345])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Joy ([123])\+(?:[);/ ]|$)'
@@ -31533,10 +32093,10 @@ MiXzo:
 
 # Openbox
 Openbox:
-  regex: '(?:Openbox (?:A[34](?: (?:Pro|Lite))?)|AS1_HD|AS_?4K[_-](?:CI(?:_PRO|_Lite)?(?:_PLUS)?|PLUS|2X)|AS_?4K)(?:[);/ ]|$)'
+  regex: '(?:Openbox (?:A[349](?: (?:Pro|Lite))?)|AS1_HD|AS_?4K[_-](?:CI(?:_PRO|_Lite)?(?:_PLUS)?|PLUS|2X)|AS_?4K)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'Openbox (A[34](?: (?:Pro|Lite))?)(?:[);/ ]|$)'
+    - regex: 'Openbox (A[349](?: (?:Pro|Lite))?)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'AS_4K_CI_PRO_PLUS'
       model: 'AS 4K CI Pro Plus'
@@ -31709,7 +32269,7 @@ Sunstech:
 
 # Hotwav (www.hotwav.com)
 Hotwav:
-  regex: '(?:Venus[_ ](?:X[12]|X1[0245679]|R8 PLUS|R[236-9]|R1[028]|X16-1)|Cosmos[ _](?:V8_lite|V19_Plus|V2[0-3]|U2?|V1[359]|V[45689]|V8-2)|Pearl K[123]|Magic Q8|Magic 5 Plus|Magic (?:[89]|1[13])|Hot[_ ]6|Symbol (?:M1|X|Max|R60|Pro|S4)|Symbol|Cyber [78X]|Cyber (?:9|13|X) Pro|Cosmos|W10 Pro|TAB R7|TAB R6 (?:Pro|Ultra)|T5 Pro| M5i)(?:[);/ ]|$)|(?:Android 8(?:[\d.]*);(?: [\w-]+;)? M5 Plus|Android 12;(?: [\w-]+;)? W10)(?: Build|[;)])'
+  regex: '(?:Venus[_ ](?:X[12]|X1[0245679]|R8 PLUS|R[236-9]|R1[028]|X16-1)|Cosmos[ _](?:V8_lite|V19_Plus|V2[0-3]|U2?|V1[359]|V[45689]|V8-2)|Pearl K[123]|Magic Q8|Magic 5 Plus|Magic (?:[89]|1[13])|Hot[_ ]6|Symbol (?:M1|X|Max|R60|Pro|S4)|Symbol|Cyber [78X]|Cyber (?:9|13|X) Pro|Cosmos|W10 Pro|TAB R7|TAB R6 (?:Pro|Ultra)|T5 Pro| M5i)(?:[);/ ]|$)|(?:Android 8(?:[\d.]*);(?: [\w-]+;)? M5 Plus|Android 12(?:[\d.]*);(?: [\w-]+;)? W10)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Cosmos[ _]V8_lite(?:[);/ ]|$)'
@@ -32061,12 +32621,12 @@ Ruio:
 
 # Transpeed
 Transpeed:
-  regex: 'Transpeed[_ ]|(?:TR99 MINI\+|TR99)(?:[);/ ]|$)'
+  regex: 'Transpeed[_ ]|(?:TR99 MINI\+|TR99|8K618-T)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'TR99 MINI\+'
       model: 'TR99 Mini Plus'
-    - regex: '(?:Transpeed[_ ])?(TR99|H616|6K|X4S?)(?:[);/ ]|$)'
+    - regex: '(?:Transpeed[_ ])?(TR99|H616|6K|X4S?|8K618-T)(?:[);/ ]|$)'
       model: '$1'
 
 # 8848 (everest 8848, 8848 titanium)
@@ -32081,9 +32641,9 @@ VVETIME:
   device: 'smartphone'
   model: 'V1'
 
-# A1 (www.a1.by)
+# A1 (www.a1.by, a1.rs)
 A1:
-  regex: '(?:A1 (?:Alpha|Alpha 20\+)|Alpha 20)(?:[);/ ]|$)'
+  regex: '(?:A1 (?:Alpha|Alpha 20\+)|Alpha 20|Alpha Eco)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A1 Alpha 20\+'
@@ -32092,6 +32652,8 @@ A1:
       model: 'Alpha 20'
     - regex: 'Alpha 21'
       model: 'Alpha 21'
+    - regex: 'Alpha Eco'
+      model: 'Alpha Eco'
     - regex: 'A1 Alpha'
       model: 'Alpha'
 
@@ -32158,7 +32720,7 @@ Pixela:
 
 # Iris
 Iris:
-  regex: '(?:Vox[_ ](?:[45]S|Alpha|POP|STEEL Plus|Energy|FORTIS|VERO)|IS2_?Plus|IS[36]Plus|IS2S|Next_P(?:_PRO)?|NEXT U|NEXT P\+|IRS002-16|X1 mini|Iris_Pad_G8020|G7060|G7100|G8060)(?:[);/ ]|$)|android 9;(?: [\w-]+;)? (?:N30)(?: Build|[;)])'
+  regex: '(?:Vox[_ ](?:[45]S|Alpha|POP|STEEL Plus|Energy|FORTIS|VERO)|IS2_?Plus|IS[36]Plus|IS2S|Next_P(?:_PRO)?|NEXT U|NEXT P\+|IRS002-16|X1 mini|Iris_Pad_G8020|G7060|G7100|G8060)(?:[);/ ]|$)|android 9(?:[\d.]*);(?: [\w-]+;)? (?:N30)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Vox[_ ]([45])S'
@@ -32199,12 +32761,12 @@ Iris:
 
 # Fonos (fonos.eu)
 Fonos:
-  regex: 'Fonos-|(?:Android 10;(?: [\w-]+;)? O3)(?:[);/ ]|$)'
+  regex: 'Fonos-|(?:Android 10(?:[\d.]*);(?:[\d.]*)(?: [\w-]+;)? O3)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Fonos-(O\d)(?:[);/ ]|$)'
       model: '$1'
-    - regex: '(?:Android 10;(?: [\w-]+;)? O3)(?:[);/ ]|$)'
+    - regex: ' O3(?: Build|[;)])'
       model: 'O3'
 
 # Xtouch (www.xtouchtechnologies.com)
@@ -32269,11 +32831,13 @@ Selenga:
 
 # Starlight
 Starlight:
-  regex: 'Starlight|(?:My_Star_X|RIO STAR|C_Note(?:_Pro)?|Star_Mix_2|I_STAR_PLUS|star_plus_plus|star_two|I star (?:one|two))(?:[);/ ]|$)'
+  regex: 'Starlight|(?:My_Star_X|My_star_18|RIO STAR|C_Note(?:_Pro)?|Star_Mix_2|I_STAR_PLUS|star_plus_plus|star_two|I star (?:one|two))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'My_Star_X'
       model: 'My Star X'
+    - regex: 'My_star_18'
+      model: 'My Star 18'
     - regex: 'RIO STAR'
       model: 'Rio Star'
     - regex: 'C_Note_Pro'
@@ -32576,7 +33140,7 @@ iSWAG:
 
 # Reeder (reeder.com.tr)
 Reeder:
-  regex: '(?:reeder[_ ](?:3G_Tablet|A7iC|A[78]i[_ ]Quad|A8i Q2|M8 Plus|[TM]8|M10 Plus|P11SE|M7_Go)|M8_Go|M8Go2020|M10SPlus|P12Curve|M10 Pro LTE|M10 Blue Max|P13_Blue_Plus|P13_Max_Blue|P13[_ ]Blue[_ ]Ma(?:ks|x|xL)|P13_Blue|P13 Blue 202[12]|M7Plus|A8i-Q2|M7Go_2019|S19 Max Pro S(?: Zoom)?|M10 GO|S19 Max 64GB|S23 Pro Max)(?:[);/ ]|$)'
+  regex: '(?:reeder[_ ](?:3G_Tablet|A7iC|A[78]i[_ ]Quad|A8i Q2|M8 Plus|[TM]8|M10 Plus|P11SE|M7_Go)|M8_Go|M8Go2020|M10SPlus|P12Curve|M10 Pro LTE|M10 Blue Max|P13[ _]Blue[ _]Plus(?:[ _]2022)?|P13_Max_Blue|P13[_ ]Blue[_ ]Ma(?:ks|x|xL)|P13_Blue|P13[ _]Blue[ _]202[12]|M7Plus|A8i-Q2|M7Go_2019|S19 Max(?: Pro S(?: Zoom)?| \d{2}GB|L 128GB| Pro)|M10 GO|S23 Pro Max)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'A8i-Q2'
@@ -32606,6 +33170,9 @@ Reeder:
     - regex: 'P13_Blue_Maks'
       device: 'smartphone'
       model: 'P13 Blue Maks'
+    - regex: 'P13_Blue_Plus_2022'
+      device: 'smartphone'
+      model: 'P13 Blue Plus (2022)'
     - regex: 'P13_Blue_Plus'
       device: 'smartphone'
       model: 'P13 Blue Plus'
@@ -32630,15 +33197,24 @@ Reeder:
     - regex: 'P13_Blue'
       device: 'smartphone'
       model: 'P13 Blue'
-    - regex: 'S19 Max 64GB'
+    - regex: 'S19 Max (?:32|64)GB'
       device: 'smartphone'
       model: 'S19 Max'
+    - regex: 'S19 MaxL 128GB'
+      device: 'smartphone'
+      model: 'S19 Max L'
     - regex: 'S19 Max Pro S Zoom'
       device: 'smartphone'
       model: 'S19 Max Pro S Zoom'
+    - regex: 'S19 Max Pro S Edge'
+      device: 'smartphone'
+      model: 'S19 Max Pro S Edge'
     - regex: 'S19 Max Pro S'
       device: 'smartphone'
       model: 'S19 Max Pro S'
+    - regex: 'S19 Max Pro'
+      device: 'smartphone'
+      model: 'S19 Max Pro'
     - regex: 'S23 Pro Max'
       device: 'smartphone'
       model: 'S23 Pro Max'
@@ -32708,7 +33284,7 @@ ELARI:
 
 # Altice
 Altice:
-  regex: 'Altice[ _]|(SX41|Android 9;(?: [\w-]+;)? (?:S32|S42|S32_(?:Plus|NFC)))(?:[);/ ]|$)'
+  regex: 'Altice[ _]|(SX41|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:S32|S42|S32_(?:Plus|NFC)))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: ' (SX41|S32|S42|S32_Plus|S32_NFC)(?:[);/ ]|$)'
@@ -32765,14 +33341,16 @@ Spark:
 
 # Sparx or SparX (https://sparx.pk/)
 Sparx:
-  regex: 'Sparx[ _]|(?:NEO_6|NEO 5|Neo_6_plus|Neo 5 Pro|Neo X)(?: Build|[;)])'
+  regex: 'Sparx[ _]|(?:NEO_6|NEO 5|Neo_6_plus|Neo 5 Pro|Neo X|Edge 20 Pro)(?: Build|[;)])'
   device: 'smartphone'
   models:
+    - regex: 'Edge 20 Pro'
+      model: 'Edge 20 Pro'
     - regex: 'Neo 7 Ultra'
       model: 'Neo 7 Ultra'
-    - regex: 'Neo ([57]) Pro'
+    - regex: 'Neo ([578]) Pro'
       model: 'Neo $1 Pro'
-    - regex: 'Neo[ _]([56])[ _]Plus'
+    - regex: 'Neo[ _]([568])[ _]Plus'
       model: 'Neo $1 Plus'
     - regex: 'Neo[ _]([567])'
       model: 'Neo $1'
@@ -32850,11 +33428,13 @@ SPC:
 
 # Winmax (winmaxmobile.com)
 Winmax:
-  regex: '(?:Winmax[ _](?:XC14|XC[46]|TX30)|PolarH4)(?:[);/ ]|$)|MAUI.+Winmax_BD45'
+  regex: '(?:Winmax[ _](?:XC14|XC[46]|TX30)|PolarH4|Tiger_X12)(?:[);/ ]|$)|MAUI.+Winmax_BD45'
   device: 'smartphone'
   models:
     - regex: 'PolarH4'
       model: 'Polar H4'
+    - regex: 'Tiger_X12'
+      model: 'Tiger X12'
     - regex: 'Winmax[ _](XC14|XC[46])(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Winmax[ _](TX30)(?:[);/ ]|$)'
@@ -32893,11 +33473,16 @@ Bkav:
   device: 'smartphone'
   model: 'Bphone $1'
 
-# Brandt
+# Brandt (brandt.dz)
 Brandt:
-  regex: 'Brandt|(BPRIME|BSTAR\+?|BPRIMES|B-ONE)(?:[);/ ]|$)'
+  regex: 'Brandt|(?:BPRIME|BSTAR\+?|BPRIMES|B-ONE)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'BRANDT FHD TV'
+      device: 'tv'
+      model: 'FHD TV'
+    - regex: '(BPRIME|BSTAR\+?|BPRIMES|B-ONE)(?:[);/ ]|$)'
+      model: '$1'
 
 # Bigben
 Bigben:
@@ -32957,10 +33542,10 @@ Mint:
 
 # Mintt (www.mintt.co)
 Mintt:
-  regex: '(?:Coolmintt(?:A[35]|M2)?|Ultramintt(?:S2)?|FRESHMINTT(?:A7|A10)?)(?:[);/ ]|$)'
+  regex: '(?:Coolmintt(?:A[35]|M2|Tribe)?|Ultramintt(?:S2)?|FRESHMINTT(?:A7|A10)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'Coolmintt ?(Blaze 2|A[3578]|M[12]|P[13]|X7)(?:[);/ ]|$)'
+    - regex: 'Coolmintt ?(Blaze 2|Tribe|A[3578]|M[12]|P[13]|X7)(?:[);/ ]|$)'
       model: 'CoolMintt $1'
     - regex: 'Ultramintt ?(A[56]|R1|S[12]|X[56]|Y[35])(?:[);/ ]|$)'
       model: 'UltraMintt $1'
@@ -33460,6 +34045,12 @@ CellAllure:
     - regex: 'CHIC_X1'
       model: 'Chic X1'
 
+# EagleSoar
+EagleSoar:
+  regex: '(EE10A)'
+  device: 'tablet'
+  model: '$1'
+
 # Eagle (eagleuhd.com)
 Eagle:
   regex: 'Eagle[ _](Classic Pro|Elite|Gold)(?:[);/ ]|$)'
@@ -33794,7 +34385,7 @@ Seuic:
 
 # CENTEK (centek.ru)
 CENTEK:
-  regex: 'CT-(87(?:43|24|32)|85(?:[67]5|5[08]|32|4[03]))(?:[);/ ]|$)'
+  regex: 'CT-(87(?:4[03]|24|32)|85(?:[67]5|5[08]|32|4[03]))(?:[);/ ]|$)'
   device: 'tv'
   model: 'CT-$1'
 
@@ -33855,7 +34446,7 @@ Shtrikh-M:
 
 # BBK (bbk.ru)
 BBK:
-  regex: '(?:32LEX-7272|([65]5|50|4[03]|3[29]|2[48])LEX[-_](81(?:27|39|45|58|6[12]|7[34])|71(?:[23]7|4[345]|5[45]|6[2368]|[57]8|7[15])|7202|725[79]|7225|7287|8243|8202)[_/]?([FU]?TS2C)|(?:3[29]|24)LEX-7289(?:-c)?)(?:[);/ ]|$)'
+  regex: '(?:32LEX-7272|24LEX-7269|([65]5|50|4[03]|3[29]|2[48])LEX[-_](81(?:27|39|45|58|6[12]|7[34])|71(?:[23]7|4[345]|5[45]|6[2368]|[57]8|7[15])|7202|725[79]|7225|7287|8243|8202)[_/]?([FU]?TS2C)|(?:3[29]|24)LEX-7289(?:-c)?)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(\d{2})LEX[-_](\d{3,4})[_/]?([FU]?TS2C)'
@@ -34001,6 +34592,12 @@ Datalogic:
   device: 'smartphone'
   model: 'Memor $1'
 
+# mipo (mipo.com.tr)
+mipo:
+  regex: 'mipo[ _]([^/;)]+)(?: Build|[);])'
+  device: 'smartphone'
+  model: '$1'
+
 # Naomi Phone
 Naomi Phone:
   regex: '(?:NAOMIPHONE Ambar|DAMMAR)(?:[);/ ]|$)'
@@ -34394,7 +34991,7 @@ Kyowon:
 
 # LT Mobile or LT Electronics (lt-smartphone.com or lt-yemen.com)
 LT Mobile:
-  regex: 'LT[ _-](?:P[89]|9701|P10I|NOTE 10[SM]|NOTE 30|C1[45]00|C3[1235]00|S10[ _]Lite|S10|S9_NOTE|M[56]|M5_lite|C1300)|(?:C3[67]00)(?:[);/ ]|$)'
+  regex: 'LT[ _-](?:P[89]|9701|P10I|NOTE 10[SM]|NOTE 30|C1[45]00|C3[1235]00|S10[ _]Lite|S10|S9_NOTE|M[56]|M5_lite|C1300|6509|2003)|(?:C3[67]00)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'LT[- ]NOTE ([13]0[SM]?)'
@@ -34425,6 +35022,10 @@ LT Mobile:
       model: 'P10i'
     - regex: 'LT[ _]9701'
       model: 'M50'
+    - regex: 'LT[ _]6509'
+      model: 'M40'
+    - regex: 'LT[ _]2003'
+      model: 'M25 Power'
     - regex: 'LT[ _]P([89])(?:[);/ ]|$)'
       model: 'P$1'
     - regex: 'LT[ _]M([56])[_ ]lite(?:[);/ ]|$)'
@@ -34434,9 +35035,11 @@ LT Mobile:
 
 # ONYX BOOX (onyx-boox.ru)
 ONYX BOOX:
-  regex: '(?:KON_TIKI(2)?|Nova3Color|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?|LIVINGSTONE2|MC_FAUST[23]|DARWIN9|MC_DARWIN[678]|MC_GAMA4|MC_Cristo4|MC_NovaPro|NoteAir3C)(?:[);/ ]|$)'
+  regex: '(?:KON_TIKI(2)?|Nova3Color|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?|LIVINGSTONE[23]|MC_FAUST[23]|DARWIN[9X]|MC_DARWIN[678]|MC_GAMA4|MC_Cristo4|MC_NovaPro|NoteAir3C|VOLTA4|Kon_Tiki3|FAUST[56]|GALILEO)(?:[);/ ]|$)'
   device: 'tablet'
   models:
+    - regex: 'VOLTA4'
+      model: 'Volta 4'
     - regex: 'NovaAirC'
       model: 'Nova Air C'
     - regex: 'MC_NovaPro'
@@ -34449,20 +35052,22 @@ ONYX BOOX:
       model: 'Nova 3 Color'
     - regex: 'Poke2Color'
       model: 'Poke 2 Color'
-    - regex: 'KON_TIKI(2)?'
+    - regex: 'KON_TIKI([23])?'
       model: 'Kon Tiki $1'
     - regex: 'Lomonosov'
       model: 'Lomonosov'
-    - regex: 'MC_FAUST([23])'
+    - regex: '(?:MC_)?FAUST([2356])'
       model: 'Faust $1'
-    - regex: '(?:MC_)?DARWIN([6789])'
+    - regex: '(?:MC_)?DARWIN([6789X])'
       model: 'Darwin $1'
     - regex: 'MC_GAMA4'
       model: 'Gama 4'
+    - regex: 'GALILEO'
+      model: 'Galileo'
     - regex: 'MC_Cristo4'
       model: 'Monte Cristo 4'
-    - regex: 'LIVINGSTONE2'
-      model: 'Living Stone 2'
+    - regex: 'LIVINGSTONE([23])'
+      model: 'Living Stone $1'
     - regex: 'NoteAir3C'
       model: 'Note Air 3C'
 
@@ -34963,13 +35568,19 @@ YASIN:
   device: 'tv'
   model: ''
 
-# Blow (blow.pl)
+# BLOW (blow.pl)
 Blow:
-  regex: '(?:LaserTAB10|PlatinumTAB10_4G_V\d|BlackTab7_3G_V2|BlackTAB7)(?:[);/ ]|$)'
+  regex: '(?:LaserTAB10|PlatinumTAB(?:11|8)_4G|PlatinumTAB10V22|PlatinumTAB10_4G_V\d|BlackTab7_3G_V2|BlackTAB7)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'LaserTAB10'
       model: 'Laser Tab 10'
+    - regex: 'PlatinumTAB11_4G'
+      model: 'Platinum Tab 11 4G'
+    - regex: 'PlatinumTAB8_4G'
+      model: 'Platinum Tab 8 4G'
+    - regex: 'PlatinumTAB10V22'
+      model: 'Platinum Tab 10 V22'
     - regex: 'PlatinumTAB10_4G_(V\d)'
       model: 'Platinum Tab 10 4G $1'
     - regex: 'BlackTab7_3G_V2'
@@ -35064,6 +35675,8 @@ DISH:
       model: 'Celero 5G+'
     - regex: 'Celero3 5G\+'
       model: 'Celero 3 5G+'
+    - regex: 'Celero3 5G'
+      model: 'Celero 3 5G'
     - regex: 'WTCELERO5G|Celero5G'
       model: 'Celero 5G'
 
@@ -35406,17 +36019,19 @@ Mara:
 
 # BMAX (www.bmaxit.com)
 BMAX:
-  regex: '(?:(?:I11|I10(Plus)?)_EEA|Android 11;(?: [\w-]+;)? I11|I10_Pro|I10Plus)(?:[);/ ]|$)'
+  regex: '(?:I11_Plus_EEA|(?:I11|I10(Plus)?|I9_Plus)_EEA|Android 11(?:[\d.]*);(?: [\w-]+;)? I11|I10_Pro|I10Plus)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'I10_?(Plus|Pro)?(?:_(?:EEA|ROW))?(?:[);/ ]|$)'
       model: 'MaxPad I10 $1'
     - regex: ' I11(?:_EEA)?(?:[);/ ]|$)'
       model: 'MaxPad I11'
+    - regex: 'I(11|9)_Plus(?:_EEA)?(?:[);/ ]|$)'
+      model: 'MaxPad I$1 Plus'
 
 # Geotex (geotex.tv)
 Geotex:
-  regex: '(GTX-R10i Pro)(?:[);/ ]|$)'
+  regex: '(GTX-R10i Pro|GTX-R10i|GTX-98Q)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -35452,15 +36067,15 @@ Glofiish:
 
 # Polar (polar.ru)
 Polar:
-  regex: 'Polar(?:_W?K?)?[_ ]P\d{2}'
+  regex: 'Polar(?:_W?K?)?[_ ]P\d{2}|(?:P42L31T2CSM)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'Polar(?:_W?K?)?[_ ](P\d{2}[LU]\d{2}T2S?CSM)(?:[);/ ]|$)'
+    - regex: '(?:Polar(?:_W?K?)?[_ ])?(P\d{2}[LU]\d{2}T2S?CSM)(?:[);/ ]|$)'
       model: '$1'
 
 # Polarline (sub brand Polar)
 PolarLine:
-  regex: 'PolarLine[_ ](?:W?K?[_ ])?(24PL51TC-SM|32PL1[34]TC-SM|40PL(?:52|11)TC-SM|55PU11TC-SM|42PL11TC-SM|65PU51TC-SM|50PU11TC-SM)(?:[);/ ]|$)'
+  regex: 'PolarLine[_ ](?:W?K?[_ ])?(24PL51TC-SM|32PL51STC-SM|32PL1[34]TC-SM|40PL(?:52|11)TC-SM|55PU11TC-SM|42PL11TC-SM|65PU51TC-SM|50PU11TC-SM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -35522,20 +36137,20 @@ Gocomma:
 
 # LEMFO
 LEMFO:
-  regex: '(?:LEM1[45]|LEM12Pro)(?:[);/ ]|$)'
+  regex: '(?:LEM1[456]|LEM12Pro)(?:[);/ ]|$)'
   device: 'wearable'
   models:
     - regex: '(LEM12)Pro'
       model: '$1 Pro'
-    - regex: '(LEM1[45])'
+    - regex: '(LEM1[456])'
       model: '$1'
 
 # Urovo (en.urovo.com)
 Urovo:
-  regex: '(?:DT[45]0|i6200[AS])(?:[);/ ]|$)'
+  regex: '(?:DT[245]0|i6200[AS])(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(DT[45]0|i6200[AS])'
+    - regex: '(DT[245]0|i6200[AS])'
       device: 'peripheral'
       model: '$1'
 
@@ -35581,7 +36196,7 @@ Bubblegum:
 
 # Erisson
 Erisson:
-  regex: '(42FLEA73T2SM|42FLX9060T2|39LES80T2SM|32LX9051T2|55ULES92T2SM|32LEA73T2SM)(?:[);/ ]|$)'
+  regex: '(42FLEA73T2SM|42FLX9060T2|32LX9000CT|39LES80T2SM|32LX9051T2|55ULES92T2SM|32LEA73T2SM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -35687,7 +36302,7 @@ Meizu:
       model: '16'
     - regex: '(?:MZ-)?16s Pro(?:[);/ ]|$)'
       model: '16s Pro'
-    - regex: 'meizu (17|C9) Pro(?:[);/ ]|$)'
+    - regex: 'meizu (17|C9|20) Pro(?:[);/ ]|$)'
       model: '$1 Pro'
     - regex: 'MZ-?M3(?:[);/ ]|$)'
       model: 'M3'
@@ -35742,7 +36357,7 @@ Alps:
 
 # Starwind (starwind.com.ru)
 Starwind:
-  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB302|42SB300|40SG300|43SG30[20]|43UB404|32SG30[012]|55UG400|50UB401|65UG403))(?:[);/ ]|$)'
+  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB302|42SB300|40SG300|43SG30[20]|43UB404|32SG3(?:0[012]|11)|55UG400|50UB401|65UG403))(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'SW-LED(\d{2}[SU][BG]\d{3})'
@@ -35805,7 +36420,7 @@ Smarty:
 
 # Leff
 Leff:
-  regex: '(32H540S|32H5[235]0T|5[05]U540S|55U630S|40F540S|43F5[35]0T|32H511T)(?:[);/ ]|$)'
+  regex: '(32[FH]540S|32H5[235]0T|5[05]U540S|55U630S|40F540S|43F5[35]0T|32H511T|24H520T|28H540S|28H550T|50U6[23]0S|43F511T)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -35842,7 +36457,7 @@ TuCEL:
 
 # FEONAL
 FEONAL:
-  regex: '(K118)_EEA(?:[);/ ]|$)'
+  regex: '(K11[08])_EEA(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -35930,6 +36545,14 @@ DUNNS Mobile:
       device: 'tablet'
       model: '$1'
 
+# inovo (inovo.co.th)
+inovo:
+  regex: '(I 618 APP plus\+)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'I 618 APP plus\+'
+      model: 'I618 App Plus+'
+
 # iNOVA
 iNOVA:
   regex: '(EX1080)(?:[);/ ]|$)'
@@ -35967,13 +36590,15 @@ Saiet:
 
 # Magicsee (magicsees.com)
 Magicsee:
-  regex: '(?:N5NOVA|IRON\+)(?:[);/ ]|$)'
+  regex: '(?:N5NOVA|IRON\+|N5Max_X4)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'N5NOVA'
       model: 'N5 Nova'
     - regex: 'IRON\+'
       model: 'Iron+'
+    - regex: 'N5Max_X4'
+      model: 'N5 Max X4'
 
 # Obabox (www.obabox.com.br)
 Obabox:
@@ -36251,7 +36876,7 @@ Techstorm:
 
 # OMIX or OMIX Mobile (omixmobile.com)
 OMIX:
-  regex: 'OMIX[ _.]|(?:X600 NFC|Android 11;(?: [\w-]+;)? X400)(?:[);/ ]|$)'
+  regex: 'OMIX[ _.]|(?:X600 NFC|Android 1[12](?:[\d.]*);(?: [\w-]+;)? X[467]00)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'X600 NFC'
@@ -36559,10 +37184,10 @@ BROR:
 
 # Vortex (https://vortexcellular.com/)
 Vortex:
-  regex: '(SYNQ|CMG101|T10M_Pro)(?:[);/ ]|$)'
+  regex: '(SYNQ|CMG101|CM62|CG65|T10M_Pro|HD62|ZTAB10|BTAB10|HD65 Choice)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(SYNQ)'
+    - regex: '(SYNQ|HD6[25]|CM62|CG65)'
       model: '$1'
     - regex: '(CMG101)'
       device: 'tablet'
@@ -36570,6 +37195,12 @@ Vortex:
     - regex: 'T10M_Pro'
       device: 'tablet'
       model: 'T10M Pro'
+    - regex: 'ZTAB10'
+      device: 'tablet'
+      model: 'Z Tab 10'
+    - regex: 'BTAB10'
+      device: 'tablet'
+      model: 'B Tab 10'
 
 # Xiaodu or Baidu Xiaodu
 Xiaodu:
@@ -36599,6 +37230,12 @@ Future Mobile Technology:
   device: 'smartphone'
   model: '$1'
 
+# MBK (byterg.com)
+MBK:
+  regex: '(MBK-T2101)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # MBI International
 MBI:
   regex: 'MBI[_ ](R7)(?:[);/ ]|$)'
@@ -36643,7 +37280,7 @@ Listo:
 
 # ECON
 ECON:
-  regex: '(EX-32HS016B|EX-39HS004B)'
+  regex: '(EX-32HS016B|EX-32HS006B|EX-39HS004B|EX-60US001B)'
   device: 'tv'
   model: '$1'
 
@@ -36774,19 +37411,25 @@ I-INN:
 
 # Emporia (emporia.eu)
 Emporia:
-  regex: 'emporia[_ ]|(?:Android 9;(?: [\w-]+;)? S3mini)(?:[);/ ]|$)'
+  regex: 'emporia[_ ]|(?:Android 9(?:[\d.]*);(?: [\w-]+;)? S3mini|Android 13(?:[\d.]*);(?: [\w-]+;)? E5mini)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S3mini'
       model: 'S3 Mini'
+    - regex: 'E5mini'
+      model: 'E5 Mini'
     - regex: 'emporia[_ ]([^/;)]+)(?: Build|[);])'
       model: '$1'
 
 # BLISS
 BLISS:
-  regex: '(BPM9727)(?:[);/ ]|$)'
+  regex: 'BLISS-T6|(BPM9727)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: 'BLISS-T6'
+      model: 'T6'
+    - regex: '(BPM9727)'
+      model: '$1'
 
 # Entity
 Entity:
@@ -37087,19 +37730,19 @@ HiKing:
     - regex: 'Fun5'
       model: 'Fun 5'
 
-# Hytera
+# Hytera (hytera.com)
 Hytera:
-  regex: '(?:PTC760|PNC550)'
+  regex: '(?:PTC760|PNC5[56]0)'
   device: 'smartphone'
   models:
-    # radio station
-    - regex: '(PTC760|PNC550)'
+    # radio station + smartphone
+    - regex: '(PTC760|PNC5[56]0)'
       device: 'peripheral'
       model: '$1'
 
 # PIRANHA (piranha.com.tr)
 PIRANHA:
-  regex: 'PIRANHA[_ ]|(?:Ultra 4 Tab 9\.0|Ultra 5 Tab White)(?:[);/ ]|$)'
+  regex: 'PIRANHA[_ ]|(?:Ultra 4 Tab 9\.0|Ultra 5 Tab White|Piranha8032)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Pro II Tab 7\.0'
@@ -37108,6 +37751,8 @@ PIRANHA:
       model: 'Ultra 4'
     - regex: 'Ultra 5 Tab White'
       model: 'Ultra 5'
+    - regex: 'Piranha8032'
+      model: '8032'
 
 # CipherLab (www.cipherlab.com)
 CipherLab:
@@ -37252,12 +37897,15 @@ Weelikeit:
 
 # M3 Mobile (www.m3mobile.net)
 M3 Mobile:
-  regex: 'M3US20W(?:[);/ ]|$)'
+  regex: '(?:M3US20W|M3SL20)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'M3US20W'
       device: 'peripheral'
       model: 'US20 W'
+    - regex: 'M3SL20'
+      device: 'peripheral'
+      model: 'M3 SL20'
 
 # Hugerock
 Hugerock:
@@ -37319,27 +37967,33 @@ ENIE:
   device: 'smartphone'
   model: 'E4 Pro'
 
-# Dcode (dcode.com.pk)
+# Dcode or DCode(dcode.com.pk)
 Dcode:
-  regex: 'DS-(?:BD[13]|CR1|CL[23] Pro|X1|CL3 Lite)(?:[);/ ]|$)'
+  regex: 'DS-(?:BD[123]|CR1|CL[23] Pro|X1|CL[23] Lite|CL[123])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'DS-CR1'
       model: 'Cypher'
     - regex: 'DS-CL([23]) Pro'
       model: 'Cygnal $1 Pro'
-    - regex: 'DS-CL3 Lite'
-      model: 'Cygnal 3 Lite'
+    - regex: 'DS-CL([23]) Lite'
+      model: 'Cygnal $1 Lite'
+    - regex: 'DS-CL3'
+      model: 'Cygnal 3'
+    - regex: 'DS-CL2'
+      model: 'Cygnal 2'
     - regex: 'DS-BD1'
       model: 'Bold'
-    - regex: 'DS-BD3'
-      model: 'Bold 3'
+    - regex: 'DS-CL1'
+      model: 'Cygnal'
+    - regex: 'DS-BD([23])'
+      model: 'Bold $1'
     - regex: 'DS-(X1)'
       model: '$1'
 
 # Pritom
 Pritom:
-  regex: 'Pritom_|(?:K7_A101(?:_EEA)?|Android 1[01];(?: [\w-]+;)? (?:M10_Lite|M10_(?:PLUS|Air)(?:_EEA)?|P7_EEA)|P7PRO)(?:[);/ ]|$)'
+  regex: 'Pritom_|(?:K7_A101(?:_EEA)?|Android 1[01](?:[\d.]*);(?: [\w-]+;)? (?:M10_Lite|M10_EEA|M10_(?:PLUS|Air)(?:_EEA)?|P7_EEA)|P7PRO)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'M10_Lite'
@@ -37350,7 +38004,7 @@ Pritom:
       model: 'M10 Air'
     - regex: 'M10_PLUS'
       model: 'M10 Plus'
-    - regex: 'Pritom[_ ]M10'
+    - regex: 'Pritom[_ ]M10|M10_EEA'
       model: 'M10'
     - regex: 'P7_EEA'
       model: 'P7'
@@ -37377,9 +38031,13 @@ Chainway:
 
 # Harper (https://harper.ru/)
 Harper:
-  regex: '(?:HARPER[_ ])?(ABX-332|ABX-[12]10|40F660TS|24R490TS|65U660TS)(?:[);/ ]|$)'
+  regex: 'HARPER|(?:HARPER[_ ])?(?:ABX-332|ABX-[12]10|32R750TS|32R670TS|40F660TS|40F750TS|24R490TS|65U660TS|50U660TS|32R751TS|43F750TS|85U750TS)(?:[);/ ]|$)'
   device: 'tv'
-  model: '$1'
+  models:
+    - regex: '(?:HARPER[_ ])?(ABX-332|ABX-[12]10|32R751TS|40F660TS|24R490TS|65U660TS|50U660TS)'
+      model: '$1'
+    - regex: '(?:HARPER[ _-]?)?(\d{2}[QUFR]\d{3}TS)(?:[);/ ]|$)'
+      model: '$1'
 
 # Venstar
 Venstar:
@@ -37500,7 +38158,7 @@ Elecson:
 
 # NEXT (https://nextcentr.ru/)
 NEXT:
-  regex: '(Discovery_XT)(?:[);/ ]|$)'
+  regex: '(Discovery_XT|Revolution-X69K)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -37657,7 +38315,7 @@ Marshal:
 
 # V-HOME
 V-HOME:
-  regex: '(32LH1210|50LU1210|55LU1210|43LU1210|24LH1211)(?:[);/ ]|$)'
+  regex: '(32LH1210|43LF1210|50LU1210|55LU1210|43LU1210|24LH1211)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -37772,7 +38430,7 @@ DRAGON:
   device: 'tv'
   model: '$1'
 
-# Skyline (skylinetv.ru)
+# Skyline or SkyLine (skylinetv.ru)
 Skyline:
   regex: '(?:SKYLINE[_ ])?(32YST5970|50UST5970|24YST5970|40LST5970|32YST5975|43LST5975|5[58]U7510)(?:[);/ ]|$)'
   device: 'tv'
@@ -37780,19 +38438,21 @@ Skyline:
 
 # Hiberg (hiberg.ru)
 Hiberg:
-  regex: '(?:32Y_STV-R|HIBERG43YUHD)(?:[);/ ]|$)'
+  regex: '(?:32Y_STV-R|HIBERG\d{2}YUHD)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'HIBERG43YUHD'
-      model: '43Y UHD'
+    - regex: 'HIBERG(\d{2})YUHD'
+      model: '$1Y UHD'
     - regex: '(32Y_STV-R)'
       model: '$1'
 
 # Hartens
 Hartens:
-  regex: '(HTY-\d{2}\w+-(?:S2|HC22)|HTY-32HDR06G|HTY-43F06B-VZ|HTY-24H06W-VZ)(?:[);/ ]|$)'
+  regex: '(HTY[_-]\d{2}\w+-(?:S2|H[ACK]22|S2-T9|V[DNZS])|HTY-32HDR06G|HTY_43FHD06B|HTY-43F06B-VZ|HTY-24H06W-VZ)(?:[);/ ]|$)'
   device: 'tv'
-  model: '$1'
+  models:
+    - regex: 'HTY[_-](\d{2}(?:[^/;)]+))(?: Build|[);])'
+      model: 'HTY-$1'
 
 # AMA
 AMA:
@@ -37816,18 +38476,27 @@ Revomovil:
 
 # OSCAL (www.oscal.hk)
 OSCAL:
-  regex: '(?:S60Pro|Tiger 1[02]|android 12;(?: [\w-]+;)? (?:C80|Pad (?:[167]0|13)))(?:[);/ ]|$)'
+  regex: '(?:Spider 8|S60Pro|MODERN 8|FLAT 1C|Tiger 1[02]|android 13(?:[\d.]*);(?: [\w-]+;)? (?:Pad 1[158]|Pad 8)|android 12(?:[\d.]*);(?: [\w-]+;)? (?:C[678]0|C30 Pro|Pad (?:[167]0|13)))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'MODERN 8'
+      model: 'Modern 8'
+    - regex: 'C30 Pro'
+      model: 'C30 Pro'
+    - regex: 'FLAT 1C'
+      model: 'Flat 1C'
     - regex: 'S60Pro'
       model: 'S60 Pro'
     - regex: 'Tiger (1[02])'
       model: 'Tiger $1'
-    - regex: ' (C80)(?:[);/ ]|$)'
+    - regex: ' (C[678]0)(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'Pad ([167]0|13)'
+    - regex: 'Pad ([167]0|1[1358]|8)'
       device: 'tablet'
       model: 'Pad $1'
+    - regex: 'Spider 8'
+      device: 'tablet'
+      model: 'Spider 8'
 
 # UE or United Education (www.ue.cn)
 UE:
@@ -37977,7 +38646,7 @@ Mobell:
 
 # Mobvoi (https://www.mobvoi.com/)
 Mobvoi:
-  regex: 'TicWatch (C2|C2\+|Pro S|S2?)(?:[);/ ]|$)'
+  regex: 'TicWatch (Pro 3 Ultra GPS|C2|C2\+|Pro S|S2?)(?:[);/ ]|$)'
   device: 'wearable'
   model: 'TicWatch $1'
 
@@ -38019,11 +38688,15 @@ VIVIMAGE:
   device: 'tablet'
   model: '$1'
 
-# X-Mobile (xmobile.ne.jp)
+# X-Mobile or Xmobile (xmobile.ne.jp)
 X-Mobile:
-  regex: '(?:XM-SW1)(?:[);/ ]|$)'
+  regex: '(?:XM-SW1|X63Pro)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'Smart WiFi'
+  models:
+    - regex: 'X63Pro'
+      model: 'X63 Pro'
+    - regex: 'XM-SW1'
+      model: 'Smart WiFi'
 
 # JOYSURF
 JoySurf:
@@ -38131,7 +38804,7 @@ Samtech:
 
 # Samtron (samtron.ru)
 Samtron:
-  regex: '(55SA703)(?:[);/ ]|$)'
+  regex: '(?:SAMTRON_W_)?(43SA701|55SA703)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -38143,9 +38816,11 @@ MwalimuPlus:
 
 # OLTO (olto.su)
 OLTO:
-  regex: 'OLTO-(43ST20U)(?:[);/ ]|$)'
+  regex: '(?:OLTO-(?:43ST20U)|43ST20H)(?:[);/ ]|$)'
   device: 'tv'
-  model: '$1'
+  models:
+    - regex: '(?:OLTO-)?(43ST20[HU])'
+      model: '$1'
 
 # DSIC
 DSIC:
@@ -38300,9 +38975,13 @@ MIWANG:
 
 # HeadWolf (headwolf.net)
 HeadWolf:
-  regex: 'Hpad([12])(?:[);/ ]|$)'
+  regex: '(?:Hpad[12]|Wpad3)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'HPad$1'
+  models:
+    - regex: 'Hpad([12])'
+      model: 'HPad$1'
+    - regex: 'Wpad(3)'
+      model: 'WPad$1'
 
 # Zamolxe
 Zamolxe:
@@ -38500,14 +39179,14 @@ Kinstone:
   device: 'tablet'
   model: '$1'
 
-# HIPER
+# HIPER (hiper-power.com)
 HIPER:
-  regex: 'HIPER (?:MEDIA|S-Pad)|(?:U(?:43|50|65)YQ2200GR|H32YQ2200GR)(?:[);/ ]|$)'
+  regex: 'HIPER[ -](?:MEDIA|[MS]-Pad)|(?:U(?:43|50|65)YQ2200GR|H32YQ2200GR)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'S-Pad'
+    - regex: 'HIPER[ -]([SM])-Pad'
       device: 'tablet'
-      model: 'S-Pad'
+      model: '$1-Pad'
     - regex: 'MEDIA STICK 4K'
       model: 'Media Stick 4K'
     - regex: 'MEDIA TV (i4 Pro|i4|[46]K)'
@@ -38517,14 +39196,23 @@ HIPER:
 
 # TopDevice (https://topdevice.ru/)
 TopDevice:
-  regex: 'TopDevice|TDTV\d{2}BS\d{2}[FHU]|TDT4518_4G'
+  regex: 'TopDevice|TDTV\d{2}[BC]S\d{2}[FHU]|TDT45(?:18|41)_4G|TDT3778_Wi_E|TDT4528_4G_E'
   device: 'tv'
   models:
-    - regex: '(?:TopDevice_)?(TDTV\d{2}BS\d{2}[FHU])'
+    - regex: '(?:TopDevice_)?(TDTV\d{2}[BC]S\d{2}[FHU])'
       model: '$1'
     - regex: 'TDT4518_4G'
       device: 'tablet'
       model: 'A8'
+    - regex: 'TDT4541_4G'
+      device: 'tablet'
+      model: 'A10'
+    - regex: 'TDT3778_Wi_E'
+      device: 'tablet'
+      model: 'K8'
+    - regex: 'TDT4528_4G_E'
+      device: 'tablet'
+      model: 'C8'
 
 # Ctroniq (https://www.ctroniq.com/)
 Ctroniq:
@@ -38548,7 +39236,7 @@ ANXONIT:
 
 # Vityaz or vityas
 Vityaz:
-  regex: '(24LH1207|43LU1204)(?:[);/ ]|$)'
+  regex: '(24LH1207|43L[FU]1204|50LU1204)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -38562,11 +39250,11 @@ VIIPOO:
 
 # GOODTEL
 GOODTEL:
-  regex: '(?:G10_EEA|CNOTE 50)(?:[);/ ]|$)'
+  regex: '(?:G(?:3|10)_EEA|CNOTE 50)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'G10_EEA'
-      model: 'G10'
+    - regex: 'G(3|10)_EEA'
+      model: 'G$1'
     - regex: 'CNOTE 50'
       device: 'smartphone'
       model: 'CNOTE 50'
@@ -38733,11 +39421,13 @@ DPA:
 
 # SkyStream
 SkyStream:
-  regex: 'SKYSTREAM_3Plus(?:[);/ ]|$)'
+  regex: 'SKYSTREAM[_ ](?:3Plus|One)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'SKYSTREAM_3Plus'
+    - regex: 'SKYSTREAM[_ ]3Plus'
       model: 'III Plus'
+    - regex: 'SKYSTREAM[_ ]One'
+      model: 'One'
 
 # Supraim
 Supraim:
@@ -38753,9 +39443,11 @@ Bolva:
 
 # DIJITSU (http://dijitsu.com.tr/)
 DIJITSU:
-  regex: 'DIJITSU_'
+  regex: 'DIJITSU_|(?:DCT 90)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'DCT 90'
+      model: 'DCT 90'
     - regex: 'DIJITSU[_ ]Smart[_ ]A11s'
       model: 'Smart A11s'
 
@@ -38926,7 +39618,7 @@ BAFF:
   models:
     - regex: 'BAFF(\d{2})YFHD'
       model: '$1Y FHD'
-    - regex: 'BAFF(\d{2})Y(STV-R)'
+    - regex: 'BAFF(\d{2})Y(STV(?:-R)?)'
       model: '$1Y $2'
 
 # GroBerwert
@@ -38945,11 +39637,18 @@ BARTEC:
 
 # FOSSiBOT (www.fossibot.com)
 FOSSiBOT:
-  regex: '(?:android 1[23];(?: [\w-]+;)? (?:F10[12])|F101 Pro)(?:[);/ ]|$)'
+  regex: '(?:android 1[23](?:[\d.]*);(?: [\w-]+;)? (?:F10[12])|F10[16] Pro|DT[12])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'F101 Pro'
-      model: 'F101 Pro'
+    - regex: 'DT1 Lite'
+      device: 'tablet'
+      model: 'DT1 Lite'
+    - regex: ' (DT[12])(?:[);/ ]|$)'
+      device: 'tablet'
+      model: '$1'
+
+    - regex: 'F(10[16]) Pro'
+      model: 'F$1 Pro'
     - regex: 'F(10[12])(?:[);/ ]|$)'
       model: 'F$1'
 
@@ -38969,13 +39668,13 @@ Nanho:
 
 # Vekta (myvekta.ru)
 Vekta:
-  regex: '(LD-65SU8815BS|LD-32SR4850BS|LD-50SU8921BS|LD-43SF4850BS)(?:[);/ ]|$)'
+  regex: '(LD-65SU8815BS|LD-32SR4850BS|LD-50SU8921BS|LD-32SR5112BS|LD-43SF4850BS)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Accesstyle (accesstyle.ru)
 Accesstyle:
-  regex: '(U43EY1500B|F32EY1500B)(?:[);/ ]|$)'
+  regex: '(U43EY1500B|[FH]32EY1500B)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -39025,20 +39724,10 @@ Epic:
 
 # AMCV
 AMCV:
-  regex: '(LE-3[29]ZTHS25)(?:[);/ ]|$)'
+  regex: '(LE-3[29]ZTHS25|LE-50ZTUS30)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
-# F+ or F-Plus (fplusmobile.ru)
-F+:
-  regex: '(?:(?:SH6[05]|SA50|SP65)_(?:2[13]|66)\d{3}|H166)(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: '(H166)(?:[);/ ]|$)'
-      model: '$1'
-    - regex: '(SH6[05]|SA50|SP65)_(?:2[13]|66)\d{3}'
-      model: '$1'
-
 # Sber (sberdevices.ru)
 Sber:
   regex: '(SberBox|SaluteTV)(?:[);/ ]|$)'
@@ -39113,9 +39802,13 @@ Arçelik:
 
 # TwinMOS
 TwinMOS:
-  regex: '(MQ703G)_1(?:[);/ ]|$)'
+  regex: 'TwinTAB|(?:MQ703G)_1(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: '(MQ703G)_1'
+      model: '$1'
+    - regex: 'TwinTAB-(T103GQ1)'
+      model: '$1'
 
 # Getnord (getnord.com)
 Getnord:
@@ -39125,17 +39818,19 @@ Getnord:
 
 # FreeYond (www.freeyond.com)
 FreeYond:
-  regex: '(?:2305003M|2306004M)(?:[);/ ]|$)'
+  regex: '(?:2305003M|2306004M|2308005M)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '2305003M'
       model: 'M5A'
+    - regex: '2308005M'
+      model: 'M6'
     - regex: '2306004M'
       model: 'F9S'
 
 # None (n-onepc.com)
 N-one:
-  regex: 'Npad[ _-]?(?:X1?|plus|Air|Pro)(?:[);/ ]|$)'
+  regex: 'Npad[ _-]?(?:X1?|plus|Air|Pro|Y1|S)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Npad[ _-]?plus'
@@ -39144,12 +39839,14 @@ N-one:
       model: 'NPad Air'
     - regex: 'Npad[ _-]?Pro'
       model: 'NPad Pro'
+    - regex: 'NpadS'
+      model: 'NPad S'
     - regex: 'Npad[ _]([^/;)]+)(?: Build|[);])'
       model: 'NPad $1'
 
 # Maunfeld (www.maunfeld.ru)
 Maunfeld:
-  regex: '(MLT43USD02|MLT32HSX02)(?:[);/ ]|$)'
+  regex: '(MLT43USD02|MLT32HSX02|MLT55USX02)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -39309,6 +40006,12 @@ Hisense:
     - regex: '(?:HS-)?Hisense ([^/]+)/'
       model: '$1'
 
+# HiBY
+HiBy:
+  regex: '(?:R6III)(?:[);/ ]|$)'
+  device: 'portable media player'
+  model: 'R6 Gen III'
+
 # VOLIA (https://my.volia.com)
 VOLIA:
   regex: '(VOL001)(?:[);/ ]|$)'
@@ -39413,7 +40116,7 @@ AUPO:
 
 # CCIT
 CCIT:
-  regex: 'CCIT[_ ]|CCITA715G'
+  regex: 'CCIT[_ ]|CCITA715G|(?:KT[236]00Pro)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'CCIT[ _]Xedition'
@@ -39422,6 +40125,8 @@ CCIT:
     - regex: 'CCIT[ _]405(?: Build|[);])'
       model: 'Vogue 405'
       device: 'smartphone'
+    - regex: 'KT([236]00)Pro'
+      model: 'KT$1 Pro'
     - regex: 'CCIT[_ ]?([^;/)]+)(?: Build|[);])'
       model: '$1'
 
@@ -39445,6 +40150,226 @@ Globmall:
   device: 'tv'
   model: '$1'
 
+# Heimat
+Heimat:
+  regex: 'HEIMAT[ _](H43PU2303SVF)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# AngelTech
+AngelTech:
+  regex: 'Android 8(?:[\d.]*);(?: [\w-]+;)? P80(?: Build|[);])'
+  device: 'tablet'
+  model: 'P80'
+
+# MAG
+MAG:
+  regex: '(CRD55-UHD9)(?: Build|[);])'
+  device: 'tv'
+  model: '$1'
+
+# S-Color or SColor
+S-Color:
+  regex: '(GT40 Ultra)(?: Build|[);])'
+  device: 'tablet'
+  model: '$1'
+
+# W&O
+'W&O':
+  regex: '(?:X9 CALL2| WO [89])(?: Build|[);])'
+  device: 'wearable'
+  models:
+    - regex: ' WO ([89])'
+      device: 'tablet'
+      model: 'WO$1'
+    - regex: 'X9 CALL2'
+      model: 'X9 Call 2'
+
+# Cuiud
+Cuiud:
+  regex: 'cuiud'
+  device: 'smartphone'
+  models:
+    - regex: 'Cuiud F7'
+      model: 'F7'
+
+# Cidea or C idea (http://cidealife.com/)
+C Idea:
+  regex: '(?:CM7800plus)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'CM7800 Plus'
+
+# Daria
+Daria:
+  regex: '(DM-B50104)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Wainyok
+Wainyok:
+  regex: ' (P10X)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Aceline (DNS retail)
+Aceline:
+  regex: '(24HHY1|32HHY1)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# CADENA
+CADENA:
+  regex: 'CADENA[_ ]'
+  device: 'tv'
+  models:
+    - regex: 'CADENA[_ ]Pro[_ ]([^;/)]+)(?: Build|[);])'
+      model: 'Pro $1'
+
+# Jin Tu (jintu.ru)
+Jin Tu:
+  regex: 'JIN[ _]TU[ _]([^;/)]+)(?: Build|[);])'
+  device: 'peripheral'
+  model: '$1'
+
+# Whoop (whoopconnect.com)
+Whoop:
+  regex: '(TAB-8US2)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# TECHNOSAT (technosat-ua.com)
+TECHNOSAT:
+  regex: 'TECHNOSAT[ _]'
+  device: 'tv'
+  models:
+    - regex: 'X98mini'
+      model: 'X98 Mini'
+    - regex: 'TECHNOSAT[ _](W2)'
+      model: '$1'
+
+# Lville or LVILLE
+Lville:
+  regex: '(TPC1013)'
+  device: 'tablet'
+  model: '$1'
+
+# KENSHI
+KENSHI:
+  regex: '(?:Android 13(?:[\d.]*);(?: [\w-]+;)? (?:E1[1278]|E28|E38|H38|H21|H19|H11)|Armor_C1w)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'Armor_C1w'
+      device: 'smartphone'
+      model: 'Armor C1w'
+    - regex: 'Android 13(?:[\d.]*);(?: [\w-]+;)? (E1[1278]|E28|E38|H38|H21|H19|H11)(?:[);/ ]|$)'
+      model: '$1'
+
+# HOLLEBERG (holleberg.com)
+HOLLEBERG:
+  regex: 'HGTV-LED(\d{2}[FU]?HDSQ?\d{3}T2)(?:[);/ ]|$)'
+  device: 'tv'
+  model: 'HGTV-LED$1'
+
+# CEPTER (ceptertech.com)
+CEPTER:
+ regex: 'CEPTER(TAB10L)'
+ device: 'tablet'
+ model: '$1'
+
+# SoulLink
+SoulLink:
+ regex: 'Soullink[ _](S1)'
+ device: 'tv'
+ model: '$1'
+
+# Clovertek or Clover
+Clovertek:
+ regex: 'Clovertek[ _](G12)'
+ device: 'tablet'
+ model: '$1'
+
+# Padpro
+Padpro:
+  regex: 'GT40promax'
+  device: 'tablet'
+  model: 'GT40 Pro Max'
+
+# GOLDBERG
+GOLDBERG:
+  regex: '(?:EVO-VX1)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'EVO-VX1'
+      model: EVO VX1
+
+# Tuvio
+Tuvio:
+  regex: '(TQ55UFBTV1|TD32HF[GW]EV1|TD43FFGTV1|TD43UFGCV1|TD50UFGEV1|TD55UFGEV1|TD65UFGCV1|TD75UFGCV1)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# WS or WS(SZ)
+WS:
+  regex: '(TD-TP010G-2)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# FLYCOAY
+FLYCOAY:
+  regex: '(Y121-EEA)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# KVADRA (квадра.рф, kvadra.tech)
+KVADRA:
+  regex: 'KVADRA_'
+  device: 'tablet'
+  models:
+    - regex: 'KVADRA_T'
+      model: 'T'
+
+# Azeyou
+Azeyou:
+  regex: '(AT1011E)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# ExtraLink
+ExtraLink:
+  regex: 'ESP-300(?:[);/ ]|$)'
+  device: 'peripheral'
+  model: 'Smart Life ESP-300'  # projector
+
+# VNPT Technology (www.vnpt-technology.vn)
+VNPT Technology:
+  regex: 'VNT_Tab8(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'VNT-Tab8'
+
+# Arival or A-Rival
+Arival:
+  regex: 'BioniQP116(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'Bioniq P116'
+
+# VILLAON
+VILLAON:
+  regex: 'VILLAON[_ ]([^;/)]+)(?: Build|[);])'
+  device: 'smartphone'
+  model: '$1'
+
+# Neoregent
+Neoregent:
+  regex: 'KT1007_EEA(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'KT1007'
+
+# Renova (renova.market)
+Renova:
+  regex: '(TLE-50USBM)(?:[);/ ]|$)'
+  device: 'tv'
+  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)(?:[);/ ]|$)'
diff --git a/includes/libraries/udd/regexes/oss.yml b/includes/libraries/udd/regexes/oss.yml
index f163ac5..fd9361c 100644
--- a/includes/libraries/udd/regexes/oss.yml
+++ b/includes/libraries/udd/regexes/oss.yml
@@ -5,6 +5,13 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# Red Star (https://en.wikipedia.org/wiki/Red_Star_OS)
+##########
+- regex: '붉은별|Fedora/(?:\d+\.[\d.-]+)\.rs(\d+(?:[_.]\d+)*)'
+  name: 'Red Star'
+  version: '$1'
+
 ##########
 # Proxmox VE (https://pve.proxmox.com/wiki/Main_Page)
 ##########
@@ -614,7 +621,7 @@
   name: 'Android'
   version: ''
 
-- regex: '(?:Android OS|OMDroid)[ /](\d+[\.\d]*)'
+- regex: '(?:Android OS|OMDroid|sdk_gphone64_arm64-userdebug)[ /](\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
 
@@ -650,6 +657,10 @@
   name: 'Android'
   version: '$1'
 
+- regex: '\(Android:.*\); API (\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
 - regex: ' Adr |.*(?<!like |/ )Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
@@ -1056,6 +1067,10 @@
   name: 'tvOS'
   version: '$1'
 
+- regex: 'Apple TV; iOS ((?:9|1[0-7])[_\.]\d+(?:[_.]\d+)*)'
+  name: 'tvOS'
+  version: '$1'
+
 - regex: 'iOS(?:; |/)((?:9|1[0-7])\.\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
   name: 'tvOS'
   version: '$1'
@@ -1064,6 +1079,10 @@
   name: 'tvOS'
   version: '$1'
 
+- regex: 'AppleTV(?:/?(\d+[\.\d]+))?'
+  name: 'tvOS'
+  version: '$1'
+
 ##########
 # watchOS (https://developer.apple.com/watchos/)
 ##########
@@ -1694,10 +1713,6 @@
   name: 'Google TV'
   version: '$1'
 
-- regex: 'AppleTV(?:/?(\d+[\.\d]+))?'
-  name: 'tvOS'
-  version: '$1'
-
 - regex: 'WebTV/(\d+[\.\d]+)'
   name: 'WebTV'
   version: '$1'
@@ -1798,7 +1813,7 @@
   name: 'GNU/Linux'
   version: '$1'
 
-- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu'
+- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu|X11'
   name: 'GNU/Linux'
   version: ''