From 7b035a11e715fa73908f5b337c509c1ab5ddac1b Mon Sep 17 00:00:00 2001
From: Pierre Lannoy <pierre@hosterra.eu>
Date: Fri, 22 Nov 2024 19:06:11 +0100
Subject: [PATCH] Ready to release 4.2.0.

---
 CHANGELOG.md                                  |   19 +
 device-detector.php                           |    2 +-
 includes/libraries/class-libraries.php        |    2 +-
 includes/libraries/udd/ClientHints.php        |   35 +-
 includes/libraries/udd/DeviceDetector.php     |   25 +-
 .../libraries/udd/Parser/Client/Browser.php   |  112 +-
 .../Parser/Client/Browser/Engine/Version.php  |    2 +-
 .../Parser/Device/AbstractDeviceParser.php    |  157 +-
 .../libraries/udd/Parser/OperatingSystem.php  |   37 +-
 includes/libraries/udd/regexes/bots.yml       |  420 +-
 .../udd/regexes/client/browser_engine.yml     |    2 +-
 .../libraries/udd/regexes/client/browsers.yml |  201 +-
 .../udd/regexes/client/hints/apps.yml         |   12 +
 .../udd/regexes/client/hints/browsers.yml     |   36 +-
 .../udd/regexes/client/libraries.yml          |   15 +
 .../udd/regexes/client/mobile_apps.yml        |   85 +-
 includes/libraries/udd/regexes/client/pim.yml |   12 +-
 .../libraries/udd/regexes/device/consoles.yml |    8 +-
 .../libraries/udd/regexes/device/mobiles.yml  | 3834 ++++++++++++-----
 .../udd/regexes/device/notebooks.yml          |   13 +
 .../regexes/device/portable_media_player.yml  |   12 +
 .../udd/regexes/device/televisions.yml        |    2 +-
 includes/libraries/udd/regexes/oss.yml        |  204 +-
 init.php                                      |    2 +-
 readme.txt                                    |    4 +-
 25 files changed, 4137 insertions(+), 1116 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8cde4d1..d37a059 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,25 @@ 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.2.0] - 2024-11-22
+
+### Added
+- Compatibility with WordPress 6.7.
+
+### Changed
+- Upgraded UDD from version 6.3.2 to version 6.4.1: dozens of added and improved detections.
+- Ability to self-update from Github.
+- The plugin user agent is now more consistent and "standard".
+
+### Fixed
+- There's a WordPress core "feature" which causes some PII to leak (to wp.org) during plugin and theme updates. This is no more the case for this plugin.
+- In some cases, a WordPress notice can be triggered concerning the loading sequence of translations.
+
+### Removed
+- Test site launching from wordpress.org plugin page.
+- All Databeam hooks and libraries, as the Databeam project is abandoned.
+- Dependency on wp.org for updates.
+
 ## [4.1.0] - 2024-09-10
 
 ### Added
diff --git a/device-detector.php b/device-detector.php
index d7f46c3..30fa299 100644
--- a/device-detector.php
+++ b/device-detector.php
@@ -10,7 +10,7 @@
  * Plugin Name:       Device Detector
  * Plugin URI:        https://perfops.one/device-detector
  * Description:       Full featured analytics reporting and management tool that detects all devices accessing your WordPress site.
- * Version:           4.1.0
+ * Version:           4.2.0
  * Requires at least: 6.2
  * Requires PHP:      8.1
  * Author:            Pierre Lannoy / PerfOps One
diff --git a/includes/libraries/class-libraries.php b/includes/libraries/class-libraries.php
index 0c83a1a..14f5c3d 100644
--- a/includes/libraries/class-libraries.php
+++ b/includes/libraries/class-libraries.php
@@ -62,7 +62,7 @@ public static function init() {
 			'name'    => 'Universal Device Detection',
 			'prefix'  => 'UDD',
 			'base'    => PODD_VENDOR_DIR . 'udd/',
-			'version' => '6.3.1',
+			'version' => '6.4.1',
 			// phpcs:ignore
 			'author'  => 'Matomo Analytics',
 			'url'     => 'https://github.com/matomo-org/device-detector',
diff --git a/includes/libraries/udd/ClientHints.php b/includes/libraries/udd/ClientHints.php
index 8c0e898..4eaacf3 100644
--- a/includes/libraries/udd/ClientHints.php
+++ b/includes/libraries/udd/ClientHints.php
@@ -76,6 +76,13 @@ class ClientHints
      */
     protected $app = '';
 
+    /**
+     * Represents `Sec-CH-UA-Form-Factors` header field: form factor device type name
+     *
+     * @var array
+     */
+    protected $formFactors = [];
+
     /**
      * Constructor
      *
@@ -88,8 +95,9 @@ class ClientHints
      * @param string $architecture    `Sec-CH-UA-Arch` header field
      * @param string $bitness         `Sec-CH-UA-Bitness`
      * @param string $app             `HTTP_X-REQUESTED-WITH`
+     * @param array  $formFactors     `Sec-CH-UA-Form-Factors` header field
      */
-    public function __construct(string $model = '', string $platform = '', string $platformVersion = '', string $uaFullVersion = '', array $fullVersionList = [], bool $mobile = false, string $architecture = '', string $bitness = '', string $app = '') // phpcs:ignore Generic.Files.LineLength
+    public function __construct(string $model = '', string $platform = '', string $platformVersion = '', string $uaFullVersion = '', array $fullVersionList = [], bool $mobile = false, string $architecture = '', string $bitness = '', string $app = '', array $formFactors = []) // phpcs:ignore Generic.Files.LineLength
     {
         $this->model           = $model;
         $this->platform        = $platform;
@@ -100,6 +108,7 @@ public function __construct(string $model = '', string $platform = '', string $p
         $this->architecture    = $architecture;
         $this->bitness         = $bitness;
         $this->app             = $app;
+        $this->formFactors     = $formFactors;
     }
 
     /**
@@ -224,6 +233,16 @@ public function getApp(): string
         return $this->app;
     }
 
+    /**
+     * Returns the formFactor device type name
+     *
+     * @return array
+     */
+    public function getFormFactors(): array
+    {
+        return $this->formFactors;
+    }
+
     /**
      * Factory method to easily instantiate this class using an array containing all available (client hint) headers
      *
@@ -237,6 +256,7 @@ public static function factory(array $headers): ClientHints
         $app             = '';
         $mobile          = false;
         $fullVersionList = [];
+        $formFactors     = [];
 
         foreach ($headers as $name => $value) {
             switch (\str_replace('_', '-', \strtolower((string) $name))) {
@@ -319,6 +339,16 @@ public static function factory(array $headers): ClientHints
                         $app = $value;
                     }
 
+                    break;
+                case 'formfactors':
+                case 'http-sec-ch-ua-form-factors':
+                case 'sec-ch-ua-form-factors':
+                    if (\is_array($value)) {
+                        $formFactors = \array_map('\strtolower', $value);
+                    } elseif (\preg_match_all('~"([a-z]+)"~i', \strtolower($value), $matches)) {
+                        $formFactors = $matches[1];
+                    }
+
                     break;
             }
         }
@@ -332,7 +362,8 @@ public static function factory(array $headers): ClientHints
             $mobile,
             $architecture,
             $bitness,
-            $app
+            $app,
+            $formFactors
         );
     }
 }
diff --git a/includes/libraries/udd/DeviceDetector.php b/includes/libraries/udd/DeviceDetector.php
index ff7d390..ff3f5ae 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.2';
+    public const VERSION = '6.4.1';
 
     /**
      * Constant used as value for unknown browser / os
@@ -1039,6 +1039,27 @@ protected function parseDevice(): void
             $this->device = AbstractDeviceParser::DEVICE_TYPE_TABLET;
         }
 
+        /**
+         * All devices running Puffin Secure Browser that contain letter 'D' are assumed to be desktops
+         */
+        if (null === $this->device && $this->matchUserAgent('Puffin/(?:\d+[.\d]+)[LMW]D')) {
+            $this->device = AbstractDeviceParser::DEVICE_TYPE_DESKTOP;
+        }
+
+        /**
+         * All devices running Puffin Web Browser that contain letter 'P' are assumed to be smartphones
+         */
+        if (null === $this->device && $this->matchUserAgent('Puffin/(?:\d+[.\d]+)[AIFLW]P')) {
+            $this->device = AbstractDeviceParser::DEVICE_TYPE_SMARTPHONE;
+        }
+
+        /**
+         * All devices running Puffin Web Browser that contain letter 'T' are assumed to be tablets
+         */
+        if (null === $this->device && $this->matchUserAgent('Puffin/(?:\d+[.\d]+)[AILW]T')) {
+            $this->device = AbstractDeviceParser::DEVICE_TYPE_TABLET;
+        }
+
         /**
          * All devices running Opera TV Store are assumed to be a tv
          */
@@ -1049,7 +1070,7 @@ protected function parseDevice(): void
         /**
          * All devices that contain Andr0id in string are assumed to be a tv
          */
-        if ($this->matchUserAgent('Andr0id|(?:Android(?: UHD)?|Google) TV|\(lite\) TV|BRAVIA')) {
+        if ($this->matchUserAgent('Andr0id|(?:Android(?: UHD)?|Google) TV|\(lite\) TV|BRAVIA| TV$')) {
             $this->device = AbstractDeviceParser::DEVICE_TYPE_TV;
         }
 
diff --git a/includes/libraries/udd/Parser/Client/Browser.php b/includes/libraries/udd/Parser/Client/Browser.php
index d90f701..3e5c7a0 100644
--- a/includes/libraries/udd/Parser/Client/Browser.php
+++ b/includes/libraries/udd/Parser/Client/Browser.php
@@ -82,6 +82,7 @@ class Browser extends AbstractClientParser
         '4A' => 'Acoo Browser',
         'BW' => 'AdBlock Browser',
         'A7' => 'Adult Browser',
+        '8A' => 'Ai Browser',
         'A9' => 'Airfind Secure Browser',
         'AF' => 'ANT Fresco',
         'AG' => 'ANTGalio',
@@ -99,6 +100,7 @@ class Browser extends AbstractClientParser
         'A4' => 'AOL Shield Pro',
         '2A' => 'Aplix',
         'A6' => 'AppBrowzer',
+        '0A' => 'AppTec Secure Browser',
         'AP' => 'APUS Browser',
         'AR' => 'Arora',
         'AX' => 'Arctic Fox',
@@ -107,6 +109,7 @@ class Browser extends AbstractClientParser
         'PN' => 'APN Browser',
         '6A' => 'Arachne',
         'RA' => 'Arc',
+        'R5' => 'Armorfly Browser',
         'AI' => 'Arvin',
         'AK' => 'Ask.com',
         'AU' => 'Asus Browser',
@@ -117,6 +120,7 @@ class Browser extends AbstractClientParser
         'VG' => 'AVG Secure Browser',
         'AC' => 'Avira Secure Browser',
         'A1' => 'AwoX',
+        '7A' => 'Awesomium',
         '5B' => 'Basic Web Browser',
         'BA' => 'Beaker Browser',
         'BM' => 'Beamrise',
@@ -151,6 +155,7 @@ class Browser extends AbstractClientParser
         'BX' => 'BrowseX',
         'BZ' => 'Browzar',
         'B7' => 'Browlser',
+        'M9' => 'Browser Mini',
         '4B' => 'BrowsBit',
         'BY' => 'Biyubi',
         'BF' => 'Byffox',
@@ -195,6 +200,7 @@ class Browser extends AbstractClientParser
         'C5' => 'Chromium GOST',
         'CY' => 'Cyberfox',
         'CS' => 'Cheshire',
+        '8C' => 'Cromite',
         'RC' => 'Crow Browser',
         'CT' => 'Crusta',
         'CG' => 'Craving Explorer',
@@ -267,6 +273,7 @@ class Browser extends AbstractClientParser
         'FH' => 'Flash Browser',
         'FS' => 'Flast',
         'F5' => 'Flyperlink',
+        'F9' => 'FOSS Browser',
         'FU' => 'FreeU',
         'F6' => 'Freedom Browser',
         'FT' => 'Frost',
@@ -287,6 +294,7 @@ class Browser extends AbstractClientParser
         'G2' => 'GO Browser',
         'RN' => 'GreenBrowser',
         'HW' => 'Habit Browser',
+        'H7' => 'Halo Browser',
         'HB' => 'Harman Browser',
         'HS' => 'HasBrowser',
         'HA' => 'Hawk Turbo Browser',
@@ -298,6 +306,7 @@ class Browser extends AbstractClientParser
         'H4' => 'Holla Web Browser',
         'H5' => 'HotBrowser',
         'HJ' => 'HotJava',
+        'H6' => 'HONOR Browser',
         'HT' => 'HTC Browser',
         'HU' => 'Huawei Browser Mobile',
         'HP' => 'Huawei Browser',
@@ -308,6 +317,7 @@ class Browser extends AbstractClientParser
         'I6' => 'iDesktop PC Browser',
         'IC' => 'iCab',
         'I2' => 'iCab Mobile',
+        '4I' => 'iNet Browser',
         'I1' => 'Iridium',
         'I3' => 'Iron Mobile',
         'I4' => 'IceCat',
@@ -321,6 +331,7 @@ class Browser extends AbstractClientParser
         'I9' => 'Insta Browser',
         'IE' => 'Internet Explorer',
         'I7' => 'Internet Browser Secure',
+        '5I' => 'Internet Webbrowser',
         '3I' => 'Intune Managed Browser',
         'I5' => 'Indian UC Mini Browser',
         'Z0' => 'InBrowser',
@@ -337,6 +348,7 @@ class Browser extends AbstractClientParser
         'JZ' => 'JUZI Browser',
         'KB' => 'K.Browser',
         'KF' => 'Keepsafe Browser',
+        'K7' => 'KeepSolid Browser',
         'KS' => 'Kids Safe Browser',
         'KI' => 'Kindle Browser',
         'KM' => 'K-meleon',
@@ -348,6 +360,7 @@ class Browser extends AbstractClientParser
         'K4' => 'Kitt',
         'KW' => 'Kiwi',
         'KD' => 'Kode Browser',
+        'KU' => 'KUN',
         'KT' => 'KUTO Mini Browser',
         'KY' => 'Kylo',
         'KZ' => 'Kazehakase',
@@ -390,14 +403,16 @@ class Browser extends AbstractClientParser
         'M3' => 'Midori Lite',
         'M6' => 'MixerBox AI',
         'MO' => 'Mobicip',
-        'MU' => 'MIUI Browser',
+        'MU' => 'Mi Browser',
         'MS' => 'Mobile Silk',
         'MK' => 'Mogok Browser',
+        'M8' => 'Motorola Internet Browser',
         'MN' => 'Minimo',
         'MT' => 'Mint Browser',
         'MX' => 'Maxthon',
         'M4' => 'MaxTube Browser',
         'MA' => 'Maelstrom',
+        '3M' => 'Mises',
         'MM' => 'Mmx Browser',
         'NM' => 'MxNitro',
         'MY' => 'Mypal',
@@ -422,6 +437,7 @@ class Browser extends AbstractClientParser
         'NP' => 'NetPositive',
         'NS' => 'Netscape',
         'WR' => 'NextWord Browser',
+        'N8' => 'Ninesky',
         'NT' => 'NTENT Browser',
         'NU' => 'Nuanti Meta',
         'NI' => 'Nuviu',
@@ -440,6 +456,7 @@ class Browser extends AbstractClientParser
         'OL' => 'OnBrowser Lite',
         'OE' => 'ONE Browser',
         'N4' => 'Onion Browser',
+        '1N' => 'ONIONBrowser',
         'Y1' => 'Opera Crypto',
         'OX' => 'Opera GX',
         'OG' => 'Opera Neon',
@@ -461,27 +478,35 @@ class Browser extends AbstractClientParser
         'O4' => 'Open Browser',
         '4U' => 'Open Browser 4U',
         '5G' => 'Open Browser fast 5G',
+        '5O' => 'Open Browser Lite',
         'O7' => 'Open TV Browser',
         'OW' => 'OmniWeb',
         'OT' => 'Otter Browser',
         '4O' => 'Owl Browser',
+        'JR' => 'OJR Browser',
         'PL' => 'Palm Blazer',
         'PM' => 'Pale Moon',
         'PY' => 'Polypane',
+        '8P' => 'Prism',
         'PP' => 'Oppo Browser',
         'P6' => 'Opus Browser',
         'PR' => 'Palm Pre',
-        'PU' => 'Puffin',
+        '7I' => 'Puffin Cloud Browser',
+        '6I' => 'Puffin Incognito Browser',
+        'PU' => 'Puffin Secure Browser',
         '2P' => 'Puffin Web Browser',
         'PW' => 'Palm WebPro',
         'PA' => 'Palmscape',
         'P7' => 'Pawxy',
+        '0P' => 'Peach Browser',
         'PE' => 'Perfect Browser',
+        'K6' => 'Perk',
         'P1' => 'Phantom.me',
         'PH' => 'Phantom Browser',
         'PX' => 'Phoenix',
         'PB' => 'Phoenix Browser',
         '5P' => 'Photon',
+        'N9' => 'Pintar Browser',
         'P9' => 'PirateBrowser',
         'P8' => 'PICO Browser',
         'PF' => 'PlayFree Browser',
@@ -489,16 +514,22 @@ class Browser extends AbstractClientParser
         'PO' => 'Polaris',
         'PT' => 'Polarity',
         'LY' => 'PolyBrowser',
+        '9P' => 'Presearch',
+        'BP' => 'Privacy Browser',
         'PI' => 'PrivacyWall',
         'P4' => 'Privacy Explorer Fast Safe',
+        'X5' => 'Privacy Pioneer Browser',
         'P3' => 'Private Internet Browser',
         'P5' => 'Proxy Browser',
         '7P' => 'Proxyium',
         '6P' => 'Proxynet',
+        '2F' => 'ProxyFox',
+        '2M' => 'ProxyMax',
         'P2' => 'Pi Browser',
         'P0' => 'PronHub Browser',
         'PC' => 'PSI Secure Browser',
         'RW' => 'Reqwireless WebViewer',
+        'RO' => 'Roccat',
         'PS' => 'Microsoft Edge',
         'QA' => 'Qazweb',
         'QI' => 'Qiyu',
@@ -513,10 +544,12 @@ class Browser extends AbstractClientParser
         'QU' => 'Quark',
         'QZ' => 'QupZilla',
         'QM' => 'Qwant Mobile',
+        'Q5' => 'QtWeb',
         'QW' => 'QtWebEngine',
         'R3' => 'Rakuten Browser',
         'R4' => 'Rakuten Web Search',
         'R2' => 'Raspbian Chromium',
+        'RT' => 'RCA Tor Explorer',
         'RE' => 'Realme Browser',
         'RK' => 'Rekonq',
         'RM' => 'RockMelt',
@@ -564,6 +597,7 @@ class Browser extends AbstractClientParser
         'LE' => 'Smart Lenovo Browser',
         'OZ' => 'Smooz',
         'SN' => 'Snowshoe',
+        'K5' => 'Spark',
         'B1' => 'Spectre Browser',
         'S2' => 'Splash',
         'SI' => 'Sputnik Browser',
@@ -582,6 +616,7 @@ class Browser extends AbstractClientParser
         'S4' => 'Steam In-Game Overlay',
         'ST' => 'Streamy',
         'SX' => 'Swiftfox',
+        'W7' => 'Swiftweasel',
         'SZ' => 'Seznam Browser',
         'W1' => 'Sweet Browser',
         '2X' => 'SX Browser',
@@ -600,10 +635,14 @@ class Browser extends AbstractClientParser
         'TI' => 'Tint Browser',
         'TL' => 'TrueLocation Browser',
         'TC' => 'TUC Mini Browser',
+        'TK' => 'TUSK',
         'TU' => 'Tungsten',
         'TG' => 'ToGate',
+        'T3' => 'Total Browser',
+        'TQ' => 'TQ Browser',
         'TS' => 'TweakStyle',
         'TV' => 'TV Bro',
+        'T4' => 'TV-Browser Internet',
         'U0' => 'U Browser',
         'UB' => 'UBrowser',
         'UC' => 'UC Browser',
@@ -611,12 +650,14 @@ class Browser extends AbstractClientParser
         'UM' => 'UC Browser Mini',
         'UT' => 'UC Browser Turbo',
         'UI' => 'Ui Browser Mini',
+        'UP' => 'UPhone Browser',
         'UR' => 'UR Browser',
         'UZ' => 'Uzbl',
         'UE' => 'Ume Browser',
         'V0' => 'vBrowser',
         'VA' => 'Vast Browser',
         'V3' => 'VD Browser',
+        'VR' => 'Veera',
         'VE' => 'Venus Browser',
         'WD' => 'Vewd Browser',
         'V5' => 'VibeMate',
@@ -628,6 +669,7 @@ class Browser extends AbstractClientParser
         'VB' => 'Vision Mobile Browser',
         'V4' => 'Vertex Surf',
         'VM' => 'VMware AirWatch',
+        'V6' => 'VMS Mosaic',
         'VK' => 'Vonkeror',
         'VU' => 'Vuhuv',
         'WI' => 'Wear Internet Browser',
@@ -647,10 +689,12 @@ class Browser extends AbstractClientParser
         'WT' => 'WeTab Browser',
         '1W' => 'World Browser',
         'WL' => 'Wolvic',
+        'WK' => 'Wukong Browser',
         'WY' => 'Wyzo',
         'YG' => 'YAGI',
         'YJ' => 'Yahoo! Japan Browser',
         'YA' => 'Yandex Browser',
+        'Y4' => 'Yandex Browser Corp',
         'YL' => 'Yandex Browser Lite',
         'YN' => 'Yaani Browser',
         'Y2' => 'Yo Browser',
@@ -659,6 +703,7 @@ class Browser extends AbstractClientParser
         'Y3' => 'YouBrowser',
         'YZ' => 'Yuzu Browser',
         'XR' => 'xBrowser',
+        'X3' => 'MMBOX XBrowser',
         'XB' => 'X Browser Lite',
         'X0' => 'X-VPN',
         'X1' => 'xBrowser Pro Super Fast',
@@ -666,12 +711,14 @@ class Browser extends AbstractClientParser
         'XT' => 'XtremeCast',
         'XS' => 'xStand',
         'XI' => 'Xiino',
+        'X4' => 'XnBrowse',
         'XO' => 'Xooloo Internet',
         'XV' => 'Xvast',
         'ZE' => 'Zetakey',
         'ZV' => 'Zvu',
         'ZI' => 'Zirco Browser',
         'ZR' => 'Zordo Browser',
+        'ZT' => 'ZTE Browser',
 
         // detected browsers in older versions
         // 'IA' => 'Iceape',  => pim
@@ -684,9 +731,9 @@ class Browser extends AbstractClientParser
      * @var array
      */
     protected static $browserFamilies = [
-        'Android Browser'    => ['AN', 'MU'],
+        'Android Browser'    => ['AN'],
         'BlackBerry Browser' => ['BB'],
-        'Baidu'              => ['BD', 'BS'],
+        'Baidu'              => ['BD', 'BS', 'H6'],
         'Amiga'              => ['AV', 'AW'],
         'Chrome'             => [
             'CH', '2B', '7S', 'A0', 'AC', 'A4', 'AE', 'AH', 'AI',
@@ -717,7 +764,10 @@ class Browser extends AbstractClientParser
             'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'P5', 'H5', 'V3',
             'K3', 'Q4', 'G2', 'R2', 'WX', 'XP', '3I', 'BG', 'R0',
             'JO', 'OL', 'GN', 'W4', 'QI', 'E1', 'RI', '8B', '5B',
-            'K4',
+            'K4', 'WK', 'T3', 'K5', 'MU', '9P', 'K6', 'VR', 'N9',
+            'M9', 'F9', '0P', '0A', 'JR', 'D3', 'TK', 'BP', '2F',
+            '2M', 'K7', '1N', '8A', 'H7', 'X3', 'T4', 'X4', '5O',
+            '8C', '3M', '6I', '2P', 'PU', '7I', 'X5',
         ],
         'Firefox'            => [
             'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
@@ -725,7 +775,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', 'N7',
+            '7C', 'N7', 'W7', '8P',
         ],
         'Internet Explorer'  => ['IE', 'CZ', 'BZ', 'IM', 'PS', '3A', '4A', 'RN'],
         'Konqueror'          => ['KO'],
@@ -744,9 +794,9 @@ class Browser extends AbstractClientParser
      */
     protected static $mobileOnlyBrowsers = [
         '36', 'AH', 'AI', 'BL', 'C1', 'C4', 'CB', 'CW', 'DB',
-        'DD', 'DT', 'EU', 'EZ', 'FK', 'FM', 'FR', 'FX', 'GH',
+        '3M', 'DT', 'EU', 'EZ', 'FK', 'FM', 'FR', 'FX', 'GH',
         'GI', 'GR', 'HA', 'HU', 'IV', 'JB', 'KD', 'M1', 'MF',
-        'MN', 'MZ', 'NX', 'OC', 'OI', 'OM', 'OZ', 'PU', 'PI',
+        'MN', 'MZ', 'NX', 'OC', 'OI', 'OM', 'OZ', '2P', 'PI',
         'PE', 'QU', 'RE', 'S0', 'S7', 'SA', 'SB', 'SG', 'SK',
         'ST', 'SU', 'T1', 'UH', 'UM', 'UT', 'VE', 'VV', 'WI',
         'WP', 'YN', 'IO', 'IS', 'HQ', 'RW', 'HI', 'PN', 'BW',
@@ -761,9 +811,12 @@ class Browser extends AbstractClientParser
         'ZR', 'D6', 'F6', 'P3', 'FT', 'A9', 'X2', 'NI', 'FG',
         'TH', 'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'N4', 'P5',
         'H5', 'V3', 'G2', 'BG', 'OL', 'II', 'TL', 'M6', 'Y3',
-        'M7', 'GN', 'D3', 'IG', 'HW', '4O', 'OU', '5P', 'KE',
+        'M7', 'GN', 'JR', 'IG', 'HW', '4O', 'OU', '5P', 'KE',
         '5A', 'TT', '6P', 'G3', '7P', 'VU', 'F8', 'L4', 'DK',
-        'DP', 'KL', 'K4', 'N6',
+        'DP', 'KL', 'K4', 'N6', 'KU', 'WK', 'M8', 'UP', 'ZT',
+        '9P', 'N8', 'VR', 'N9', 'M9', 'F9', '0P', '0A', '2F',
+        '2M', 'K7', '1N', '8A', 'H7', 'X3', 'X4', '5O', '6I',
+        '7I', 'X5',
     ];
 
     /**
@@ -776,6 +829,7 @@ class Browser extends AbstractClientParser
         'Chrome Webview'             => ['Android WebView'],
         'DuckDuckGo Privacy Browser' => ['DuckDuckGo'],
         'Edge WebView'               => ['Microsoft Edge WebView2'],
+        'Mi Browser'                 => ['Miui Browser', 'XiaoMiBrowser'],
         'Microsoft Edge'             => ['Edge'],
         'Norton Private Browser'     => ['Norton Secure Browser'],
         'Vewd Browser'               => ['Vewd Core'],
@@ -936,23 +990,22 @@ public function parse(): ?array
                 $engineVersion = $browserFromUserAgent['engine_version'] ?? '';
             }
 
-            if ('Atom' === $name || 'Huawei Browser' === $name) {
+            // If client hints report the following browsers, we use the version from useragent
+            if (!empty($browserFromUserAgent['version'])
+                && \in_array($short, ['A0', 'AL', 'HP', 'JR', 'MU', 'OM', 'OP', 'VR'])
+            ) {
                 $version = $browserFromUserAgent['version'];
             }
 
-            if ('DuckDuckGo Privacy Browser' === $name) {
-                $version = '';
-            }
-
             if ('Vewd Browser' === $name) {
                 $engine        = $browserFromUserAgent['engine'] ?? '';
                 $engineVersion = $browserFromUserAgent['engine_version'] ?? '';
             }
 
             // If client hints report Chromium, but user agent detects a Chromium based browser, we favor this instead
-            if ('Chromium' === $name
+            if (('Chromium' === $name || 'Chrome Webview' === $name)
                 && !empty($browserFromUserAgent['name'])
-                && 'Chromium' !== $browserFromUserAgent['name']
+                && !\in_array($browserFromUserAgent['short_name'], ['CR', 'CV', 'AN'])
             ) {
                 $name    = $browserFromUserAgent['name'];
                 $short   = $browserFromUserAgent['short_name'];
@@ -976,14 +1029,18 @@ public function parse(): ?array
             if ($name === $browserFromUserAgent['name']) {
                 $engine        = $browserFromUserAgent['engine'] ?? '';
                 $engineVersion = $browserFromUserAgent['engine_version'] ?? '';
+            }
 
-                // In case the user agent reports a more detailed version, we try to use this instead
-                if (!empty($browserFromUserAgent['version'])
-                    && 0 === \strpos($browserFromUserAgent['version'], $version)
-                    && \version_compare($version, $browserFromUserAgent['version'], '<')
-                ) {
-                    $version = $browserFromUserAgent['version'];
-                }
+            // In case the user agent reports a more detailed version, we try to use this instead
+            if (!empty($browserFromUserAgent['version'])
+                && 0 === \strpos($browserFromUserAgent['version'], $version)
+                && \version_compare($version, $browserFromUserAgent['version'], '<')
+            ) {
+                $version = $browserFromUserAgent['version'];
+            }
+
+            if ('DuckDuckGo Privacy Browser' === $name) {
+                $version = '';
             }
         } else {
             $name          = $browserFromUserAgent['name'];
@@ -1033,6 +1090,13 @@ public function parse(): ?array
             $engineVersion = '';
         }
 
+        // This browser simulates user-agent of Firefox
+        if ('TV-Browser Internet' === $name && 'Gecko' === $engine) {
+            $family        = 'Chrome';
+            $engine        = 'Blink';
+            $engineVersion = '';
+        }
+
         return [
             'type'           => 'browser',
             'name'           => $name,
diff --git a/includes/libraries/udd/Parser/Client/Browser/Engine/Version.php b/includes/libraries/udd/Parser/Client/Browser/Engine/Version.php
index 482bcfe..f18d955 100644
--- a/includes/libraries/udd/Parser/Client/Browser/Engine/Version.php
+++ b/includes/libraries/udd/Parser/Client/Browser/Engine/Version.php
@@ -59,7 +59,7 @@ public function parse(): ?array
         $engineToken = $this->engine;
 
         if ('Blink' === $this->engine) {
-            $engineToken = 'Chrome|Cronet';
+            $engineToken = 'Chr[o0]me|Cronet';
         }
 
         if ('Arachne' === $this->engine) {
diff --git a/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php b/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php
index 591b060..4aed092 100644
--- a/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php
+++ b/includes/libraries/udd/Parser/Device/AbstractDeviceParser.php
@@ -128,9 +128,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         'Q3'  => 'AKIRA',
         '1A'  => 'Alba',
         'AL'  => 'Alcatel',
+        'AL0' => 'Alienware',
         '20'  => 'Alcor',
         'XY'  => 'Alps',
         'XYA' => 'XY Auto',
+        'AAU' => 'AAUW',
         '7L'  => 'ALDI NORD',
         '6L'  => 'ALDI SÜD',
         '3L'  => 'Alfawise',
@@ -155,6 +157,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         '54'  => 'AMCV',
         '60'  => 'Andowl',
         'ANX' => 'ANXONIT',
+        'ANL' => 'ANCEL',
+        'ANC' => 'ANBERNIC',
         '6J'  => 'Angelcare',
         'ANG' => 'AngelTech',
         '7A'  => 'Anry',
@@ -166,6 +170,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '55'  => 'AOpen',
         'RW'  => 'Aoro',
         '9Y'  => 'Aocos',
+        'AOW' => 'Aocwei',
         'AP'  => 'Apple',
         'ARC' => 'Arçelik',
         'AR'  => 'Archos',
@@ -192,10 +197,13 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ATE' => 'Atlantic Electrics',
         '5Q'  => 'Atmaca Elektronik',
         'YH'  => 'ATMAN',
+        'ATM' => 'ATMPC',
         '2A'  => 'Atom',
+        'AT1' => 'Atozee',
         'ATO' => 'ATOL',
         'Z2'  => 'Atvio',
         'ATI' => 'Attila',
+        'ATU' => 'Atouch',
         'AX'  => 'Audiovox',
         'AJ'  => 'AURIS',
         'YZ'  => 'Autan',
@@ -212,6 +220,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'XA'  => 'Axioo',
         'AM'  => 'Azumi Mobile',
         'AZE' => 'Azeyou',
+        'AZU' => 'Azupik',
         'WW'  => 'Awow',
         'AWO' => 'AWOX',
         'XU'  => 'AUX',
@@ -242,6 +251,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'YB'  => 'Beista',
         'BY'  => 'BS Mobile',
         'BZ'  => 'Bezkam',
+        'BEL' => 'Bell',
         '9B'  => 'Bellphone',
         '63'  => 'Beyond',
         'BG'  => 'BGH',
@@ -299,6 +309,9 @@ abstract class AbstractDeviceParser extends AbstractParser
         '4Q'  => 'Bundy',
         'Y8'  => 'Bubblegum',
         'BMW' => 'BMW',
+        'BYJ' => 'BYJU\'S',
+        'BYY' => 'BYYBUO',
+        'BYD' => 'BYD',
         'C9'  => 'CAGI',
         'CAD' => 'CADENA',
         'CT'  => 'Capitel',
@@ -312,6 +325,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'CA'  => 'Cat',
         'BC'  => 'Camfone',
         'CJ'  => 'Cavion',
+        'CNM' => 'Canaima',
         'CAN' => 'Canal+',
         '4D'  => 'Canal Digital',
         'CNG' => 'Canguro',
@@ -334,6 +348,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'C3'  => 'China Mobile',
         'U9'  => 'China Telecom',
         'CI'  => 'Chico Mobile',
+        'CHC' => 'CHCNAV',
         'CIA' => 'C Idea',
         'CIP' => 'CipherLab',
         'CIT' => 'Citycall',
@@ -389,6 +404,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'CUI' => 'Cuiud',
         'CV'  => 'CVTE',
         'CWO' => 'Cwowdefu',
+        'CX0' => 'CX',
         'C4'  => 'Cyrus',
         'D5'  => 'Daewoo',
         'DA'  => 'Danew',
@@ -445,6 +461,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DIN' => 'Dinax',
         'DNA' => 'Dinalink',
         'DM'  => 'DMM',
+        'DMO' => 'DMOAO',
         'DN'  => 'DNS',
         'DC'  => 'DoCoMo',
         'DF'  => 'Doffler',
@@ -471,6 +488,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DUU' => 'Duubee',
         'DUR' => 'Durabook',
         'DYO' => 'Dyon',
+        'DYM' => 'Dykemann',
         'DTE' => 'D-Tech',
         'DLI' => 'D-Link',
         'ENO' => 'eNOVA',
@@ -498,6 +516,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EDE' => 'Edenwood',
         'E6'  => 'EE',
         'GW'  => 'EGL',
+        'EGO' => 'EGOTEK',
         'EFT' => 'EFT',
         'EK'  => 'EKO',
         'EY'  => 'Einstein',
@@ -509,6 +528,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '7E'  => 'ELARI',
         '03'  => 'Electroneum',
         'Z8'  => 'ELECTRONIA',
+        'ELG' => 'ELE-GATE',
         'EL1' => 'Elecson',
         'ELK' => 'Elektroland',
         'L0'  => 'Element',
@@ -544,6 +564,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EV'  => 'Evertek',
         'EVE' => 'Everest',
         'EV1' => 'Everex',
+        'EVR' => 'Everis',
         'E3'  => 'Evolio',
         'EO'  => 'Evolveo',
         '0Q'  => 'Evoo',
@@ -604,6 +625,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'F5'  => 'Formuler',
         'FR'  => 'Forstar',
         'RF'  => 'Fortis',
+        'FRT' => 'FortuneShip',
         'FO'  => 'Foxconn',
         'FOD' => 'FoxxD',
         'FJ'  => 'FOODO',
@@ -628,6 +650,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'GFO' => 'Gfone',
         'GTM' => 'GTMEDIA',
         'GTX' => 'GTX',
+        'GDL' => 'GDL',
         '0G'  => 'GFive',
         'GM'  => 'Garmin-Asus',
         'GA'  => 'Gateway',
@@ -657,14 +680,17 @@ abstract class AbstractDeviceParser extends AbstractParser
         'GIR' => 'GIRASOLE',
         'G4'  => 'Globex',
         'GLB' => 'Globmall',
+        'GME' => 'GlocalMe',
         '38'  => 'GLONYX',
         'U6'  => 'Glofiish',
+        'GLO' => 'Glory Star',
         'G7'  => 'GoGEN',
         'GC'  => 'GOCLEVER',
         '5G'  => 'Gocomma',
         'GB'  => 'Gol Mobile',
         'GL'  => 'Goly',
         'GOL' => 'GoldMaster',
+        'GOS' => 'GoldStar',
         'GOB' => 'GOLDBERG',
         'GX'  => 'GLX',
         'G5'  => 'Gome',
@@ -673,6 +699,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         'G0'  => 'Goophone',
         '6G'  => 'Gooweel',
         'GOO' => 'GOODTEL',
+        'GO1' => 'GOtv',
+        'GPL' => 'G-PLUS',
         '8G'  => 'Gplus',
         'GR'  => 'Gradiente',
         'GRE' => 'Graetz',
@@ -688,6 +716,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'GU'  => 'Grundig',
         'GV'  => 'Gtel',
         'CUO' => 'Guophone',
+        'GVC' => 'GVC Pro',
         'H13' => 'H133',
         '9Z'  => 'H96',
         'HF'  => 'Hafury',
@@ -696,9 +725,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         'HA'  => 'Haier',
         'HEC' => 'HEC',
         'XH'  => 'Haipai',
+        'XHU' => 'Haixu',
         'HAN' => 'Handheld',
         'HE'  => 'HannSpree',
         'HNS' => 'Hanseatic',
+        'HA2' => 'Hanson',
         'HK'  => 'Hardkernel',
         'HAR' => 'Harper',
         'HA1' => 'Hartens',
@@ -731,6 +762,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '8X'  => 'Hi Nova',
         'HLL' => 'HLLO',
         'HKC' => 'HKC',
+        'HMD' => 'HMD',
         '8W'  => 'HKPro',
         'HOF' => 'HOFER',
         'H1'  => 'Hoffmann',
@@ -738,6 +770,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'H0'  => 'Hometech',
         'HLB' => 'HOLLEBERG',
         'HM'  => 'Homtom',
+        'HOP' => 'Hopeland',
         'HZ'  => 'Hoozo',
         'H7'  => 'Horizon',
         '4H'  => 'Horizont',
@@ -748,6 +781,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         'JH'  => 'HOTREALS',
         'HW'  => 'How',
         'WH'  => 'Honeywell',
+        'HON' => 'HongTop',
+        'HOG' => 'HONKUAHG',
         'HP'  => 'HP',
         'HDC' => 'HDC',
         'HT'  => 'HTC',
@@ -756,6 +791,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'HG'  => 'Huavi',
         'HU'  => 'Huawei',
         'HX'  => 'Humax',
+        'HUM' => 'Humanware',
         'HR'  => 'Hurricane',
         'H5'  => 'Huskee',
         'HUG' => 'Hugerock',
@@ -764,6 +800,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         '7H'  => 'Hyve',
         'HYT' => 'Hytera',
         'HYK' => 'Hykker',
+        'HYA' => 'Hyatta',
+        'IKL' => 'I KALL',
         '3I'  => 'i-Cherry',
         'IJ'  => 'i-Joy',
         'IM'  => 'i-mate',
@@ -780,6 +818,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'IDI' => 'iDino',
         '6Z'  => 'iData',
         'IG'  => 'iGet',
+        'IHL' => 'iHome Life',
         'IH'  => 'iHunt',
         'IA'  => 'Ikea',
         'IYO' => 'iYou',
@@ -825,6 +864,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'IV'  => 'Inverto',
         '32'  => 'Invens',
         '4I'  => 'Invin',
+        'IFT' => 'iFIT',
         'INA' => 'iNavi',
         'I1'  => 'iOcean',
         'IMU' => 'iMuz',
@@ -853,6 +893,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'IXT' => 'iXTech',
         'IOT' => 'IOTWE',
         'JA'  => 'JAY-Tech',
+        'JAM' => 'Jambo',
         'KJ'  => 'Jiake',
         'JD'  => 'Jedi',
         'JEE' => 'Jeep',
@@ -892,11 +933,13 @@ abstract class AbstractDeviceParser extends AbstractParser
         'KS'  => 'Kempler & Strauss',
         'K3'  => 'Keneksi',
         'KHI' => 'KENSHI',
+        'KNW' => 'KENWOOD',
         'KX'  => 'Kenxinda',
         'KEN' => 'Kenbo',
         'KND' => 'Kendo',
         'KZG' => 'KZG',
         'K1'  => 'Kiano',
+        'KID' => 'kidiby',
         '5W'  => 'Kingbox',
         'KI'  => 'Kingsun',
         'KIS' => 'Kinstone',
@@ -944,6 +987,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'LK'  => 'Lark',
         'Z3'  => 'Laurus',
         'LEC' => 'Lectrus',
+        'LAS' => 'Laser',
         'LV'  => 'Lava',
         'LVI' => 'Lville',
         'LC'  => 'LCT',
@@ -980,12 +1024,14 @@ abstract class AbstractDeviceParser extends AbstractParser
         'JJ'  => 'Listo',
         'LNM' => 'LNMBBS',
         'LO'  => 'Loewe',
+        'LNG' => 'LongTV',
         'YL'  => 'Loview',
         'LOV' => 'Lovme',
         '1L'  => 'Logic',
         'LH'  => 'Logic Instrument',
         'LM'  => 'Logicom',
         'LOG' => 'Logik',
+        'LGT' => 'Logitech',
         'GY'  => 'LOKMAT',
         'LPX' => 'LPX-G',
         '0L'  => 'Lumigon',
@@ -995,7 +1041,9 @@ abstract class AbstractDeviceParser extends AbstractParser
         'LR'  => 'Luxor',
         'LY'  => 'LYF',
         'LL'  => 'Leader Phone',
+        'LTL' => 'LYOTECH LABS',
         'QL'  => 'LT Mobile',
+        'LW1' => 'LW',
         'MQ'  => 'M.T.T.',
         'MN'  => 'M4tel',
         'XM'  => 'Macoox',
@@ -1003,6 +1051,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MJ'  => 'Majestic',
         'FQ'  => 'Mafe',
         'MAG' => 'MAG',
+        'MA2' => 'MAGCH',
         '6Y'  => 'Magicsee',
         '23'  => 'Magnus',
         'NH'  => 'Manhattan',
@@ -1046,6 +1095,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MD'  => 'Medion',
         'M2'  => 'MEEG',
         'MEG' => 'MEGA VISION',
+        'MCA' => 'Megacable',
         'MP'  => 'MegaFon',
         'X0'  => 'mPhone',
         '3M'  => 'Meitu',
@@ -1055,14 +1105,17 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ME'  => 'Metz',
         'MEO' => 'MEO',
         'MX'  => 'MEU',
+        'MES' => 'MESWAO',
         'MI'  => 'MicroMax',
         'MIP' => 'mipo',
         'MS'  => 'Microsoft',
         '6Q'  => 'Microtech',
+        'MIG' => 'Mightier',
         '1X'  => 'Minix',
         'OM'  => 'Mintt',
         'MIN' => 'Mint',
         'MO'  => 'Mio',
+        'MOD' => 'Moondrop',
         'X7'  => 'Mione',
         'M7'  => 'Miray',
         'MIT' => 'Mitchell & Brown',
@@ -1088,8 +1141,10 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MOB' => 'Mobell',
         'MVO' => 'Mobvoi',
         'M4'  => 'Modecom',
+        'MEP' => 'Mode Mobile',
         'MF'  => 'Mofut',
         'MR'  => 'Motorola',
+        'MTS' => 'Motorola Solutions',
         'MIV' => 'Motiv',
         'MV'  => 'Movic',
         'MOV' => 'Movitel',
@@ -1103,10 +1158,12 @@ abstract class AbstractDeviceParser extends AbstractParser
         'N4'  => 'MTN',
         '72'  => 'M-Tech',
         '9H'  => 'M-Horse',
+        'MKP' => 'M-KOPA',
         '1R'  => 'Multilaser',
         'MPS' => 'MultiPOS',
         '1M'  => 'MYFON',
-        'MY'  => 'MyPhone',
+        'MY1' => 'myPhone (PL)',
+        'MY'  => 'MyPhone (PH)',
         '51'  => 'Myros',
         'M8'  => 'Myria',
         '6M'  => 'Mystery',
@@ -1140,6 +1197,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '7Q'  => 'Neon IQ',
         '8F'  => 'Neolix',
         'NET' => 'NetBox',
+        'NWT' => 'NETWIT',
         'NA'  => 'Netgear',
         'NEM' => 'Netmak',
         'NU'  => 'NeuImage',
@@ -1152,6 +1210,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ND'  => 'Newsday',
         'HB'  => 'New Balance',
         'BRI' => 'New Bridge',
+        'NEW' => 'Newal',
         'XB'  => 'NEXBOX',
         'NX'  => 'Nexian',
         '7X'  => 'Nexa',
@@ -1169,6 +1228,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'NN'  => 'Nikon',
         'NI'  => 'Nintendo',
         'NIN' => 'NINETEC',
+        'NI1' => 'NINETOLOGY',
         'N5'  => 'NOA',
         'N1'  => 'Noain',
         'N6'  => 'Nobby',
@@ -1185,6 +1245,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '2N'  => 'Nomu',
         '6H'  => 'Noontec',
         'NR'  => 'Nordmende',
+        'NRD' => 'Nordfrost',
         'NOR' => 'NORMANDE',
         '7N'  => 'NorthTech',
         'NOT' => 'Nothing Phone',
@@ -1209,6 +1270,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'O1'  => 'Odys',
         'ODP' => 'Odotpad',
         'O9'  => 'Ok',
+        'OKA' => 'Okapi',
         'OA'  => 'Okapia',
         'OKI' => 'Oking',
         'OLA' => 'Olax',
@@ -1237,6 +1299,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'OPT' => 'Optoma',
         'OPH' => 'Ophone',
         'OR'  => 'Orange',
+        'ORP' => 'Orange Pi',
         'ORA' => 'Orava',
         'O5'  => 'Orbic',
         'Y6'  => 'Orbita',
@@ -1246,6 +1309,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'OTT' => 'OTTO',
         'OK'  => 'Ouki',
         '0O'  => 'OINOM',
+        'OIL' => 'Oilsky',
         'QK'  => 'OKWU',
         'QQ'  => 'OMIX',
         '56'  => 'OKSI',
@@ -1256,6 +1320,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '30'  => 'Ovvi',
         'O2'  => 'Owwo',
         'OSC' => 'OSCAL',
+        'OXT' => 'OX TAB',
         'OY'  => 'Oysters',
         'QF'  => 'OYSIN',
         'O6'  => 'Oyyu',
@@ -1300,6 +1365,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '8P'  => 'Pixelphone',
         '9O'  => 'Pixela',
         'PX'  => 'Pixus',
+        'PIX' => 'PIXPRO',
         'QP'  => 'Pico',
         'PIR' => 'PIRANHA',
         'PIN' => 'PINE',
@@ -1313,6 +1379,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '0P'  => 'POCO',
         'FH'  => 'Point Mobile',
         'PV'  => 'Point of View',
+        'PVB' => 'PVBox',
         'PL'  => 'Polaroid',
         'Q6'  => 'Polar',
         '97'  => 'PolarLine',
@@ -1324,6 +1391,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'PS'  => 'Positivo',
         '3P'  => 'Positivo BGH',
         '3F'  => 'Porsche',
+        'PRT' => 'Portfolio',
         'P3'  => 'PPTV',
         'FP'  => 'Premio',
         'PR1' => 'Premier',
@@ -1372,8 +1440,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         '95'  => 'Rakuten',
         'RAY' => 'Raylandz',
         'RC'  => 'RCA Tablets',
+        'RCT' => 'RCT',
         '2R'  => 'Reach',
+        'RLX' => 'Realix',
         'REL' => 'RelNAT',
+        'RE4' => 'Relndoo',
         'RB'  => 'Readboy',
         'RE'  => 'Realme',
         'RE1' => 'Redbean',
@@ -1388,10 +1459,13 @@ abstract class AbstractDeviceParser extends AbstractParser
         'REV' => 'Revomovil',
         '8R'  => 'Retroid Pocket',
         'REN' => 'Renova',
+        'REP' => 'rephone',
+        'RHI' => 'Rhino',
         'RIC' => 'Ricoh',
         'RI'  => 'Rikomagic',
         'RM'  => 'RIM',
         'RN'  => 'Rinno',
+        'RNB' => 'Ringing Bells',
         'RX'  => 'Ritmix',
         'R7'  => 'Ritzviva',
         'RV'  => 'Riviera',
@@ -1399,7 +1473,9 @@ abstract class AbstractDeviceParser extends AbstractParser
         'RIZ' => 'Rizzen',
         'RR'  => 'Roadrover',
         'QR'  => 'ROADMAX',
+        'ROH' => 'ROCH',
         'ROC' => 'Roam Cat',
+        'ROT' => 'Rocket',
         'R1'  => 'Rokit',
         'ROI' => 'ROiK',
         'RK'  => 'Roku',
@@ -1410,6 +1486,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'RQ'  => 'RoyQueen',
         'RJ'  => 'Royole',
         'RT'  => 'RT Project',
+        'RTK' => 'RTK',
         'RG'  => 'RugGear',
         'RUG' => 'Ruggex',
         'RUT' => 'RuggeTech',
@@ -1424,6 +1501,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         '89'  => 'Seatel',
         'SEW' => 'Sewoo',
         'SE1' => 'SEEWO',
+        'SEN' => 'SENNA',
+        'SER' => 'SERVO',
         'Y7'  => 'Saiet',
         'SLF' => 'SAILF',
         'X1'  => 'Safaricom',
@@ -1444,6 +1523,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'Y4'  => 'SCBC',
         'CZ'  => 'Schneider',
         'SCO' => 'Scosmos',
+        'SC1' => 'Scoole',
         'ZG'  => 'Schok',
         'G8'  => 'SEG',
         'SEX' => 'SEHMAX',
@@ -1480,6 +1560,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SIM' => 'simfer',
         '52'  => 'Singtech',
         '31'  => 'Siragon',
+        'SIS' => 'Siswoo',
         '83'  => 'Sirin Labs',
         '5Z'  => 'SK Broadband',
         'GK'  => 'SKG',
@@ -1500,6 +1581,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SM1' => 'Smartex',
         'SC'  => 'Smartfren',
         'S7'  => 'Smartisan',
+        'SMU' => 'SMUX',
+        'SMT' => 'SMT Telecom',
         'JR'  => 'Sylvania',
         'SYH' => 'SYH',
         '3Y'  => 'Smarty',
@@ -1547,6 +1630,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '69'  => 'Stylo',
         '9S'  => 'Sugar',
         'SUR' => 'Surge',
+        'SUF' => 'Surfans',
         '06'  => 'Subor',
         'SZ'  => 'Sumvision',
         '0H'  => 'Sunstech',
@@ -1568,6 +1652,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SWI' => 'Switel',
         'SS'  => 'SWISSMOBILITY',
         '1W'  => 'Swisstone',
+        'SWO' => 'SWOFY',
         'SSK' => 'SSKY',
         'SYC' => 'Syco',
         'SM'  => 'Symphony',
@@ -1622,6 +1707,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'TZ'  => 'teXet',
         '29'  => 'Teknosa',
         'JZ'  => 'TJC',
+        'TJD' => 'TJD',
         'JC'  => 'TENPLUS',
         'T4'  => 'ThL',
         'TN'  => 'Thomson',
@@ -1635,12 +1721,14 @@ abstract class AbstractDeviceParser extends AbstractParser
         'TF'  => 'Tinmo',
         'TH'  => 'TiPhone',
         'YV'  => 'TiVo',
+        'TIV' => 'Tivax',
         'TIB' => 'Tibuta',
         'Y3'  => 'TOKYO',
         'TOX' => 'TOX',
         'T1'  => 'Tolino',
         '0T'  => 'Tone',
         'TY'  => 'Tooky',
+        'TYD' => 'TYD',
         'TOO' => 'TOOGO',
         'T9'  => 'Top House',
         'DK'  => 'Topelotek',
@@ -1662,6 +1750,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'TRI' => 'TriaPlay',
         'TJ'  => 'Trifone',
         'Q5'  => 'Trident',
+        'TRB' => 'Trimble',
         '4T'  => 'Tronsmart',
         '11'  => 'True',
         'JT'  => 'True Slim',
@@ -1703,6 +1792,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'UNI' => 'Unistrong',
         'U2'  => 'UNIWA',
         'UND' => 'Uniden',
+        'UGR' => 'United Group',
         'UO'  => 'Unnecto',
         'UNN' => 'Unnion Technologies',
         'UU'  => 'Unonu',
@@ -1722,10 +1812,12 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VP'  => 'Vargo',
         'VC'  => 'Vankyo',
         'VAL' => 'VALEM',
+        'VA2' => 'VALE',
         'VAT' => 'VALTECH',
         'VAN' => 'VANGUARD',
         'VAW' => 'VANWIN',
         'VB'  => 'VC',
+        'VEI' => 'Veidoo',
         'VN'  => 'Venso',
         'VNP' => 'VNPT Technology',
         'VEN' => 'Venstar',
@@ -1751,6 +1843,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VD'  => 'Videocon',
         'VW'  => 'Videoweb',
         'VS'  => 'ViewSonic',
+        'VIK' => 'VIKUSHA',
         'V7'  => 'Vinga',
         'V3'  => 'Vinsoc',
         'XD'  => 'Vinabox',
@@ -1763,6 +1856,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '8V'  => 'Viumee',
         'V5'  => 'Vivax',
         'VIV' => 'VIVIMAGE',
+        'VI2' => 'VIVIBright',
         'VV'  => 'Vivo',
         '6V'  => 'VIWA',
         'VII' => 'VIIPOO',
@@ -1771,8 +1865,10 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VIZ' => 'Vizmo',
         'VIT' => 'Vityaz',
         '9V'  => 'Vision Touch',
+        'VIS' => 'Vision Technology',
         'VIL' => 'Visual Land',
         'VI1' => 'VILLAON',
+        'VIM' => 'VIMOQ',
         'VK'  => 'VK Mobile',
         'JM'  => 'v-mobile',
         'VHO' => 'V-HOPE',
@@ -1816,6 +1912,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WBL' => 'We. by Loewe.',
         'WCP' => 'WeChip',
         'WM'  => 'Weimei',
+        'WM1' => 'Weiimi',
         'WE'  => 'WellcoM',
         'W6'  => 'WELLINGTON',
         'WD'  => 'Western Digital',
@@ -1848,6 +1945,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'W1'  => 'Woo',
         'WR'  => 'Wortmann',
         'WX'  => 'Woxter',
+        'WOZ' => 'WOZIFAN',
         'XQ'  => 'X-AGE',
         'XEL' => 'XElectron',
         'X3'  => 'X-BO',
@@ -1868,6 +1966,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'XN'  => 'Xion',
         'XO'  => 'Xolo',
         'XR'  => 'Xoro',
+        'XRL' => 'XREAL',
         'XS'  => 'Xshitou',
         'XSM' => 'Xsmart',
         '4X'  => 'Xtouch',
@@ -1904,6 +2003,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '0Z'  => 'Zatec',
         '2Z'  => 'Zaith',
         'ZAM' => 'Zamolxe',
+        'ZZB' => 'ZZB',
         'ZEA' => 'Zealot',
         'PZ'  => 'Zebra',
         'ZE1' => 'Zeblaze',
@@ -1939,6 +2039,21 @@ abstract class AbstractDeviceParser extends AbstractParser
         'XX'  => 'Unknown',
     ];
 
+    /**
+     * Mapping formFactor types to parser device types
+     * (not sort array the array priority result device type)
+     * @var array
+     */
+    protected static $clientHintFormFactorsMapping = [
+        'automotive' => self::DEVICE_TYPE_CAR_BROWSER,
+        'xr'         => self::DEVICE_TYPE_WEARABLE,
+        'watch'      => self::DEVICE_TYPE_WEARABLE,
+        'mobile'     => self::DEVICE_TYPE_SMARTPHONE,
+        'tablet'     => self::DEVICE_TYPE_TABLET,
+        'desktop'    => self::DEVICE_TYPE_DESKTOP,
+        'eink'       => self::DEVICE_TYPE_TABLET,
+    ];
+
     /**
      * Returns the device type represented by one of the DEVICE_TYPE_* constants
      *
@@ -2059,7 +2174,7 @@ public function parse(): ?array
         $deviceModel      = $resultClientHint['model'] ?? '';
 
         // is freeze user-agent then restoring the original UA for the device definition
-        if ('' !== $deviceModel && \preg_match('~Android 10[.\d]*; K(?: Build/|[;)])~i', $this->userAgent)) {
+        if ('' !== $deviceModel && $this->hasUserAgentClientHintsFragment()) {
             $osVersion = $this->clientHints ? $this->clientHints->getOperatingSystemVersion() : '';
             $this->setUserAgent((string) \preg_replace(
                 '(Android 10[.\d]*; K)',
@@ -2068,6 +2183,19 @@ public function parse(): ?array
             ));
         }
 
+        // is freeze user-agent then restoring the original UA for the device definition
+        if ('' !== $deviceModel && $this->hasDesktopFragment()) {
+            $this->setUserAgent((string) \preg_replace(
+                '(X11; Linux x86_64)',
+                \sprintf('X11; Linux x86_64; %s', $deviceModel),
+                $this->userAgent
+            ));
+        }
+
+        if ('' === $deviceModel && $this->hasUserAgentClientHintsFragment()) {
+            return $this->getResult();
+        }
+
         if ('' === $deviceModel && $this->hasDesktopFragment()) {
             return $this->getResult();
         }
@@ -2084,6 +2212,8 @@ public function parse(): ?array
         }
 
         if (empty($matches)) {
+            $this->deviceType = $resultClientHint['deviceType'] ?? null;
+
             return $resultClientHint;
         }
 
@@ -2166,8 +2296,19 @@ protected function buildModel(string $model, array $matches): string
     protected function parseClientHints(): ?array
     {
         if ($this->clientHints && $this->clientHints->getModel()) {
+            $detectedDeviceType = null;
+            $formFactors        = $this->clientHints->getFormFactors();
+
+            foreach (self::$clientHintFormFactorsMapping as $formFactor => $deviceType) {
+                if (\in_array($formFactor, $formFactors)) {
+                    $detectedDeviceType = $deviceType;
+
+                    break;
+                }
+            }
+
             return [
-                'deviceType' => null,
+                'deviceType' => $detectedDeviceType,
                 'model'      => $this->clientHints->getModel(),
                 'brand'      => '',
             ];
@@ -2194,6 +2335,16 @@ protected function hasDesktopFragment(): bool
             !$this->matchUserAgent($regexExcludeDesktopFragment);
     }
 
+    /**
+     * Returns if the parsed UA contains the 'Android 10 K;' or Android 10 K Build/` fragment
+     *
+     * @return bool
+     */
+    protected function hasUserAgentClientHintsFragment(): bool
+    {
+        return (bool) \preg_match('~Android 10[.\d]*; K(?: Build/|[;)])~i', $this->userAgent);
+    }
+
     /**
      * Resets the stored values
      */
diff --git a/includes/libraries/udd/Parser/OperatingSystem.php b/includes/libraries/udd/Parser/OperatingSystem.php
index d53c11e..7b4c971 100644
--- a/includes/libraries/udd/Parser/OperatingSystem.php
+++ b/includes/libraries/udd/Parser/OperatingSystem.php
@@ -47,15 +47,19 @@ class OperatingSystem extends AbstractParser
         'AMZ' => 'Amazon Linux',
         'AMG' => 'AmigaOS',
         'ARM' => 'Armadillo OS',
+        'ARO' => 'AROS',
         'ATV' => 'tvOS',
         'ARL' => 'Arch Linux',
         'AOS' => 'AOSC OS',
         'ASP' => 'ASPLinux',
+        'AZU' => 'Azure Linux',
         'BTR' => 'BackTrack',
         'SBA' => 'Bada',
+        'BYI' => 'Baidu Yi',
         'BEO' => 'BeOS',
         'BLB' => 'BlackBerry OS',
         'QNX' => 'BlackBerry Tablet OS',
+        'PAN' => 'blackPanther OS',
         'BOS' => 'Bliss OS',
         'BMP' => 'Brew',
         'BSN' => 'BrightSignOS',
@@ -85,6 +89,9 @@ class OperatingSystem extends AbstractParser
         'FYD' => 'FydeOS',
         'FUC' => 'Fuchsia',
         'GNT' => 'Gentoo',
+        'GNX' => 'GENIX',
+        'GEO' => 'GEOS',
+        'GNS' => 'gNewSense',
         'GRI' => 'GridOS',
         'GTV' => 'Google TV',
         'HPX' => 'HP-UX',
@@ -96,9 +103,11 @@ class OperatingSystem extends AbstractParser
         'IRI' => 'IRIX',
         'INF' => 'Inferno',
         'JME' => 'Java ME',
+        'JOL' => 'Joli OS',
         'KOS' => 'KaiOS',
         'KAL' => 'Kali',
         'KAN' => 'Kanotix',
+        'KIN' => 'KIN OS',
         'KNO' => 'Knoppix',
         'KTV' => 'KreaTV',
         'KBT' => 'Kubuntu',
@@ -119,18 +128,22 @@ class OperatingSystem extends AbstractParser
         'SMG' => 'MeeGo',
         'MCD' => 'MocorDroid',
         'MON' => 'moonOS',
+        'EZX' => 'Motorola EZX',
         'MIN' => 'Mint',
         'MLD' => 'MildWild',
         'MOR' => 'MorphOS',
         'NBS' => 'NetBSD',
         'MTK' => 'MTK / Nucleus',
         'MRE' => 'MRE',
+        'NXT' => 'NeXTSTEP',
+        'NWS' => 'NEWS-OS',
         'WII' => 'Nintendo',
         'NDS' => 'Nintendo Mobile',
         'NOV' => 'Nova',
         'OS2' => 'OS/2',
         'T64' => 'OSF1',
         'OBS' => 'OpenBSD',
+        'OVS' => 'OpenVMS',
         'OVZ' => 'OpenVZ',
         'OWR' => 'OpenWrt',
         'OTV' => 'Opera TV',
@@ -143,13 +156,16 @@ class OperatingSystem extends AbstractParser
         'PSP' => 'PlayStation Portable',
         'PS3' => 'PlayStation',
         'PVE' => 'Proxmox VE',
+        'PUF' => 'Puffin OS',
         'PUR' => 'PureOS',
+        'QTP' => 'Qtopia',
         'PIO' => 'Raspberry Pi OS',
         'RAS' => 'Raspbian',
         'RHT' => 'Red Hat',
         'RST' => 'Red Star',
         'RED' => 'RedOS',
         'REV' => 'Revenge OS',
+        'RIS' => 'risingOS',
         'ROS' => 'RISC OS',
         'ROC' => 'Rocky Linux',
         'ROK' => 'Roku OS',
@@ -168,6 +184,7 @@ class OperatingSystem extends AbstractParser
         'SIR' => 'Sirin OS',
         'SLW' => 'Slackware',
         'SOS' => 'Solaris',
+        'SBL' => 'Star-Blade OS',
         'SYL' => 'Syllable',
         'SYM' => 'Symbian',
         'SYS' => 'Symbian OS',
@@ -179,9 +196,12 @@ class OperatingSystem extends AbstractParser
         'TIZ' => 'Tizen',
         'TIV' => 'TiVo OS',
         'TOS' => 'TmaxOS',
+        'TUR' => 'Turbolinux',
         'UBT' => 'Ubuntu',
+        'ULT' => 'ULTRIX',
         'UOS' => 'UOS',
         'VID' => 'VIDAA',
+        'VIZ' => 'ViziOS',
         'WAS' => 'watchOS',
         'WER' => 'Wear OS',
         'WTV' => 'WebTV',
@@ -192,6 +212,7 @@ class OperatingSystem extends AbstractParser
         'WMO' => 'Windows Mobile',
         'WPH' => 'Windows Phone',
         'WRT' => 'Windows RT',
+        'WPO' => 'WoPhone',
         'XBX' => 'Xbox',
         'XBT' => 'Xubuntu',
         'YNS' => 'YunOS',
@@ -212,9 +233,9 @@ class OperatingSystem extends AbstractParser
         'Android'               => [
             'AND', 'CYN', 'FIR', 'REM', 'RZD', 'MLD', 'MCD', 'YNS', 'GRI', 'HAR',
             'ADR', 'CLR', 'BOS', 'REV', 'LEN', 'SIR', 'RRS', 'WER', 'PIC', 'ARM',
-            'HEL',
+            'HEL', 'BYI', 'RIS', 'PUF',
         ],
-        'AmigaOS'               => ['AMG', 'MOR'],
+        'AmigaOS'               => ['AMG', 'MOR', 'ARO'],
         'BlackBerry'            => ['BLB', 'QNX'],
         'Brew'                  => ['BMP'],
         'BeOS'                  => ['BEO', 'HAI'],
@@ -233,20 +254,22 @@ 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', 'RST',
+            'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE', 'RST', 'EZX', 'GNS', 'JOL',
+            'TUR', 'QTP', 'WPO', 'PAN', 'VIZ', 'AZU',
         ],
         'Mac'                   => ['MAC'],
         'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'],
+        'OpenVMS'               => ['OVS'],
         'Real-time OS'          => ['MTK', 'TDX', 'MRE', 'JME', 'REX'],
-        'Other Mobile'          => ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE', 'LUN'],
+        'Other Mobile'          => ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE', 'LUN', 'GEO'],
         'Symbian'               => ['SYM', 'SYS', 'SY3', 'S60', 'S40'],
         'Unix'                  => [
             'SOS', 'AIX', 'HPX', 'BSD', 'NBS', 'OBS', 'DFB', 'SYL', 'IRI', 'T64',
-            'INF', 'ELE',
+            'INF', 'ELE', 'GNX', 'ULT', 'NWS', 'NXT', 'SBL',
         ],
         'WebTV'                 => ['WTV'],
         'Windows'               => ['WIN'],
-        'Windows Mobile'        => ['WPH', 'WMO', 'WCE', 'WRT', 'WIO'],
+        'Windows Mobile'        => ['WPH', 'WMO', 'WCE', 'WRT', 'WIO', 'KIN'],
         'Other Smart TV'        => ['WHS'],
     ];
 
@@ -668,7 +691,7 @@ protected function parsePlatform(): string
             }
         }
 
-        if ($this->matchUserAgent('arm|.*arm64|aarch64|Apple ?TV|Watch ?OS|Watch1,[12]')) {
+        if ($this->matchUserAgent('arm[ _;)ev]|.*arm$|.*arm64|aarch64|Apple ?TV|Watch ?OS|Watch1,[12]')) {
             return 'ARM';
         }
 
diff --git a/includes/libraries/udd/regexes/bots.yml b/includes/libraries/udd/regexes/bots.yml
index f5ef176..d5efb13 100644
--- a/includes/libraries/udd/regexes/bots.yml
+++ b/includes/libraries/udd/regexes/bots.yml
@@ -132,10 +132,18 @@
 - regex: 'Applebot'
   name: 'Applebot'
   category: 'Crawler'
-  url: 'https://support.apple.com/en-us/HT204683'
+  url: 'https://support.apple.com/en-us/119829'
   producer:
     name: 'Apple Inc'
-    url: 'https://www.apple.com'
+    url: 'https://www.apple.com/'
+
+- regex: 'iTMS'
+  name: 'iTMS'
+  category: 'Crawler'
+  url: 'https://support.apple.com/en-us/119829'
+  producer:
+    name: 'Apple Inc'
+    url: 'https://www.apple.com/'
 
 - regex: 'AppSignalBot'
   name: 'AppSignalBot'
@@ -241,6 +249,14 @@
     name: 'Microsoft Corporation'
     url: 'http://www.microsoft.com'
 
+- regex: 'Blackbox Exporter'
+  name: 'Blackbox Exporter'
+  category: 'Site Monitor'
+  url: 'https://github.com/prometheus/blackbox_exporter'
+  producer:
+    name: 'Prometheus'
+    url: 'https://prometheus.io/'
+
 - regex: 'Blekkobot'
   name: 'Blekkobot'
   category: 'Search bot'
@@ -384,6 +400,22 @@
     name: 'CloudFlare'
     url: 'https://www.cloudflare.com/'
 
+- regex: 'Cloudflare-Smart-Transit'
+  name: 'Cloudflare Smart Transit'
+  category: 'Site Monitor'
+  url: 'https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/'
+  producer:
+    name: 'CloudFlare'
+    url: 'https://www.cloudflare.com/'
+
+- regex: 'CloudflareObservatory'
+  name: 'Cloudflare Observatory'
+  category: 'Site Monitor'
+  url: 'https://developers.cloudflare.com/speed/speed-test/run-speed-test'
+  producer:
+    name: 'CloudFlare'
+    url: 'https://www.cloudflare.com/'
+
 - regex: 'https://developers\.cloudflare\.com/security-center/'
   name: 'Cloudflare Security Insights'
   category: 'Site Monitor'
@@ -489,9 +521,17 @@
     url: 'http://moz.com/'
 
 - regex: 'DuckDuck(?:Go-Favicons-)?Bot'
-  name: 'DuckDuckGo Bot'
+  name: 'DuckDuckBot'
+  category: 'Search bot'
+  url: 'https://duckduckgo.com/duckduckgo-help-pages/results/duckduckbot/'
+  producer:
+    name: 'DuckDuckGo'
+    url: 'https://duckduckgo.com/'
+
+- regex: 'DuckAssistBot'
+  name: 'DuckAssistBot'
   category: 'Search bot'
-  url: 'https://duckduckgo.com/duckduckbot'
+  url: 'https://duckduckgo.com/duckduckgo-help-pages/results/duckassistbot/'
   producer:
     name: 'DuckDuckGo'
     url: 'https://duckduckgo.com/'
@@ -733,6 +773,14 @@
     name: 'Google Inc.'
     url: 'https://www.google.com/'
 
+- regex: 'Google-CloudVertexBot'
+  name: 'Google-CloudVertexBot'
+  category: 'Crawler'
+  url: 'https://developers.google.com/search/docs/crawling-indexing/google-common-crawlers#google-cloudvertexbot'
+  producer:
+    name: 'Google Inc.'
+    url: 'https://www.google.com/'
+
 - regex: 'via ggpht\.com GoogleImageProxy'
   name: 'Gmail Image Proxy'
   category: 'Crawler'
@@ -773,6 +821,14 @@
     name: 'Visual Meta'
     url: 'https://www.shopalike.cz/'
 
+- regex: 'deepcrawl\.com'
+  name: 'Lumar'
+  category: 'Crawler'
+  url: 'https://deepcrawl.com/bot'
+  producer:
+    name: 'Lumar'
+    url: 'https://www.lumar.io/'
+
 - regex: 'Googlebot-News'
   name: 'Googlebot News'
   category: 'Search bot'
@@ -781,7 +837,7 @@
     name: 'Google Inc.'
     url: 'https://www.google.com/'
 
-- regex: 'Adwords-(?:DisplayAds|Express|Instant)|Google Web Preview|Google[ -]Publisher[ -]Plugin|Google-(?:adstxt|Ads-Conversions|Ads-Qualify|Adwords|AMPHTML|Assess|Extended|HotelAdsVerifier|InspectionTool|Lens|PageRenderer|Read-Aloud|Safety|Shopping-Quality|Site-Verification|Sites-Thumbnails|speakr|Stale-Content-Probe|Test|Youtube-Links)|(?:AdsBot|APIs|DuplexWeb|Feedfetcher|Mediapartners)-Google(?:-Mobile)?|Google(?:AdSenseInfeed|AssociationService|bot|Other|Prober|Producer|Sites)|Google.*/\+/web/snippet'
+- regex: 'Adwords-(?:DisplayAds|Express|Instant)|Google Web Preview|Google[ -]Publisher[ -]Plugin|Google-(?:adstxt|Ads-Conversions|Ads-Qualify|Adwords|AMPHTML|Assess|Extended|HotelAdsVerifier|InspectionTool|Lens|PageRenderer|Read-Aloud|Shopping-Quality|Site-Verification|Sites-Thumbnails|speakr|Stale-Content-Probe|Test|Youtube-Links)|(?:AdsBot|APIs|Feedfetcher|Mediapartners)-Google(?:-Mobile)?|Google(?:AdSenseInfeed|AssociationService|bot|Other|Prober|Producer|Sites)|Google.*/\+/web/snippet'
   name: 'Googlebot'
   category: 'Search bot'
   url: 'https://developers.google.com/search/docs/crawling-indexing/overview-google-crawlers'
@@ -797,21 +853,29 @@
     name: 'Google Inc.'
     url: 'https://www.google.com/'
 
-- regex: 'Google-Area120-PrivacyPolicyFetcher'
-  name: 'Google Area 120 Privacy Policy Fetcher'
+- regex: 'Google-Safety'
+  name: 'Google-Safety'
   category: 'Crawler'
-  url: 'https://area120.google.com/'
+  url: 'https://developers.google.com/search/docs/crawling-indexing/google-special-case-crawlers'
   producer:
     name: 'Google Inc.'
     url: 'https://www.google.com/'
 
-- regex: 'heritrix'
-  name: 'Heritrix'
+- regex: 'DuplexWeb-Google'
+  name: 'DuplexWeb-Google'
   category: 'Crawler'
-  url: 'https://webarchive.jira.com/wiki/display/Heritrix/Heritrix'
+  url: 'https://developers.google.com/search/docs/crawling-indexing/google-special-case-crawlers'
   producer:
-    name: 'The Internet Archive'
-    url: 'https://archive.org'
+    name: 'Google Inc.'
+    url: 'https://www.google.com/'
+
+- regex: 'Google-Area120-PrivacyPolicyFetcher'
+  name: 'Google Area 120 Privacy Policy Fetcher'
+  category: 'Crawler'
+  url: 'https://area120.google.com/'
+  producer:
+    name: 'Google Inc.'
+    url: 'https://www.google.com/'
 
 - regex: 'HubSpot '
   name: 'HubSpot'
@@ -820,10 +884,10 @@
     name: 'HubSpot Inc.'
     url: 'https://www.hubspot.com'
 
-- regex: 'vuhuvBot'
-  name: 'Vuhuv Bot'
-  category: 'Crawler'
-  url: 'http://vuhuv.com/bot.html'
+- regex: 'vuhuv(?:Bot|RBT)'
+  name: 'vuhuvBot'
+  category: 'Search bot'
+  url: 'https://vuhuv.com/bot.html'
 
 - regex: 'HTTPMon/[\d.]+'
   name: 'HTTPMon'
@@ -1116,6 +1180,14 @@
     name: 'Nuzzel'
     url: 'https://www.nuzzel.com/'
 
+- regex: 'NodePing'
+  name: 'NodePing'
+  category: 'Site Monitor'
+  url: 'https://nodeping.com'
+  producer:
+    name: 'NodePing'
+    url: 'https://nodeping.com'
+
 - regex: 'Octopus [0-9]'
   name: 'Octopus'
 
@@ -1260,10 +1332,10 @@
     name: 'QueryEye Inc.'
     url: 'http://queryeye.com'
 
-- regex: 'Qwantify'
-  name: 'Qwantify'
+- regex: 'Qwantify|Qwantbot'
+  name: 'Qwantbot'
   category: 'Crawler'
-  url: 'https://www.qwant.com/'
+  url: 'https://help.qwant.com/bot/'
   producer:
     name: 'Qwant Corporation'
     url: 'https://www.qwant.com/'
@@ -1845,6 +1917,22 @@
     name: 'Wordpress.org'
     url: 'https://wordpress.org/'
 
+- regex: 'WordPress\.com mShots'
+  name: 'WordPress.com mShots'
+  category: 'Service Agent'
+  url: 'https://wordpress.org/'
+  producer:
+    name: 'Wordpress.org'
+    url: 'https://wordpress.org/'
+
+- regex: 'wp\.com feedbot'
+  name: 'wp.com feedbot'
+  category: 'Feed Fetcher'
+  url: 'https://wordpress.com/'
+  producer:
+    name: 'Automattic, Inc.'
+    url: 'https://automattic.com/'
+
 - regex: 'WordPress'
   name: 'WordPress'
   category: 'Service Agent'
@@ -2155,6 +2243,11 @@
 
 - regex: 'PagePeeker'
   name: 'PagePeeker'
+  category: 'Crawler'
+  url: 'https://pagepeeker.com/robots/'
+  producer:
+    name: 'PAGEPEEKER SRL'
+    url: 'https://pagepeeker.com/'
 
 - regex: 'WebThumbnail'
   name: 'WebThumbnail'
@@ -2377,6 +2470,14 @@
     name: 'Carbon60 Operating Co. Ltd.'
     url: 'https://www.carbon60.com/'
 
+- regex: 'CyberFind ?Crawler'
+  name: 'CyberFind Crawler'
+  category: 'Crawler'
+  url: 'https://www.cyberfind.net/bot.html'
+  producer:
+    name: 'Find.tf'
+    url: 'https://find.tf/'
+
 - regex: 'Nutch'
   name: 'Nutch-based Bot'
   category: 'Crawler'
@@ -2832,6 +2933,14 @@
     name: 'Komodia Inc.'
     url: 'https://www.komodia.com/'
 
+- regex: 'KStandBot/[\d.]+'
+  name: 'KStandBot'
+  category: 'Crawler'
+  url: 'https://url-classification.io/wiki/index.php?title=URL_server_crawler'
+  producer:
+    name: 'Komodia Inc.'
+    url: 'https://www.komodia.com/'
+
 - regex: 'Neevabot/[\d.]+'
   name: 'Neevabot'
   category: 'Search bot'
@@ -2976,7 +3085,7 @@
     name: 'Newslit, LLC.'
     url: 'https://www.newslit.co/'
 
-- regex: 'um-LN/[\d.]+'
+- regex: 'um-(?:ANS|CC|FC|IC|LN)/[\d.]+'
   name: 'uMBot'
   category: 'Crawler'
   url: 'https://www.ubermetrics-technologies.com/'
@@ -3146,6 +3255,14 @@
     name: 'Jožef Stefan Institute'
     url: 'https://www.ijs.si/ijsw/JSI'
 
+- regex: 'CLASSLA'
+  name: 'CLASSLA-web'
+  category: 'Crawler'
+  url: 'https://www.clarin.si/info/classla-web-crawler/'
+  producer:
+    name: 'Jožef Stefan Institute'
+    url: 'https://www.ijs.si/ijsw/JSI'
+
 - regex: 'dnt-policy@eff\.org'
   name: 'EFF Do Not Track Verifier'
   category: 'Crawler'
@@ -3337,7 +3454,7 @@
     name: 'Comodo Security Solutions, Inc.'
     url: 'https://www.comodo.com/'
 
-- regex: 'Sectigo DCV'
+- regex: 'Sectigo DCV|acme\.sectigo\.com'
   name: 'Sectigo DCV'
   category: 'Service Agent'
   url: 'https://sectigo.com/'
@@ -3516,10 +3633,26 @@
   category: 'Site Monitor'
   url: 'https://github.com/louislam/uptime-kuma'
 
+- regex: 'OAI-SearchBot'
+  name: 'OAI-SearchBot'
+  category: 'Crawler'
+  url: 'https://platform.openai.com/docs/bots'
+  producer:
+    name: 'OpenAI OpCo, LLC'
+    url: 'https://openai.com/'
+
+- regex: 'GPTBot/[\d.]+'
+  name: 'GPTBot'
+  category: 'Crawler'
+  url: 'https://platform.openai.com/docs/bots'
+  producer:
+    name: 'OpenAI OpCo, LLC'
+    url: 'https://openai.com/'
+
 - regex: 'ChatGPT-User'
-  name: 'ChatGPT'
+  name: 'ChatGPT-User'
   category: 'Crawler'
-  url: 'https://platform.openai.com/docs/plugins/bot'
+  url: 'https://platform.openai.com/docs/bots'
   producer:
     name: 'OpenAI OpCo, LLC'
     url: 'https://openai.com/'
@@ -3545,14 +3678,6 @@
     name: 'DGC Verwaltungs GmbH'
     url: 'https://dgc.org/'
 
-- regex: 'deepcrawl\.com'
-  name: 'Lumar'
-  category: 'Crawler'
-  url: 'https://deepcrawl.com/bot'
-  producer:
-    name: 'Lumar'
-    url: 'https://www.lumar.io/'
-
 - regex: 'researchscan\.comsys\.rwth-aachen\.de'
   name: 'Research Scan'
   category: 'Crawler'
@@ -3569,14 +3694,6 @@
     name: 'Sprious LLC'
     url: 'https://sprious.com/'
 
-- regex: 'GPTBot/[\d.]+'
-  name: 'GPTBot'
-  category: 'Crawler'
-  url: 'https://platform.openai.com/docs/gptbot'
-  producer:
-    name: 'OpenAI OpCo, LLC'
-    url: 'https://openai.com/'
-
 - regex: 'Ant(?:\.com beta|Bot)(?:/([\d+.]+))?'
   name: 'Ant'
   category: 'Crawler'
@@ -3634,7 +3751,7 @@
     name: 'Meltwater Deutschland GmbH'
     url: 'https://www.meltwater.com/'
 
-- regex: '(?:Owler@ows\.eu|OWLer)/[\d.]+'
+- regex: 'owler'
   name: 'OWLer'
   category: 'Crawler'
   url: 'https://openwebsearch.eu/owler/'
@@ -4488,10 +4605,227 @@
   category: 'Security Checker'
   url: 'https://ducks.party/'
 
+- regex: 'DepSpid/[\d.]+'
+  name: 'DepSpid'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20080321224033/http://about.depspid.net/'
+
+- regex: 'Website-info\.net'
+  name: 'Website-info'
+  category: 'Crawler'
+  url: 'https://website-info.net/robot'
+  producer:
+    name: 'Meins und Vogel GmbH'
+    url: 'https://muv.com/'
+
+- regex: 'RedekenBot'
+  name: 'RedekenBot'
+  category: 'Crawler'
+  url: 'https://www.redeken.com/en/help/bot.html'
+  producer:
+    name: 'Redeken'
+    url: 'https://www.redeken.com/'
+
+- regex: 'semaltbot'
+  name: 'semaltbot'
+  category: 'Crawler'
+  url: 'https://semalt.net/'
+  producer:
+    name: 'Semalt LP'
+    url: 'https://semalt.net/'
+
+- regex: 'MakeMerryBot'
+  name: 'MakeMerryBot'
+  category: 'Crawler'
+  url: 'https://makemerry.app/bots'
+
+- regex: 'Timpibot'
+  name: 'Timpibot'
+  category: 'Crawler'
+  url: 'https://timpi.io/'
+  producer:
+    name: 'Timpi Inc.'
+    url: 'https://timpi.io/'
+
+- regex: 'Validbot'
+  name: 'ValidBot'
+  category: 'Crawler'
+  url: 'https://www.validbot.com/'
+  producer:
+    name: 'Jake Olefsky LLC'
+    url: 'https://www.validbot.com/'
+
+- regex: 'NPBot'
+  name: 'NameProtectBot'
+  category: 'Crawler'
+  url: 'https://www.cscglobal.com/cscglobal/home/'
+  producer:
+    name: 'NameProtect, Inc.'
+    url: 'https://www.cscglobal.com/'
+
+- regex: 'domaincodex\.com'
+  name: 'Domain Codex'
+  category: 'Crawler'
+  url: 'https://www.domaincodex.com/'
+  producer:
+    name: 'Erie Data Systems, LLC'
+    url: 'https://www.eriedatasys.com/'
+
+- regex: 'Swisscows Favicons'
+  name: 'Swisscows Favicons'
+  category: 'Crawler'
+  url: 'https://swisscows.com/'
+  producer:
+    name: 'Swisscows AG'
+    url: 'https://swisscows.com/'
+
+- regex: 'leak\.info'
+  name: 'leak.info'
+  category: 'Crawler'
+  url: 'http://www.leak.info/'
+
+- regex: 'workona'
+  name: 'Workona'
+  category: 'Crawler'
+  url: 'https://workona.com/'
+  producer:
+    name: 'Workona, Inc.'
+    url: 'https://workona.com/'
+
+- regex: 'Bloglines'
+  name: 'Bloglines'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20140309033202/http://www.bloglines.com/'
+  producer:
+    name: 'Reply!, Inc.'
+    url: 'https://www.reply.com/'
+
+- regex: 'heritrix'
+  name: 'Heritrix'
+  category: 'Crawler'
+  url: 'https://webarchive.jira.com/wiki/display/Heritrix/Heritrix'
+  producer:
+    name: 'The Internet Archive'
+    url: 'https://archive.org'
+
+- regex: 'search\.marginalia\.nu'
+  name: 'Marginalia'
+  category: 'Crawler'
+  url: 'https://www.marginalia.nu/marginalia-search/for-webmasters/'
+  producer:
+    name: 'Marginalia'
+    url: 'https://www.marginalia.nu/'
+
+- regex: 'vu-server-health-scanner/[\d.]+'
+  name: 'VU Server Health Scanner'
+  category: 'Security Checker'
+  url: 'https://130.37.198.75/index.html'
+  producer:
+    name: 'VU Amsterdam'
+    url: 'https://vu.nl/en'
+
+- regex: 'Functionize'
+  name: 'Functionize'
+  category: 'Crawler'
+  url: 'https://www.functionize.com/'
+  producer:
+    name: 'Functionize, Inc.'
+    url: 'https://www.functionize.com/'
+
+- regex: 'Prerender'
+  name: 'Prerender'
+  category: 'Crawler'
+  url: 'https://docs.prerender.io/docs/33-overview-of-prerender-crawlers'
+  producer:
+    name: 'saas.group Inc.'
+    url: 'https://saas.group/'
+
+- regex: 'bl\.uk_ldfc_bot'
+  name: 'The British Library Legal Deposit Bot'
+  category: 'Crawler'
+  url: 'https://www.bl.uk/'
+  producer:
+    name: 'The British Library'
+    url: 'https://www.bl.uk/'
+
+- regex: 'Miniature\.io'
+  name: 'Miniature.io'
+  category: 'Service Agent'
+  url: 'https://miniature.io/'
+  producer:
+    name: 'LCX Ventures Ltd'
+    url: 'https://www.lcxventures.com/'
+
+- regex: 'Convertify'
+  name: 'Convertify'
+  category: 'Service Agent'
+  url: 'https://www.convertify.app/'
+  producer:
+    name: 'Convertify'
+    url: 'https://www.convertify.app/'
+
+- regex: 'ZoteroTranslationServer'
+  name: 'Zotero Translation Server'
+  category: 'Service Agent'
+  url: 'https://github.com/wikimedia/mediawiki-services-zotero'
+  producer:
+    name: 'The Wikimedia Foundation, Inc.'
+    url: 'https://www.wikimedia.org/'
+
+- regex: 'MuckRack'
+  name: 'MuckRack'
+  category: 'Crawler'
+  url: 'https://muckrack.com/'
+  producer:
+    name: 'Muck Rack, LLC'
+    url: 'https://muckrack.com/'
+
+- regex: 'Golfe'
+  name: 'Golfe'
+  category: 'Crawler'
+  url: 'http://www.goo-olfe.ae/bot.html'
+
+- regex: 'SpiderLing'
+  name: 'SpiderLing'
+  category: 'Crawler'
+  url: 'https://nlp.fi.muni.cz/projects/biwec/'
+  producer:
+    name: 'Natural Language Processing Centre'
+    url: 'https://nlp.fi.muni.cz/'
+
+- regex: 'Bravebot'
+  name: 'Bravebot'
+  category: 'Search bot'
+  url: 'https://search.brave.com/help/brave-search-crawler'
+  producer:
+    name: 'Brave Software, Inc.'
+    url: 'https://brave.com/'
+
+- regex: '1001FirmsBot'
+  name: '1001FirmsBot'
+  category: 'Crawler'
+  url: 'https://www.1001firms.com/1001firmsbot.php'
+
+- regex: 'SteamChatURLLookup'
+  name: 'Steam Chat URL Lookup'
+  category: 'Service Agent'
+  url: 'https://help.steampowered.com/en/faqs/view/595C-42F4-3B66-E02F'
+  producer:
+    name: 'Valve Corporation'
+    url: 'https://www.valvesoftware.com/'
+
+- regex: 'ohdear\.app'
+  name: 'Oh Dear'
+  category: 'Site Monitor'
+  url: 'https://ohdear.app/docs/faq/what-is-the-oh-dear-crawler-doing-in-my-logs'
+  producer:
+    name: 'Immutable, SNC'
+    url: 'https://ohdear.app/'
+
 # 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| 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)$'
+- 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|Searcherx?web|kirkland-signature|LinkChain|survey-security-dot-txt|infrawatch|Time/|r00ts3c-owned-you|nvdorz|Root Slut|NiggaBalls|BotPoke|GlobalWebSearch|xx032_bo9vs83_2a|sslshed|geckotrail|Wordup|^xenu|^(?:chrome|firefox|Abcd|Dark|KvshClient|Node.js|Report Runner|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|(?<!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]|$)'
+- 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 |SpeedMode; )proxy|(?<!P)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/browser_engine.yml b/includes/libraries/udd/regexes/client/browser_engine.yml
index e87ae25..c771d02 100644
--- a/includes/libraries/udd/regexes/client/browser_engine.yml
+++ b/includes/libraries/udd/regexes/client/browser_engine.yml
@@ -14,7 +14,7 @@
 - regex: 'Trident'
   name: 'Trident'
 
-- regex: 'Chrome/(?!1?\d\.|2[0-7]\.)'
+- regex: 'Chr[o0]me/(?!1?\d\.|2[0-7]\.)'
   name: 'Blink'
 
 - regex: '(?:Apple)?WebKit'
diff --git a/includes/libraries/udd/regexes/client/browsers.yml b/includes/libraries/udd/regexes/client/browsers.yml
index 58a529e..351117b 100644
--- a/includes/libraries/udd/regexes/client/browsers.yml
+++ b/includes/libraries/udd/regexes/client/browsers.yml
@@ -5,6 +5,135 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# RCA Tor Explorer
+- regex: 'RCATorExplorer'
+  name: 'RCA Tor Explorer'
+  version: ''
+
+# TQBrowser
+- regex: 'TQBrowser'
+  name: 'TQ Browser'
+  version: ''
+
+# XnBrowse (https://play.google.com/store/apps/details?id=xnx.browser.browse.Xnxnewx)
+- regex: 'XXXAndroidApp'
+  name: 'XnBrowse'
+  version: ''
+  engine:
+    default: 'Blink'
+
+# ProxyFox (https://www.stoutner.com/)
+- regex: 'ProxyFox'
+  name: 'ProxyFox'
+  version: ''
+
+# Privacy Browser (https://www.stoutner.com/)
+- regex: 'PrivacyBrowser'
+  name: 'Privacy Browser'
+  version: ''
+  engine:
+    default: 'Blink'
+
+# TUSK (https://tuskbrowser.com/)
+- regex: 'TUSK/(\d+[\.\d]+)'
+  name: 'TUSK'
+  version: '$1'
+
+# Dezor (https://www.dezor.net/)
+- regex: 'Dezor/(\d+[\.\d]+)'
+  name: 'Dezor'
+  version: '$1'
+
+# OJR Browser (https://play.google.com/store/apps/details?id=com.ojr.browser.anti.blokir)
+- regex: 'OJR Browser/([\d\.]+)'
+  name: 'OJR Browser'
+  version: '$1'
+
+# AppTec Secure Browser (https://www.apptec360.com/secure-browser/)
+- regex: 'SecureBrowser/([\d\.]+)'
+  name: 'AppTec Secure Browser'
+  version: '$1'
+
+# Veera (https://www.veera.com/)
+- regex: 'Veera/([\d\.]+)'
+  name: 'Veera'
+  version: '$1'
+
+# Ninesky (https://web.archive.org/web/20120615040938/http://www.ninesky.com/index_en.html)
+- regex: 'Ninesky(?:-android-mobile)?/([\d\.]+)'
+  name: 'Ninesky'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+# Perk (https://web.archive.org/web/20130724161928/http://www.perk.com/)
+- regex: 'Perk/([\d\.]+)'
+  name: 'Perk'
+  version: '$1'
+
+# Presearch (https://play.google.com/store/apps/details?id=com.presearch)
+- regex: 'Presearch \(Tempest\)'
+  name: 'Presearch'
+  version: ''
+
+# QtWeb (https://www.qtweb.net/)
+- regex: 'QtWeb Internet Browser(?:/(\d+[\.\d]+))?'
+  name: 'QtWeb'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+# UPhone Browser
+- regex: 'UPhoneWebBrowser(\d+[\.\d]+)'
+  name: 'UPhone Browser'
+  version: '$1'
+
+# Motorola Internet Browser
+- regex: 'MIB/(\d+[\.\d]+)'
+  name: 'Motorola Internet Browser'
+  version: '$1'
+
+# iNet Browser
+- regex: 'iNet Browser(?: (\d+[\.\d]+))?'
+  name: 'iNet Browser'
+  version: '$1'
+
+# Prism (https://wiki.mozilla.org/Prism/FAQ)
+- regex: 'Prism/([\d\.]+)'
+  name: 'Prism'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# Awesomium (https://web.archive.org/web/20150205230848/http://awesomium.com/)
+- regex: 'Awesomium/([\d\.]+)'
+  name: 'Awesomium'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+# Roccat (https://runecats.com/roccat-browser-for-mac/)
+- regex: 'Roccat(?:/(\d+[\.\d]+))?'
+  name: 'Roccat'
+  version: '$1'
+
+# Swiftweasel (https://swiftweasel.tuxfamily.org/)
+- regex: 'Swiftweasel(?:/(\d+[\.\d]+))?'
+  name: 'Swiftweasel'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# Wukong Browser (https://www.wkbrowser.com/)
+- regex: 'wkbrowser (\d+[\.\d]+)'
+  name: 'Wukong Browser'
+  version: '$1'
+
+# KUN (https://api.dcmys.kr/etc/historical/kun_3.0.1_cp_개발자_가이드_v1.1.pdf)
+- regex: 'KUN/(\d+[\.\d]+)'
+  name: 'KUN'
+  version: '$1'
+
 # Naenara Browser (https://en.wikipedia.org/wiki/Naenara_(browser))
 - regex: 'NaenaraBrowser(?:/(\d+[\.\d]+))?'
   name: 'Naenara Browser'
@@ -435,9 +564,9 @@
   version: ''
 
 # Keepsafe Browser (https://www.getkeepsafe.com/products/browser/)
-- regex: 'Keepsafe Browser'
+- regex: 'Keepsafe Browser(?:/(\d+[\.\d]+))?'
   name: 'Keepsafe Browser'
-  version: ''
+  version: '$1'
 
 # Vast Browser (https://play.google.com/store/apps/details?id=com.vast.vpn.proxy.unblock)
 - regex: '(.*)Vast Browser/(\d+\.[\.\d]+)'
@@ -1073,8 +1202,6 @@
 - regex: 'PHX/(?:(\d+[\.\d]+))?'
   name: 'Phoenix Browser'
   version: '$1'
-  engine:
-    default: 'Blink'
 
 # PrivacyWall (https://play.google.com/store/apps/details?id=org.privacywall.browser)
 - regex: 'PrivacyWall/(?:(\d+[\.\d]+))?'
@@ -1457,8 +1584,8 @@
   engine:
     default: 'Blink'
 
-# 7Star
-- regex: '7Star/(?:(\d+[\.\d]+))'
+# 7Star or 7 Star or Kuaiso (https://web.archive.org/web/20210614112514/http://browser.kuaiso.com/)
+- regex: '(?:7Star|Kuaiso)/(?:(\d+[\.\d]+))'
   name: '7Star'
   version: '$1'
   engine:
@@ -1485,6 +1612,11 @@
   engine:
     default: 'Blink'
 
+# ZTE Browser
+- regex: 'ZTE ?Browser/'
+  name: 'ZTE Browser'
+  version: '$1'
+
 # vivo Browser
 - regex: 'VivoBrowser(?:/(\d+[\.\d]+))?'
   name: 'vivo Browser'
@@ -1722,7 +1854,7 @@
   version: '$1'
   engine:
     default: 'Blink'
-- regex: 'Brave(?:/(\d+[\.\d]+))?'
+- regex: 'Brave(?: Chrome)?(?:/(\d+[\.\d]+))?'
   name: 'Brave'
   version: '$1'
   engine:
@@ -2184,6 +2316,11 @@
     versions:
       4: '' # multiple (KHTML or WebKit)
 
+# HONOR Browser
+- regex: 'bdhonorbrowser/(\d+[\.\d]+)'
+  name: 'HONOR Browser'
+  version: '$1'
+
 #Baidu Browser
 - regex: '(?:baidubrowser|bdbrowser(?:(?:hd)?_i18n)?|FlyFlow|BaiduHD)(?:[/ ](\d+[\.\d]*))?'
   name: 'Baidu Browser'
@@ -2200,7 +2337,7 @@
   version: '$1'
   engine:
     default: 'WebKit'
-- regex: 'iP(?:hone|ad);.+YaBrowser(?:/(\d+[\.\d]*)) Mobile'
+- regex: 'iP(?:hone|ad).*YaBrowser(?:/(\d+[\.\d]*))'
   name: 'Yandex Browser'
   version: '$1'
   engine:
@@ -2210,6 +2347,12 @@
   version: '$1'
   engine:
     default: 'Blink'
+# Yandex Browser Corp (https://browser.yandex.ru/corp)
+- regex: 'YaBrowser/(\d+[\.\d]*).*corp'
+  name: 'Yandex Browser Corp'
+  version: '$1'
+  engine:
+    default: 'Blink'
 #Yandex Browser
 - regex: 'YaBrowser(?:/(\d+[\.\d]*))(?: \((alpha|beta)\))?'
   name: 'Yandex Browser'
@@ -2281,9 +2424,19 @@
   engine:
     default: '' # Trident and WebKit
 
-#Puffin
-- regex: 'Puffin(?:/(\d+[\.\d]+))?'
-  name: 'Puffin'
+# Puffin Cloud Browser (https://play.google.com/store/apps/details?id=com.cloudmosa.puffinCloudBrowser)
+- regex: 'Puffin/(\d+[\.\d]+)FP'
+  name: 'Puffin Cloud Browser'
+  version: '$1'
+
+# Puffin Secure Browser (https://www.puffin.com/secure-browser)
+- regex: 'Puffin/(\d+[\.\d]+)(?:[LMW]D)'
+  name: 'Puffin Secure Browser'
+  version: '$1'
+
+# Puffin Web Browser (https://www.puffin.com/web-browser)
+- regex: 'Puffin/(\d+[\.\d]+)(?:[AILW][PT]|M)?'
+  name: 'Puffin Web Browser'
   version: '$1'
 
 #MobileIron
@@ -2354,9 +2507,9 @@
   engine:
     default: '' # multi engine -- WebKit or Blink
 
-# MIUI Browser
+# Mi Browser
 - regex: '(?:MIUIBrowser|MiuiBrowser)(?:/(\d+[\.\d]+))?'
-  name: 'MIUI Browser'
+  name: 'Mi Browser'
   version: '$1'
   engine:
     default: '' # multi engine -- WebKit or Blink
@@ -2374,7 +2527,11 @@
     versions:
       28: 'Blink'
 
-- regex: '(?:DDG-Android-|DuckDuckGo/|ddg_android/)(\d+[\.\d]*)'
+# DuckDuckGo Privacy Browser
+- regex: '(?:DuckDuckGo|Ddg)/(\d+[\.\d]*)'
+  name: 'DuckDuckGo Privacy Browser'
+  version: '$1'
+- regex: '(?:DDG-Android-|ddg_android/)(\d+[\.\d]*)'
   name: 'DuckDuckGo Privacy Browser'
   version: '$1'
   engine:
@@ -2568,7 +2725,7 @@
   version: '$1'
 
 #Nokia Browser
-- regex: '(?:NokiaBrowser|BrowserNG|WicKed)(?:/(\d+[\.\d]+))?'
+- regex: '(?:NokiaBrowser|BrowserNG|WicKed|Nokia-Communicator-WWW-Browser)(?:/(\d+[\.\d]+))?'
   name: 'Nokia Browser'
   version: '$1'
 - regex: 'Series60/5\.0'
@@ -2781,6 +2938,11 @@
   name: 'NCSA Mosaic'
   version: '$1'
 
+# VMS Mosaic
+- regex: 'VMS_Mosaic(?:/(\d+[\.\d]+))?'
+  name: 'VMS Mosaic'
+  version: '$1'
+
 #ABrowse
 - regex: 'ABrowse(?: (\d+[\.\d]+))?'
   name: 'ABrowse'
@@ -3017,7 +3179,7 @@
     default: 'WebKit'
 
 #Phoenix
-- regex: 'Phoenix(?:/(\d+[\.\d]+))?'
+- regex: '(?<!/)Phoenix(?:/(\d+[\.\d]+))?'
   name: 'Phoenix'
   version: '$1'
 
@@ -3027,6 +3189,11 @@
   version: '$1'
   engine:
     default: 'NetFront'
+- regex: 'Browser/(?:NetFont-|NF|NetFront)(\d+[\.\d]+)'
+  name: 'NetFront'
+  version: '$1'
+  engine:
+    default: 'NetFront'
 - regex: 'NetFront(?:/(\d+[\.\d]+))?'
   name: 'NetFront'
   version: '$1'
@@ -3164,7 +3331,7 @@
     default: 'WebKit'
 
 # Dorado
-- regex: '(?:\w{1,5}[_ ])?Dorado WAP-Browser(?:[/ ](\d+[\.\d]+))?'
+- regex: '(?:\w{1,5}[_ ])?Dorado(?: WAP-Browser)?(?:[/ ]?(\d+[\.\d]+))?'
   name: 'Dorado'
   version: '$1'
 
diff --git a/includes/libraries/udd/regexes/client/hints/apps.yml b/includes/libraries/udd/regexes/client/hints/apps.yml
index bf58ac3..0ca22de 100644
--- a/includes/libraries/udd/regexes/client/hints/apps.yml
+++ b/includes/libraries/udd/regexes/client/hints/apps.yml
@@ -1,6 +1,7 @@
 # Apps
 
 'org.telegram.messenger': 'Telegram'
+'org.telegram.messenger.web': 'Telegram'
 'com.snapchat.android': 'Snapchat'
 'info.sunista.app': 'Sanista Persian Instagram'
 'com.instapro.app': 'InstaPro'
@@ -136,6 +137,17 @@
 'nu.bi.moya': 'Moya'
 'com.microsoft.copilot': 'Microsoft Copilot'
 'com.nate.android.portalmini': 'nate'
+'za.co.tracker.consumer': 'Tracker Connect'
+'com.larus.wolf': 'Cici'
+'com.qihoo.security': '360 Security'
+'com.infinix.xshare': 'XShare'
+'com.transsion.magicshow': 'Visha'
+'com.bigqsys.photosearch.searchbyimage2020': 'Photo Search'
+'com.stickypassword.android': 'Sticky Password'
+'com.nytimes.crossword': 'The Crossword'
+'castify.roku': 'Castify'
+'com.castify': 'Castify'
+'mojeek.app': 'Mojeek'
 
 # Vpns
 'org.torproject.android': 'Orbot'
diff --git a/includes/libraries/udd/regexes/client/hints/browsers.yml b/includes/libraries/udd/regexes/client/hints/browsers.yml
index 15fe748..20ccd51 100644
--- a/includes/libraries/udd/regexes/client/hints/browsers.yml
+++ b/includes/libraries/udd/regexes/client/hints/browsers.yml
@@ -3,6 +3,7 @@
 'mark.via.gp': 'Via'
 'mark.via.gq': 'Via'
 'mark.via.pm': 'Via'
+'mark.viah': 'Via'
 'com.pure.mini.browser': 'Pure Mini Browser'
 'pure.lite.browser': 'Pure Lite Browser'
 'acr.browser.Hexa': 'Hexa Web Browser'
@@ -14,7 +15,9 @@
 'com.darkbrowser': 'Dark Browser'
 'com.kiwibrowser.browser': 'Kiwi'
 'com.cloudmosa.puffinFree': 'Puffin Web Browser'
-'com.cloudmosa.puffin': 'Puffin Web Browser' # Puffin Cloud Browser or Puffin Web Browser Pro
+'com.cloudmosa.puffin': 'Puffin Web Browser' # or Puffin Web Browser Pro
+'com.cloudmosa.puffinIncognito': 'Puffin Incognito Browser'
+'com.cloudmosa.puffinCloudBrowser': 'Puffin Cloud Browser'
 'com.aloha.browser': 'Aloha Browser'
 'com.cake.browser': 'Cake Browser'
 'com.UCMobile.intl': 'UC Browser'
@@ -77,12 +80,15 @@
 'com.opera.browser': 'Opera'
 'com.opera.mini.native': 'Opera Mini'
 'com.wSilverMobBrowser': 'SilverMob US'
+'com.ksmobile.cb': 'CM Browser'
+'com.cmcm.armorfly': 'Armorfly Browser'
 'org.mini.freebrowser': 'CM Mini'
 'com.anc.web.browser': 'Comfort Browser'
 'fast.explorer.web.browser': 'Fast Explorer'
 'net.soti.surf': 'SOTI Surf'
 'com.lexi.browser': 'Lexi Browser'
 'com.browser.pintar': 'Smart Browser'
+'com.belva.browser': 'Belva Browser'
 'com.belva.safe.browser': 'Belva Browser'
 'com.youcare.browser': 'YouCare'
 'org.lilo.mobile.android2020': 'Lilo'
@@ -224,7 +230,7 @@
 'com.sec.android.app.sbrowser.lite': 'Samsung Browser Lite'
 'com.browser.elmurzaev': 'World Browser'
 'every.browser.inc': 'Every Browser'
-'com.mi.globalbrowser': 'MIUI Browser'
+'com.mi.globalbrowser': 'Mi Browser'
 'nu.tommie.inbrowser': 'InBrowser'
 'com.insta.browser': 'Insta Browser'
 'com.alohamobile.vertexsurf': 'Vertex Surf'
@@ -290,3 +296,29 @@
 'acr.browser.lightning': 'Lightning Browser Plus'
 'birapp.dark.web': 'Dark Web'
 'birapp.dark.web.private': 'Dark Web Private'
+'com.hihonor.baidu.browser': 'HONOR Browser'
+'com.browser.pintar.vpn': 'Pintar Browser'
+'com.ucimini.internetbrowser': 'Browser Mini'
+'de.baumann.browser': 'FOSS Browser'
+'com.oversea.mybrowser': 'Peach Browser'
+'com.apptec360.android.browser': 'AppTec Secure Browser'
+'com.ojr.browser.anti.blokir': 'OJR Browser'
+'com.vworldc.tusk': 'TUSK'
+'com.stoutner.privacybrowser.standard': 'Privacy Browser'
+'com.techlastudio.proxyfoxbrowser': 'ProxyFox'
+'com.vielianztlabs.browser': 'ProxyMax'
+'com.keepsolid.privatebrowser': 'KeepSolid Browser'
+'com.onionsearchengine.focus': 'ONIONBrowser'
+'com.best.quick.browser': 'Ai Browser'
+'miada.tv.webbrowser': 'Internet Webbrowser'
+'com.kaweapp.webexplorer': 'Web Explorer'
+'com.halo.browser': 'Halo Browser'
+'com.mmbox.xbrowser': 'MMBOX XBrowser'
+'com.tvwebbrowser.v22': 'TV-Browser Internet'
+'com.tvwebbrowserpaid.v22': 'TV-Browser Internet'
+'xnx.browser.browse.Xnxnewx': 'XnBrowse'
+'com.metax.browser': 'Open Browser Lite'
+'com.getkeepsafe.browser': 'Keepsafe Browser'
+'com.hawk.android.browser': 'Hawk Turbo Browser'
+'com.zte.nubrowser': 'ZTE Browser'
+'com.cloaktp.browser': 'Privacy Pioneer Browser'
diff --git a/includes/libraries/udd/regexes/client/libraries.yml b/includes/libraries/udd/regexes/client/libraries.yml
index 9363f67..1e28b3a 100644
--- a/includes/libraries/udd/regexes/client/libraries.yml
+++ b/includes/libraries/udd/regexes/client/libraries.yml
@@ -5,6 +5,11 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+- regex: 'IPinfoClient/.*/(\d+[\.\d]+)'
+  name: 'IPinfo'
+  version: '$1'
+  url: 'https://github.com/ipinfo'
+
 - regex: 'kiwi-tcms/(\d+[\.\d]+)'
   name: 'Kiwi TCMS'
   version: '$1'
@@ -611,3 +616,13 @@
   name: 'Boto3'
   version: '$1'
   url: 'https://github.com/boto/boto3'
+
+- regex: 'Python-xmlrpc(?:/(\d+[\.\d]+))?'
+  name: 'XML-RPC'
+  version: '$1'
+  url: 'https://docs.python.org/3/library/xmlrpc.html'
+
+- regex: 'ICAP-Client-Library(?:/(\d+[\.\d]+))?'
+  name: 'ICAP Client'
+  version: '$1'
+  url: 'https://github.com/Peoplecantfly/icapserver'
diff --git a/includes/libraries/udd/regexes/client/mobile_apps.yml b/includes/libraries/udd/regexes/client/mobile_apps.yml
index c6068a9..d286507 100644
--- a/includes/libraries/udd/regexes/client/mobile_apps.yml
+++ b/includes/libraries/udd/regexes/client/mobile_apps.yml
@@ -5,11 +5,6 @@
 # @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'
@@ -272,7 +267,7 @@
   version: '$1'
 - regex: 'BeyondPod'
   name: 'BeyondPod'
-  version:
+  version: ''
 
 - regex: '(?:^Overcast/([\d\.]+)|^Overcast.*Apple Watch)'
   name: 'Overcast'
@@ -297,7 +292,7 @@
   version: ''
 - regex: 'DoggCatcher'
   name: 'DoggCatcher'
-  version:
+  version: ''
 - regex: '(?:PodcastAddict/v([\d]+)|^Podcast Addict)'
   name: 'Podcast & Radio Addict'
   version: '$1'
@@ -558,7 +553,10 @@
   version: '$1'
 
 # TikTok (https://apps.apple.com/app/id835599320 | https://play.google.com/store/apps/details?id=com.zhiliaoapp.musically)
-- regex: '(?:TikTok[/ ]|com\.zhiliaoapp\.musically|musical_ly_|AppName/musical_ly app_version/)(\d+\.(?:[\.\d]+))?'
+- regex: 'AppName/musical_ly app_version/(\d+\.(?:[\.\d]+))?'
+  name: 'TikTok'
+  version: '$1'
+- regex: '(?:TikTok[/ ]|com\.zhiliaoapp\.musically|musical_ly_|trill_)(\d+\.(?:[\.\d]+))?'
   name: 'TikTok'
   version: '$1'
 
@@ -706,7 +704,7 @@
   name: 'Evolve Podcast'
   version: '$1'
 
-- regex: ' Rocket\.Chat\+?/(\d+[\.\d]+)'
+- regex: 'Rocket\.Chat\+?/(\d+[\.\d]+)'
   name: 'Rocket Chat'
   version: '$1'
 
@@ -1091,6 +1089,21 @@
   name: 'Blackboard'
   version: '$1'
 
+# TIM (https://tim.qq.com/)
+- regex: 'TIM/(\d+[\.\d]+)'
+  name: 'TIM'
+  version: '$1'
+
+# Tencent Docs (https://docs.qq.com/)
+- regex: 'TencentDocs/(\d+[\.\d]+)'
+  name: 'Tencent Docs'
+  version: '$1'
+
+# QQ (https://apps.apple.com/us/app/qq/id444934666)
+- regex: 'QQ/(\d+[\.\d]+) V1_IPH_SQ_'
+  name: 'QQ'
+  version: '$1'
+
 # QQMusic (https://apps.apple.com/cn/app/qq%E9%9F%B3%E4%B9%90-%E5%90%AC%E6%88%91%E6%83%B3%E5%90%AC/id414603431)
 - regex: 'QQMusic/(\d+[\.\d]+)'
   name: 'QQMusic'
@@ -2137,7 +2150,7 @@
   name: 'Shadowrocket'
   version: '$1'
 
-- regex: '^SiriusXM/([\d\.]+)'
+- regex: '^(?:SiriusXM|sxm-android|sxm-apple)/([\d\.]+)'
   name: 'SiriusXM'
   version: '$1'
 
@@ -2482,8 +2495,58 @@
   name: 'SoFi'
   version: '$1'
 
+# WNYC (https://play.google.com/store/apps/details?id=org.wnyc.android)
+- regex: 'WNYC(?: App)?[/ ]?([\d\.]+)?'
+  name: 'WNYC'
+  version: '$1'
+
+# The Epoch Times (https://apps.apple.com/us/app/epoch-times-live-breaking/id670443321)
+- regex: 'com\.theepochtimes\.mobile/([\d\.]+)'
+  name: 'The Epoch Times'
+  version: '$1'
+
+# Reuters News (https://apps.apple.com/us/app/reuters-news/id602660809)
+- regex: 'ReutersNews(?: App)?[/ ]?([\d\.]+)?'
+  name: 'Reuters News'
+  version: '$1'
+
+# WatchFree+ (https://web.archive.org/web/20240514173717/https://www.vizio.com/en/watchfreeplus)
+- regex: 'WatchFree/([\d\.]+)'
+  name: 'WatchFree+'
+  version: '$1'
+
+# Obsidian (https://obsidian.md/)
+- regex: 'obsidian/([\d\.]+)'
+  name: 'Obsidian'
+  version: '$1'
+
+# Perplexity (https://apps.apple.com/us/app/perplexity-ask-anything/id1668000334)
+- regex: 'Perplexity'
+  name: 'Perplexity'
+  version: ''
+
+# XShare
+- regex: 'XShare'
+  name: 'XShare'
+  version: ''
+
+# Visha (https://play.google.com/store/apps/details?id=com.transsion.magicshow)
+- regex: 'VISHAAPP ([\d\.]+)'
+  name: 'Visha'
+  version: '$1'
+
+# The Crossword (https://play.google.com/store/apps/details?id=com.nytimes.crossword)
+- regex: 'nyt_android/([\d\.]+)'
+  name: 'The Crossword'
+  version: '$1'
+
+# Mojeek (https://play.google.com/store/apps/details?id=mojeek.app)
+- regex: 'mojeek-app'
+  name: 'Mojeek'
+  version: ''
+
 # 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/'
+- regex: ' (?!(?:AppleWebKit|brave|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|Dezor|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'
 
diff --git a/includes/libraries/udd/regexes/client/pim.yml b/includes/libraries/udd/regexes/client/pim.yml
index 46e1347..1299c10 100644
--- a/includes/libraries/udd/regexes/client/pim.yml
+++ b/includes/libraries/udd/regexes/client/pim.yml
@@ -27,6 +27,11 @@
   name: 'Thunderbird'
   version: '$1'
 
+# Spicebird (http://www.spicebird.org/)
+- regex: 'Spicebird/(\d+\.[\.\d]+)'
+  name: 'Spicebird'
+  version: '$1'
+
 - regex: 'Airmail(?: (\d+[\.\d]+))?'
   name: 'Airmail'
   version: '$1'
@@ -143,7 +148,7 @@
   version: '$1'
 
 # Mail Master (https://apps.apple.com/mw/app/mail-master-by-netease/id897003024)
-- regex: 'MailMaster(?:PC)?/(\d+[\.\d]+)'
+- regex: 'MailMaster(?:PC|_Android_Mobile)?/(\d+[\.\d]+)'
   name: 'Mail Master'
   version: '$1'
 
@@ -155,3 +160,8 @@
 - regex: 'mailapp/(\d+\.[\.\d]+)'
   name: 'mailapp'
   version: '$1'
+
+# Gmail
+- regex: 'Android-Gmail'
+  name: 'Gmail'
+  version: ''
diff --git a/includes/libraries/udd/regexes/device/consoles.yml b/includes/libraries/udd/regexes/device/consoles.yml
index 888f840..2a8bbf2 100644
--- a/includes/libraries/udd/regexes/device/consoles.yml
+++ b/includes/libraries/udd/regexes/device/consoles.yml
@@ -69,6 +69,10 @@ Sony:
 
 # Retroid Pocket (www.goretroid.com)
 Retroid Pocket:
-  regex: 'Retroid Pocket 2(?:Plus|\+)'
+  regex: 'Retroid Pocket'
   device: 'console'
-  model: '2 Plus'
+  models:
+    - regex: 'Retroid Pocket ([32]) ?(?:Plus|\+)'
+      model: '$1 Plus'
+    - regex: 'Retroid Pocket 4 Pro'
+      model: '4 Pro'
diff --git a/includes/libraries/udd/regexes/device/mobiles.yml b/includes/libraries/udd/regexes/device/mobiles.yml
index caa52f5..9ddd288 100644
--- a/includes/libraries/udd/regexes/device/mobiles.yml
+++ b/includes/libraries/udd/regexes/device/mobiles.yml
@@ -7,33 +7,36 @@
 
 # Ace or ACE France (www.acemobile.fr)
 Ace:
-  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 4 Prime'
-      model: 'Buzz 4 Prime'
-    - regex: 'BUZZ 4Pro'
-      model: 'Buzz 4 Pro'
+  regex: '(?:BUZZ [1-5]|BUZZ 4(?:Pro|S|Lite)|CLEVER [13]|URBAN [123](?: Pro)?)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'BUZZ ([45]) Ultra'
+      model: 'Buzz $1 Ultra'
+    - regex: 'BUZZ ([45]) Note'
+      model: 'Buzz $1 Note'
+    - regex: 'BUZZ ([45]) Prime'
+      model: 'Buzz $1 Prime'
+    - regex: 'BUZZ 5 Pro Plus'
+      model: 'Buzz 5 Pro+'
+    - regex: 'BUZZ ([45]) ?Pro'
+      model: 'Buzz $1 Pro'
     - regex: 'BUZZ ([124]) ?Lite'
       model: 'Buzz $1 Lite'
     - regex: 'BUZZ ([123]) Plus'
       model: 'Buzz $1 Plus'
     - regex: 'BUZZ 4S'
       model: 'Buzz 4S'
-    - regex: 'BUZZ ([1-4])'
+    - regex: 'BUZZ ([1-5])'
       model: 'Buzz $1'
     - regex: 'CLEVER ([13])'
       model: 'Clever $1'
     - regex: 'URBAN 1 Pro'
       model: 'Urban 1 Pro'
-    - regex: 'URBAN ([13])'
+    - regex: 'URBAN ([123])'
       model: 'Urban $1'
 
-'Tunisie Telecom':
+# Tunisie Telecom
+Tunisie Telecom:
   regex: 'StarTrail TT(?:[);/ ]|$)'
   device: 'smartphone'
   model: 'StarTrail by TT'
@@ -112,8 +115,8 @@ Adronix:
       model: '$1'
 
 # Cherry Mobile (cherrymobile.com)
-'Cherry Mobile':
-  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'
+Cherry Mobile:
+  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[ _][345]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|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))?)'
@@ -175,7 +178,7 @@ Adronix:
       model: 'Flare $1'
     - regex: 'Touch XL 2'
       model: 'Touch XL 2'
-    - regex: 'OMEGA[ _]HD[ _]([45])'
+    - regex: 'OMEGA[ _]HD[ _]([345])'
       model: 'Omega HD $1'
     - regex: 'Omega_HD_Duo'
       model: 'Omega HD Duo'
@@ -240,22 +243,22 @@ Adronix:
 
 # HTC (htc.com)
 HTC:
-  regex: 'HTC|Sprint (?:APA|ATP)|ADR(?!910L)[a-z0-9]+|NexusHD2|Amaze[ _]4G(?:[);/ ]|$)|(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|\))|(Amaze[ _]4G|(?<!BLU LIFE |ZOPO )One ?[XELSV\+]+)(?:[);/ ]|$)|SPV E6[05]0|(One M8|One Mini 2|X525a|PG86100|PC36100|XV6975|PJ83100|2PYB2|2PS64|2PZC5|0PJA10|0PJA2|HTV33|0PM92|0PCV1|601HT|0PAJ5|HTL2[23]|HTV3[12]|2PQ93|X2-HT|EXODUS 1|ISW13HT|710C|U Ultra|2Q8L10000)(?:[);/ ]|$)'
+  regex: 'HTC|Sprint (?:APA|ATP)|ADR(?!910L)[a-z0-9]+|NexusHD2|Amaze[ _]4G(?:[);/ ]|$)|(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|\))|(Amaze[ _]4G|(?<!BLU LIFE |ZOPO )One ?[XELSV\+]+)(?:[);/ ]|$)|SPV E6[05]0|(One M8|One Mini 2|X525a|PG86100|PC36100|XV6975|PJ83100|2PYB2|2PS64|2PZC5|0PJA10|0PJA2|HTV33|0PM92|0PCV1|601HT|0PAJ5|HTL2[23]|HTV3[12]|2PQ93|X2-HT|EXODUS 1|ISW13HT|710C|U Ultra|2Q8L10000|2Q55100|2QC9200|2PZC100|2PZF1|2PZM3|2Q6E1|U12 life)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
-    - regex: '(?:2PZF1|U Ultra)(?:[);/ ]|$)'
-      model: 'U Ultra'
-    - regex: 'HTC[_ ](?:U-2u|U Play|2PZM3)(?:[);/ ]|$)'
+    - regex: '(?:HTC[_ ](?:U-2u|U Play|2PZM3)|2PZM3)(?:[);/ ]|$)'
       model: 'U Play'
-    - regex: 'HTC[_ ]U-1[wu](?:[);/ ]|$)'
+    - regex: '(?:HTC[_ ]U-1[wu]|2PZF1|U Ultra)(?:[);/ ]|$)'
       model: 'U Ultra'
     - regex: '(?:U11 plus|(?:HTC_)?2Q4D[12]00)(?:[);/ ]|$)'
       model: 'U11 Plus'
-    - regex: 'HTC (?:U12\+|2Q55[13]00)(?:[);/ ]|$)'
+    - regex: '(?:HTC )?(?:U12\+|2Q55[13]00)(?:[);/ ]|$)'
       model: 'U12 Plus'
     - regex: 'U(1[12]) life(?:[);/ ]|$)'
       model: 'U$1 Life'
+    - regex: '2Q6E1(?:[);/ ]|$)'
+      model: 'U12 Life'
     - regex: '(?:U11 Eyes|2Q4R100)(?:[);/ ]|$)'
       model: 'U11 Eyes'
     - regex: 'XV6975(?:[);/ ]|$)'
@@ -284,7 +287,7 @@ HTC:
       model: 'J'
     - regex: 'HTL22(?:[);/ ]|$)'
       model: 'J One'
-    - regex: 'HTC U23 pro(?:[);/ ]|$)'
+    - regex: '(?:HTC U23 pro|2QC9200)(?:[);/ ]|$)'
       model: 'U23 Pro'
     - regex: '(?:HTL23|HTV31)(?:[);/ ]|$)'
       model: 'J Butterfly'
@@ -410,6 +413,8 @@ HTC:
       model: '$1 (Sprint)'
     - regex: 'Sprint (APA.*) Build'
       model: '$1 (Sprint)'
+    - regex: 'Wildfire (E3) lite'
+      model: 'Wildfire $1 Lite'
     - regex: 'Wildfire (E2?) plus'
       model: 'Wildfire $1 Plus'
     - regex: 'HTC[ _]([^/;]+) [0-9]+(?:\.[0-9]+)+ Build'
@@ -655,9 +660,9 @@ Nokia:
       device: 'tablet'
       model: 'T$1'
 
-    - regex: '(Streaming Stick 800)(?:[);/ ]|$)'
+    - regex: 'Streaming (Stick 800|Box 8000)(?:[);/ ]|$)'
       device: 'tv'
-      model: '$1'
+      model: 'Streaming $1'
 
     - regex: 'Nokia ([A-Za-z0-9\. ]+)(?: Build|\))'
       model: '$1'
@@ -693,7 +698,7 @@ Nokia:
 
 # CnM
 CnM:
-  regex: 'CnM'
+  regex: 'CnM '
   device: 'tablet'
   models:
     - regex: 'CnM[ \-](?:Touchpad|TP)[ \-]([0-9\.]+)'
@@ -710,11 +715,11 @@ RIM:
       model: 'KEYone'
     - regex: 'BBC100-1'
       model: 'Aurora'
-    - regex: 'BBD100-[126]'
+    - regex: 'BBD100-[126]|BlackBerry Motion'
       model: 'Motion'
     - regex: 'BBE100-[123456789]'
       model: 'KEY2 LE'
-    - regex: 'BBF100-[1234567]'
+    - regex: 'BBF100-[1234567]|BlackBerry Key2'
       model: 'KEY2'
     - regex: 'BBF100-8'
       model: 'KEY2 Silver'
@@ -754,67 +759,57 @@ RIM:
 
 # Ghia or GHIA (www.ghia.com.mx)
 Ghia:
-  regex: 'GHIA|QS702|SVEGLIO[ _][QH]1|VECTOR10\.1|GTKIDS7[BVR]?|(?:A7_WF|GTA7(?:WF|PLUS)|VENUS7|TREO_TAB8G?|VECTOR_SLIM|GTAB718|GTABPND|GTABKIDS|GTVR10S|AXIS7_SLIM|AXIS7_LED)(?:[);/ ]|$)'
-  device: 'smartphone'
+  regex: 'GHIA|QS702|SVEGLIO[ _][QH]1|VECTOR10\.1|GTKIDS7[BVR]?|(?:A7_WF|GTA7(?:WF|PLUS)|VENUS7|TREO_TAB8G?|VECTOR_SLIM|GTAB718|GTABPND|GTABKIDS|GTVR10S|AXIS7_SLIM|AXIS7_LED|4104116N)(?:[);/ ]|$)'
+  device: 'tablet'
   models:
     - regex: 'SVEGLIO[ _]([QH]1)'
       model: 'Sveglio $1'
+      device: 'smartphone'
     - regex: 'QS702'
       model: 'QS702'
+      device: 'smartphone'
     - regex: 'GHIA_ZEUS_3G'
       model: 'Zeus 3G'
+      device: 'smartphone'
     - regex: 'GHIA[ _](L1)'
       model: '$1'
+      device: 'smartphone'
+
     - regex: 'VECTOR_SLIM'
-      device: 'tablet'
       model: 'Vector Slim'
     - regex: 'GHIA_AXIS7P'
       model: 'Axis 7P'
-      device: 'tablet'
     - regex: 'AXIS7_SLIM'
       model: 'Axis 7 Slim'
-      device: 'tablet'
     - regex: 'AXIS7_LED'
       model: 'Axis 7 LED'
-      device: 'tablet'
     - regex: 'GHIA_AXIS7_3G'
       model: 'Axis 7 3G'
-      device: 'tablet'
     - regex: 'GHIA_AXIS7'
       model: 'Axis 7'
-      device: 'tablet'
     - regex: 'A7_WF'
       model: 'A7 WiFi'
-      device: 'tablet'
     - regex: 'VECTOR10\.1'
       model: 'Vector 10.1"'
-      device: 'tablet'
     - regex: 'GTA7WF'
-      device: 'tablet'
       model: 'A7 ROJA'
     - regex: 'GTA7PLUS'
-      device: 'tablet'
       model: 'A7 Plus'
     - regex: 'TREO_TAB8G'
-      device: 'tablet'
       model: 'TREO TAB8G'
     - regex: 'GTKIDS7[ABVR]?|GTABKIDS'
-      device: 'tablet'
       model: 'GT KIDS 7'
     - regex: 'GTVR10S'
-      device: 'tablet'
       model: 'Vector 10.1" Slim'
     - regex: 'GTABPND'
-      device: 'tablet'
       model: 'Kids Panda'
     - regex: 'VENUS7'
-      device: 'tablet'
       model: 'VENUS 7'
+    - regex: '4104116N'
+      model: 'Any Diez.1'
     - regex: 'GHIA[ _]?(47458|VECTOR_3G)'
-      device: 'tablet'
       model: '$1'
     - regex: '(GTAB718)'
-      device: 'tablet'
       model: '$1'
 
 # PALM
@@ -847,7 +842,7 @@ Compaq:
 
 # HP or Hewlett-Packard
 HP:
-  regex: 'Hewlett-Packard|HP/HP|HP Chromebook|HP EliteBook 820|TouchPad/\d+\.\d+|hp-tablet|HP ?iPAQ|webOS.*P160U|HP (?:Pro )?Slate|Slate 21|HP [78]|HP 10 Plus|Compaq [7|8]|HP; [^;/)]+|cm_tenderloin'
+  regex: 'Hewlett-Packard|HP Engage|HP/HP|HP Chromebook|HP EliteBook|TouchPad/\d+\.\d+|hp-tablet|HP ?iPAQ|webOS.*P160U|HP (?:Pro )?Slate|Slate 21|HP [78]|HP 10 Plus|Compaq [7|8]|HP; [^;/)]+|cm_tenderloin'
   device: 'smartphone'
   models:
     - regex: 'HP Slate 6 Voice Tab'
@@ -868,6 +863,10 @@ HP:
       model: 'Touch 9.7" WiFi'
       device: 'tablet'
 
+    - regex: 'Compaq 8200 Elite SFF PC'
+      device: 'desktop'
+      model: 'Compaq 8200 Elite SFF PC'
+
     - regex: 'Compaq ([78][^/;]*) Build'
       model: 'Compaq $1'
       device: 'tablet'
@@ -893,12 +892,15 @@ HP:
     - regex: 'HP ProBook (6560b)'
       device: 'desktop'
       model: 'ProBook $1'
+    - regex: 'Engage One Pro AIO'  # monoblock
+      device: 'desktop'
+      model: 'Engage One Pro AIO'
     - regex: 'Chromebook (11 G5|x360 11 G1 EE|13 G1|x2)'
       device: 'desktop'
       model: 'Chromebook $1'
-    - regex: 'HP EliteBook 820 G2'
+    - regex: 'HP EliteBook (820 G2|8470p)'
       device: 'desktop'
-      model: 'EliteBook 820 G2'
+      model: 'EliteBook $1'
     - regex: 'Z240 Tower Workstation'
       device: 'desktop'
       model: 'Z240 Tower Workstation'
@@ -925,7 +927,7 @@ TiVo:
 
 # Apple
 Apple:
-  regex: '(?:iTunes-)?Apple[ _]?TV|Apple/|(?:Apple-|iTunes-)?(?<!like )(?:iPad|iPhone)(?!\: Build/)|iPh(?:[0-9]|1[0-4]),[0-9]|CFNetwork|HomePod|AirPlay|AirPodcasts/|Watch ?OS|Watch1,[12]|MDCR_Mac|ICRU_iP(?:ad|hone)|Mac OS X[,;]|OSX/|macOS,|for Apple Watch'
+  regex: '(?:iTunes-)?Apple[ _]?TV|Apple/|(?:Apple-|iTunes-)?(?<!like )(?:iPad|iPhone)(?!\: Build/)|iPh(?:[0-9]|1[0-7]),[0-9]|CFNetwork|HomePod|AirPlay|AirPodcasts/|Watch ?OS|Watch1,[12]|MDCR_Mac|ICRU_iP(?:ad|hone)|Mac OS X[,;]|OSX/|macOS,|for Apple Watch'
   models:
     - regex: '(?:HomePod|AirPodcasts/)'
       device: 'smart speaker'
@@ -1001,7 +1003,7 @@ Apple:
     - regex: 'Watch7,[24]'
       device: 'wearable'
       model: 'Watch Series 9 45mm'
-    - regex: 'Apple Watch'
+    - regex: '(:?Apple Watch|watchOS)'
       device: 'wearable'
       model: 'Watch'
 
@@ -1491,6 +1493,18 @@ Apple:
     - regex: '(?:MDCR_|ICRU_|Apple-)?iPh(?:one)?15[C,_]4|(?:iPhone[ _]?15| 15)(?:[);/ ]|$)'
       model: 'iPhone 15'
       device: 'phablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPh(?:one)?17[C,_]2|(?:iPhone[ _]?16[ _]?Pro[ _]?Max| 16PROMAX)(?:[);/ ]|$)'
+      model: 'iPhone 16 Pro Max'
+      device: 'phablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPh(?:one)?17[C,_]1|(?:iPhone[ _]?16[ _]?Pro| 16PRO)(?:[);/ ]|$)'
+      model: 'iPhone 16 Pro'
+      device: 'phablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPh(?:one)?17[C,_]4|(?:iPhone[ _]?16[ _]?Plus| 16PLUS)(?:[);/ ]|$)'
+      model: 'iPhone 16 Plus'
+      device: 'phablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPh(?:one)?17[C,_]3|(?:iPhone[ _]?16| 16)(?:[);/ ]|$)'
+      model: 'iPhone 16'
+      device: 'phablet'
 
     # specific tablet devices
     - regex: '(?:MDCR_|ICRU_|Apple-)?iPad1[C,_]1'
@@ -1598,12 +1612,48 @@ Apple:
     - regex: '(?:MDCR_|ICRU_|Apple-)?iPad13[C,_]2'
       model: 'iPad Air 4'
       device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]10'
+      model: 'iPad Air 7 13" WiFi'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]11'
+      model: 'iPad Air 7 13"'
+      device: 'tablet'
     - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]1|(?:iPad mini 6th Gen \(WiFi\))(?:[);/ ]|$)'
       model: 'iPad Mini 6 WiFi'
       device: 'tablet'
     - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]2'
       model: 'iPad Mini 6'
       device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]3'
+      model: 'iPad Pro 4 11" WiFi'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]4'
+      model: 'iPad Pro 4 11"'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]5'
+      model: 'iPad Pro 6 12.9" WiFi'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]6'
+      model: 'iPad Pro 6 12.9"'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]8'
+      model: 'iPad Air 6 11" WiFi'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad14[C,_]9'
+      model: 'iPad Air 6 11"'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad16[C,_]3'
+      model: 'iPad Pro 5 11" WiFi'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad16[C,_]4'
+      model: 'iPad Pro 5 11"'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad16[C,_]5'
+      model: 'iPad Pro 7 13" WiFi'
+      device: 'tablet'
+    - regex: '(?:MDCR_|ICRU_|Apple-)?iPad16[C,_]6'
+      model: 'iPad Pro 7 13"'
+      device: 'tablet'
 
     - regex: 'Apple-?TV2[C,_]1'
       model: 'Apple TV 2'
@@ -1637,9 +1687,9 @@ Apple:
       model: 'iPhone $1'
       device: 'smartphone'
 
-# micromax
+# micromax  (https://micromaxinfo.com/)
 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|E7446|E7533)(?:[);/ ]|$)'
+  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|Bharat 5|N8216|N8301|IN_2[bc]|IN_Note1|ione note|E7446|E7533)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AQ5001 Canvas Power'
@@ -1658,6 +1708,8 @@ MicroMax:
       model: '4560MMX'
     - regex: 'IN_2b(?:[);/ ]|$)'
       model: 'IN 2B'
+    - regex: 'IN_2c(?:[);/ ]|$)'
+      model: 'IN 2C'
     - regex: 'E6523(?:[);/ ]|$)'
       model: 'IN 1B'
     - regex: 'AQ4502(?:[);/ ]|$)'
@@ -1971,7 +2023,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 [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)(?:[);/ ]|$)'
+  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|EUT[13]10A?-11A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # smart displays
@@ -2073,8 +2125,8 @@ Acer:
     - regex: 'One 8 T4-82L'
       model: 'One 8 T4-82L'
       device: 'tablet'
-    - regex: 'EUT310A-11A'
-      model: 'Enduro' # Ultimo
+    - regex: 'EUT([13])10A?-11A'
+      model: 'ENDURO Urban T$1'
       device: 'tablet'
 
     # explicit smartphone models
@@ -2132,9 +2184,9 @@ Acer:
       model: 'Liquid M220'
     - regex: 'AcerTD600'
       model: 'TD600'
-    - regex: ' S55(?:[);/ ]|$)'
+    - regex: 'S55(?:[);/ ]|$)'
       model: 'Liquid Jade'
-    - regex: ' S59(?:[);/ ]|$)'
+    - regex: 'S59(?:[);/ ]|$)'
       model: 'Liquid X2'
 
     # desktop models
@@ -2168,9 +2220,9 @@ Acer:
     - regex: 'acer[_-]([a-z0-9]+)'
       model: '$1'
 
-# Advan or advan digital
+# Advan or advan digital (https://www.advan.id/)
 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](?:[\d.]*);(?: [\w-]+;)? (?: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|ADVANNASAPro)(?:[);/ ]|$)| (?: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'
@@ -2185,19 +2237,21 @@ Advan:
       model: 'I$1'
     - regex: 'i4U'
       model: 'I4U'
-    - regex: ' 5505(?:[);/ ]|$)'
+    - regex: '5505(?:[);/ ]|$)'
       model: 'NASA Plus'
-    - regex: ' 5202(?:[);/ ]|$)'
+    - regex: 'ADVANNASAPro(?:[);/ ]|$)'
+      model: 'NASA Pro'
+    - regex: '5202(?:[);/ ]|$)'
       model: 'NASA'
-    - regex: ' 6201(?: Build|[;)])'
+    - regex: '6201(?: Build|[;)])'
       model: 'G5'
-    - regex: ' 6501(?: Build|[;)])'
+    - regex: '6501(?: Build|[;)])'
       model: 'G5 Elite'
-    - regex: ' i5G(?: Build|[;)])'
+    - regex: 'i5G(?: Build|[;)])'
       model: 'S50 4G'
-    - regex: ' 6004(?: Build|[;)])'
+    - regex: '6004(?: Build|[;)])'
       model: 'G2 Pro'
-    - regex: ' 6002(?: Build|[;)])'
+    - regex: '6002(?: Build|[;)])'
       model: 'G3 Pro'
     - regex: '(S45E|50[46]1|505[89]|5062|S50H|I7D|S7D|S4Z|S5J\+|S4\+|i5C)(?:[);/ ]|$)'
       model: '$1'
@@ -2216,7 +2270,7 @@ Advan:
 
 # Advance (advanceperu.com)
 Advance:
-  regex: 'Hollogram|(?:HL(?:4[79]36|6246|5576|5585|[56]575|5[67]67|6[05]77|6256|7257|9000)|IntroTr3544|Pr(?:61(?:4[56]|50)|60[27]0|5[69]50)|Tr3845|TR7989|SP[345]701)(?:[);/ ]|$)'
+  regex: 'Hollogram|(?:HL(?:4[79]36|6246|5576|5585|[56]575|5[67]67|6[05]77|6256|7257|9000)|IntroTr3544|Pr(?:61(?:4[56]|50)|60[27]0|5[69]50|5860)|Tr3845|TR7989|SP[345]701)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit table models
@@ -2229,7 +2283,7 @@ Advance:
     - regex: 'SP([345]701)'
       model: 'SmartPad SP$1'
       device: 'tablet'
-    - regex: 'Pr(61(?:4[56]|50)|60[27]0|5[69]50)'
+    - regex: 'Pr(61(?:4[56]|50)|60[27]0|5[69]50|5860)'
       model: 'Prime PR$1'
       device: 'tablet'
     # explicit smartphone models
@@ -2254,9 +2308,9 @@ AGM:
       model: 'H3'
     - regex: 'AGM_H5_PRO(?:[);/ ]|$)'
       model: 'H5 Pro'
-    - regex: 'AGM[_ ]PAD[_ ]P1(?:[);/ ]|$)'
+    - regex: 'AGM[_ ]PAD[_ ]P([12])(?:[);/ ]|$)'
       device: 'tablet'
-      model: 'Pad P1'
+      model: 'Pad P$1'
     - regex: 'AGM[ _]([^/;)]+)(?: Build|[;)])'
       model: '$1'
 
@@ -2287,7 +2341,7 @@ Airpha:
 
 # Aiwa (aiwa.mx eu-aiwa.com)
 Aiwa:
-  regex: '(?:AW790|M300(?! 4G)|AWM(?:53[39]|50[19]|561|999)|AW500|Android 7(?:[\d.]*);(?: [\w-]+;)? Z9 PLUS|JA2-SMP0601)(?:[);/ ]|$)'
+  regex: '(?:AW790|M300(?! 4G)|AWM(?:53[39]|50[19]|561|999)|AW500|Android 7(?:[\d.]*);(?: [\w-]+;)? Z9 PLUS|JA2-SMP0601|AWTX6)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AW790(?:[);/ ]|$)'
@@ -2303,10 +2357,13 @@ Aiwa:
     - regex: 'M300(?:[);/ ]|$)'
       model: 'M300'
       device: 'phablet'
+    - regex: 'AWTX6'
+      model: 'AWTX6'
+      device: 'tv'
 
 # Akai
 Akai:
-  regex: 'Akai[ _\-,]|Eco[ _]E2|Glory[ _](?:G[1235]|L[123]|O[125])|(?:TAB-[79]8[03]0Q?|X[56] METAL|AKTB-703MZ|FZ70[13]|X5_PRO|X3[_ ]PRO[_ ]SLIM)(?:[);/ ]|$)'
+  regex: 'Akai[ _\-,]|LGE; (?:ALT|AK)[a-z0-9]+;|Eco[ _]E2|Glory[ _](?:G[1235]|L[123]|O[125])|(?:TAB-[79]8[03]0Q?|X[56] METAL|AKTB-703MZ|FZ70[13]|X5_PRO|X3[_ ]PRO[_ ]SLIM|iLike U5 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TAB-([79]8[03]0Q?)'
@@ -2325,6 +2382,8 @@ Akai:
       model: 'iLike X3 Pro Slim'
     - regex: 'X5_PRO'
       model: 'iLike X5 Pro'
+    - regex: 'iLike U5 Pro'
+      model: 'iLike U5 Pro'
     - regex: 'Glory[ _](G[1235]|L[123]|O[125])'
       model: 'Glory $1'
     - regex: 'Eco[ _]E2'
@@ -2338,6 +2397,9 @@ Akai:
     - regex: 'AKAI,(AK3219NF)'
       device: 'tv'
       model: '$1'
+    - regex: 'LGE; ((?:ALT|AK)[a-z0-9]+);'
+      device: 'tv'
+      model: '$1'
     - regex: 'Si2157LG32'
       device: 'tv'
       model: ''
@@ -2358,7 +2420,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|A463BG)(?:[);/ ]|$)'
+  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]|4063[FT]|4065F|4087U|4114E|5001[ADJTU]|5002[ABDEFHJLMRSUWX]|5003[ADGUX]|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|5131E|5145A|6002[ADJ]|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|6065A|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|9006W|9007[ATX]|9008[ADIJNTUX]|9009[AFG]|9010X|9013[ATX]|9015B|9020A|9022X|9024[OW]|9025Q|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'
@@ -2435,7 +2497,7 @@ Alcatel:
       model: 'A7 XL'
     - regex: '5002[ABDEHJLMSUWX]'
       model: '1B (2020)'
-    - regex: '5031[ADGJ]'
+    - regex: '5031[ADGJ]|5131E'
       model: '1B (2022)'
     - regex: '(?:Alcatel_)?5008R'
       model: 'Onyx'
@@ -2556,6 +2618,9 @@ Alcatel:
     - regex: '9009A'
       model: '1T 7'
       device: 'tablet'
+    - regex: '9009F'
+      model: '1T 7" 3G'
+      device: 'tablet'
     - regex: '9309X'
       model: '1T 7" (2021)'
       device: 'tablet'
@@ -2627,6 +2692,9 @@ Alcatel:
       model: '3X (2019)'
     - regex: '5049W'
       model: 'Revvl'
+    - regex: '9006W'
+      model: 'One Touch Pixi 2 7" 4G'
+      device: 'tablet'
     - regex: '8050[GX]'
       model: 'One Touch Pixi 4 6" 3G'
     - regex: '8050[ED]'
@@ -2636,10 +2704,13 @@ Alcatel:
     - regex: '9003[AX]'
       model: 'One Touch Pixi 4 7" 3G'
       device: 'tablet'
+    - regex: '9015B'
+      model: 'One Touch Pixi 4 7" 4G'
+      device: 'tablet'
     - regex: '8063'
       model: 'One Touch Pixi 4 7" WiFi'
       device: 'tablet'
-    - regex: '9024O'
+    - regex: '9024[OW]'
       model: 'One Touch Pixi 5'
       device: 'tablet'
     - regex: 'I216[AX]'
@@ -2651,6 +2722,9 @@ Alcatel:
     - regex: '9005X'
       model: 'One Touch Pixi 8'
       device: 'tablet'
+    - regex: '9025Q'
+      model: 'One Touch Pop 4 7" 4G'
+      device: 'tablet'
     - regex: 'P320X'
       model: 'One Touch POP 8'
       device: 'tablet'
@@ -2724,14 +2798,16 @@ Alcatel:
       model: '1'
     - regex: '5009[AD]'
       model: '1C'
+    - regex: '5003[ADGUX]'
+      model: '1C (2019)'
     - regex: '5008[ADUYT]'
       model: '1X (2019)'
     - regex: '5007[AGUS]'
       model: '1V (2020)'
     - regex: '6002[AD]'
       model: '1V (2021)'
-    - regex: '5003[ADGU]'
-      model: '1C (2019)'
+    - regex: '6002J'
+      model: '1V (2022)'
     - regex: '5006[ADG]'
       model: '3C (2019)'
     - regex: '5024[ADFIJ]|5028Y|6025[ADH]'
@@ -2772,6 +2848,8 @@ Alcatel:
       model: '3X (2020)'
     - regex: '5086[ADY]'
       model: '5'
+    - regex: '6065A'
+      model: '5H Plus'
     - regex: '6062W'
       model: '7'
     - regex: '8088[XQM]'
@@ -2803,7 +2881,7 @@ Alcatel:
 
 # Allview (allviewmobile.com)
 Allview:
-  regex: 'Allview|A4You|H1003_LTE_PRO|A5_(?:Easy(?:_TM)?|Ready(?:_TM)?|Quad|Quad_Plus_TM)|A[5-9]_Lite|A5Smiley|A6_Duo|A10_Lite_(?:2019|2GB)|A10_(?:Plus|Max)|AX2_Frenzy|AX4Nano|AX5NanoQ|AX50(?:[23]|1Q)|C6_Duo|E[23]_Living|E[23]_(?:Jump|Sign)|E4_Lite|M9_Connect|P(?:43_Easy|[5689]_Energy|6_Energy_Lite|[68]_Energy_Mini(?:_TM)?|(41|[4568])_eMagic(?:_TM)?|[589](?:_)?Life(?:_TM)?|[567]_Lite(?:_TM)?|6_plus|[45678]_Pro|7_Seon|10_Life|10_Max|10_Style|7_Xtreme|6_Qmax|4_Quad)|V(?:[1345]_Viper|1_Viper_I|2_Viper_(?:[EISX]|X_plus|Xe))|X4_Soul_Vision|X(?:[1-46]_Soul_Xtreme|[1-5]_Soul|3_Soul_Lite|[2-6]_Soul_Mini(?:_TM)?|4_Soul_Mini_S(?:_TM)?|[2-58]_Soul_Style(?:_TM)?|2_Soul_Style_Plus|2_Twin)|Viva_(?:H801|100[13]G|(?:H100[124]|H701|H802)_LTE|C701|i701G|803G)|VivaH(?:10|[78])|X7_Soul_Style|X[78]_Soul_Pro|Viva_(?:Home|i7G)|H1004_LTE'
+  regex: 'Allview|A4You|H1003_LTE_PRO|A5_(?:Easy(?:_TM)?|Ready(?:_TM)?|Quad|Quad_Plus_TM)|A[5-9]_Lite|A5Smiley|A6_Duo|A10_Lite_(?:2019|2GB)|A10_(?:Plus|Max)|AX2_Frenzy|AX4Nano|AX5NanoQ|AX50(?:[23]|1Q)|C6_Duo|E[23]_Living|E[23]_(?:Jump|Sign)|E4_Lite|M9_Connect|P(?:43_Easy|[5689]_Energy|6_Energy_Lite|[68]_Energy_Mini(?:_TM)?|(41|[4568])_eMagic(?:_TM)?|[589](?:_)?Life(?:_TM)?|[567]_Lite(?:_TM)?|6_plus|[45678]_Pro|7_Seon|10_Life|10_Max|10_Style|7_Xtreme|6_Qmax|4_Quad)|V(?:[1345]_Viper|1_Viper_I|2_Viper_(?:[EISX]|X_plus|Xe))|X4_Soul_Vision|X(?:[1-46]_Soul_Xtreme|[1-5]_Soul|3_Soul_Lite|[2-6]_Soul_Mini(?:_TM)?|4_Soul_Mini_S(?:_TM)?|[2-58]_Soul_Style(?:_TM)?|2_Soul_Style_Plus|2_Twin)|A30_Plus|Viva_(?:H801|100[13]G|(?:H100[124]|H701|H802)_LTE|C701|i701G|803G)|VivaH(?:10|[78])|X7_Soul_Style|X[12]0_Soul|X[78]_Soul_Pro|V10_Viper|Viva_(?:Home|i7G)|H1004_LTE'
   device: 'smartphone'
   models:
     - regex: 'A4You'
@@ -2870,8 +2948,6 @@ Allview:
       model: 'V1 Viper I'
     - regex: 'V4_Viper_PRO'
       model: 'V4 Viper Pro'
-    - regex: 'V([1345])_Viper'
-      model: 'V$1 Viper'
     - regex: 'V2_Viper_X_plus'
       model: 'V2 Viper X Plus'
     - regex: 'V2_Viper_(E|I|S|X(?:e)?)'
@@ -2902,8 +2978,10 @@ Allview:
       model: 'X2 Soul Style Plus'
     - regex: 'X([23458])_Soul_Style(?:_TM)?'
       model: 'X$1 Soul Style'
-    - regex: 'X([12345])_Soul'
+    - regex: 'X(\d+)_Soul'
       model: 'X$1 Soul'
+    - regex: 'V(\d+)_Viper'
+      model: 'V$1 Viper'
     - regex: 'X2_Twin'
       model: 'X2 Twin'
     - regex: 'A5_Easy(?:_TM)?'
@@ -2924,8 +3002,8 @@ Allview:
       model: 'A10 Lite (2019)'
     - regex: 'A10_Lite_2GB'
       model: 'A10 Lite'
-    - regex: 'A10_Plus'
-      model: 'A10 Plus'
+    - regex: 'A(10|30)_Plus'
+      model: 'A$1 Plus'
     - regex: 'A10_Max'
       model: 'A10 Max'
     - regex: 'Impera S'
@@ -2959,7 +3037,7 @@ Allview:
     - regex: 'Allview3SpeedQuad'
       device: 'tablet'
       model: 'Alldro 3 Speed Quad'
-    - regex: ' H1003_LTE_PRO([13])'
+    - regex: 'H1003_LTE_PRO([13])'
       device: 'tablet'
       model: 'Viva H1003 LTE Pro $1'
     - regex: 'H1003_LTE_PRO'
@@ -3039,12 +3117,12 @@ Allwinner:
 
 # altron
 altron:
-  regex: '(AL-555|GI-626|OB[_-](?:421|728|627))(?:[);/ ]|$)'
+  regex: '(AL-555|GI-626|OB[_-](?:421|588|728|627))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AL-555'
       model: 'AL-555'
-    - regex: 'OB[_-](421|728|627)'
+    - regex: 'OB[_-](421|588|728|627)'
       model: 'OB-$1'
     - regex: 'GI-626'
       device: 'phablet'
@@ -3157,7 +3235,7 @@ Ainol:
 
 # Archos (www.archos.com)
 Archos:
-  regex: '(?:YL-)?Archos|(?:A50TI|AC101BHE|AC50BHE|AC45NE|X67 5G|AC45BHE|AC101PL3GV2)(?:[);/ ]|$)'
+  regex: '(?:YL-)?Archos|(?:A50TI|AC101BHE|AC50BHE|AC45NE|X67 5G|AC45BHE|AC101PL3GV2|9\.4 FFF|Tikeasy 10d)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Archos (Oxygen (?:63|57|68XL))(?:[);/ ]|$)'
@@ -3223,9 +3301,21 @@ Archos:
     - regex: 'Archos Hello 7(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Hello 7'
+    - regex: '9\.4 FFF(?:[);/ ]|$)'
+      device: 'tablet'
+      model: '9.4" FFF'
     - regex: 'Archos Sense 101 X(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Sense 101 X'
+    - regex: 'Tikeasy 10d(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tikeasy 10d'
+    - regex: 'T101 HD 4G(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T101 HD 4G'
+    - regex: 'T101 FHD WiFi(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T101 FHD WiFi'
     - regex: '(?:YL-)?Archos ([^/;]*(?:PAD)[^/;]*) Build'
       device: 'tablet'
       model: '$1'
@@ -3350,15 +3440,17 @@ Ask:
     - regex: 'ASK[_ ]([^/;]*) Build'
       model: '$1'
 
-# ANS or ANS Cell
+# ANS or ANS Cell or ANS Mobility (https://www.ansmobility.com/)
 ANS:
-  regex: 'ANS/|(?: UL40)(?: Build|[;)])'
+  regex: 'ANS/|(?: UL40|ACK2326)(?: Build|[;)])'
   device: 'smartphone'
   models:
-    - regex: ' UL40'
+    - regex: 'UL40'
       model: 'UL40'
     - regex: 'ANS/L51'
       model: 'L51'
+    - regex: 'ACK2326'
+      model: 'Artia'
 
 # AOC (https://www.aoc.com/)
 AOC:
@@ -3465,7 +3557,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|I003D'
+  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|Z00UDH'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -3496,7 +3588,7 @@ Asus:
     - regex: 'Z101(?:[);/ ]|$)'
       model: 'Z101'
       device: 'tablet'
-    - regex: 'X Pad 10 LTE(?:[);/ ]|$)'
+    - regex: '(?:X Pad 10 LTE|ASUSXPad10)(?:[);/ ]|$)'
       model: 'X Pad 10 LTE'
       device: 'tablet'
     - regex: '(?:K01[3A7]|K007|K00R)(?:[);/ ]|$)|MeMO Pad 7'
@@ -3756,6 +3848,11 @@ Asus:
       device: 'peripheral'
       model: 'Tinker Board$1'
 
+    # tv detections
+    - regex: 'asus_google_cube'
+      device: 'tv'
+      model: 'Cube'
+
     # watch detections
     - regex: '(?:ASUS_)?ZenWatch( 2)?'
       device: 'wearable'
@@ -3846,8 +3943,8 @@ Azumi Mobile:
     - regex: 'NOBU[ _]A55[ _]PRO'
       model: 'Nobu A55 Pro'
 
-#Barnes & Noble
-'Barnes & Noble':
+# Barnes & Noble
+Barnes & Noble:
   regex: 'Nook|BN[TR]V[0-9]+'
   device: 'tablet'
   models:
@@ -3889,11 +3986,19 @@ Bitel:
     - regex: 'Bitel[ _-]([^/;]+) Build'
       model: '$1'
 
+# GDL or GDL Mobile (https://gdlmobile.com/)
+GDL:
+  regex: 'GDL[_ ](Xtreme 4)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # 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 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)(?:[);/ ]|$)'
+  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]|K[15]0)|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|PLUS)|G71 PLUS|G52L|G61S|G91S|Studio Mini 2023|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:G[57]0|G[679]1)|Android 11(?:[\d.]*);(?: [\w-]+;)? J9L|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:G53)|F92 E 5G|(?<!Neffos |CAMELEON )C5 (?:Max|Plus))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'F92 E 5G'
+      model: 'F92 E 5G'
     - regex: 'Advance (4\.0 ?[LM]|4\.0|5\.[02](?: HD)?|A4|L[54])'
       model: 'Advance $1'
     - regex: 'M6 2021(?:[);/ ]|$)'
@@ -3904,6 +4009,8 @@ Blu:
       model: 'Studio X10 (2022)'
     - regex: 'Studio Mini 2023'
       model: 'Studio Mini (2023)'
+    - regex: 'STUDIO G PLUS'
+      model: 'Studio G Plus'
     - regex: '(?:BLU[_ ])?Studio[ _](G3|J8M|5\.0 C|5\.5|C 5\+5 LTE|View(?: XL)?|Mega(?: LTE)?|C 8\+8|G HD LTE|[CG][ _]HD|C|G|Touch|M HD|G2 HD|M[45] Plus|J[1258]|X[89] HD|X5|X10\+?|XL(?: 2)?|X|G4)(?:[);/ ]|$)'
       model: 'Studio $1'
     - regex: '(?:BLU[_ ])?Studio[ _]5\.0 ?K(?:[);/ ]|$)'
@@ -3952,7 +4059,7 @@ Blu:
       model: 'Pure $1'
     - regex: 'PURE MINI'
       model: 'Pure Mini'
-    - regex: 'BOLD (M7|N[123])'
+    - regex: 'BOLD (M7|N[123]|K[15]0)'
       model: 'Bold $1'
     - regex: 'Life One X2 Mini'
       model: 'Life One X2 Mini'
@@ -3976,9 +4083,9 @@ Blu:
       model: 'G$1 Plus'
     - regex: 'G(9[01]?) PRO'
       model: 'G$1 Pro'
-    - regex: '(G90|D701|R2 3G|G52L|G91S)(?:[);/ ]|$)'
+    - regex: '(G[579]0|G[679]1|D701|R2 3G|G52L|G91S|G61S)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' (J9L)(?:[);/ ]|$)'
+    - regex: '(J9L|G53)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'GRAND 5\.5 HD'
       model: 'Grand 5.5 HD'
@@ -4026,6 +4133,8 @@ Blu:
       model: 'Vivo Air LTE'
     - regex: 'Touchbook G7'
       model: 'Touchbook G7'
+    - regex: 'C5 (Max|Plus)(?:[);/ ]|$)'
+      model: 'C5 $1'
     - regex: 'C([56])L 20(20|21)'
       model: 'C$1L (20$2)'
     - regex: 'C5L Plus'
@@ -4084,10 +4193,10 @@ Bluegood:
 
 # Blackview
 Blackview:
-  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)(?:[);/ ]|$)'
+  regex: 'Blackview|(BL8[08]00|BV([24-9]000|8[18]00|[468]900|(5[1589]|9[135689])00|6[12368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|N6000|Heatwave|DM550|BV9700Pro|BL9000 Pro|(?<!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|BL5000|Tab 12)|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|BL9000)|BV500|BV4800|BV[579]200|SOLID_4G1|BV5300(?: Pro)?|Tab [56]0 Kids|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|HERO 10|A52 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'A([2678]0|55) ?Pro(?:[);/ ]|$)'
+    - regex: 'A([2678]0|5[25]) ?Pro(?:[);/ ]|$)'
       model: 'A$1 Pro'
     - regex: 'A([6798]0|95|100)(?: Build|[;)])'
       model: 'A$1'
@@ -4099,14 +4208,14 @@ Blackview:
       model: 'A30'
     - regex: '(A[86]0|BV[59]500)Plus(?:[);/ ]|$)'
       model: '$1 Plus'
-    - regex: '(BV6000S|BL8[08]00|N6000)(?:[);/ ]|$)'
-      model: '$1'
     - regex: '(P2|R6) ?Lite'
       model: '$1 Lite'
     - regex: 'BV9000Pro-F'
       model: 'BV9000 Pro'
-    - regex: '(BL6000|BL8800|BV(?:[0-9]+)|A200) ?Pro'
+    - regex: '(BL[69]000|BL8800|BV(?:[0-9]+)|A200) ?Pro'
       model: '$1 Pro'
+    - regex: '(BL[579]000|BV6000S|BL8[08]00|N6000)'
+      model: '$1'
     - regex: 'Blackview (A[78]|E7S)'
       model: '$1'
     - regex: 'COLOR 8'
@@ -4115,6 +4224,8 @@ Blackview:
       model: 'Shark 8'
     - regex: 'WAVE 6C'
       model: 'Wave 6C'
+    - regex: 'HERO 10'
+      model: 'Hero 10'
     - regex: 'SOLID_4G1'
       model: 'Solid-4 G1'
     - regex: 'SOLID 4 G2'
@@ -4139,7 +4250,7 @@ Blackview:
     - regex: 'Tab (1[0235]) Pro(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1 Pro'
-    - regex: ' Tab ?(6 Kids|8E)(?:[);/ ]|$)'
+    - regex: 'Tab ?([56]0? Kids|8E)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1'
     - regex: 'Tab (7|[57]0|8|11) WiFi(?:[);/ ]|$)'
@@ -4148,7 +4259,7 @@ Blackview:
     - regex: 'Tab 11 SE(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab 11 SE'
-    - regex: ' Tab ?([689]|1[013568]|[68]0)(?:[);/ ]|$)'
+    - regex: 'Tab ?([689]|1[0123568]|[68]0)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1'
 
@@ -4174,13 +4285,13 @@ Bluboo:
       model: 'D6 Lite'
     - regex: 'S8_plus_a'
       model: 'S8 Plus'
-    - regex: ' S8a'
+    - regex: 'S8a'
       model: 'S8a'
     - regex: 'D([16])[_ ]Pro'
       model: 'D$1 Pro'
     - regex: '(?:Bluboo[_ ])?S8[_ ]plus'
       model: 'S8 Plus'
-    - regex: ' D6(?: Build|[;)])'
+    - regex: 'D6(?: Build|[;)])'
       model: 'D6'
     - regex: 'Bluboo[ _-]?([^;/)]+)(?: Build|[;)])'
       model: '$1'
@@ -4188,7 +4299,7 @@ Bluboo:
       model: '$1'
 
 # Black Fox or BlackFox
-'Black Fox':
+Black Fox:
   regex: 'BMM[ _-]?(?:44[123]D|431B|441[AWB]|44[12]S|431[SD]|53[23]D|54[12]S|541[ABW]|54[123]D|543S|531[ABD]|532 S|531S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -4257,7 +4368,7 @@ Boway:
 
 # Brondi (https://www.brondi.it/)
 Brondi:
-  regex: 'Brondi[ _]|(?:CENTURION|GLADIATOR| GLORY|LUXURY|SENSUELLE|(?<!ODYSSEY[_ ])VICTORY|AMICO SMARTPHONE XL|AMICO_SMARTPHONE_4G|MIDNIGHT_SKY|501 SZ|850_4G)(?:[ _-]?[2-6])?(?:[);/ ]|$)|Surfing Tab'
+  regex: 'Brondi[ _]|(?:CENTURION|GLADIATOR| GLORY|LUXURY|SENSUELLE|(?<!ODYSSEY[_ ])VICTORY|AMICO[_ ]SMARTPHONE[_ ](?:4G|X[SL]|S\+)|MIDNIGHT_SKY|501 SZ|850_4G)(?:[ _-]?[2-6])?(?:[);/ ]|$)|Surfing Tab'
   device: 'smartphone'
   models:
     - regex: '(?:Brondi[ _])?(620 SZ|730_4G_HD|501 SZ|850_4G)(?:[);/ ]|$)'
@@ -4278,8 +4389,8 @@ Brondi:
       model: 'VICTORY $1'
     - regex: 'AMICO_SMARTPHONE_4G'
       model: 'Amico Smartphone 4G'
-    - regex: 'AMICO SMARTPHONE XL'
-      model: 'Amico Smartphone XL'
+    - regex: 'AMICO SMARTPHONE (X[LS]|S\+)'
+      model: 'Amico Smartphone $1'
 
     - regex: 'Surfing Tab ([^;/]+) Build'
       model: 'SURFING TAB $1'
@@ -4290,7 +4401,7 @@ Brondi:
 
 # VGO TEL (vgotel.com)
 VGO TEL:
-  regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[01256]|2[024]|[57])|i_Smart)(?:[);/ ]|$)'
+  regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[01256]|2[024]|[57])|V TAB 2|i_Smart)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Venture ?V([278]|1[02])(?:[);/ ]|$)'
@@ -4301,10 +4412,13 @@ VGO TEL:
       model: 'New $1'
     - regex: 'i_Smart'
       model: 'i Smart'
+    - regex: 'V TAB 2'
+      device: 'tablet'
+      model: 'V Tab 2'
 
 # 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|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)(?:[);/ ]|$)'
+  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]|2218)|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|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|I201[19]|I2126|X50 Pro\+|I220[123678]|I2127|I221[234679]|I222[03]|I230[124]|I2009|I2017|I2022|V1962BA|V1930|PA2170|PA23[57]3|V20(?:0[1256]|0[215]A|[34]4|29_PK|4[57]A?|23EA|2[2-9]|3[0-35-9]|4[0-3568]|5[02-5789]|6[015689]|69B?A|70)|V21(?:0[12459]|1[01]|2[04-79]|3[012459]A?|7[12]A|4[0-79]|40A|6[0289]|64[KP]A|6[234568]A|7[08]A|1[4-8]A?|0[28]A?|5[4678]A|5[0-478]|8[03568]A|80GA|66(?:BA)?|56FA|9[069]A|99GA)|V22(?:8[2345]A|7[01289]A|5[0123]|30EA|4[0246789]|41HA|5[46]A?|3[016789]|34(?:_PK)?|3[01289]A|4[2345]A|[34]1A|2[12589]|2[079]A|[36]6A|0[37]A|0[1-9]|1[789]A|1[24789])|V23(?:4[34]A|4[12356]|12BA|24HA|61GA|66[GH]A|3[1-46789]|3[4789]A|39FA|0[1-479]A|0[23789]|52A?|5[015]|5[349]A|6[124]A|2[0-57]|2[3479]A|1[0124-9]|1[23478]A)|V24(?:0[16]|1[02]|03A)|I2306|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|iQOO (?:U[13]x?|Z1x 5G|Z5x|[578]|Z[153])|NEX 3s? 5G|Z5x 712|iPA2375|PA2473|Y51A|Y51 PK)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PA2170'
@@ -4326,6 +4440,9 @@ Vivo:
     - regex: 'V2170A(?:[);/ ]|$)'
       device: 'phablet'
       model: 'X Note'
+    - regex: 'V2256A'
+      device: 'phablet'
+      model: 'X Flip'
     - regex: 'V2178A'
       device: 'phablet'
       model: 'X Fold'
@@ -4342,16 +4459,26 @@ Vivo:
       device: 'phablet'
       model: 'X Fold+'
 
-    - regex: ' (Y20T|Y30g)(?:[);/ ]|$)'
+    - regex: '(Y20T|Y30g)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'V2318A'
       model: 'G2'
     - regex: 'V2324A|V2309(?:[);/ ]|$)'
       model: 'X100 Pro'
+    - regex: 'V2366[GH]A'
+      model: 'X100 Ultra'
     - regex: 'V2309A|V2308'
       model: 'X100'
-    - regex: 'V2307(?:[);/ ]|$)'
+    - regex: 'V2324HA'
+      model: 'X100s Pro'
+    - regex: 'V2359A'
+      model: 'X100s'
+    - regex: '(?:V2307|V2343A|V2401)(?:[);/ ]|$)'
       model: 'Y200 5G'
+    - regex: 'V2361GA'
+      model: 'Y200 GT'
+    - regex: 'V2354A'
+      model: 'Y200i'
     - regex: 'V2336(?:[);/ ]|$)'
       model: 'Y200e 5G'
     - regex: 'V1824[B]?A(?:[);/ ]|$)'
@@ -4386,7 +4513,11 @@ Vivo:
       model: 'iQOO U5'
     - regex: 'V2180GA'
       model: 'iQOO U5x'
-    - regex: '(?:V2049A|I2009)(?:[);/ ]|$)'
+    - regex: 'iQOO 7 Legend'
+      model: 'iQOO 7 Legend'
+    - regex: 'iQOO 7 India'
+      model: 'iQOO 7 India'
+    - regex: '(?:V2049A|I2009|iQOO 7)(?:[);/ ]|$)'
       model: 'iQOO 7'
     - regex: 'V2196A'
       model: 'iQOO Neo 6'
@@ -4404,6 +4535,10 @@ Vivo:
       model: 'iQOO Neo 9 Pro'
     - regex: 'V2338A'
       model: 'iQOO Neo 9'
+    - regex: 'V2339FA'
+      model: 'iQOO Neo 9S Pro'
+    - regex: 'V2403A'
+      model: 'iQOO Neo 9S Pro+'
     - regex: 'V2157A'
       model: 'iQOO Neo 5 SE'
     - regex: 'V2154A|iQOO Neo 5S'
@@ -4428,24 +4563,24 @@ Vivo:
       model: 'iQOO Neo 5 Lite'
     - regex: 'V2199A(?:[);/ ]|$)'
       model: 'iQOO Neo 6 SE'
-    - regex: 'V1986A(?:[);/ ]|$)'
+    - regex: '(?:V1986A|iQOO Z1)(?:[);/ ]|$)'
       model: 'iQOO Z1'
     - regex: 'V2012A(?:[);/ ]|$)'
       model: 'iQOO Z1x'
     - regex: 'iQOO Z1x 5G(?:[);/ ]|$)'
       model: 'iQOO Z1x 5G'
-    - regex: '(?:V2073A|I2011)(?:[);/ ]|$)'
+    - regex: '(?:V2073A|I2011|iQOO Z3 5G)(?:[);/ ]|$)'
       model: 'iQOO Z3'
     - regex: 'Z5x 712'
       model: 'Z5x 712'
-    - regex: 'V1919A'
+    - regex: 'V1919A|iQOO Z5x'
       model: 'iQOO Z5x'
     - regex: 'V2131A'
       model: 'iQOO Z5x 5G'
-    - regex: 'V2148A'
-      model: 'iQOO Z5'
     - regex: 'I2018(?:[);/ ]|$)'
       model: 'iQOO Z5 5G'
+    - regex: 'V2148A|iQOO Z5'
+      model: 'iQOO Z5'
     - regex: '(?:I220[236]|I2127|V2220A)(?:[);/ ]|$)'
       model: 'iQOO Z6'
     - regex: 'V2164KA'
@@ -4472,12 +4607,16 @@ Vivo:
       model: 'iQOO Z8'
     - regex: 'V2312A'
       model: 'iQOO Z8x'
-    - regex: 'I2302'
+    - regex: 'V2361A'
+      model: 'iQOO Z9'
+    - regex: 'I2302|I2218'
       model: 'iQOO Z9 5G'
     - regex: 'V2352A'
       model: 'iQOO Z9 Turbo'
-    - regex: 'I2219'
+    - regex: 'I2219|V2353A'
       model: 'iQOO Z9x 5G'
+    - regex: 'I2306'
+      model: 'iQOO Z9 Lite 5G'
     - regex: '(?:V2023A|iQOO U1)(?:[);/ ]|$)'
       model: 'iQOO U1'
     - regex: '(?:V2065A|iQOO U1x)(?:[);/ ]|$)'
@@ -4488,16 +4627,18 @@ Vivo:
       model: 'iQOO U3x'
     - regex: '(?:V2106A|iQOO U3x 5G)(?:[);/ ]|$)'
       model: 'iQOO U3x 5G'
-    - regex: 'V2024A(?:[);/ ]|$)'
-      model: 'iQOO 5'
-    - regex: 'V2025A(?:[);/ ]|$)'
+    - regex: '(?:V2025A|iQOO 5 Pro)(?:[);/ ]|$)'
       model: 'iQOO 5 Pro'
-    - regex: 'V2136A(?:[);/ ]|$)'
-      model: 'iQOO 8'
-    - regex: 'V2141A(?:[);/ ]|$)'
+    - regex: '(?:V2024A|iQOO 5)(?:[);/ ]|$)'
+      model: 'iQOO 5'
+    - regex: '(?:V2141A|iQOO 8 Pro)(?:[);/ ]|$)'
       model: 'iQOO 8 Pro'
+    - regex: '(?:V2136A|iQOO 8)(?:[);/ ]|$)'
+      model: 'iQOO 8'
     - regex: 'V2339(?:[);/ ]|$)'
       model: 'V30e'
+    - regex: 'V2337(?:[);/ ]|$)'
+      model: 'V40 SE 5G'
     - regex: '(?:V2025)(?:[);/ ]|$)'
       model: 'V20'
     - regex: '(?:V2066|V2108)(?:[);/ ]|$)'
@@ -4518,7 +4659,7 @@ Vivo:
       model: 'Nex'
     - regex: '(?:vivo 1912|V1923A)(?:[);/ ]|$)'
       model: 'Nex 3'
-    - regex: 'V1924A(?:[);/ ]|$)'
+    - regex: '(?:V1924A|NEX 3 5G)(?:[);/ ]|$)'
       model: 'Nex 3 5G'
     - regex: 'V1950A(?:[);/ ]|$)'
       model: 'Nex 3S'
@@ -4548,7 +4689,7 @@ Vivo:
       model: 'T2x'
     - regex: 'V2253|V2312'
       model: 'T2x 5G'
-    - regex: 'V2320'
+    - regex: 'V2320|V2199GA'
       model: 'T2'
     - regex: 'V2222'
       model: 'T2 5G'
@@ -4558,16 +4699,24 @@ Vivo:
       model: 'T2 5G'
     - regex: 'V2334(?:[);/ ]|$)'
       model: 'T3 5G'
+    - regex: 'V2346(?:[);/ ]|$)'
+      model: 'T3 Lite 5G'
+    - regex: 'V2338(?:[);/ ]|$)'
+      model: 'T3x 5G'
     - regex: 'V1962BA'
       model: 'G1 5G'
     - regex: 'V2203A(?:[);/ ]|$)'
       model: 'S15'
     - regex: 'V2344A'
       model: 'S18 Pro'
+    - regex: 'V2362A'
+      model: 'S19 Pro'
     - regex: 'V2334A'
       model: 'S18e'
     - regex: 'V2323A'
       model: 'S18'
+    - regex: 'V2364A'
+      model: 'S19'
     - regex: 'V1831[AT]'
       model: 'S1'
     - regex: 'V1832[AT](?:[);/ ]|$)'
@@ -4610,14 +4759,26 @@ Vivo:
       model: 'V29e 5G'
     - regex: 'V2315'
       model: 'Y28 5G'
+    - regex: 'V2351'
+      model: 'Y28s 5G'
+    - regex: 'V2352(?:[);/ ]|$)'
+      model: 'Y28'
     - regex: 'V2244(?:[);/ ]|$)'
       model: 'V29 Lite 5G'
     - regex: 'V2318(?:[);/ ]|$)'
       model: 'V30'
     - regex: 'V2342'
       model: 'V30 Lite'
-    - regex: 'V2327'
+    - regex: 'V2327A'
+      model: 'Y36t'
+    - regex: 'V2343(?:[);/ ]|$)'
+      model: 'Y38 5G'
+    - regex: 'V23(?:27|14)(?:[);/ ]|$)'
       model: 'V30 Lite 5G'
+    - regex: 'V2341'
+      model: 'V40 Lite'
+    - regex: 'V2319'
+      model: 'V30 Pro'
     - regex: 'V1932[AT](?:[);/ ]|$)'
       model: 'S5'
     - regex: 'V2207A'
@@ -4786,17 +4947,23 @@ Vivo:
       model: 'Y17'
     - regex: 'V2310|V2331'
       model: 'Y17s'
-    - regex: 'V2333(?:[);/ ]|$)'
+    - regex: '(?:V2333|V2345)(?:[);/ ]|$)'
       model: 'Y18'
+    - regex: 'V2410(?:[);/ ]|$)'
+      model: 'Y18s'
+    - regex: 'V2350'
+      model: 'Y18e'
     - regex: 'V22[01]4(?:[);/ ]|$)'
       model: 'Y16'
     - regex: '(?:vivo 1906(?:_20)?|V2236A)(?:[);/ ]|$)'
       model: 'Y11'
+    - regex: 'V2140A'
+      model: 'Y10'
     - regex: 'V2168A'
       model: 'Y10 T1'
     - regex: 'V2313A'
       model: 'Y100 5G'
-    - regex: 'V2239'
+    - regex: 'V2239|V2412'
       model: 'Y100'
     - regex: 'V2168'
       model: 'T1'
@@ -4812,7 +4979,7 @@ Vivo:
       model: 'Y02'
     - regex: '(?:V2234)(?:[);/ ]|$)'
       model: 'Y02A'
-    - regex: 'V2332'
+    - regex: 'V2332|V2406'
       model: 'Y03'
     - regex: 'vivo 19(?:04|40)(?:[);/ ]|$)'
       model: 'Y12'
@@ -4942,10 +5109,14 @@ Vivo:
       model: 'Y50t'
     - regex: 'V(?:2024|203[05])(?:[);/ ]|$)'
       model: 'Y51'
+    - regex: 'Y51 PK(?:[);/ ]|$)'
+      model: 'Y51 PK'
     - regex: 'vivo 1707(?:[);/ ]|$)'
       model: 'Y51 (2015)'
     - regex: 'V2031(?:_21)?(?:[);/ ]|$)'
       model: 'Y51s'
+    - regex: 'Y51A(?:[);/ ]|$)'
+      model: 'Y51A'
     - regex: '(?:V2054A|Y31s 5G)(?:[);/ ]|$)'
       model: 'Y31s'
     - regex: 'V2057A(?:[);/ ]|$)'
@@ -4976,6 +5147,8 @@ Vivo:
       model: 'Y54s'
     - regex: 'V2311|V2225'
       model: 'Y56 5G'
+    - regex: 'V2355'
+      model: 'Y58 5G'
     - regex: 'vivo 1719(?:[);/ ]|$)'
       model: 'Y65'
     - regex: 'vivo (?:1714|Y69A?)(?:[);/ ]|$)'
@@ -5056,7 +5229,7 @@ Vivo:
       model: 'Z6'
     - regex: 'V2142(?:[);/ ]|$)'
       model: 'Y75 5G'
-    - regex: 'vivo Y75s(?:[);/ ]|$)'
+    - regex: '(?:vivo Y75s|V2069BA)(?:[);/ ]|$)'
       model: 'Y75s'
     - regex: 'vivo X710L?(?:[);/ ]|$)'
       model: 'X Shot'
@@ -5078,7 +5251,7 @@ Vivo:
       model: 'X Play $1'
     - regex: '(?:VIV-|BBG-)?vivo[ _]([^/;]+) Build'
       model: '$1'
-    - regex: '(?:VIV-|BBG-)?vivo[ _]([^);/]+)(?:[);/]|$)'
+    - regex: '(?:VIV-|BBG-)?vivo[ _]([^);/]+)(?:[);/ ]|$)'
       model: '$1'
 
 # Vinsoc
@@ -5107,7 +5280,7 @@ Becker:
 
 # Beeline
 Beeline:
-  regex: 'Beeline|(?:A239s|SWG2001A-A)(?:[);/ ]|$)'
+  regex: 'Beeline|(?:A239s|SWG2001A-A|RASSE-001)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Beeline[_ ]Pro[_ ]([2436])'
@@ -5133,6 +5306,9 @@ Beeline:
       model: 'Fast'
     - regex: 'A239s(?:[);/ ]|$)'
       model: 'Smart 8 A239s'
+    - regex: '(RASSE-001)'
+      device: 'tv'
+      model: '$1'
     - regex: '(SWG2001A-A)(?:[);/ ]|$)'
       device: 'tv'
       model: 'Beebox $1' # SuperWave
@@ -5161,7 +5337,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|SF04 4G)(?:[);/ ]|$)'
+  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|A-STREAM)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Discovery[_ ](1000|111|10[28])C'
@@ -5195,7 +5371,7 @@ Blaupunkt:
     - regex: 'SM 02 2019'
       device: 'smartphone'
       model: 'SM 02 (2019)'
-    - regex: '(4K Android TV)'
+    - regex: '(4K Android TV|A-STREAM)'
       device: 'tv'
       model: '$1'
     - regex: 'B-STREAM'
@@ -5204,7 +5380,7 @@ Blaupunkt:
 
 # Bmobile
 Bmobile:
-  regex: 'Bmobile[_ ]|B60Pro(?:_MV03)?|BL50P_TG0[567]|BL51_MV05|BL54_?Pro|(?:B50Pro|BL5[02]|BL60_TG(?:05|17)|BL60M_MV05|FUN 4 2018|AX686A|AX-?(?:[1-9][0-9]{2,3}[eEO+]?|7OO))(?:[);/ ]|$)'
+  regex: 'Bmobile[_ ]|B60Pro(?:_MV03)?|BL40_MV12|BL50P_TG0[567]|BL51_MV05|BL53_TG06|BL54_?Pro|(?:B50Pro|BL5[02]|BL60_TG(?:05|17)|BL60M_MV05|BL60 Pro|BL6[12]|BL63_TG07|FUN 4 2018|AX686A|AX-?(?:[1-9][0-9]{2,3}[eEO+]?|7OO))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AX-?([1-9][0-9]{2,3}[eAEO+]?)'
@@ -5215,8 +5391,14 @@ Bmobile:
       model: 'Fun 4 (2018)'
     - regex: 'B60Pro(?:_MV03)?'
       model: 'B60 Pro'
+    - regex: 'BL40_MV12(?:[);/ ]|$)'
+      model: 'BL40'
     - regex: 'BL60_TG(?:05|17)'
       model: 'BL60'
+    - regex: 'BL60 Pro(?:[);/ ]|$)'
+      model: 'BL60 Pro'
+    - regex: 'BL63_TG07(?:[);/ ]|$)'
+      model: 'BL63'
     - regex: 'BL60M_MV05'
       model: 'BL60M'
     - regex: 'B50Pro'
@@ -5227,8 +5409,12 @@ Bmobile:
       model: 'BL$1'
     - regex: 'BL51_MV05(?:[);/ ]|$)'
       model: 'BL51'
+    - regex: 'BL53_TG06(?:[);/ ]|$)'
+      model: 'BL53'
     - regex: 'BL54_?Pro'
       model: 'BL54 Pro'
+    - regex: 'BL6([12])(?:[);/ ]|$)'
+      model: 'BL6$1'
     - regex: 'Bmobile[_ ]([^/;]+) Build'
       model: '$1'
     - regex: 'Bmobile[_ ]([a-z0-9]+)'
@@ -5773,7 +5959,7 @@ VOCAL:
 
 # Casper (casper.com.tr)
 Casper:
-  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)(?:[);/ ]|$)'
+  regex: 'CASPER[_ ]|VIA[- _](X30(?: Plus)?|[AXS]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)?'
@@ -5791,7 +5977,7 @@ Casper:
     - regex: 'VIA[- _]([ST]7|T8D)-3G'
       model: 'VIA $1 3G'
       device: 'tablet'
-    - regex: 'VIA[- _](T7D|S[13]0|S48|[LS]8|S7|T17_M|T1[07]|T7|T8B|S1[78])(?:[);/ ]|$)'
+    - regex: 'VIA[- _](T7D|S[134]0|S48|[LS]8|S7|T17_M|T1[07]|T7|T8B|S1[78])(?:[);/ ]|$)'
       model: 'VIA $1'
       device: 'tablet'
     - regex: 'VIA[- _](S48|[LS]30)(?:_0)?(?:[);/ ]|$)'
@@ -5818,7 +6004,7 @@ Cat:
     - regex: 'S22 FLIP'
       model: 'S22 Flip'
       device: 'smartphone'
-    - regex: ' (S48c|S[45]2)(?:[);/ ]|$)'
+    - regex: '(S48c|S[45]2)(?:[);/ ]|$)'
       model: '$1'
       device: 'smartphone'
     - regex: 'Cat ?(?:tablet)? ?((?:Galactica|Nova|StarGate|PHOENIX)[^/;]*) Build'
@@ -5919,7 +6105,7 @@ Changhong:
       model: '$1'
 
 # China Mobile
-'China Mobile':
+China Mobile:
   regex: '(M812C|1501_M02|9930i|A1303|A309W|M651CY|M653|CMCC[ -]M(?:670|860)|M762G)(?: Build|[);]|$)'
   device: 'smartphone'
   models:
@@ -5934,6 +6120,15 @@ Changhong:
     - regex: '(M812C|1501_M02|9930i|A1303|A309W|M670)'
       model: '$1'
 
+# CHCNAV (https://chcnav.com/)
+CHCNAV:
+  regex: 'CHCNAV|(?:HCE[67]00)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: '(HCE[67]00)'
+      device: 'peripheral'
+      model: '$1'
+
 # Comio
 Comio:
   regex: 'Comio|(?:CT701G PLUS|CT701W|GT100)(?:[);/ ]|$)'
@@ -5967,15 +6162,15 @@ Artel:
       device: 'tv'
       model: 'R3 GTV'
 
-    - regex: ' GAP|GAP YOQ(?:[);/ ]|$)'
+    - regex: 'GAP|GAP YOQ(?:[);/ ]|$)'
       model: 'Gap Yo Q'
     - regex: 'U1 MINI(?:[);/ ]|$)'
       model: 'U1 Mini'
     - regex: 'U3_4G(?:[);/ ]|$)'
       model: 'U3 4G'
-    - regex: ' U([124])(?:[);/ ]|$)'
+    - regex: 'U([124])(?:[);/ ]|$)'
       model: 'U$1'
-    - regex: ' ALO(?:[);/ ]|$)'
+    - regex: 'ALO(?:[);/ ]|$)'
       model: 'Allo'
     - regex: 'Artel[_ ](Quadro(?: Pro)?|Tesla|Air|Tomchi|Premium|U3_4G|Z5|Sentinel (?:X 8G|X D5|X)|T10|T21)'
       model: '$1'
@@ -6086,7 +6281,7 @@ ConCorde:
 
 # Condor (www.condor.dz)
 Condor:
-  regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX71[12]G|TFX71[34]L|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411|SP413|PAM524)(?:[);/ ]|$)|CTAB[^/;]+ Build'
+  regex: 'Allure (?:A8 Pro|A55 Slim|M[123]|X)|Griffe T[235-9]|TFX71[12]G|TFX71[34]L|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411|SP413|PAM524|GT60 PRO|GT60)(?:[);/ ]|$)|CTAB[^/;]+ Build'
   device: 'smartphone'
   models:
     - regex: 'CTAB([^/;]+) Build'
@@ -6104,6 +6299,8 @@ Condor:
 
     - regex: 'PHS-601'
       model: 'C8'
+    - regex: 'GT60 PRO'
+      model: 'GT60 Pro'
     - regex: 'PGN-?403'
       model: 'C4+ Noir'
     - regex: 'PGN-?404'
@@ -6120,9 +6317,11 @@ Condor:
       model: 'C7'
     - regex: '(Allure \w+) Plus'
       model: '$1 Plus'
+    - regex: '(Allure \w+) Pro'
+      model: '$1 Pro'
     - regex: '(Allure \w+) Lite'
       model: '$1 Lite'
-    - regex: '(Allure (?:M[123]|X))'
+    - regex: '(Allure (?:M[123]|X)|GT60)'
       model: '$1'
     - regex: 'PGN\-?507'
       model: 'Allure A9'
@@ -6202,7 +6401,7 @@ Condor:
       model: 'Allure A55 Plus'
     - regex: 'Plume H1'
       model: 'Plume H1'
-    - regex: 'Plume L([2468]) Pro'
+    - regex: 'Plume L([24568]) Pro'
       model: 'Plume L$1 Pro'
     - regex: 'Plume L([13]) Plus'
       model: 'Plume L$1 Plus'
@@ -6218,7 +6417,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|CP12)(?:[);/ ]|$)|(8295|5860S) Build'
+  regex: '(?:YL-)?Coolpad|(?:Cool_9S|1824-S0|8190Q|1831-A0|8676-[AM]01|1872-A0|REVVLPLUS C3701A|VCR-[AI]0|C105-(?:8|E0)|C106-[789]|C107-9| C106|MTS-T0|ORL-C0|DLS-E0|182[56]-I01|1825-E0| 1825|8298-(?:M02|A01)|5560S|CP3320AS2|CP3321AT|CP350[34]L|cp3636a|CP3648AT?|CP3667AT|CP3669AS|cp3705A[S]?|CP3706AS|CP8298_I00|CP8676_I0[23]|C103|CP03|C1-U02|SAC-A0| 203[29]|CP05|CP12p?)(?:[);/ ]|$)|(8295|5860S) Build'
   device: 'smartphone'
   models:
     - regex: 'VCR-[AI]0'
@@ -6227,7 +6426,7 @@ Coolpad:
       model: 'Cool Play C7'
     - regex: '1872-A0(?:[);/ ]|$)'
       model: 'Cool Play 7'
-    - regex: ' 2032(?:[);/ ]|$)'
+    - regex: '2032(?:[);/ ]|$)'
       model: 'N7 Plus'
     - regex: 'REVVLPLUS C3701A'
       model: 'REVVL Plus'
@@ -6245,6 +6444,8 @@ Coolpad:
       model: 'N5C'
     - regex: 'CP3321AT(?:[);/ ]|$)'
       model: 'Bellaza'
+    - regex: 'cp3636a(?:[);/ ]|$)'
+      model: 'Canvas'
     - regex: 'CP3705A[S]?(?:[);/ ]|$)'
       model: 'Legacy'
     - regex: 'CP3648AT?(?:[);/ ]|$)'
@@ -6259,7 +6460,7 @@ Coolpad:
       model: 'N2M'
     - regex: '(?:C106-[789]|R116|C10[36]|C1-U02)(?:[);/ ]|$)'
       model: 'Cool 1'
-    - regex: ' 2039(?:[);/ ]|$)'
+    - regex: '2039(?:[);/ ]|$)'
       model: 'Cool S'
     - regex: 'C107-9(?:[);/ ]|$)'
       model: '1C'
@@ -6269,7 +6470,7 @@ Coolpad:
       model: 'Cool 5'
     - regex: '1825-I01(?:[);/ ]|$)'
       model: 'Cool 3 Plus'
-    - regex: ' 1825(?:[);/ ]|$)'
+    - regex: '1825(?:[);/ ]|$)'
       model: 'Cool 3'
     - regex: 'ORL-C0(?:[);/ ]|$)'
       model: 'Cool 9'
@@ -6281,6 +6482,8 @@ Coolpad:
       model: 'Cool 20 Pro'
     - regex: '(CP12)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'CP12P(?:[);/ ]|$)'
+      model: 'CP12P'
     - regex: 'SAC-A0(?:[);/ ]|$)'
       model: '26' # Tibetan Peak Edition
     - regex: '5560S(?:[);/ ]|$)'
@@ -6357,11 +6560,15 @@ Cosmote:
 
 # Cricket
 Cricket:
-  regex: 'Cricket-([a-z0-9]+)|(?:U304AC|U325AC|U680AC|U705AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C)(?:[);/ ]|$)'
+  regex: 'Cricket-([a-z0-9]+)|(?:U(?:304|325|380|6080|668|680|705)AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C|SN304AE)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'SL101AE'
       model: 'Debut Smart'
+    - regex: 'U6080AC'
+      model: 'Magic 5G'
+    - regex: 'U380AC'
+      model: 'Debut S2'
     - regex: 'U680AC'
       model: 'Outlast'
     - regex: 'EC211001'
@@ -6380,10 +6587,14 @@ Cricket:
       model: 'Influence'
     - regex: 'EC211004'
       model: 'Innovate 5G'
+    - regex: 'SN304AE'
+      model: 'Innovate E 5G'
     - regex: 'U705AC'
       model: 'Ovation'
     - regex: 'EC1002'
       model: 'Ovation 2'
+    - regex: 'U668AC'
+      model: 'Ovation 3'
     - regex: 'EC211003'
       model: 'Splendor'
     - regex: 'SL100EA'
@@ -6393,14 +6604,14 @@ Cricket:
       model: '$1'
 
 # Crius
-'Crius Mea':
+Crius Mea:
   regex: '(Q7A\+?)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
 # Crosscall
 Crosscall:
-  regex: 'Crosscall|ODYSSEY_Plus|Odyssey S1|Trekker-[MSX][1-4]|Action-X[35]|Core-(?:M[45]|T[45]|X[345]|Z5)'
+  regex: 'Crosscall|ODYSSEY_Plus|Action-X[35]|Core-(?:M[45]|T[45]|X[345]|Z5)|Stellar-X5|Trekker-[MSX][1-4]|Odyssey S1'
   device: 'smartphone'
   models:
     - regex: 'Action-X3 Pro(?:[);/ ]|$)'
@@ -6421,6 +6632,8 @@ Crosscall:
       model: 'Trekker-$1 Core'
     - regex: 'Trekker-([MSX][1-4](?: Core)?)'
       model: 'Trekker-$1'
+    - regex: 'Stellar-(X5)(?:[);/ ]|$)'
+      model: 'Stellar-$1'
     - regex: 'Core-T([45])(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Core-T$1'
@@ -6456,7 +6669,7 @@ Crown:
 
 # AllDocube (alldocube.com)
 AllDocube:
-  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)(?:[);/ ]|$)'
+  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(?:Pro|_Lite)?|kPad|X_Game|T806MHE?|Power M3|Smile_X|iPlay_60_Lite|iPlay_60)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Smile_X(?:[);/ ]|$)'
@@ -6483,13 +6696,15 @@ AllDocube:
       model: 'X'
     - regex: 'T806MHE?'
       model: 'iPlay 8 Pro'
+    - regex: 'iPlay_?([56]0)_Lite'
+      model: 'iPlay $1 Lite'
     - regex: 'iPlay[_ ]?50[_ ]mini[_ ]Pro'
       model: 'iPlay 50 Mini Pro'
-    - regex: 'iPlay50 Pro'
+    - regex: 'iPlay ?50 ?Pro'
       model: 'iPlay 50 Pro'
     - regex: 'iPlay50 Mini'
       model: 'iPlay 50 Mini'
-    - regex: 'iPlay[_ ]?([1-5]0|[89]T?|40H|[25]0[sP])(?:[);/ ]|$)'
+    - regex: 'iPlay[_ ]?([1-6]0|[89]T?|40H|[25]0[sP])(?:[);/ ]|$)'
       model: 'iPlay $1'
     - regex: 'X_Game(?:[);/ ]|$)'
       model: 'X Game'
@@ -6498,9 +6713,13 @@ AllDocube:
 
 # Xsmart (xsmart.com.pk)
 Xsmart:
-  regex: 'Xsmart (Nova 7)(?:[);/ ]|$)'
+  regex: '(?:Xsmart (?:Nova 7|Mate 10)|CORE_X)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'CORE_X'
+      model: 'Core X'
+    - regex: 'Xsmart (Nova 7|Mate 10)'
+      model: '$1'
 
 # MyTab
 MyTab:
@@ -6586,7 +6805,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|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)(?:[);/ ]|$)'
+  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|X|ACE 3)|TAB KINGKONG|KING KONG CS| X30P|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|NOTE 30)|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:NOTE [345]0|NOTE 2[134]|P80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:Pocket|NOTE 9|P50|J10)|POCKET 3)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TAB KINGKONG'
@@ -6609,6 +6828,8 @@ CUBOT:
       model: 'King Kong Power'
     - regex: 'KINGKONG[ _]AX'
       model: 'King Kong AX'
+    - regex: 'KINGKONG ACE 3'
+      model: 'King Kong Ace 3'
     - regex: 'KINGKONG[ _]STAR'
       model: 'King Kong Star'
     - regex: 'KINGKONG MINI2 Pro'
@@ -6619,7 +6840,7 @@ CUBOT:
       model: 'King Kong Mini'
     - regex: 'KINGKONG 5 Pro'
       model: 'King Kong 5 Pro'
-    - regex: 'KING[_ ]?KONG[_ ]([35-9])'
+    - regex: 'KING[_ ]?KONG[_ ]([35-9]|X)'
       model: 'King Kong $1'
     - regex: 'KING KONG CS'
       model: 'King Kong CS'
@@ -6649,7 +6870,7 @@ CUBOT:
       model: 'Note 20 Pro'
     - regex: '(R15|S550|J3)[_ ]PRO'
       model: '$1 Pro'
-    - regex: 'NOTE ([2-5]0|21|[79])'
+    - regex: 'NOTE ([2-5]0|2[134]|[79])'
       model: 'Note $1'
     - regex: 'CUBOT[_ ]NOTE[_ ]S'
       model: 'Note S'
@@ -6659,9 +6880,11 @@ CUBOT:
       model: 'Power'
     - regex: 'CUBOT_X18_Plus'
       model: 'X18 Plus'
-    - regex: 'CUBOT[ _](A5|C6W|H3|J3|P7|P20|[RXJ]9|R11|X18)(?:[);/ ]|$)'
+    - regex: 'CUBOT[_ ]Hafury V1'
+      model: 'Hafury V1'
+    - regex: 'CUBOT[ _](A5|C6W|H3|J3|P7|P20|[RXJ]9|R11|X18|X30)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' (X19 S|[RX]19|R15|J5|P[568]0|J10)(?:[);/ ]|$)'
+    - regex: '(X19 S|[RX]19|R15|J5|P[568]0|J10|X30P)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'CUBOT ([^;/]+) Build'
       model: '$1'
@@ -6722,20 +6945,29 @@ Crescent:
     - regex: 'Venus[ _]([14])'
       model: 'Venus $1'
 
-# Cwowdefu
+# Cwowdefu (cwowdefu.com)
 Cwowdefu:
-  regex: 'C70W(?:[);/ ]|$)'
+  regex: '(?:C70W|F35W_EEA|C82W_EEA)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'C70W(?:[);/ ]|$)'
-      model: 'C70W'
+    - regex: '(C70W|F35W|C82W)(?:_EEA)?(?:[);/ ]|$)'
+      model: '$1'
+
+# CX (https://redcx.com/)
+CX:
+  regex: 'CX9006(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'CX9006'
+      model: 'CX9006'
+      device: 'tablet'
 
 # Cyrus (www.cyrus-technology.de)
 Cyrus:
   regex: 'Cyrus[ _-]|CyrusApel|CM17XA|CS(?:22|45)XA(?:_EEA)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'CM17XA(?:[);/ ]|$)'
+    - regex: 'CM17XA(?:_EEA)?(?:[);/ ]|$)'
       model: 'CM17XA'
     - regex: 'CS(22|45)XA(?:_EEA)?'
       model: 'CS$1 XA'
@@ -6829,6 +7061,9 @@ Dell:
       device: 'desktop'
       model: 'Chromebook $1'
 
+    - regex: 'Venue7 (3740)'
+      model: 'Venue 7 $1'
+      device: 'tablet'
     - regex: '(?:Dell )?(Streak|Venue) ?([^/;]*) Build'
       model: '$1 $2'
       device: 'tablet'
@@ -6855,7 +7090,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|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)(?:[);/ ]|$)'
+  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|75UCY1-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)(?:[);/ ]|$)'
@@ -6891,19 +7126,19 @@ DEXP:
     - regex: 'Ursus[ _]([^;/)]+)(?: Build|[);])'
       model: 'Ursus $1'
       device: 'tablet'
-    - regex: ' (K[23456]1|K[234]8|[KB]18|B[23]1|B[12]7|B[23]8|[BD]11|D21|T21|C3[78]|P11)(?:[);/ ]|$)'
+    - regex: '(K[23456]1|K[234]8|[KB]18|B[23]1|B[12]7|B[23]8|[BD]11|D21|T21|C3[78]|P11)(?:[);/ ]|$)'
       model: '$1'
       device: 'tablet'
     - regex: '(VA[21]10|VA170|E210|R1[18]0|Q110|M[12]10|N280i|P380i?|P[345]10|S2[89]0|S3[78]0|S[456]70|H[12]10|H[123]70|H[34]10|L1[178]0|L2[17]0|N[13]80i|N[234]10|E1[178]0|Q[123]10|Q[12]80|EX111|N[35]70|L3[17]0i|L470|S[127]70i|S270|S110|S169|S770|S180i?|M170)(?:[);/ ]|$)'
       model: 'Ursus $1'
       device: 'tablet'
-    - regex: ' (H28)(?:[);/ ]|$)'
+    - regex: '(H28)(?:[);/ ]|$)'
       model: 'Ursus $1'
       device: 'tablet'
 
     - regex: '(G450)[ _](2021)'
       model: '$1 ($2)'
-    - regex: ' (B260|B245|A440|A[345]55|B450|B340|B35[05]|BL155|BL160|A160|A[23]40|A350|T155|Z[1-4]55|G25[035]|G355|Z250|G450|G550|G660)(?:[);/ ]|$)'
+    - regex: '(B260|B245|A440|A[345]55|B450|B340|B35[05]|BL155|BL160|A160|A[23]40|A350|T155|Z[1-4]55|G25[035]|G355|Z250|G450|G550|G660)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'SENIOR(?:[);/ ]|$)'
       model: 'Senior'
@@ -6915,7 +7150,7 @@ DEXP:
       device: 'console'
       model: 'Freya'
 
-    - 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])?(?:[);/ ]|$)'
+    - 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|75UCY1-G|55UCY1-G|65UCY1-[GB]|55UCY1)(?:-[AbcfedH])?(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
 
@@ -6943,10 +7178,10 @@ Dbtel:
 
 # DGTEC
 DGTEC:
-  regex: 'DG101TBIPS(?:[);/ ]|$)'
+  regex: '(?:DG101HSTB|DG101TBIPS)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'DG101TBIPS(?:[);/ ]|$)'
+    - regex: '(DG101HSTB|DG101TBIPS)(?:[);/ ]|$)'
       model: 'DG101TBIPS'
       device: 'tablet'
 
@@ -7051,7 +7286,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(?:5[05]UBB31|43UBB31|32SR21|(?:32|40)SBB31|43SR2[23]|42SR24|24SR20|55UR31|43SBB31)|RS1248PL|RS1253PL|RS1249PL|RS1267PL|WS1250PL|WS1262RW|HS1002PL|TS8289PL'
+  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|WS825[123]PL|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)SBB3[15]|43SR2[23]|42SR24|24SR20|55UR31|43SBB31|24SBB31)|RS1248PL|RS1253PL|RS1249PL|RS1267PL|WS125[01]PL|WS1262RW|HS1002PL|TS1292PL|HS100[134]PL|TS8289PL|Kids_8280C_WS8252PL|HS101[012]PL'
   device: 'smartphone'
   models:
     - regex: 'HIT(?: 3G)? HT707[10]MG'
@@ -7105,6 +7340,12 @@ Digma:
     - regex: 'MS100[123]PL'
       model: 'Pro Prime 18 11" 3G'
       device: 'tablet'
+    - regex: 'HIT 18 HS101[012]PL'
+      model: 'Pro Hit 18 10.51"'
+      device: 'tablet'
+    - regex: 'Pro STAR 14|AS8001PL'
+      model: 'Pro Star 14'
+      device: 'tablet'
 
     - regex: 'TS7854M'
       model: 'Plane 8.1" 3G'
@@ -7115,6 +7356,15 @@ Digma:
     - regex: 'HS1002PL'
       model: 'Pro Hit 16 10.4"'
       device: 'tablet'
+    - regex: 'HS1008PL'
+      model: 'Pro Hit 104 10.1"'
+      device: 'tablet'
+    - regex: 'HS100[13]PL'
+      model: 'Hit 16 10.4"'
+      device: 'tablet'
+    - regex: 'HS1004PL'
+      model: 'Pro Hit 108E 10.1"'
+      device: 'tablet'
     - regex: 'HS1006PL'
       model: 'Pro Hit 14 10.4"'
       device: 'tablet'
@@ -7149,12 +7399,18 @@ Digma:
     - regex: 'DIGMA[_ ]IDSD'
       model: 'IDsD 10 3G'
       device: 'tablet'
-    - 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)'
+    - 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|1314C 4G|1421D 4G)'
       model: 'CITI $1'
       device: 'tablet'
     - regex: 'WS1262RW'
       model: 'Kids 1210B'
       device: 'tablet'
+    - regex: 'WS8253PL'
+      model: 'Kids 8260C'
+      device: 'tablet'
+    - regex: '(?:Kids_8280C_)?WS8252PL'
+      model: 'Kids 8280C'
+      device: 'tablet'
     - regex: '(CITI[ _](?:[A-Z0-9]+)[ _][34]G)[ _][TC][ST](?:106[24]ML|111[46]ML|1115MG|1117PG|1207MG|1210MG|3001ML|500[67]PG|7052PG|706[567]MG|7097MG|720[48]MG|820[69]MG|11[459]4MG|1195MG|1196ML|3001ML|8152ML|1050PL|709[68]PL|7113PL|7193MG|7216MG|8205PG|7203MG|8143MG|7153MG|7141MG|7140ML|8268PL)'
       model: '$1'
       device: 'tablet'
@@ -7215,6 +7471,9 @@ Digma:
     - regex: '1402D 4G WS1250PL'
       model: '1402D 4G'
       device: 'tablet'
+    - regex: 'WS1251PL'
+      model: 'Kids 1247C'
+      device: 'tablet'
     - regex: 'RS1267PL'
       model: 'Pro 1480E 4G'
       device: 'tablet'
@@ -7253,13 +7512,13 @@ 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|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)(?:[);/ ]|$)'
+  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| S118|(?<!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)|V Max Plus|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|S95)|S41T|N50S|D60 Pro|DK10|Turbo_mini_F1|Y100X|T30Pro|T10S|T10Plus|T20Mini|S41 Max|S41 Plus|N55 Pro|S punk|S cyber)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'T30Pro(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T30 Pro'
-    - regex: ' R([12]0)(?:[);/ ]|$)'
+    - regex: 'R([12]0)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'R$1'
     - regex: 'T([12]0)S(?:[);/ ]|$)'
@@ -7271,6 +7530,9 @@ Doogee:
     - regex: 'T10Plus(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T10 Plus'
+    - regex: 'T20Mini Kid(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T20 Mini Kid'
     - regex: 'T20Mini(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T20 Mini'
@@ -7278,8 +7540,14 @@ Doogee:
       device: 'tablet'
       model: 'T$1 Ultra'
 
+    - regex: 'V Max Plus'
+      model: 'V Max Plus'
     - regex: 'V Max'
       model: 'V Max'
+    - regex: 'S punk'
+      model: 'S Punk'
+    - regex: 'S cyber'
+      model: 'S Cyber'
     - regex: '(?:Valencia2_)?Y100_Plus(?:[);/ ]|$)'
       model: 'Valencia2 Y100 Plus'
     - regex: 'Valencia2[_ ]Y100pro'
@@ -7290,14 +7558,16 @@ 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|V20S)(?:[);/ ]|$)'
+    - regex: '(X95i?|BL[579]000|S90C|X10S|X[569]0L|X93|V30T?|V31GT|V20S|DK10)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'X(9[567])Pro(?:[);/ ]|$)'
       model: 'X$1 Pro'
     - regex: 'V30Pro(?:[);/ ]|$)'
       model: 'V30 Pro'
-    - regex: 'N([24]0)Pro(?:[);/ ]|$)'
+    - regex: 'N([24]0|55) ?Pro(?:[);/ ]|$)'
       model: 'N$1 Pro'
+    - regex: 'N(50)S(?:[);/ ]|$)'
+      model: 'N$1S'
     - regex: 'BL12000 PRO'
       model: 'BL12000 Pro'
     - regex: 'D60 Pro'
@@ -7360,7 +7630,7 @@ Doogee:
       model: 'Turbo Mini F1'
     - regex: 'Y([89]) ?Plus(?:[);/ ]|$)'
       model: 'Y$1 Plus'
-    - regex: ' (S5[19]|S35T?|S98|S89|Y8|Y6C|S61|N[23]0|[NS]100)(?:[);/ ]|$)'
+    - regex: '(S5[19]|S35T?|S9[58]|S89|Y8|Y6C|S61|N[23]0|[NS]100|S118|S41T)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(X5max(?:[_ ]PRO)?)'
       model: '$1'
@@ -7414,13 +7684,13 @@ Doro:
       model: '8020X'
     - regex: 'DSB-0220(?:[);/ ]|$)'
       model: '8080'
-    - regex: 'Doro[ _-]?([^;/)]+) Build'
+    - regex: 'Doro[ _-]?([^;/)]+)(?: Build|[;)])'
       model: '$1'
     - regex: 'Doro[ _-]([0-9a-z]+)'
       model: '$1'
 
 # Dune HD
-'Dune HD':
+Dune HD:
   regex: 'DuneHD|SOLO 4K(?:[);/ ]|$)'
   device: 'tv'
   models:
@@ -7485,7 +7755,7 @@ EBEST:
 
 # Horizont (https://horizont.by/en/)
 Horizont:
-  regex: '(?:Horizont[_ ])?(32LE7011D|43LE7022D|32LE705[12]D|65LE7053D)'
+  regex: '(?:Horizont[_ ])?(32LE7011D|43LE7022D|32LE705[12]D|65LE7053D|43LE7052D|50LE7053D)'
   device: 'tv'
   model: '$1'
 
@@ -7591,11 +7861,11 @@ Elephone:
       model: 'P8 Mini'
     - regex: '(U|PX|E10)_Pro(?:[);/ ]|$)'
       model: '$1 Pro'
-    - regex: ' U3H(?:[);/ ]|$)'
+    - regex: 'U3H(?:[);/ ]|$)'
       model: 'U3H'
     - regex: 'C1_Max(?:[);/ ]|$)'
       model: 'C1 Max'
-    - regex: ' PX(?: Build|[;)])'
+    - regex: 'PX(?: Build|[;)])'
       model: 'PX'
     - regex: '(P8_3D|P8_Max)(?:[);/ ]|$)'
       model: '$1'
@@ -7667,7 +7937,7 @@ Evercoss:
       model: 'M50 Max'
     - regex: 'U6 PRIME'
       model: 'U6 Prime'
-    - regex: ' (M50A|R40K|R70|R5C|S55[AB]|M55[ABC])(?:[);/ ]|$)'
+    - regex: '(M50A|R40K|R70|R5C|S55[AB]|M55[ABC])(?:[);/ ]|$)'
       model: '$1'
     - regex: '(AT8B|R70A|U70[CB])(?:[);/ ]|$)'
       device: 'tablet'
@@ -7797,7 +8067,7 @@ Smartab:
 
 # Sony & Sony Ericsson (combined as they are mixed up)
 Sony:
-  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|(?:[4-9]0[12])SO|C1[569]0[45]|C2[01]0[45]|C230[45]|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D(?:200[45]|21(?:0[45]|14)|22(?:0[236]|12|43)|230[2356]|240[36]|2502|2533|510[236]|530[36]|5316|5322|5503|58[03]3|65(?:0[23]|43|63)|66[03458]3|66[14]6|6708)|E(?:20[0345]3|2006|210[45]|2115|2124|230[36]|2312|23[356]3|530[36]|53[3456]3|5506|55[356]3|56[46305][36]|58[02]3|6508|65[35]3|66[0358]3|68[358]3)|F(?:311[12356]|331[13]|321[12356]|5[13]21|5122|813[12]|833[12])|G(?:2299|312[135]|311[26]|322[136]|3212|331[123]|3412|3416|342[136]|823[12]|834[123]|8[14]4[12]|8188)|H(?:3113|3123|3133|3213|3223|3311|3321|3413|4113|4133|4213|4233|4311|4331|4413|4433|4493|8116|8166|82[1679]6|83[12]4|8416|9436|9493)|I(?:3[12]23|3213|[34]113|[34]312|4193|42[19]3|4332)|J(?:3173|3273|81[17]0|82[17]0|91[15]0|92[16]0)|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]+[0-9]*(?: Build|\))|X?L39H|XM50[ht]|XQ-[A-Z]{2}[0-9]{2}|W960|portalmmm/2\.0 K|S3[69]h|SOG(?:0[1-9]|10)|SOL2[2-6]|SOT[23]1|SOV3[1-9]|SOV4[0-3]|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[12]C|[2-5]D|[1-4]E|[1-5]F|[1-5]G|[1-4]H|[1-4]J|[1-5]K|1M|[1-3]L)|R800[aix]|LiveWithWalkman|BRAVIA|SGP771|E3 Dual|A[012]01SO|A204SO|A[12]02SO|SO-[45]1[AB]|SO-5[1234][ABCD]|A[12]03SO|A002SO|NW-(A[13]00|ZX500|Z1000)Series|NSZ-GS7|SmartWatch 3|SVP-DTV15'
+  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|(?:[4-9]0[12])SO|C1[569]0[45]|C2[01]0[45]|C230[45]|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D(?:200[45]|21(?:0[45]|14)|22(?:0[236]|12|43)|230[2356]|240[36]|2502|2533|510[236]|530[36]|5316|5322|5503|58[03]3|65(?:0[23]|43|63)|66[03458]3|66[14]6|6708)|E(?:20[0345]3|2006|210[45]|2115|2124|230[36]|2312|23[356]3|530[36]|53[3456]3|5506|55[356]3|56[46305][36]|58[02]3|6508|65[35]3|66[0358]3|68[358]3)|F(?:311[12356]|331[13]|321[12356]|5[13]21|5122|813[12]|833[12])|G(?:2299|312[135]|311[26]|322[136]|3212|331[123]|3412|3416|342[136]|823[12]|834[123]|8[14]4[12]|8188)|H(?:3113|3123|3133|3213|3223|3311|3321|3413|4113|4133|4213|4233|4311|4331|4413|4433|4493|8116|8166|82[1679]6|83[12]4|8416|9436|9493)|I(?:3[12]23|3213|[34]113|[34]312|4193|42[19]3|4332)|J(?:3173|3273|81[17]0|82[17]0|91[15]0|92[16]0)|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]+[0-9]*(?: Build|\))|X?L39H|XM50[ht]|XQ-[A-Z]{2}[0-9]{2}|W960|portalmmm/2\.0 K|S3[69]h|SOG(?:0[1-9]|10)|SOL2[2-6]|SOT[23]1|SOV3[1-9]|SOV4[0-3]|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[12]C|[2-5]D|[1-4]E|[1-5]F|[1-5]G|[1-4]H|[1-4]J|[1-5]K|1M|[1-3]L)|R800[aix]|LiveWithWalkman|BRAVIA|SGP771|E3 Dual|A[012]01SO|A204SO|A[123]02SO|SO-[45]1[AB]|SO-5[1234][ABCD]|A[12]03SO|A002SO|NW-(A[13]00|ZX500|Z1000)Series|NSZ-GS7|SmartWatch 3|SVP-DTV15'
   device: 'smartphone'
   models:
     # SONY ERICSSON: explicit smartphone models
@@ -7958,8 +8228,10 @@ Sony:
       model: 'Xperia 10 II'
     - regex: '(?:A10[12]SO|SO-52B|SOG04|XQ-BT52)(?:[);/ ]|$)'
       model: 'Xperia 10 III'
-    - regex: '(?:SO-52D|XQ-DC72|XQ-DC54)(?:[);/ ]|$)'
+    - regex: '(?:SO-52D|XQ-DC72|XQ-DC54|A302SO)(?:[);/ ]|$)'
       model: 'Xperia 10 V'
+    - regex: '(?:XQ-ES[45]4|XQ-ES72|SOG14|SO-52E|A402SO)(?:[);/ ]|$)'
+      model: 'Xperia 10 VI'
     - regex: 'XQ-BT44(?:[);/ ]|$)'
       model: 'Xperia 10 III Lite'
     - regex: '(?:XQ-CC72|XQ-CC[45]4|SOG07|SO-52C|A202SO)(?:[);/ ]|$)'
@@ -7976,10 +8248,12 @@ Sony:
       model: 'Xperia 1 II'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SO-51B|SOG03|XQ-BC[4567]2)(?:[);/ ]|$)'
       model: 'Xperia 1 III'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:SOG06|XQ-CT72|SO-51C|A201SO|XQ-CT[45]4)(?:[);/ ]|$)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:SOG06|XQ-CT[67]2|SO-51C|A201SO|XQ-CT[45]4)(?:[);/ ]|$)'
       model: 'Xperia 1 IV'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SOG10|SO-51D|XQ-DQ(?:[67]2|[45]4))(?:[);/ ]|$)'
       model: 'Xperia 1 V'
+    - regex: '(?:XQ-EC72|XQ-EC54|XQ-EC44|SOG13|SO-51E|A401SO)(?:[);/ ]|$)'
+      model: 'Xperia 1 VI'
     - regex: '(?:Sony(?:Ericsson)?)?LT22i|Xperia P'
       model: 'Xperia P'
     - regex: '(?:Sony(?:Ericsson)?)?LT25i|Xperia V'
@@ -8418,6 +8692,9 @@ Ergo:
     - regex: '(LE32CT5515AK)'
       model: '$1'
       device: 'tv'
+    - regex: 'ERGOGS'
+      model: 'GHS55'
+      device: 'tv'
 
 # Ericsson
 Ericsson:
@@ -8431,10 +8708,10 @@ Ericsson:
 
 # Energizer (www.energizeyourdevice.com)
 Energizer:
-  regex: 'PowerMax|HARDCASEH5[05]0S|ENERGY[_ ]?(?:[45]00|400S|S[56]00|E12|E5[02]0S?)(?:[_ ](?:LTE|EU))?'
+  regex: 'Energizer[ _](?:Ultimate|Power Max|Hard ?case)|PowerMax|HARDCASEH5[05]0S|ENERGY[_ ]?(?:[45]00|400S|S[56]00|E12|E5[02]0S?)(?:[_ ](?:LTE|EU))?'
   device: 'smartphone'
   models:
-    - regex: 'PowerMax(P[0-9]+S?)'
+    - regex: 'Power ?Max ?(P[0-9]+S?)'
       model: 'Power Max $1'
     - regex: 'ENERGY[_ ]([45]00|E520)[_ ]LTE'
       model: 'Energy $1 LTE'
@@ -8446,8 +8723,10 @@ Energizer:
       model: 'Energy S$1'
     - regex: 'ENERGY[_ ]?(E500S|E500|E12)'
       model: 'Energy $1'
-    - regex: 'HARDCASE(H5[05]0S)'
+    - regex: 'HARD ?CASE ?(H5[057]0S|G5)'
       model: 'Hard Case $1'
+    - regex: 'Ultimate 65G'
+      model: 'Ultimate 65G'
 
 # eTouch
 eTouch:
@@ -8499,7 +8778,7 @@ Evertek:
       model: 'M10 Max'
     - regex: 'EverMiracle Plus'
       model: 'EverMiracle Plus'
-    - regex: ' V4\+'
+    - regex: 'V4\+'
       model: 'V4 Plus'
     - regex: 'EverTrendy\+4G'
       model: 'EverTrendy 4G'
@@ -8725,7 +9004,7 @@ Fondi:
 
 # Fairphone (fairphone.com)
 Fairphone:
-  regex: ' (FP(?:1U?|[234]))(?:[);/ ]|$)'
+  regex: '(?:Fairphone )?(FP(?:1U?|[2345]))(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -8922,10 +9201,13 @@ G-TiDE:
       model: 'V6'
     - regex: 'EXTREME X9'
       model: 'Extreme X9'
-    - regex: ' EX10'
+    - regex: 'EX10'
       model: 'EX10'
     - regex: 'E(57|60|66|72|77)'
       model: '$1'
+    - regex: 'G-TiDE[_ ](H1)'
+      device: 'tablet'
+      model: '$1'
 
 # Gemini
 Gemini:
@@ -9001,7 +9283,7 @@ Gigaset:
 
     - regex: 'Gigaset ([^;/]+) Build'
       model: '$1'
-    - regex: 'Gigaset ([^;/)]+)(?:[);/]|$)'
+    - regex: 'Gigaset ([^;/)]+)(?:[);/ ]|$)'
       model: '$1'
 
 # Ginzzu
@@ -9021,7 +9303,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(?:[\d.]*);(?: [\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|F100[AL]|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'
@@ -9052,7 +9334,7 @@ Gionee:
       model: 'M18'
     - regex: 'GN([0-9]{3,4}[a-z]?)(?:[);/ ]|$)'
       model: 'GN$1'
-    - regex: '(F106L|F100A|V188S|V188|F103S|F8 Neo)(?:[);/ ]|$)'
+    - regex: '(F106L|F100[AL]|V188S|V188|F103S|F8 Neo)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'M7 Power(?:[);/ ]|$)'
       model: 'M7 Power'
@@ -9082,7 +9364,7 @@ Gionee:
       model: 'F12 Pro'
     - regex: 'F103( Pro)?( BUILD|\))'
       model: 'F103$1'
-    - regex: ' (P61)(?:[);/ ]|$)'
+    - regex: '(P61)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(?:(?:GIO-)?GIONEE[ _-])?Dream_D1(?:[);/ ]|$)'
       model: 'Dream D1'
@@ -9113,13 +9395,15 @@ Vizio:
       model: 'ISV-B11'
     - regex: 'D50u-D1'
       model: 'D50u-D1'
+    - regex: 'VIZIO ([a-z0-9_-]+) ViziOS/'
+      model: '$1'
     - regex: '(VTAB1008|XR6[PM]10)'
       device: 'tablet'
       model: '$1'
 
-# Timovi
+# Timovi (https://web.archive.org/web/20181129055129/https://www.timovi.mx/)
 Timovi:
-  regex: 'Tmovi[ _]|(?:Infinit[ _](?:Lite[_ ]2|X[_ ]CAM)|Infinit MX(?: Pro)?|Vision_PRO|VISION ULTRA|Epix|Yeah_Go|Insignia Delta 2|Insignia_(?:Delta3|Lab))(?:[);/ ]|$)'
+  regex: 'Tmovi[ _]|(?:Infinit[ _](?:Lite[_ ]2|X[_ ]CAM)|Infinit (?:MX(?: Pro)?|2)|Vision_PRO|VISION ULTRA|Epix|Yeah_Go|Insignia Delta 2|Insignia_(?:Delta3|Lab))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Tmovi[ _]Prime'
@@ -9134,6 +9418,8 @@ Timovi:
       model: 'Infinit MX Pro'
     - regex: 'Infinit MX'
       model: 'Infinit MX'
+    - regex: 'Infinit 2'
+      model: 'Infinit 2'
     - regex: 'Infinit[_ ]Lite([_ ]2)?'
       model: 'Infinit Lite$1'
     - regex: 'Vision_PRO'
@@ -9225,6 +9511,12 @@ GOCLEVER:
       model: 'Libra 97'
       device: 'tablet'
 
+# GOtv
+GOtv:
+  regex: '(SEI600GO|GO700FR)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
 # GoMobile
 GoMobile:
   regex: 'GO Onyx|GO[0-9]{3,4}'
@@ -9316,7 +9608,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](?:\.[\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)(?:[);/ ]|$)'
+  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]|G901|(?<!Symphony) G100)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GM 5 Plus'
@@ -9357,6 +9649,8 @@ General Mobile:
       model: 'GM 9 Go'
     - regex: 'GM 9 Pro'
       model: 'GM 9 Pro'
+    - regex: 'G901'
+      model: 'GM Phoenix 5G'
     - regex: 'GM 9 Plus'
       model: 'GM 9 Plus'
     - regex: 'G100'
@@ -9407,11 +9701,12 @@ 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|G025I|G020[AMP]|G9FPL|GWKK3|GP4BC|GKWS6|GHL1X|GC3VE|GA01180-US'
+  regex: 'Nexus(?! 6P)|GoogleTV|Google Fiber|Google Pixel|Glass(?<!Browser)|CrKey[^a-z0-9]|(?:Pixel|sailfish|taimen|blueline|Chromecast(?: HD)?)(?:;? Build|[)])|Pixel (?:XL|9 Pro 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|G6QU3|GO3Z5|G025[IJ]|G020[ABCGEMP]|G9FPL|GWKK3|GP4BC|G4S1M|GKWS6|GHL1X|G1F8F|G01[13]C|G013A|GC3VE|GD1YQ|GTT9Q|GA02099|GA01180-US|G5NZ6|G8VOU|G025N'
   device: 'smartphone'
   models:
-    - regex: 'Glass'
-      model: 'Glass'
+    - regex: 'Glass 1'
+      device: 'wearable'
+      model: 'Glass 1'
     - regex: 'Galaxy Nexus'
       model: 'Galaxy Nexus'
     - regex: 'AOSP on HammerHead'
@@ -9434,6 +9729,9 @@ Google:
     - regex: '(GFHD[12]00)'
       device: 'tv'
       model: 'Fiber $1'
+    - regex: 'CrKey/[0-9.]+ DeviceType/SmartSpeaker'
+      model: 'Chromecast'
+      device: 'smart speaker'
     - regex: 'CrKey[^a-z0-9]'
       model: 'Chromecast'
       device: 'tv'
@@ -9451,15 +9749,17 @@ Google:
       model: 'Pixel'
     - regex: 'Pixel XL'
       model: 'Pixel XL'
-    - regex: 'blueline'
+    - regex: 'blueline|G013A'
       model: 'Pixel 3'
-    - regex: 'G020A'
+    - regex: 'G020[AE]'
       model: 'Pixel 3a'
-    - regex: 'Pixel 3 XL'
+    - regex: 'Pixel 9 Pro XL'
+      model: 'Pixel 9 Pro XL'
+    - regex: 'Pixel 3 XL|G013C'
       model: 'Pixel 3 XL'
     - regex: 'Pixel 2 XL|taimen'
       model: 'Pixel 2 XL'
-    - regex: 'Pixel 3a XL'
+    - regex: 'Pixel 3a XL|G020[BCG]'
       model: 'Pixel 3a XL'
     - regex: 'Pixel 4 XL|GA01180-US|G020P'
       model: 'Pixel 4 XL'
@@ -9467,23 +9767,31 @@ Google:
       model: 'Pixel 4'
     - regex: 'PIXEL4X'
       model: 'Pixel 4 X'
-    - regex: 'AOSP on sunfish'
+    - regex: 'AOSP on sunfish|G025[JN]|GA02099'
       model: 'Pixel 4a'
-    - regex: 'Pixel 4a \(?5G\)?|AOSP on bramble|G025I'
+    - regex: 'Pixel 4a \(?5G\)?|AOSP on bramble|G025I|G6QU3'
       model: 'Pixel 4a (5G)'
     - regex: 'pixel ([3-8])a'
       model: 'Pixel $1a'
+    - regex: 'G1F8F|G4S1M'
+      model: 'Pixel 5a 5G'
     - regex: 'G011A'
       model: 'Pixel 2'
     - regex: 'GE2AE|GP4BC'
       model: 'Pixel 7 Pro'
+    - regex: 'GO3Z5'
+      model: 'Pixel 7'
+    - regex: 'GTT9Q|GD1YQ|G5NZ6'
+      model: 'Pixel 5'
     - regex: 'G1MNW|GC3VE'
       model: 'Pixel 8 Pro'
     - regex: 'G9BQD|GKWS6'
       model: 'Pixel 8'
     - regex: 'G0DZQ|G82U8|GWKK3|GHL1X'
       model: 'Pixel 7a'
-    - regex: 'Google 2XL'
+    - regex: 'G8VOU'
+      model: 'Pixel 6 Pro'
+    - regex: 'Google 2XL|G011C'
       model: 'Pixel 2 XL'
     - regex: 'Pixel ([678]) Pro'
       model: 'Pixel $1 Pro'
@@ -9540,7 +9848,7 @@ Grundig:
       device: 'tablet'
       model: '$1'
     - regex: 'GRUNDIG (?:Android TV|Google TV UHD\+)'
-      model: ''
+      model: 'Smart TV'
     - regex: 'GRUNDIG ([a-z0-9]+)'
       model: '$1'
     - regex: 'portalmmm/2\.0 G([a-z0-9]+)'
@@ -9580,7 +9888,7 @@ H133:
 
 # H96 (https://www.h96tvbox.com/)
 H96:
-  regex: 'H96[ _]?(?:Max|PRO\+)'
+  regex: 'H96[ _]?(?:Max|mini H8|plus|PRO\+)'
   device: 'tv'
   models:
     - regex: '(?:H96[_ ]?)?Max[ _]RK(\d{4})(?:[);/ ]|$)'
@@ -9591,6 +9899,10 @@ H96:
       model: 'Max V11'
     - regex: 'Max(?:[);/ ]|$)'
       model: 'Max'
+    - regex: 'mini H8(?:[);/ ]|$)'
+      model: 'Mini H8'
+    - regex: 'H96plus(?:[);/ ]|$)'
+      model: 'Plus'
     - regex: 'PRO\+(?:[);/ ]|$)'
       model: 'Pro+'
 
@@ -9612,7 +9924,7 @@ HEC:
 
 # 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|[;)])'
+  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|OLED TV S9|MINTAKA|android 8([\d.]*);(?: [\w-]+;)? E13)(?:[);/ ]|$)|Android [67](?:[\d.]*);(?: [\w-]+;)? P2(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'A2_Lite_NFC'
@@ -9623,7 +9935,7 @@ Haier:
       model: 'I8'
     - regex: 'S5 Silk'
       model: 'S5 Silk'
-    - regex: ' E13(?:[);/ ]|$)'
+    - regex: 'E13(?:[);/ ]|$)'
       model: 'Elegance E13'
     - regex: 'HM-N700-FL'
       model: 'L7'
@@ -9637,7 +9949,7 @@ Haier:
       model: 'G7s'
     - regex: 'HM-G553-FL'
       model: 'G51'
-    - regex: ' P2(?: Build|[;)])'
+    - regex: 'P2(?: Build|[;)])'
       model: 'P2'
     - regex: 'Andromax C46B2H'
       model: 'Andromax EC'
@@ -9647,6 +9959,9 @@ Haier:
       model: '$1'
     - regex: '(?:HW-)?W(71[67]|757|86[07]|970)(?:[);/ ]|$)'
       model: 'W$1'
+    - regex: 'MINTAKA(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Mintaka'
     - regex: 'PAD[ -_](D71|G781|d85)'
       device: 'tablet'
       model: '$1'
@@ -9659,6 +9974,9 @@ Haier:
     - regex: 'haierATV'
       device: 'tv'
       model: 'Android TV'
+    - regex: 'OLED TV S9'
+      device: 'tv'
+      model: 'OLED TV S9'
     - regex: 'haier Android TV DVB2K'
       device: 'tv'
       model: 'Android TV DVB2K'
@@ -9791,11 +10109,13 @@ Toshiba:
 
 # AWOX (https://www.awox.com.tr/)
 AWOX:
-  regex: 'AWOX(?:[);/ ]|$)'
+  regex: '(?:AWOX|B213900SW)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'AWOX;SmartTV;([a-z0-9_ \-]+);'
       model: '$1'
+    - regex: '(B213900SW)(?:[);/ ]|$)'
+      model: '$1'
 
 # UD (https://udtv.store/)
 UD:
@@ -9819,7 +10139,7 @@ UGINE:
 
 # Sunny
 Sunny:
-  regex: '(?:SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola|SN7014S?|SN7016|SN10016|SN01DNGL300|SUNNY (?:SS01|S52D)|SUNNY;SmartTV)(?:[);/ ]|$)'
+  regex: 'LGE; SNY?[0-9]{2}[0-9a-z]+(?:-[0-9]+)?;|(?:SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola|SN7014S?|SN7016|SN10016|SN01DNGL300|SUNNY (?:SS01|S52D)|SUNNY;SmartTV)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola)(?:[);/ ]|$)'
@@ -9835,10 +10155,13 @@ Sunny:
     - regex: 'SN01DNGL300(?:[);/ ]|$)'
       device: 'tv'
       model: 'Prime TV Stick'
+    - regex: 'LGE; (SNY?[0-9]{2}[0-9a-z]+)(?:-[0-9]+)?;'
+      device: 'tv'
+      model: '$1'
 
 # Qilive
 Qilive:
-  regex: 'Qilive [0-9][^;/]*|QILIVE|Q(7S5[5]?IN4G|T19101|T21101|7T10INP|T19101HV|8T10IN|8S55IN4G2|8S[56]IN4G|9T9IN|9T(?:7|10)IN4G|9S55IN4G|10S5[37]IN4G|10S[56]IN4G|10S[56]IN4GR|9S5IN4G|6T7IN|T2108BP)'
+  regex: 'Qilive [0-9][^;/]*|QILIVE|Q(7S5[5]?IN4G|T19101|T22101B|T23109BP|T21101|7T10INP|T19101HV|8T10IN|8S55IN4G2|8S[56]IN4G|9T9IN|9T(?:7|10)IN4G|9S55IN4G|10S5[37]IN4G|10S[56]IN4G|10S[56]IN4GR|9S5IN4G|6T7IN|T2108BP)'
   device: 'smartphone'
   models:
     - regex: 'Q7S5IN4G'
@@ -9881,7 +10204,7 @@ Qilive:
     - regex: 'Q9T10IN4G'
       model: 'Q9 10.1" 4G'
       device: 'tablet'
-    - regex: '(QT19101HV|QT19101)'
+    - regex: '(QT19101HV|QT19101|QT23109BP|QT22101B)'
       model: '$1'
       device: 'tablet'
     - regex: 'QT21101'
@@ -9944,14 +10267,22 @@ Loewe:
     - regex: '48A81FEVS'
       model: '48A81FEVS'
 
+# LongTV (https://my.long.tv/)
+LongTV:
+  regex: 'LongTV'
+  device: 'tv'
+  models:
+    - regex: 'LongTV LOUiE(?:[);/ ]|$)'
+      model: 'LOUiE'
+
 # Majestic (https://www.newmajestic.com/)
 Majestic:
-  regex: 'MAJESTIC[;, _-]|CRONO ?[0-9]+|(?:TAB (?:647|411) 3G|TAB_(?:81[12]|912)_4G|TAB_911_3G|TAB-714|TAB_814|TAB (711 4G|747 3G|[56]11 3G)|URANO27|URANO 47|URANO 77LTE|PLUTO__?26N?|JACK| JOE)(?:[);/ ]|$)'
+  regex: 'MAJESTIC[;, _-]|CRONO ?[0-9]+|(?:TAB (?:647|411) 3G|TAB_(?:81[12]|912|918_PRO)_4G|TAB_911_3G|TAB-714|TAB_814|TAB (711 4G|747 3G|[56]11 3G)|URANO27|URANO 47|URANO 77LTE|PLUTO__?26N?|JACK| JOE)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'JACK(?:[);/ ]|$)'
       model: 'Jack'
-    - regex: ' JOE(?:[);/ ]|$)'
+    - regex: 'JOE(?:[);/ ]|$)'
       model: 'Joe'
     - regex: 'URANO 77LTE(?:[);/ ]|$)'
       model: 'Urano 77 LTE'
@@ -9959,6 +10290,9 @@ Majestic:
       model: 'Urano $1'
     - regex: 'PLUTO__?(26N?)(?:[);/ ]|$)'
       model: 'Pluto $1'
+    - regex: 'TAB[ _](\d{3})[ _]PRO_([34])G'
+      model: 'Tab $1 Pro $2G'
+      device: 'tablet'
     - regex: 'TAB[ _](\d{3})[ _]([34])G'
       model: 'Tab $1 $2G'
       device: 'tablet'
@@ -9971,7 +10305,7 @@ Majestic:
     - regex: 'MAJESTIC[ _]Tab([^;/]+)Build'
       model: 'Tab$1'
       device: 'tablet'
-    - regex: 'MAJESTIC[ _]Tab([^);/]+)(?:[);/]|$)'
+    - regex: 'MAJESTIC[ _]Tab([^);/]+)(?:[);/ ]|$)'
       model: 'Tab$1'
       device: 'tablet'
     - regex: 'MAJESTIC[ _]([^;/]+)Build'
@@ -9980,7 +10314,7 @@ Majestic:
       model: '$1'
     - regex: 'CRONO ?([0-9]+) Build'
       model: 'Crono $1'
-    - regex: 'CRONO ?([0-9]+)(?:[);/]|$)'
+    - regex: 'CRONO ?([0-9]+)(?:[);/ ]|$)'
       model: 'Crono $1'
 
 # Maxwell (https://maxwell-grp.com/)
@@ -10075,7 +10409,7 @@ Hoffmann:
 
 # Homatics (https://www.homatics.eu/)
 Homatics:
-  regex: '(Box Q|Box R 4K)(?:[);/ ]|$)'
+  regex: '(Box Q|Box R 4K| KP1)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -10089,13 +10423,16 @@ Huagan:
 
 # Stream or Stream System
 Stream:
-  regex: '(B3 (?:Maxi|Simply)|B3Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:B1s|HT28|HT16))(?:[);/ ]|$)'
+  regex: 'LGE; WSTR[0-9a-z]+;|(B3 (?:Maxi|Simply)|B3Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:B1s|HT28|HT16))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(B3 (?:Maxi|Simply)|B1s|HT28|HT16)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'B3Pro(?:[);/ ]|$)'
       model: 'B3 Pro'
+    - regex: 'LGE; (WSTR[0-9a-z]+);'
+      model: '$1'
+      device: 'tv'
 
 # Homtom
 Homtom:
@@ -10104,7 +10441,7 @@ Homtom:
   models:
     - regex: 'P30 Pro'
       model: 'P30 Pro'
-    - regex: ' S17'
+    - regex: 'S17'
       model: 'S17'
     - regex: '(?:Homtom[_ ])?HT ?([0-9]{1,2})[ _]?Pro(?:[);/ ]|$)'
       model: 'HT$1 Pro'
@@ -10113,6 +10450,14 @@ Homtom:
     - regex: 'Homtom ([^;/]+) Build'
       model: '$1'
 
+# Hopeland (https://www.hopelandrfid.com/)
+Hopeland:
+  regex: 'HY(?:416|820)(?:[);/ ]|$)'
+  device: 'peripheral'
+  models:
+    - regex: 'HY(416|820)(?:[);/ ]|$)'
+      model: 'HY$1'
+
 # Hosin
 Hosin:
   regex: 'HOSIN[ _-]'
@@ -10138,6 +10483,12 @@ Hoozo:
       device: 'smartphone'
       model: '$1'
 
+# Mightier (https://www.mightier.com/)
+Mightier:
+  regex: '(MT003-21)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # Minix (minix.us)
 Minix:
   regex: 'NEO[- ](?:X8-H|X8|U9-H|X[57]-mini|X8H?-PLUS|X88-?I|X7-216A|X5-116A|X[68]|U1|Z64|U22-XJ)(?:[);/ ]|$)'
@@ -10196,7 +10547,7 @@ Turkcell:
 
 # China Telecom
 China Telecom:
-  regex: 'Build/Tianyi|(?:TYH61[12]M|TYH211U|TYH201H|TYH622M)(?:[);/ ]|$)'
+  regex: 'Build/Tianyi|(?:TYH61[12]M|TYH211U|TYH201H|TYH622M|TYH632M|TYH631M)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TYH622M'
@@ -10205,6 +10556,8 @@ China Telecom:
       model: 'Maimang 10 SE 5G'
     - regex: 'TYH612M'
       model: 'Maimang 10 5G'
+    - regex: 'TYH632M'
+      model: 'Maimang A20 5G'
     - regex: 'TYH631M'
       model: 'Maimang 20 5G'
     - regex: 'TYH211U'
@@ -10214,7 +10567,7 @@ China Telecom:
 
 # U-Magic (China Unicom)
 U-Magic:
-  regex: '(?:Liantong)?(?:VP00[123])(?:[);/ ]|$)'
+  regex: '(?:Liantong)?(?:VP00[1235])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Liantong)?VP001'
@@ -10223,24 +10576,30 @@ U-Magic:
       model: 'Enjoy 20 5G'
     - regex: '(?:Liantong)?VP003'
       model: 'Enjoy 30e 5G'
+    - regex: '(?:Liantong)?VP005'
+      model: 'Enjoy 50 Plus'
 
 # Hi Nova
 Hi Nova:
-  regex: '(?:Hebe|Hera|Hinova)-BD00|(?:ALH-BD00|MGZ-BD00|FIO-BD00|MIZ-BD00)(?:[);/ ]|$)'
+  regex: '(?:Hebe|Hera|Hinova)-BD00|(?:ALH-BD00|MGZ-BD00|FIO-BD00|MIZ-BD00|MNT-BD00|SUP-BD00)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'FIO-BD00'
       model: '9 SE'
+    - regex: 'MNT-BD00'
+      model: '9z 5G'
     - regex: 'Hebe-BD00'
-      model: '9 Pro'  # Nova 9 Pro
+      model: '9 Pro'
     - regex: 'Hera-BD00'
-      model: '9'      # Nova 9
+      model: '9'
     - regex: 'ALH-BD00'
       model: '10'
     - regex: 'MGZ-BD00'
       model: '10 Pro'
     - regex: 'Hinova-BD00|MIZ-BD00'
       model: '11'
+    - regex: 'SUP-BD00'
+      model: '12 SE'
 
 # TD Tech (based for Huawei brand)
 TD Tech:
@@ -10256,13 +10615,15 @@ TD Tech:
 
 # Huawei
 Huawei:
-  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'
+  regex: '(HW-)?(?:Huawei(?!Browser)|nova (?:Y\d|[678])|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[CMW]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|EL[EN]|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]|[AT]L10|L[02]1)|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|LX[23])|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]|L03)|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]|W9)|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|AL00CM)|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|W0[09])|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|N49B)|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?-[NW]09|GOT-(?:AL[01]9|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-(?:AL00|LX[39]N?)|BNE-(?:LX[13]|AL00)|dtab01|BZT4-W19|ROD-W09|ANP-AN00|WGRR-W09|HN3-U01|Holly-U19|BLM-00|ANN-AN00|VNA-(?:LX[23]|L29)|CRT-(?:NX[13]|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|AN00)|MAO-(?:LX9N?|AL00)|Enjoy (?:20 SE|20 5G|Z 5G|20 Plus|20 Pro|[12]0e)|ANB-AN00|STG-(?:AL00|LX[12])|LTK-LX3|GOA-(?:LX9|AL80)|nova (?:6 5G|6SE|Lite3Plus|5T Pro)| Angela-L|DBR-(?:W[01]9|W10)|WOD-LX[123]|REP-AN00|WDY-(?:LX[123]|AN00)|FOA-(?:LX9|AL00)|ALI-(?:AN00|NX[13])|DBY2-(?:W0[09]|L09)|REA-(?:NX9|AN00)|AMZ-L29|AGT-AN00|VER-(?:AN[01]0|N49)|ELN-[WL]09|BTK-(?:AL09|W09)|FRI-(?:NX9|AN[01]0)|LLY-(?:LX[123]|AN00|NX1)|MAA-AN[01]0|BVL-(?:N[45]9|AN(?:16|[02]0))|MAG-AN00|RBN-NX[13]|PCE-(?:W29|W[34]0)|ALN-AL[018]0|FIN-AL60|ADA-AL00U?|BON-AL00|BRA-AL00|CLK-(?:LX[123]|AN00|NX[123])|FGD-AL00|GDI-W09|GAR-AN[06]0|CHA-AL80|MLA-L1[12]|LEM-AL00|ADY-(?:AL00|LX9)|VCA-AN00|JuliaQN-(?:L[02]1B|L23A)|HBP-(?:AL00|LX9)|ARC-AL00|BLK-AL00|HBN-(?:AL[18]0|LX9)|JDY-(?:LX1|AN00)|ELI-(?:AN00|NX9)|GFY-AL00|PE-CL00|DBY2-L09CK|ELP-(?:AN00|NX9)|LRA-(?:AN00|TL00)|GBD-NX9|FCP-AN10|CAM-L03|TGR-W09|Wukong-L29A|RTG-NX9'
   device: 'smartphone'
   models:
-    - regex: 'ADY-AL00'
+    - regex: 'ADY-(?:AL00|LX9)'
       model: 'Pura 70' # wiko
-    - regex: 'HBP-AL00'
+    - regex: 'HBP-(?:AL00|LX9)'
       model: 'Pura 70 Ultra'
+    - regex: 'HBN-(?:AL[18]0|LX9)'
+      model: 'Pura 70 Pro+'
     - regex: 'VCA-AN00'
       model: 'Honor V Purse'
     - regex: 'GAR-AN60'
@@ -10271,9 +10632,13 @@ Huawei:
       model: 'Hi Enjoy 60 5G' # wiko
     - regex: 'BAL-AN20'
       model: 'Hi Enjoy 70 Pro 5G' # wiko
-    - regex: 'CRT-NX1'
+    - regex: 'GFY-AL00'
+      model: 'Enjoy 70S'
+    - regex: 'CRT-NX[13]'
       model: 'Honor 90 Lite'
-    - regex: 'REA-(?:NX9|AN00)'
+    - regex: 'CLK-NX[13]'
+      model: 'Honor 90 Smart'
+    - regex: 'REA-(?:NX9|AN00)|RTG-NX9'
       model: 'Honor 90'
     - regex: 'MAG-AN00'
       model: 'Honor 90 GT'
@@ -10349,7 +10714,7 @@ Huawei:
       model: 'Enjoy 10'
     - regex: 'STK-[AT]L00(?:[);/ ]|$)'
       model: 'Enjoy 10 Plus'
-    - regex: 'MED-(?:[AT]L00|AL20)(?:[);/ ]|$)'
+    - regex: 'MED-(?:[AT]L00|AL20)(?:[);/ ]|$)|Enjoy 10e'
       model: 'Enjoy 10E'
     - regex: 'AQM-[AT]L00(?:[);/ ]|$)'
       model: 'Enjoy 10S'
@@ -10357,6 +10722,8 @@ Huawei:
       model: 'Enjoy 5S'
     - regex: 'MGA-AL00'
       model: 'Enjoy 50'
+    - regex: 'EVE-AL00'
+      model: 'Enjoy 50z'
     - regex: 'MGA-AL40'
       model: 'Enjoy 60'
     - regex: 'MAO-AL00'
@@ -10389,15 +10756,15 @@ Huawei:
       model: 'Enjoy 8e'
     - regex: 'MRD-[TA]L00(?:[);/ ]|$)'
       model: 'Enjoy 9e'
-    - regex: 'DVC-[AT]N20(?:[);/ ]|$)'
-      model: 'Enjoy 20 Pro'
-    - regex: 'DVC-AN00(?:[);/ ]|$)'
+    - regex: 'DVC-[AT]N20|Enjoy 20 Pro 5G'
+      model: 'Enjoy 20 Pro 5G'
+    - regex: '(?:DVC-AN00|Enjoy Z 5G)(?:[);/ ]|$)'
       model: 'Enjoy Z 5G'
     - regex: '(?:PPA-AL20|Enjoy 20 SE)(?:[);/ ]|$)'
       model: 'Enjoy 20 SE'
-    - regex: 'FRL-[AT]N00'
+    - regex: 'FRL-[AT]N00|Enjoy 20 Plus 5G'
       model: 'Enjoy 20 Plus 5G'
-    - regex: 'MLD-AL[01]0'
+    - regex: 'MLD-AL[01]0|Enjoy 20e Helio P35'
       model: 'Enjoy 20e'
     - regex: 'U8665(?:[);/ ]|$)'
       model: 'Fusion 2'
@@ -10441,7 +10808,7 @@ Huawei:
       model: 'Honor'
     - regex: 'COL-(?:AL[01]0|TL[01]0|L29|L10)(?:[);/ ]|$)'
       model: 'Honor 10'
-    - regex: 'HRY-(?:[AT]L00[A]?|LX[12]|LX1MEB)(?:[);/ ]|$)'
+    - regex: 'HRY-(?:[AT]L00[A]?|LX[12]|L21|LX1MEB)(?:[);/ ]|$)'
       model: 'Honor 10 Lite'
     - regex: 'HRY-LX1T(?:[);/ ]|$)'
       model: 'Honor 10I'
@@ -10449,23 +10816,23 @@ Huawei:
       model: 'Honor 2'
     - regex: 'YAL-(?:L21|[AT]L00)(?:[);/ ]|$)'
       model: 'Honor 20'
-    - regex: 'LRA-AL00(?:[);/ ]|$)'
+    - regex: '(?:LRA-[AT]L00|Honor 20 Lite)(?:[);/ ]|$)'
       model: 'Honor 20 Lite'
-    - regex: '(HRY-AL00T[a]?)(?:[);/ ]|$)'
+    - regex: '(HRY-AL00T[a]?|Honor 20i)(?:[);/ ]|$)'
       model: 'Honor 20I'
-    - regex: 'YAL-(L41|AL10)(?:[);/ ]|$)'
+    - regex: '(?:YAL-(L41|AL10)|Honor 20 Pro)(?:[);/ ]|$)'
       model: 'Honor 20 Pro'
     - regex: '(MAR-LX1H|YAL-[AT]L50)(?:[);/ ]|$)'
       model: 'Honor 20S'
     - regex: 'EBG-[AT]N00(?:[);/ ]|$)'
       model: 'Honor 30 Pro'
-    - regex: '(?:EBG-AN10|EBG-N19)(?:[);/ ]|$)'
+    - regex: '(?:EBG-AN10|EBG-N19|Honor 30 Pro\+)(?:[);/ ]|$)'
       model: 'Honor 30 Pro Plus'
     - regex: '(?:CDY-(?:AN9[05]|NX9A|TN90)|Honor 30S)(?:[);/ ]|$)'
       model: 'Honor 30S'
     - regex: 'LRA-LX1(?:[);/ ]|$)'
       model: 'Honor 30I'
-    - regex: 'MXW-[AT]N00(?:[);/ ]|$)'
+    - regex: '(?:MXW-[AT]N00|Honor 30 Lite)(?:[);/ ]|$)'
       model: 'Honor 30 Lite'
     - regex: '(?:BMH-(?:AN[12]0|TN10)|Honor 30)(?:[);/ ]|$)'
       model: 'Honor 30'
@@ -10515,7 +10882,7 @@ Huawei:
       model: 'Honor 6'
     - regex: 'MYA-TL10(?:[);/ ]|$)'
       model: 'Honor 6 Play'
-    - regex: 'PE-(UL00|TL[12]0|TL00M)(?:[);/ ]|$)'
+    - regex: 'PE-([CU]L00|TL[12]0|TL00M)(?:[);/ ]|$)'
       model: 'Honor 6 Plus'
     - regex: '(?:HONOR[ _]?)?DLI-(?:AL10|L[24]2|TL20)(?:[);/ ]|$)'
       model: 'Honor 6A'
@@ -10551,7 +10918,7 @@ Huawei:
       model: 'Honor 8 Smart'
     - regex: 'JAT-L(29|X[13])(?:[);/ ]|$)'
       model: 'Honor 8A'
-    - regex: 'JAT-L41(?:[);/ ]|$)'
+    - regex: '(?:JAT-L41|Honor 8A Pro)(?:[);/ ]|$)'
       model: 'Honor 8A Pro'
     - regex: 'BKK-(?:AL[10]0|L21|L22|LX2|TL00)(?:[);/ ]|$)'
       model: 'Honor 8C'
@@ -10571,12 +10938,14 @@ Huawei:
       model: 'Honor 9 Lite'
     - regex: 'LLD-AL[23]0(?:[);/ ]|$)'
       model: 'Honor 9i'
-    - regex: 'DUA-LX9(?:[);/ ]|$)'
+    - regex: '(?:DUA-LX9|Honor 9S)(?:[);/ ]|$)'
       model: 'Honor 9S'
     - regex: 'HLK-AL00a?(?:[);/ ]|$)'
       model: 'Honor 9X'
     - regex: 'HLK-(?:AL10|L4[12])(?:[);/ ]|$)'
       model: 'Honor 9X Pro'
+    - regex: 'Honor 9x Lite'
+      model: 'Honor 9X Lite'
     - regex: 'CAM-UL00(?:[);/ ]|$)'
       model: 'Honor Holly 3'
     - regex: 'Holly-U19(?:[);/ ]|$)'
@@ -10589,17 +10958,25 @@ Huawei:
       model: 'Honor Magic 2 3D'
     - regex: 'VER-(?:AN10|N49)'
       model: 'Honor Magic V2'
+    - regex: 'LRA-AN00'
+      model: 'Honor Magic V Flip 5G'
     - regex: 'VER-AN00'
       model: 'Honor Magic Vs2'
     - regex: 'FRI-NX9'
       model: 'Honor Magic Vs'
+    - regex: 'FRI-AN10'
+      model: 'Honor Magic Vs Ultimate'
+    - regex: 'FRI-AN00'
+      model: 'Honor Magic Vs 5G'
+    - regex: 'FCP-AN10'
+      model: 'Honor Magic V3'
     - regex: 'ELZ-AN00'
       model: 'Honor Magic 3'
     - regex: 'ELZ-AN10'
       model: 'Honor Magic 3 Pro'
     - regex: 'ELZ-AN20'
       model: 'Honor Magic 3 Pro+'
-    - regex: 'LGE-(?:AN10|NX9)'
+    - regex: 'LGE-(?:AN10|NX9|N49B)|GBD-NX9'
       model: 'Honor Magic 4 Pro'
     - regex: 'LGE-AN00'
       model: 'Honor Magic 4'
@@ -10615,11 +10992,11 @@ Huawei:
       model: 'Honor Magic 5 Pro'
     - regex: 'PGT-AN20'
       model: 'Honor Magic 5 Ultimate'
-    - regex: 'ALI-NX1'
+    - regex: 'ALI-NX[13]'
       model: 'Honor Magic 6 Lite 5G'
     - regex: 'BVL-AN16|BVL-N49'
       model: 'Honor Magic 6 Pro'
-    - regex: 'BVL-AN20'
+    - regex: 'BVL-(?:AN20|N59)'
       model: 'Honor Magic 6 RSR'
     - regex: 'BVL-AN00'
       model: 'Honor Magic 6'
@@ -10645,9 +11022,13 @@ Huawei:
       model: 'Honor Play 30 Plus'
     - regex: 'VNE-AN00'
       model: 'Honor Play 30'
+    - regex: 'JDY-AN00'
+      model: 'Honor Play 50 5G'
     - regex: 'VNE-AN40'
       model: 'Honor Play 6C'
-    - regex: 'KSA-AL10(?:[);/ ]|$)'
+    - regex: 'ALT-AN00'
+      model: 'Honor Play 60 Plus'
+    - regex: '(?:KSA-AL10|Honor Play 3e)(?:[);/ ]|$)'
       model: 'Honor Play 3E'
     - regex: 'NNH-AN00(?:[);/ ]|$)'
       model: 'Honor 50'
@@ -10669,6 +11050,8 @@ Huawei:
       model: 'Honor X7a'
     - regex: 'CLK-LX[123]'
       model: 'Honor X7b'
+    - regex: 'CLK-NX2'
+      model: 'Honor X7b 5G'
     - regex: '(?:NZA-AL00?|KOZ-AL40)(?:[);/ ]|$)'
       model: 'Honor Play 5T' # Vitality Edition
     - regex: 'NEW-AN90'
@@ -10685,6 +11068,8 @@ Huawei:
       model: 'Honor Play 5'
     - regex: 'KOZ-AL00(?:[);/ ]|$)'
       model: 'Honor Play 20'
+    - regex: 'KOZ-AL00CM(?:[);/ ]|$)'
+      model: 'Honor Play 20a'
     - regex: 'HJC-LX9(?:[);/ ]|$)'
       model: 'Honor Play 20 Pro'
     - regex: '(?:JAT-[AT]L00|Honor Play 8A)(?:[);/ ]|$)'
@@ -10693,6 +11078,8 @@ Huawei:
       model: 'Honor Play 9A'
     - regex: 'CLK-AN00'
       model: 'Honor Play 8T'
+    - regex: 'Honor Play 8'
+      model: 'Honor Play 8'
     - regex: 'BKL-(?:AL00|AL20|AL30|L09|TL10)(?:[);/ ]|$)'
       model: 'Honor V10'
     - regex: 'PCT-[TA]L10(?:[);/ ]|$)'
@@ -10733,16 +11120,24 @@ Huawei:
       model: 'Honor X8'
     - regex: 'CRT-LX[123]'
       model: 'Honor X8a'
+    - regex: 'RBN-NX3'
+      model: 'Honor X8a 5G'
     - regex: 'LLY-LX[123]'
       model: 'Honor X8b'
     - regex: 'LLY-NX1'
       model: 'Honor 200 Lite'
+    - regex: 'ELI-(?:AN00|NX9)'
+      model: 'Honor 200'
+    - regex: 'ELP-(?:AN00|NX9)'
+      model: 'Honor 200 Pro'
     - regex: 'VNE-N41'
       model: 'Honor X8 5G'
     - regex: 'VNE-LX[123]'
       model: 'Honor X6'
     - regex: 'WDY-LX[123]'
       model: 'Honor X6a'
+    - regex: 'JDY-LX1'
+      model: 'Honor X6b'
     - regex: '(?:KKG-AN00|Honor X10 Max)(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Honor X10 Max'
@@ -10824,7 +11219,7 @@ Huawei:
       model: 'Mate 10 Pro'
     - regex: 'HMA-(?:[AT]L00|L[02]9)(?:[);/ ]|$)'
       model: 'Mate 20'
-    - regex: 'SNE-(?:AL00|LX[0-3])(?:[);/ ]|$)'
+    - regex: 'SNE-(?:AL00|LX[0-3]|L01)(?:[);/ ]|$)'
       model: 'Mate 20 Lite'
     - regex: '(?:LYA-(?:AL[01]0|L[02]9|L0C|TL00)|PAN-L29)(?:[);/ ]|$)'
       model: 'Mate 20 Pro'
@@ -10842,14 +11237,14 @@ Huawei:
       model: 'Mate 30 Lite'
     - regex: 'LIO-(?:[TA]L00|L[02]9|AN00)(?:[);/ ]|$)'
       model: 'Mate 30 Pro'
-    - regex: 'LIO-(?:N29|TN00)(?:[);/ ]|$)'
+    - regex: 'LIO-(?:N29|TN00|AL10)(?:[);/ ]|$)'
       model: 'Mate 30 Pro 5G'
     - regex: 'LIO-AN00m(?:[);/ ]|$)'
       model: 'Mate 30E Pro 5G'
     - regex: 'NOH-(?:NX9|AN0[01]|AN50|AL[01]0)(?:[);/ ]|$)'
       model: 'Mate 40 Pro'
     - regex: 'NOH-AN80'
-      model: ' Mate 40E Pro 5G'
+      model: 'Mate 40E Pro 5G'
     - regex: 'NOP-AN00(?:[);/ ]|$)'
       model: 'Mate 40 Pro+'
     - regex: 'Mate 40 RS(?:[);/ ]|$)'
@@ -10920,7 +11315,7 @@ Huawei:
       model: 'Nova 5'
     - regex: 'SEA-AL10(?:[);/ ]|$)'
       model: 'Nova 5 Pro'
-    - regex: 'GLK-(?:[AT]L00|LX1U|LX3)(?:[);/ ]|$)'
+    - regex: 'GLK-(?:[AT]L00|LX1U|LX[23])(?:[);/ ]|$)'
       model: 'Nova 5i'
     - regex: 'YAL-L61'
       model: 'Nova 5T'
@@ -10928,17 +11323,17 @@ Huawei:
       model: 'Nova 5T Pro'
     - regex: 'SPN-TL00(?:[);/ ]|$)'
       model: 'Nova 5i Pro'
-    - regex: 'WLZ-AL10(?:[);/ ]|$)'
-      model: 'Nova 6'
     - regex: '(?:WLZ-AN00|nova 6 5G)(?:[);/ ]|$)'
       model: 'Nova 6 5G'
-    - regex: '(?:JNY-AL10|nova 6SE)(?:[);/ ]|$)'
+    - regex: '(?:JNY-[AT]L10|nova 6SE)(?:[);/ ]|$)'
       model: 'Nova 6 SE'
-    - regex: 'JEF-(?:[AT]N00|[AT]N20|NX9)(?:[);/ ]|$)'
+    - regex: '(?:WLZ-AL10|nova 6)(?:[);/ ]|$)'
+      model: 'Nova 6'
+    - regex: '(?:JEF-(?:[AT]N00|[AT]N20|NX9)|nova 7 5G)(?:[);/ ]|$)'
       model: 'Nova 7 5G'
-    - regex: 'JER-(?:[AT]N10|[AT]N20)(?:[);/ ]|$)'
+    - regex: '(?:JER-(?:[AT]N10|[AT]N20)|nova 7 Pro 5G)(?:[);/ ]|$)'
       model: 'Nova 7 Pro 5G'
-    - regex: '(?:CDY-(?:[AT]N00|NX9B|[AT]N20)|CDL-AN50|CND-AN00)(?:[);/ ]|$)'
+    - regex: '(?:CDY-(?:[AT]N00|NX9B|[AT]N20)|CDL-AN50|CND-AN00|nova 7 SE 5G)(?:[);/ ]|$)'
       model: 'Nova 7 SE 5G'
     - regex: 'MAO-LX9'
       model: 'Nova 11i'
@@ -10958,17 +11353,17 @@ Huawei:
       model: 'Nova 12i'
     - regex: 'ADA-AL00'
       model: 'Nova 12 Pro'
-    - regex: 'JNY-LX2(?:[);/ ]|$)'
+    - regex: 'BLK-AL00'
+      model: 'Nova 12'
+    - regex: '(?:JNY-LX2|nova 7i)(?:[);/ ]|$)'
       model: 'Nova 7i'
-    - regex: '(?:ANG-LX[12]|Angela-(?:L2[12]B|L02B))(?:[);/ ]|$)'
-      model: 'Nova 8'
-    - regex: 'NEN-L(?:X[13]|22)(?:[);/ ]|$)'
+    - regex: '(?:NEN-L(?:X[13]|22)|nova 8i)(?:[);/ ]|$)'
       model: 'Nova 8i'
     - regex: 'ANG-AN00(?:[);/ ]|$)'
       model: 'Nova 8 5G'
     - regex: 'JSC-AN00'
       model: 'Nova 8 SE 5G'
-    - regex: 'JSC-AL50'
+    - regex: 'JSC-AL50|nova 8 SE'
       model: 'Nova 8 SE 4G'
     - regex: 'CHL-AL60'
       model: 'Nova 8 SE Vitality'
@@ -10976,17 +11371,19 @@ Huawei:
       model: 'Nova 8 Pro 4G'
     - regex: 'BRQ-AN00(?:[);/ ]|$)'
       model: 'Nova 8 Pro 5G'
+    - regex: '(?:ANG-LX[12]|Angela-(?:L2[12]B|L02B)|nova 8)(?:[);/ ]|$)'
+      model: 'Nova 8'
     - regex: 'NAM-(?:AL00|LX9)(?:[);/ ]|$)'
       model: 'Nova 9'
     - regex: 'RTE-AL00(?:[);/ ]|$)'
       model: 'Nova 9 Pro'  # 4G
-    - regex: 'JLN-(?:AL00|LX[13])|JuliaQN-L21B'
+    - regex: 'JLN-(?:AL00|LX[13])|JuliaQN-(?:L[02]1B|L23A)'
       model: 'Nova 9 SE'   # 4G
     - regex: 'GLA-(?:LX[13]|AL00)'
       model: 'Nova 10 Pro'
     - regex: 'NCO-(?:AL00|LX[13])'
       model: 'Nova 10 4G'
-    - regex: 'BNE-(?:LX1|AL00)'
+    - regex: 'BNE-(?:LX[13]|AL00)'
       model: 'Nova 10 SE'
     - regex: 'CHA-AL80'
       model: 'Nova 10z'
@@ -10996,15 +11393,15 @@ Huawei:
       model: 'Nova Smart'
     - regex: 'WAS-AL00(?:[);/ ]|$)'
       model: 'Nova Youth'
-    - regex: 'WKG-[AT]N00'
+    - regex: 'WKG-[AT]N00|Enjoy 20 5G'
       model: 'Enjoy 20 5G'
-    - regex: 'WKG-LX9(?:[);/ ]|$)'
+    - regex: '(?:WKG-LX9|Wukong-L29A|nova Y60)(?:[);/ ]|$)'
       model: 'Nova Y60'
-    - regex: 'EVE-LX9'
+    - regex: 'EVE-LX[39]'
       model: 'Nova Y61'
     - regex: 'MGA-LX[39]'
       model: 'Nova Y70'
-    - regex: 'CTR-LX[123]'
+    - regex: 'CTR-LX[123]|CHW-LX3'
       model: 'Nova Y90'
     - regex: 'STG-LX[12]'
       model: 'Nova Y91'
@@ -11030,7 +11427,7 @@ Huawei:
       model: 'P10 Selfie'
     - regex: 'EML-(?:[TA]L00|L[02]9)(?:[);/ ]|$)'
       model: 'P20'
-    - regex: '(?:ANE-(?:LX[123]|LX2J|TL00)|HWV32)(?:[);/ ]|$)'
+    - regex: '(?:ANE-(?:LX[123]|LX2J|L23|TL00)|HWV32)(?:[);/ ]|$)'
       model: 'P20 Lite'
     - regex: '(?:CLT-(?:AL0[01]|TL0[01]|L0J|L(?:04|[02]9))l?|HW-01K)(?:[);/ ]|$)'
       model: 'P20 Pro'
@@ -11042,7 +11439,7 @@ Huawei:
       model: 'P30 Pro'
     - regex: 'ANA-LX4(?:[);/ ]|$)'
       model: 'P40'
-    - regex: 'JNY-LX1(?:[);/ ]|$)'
+    - regex: 'JNY-(?:LX1|L[02]1)(?:[);/ ]|$)'
       model: 'P40 Lite'
     - regex: 'ART-L29(?:[);/ ]|$)'
       model: 'P40 Lite E'
@@ -11156,13 +11553,13 @@ Huawei:
       model: 'Y7p'
     - regex: 'AQM-LX1(?:[);/ ]|$)'
       model: 'Y8p'
-    - regex: 'FLA-(LX[123]|AL20|TL10)(?:[);/ ]|$)'
+    - regex: 'FLA-(LX[123]|AL20|TL10|L23)(?:[);/ ]|$)'
       model: 'Y9 (2018)'
-    - regex: 'JKM-(?:[TA]L00[ab]?|LX[123])(?:[);/ ]|$)'
+    - regex: 'JKM-(?:[TA]L00[ab]?|LX[123]|L03)(?:[);/ ]|$)'
       model: 'Y9 (2019)'
     - regex: 'STK-(L2[12]|LX3)|LTK-LX3'
       model: 'Y9 Prime (2019)'
-    - regex: 'FRL-L2[23](?:[);/ ]|$)'
+    - regex: 'FRL-L2[123](?:[);/ ]|$)'
       model: 'Y9a'
     - regex: '302HW(?:[);/ ]|$)'
       model: 'Stream S'
@@ -11206,10 +11603,10 @@ Huawei:
     - regex: 'DB[YR]-W09(?:[);/ ]|$)'
       device: 'tablet'
       model: 'MatePad 11 WiFi'
-    - regex: 'DBR-W19'
+    - regex: 'DBR-W1[09]'
       model: 'MatePad 11 (2023) WiFi'
       device: 'tablet'
-    - regex: 'GOT-AL09(?:[);/ ]|$)'
+    - regex: 'GOT-AL[01]9(?:[);/ ]|$)'
       model: 'MatePad Pro 11'
       device: 'tablet'
     - regex: 'GOT-W[02]9(?:[);/ ]|$)'
@@ -11224,13 +11621,13 @@ Huawei:
     - regex: 'AGS3-(L09|AL00)(?:[);/ ]|$)'
       model: 'MatePad T10s'
       device: 'tablet'
-    - regex: 'AGS3-W09(?:[);/ ]|$)'
+    - regex: 'AGS3-W0?9(?:[);/ ]|$)'
       model: 'MatePad T10s WiFi'
       device: 'tablet'
     - regex: 'AGS5-L09(?:[);/ ]|$)'
       model: 'MatePad 10.4" SE'
       device: 'tablet'
-    - regex: 'DBY2-W09'
+    - regex: 'DBY2-W0[09]'
       model: 'MatePad 11.5" Air WiFi'
       device: 'tablet'
     - regex: 'DBY2-L09'
@@ -11242,7 +11639,10 @@ Huawei:
     - regex: 'BTK-W09'
       model: 'MatePad 11.5" WiFi'
       device: 'tablet'
-    - regex: 'AGS5-W09(?:[);/ ]|$)'
+    - regex: 'TGR-W09'
+      model: 'MatePad 11.5" S WiFi'
+      device: 'tablet'
+    - regex: 'AGS5-W0[09](?:[);/ ]|$)'
       model: 'MatePad 10.4" SE WiFi'
       device: 'tablet'
     - regex: 'HMW-W09(?:[);/ ]|$)'
@@ -11296,7 +11696,7 @@ Huawei:
     - regex: 'ELN-W09'
       device: 'tablet'
       model: 'Honor Pad X9 11.5" WiFi'
-    - regex: 'ELN-L09'
+    - regex: 'ELN-L0[39]'
       device: 'tablet'
       model: 'Honor Pad X9 11.5" LTE'
     - regex: 'AGS3-AL09HN(?:[);/ ]|$)'
@@ -11311,6 +11711,9 @@ Huawei:
     - regex: 'HEY2-W09(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Honor Pad 9 12.1" WiFi'
+    - regex: 'HEY2-N09(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Honor Pad 9 12.1" 5G'
     - regex: 'MON-(W|AL)19(?:[);/ ]|$)'
       device: 'tablet'
       model: 'MatePad C5 8'
@@ -11511,6 +11914,9 @@ Huawei:
     - regex: 'GLL-AL01'
       device: 'wearable'
       model: 'Watch 3 Pro Elite'
+    - regex: 'ARC-AL00'
+      device: 'wearable'
+      model: 'Watch 4'
 
     # smart display regex
     - regex: 'BLM-00(?:[);/ ]|$)'
@@ -11564,7 +11970,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(?:[\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)(?:[);/ ]|$)'
+  regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|(?:Android 9(?:[\d.]*);(?: [\w-]+;)? [EL]553)|E435 Plus|E503F|E601F|L503F Plus|L604|L622|L601F|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|10LA1|10LB1|10WB[12]|E465GO|H-LED(?:55[BG]U7003|50FU7001|50[BG]U7003|50EU1311|55EU1311|65[BG]U7003|65EU1311|75BU7005|24BS5000|40GS5003|40FS500[13]|42FS500[13]|43FS500[13]|43EU1312|32FS500[135]|32GS5003|(?:32|40)BS5003|43[BG]U7003)(?:-[PC])?|H-DMP10[03]|HT070[34]W08|Koral 7W4)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Ultra[_ ]Vision[_ ]Plus'
@@ -11603,11 +12009,13 @@ Hyundai:
       model: 'Ultra Rock'
     - regex: 'E(475|504|503F|553|603|601F)(?:[);/ ]|$)'
       model: 'E$1'
-    - regex: 'L(553|601F)(?:[);/ ]|$)'
+    - regex: 'L(553|601F|604|622)(?:[);/ ]|$)'
       model: 'L$1'
     - regex: '(?:Hyundai[_ ])?(Eternity[_ ](?:G57L?|G[56]0W?)|H7|Aero Plus|E435 Plus)'
       model: '$1'
-
+    - regex: '(H-LED\w+)(?:-[PC])(?:[);/ ]|$)'
+      device: 'tv'
+      model: '$1'
     - regex: '(H-LED\w+|H-DMP10[03]|2K TV)(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
@@ -11652,6 +12060,12 @@ Hyundai:
     - regex: '10WB1'
       model: 'Koral 10WB1'
       device: 'tablet'
+    - regex: '10WB2'
+      model: 'HyTab Plus 10WB2'
+      device: 'tablet'
+    - regex: '10LA1'
+      model: 'HyTab Pro 10LA1'
+      device: 'tablet'
     - regex: 'HT1002W32'
       model: 'Koral 10X3 WiFi'
       device: 'tablet'
@@ -11668,8 +12082,8 @@ Hyundai:
       model: '$1'
       device: 'tablet'
 
-#i-Joy
-'i-Joy':
+# i-Joy
+i-Joy:
   regex: 'i-Joy|i-Call|(?:Neon[79]|Sygnus|Deox|Elektra (?:M|L|XL|XXL))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -11763,7 +12177,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|24H1YDX000BS2)(?:[);/ ]|$)'
+  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)|\d{2}[FYHU]1YDX000F?BS2|65U001BS2)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(TZ(?:[0-9]+)|TZ(?:one|art|HIT|81L))(?:[);/ ]|$)'
@@ -11771,7 +12185,7 @@ Irbis:
     - regex: '(SP[0-9]+)(?:[);/ ]|$)'
       device: 'smartphone'
       model: '$1'
-    - regex: '(43F1YDX000BS2|50U1YDX000BS2|32H1YDX000BS2|32H1YDX000FBS2|39H1YDX000BS2|24H1YDX000BS2)'
+    - regex: '(\d{2}[FYHU]1YDX000F?BS2|65U001BS2)'
       device: 'tv'
       model: '$1'
 
@@ -11785,14 +12199,20 @@ iBerry:
     - regex: 'AUXUS ([^/;]+) Build'
       model: '$1'
 
+# iHome Life (http://www.ihomebox.com/)
+iHome Life:
+  regex: 'HLQ MAX(?:[);/ ]|$)'
+  device: 'tv'
+  model: 'HLQ MAX'
+
 # 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|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'
+    - regex: 'Strong Tablet (P15000|X) Pro'
       device: 'tablet'
-      model: 'Strong Tablet P15000 Pro'
+      model: 'Strong Tablet $1 Pro'
     - regex: 'Tablet PC 10 PRO'
       device: 'tablet'
       model: 'Tablet PC 10 Pro'
@@ -11865,8 +12285,8 @@ iHunt:
       model: 'S21 Ultra 4G (2021)'
     - regex: 'S(2[234]) ULTRA'
       model: 'S$1 Ultra'
-    - regex: 'S22 PLUS'
-      model: 'S22 Plus'
+    - regex: '(?:iHunt_)?S(2[234])[ _]PLUS'
+      model: 'S$1 Plus'
     - regex: 'Like 11 Panda Pro 2022'
       model: 'Like 11 Panda Pro (2022)'
     - regex: 'iHunt ([^;)/]+)(?: Build|[;)])'
@@ -11930,7 +12350,7 @@ IconBIT:
     - regex: 'TOUCAN Stick 4K'
       model: 'Toucan Stick 4K'
       device: 'tv'
-    - regex: '(?:iconBIT )?(Movie (?:Smart 4K|UNO|Play|IPTV Quad|Ultra HD 4K)|XDS[789]4K|Omnicast UHD|Stick|XDS1[01]00?|Movie [XZ])'
+    - regex: '(?:iconBIT )?(Movie (?:Smart 4K|UNO|Play|IPTV Quad|Ultra HD 4K)|XDS[789]4K|XLR3090|Omnicast UHD|Stick|XDS1[01]00?|Movie [XZ])'
       model: '$1'
       device: 'tv'
 
@@ -12021,6 +12441,13 @@ Lumus:
       model: 'Ion'
     - regex: 'AEON(SR570)(?:[);/ ]|$)'
       model: 'AEON $1'
+
+# LW
+LW:
+  regex: '(LW788)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # M4tel
 M4tel:
   regex: '(?:M4[ -]SS[0-9]{4}(?:-R)?|M4_B[23]|M4_R2|R2_Plus)(?:[);/ ]|$)'
@@ -12116,6 +12543,8 @@ IMO Mobile:
       model: 'Discovery II'
     - regex: 'IMO[ _]Q(?:[);/ ]|$)'
       model: 'Q'
+    - regex: 'IMO[ _]Q(5)(?:[);/ ]|$)'
+      model: 'Q$1'
 
     - regex: 'IMO[ _](Y5|Z[67])(?:[);/ ]|$)'
       model: 'Tab $1'
@@ -12124,14 +12553,14 @@ IMO Mobile:
       model: 'Tab X9'
       device: 'tablet'
 
-# iLA or ILA Mobile
+# iLA or ILA Mobile (https://www.facebook.com/iLAPhone/)
 iLA:
-  regex: '(?:iLA[-_ ](?:Silk|X|R1)|R1 Lite)(?:[);/ ]|$)'
+  regex: '(?:iLA[-_ ](?:Silk|X2?|R1)|R1 Lite)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(R1) Lite(?:[);/ ]|$)'
       model: '$1 Lite'
-    - regex: 'iLA[-_ ](Silk|X|R1)(?:[);/ ]|$)'
+    - regex: 'iLA[-_ ](Silk|X2?|R1)(?:[);/ ]|$)'
       model: '$1'
 
 # iNew
@@ -12156,9 +12585,13 @@ iNew:
 
 # iPro
 iPro:
-  regex: '(?:Kylin[ _]5\.[05]S?|KYLIN(?:40|50i)|Jade[78]s|Amber[678]S?|Amber[58]S[ _]Pro|Benny10|Phonenix50S|Ruby5S|Zafiro|I9355A|Opal 4S|Perla|S[45]01A|WAVE 4\.0 II|WAVE 5\.0|MEGA7|SAMBA65S)(?:[);/ ]|$)'
+  regex: '(?:IPRO_K2_3G|Kylin[ _]5\.[05]S?|KYLIN(?:40|50i)|Jade[78]s|Amber[678]S?|Amber[58]S[ _]Pro|Benny10|Phonenix50S|Ruby5S|Zafiro|I9355A|Opal 4S|Perla|S[45]01A|S200M|WAVE 4\.0 II|WAVE 5\.0|MEGA7|SAMBA65S|S501APlus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'IPRO_K2_3G'
+      model: 'K2 3G'
+    - regex: 'S501APlus'
+      model: 'S501A Plus'
     - regex: 'Kylin_5\.0S'
       model: 'Kylin 5.0S'
     - regex: 'Kylin (5\.[05])'
@@ -12197,7 +12630,7 @@ iPro:
       model: 'Wave 4.0 II'
     - regex: 'WAVE 5\.0'
       model: 'Wave 5.0'
-    - regex: '(I9355A|S[45]01A|Perla)'
+    - regex: '(I9355A|S[45]01A|S200M|Perla)'
       model: '$1'
     - regex: 'MEGA7'
       device: 'tablet'
@@ -12210,6 +12643,8 @@ Infinix:
   models:
     - regex: 'Infinix[ _-]X6739'
       model: 'GT 10 Pro'
+    - regex: 'Infinix[ _-]X6871'
+      model: 'GT 20 Pro'
     - regex: 'Infinix[ _-]X260'
       model: 'Buzz'
     - regex: 'Infinix[ _-]X502'
@@ -12533,9 +12968,21 @@ Infinix:
     - regex: 'Infinix[ _-]X6711'
       model: 'Note 30 5G'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X6850B'
+      model: 'Note 40S'
+      device: 'phablet'
     - regex: 'Infinix[ _-]X6850'
       model: 'Note 40 Pro'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X6851B'
+      model: 'Note 40 Pro+ 5G'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X6851'
+      model: 'Note 40 Pro 5G'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X6852'
+      model: 'Note 40 5G'
+      device: 'phablet'
     - regex: 'Infinix[ _-]X685'
       model: 'Note 40'
       device: 'phablet'
@@ -12554,9 +13001,13 @@ Infinix:
 
 # InnJoo (innjoo.es)
 InnJoo:
-  regex: 'InnJoo|(?:Halo Plus|Halo X|Halo 5 3G|Halo[ _]4(?:[ _]mini[ _]LTE)?|VISION LTE|Halo2 3G|Fire 4 ?(?:Pro|Plus)?|Fire_Plus_LTE|Fire3 mini|Fire2 (?:Air|Pro|Plus) LTE|Fire2 LTE|Superb(?:_PLus)?)(?:[);/ ]|$)'
+  regex: 'InnJoo|(?:Halo Plus|Halo2 LTE|Halo X|Halo 5 3G|Halo[ _]4(?:[ _]mini[ _]LTE)?|VISION LTE|Halo2 3G|Fire 4 ?(?:Pro|Plus)?|Fire_Plus_LTE|Fire3 mini|Fire2 (?:Air|Pro|Plus) LTE|Fire2 LTE|Superb(?:_PLus)?|VOOM TAB 2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'VOOM TAB 2'
+      device: 'tablet'
+      model: 'Voom Tab 2'
+
     - regex: 'InnJoo[ _]X3(?:[);/ ]|$)'
       model: 'X3'
     - regex: 'Halo[ _]X[ _]LTE(?:[);/ ]|$)'
@@ -12569,6 +13020,8 @@ InnJoo:
       model: 'Halo 4 Mini LTE'
     - regex: 'Halo 4(?:[);/ ]|$)'
       model: 'Halo 4'
+    - regex: 'Halo ?2 LTE(?:[);/ ]|$)'
+      model: 'Halo 2 LTE'
     - regex: 'Halo ?([25]) 3G(?:[);/ ]|$)'
       model: 'Halo $1 3G'
     - regex: 'InnJoo[ _]Pro2(?:[);/ ]|$)'
@@ -12648,7 +13101,7 @@ Insignia:
 
 # INSYS (https://www.insys.pt/)
 INSYS:
-  regex: 'INSYS|(?:HK9-4010|IH9-L614|AC7_DJ17)(?:[);/ ]|$)'
+  regex: 'INSYS|(?:HK9-4010|IH9-L614|AC7_DJ17|HN2-M16Q)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'HK9-4010'
@@ -12657,7 +13110,7 @@ INSYS:
       model: 'AC7-DJ17'
     - regex: 'IH9-L614'
       model: 'MX IH9-L614'
-    - regex: '(VI4-103|GU4-K147)'
+    - regex: '(GU4-K147|HN2-M16Q|VI4-103)'
       device: 'tablet'
       model: '$1'
 
@@ -12746,7 +13199,7 @@ Turbo:
 
 # Turbo-X
 Turbo-X:
-  regex: 'Turbo[-_]X|(?:TURBOX_I4G|Hive V 3G|Calltab10\.1|Calltab2GB10|Calltab7inch|Turbox_S3|Fire_II_WiFi|Breeze IV|Aqua_II|RainbowIII3G|RubikII7|Rubik 10\.1 II|Rubik_10_III|QUAD-CORE A33 inet)(?:[);/ ]|$)|(?<!Rombica TV )Mercury(?!/| HD Quad core)|(?:android 8([\d.]*);(?: [\w-]+;)? Dream)(?:[);/ ]|$)'
+  regex: 'Turbo[-_]X|(?:TURBOX_I4G|Hive V 3G|Calltab10\.1|Calltab2GB10|Calltab7inch|Turbox_S3|Fire_II_WiFi|Breeze IV|Aqua_II|RainbowIII3G|RubikII7|Rubik 10\.1 II|Rubik_10_III|QUAD-CORE A33 inet)(?:[);/ ]|$)|(?<!Rombica TV |DVK82 )Mercury(?!/| HD Quad core)|(?:android 8([\d.]*);(?: [\w-]+;)? Dream)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -12908,7 +13361,7 @@ i-mate:
 
 # i-mobile
 i-mobile:
-  regex: 'i-mobile ?[a-z0-9]+|i-Style|IQ ?(9\.1|5\.5|5\.6A?)'
+  regex: 'i-mobile[ _]?[a-z0-9]+|i-Style|IQ ?(9\.1|5\.5|5\.6A?)'
   device: 'feature phone'
   models:
     - regex: 'i-mobile (i-note[^/;]*) Build'
@@ -12917,6 +13370,12 @@ i-mobile:
     - regex: 'i-Style ?([^;/)]+)(?: Build|[;)])'
       model: 'i-Style $1'
       device: 'smartphone'
+    - regex: '(?:i-mobile_)?IQ[ _]XPRO2'
+      device: 'smartphone'
+      model: 'IQ X Pro 2'
+    - regex: '(?:i-mobile_)?IQ[ _]BIG2'
+      device: 'smartphone'
+      model: 'IQ Big 2'
     - regex: 'IQ ?(9\.1|5\.5|5\.6A?|II)'
       model: 'IQ $1'
       device: 'smartphone'
@@ -12989,7 +13448,7 @@ Impression:
     - regex: 'Impression[ _\-]?([^/;)]+)(?: Build|\))'
       model: '$1'
 
-#iLife or i-life (lifedigital.com)
+# iLife or i-life (lifedigital.com)
 iLife:
   regex: 'WTAB[ _]?\d{3}|(ITELL[_ ](?:K3300|K3500N?|K4700)|K3102 WIFI|FIVO (?:PLUS|Lite)|Zed Book G)(?:[);/ ]|$)'
   device: 'tablet'
@@ -13029,6 +13488,8 @@ iTel:
       model: 'A04'
     - regex: 'A663L'
       model: 'A05s'
+    - regex: 'S667LN'
+      model: 'S24'
     - regex: 'S665LN?'
       model: 'S23'
     - regex: 'S681LN'
@@ -13037,6 +13498,8 @@ iTel:
       model: 'A60s'
     - regex: 'A662L'
       model: 'A60'
+    - regex: 'A667L'
+      model: 'A50'
     - regex: 'A665L'
       model: 'A70'
     - regex: 'W5504'
@@ -13049,11 +13512,13 @@ iTel:
       model: 'A37'
     - regex: 'A631L'
       model: 'A49 Play'
+    - regex: 'A507LM'
+      model: 'AC50'
     - regex: 'W6002E?'
       model: 'S15'
     - regex: 'S663L[NC]'
       model: 'Vision 5'
-    - regex: 'S662LCN'
+    - regex: 'S662LCN?'
       model: 'Vision 5 Plus'
     - regex: 'S663L'
       model: 'S18'
@@ -13089,6 +13554,8 @@ iTel:
       model: 'A48'
     - regex: 'A571L'
       model: 'A26'
+    - regex: 'S666LN'
+      model: 'RS4'
     - regex: 'P651W'
       model: 'P37'
     - regex: 'A509WM?'
@@ -13101,14 +13568,20 @@ iTel:
       model: 'P38'
     - regex: 'L5007'
       model: 'A24'
+    - regex: 'A511LP'
+      model: 'A24 Pro'
     - regex: 'A512W'
       model: 'A18'
+    - regex: 'A513W'
+      model: 'A18s'
     - regex: 'L6003P'
       model: 'A55 LTE'
     - regex: 'L6002P'
       model: 'S15 Pro'
     - regex: '[LW]6503'
       model: 'S16 Pro'
+    - regex: 'A511LQ'
+      model: 'A23S'
     - regex: 'L5006[CS]'
       model: 'A23 Pro'
     - regex: 'L5002P'
@@ -13153,6 +13626,8 @@ iTel:
       model: 'A15'
     - regex: 'P662LN?'
       model: 'P40'
+    - regex: 'P683L'
+      model: 'P40+'
     - regex: 'L6005'
       model: 'Vision 1'
     - regex: 'P682LPN?'
@@ -13224,6 +13699,8 @@ JAY-Tech:
       model: 'Tablet PC PA10.1M'
     - regex: 'TPC-(XE10D-H)'
       model: 'Tablet PC $1'
+    - regex: 'TPC-G1011LTE'
+      model: 'Tablet PC G 10.11" LTE'
     - regex: 'TPC-([A-Z0-9]+)'
       model: 'Tablet PC $1'
     - regex: '(TPCY-TX[TE][^);/ ]+)'
@@ -13248,7 +13725,7 @@ Jolla:
   model: ''
 
 # Juniper Systems (https://junipersys.com/)
-'Juniper Systems':
+Juniper Systems:
   regex: 'Junipers/'
   device: 'smartphone'
   models:
@@ -13280,23 +13757,29 @@ Just5:
 
 # Kalley (www.kalley.com.co)
 Kalley:
-  regex: 'KALLEY|(?:ELEMENT (?:4 Plus|MAX|PLAY|Q)|ELEMENT_PRO_2|K-BOOK(?:8MG|73G)|SILVER_MAX|Silver Max (?:Lite|Pro)|Black[ _][GXZ]|Black_G_2|BLACK_PRO|ATV R[12]|GOLD_PRO|KBOOK7M)(?:[);/ ]|$)'
+  regex: 'KALLEY|(?:ELEMENT (?:4 Plus|5|MAX|PLAY|Q)|ELEMENT_PRO_2|K-BOOK(?:8MG|73G)|SILVER_MAX(?:_Pro_2)?|Silver Max (?:Lite|Pro)|Black[ _][13CGXZ](?:_PRO)?|Black_G_2|BLACK_PRO|ATV R[12]|GOLD_PRO|KBOOK7M)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Black_G_2'
       model: 'Black G 2'
-    - regex: 'Black[ _]([GXZ])'
+    - regex: 'Black[ _](C)_PRO'
+      model: 'Black $1 Pro'
+    - regex: 'Black[ _]([13CGXZ])'
       model: 'Black $1'
     - regex: 'BLACK_PRO'
       model: 'Black Pro'
     - regex: 'Element 4 Plus'
       model: 'Element 4 Plus'
+    - regex: 'Element 5(?:[);/ ]|$)'
+      model: 'Element 5'
     - regex: 'ELEMENT MAX'
       model: 'Element Max'
-    - regex: 'SILVER_MAX'
-      model: 'Silver Max'
+    - regex: 'Silver[_ ]Max[_ ]Pro[_ ]2'
+      model: 'Silver Max Pro 2'
     - regex: 'Silver Max (Lite|Pro)'
       model: 'Silver Max $1'
+    - regex: 'SILVER_MAX'
+      model: 'Silver Max'
     - regex: 'ELEMENT PLAY'
       model: 'Element Play'
     - regex: 'ELEMENT Q'
@@ -13366,8 +13849,8 @@ Keneksi:
       model: '$1'
 
 # Kempler & Strauss (www.kemplerusa.com)
-'Kempler & Strauss':
-  regex: 'Alumini_?3_?Plus|Alumini ?[23]|KEMPLER_(?:P[13]|TV|[X9]|8_PLUS)|P1[ _]Amateur'
+Kempler & Strauss:
+  regex: 'Alumini_?3_?Plus|Alumini ?[23]|KEMPLER_(?:P[13]|TV|[X9]|8_PLUS)|ZKEMPLER[ _](?:PLUS|PRO)|P1[ _]Amateur'
   device: 'smartphone'
   models:
     - regex: 'Alumini ?2'
@@ -13388,6 +13871,12 @@ Keneksi:
       model: '8 Plus'
     - regex: 'KEMPLER_9'
       model: '9'
+    - regex: 'ZKEMPLER PLUS'
+      model: 'ZKempler Plus'
+      device: 'tablet'
+    - regex: 'ZKEMPLER_PRO'
+      model: 'ZKempler Pro'
+      device: 'tablet'
 
 # Kiano
 Kiano:
@@ -13414,6 +13903,12 @@ Kiano:
     - regex: 'Kiano[ _]([^;/]+) Build'
       model: '$1'
 
+# kidiby (https://www.kidiby.com/)
+kidiby:
+  regex: 'KIDIBY'
+  device: 'tablet'
+  model: ''
+
 # Kingbox
 Kingbox:
   regex: 'Kingbox'
@@ -13510,13 +14005,15 @@ Komu:
 
 # Koobee
 Koobee:
-  regex: 'Koobee|(?:F2_Plus|SL004T)(?:[);/ ]|$)'
+  regex: 'Koobee|(?:F2_Plus|SL004T|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:K60))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'SL004T'
       model: 'K100'
     - regex: 'F2[_ ]Plus'
       model: 'F2 Plus'
+    - regex: '(K60)(?:[);/ ]|$)'
+      model: '$1'
     - regex: 'Koobee[ _\-]?([^;/]+) Build'
       model: '$1'
     - regex: 'Koobee[ _\-]?([a-z0-9_-]+)'
@@ -13555,6 +14052,14 @@ KDDI:
       device: 'smartphone'
       model: 'J Butterfly'
 
+# PIXPRO (sub brand Kodak)
+PIXPRO:
+  regex: 'PIXPRO[_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'L1 Pro'
+      model: 'L1 Pro'
+
 # Kodak
 Kodak:
   regex: 'KODAK|(?:IM5|KD50|Ektra|Smartway[_ ](?:[FT]1|[LT]2)|D55L|D61L|D6[05]LX)(?:[);/ ]|$)'
@@ -13592,7 +14097,7 @@ Koridy:
 
 # KRONO (www.kronodigital.com)
 KRONO:
-  regex: '(?:NET1100|NET_(?:LITE|TITAN|VOLT|MAX|MATRIX|K7)|android 8([\d.]*);(?: [\w-]+;)? NETWORK)(?:[);/ ]|$)'
+  regex: '(?:NET1100|NET_(?:LITE|TITAN|VOLT|MAX|MATRIX|[KR]7)|android 8([\d.]*);(?: [\w-]+;)? NETWORK)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NET1100'
@@ -13605,14 +14110,14 @@ KRONO:
     - regex: 'NET_MAX'
       device: 'tablet'
       model: 'Net Max'
-    - regex: 'NET_K7'
+    - regex: 'NET_([KR]7)'
       device: 'tablet'
-      model: 'Net K7'
+      model: 'Net $1'
     - regex: 'NETWORK'
       device: 'tablet'
       model: 'Network'
 
-#k-touch
+# K-Touch
 K-Touch:
   regex: 'K-?Touch[ _][a-z0-9]+|(?:Pace 2 Lite|KT202011(?:99|88)|LDXA-2[01]22|LDOX-2130|LDOX-212[13])(?:[);/ ]|$)'
   device: 'smartphone'
@@ -13646,7 +14151,7 @@ Diva:
 
 # 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-(?:42C|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|KYG0[13]|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[0-3]01KC|A205KC|WX10K|URBANO PROGRESSO|E7110|E7200|E6921|KY-(?:42C|51B)|C6930|A101BM)(?:[-_][uj]2?)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -13708,6 +14213,8 @@ Kyocera:
       model: 'DuraForce Pro'
     - regex: '(?:KYOCERA-)?(?:E69[12]0|E6921)'
       model: 'DuraForce Pro 2'
+    - regex: '(?:KYOCERA-)?(?:E7200)'
+      model: 'DuraForce Pro 3'
     - regex: 'E7110'
       model: 'DuraForce Ultra 5G'
     - regex: 'C6930'
@@ -13722,6 +14229,8 @@ Kyocera:
       model: 'Miraie'
     - regex: 'KYY24(?:[);/ ]|$)'
       model: 'Torque G01'
+    - regex: 'KYG03(?:[);/ ]|$)'
+      model: 'Torque G06'
     - regex: '(KYF32|KYF41)(?:[);/ ]|$)'
       model: 'Easy Mobile Phone $1'
     - regex: 'KYF35(?:[);/ ]|$)'
@@ -13781,6 +14290,8 @@ Kyocera:
       model: 'Urbano V02'
     - regex: 'KYV(?:45|38)(?:[);/ ]|$)'
       model: 'Urbano V03'
+    - regex: 'A301KC(?:[);/ ]|$)'
+      model: 'DuraForce EX'
     - regex: '(?:Kyocera-)?E6790(?:TM)?'
       model: 'DuraForce XD'
     - regex: 'X3-KC(?:[);/ ]|$)'
@@ -13827,7 +14338,7 @@ 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 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'
+  regex: 'Kruger[ _&]Matz|KrugerMatz[ _]|K&M|EAGLE_(?:807|961|107[46]|1068)|FLOW ?5PLUS|FLOW 10|FLOW 4 PLUS|Flow 9|FLOW_5|FLOW7|FLOW6(?:S|Lite)?|DRIVE9|DRIVE 8|DRIVE[_ ]6S?|Drive 10|MOVE8mini|MOVE9| MOVE 10|MOVE_|LIVE_6plus|LIVE 5 PLUS|Live [89]|LIVE4_KM043[89]|LIVE 7S?|Flow 7S|Eagle 806|KM(?:106[679]|107[23]|1065G|0701(?:_1)?|0702|080[45](?:_1)?|1070)|Live 10S'
   device: 'smartphone'
   models:
     - regex: 'MOVE8mini'
@@ -13838,7 +14349,7 @@ Krüger&Matz:
       model: 'MOVE $1'
     - regex: 'DRIVE 4 mini LTE'
       model: 'DRIVE 4 mini LTE'
-    - regex: 'DRIVE[ _]?([45689][S]?)(?:[);/ ]|$)'
+    - regex: 'DRIVE[ _]?([45689][S]?|10)(?:[);/ ]|$)'
       model: 'DRIVE $1'
     - regex: 'FLOW ?([54]) ?PLUS(?:[);/ ]|$)'
       model: 'FLOW $1 Plus'
@@ -13863,12 +14374,21 @@ Krüger&Matz:
     - regex: 'MOVE9(?:[);/ ]|$)'
       model: 'MOVE 9'
 
-    - regex: 'KM(106[679])(?:[);/ ]|$)'
+    - regex: 'KM(106[679]|1072)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'EAGLE $1 10.1"'
+    - regex: 'KM(1073)(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'EAGLE $1 10.4"'
     - regex: 'Eagle 806(?:[);/ ]|$)'
       device: 'tablet'
       model: 'EAGLE 806 8.0"'
+    - regex: 'Eagle_807(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'EAGLE 807 8.4"'
+    - regex: 'Eagle_(107[46])(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'EAGLE $1 10.4"'
     - regex: 'EAGLE_(961|1068)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'EAGLE $1'
@@ -13918,7 +14438,7 @@ Beko:
 
 # Benco (www.bencomobile.com)
 Benco:
-  regex: 'Benco[_ ]|(?:AE9(?:010|1[25]0|2[246]0|950)|AH9110)(?:[);/ ]|$)'
+  regex: 'Benco[_ ]|(?:AE9(?:[03]10|1[25]0|2[2346]0|950)|AH9110)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AE9950'
@@ -13931,16 +14451,28 @@ Benco:
       model: 'V80'
     - regex: 'AE9120'
       model: 'V90'
+    - regex: 'AE9310'
+      model: 'V91'
     - regex: 'AH9110'
       model: 'Y11'
     - regex: 'AE9240'
       model: 'S1'
     - regex: 'AE9260'
       model: 'S1 Pro'
+    - regex: 'AE9230'
+      model: 'Y32'
+
+# Laser (https://www.laserco.com.au/)
+Laser:
+  regex: '(?:MID_1089IPSA100)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'MID_1089IPSA100(?:[);/ ]|$)'
+      model: 'MID-1089IPSA100'
 
 # 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]|Fuel F1 Mini)(?:[);/ ]|$)'
+  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|LE000Z93P)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -13980,7 +14512,7 @@ Lava:
       model: 'A97 2GB Plus'
     - regex: 'A76Plus(?:[);/ ]|$)'
       model: 'A76 Plus'
-    - regex: ' A3_mini(?:[);/ ]|$)'
+    - regex: 'A3_mini(?:[);/ ]|$)'
       model: 'A3 Mini'
     - regex: 'Pixel V2\+(?:[);/ ]|$)'
       model: 'Pixel V2 Plus'
@@ -14000,7 +14532,7 @@ Lava:
       model: 'Z3'
     - regex: 'LEX402'
       model: 'Z33'
-    - regex: ' Z(\d{2})(?:_2GB)?(?:[);/ ]|$)'
+    - regex: 'Z(\d{2})(?:_2GB)?(?:[);/ ]|$)'
       model: 'Z$1'
     - regex: 'Z50_Pro(?:[);/ ]|$)'
       model: 'Z50 Pro'
@@ -14012,6 +14544,10 @@ Lava:
       model: 'Z21'
     - regex: 'LZG403[ _]225(?:[);/ ]|$)'
       model: 'X2'
+    - regex: 'LE000Z93P(?:[);/ ]|$)'
+      model: 'Z2'
+    - regex: 'LZG403[ _]25(?:[);/ ]|$)'
+      model: 'Z3 Pro'
     - regex: 'LZG403(?:[);/ ]|$)'
       model: 'Z3'
     - regex: 'LZG401(?:[);/ ]|$)'
@@ -14024,6 +14560,8 @@ Lava:
       model: 'V7'
     - regex: 'LE9940(?:[);/ ]|$)'
       model: 'V7 Prime'
+    - regex: 'LE9940_W'
+      model: 'V7s Prime'
     - regex: 'LE9920(?:[);/ ]|$)'
       model: 'Z53'
     - regex: 'LH9910(?:[);/ ]|$)'
@@ -14070,13 +14608,17 @@ Lava:
       model: 'P7 Plus'
     - regex: 'LZX414'
       model: 'Yuva 3 Pro'
+    - regex: 'LZX408'
+      model: 'Yuva 2 Pro'
     - regex: 'LIX402'
       model: 'Yuva Pro'
+    - regex: 'LZG409'
+      model: 'Yuva Star'
     - regex: 'LXX508'
       model: 'Storm 5G'
     - regex: '(X\d+)[ _]Plus(?:[);/ ]|$)'
       model: '$1 Plus'
-    - regex: ' (X28)(?:[);/ ]|$)'
+    - regex: '(X28)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'iris88[_ ]go'
       model: 'Iris 88 Go'
@@ -14171,7 +14713,7 @@ Lanin:
 
 # lanix (lanix.com)
 Lanix:
-  regex: 'LANIX-([a-z0-9]+)|Ilium[ _]|LANIX_PAD|IliumPad|X120C|(?:Alpha 950(?:XL)?|Alpha [135]V|X540)(?:[);/ ]|$)'
+  regex: 'LANIX-([a-z0-9]+)|Ilium[ _]|LANIX_PAD|IliumPad|X120C|(?:Alpha 950(?:XL)?|Alpha [1359]V|X540)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ILIUM_PAD_RX10v5'
@@ -14191,7 +14733,7 @@ Lanix:
       model: 'Ilium $1'
     - regex: 'Alpha (9500|950(?:XL)?)'
       model: 'Ilium Alpha $1'
-    - regex: 'Alpha ([135])V'
+    - regex: 'Alpha ([1359])V'
       model: 'Alpha $1V'
     - regex: '(X540)'
       model: '$1'
@@ -14243,14 +14785,14 @@ Lark:
       model: 'Impress Noda'
       device: 'smartphone'
 
-# lct
+# LCT
 LCT:
   regex: 'LCT_([a-z0-9]+)'
   device: 'feature phone'
   model: '$1'
 
 # Le Pan
-'Le Pan':
+Le Pan:
   regex: 'Le ?Pan|TC970 ([^;/]+)Build'
   device: 'tablet'
   models:
@@ -14404,19 +14946,19 @@ Lenco:
     - regex: 'Lenco ([^/);]*)(?: Build|[);])'
       model: '$1'
 
-# Aligator
+# Aligator (aligator.cz)
 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)(?:[);/ ]|$)'
+    - regex: '(?:ALIGATOR[ _])?(S4080|S5550|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 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)(?:[);/ ]|$)'
+  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-(?:Q706Z|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|TB301FU|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|L79031|XT2091-[78]|L71061|L70081|L78031|20JJS0CU1M)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Lenovo ?G780'
@@ -14720,6 +15262,9 @@ Lenovo:
     - regex: 'TB300[FX]U'
       model: 'Tab M8 (Gen 4)'
       device: 'tablet'
+    - regex: 'TB301[FX]U'
+      model: 'Tab M8 (Gen 4) (2024)'
+      device: 'tablet'
     - regex: 'TB-8705[FX]'
       model: 'Tab M8 FHD'
       device: 'tablet'
@@ -14843,6 +15388,8 @@ Lenovo:
       model: 'Z5'
     - regex: 'L78031(?:[);/ ]|$)'
       model: 'Z5 Pro'
+    - regex: '(?:Z6 Pro 5G|L79041)(?:[);/ ]|$)'
+      model: 'Z6 Pro 5G'
     - regex: '(?:Z6 Pro|L78051)(?:[);/ ]|$)'
       model: 'Z6 Pro'
     - regex: 'L78032(?:[);/ ]|$)'
@@ -14874,7 +15421,7 @@ Lenovo:
       model: 'K12'
     - regex: 'A2010l36'
       model: 'A2010'
-    - regex: 'Lenovo K12 Pro'
+    - regex: 'Lenovo K12 Pro|XT2091-[78]'
       model: 'K12 Pro'
     - regex: 'Lenovo X2(?:-[ER]U)?'
       model: 'X2'
@@ -14886,6 +15433,9 @@ Lenovo:
     - regex: 'NL5H00X'  # Laser Projector
       device: 'peripheral'
       model: 'Xiaoxin 100'
+    - regex: 'Projector701'
+      device: 'peripheral'
+      model: 'Projector 701'
 
     - regex: 'LENOVO/81W8(?:[);/ ]|$)'
       device: 'desktop'
@@ -14899,6 +15449,9 @@ Lenovo:
     - regex: 'F0CU0028RK(?:[);/ ]|$)'
       device: 'desktop'
       model: 'IdeaCentre 520S-23IKU'
+    - regex: '20JJS0CU1M(?:[);/ ]|$)'
+      device: 'desktop'
+      model: 'ThinkPad Yoga 370'
 
     - regex: 'Lenovo TAB ?([^/);]*)(?: Build|[;)])'
       model: 'TAB $1'
@@ -14910,7 +15463,7 @@ Lenovo:
 
 # Lexand or LEXAND (lexand.ru)
 Lexand:
-  regex: 'Lexand[ _]|(?:S[BC]7 PRO HD|S5A[1-4]|S4A[1-5]|S6A1|A811|(?<!Tab )A802|LPH7_Smarty)(?:[);/ ]|$)'
+  regex: 'Lexand[ _]|(?:S[BC]7 PRO HD|SB5 HD|S5A[1-4]|S4A[1-5]|S6A1|A811|(?<!Tab )A802|LPH7_Smarty)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A(811|802)'
@@ -14940,6 +15493,9 @@ Lexand:
     - regex: '(S[CB]7) PRO HD'
       device: 'tablet'
       model: '$1 PRO HD'
+    - regex: '(SB5) HD'
+      device: 'tablet'
+      model: '$1 HD'
     - regex: 'LPH7_Smarty'
       model: 'LPH7 Smarty'
     - regex: 'Lexand[ _]([^;/)]+)(?: Build|[;)])'
@@ -15009,7 +15565,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|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'
+  regex: '(?<!TECNO Mobile |TECNO )LG(?!(?: Browser/8| NetCast\.TV| WebOS|E[;,]))|NetCast(?!\.TV)|WebAppManager|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)(?:[);/ ]|$)|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|US215|32LH590U-ZE'
   device: 'smartphone'
   models:
     - regex: 'DM-(01K|02H)'
@@ -15428,7 +15984,7 @@ LG:
       model: 'K8 4G'
     - regex: '(?:LG-)?VS500'
       model: 'K8 V'
-    - regex: 'LM-X212\(G\)|LGUS215'
+    - regex: 'LM-X212\(G\)|(?:LG)?US215'
       model: 'K8 (2018)'
     - regex: '(?:LG-)?(?:VS995|F800K|US999|LS997|H91[058]|H990(?:DS|[NT])?)'
       model: 'V20'
@@ -15494,7 +16050,7 @@ LG:
       model: 'K56 Plus'
     - regex: 'LM-Q510N(?:[);/ ]|$)'
       model: 'Q51'
-    - regex: ' LM-Q310N(?:[);/ ]|$)'
+    - regex: 'LM-Q310N(?:[);/ ]|$)'
       model: 'Q31'
     - regex: 'LM-Q630N?(?:[);/ ]|$)'
       model: 'Q61'
@@ -15759,7 +16315,7 @@ Logic Instrument:
 
 # 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)?)|Tab_Stand_Pro|LeFit|logikids4|Le Link)(?:[);/ ]|$|_)'
+  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|TAB76|Five Pro|Solar(?: Pro)?|LUNAR|Lunar Pro|Elio)(?:[);/ ]|$|_)'
   device: 'tablet'
   models:
     - regex: 'Tab_Stand_Pro'
@@ -15768,6 +16324,8 @@ Logicom:
       model: 'La Tab $1'
     - regex: 'LaTabStandRB(?:[);/ ]|$)'
       model: 'La Tab Stand'
+    - regex: 'TAB76(?:[);/ ]|$)'
+      model: 'La Tab 79'
     - regex: 'La[_ ]Tab[_ ]124[_ ]HD[_ ]Plus(?:[);/ ]|$)'
       model: 'La Tab 124 HD Plus'
     - regex: 'LOGICOM_LA_TAB_LINK_71'
@@ -15811,6 +16369,24 @@ Logicom:
       model: '$1 BOT Tab $2'
     - regex: '((?:[BCM]|ID|VR))[ _]?BOT[ _]?((?:TAB[ _])?([0-9]+\+?)(?:PLUS)?)'
       model: '$1 BOT $2'
+    - regex: 'Elio'
+      model: 'Elio'
+      device: 'smartphone'
+    - regex: 'Five Pro'
+      model: 'Five Pro'
+      device: 'smartphone'
+    - regex: 'Solar Pro'
+      model: 'Solar Pro'
+      device: 'smartphone'
+    - regex: 'SOLAR'
+      model: 'Solar'
+      device: 'smartphone'
+    - regex: 'Lunar Pro'
+      model: 'Lunar Pro'
+      device: 'smartphone'
+    - regex: 'LUNAR'
+      model: 'Lunar'
+      device: 'smartphone'
     - regex: 'Le Lift'
       model: 'Le Lift'
       device: 'smartphone'
@@ -15914,13 +16490,17 @@ Konka:
     - regex: '( R[EU]1)(?:[);/ ]|$)'
       model: '$1'
 
+    - regex: '2K Android TV'
+      device: 'tv'
+      model: '2K Smart TV'
+
     - regex: 'KONKA[_ ]([a-z0-9]+)'
       device: 'feature phone'
       model: '$1'
 
 # 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(?:[\d.]*);(?: [\w-]+;)? SWEET5|SWEET 55)(?:[);/ ]|$)'
+  regex: 'KONROW[_ ]|(?:LINK55|KTAB_1003|BIGCOOL|SOFT5P?|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(?:[);/ ]|$)'
@@ -15933,6 +16513,8 @@ Konrow:
       model: 'Cool 55'
     - regex: 'SOFT5(?:[);/ ]|$)'
       model: 'Soft 5'
+    - regex: 'SOFT5P(?:[);/ ]|$)'
+      model: 'Soft 5P'
     - regex: 'COOLFIVE(?:[);/ ]|$)'
       model: 'Cool Five'
     - regex: 'Just5(?:[);/ ]|$)'
@@ -16182,13 +16764,13 @@ Talius:
   device: 'smartphone'
   model: '$1'
 
-# Maxwest
+# Maxwest (maxwesttelecom.com)
 Maxwest:
-  regex: '(?:Astro[_ ](?:Phablet_9|55?N[_ ]LTE|55R|5 PRO|5[sTX]|[45]P|X4|5_GO_LTE|X55s?|4\.5|4|X5|8R)|Astro6|Virtue Z5|Nitro[_ ](?:4S?|55[ARCMN]|5[XRPNM]|[45] GO|4[sN] LTE|55[ _]LTE|N62)|Gravity_(?:55?_GO|6P)|Nitro_Phablet_9s|Nitro Phablet 7N|Nitro 8|MX-A10R)(?:[);/ ]|$)'
+  regex: '(?:Astro[_ ](?:Phablet_9|55?N[_ ]LTE|55[RT]|5 PRO|5[sTX]|[45]P|X4|5_GO_LTE|X55s?|4\.5|4|63R|X5|8R)|Astro6|Virtue Z5|Nitro[_ ](?:4S?|55[ARCMN]|5[XRPNM]|[45] GO|4[sN] LTE|55[ _]LTE|N62)|Gravity_(?:55?_GO|6P)|Gravity 5\.5 LTE|Nitro_Phablet_9s|Nitro Phablet 7N|Nitro 8|MX-(?:A10R|A6[45]))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'MX-A10R'
-      model: 'Astro A10R'
+    - regex: 'MX-(A10R|A6[45])'
+      model: 'Astro $1'
     - regex: 'Astro[_ ](55?)N[_ ]LTE'
       model: 'Astro $1N LTE'
     - regex: 'Astro[_ ]X55[_ ]LTE'
@@ -16197,7 +16779,7 @@ Maxwest:
       model: 'Astro 5 Go LTE'
     - regex: 'Astro 5 PRO'
       model: 'Astro 5 Pro'
-    - regex: 'Astro[_ ](55R|X55s?|5[sTX]|4|X[45]|[45]P|8R)(?:[);/ ]|$)'
+    - regex: 'Astro[_ ](55[RT]|X55s?|5[sTX]|4|X[45]|[45]P|8R|63R)(?:[);/ ]|$)'
       model: 'Astro $1'
     - regex: 'Astro[_ ](4\.5)'
       model: 'Astro $1"'
@@ -16217,6 +16799,8 @@ Maxwest:
       model: 'Gravity $1 GO'
     - regex: 'Gravity_6P'
       model: 'Gravity 6P'
+    - regex: 'Gravity 5\.5 LTE'
+      model: 'Gravity 5.5 LTE'
 
     - regex: 'Astro6'
       device: 'phablet'
@@ -16235,11 +16819,13 @@ True Slim:
   device: 'smartphone'
   model: '$1'
 
-# Maze Speed (ssbphones.com)
+# Maze Speed or SSB PHONES (ssbphones.com)
 Maze Speed:
-  regex: '(SSB-(?:500|508)|SSB408D|SSB504R)(?:[);/ ]|$)'
+  regex: '(?:MP5184G|MS5424G|MS5514G|MS5539G|MS5614G|SSB-(?:500|508)|SSB408D|SSB504R)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: '(MP5184G|MS5424G|MS5514G|MS5539G|MS5614G)(?:[);/ ]|$)'
+      model: '$1'
     - regex: 'SSB-?(500|508|408D|504R)(?:[);/ ]|$)'
       model: 'SSB-$1'
 
@@ -16257,7 +16843,7 @@ Maze:
 
 # Mediacom (mediacomeurope.it)
 Mediacom:
-  regex: '(?:SmartPad7503G|M-SP10MXA|M-PPAB500|SmartPad970s2(?:3G)?|M[_-][MPS]P[0-9a-z]+|M-IPRO[0-9a-z]+|10edge|1AZ2[TP]| (?:7[BCD]Y|8[AD]Y|1[AB]EC|1CY|1AZ|1[DI]Y4G|1AZ2TW|1EY4G|1HY4G)(?:_eea)?|Azimut ?[23](?: Lite|Pro)?|M-WPW801| 1EY)(?:[);/ ]|$)'
+  regex: '(?:SmartPad7503G|M-SP10MXA|M-PPAB500|SmartPad970s2(?:3G)?|M[_-][MPS]P[0-9a-z]+|M-IPRO[0-9a-z]+|10edge|1AZ2[TP]| (?:7[BCD]Y|8[ADE]Y|1[AB]EC|1CY|1AZ|1[DI]Y4G|1AZ2TW|1EY4G|1HY4G)(?:_eea)?|Azimut ?[23](?: Lite|Pro)?|M-WPW801| 1EY)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'SmartPad7503G(?:[);/ ]|$)'
@@ -16342,11 +16928,11 @@ Mediacom:
       model: 'SmartPad iyo 8"'
     - regex: '10edge(?:[);/ ]|$)'
       model: 'SmartPad 10 Edge'
-    - regex: ' 1EY(?:[);/ ]|$)'
+    - regex: '1EY(?:[);/ ]|$)'
       model: 'SmartPad 1EY'
     - regex: 'M-WPW801(?:[);/ ]|$)'
       model: 'WinPad W801'
-    - regex: ' (7[BCD]Y|8AY|1BEC|1CY|1AZ|1AZ2TW)(?:_eea)?(?:[);/ ]|$)'
+    - regex: '(7[BCD]Y|8[AE]Y|1BEC|1CY|1AZ|1AZ2TW)(?:_eea)?(?:[);/ ]|$)'
       model: '$1'
 
     - regex: '(?:M-MP75S23G|M-MP72[01]M)(?:[);/ ]|$)'
@@ -16421,7 +17007,7 @@ Mediacom:
 
 # Medion
 Medion:
-  regex: 'Medion|(?:MD_)?LIFETAB|([SPX]10[0-9]{2}X|E10[45]1X|X5001|P851X|P850X|E691X|E10[56]0X)(?:[);/ ]|$)'
+  regex: 'Medion|(?:MD_)?LIFETAB|([SPX]10[0-9]{2}X|E10[45]1X|X5001|P851X|P850X|E691X|E10[56]0X|B5532)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:MD_)?LIFETAB[_ ]([a-z0-9]+)'
@@ -16429,7 +17015,7 @@ Medion:
       model: 'Lifetab $1'
     - regex: '(E450[46]|E5004|S5004|X5001|E5020|P5015|P500[45]|X6001)(?:[);/ ]|$)'
       model: 'Life $1'
-    - regex: '(B5530)(?:[);/ ]|$)'
+    - regex: '(B553[02])(?:[);/ ]|$)'
       model: '$1'
     - regex: '(E10[45]1X)(?:[);/ ]|$)'
       device: 'tablet'
@@ -16592,7 +17178,7 @@ Mitsubishi:
 
 # MIXC
 MIXC:
-  regex: '(?<!VIA )(M35|M20|G7106|G7108)(?:[);/ ]|$)'
+  regex: '(?<!VIA |Orbit )(M35|M20|G7106|G7108)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(M[0-9]{1,2})(?:[);/ ]|$)'
@@ -16651,11 +17237,19 @@ Matrix:
 
 # Mobicel or Mobicell
 Mobicel:
-  regex: 'Mobicel[_ ](R[16]|METRO2)|ASTRO(?: Build|[;)]|$)|(?:Android 8(?:[\d.]*);(?: [\w-]+;)? (?:BEAM|ZOOM|RUBY)|FAME(?:_DS)?|CLIK|R7_[12]|(?<!INTENSE )HYPE(?:_X)?|DANDY(?:_ZAM)?|(?<!SMADL )Matrix|VENUS_G|TRENDY PLUS|FENDY_DS|TANGO_LITE|BLINK|BERRY|BERRY[_ ]?(?:[12]|PLUS)|R1PLUS_1|ZOOM-H|REBEL|LEGEND (?:MAX|PRO_1|Pro LTE)|HERO_DS|Switch[ _]GO|SWITCH1|switch plus|PULSE_1|TRENDY 2|TRENDY_LITE|FEVER_PLUS(?:_[HJ])?|RIO_(?:SS|ZAM|RW|BN)|Clik plus|(PURE|Fendy) PLUS|Neo[ _]LTE|Titan_1|ZOOM_1|R4 LTE|NEO_1|EPIC_[12]| GLO|EPIC PRO_[12]|OREO|Cosmo LTE|Neo_Plus|Android 1[12](?:[\d.]*);(?: [\w-]+;)? FORCE|VX20|VX19)(?:[);/ ]|$)'
+  regex: 'Mobicel[_ ](R[16]|METRO2)|ASTRO(?: Build|[;)]|$)|(?:Android 6(?:[\d.]*);(?: [\w-]+;)? SHIFT)|(?:Android 8(?:[\d.]*);(?: [\w-]+;)? (?:BEAM|ZOOM|RUBY)|FAME(?:_DS)?|CLIK|R7_[12]|(?<!INTENSE )HYPE(?:_X)?|DANDY(?:_ZAM)?|(?<!SMADL )Matrix|VENUS_G|TRENDY PLUS|FENDY_DS|TANGO_LITE|BLINK|BERRY|BERRY[_ ]?(?:[12]|PLUS)|R1PLUS_1|ZOOM-H|REBEL|LEGEND (?:MAX|PRO_1|Pro LTE)|HERO_DS|Switch[ _]GO|SWITCH1|switch plus|PULSE_1|TRENDY 2|TRENDY_LITE|FEVER_PLUS(?:_[HJ])?|RIO_(?:SS|ZAM|RW|BN)|Clik plus|(PURE|Fendy) PLUS|RX PRO|Neo[ _]LTE|Titan_1|ZOOM_1|R4 LTE|NEO_1|EPIC_[12]| GLO|EPIC PRO_[12]|IX PRO|OREO|Cosmo LTE|Neo_Plus|IX-1|Android 13(?:[\d.]*);(?: [\w-]+;)? IX|Android 1[12](?:[\d.]*);(?: [\w-]+;)? FORCE|VX20|VX19)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'EPIC PRO_([12])'
       model: 'Epic Pro $1'
+    - regex: 'IX PRO'
+      model: 'IX Pro'
+    - regex: 'RX PRO'
+      model: 'RX Pro'
+    - regex: 'IX-1'
+      model: 'IX-1'
+    - regex: 'IX(?: Build|[;)])'
+      model: 'IX'
     - regex: 'Matrix'
       model: 'Matrix'
     - regex: 'LEGEND MAX'
@@ -16728,6 +17322,8 @@ Mobicel:
       model: 'Fame'
     - regex: 'BEAM'
       model: 'Beam'
+    - regex: 'SHIFT'
+      model: 'Shift'
     - regex: 'Cosmo LTE'
       model: 'Cosmo LTE'
     - regex: 'Neo[ _]LTE'
@@ -16873,7 +17469,7 @@ MLLED:
   models:
     - regex: 'MLLED[ _]([^;/]+)Build'
       model: '$1'
-    - regex: 'MLLED[ _]([^);/]+)(?:[);/]|$)'
+    - regex: 'MLLED[ _]([^);/]+)(?:[);/ ]|$)'
       model: '$1'
 
 # Mobistel
@@ -16894,7 +17490,7 @@ MobiIoT:
 
 # Mecool
 Mecool:
-  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)(?:[);/ ]|$)'
+  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[135679]| KD1)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'KM9 ?PRO(?:[);/ ]|$)'
@@ -16923,7 +17519,7 @@ Mecool:
       model: 'M8S Max'
     - regex: 'ME-COOL S(?:[);/ ]|$)'
       model: 'S'
-    - regex: ' K([MD]\d+)(?:[);/ ]|$)'
+    - regex: 'K([MD]\d+)(?:[);/ ]|$)'
       model: 'K$1'
     - regex: 'Mecool[ _-]([^/);]+)(?: Build|[;)])'
       model: '$1'
@@ -16948,6 +17544,14 @@ Modecom:
     - regex: 'FreeWay Tab[ _\-]?((?!Build)[^);/ ]+)'
       model: 'FreeWay Tab $1'
 
+# Mode Mobile (https://www.modemobile.com/)
+Mode Mobile:
+  regex: 'MEP2Q421G(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'MEP2Q421G'
+      model: 'EarnPhone'
+
 # Mofut
 Mofut:
   regex: 'Mofut'
@@ -16996,7 +17600,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|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'
+  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-[23]|XT2013-[124]|XT2061-3|XT2071-4|XT2201-[126]|XT-2201|XT2113-2|XT2115-1|XT2175-2|XT2141-1|XT2125-4|XT2127-2|XT2129-[123]|XT2143-1|XT2153-1|XT2158-6|XT2215-[124]|XT2221-[12]|XT2225-[12]|XT2233-2|XT2251-1|XT2243-2|XT2241-1|XT2169-1|XT2137-[12]|XT1710-08|XT180[3-5]|XT2315-1|XT2261-1|XT2335-[23]|XT2131(?:-[14]|DL)|XT2303-2|XT2301-5|XT2307-1|XT2321-[23]|XT2323-3|XT2343-[13]|XT2363-2|XT194[23]-1|XT1929-15|XT2083-9|XT2081-1|XT2093DL|XT2093-[37]|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD|PAMR00(?:0[28]|10)IN|PANB0001IN|PANB001[35]IN|PANV000[59]IN'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -17007,12 +17611,17 @@ Motorola:
     - regex: 'moto tab g70'
       device: 'tablet'
       model: 'Moto Tab G70'
+    - regex: 'XT2261-1'
+      model: 'Moto Tab G62'
+      device: 'tablet'
     # Explicit smartphone models
     - regex: '(?:MOT-|Motorola-)?XT300'
       model: 'Spice'
     - regex: 'ThinkPhone'
       model: 'ThinkPhone'
-    - regex: 'XT2321-2'
+    - regex: 'MOTOROLA E6S'
+      model: 'Moto E6S'
+    - regex: 'XT2321-[23]'
       model: 'Moto Razr 40 Ultra'
     - regex: 'XT2323-3'
       model: 'Moto Razr 40'
@@ -17020,6 +17629,8 @@ Motorola:
       model: 'Moto Razr+ (2023)'
     - regex: 'motorola razr 2023'
       model: 'Moto Razr (2023)'
+    - regex: 'XT2251-1'
+      model: 'Moto Razr (2022)'
     - regex: '(?:MOT-|Motorola-)?XT30[35]'
       model: 'Motosmart ME'
     - regex: '(?:MOT-|Motorola-)?XT31[16]'
@@ -17028,12 +17639,16 @@ Motorola:
       model: 'Edge S'
     - regex: '(?:MOT-|Motorola[- ])?edge \(?(202\d)\)?'
       model: 'Edge ($1)'
+    - regex: '(?:MOT-|Motorola-)?XT2307-1'
+      model: 'Edge 40 Neo'
     - regex: '(?:MOT-|Motorola-)?XT2175-2'
       model: 'Edge S30'
     - regex: 'motorola edge 30 ultra'
       model: 'Edge 30 Ultra'
     - regex: 'motorola edge 30 neo'
       model: 'Edge 30 Neo'
+    - regex: 'XT2201-1'
+      model: 'Edge 30 Pro'
     - regex: '(?:MOT-|Motorola-)?XT2143-1'
       model: 'Edge 20'
     - regex: '(?:MOT-|Motorola-)?XT2153-1'
@@ -17048,6 +17663,8 @@ Motorola:
       model: 'Fire XT'
     - regex: '(?:MOT-|Motorola-)?XT535'
       model: 'Defy'
+    - regex: '(?:MOT-|Motorola-)?XT2083-9'
+      model: 'Defy (2021)'
     - regex: '(?:MOT-|Motorola-)?XT55[567]C?'
       model: 'Defy XT'
     - regex: '(?:MOT-|Motorola-)?XT603'
@@ -17102,16 +17719,30 @@ Motorola:
       model: 'Droid RAZR Maxx'
     - regex: 'moto g52j 5G'
       model: 'Moto G52j 5G'
+    - regex: 'XT2221-[12]'
+      model: 'Moto G52'
     - regex: 'moto g53y 5G'
       model: 'Moto G53y 5G'
-    - regex: 'XT2335-3'
+    - regex: 'XT2335-[23]'
       model: 'Moto G53'
+    - regex: 'XT2343-[13]'
+      model: 'Moto G54 5G'
+    - regex: 'XT2225-[12]'
+      model: 'Moto G82 5G'
+    - regex: 'PAMR00(0[28]|10)IN'
+      model: 'Moto G10 Power'
+    - regex: 'XT2127-2'
+      model: 'Moto G10'
+    - regex: 'Moto G8 Power'
+      model: 'Moto G8 Power'
     - regex: '(?:MOT-|Motorola-)?(?:XT102[12]|XT830C|XT15[12]4|XT152[67])' # 2015
       model: 'Moto E'
     - regex: 'Moto E \(XT2052DL\)'
       model: 'Moto E (2020)'
     - regex: '(?:MOT-|Motorola-)?XT1706'
       model: 'Moto E3 Power'
+    - regex: '(?:MOT-|Motorola-)?XT2158-6'
+      model: 'Moto E30'
     - regex: 'MotoE2\(4G-LTE\)'
       model: 'Moto E2 (4G-LTE)'
     - regex: '(?:MOT-|Motorola-)?XT1924-9'
@@ -17120,6 +17751,8 @@ Motorola:
       model: 'Moto E$1 Plus'
     - regex: 'Moto E([0-9]) Play'
       model: 'Moto E$1 Play'
+    - regex: 'moto-e([0-9])-play'
+      model: 'Moto E$1 Play'
     - regex: 'moto e6 \(XT2005DL\)'
       model: 'Moto E6 (XT2005DL)'
     - regex: 'moto e5 cruise(?:[);/ ]|$)'
@@ -17138,6 +17771,8 @@ Motorola:
       model: 'Moto E$1s'
     - regex: 'Moto E(?: Build|[;)])'
       model: 'Moto E'
+    - regex: 'XT2081-1'
+      model: 'Moto E7 Plus'
     - regex: '(?:MOT-|Motorola-)?XT1030'
       model: 'Droid Mini'
     - regex: '(?:MOT-|Motorola-)?XT1565'
@@ -17172,10 +17807,18 @@ Motorola:
       model: 'Moto G6'
     - regex: '(?:MOT-|Motorola-)?XT1965-6'
       model: 'Moto G7 Plus'
-    - regex: 'XT2137-2'
+    - regex: 'XT2129-[123]'
+      model: 'Moto G30'
+    - regex: 'XT2363-2'
+      model: 'Moto G34 5G'
+    - regex: 'XT2137-[12]'
       model: 'Moto G50'
     - regex: 'XT2171-3'
       model: 'Moto G51'
+    - regex: 'XT2171-2'
+      model: 'Moto G51 5G'
+    - regex: 'XT2169-1'
+      model: 'Moto G71 5G'
     - regex: '(?:MOT-|Motorola-)?(?:XT10(?:49|5[23568]|6[04]|9[23457])|XT1093)'
       model: 'Moto X'
     - regex: '(?:MOT-|Motorola-)?XT156[234]|Moto X Play(?:[);/ ]|$)'
@@ -17212,6 +17855,8 @@ Motorola:
       model: 'Moto S30'
     - regex: '(?:MOT-|Motorola-)?XT2201-6'
       model: 'Moto X30'
+    - regex: '(?:MOT-|Motorola-)?XT-2201'
+      model: 'Moto Edge X30 5G'
     - regex: '(?:MOT-|Motorola-)?XT2301-5'
       model: 'Moto X40'
     - regex: '(?:MOT-|Motorola-)?XT1943-1'
@@ -17224,7 +17869,7 @@ Motorola:
       model: 'Edge Plus 5G UW (2022)'
     - regex: '(?:MOT-|Motorola-)?edge plus \(?(202[23])\)?'
       model: 'Edge Plus ($1)'
-    - regex: '(?:MOT-|Motorola-)?edge plus'
+    - regex: '(?:MOT-|Motorola-)?edge plus|XT2061-3'
       model: 'Edge Plus'
     - regex: 'XT2201-2'
       model: 'Edge X30'
@@ -17232,16 +17877,20 @@ Motorola:
       model: 'Edge $1 Fusion'
     - regex: '(?:MOT-|Motorola-)?edge 20 lite'
       model: 'Edge 20 Lite'
+    - regex: '(?:MOT-|Motorola-)?edge (\d+) fusion'
+      model: 'Edge $1 Fusion'
     - regex: '(?:MOT-|Motorola-)?edge (\d+) pro'
       model: 'Edge $1 Pro'
     - regex: '(?:MOT-|Motorola-)?edge (\d+) neo'
       model: 'Edge $1 Neo'
-    - regex: '(?:MOT-|Motorola-)?edge 5G UW \(2021\)'
+    - regex: '(?:MOT-|Motorola-)?(?:edge 5G UW \(2021\)|XT2141-1)'
       model: 'Edge 5G UW (2021)'
     - regex: '(?:MOT-|Motorola-)?edge (\d+)'
       model: 'Edge $1'
     - regex: '(?:MOT-|Motorola-)?edge \(2021\)'
       model: 'Edge (2021)'
+    - regex: 'XT2303-2'
+      model: 'Edge 40'
     - regex: '(?:MOT-|Motorola-)?edge'
       model: 'Edge'
     - regex: '(?:MOT-|Motorola-)?one vision plus'
@@ -17258,7 +17907,7 @@ Motorola:
       model: 'One Fusion Plus'
     - regex: '(?:MOT-|Motorola-)?one fusion'
       model: 'One Fusion'
-    - regex: 'motorola one action'
+    - regex: 'motorola one action|XT2013-[124]'
       model: 'One Action'
     - regex: 'motorola one macro'
       model: 'One Macro'
@@ -17266,7 +17915,7 @@ Motorola:
       model: 'One 5G UW Ace'
     - regex: 'motorola one 5G UW'
       model: 'One 5G UW'
-    - regex: 'motorola one 5G ace'
+    - regex: 'motorola one 5G ace|XT2113-2'
       model: 'One 5G Ace'
     - regex: 'motorola one vision'
       model: 'One Vision'
@@ -17276,13 +17925,17 @@ 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|XT2131-4'
+    - regex: 'XT2215-[124]'
+      model: 'Moto G Stylus 5G (2022)'
+    - regex: 'XT2315-1'
+      model: 'Moto G Stylus 5G (2023)'
+    - regex: 'XT2115-1'
+      model: 'Moto G Stylus (2021)'
+    - regex: 'moto g stylus 5G|XT2131(?:-[134]|DL)' # 2021
       model: 'Moto G Stylus 5G'
     - regex: 'moto g stylus'
       model: 'Moto G Stylus'
-    - regex: 'moto g play \(XT2093DL\)'
-      model: 'Moto G Play (XT2093DL)'
-    - regex: 'moto g play \(2021\)'
+    - regex: 'moto g play \(2021\)|XT2093DL|XT2093-[37]'
       model: 'Moto G Play (2021)'
     - regex: 'moto g power \(XT2041DL\)'
       model: 'Moto G Power'
@@ -17304,8 +17957,12 @@ Motorola:
       model: 'Moto G 5G (2022)'
     - regex: 'moto g 5G'
       model: 'Moto G 5G'
-    - regex: 'moto g\(?40\)? fusion'
+    - regex: 'moto g\(?40\)? fusion|PANV000[159]IN'
       model: 'Moto G40 Fusion'
+    - regex: 'XT2233-2'
+      model: 'Moto G42'
+    - regex: 'PANB001[35]IN|PANB0001IN'
+      model: 'Moto G60'
     - regex: 'moto g\(?60\)?s'
       model: 'Moto G60s'
     - regex: 'moto g(\d+)\((\w)\)'
@@ -17335,6 +17992,8 @@ Motorola:
       model: 'Moto G$1'
     - regex: 'moto g(\d+)(?:[);/ ]|$)'
       model: 'Moto G$1'
+    - regex: 'moto g go'
+      model: 'Moto G Go'
     - regex: 'moto e\(?([0-9]+)\)?(?: Build|[;)])'
       model: 'Moto E$1'
     - regex: 'moto x\(?(4+)\)?(?: Build|[;)])'
@@ -17393,6 +18052,12 @@ Motorola:
     - regex: '((?:ME|MB|XT)[0-9]{3,4}(?:\(Defy\))?)(?:[);/ ]|$)'
       model: '$1'
 
+# Motorola Solutions (https://www.motorolasolutions.com/)
+Motorola Solutions:
+  regex: '(LEX L11[ae])(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # Movic
 Movic:
   regex: 'MOVIC|F4502'
@@ -17432,7 +18097,7 @@ MTN:
     - regex: 'MTN-([a-z0-9_\-]+)'
       model: 'MTN-$1'
 
-# Hammer (hammerphones.com) sub brand MyPhone
+# Hammer (hammerphones.com) sub brand myPhone (PL)
 Hammer:
   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'
@@ -17474,7 +18139,7 @@ Hammer:
 
 # Rombica (rumbica.ru)
 Rombica:
-  regex: 'Rombica[_ ]|(SSQ-A0500|Smart Box v[0-9]+|Smart Box (?:[ABCDXYZ]1|[GDFQ]2|[AF]3|H4)|myPhone Jet)(?:[);/ ]|$)'
+  regex: 'Rombica[_ ]|(SSQ-A0500|Smart Box v[0-9]+|Smart Box (?:[ABCDXYZ]1|[GDFQ]2|[AF]3|H4)|myPhone Jet|55MT-UDG54G)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'myPhone Jet'
@@ -17484,65 +18149,24 @@ Rombica:
       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)(?:[);/ ]|$)'
+    - regex: '(55MT-UDG54G|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'
+# MyPhone or my|phone, or MyPhone Pilipinas (myphone.com.ph)
+MyPhone (PH):
+  regex: 'MyPad[ _][^;/)]+( Build|[);])|MyPhone ?(?:A888|A919 Duo|Agua (?:Infinity|Rio ?(?:Fun|Lite)?)|MY27|Rio (?:2 ?(?:Fun|Lite)?|Pixie)|UNO)|my(?:A(?:10|[789])|T[356]) DTV|myWX1 Plus|myXI1(?:[ _](?:Plus|Pro))?|my(?:G1|XI3|NX1|X12|X[23589]|A1[0-35-8]|29S|807)|Brown [12]|A898 DUO'
   device: 'smartphone'
   models:
     # explicit table models
-    - regex: 'myTab_10III'
-      model: 'MyTab 10 III'
-      device: 'tablet'
-    - regex: 'myTab10II'
-      model: 'MyTab 10 II'
-      device: 'tablet'
     - regex: 'myT([356]) DTV'
       model: 'myT$1 DTV'
       device: 'tablet'
-    - regex: 'SmartView_7_3G'
-      model: 'SmartView 7" 3G'
-      device: 'tablet'
-    - regex: 'SmartView_8_LTE'
-      model: 'SmartView 8" LTE'
-      device: 'tablet'
-    - regex: 'SmartView_9[_.]6_3G'
-      model: 'SmartView 9.6" 3G'
-      device: 'tablet'
 
     # explicit smartphones models
     - regex: 'myA([789]|10) DTV'
       model: 'myA$1 DTV'
     - regex: 'A898 DUO'
       model: 'A898 Duo'
-    - regex: 'Cube_LTE|Cube 16GB'
-      model: 'Cube LTE'
-    - regex: 'INFINITY (LTE|3G)'
-      model: 'Infinity $1'
-    - regex: 'Infinit 2'
-      model: 'Infinit 2'
-    - regex: 'Prime_4_Lite'
-      model: 'Prime 4 Lite'
-    - regex: 'C-Smart_pix'
-      model: 'C-Smart Pix'
-    - regex: 'Pocket_2(?:[);/ ]|$)'
-      model: 'Pocket 2'
-    - regex: 'Pocket(?:[);/ ]|$)'
-      model: 'Pocket'
-    - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?Lite'
-      model: 'FUN $1 Lite'
-    - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?LTE'
-      model: 'FUN $1 LTE'
-    - regex: '(?:myPhone_)?Fun_?([48]|18x9)'
-      model: 'FUN $1'
-    - regex: 'Hammer AXE Pro'
-      model: 'Hammer Axe Pro'
-    - regex: 'myPhone AXE 3G'
-      model: 'Hammer Axe 3G'
-    - regex: '(?:HAMMER_)?AXE[_ ]M[_ ]LTE'
-      model: 'Hammer Axe M LTE'
     - regex: 'MyPhoneMY27'
       model: 'my27'
     - regex: 'MY807'
@@ -17553,28 +18177,14 @@ MyPhone:
       model: 'myXI1 Pro'
     - regex: 'myXI([13])(?:[);/ ]|$)'
       model: 'myXI$1'
-    - regex: 'my(X[23589]|NX1|A1[12356]i?|29S|G1|X12|A1[078])(?:[);/ ]|$)'
+    - regex: 'my(A1[0-35-8]i?|G1|NX1|X[23589]|X12|29S)(?:[);/ ]|$)'
       model: 'my$1'
     - regex: 'myWX1 Plus(?:[);/ ]|$)'
       model: 'myWX1 Plus'
-    - regex: 'Q_Smart_BE(?:[);/ ]|$)'
-      model: 'Q-Smart BE'
-    - regex: 'Q-Smart_Plus(?:[);/ ]|$)'
-      model: 'Q-Smart Plus'
-    - regex: 'Prime_18x9(_LTE)?(?:[);/ ]|$)'
-      model: 'Prime 18x9$1'
-    - regex: 'Prime3Lite(?:[);/ ]|$)'
-      model: 'Prime 3 Lite'
     - regex: 'Brown 1(?:[);/ ]|$)' # ARK Brown 1
       model: 'Brown 1'
     - regex: 'brown 2(?:[);/ ]|$)' # ARK Brown 1
       model: 'Brown 2'
-    - regex: 'myPhone[_ ]Pocket[_ ]Pro'
-      model: 'Pocket Pro'
-    - regex: 'Q-Smart_III_Plus'
-      model: 'Q-Smart III Plus'
-    - regex: 'LUNA_II'
-      model: 'Luna II'
 
     # general detections
     - regex: 'MyPhone[ _]([^;/)]+)( Build|[;)])'
@@ -17582,8 +18192,76 @@ MyPhone:
     - regex: 'MyPad[ _]([^;/(]+)(?: Build|[;)])'
       model: 'MyPad $1'
       device: 'tablet'
-    - regex: 'MyTab[ _]([^;/]+)(?: Build|[;)])'
-      model: 'MyTab $1'
+
+# myPhone (https://www.myphone.pl/)
+myPhone (PL):
+  regex: '(?:myPhone|myTab)_?[^;/)]+( Build|[);])|(?:FUN|Pocket|Prime)_18x9|Prime3Lite|Prime_4_Lite|Q-Smart_Plus|Q-Smart_III_Plus|Q_Smart_BE|(?:HAMMER_)?AXE[_ ]M[_ ]LTE|Hammer[_ ](?:Axe)|Cube_LTE|C-Smart_pix|SmartView_9\.6_3G|SmartView_(?:[78]|9_6)_(?:LTE|[34]G)|Android 6(?:[\d.]*);(?: [\w-]+;)? Pocket|Pocket_2|LUNA_II'
+  device: 'smartphone'
+  models:
+    # explicit smartphones models
+    - regex: 'C-Smart_pix'
+      model: 'C-Smart Pix'
+    - regex: 'Cube_LTE|Cube 16GB'
+      model: 'Cube LTE'
+    - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?Lite'
+      model: 'FUN $1 Lite'
+    - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?LTE'
+      model: 'FUN $1 LTE'
+    - regex: '(?:myPhone_)?Fun_?([48]|18x9)'
+      model: 'FUN $1'
+    - regex: 'Hammer AXE Pro'
+      model: 'Hammer Axe Pro'
+    - regex: 'myPhone AXE 3G'
+      model: 'Hammer Axe 3G'
+    - regex: '(?:HAMMER_)?AXE[_ ]M[_ ]LTE'
+      model: 'Hammer Axe M LTE'
+    - regex: 'INFINITY (LTE|3G)'
+      model: 'Infinity $1'
+    - regex: 'LUNA_II'
+      model: 'Luna II'
+    - regex: 'Pocket_2(?:[);/ ]|$)'
+      model: 'Pocket 2'
+    - regex: 'Pocket(?:[);/ ]|$)'
+      model: 'Pocket'
+    - regex: 'myPhone[_ ]Pocket[_ ]Pro'
+      model: 'Pocket Pro'
+    - regex: 'Pocket_18x9'
+      model: 'Pocket 18x9'
+    - regex: 'Prime3Lite(?:[);/ ]|$)'
+      model: 'Prime 3 Lite'
+    - regex: 'Prime_4_Lite'
+      model: 'Prime 4 Lite'
+    - regex: 'Prime_18x9(_LTE)?(?:[);/ ]|$)'
+      model: 'Prime 18x9$1'
+    - regex: 'Q_Smart_BE(?:[);/ ]|$)'
+      model: 'Q-Smart BE'
+    - regex: 'Q-Smart_Plus(?:[);/ ]|$)'
+      model: 'Q-Smart Plus'
+    - regex: 'Q-Smart_III_Plus'
+      model: 'Q-Smart III Plus'
+
+    # explicit table models
+    - regex: 'myTab10II'
+      model: 'myTab 10 II'
+      device: 'tablet'
+    - regex: 'myTab_10III'
+      model: 'myTab 10 III'
+      device: 'tablet'
+    - regex: 'SmartView_7_3G'
+      model: 'SmartView 7" 3G'
+      device: 'tablet'
+    - regex: 'SmartView_8_LTE'
+      model: 'SmartView 8" LTE'
+      device: 'tablet'
+    - regex: 'SmartView_9[_.]6_3G'
+      model: 'SmartView 9.6" 3G'
+      device: 'tablet'
+
+    # general detections
+    - regex: 'myPhone[ _]([^;/)]+)( Build|[;)])'
+      model: '$1'
+    - regex: 'myTab[ _]?([^;/]+)(?: Build|[;)])'
+      model: 'myTab $1'
       device: 'tablet'
 
 # MyWigo
@@ -17783,19 +18461,21 @@ Novacom:
 
 # Novey (https://www.novey.com.pa/ https://noveymobile.com)
 Novey:
-  regex: 'Novey|(?:Force (?:F15|G20)|Alpha A10)(?:[);/ ]|$)'
+  regex: 'Novey|(?:Pro K10|(?:Force (?:F15|G20)|Alpha A10))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Force (F15|G20)'
       model: 'Force $1'
     - regex: 'Alpha A10'
       model: 'Alpha A10'
+    - regex: 'Pro K10'
+      model: 'Pro K10'
     - regex: 'Novey (L2)(?:[);/ ]|$)'
       model: '$1'
 
 # nec or nec lavie (www.nec-lavie.jp)
 NEC:
-  regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2\.0[ ,]N|(?:PC-T[SE]\d{3}[\w]{2,3}|N-06C|N-02E|LAVIE T11 (?:11QHD1|112K1)|LAVIE Tab E (?:10|8)FHD[12]|7SD1|8HD1|LAVIE Tab (?:10FHD3|T12 12QHD1))(?:[);/ ]|$)'
+  regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2\.0[ ,]N|(?:PC-T[SE]\d{3}[\w]{2,3}|N-06C|N-02E|LAVIE T11 (?:11QHD1|112K1)|LAVIE Tab E (?:10|8)FHD[12]|7SD1|8HD1|LAVIE Tab (?:10FHD3|T12 12QHD1|9QHD1))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'N-06C(?:[);/ ]|$)'
@@ -17832,6 +18512,9 @@ NEC:
     - regex: 'PC-TS(\d+)'
       device: 'tablet'
       model: 'LAVIE Tab S TS$1'
+    - regex: 'LAVIE Tab (9QHD1)'
+      device: 'tablet'
+      model: 'LAVIE Tab $1'
 
 # Neffos (sub brand TP-Link) (neffos.com)
 Neffos:
@@ -17895,9 +18578,11 @@ NeuImage:
 
 # NextBook
 NextBook:
-  regex: 'Next[0-9]|NX(?:785QC8G|M900MC|008HD8G|010HI8G|M908HC|M726|16A8116K|A8QC116|A8LTE116|16A10132S|16A11264|A116QC164|A101LTE116)'
+  regex: 'Next[0-9]|NX(?:785QC8G|M900MC|008HD8G|010HI8G|M908HC|M726|16A8116K|A8QC116|A8LTE116|16A10132S|16A11264|A116QC164|A101LTE116)|(?:BRT81)(?:[);/ ]|$)'
   device: 'tablet'
   models:
+    - regex: '(BRT81)(?:[);/ ]|$)'
+      model: '$1'
     - regex: 'NX008HD8G'
       model: 'Premium 8 HD'
     - regex: 'NXA8QC116'
@@ -17987,17 +18672,14 @@ Noblex:
 
 # NOGA (https://noganet.ar/)
 NOGA:
-  regex: '(?:NOGAPC (?:LIVE|PRO)|NOGAPAD ?(?:7G|10\.1GHD|10HD))(?:[);/ ]|$)'
-  device: 'smartphone'
+  regex: '(?:NOGAPC (?:LIVE|PRO|ULTRA)|NOGAPAD ?(?:7G|10\.1GHD|10HD))(?:[);/ ]|$)'
+  device: 'tablet'
   models:
     - regex: 'NOGAPAD ?7G(?:[);/ ]|$)'
-      device: 'tablet'
       model: 'NOGAPAD 7G'
     - regex: 'NOGAPAD ?10\.1GHD(?:[);/ ]|$)'
-      device: 'tablet'
       model: 'NOGAPAD 10.1" GHD'
     - regex: 'NOGAPAD 10HD'
-      device: 'tablet'
       model: 'NOGAPAD 10HD'
     - regex: 'NOGAPC PRO(?:[);/ ]|$)'
       device: 'tv'
@@ -18005,6 +18687,9 @@ NOGA:
     - regex: 'NOGAPC LIVE(?:[);/ ]|$)'
       device: 'tv'
       model: 'PC Live'
+    - regex: 'NOGAPC ULTRA(?:[);/ ]|$)'
+      device: 'tv'
+      model: 'PC Ultra'
 
 # Nomu
 Nomu:
@@ -18037,7 +18722,7 @@ Nordmende:
   regex: 'NORDMENDE[ _;,]'
   device: 'tv'
   models:
-    - regex: 'NORDMENDE_(43NM6000F)(?:[);/ ]|$)'
+    - regex: 'NORDMENDE[_ ](43NM6000F|55NM6000U)(?:[);/ ]|$)'
       model: '$1'
 
 # Opsson
@@ -18190,9 +18875,9 @@ Nomi:
     - regex: 'Nomi[ _-]([^;/)]+)(?:[;/)]|$)'
       model: '$1'
 
-# NUU Mobile
+# NUU Mobile (https://nuumobile.com/)
 NUU Mobile:
-  regex: 'NUU_|(?:(?:N(570[24]|500[12]|6001)L|S6512L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L|S6501L|S6303L|T080[12]L)(?:[);/ ]|$)'
+  regex: 'NUU_|(?:(?:N(500[12]|550[12]|570[24]|6001)L|S(?:5501|5701|600[13]|6303|6501|6512)L|T080[12]L)|A6L-[CG])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'T080[12]L'
@@ -18205,6 +18890,8 @@ NUU Mobile:
       model: 'M$1'
     - regex: 'NUU_X5(?:[);/ ]|$)'
       model: 'X5'
+    - regex: 'S6003L'
+      model: 'X6 Plus'
     - regex: 'N5704L'
       model: 'G1'
     - regex: 'S6512L'
@@ -18378,7 +19065,7 @@ Funai:
 
 # Fusion5 (www.fusion5store.com)
 Fusion5:
-  regex: 'Fusion5|F104Bv2|F104EvII_PRO|F104EvII'
+  regex: 'Fusion5|F104Bv2|F104EvII_PRO|F104EvII|F105D_128'
   device: 'tablet'
   models:
     - regex: '(?:Fusion5_)?(F104B)v2_PRO'
@@ -18389,11 +19076,11 @@ Fusion5:
       model: 'F104EVII Pro'
     - regex: '(?:Fusion5_)?F104EvII(?:_EEA)?(?:[);/ ]|$)'
       model: 'F104EVII'
-    - regex: '(?:Fusion5_)?(F704B|F105D|F104E)(?:_EEA)?(?:[);/ ]|$)'
+    - regex: '(?:Fusion5_)?(F704B|F105D|F104E)(?:_128|_EEA)?(?:[);/ ]|$)'
       model: '$1'
 
 # ZH&K Mobile (zhnkmobile.com)
-'ZH&K':
+ZH&K:
   regex: '(?:Odyssey[_ ](?:evo|DTV[67]|J[59]|J10|GLAZE\+?|RANGE|ACE|AEON|VICTORY|SACRED|SAGA|SWIFT|O2|ULTRA|FLAME|POPO|PERRI|TYTAN|HIGH|SOAR|ERA)|ODYSSEY[ _]?NEXT|INTENSE (?:RISE|Hype|GAME))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -18626,9 +19313,17 @@ Obi:
     - regex: 'Obi[ _-]([^;/)]+)(?:[;/)]|$)'
       model: '$1'
 
+# Okapi (https://www.okapius.com/)
+Okapi:
+  regex: 'Okapi(?!a)'
+  device: 'smartphone'
+  models:
+    - regex: 'Okapi10(?:[);/ ]|$)'
+      model: 'Okapi 10'
+
 # Okapia
 Okapia:
-  regex: 'Okapia|Signature (?:L|Pro|Touch)'
+  regex: 'Okapia|Signature (?:L|Pro|Touch)|(?<!STYLO SM61 )(?:MAGIC\+)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Signature (L|Pro|Touch)'
@@ -18637,12 +19332,19 @@ Okapia:
       model: 'X1'
     - regex: 'Okapia[_ ]Mirage(?:[);/ ]|$)'
       model: 'Mirage'
+    - regex: 'MAGIC\+(?:[);/ ]|$)'
+      model: 'Magic+'
+    - regex: 'Okapia[_ ]?Magic(?:[);/ ]|$)'
+      model: 'Magic'
 
-# Olax
+# Olax (https://www.olaxwifi.com/)
 Olax:
-  regex: 'Olax '
+  regex: 'Olax |Ocean K(?:10|8)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Ocean (K10|K8)(?:[);/ ]|$)'
+      model: 'Ocean $1'
+      device: 'tablet'
     - regex: 'Olax Prime 12(?:[);/ ]|$)'
       model: 'Prime 12'
 
@@ -18705,7 +19407,7 @@ Onda:
     - regex: 'OBOOK[_ ]?20[_ ]PLUS'
       device: 'tablet'
       model: 'oBook 20 Plus'
-    - regex: ' V10 4G(?:[);/ ]|$)'
+    - regex: 'V10 4G(?:[);/ ]|$)'
       model: 'V10 10.1" 4G'
       device: 'tablet'
     - regex: 'V80[ _]SE(?:[);/ ]|$)'
@@ -18731,7 +19433,7 @@ Onda:
 
 # OnePlus (www.oneplus.com or oneplus.com.ru)
 OnePlus:
-  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|[;)])'
+  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|CPH260[59]|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|OPD2304|PJ[ADEFX]110|CPH26(?:19|21))(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: '(?:CPH2585|CPH2611|CPH2609)(?:[);/ ]|$)'
@@ -18746,6 +19448,8 @@ OnePlus:
       model: 'Open'
     - regex: 'PJE110(?:[);/ ]|$)'
       model: 'Ace 3'
+    - regex: 'PJX110(?:[);/ ]|$)'
+      model: 'Ace 3 Pro 5G'
     - regex: 'PJF110(?:[);/ ]|$)'
       model: 'Ace 3V'
     - regex: 'PHK110(?:[);/ ]|$)'
@@ -18768,6 +19472,8 @@ OnePlus:
       model: 'Nord CE 5G'
     - regex: 'CPH2613'
       model: 'Nord CE 4'
+    - regex: 'CPH26(?:19|21)'
+      model: 'Nord CE 4 Lite 5G'
     - regex: 'CPH(?:2381|2409)(?:[);/ ]|$)'
       model: 'Nord CE 2 Lite'
     - regex: 'CPH246[57](?:[);/ ]|$)'
@@ -18788,6 +19494,8 @@ OnePlus:
       model: 'Nord N20 5G'
     - regex: '(?:CPH251[35])(?:[);/ ]|$)'
       model: 'Nord N30 5G'
+    - regex: '(?:CPH2605)(?:[);/ ]|$)'
+      model: 'Nord N30 SE 5G'
     - regex: 'CPH2469(?:[);/ ]|$)'
       model: 'Nord N20 SE'
     - regex: 'BE2025(?:[);/ ]|$)'
@@ -18863,12 +19571,15 @@ OnePlus:
     - regex: 'OPD2203(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Pad 11.61" WiFi'
+    - regex: 'OPD2304(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Pad Go 11.35"'
     - regex: '(?:du_)?ONEPLUS[ _]?([^;/,)(]+)(?: Build|[;,)])'
       model: '$1'
 
 # 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[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)(?:[);/ ]|$)'
+  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[246])|36(?:1[0125789]|[39]0|36|2[347](?:_Natv_vf)?|8[67]|6[013])|37(?:0[0689]|6[125]|[14-7]0|[0457]1|8[01235])|38(?:[039]0|2[03]|34|4[01234]|5[0123]|6[78]|7[01]|88)|39(?:9[35789]|10|3[09]))|(?:OPPO[ _]?)?CPH1861|RMP220[45]|RMP210[235-8]|4K Google TV Stick)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'RMX3844'
@@ -18881,6 +19592,10 @@ Realme:
       model: 'GT Neo 5'
     - regex: 'RMX3852'
       model: 'GT Neo 6'
+    - regex: 'RMX38(?:51|00)'
+      model: 'GT 6'
+    - regex: 'RMX3853'
+      model: 'GT 6T'
     - regex: 'RMX3850'
       model: 'GT Neo 6 SE'
     - regex: 'RMX3700'
@@ -19011,8 +19726,12 @@ Realme:
       model: '12+ 5G'
     - regex: 'RMX3999'
       model: '12 5G'
+    - regex: 'RMX3871'
+      model: '12'
     - regex: 'RMX3998'
       model: '12x 5G'
+    - regex: 'RMX3993'
+      model: '12x'
     - regex: 'RMX1925(?:[);/ ]|$)'
       model: '5S'
     - regex: 'RMX1811(?:[);/ ]|$)'
@@ -19057,12 +19776,22 @@ Realme:
       model: 'C55'
     - regex: 'RMX3830'
       model: 'C51'
+    - regex: 'RMX3765'
+      model: 'C51s'
     - regex: 'RMX376[02]'
       model: 'C53'
+    - regex: 'RMX3930'
+      model: 'C61'
+    - regex: 'RMX3939'
+      model: 'C63'
     - regex: 'RMX3890'
       model: 'C67'
     - regex: 'RMX3782'
       model: 'C67 5G'
+    - regex: 'RMX3910'
+      model: 'C65'
+    - regex: 'RMX3997'
+      model: 'C65 5G'
     - regex: 'RMX3231'
       model: 'C11 (2021)'
     - regex: 'RMX382[03]'
@@ -19171,10 +19900,18 @@ Realme:
       model: 'V20'
     - regex: 'RMX3571'
       model: 'V23'
+    - regex: 'RMX3576'
+      model: 'V23i'
     - regex: 'RMX3475'
       model: 'V25'
     - regex: 'RMX3619'
       model: 'V30'
+    - regex: 'RMX3783'
+      model: 'V50'
+    - regex: 'RMX3781'
+      model: 'V50s'
+    - regex: 'RMX3995'
+      model: 'V60'
     - regex: 'RMX2202'
       model: 'GT 5G'
     - regex: 'Realme[ _]([1-9])[ _]Pro(?:[);/ ]|$)'
@@ -19199,10 +19936,10 @@ Realme:
 
 # 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|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)(?:[);/ ]|$)'
+  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|Reno Ace|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|PCHT[13]0|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?|220[12]|230[12])|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PH[WQJMU]110|PH[AY]120|PGGM10|PG[WX]110|PGU110|PCCM40|CHP1723|PGT110|PGEM10|RX17Neo|R15 Dream Mirror|R9 Plustm A|PGFM10|A301OP|P(?:J[CGJSU]|H[FVSTNYZ])110|K9 Pro 5G| K9[xs]|CPH1821EX|PJ[HYBVRW]110|PKA110|CHP2219|RX17Pro|F7 Youth|A302OP|Reno [56])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'PCHM10(?:[);/ ]|$)'
+    - regex: 'PCH[TM]10(?:[);/ ]|$)'
       model: 'A11'
     - regex: 'PHQ110(?:[);/ ]|$)'
       model: 'A1 Pro'
@@ -19210,8 +19947,14 @@ OPPO:
       model: 'A1i 5G'
     - regex: 'PJS110'
       model: 'A2x 5G'
+    - regex: 'CPH2681'
+      model: 'A3x 5G'
     - regex: 'PJB110'
       model: 'A2 5G'
+    - regex: 'PKA110'
+      model: 'A3 5G'
+    - regex: 'PJY110|CPH2665|CPH2639'
+      model: 'A3 Pro 5G'
     - regex: 'PCHT30(?:[);/ ]|$)'
       model: 'A11x'
     - regex: '(?:CPH2083|CPH2077)(?:[);/ ]|$)'
@@ -19286,8 +20029,10 @@ OPPO:
       model: 'A54s'
     - regex: 'PEM[MT][02]0(?:[);/ ]|$)'
       model: 'A55 5G'
-    - regex: 'CPH2325(?:[);/ ]|$)'
+    - regex: 'CPH2325'
       model: 'A55'
+    - regex: 'CPH2631'
+      model: 'A60'
     - regex: '(?:A102OP|CPH2309)(?:[);/ ]|$)'
       model: 'A55s 5G'
     - regex: 'PFVM10'
@@ -19316,7 +20061,7 @@ OPPO:
       model: 'A72'
     - regex: 'CPH(?:2161|2099)(?:[);/ ]|$)'
       model: 'A73 5G'
-    - regex: 'CPH2219(?:[);/ ]|$)'
+    - regex: '(?:CHP|CPH)2219(?:[);/ ]|$)'
       model: 'A74'
     - regex: 'CPH2263(?:[);/ ]|$)'
       model: 'A74 5G'
@@ -19390,6 +20135,8 @@ OPPO:
       model: 'F23 5G'
     - regex: 'CPH2603'
       model: 'F25 Pro 5G'
+    - regex: 'CPH2643'
+      model: 'F27 Pro+ 5G'
     - regex: 'CPH191[135](?:[);/ ]|$)'
       model: 'F11'
     - regex: 'CPH19(?:69|87)(?:[);/ ]|$)'
@@ -19410,6 +20157,8 @@ OPPO:
       model: 'F5 Youth'
     - regex: '(?:OPPO[ _]?)?CPH18(?:[15]9|21|21EX)(?:[);/ ]|$)'
       model: 'F7'
+    - regex: 'F7 Youth'
+      model: 'F7 Youth'
     - regex: '(?:OPPO[ _]?)?(?:CPH1825|CPH1881)(?:[);/ ]|$)'
       model: 'F9'
     - regex: '(?:OPPO[ _]?)?CPH1823(?:[);/ ]|$)'
@@ -19482,6 +20231,8 @@ OPPO:
       model: 'Find X7'
     - regex: 'PHY110'
       model: 'Find X7 Ultra'
+    - regex: 'PHY120'
+      model: 'Find X7 Ultra SE'
     - regex: '(?:OPPO[ _]?)?R1011 Build'
       model: 'Joy Plus'
     - regex: '(?:OPPO[ _]?)?(PBC(?:M30|T10))(?:[);/ ]|$)'
@@ -19516,6 +20267,8 @@ OPPO:
       model: 'A2 5G'
     - regex: '(?:OPPO[ _]?)?PHF110'
       model: 'K11x 5G'
+    - regex: '(?:OPPO[ _]?)?PJR110'
+      model: 'K12 5G'
     - regex: '(?:OPPO[ _]?)?N5117(?:[);/ ]|$)'
       model: 'N1 Mini'
     - regex: '(?:OPPO[ _]?)?N520[79](?:[);/ ]|$)'
@@ -19560,7 +20313,7 @@ OPPO:
       model: 'R15 Neo'
     - regex: '(?:OPPO[ _]?)?(?:CPH1893)(?:[);/ ]|$)'
       model: 'R17 Neo'
-    - regex: '(?:OPPO[ _]?)?(?:CPH1877|PBD[MT]00)(?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1877|PBD[MT]00|RX17Pro)(?:[);/ ]|$)'
       model: 'R17 Pro'
     - regex: '(?:OPPO[ _]?)?R8006(?:[);/ ]|$)'
       model: 'R1L'
@@ -19598,7 +20351,7 @@ OPPO:
       model: 'Reno 10'
     - regex: 'CPH2531'
       model: 'Reno 10 5G'
-    - regex: '(?:CPH2525|PHV110)(?:[);/ ]|$)'
+    - regex: '(?:CPH2525|PHV110|A302OP)(?:[);/ ]|$)'
       model: 'Reno 10 Pro 5G'
     - regex: 'CPH2521|PHU110'
       model: 'Reno 10 Pro+ 5G'
@@ -19606,6 +20359,16 @@ OPPO:
       model: 'Reno 11 Pro'
     - regex: 'CPH2599|PJH110'
       model: 'Reno 11'
+    - regex: 'PJ[VW]110'
+      model: 'Reno 12'
+    - regex: 'CPH2625'
+      model: 'Reno 12 5G'
+    - regex: 'CPH2637'
+      model: 'Reno 12 F 5G'
+    - regex: 'CPH2687'
+      model: 'Reno 12 F 4G'
+    - regex: 'CPH2629'
+      model: 'Reno 12 Pro 5G'
     - regex: '(?:PCKM00|CPH1907)(?:[);/ ]|$)'
       model: 'Reno 2'
     - regex: 'CPH1989(?:[);/ ]|$)'
@@ -19630,7 +20393,7 @@ OPPO:
       model: 'Reno 4 Pro 4G'
     - regex: '(?:PDP[TM]00|CPH2091)(?:[);/ ]|$)'
       model: 'Reno 4 5G'
-    - regex: 'PEA[TM]00(?:[);/ ]|$)'
+    - regex: '(?:PEA[TM]00|Reno4 SE 5G)(?:[);/ ]|$)'
       model: 'Reno 4 SE 5G '
     - regex: '(?:PDN[TM]00|CPH2089)(?:[);/ ]|$)'
       model: 'Reno 4 Pro 5G'
@@ -19638,8 +20401,6 @@ OPPO:
       model: 'Reno 4Z 5G'
     - regex: 'CPH2209(?:[);/ ]|$)'
       model: 'Reno 4F'
-    - regex: 'CPH2159|Reno5 4G(?: Build|[;)])'
-      model: 'Reno 5'
     - regex: '(?:CPH2199|A10[13]OP)|Reno5 A 5G(?: Build|[;)])'
       model: 'Reno 5A'
     - regex: 'CPH2205|Reno5 Lite(?: Build|[;)])'
@@ -19660,8 +20421,8 @@ OPPO:
       model: 'Reno 5 Pro Plus 5G'
     - regex: '(?:CPH1921|PCCM40)(?:[);/ ]|$)'
       model: 'Reno 5G'
-    - regex: '(?:CPH2235|PEQM00|CPH2251|Reno6 5G)(?:[);/ ]|$)'
-      model: 'Reno 6'
+    - regex: 'CPH2159|(?:Reno5 4G|Reno 5)(?: Build|[;)])'
+      model: 'Reno 5'
     - regex: 'CPH2237|Reno6 Z 5G(?: Build|[;)])'
       model: 'Reno 6 Z 5G'
     - regex: 'PEPM00(?:[);/ ]|$)'
@@ -19670,6 +20431,8 @@ OPPO:
       model: 'Reno 6 Pro 5G'
     - regex: 'PENM00(?:[);/ ]|$)'
       model: 'Reno 6 Pro Plus'
+    - regex: '(?:CPH2235|PEQM00|CPH2251|Reno6 5G|Reno 6)(?:[);/ ]|$)'
+      model: 'Reno 6'
     - regex: 'PFJM10|CPH2371|CPH2363|Reno7(?: Build|[;)])'
       model: 'Reno 7'
     - regex: 'CPH2343'
@@ -19702,6 +20465,8 @@ OPPO:
       model: 'K9 Pro 5G'
     - regex: '(?:PEXM00)(?:[);/ ]|$)'
       model: 'K9 5G'
+    - regex: 'Reno Ace 2 EVA'
+      model: 'Reno Ace 2 EVA'
     - regex: 'PCLM10(?:[);/ ]|$)'
       model: 'Reno Ace'
     - regex: 'PDHM00(?:[);/ ]|$)'
@@ -19728,7 +20493,7 @@ OPPO:
     - regex: 'OPD2302'
       model: 'Pad Neo'
       device: 'tablet'
-    - regex: 'OPD2201'
+    - regex: 'OPD220[12]'
       model: 'Pad 2'
       device: 'tablet'
     - regex: 'OPD2101'
@@ -19794,7 +20559,7 @@ Orange:
     - regex: 'orange_Tab_7_4G'
       model: 'Tab 7 4G'
       device: 'tablet'
-    - regex: 'Orange[ _-](Rise)(3[12]|5[12])(?:[);/ ]|$)'
+    - regex: 'Orange[ _-](Rise) ?(3[125]|5[12])(?:[);/ ]|$)'
       model: '$1 $2'
     - regex: '(?:Orange[ _-])?Dive ?(\d+) Dual(?:[);/ ]|$)'
       model: 'Dive $1 Dual'
@@ -19807,7 +20572,7 @@ Orange:
 
 # Oukitel
 Oukitel:
-  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)?)(?:[);/ ]|$)'
+  regex: 'OU[Kc]ITEL|(?:Android 10(?:[\d.]*);(?: [\w-]+;)? (?:C19|C22)|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:C11|U23)|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:K12)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:C25)|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:C3[12])|Android 1[23](?:[\d.]*);(?: [\w-]+;)? (?:K16|C51|C3[3568]|RT8)|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[023568]|50)|K[37]_Pro|K13_Pro|U25_Pro|OKT[13]|UniverseTap|RT7 TITAN(?: 5G)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'WP21 Ultra'
@@ -19816,8 +20581,6 @@ Oukitel:
       model: '$1 Pro'
     - regex: 'K7 Power(?:[);/ ]|$)'
       model: 'K7 Power'
-    - regex: '(?:OUKITEL)? K([37]|16)(?:[);/ ]|$)'
-      model: 'K$1'
     - regex: '(K10000|U16|U7)[ _]Max(?:[);/ ]|$)'
       model: '$1 Max'
     - regex: '(U20|K[46]000|U7|U11|OK6000|K15|C12|C21)[_ ]?Plus(?:[);/ ]|$)'
@@ -19828,8 +20591,10 @@ Oukitel:
       model: '$1 Mix'
     - 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|C31|WP15 S|C25)(?:[);/ ]|$)'
+    - regex: '(?:Oukitel-)?(Y4800|K10000|K[4-8]000|WP5000|[CU]2|U1[078]|U2[23]|C1[19]|C[23]2|C3|C3[13568]|C51|WP15 S|C25)(?:[);/ ]|$)'
       model: '$1'
+    - regex: '(?:OUKITEL)? K([37]|1[26])(?:[);/ ]|$)'
+      model: 'K$1'
 
     - regex: 'RT7 TITAN 5G'
       device: 'tablet'
@@ -19837,7 +20602,7 @@ Oukitel:
     - regex: 'RT7 TITAN'
       device: 'tablet'
       model: 'RT7 Titan'
-    - regex: ' (RT[12356]|OKT[13]|OT[568])(?:[);/ ]|$)'
+    - regex: '(RT[123568]|OKT[13]|OT5 S|OT[568])(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
@@ -19912,6 +20677,14 @@ Overmax:
     - regex: '(OV-[a-z]+(?:[^/();]+))(?: Build|[();])'
       model: '$1'
 
+# OX TAB
+OX TAB:
+  regex: 'Ox-([^;/)]+)(?: Build|[;)])'
+  device: 'tablet'
+  models:
+    - regex: 'Ox-p010-2(?:[);/ ]|$)'
+      model: 'Ox-p010-2'
+
 # Oysters
 Oysters:
   regex: 'Oysters|T84ERI[ _]3G|T72HM(s_)?3G|T102MS_3G|T102ER3G|T72ER3G|(T74HMi|T84Bi)[_ ]4G|T74MR4G|T74RD|T84Ni[_ ][34]G|Pacific(?:[ ]?800i|E)|T104B_[34]G|IndianV|T72HA_3G|T12V? 3G|T74D_3G|T74N_3G|T74SC_3G|T74Mai_3G|T74MRi3G|T104MBi_3G|T104SCi_3G|T104ER4G|Arctic450|Atlantic(?:4G|454|[EV])|AntarcticE|Life4G|T7V 3G|Pacific(?:VS?|I?4G|454)'
@@ -19990,7 +20763,7 @@ Panacom:
 
 # panasonic
 Panasonic:
-  regex: 'Panasonic|PANATV[0-9]+|Viera/|(?:P902i|P-0[28]D|FZ-B2D|FZ-[NX]1|FZ-A2A|DMC-CM1|P-01[JK]|P-0[23]E|P55 Max)(?:[);/ ]|$)|Eluga[ _]|P55 Novo 4G'
+  regex: 'Panasonic|PANATV[0-9]+|Viera/|4KTV-0SU|(?:P902i|P-0[28]D|FZ-B2D|FZ-[NX]1|FZ-A2A|DMC-CM1|P-01[JK]|P-0[23]E|P55 Max)(?:[);/ ]|$)|Eluga[ _]|P55 Novo 4G'
   device: 'smartphone'
   models:
     - regex: 'P-01J(?:[);/ ]|$)'
@@ -20038,7 +20811,7 @@ Panasonic:
     - regex: 'PANATV[0-9]+|Viera/'
       device: 'tv'
       model: 'Smart TV'
-    - regex: '(43D1200|(?:32|43)D1270|32D1280)'
+    - regex: '(43D1200|(?:32|43)D1270|32D1280|4KTV-0SU[WF]?)'
       device: 'tv'
       model: '$1'
     - regex: 'PANASONIC, ([a-z0-9_ \-]+), (?:wired|wireless)'
@@ -20058,7 +20831,7 @@ Panasonic:
 
 # PCBOX
 PCBOX:
-  regex: 'Art-PCB-V116|Bee-PCB-V216|Clap-PCB-I316|PCB-T(?:103|715|750)|Kova[ _-]PCB-\w+|Kova_Plus_PCB_T735'
+  regex: 'Art-PCB-V116|Bee-PCB-V216|Clap-PCB-I316|PCB-T(?:10[34]|715|750)|Kova[ _-]PCB-\w+|Kova_Plus_PCB_T735'
   device: 'smartphone'
   models:
     - regex: 'Art-PCB-V116'
@@ -20070,6 +20843,9 @@ PCBOX:
     - regex: 'PCB-T103'
       device: 'tablet'
       model: 'Curi Lite'
+    - regex: 'PCB-T104'
+      device: 'tablet'
+      model: 'Flash'
     - regex: 'PCB-T(715|750)'
       device: 'tablet'
       model: 'T$1'
@@ -20080,22 +20856,24 @@ PCBOX:
       device: 'tablet'
       model: 'Kova Plus T735'
 
-# PCD or PCD Argentina
+# PCD or PCD Argentina (https://pcdlatam.com/)
 PCD:
-  regex: 'PH4001|PCD[ _](?:PL5507|PH4002|PH3501|E400)'
+  regex: '(?:PCD[ _])?(?:PL5507|PL571US|PH3501|PH400[12]|E400)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'PL571US'
+      model: 'Jaguar Pro II'
     - regex: '(?:PCD[ _])?(P[HL]\d{4}|E400)'
       model: '$1'
 
 # PCD Argentina
 PCD Argentina:
-  regex: 'PCD[ ]?50[689]|PL620(?:[);/ ]|$)'
+  regex: 'PCD[ ]?50[689]|(?:PL620|P63L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PCD[ ]?(50[689])'
       model: '$1'
-    - regex: '(PL620)'
+    - regex: '(PL620|P63L)'
       model: '$1'
 
 # ArmPhone
@@ -20136,7 +20914,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|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))?(?:[);/ ]|$)'
+  regex: 'TCL,|smarttv_AFTMM-TCL|AFTMD002|AFTSHN02|AFTMD001|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|TCL72563C|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRSVO]|5004S|5033TP|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JMEI]|5133MP|5133A|5148A|5152D|5159[AJ]|5164[AD]|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|9183W|9198S|9309X2|9317X1|8[14]96G|916[016]G| 9061| 8182| 8167| 8095|BeyondTV\d?|UnionTV|T507U|5131[AG]|T610[KE]|T612B|9132[GS]|9137W|T430W|T431[DUQ]|T501[CL]|T768S|9494G|9460G|9466X|T60[79]DL)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TCLGalaG60(?:\(9108A\))?(?:[);/ ]|$)'
@@ -20149,17 +20927,19 @@ TCL:
       model: 'Ion'
     - regex: 'T779W(?:[);/ ]|$)'
       model: 'Stylus 5G'
+    - regex: '5[01]33[MT]P(?:[);/ ]|$)'
+      model: '201'
     - regex: '4187D(?:[);/ ]|$)'
       model: '205'
     - regex: '(?:4163D|4188S)(?:[);/ ]|$)'
       model: '304'
-    - regex: '5131G'
+    - regex: '5131[AG]'
       model: '303'
-    - regex: 'T431[DU](?:[);/ ]|$)'
+    - regex: 'T431[DUQ](?:[);/ ]|$)'
       model: '403'
     - regex: '6102[AD](?:[);/ ]|$)'
       model: '305'
-    - regex: '5164D(?:[);/ ]|$)'
+    - regex: '5164[AD](?:[);/ ]|$)'
       model: '305i'
     - regex: '6102H(?:[);/ ]|$)'
       model: '306'
@@ -20235,6 +21015,8 @@ TCL:
       model: 'A2X'
     - regex: 'T601DL(?:[);/ ]|$)'
       model: 'X4 5G'
+    - regex: 'T609DL(?:[);/ ]|$)'
+      model: '40 XE 5G'
     - regex: 'T770[HB](?:[);/ ]|$)'
       model: '10L'
     - regex: 'T766[AHJSU](?:_(?:EEA|TR|RU))?(?:[);/ ]|$)'
@@ -20287,10 +21069,13 @@ TCL:
     - regex: '9494G'
       device: 'tablet'
       model: 'NxtPaper 12 Pro'
+    - regex: '9466X'
+      device: 'tablet'
+      model: 'NxtPaper 11'
     - regex: '9317X1'
       device: 'tablet'
       model: 'Smart Tab 7'
-    - regex: ' 8095(?:[);/ ]|$)'
+    - regex: '8095(?:[);/ ]|$)'
       device: 'tablet'
       model: 'TKEE Max'
     - regex: '9048S(?:[);/ ]|$)'
@@ -20299,6 +21084,9 @@ TCL:
     - regex: '9132G'
       device: 'tablet'
       model: 'Tab 8"'
+    - regex: '9132S'
+      device: 'tablet'
+      model: 'Tab Lite'
     - regex: '9295G'
       device: 'tablet'
       model: '10 TabMax 4G'
@@ -20308,13 +21096,31 @@ TCL:
     - regex: '9296Q'
       device: 'tablet'
       model: '10 TabMax'
-    - regex: ' (?:9061|9081X)(?:[);/ ]|$)'
+    - regex: '9198S(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab Pro 5G'
+    - regex: '9460G(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab 10'
+    - regex: '9183W(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab 10 5G'
+    - regex: '(?:9061|9081X)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab 10s'
-    - regex: ' (?:8167)(?:[);/ ]|$)'
+    - regex: '8496G(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab 10 WiFi (Gen 2)'
+    - regex: '8196G(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab 10 LTE (Gen 2)'
+    - regex: '9309X2(?:_EEA)?(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab 7 Lite'
+    - regex: '(?:8167)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab 7L WiFi'
-    - regex: ' (?:8182)(?:[);/ ]|$)'
+    - regex: '(?:8182)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab 10L WiFi'
     - regex: '9060G|9161G'
@@ -20440,6 +21246,8 @@ Pixus:
       model: 'Line'
     - regex: 'Pixus[ _]Titan'
       model: 'Titan'
+    - regex: 'Pixus[ _]Folio'
+      model: 'Folio'
     - regex: '(?:Pixus_)?Touch[ _]7[ _]3G'
       model: 'Touch 7 3G'
     - regex: 'Pixus[ _]hiMax'
@@ -20484,7 +21292,7 @@ Purism:
       model: 'Librem 5'
 
 # Point Mobile (https://pointmobile.com/)
-'Point Mobile':
+Point Mobile:
   regex: 'PM80'
   device: 'peripheral'
   models:
@@ -20492,7 +21300,7 @@ Purism:
       model: 'PM80'
 
 # Point of View (pointofview.eu)
-'Point of View':
+Point of View:
   regex: 'POV_TV|POV_TAB|MOB-5045|TAB-P10232-3G'
   device: 'tablet'
   models:
@@ -20553,11 +21361,13 @@ ProScan:
     - regex: 'PLT(777[045]|9774|107[47]|9999)G'
       model: 'PLT$1G'
 
-# RCA Tablets (RCA) ((https://www.rca.com/))
+# RCA Tablets (RCA) (https://www.rca.com/)
 RCA Tablets:
-  regex: 'RCA-OEM[;,]|RCT([^;/]+) Build|RCA RLTP4028|RLTP5567|RLTP5573|RC7T3G21|RCT6B06P23|RCT6613W23P|RCT6513W87|DRP(?:29101|2091)|RCT6973W43(?:MD)?|RCT6703W12|RCT(?:6A06P22|6603W47M7|6303W87(?:DK|M)|6773W22B|6203W46L|6873W42B?M|6K03W13|6876Q22N|6A06Q22)'
+  regex: 'RCA-OEM[;,]|RC[AT]([^;/]+)(?: Build|[;)]|$)|RCA RLTP4028|RLTP5567|RLTP5573|RC7T3G21|DRP(?:29101|2091)'
   device: 'smartphone'
   models:
+    - regex: 'RCARENO5011619'
+      model: 'Reno'
     - regex: '(?:RCA[ _])?(RLTP4028|RLTP5567|RLTP5573)'
       model: '$1'
     - regex: 'RCT6513W87'
@@ -20602,6 +21412,12 @@ RCA Tablets:
       device: 'tablet'
       model: 'RC$1'
 
+# RCT or Rectron (https://www.rctzone.co.za/)
+RCT:
+  regex: '(MX101M[23])(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # Readboy
 Readboy:
   regex: 'Readboy[ _-]'
@@ -20795,13 +21611,13 @@ Siemens:
 
 # Soundmax
 Soundmax:
-  regex: '((?:SM-LED32M(?:11|04)S)|SM-QLED50T2SU|SM-LED(?:40M04S|65M01SU))(?:_-Ver01)?(?:[);/ ]|$)'
+  regex: '((?:SM-LED32M(?:1[014]|0[49])S)|SM-QLED50T2SU|SM-LED(?:24M0[69]S|43M02S|40M04S|(?:5[05]|43)M0[12]SU|32M13S|65M0[12]SU))(?:_-Ver01)?(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Samsung
 Samsung:
-  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])?(?:[);/ ]|$)'
+  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|Verizon-SM)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G2[0-7]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit tv models
@@ -20948,9 +21764,18 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-X216'
       device: 'tablet'
       model: 'Galaxy Tab A9+ 11.0" 5G'
+    - regex: '(?:SAMSUNG-)?SM-X218'
+      device: 'tablet'
+      model: 'Galaxy Tab A9+ 11.0" 5G'
     - regex: '(?:SAMSUNG-)?SM-X210'
       device: 'tablet'
-      model: 'Galaxy Tab A9+ 11.0"'
+      model: 'Galaxy Tab A9+ 11.0" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-X115'
+      device: 'tablet'
+      model: 'Galaxy Tab A9 8.7"'
+    - regex: '(?:SAMSUNG-)?SM-X110'
+      device: 'tablet'
+      model: 'Galaxy Tab A9 8.7" WiFi'
     - regex: '(?:SAMSUNG-)?SM-T11[03]'
       device: 'tablet'
       model: 'Galaxy Tab 3 Lite 7.0" WiFi'
@@ -20984,7 +21809,7 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-(?:P615[CN]?|P61[379])(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Galaxy Tab S6 Lite 10.4"'
-    - regex: '(?:SAMSUNG-)?SM-P610X?(?:[);/ ]|$)'
+    - regex: '(?:SAMSUNG-)?SM-(?:P610X?|P620)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Galaxy Tab S6 Lite 10.4" WiFi'
     - regex: '(?:SAMSUNG-)?SM-T860X?(?:[);/ ]|$)'
@@ -20999,18 +21824,30 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-X900'
       device: 'tablet'
       model: 'Galaxy Tab S8 Ultra 14.6" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-X916B'
+    - regex: '(?:SAMSUNG-)?SM-X910(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Galaxy Tab S9 Ultra 14.6" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-X916[CB]'
       device: 'tablet'
       model: 'Galaxy Tab S9 Ultra 14.6" 5G'
     - regex: '(?:SAMSUNG-)?SM-X810'
       device: 'tablet'
       model: 'Galaxy Tab S9+ 12.4"'
+    - regex: '(?:SAMSUNG-)?(?:SM-X818U|SM-X816[BN])'
+      device: 'tablet'
+      model: 'Galaxy Tab S9+ 12.4" 5G'
     - 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-X(?:518U|516)'
+      device: 'tablet'
+      model: 'Galaxy Tab S9 FE 10.9" 5G'
+    - regex: '(?:SAMSUNG-)?SM-X610'
+      device: 'tablet'
+      model: 'Galaxy Tab S9 FE+ 12.4" WiFi'
     - regex: '(?:SAMSUNG-)?SM-T111'
       device: 'tablet'
       model: 'Galaxy Tab 3 Lite 7.0"'
@@ -21203,6 +22040,9 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T567V'
       device: 'tablet'
       model: 'Galaxy Tab E 9.6" 4G'
+    - regex: '(?:SAMSUNG-)?SM-X306'
+      device: 'tablet'
+      model: 'Galaxy Tab Active 5 8.0" 5G'
     - regex: '(?:SAMSUNG-)?SM-T365(?:F0|[MY])?(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Galaxy Tab Active 8.0"'
@@ -21292,6 +22132,9 @@ Samsung:
     - regex: 'SM-R815'
       device: 'wearable'
       model: 'Galaxy Watch 42mm LTE'
+    - regex: 'SM-R885'
+      device: 'wearable'
+      model: 'Galaxy Watch 4 Classic 42mm'
     - regex: 'SM-R500'
       device: 'wearable'
       model: 'Galaxy Watch Active'
@@ -21599,7 +22442,7 @@ Samsung:
       model: 'Galaxy S6 Edge'
     - regex: '(?:SAMSUNG-)?SM-G928(?:7C|N0|R4|W8|[07ACFGIKLPSTVX])'
       model: 'Galaxy S6 Edge+'
-    - regex: '(?:SAMSUNG-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
+    - regex: '(?:SAMSUNG-|Verizon-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
       model: 'Galaxy S7'
     - regex: '(?:SAMSUNG-)?SM-G935(?:R4|W8|[0AFKLPSTUVX])|SC-02H|SCV33|Galaxy s7 edge'
       model: 'Galaxy S7 Edge'
@@ -21665,13 +22508,13 @@ Samsung:
       model: 'Galaxy S23+'
     - regex: '(?:SAMSUNG-)?(?:SM-S918|SC-52D|SCG20)'
       model: 'Galaxy S23 Ultra'
-    - regex: '(?:SAMSUNG-)?(?:SM-S711)'
+    - regex: '(?:SAMSUNG-)?(?:SM-S711|SCG24)'
       model: 'Galaxy S23 FE'
-    - regex: '(?:SAMSUNG-)?SM-S921'
+    - regex: '(?:SAMSUNG-)?(?:SM-S921|SCG25)'
       model: 'Galaxy S24'
     - regex: '(?:SAMSUNG-)?(?:SM-S926)'
       model: 'Galaxy S24+'
-    - regex: '(?:SAMSUNG-)?SM-S928'
+    - regex: '(?:SAMSUNG-)?(?:SM-S928|SCG26)'
       model: 'Galaxy S24 Ultra'
     - regex: '(?:SAMSUNG-)?SM-F700(?:U1|[0FNUW])|SCV47'
       model: 'Galaxy Z Flip'
@@ -21869,13 +22712,15 @@ Samsung:
       model: 'Galaxy A53 5G UW'
     - regex: '(?:SAMSUNG-)?(?:SM-A536|SC-53C|SCG15|SM-S536DL)'
       model: 'Galaxy A53 5G'
+    - regex: '(?:SAMSUNG-)?SM-A546S'
+      model: 'Galaxy Quantum 4'
     - regex: '(?:SAMSUNG-)?(?:SM-A546|SC-53D|SCG21)'
       model: 'Galaxy A54 5G'
-    - regex: '(?:SAMSUNG-)?(?: SM-A556)'
+    - regex: '(?:SAMSUNG-)?(?:SM-A556|SCG27)'
       model: 'Galaxy A55 5G'
     - regex: '(?:SAMSUNG-)?SM-A705(?:GM|[MYF]N|[0FUWX])'
       model: 'Galaxy A70'
-    - regex: '(?:SAMSUNG-)?SM-A707[0F]'
+    - regex: '(?:SAMSUNG-)?SM-A707[0FW]'
       model: 'Galaxy A70s'
     - regex: '(?:SAMSUNG-)?SM-A805[0FNX]'
       model: 'Galaxy A80'
@@ -21889,12 +22734,16 @@ Samsung:
       model: 'Galaxy F12'
     - regex: '(?:SAMSUNG-)?SM-E135F'
       model: 'Galaxy F13'
+    - regex: '(?:SAMSUNG-)?SM-E146B'
+      model: 'Galaxy F14 5G'
     - regex: '(?:SAMSUNG-)?SM-E156B'
       model: 'Galaxy F15 5G'
     - regex: '(?:SAMSUNG-)?SM-E225F(?:[);/ ]|$)'
       model: 'Galaxy F22'
     - regex: '(?:SAMSUNG-)?SM-E236'
       model: 'Galaxy F23 5G'
+    - regex: '(?:SAMSUNG-)?SM-E346'
+      model: 'Galaxy F34 5G'
     - regex: '(?:SAMSUNG-)?SM-F415F(?:[);/ ]|$)'
       model: 'Galaxy F41'
     - regex: '(?:SAMSUNG-)?SM-E426B(?:[);/ ]|$)'
@@ -21907,8 +22756,10 @@ Samsung:
       model: 'Galaxy F62'
     - regex: '(?:SAMSUNG-)?GT-I9301I'
       model: 'Galaxy S III Neo'
-    - regex: '(?:SAMSUNG-)?SM-S120VL(?:[);/ ]|$)'
+    - regex: '(?:SAMSUNG-)?SM-S120VL'
       model: 'Galaxy Luna'
+    - regex: '(?:SAMSUNG-)?SGH-T399'
+      model: 'Galaxy Light'
     - regex: '(?:SAMSUNG-)?SM-(?:J100(?:FN|VPP|MU|[FGHMY])|S777C)'
       model: 'Galaxy J1'
     - regex: '(?:SAMSUNG-)?SM-J105[BFHYM]'
@@ -22027,6 +22878,8 @@ Samsung:
       model: 'Galaxy Jump 5G'
     - regex: 'SM-M336K'
       model: 'Galaxy Jump 2'
+    - regex: 'SM-M446K'
+      model: 'Galaxy Jump 3'
     - regex: '(?:SAMSUNG-)?SM-M015[FG]'
       model: 'Galaxy M01'
     - regex: '(?:SAMSUNG-)?SM-[EM]045F'
@@ -22128,6 +22981,8 @@ Samsung:
       model: 'Galaxy C5'
     - regex: '(?:SAMSUNG-)?SM-C501[08]'
       model: 'Galaxy C5 Pro'
+    - regex: '(?:SAMSUNG-)?SM-C5560'
+      model: 'Galaxy C55 5G'
     - regex: '(?:SAMSUNG-)?SM-C700[0X]'
       model: 'Galaxy C7'
     - regex: '(?:SAMSUNG-)?SM-C701[08FX]'
@@ -22168,15 +23023,24 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-W9023'
       model: 'Galaxy W23 Fold'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-W7023'
+      model: 'Galaxy W23 Flip'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-W7024'
+      model: 'Galaxy W24 Flip'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?(?:SM-F711|SCG12|SC-54B)'
       model: 'Galaxy Z Flip 3'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?(?:SM-F721|SC-54C|SCG17)'
       model: 'Galaxy Z Flip 4'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?(?:SM-F731)'
+    - regex: '(?:SAMSUNG-)?(?:SM-F731|SCG23)'
       model: 'Galaxy Z Flip 5'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?(?:SM-F741)'
+      model: 'Galaxy Z Flip 6'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?SM-F916(?:U1|[0BNQUW])|SCG05'
       model: 'Galaxy Z Fold 2 5G'
       device: 'phablet'
@@ -22186,7 +23050,7 @@ Samsung:
     - regex: '(?:SAMSUNG-)?(?:SM-F936|SCG16|SC-55C)'
       model: 'Galaxy Z Fold 4'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?(?:SM-F946)'
+    - regex: '(?:SAMSUNG-)?(?:SM-F946|SCG22)'
       model: 'Galaxy Z Fold 5'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-I9060(?:[);/ ]|$)'
@@ -22400,7 +23264,7 @@ Selfix:
 
 # Senwa (senwamobile.com)
 Senwa:
-  regex: 'Senwa|(?:S\-?(?:471|7[12]5|6[01]5|915|905TL|1000|5018)|V705B|LS50F| LS50?|LS5518H|LS5718|LS5018F)(?:[);/ ]|$)'
+  regex: 'Senwa|(?:S\-?(?:471|7[12]5|6[01]5|915|905TL|1000|5018)|V705B|LS50F| LS50?|LS5518H|LS5718|LS5018FP?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S-?471(?:[);/ ]|$)'
@@ -22413,6 +23277,8 @@ Senwa:
       model: 'Odin'
     - regex: 'S-?5018(?:[);/ ]|$)'
       model: 'Inizio'
+    - regex: 'LS5018FP(?:[);/ ]|$)'
+      model: 'Inizio Plus'
     - regex: 'LS5018F(?:[);/ ]|$)'
       model: 'Inizio LTE'
     - regex: 'S-?(615|7[12]5|915)(?:[);/ ]|$)'
@@ -22421,9 +23287,9 @@ Senwa:
       model: 'V705B'
     - regex: 'LS50F(?:[);/ ]|$)'
       model: 'Evolution'
-    - regex: ' LS50(?:[);/ ]|$)'
+    - regex: 'LS50(?:[);/ ]|$)'
       model: 'Pegasus'
-    - regex: ' LS5(?:[);/ ]|$)'
+    - regex: 'LS5(?:[);/ ]|$)'
       model: 'Thor'
     - regex: 'LS5518H(?:[);/ ]|$)'
       model: 'Sparkly'
@@ -22434,19 +23300,19 @@ Senwa:
 
 # Visual Land (www.visual-land.com)
 Visual Land:
-  regex: '(?:Prime10(?:SE|ES)|Elite(?:9QL|8QI|7QS|10QHPro))(?:[);/ ]|$)'
+  regex: '(?:Prime10(?:SE|ES)|Elite(?:7QS|8QI|9QL|10QH(?:Pro)?))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Prime10(SE|ES)'
       model: 'Prestige Prime 10$1'
     - regex: 'Elite10QHPro'
       model: 'Prestige Elite 10QH Pro'
-    - regex: 'Elite(9QL|8QI|7QS)'
+    - regex: 'Elite(7QS|8QI|9QL|10QH)'
       model: 'Prestige Elite $1'
 
-# Sky or Sky Devices (skydevices.com)
+# Sky or Sky Devices or SKY EVO (skydevices.com)
 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,'
+  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:Max|PHOTOPRO|5_0T|M45|[45]T|45T|GO|A63Max|M5Plus|T8Plus|T[46]|[ABCDHP]5|A6|5_5_Octa|Octa|[A-HJLNPTVR]55|[AB]65|[CG]63|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)'
@@ -22461,6 +23327,8 @@ Sky:
       model: 'Platinum 4.0'
     - regex: 'Platinum[_ ](P9) Pro(?:[);/ ]|$)'
       model: 'Platinum $1 Pro'
+    - regex: 'Platinum[_ ]B4P(?:[);/ ]|$)'
+      model: 'Platinum B4'
     - regex: 'Platinum[_ ]([ABCMP]4|[ACGK]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|O|6\.0)(?:[);/ ]|$)'
       model: 'Platinum $1'
     - regex: 'Platinum[_ ]?VIEW(2)?(?:[);/ ]|$)'
@@ -22505,13 +23373,13 @@ Sky:
       model: 'Elite Photo Pro'
     - regex: 'Elite M5Plus'
       model: 'Elite M5 Plus'
-    - regex: 'Elite ([EP])55Max'
+    - regex: 'Elite ([ENP])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|[ABCEFGHJPTVR]55|[AB]65|45T|N55)(?:[);/ ]|$)'
+    - regex: 'Elite[ _](Max|M45|Go|[45]T|T[46]|[ABCDHP]5|A6|[A-HJLNPTVR]55|[AB]65|[CG]63|45T)(?:[);/ ]|$)'
       model: 'Elite $1'
     - regex: 'Elite (T10)'
       device: 'tablet'
@@ -22558,13 +23426,15 @@ Sky:
       model: '$1'
       device: 'tv'
 
-# Skyworth
+# Skyworth or SWTV
 Skyworth:
-  regex: 'Sky_?worth|SWTV-|(?:FlowBox-F1|SWTV)(?:[);/ ]|$)'
+  regex: 'Sky_?worth|SWTV-|(?:FlowBox-F1|SWTV|SW-22AE NF)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'FlowBox-F1'
       model: 'FlowBox-F1'
+    - regex: 'SW-22AE NF'
+      model: 'SWTV-22AE NF'
     - regex: '(SWTV-2[02]AE(?:-PRO|-FHD)?)'
       model: '$1'
     - regex: 'Sky_?worth ([^;/)]+)(?: Build|[;)])'
@@ -22772,7 +23642,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|Origin_679)(?:[);/ ]|$)|(?: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|TEOX10-MT8SL128LTE|HERO10RK|SPTEO10BK16|Origin_679(?:_Pro)?)(?:[);/ ]|$)|(?:Tlink|Every)[0-9]+|THOMSON[, ]'
   device: 'tablet'
   models:
     # already detected as manta device
@@ -22792,6 +23662,8 @@ Thomson:
       model: '3G 8950'
     - regex: 'SPTEO10BK16'
       model: 'TEO10BK16'
+    - regex: 'TEOX10-MT8SL128LTE'
+      model: 'TEOX10'
     - regex: 'TEO(13P|10[SM]|7RK|104G|X10[23]|8M)(?:[);/ ]|$)'
       model: 'TEO$1'
     - regex: 'HERO10RK'
@@ -22803,7 +23675,10 @@ Thomson:
     - regex: 'Tlink([0-9]+)'
       device: 'smartphone'
       model: 'Tlink$1'
-    - regex: 'Origin_679'
+    - regex: 'Origin[_ ]679[_ ]Pro'
+      device: 'smartphone'
+      model: 'Origin 679 Pro'
+    - regex: 'Origin[_ ]679'
       device: 'smartphone'
       model: 'Origin 679'
     - regex: 'Every([0-9]+)'
@@ -22824,11 +23699,13 @@ Thomson:
 
 # Tanix
 Tanix:
-  regex: '(?:TX[53] MAX|TX[69]s|TX3 Mini|TX3MINI|TX5 Pro)(?:[);/ ]|$)'
+  regex: 'Tanix|(?:TX[53] MAX|TX[69]s|TX3 Mini|TX3MINI|TX5 Pro)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'TX([69])s'
       model: 'TX$1s'
+    - regex: 'Tanix (A3)'
+      model: '$1'
     - regex: 'TX([35]) MAX'
       model: 'TX$1 Max'
     - regex: 'TX5 Pro'
@@ -22908,7 +23785,7 @@ Ployer:
 
 # Plum (plum-mobile.com)
 Plum:
-  regex: 'PLUM[ _]|(?:Z51[89])(?:[);/]|$)'
+  regex: 'PLUM[ _]|(?:Z51[89])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Z405'
@@ -23114,7 +23991,7 @@ Polytron:
 
 # Positivo (www.positivoempresas.com.br)
 Positivo:
-  regex: '(?:YPY_S450|Twist 4(?: Fit|Pro)?|Twist 4G|T1085|Positivo (?:Q20|Slim)|M10 4G PRO X|UP 32|YOLO|Android 4([\d.]*);(?: [\w-]+;)? X400)(?:[);/ ]|$)'
+  regex: '(?:YPY_S450|Twist 4(?: Fit|Pro)?|Twist (?:4G|5 Max)|T1085|Positivo (?:Q20|Slim)|M10 4G PRO X|UP 32|YOLO|Android 4([\d.]*);(?: [\w-]+;)? X400)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'YPY_S450'
@@ -23125,6 +24002,8 @@ Positivo:
       model: '$1'
     - regex: 'Twist 4 Mini'
       model: 'Twist 4 Mini'
+    - regex: 'Twist 5 Max'
+      model: 'Twist 5 Max'
     - regex: 'Twist 4 (Fit|Pro)'
       model: 'Twist 4 $1'
     - regex: 'YOLO'
@@ -23389,7 +24268,7 @@ Vankyo:
 
 # Quest or Quest Mobile
 Quest:
-  regex: 'RAPTOR(?:[);/ ]|$)'
+  regex: 'Android 1[012](?:[\d.]*);(?: [\w-]+;)? RAPTOR(?! LTD)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'RAPTOR'
@@ -23397,7 +24276,7 @@ Quest:
 
 # QMobile or QSmart or Q-Smart (qmobile.com.pk)
 QMobile:
-  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)(?:[);/ ]|$)'
+  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|i6 Metal|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'
@@ -23458,6 +24337,8 @@ QMobile:
       model: 'i8i'
     - regex: 'i6 Metal ONE'
       model: 'i6 Metal One'
+    - regex: 'i6 Metal HD'
+      model: 'i6 Metal HD'
     - regex: 'i6 Metal (201[78])'
       model: 'i6 Metal ($1)'
     - regex: 'Smart HD Pro'
@@ -23484,13 +24365,13 @@ QMobile:
       model: 'Q Infinity E Lite'
     - regex: 'Q Infinity ([FCB])'
       model: 'Q Infinity $1'
-    - regex: ' (LT950|J5)(?:[);/ ]|$)'
+    - regex: '(LT950|J5)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'LINQ (L10|X100)'
       model: 'Linq $1'
     - regex: 'GLi Lite(?:[);/ ]|$)'
       model: 'GLi Lite'
-    - regex: ' GLi(?:[);/ ]|$)'
+    - regex: 'GLi(?:[);/ ]|$)'
       model: 'GLi'
     - regex: 'V2 2018(?:[);/ ]|$)'
       model: 'V2 (2018)'
@@ -23551,7 +24432,7 @@ TOOGO:
 
 # Quantum
 Quantum:
-  regex: 'Qrash|(?:Quantum (?:Fit|Five|Fly|UP|MUV (?:PRO|UP)|Go|Mini|M|V|You [2E])|GO 2|Q20|LIO\+|Q-TITANO(_007i|-H2)?|Q-Pulse70M|Q-Wave(?:101|71M))(?:[);/ ]|$)'
+  regex: 'Qrash|(?:Quantum (?:Fit|Five|Fly|UP|MUV (?:PRO|UP)|Go|Mini|M|V|You [2E])|GO 2|Q[23]0|LIO\+|Q-TITANO(_007i|-H2)?|Q-Pulse70M|Q-Wave(?:101|71M))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'LIO\+(?:[);/ ]|$)'
@@ -23560,7 +24441,7 @@ Quantum:
       model: 'Go 2'
     - regex: 'Qrash(?:[);/ ]|$)'
       model: 'Qrash'
-    - regex: 'Quantum (Fit|Five|Go|Mini|[MV]|Fly|You [2E]|Q20)(?:[);/ ]|$)'
+    - regex: 'Quantum (Fit|Five|Go|Mini|[MV]|Fly|You [2E]|Q[23]0)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Quantum MUV PRO(?:[);/ ]|$)'
       model: 'MUV Pro'
@@ -23629,7 +24510,7 @@ I-Plus:
 
 # Razer (razer.com)
 Razer:
-  regex: '(?:Phone 2|Razer Edge 5G)(?:[);/ ]|$)'
+  regex: '(?:(?<!T )Phone 2|Razer Edge 5G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Razer Edge 5G'
@@ -23645,7 +24526,7 @@ Sendo:
   model: '$1'
 
 # Silent Circle
-'Silent Circle':
+Silent Circle:
   regex: 'Blackphone 2'
   device: 'smartphone'
   model: 'Blackphone 2'
@@ -23688,7 +24569,7 @@ Sigma:
 
 # Spice
 Spice:
-  regex: '(?<![\d];)Spice|(?:Xlife[-_ ](?:\d+Q?|Victor5|M5q\+|M5 Pro|Proton5|Electro55HD))(?:[);/ ]|$)'
+  regex: '(?<![\d];)Spice(?!bird)|(?:Xlife[-_ ](?:\d+Q?|Victor5|M5q\+|M5 Pro|Proton5|Electro55HD))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Spice_)?Xlife[-_ ](\d+Q?|M5\+)(?:[);/ ]|$)'
@@ -23720,27 +24601,31 @@ Spice:
 
 # SGIN
 SGIN:
-  regex: 'SGIN_X10(?:[);/ ]|$)'
+  regex: 'SGIN_(?:E10M|X10)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'X10'
+  models:
+    - regex: 'SGIN_E10M'
+      model: 'E10M'
+    - regex: 'SGIN_X10'
+      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)(?:[);/ ]|$)'
+  regex: '(?:(?:SH6[05]|SA50|SP65)_(?:2[13]|66)\d{3}|H166|R570E|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)(?:[);/ ]|$)'
+    - regex: '(H166|P670|R570E)(?:[);/ ]|$)'
       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)(?:[);/ ]|$)'
+  regex: 'SHARP(?!_2|1)|SBM|SH-?[0-9]+[a-z]?(?:[);/ ]|$)|AQUOS|(?:SH-T01|SH-M26|SH-M0[14-9]|SH-M1[1-7](?:-y)?|S[357]-SH|SH-[MZ]([12]0|01|22)|SH-C06|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|A30[12]SH)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -23774,13 +24659,15 @@ Sharp:
       model: 'Aquos SH-M04'
     - regex: 'SH-M05(?:[);/ ]|$)'
       model: 'Aquos Sense Lite'
+    - regex: 'SH-(?:M26|54D)(?:[);/ ]|$)'
+      model: 'Aquos Sense 8'
     - regex: 'SH-M07(?:[);/ ]|$)'
       model: 'Aquos Sense Plus'
     - regex: 'A003SH(?:[);/ ]|$)'
       model: 'Aquos Sense 4 Basic'
     - regex: 'SH-41A(?:[);/ ]|$)'
       model: 'Aquos Sense 4'
-    - regex: ' SH-S40P(?:[);/ ]|$)'
+    - regex: 'SH-S40P(?:[);/ ]|$)'
       model: 'Aquos Sense 4 Plus'
     - regex: '(?:SH-54B|SHG05|SH-R?M19)(?:[);/ ]|$)'
       model: 'Aquos Sense 6'
@@ -23802,7 +24689,7 @@ Sharp:
       model: 'Aquos Zero'
     - regex: '(?:SH-M13|906SH|SH-01M)(?:[);/ ]|$)'
       model: 'Aquos Zero 2'
-    - regex: '(?:SHG04|A102SH|SH-RM18)(?:[);/ ]|$)'
+    - regex: '(?:SHG04|A102SH|SH-RM18|Aquos zero6)(?:[);/ ]|$)'
       model: 'Aquos Zero 6'
     - regex: '(?:SHG02|A002SH)(?:[);/ ]|$)'
       model: 'Aquos Zero 5G Basic'
@@ -23836,6 +24723,8 @@ Sharp:
       model: 'Aquos S4 SIM'
     - regex: 'SH-C02(?:[);/ ]|$)'
       model: 'Aquos V'
+    - regex: 'SH-C06(?:[);/ ]|$)'
+      model: 'Aquos V7+'
     - regex: '(SHF3[1-4])(?:[);/ ]|$)'
       model: 'Aquos K $1'
     - regex: '704SH(?:[);/ ]|$)'
@@ -23888,8 +24777,10 @@ Sharp:
       model: 'Aquos R6'
     - regex: '(?:A202SH|SH-52C)(?:[);/ ]|$)'
       model: 'Aquos R7'
-    - regex: '(?:SH-51D)(?:[);/ ]|$)'
+    - regex: '(?:SH-51D|A301SH)(?:[);/ ]|$)'
       model: 'Aquos R8 Pro'
+    - regex: 'A302SH(?:[);/ ]|$)'
+      model: 'Aquos wish3'
     - regex: '(?:SH-52D)(?:[);/ ]|$)'
       model: 'Aquos R8'
     - regex: 'SHV3[57](?:_u)?(?:[);/ ]|$)'
@@ -23994,28 +24885,30 @@ Softbank:
     - regex: 'J-PHONE/[0-9]\.[0-9]/([a-z0-9\-]+)'
       model: '$1'
 
-# Sonim
+# Sonim or Sonimtech (sonimtech.com)
 Sonim:
-  regex: 'Sonim[ -]|XP(?:[67]7|[358]8)00(?:[);/ ]|$)'
+  regex: 'Sonim[ -]|XP(?:[67]7|[358]8|99)00(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Sonim-)?XP3400'
       model: 'XP3400'
       device: 'feature phone'
-    - regex: '(?:Sonim-)?XP3800(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP3800'
       model: 'XP3'
-    - regex: '(?:Sonim-)?XP3900(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP3900'
       model: 'XP3 Plus'
-    - regex: '(?:Sonim-)?XP5800(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP5800'
       model: 'XP5s'
-    - regex: '(?:Sonim-)?XP5700(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP5700'
       model: 'XP5'
-    - regex: '(?:Sonim-)?XP6700(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP6700'
       model: 'XP6'
-    - regex: '(?:Sonim-)?XP7700(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP7700'
       model: 'XP7'
-    - regex: '(?:Sonim-)?XP8800(?:[);/ ]|$)'
+    - regex: '(?:Sonim-)?XP8800'
       model: 'XP8'
+    - regex: '(?:Sonim-)?XP9900'
+      model: 'XP10'
 
 # Star
 Star:
@@ -24096,7 +24989,7 @@ Amazon Basics:
 
 # Kindle
 Amazon:
-  regex: '(?:smarttv_)?(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTGAZL|AFTMM|AFTK(?:A|M|RT)|AFTTI43|AFTHA001|AFTKA(?:UK)?002|SD4930UR|AEO(?:BC|C[HW]|KN)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|KAWI|MAWI|MEWI|[MST]UWI|SNWI))(?:[);/ _]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK|Amazon;Echo'
+  regex: '(?:smarttv_)?(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTGAZL|AFTMM|AFTK(?:A|M|RT)|AFTTI43|AFTTIFF43|AFTHA001|AFTKA(?:UK)?002|SD4930UR|AEO(?:AT|B[CP]|C[HNW]|HY|KN|TA)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|[KMR]AWI|MEWI|[MSTQ]UWI|SNWI|RAPWI))(?:[);/ _]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK|Amazon;Echo'
   device: 'tablet'
   models:
     - regex: '(?:smarttv_)?AFTA(?:[);/ _]|$)'
@@ -24260,9 +25153,9 @@ Syco:
     - regex: 'RS-403'
       model: 'RS-403'
 
-# Symphony
+# Symphony (https://www.symphony-mobile.com/)
 Symphony:
-  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\+)(?:[);/ ]|$)'
+  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+| (?:i9[79]|i7[245]|i8[05]|i6[568]|i30|i1[58]|i120|Z30 pro|Z60 plus|[ZR]30|V9[246789]|V75m)|INOVA|Android 7(?:[\d.]*);(?: [\w-]+;)? P11|Android 6.*; (?:V75|i2[015])|EASY_NAV_2|G10\+|helio 30)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ZVIII'
@@ -24279,9 +25172,13 @@ Symphony:
       model: 'Roar $1'
     - regex: '(Z30|P7) pro'
       model: '$1 Pro'
-    - regex: ' G10\+'
+    - regex: '(Z60) plus'
+      model: '$1 Plus'
+    - regex: 'G10\+'
       model: 'G10 Plus'
-    - regex: ' (V141|V1[23]0|V10[25]|V128|V14[012]|i97|i7[245]|i8[05]|i6[58]|i30|i1[58]|i120|V1[45]5|[ZR]30|V9[246789]|V75m?|i2[015]|P11)(?:[);/ ]|$)'
+    - regex: 'helio 30'
+      model: 'helio 30'
+    - regex: '(V141|V1[23]0|V10[25]|V128|V14[012]|i9[79]|i7[245]|i8[05]|i6[568]|i30|i1[58]|i120|V1[45]5|[ZR]30|V9[246789]|V75m?|i2[015]|P11)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'SYMPHONY[ \_]([a-z0-9]+)'
       model: '$1'
@@ -24352,7 +25249,7 @@ G-Touch:
 
 # T-Mobile
 T-Mobile:
-  regex: 'T-Mobile[ _][a-z0-9 ]+|(?:REVVLRY\+?|REVVL V\+ 5G|REVVL 2(?: PLUS)?|5062[ZW]|5007[ZW]|T790[WZ]|Telekom Puls|TMAF0[23]5G|TMRVL4G|TMRV06P?5G|T Phone|T Tablet)(?:[);/ ]|$)'
+  regex: 'T-Mobile[ _][a-z0-9 ]+|(?:REVVLRY\+?|REVVL V\+ 5G|REVVL 2(?: PLUS)?|5062[ZW]|5007[ZW]|T790[WZ]|Telekom Puls|TMAF0[23]5G|TMRVL4G|TMRV0[67]P?5G|T Phone|T Tablet)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TMRVL4G'
@@ -24377,16 +25274,25 @@ T-Mobile:
       model: 'REVVL 2'
     - regex: 'TMAF025G(?:[);/ ]|$)'
       model: 'REVVL 6 5G'
+    - regex: 'TMRV075G(?:[);/ ]|$)'
+      model: 'REVVL 7 5G'
     - regex: 'TMAF035G(?:[);/ ]|$)'
       model: 'REVVL 6 Pro 5G'
+    - regex: 'TMRV07P5G(?:[);/ ]|$)'
+      model: 'REVVL 7 Pro 5G'
     - regex: 'Telekom Puls(?:[);/ ]|$)'
       model: 'Telekom Puls'
+      # Deutsche Telekom
+    - regex: 'T Phone 2 Pro'
+      model: 'T Phone 2 Pro'
     - regex: 'T Phone Pro \((2023)\)'
-      model: 'T Phone Pro ($1)' # Deutsche Telekom
+      model: 'T Phone Pro ($1)'
     - regex: 'T Phone \((2023)\)'
       model: 'T Phone ($1)'
     - regex: 'T Phone Pro(?:[);/ ]|$)'
       model: 'T Phone Pro'
+    - regex: 'T Phone (\d*)(?:[);/ ]|$)'
+      model: 'T Phone $1'
     - regex: 'T Phone(?:[);/ ]|$)'
       model: 'T Phone'
 
@@ -24400,7 +25306,7 @@ T-Mobile:
       model: '$1'
 
 # TB Touch
-'TB Touch':
+TB Touch:
   regex: 'Ignis [89]'
   device: 'tablet'
   models:
@@ -24409,7 +25315,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)?|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)(?:[);/ ]|$)'
+  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[XHT]|P20HD|P10[_ ]HD|M40|P10SE?|M30_Pro|M40SE|P8[05]|P25(?:_T)?|P85T|P[23]0S|P[34]0HD|T40S)_(?:ROW|EEA|RUS|W_EEA)|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_Plus_RUS|T40 Air|(?: (?:T4[05]HD|P30T|P80X|M50HD))|(?:Android 13(?:[\d.]*);(?: [\w-]+;)? (?:M50 Pro|T[56]0)|T50HD)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Tbook[_ -]([^;/]+)(?: Build|[;)]|$)'
@@ -24426,13 +25332,15 @@ Teclast:
       model: 'P20HD'
     - regex: 'P40HD'
       model: 'P40HD'
+    - regex: 'P80T'
+      model: 'P80T'
     - regex: 'P10[_ ]HD_(?:ROW|EEA)'
       model: 'Apex P10HD'
     - regex: 'P10HD_Lite'
       model: 'Apex P10HD Lite'
     - regex: 'P80[_ ](?:ROW|EEA)|P80_G3M2'
       model: 'P80'
-    - regex: 'P30S[_ ](?:ROW|EEA)'
+    - regex: 'P30S'
       model: 'P30S'
     - regex: 'P85[_ ](?:ROW|EEA|RUS)'
       model: 'P85'
@@ -24466,7 +25374,7 @@ Teclast:
       model: 'T40 Air'
     - regex: 'TLA001'
       model: 'T40'
-    - regex: 'T40 Plus(?:_(?:ROW|EEA)|\(M7T3\))'
+    - regex: 'T40[ _]Plus(?:_(?:ROW|EEA|RUS)|\(M7T3\))'
       model: 'T40 Plus'
     - regex: 'T(4[05])HD'
       model: 'T$1HD'
@@ -24476,7 +25384,7 @@ Teclast:
       model: 'T50 Pro'
     - regex: 'P80H\(D1C2\)'
       model: 'P80h'
-    - regex: '(P80[Xh]|P30HD|T30|M40|P25(?:_T)?|P10SE|T40S|P[24]0S|T50|TLG01|P26T|P85T|P30T)(?:[_ ](?:ROW|EEA))?(?:[);/ ]|$)'
+    - regex: '(P80[Xh]|P30HD|T30|M40|P25(?:_T)?|P10SE|T40S|P[24]0S|T[56]0|TLG01|P26T|P85T|P30T|T50HD)(?:[_ ](?:ROW|EEA))?(?:[);/ ]|$)'
       model: '$1'
     - regex: 'P80X'
       model: 'P80X'
@@ -24493,9 +25401,9 @@ Teclast:
     - regex: 'Teclast[_ -]([^;/]+) Build'
       model: '$1'
 
-# Tecno Mobile or Tecno
+# Tecno Mobile or Tecno (https://www.tecno-mobile.com/)
 Tecno Mobile:
-  regex: 'Tecno|Phantom[56]|Phantom6-Plus|Phantom6S|DP7C ?Pro-SGA1|(?:DP7CPRO|DP8D)(?:[);/ ]|$)'
+  regex: 'Tecno|Camon|Phantom[56]|Phantom6-Plus|Phantom6S|DP7C ?Pro-SGA1|(?:DP7CPRO|DP8D)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Phantom6-Plus'
@@ -24620,7 +25528,7 @@ Tecno Mobile:
       model: 'Camon 19 Pro'
     - regex: 'Tecno[ _-]CI7n(?:[);/ ]|$)'
       model: 'Camon 19 Pro 5G'
-    - regex: 'Tecno[ _-]CK7n?(?:[);/ ]|$)'
+    - regex: '(?:Tecno[ _-]CK7n?|Camon 20 Pro)(?:[);/ ]|$)'
       model: 'Camon 20 Pro'
     - regex: 'Tecno[ _-]CK6n?(?:[);/ ]|$)'
       model: 'Camon 20'
@@ -24632,6 +25540,10 @@ Tecno Mobile:
       model: 'Camon 30'
     - regex: 'Tecno[ _-]CL9(?:[);/ ]|$)'
       model: 'Camon 30 Premier 5G'
+    - regex: 'Tecno[ _-]CL7[ks]?(?:[);/ ]|$)'
+      model: 'Camon 30 5G'
+    - regex: 'Tecno[ _-]CL8(?:[);/ ]|$)'
+      model: 'Camon 30 Pro 5G'
     - regex: 'Tecno[ _-]CA6S?(?:[);/ ]|$)'
       model: 'Camon CM'
     - regex: 'Tecno[ _-]CA7(?:[);/ ]|$)'
@@ -24712,7 +25624,7 @@ Tecno Mobile:
       model: 'Spark Go (2022)'
     - regex: 'Tecno[ _](?:Mobile )?BF7n(?:[);/ ]|$)'
       model: 'Spark Go (2023)'
-    - regex: 'Tecno[ _](?:Mobile )?BG6(?:[);/ ]|$)'
+    - regex: 'Tecno[ _](?:Mobile )?BG6m?(?:[);/ ]|$)'
       model: 'Spark Go (2024)'
     - regex: 'Tecno[ _](?:Mobile )?KJ5n?(?:[);/ ]|$)'
       model: 'Spark 20'
@@ -24837,6 +25749,9 @@ Tecno Mobile:
     - regex: 'TECNO[ _]LH6n(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Pova Neo 3'
+    - regex: 'TECNO[ _]LE6j(?:[);/ ]|$)'
+      device: 'phablet'
+      model: 'Pova Neo 5G'
     - regex: 'TECNO[ _]LE7n?(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Pova 2'
@@ -25090,7 +26005,7 @@ 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(?: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'
+  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|32S08T2S|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'
@@ -25255,9 +26170,9 @@ Top House:
 
 # Topelotek
 Topelotek:
-  regex: 'KIDS09'
+  regex: 'KIDS(09|708)'
   device: 'tablet'
-  model: 'KIDS09 Kids Tablet'
+  model: 'KIDS$1 Kids Tablet'
 
 # Toplux
 Toplux:
@@ -25267,10 +26182,10 @@ Toplux:
 
 # Touchmate (touchmate.net)
 Touchmate:
-  regex: 'TOUCHMATE|(TM-(?:MID870SB|MID1050WKD|MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|SM500N|SM410|MID1010))'
+  regex: 'TOUCHMATE|(TM-(?:MID870SB|MID1050WKD|MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|SM500N|SM410|MID1010|MID1065))'
   device: 'smartphone'
   models:
-    - regex: '(TM-(?:MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|MID10[14]0))'
+    - regex: '(TM-(?:MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|MID10[14]0|MID1065))'
       device: 'tablet'
       model: '$1'
     - regex: 'TM-MID870SB'
@@ -25358,7 +26273,7 @@ Trevi:
     - regex: 'Trevi[_]([^;/]+) Build'
       model: '$1'
 
-#TVC
+# TVC
 TVC:
   regex: '(NuclearSX-SP5)'
   device: 'smartphone'
@@ -25416,7 +26331,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(?:[\d.]*);(?: [\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(?! P1s)(?:[ _](?:[2367]|2S|X[236]|6[SE]|3WT|3W|X))?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure|Pro)(?:[ _]Lite)?|Note 14|Note (?:11P|7T)|Note 16 Pro|Tiger_lite|Note_7P|Note 10P|Paris_(?:Lite|X)|Paris|P6000_Plus|Vienna|GQ3060TF3|Android 11(?:[\d.]*);(?: [\w-]+;)? Note 6P?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S(10|9)_Pro'
@@ -25433,6 +26348,8 @@ Ulefone:
       model: 'Be One'
     - regex: 'Be[ _]X'
       model: 'Be X'
+    - regex: 'Be[ _]Pro'
+      model: 'Be Pro'
     - regex: 'U(00[78]) Pro'
       model: 'U$1 Pro'
     - regex: 'P6000_Plus'
@@ -25453,6 +26370,8 @@ Ulefone:
       model: 'Power Armor $1'
     - regex: 'Armor[ _]6S(?:[);/ ]|$)'
       model: 'Armor 6S'
+    - regex: 'GQ3060TF3(?:[);/ ]|$)'
+      model: 'Armor 20WT'
     - regex: 'Armor[ _]([679])E(?:[);/ ]|$)'
       model: 'Armor $1E'
     - regex: 'Armor[ _]X(\d+) Pro(?:[);/ ]|$)'
@@ -25503,15 +26422,21 @@ 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(?:[\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)(?:[;/) ]|$)'
+  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]|MT0[17]|MT1[01]|MP0[1-9]|MP1[3789]|MP2[034-79]|MP34|Plus E|S2_PRO|RP05|(?<! HP Engage )One Pro|Diamond_X|TG3DBG1MA|Android [67](?:[\d.]*);(?: [\w-]+;)? Z Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? A1_PRO|RP08|MP3[38]|PR4JBX20A|PG2309GBA)(?:[;/) ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'MT01(?:[;/) ]|$)'
+    - regex: 'MT01'
       device: 'tablet'
       model: 'A11 Tab'
-    - regex: 'TG3DBG1MA'
+    - regex: 'MT07'
+      device: 'tablet'
+      model: 'A13 Tab'
+    - regex: 'TG3DBG1MA|MT10'
       device: 'tablet'
       model: 'G1 Tab'
+    - regex: 'MT11'
+      device: 'tablet'
+      model: 'G2 Tab'
 
     - regex: '(A[13579]|Z2|S3)[_ ]Pro'
       model: '$1 Pro'
@@ -25523,8 +26448,14 @@ UMIDIGI:
       model: 'C1 Plus'
     - regex: 'MP07'
       model: 'C1'
+    - regex: 'MP20'
+      model: 'C2'
     - regex: 'MP09'
       model: 'F3'
+    - regex: 'MP19'
+      model: 'F3 Pro 5G'
+    - regex: 'MP13'
+      model: 'F3 5G'
     - regex: 'MP18'
       model: 'G1 Max'
     - regex: 'MP01(?:[;/) ]|$)'
@@ -25539,6 +26470,16 @@ UMIDIGI:
       model: 'G5 Mecha'
     - regex: 'MP27(?:[;/) ]|$)'
       model: 'G5'
+    - regex: 'PG2309GBA(?:[;/) ]|$)'
+      model: 'G6 5G'
+    - regex: 'MP38(?:[;/) ]|$)'
+      model: 'G5A'
+    - regex: 'MP24(?:[;/) ]|$)'
+      model: 'G3'
+    - regex: 'MP26(?:[;/) ]|$)'
+      model: 'G3 Max'
+    - regex: 'MP25(?:[;/) ]|$)'
+      model: 'G3 Plus'
     - regex: 'UMI TOUCH X'
       model: 'Touch X'
     - regex: 'UMI TOUCH'
@@ -25551,6 +26492,8 @@ UMIDIGI:
       model: 'Rome X'
     - regex: 'BISON GT'
       model: 'Bison GT'
+    - regex: 'PR4JBX20A'
+      model: 'Bison X20'
     - regex: 'RP05(?:[;/) ]|$)'
       model: 'Bison X10G'
     - regex: 'Bison N1'
@@ -25595,7 +26538,7 @@ UMIDIGI:
       model: 'A13 Pro Max 5G'
     - regex: 'MP06(?:[;/) ]|$)'
       model: 'Power 7 Max'
-    - regex: ' (A3[SX]|A7S)(?:[;/) ]|$)'
+    - regex: '(A3[SX]|A7S)(?:[;/) ]|$)'
       model: '$1'
     - regex: '(?:UMI_)?(London|Diamond(?:_X)?)'
       model: '$1'
@@ -25604,12 +26547,12 @@ UMIDIGI:
 
 # Uniqcell
 Uniqcell:
-  regex: 'UNIQCELL_|[AQ]5\.8(?:[;/) ]|$)'
+  regex: 'UNIQCELL_|(?:[AQ]5\.8|UNI (?:10X|GO))(?:[;/) ]|$)'
   device: 'smartphone'
   models:
     - regex: 'UNIQCELL_A4(?:[;/) ]|$)'
       model: 'A4'
-    - regex: '(Space A5\.8|Q5\.8)(?:[;/) ]|$)'
+    - regex: '(Space A5\.8|Q5\.8|UNI (?:10X|GO))(?:[;/) ]|$)'
       model: '$1'
 
 # Uniscope
@@ -25628,6 +26571,16 @@ Unistrong:
   device: 'smartphone'
   model: '$1'
 
+# United Group (https://united.group/ or sbb.rs)
+United Group:
+  regex: '(?:SDOTT0202|SDSTB02)(?:[;/) ]|$)'
+  device: 'tv'
+  models:
+    - regex: 'SDOTT0202'
+      model: 'EON Smart Box (2019-2020)' # SDMC SDOTT0202
+    - regex: 'SDSTB02'
+      model: 'EON Smart Box (2023)' # SDMC SDSTB02
+
 # Unnecto
 Unnecto:
   regex: 'Unnecto|(?:U513|U5151|U61[1356]|U7[12]0|U-830|U90[35])(?:[);/ ]|$)'
@@ -25693,10 +26646,10 @@ UTOK:
 
 # Vastking
 Vastking:
-  regex: '(?:M910A|M783K|M783K-16G|M1072R-3G|KingPad_(?:[KM]10|SA10|SA8)(?:Pro)?)(?:_EEA)?(?:[);/ ]|$)'
+  regex: '(?:M910A|M783K|M783K-16G|M1072R-3G|KingPad[_ ](?:[KM]10|SA10|SA8|Z10)(?:Pro)?)(?:_EEA)?(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'KingPad_([KM]10|SA10|SA8)(Pro)?'
+    - regex: 'KingPad[_ ]([KM]10|SA10|SA8|Z10)(Pro)?'
       model: 'KingPad $1 $2'
     - regex: '(M910A|M783K|M783K-16G|M1072R-3G)(?:[);/ ]|$)'
       model: '$1'
@@ -25764,6 +26717,12 @@ Fortis:
   device: 'smartphone'
   model: '$1'
 
+# FortuneShip (http://www.fortuneship.com/)
+FortuneShip:
+  regex: 'ENIE E2(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'Enie E2'
+
 # Vernee
 Vernee:
   regex: 'Vernee|(?:Mars Pro|Apollo[ _](?:Lite|X)|Thor (?:E|Plus)|X2_euro|M7_EEA|T3 Pro|V2 Pro|(?<!MAXTRON )Apollo(?! Premium))(?:[);/ ]|$)'
@@ -25814,6 +26773,14 @@ Vertu:
     - regex: 'Vertu[ ]?([a-z0-9]+)'
       model: '$1'
 
+# Veidoo (https://veidoo.com/)
+Veidoo:
+  regex: 'VEIDOO'
+  device: 'tablet'
+  models:
+    - regex: 'VEIDOO_(T60)_PLUS(?:[);/ ]|$)'
+      model: '$1 Plus'
+
 # Venso mobile
 Venso:
   regex: '(?:CX-508|CX-551|Reiv 500|Creon F5|Isprit U50|Isprit-U50-LTE)(?:[);/ ]|$)'
@@ -25971,7 +26938,7 @@ Hitachi:
       model: '$1'
 
 # Mitchell & Brown (https://www.mitchellandbrown.co.uk/)
-'Mitchell & Brown':
+Mitchell & Brown:
   regex: 'MITCHELL_BROWN[;,]'
   device: 'tv'
   model: ''
@@ -25982,6 +26949,12 @@ Logik:
   device: 'tv'
   model: ''
 
+# Logitech (https://www.logitechg.com/)
+Logitech:
+  regex: 'GR0006(?:[);/ ]|$)'
+  device: 'console'
+  model: 'G Cloud'
+
 # Vestel (vestel.com)
 Vestel:
   regex: 'Vestel[ _,/\-]|Venus[ _](GO|E[2-5]|V[1-9]|Z[1-9]0)|(?<!Winnovo )V_?TAB|VP74|VT97PRO|VSP145M|VSP250[GS]|VSP355[GS]|V3_5580_Dual|V TAB Z[12]'
@@ -26090,11 +27063,13 @@ Videocon:
 
 # Vodafone
 Vodafone:
-  regex: '(?<!FBCR/)Vodafone[ _-]|Smart ?Tab ?(?:III? ?)?(?:|4G|7|10)[);/ -]|VodafoneSmartChat|Smart Ultra 6|(?:GigaTV|VFD[ _][0-9]+|VFD[37]20|VF6[89]5|VF-(696|1397|795|895N|1497))(?:[);/ ]|$)'
+  regex: '(?<!FBCR/)Vodafone[ _-]|VodafoneSmartChat|Smart Ultra 6|Smart ?Tab ?(?:III? ?)?(?:4G|7|10)(?! e-Biz| M1)[;/ )-]|(?:GigaTV|VFD[ _][0-9]+|VFD[37]20|VF6[89]5|VF-(696|1397|795|895N|1497)|SmartV22)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'VFD 100'
       model: 'Smart Mini'
+    - regex: 'Vodafone Pro 4G'  # Mobiwire
+      model: 'Pro 4G'
     - regex: 'VFD720'
       model: 'Smart N9'
     - regex: 'VF685'
@@ -26137,6 +27112,8 @@ Vodafone:
       model: 'Smart N9'
     - regex: 'VFD 730'
       model: 'Smart V10'
+    - regex: 'SmartV22'
+      model: 'Smart V22'
     - regex: 'VFD 900'
       model: 'Smart Platinum 7'
     - regex: 'Vodafone[ _]875(?:[);/ ]|$)'
@@ -26266,8 +27243,8 @@ Vonino:
     - regex: 'Epic[_ ]([EM]8|P7)'
       model: 'Epic $1'
       device: 'tablet'
-    - regex: 'Pluri_M7_2020'
-      model: 'Pluri M7 (2020)'
+    - regex: 'Pluri_M([78])_2020'
+      model: 'Pluri M$1 (2020)'
       device: 'tablet'
     - regex: 'Pluri[ _]([BCMQ])7'
       model: 'Pluri $17'
@@ -26278,9 +27255,12 @@ Vonino:
     - regex: 'Druid[_ ](L10)'
       model: 'Druid $1'
       device: 'tablet'
-    - regex: ' Magnet[_ ]M10[_ ]2020'
+    - regex: 'Magnet[_ ]M10[_ ]2020'
       device: 'tablet'
       model: 'Magnet M10 (2020)'
+    - regex: 'Magnet[_ ](G50)[_ ]Pro'
+      device: 'tablet'
+      model: 'Magnet $1 Pro'
     - regex: 'Magnet[ _](M[19]|G[135]0|W10)'
       model: 'Magnet $1'
       device: 'tablet'
@@ -26355,10 +27335,10 @@ 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|[57]0)|XANON X20|NEXG N(?:7[01]|6)'
+  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-689]|R[HM]2?|RX[23]?|S[1-8]|V1|X[1-4]|Z|[ZV]X)|Orbit M20|Orbit Y(?:2[10]|[57]0)|XANON X[29]0|NEXG N(?:7[0-3]|25|[689])'
   device: 'smartphone'
   models:
-    - regex: 'Walpad[ _]([^;/)]+)(?: Build|[);])'
+    - regex: 'Walpad[ _]?([^;/)]+)(?: Build|[);])'
       device: 'tablet'
       model: 'Primo Walpad $1'
     - regex: 'Primo S6 infinity'
@@ -26375,9 +27355,15 @@ Walton:
       model: 'RX7 Mini'
     - regex: 'Orbit Y(\d{2})'
       model: 'Orbit Y$1'
+    - regex: 'Orbit M(\d{2})'
+      model: 'Orbit M$1'
     - regex: 'XANON X20'
       model: 'Xanon X20'
-    - regex: 'NEXG N(7[01]|6)'
+    - regex: 'XANON X90'
+      model: 'Xanon X90'
+    - regex: 'NEXG N71 Plus'
+      model: 'Nexg N71 Plus'
+    - regex: 'NEXG N(7[0-3]|25|[689])'
       model: 'Nexg N$1'
 
     # general detections
@@ -26417,7 +27403,7 @@ Wexler:
       model: 'TAB 10iQ 3G'
     - regex: 'Wexler[ _\-\.]([^;/]+) Build'
       model: '$1'
-    - regex: 'Wexler[ _\-\.]([^);/]+)(?:[);/]|$)'
+    - regex: 'Wexler[ _\-\.]([^);/]+)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(ULTIMA 7 TWIST PLUS|ULTIMA [78] TWIST|ULTIMA 7 OCTA|ULTIMA 7|MOBI 7 LTE)(?:[);/ ]|$)'
       model: '$1'
@@ -26451,9 +27437,13 @@ Inka:
 
 # Wink
 Wink:
-  regex: '(?<!mismart )Wink[_ ]'
+  regex: '(?<!mismart )Wink[_ ]|SWITRON-i12A'
   device: 'smartphone'
   models:
+    - regex: 'SWITRON-i12A'
+      device: 'tv'
+      model: 'Switron i12A'
+
     - regex: 'Wink[_ ]((?:Glory|World|Share|City)(?:[_ ](?:SE|S))?)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Wink[ _](Primo|Highway)(?:[);/ ]|$)'
@@ -26535,6 +27525,8 @@ Wiko:
       model: 'Barry'
     - regex: '(?:WIKO-)?Birdy'
       model: 'Birdy'
+    - regex: '(?:WIKO-)?Bloom2'
+      model: 'Bloom 2'
     - regex: '(?:WIKO-)?Bloom'
       model: 'Bloom'
     - regex: '(?:WIKO-)?JIMMY'
@@ -26720,13 +27712,23 @@ Wieppo:
   device: 'smartphone'
   model: '$1'
 
+# Weiimi
+Weiimi:
+  regex: '(?:20200808A1)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: '20200808A1'
+      model: 'X16 Pro'
+
 # Weimei
 Weimei:
-  regex: 'weplus_3'
+  regex: 'weplus_3|WEIMEI_NEON2'
   device: 'smartphone'
   models:
     - regex: 'weplus_3'
       model: 'WePlus 3'
+    - regex: 'WEIMEI_NEON2'
+      model: 'Neon 2'
 
 # Wileyfox
 Wileyfox:
@@ -26855,15 +27857,21 @@ 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|2312BPC51H|22127PC95I|2310FPCA4[GI]|MZB0E6DIN|23076PC4BI|2312(?:FPCA6G|2PCD1[GI]|8PC33I)|2311DRK48[GI])(?:[);/ ]|$)'
+  regex: '(?:POCO[ _](?:X[2-6](?:_SN)?|F[26] PRO|M[32456]|M5s|F[356]|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]|MZB0(?:GGWIN|E6DIN|7Z[0-4]IN)|23076PC4BI|2312(?:FRAFDI|BPC51H|FPCA6G|2PCD1[GI]|8PC33I)|2311(?:3RKC6G|DRK48[GI])|24069PC21[GI]|2404APC5FG|2405CPCFBG|MZB9965IN|MZB874[13456]IN|M2004J11G|MZB0A0MIN)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'POCO X2(?:[);/ ]|$)'
+    - regex: '(?:POCO X2|MZB874[13456]IN)(?:[);/ ]|$)'
       model: 'X2'
+    - regex: '23113RKC6G|POCO F6 Pro(?:[);/ ]|$)'
+      model: 'F6 Pro'
+    - regex: '24069PC21[GI]|POCO F6(?:[);/ ]|$)'
+      model: 'F6'
     - regex: '2311DRK48[GI]|POCO X6 Pro 5G(?: Build|[;)])'
       model: 'X6 Pro 5G'
     - regex: '23122PCD1[GI]|POCO X6 5G(?: Build|[;)])'
       model: 'X6 5G'
+    - regex: '2312FRAFDI|MZB0GGWIN'
+      model: 'X6 Neo'
     - regex: '(?:M2012K11AG|POCO F3)(?:[);/ ]|$)'
       model: 'F3'
     - regex: '23013PC75G|POCO F5 Pro'
@@ -26886,6 +27894,8 @@ POCO:
       model: 'M5s'
     - regex: '23128PC33I'
       model: 'M6 5G'
+    - regex: '2404APC5FG|POCO M6(?: Build|[;)])'
+      model: 'M6'
     - regex: '23076PC4BI'
       model: 'M6 Pro 5G'
     - regex: '2312FPCA6G|POCO M6 Pro(?: Build|[;)])'
@@ -26902,7 +27912,7 @@ POCO:
       model: 'X3 Pro'
     - regex: '(?:21061110AG|POCO X3 GT)(?:[);/ ]|$)'
       model: 'X3 GT'
-    - regex: '(?:M2007J20CI|POCO X3(?:_SN)?)(?:[);/ ]|$)'
+    - regex: '(?:M2007J20CI|MZB9965IN|POCO X3(?:_SN)?|MZB07Z[0-4]IN)(?:[);/ ]|$)'
       model: 'X3'
     - regex: '(?:22111317P[GI]|POCO X5 5G)(?:[);/ ]|$)'
       model: 'X5 5G'
@@ -26922,7 +27932,7 @@ POCO:
       model: 'F4'
     - regex: '(?:M2006C3MI|POCO C3)(?:[);/ ]|$)'
       model: 'C3'
-    - regex: '(?:211033MI|22031116AI)(?:[);/ ]|$)'
+    - regex: '(?:211033MI|22031116AI|MZB0A0MIN)(?:[);/ ]|$)'
       model: 'C31'
     - regex: '(?:220333QPG|POCO C40)(?:[);/ ]|$)'
       model: 'C40'
@@ -26936,11 +27946,15 @@ POCO:
       model: 'C61'
     - regex: '2310FPCA4[GI]|POCO C65'
       model: 'C65'
-    - regex: 'POCO F2 PRO(?:[);/ ]|$)'
+    - regex: '(?:POCO F2 PRO|M2004J11G)(?:[);/ ]|$)'
       model: 'F2 Pro'
     - regex: 'X5 GT PRO(?:[);/ ]|$)'
       model: 'X5 GT Pro'
 
+    - regex: '2405CPCFBG'
+      device: 'tablet'
+      model: 'Pad 12.1"'
+
 # Zopo
 Zopo:
   regex: 'ZOPO|(?:ZOPO[_ ])?(HERO2|Flash X3|F2_Color5_5|F5_Color_M5|C2_Color_M4|ZP[0-9]{2,}[^/;]+)(?:\)| Build)'
@@ -27011,7 +28025,7 @@ QIN:
 
 # Xiaomi
 Xiaomi:
-  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'
+  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|rubyplus|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|6A1I)|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[1-5]|2107119DC|M1810F6LI|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G|03C3GI)|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|[CR])|128(?:1AC|3[GC]))|Black Shark|MZB82(?:98|5[57])IN|MZB0A5[HE]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[CGIH]|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)|M1908C3(?:[KJI]G|KH|I[CH])|M1906G7G|M1903(?:F10I|C3GG|C3EI)|M1904F3BG|Hongmi [45]A?|M1912G7B[CE]|2307(?:7RABDC|6RN4BI|6RA4BR|6RN8DY|8PND5G|8RKD5C|6RA4BC|3RPBF[GCL]|BRPDCC)|2310(?:6RN0DA|8RN04Y)|2312(?:CRNCCL|DRA50G|9RAA4G|9RA5FL|9RN51[HX]|CRAD3C|DRAAB[CGI]|7PN0C[CG]|DRA50[CI]|4RA7EO|4RN87[CIG])|2311(?:6PN5B[CG]|BPN23C|7RA68G|DRN14I|7RK66C|FRAFDC|DRK48C|3RKC6C)|2308(?:CPXD0C|8PND5R)|24018RPAC[CG]|2404(?:ARN45A|8RN6C[GI]|0RN64Y|4RN32L)|2405(?:3PY09[CI]|CRPFD[CG])|2306EPN60G|23090(?:RA98[CGI])|23100RN82L|2406(?:9RA21C|ERN9CI)|2403(?:1PN0DC|0PN60G)|QIN3ULTRA|FengMiProjA2|A401XM|MZB8458IN|M1805E10A|M1803D5XA|2407(?:2PX77C|FRK8EC)'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -27053,13 +28067,13 @@ Xiaomi:
       model: 'Hongmi 2'
     - regex: 'Xiaomi[_-]201481[123]|201481[123] Build'
       model: 'Hongmi 2 4G'
-    - regex: 'Hongmi 4A'
-      model: 'Hongmi 4A'
+    - regex: 'Hongmi ([45]A?)'
+      model: 'Hongmi $1'
     - regex: 'MI[_ ]PLAY(?:[);/ ]|$)'
       model: 'Mi Play'
     - regex: 'Mi ?9 ?SE(?:[);/ ]|$)'
       model: 'Mi 9 SE'
-    - regex: 'Mi ?9 Lite(?:[);/ ]|$)'
+    - regex: '(?:Mi ?9 Lite|M1904F3BG)(?:[);/ ]|$)'
       model: 'Mi 9 Lite'
     - regex: '(?:Xiaomi_)?M1902F1[GT]'
       model: 'Mi 9'
@@ -27097,7 +28111,7 @@ Xiaomi:
       model: 'Mi 10 Lite 5G'
     - regex: 'M2007J17I(?:[);/ ]|$)'
       model: 'Mi 10i'
-    - regex: 'M2012K11G(?:[);/ ]|$)'
+    - regex: '(?:M2012K11G|MZB0A5EIN)(?:[);/ ]|$)'
       model: 'Mi 11i'
     - regex: '(?:2107113S[IGR]|Xiaomi 11T Pro)(?:[);/ ]|$)'
       model: 'Mi 11T Pro'
@@ -27121,9 +28135,9 @@ Xiaomi:
       model: 'Note 12 Pro'
     - regex: '22071212AG(?:[);/ ]|$)'
       model: '12T'
-    - regex: '2207122MC(?:[);/ ]|$)'
+    - regex: '(?:2207122MC|Xiaomi 12 Pro Dimensity)(?:[);/ ]|$)'
       model: '12 Pro Dimensity'
-    - regex: '(?:22081212(?:U?G|C)|Xiaomi 12T Pro)(?:[);/ ]|$)'
+    - regex: '(?:22081212(?:U?G|[CR])|Xiaomi 12T Pro)(?:[);/ ]|$)'
       model: '12T Pro'
     - regex: '(?:2206122SC|Xiaomi 12S Pro)(?:[);/ ]|$)'
       model: '12S Pro'
@@ -27141,9 +28155,9 @@ Xiaomi:
       model: '13 Lite'
     - regex: '2211133[CG](?:[);/ ]|$)|Xiaomi 13(?: Build|[;)])'
       model: '13'
-    - regex: '2304FPN6D[CG](?:[);/ ]|$)'
+    - regex: '(?:2304FPN6D[CG]|Xiaomi 13 Ultra)(?:[);/ ]|$)'
       model: '13 Ultra'
-    - regex: '(?:23078PND5G|Xiaomi 13T Pro)(?:[);/ ]|$)'
+    - regex: '(?:23078PND5G|23088PND5R|Xiaomi 13T Pro)(?:[);/ ]|$)'
       model: '13T Pro'
     - regex: '(?:2306EPN60G|XIG04)(?:[);/ ]|$)'
       model: '13T'
@@ -27151,7 +28165,11 @@ Xiaomi:
       model: '14'
     - regex: '(?:24031PN0DC|24030PN60G|Xiaomi 14 Ultra)(?:[);/ ]|$)'
       model: '14 Ultra'
-    - regex: '(?:23116PN5BC|Xiaomi 14 Pro)(?:[);/ ]|$)'
+    - regex: 'Xiaomi 14 Pro Ti'
+      model: '14 Pro Ti'
+    - regex: '24053PY09I(?:[);/ ]|$)'
+      model: '14 Civi'
+    - regex: '(?:2311(?:6PN5B[CG]|BPN23C)|Xiaomi 14 Pro)(?:[);/ ]|$)'
       model: '14 Pro'
     - regex: 'MI[ _]8[ _]?Lite(?:[);/ ]|$)'
       model: 'Mi 8 Lite'
@@ -27193,6 +28211,8 @@ Xiaomi:
       model: 'Mi A3'
     - regex: '2106118C(?:[);/ ]|$)'
       model: 'Mi Mix 4'
+    - regex: 'M1803D5XA(?:[);/ ]|$)'
+      model: 'Mi Mix 2'
     - regex: 'Mi MIX 3 5G(?:[);/ ]|$)'
       model: 'Mi Mix 3 5G'
     - regex: 'MIX ([23])(?:[);/ ]|$)'
@@ -27203,10 +28223,16 @@ Xiaomi:
       model: 'Mi Mix 2S'
     - regex: 'MIX(?! Fold 3)(?:[);/ ]|$)'
       model: 'Mi Mix'
+    - regex: '24072PX77C(?:[);/ ]|$)'
+      model: 'Mix Fold 4'
     - regex: 'Mi Note 3(?:[);/ ]|$)'
       model: 'Mi Note 3'
-    - regex: 'POCOPHONE[ _]F1|POCO F1|beryllium'
+    - regex: 'POCOPHONE[ _]F1|POCO F1|beryllium|M1805E10A'
       model: 'Pocophone F1'
+    - regex: 'M1903C3G[IG]'
+      model: 'Redmi Go'
+    - regex: '24069RA21C|Redmi Turbo 3'
+      model: 'Redmi Turbo 3'
     - regex: 'Redmi 5 Plus'
       model: 'Redmi 5 Plus'
     - regex: 'MDG1(?:[);/ ]|$)'
@@ -27221,9 +28247,9 @@ Xiaomi:
       model: 'Redmi 1S'
     - regex: 'HM 1(?:[);/ ]|$)'
       model: 'Redmi 1'
-    - regex: '(?:M2001C3K3I|MZB8298IN)(?:[);/ ]|$)'
+    - regex: '(?:M2001C3K3I|MZB8298IN|M1908C3K[GH]|MZB8458IN)(?:[);/ ]|$)'
       model: 'Redmi 8A'
-    - regex: '(?:MZB8257IN)(?:[);/ ]|$)'
+    - regex: '(?:MZB825[57]IN|M1908C3I[CG]|M1908C3IH)(?:[);/ ]|$)'
       model: 'Redmi 8'
     - regex: 'Redmi 8A (Dual|Pro)(?:[);/ ]|$)'
       model: 'Redmi 8A $1'
@@ -27231,9 +28257,13 @@ Xiaomi:
       model: 'Redmi 10X'
     - regex: '220333Q(?:AG|NY|L)(?:[);/ ]|$)'
       model: 'Redmi 10C'
-    - regex: '(?:2310(?:6RN0DA|8RN04Y)|2311DRN14I)(?:[);/ ]|$)'
+    - regex: '(?:2310(?:6RN0DA|8RN04Y|0RN82L)|2311DRN14I)(?:[);/ ]|$)'
       model: 'Redmi 13C'
-    - regex: '(?:23124RN87I)(?:[);/ ]|$)'
+    - regex: '2404ARN45A|24040RN64Y'
+      model: 'Redmi 13'
+    - regex: '2406ERN9CI'
+      model: 'Redmi 13 5G'
+    - regex: '(?:23124RN87[CIG])(?:[);/ ]|$)'
       model: 'Redmi 13C 5G'
     - regex: '(?:M2004J19[CG]|M2006C3MII|lancelot|galahad|M2004J19AG)(?:[);/ ]|$)'
       model: 'Redmi 9'
@@ -27245,6 +28275,8 @@ Xiaomi:
       model: 'Redmi 9A'
     - regex: 'M2006C3LII(?:[);/ ]|$)'
       model: 'Redmi 9i'
+    - regex: 'MZB0A5HIN(?:[);/ ]|$)'
+      model: 'Redmi 9i Sport'
     - regex: 'M2006C3M[GT](?:[);/ ]|$)'
       model: 'Redmi 9C'
     - regex: 'M2006C3LVG(?:[);/ ]|$)'
@@ -27273,20 +28305,20 @@ Xiaomi:
       model: 'Redmi 10 Prime'
     - regex: '(?:M2004J7BC|Redmi 10X Pro)(?:[);/ ]|$)'
       model: 'Redmi 10X Pro'
-    - regex: '22120RN86[GI]|22126RN91Y|2212ARNC4L'
+    - regex: '22120RN86[CGIH]|22126RN91Y|2212ARNC4L'
       model: 'Redmi 12C'
     - regex: '23053RN02[AYLI]'
       model: 'Redmi 12'
-    - regex: '(?:23076RN8DY|23076RN4BI|23077RABDC|XIG03|Redmi 12 5G)(?:[);/ ]|$)'
+    - regex: '(?:23076(?:RN8DY|RA4BR|RN4BI)|23077RABDC|XIG03|Redmi 12 5G|A401XM)(?:[);/ ]|$)'
       model: 'Redmi 12 5G'
-    - regex: '23100RN82L(?:[);/ ]|$)'
-      model: 'Redmi 13C'
     - regex: '22071219AI(?:[);/ ]|$)'
       model: 'Redmi 11 Prime'
     - regex: 'Redmi K20 Pro Premium Edition(?:[);/ ]|$)'
       model: 'Redmi K20 Pro Premium Edition'
     - regex: 'Redmi K20Pro(?:[);/ ]|$)'
       model: 'Redmi K20 Pro'
+    - regex: 'M1903F10I'
+      model: 'Redmi K20'
     - regex: 'Redmi K30 Pro Zoom Edition(?:[);/ ]|$)'
       model: 'Redmi K30 Pro Zoom Edition'
     - regex: 'Redmi K30 Pro Zoom(?:[);/ ]|$)'
@@ -27297,7 +28329,7 @@ Xiaomi:
       model: 'Redmi K$1 Pro'
     - regex: 'Redmi K30 5G(?:[);/ ]|$)'
       model: 'Redmi K30 5G'
-    - regex: 'M1912G7BC(?:[);/ ]|$)'
+    - regex: 'M1912G7B[CE](?:[);/ ]|$)'
       model: 'Redmi K30 4G'
     - regex: 'Redmi K30i 5G(?:[);/ ]|$)'
       model: 'Redmi K30i 5G'
@@ -27331,7 +28363,7 @@ Xiaomi:
       model: 'Redmi K60E'
     - regex: '22127RK46C|Redmi K60 Pro'
       model: 'Redmi K60 Pro'
-    - regex: '23078RKD5C'
+    - regex: '23078RKD5C|Redmi K60 Ultra'
       model: 'Redmi K60 Ultra'
     - regex: '23117RK66C'
       model: 'Redmi K70 Pro'
@@ -27339,14 +28371,18 @@ Xiaomi:
       model: 'Redmi K70E'
     - regex: '23113RKC6C'
       model: 'Redmi K70'
+    - regex: '2407FRK8EC'
+      model: 'Redmi K70 Ultra'
     - regex: 'Redmi Y1 Lite(?:[);/ ]|$)'
       model: 'Redmi Y1 Lite'
     - regex: 'Redmi 6 Pro Extreme'
       model: 'Redmi 6 Pro Extreme'
     - regex: 'Xiaomi_M1805D1ST'
       model: 'Redmi 6 Pro'
-    - regex: ' ONC(?: Build|[;)])'
+    - regex: 'ONC(?: Build|[;)])|M1810F6LI'
       model: 'Redmi 7'
+    - regex: 'M1903C3EI'
+      model: 'Redmi 7A'
     - regex: 'Redmi (\d+) Pro(?:[);/ ]|$)'
       model: 'Redmi $1 Pro'
     - regex: 'Redmi 4 Prime(?:[);/ ]|$)'
@@ -27361,6 +28397,10 @@ Xiaomi:
       model: 'Redmi A2+'
     - regex: '23129RN51[XH]'
       model: 'Redmi 3'
+    - regex: '2404(?:4RN32L|8RN6C[GI])'
+      model: 'Redmi A3x'
+    - regex: '2312CRNCCL'
+      model: 'Redmi A3'
     - regex: 'QIN3ULTRA'
       model: 'Qin 3 Ultra'
     - regex: 'Qin ?2 Pro(?:[);/ ]|$)'
@@ -27424,6 +28464,9 @@ Xiaomi:
     - regex: '22081283[GC](?:[);/ ]|$)'
       model: 'Redmi Pad'
       device: 'tablet'
+    - regex: '2405CRPFD[CG](?:[);/ ]|$)'
+      model: 'Redmi Pad Pro'
+      device: 'tablet'
     - regex: '(?:23073RPBF[GCL]|Redmi Pad SE)(?:[);/ ]|$)'
       model: 'Redmi Pad SE'
       device: 'tablet'
@@ -27546,7 +28589,7 @@ Xiaomi:
     - regex: 'M2007J17C(?:[);/ ]|$)'
       model: 'Redmi Note 9 Pro 5G'
       device: 'phablet'
-    - regex: '(?:joyeuse|M2003J6B2G)(?:[);/ ]|$)'
+    - regex: '(?:joyeuse|M2003J6(?:B2G|A1I))(?:[);/ ]|$)'
       model: 'Redmi Note 9 Pro'
       device: 'phablet'
     - regex: 'Redmi Note 10 Lite|M2002F4LG(?:[);/ ]|$)'
@@ -27576,6 +28619,9 @@ Xiaomi:
     - regex: '(?:M2101K6[GIRP]|M2104K10AC|Redmi Note 10 Pro(?! Max))(?:[);/ ]|$)'
       model: 'Redmi Note 10 Pro'
       device: 'phablet'
+    - regex: 'rubyplus(?:[);/ ]|$)'
+      model: 'Redmi Note 12 Discovery'
+      device: 'phablet'
     - regex: '(?:22101316[CIG])(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro'
       device: 'phablet'
@@ -27588,7 +28634,10 @@ Xiaomi:
     - regex: '(?:2302(?:1RAA2Y|1RAAEG|8RA60L|7RAD4I)|22101317C|22111317G)(?:[);/ ]|$)'
       model: 'Redmi Note 12'
       device: 'phablet'
-    - regex: '23076RA4BC(?:[);/ ]|$)'
+    - regex: '(?:Redmi Note 12R Pro)(?:[);/ ]|$)'
+      model: 'Redmi Note 12R Pro'
+      device: 'phablet'
+    - regex: '(?:23076RA4BC|Redmi Note 12R)(?:[);/ ]|$)'
       model: 'Redmi Note 12R'
       device: 'phablet'
     - regex: '(?:23049RAD8C)(?:[);/ ]|$)'
@@ -27600,12 +28649,9 @@ Xiaomi:
     - regex: '(?:22101316UC)(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro DE'
       device: 'phablet'
-    - regex: '(?:22101316UG)(?:[);/ ]|$)'
+    - regex: '(?:22101316U[GP])(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro+ 5G'
       device: 'phablet'
-    - regex: '(?:22101316UP)(?:[);/ ]|$)'
-      model: 'Redmi Note 12 Discovery'
-      device: 'phablet'
     - regex: '22101316UCP(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro+'
       device: 'phablet'
@@ -27621,7 +28667,7 @@ Xiaomi:
     - regex: '(?:2311FRAFDC)(?:[);/ ]|$)'
       model: 'Redmi Note 13R Pro'
       device: 'phablet'
-    - regex: '(?:2312DRA50[GI]|Redmi Note 13 Pro 5G)(?:[);/ ]|$)'
+    - regex: '(?:2312DRA50[GI]|Redmi Note 13 Pro 5G|XIG05)(?:[);/ ]|$)'
       model: 'Redmi Note 13 Pro 5G'
       device: 'phablet'
     - regex: '2312(?:4RA7EO|9RAA4G|9RA5FL)(?:[);/ ]|$)'
@@ -27678,7 +28724,7 @@ Xiaomi:
     - regex: '(?:21091116(?:AI|I)|Redmi Note 11T 5G)(?:[);/ ]|$)'
       model: 'Redmi Note 11T 5G'
       device: 'phablet'
-    - regex: 'M1908C3J[IH](?:[);/ ]|$)'
+    - regex: '(?:M1908C3J[IH]|M1908C3JG)(?:[);/ ]|$)'
       model: 'Redmi Note 8'
       device: 'phablet'
     - regex: '(?:M1908C3JGG|Redmi Note 8 \(2021\))(?:[);/ ]|$)'
@@ -27716,7 +28762,7 @@ Xiaomi:
     - regex: 'Mi Note 10 Lite'
       model: 'Mi Note 10 Lite'
       device: 'phablet'
-    - regex: 'Mi Note 10'
+    - regex: 'Mi Note 10|M1910F4G(?:[);/ ]|$)'
       model: 'Mi Note 10'
       device: 'phablet'
     - regex: 'MI[ _]Note[ _]([^;/) ]+)?'
@@ -27757,7 +28803,7 @@ Xolo:
   regex: 'Xolo|(?:Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5\.[05]|Era5X|Era[ _]2[VX](?:[_ ]3GB)?|era[ _]X|era_HD|era[_ ]4[GK]|Era_4?X(?:_2GB)?|BLACK-1XM|A1000s_Lite|cube 5\.0_2GB|Opus 3|era1X|era [2X]|era1Xpro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'BLACK-1XM'
+    - regex: 'BLACK-?1XM?'
       model: 'Black 1X'
     - regex: 'Era[ _]?1X ?Pro'
       model: 'Era 1X Pro'
@@ -27818,7 +28864,7 @@ Yarvik:
       model: 'Xenta 13c'
 
 # Yes
-'Yes':
+Yes:
   regex: 'M631Y|M685Y4|M651G_MY|YES (?:Altitude 4|MPY(?:48|54))'
   device: 'smartphone'
   models:
@@ -27833,18 +28879,18 @@ Yarvik:
 
 # Yestel or YesTeL
 Yestel:
-  regex: 'yestel|(?:T5|X2)_EEA(?:[);/ ]|$)'
+  regex: 'yestel|(?:T5|T13|X2)_EEA(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'yestel P30(?:[);/ ]|$)'
       model: 'P30'
-    - regex: '(X2|T5)_EEA(?:[);/ ]|$)'
+    - regex: '(X2|T5|T13)_EEA(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
-# Yezz
+# Yezz (https://myyezz.com/)
 Yezz:
-  regex: 'Yezz|ANDY[ _]|(?: (?:4E4|5EQ)|A5EI|LIV 1S|LIV1|LIV2[_ ]?LTE|ART[12](?:_?PRO)?|MAX_1_PLUS|MAX2 PLUS|EPIC T)(?:[);/ ]|$)'
+  regex: 'Yezz|ANDY[ _]|(?: (?:4E4|5EQ)|A5EI|LIV[ _][13]S?|LIV1|LIV2[_ ]?LTE|ART ?[123](?:_?PRO|S)?|MAX_1_PLUS|MAX2 PLUS|EPIC T|GO ?[123])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:YEZZ[_-])?(4E4|5EQ|A4M|A5EI)'
@@ -27857,12 +28903,20 @@ Yezz:
       model: 'Art 1'
     - regex: 'ART2PRO'
       model: 'Art 2 Pro'
+    - regex: 'ART 3S'
+      model: 'Art 3S'
     - regex: 'EPIC T'
       model: 'Epic T'
+    - regex: 'GO ?([123])'
+      model: 'GO $1'
     - regex: 'LIV1'
       model: 'LIV1'
-    - regex: 'LIV 1S'
-      model: 'LIV 1S'
+    - regex: 'LIV 3S LTE'
+      model: 'LIV 3S LTE'
+    - regex: 'LIV[ _]([13])S'
+      model: 'LIV $1S'
+    - regex: 'LIV 3 LTE'
+      model: 'LIV 3 LTE'
     - regex: 'LIV2[_ ]?LTE'
       model: 'LIV2 LTE'
     - regex: 'MAX_1_PLUS'
@@ -28028,13 +29082,15 @@ ZYQ:
 
 # Vivax (www.vivax.com)
 Vivax:
-  regex: 'VIVAX|(?:Fly4|Fly5[_ ]Lite|Fun[_ ]S500|Point[_ ](?:X[12]|X50[123]|X450)|PRO3|32LE77SM|40LE77SM|FUN S1|FUN_S20|TPC[-_ ](?:7121|80[56])3G)(?:[);/ ]|$)'
+  regex: 'VIVAX|(?:Fly4|Fly5[_ ]Lite|Fun[_ ]S500|Point[_ ](?:X[12]|X50[123]|X450)|SMART FLY V500|PRO3|32LE77SM|40LE77SM|FUN S1|FUN_S20|TPC[-_ ](?:7121|80[56])3G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Fly5[_ ]Lite(?:[);/ ]|$)'
       model: 'Fly 5 Lite'
     - regex: 'Fly4(?:[);/ ]|$)'
       model: 'Fly 4'
+    - regex: 'SMART FLY V500(?:[);/ ]|$)'
+      model: 'Smart Fly V500'
     - regex: 'Point_X([12])(?:[);/ ]|$)'
       model: 'Point X$1'
     - regex: 'Fun[_ ]S500(?:[);/ ]|$)'
@@ -28051,7 +29107,7 @@ Vivax:
       model: 'Smart Point X5010'
     - regex: 'VIVAX[_ ]PRO[_ ]?(3|M1)'
       model: 'Pro $1'
-    - regex: 'TPC[-_ ](7121|806)([34])G'
+    - regex: '(?:VIVAX[ _])?TPC[-_ ](105|7121|806)_?([34])G'
       model: 'TPC-$1 $2G'
       device: 'tablet'
     - regex: '(?:TABLET )?TPC[-_ ](\d+) ?([34])G(?:[);/ ]|$)'
@@ -28228,7 +29284,7 @@ FLYCAT:
 
 # Fly
 Fly:
-  regex: '(?<!GI )Fly(?!Flow|touch)|Power Plus 5000|Power Plus 3|Photo Pro|Slimline|Cirrus (?:6|13)|Life (?:Ace|Jet|Sky|Compact 4G|Geo|Zen|Play)|(?:lineage_)?FS50[1-9]|FS51[0-8]|FS52[0-9]|FS530|FS55[134]|FS40[1-9]|FS45[1-9]|4FS06|MERIDIAN-|(?:Phoenix 2|(?:IQ(?!10[134]0)[0-9]{3,}[i]?)[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?|Tornado Slim|Android 8(?:[\d.]*);(?: [\w-]+;)? View Max)(?:[);/ ]|$)'
+  regex: '(?<!GI |SMART )Fly(?!Flow|touch)|Power Plus 5000|Power Plus 3|Photo Pro|Slimline|Cirrus (?:6|13)|Life (?:Ace|Jet|Sky|Compact 4G|Geo|Zen|Play)|(?:lineage_)?FS50[1-9]|FS51[0-8]|FS52[0-9]|FS530|FS55[134]|FS40[1-9]|FS45[1-9]|4FS06|MERIDIAN-|(?:Phoenix 2|(?:IQ(?!10[134]0)[0-9]{3,}[i]?)[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?|Tornado Slim|Android 8(?:[\d.]*);(?: [\w-]+;)? View Max)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Fly_)?IQ310(?:[);/ ]|$)'
@@ -28473,9 +29529,11 @@ FinePower:
 
 # Freetel (freetel.jp)
 Freetel:
-  regex: '(?:FUN PLUS|FTJ17[AC]00|FTJ152[ABCD]|FTU18A00|FT141B|FT142D(?:_LTEXM)?|FT142A?|FTJ161[ABE](?:-VN)?|FTJ1[56]2E|FTJ162[BD]|FT162D|FTE161[GE]|SAKURA_FTE1|FTE171A)(?:[);/ ]|$)'
+  regex: '(?:FUN PLUS|Fun \+|FTJ17[AC]00|FTJ152[ABCD]|FTU18A00|FT141B|FT142D(?:_LTEXM)?|FT142A?|FTJ161[ABE](?:-VN)?|FTJ1[56]2E|FTJ162[BD]|FT162D|FTE161[GE]|SAKURA_FTE1|FTE171A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Fun \+' # plusone ltd
+      model: 'Fun +'
     - regex: 'FTJ152C'
       model: 'Samurai Miyabi'
     - regex: 'FTJ17A00(?:[);/ ]|$)'
@@ -28534,7 +29592,7 @@ Zeemi:
   models:
     - regex: 'ZEEMI[ _-]([^/;]+) Build'
       model: '$1'
-    - regex: 'ZEEMI[ _-]([^/;)]+)(?:[);/]|$)'
+    - regex: 'ZEEMI[ _-]([^/;)]+)(?:[);/ ]|$)'
       model: '$1'
 
 # Zenek
@@ -28555,15 +29613,19 @@ Zenek:
 
 # Nubia (www.nubia.com)
 Nubia:
-  regex: 'Nubia[ _]|(?:NX(?:403A|404H|406E|40[X2]|503A|50[5678]J|51[0123]J|521J|523J_V1|529Jq?|5[345]1J|5[48]9J|569[HJ]|5[67]3J|575J|59[157]J|60[1689]J|61[12679]J|62[79]J|65[19]J|6[126]9J|66[67]J|679[JS]|70[129]J|71[123]J|72[19]J|769J|709S|907J)|NP01J)(?:[);/ ]|$)'
+  regex: 'Nubia[ _]|(?:NX(?:403A|404H|406E|40[X2]|503A|50[5678]J|51[0123]J|521J|523J_V1|529Jq?|5[345]1J|5[48]9J|569[HJ]|5[67]3J|575J|59[157]J|60[1689]J|61[12679]J|62[79]J|65[19]J|6[126]9J|66[67]J|679[JS]|70[129]J|71[123]J|72[19]J|769J|709S|907J)|NP01J|Z2352N|Z6255CA)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NP01J'
       device: 'tablet'
       model: 'Red Magic Gaming Pad'
 
+    - regex: 'Z6255CA'
+      model: 'Blade A72'
     - regex: '8150N'
       model: 'Neo 5G'
+    - regex: 'Z2352N'
+      model: 'Neo 2 5G'
     - regex: 'NX711J'
       model: 'Z50'
     - regex: 'NX712J'
@@ -28675,7 +29737,7 @@ Nubia:
 
 # Rakuten (network.mobile.rakuten.co.jp)
 Rakuten:
-  regex: '(?:ZR01|3917JR|P710|C330)(?:[);/ ]|$)'
+  regex: '(?:ZR01|3917JR|P710|P780|C330)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ZR01'
@@ -28686,10 +29748,12 @@ Rakuten:
       model: 'Hand'
     - regex: 'C330'
       model: 'C330 Mini'
+    - regex: 'P780'
+      model: 'Hand 5G'
 
 # 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|5G UG Phone U23|ATLAS[ _]W)(?:[);/ ]|$)'
+  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|A[13]03ZT|Z335(?:1S|[23]CA)|Z5156CC|Z5157[VY]|B867RE|MEO Smart A[48]0|SmartA35|P65[10] 2021|Z6201V|Z6252CA|Z6251V?|A2020N3|A2322G|A202ZT|A302ZT|Z719DL|Z5158|Z235[069]|Z2450|B2017G|5G UG Phone U23|ATLAS[ _]W|A2121G|A2022|A202[23]P|A0622|A0616)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -28703,6 +29767,8 @@ ZTE:
       model: 'Voyage 10'
     - regex: '9040N(?:[);/ ]|$)'
       model: 'Voyage 20 Pro'
+    - regex: '9042N(?:[);/ ]|$)'
+      model: 'Voyage 40 Pro+'
     - regex: '7531N(?:[);/ ]|$)'
       model: 'Voyage 30S'
     - regex: 'A2122H(?:[);/ ]|$)'
@@ -28717,8 +29783,12 @@ ZTE:
       model: 'Libero 5G II'
     - regex: 'A202ZT(?:[);/ ]|$)'
       model: 'Libero 5G III'
+    - regex: 'A302ZT(?:[);/ ]|$)'
+      model: 'Libero 5G IV'
     - regex: '901ZT(?:[);/ ]|$)'
       model: 'Libero S10'
+    - regex: 'A303ZT(?:[);/ ]|$)'
+      model: 'Anshin Family'
     - regex: 'ZTG01(?:[);/ ]|$)'
       model: 'A1'
     - regex: 'ZTE T221(?:[);/ ]|$)'
@@ -28741,6 +29811,8 @@ ZTE:
       model: 'Blade A71'
     - regex: 'ZTE 7060'
       model: 'Blade A73'
+    - regex: 'Z2359'
+      model: 'Blade A75'
     - regex: 'N939Sc'
       model: 'Blade A711'
     - regex: 'Z5157[VY]'
@@ -28765,7 +29837,7 @@ ZTE:
       model: 'Axon 10 Pro 5G'
     - regex: 'A2020 SP(?:[);/ ]|$)'
       model: 'Axon 10s Pro 5G'
-    - regex: 'A2021[LGH]?(?:[);/ ]|$)'
+    - regex: '(?:A2021[LGH]?|ZTE Axon 11 5G)(?:[);/ ]|$)'
       model: 'Axon 11 5G'
     - regex: 'A2021E(?:[);/ ]|$)'
       model: 'Axon 11'
@@ -28783,6 +29855,8 @@ ZTE:
       model: 'Axon 30 Pro 5G'
     - regex: 'A2022'
       model: 'Axon 30 Pro'
+    - regex: 'A2023H'
+      model: 'Axon A41 Ultra 5G'
     - regex: 'A2023P'
       model: 'Axon 40 Ultra'
     - regex: 'A2023G?'
@@ -28791,6 +29865,12 @@ ZTE:
       model: 'Axon 40 SE'
     - regex: 'A2016'
       model: 'Axon Elite'
+    - regex: 'Z2356'
+      model: 'Axon 60'
+    - regex: 'Z2350'
+      model: 'Axon 60 Lite'
+    - regex: 'A2024H'
+      model: 'Axon 50 Ultra 5G'
     - regex: 'N799D(?:[);/ ]|$)'
       model: 'Blade Eg'
     - regex: 'Z818L(?:[);/ ]|$)'
@@ -29208,7 +30288,7 @@ ZTE:
     - regex: 'ATLAS[ _]W'
       model: 'Atlas W'
 
-    - regex: 'A2121[LE]?(?:[);/ ]|$)'
+    - regex: 'A2121[GLE]?(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Axon 20 5G'
     - regex: 'ZTE 8010'
@@ -29239,6 +30319,9 @@ ZTE:
     - regex: 'T1002(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Blade X10'
+    - regex: 'T1004(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Blade X10 II Pro+'
 
     - regex: 'AxonPhone ([^;/]+) Build'
       model: 'AxonPhone $1'
@@ -29251,6 +30334,8 @@ ZTE:
       model: 'Blade $1'
     - regex: 'ZTE Blade A52'
       model: 'Blade A52'
+    - regex: 'Z2450'
+      model: 'Blade A55'
     - regex: 'ZTE Blade A53\+'
       model: 'Blade A53+'
     - regex: 'ZTE Blade A33s'
@@ -29288,7 +30373,7 @@ Onix:
       model: '$1'
 
 Zuum:
-  regex: 'Zuum[ _-]|Android 6.+ UNIQ(?: Build|[);])|(?:ROCKET III?|Akus (?:PRO|[ZP]1?)|AURA_Z|COVET|MAGNO(?:-S)?|ONIX(?: S)?|STEDI|STELLAR(?:[ _](?:Z|PRO|[MP]1|M2))?|GRAVITY [ZM]|AURA (?:PLUS JLO|PRO JLO|PRO|X)|COVET_PRO_LITE|RONI|Android.*; (?:GRANT|LIMIT)|Gravity Life|ULTRA Z)(?:[);/ ]|$)'
+  regex: 'Zuum[ _-]|Android 6.+ UNIQ(?: Build|[);])|(?:ROCKET III?|Akus (?:PRO|[ZP]1?)|AURA_Z|COVET|MAGNO(?:-S)?|ONIX(?: S)?|STEDI|STELLAR(?:[ _](?:Z|PRO|[MP]1|M2))?|GRAVITY [ZM]|AURA (?:PLUS JLO|PRO JLO|PRO|X)|COVET_PRO_LITE|RONI|Android.*; (?:GRANT|LIMIT)|Gravity Life|SENS M1|ULTRA Z)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AKUS PRO'
@@ -29315,6 +30400,8 @@ Zuum:
       model: 'Onix S'
     - regex: 'ONIX'
       model: 'Onix'
+    - regex: 'SENS M1'
+      model: 'Sens M1'
     - regex: 'STEDI'
       model: 'Stedi'
     - regex: 'STELLAR PRO'
@@ -29426,7 +30513,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|DV9135|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|DV9157-C|DV8304-C|Osmartphona'
   device: 'smartphone'
   models:
     - regex: 'Osmartphona'
@@ -29467,13 +30554,21 @@ MTC:
     - regex: 'DV8304-C'
       device: 'tv'
       model: 'SuperWave DV8304-C'
-    - regex: '(DV8235|DV9135)'
+    - regex: '(DV8235|DV9135|DV9157)'
       device: 'tv'
       model: '$1'
 
+# Megacable (https://megacable.com.mx/)
+Megacable:
+  regex: 'OTT Xview AV1(?:[);/ ]|$)'
+  device: 'tv'
+  models:
+    - regex: 'OTT Xview AV1'
+      model: 'Xview+' # ZTE B866V2F
+
 # MegaFon
 MegaFon:
-  regex: 'MegaFon|MFLoginPh|MegLogPh|(MFLogin[34]T?|MS3B|SP-A5|SP-A20i)(?:[);/ ]|$)'
+  regex: 'MegaFon|MFLoginPh|MegLogPh|(MFLogin[34]T?|MS3B|SP-A5|SP-A20i|KM8-ATV-MF)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'MFLoginPh|MegLogPh'
@@ -29492,10 +30587,13 @@ MegaFon:
     - regex: 'MegaFon V9+'
       device: 'tablet'
       model: 'V9 Plus'
+    - regex: '(KM8-ATV-MF)'
+      device: 'tv'
+      model: '$1'
 
 # Inoi (inoi.com)
 Inoi:
-  regex: 'INOI|(?:A126|A161|A170_Plus|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A17[01]|A180))|A181_Plus)(?:[);/ ]|$)'
+  regex: 'INOI|(?:A126|A1[68]1|A170_Plus|A161_Plus|(?:Android 12(?:[\d.]*);(?: [\w-]+;)? (?:A151))|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A17[01]|A180))|A181_Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'inoiPad mini 2\+32 Wi-Fi\+3G'
@@ -29513,21 +30611,26 @@ Inoi:
     - regex: 'inoiPad Pro'
       device: 'tablet'
       model: 'Pad Pro'
+    - regex: 'inoiPad 64GB Wi-Fi\+3G'
+      device: 'tablet'
+      model: 'Pad WiFi'
     - 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|A17[01])(?:[);/ ]|$)'
+    - regex: '(A126|A17[01])(?:[);/ ]|$)'
       model: '$1'
     - regex: 'A170_Plus'
       model: 'A72'
     - regex: 'A181_Plus'
       model: 'A181 Plus'
+    - regex: 'A(1[58]1)'
+      model: 'A$1'
     - regex: 'A180'
       model: 'Note 12'
-    - regex: ' A161(?:[);/ ]|$)'
+    - regex: '(?: A161|A161_Plus)(?:[);/ ]|$)'
       model: 'A62'
     - regex: 'INOI ([257]) (?:\d\+\d+ )?(2019|202[01])(?:[);/ ]|$)'
       model: '$1 ($2)'
@@ -29671,13 +30774,15 @@ X-TIGI:
 
 # Hot Pepper (https://www.hotpepperusa.com/)
 Hot Pepper:
-  regex: '(?:HPP-(GS1|L55B)|VLE5|Puya|HPPL60A)(?:[);/ ]|$)'
+  regex: '(?:HPP-(GS1|L55B)|VLE5|Puya|HPPL6[03]A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'HPP-GS1'
       model: 'Ghost'
     - regex: 'HPPL60A'
       model: 'Chilaca'
+    - regex: 'HPPL63A'
+      model: 'Panca'
     - regex: 'VLE5'
       model: 'Poblano'
     - regex: 'Puya'
@@ -29722,7 +30827,7 @@ Ritmix:
       device: 'smartphone'
 
 # Ross&Moor
-'Ross&Moor':
+Ross&Moor:
   regex: 'RM(D)?[-_](974R|600|550|790)(?:[);/ ]|$)'
   device: 'tablet'
   model: 'RM$1-$2'
@@ -29747,7 +30852,7 @@ NEXBOX:
 
 # True or TrueSmart
 'True':
-  regex: ' TRUE BEYOND TAB 3G|HPH07|SMART[ _](4G Adventure(?: Pro)?|MAX 4\.0 PLUS|4G[ _](?:GEN C [45]\.[05]|M1 Plus|Champion|Speedy 5\.0 Plus|Speedy[_ ]5inch|P1))|Alpha 5G|SMART Champ 4\.0|TRUE SMART 7\.0 Quadcore|SMART 4G M1'
+  regex: 'TRUE BEYOND TAB 3G|HPH07|SMART[ _](4G Adventure(?: Pro)?|MAX 4\.0 PLUS|4G[ _](?:MAX 5\.5|GEN C [45]\.[05]|M1 Plus|Champion|Speedy 5\.0 Plus|Speedy[_ ]5inch|P1))|Alpha 5G|SMART Champ 4\.0|TRUE SMART 7\.0 Quadcore|SMART 4G M1|SMART TAB 4G (?:e-Biz|M1)'
   device: 'smartphone'
   models:
     - regex: 'Alpha 5G(?:[);/ ]|$)'
@@ -29764,6 +30869,8 @@ NEXBOX:
       model: 'Smart 4G Adventure Pro'
     - regex: 'SMART 4G Adventure'
       model: 'Smart 4G Adventure'
+    - regex: 'SMART 4G MAX 5\.5'
+      model: 'Smart 4G Max 5.5'
     - regex: 'SMART[ _]4G[_ ]Speedy[_ ]5inch'
       model: 'Smart 4G Speedy 5'
     - regex: 'SMART[ _]4G[_ ]Champion'
@@ -29776,6 +30883,15 @@ NEXBOX:
       model: 'Smart 4G M1 Plus'
     - regex: 'SMART 4G M1'
       model: 'Smart 4G M1'
+    - regex: 'SMART TAB 4G M1'
+      device: 'tablet'
+      model: 'Smart Tab 4G M1'
+    - regex: 'SMART TAB 4G e-Biz PRO'
+      device: 'tablet'
+      model: 'Smart Tab 4G e-Biz Pro'
+    - regex: 'SMART TAB 4G e-Biz'
+      device: 'tablet'
+      model: 'Smart Tab 4G e-Biz'
     - regex: 'TRUE BEYOND TAB 3G'
       device: 'tablet'
       model: 'Beyond Tab 3G'
@@ -29788,13 +30904,13 @@ NEXBOX:
       model: 'ID TV HPH07'
 
 Yandex:
-  regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[12]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
+  regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[1235]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'YandexModule2-00001'
       device: 'tv'
       model: 'Module'
-    - regex: 'YNDX-?(0007[12]|0009[12]|0010[12])'
+    - regex: 'YNDX-?(0007[1235]|0009[12]|0010[12])'
       device: 'tv'
       model: 'YNDX-$1'
     - regex: 'YNDX-?000SB'
@@ -29843,7 +30959,7 @@ HiHi:
 
 # Hi or Hi TFG (https://www.hi-online.co.za/)
 Hi:
-  regex: '(?:(?<!Thrill )Boost(?:[ _](?:Hypa|Max|Ultra))?(?: Build|[;)])|HMR(?:5012|5450)|Crusader|(?:VHIX-)?VHIX-\w+(?:-[A-Z])?|43FSY112X[cd]|32HSY119X|39HSY111X|55USY151X|50USY151X|65USY151X)(?:[);/ ]|$)'
+  regex: '(?:(?<!Thrill )Boost(?:[ _](?:Hypa|Max|Ultra))?(?: Build|[;)])|HMR(?:5012|5450)|Crusader|(?:VHIX-)?VHIX-\w+(?:-[A-Z])?|43FSY112X[bcd]?|32HSY119X|39HSY111X|55USY151X|50USY151X|65USY151X)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Boost[ _](Hypa|Max|Ultra)(?:[);/ ]|$)'
@@ -29860,7 +30976,7 @@ Hi:
     - regex: '(?:VHIX-)?VHIX-(\w+)'
       device: 'tv'
       model: 'VHIX-$1'
-    - regex: '(32HSY119X|39HSY111X|55USY151X|43FSY112X[cd]|50USY151X|65USY151X)(?:[);/ ]|$)'
+    - regex: '(32HSY119X|39HSY111X|55USY151X|43FSY112X[bcd]?|50USY151X|65USY151X)(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
 
@@ -29909,7 +31025,7 @@ Highscreen:
       model: 'Fest Pro'
     - regex: 'Fest(?:[);/ ]|$)'
       model: 'Fest'
-    - regex: ' Bay(?:[);/ ]|$)'
+    - regex: 'Bay(?:[);/ ]|$)'
       model: 'Bay'
     - regex: 'PowerFour(?:[);/ ]|$)'
       model: 'Power Four'
@@ -30011,15 +31127,18 @@ Qumo:
 
 # Qubo (qubomobile.com)
 Qubo:
-  regex: '(?:Cronos|MINERVA(?:_32GB)?|X668_64GB|X626_4G|Hermes)(?:[);/ ]|$)'
+  regex: '(?:Cronos|MINERVA(?:_32GB)?|X668_64GB|X626_4G|Hermes|T104_64GB)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'MINERVA(?:_32GB)?(?:[);/ ]|$)'
       model: 'Minerva'
-    - regex: 'X668_64GB(?:[);/ ]|$)'
+    - regex: 'X668_64GB'
       model: 'X668'
     - regex: '(Cronos|Hermes|X626_4G)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'T104_64GB(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T104'
 
 # Umax (umax.cz)
 Umax:
@@ -30063,13 +31182,15 @@ Mann:
 
 # Unihertz (unihertz.com)
 Unihertz:
-  regex: '((?<!Astra )Titan(_pocket)?|Jelly(?:-Pro| Star|2(?:_JP)?)|Atom_X?L|Ticktock(?:-S)?|UNIA62_S01|Titan Slim|TANK 01|TANK2|TANK 3|TANK MINI 1)(?:[);/ ]|$)'
+  regex: '((?<!Astra )Titan(_pocket)?|Jelly(?:-Pro| Star|2(?:_JP)?| 2E)|Atom_X?L|Ticktock(?:-S)?|UNIA62_S01|Titan Slim|TANK 01|TANK 2 PRO|TANK2|TANK 3|TANK MINI 1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(Jelly)-Pro(?:[);/ ]|$)'
       model: '$1 Pro'
     - regex: 'Jelly2(?:_JP)?(?:[);/ ]|$)'
       model: 'Jelly 2'
+    - regex: 'Jelly 2E'
+      model: 'Jelly 2E'
     - regex: 'Jelly Star'
       model: 'Jelly Star'
     - regex: 'Titan_pocket'
@@ -30084,12 +31205,15 @@ Unihertz:
       model: 'Ticktock'
     - regex: 'TANK 01'
       model: 'Tank 01'
+    - regex: '(Titan|Atom_X?L)(?:[);/ ]|$)'
+      model: '$1'
+      # 8849 (8849tech.com) sub brand Unihertz
+    - regex: 'TANK 2 PRO'
+      model: 'Tank 2 Pro'
     - regex: 'TANK MINI 1'
       model: 'Tank Mini 1'
     - regex: 'TANK ?([23])'
       model: '8849 Tank $1'
-    - regex: '(Titan|Atom_X?L)(?:[);/ ]|$)'
-      model: '$1'
 
 # Chuwi (www.chuwi.com)
 Chuwi:
@@ -30156,7 +31280,7 @@ Bezkam:
   model: '$1'
 
 # NG Optics
-'NG Optics':
+NG Optics:
   regex: '(NG3128HD)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
@@ -30236,7 +31360,7 @@ Viumee:
       model: '$1 Play'
     - regex: 'EV5 X'
       model: 'EV5 X'
-    - regex: ' EV7(?:[);/ ]|$)'
+    - regex: 'EV7(?:[);/ ]|$)'
       model: 'EV7'
     - regex: 'SMART[_ ](EV[56])'
       model: 'Smart $1'
@@ -30269,14 +31393,14 @@ Sunvell:
 
 # Ugoos
 Ugoos:
-  regex: 'UGOOS-|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? UT8|TOX3)(?:[);/ ]|$)'
+  regex: 'UGOOS[-_ ]|(?:Android 11(?:[\d.]*);(?: [\w-]+;)? UT8|TOX3)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'UGOOS-UT3 ?Plus'
       model: 'UT3 Plus'
-    - regex: 'UGOOS-(\w{2}\d+\w?)'
+    - regex: '(UT8|TOX3)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' (UT8|TOX3)(?:[);/ ]|$)'
+    - regex: 'UGOOS[- _](\w{2}\d+\w?)(?:[);/ ]|$)'
       model: '$1'
 
 # Yxtel
@@ -30406,7 +31530,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|32H600G[RU])(?:_-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|K3[05]G|700GR)|50FK30G|50UK35G|32HR50GR|32[FH]700GR|55UC30G|55U730GR|32HK30G|40FK30G|32HR50GU|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])(?:[);/ ]|$)'
@@ -30426,9 +31550,11 @@ DiverMax:
 
 # Divisat (divisat.ru)
 Divisat:
-  regex: '(?:Divisat|X-MEDIA|DVS X3|OPTIMA_T-II)(?:[);/ ]|$)'
+  regex: '(?:Divisat|X-MEDIA|DVS X3|OPTIMA_T-II|J-LINK II)(?:[);/ ]|$)'
   device: 'tv'
   models:
+    - regex: 'J-LINK II'
+      model: 'J-Link II'
     - regex: '(?:DVS )?(J-Link|X3)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'X-MEDIA(?:[);/ ]|$)'
@@ -30502,6 +31628,12 @@ Shift Phones:
   device: 'smartphone'
   model: '$1'
 
+# RTK
+RTK:
+  regex: 'ESKIMO_K5001(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'ESKIMO!'
+
 # RugGear
 RugGear:
   regex: '(?:RugGear|RG(?:310|500|65[05]|702|7[13]0|850)|RG725)(?:[);/ ]|$)'
@@ -30520,6 +31652,12 @@ RuggeTech:
     - regex: '(FieldPad 8)'
       model: '$1'
 
+# Rhino
+Rhino:
+  regex: '(?:PACE A1)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'Pace A1'
+
 # Ruggex (https://www.ruggex.com/)
 Ruggex:
   regex: 'Rhino-Quest(?:[);/ ]|$)'
@@ -30528,16 +31666,16 @@ Ruggex:
     - regex: 'Rhino-Quest(?:[);/ ]|$)'
       model: 'Rhino Quest'
 
-# Maxcom
+# Maxcom (maxcom.pl)
 Maxcom:
-  regex: '(MS(?:45[036]|505|507_STRONG|514)|MS457(?:PLUS)?|RS-401|Neva Rise S1)(?:[);/ ]|$)'
+  regex: '(?:MS(?:45[036]|505|507_STRONG|514|651)|MS457(?:PLUS)?|RS-401|Neva Rise S1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(MS457)PLUS(?:[);/ ]|$)'
       model: '$1 Plus'
     - regex: '(MS507)_STRONG(?:[);/ ]|$)'
       model: '$1 Strong'
-    - regex: 'MS(45[0367]|505|514)(?:[);/ ]|$)'
+    - regex: 'MS(45[0367]|505|514|651)(?:[);/ ]|$)'
       model: 'MS$1'
     - regex: 'RS-401(?:[);/ ]|$)'
       model: 'RS-401'
@@ -30546,10 +31684,10 @@ Maxcom:
 
 # Luna (http://luna.id/)
 Luna:
-  regex: '(?:LUNA[ _](?:[VG]55|G[56]0|G9|G6E)|TG-L800S)(?:[);/ ]|$)'
+  regex: '(?:LUNA[ _](?:[VG]55|G[56]0|G9|G6E|V6)|TG-L800S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'LUNA[ _]([VG]55|G[56]0|G9|G6E)(?:[);/ ]|$)'
+    - regex: 'LUNA[ _]([VG]55|G[56]0|G9|G6E|V6)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(TG-L800S)(?:[);/ ]|$)'
       model: '$1'
@@ -30612,12 +31750,12 @@ EKINOX:
 
 # iGet
 iGet:
-  regex: 'iGET SMART|(?:SMART[_ ](?:L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|W[12]0X|W101|W8X|W20[23]|L206)(?:_eea)?|Android 5(?:[\d.]*);(?: [\w-]+;)? (?:S100))(?:[);/ ]|$)'
+  regex: 'iGET SMART|(?:SMART[_ ](?:L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|L11|L3[12]|W[12]0X|W101|W3[12]|W8X|W20[23]|L206)(?:_eea)?|Android 5(?:[\d.]*);(?: [\w-]+;)? (?:S100))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(?:SMART[_ ])?S100(?:[);/ ]|$)'
       model: 'Smart S100'
-    - regex: 'SMART[_ ](L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|W[12]0X|W101|W8X|W20[23]|L206)'
+    - regex: 'SMART[_ ](L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|L11|W[12]0X|W101|W8X|W3[12]|W20[23]|L206|L3[12])'
       model: 'Smart $1'
 
 # Phicomm
@@ -30645,7 +31783,7 @@ Huadoo:
   models:
     - regex: 'Huadoo[ _](HG0[46]|HG11|V[34])'
       model: '$1'
-    - regex: ' HG11(?:[);/ ]|$)'
+    - regex: 'HG11(?:[);/ ]|$)'
       model: 'HG11'
 
 # Gome
@@ -30735,34 +31873,41 @@ Wigor:
   models:
     - regex: 'Wigor (V4)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' (V3)(?: Build|[;)])'
+    - regex: '(V3)(?: Build|[;)])'
       model: '$1'
 
 # NEXON (nexon.ua)
 NEXON:
-  regex: 'NEXON[ _](X[135]\+|X[123589]|X10)(?:[);/ ]|$)'
+  regex: 'NEXON[ _](X[1235]\+|X[123589]|X10)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
-# ONN (walmart)
+# ONN or onn. (walmart)
 ONN:
-  regex: 'onn\.|(ONA19TB00[327]|10000356[12]|10000520[6-9]|O8HD|100011886A|10001188[56]|100015685-[AE]|100026191|100043279|100044018G|10007148[1356]|TBBVNC10000520[78])(?:[);/ ]|$)'
+  regex: 'onn\.|Onn 2k|(10007148[135]A|ONA19TB00[327]|10000356[12]|100110027|100110603|10000520[6-9]|O8HD|100011886(?:C?A|_GTW)|10001188[56]|100015685-[AE]|100026191|100043279|100044018G?|10007148[1356]|TBBVNC10000520[78]|100092980A?|10013592[35])(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(ONA19TB00[327]|10000356[12]|10000520[6-9]|O8HD|100011886A|10001188[56]|100015685-[AE]|100026191|100043279|100044018G|10007148[1356]|TBBVNC10000520[78])(?:[);/ ]|$)'
+    - regex: '(100092980A?|10007148[135]A|ONA19TB00[327]|10000356[12]|10000520[6-9]|O8HD|100011886(?:C?A|_GTW)|10001188[56]|100015685-[AE]|100026191|100043279|100044018G?|10007148[1356]|TBBVNC10000520[78]|100110027|100110603|10013592[35])(?:[);/ ]|$)'
       model: '$1'
     - regex: '(4K Streaming Box)'
       device: 'tv'
       model: '$1'
+    - regex: '2k TV stick'
+      device: 'tv'
+      model: '2K TV Stick'
 
 # EXO S.A (exo.com.ar)
 EXO:
-  regex: '(?:Tablet)?(?:EXO_)?(Wave[_-]i101[GLR]|Wave[_ ]i007[BT]?|Wave i101[Hb]|Wave i007Kids)(?:[);/ ]|$)'
+  regex: '(?:Tablet)?EXO_|(?:Wave[_-]i101[GLRS]|Wave[_ ]i007[BT]?|Wave i101[Hb]|Wave i007Kids)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: 'Wave i007Kids(?:[);/ ]|$)'
+      model: 'Wave i007 Kids'
+    - regex: '(?:Tablet)?(?:EXO_)?(Wave[_-]i101[GLRS]|Wave[_ ]i007[BT]?|Wave i101[Hb])(?:[);/ ]|$)'
+      model: '$1'
 
 # Q.Bell (qbell.it)
-'Q.Bell':
+Q.Bell:
   regex: '(QPHONE[_ ](?:10\.1|9\.[12]|7\.1|5\.[246])|QTAB10EW)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -31036,10 +32181,10 @@ Mafe:
 
 # Magnus or Magnus Telecom
 Magnus:
-  regex: '(?:Magnus[ _](?:bravoZ[23]0|Infinity_?(?:G8|G11))|bravo Z40|bravo[-_]Z[12]2)(?:[);/ ]|$)'
+  regex: '(?:Magnus[ _](?:bravoZ[23]0|Infinity_?(?:G8|G11))|bravo Z40|Bravo Z11|bravo[-_]Z[12]2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'bravo[ _-]?(Z[234]0|Z[12]2)'
+    - regex: 'bravo[ _-]?(Z[234]0|Z11|Z[12]2)'
       model: 'Bravo $1'
     - regex: '(?:Magnus[ _])?Infinity_?(G8|G11)'
       model: 'Infinity $1'
@@ -31059,7 +32204,7 @@ Newland:
 
 # Orbic (orbic.us)
 Orbic:
-  regex: '(?:RC(?:2200|501|545|555|608)L|R678EL|R8L5T)(?:[);/ ]|$)'
+  regex: '(?:RC(?:2200|501|545|555|60[89])L|R678EL|R8L5T|RC608L2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'R678EL'
@@ -31074,6 +32219,8 @@ Orbic:
       model: 'Journey V'
     - regex: 'RC608L'
       model: 'Joy'
+    - regex: 'RC609L'
+      model: 'Q10'
     - regex: 'R8L5T'
       device: 'tablet'
       model: 'Tab8 5G'
@@ -31097,6 +32244,8 @@ Contixo:
   models:
     - regex: 'CX-?1045(?: 3G)?(?:[);/ ]|$)'
       model: 'CX-1045 3G'
+    - regex: 'CX-?1065(?: 3G)?(?:[);/ ]|$)'
+      model: 'CX-1065 3G'
     - regex: 'CONTIXO GX 1035(?:[);/ ]|$)'
       model: 'GX-1035 4G 10.1"'
     - regex: 'Contixo GT1160 4G(?:[);/ ]|$)'
@@ -31117,7 +32266,7 @@ Contixo:
       model: 'KT1100GT'
 
 # E-Ceros
-'E-Ceros':
+E-Ceros:
   regex: '(?:CT9716(?:-B)?)(?:[);/ ]|$)'
   device: 'tablet'
   models:
@@ -31279,7 +32428,7 @@ Maxtron:
 
 # Philco (philco.com.br)
 Philco:
-  regex: 'PHILCO[ /]|(PCS0[12]|PH350B|PTB[78]R|PTB7PAP_PTB7PAB_PTB7PAR|Hit Max|Hit P1[023]|HIT P8|HIT P10a|TP7A4|TP10A1I)(?:[);/ ]|$)'
+  regex: 'PHILCO[ /]|(PCS0[12]|PH350B|PTB(?:10|[78])R|PTB7PAP_PTB7PAB_PTB7PAR|Hit Max|Hit P1[023]|HIT P8|HIT P10a|TP7A4|TP10A1I)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'HIT P10a'
@@ -31288,7 +32437,7 @@ Philco:
       model: 'Hit $1'
     - regex: '(PCS0[12]|PH350B|Hit Max)(?:[);/ ]|$)'
       model: '$1'
-    - regex: '(PTB[78]R|TP7A4|TP10A1I)(?:[);/ ]|$)'
+    - regex: '(PTB(?:10|[78])R|TP7A4|TP10A1I)(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
     - regex: 'PHILCO Android TV(?:[);/ ]|$)'
@@ -31401,7 +32550,7 @@ Tone:
 
 # AT&T
 AT&T:
-  regex: '(?:EA1002|EA21100[125]|U(?:202|304|31[89]|328|626|668|6080|705)AA|QS5509A|V340U|V350U|WTATTRW2|SL112A)(?:[);/ ]|$)'
+  regex: '(?:EA1002|EA21100[125]|EABF22206A|U(?:202|304|31[89]|328|626|668|6080|705)AA|QS5509A|V340U|V350U|WTATTRW2|SL112A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'EA211005'
@@ -31430,6 +32579,8 @@ AT&T:
       model: 'Maestro 3'
     - regex: 'EA211002(?:[);/ ]|$)'
       model: 'Motivate 2'
+    - regex: 'EABF22206A(?:[);/ ]|$)'
+      model: 'Motivate 3'
     - regex: 'SL112A(?:[);/ ]|$)'
       model: 'Motivate 4'
     - regex: 'U668AA(?:[);/ ]|$)'
@@ -31489,7 +32640,7 @@ Winds:
 
 # Asano
 Asano:
-  regex: '(?:32LH7010T|32LH8030S|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7011T|24LH7020T|24LH8010T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T|50LU8110T|40LF8120T)(?:[);/ ]|$)'
+  regex: '(?:32LH7010T|32LH8030S|43L[FU]8120T|43LU8030S|43LU8130S|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7011T|24L[HF]7020T|24LH8010T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T|50LU8110T|40LF8120T|43LF7010T|32LH8011T|32LF7111T)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(\d{2})(L[FHU]\d+[ST])(?:[);/ ]|$)'
@@ -31511,11 +32662,13 @@ Phonemax:
     - regex: 'Rocky 2(?:[);/ ]|$)'
       model: 'Rocky 2'
 
-# Vipro (Vipro Mobile)
+# Vipro or ViPro (Vipro Mobile)
 Vipro:
-  regex: 'VIPRO(?:[);/ ]|$)'
+  regex: 'VIPRO[_ ]'
   device: 'smartphone'
   models:
+    - regex: 'ViPro S20(?:[);/ ]|$)'
+      model: 'S20'
     - regex: 'VIPRO PRO2X(?:[);/ ]|$)'
       model: 'Pro 2X'
     - regex: 'Vipro Edge 2(?:[);/ ]|$)'
@@ -31625,7 +32778,7 @@ Neo:
 
 # NEKO
 NEKO:
-  regex: '(?:NEKO_(?:W_)?LT[-_](\w+)|LT-\d{2}N(?:H8020S|F7021S))(?:[);/ ]|$)'
+  regex: '(?:NEKO_(?:W_)?LT[-_](\w+)|LT-\d{2}N(?:[HF]8020S|X8001S|F7021S))(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(?:NEKO_)?(?:W_)?LT[-_](\w+)(?:[);/ ]|$)'
@@ -31639,14 +32792,14 @@ Neomi:
 
 # Eltex (eltex-co.ru)
 Eltex:
-  regex: '(?:NV5(?:01|10)WAC|NV501|NV510WB|NV720WB|NV711WAC)(?:[);/ ]|$)'
+  regex: '(?:NV5(?:01|10)WAC|NV501|NV731|NV[57]10WB|NV72[01]WB|NV711WAC|NV73[01]WB)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'NV(501|510|711)WAC(?:[);/ ]|$)'
       model: 'NV-$1-Wac'
-    - regex: 'NV501(?:[);/ ]|$)'
-      model: 'NV-501'
-    - regex: 'NV(510|720)WB(?:[);/ ]|$)'
+    - regex: 'NV(501|731)(?:[);/ ]|$)'
+      model: 'NV-$1'
+    - regex: 'NV(\d{3})WB(?:[);/ ]|$)'
       model: 'NV-$1-WB'
 
 # Senkatel
@@ -31667,9 +32820,9 @@ Bobarry:
 
 # Wortmann (wortmann.de)
 Wortmann:
-  regex: 'TERRA[ _]PAD[ _](\d+)(?:[);/ ]|$)'
+  regex: 'TERRA[ _]PAD[ _](\d+)(_V2)?(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Terra Pad $1'
+  model: 'Terra Pad $1$2'
 
 # BB Mobile
 BB Mobile:
@@ -31741,13 +32894,13 @@ Tele2:
       model: '$1'
 
 # ALDI NORD
-'ALDI NORD':
+ALDI NORD:
   regex: 'ALDINORD, ([a-z0-9_ \-]+), (?:wired|wireless)'
   device: 'tv'
   model: ''
 
 # ALDI SÜD
-'ALDI SÜD':
+ALDI SÜD:
   regex: 'ALDISUED, ([a-z0-9_ \-]+), (?:wired|wireless)'
   device: 'tv'
   model: ''
@@ -31766,12 +32919,12 @@ Alfawise:
 
 # Klipad (www.klipad.fr)
 Klipad:
-  regex: 'KLIPAD_|(?:KL-V905|KL(2108NBE|[46]889|489[08]|9878A?|3669|759[01]|500|601|988)?(?:_EEA)?|7589AN|KL628_HL|KL628KO|KL4898[_ -]A50|V356B?)(?:[);/ ]|$)'
+  regex: 'KLIPAD_|(?:KL-V905|KL(2108NBE|[46]889|489[08]|9878A?E?|3669|759[01]|500|638DK|60[15]|988)?(?:_EEA)?|7589AN|KL628_HL|KL628KO|KL4898[_ -]A50|V356B?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(?:KLIPAD_)?(V355B?|KL600|KL-V905|V356B?|KL500|KL601)(?:[);/ ]|$)'
+    - regex: '(?:KLIPAD_)?(V355B?|KL600|KL-V905|V356B?|KL500|KL60[15])(?:_EEA)?(?:[);/ ]|$)'
       model: '$1'
-    - regex: '(KL[46]889|7589AN|KL759[01]|KL9878A?|KL628KO|KL3669|KL489[08]|KL988|KL2108NBE)(?:_EEA)?(?:[);/ ]|$)'
+    - regex: '(KL[46]889|7589AN|KL759[01]|KL9878A?E?|KL628KO|KL3669|KL489[08]|KL988|KL2108NBE|KL638DK)(?:_EEA)?(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
     - regex: 'KL628_HL'
@@ -31867,10 +33020,10 @@ Jinga:
 
 # Jio (https://www.jio.com/)
 Jio:
-  regex: 'LS1542QWN(?:[);/ ]|$)'
+  regex: 'LS1542QWN?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'LS1542QWN(?:[);/ ]|$)'
+    - regex: 'LS1542QWN?(?:[);/ ]|$)'
       model: 'JioPhone Next'
 
 # Twoe
@@ -31891,11 +33044,13 @@ iTruck:
 
 # Torex (torex.tools)
 Torex:
-  regex: 'TOREX[- ](?:PS12|S18|S27|PAD 8 ?PRO)(?:[);/ ]|$)'
+  regex: '(?:TOREX[- _](?:PS12|S18|S27|PAD 8 ?PRO|PAD818)|PAD831B)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'TOREX-(PS12)'
       model: '$1'
+    - regex: '(?:TOREX[_ ])?PAD(831B|818)'
+      model: 'Pad $1'
     - regex: 'TOREX PAD 8 ?PRO'
       model: 'Pad 8 Pro'
     - regex: 'TOREX[- ](S18|S27)'
@@ -31904,7 +33059,7 @@ Torex:
 
 # Doffler
 Doffler:
-  regex: '(24DHS54|32GHS5[67]|40KFS57|32KHS57|43KUS65|24KHS57|24GHS55|24GHS57|50KUS65|40GHS57|55KUS65)(?:[);/ ]|$)'
+  regex: '(24DHS54|32GHS5[67]|40KFS57|32KHS57|43KUS65|24[KG]HS57|24GHS55|50KUS65|40GHS57|43GUS65|55KUS65|65KUS65|42GFS56)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -31937,7 +33092,7 @@ Primux:
     - regex: 'PrimuxUP(?:[);/ ]|$)'
       device: 'tablet'
       model: 'UP'
-    - regex: ' PrimuxZonda4(?:[);/ ]|$)'
+    - regex: 'PrimuxZonda4(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Zonda 4'
     - regex: 'Primux_Siroco6(?:[);/ ]|$)'
@@ -31961,7 +33116,7 @@ iMars:
 
 # Logic or Logic Mobility (logicmobility.com)
 Logic:
-  regex: '(?:LOGIC[_ ](X4 Plus|X50|X[135]|X4M|L4T|L5D|X5[AFT]|X60G|L50T?|L57|L6[0135]|X60_PLUS)(:?[_ ]LITE2?)?|L55[ABS]|Q-502)(?:[);/ ]|$)'
+  regex: 'LOGIC[_ ]|(?:LOGIC[_ ](X4 Plus|X50|X[135]|X4M|L4T|L5D|X5[AFT]|X57A|X60G|L50T?|L57|L6[0135]|X60_PLUS)(:?[_ ]LITE2?)?|L55[ABS]|Q-502)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'LOGIC[_ ]X60_PLUS(?:[);/ ]|$)'
@@ -31972,7 +33127,7 @@ Logic:
       model: '$1'
     - regex: 'LOGIC[_ ](X5)[_ ]LITE2(?:[);/ ]|$)'
       model: '$1 Lite 2'
-    - regex: 'LOGIC[_ ](X4 Plus|X50|X[13]|X4M|L4T|L5D|L6[013]|X5[AFT]|X60G)(?:[);/ ]|$)'
+    - regex: 'LOGIC[_ ](X4 Plus|X50|X[13]|X4M|L4T|L5D|L6[013]|X5[AFT]|X57A|X60G)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(L50T?|L55[ABS]|L57|Q-502)(?:[);/ ]|$)'
       model: '$1'
@@ -32093,10 +33248,10 @@ MiXzo:
 
 # Openbox
 Openbox:
-  regex: '(?:Openbox (?:A[349](?: (?:Pro|Lite))?)|AS1_HD|AS_?4K[_-](?:CI(?:_PRO|_Lite)?(?:_PLUS)?|PLUS|2X)|AS_?4K)(?:[);/ ]|$)'
+  regex: '(?:Openbox (?:A[3489](?: (?:Pro|Lite))?)|AS1_HD|AS_?4K[_-](?:CI(?:_PRO|_Lite)?(?:_PLUS)?|PLUS|2X)|AS_?4K)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'Openbox (A[349](?: (?:Pro|Lite))?)(?:[);/ ]|$)'
+    - regex: 'Openbox (A[3489](?: (?:Pro|Lite))?)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'AS_4K_CI_PRO_PLUS'
       model: 'AS 4K CI Pro Plus'
@@ -32238,6 +33393,12 @@ FITCO:
   device: 'tv'
   model: ''
 
+# I KALL (https://ikall.in/)
+I KALL:
+  regex: 'IKALL'
+  device: 'smartphone'
+  model: ''
+
 # i-Cherry or iCherry
 i-Cherry:
   regex: 'iCherry_?'
@@ -32269,7 +33430,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(?:[\d.]*);(?: [\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]|15)|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|Android 13(?:[\d.]*);(?: [\w-]+;)? T7)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Cosmos[ _]V8_lite(?:[);/ ]|$)'
@@ -32292,9 +33453,11 @@ Hotwav:
       model: 'Symbol $1'
     - regex: '(W10|T5) Pro'
       model: '$1 Pro'
-    - regex: ' W10?(?:[);/ ]|$)'
+    - regex: 'W10?(?:[);/ ]|$)'
       model: 'W10'
-    - regex: ' M5i(?:[);/ ]|$)'
+    - regex: '(T7)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'M5i(?:[);/ ]|$)'
       model: 'M5i'
     - regex: 'Symbol R60'
       device: 'phablet'
@@ -32308,6 +33471,8 @@ Hotwav:
     - regex: 'TAB R7'
       device: 'tablet'
       model: 'Tab R7'
+    - regex: 'Pearl K(3) (2021)'
+      model: 'Pearl K$1 ($2)'
     - regex: '(Cosmos[ _](?:V19_Plus|V2[0-3]|U2?|V1[359]|V[45689])|Pearl K[123](?: Prime)?|Magic Q8|Magic 5 Plus|Magic (?:[89]|1[13])|Symbol (?:X|Max)|Cosmos|M5 Plus)(?:-2)?(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Symbol Pro'
@@ -32420,7 +33585,7 @@ Avenzo:
 
 # Beelink (www.bee-link.com)
 Beelink:
-  regex: '(?:Beelink (?:G[ST]1|LAKE I|SEA I|A1)|GTKing(?:_AT)?|GT1mini-2|GT1-mini(?:[-_]AT)?|R68 II|Amlogic Alvatech GT1)(?:[);/ ]|$)'
+  regex: '(?:Beelink (?:G[ST]1|LAKE I|SEA I|A1)|GTKing(?:_AT|II)?|GT1mini-2|GT1-mini(?:[-_]AT)?|R68 II|Amlogic Alvatech GT1)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'Beelink (G[ST]1|LAKE I|SEA I|A1)(?:[);/ ]|$)'
@@ -32433,6 +33598,8 @@ Beelink:
       model: 'GT1 Mini 2'
     - regex: 'GTKing PRO(?:[);/ ]|$)'
       model: 'GT King Pro'
+    - regex: 'GTKingII(?:[);/ ]|$)'
+      model: 'GT King II'
     - regex: 'GTKing(?:_AT)?(?:[);/ ]|$)'
       model: 'GT King'
     - regex: 'R68 II(?:[);/ ]|$)'
@@ -32477,14 +33644,16 @@ MDTV:
 
 # meanIT (meanit.hr)
 meanIT:
-  regex: 'meanIT[ _](?:C[12]|X10|X[126]|MG430|Q[145]|C[18]0C[18]1)(?:[);/ ]|$)'
+  regex: 'meanIT[ _]|(?:meanIT[ _](?:C[12]|X10|X[126]|MG430|Q[145]|C[18]0C[18]1)|Smartphone_X5)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Smartphone_X5'
+      model: 'X5'
     - regex: 'meanIT[ _]Q1 plus(?:[);/ ]|$)'
       model: 'Q1 Plus'
     - regex: 'meanIT[ _](C[12]|X[126]|MG430|Q[145])(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'meanIT[ _](X10|C[18]0C[18]1)(?:[);/ ]|$)'
+    - regex: 'meanIT[ _](X[12]0|C[18]0C[18]1)(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
@@ -32508,13 +33677,17 @@ X88:
 
 # X96
 X96:
-  regex: '(?:X96Air_A100|X96_X6_I|X96Max_Plus_Ultra|X96MATE_PLUS|X96MINI_11)(?:[);/ ]|$)'
+  regex: '(?:X96Air_(?:A100|100W|V2|P[1-3])|X96_X6_I|X96Max_Plus_?(?:Ultra|[25]|Q[12])?|X96MATE_PLUS|X96MINI_11)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'X96Air_A100'
-      model: 'Air A100'
+    - regex: 'X96Air_(100W|A100|V2|P[1-3])'
+      model: 'Air $1'
     - regex: 'X96Max_Plus_Ultra'
       model: 'Max Plus Ultra'
+    - regex: 'X96Max_Plus_?([25]|Q[12])'
+      model: 'Max Plus $1'
+    - regex: 'X96Max_Plus'
+      model: 'Max Plus'
     - regex: 'X96_X6_I'
       model: 'X6i'
     - regex: 'X96MATE_PLUS'
@@ -32699,7 +33872,7 @@ iVooMi:
       model: 'Me 1'
     - regex: 'i2_Lite'
       model: 'i2 Lite'
-    - regex: ' i2(?:[);/ ]|$)'
+    - regex: 'i2(?:[);/ ]|$)'
       model: 'i2'
     - regex: 'Me 1\+'
       model: 'Me 1+'
@@ -32766,7 +33939,7 @@ Fonos:
   models:
     - regex: 'Fonos-(O\d)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' O3(?: Build|[;)])'
+    - regex: 'O3(?: Build|[;)])'
       model: 'O3'
 
 # Xtouch (www.xtouchtechnologies.com)
@@ -32823,17 +33996,21 @@ Selecline:
     - regex: 'Selecline 10(?:[);/ ]|$)'
       model: '10'
 
-# Selenga
+# Selenga (selenga-t2.ru)
 Selenga:
-  regex: 'Selenga[ _](A[1345])(?:[);/ ]|$)'
+  regex: 'Selenga'
   device: 'tv'
-  model: '$1'
+  models:
+    - regex: 'Selenga[ _](A[1345])(?:[);/ ]|$)'
+      model: '$1'
 
 # Starlight
 Starlight:
-  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))(?:[);/ ]|$)'
+  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)|Milan_Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Milan_Pro'
+      model: 'Milan Pro'
     - regex: 'My_Star_X'
       model: 'My Star X'
     - regex: 'My_star_18'
@@ -32895,7 +34072,7 @@ TTfone:
 
 # eSTAR
 eSTAR:
-  regex: 'eSTAR[_ ](?:Grand|GO\!?|Zoom Quad|Gemini|MINI[_ ]3G|BEAUTY|MOON)|(?:MERCURY HD Quad core|MID1020L|takee 1)(?:[);/ ]|$)'
+  regex: 'eSTAR[_ ](?:Grand|GO\!?|Zoom Quad|Gemini|MINI[_ ]3G|BEAUTY|MOON)|(?:Digni-Smart|MERCURY HD Quad core|MID1020L|takee 1)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'eSTAR (Grand|GO\!?) (HD Intel|IPS Intel|IPS|HD|Intel) Quad Core 3G'
@@ -32922,15 +34099,18 @@ eSTAR:
     - regex: 'takee 1'
       device: 'smartphone'
       model: 'Takee 1'
+    - regex: 'Digni-Smart'
+      device: 'smartphone'
+      model: 'Digni Smart'
 
 # Hometech (hometech.com.tr)
 Hometech:
-  regex: '(?:Ideal (?:10S|Tab [79]|8S)|ALFA(?:10T[BX]|7LM)|ALFA[_ ](?:10R[CX]|10BS|10TM?|8T|10MB|10YC|7RS|[78]M?RC|7M|8S[TL]|8RX|8MG)|HT[ _](?:7RT|8MZ))(?:[);/ ]|$)'
+  regex: '(?:Ideal (?:10S|Tab [79]|8S)|ALFA(?:10T[BX]|7LM)|ALFA[_ ](?:10R[CX]|10BS|10TM?|8T|10MB|10YC|7RS|[78]M?RC|7M|8S[TL]|8RX|8MG|10BT_V2)|HT[ _](?:7RT|8MZ))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(Ideal (?:10S|Tab 9|8S))(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'ALFA[_ ]?(10R[CX]|10YC|10BS|10T[BMX]?|7RS|[78]M?RC|7L?M|10MB|8T|8S[TL]|8RX|8MG)(?:[);/ ]|$)'
+    - regex: 'ALFA[_ ]?(10R[CX]|10YC|10BS|10T[BMX]?|7RS|[78]M?RC|7L?M|10MB|8T|8S[TL]|8RX|8MG|10BT_V2)(?:[);/ ]|$)'
       model: 'ALFA $1'
     - regex: 'Ideal Tab 7 Ips( 3G)?'
       model: 'Ideal Tab 7 IPS$1'
@@ -33050,23 +34230,31 @@ Reach:
   device: 'smartphone'
   model: '$1'
 
+# Realix (https://www.realix.co.uk/)
+Realix:
+  regex: '(RxIS202)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # MobiWire
 MobiWire:
-  regex: '(?:Kiona|KANUNA|Halona|Kicka[_ ][45][ _]Plus|Kicka Zoom|Kohana|Kayeta|Kosumi|KWANITA|Lonan|Hotah|Kicka 5|Kiona|Smart ?(?:[CEN]11|N12)|Sakari)(?:[);/ ]|$)'
+  regex: 'MobiGo|(?:Kiona|KANUNA|Halona|IKOSORA\+|Kicka[_ ][45][ _]Plus|Kicka Zoom|Kohana|Kayeta|Kosumi|KWANITA|Lonan|Hotah|Kicka 5|Kiona|Smart ?(?:[CEN]11|N12)|Sakari)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'KANUNA'
       model: 'Kanuna'
     - regex: 'KWANITA'
       model: 'Kwanita'
+    - regex: 'MobiGo2L'
+      model: 'MobiGo 2L'
     - regex: 'Smart ?([CEN]11|N12)'
       model: 'Smart $1'
-    - regex: '(Kiona|Kicka[_ ][45][ _]Plus|Kohana|Kayeta|Kosumi|Lonan|Halona|Hotah|Kicka 5|Kicka Zoom|Kiona|Sakari)(?:[);/ ]|$)'
+    - regex: '(IKOSORA\+|Kiona|Kicka[_ ][45][ _]Plus|Kohana|Kayeta|Kosumi|Lonan|Halona|Hotah|Kicka 5|Kicka Zoom|Kiona|Sakari)(?:[);/ ]|$)'
       model: '$1'
 
-# Hezire
+# Hezire (hezire.com)
 Hezire:
-  regex: '(HTB801)(?:[);/ ]|$)'
+  regex: '(HTB801|HBook-Pro)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -33140,11 +34328,13 @@ 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(?:[ _]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)(?:[);/ ]|$)'
+  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|S19 Max|P11SE_Art)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'A8i-Q2'
       model: 'A8i Q2'
+    - regex: 'P11SE_Art'
+      model: 'P11SE Art'
     - regex: 'reeder[_ ](3G_Tablet|A7iC|A[78]i[_ ]Quad|A8i Q2|M8 Plus|[TM]8|M10 Plus|P11SE)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'M10SPlus'
@@ -33215,6 +34405,9 @@ Reeder:
     - regex: 'S19 Max Pro'
       device: 'smartphone'
       model: 'S19 Max Pro'
+    - regex: 'S19 Max'
+      device: 'smartphone'
+      model: 'S19 Max'
     - regex: 'S23 Pro Max'
       device: 'smartphone'
       model: 'S23 Pro Max'
@@ -33226,7 +34419,7 @@ ELARI:
   model: 'KidPhone 4G'
 
 # Epik One or EPIKONE (epikmobile.com)
-'Epik One':
+Epik One:
   regex: '(K501 Plus|[ ]K5(?:0[0-4]|1[01]|03[TS]|3[456]|4[05]|73|03HD)|[ ]K60[01]|[ ]X507T|[ ]K40[56]|[ ]T700|Android 8([\d.]*);(?: [\w-]+;)? X400|RS550)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -33287,7 +34480,7 @@ Altice:
   regex: 'Altice[ _]|(SX41|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:S32|S42|S32_(?:Plus|NFC)))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: ' (SX41|S32|S42|S32_Plus|S32_NFC)(?:[);/ ]|$)'
+    - regex: '(SX41|S32|S42|S32_Plus|S32_NFC)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Altice[ _](S62|S31|S43)(?:[);/ ]|$)'
       model: '$1'
@@ -33341,7 +34534,7 @@ Spark:
 
 # Sparx or SparX (https://sparx.pk/)
 Sparx:
-  regex: 'Sparx[ _]|(?:NEO_6|NEO 5|Neo_6_plus|Neo 5 Pro|Neo X|Edge 20 Pro)(?: Build|[;)])'
+  regex: 'Sparx[ _]|(?:NEO_6|NEO 5|Neo_6_plus|Neo 5 Pro|Neo X|Edge 20 Pro|Ultra 8 Pro)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Edge 20 Pro'
@@ -33350,18 +34543,22 @@ Sparx:
       model: 'Neo 7 Ultra'
     - regex: 'Neo ([578]) Pro'
       model: 'Neo $1 Pro'
-    - regex: 'Neo[ _]([568])[ _]Plus'
+    - regex: 'Neo[ _]([5687])[ _]Plus'
       model: 'Neo $1 Plus'
     - regex: 'Neo[ _]([567])'
       model: 'Neo $1'
     - regex: 'Neo X'
       model: 'Neo X'
+    - regex: 'Ultra 11'
+      model: 'Ultra 11'
+    - regex: 'Ultra 8 Pro'
+      model: 'Ultra 8 Pro'
     - regex: 'Sparx S7'
       model: 'S7'
 
 # SPC or SPC Universe or SPC Mobile (spc.es)
 SPC:
-  regex: '(?:GRAVITY [34]G(?:_2019)?|GRAVITY2-4G|GRAVITY_OCTACORE|GRAVITY[ -](?:Max|SE|PRO|2-MAX|2)|SPC (?:GEN|SMART)|SPC_ALIEN(?:_STICK)?|SPC Glow9\.7|Lightyear|Laika|L70_Lite|L60 Turbo|L60 Pro|FLOW 7)(?:[);/ ]|$)'
+  regex: '(?:GRAVITY [34]G(?:_2019)?|GRAVITY2-4G|GRAVITY_OCTACORE|GRAVITY[ -_](?:Max|SE|PRO|2-MAX|[23]|3_MINI|3_SE|ULTIMATE 2)|SPC (?:GEN|SMART)|SPC_ALIEN(?:_STICK)?|SPC Glow9\.7|Lightyear|Laika|L70_Lite|L60 Turbo|L60 Pro|FLOW 7|SMART_ULTIMATE(?:_64)?|Discovery (?:Pro|SE))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'GRAVITY_OCTACORE'
@@ -33380,6 +34577,14 @@ SPC:
       model: 'Gravity 2 Max'
     - regex: 'GRAVITY 2|GRAVITY2-4G'
       model: 'Gravity 2'
+    - regex: 'GRAVITY ULTIMATE 2'
+      model: 'Gravity Ultimate 2'
+    - regex: 'GRAVITY_3_MINI'
+      model: 'Gravity 3 Mini'
+    - regex: 'GRAVITY_3_SE'
+      model: 'Gravity 3 SE'
+    - regex: 'GRAVITY_3'
+      model: 'Gravity 3'
     - regex: 'SPC Glow9\.7'
       model: 'Glow 9.7"'
     - regex: 'Lightyear'
@@ -33391,6 +34596,9 @@ SPC:
     - regex: 'Laika'
       model: 'Laika'
 
+    - regex: 'SMART_ULTIMATE(?:_64)?'
+      device: 'smartphone'
+      model: 'Smart Ultimate'
     - regex: 'SPC SMART PLUS'
       device: 'smartphone'
       model: 'Smart Plus'
@@ -33415,7 +34623,7 @@ SPC:
     - regex: 'SPC GEN'
       device: 'smartphone'
       model: 'Gen'
-    - regex: '(L60 Turbo|L60 Pro)'
+    - regex: '(L60 Turbo|L60 Pro|Discovery (?:Pro|SE))'
       device: 'smartphone'
       model: '$1'
 
@@ -33446,10 +34654,10 @@ Winmax:
 
 # Zebra (zebra.com)
 Zebra:
-  regex: ' (MC2[27]00|TC15|TC2[0156]|TC5[1267]|TC7[05]x|TC7[57]|TC700H|ET51|MC33|MC93|EC30|TC55|PS20J|VC8300)(?:[);/ ]|$)'
+  regex: ' (MC2[27]00|TC15|TC2[01567]|TC5[12567]|TC7[05]x|TC7[57]|TC700H|ET51|MC33|MC93|EC30|EC55|PS20J|VC8300)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(TC15|TC2[0156]|TC5[1267]|TC7[05]x|TC7[57]|TC700H|MC33|EC30|TC55)(?:[);/ ]|$)'
+    - regex: '(TC15|TC2[01567]|TC5[12567]|TC7[05]x|TC7[57]|TC700H|MC33|EC30|EC55)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(ET51)(?:[);/ ]|$)'
       device: 'tablet'
@@ -33542,9 +34750,11 @@ Mint:
 
 # Mintt (www.mintt.co)
 Mintt:
-  regex: '(?:Coolmintt(?:A[35]|M2|Tribe)?|Ultramintt(?:S2)?|FRESHMINTT(?:A7|A10)?)(?:[);/ ]|$)'
+  regex: '(?:Cool|Fresh|Ultra)?Mintt'
   device: 'smartphone'
   models:
+    - regex: 'Mintt (M3)(?:[);/ ]|$)'
+      model: '$1'
     - 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])(?:[);/ ]|$)'
@@ -33558,14 +34768,14 @@ Mintt:
 
 # Premio
 Premio:
-  regex: '(?:AXE_II|186HS2080531|186HS1050531|186HS1050232|186FT1080231|185FT5050231|X70-2021|PREMIO[ _](?:S50|P420|P451)|Android 8(?:[\d.]*);(?: [\w-]+;)? Axe)(?:[);/ ]|$)'
+  regex: '(?:AXE_II|186HS2080531|186HS1050531|186HS1050232|186FT1080231|185FT5050231|X7[05]-2021|PREMIO[ _](?:S50|P420|P451)|Android 8(?:[\d.]*);(?: [\w-]+;)? Axe)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '186HS2080531'
       model: 'X1'
     - regex: 'AXE_II'
       model: 'Axe II'
-    - regex: ' Axe'
+    - regex: 'Axe'
       model: 'Axe'
     - regex: '186HS1050531'
       model: 'P541'
@@ -33575,8 +34785,8 @@ Premio:
       model: 'P571'
     - regex: '186HS1050232'
       model: 'P630'
-    - regex: 'X70-2021'
-      model: 'X70 (2021)'
+    - regex: 'X(7[05])-2021'
+      model: 'X$1 (2021)'
     - regex: 'PREMIO[ _](S50|P420|P451)(?:[);/ ]|$)'
       model: '$1'
 
@@ -33610,11 +34820,17 @@ Bluewave:
 
 # Siragon (siragon.com)
 Siragon:
-  regex: 'Siragon|(?:SP-(?:5[0124]50|5[34]00|61[05]0))(?:[);/ ]|$)'
+  regex: 'Siragon|(?:SP[_-](?:5[0124]50|5[34]00|61[05]0|7200))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(?:Siragon[_ ])?(SP-(?:5[0124]50|5[34]00|61[05]0))'
-      model: '$1'
+    - regex: '(?:Siragon[_ ])?(?:SP[_-](5[0124]50|5[34]00|61[05]0|7200))'
+      model: 'SP-$1'
+
+# Siswoo (https://web.archive.org/web/20170801152418/http://siswoo.com/)
+Siswoo:
+  regex: 'APRIX C55(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'Aprix C55'
 
 # Poppox
 Poppox:
@@ -33653,7 +34869,7 @@ ONVO:
       model: 'Smart TV'
 
 # Black Bear
-'Black Bear':
+Black Bear:
   regex: '(B6 Master|B6 Note X)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
@@ -33668,11 +34884,13 @@ Black Box:
 
 # OpelMobile (opelmobile.com.au)
 OpelMobile:
-  regex: 'Opel ?Mobile|(?:OpelMobile_Smart(?:JX|X1)|Easy_Smart_2)(?:[);/ ]|$)'
+  regex: 'Opel ?Mobile|(?:OpelMobile_Smart(?:JX|X1)|Easy_Smart_2|Rugged60Q)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Easy_Smart_2'
       model: 'Easy Smart 2'
+    - regex: 'Rugged60Q'
+      model: 'Rugged 60Q'
     - regex: 'OpelMobile_SmartJX'
       model: 'SmartJX'
     - regex: 'OpelMobile_SmartX1'
@@ -33827,10 +35045,12 @@ Colors:
 
 # Honeywell (honeywell.com)
 Honeywell:
-  regex: '(?:EDA5[01]K?|EDA[47]0|EDA71_G|EDA5[12]|CK65|CT[46]0|CN80|EDA61K)(?:[);/ ]|$)'
+  regex: '(?:EDA5[01]K?|EDA[47]0|EDA71_G|EDA5[12]|CK65|CT[46]0|CT45P|CN80|EDA61K)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # smartphone + scan
+    - regex: '(CT45P)(?:[);/ ]|$)'
+      model: '$1'
     - regex: '(EDA5[01]K?|EDA[47]0|EDA5[12]|EDA61K)(?:[);/ ]|$)'
       model: 'ScanPal $1'
     # tablet + scan
@@ -33849,7 +35069,7 @@ Electroneum:
   model: '$1'
 
 # High Q or HighQ
-'High Q':
+High Q:
   regex: '(ELT070[46]H|ELT0802H)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
@@ -33861,13 +35081,13 @@ Pluzz:
   model: '$1'
 
 # IKU Mobile (iku-mobile.com)
-'IKU Mobile':
-  regex: '(?:IKU[_ ](?:A22|A[45]0|T[123]|X2|K3|i[34]|T[_ ]MAX)|Powerful_K55i|Curvy C50L)(?:[);/ ]|$)'
+IKU Mobile:
+  regex: 'IKU[_ ]|(?:Powerful_K55i|Curvy C50L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(Powerful_K55i|Curvy C50L)(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'IKU[_ ](A22|A[45]0|X2|K3|i[34])(?:[);/ ]|$)'
+    - regex: 'IKU[_ ](A22|A[457]0|X[23]|K3|i[34])(?:[);/ ]|$)'
       model: '$1'
     - regex: 'IKU[_ ](T[123])(?:[);/ ]|$)'
       device: 'tablet'
@@ -33893,7 +35113,7 @@ IKI Mobile:
       model: '$1'
 
 # CG Mobile
-'CG Mobile':
+CG Mobile:
   regex: '(?:CG_OMEGA6|Omega (?:[38])|CG_EON_Blaze_Pro|CG\|EON Blaze GOLD|Blaze [GN])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -34035,10 +35255,10 @@ Cellacom:
 
 # CellAllure (cellallure.com)
 CellAllure:
-  regex: '(?:Cool_Extreme_2|Earn|Fashion2Plus|Fashion[ _]C|Cool Duo|CHIC_X1|Miracle XS|Miracle 6.0 S)(?:[);/ ]|$)'
+  regex: '(?:Cool_Extreme_2|Earn2 CL|Earn|Fashion2Plus|Fashion[ _]C|Cool Duo|CHIC_X1|Miracle XS|Miracle 6.0 S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(Cool_Extreme_2|Earn|Fashion[ _]C|Cool Duo|Miracle XS|Miracle 6\.0 S)(?:[);/ ]|$)'
+    - regex: '(Cool_Extreme_2|Earn2 CL|Earn|Fashion[ _]C|Cool Duo|Miracle XS|Miracle 6\.0 S)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Fashion2Plus'
       model: 'Fashion 2 Plus'
@@ -34047,7 +35267,7 @@ CellAllure:
 
 # EagleSoar
 EagleSoar:
-  regex: '(EE10A)'
+  regex: '(EE10A|Z-F1010)'
   device: 'tablet'
   model: '$1'
 
@@ -34125,16 +35345,22 @@ Claresta:
 
 # Camfone (camfonemobile.com)
 Camfone:
-  regex: '(?:Camfone (?:SE)|Hero[_ ](?:H5\+|SE2|H9|(?:H7|XR)_Plus|SX|1[123]|SE3[ _]Max)|Honey (?:Y1|Y2s)|Mega 10|Furious 7 Pro)(?:[);/ ]|$)'
+  regex: '(?:Camfone (?:SE)|Hero[_ ](?:H5\+|SE2|H[579]|(?:H7|XR)_Plus|SX|1[123]|SE3[ _]Max)|Honey (?:Y1|Y2s)|Mega 10|Furious 7 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(Hero[_ ](?:H5\+|SE2|H9|(?:H7|XR)_Plus|SX|1[123]|SE3[ _]Max)|Honey (?:Y1|Y2s)|Mega 10)(?:[);/ ]|$)'
+    - regex: '(Hero[_ ](?:H5\+|SE2|H[579]|(?:H7|XR)_Plus|SX|1[123]|SE3[ _]Max)|Honey (?:Y1|Y2s)|Mega 10)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Furious 7 Pro'
       model: 'Furious 7 Pro'
     - regex: 'Camfone (SE)(?:[);/ ]|$)'
       model: '$1'
 
+# Bell (https://www.bell.ca/)
+Bell:
+  regex: 'FibeTV(?:[);/ ]|$)'
+  device: 'tv'
+  model: 'FibeTV'
+
 # Bellphone
 Bellphone:
   regex: 'Bp100 X-Plus(?:[);/ ]|$)'
@@ -34278,6 +35504,14 @@ Cavion:
       device: 'tablet'
       model: '$1'
 
+# Canaima (manufactured by COMIVISION http://www.comivision.com/Laptop/37.html)
+Canaima:
+  regex: 'CNM6762(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(CNM6762)(?:[);/ ]|$)' # COMIVISION
+      model: '$1'
+
 # Canal+ (https://pl.canalplus.com/)
 Canal+:
   regex: 'CANAL PLUS'
@@ -34286,13 +35520,15 @@ Canal+:
     - regex: 'CANAL PLUS BOX(?:[);/ ]|$)'
       model: 'TV Box'
 
-# GLX or JLX
+# GLX or JLX or General luxe (www.glx.ir)
 GLX:
-  regex: '(?:GLX (?:Aria|Dorna|Taban|Shine|Spark|ASA)|Maad\+?)(?:[);/ ]|$)'
+  regex: '(?:GLX (?:Aria|Dorna|Taban|Shine|Spark|ASA)|SHAHIN III|Maad\+?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GLX ASA'
       model: 'Asa'
+    - regex: 'SHAHIN III'
+      model: 'Shahin III'
     - regex: 'Maad\+'
       model: 'Maad Plus'
     - regex: 'Maad'
@@ -34446,13 +35682,13 @@ Shtrikh-M:
 
 # BBK (bbk.ru)
 BBK:
-  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)?)(?:[);/ ]|$)'
+  regex: '65LEX-8234-UTS2C|(?:32LEX-7272|24LEX-7269|([65]5|50|4[023]|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[579]|7225|7287|8243|8202|8289|9201)[_/]?([FU]?TS2C)|(?:3[29]|24)LEX-7289(?:-c)?|65LEX-8262)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: '(\d{2})LEX[-_](\d{3,4})[_/]?([FU]?TS2C)'
+    - regex: '(\d{2})LEX[-_](\d{3,4})[_/-]?([FU]?TS2C)'
       model: '$1LEX-$2/$3'
-    - regex: '(3[29]|24)LEX-7289(?:-c)?(?:[);/ ]|$)'
-      model: '$1LEX-7289/TS2C'
+    - regex: '(3[29]|24|65)LEX-(7289|8262)(?:-c)?(?:[);/ ]|$)'
+      model: '$1LEX-$2/TS2C'
     - regex: '(\d{2})LEX[-_](\d{3,4})'
       model: '$1LEX-$2'
 
@@ -34513,7 +35749,7 @@ Datamini:
       model: 'T900'
 
 # Yoka TV
-'Yoka TV':
+Yoka TV:
   regex: 'KB2 PRO(?:[);/ ]|$)'
   device: 'tv'
   model: 'KB2 Pro'
@@ -34575,10 +35811,14 @@ Jiake:
   model: 'JK-$1'
 
 # iQ&T or iQandT (iqandt.com)
-'iQ&T':
-  regex: '(IFoo (?:U200|H55|S50))(?:[);/ ]|$)'
+iQ&T:
+  regex: 'iQ&T|iQ&amp;T|(?:IFoo (?:U200|H55|S50))(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: '(?:iQ&T|iQ&amp;T) (N8)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: '(IFoo (?:U200|H55|S50))(?:[);/ ]|$)'
+      model: '$1'
 
 # Mantra (mantratec.com)
 Mantra:
@@ -34947,17 +36187,21 @@ Hitech:
   device: 'smartphone'
   model: '$1'
 
-# F150 or iiiF150 (sub brand Oukitel)
+# F150 or iiiF150 or ANT DAO TECHNOLOGY LIMITED (sub brand Oukitel) (iif150.com)
 F150:
-  regex: '(?:Bison2021|B2021|[HR]2022|Air1 Pro| Air1| B[12] Pro|B2 Ultra)(?:[);/ ]|$)'
+  regex: '(?:Bison2021|B2021|[HR]2022|Air1 Pro| Air1| B[12] Pro|(?:B2|Air2) Ultra|Raptor LTD|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:B1)|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:Raptor|B2))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'B2 Ultra'
       model: 'B2 Ultra'
-    - regex: '([HR]2022|Air1 (?:Ultra Pro|Ultra\+?|Pro)|Air1|B[12] Pro)(?:[);/ ]|$)'
+    - regex: 'Raptor(?: LTD)?'
+      model: 'Raptor LTD'
+    - regex: '([HR]2022|Air1 (?:Ultra Pro|Ultra\+?|Pro)|Air1|B[12] Pro|Air2 Ultra)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(?:Bison2021|B2021)(?:[);/ ]|$)'
       model: 'B2021'
+    - regex: '(B[12])(?: Build|[;)])'
+      model: '$1'
 
 # BilimLang (bilimlang.com)
 BilimLand:
@@ -34991,7 +36235,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|6509|2003)|(?:C3[67]00)(?:[);/ ]|$)'
+  regex: 'LT[ _-](?:P[89]|9701|9902|P10I|NOTE 10[SM]|NOTE 30|C1[45]00|C3[1235]00|C3750|S10[ _]Lite|S10|S9_NOTE|M[56]|M5_lite|C1300|6509|2003)|(?:C3[67]00)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'LT[- ]NOTE ([13]0[SM]?)'
@@ -35002,6 +36246,8 @@ LT Mobile:
       model: 'P9'
     - regex: 'LT[ _-]C3200'
       model: 'P10'
+    - regex: 'LT[ _-]C3750'
+      model: 'P40'
     - regex: 'LT[ _-]C1400'
       model: 'P7s'
     - regex: 'LT[ _-]C3500'
@@ -35024,6 +36270,8 @@ LT Mobile:
       model: 'M50'
     - regex: 'LT[ _]6509'
       model: 'M40'
+    - regex: 'LT[ _]9902'
+      model: 'M60'
     - regex: 'LT[ _]2003'
       model: 'M25 Power'
     - regex: 'LT[ _]P([89])(?:[);/ ]|$)'
@@ -35035,11 +36283,11 @@ LT Mobile:
 
 # ONYX BOOX (onyx-boox.ru)
 ONYX BOOX:
-  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)(?:[);/ ]|$)'
+  regex: '(?:KON_TIKI(2)?|Nova3Color|GoColor7|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?|TabUltraCPro|LIVINGSTONE[23]|MC_FAUST[23]|DARWIN[9X]|MC_DARWIN[678]|MC_GAMA4|MC_Cristo4|MC_NovaPro|NoteAir3C|VOLTA[45]|Kon_Tiki3|FAUST[56]|GALILEO|Poke3|KANT2)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'VOLTA4'
-      model: 'Volta 4'
+    - regex: 'VOLTA([45])'
+      model: 'Volta $1'
     - regex: 'NovaAirC'
       model: 'Nova Air C'
     - regex: 'MC_NovaPro'
@@ -35052,6 +36300,10 @@ ONYX BOOX:
       model: 'Nova 3 Color'
     - regex: 'Poke2Color'
       model: 'Poke 2 Color'
+    - regex: 'Poke3'
+      model: 'Poke 3'
+    - regex: 'KANT2'
+      model: 'Kant 2'
     - regex: 'KON_TIKI([23])?'
       model: 'Kon Tiki $1'
     - regex: 'Lomonosov'
@@ -35064,12 +36316,16 @@ ONYX BOOX:
       model: 'Gama 4'
     - regex: 'GALILEO'
       model: 'Galileo'
+    - regex: 'GoColor7'
+      model: 'Go Color 7'
     - regex: 'MC_Cristo4'
       model: 'Monte Cristo 4'
     - regex: 'LIVINGSTONE([23])'
       model: 'Living Stone $1'
     - regex: 'NoteAir3C'
       model: 'Note Air 3C'
+    - regex: 'TabUltraCPro'
+      model: 'Tab Ultra C Pro'
 
 # AIRON (airon.ua)
 AIRON:
@@ -35175,6 +36431,8 @@ YUHO:
       model: 'Vast Plus'
     - regex: 'YUHO_Y1_ACE'
       model: 'Y1 Ace'
+    - regex: 'YUHO_Y1_StarS'
+      model: 'Y1 Star S'
     - regex: 'YUHO_Y1_STAR'
       model: 'Y1 Star'
     - regex: 'YUHO_O1_LITE'
@@ -35303,10 +36561,20 @@ Pico:
 
 # STG Telecom (stgtelecom.com)
 STG Telecom:
-  regex: 'STG[ _](A[12] Pro|[AS]1|X[1-3]|X20|S[1-3]0|[BCP]10)(?:[);/ ]|$)'
+  regex: 'STG[ _](A[12] Pro|[AS]1|X[1-3]|X20|S[1-3]0|[BCHP]10)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
+# SMT Telecom (SMT_LW, SMT_SN, SMT_TSC)
+SMT Telecom:
+  regex: '(?:CRUSH_X565|BLAZE_X500)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'CRUSH_X565'
+      model: 'Crush X565'
+    - regex: 'BLAZE_X500'
+      model: 'Blaze X500'
+
 # Rivo
 Rivo:
   regex: 'PHANTOM (?:PZ|RX)|RHYTHM[ _]RX|(?:STORM_S8(?: ?plus)?)(?:[);/ ]|$)'
@@ -35486,7 +36754,7 @@ AOYODKG:
 
 # Xtratech (xtratech.com)
 Xtratech:
-  regex: '(?:BRIO[_ ]X31|XM14G|X10MT16)(?:[);/ ]|$)'
+  regex: '(?:BRIO[_ ]X31|XM14G|X10MT(?:16|87))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(BRIO[_ ]X31)'
@@ -35497,11 +36765,22 @@ Xtratech:
     - regex: 'X10MT16'
       device: 'tablet'
       model: 'X10MT16'
+    - regex: 'X10MT87'
+      device: 'tablet'
+      model: 'IguanaPad 10.1"'
 
 # XGIMI (www.xgimi.com)
 XGIMI:
-  regex: 'XGIMI TV(?:[);/ ]|$)'
+  regex: '(?:XGIMI TV|XK03H)(?:[);/ ]|$)'
   device: 'peripheral'
+  models:
+    - regex: 'XK03H'
+      model: 'Horizon Pro' # Laser Projector
+
+# VIVIBright
+VIVIBright:
+  regex: '(F30UP)(?:[);/ ]|$)' # Projector
+  device: 'tv'
   model: '$1'
 
 # Raspberry (raspberrypi.org)
@@ -35518,19 +36797,24 @@ Tambo:
 
 # Smooth Mobile (https://www.smoothmobile.us/)
 Smooth Mobile:
-  regex: '(?:Smooth ?(?:5\.[05]|626|6\.26 (?:Lite|Max|Pro)|6\.[15])|S2 Advance)(?:[);/ ]|$)'
+  regex: 'Smooth|S2 Advance(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S2 Advance'
       model: 'S2 Advance'
     - regex: 'Smooth 5\.5 lite'
       model: 'Smooth 5.5 Lite'
-    - regex: 'Smooth (5\.[05]|6\.[15])(?:[);/ ]|$)'
+    - regex: 'Smooth (5\.[05]|6\.[015])(?:[);/ ]|$)'
       model: 'Smooth $1'
     - regex: 'Smooth626(?:[);/ ]|$)'
       model: 'Smooth 6.26'
     - regex: 'Smooth 6\.26 (Lite|Max|Pro)(?:[);/ ]|$)'
       model: 'Smooth 6.26 $1'
+    - regex: 'Smooth Note 6\.8(?:[);/ ]|$)'
+      model: 'Smooth Note 6.8'
+    - regex: 'Smooth (8GT)(?:[);/ ]|$)'
+      model: 'Smooth $1'
+      device: 'tablet'
 
 # Smotreshka
 Smotreshka:
@@ -35564,9 +36848,15 @@ Elekta:
 
 # YASIN (yasintv.kz)
 YASIN:
-  regex: 'YASIN (?:Android|2K) TV(?:[);/ ]|$)'
+  regex: 'YASIN '
   device: 'tv'
-  model: ''
+  models:
+    - regex: 'YASIN ([24])K G Smart TV'
+      model: '$1K G Smart TV'
+    - regex: 'YASIN (?:Android|2K) (?:Android )?TV(?:[);/ ]|$)'
+      model: '2K Smart TV'
+    - regex: 'YASIN 4K Android TV(?:[);/ ]|$)'
+      model: '4K Smart TV'
 
 # BLOW (blow.pl)
 Blow:
@@ -35710,6 +37000,14 @@ M-Horse:
     - regex: 'TOP_Note8'
       model: 'Top Note 8'
 
+# M-KOPA (https://www.m-kopa.com/)
+M-KOPA:
+  regex: 'M-KOPA'
+  device: 'smartphone'
+  models:
+    - regex: '(X20|X2)(?:[);/ ]|$)' # HMD
+      model: '$1'
+
 # ProVision (www.provision.co.ir/en)
 ProVision:
   regex: 'ProVision (S1)(?:[);/ ]|$)'
@@ -35728,11 +37026,13 @@ Sirin Labs:
 
 # SK Broadband (https://www.skbroadband.com/)
 SK Broadband:
-  regex: 'BHX-UH200'
+  regex: 'BHX-UH200|BID-AT200'
   device: 'tv'
   models:
     - regex: 'BHX-UH200(?:[);/ ]|$)' # Humax
       model: 'BHX-UH200'
+    - regex: 'BID-AT200(?:[);/ ]|$)' # Intek INTEKS20SI
+      model: 'B TV Smart 3 (2021)'
 
 # Humax (https://automotive-en.humaxdigital.com/)
 Humax:
@@ -35747,6 +37047,16 @@ Humax:
       device: 'car browser'
       model: '$1'
 
+# Humanware (https://www.humanware.com/)
+Humanware:
+  regex: 'BrailleNote'
+  device: 'tablet'
+  models:
+    - regex: 'BrailleNote Touch \+(?:[);/ ]|$)'
+      model: 'BrailleNote Touch Plus'
+    - regex: 'BrailleNote Touch(?:[);/ ]|$)'
+      model: 'BrailleNote Touch'
+
 # Perfeo (perfeo.ru)
 Perfeo:
   regex: 'Perfeo'
@@ -35792,7 +37102,7 @@ SmartBook:
   models:
     - regex: 'SMARTBOOK[ _]SB ?13'
       model: 'SB13'
-    - regex: 'SMARTBOOK[ _](S9Q9|S7QS)'
+    - regex: 'SMARTBOOK[ _](S9Q9|S7QS|S9\+)'
       model: '$1'
 
 # Kiowa
@@ -35844,16 +37154,20 @@ Elevate:
 
 # Stylo
 Stylo:
-  regex: 'STYLO|(?:TARISTAB[234]|Luna|CPE91|VS571|VS5502|S57_A[ZL]URE|BOLD_PLUS|INKOSI(?:_PRO)?|INKULU_PRO|Ithemba|S56 MIST|S55 Nova|S40_VISTA|S50_JADE|S50_BOLD|S64_ALPHA|S53_STARK|S40_LIFE|LIFE_2|S49[_ ](?:MONO|POISE|ECO)| [27]21|721_PRO|DQR22|MOSCOW|STEP_UP|ARCTIC|S61 JAZZ|DVK87 Orion 8 Tab)(?:[);/ ]|$)| BRAVE(?: Build|[;)])'
+  regex: 'STYLO|(?:TARISTAB[234]|Luna|CPE91|VS571|VS5502|S57_A[ZL]URE|BOLD_PLUS|INKOSI(?:_PRO)?|INKULU_PRO|Ithemba|S56 MIST|S55 Nova|INKOSI_PRO_4G|S40_VISTA|S50_JADE|S50_BOLD|S64_ALPHA|S53_STARK|S40_LIFE|LIFE_2|S49[_ ](?:MONO|POISE|ECO)| [27]21|721_PRO|DQR22|MOSCOW|STEP_UP|ARCTIC|S61 JAZZ|DVK87 Orion 8 Tab|DVK82 Mercury|EBY33)(?:[);/ ]|$)| (?:BRAVE|SATURN)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'STYLO[ _](F1|Viva)'
       model: '$1'
+    - regex: 'STYLO[ _]SONIC'
+      model: 'Sonic'
     - regex: 'STEP_UP'
       model: 'Step Up'
+    - regex: 'INKOSI_PRO_4G'
+      model: 'Inkosi Pro 4G'
     - regex: '721_PRO'
       model: '721 Pro'
-    - regex: ' ([27]21)(?:[);/ ]|$)'
+    - regex: '([27]21)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'STYLO[ _]S9[_ ]TOPAZ'
       model: 'S9 Topaz'
@@ -35883,6 +37197,8 @@ Stylo:
       model: 'Ithemba'
     - regex: 'ARCTIC'
       model: 'Arctic'
+    - regex: 'EBY33'
+      model: 'Horizon'
     - regex: 'S53_STARK'
       model: 'S53 Stark'
     - regex: 'S40_LIFE'
@@ -35913,6 +37229,12 @@ Stylo:
       model: 'Bold Plus'
     - regex: 'BRAVE'
       model: 'Brave'
+    - regex: 'RAIN'
+      model: 'Rain'
+    - regex: 'SATURN'
+      model: 'Saturn'
+    - regex: 'DVK82 Mercury'
+      model: 'DVK82 Mercury'
     - regex: 'Stylo[_ ](521)'
       model: '$1'
     - regex: '(VS571|VS5502)'
@@ -35959,7 +37281,7 @@ Vexia:
 
 # HiMax (himaxmobilebd.com)
 HiMax:
-  regex: ' HIMAX[_ ]'
+  regex: 'HIMAX[_ ]'
   device: 'smartphone'
   models:
     - regex: 'POLYMER( X)?'
@@ -35969,7 +37291,7 @@ HiMax:
 
 # Packard Bell (sub brand Acer www.packardbell.com, packard-bell.co.za)
 Packard Bell:
-  regex: '(PB1009|M10[45]00|M7500|M7600-D|DAYTONA-G12|MONZA-T7|SILVERSTONE-T10|EasyNote TV11HC)(?:[);/ ]|$)'
+  regex: '(PB1009|M10[45]00|M7500|M7600-D|DAYTONA-G12|MONZA-T7|SILVERSTONE-T(?:5A|10)|EasyNote TV11HC)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'DAYTONA-G12'
@@ -35977,8 +37299,8 @@ Packard Bell:
       model: 'Daytona G12'
     - regex: 'MONZA-T7'
       model: 'Monza T7'
-    - regex: 'SILVERSTONE-T10'
-      model: 'Silverstone T10'
+    - regex: 'SILVERSTONE-(T5A|T10)'
+      model: 'Silverstone $1'
     - regex: '(PB1009|M10[45]00|M7500|M7600-D)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'EasyNote TV11HC'
@@ -35987,7 +37309,7 @@ Packard Bell:
 
 # Qnet Mobile (qnetmobile.com)
 Qnet Mobile:
-  regex: ' Passion[ _]P|Hynex plus|Stark K1|Hynex H[356]|Levin V[12]|Aston A[357]\+'
+  regex: 'Passion[ _]P|Hynex plus|Stark K1|Hynex H[356]|Levin V[12]|Aston A[357]\+'
   device: 'smartphone'
   models:
     - regex: 'Passion[ _](P[0-9]+)'
@@ -36019,12 +37341,12 @@ Mara:
 
 # BMAX (www.bmaxit.com)
 BMAX:
-  regex: '(?:I11_Plus_EEA|(?:I11|I10(Plus)?|I9_Plus)_EEA|Android 11(?:[\d.]*);(?: [\w-]+;)? I11|I10_Pro|I10Plus)(?:[);/ ]|$)'
+  regex: '(?:I11_Plus(?:_EEA)?|(?:I11|I10(Plus)?|I9_Plus)_EEA|I9_Plus|Android 11(?:[\d.]*);(?: [\w-]+;)? I11|I10_Pro|I10Plus)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'I10_?(Plus|Pro)?(?:_(?:EEA|ROW))?(?:[);/ ]|$)'
       model: 'MaxPad I10 $1'
-    - regex: ' I11(?:_EEA)?(?:[);/ ]|$)'
+    - regex: 'I11(?:_EEA)?(?:[);/ ]|$)'
       model: 'MaxPad I11'
     - regex: 'I(11|9)_Plus(?:_EEA)?(?:[);/ ]|$)'
       model: 'MaxPad I$1 Plus'
@@ -36047,6 +37369,14 @@ Trident:
   device: 'smartphone'
   model: '$1'
 
+# Trimble (https://www.trimble.com/)
+Trimble:
+  regex: 'MobileMapper'
+  device: 'smartphone'
+  models:
+    - regex: 'MobileMapper60(?:_2)?(?:[);/ ]|$)'
+      model: 'MobileMapper 60'
+
 # OKSI
 OKSI:
   regex: '(GEN-10|GT1001)(?:[);/ ]|$)'
@@ -36061,13 +37391,24 @@ Taiga System:
 
 # Glofiish (glofiish.ua)
 Glofiish:
-  regex: '(?:Gpad_U)(?:[);/ ]|$)'
+  regex: 'glofiish[ _]|(?:Gpad_U)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'G Pad U'
+  models:
+    - regex: 'Gpad_U'
+      model: 'G Pad U'
+    - regex: 'Gpad Air'
+      device: 'tablet'
+      model: 'G Pad Air'
+
+# Glory Star (https://www.glorystartouch.com/)
+Glory Star:
+  regex: 'StarOS'
+  device: 'tablet'
+  model: ''
 
 # Polar (polar.ru)
 Polar:
-  regex: 'Polar(?:_W?K?)?[_ ]P\d{2}|(?:P42L31T2CSM)(?:[);/ ]|$)'
+  regex: 'Polar(?:_W?K?)?[_ ]P\d{2}|(?:P42L31T2CSM|P32L33T2CSM)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(?:Polar(?:_W?K?)?[_ ])?(P\d{2}[LU]\d{2}T2S?CSM)(?:[);/ ]|$)'
@@ -36075,7 +37416,7 @@ Polar:
 
 # Polarline (sub brand Polar)
 PolarLine:
-  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)(?:[);/ ]|$)'
+  regex: 'PolarLine[_ ](?:W?K?[_ ])?(\d{2}P[LU]\d{2}S?TC-SM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -36105,7 +37446,7 @@ neoCore:
 
 # Novex
 Novex:
-  regex: '(NWX-40F171MSY|NVX-32H219MSY|NVX-43U329MSY|NVX-39H211MSY|NWX-43F149MSYv?|NWX-24H121MSY|NWX-24H121WSY|NWX-32H171MSY|NVX-55U321MSY|NVX-50U329MSY)(?:[);/ ]|$)'
+  regex: '(NWX-40F171MSY|NVX-32H219MSY|NVX-43U329MSY|NVX-39H211MSY|NWX-43F149MSYv?|NWX-24H121MSY|NWX-24H121WSY|NWX-32H171MSY|NVX-55U321MSY|NVX-50U329MSY|NWX-65U169TSY-A|NVX-65U321MSY)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -36117,10 +37458,10 @@ Epson:
 
 # Awow or AWOW (awowtech.com)
 Awow:
-  regex: '(?:AWOW_)?(?:UTBook|CreaPad_100[39](?:_EEA)?)'
+  regex: '(?:AWOW_)?(?:UTBook|CreaPad_100[359](?:_EEA)?)'
   device: 'tablet'
   models:
-    - regex: '(?:AWOW_)?(UTBook|CreaPad_100[39])'
+    - regex: '(?:AWOW_)?(UTBook|CreaPad_100[359])'
       model: '$1'
 
 # Mitsui (www.diamond-electronics.com)
@@ -36156,9 +37497,11 @@ Urovo:
 
 # Neon IQ or NeonIQ
 Neon IQ:
-  regex: '(?:NQT-(?:101|7)[34]GIQ|NQT-7W)(?:[);/ ]|$)'
+  regex: '(?:NQT-(?:101|7)[34]GIQ(?:11)?|NQT-7W)(?:[);/ ]|$)'
   device: 'tablet'
   models:
+    - regex: '(NQT-1013GIQ11)'
+      model: '$1'
     - regex: 'NQT-101([34])GIQ'
       model: 'Tab 10.1" $1G'
     - regex: 'NQT-7([34])GIQ'
@@ -36196,7 +37539,7 @@ Bubblegum:
 
 # Erisson
 Erisson:
-  regex: '(42FLEA73T2SM|42FLX9060T2|32LX9000CT|39LES80T2SM|32LX9051T2|55ULES92T2SM|32LEA73T2SM)(?:[);/ ]|$)'
+  regex: '(24LM8002CT2|42FLEA73T2SM|43FLES90[12]T2SM|42FLX9060T2|32LX9000CT|39LES80T2SM|32LX9051T2|43ULX9060T2|32LX9050T2|55ULES92T2SM|32LEA73T2SM|32LES90[24]T2SM|42FLES904T2SM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -36208,7 +37551,7 @@ Liberton:
 
 # Soho Style
 Soho Style:
-  regex: '(SS5214G)(?:[);/ ]|$)'
+  regex: '((?:S1586K|SS(?:5[23]14|5[47]24)G))(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -36298,7 +37641,7 @@ Meizu:
       model: '16th'
     - regex: '(?:MZ-)?16 X(?:[);/ ]|$)'
       model: '16X'
-    - regex: ' 16(?: Build|[;)]|$)'
+    - regex: '16(?: Build|[;)]|$)'
       model: '16'
     - regex: '(?:MZ-)?16s Pro(?:[);/ ]|$)'
       model: '16s Pro'
@@ -36317,12 +37660,12 @@ Meizu:
     - regex: 'MZ-([^/;]+) Build'
       model: '$1'
 
-# Athesi (https://www.athesi-professional.com/)
+# Athesi or Athesi Professional (https://www.athesi-professional.com/)
 Athesi:
-  regex: '(?:AP570[12]|AP5705S)(?:[);/ ]|$)'
+  regex: '(?:AP570[12]|AP5705S|AP6301)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(AP570[12]|AP5705S)(?:[);/ ]|$)'
+    - regex: '(AP570[12]|AP5705S|AP6301)(?:[);/ ]|$)'
       model: '$1'
 
 # Atmaca Elektronik (http://www.atmacaelektronik.com.tr/)
@@ -36345,22 +37688,22 @@ XY Auto:
 
 # Alps
 Alps:
-  regex: '(?:FF-5000|ZQ8003|825X_Pro|03_v89_jbl|benz_hy1920x720|8227L_demo)(?:[);/ ]|$)'
+  regex: '(?:FF-5000|ZQ8003|825X_Pro|03_v89_jbl|benz_hy1920x720|8227L_demo|tb8163p3_bsp)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(FF-5000)' # for Ford Mustang (FFKJ)
       device: 'car browser'
       model: '$1'
-    - regex: '(ZQ8003|825X_Pro|benz_hy|8227L_demo)(?:1920x720)?'
+    - regex: '(ZQ8003|825X_Pro|benz_hy|8227L_demo|tb8163p3_bsp)(?:1920x720)?'
       device: 'car browser'
       model: '$1'
 
 # Starwind (starwind.com.ru)
 Starwind:
-  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB302|42SB300|40SG300|43SG30[20]|43UB404|32SG3(?:0[012]|11)|55UG400|50UB401|65UG403))(?:[);/ ]|$)'
+  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB30[02]|42SB300|43SB304|40SG300|40SB304|43SG30[20]|43UB404|43UG40[0135]|32SG3(?:0[01245]|11)|55UG40[03]|58UG401|5[05]UB401|50UG40[03]|65UG403|5[08]UB400|58UA401))(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'SW-LED(\d{2}[SU][BG]\d{3})'
+    - regex: 'SW-LED(\d{2}[SU][ABG]\d{3})'
       model: 'SW-LED$1'
 
 # QTECH (https://www.qtech.ru/en/)
@@ -36389,6 +37732,12 @@ Porsche:
   device: 'car browser'
   model: ''
 
+# Portfolio
+Portfolio:
+  regex: '(V100M4L)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # NavRoad (navroad.com)
 NavRoad:
   regex: '(?:NEXO (?:Smarty|handy|SMART DUO|Evo)|MOVIO 2)(?:[);/ ]|$)'
@@ -36420,7 +37769,7 @@ Smarty:
 
 # Leff
 Leff:
-  regex: '(32[FH]540S|32H5[235]0T|5[05]U540S|55U630S|40F540S|43F5[35]0T|32H511T|24H520T|28H540S|28H550T|50U6[23]0S|43F511T)(?:[);/ ]|$)'
+  regex: '(32[FH]540S|32H5[235]0T|32F550T|32H650S|43U540S|43U550T|5[05]U5[14]0S|55U630S|65U520S|40F540S|40F550T|43F5[35]0T|32H511T|24H5[12]0T|28H540S|28H550T|50U6[23]0S|55U620S|43F511T|43F520T)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -36457,13 +37806,13 @@ TuCEL:
 
 # FEONAL
 FEONAL:
-  regex: '(K11[08])_EEA(?:[);/ ]|$)'
+  regex: '(K11[038]|D118)_EEA(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
 # Sunmi (www.sunmi.com)
 Sunmi:
-  regex: '(?:V1s-G|T2s_LITE)(?:[);/ ]|$)'
+  regex: '(?:V1s-G|T2s_LITE|V2_PRO-ST)(?:[);/ ]|$)'
   device: 'peripheral'
   models:
     - regex: 'T2s_LITE(?:[);/ ]|$)' # monoblock and terminal
@@ -36471,6 +37820,8 @@ Sunmi:
       model: 'T2s Lite'
     - regex: '(V1s)-G'
       model: '$1'
+    - regex: 'V2_PRO-ST'
+      model: 'V2 Pro ST'
 
 # iData (idataglobal.com)
 iData:
@@ -36561,13 +37912,15 @@ iNOVA:
 
 # eNOVA
 eNOVA:
-  regex: 'eNOVA'
+  regex: 'eNOVA|(?:TAE08N10)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'eNOVA TAB 10 LTE'
       device: 'tablet'
       model: 'Tab 10" LTE'
-
+    - regex: '(TAE08N10)'
+      device: 'tablet'
+      model: '$1'
 # Amino or Aminocom (www.amino.tv)
 Amino:
   regex: '(?:Amigo7x?(?:YUF|SCB)?)(?:[);/ ]|$)'
@@ -36622,13 +37975,13 @@ iKonia:
   device: 'tablet'
   model: 'Jarvis 7.85'
 
-# QLink
+# QLink or Q Link Wireless (https://qlinkwireless.com/)
 QLink:
-  regex: '(?:Scepter[ _]8(?: Tablet)?)(?:[);/ ]|$)'
+  regex: '(?:Scepter[ _]?8(?: Tablet)?)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(Scepter[ _]8)'
-      model: '$1'
+    - regex: 'Scepter[ _]?8'
+      model: 'Scepter 8'
 
 # IRA or IRA (explore more) (wishtel.com)
 IRA:
@@ -36650,6 +38003,14 @@ Microtech:
     - regex: 'ETL101(?:GB|AL)'
       model: 'E-Tab LTE'
 
+# G-PLUS
+G-PLUS:
+  regex: '(?:GNE-N001S)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'GNE-N001S'
+      model: 'A3'
+
 # Gplus (gpluselectronics.com)
 Gplus:
   regex: 'GTV-|(?:Gplus[ _](?:[ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus|S10)|GMC-(?:7127M|668[NM]))(?:[);/ ]|$)'
@@ -36703,7 +38064,7 @@ FiGi:
       model: '$1two'
     - regex: '(FSE1020)'
       model: '$1'
-    - regex: ' Fj(?: Build|[;)])'
+    - regex: 'Fj(?: Build|[;)])'
       model: 'Fj'
     - regex: 'Note_1C'
       model: 'Note 1C'
@@ -36774,10 +38135,10 @@ Beista:
 
 # YOTOPT (www.yotopt.com)
 YOTOPT:
-  regex: '(?:X109|(?:Y103|Q11)[-_]EEA)(?:[);/ ]|$)'
+  regex: '(?:X109|(?:Y103|Y61|Q11)[-_]EEA)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(Y103|Q11)[-_]EEA'
+    - regex: '(Y103|Q11|Y61)[-_]EEA'
       model: '$1'
     - regex: '(X109)(?:[);/ ]|$)'
       model: '$1'
@@ -36790,10 +38151,10 @@ Ookee:
 
 # TOSCIDO (www.toscido.com)
 TOSCIDO:
-  regex: '(?:(?:T1[235]|T151|T2[12])-EEA|W-?109)(?:[);/ ]|$)'
+  regex: '(?:(?:T1[235]|T151|T2[1268])-EEA|W-?109)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(T1[235]|T151|T2[12])-EEA(?:[);/ ]|$)'
+    - regex: '(T1[235]|T151|T2[1268])-EEA(?:[);/ ]|$)'
       model: '$1'
     - regex: 'W-?109(?:[);/ ]|$)'
       model: 'W109'
@@ -36932,7 +38293,7 @@ Hamlet:
 
 # Vorcom
 Vorcom:
-  regex: '(?:SXPro|S7-classic|SXPRO_classic)(?:[);/ ]|$)'
+  regex: '(?:SXPro|S7-classic|SXPRO_classic|QuartzLITE)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'SXPRO_classic'
@@ -36941,6 +38302,8 @@ Vorcom:
       model: 'SX Pro'
     - regex: 'S7-classic'
       model: 'S7 Classic'
+    - regex: 'QuartzLITE'
+      model: 'Quartz Lite'
 
 # UNNO
 UNNO:
@@ -37059,6 +38422,8 @@ Airtel:
     - regex: 'Airpad 7-s'
       device: 'tablet'
       model: 'AirPad 7S'
+    - regex: 'Imagine(?:[);/ ]|$)'
+      model: 'Imagine'
 
 # MAXX
 MAXX:
@@ -37106,9 +38471,11 @@ X-AGE:
 
 # Zonko
 Zonko:
-  regex: 'K101_EEA(?:[);/ ]|$)'
+  regex: '(?:K101_EEA|K118)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'K101'
+  models:
+    - regex: 'K(101|118)'
+      model: 'K$1'
 
 # TJC (www.tjc-jp.com)
 TJC:
@@ -37116,12 +38483,18 @@ TJC:
   device: 'tablet'
   model: 'Metal Tablet 10'
 
+# TJD or TJD(SZ)
+TJD:
+  regex: '(MT-1011QR)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # HOTREALS
 HOTREALS:
   regex: 'HOTREALS'
   device: 'tablet'
   models:
-    - regex: 'HOTREALS(?:[);/]|$)'
+    - regex: 'HOTREALS(?:[);/ ]|$)'
       model: 'Tablet PC 10.1"'
 
 # ZEEKER
@@ -37184,10 +38557,20 @@ BROR:
 
 # Vortex (https://vortexcellular.com/)
 Vortex:
-  regex: '(SYNQ|CMG101|CM62|CG65|T10M_Pro|HD62|ZTAB10|BTAB10|HD65 Choice)(?:[);/ ]|$)'
+  regex: '(Android 13(?:[\d.]*);(?: [\w-]+;)? (?:HD65)|ZG65|SYNQ|CMG101|CM62|CG65|T10M_Pro|HD55|HD60[iL]?|HD62|HD68|ZTAB10|BTAB10|HD65[ _](?:Choice|Select|Ultra|PLUS)|ZG55|ZG65 Pro|V39TPHE01S|V32TPHDE1S|V24TPHDE1S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(SYNQ|HD6[25]|CM62|CG65)'
+    - regex: 'ZG65 Pro'
+      model: 'ZG65 Pro'
+    - regex: 'HD65[_ ]Choice'
+      model: 'HD65 Choice'
+    - regex: 'HD65[_ ]Ultra'
+      model: 'HD65 Ultra'
+    - regex: 'HD65[_ ]Select'
+      model: 'HD65 Select'
+    - regex: 'HD65[_ ]PLUS'
+      model: 'HD65 Plus'
+    - regex: '(SYNQ|CM62|CG65|ZG55|HD55|HD60[iL]?|HD6[258]|ZG65)'
       model: '$1'
     - regex: '(CMG101)'
       device: 'tablet'
@@ -37201,6 +38584,9 @@ Vortex:
     - regex: 'BTAB10'
       device: 'tablet'
       model: 'B Tab 10'
+    - regex: '(V39TPHE01S|V32TPHDE1S|V24TPHDE1S)'
+      device: 'tv'
+      model: '$1'
 
 # Xiaodu or Baidu Xiaodu
 Xiaodu:
@@ -37220,9 +38606,13 @@ AXXA:
 
 # AYYA
 AYYA:
-  regex: 'AYYA[ _](T1)(?:[);/ ]|$)'
+  regex: 'AYYA[ _]|(?:Ayat101)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'AYYA[ _](T1)'
+      model: '$1'
+    - regex: 'Ayat101'
+      model: 'Ayat 101'
 
 # Future Mobile Technology
 Future Mobile Technology:
@@ -37280,13 +38670,13 @@ Listo:
 
 # ECON
 ECON:
-  regex: '(EX-32HS016B|EX-32HS006B|EX-39HS004B|EX-60US001B)'
+  regex: '(EX-32HS01[67]B|EX-32HS006B|EX-39HS004B|EX-50US003B|EX-60US001B)'
   device: 'tv'
   model: '$1'
 
 # LNMBBS
 LNMBBS:
-  regex: '(H11)-EEA(?:[);/]|$)'
+  regex: '(H11)-EEA(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -37306,23 +38696,25 @@ TeachTouch:
 
 # Facetel
 Facetel:
-  regex: '(?:Q3_EEA|Q3pro)(?:[);/]|$)'
+  regex: '(?:Q3_EEA|Q3pro|Q10-EEA)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'Q3_EEA(?:[);/]|$)'
+    - regex: 'Q3_EEA(?:[);/ ]|$)'
       model: 'Q3'
-    - regex: 'Q3pro(?:[);/]|$)'
+    - regex: 'Q10-EEA(?:[);/ ]|$)'
+      model: 'Q10'
+    - regex: 'Q3pro(?:[);/ ]|$)'
       model: 'Q3 Pro'
 
 # HLLO or Exertis HLLO
 HLLO:
-  regex: '(SMB-H8009)(?:[);/]|$)'
+  regex: '(SMB-H8009)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
 # YUMKEM
 YUMKEM:
-  regex: '(L211|N10|U221)-EEA(?:[);/]|$)'
+  regex: '(L211|N10|U221|U310)-EEA(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -37351,19 +38743,19 @@ Famous:
 
 # ZIK (zik.kz)
 ZIK:
-  regex: 'ZIK[_ ](W1027)(?:[);/]|$)'
+  regex: 'ZIK[_ ](W1027)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
 # PlusStyle (plusstyle.jp)
 PlusStyle:
-  regex: 'PS_TAB_(WB01)(?:[);/]|$)'
+  regex: 'PS_TAB_(WB01)(?:[);/ ]|$)'
   device: 'tablet'
   model: 'Tab $1'
 
 # New Bridge
 New Bridge:
-  regex: '(NBTB10[12])(?:[);/]|$)'
+  regex: '(NBTB10[12])(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -37391,7 +38783,7 @@ Infiniton:
 
 # Backcell
 Backcell:
-  regex: '(BK2021)(?:[);/]|$)'
+  regex: '(BK2021)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -37567,6 +38959,12 @@ Kenbo:
     - regex: '(O[76]1)(?:[);/ ]|$)'
       model: '$1'
 
+# VALE
+VALE:
+  regex: 'V12E-LTE-8128'
+  device: 'tablet'
+  model: 'V12E LTE'
+
 # VALEM
 VALEM:
   regex: 'PHANTOM_Z'
@@ -37575,7 +38973,7 @@ VALEM:
 
 # ENACOM
 ENACOM:
-  regex: '(PIXBA2019)(?:[);/ ]|$)'
+  regex: '(M1045W|PIXBA2019)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -37666,7 +39064,7 @@ D-Tech:
 
 # nJoy or Njoy
 nJoy:
-  regex: '(?:nJoy[_ ])?(Deimos 7|Kali_8|Turnus_8|Tityos_10|Arcas_7|Theia_10)(?:[);/ ]|$)'
+  regex: '(?:nJoy[_ ])?(Deimos 7|Kali_8|Turnus_8|Tityos_10|Arcas_7|Theia_10|Chronos_10)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -37869,7 +39267,7 @@ Topsion:
 
 # Ceibal (www.ceibal.edu.uy)
 Ceibal:
-  regex: '(?:ACRUX|BELLATRIX|BETELGEUSE|Kil-82WFDC|U800B)(?:[);/ ]|$)'
+  regex: '(?:ACRUX|BELLATRIX|BETELGEUSE|GACRUX|Kil-82WFDC|U800B)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'ACRUX'
@@ -37878,6 +39276,8 @@ Ceibal:
       model: 'Bellatrix'
     - regex: 'BETELGEUSE'
       model: 'Betelgeuse'
+    - regex: 'GACRUX'
+      model: 'Gacrux'
     - regex: 'Kil-82WFDC'
       model: 'Kiland T8'
     - regex: '(U800B)'
@@ -37891,21 +39291,23 @@ Wecool:
 
 # Weelikeit
 Weelikeit:
-  regex: '(C81W)_EEA(?:[);/ ]|$)'
+  regex: '(?:C81W_EEA|P16W|F21W)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: '(P16W|C81W|F21W)(?:_EEA)?'
+      model: '$1'
 
 # M3 Mobile (www.m3mobile.net)
 M3 Mobile:
-  regex: '(?:M3US20W|M3SL20)(?:[);/ ]|$)'
-  device: 'smartphone'
+  regex: '(?:M3US20W|M3SL20|M3SM15X)(?:[);/ ]|$)'
+  device: 'peripheral'
   models:
     - regex: 'M3US20W'
-      device: 'peripheral'
-      model: 'US20 W'
+      model: 'US20W'
     - regex: 'M3SL20'
-      device: 'peripheral'
-      model: 'M3 SL20'
+      model: 'SL20'
+    - regex: 'M3SM15X'
+      model: 'SM15X'
 
 # Hugerock
 Hugerock:
@@ -37963,9 +39365,13 @@ Redbean:
 
 # ENIE
 ENIE:
-  regex: '(?:8.*; E4Pro)(?:[);/ ]|$)'
+  regex: '(?:android 8(?:[\d.]*);(?: [\w-]+;)? E4Pro|VT8216)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'E4 Pro'
+  models:
+    - regex: 'E4Pro'
+      model: 'E4 Pro'
+    - regex: '(VT8216)'
+      model: '$1'
 
 # Dcode or DCode(dcode.com.pk)
 Dcode:
@@ -38023,15 +39429,15 @@ Unblock Tech:
 
 # Chainway (www.chainway.net)
 Chainway:
-  regex: ' (?:C66)(?:[);/ ]|$)'
+  regex: '(?:C66)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: ' (C66)'
+    - regex: '(C66)'
       model: '$1'
 
 # Harper (https://harper.ru/)
 Harper:
-  regex: 'HARPER|(?:HARPER[_ ])?(?:ABX-332|ABX-[12]10|32R750TS|32R670TS|40F660TS|40F750TS|24R490TS|65U660TS|50U660TS|32R751TS|43F750TS|85U750TS)(?:[);/ ]|$)'
+  regex: 'HARPER|(?:HARPER[_ ])?(?:ABX-332|ABX-[12]10|32R750TS|32R670TS|40F660TS|40F750TS|43U750TS|24R490TS|65U660TS|43F660TS|50U660TS|32R751TS|43F750TS|85U750TS)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(?:HARPER[_ ])?(ABX-332|ABX-[12]10|32R751TS|40F660TS|24R490TS|65U660TS|50U660TS)'
@@ -38061,7 +39467,7 @@ Nothing Phone:
 Gazer:
   regex: 'Gazer_TV'
   device: 'tv'
-  model: ''
+  model: 'Smart TV'
 
 # WIZARPOS (www.wizarpos.com)
 WizarPos:
@@ -38129,6 +39535,12 @@ Dtac:
   device: 'smartphone'
   model: 'Phone $1'
 
+# NINETOLOGY
+NINETOLOGY:
+  regex: 'NINETOLOGY[_ ]([^/;)]+)(?: Build|[);])'
+  device: 'smartphone'
+  model: '$1'
+
 # NINETEC (www.ninetec.de)
 NINETEC:
   regex: 'NINETEC'
@@ -38150,6 +39562,12 @@ NASCO:
       model: 'Snap Pro'
       device: 'smartphone'
 
+# ELE-GATE (https://www.ele-gate.com/)
+ELE-GATE:
+  regex: 'ELE-GATE(?:[);/ ]|$)'
+  device: 'tv'
+  model: 'TV Box'
+
 # Elecson
 Elecson:
   regex: 'Meeplus_1(?:[);/ ]|$)'
@@ -38163,8 +39581,8 @@ NEXT:
   model: '$1'
 
 # Next & NextStar (https://www.next.com.tr/)
-'Next & NextStar':
-  regex: '^NEXT |MyBox(?:[);/ ]|$)'
+Next & NextStar:
+  regex: '^NEXT |LGE; YE-[0-9a-z]+(?:-4K)?;|MyBox(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '2000 WiFi'
@@ -38175,15 +39593,19 @@ NEXT:
       model: '2071'
     - regex: 'MyBox(?:[);/ ]|$)'
       model: 'MyBox'
+    - regex: 'LGE; (YE-[0-9a-z]+)-4K;'
+      model: '$1 4K'
+    - regex: 'LGE; (YE-[0-9a-z]+);'
+      model: '$1'
 
 # iMuz (shop.imuz.com)
 iMuz:
-  regex: '(?:Revolution A8|muPAD[_ ][KT]10|muPAD104|muPADT7|muPAD 7S)(?:[);/ ]|$)'
+  regex: '(?:Revolution A8|muPAD[_ ][KT]10|muPAD10[24]|muPADT7|muPAD 7S)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(Revolution A8|muPAD[_ ][KT]10)'
       model: '$1'
-    - regex: 'muPAD[ _]?(104|T7|7S)'
+    - regex: 'muPAD[ _]?(10[24]|T7|7S)'
       model: 'muPAD $1'
 
 # ECOO
@@ -38315,7 +39737,7 @@ Marshal:
 
 # V-HOME
 V-HOME:
-  regex: '(32LH1210|43LF1210|50LU1210|55LU1210|43LU1210|24LH1211)(?:[);/ ]|$)'
+  regex: '(?:V-HOME_)?(32LH1210|43LF1210|(?:5[05]|65|43)LU1210|24LH1211|24LH1203)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -38357,14 +39779,14 @@ Blackpcs:
 
 # GoldMaster (www.goldmaster.com.tr)
 GoldMaster:
-  regex: '(?:Netta 2 Pro|Netta 3\.100m|BENGAL_6|DETROIT 3|i-910)(?:[);/ ]|$)'
+  regex: '(?:Netta 2 Pro|Netta 3\.100m|BENGAL_6|DETROIT 3|i-910|i-9[02]5)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Netta 2 Pro'
       model: 'Netta 2 Pro'
       device: 'tv'
-    - regex: 'i-910'
-      model: 'i-910'
+    - regex: 'i-(910|9[02]5)'
+      model: 'i-$1'
       device: 'tv'
     - regex: 'Netta 3\.100m'
       model: 'Netta 3'
@@ -38386,6 +39808,12 @@ FPT:
   device: 'smartphone'
   model: '$1'
 
+# iFIT (https://www.ifit.com/)
+iFIT:
+  regex: 'IFT1018(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'Compass'
+
 # iNavi (www.inavi.com)
 iNavi:
   regex: '(ITP-XD80L)(?: Build|[);])'
@@ -38432,15 +39860,19 @@ DRAGON:
 
 # Skyline or SkyLine (skylinetv.ru)
 Skyline:
-  regex: '(?:SKYLINE[_ ])?(32YST5970|50UST5970|24YST5970|40LST5970|32YST5975|43LST5975|5[58]U7510)(?:[);/ ]|$)'
+  regex: '(?:SKYLINE[_ ])?(32YST5970|50UST5970|24YST5970|40LST5970|32YST5975|43LST5975|43U6510|5[58]U7510|43LST5970)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Hiberg (hiberg.ru)
 Hiberg:
-  regex: '(?:32Y_STV-R|HIBERG\d{2}YUHD)(?:[);/ ]|$)'
+  regex: '(?:32Y_STV-R|HIBERGQLED\d{2}Y|HIBERG\d{2}YUHD(?:-R)?|(?:5[05]|43|65)YUHD-R)(?:[);/ ]|$)'
   device: 'tv'
   models:
+    - regex: 'HIBERGQLED(\d{2}Y)(?:[);/ ]|$)'
+      model: 'QLED $1'
+    - regex: '(?:HIBERG)?(\d{2})YUHD-R'
+      model: '$1Y UHD-R'
     - regex: 'HIBERG(\d{2})YUHD'
       model: '$1Y UHD'
     - regex: '(32Y_STV-R)'
@@ -38448,11 +39880,11 @@ Hiberg:
 
 # Hartens
 Hartens:
-  regex: '(HTY[_-]\d{2}\w+-(?:S2|H[ACK]22|S2-T9|V[DNZS])|HTY-32HDR06G|HTY_43FHD06B|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|HTV-55U11B-VS)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'HTY[_-](\d{2}(?:[^/;)]+))(?: Build|[);])'
-      model: 'HTY-$1'
+    - regex: 'HT([YV])[_-](\d{2}(?:[^/;)]+))(?: Build|[);])'
+      model: 'HT$1-$2'
 
 # AMA
 AMA:
@@ -38476,11 +39908,13 @@ Revomovil:
 
 # OSCAL (www.oscal.hk)
 OSCAL:
-  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)))(?:[);/ ]|$)'
+  regex: '(?:Spider 8|S60Pro|MODERN 8|PILOT 2|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: 'PILOT 2'
+      model: 'Pilot 2'
     - regex: 'C30 Pro'
       model: 'C30 Pro'
     - regex: 'FLAT 1C'
@@ -38489,7 +39923,7 @@ OSCAL:
       model: 'S60 Pro'
     - regex: 'Tiger (1[02])'
       model: 'Tiger $1'
-    - regex: ' (C[678]0)(?:[);/ ]|$)'
+    - regex: '(C[678]0)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Pad ([167]0|1[1358]|8)'
       device: 'tablet'
@@ -38568,11 +40002,13 @@ Uniden:
   device: 'smartphone'
   model: '$1'
 
-# FoxxD
+# FoxxD (http://www.foxxdevelopment.com/)
 FoxxD:
-  regex: '(L590A)(?:[);/ ]|$)'
+  regex: 'FOXXD|(?:L590A)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: '(?:FOXXD )?(C65|L590A)(?:[);/ ]|$)'
+      model: '$1'
 
 # KZG (Ke Zhi Guang)
 KZG:
@@ -38688,11 +40124,13 @@ VIVIMAGE:
   device: 'tablet'
   model: '$1'
 
-# X-Mobile or Xmobile (xmobile.ne.jp)
+# X-Mobile or XMobile (xmobile.ne.jp | https://xmobileusa.com/)
 X-Mobile:
-  regex: '(?:XM-SW1|X63Pro)(?:[);/ ]|$)'
+  regex: 'XMOBILE|(?:XM-SW1|X63Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: '(?:XMOBILE) X7(?:[);/ ]|$)'
+      model: 'X7'
     - regex: 'X63Pro'
       model: 'X63 Pro'
     - regex: 'XM-SW1'
@@ -38804,7 +40242,7 @@ Samtech:
 
 # Samtron (samtron.ru)
 Samtron:
-  regex: '(?:SAMTRON_W_)?(43SA701|55SA703)(?:[);/ ]|$)'
+  regex: '(?:SAMTRON_W_)?(43SA70[15]|50SA707|55SA703)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -38816,10 +40254,10 @@ MwalimuPlus:
 
 # OLTO (olto.su)
 OLTO:
-  regex: '(?:OLTO-(?:43ST20U)|43ST20H)(?:[);/ ]|$)'
+  regex: 'OLTO[_-]|(?:43ST20[HU]|32ST30H)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: '(?:OLTO-)?(43ST20[HU])'
+    - regex: '(?:OLTO-)?(\d{2}ST\d{2}[HU])'
       model: '$1'
 
 # DSIC
@@ -38848,9 +40286,13 @@ SOSH:
 
 # Oangcc
 Oangcc:
-  regex: '(Tab_A6)(?:[);/ ]|$)'
+  regex: '(?:Tab_A6|A1[35]_EEA)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: 'Tab_(A6)'
+      model: 'Tab $1'
+    - regex: '(A1[35])_EEA'
+      model: 'Tab $1'
 
 # Everex
 Everex:
@@ -38858,17 +40300,35 @@ Everex:
   device: 'tablet'
   model: 'Fine 7B'
 
+# Everis (exclusively marketed and distributed by The Warehouse Group https://www.thewarehouse.co.nz/)
+Everis:
+  regex: '(E011[1346-9]|E0120)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # Guophone
 Guophone:
   regex: '(XP9800)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
+# GVC Pro
+GVC Pro:
+  regex: 'LGE; [0-9]{2}GW[0-9]{4}\d*;'
+  device: 'tv'
+  models:
+    - regex: 'LGE; ([0-9]{2}GW\d+);'
+      model: '$1'
+
 # Unitech (ute.com)
 Unitech:
-  regex: '(EA630)(?:[);/ ]|$)'
+  regex: 'EA(?:500Plus|520|602|630)(?:_US)?(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'EA500Plus(?:[);/ ]|$)'
+      model: 'EA500 Plus'
+    - regex: '(EA(?:520|602|630))(?:_US)?(?:[);/ ]|$)'
+      model: '$1'
 
 # GTMEDIA
 GTMEDIA:
@@ -38877,7 +40337,7 @@ GTMEDIA:
   model: '$1'
 
 # Energy Sistem
-'Energy Sistem':
+Energy Sistem:
   regex: 'ENERGY[ _-]?([^;/)]+)(?: Build|[;)])'
   device: 'smartphone'
   models:
@@ -38886,7 +40346,7 @@ GTMEDIA:
     - regex: 'Energy Tablet ([^;/)]+)(?: Build|[;)])'
       device: 'tablet'
       model: 'Energy Tablet $1'
-    - regex: ' ENERGY i10 DUAL'
+    - regex: 'ENERGY i10 DUAL'
       device: 'tablet'
       model: 'i10 Dual'
     - regex: 'ENERGY[ _-]?([^;/]+) Build'
@@ -38895,9 +40355,13 @@ GTMEDIA:
 
 # WANSA
 WANSA:
-  regex: '(WUD55H7762SN|WUD55G7762S)(?:[);/ ]|$)'
+  regex: 'LGE; WLE[0-9a-z]+;|(?:WUD55H7762SN|WUD55G7762S)(?:[);/ ]|$)'
   device: 'tv'
-  model: '$1'
+  models:
+    - regex: '(WUD55H7762SN|WUD55G7762S)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'LGE; (WLE[0-9a-z]+);'
+      model: '$1'
 
 # XElectron
 XElectron:
@@ -38975,13 +40439,15 @@ MIWANG:
 
 # HeadWolf (headwolf.net)
 HeadWolf:
-  regex: '(?:Hpad[12]|Wpad3)(?:[);/ ]|$)'
+  regex: '(?:Hpad[12]|Wpad3| F3A)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Hpad([12])'
       model: 'HPad$1'
     - regex: 'Wpad(3)'
       model: 'WPad$1'
+    - regex: 'F3A(?:[);/ ]|$)'
+      model: 'FPad3'
 
 # Zamolxe
 Zamolxe:
@@ -39047,7 +40513,7 @@ iRobot:
 
 # BRAVE
 BRAVE:
-  regex: '(BT7X1)(?:[);/ ]|$)'
+  regex: '(BT7X1|EX10SL4|BTXS1)(?:[);/ ]|$)'  # EXCEED EX10SL4
   device: 'tablet'
   model: '$1'
 
@@ -39181,7 +40647,7 @@ Kinstone:
 
 # HIPER (hiper-power.com)
 HIPER:
-  regex: 'HIPER[ -](?:MEDIA|[MS]-Pad)|(?:U(?:43|50|65)YQ2200GR|H32YQ2200GR)(?:[);/ ]|$)'
+  regex: 'HIPER[ -](?:MEDIA|[MS]-Pad)|(?:U(?:43|50|65)YQ2200GR|H32YQ2200GR|MEDIA TV M5)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'HIPER[ -]([SM])-Pad'
@@ -39189,14 +40655,14 @@ HIPER:
       model: '$1-Pad'
     - regex: 'MEDIA STICK 4K'
       model: 'Media Stick 4K'
-    - regex: 'MEDIA TV (i4 Pro|i4|[46]K)'
+    - regex: 'MEDIA TV (i4 Pro|i4|[46]K|M5)'
       model: 'Media TV $1'
     - regex: '(U(?:43|50|65)YQ2200GR|H32YQ2200GR)'
       model: '$1'
 
 # TopDevice (https://topdevice.ru/)
 TopDevice:
-  regex: 'TopDevice|TDTV\d{2}[BC]S\d{2}[FHU]|TDT45(?:18|41)_4G|TDT3778_Wi_E|TDT4528_4G_E'
+  regex: 'TopDevice|TDTV\d{2}[BC]S\d{2}[FHU]|TDT45(?:18|41)_4G|TDT3778_Wi_E|TDT3887_Wi_D|TDT4528_4G_E'
   device: 'tv'
   models:
     - regex: '(?:TopDevice_)?(TDTV\d{2}[BC]S\d{2}[FHU])'
@@ -39210,6 +40676,9 @@ TopDevice:
     - regex: 'TDT3778_Wi_E'
       device: 'tablet'
       model: 'K8'
+    - regex: 'TDT3887_Wi_D'
+      device: 'tablet'
+      model: 'K7'
     - regex: 'TDT4528_4G_E'
       device: 'tablet'
       model: 'C8'
@@ -39234,9 +40703,9 @@ ANXONIT:
   device: 'tablet'
   model: '$1'
 
-# Vityaz or vityas
+# Vityaz or vityas (www.vityaz.com)
 Vityaz:
-  regex: '(24LH1207|43L[FU]1204|50LU1204)(?:[);/ ]|$)'
+  regex: '(24LH1207|43L[FU]1204|50LU1204|43LF1212)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -39347,10 +40816,10 @@ Zoom:
 
 # Linsay (linsaydigital.com)
 Linsay:
-  regex: 'LINSAY[_ ]|(?:F10XIPSQ)(?:[);/ ]|$)'
+  regex: 'LINSAY[_ ]|(?:F10XIPSQ|F10XIPG)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(F10XIPSQ)(?:[);/ ]|$)'
+    - regex: '(F10XIPSQ|F10XIPG)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'LINSAY[_ ]([^/;)]+)(?: Build|[);])'
       model: '$1'
@@ -39393,7 +40862,7 @@ Zigo:
 
 # AEEZO
 AEEZO:
-  regex: '(TK701)_EEA(?:[);/ ]|$)'
+  regex: '(TK701|TK806)_EEA(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -39429,6 +40898,14 @@ SkyStream:
     - regex: 'SKYSTREAM[_ ]One'
       model: 'One'
 
+# Skytech (https://skytech.com.tr/)
+Skytech:
+  regex: 'LGE; ST-[0-9a-z]+;'
+  device: 'tv'
+  models:
+    - regex: 'LGE; (ST-[0-9a-z]+);'
+      model: '$1'
+
 # Supraim
 Supraim:
   regex: '(SN10)(?:[);/ ]|$)'
@@ -39443,13 +40920,16 @@ Bolva:
 
 # DIJITSU (http://dijitsu.com.tr/)
 DIJITSU:
-  regex: 'DIJITSU_|(?:DCT 90)(?:[);/ ]|$)'
+  regex: 'DIJITSU_|LGE; [0-9]{2}DW[0-9]\d*;|(?:DCT 90)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'DCT 90'
       model: 'DCT 90'
     - regex: 'DIJITSU[_ ]Smart[_ ]A11s'
       model: 'Smart A11s'
+    - regex: 'LGE; ([0-9]{2}DW\d*);'
+      model: '$1'
+      device: 'tv'
 
 # Hathway
 Hathway:
@@ -39613,12 +41093,12 @@ MultiPOS:
 
 # BAFF
 BAFF:
-  regex: 'BAFF\d{2}'
+  regex: 'BAFF\d{2}|(?:32YSTV-R)(?:[);/ ]|$)'
   device: 'tv'
   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
@@ -39643,7 +41123,7 @@ FOSSiBOT:
     - regex: 'DT1 Lite'
       device: 'tablet'
       model: 'DT1 Lite'
-    - regex: ' (DT[12])(?:[);/ ]|$)'
+    - regex: '(DT[12])(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
@@ -39668,7 +41148,7 @@ Nanho:
 
 # Vekta (myvekta.ru)
 Vekta:
-  regex: '(LD-65SU8815BS|LD-32SR4850BS|LD-50SU8921BS|LD-32SR5112BS|LD-43SF4850BS)(?:[);/ ]|$)'
+  regex: '(LD-24SR(?:4715|4815|4850)BS|LD-65SU8815BS|LD-32SR(?:4850|4815|511[25])BS|LD-39SR4815BS|LD-50SU(?:8921|8815)BS|LD-55SU8815BS|LD-43SU8821BS|LD-43SF(?:4850|4815)BS(?:-T9)?)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -39688,9 +41168,13 @@ SobieTech:
 
 # Lime
 Lime:
-  regex: 'LimeZ2PLUS'
+  regex: 'Lime(?:Z2PLUS|T95)'
   device: 'tv'
-  model: 'Z2 Plus'
+  models:
+    - regex: 'LimeZ2PLUS'
+      model: 'Z2 Plus'
+    - regex: 'Lime(T95)'
+      model: '$1'
 
 # VETAS
 VETAS:
@@ -39724,13 +41208,13 @@ Epic:
 
 # AMCV
 AMCV:
-  regex: '(LE-3[29]ZTHS25|LE-50ZTUS30)(?:[);/ ]|$)'
+  regex: '(LE-3[29]ZTHS25|LE-5[05]ZTUS30|LE-50ZTUS32|LE-43ZTFS25)(?:-[ABF])?(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Sber (sberdevices.ru)
 Sber:
-  regex: '(SberBox|SaluteTV)(?:[);/ ]|$)'
+  regex: '(SberBox|SaluteTV|SBDV-00006)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -39784,9 +41268,11 @@ CKK Mobile:
 
 # SPURT
 SPURT:
-  regex: '(?: K700)(?:[);/ ]|$)'
+  regex: 'Spurt[_ ]|(?: K700)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'K700'
+  models:
+    - regex: '(?:Spurt[_ ])?K([78]00)'
+      model: 'K$1'
 
 # Z-Kai
 Z-Kai:
@@ -39800,12 +41286,12 @@ Arçelik:
   device: 'tv'
   model: ''
 
-# TwinMOS
+# TwinMOS (https://www.twinmos.com/)
 TwinMOS:
-  regex: 'TwinTAB|(?:MQ703G)_1(?:[);/ ]|$)'
+  regex: 'TwinTAB|(?:MQ703G)(?:_1)?(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(MQ703G)_1'
+    - regex: '(MQ703G)(?:_1)?'
       model: '$1'
     - regex: 'TwinTAB-(T103GQ1)'
       model: '$1'
@@ -39818,13 +41304,15 @@ Getnord:
 
 # FreeYond (www.freeyond.com)
 FreeYond:
-  regex: '(?:2305003M|2306004M|2308005M)(?:[);/ ]|$)'
+  regex: '(?:2305003M|2306004M|23080(?:05M|11M))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '2305003M'
       model: 'M5A'
     - regex: '2308005M'
       model: 'M6'
+    - regex: '2308011M'
+      model: 'M5'
     - regex: '2306004M'
       model: 'F9S'
 
@@ -39846,7 +41334,7 @@ N-one:
 
 # Maunfeld (www.maunfeld.ru)
 Maunfeld:
-  regex: '(MLT43USD02|MLT32HSX02|MLT55USX02)(?:[);/ ]|$)'
+  regex: '(MLT43USD02G?|MLT32HSX02|MLT55USX02)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -39864,7 +41352,7 @@ SAILF:
 
 # Hisense (https://www.hisense-usa.com/)
 Hisense:
-  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*|HNR55[01]T|E270BSA|HWCD100E|HITV300C|HITV205N|M470BS[AE]|EG98|E2281|EG680|I46D1G|HAT4KDTV|HITV10[12]C|HLTE([237]00T|229T|200M|203T|202N|21[023567][TM]|22[67]T|22[13]E|230E|103E|310[TM]|31[16]T|500T|501N|510[TM]|7[23]0T|M800)|KS(?:907|964)|U972|U601S Pro|U972_Pro|HNR320T|HiSmart [24]K ATV4|HiSmartTV A4|HLTE556N'
+  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*|HNR(?:320T|55[01]T)|E270BSA|HWCD100E|HITV300C|HITV205N|M470BS[AE]|EG98|E2281|EG680|I46D1G|HAT4KDTV|HITV10[12]C|HLTE(?:[237]00T|229T|200M|203T|202N|21[023567][TM]|22[67]T|22[13]E|230E|239E|103E|310[TM]|31[16]T|500T|501N|510[TM]|556N|7[23]0T|720E|M800)|KS(?:907|964)|U972|U601S Pro|U972_Pro|HiSmart [24]K ATV4|HiSmartTV A4'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -39894,7 +41382,7 @@ Hisense:
       model: 'A9'
     - regex: 'M50 Lite 2021'
       model: 'M50 Lite (2021)'
-    - regex: 'E50s \d+GB'
+    - regex: 'E50s \d+GB|HLTE239E'
       model: 'E50s'
     - regex: 'Infinity E MAX'
       model: 'Infinity E Max'
@@ -39906,6 +41394,8 @@ Hisense:
       model: 'V3'
     - regex: 'HLTE223E'
       model: 'H30'
+    - regex: 'HLTE720E'
+      model: 'U30'
     - regex: 'I46D1G'
       model: 'Smartfren Andromax R'
     - regex: 'EG680'
@@ -40042,9 +41532,9 @@ XGEM:
 
 # MeMobile
 MeMobile:
-  regex: '(?:Grace 9)(?:[);/ ]|$)'
+  regex: 'Grace (9|10)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'Grace 9'
+  model: 'Grace $1'
 
 # WeChip
 WeChip:
@@ -40132,11 +41622,13 @@ CCIT:
 
 # Green Lion or GreenLion
 Green Lion:
-  regex: 'G-10 ULTRA'
+  regex: 'G-10 (?:ULTRA|PRO)|G-20ULTRA|G-8 PRO'
   device: 'tablet'
   models:
-    - regex: 'G-10 ULTRA'
-      model: 'G-10 Ultra'
+    - regex: 'G-([12]0) ?ULTRA'
+      model: 'G-$1 Ultra'
+    - regex: 'G-(8|10) PRO'
+      model: 'G-$1 Pro'
 
 # VANWIN
 VANWIN:
@@ -40150,9 +41642,15 @@ Globmall:
   device: 'tv'
   model: '$1'
 
+# GlocalMe (https://www.glocalme.com/)
+GlocalMe:
+  regex: 'S20iQ19(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'S20i'
+
 # Heimat
 Heimat:
-  regex: 'HEIMAT[ _](H43PU2303SVF)(?:[);/ ]|$)'
+  regex: 'HEIMAT[ _](H43PU2303SVF|H65PU2303SVF)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -40162,6 +41660,12 @@ AngelTech:
   device: 'tablet'
   model: 'P80'
 
+# MAGCH (www.magchtab.com)
+MAGCH:
+  regex: '(M82[01])(?:-EEA)?(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # MAG
 MAG:
   regex: '(CRD55-UHD9)(?: Build|[);])'
@@ -40175,11 +41679,11 @@ S-Color:
   model: '$1'
 
 # W&O
-'W&O':
+W&O:
   regex: '(?:X9 CALL2| WO [89])(?: Build|[);])'
   device: 'wearable'
   models:
-    - regex: ' WO ([89])'
+    - regex: 'WO ([89])'
       device: 'tablet'
       model: 'WO$1'
     - regex: 'X9 CALL2'
@@ -40193,11 +41697,15 @@ Cuiud:
     - regex: 'Cuiud F7'
       model: 'F7'
 
-# Cidea or C idea (http://cidealife.com/)
+# Cidea or C idea (http://cidealife.com/ or https://www.cideatablet.com/)
 C Idea:
-  regex: '(?:CM7800plus)(?:[);/ ]|$)'
+  regex: 'CM(?:[58]22|(?:85|78)00plus)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'CM7800 Plus'
+  models:
+    - regex: '(CM[58]22)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'CM(85|78)00plus(?:[);/ ]|$)'
+      model: 'CM$100 Plus'
 
 # Daria
 Daria:
@@ -40255,15 +41763,24 @@ Lville:
 
 # KENSHI
 KENSHI:
-  regex: '(?:Android 13(?:[\d.]*);(?: [\w-]+;)? (?:E1[1278]|E28|E38|H38|H21|H19|H11)|Armor_C1w)(?:[);/ ]|$)'
+  regex: '(?:Android 13(?:[\d.]*);(?: [\w-]+;)? (?:E1[1278]|E28|E38|H38|H21|H19|H11)|Armor_C1w|Armor P1s)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Armor_C1w'
       device: 'smartphone'
       model: 'Armor C1w'
+    - regex: 'Armor P1s'
+      device: 'smartphone'
+      model: 'Armor P1s'
     - regex: 'Android 13(?:[\d.]*);(?: [\w-]+;)? (E1[1278]|E28|E38|H38|H21|H19|H11)(?:[);/ ]|$)'
       model: '$1'
 
+# KENWOOD (https://www.kenwoodworld.com/)
+KENWOOD:
+  regex: '(KWSA80K)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # HOLLEBERG (holleberg.com)
 HOLLEBERG:
   regex: 'HGTV-LED(\d{2}[FU]?HDSQ?\d{3}T2)(?:[);/ ]|$)'
@@ -40272,21 +41789,21 @@ HOLLEBERG:
 
 # CEPTER (ceptertech.com)
 CEPTER:
- regex: 'CEPTER(TAB10L)'
- device: 'tablet'
- model: '$1'
+  regex: 'CEPTER(TAB10[1L])'
+  device: 'tablet'
+  model: '$1'
 
 # SoulLink
 SoulLink:
- regex: 'Soullink[ _](S1)'
- device: 'tv'
- model: '$1'
+  regex: 'Soullink[ _](S1)'
+  device: 'tv'
+  model: '$1'
 
 # Clovertek or Clover
 Clovertek:
- regex: 'Clovertek[ _](G12)'
- device: 'tablet'
- model: '$1'
+  regex: 'Clovertek[ _](G12)'
+  device: 'tablet'
+  model: '$1'
 
 # Padpro
 Padpro:
@@ -40304,7 +41821,7 @@ GOLDBERG:
 
 # Tuvio
 Tuvio:
-  regex: '(TQ55UFBTV1|TD32HF[GW]EV1|TD43FFGTV1|TD43UFGCV1|TD50UFGEV1|TD55UFGEV1|TD65UFGCV1|TD75UFGCV1)(?:[);/ ]|$)'
+  regex: '(STV-32DHBK2R-T9|TQ55UFBTV1|TD86UFBTV1|TQ50UFBCV1|TD32HF[GW]EV1|TD43FFGTV1|TD50UFGEV1|TD55UFBHV1|TD55UFGEV1|TD(?:[67]5|43)UFGCV1)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -40334,6 +41851,12 @@ Azeyou:
   device: 'tablet'
   model: '$1'
 
+# Azupik
+Azupik:
+  regex: 'Azupik'
+  device: 'tablet'
+  model: ''
+
 # ExtraLink
 ExtraLink:
   regex: 'ESP-300(?:[);/ ]|$)'
@@ -40354,9 +41877,27 @@ Arival:
 
 # VILLAON
 VILLAON:
-  regex: 'VILLAON[_ ]([^;/)]+)(?: Build|[);])'
+  regex: 'VILLAON[_ ]'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'V6751L'
+      model: 'V30 RS'
+    - regex: 'V501W'
+      model: 'V20 SE'
+    - regex: 'VILLAON[_ ]([^;/)]+)(?: Build|[);])'
+      model: '$1'
+
+# VIMOQ
+VIMOQ:
+  regex: 'VIMOQ'
+  device: 'smartphone'
+  models:
+    - regex: 'A631LO(?:[);/ ]|$)'
+      model: 'A49 Play'
+    - regex: 'P662LO(?:[);/ ]|$)'
+      model: 'P40'
+    - regex: 'S661LS(?:[);/ ]|$)'
+      model: 'Vision 3'
 
 # Neoregent
 Neoregent:
@@ -40364,17 +41905,355 @@ Neoregent:
   device: 'tablet'
   model: 'KT1007'
 
+# Retroid Pocket (www.goretroid.com)
+Retroid Pocket:
+  regex: 'Retroid Pocket'
+  device: 'console'
+  models:
+    - regex: 'Retroid Pocket ([32]) ?(?:Plus|\+)'
+      model: '$1 Plus'
+    - regex: 'Retroid Pocket 4 Pro'
+      model: '4 Pro'
+
 # Renova (renova.market)
 Renova:
-  regex: '(TLE-50USBM)(?:[);/ ]|$)'
+  regex: '(TLE-50USBM|TLE-43FSBM)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# GoldStar
+GoldStar:
+  regex: '(LT-55U900)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# ANBERNIC (anbernic.com/)
+ANBERNIC:
+  regex: '(RG405V|RG505)(?:[);/ ]|$)'
+  device: 'console'
+  model: '$1'
+
+# ANCEL (https://www.ancel.com/)
+ANCEL:
+  regex: 'ANCEL'
+  device: 'tablet'
+  models:
+    - regex: 'Ancel(801)(?:[);/ ]|$)'
+      model: '$1'
+
+# Aocwei
+Aocwei:
+  regex: '(?:X900_US|X700_EEA)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'X([79]00)_(?:EEA|US)'
+      model: 'X$1'
+
+# SMUX or SMUXBOX
+SMUX:
+  regex: 'SMUX ?BOX A1(?:[);/ ]|$)'
+  device: 'tv'
+  model: 'A1'
+
+# AAUW (aauwtablet.com)
+AAUW:
+  regex: 'Android 13(?:[\d.]*);(?: [\w-]+;)? (?:M50)( Build|[;)])'
+  device: 'tablet'
+  model: 'M50'
+
+# Rocket Tablet Computer
+Rocket:
+  regex: '(ZC-P95)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# TYD or JXCNSNW
+TYD:
+  regex: '(TYD-109([_ ]Pro)?)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# HMD (hmd.com)
+HMD:
+  regex: 'HMD (?:Pulse (?:Pro|Plus)|Pulse)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'Pulse Plus'
+      model: 'Pulse+'
+    - regex: 'Pulse Pro'
+      model: 'Pulse Pro'
+    - regex: 'Pulse'
+      model: 'Pulse'
+
+# NETWIT (netwit.ru)
+NETWIT:
+  regex: 'NETWIT_([^;/)]+)( Build|[;)])'
+  device: 'tv'
+  model: '$1'
+
+# HongTop
+HongTop:
+  regex: 'HongTop'
+  device: 'tv'
+  models:
+    - regex: 'HongTop_Projector'
+      device: 'peripheral'
+      model: 'Projector'
+
+# OrangePi (orangepi.org)
+Orange Pi:
+  regex: 'OrangePi[_ ]?([^;/)]+)( Build|[;)])'
+  device: 'peripheral'
+  model: '$1'
+
+# VIKUSHA (vikushalife.com)
+VIKUSHA:
+  regex: '(V-Z[45]0)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Atozee
+Atozee:
+  regex: '(?:(?:CP20|YQ10S)_(?:MAX|Gold)|AT81K|CP10)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'CP20_Gold'
+      model: 'CP20 Gold'
+    - regex: 'YQ10S_MAX'
+      model: 'YQ10S Max'
+    - regex: 'YQ10S_Gold'
+      model: 'YQ10S Gold'
+    - regex: '(AT81K|CP10)'
+      model: '$1'
+
+# Relndoo
+Relndoo:
+  regex: ' (TB02)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Scoole
+Scoole:
+  regex: '(SL-LED24S90T2S|SL-LED32S49T2S|SL-LED43S98T2SU|SL-LED43S94T2S|SL-LED55S01T2SU)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
+# rephone (rephone.ch)
+rephone:
+  regex: '(?:2000_000170_00)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: '2000_000170_00'
+      model: rephone (Gen 1)
+
+# BYJU'S (https://byjus.com/)
+BYJU'S:
+  regex: 'LRNS10GIL0(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(LRNS10GIL0)'
+      model: '$1'
+
+# BYYBUO (byybuo.com)
+BYYBUO:
+  regex: 'BYYBUO|(?:SmartPad_(?:K7|T10)_EU|SmartPad_T10)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(?:BYYBUO_)?SmartPad_(K7|T10)(?:_EU)?'
+      model: 'SmartPad $1'
+
+# Haixu
+Haixu:
+  regex: 'Haixu[_ ]?([^;/)]+)( Build|[;)])'
+  device: 'smartphone'
+  model: '$1'
+
+# HONKUAHG
+HONKUAHG:
+  regex: ' (EV10)( Build|[;)])'
+  device: 'tablet'
+  model: '$1'
+
+# SWOFY (swofy.com.cn)
+SWOFY:
+  regex: 'SWOFY[_ ]'
+  device: 'portable media player'
+  models:
+    - regex: 'SWOFY[_ ]M503-Pro'
+      model: 'M503 Pro'
+
+# Moondrop (moondroplab.com)
+Moondrop:
+  regex: 'MD-PH-001(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'MIAD01'
+
+# Vision Technology (vision-ma.com)
+Vision Technology:
+  regex: 'LGE; VS-[0-9a-z]+;|XS100MINI(?:[);/ ]|$)'
+  device: 'tv'
+  models:
+    - regex: 'XS100MINI(?:[);/ ]|$)'
+      model: 'XS100 Mini'
+    - regex: 'LGE; (VS-[0-9a-z]+);'
+      model: '$1'
+
+# WOZIFAN (Ruzava/WOZIFAN)
+WOZIFAN:
+  regex: 'W10_EEA(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'W10'
+
+# Newal (newal.com.tr)
+Newal:
+  regex: 'NEWAL[_ ]?([^;/)]+)( Build|[;)])'
+  device: 'tv'
+  model: '$1'
+
+# Hanson
+Hanson:
+  regex: 'Hanson[_ ]?([^;/)]+)( Build|[;)])'
+  device: 'tablet'
+  model: '$1'
+
+# Tivax (tivax.com)
+Tivax:
+  regex: '(MiTraveler 958)'
+  device: 'tablet'
+  model: '$1'
+
+# Nordfrost (nordfrost.ru)
+Nordfrost:
+  regex: '(Y-(?:4301|4001)-FHD-R)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# Ringing Bells
+Ringing Bells:
+  regex: 'RINGING BELLS'
+  device: 'smartphone'
+  models:
+    - regex: 'Smart 101'
+      model: 'Smart 101 4G'
+
+# Atouch
+Atouch:
+  regex: '(?:S-Tab10?|M-T[34])(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(M-T[34])'
+      model: '$1'
+    - regex: 'S-Tab(10?)'
+      model: 'S-Tab$1'
+
+# Metz or METZ blue (https://metz-ce.de, https://metzblue.com)
+Metz:
+  regex: 'METZ 2K TV'
+  device: 'tv'
+  model: '2K Smart TV'
+
+# EGOTEK
+EGOTEK:
+  regex: '(EGO1003)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# ZZB or ZZB (cn)
+ZZB:
+  regex: '(ZB30)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Dykemann (https://dykemann.ru/)
+Dykemann:
+  regex: 'Sternenschein (G-\d{2})(?:[);/ ]|$)' # projector
+  device: 'tv'
+  model: 'Sternenschein $1'
+
+# BYD or BYD Auto (https://www.byd.com/)
+BYD:
+  regex: 'For BYD AUTO'
+  device: 'car browser'
+  model: 'CarPad'
+
+# ROCH
+ROCH:
+  regex: '(RH-LE\d{2}DSY-C)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# DMOAO
+DMOAO:
+  regex: '(?:D3_EEA)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(D3)_EEA(?:[);/ ]|$)'
+      model: '$1'
+
+# Hyatta (hyatta.cn)
+Hyatta:
+  regex: 'Model[ _](5|6s)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'Model $1'
+
+# PVBox
+PVBox:
+  regex: 'PVBOX_P5_PRO'
+  device: 'tv'
+  model: 'P5 Pro'
+
+# XREAL (xreal.com)
+XREAL:
+  regex: '(?:X4000)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'X4000'
+      model: 'Beam Pro'
+
+# SENNA
+SENNA:
+  regex: '(32SN6000H)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# ATMPC
+ATMPC:
+  regex: '(IT)_(701A)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1-$2'
+
+# Jambo or Jambo Technology (www.jambo.technology, jambophone.xyz)
+Jambo:
+  regex: ' (?:JP1)( Build|[;)])'
+  device: 'smartphone'
+  model: 'JamboPhone'
+
+# LYOTECH LABS
+LYOTECH LABS:
+  regex: 'LFi ONE(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'LFi One'
+
+# MESWAO (https://meswao.com/)
+MESWAO:
+  regex: '(MES-B1)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# SERVO
+SERVO:
+  regex: '(?:SERVO 16MAX)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '16 Max'
+
 # 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)(?:[);/ ]|$)'
+  regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro| BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|SDSTB|SDOTT|(?: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|WayDroid x86_64 Device|MediaBox|Cloud Phone|HK1RBOX-X4)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'LGE; ([a-z0-9]+);'
+      device: 'tv'
+      model: '$1'
     - regex: 'WebTV/(\d+\.\d+)'
       device: 'tv'
       model: 'Web TV'
@@ -40384,7 +42263,7 @@ Unknown:
     - regex: '(FO-R15|X98_S500|8K3528-T|MX10|V88|H8S|X92|AI PONT)(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
-    - regex: ' BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|(Smart[ _-]?TV|SmartATV|PCBox|hx322x_box|rk(?:3128|322x|3368)(?:[_-]box)?|TVBOX|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|AT&T TV|RealtekATV|TV Bro|AOSP on r33a0|tv001 on rtd289x|tv.plus)(?:[);/ ]|$)'
+    - regex: 'BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|SDSTB|SDOTT|(Smart[ _-]?TV|SmartATV|PCBox|hx322x_box|rk(?:3128|322x|3368)(?:[_-]box)?|TVBOX|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|AT&T TV|RealtekATV|TV Bro|AOSP on r33a0|tv001 on rtd289x|tv.plus|MediaBox|HK1RBOX-X4)(?:[);/ ]|$)'
       device: 'tv'
       model: ''
     - regex: 'M8S\+ 4K(?:[);/ ]|$)'
@@ -40401,3 +42280,6 @@ Unknown:
     - regex: '(?:audi_)?ks1280x480'
       device: 'car browser'
       model: 'Audi KS'
+    - regex: 'WayDroid x86_64 Device' # linux container virtual
+      device: 'desktop'
+      model: ''
diff --git a/includes/libraries/udd/regexes/device/notebooks.yml b/includes/libraries/udd/regexes/device/notebooks.yml
index 849b4ed..05e1991 100644
--- a/includes/libraries/udd/regexes/device/notebooks.yml
+++ b/includes/libraries/udd/regexes/device/notebooks.yml
@@ -39,6 +39,19 @@ Asus:
     - regex: 'FBMD/X556UQK;'
       model: 'X556UQK'
 
+Alienware:
+  regex: 'FBMD/(?:Alienware [0-9]{2,3}R[0-9]{1,2}|Area-51m|R3|R4|Alienware Aurora R[0-9]+(:? [0-9]+)?);'
+  device: 'desktop'
+  models:
+    - regex: 'Alienware 15R3;'
+      model: 'Alienware 15 R3'
+    - regex: 'Alienware 17R4;'
+      model: 'Alienware 17 R4'
+    - regex: 'Area-51m;'
+      model: 'Area-51m'
+    - regex: 'Aurora (R[0-9]+)'
+      model: 'Aurora $1'
+
 Dell:
   regex: 'FBMD/(?:Latitude E4300|Inspiron 3541|XPS 15 95[35]0);'
   device: 'desktop'
diff --git a/includes/libraries/udd/regexes/device/portable_media_player.yml b/includes/libraries/udd/regexes/device/portable_media_player.yml
index 20fcdd4..f120a69 100644
--- a/includes/libraries/udd/regexes/device/portable_media_player.yml
+++ b/includes/libraries/udd/regexes/device/portable_media_player.yml
@@ -116,3 +116,15 @@ KuGou:
   regex: 'KuGou[_ -](P5)'
   device: 'portable media player'
   model: '$1'
+
+# Surfans
+Surfans:
+  regex: '(Y57A)(?:[);/ ]|$)'
+  device: 'portable media player'
+  model: '$1'
+
+# Oilsky (oilsky.com.cn)
+Oilsky:
+  regex: 'Oilsky (M501)(?:[);/ ]|$)'
+  device: 'portable media player'
+  model: '$1'
diff --git a/includes/libraries/udd/regexes/device/televisions.yml b/includes/libraries/udd/regexes/device/televisions.yml
index 7c51e58..bf8f652 100644
--- a/includes/libraries/udd/regexes/device/televisions.yml
+++ b/includes/libraries/udd/regexes/device/televisions.yml
@@ -748,7 +748,7 @@ Nordmende:
   device: 'tv'
   model: ''
 
-# Metz
+# Metz or METZ blue (https://metz-ce.de, https://metzblue.com)
 Metz:
   regex: 'Metz'
   device: 'tv'
diff --git a/includes/libraries/udd/regexes/oss.yml b/includes/libraries/udd/regexes/oss.yml
index fd9361c..611e380 100644
--- a/includes/libraries/udd/regexes/oss.yml
+++ b/includes/libraries/udd/regexes/oss.yml
@@ -5,6 +5,152 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# Puffin OS (https://www.puffin.com/os/help/faq/)
+##########
+- regex: 'Cloud Phone'
+  name: 'Puffin OS'
+  version: ''
+
+##########
+# risingOS (https://github.com/RisingTechOSS/android)
+##########
+- regex: 'RisingOS'
+  name: 'risingOS'
+  version: ''
+
+##########
+# Azure Linux (https://github.com/microsoft/azurelinux)
+##########
+- regex: 'Linux/.+-Microsoft'
+  name: 'Azure Linux'
+  version: ''
+
+# ViziOS
+##########
+- regex: 'ViziOS/(\d+[\.\d]+)'
+  name: 'ViziOS'
+  version: '$1'
+
+##########
+# blackPanther OS (https://blackpantheros.eu/)
+##########
+- regex: 'blackPanther OS'
+  name: 'blackPanther OS'
+  version: ''
+
+##########
+# WoPhone
+##########
+- regex: 'WoPhone(?:/(\d+[\.\d]+))?'
+  name: 'WoPhone'
+  version: '$1'
+
+##########
+# KIN OS (https://en.wikipedia.org/wiki/Microsoft_Kin)
+##########
+- regex: 'KIN\.(?:One|Two) (\d+[\.\d]+)'
+  name: 'KIN OS'
+  version: '$1'
+
+##########
+# Star-Blade OS
+##########
+- regex: 'Star-Blade OS'
+  name: 'Star-Blade OS'
+  version: ''
+
+##########
+# Qtopia (https://en.wikipedia.org/wiki/Qt_Extended)
+##########
+- regex: 'Qtopia/(\d+[\.\d]+)'
+  name: 'Qtopia'
+  version: '$1'
+
+##########
+# OpenVMS (https://vmssoftware.com/)
+##########
+- regex: 'OpenVMS V(\d+[\.\d]+)'
+  name: 'OpenVMS'
+  version: '$1'
+
+##########
+# AROS (https://aros.sourceforge.io/)
+##########
+- regex: 'AROS'
+  name: 'AROS'
+  version: ''
+
+##########
+# NeXTSTEP
+##########
+- regex: '\(NEXT\)'
+  name: 'NeXTSTEP'
+  version: ''
+
+##########
+# NEWS-OS (https://en.wikipedia.org/wiki/Sony_NEWS)
+##########
+- regex: 'NEWS-OS (\d+[\.\d]+)'
+  name: 'NEWS-OS'
+  version: '$1'
+
+##########
+# ULTRIX (https://en.wikipedia.org/wiki/Ultrix)
+##########
+- regex: 'ULTRIX (\d+[\.\d]+)'
+  name: 'ULTRIX'
+  version: '$1'
+
+##########
+# Turbolinux (http://www.turbolinux.com/)
+##########
+- regex: 'Turbolinux/(\d+[\.\d]+)'
+  name: 'Turbolinux'
+  version: '$1'
+
+##########
+# Joli OS (https://www.jolicloud.com/products/)
+##########
+- regex: 'Joli OS/(\d+[\.\d]+)'
+  name: 'Joli OS'
+  version: '$1'
+
+##########
+# GENIX
+##########
+- regex: 'GENIX (\d+[\.\d]+)'
+  name: 'GENIX'
+  version: '$1'
+
+##########
+# gNewSense (http://www.gnewsense.org)
+##########
+- regex: 'gNewSense/.*\((\d+[\.\d]+)'
+  name: 'gNewSense'
+  version: '$1'
+
+##########
+# GEOS
+##########
+- regex: 'Geos (\d+[\.\d]+)'
+  name: 'GEOS'
+  version: '$1'
+
+##########
+# Motorola EZX
+##########
+- regex: 'MOT-.*LinuxOS/'
+  name: 'Motorola EZX'
+  version: ''
+
+##########
+# Baidu Yi (https://en.wikipedia.org/wiki/Baidu_Yi)
+##########
+- regex: 'Baidu Yi'
+  name: 'Baidu Yi'
+  version: ''
+
 ##########
 # Red Star (https://en.wikipedia.org/wiki/Red_Star_OS)
 ##########
@@ -236,10 +382,14 @@
 ##########
 # Amazon Linux (https://docs.aws.amazon.com/AL2/latest/relnotes/relnotes-al2.html)
 ##########
-- regex: '.+.amzn(\d)(?:int)?.x86_64'
+- regex: '.+.amzn(\d)(?:int)?.x86_64|Linux/.+aws'
   name: 'Amazon Linux'
   version: '$1'
 
+- regex: 'Linux/.+-c9$'
+  name: 'Amazon Linux'
+  version: '2023' # https://aws.amazon.com/about-aws/whats-new/2023/12/aws-cloud9-amazon-linux-2023/
+
 ##########
 # COS (China Operating System - https://web.archive.org/web/20170825001023/http://www.china-cos.com/)
 ##########
@@ -540,7 +690,7 @@
 ##########
 # ChromeOS
 ##########
-- regex: 'CrOS [a-z0-9_]+ (\d+[\.\d]+)|Chromebook'
+- regex: '(?:CrOS [a-z0-9_]+ |.*Build/R\d+-)(\d+[\.\d]+)|Chromebook'
   name: 'Chrome OS'
   version: '$1'
 
@@ -565,6 +715,8 @@
 - regex: '(?:Android API \d+|\d+/tclwebkit(?:\d+[\.\d]*)|(?:(?<!\d )Android/\d{2}|(?<!; |\d{4}/)Android (?!1[0-5])\d{2})(?![^ ]))'
   name: 'Android'
   versions:
+    - regex: '(?:Android API 35|35/tclwebkit|Android[ /]35)'
+      version: '15'
     - regex: '(?:Android API 34|34/tclwebkit|Android[ /]34)'
       version: '14'
     - regex: '(?:Android API 33|33/tclwebkit|Android[ /]33)'
@@ -621,7 +773,7 @@
   name: 'Android'
   version: ''
 
-- regex: '(?:Android OS|OMDroid|sdk_gphone64_arm64-userdebug)[ /](\d+[\.\d]*)'
+- regex: '(?:Android OS|OMDroid|sdk_gphone64_arm64-userdebug|StarOS)[ /](\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
 
@@ -699,7 +851,7 @@
 ##########
 # ThreadX
 ##########
-- regex: 'ThreadX(?:/(\d+[\.\d]*))?'
+- regex: 'ThreadX(?:_OS)?(?:/(\d+[\.\d]*))?'
   name: 'ThreadX'
   version: '$1'
 
@@ -1063,19 +1215,19 @@
 ##########
 # tvOS (https://developer.apple.com/tvos/)
 ##########
-- regex: 'Apple ?TV.*CPU (?:iPhone )?OS ((?:9|1[0-7])[_\.]\d+(?:[_.]\d+)*)'
+- regex: 'Apple ?TV.*CPU (?:iPhone )?OS ((?:9|1[0-8])[_\.]\d+(?:[_.]\d+)*)'
   name: 'tvOS'
   version: '$1'
 
-- regex: 'Apple TV; iOS ((?:9|1[0-7])[_\.]\d+(?:[_.]\d+)*)'
+- regex: 'Apple TV; iOS ((?:9|1[0-8])[_\.]\d+(?:[_.]\d+)*)'
   name: 'tvOS'
   version: '$1'
 
-- regex: 'iOS(?:; |/)((?:9|1[0-7])\.\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
+- regex: 'iOS(?:; |/)((?:9|1[0-8])\.\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
   name: 'tvOS'
   version: '$1'
 
-- regex: 'tvOS[ /]?((?:9|1[0-7])\.\d+(?:[_\.]\d+)*);?'
+- regex: 'tvOS[ /]?((?:9|1[0-8])\.\d+(?:[_\.]\d+)*);?'
   name: 'tvOS'
   version: '$1'
 
@@ -1086,7 +1238,7 @@
 ##########
 # watchOS (https://developer.apple.com/watchos/)
 ##########
-- regex: '(?:Watch1,[12]/|Watch OS,|watchOS[ /])(\d+[\.\d]*)'
+- regex: '(?:Watch1,[12]/|Watch OS,|watchOS[ /]?)(\d+[\.\d]*)?'
   name: 'watchOS'
   version: '$1'
 - regex: 'Apple Watch(?!;)'
@@ -1096,27 +1248,31 @@
 ##########
 # iPadOS (https://www.apple.com/ipados/)
 ##########
-- regex: 'FBMD/iPad;.*FBSV/ ?(1[3-7]).(\d+[\.\d]*);'
+- regex: 'FBMD/iPad;.*FBSV/ ?(1[3-8]).(\d+[\.\d]*);'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPad(?:OS)?[ /](1[3-7])\.(\d+[\.\d]*)'
+- regex: 'iPad(?:OS)?[ /](1[3-8])\.(\d+[\.\d]*)'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: '^iPad(?:\d+[\,\d]*)/(1[3-7])\.(\d+[\.\d]*)'
+- regex: '^iPad(?:\d+[\,\d]*)/(1[3-8])\.(\d+[\.\d]*)'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPad(?:; (?:iOS|iPadOS|iPhone OS)|.+CPU (?:iPad |iPhone )?OS) ((1[3-7])+(?:[_\.]\d+)*)'
+- regex: 'iPad(?:; (?:iOS|iPadOS|iPhone OS)|.+CPU (?:iPad |iPhone )?OS) ((1[3-8])+(?:[_\.]\d+)*)'
   name: 'iPadOS'
   version: '$1'
 
-- regex: 'iOS/(1[3-7])\.(\d+[\.\d]*).+Apple/iPad'
+- regex: 'iOS/(1[3-8])\.(\d+[\.\d]*).+Apple/iPad'
+  name: 'iPadOS'
+  version: '$1.$2'
+
+- regex: 'iPhone OS,(1[3-8])\.(\d+[\.\d]*).+iPad'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPhone OS,(1[3-7])\.(\d+[\.\d]*).+iPad'
+- regex: 'iphoneos(1[3-8])\.(\d+[\.\d]*); iPad'
   name: 'iPadOS'
   version: '$1.$2'
 
@@ -1135,6 +1291,10 @@
   name: 'iOS'
   version: '$1'
 
+- regex: 'iphoneos(1[3-8])\.(\d+[\.\d]*); iPhone'
+  name: 'iOS'
+  version: '$1.$2'
+
 - regex: 'Pinterest for iOS/.*iPhone.*; (\d(?:[\d\.]*))[)]$'
   name: 'iOS'
   version: '$1'
@@ -1158,6 +1318,10 @@
 - regex: '^(?!com\.apple\.Safari\.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
+    - regex: 'Darwin/24\.1\.0'
+      version: '18.1'
+    - regex: 'Darwin/24\.0\.0'
+      version: '18.0'
     - regex: 'Darwin/23\.5\.0'
       version: '17.5'
     - regex: 'Darwin/23\.4\.0'
@@ -1309,7 +1473,7 @@
     - regex: 'CFNetwork/459'
       version: '3.1'
 
-- regex: '(?:iPhone|iPod_touch)/(\d+[\.\d]*) hw/'
+- regex: '(?:iPhone|iPod_touch)/(\d+[\.\d]*)(?: hw)?/'
   name: 'iOS'
   version: '$1'
 
@@ -1373,7 +1537,7 @@
   name: 'iOS'
   version: ''
 
-- regex: 'CaptiveNetworkSupport|AirPlay|.*[ \.\-/]iOS'
+- regex: 'CaptiveNetworkSupport|AirPlay|.*[ \.\-/]iOS(?!@)'
   name: 'iOS'
   version: ''
 
@@ -1383,6 +1547,10 @@
 - regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|C?Python.*Darwin|PowerMac|com\.apple\.Safari\.SearchHelper|^Safari'
   name: 'Mac'
   versions:
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.1\.0'
+      version: '15.1'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.0\.0'
+      version: '15.0'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.5\.0'
       version: '14.5'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.4\.0'
@@ -1813,7 +1981,7 @@
   name: 'GNU/Linux'
   version: '$1'
 
-- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu|X11'
+- regex: 'Linux[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu|X11'
   name: 'GNU/Linux'
   version: ''
 
diff --git a/init.php b/init.php
index 1d27b2c..dae21e6 100644
--- a/init.php
+++ b/init.php
@@ -12,7 +12,7 @@
 define( 'PODD_PRODUCT_SHORTNAME', 'Device Detector' );
 define( 'PODD_PRODUCT_ABBREVIATION', 'podd' );
 define( 'PODD_SLUG', 'device-detector' );
-define( 'PODD_VERSION', '4.1.0' );
+define( 'PODD_VERSION', '4.2.0' );
 define( 'PODD_API_VERSION', '3' );
 define( 'PODD_CODENAME', '"-"' );
 
diff --git a/readme.txt b/readme.txt
index 6398bd2..fdd5b4a 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: PierreLannoy, hosterra
 Tags: bot, detection, detector, device, mobile
 Requires at least: 6.2
 Requires PHP: 8.1
-Tested up to: 6.6
-Stable tag: 4.1.0
+Tested up to: 6.7
+Stable tag: 4.2.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html