diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb370101e..34109d215 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - Fixed [long URLs display](https://github.com/plausible/analytics/issues/3158) in Outbound Link breakdown view
 - Fixed [Sentry reports](https://github.com/plausible/analytics/discussions/3166) for ingestion requests plausible/analytics#3182
 - Fix breakdown pagination bug in the dashboard details view when filtering by goals
+- Update bot detection (matomo 6.1.4, ua_inspector 3.4.0)
 
 ## v2.0.0 - 2023-07-12
 
diff --git a/config/config.exs b/config/config.exs
index f226f62eb..0ca8e5977 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -22,7 +22,8 @@ config :logger, :console,
 config :phoenix, :json_library, Jason
 
 config :ua_inspector,
-  database_path: "priv/ua_inspector"
+  database_path: "priv/ua_inspector",
+  remote_release: "66d80de32fbb265941f4d7941fadc19097375097"
 
 config :ref_inspector,
   database_path: "priv/ref_inspector"
diff --git a/mix.lock b/mix.lock
index fe0c9895b..6634da11c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -135,7 +135,7 @@
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "tls_certificate_check": {:hex, :tls_certificate_check, "1.15.0", "1c0377617a1111000bca3f4cd530b62690c9bd2dc9b868b4459203cd4d7f16ab", [:rebar3], [{:ssl_verify_fun, "1.1.6", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "87fd2e865078fdf8913a8c27bd8fe2be986383e31011f21d7f92cc5f7bc90731"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
-  "ua_inspector": {:hex, :ua_inspector, "3.2.1", "16e249f276cbf19c9137dccf485f73a49119a5cc7d4f240a143fdb3191608c34", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:yamerl, "~> 0.7", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm", "f3bce513b2452a2891fce08f7e2ab74875ccdd7c920ff52e61862b0481e248f9"},
+  "ua_inspector": {:hex, :ua_inspector, "3.4.0", "9410b51f9aeda5074da3f4f32553f3bc20b6463869a3822db1ee08aa6d0afbb9", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:yamerl, "~> 0.7", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm", "4fb3d9283621935a6f5158c12e30ce7ac18e004f6f11e05f5e3ae9ef8beb7022"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "unsafe": {:hex, :unsafe, "1.0.1", "a27e1874f72ee49312e0a9ec2e0b27924214a05e3ddac90e91727bc76f8613d8", [:mix], [], "hexpm", "6c7729a2d214806450d29766abc2afaa7a2cbecf415be64f36a6691afebb50e5"},
   "websock": {:hex, :websock, "0.5.2", "b3c08511d8d79ed2c2f589ff430bd1fe799bb389686dafce86d28801783d8351", [:mix], [], "hexpm", "925f5de22fca6813dfa980fb62fd542ec43a2d1a1f83d2caec907483fe66ff05"},
diff --git a/priv/ua_inspector/bot.bots.yml b/priv/ua_inspector/bot.bots.yml
index c7746440f..33a0194fe 100644
--- a/priv/ua_inspector/bot.bots.yml
+++ b/priv/ua_inspector/bot.bots.yml
@@ -712,7 +712,15 @@
     name: 'Visual Meta'
     url: 'https://www.shopalike.cz/'
 
-- regex: 'AdsBot-Google|Adwords-(DisplayAds|Express|Instant)|Google Web Preview|Google[ -]Publisher[ -]Plugin|Google-(Ads-Conversions|Ads-Qualify|Adwords|AMPHTML|Assess|HotelAdsVerifier|Read-Aloud|Shopping-Quality|Site-Verification|speakr|Stale-Content-Probe|Test|Youtube-Links)|(APIs|DuplexWeb|Feedfetcher|Mediapartners)-Google|Googlebot|Google(?:AdSenseInfeed|AssociationService|Prober|Producer)|Google.*/\+/web/snippet'
+- regex: 'AdsBot-Google|Adwords-(DisplayAds|Express|Instant)|Google Web Preview|Google[ -]Publisher[ -]Plugin|Google-(Ads-Conversions|Ads-Qualify|Adwords|AMPHTML|Assess|HotelAdsVerifier|InspectionTool|Read-Aloud|Shopping-Quality|Site-Verification|speakr|Stale-Content-Probe|Test|Youtube-Links)|(APIs|DuplexWeb|Feedfetcher|Mediapartners)-Google|Googlebot|Google(?:AdSenseInfeed|AssociationService|Other|Prober|Producer)|Google.*/\+/web/snippet'
+  name: 'Googlebot'
+  category: 'Search bot'
+  url: 'http://www.google.com/bot.html'
+  producer:
+    name: 'Google Inc.'
+    url: 'http://www.google.com'
+
+- regex: '^Google$'
   name: 'Googlebot'
   category: 'Search bot'
   url: 'http://www.google.com/bot.html'
@@ -735,6 +743,11 @@
     name: 'HubSpot Inc.'
     url: 'https://www.hubspot.com'
 
+- regex: 'vuhuvBot'
+  name: 'Vuhuv Bot'
+  category: 'Crawler'
+  url: 'http://vuhuv.com/bot.html'
+
 - regex: 'HTTPMon'
   name: 'HTTPMon'
   category: 'Site Monitor'
@@ -1028,6 +1041,14 @@
 - regex: 'Octopus [0-9]'
   name: 'Octopus'
 
+- regex: 'OnlineOrNot.com_bot'
+  name: 'OnlineOrNot Bot'
+  category: 'Site Monitor'
+  url: 'https://onlineornot.com/website-monitoring'
+  producer:
+    name: 'OnlineOrNot'
+    url: 'https://onlineornot.com'
+
 - regex: 'omgili'
   name: 'Omgili bot'
   category: 'Search bot'
@@ -1749,7 +1770,15 @@
 - regex: 'Y!J-BRW'
   name: 'Yahoo! Japan BRW'
   category: 'Crawler'
-  url: 'https://www.yahoo-help.jp/app/answers/detail/p/595/a_id/42716/~/ウェブページにアクセスするシステムのユーザーエージェントについて'
+  url: 'https://support.yahoo-net.jp/PccSearch/s/article/H000007955'
+  producer:
+    name: 'Yahoo! Japan Corp.'
+    url: 'https://www.yahoo.co.jp/'
+
+- regex: 'Y!J-WSC'
+  name: 'Yahoo! Japan WSC'
+  category: 'Crawler'
+  url: 'https://support.yahoo-net.jp/PccSearch/s/article/H000007955'
   producer:
     name: 'Yahoo! Japan Corp.'
     url: 'https://www.yahoo.co.jp/'
@@ -1974,7 +2003,7 @@
 - regex: 'RSSRadio \(Push Notification Scanner;support@dorada\.co\.uk\)'
   name: 'RSSRadio Bot'
 
-- regex: '(A6-Indexer|nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr.com|tweetedtimes.com|TrendsmapResolver|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex(?!(?: Build|Plus))|zeal(?!ot)|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|RackspaceBot|robots|SeopultContentAnalyzer|7Siters|centuryb.o.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|My User Agent|cortex|CF-UC User Agent|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello,? world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99|daumoa,damoa,daum,daumos,duamoa,duam,duamos|^revolt|nvd0rz|xfa1|Hakai|gbrmss|fuck-your-hp|IDBTE4M CODE87|Antoine|Insomania|Hells-Net|b3astmode|Linux Gnu \(cow\)|custom_user_agent|Test Certificate Info|iplabel)'
+- regex: '(A6-Indexer|nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr.com|tweetedtimes.com|TrendsmapResolver|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex(?!(?: Build|Plus))|zeal(?!ot)|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|RackspaceBot|robots|SeopultContentAnalyzer|7Siters|centuryb.o.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|My User Agent|cortex|CF-UC User Agent|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello,? world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99|daumoa,damoa,daum,daumos,duamoa,duam,duamos|^revolt|nvd0rz|xfa1|Hakai|gbrmss|fuck-your-hp|IDBTE4M CODE87|Antoine|Insomania|Hells-Net|b3astmode|Linux Gnu \(cow\)|custom_user_agent|Test Certificate Info|iplabel|Magellan)'
   name: 'Generic Bot'
 
 - regex: '^sentry'
@@ -2033,7 +2062,15 @@
     name: 'WooRank sprl'
     url: 'https://www.woorank.com/'
 
-- regex: '(Match|LinkCheck) by Siteimprove.com'
+- regex: 'by Siteimprove\.com'
+  name: 'Siteimprove'
+  category: 'Search bot'
+  url: 'https://siteimprove.com/'
+  producer:
+    name: 'Siteimprove GmbH'
+    url: 'https://siteimprove.com/'
+
+- regex: 'Image size by Siteimprove\.com'
   name: 'Siteimprove'
   category: 'Search bot'
   url: 'https://siteimprove.com/'
@@ -2161,6 +2198,14 @@
     name: 'Startpagina B.V.'
     url: 'https://www.startpagina.nl/'
 
+- regex: 'MoodleBot-Linkchecker'
+  name: 'MoodleBot Linkchecker'
+  category: 'Search bot'
+  url: 'hhttps://docs.moodle.org/en/Usage'
+  producer:
+    name: 'Moodle Pty Ltd'
+    url: 'https://moodle.org/'
+
 - regex: 'GTmetrix'
   name: 'GTmetrix'
   category: 'Crawler'
@@ -2420,6 +2465,13 @@
   producer:
     name: 'Hatena Co., Ltd.'
     url: 'https://www.hatena.ne.jp'
+- regex: 'Hatena-?Bookmark'
+  name: 'Hatena Bookmark'
+  category: 'Crawler'
+  url: 'https://www.hatena.ne.jp/faq/'
+  producer:
+    name: 'Hatena Co., Ltd.'
+    url: 'https://www.hatena.ne.jp'
 
 - regex: 'RyowlEngine/(\d+)'
   name: 'Ryowl'
@@ -2564,6 +2616,14 @@
   category: 'Security Checker'
   url: 'https://github.com/LeakIX/l9explore'
 
+- regex: 'l9scan/|^Lkx-(.*)/([\d+.]+)'
+  name: 'LeakIX'
+  category: 'Security Checker'
+  url: 'https://leakix.net/'
+  producer:
+    name: 'BaDaaS SRL'
+    url: 'https://leakix.net/'
+
 - regex: 'MegaIndex.ru/([\d+\.])'
   name: 'MegaIndex'
   category: 'Crawler'
@@ -3055,14 +3115,6 @@
     name: 'New Work SE'
     url: 'https://www.xing.com/'
 
-- regex: '^Lkx-(.*)/([\d+.]+)'
-  name: 'LeakIX'
-  category: 'Security Checker'
-  url: 'https://leakix.net/'
-  producer:
-    name: 'BaDaaS SRL'
-    url: 'https://leakix.net/'
-
 - regex: 'RepoLookoutBot/([\d+.]+)'
   name: 'Repo Lookout'
   category: 'Security Checker'
@@ -3293,6 +3345,96 @@
     name: 'Morningscore'
     url: 'https://morningscore.io/'
 
+- regex: 'Uptime-Kuma/([\d+.]+)'
+  name: 'Uptime-Kuma'
+  category: 'Site Monitor'
+  url: 'https://github.com/louislam/uptime-kuma'
+
+- regex: 'ChatGPT-User'
+  name: 'ChatGPT'
+  category: 'Crawler'
+  url: 'https://platform.openai.com/docs/plugins/bot'
+  producer:
+    name: 'OpenAI OpCo, LLC'
+    url: 'https://openai.com/'
+
+- regex: 'BrightEdge Crawler/([\d+.]+)'
+  name: 'BrightEdge'
+  category: 'Crawler'
+  url: 'https://www.brightedge.com/'
+  producer:
+    name: 'BrightEdge Technologies, Inc'
+    url: 'https://www.brightedge.com/'
+
+- regex: 'sfFeedReader/([\d+.]+)'
+  name: 'sfFeedReader'
+  url: 'https://github.com/diem-project/sfFeed2Plugin'
+  category: 'Feed Fetcher'
+
+- regex: 'cyberscan.io'
+  name: 'Cyberscan'
+  category: 'Security Checker'
+  url: 'https://www.cyberscan.io/'
+  producer:
+    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: 'RepoLookoutBot'
+  name: 'Repo Lookout'
+  category: 'Crawler'
+  url: 'https://www.repo-lookout.org/'
+  producer:
+    name: 'Crissy Field GmbH'
+    url: 'https://www.crissyfield.de/'
+
+- regex: 'researchscan.comsys.rwth-aachen.de'
+  name: 'Research Scan'
+  category: 'Crawler'
+  url: 'http://researchscan.comsys.rwth-aachen.de/'
+  producer:
+    name: 'RWTH Aachen University'
+    url: 'https://www.comsys.rwth-aachen.de/'
+
+- regex: 'newspaper/([\d+.]+)'
+  name: 'Scraping Robot'
+  category: 'Crawler'
+  url: 'https://scrapingrobot.com/'
+  producer:
+    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/([\d+.]+)'
+  name: 'Ant'
+  category: 'Crawler'
+  url: 'https://www.ant.com/'
+  producer:
+    name: 'Ant.com Ltd.'
+    url: 'https://www.ant.com/'
+
+- regex: 'WebwikiBot/([\d+.]+)'
+  name: 'Webwiki'
+  category: 'Crawler'
+  url: 'https://www.webwiki.com/'
+  producer:
+    name: 'webwiki GmbH'
+    url: 'https://www.webwiki.com/'
+
 # Generic detections
 - regex: '[a-z0-9\-_]*((?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|crawler|crawl|checker|archiver|transcoder|spider)([^a-z]|$)'
   name: 'Generic Bot'
diff --git a/priv/ua_inspector/client.browsers.yml b/priv/ua_inspector/client.browsers.yml
index 7db69c55b..42f5dfc1c 100644
--- a/priv/ua_inspector/client.browsers.yml
+++ b/priv/ua_inspector/client.browsers.yml
@@ -5,6 +5,13 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Odd Browser (https://play.google.com/store/apps/details?id=com.corproxy.browser)
+- regex: 'Odd/(\d+\.[\.\d]+)'
+  name: 'Odd Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
 # APN Browser
 - regex: 'Safari/537.36 (?:Browser|Navegador)'
   name: 'APN Browser'
@@ -1886,7 +1893,7 @@
     versions:
       28: 'Blink'
 
-- regex: '(?:DDG-Android-|DuckDuckGo/)(\d+[\.\d]*)'
+- regex: '(?:DDG-Android-|DuckDuckGo/|ddg_android/)(\d+[\.\d]*)'
   name: 'DuckDuckGo Privacy Browser'
   version: '$1'
   engine:
@@ -2697,7 +2704,7 @@
     default: 'WebKit'
 
 # Dorado
-- regex: 'Dorado WAP-Browser(?:[/ ](\d+[\.\d]+))?'
+- regex: '(?:\w{1,5}[_ ])?Dorado WAP-Browser(?:[/ ](\d+[\.\d]+))?'
   name: 'Dorado'
   version: '$1'
 
diff --git a/priv/ua_inspector/client.mobile_apps.yml b/priv/ua_inspector/client.mobile_apps.yml
index 6230bc52f..eb9519a6e 100644
--- a/priv/ua_inspector/client.mobile_apps.yml
+++ b/priv/ua_inspector/client.mobile_apps.yml
@@ -33,6 +33,11 @@
   name: 'Apple News'
   version: '$1'
 
+# Apple TV
+- regex: 'appletv.client'
+  name: 'Apple TV'
+  version: ''
+
 - regex: 'bPod'
   name: 'bPod'
   version: ''
@@ -141,6 +146,11 @@
   name: 'YouTube'
   version: '$1'
 
+# Rutube
+- regex: 'Rutube(?:TV)?BlackAndroid'
+  name: 'Rutube'
+  version: '$1'
+
 # Netflix (https://play.google.com/store/apps/details?id=com.netflix.mediaclient)
 - regex: 'com.netflix.mediaclient(?:/(\d+\.[\d\.]+))?'
   name: 'Netflix'
@@ -551,7 +561,7 @@
   version: '$1'
 
 # https://apps.apple.com/us/app/zalo/id579523206
-- regex: 'Zalo/([\d\.]+)'
+- regex: 'Zalo/([\d\.]+)|Zalo android'
   name: 'Zalo'
   version: '$1'
 
@@ -1300,6 +1310,11 @@
   name: 'Bitcoin Core'
   version: '$1'
 
+# Dogecoin Core (https://github.com/dogecoin/dogecoin)
+- regex: '/Shibetoshi:(\d+\.[\.\d]+)/'
+  name: 'Dogecoin Core'
+  version: '$1'
+
 # Amazon Shopping (https://play.google.com/store/apps/details?id=com.amazon.mShop.android.shopping)
 - regex: 'Amazon.com/(\d+\.[\.\d]+)'
   name: 'Amazon Shopping'
@@ -1442,3 +1457,12 @@
 - regex: 'RelesysApp/(\d+\.[.\d]+) \(\d{1,2}\) net.relesysapp.jj2go'
   name: 'JJ2GO'
   version: '$1'
+
+# My Watch Party
+- regex: 'MyWatchParty/(\d+\.[.\d]+)'
+  name: 'My Watch Party'
+  version: '$1'
+
+- regex: 'LoseIt!/(\d+\.[.\d]+)'
+  name: 'LoseIt!'
+  version: '$1'
diff --git a/priv/ua_inspector/client_hints.apps.yml b/priv/ua_inspector/client_hints.apps.yml
new file mode 100644
index 000000000..7dd40fb13
--- /dev/null
+++ b/priv/ua_inspector/client_hints.apps.yml
@@ -0,0 +1,110 @@
+# Apps
+
+'org.telegram.messenger': 'Telegram'
+'com.snapchat.android': 'Snapchat'
+'info.sunista.app': 'Sanista Persian Instagram'
+'com.instapro.app': 'InstaPro'
+'com.tencent.mm': 'WeChat'
+'com.kakao.talk': 'KakaoTalk'
+'com.ayoba.ayoba': 'Ayoba'
+'snapu2b.com': 'SnapU2B'
+'com.facebook.katana': 'Facebook'
+'com.facebook.orca': 'Facebook Messenger'
+'com.yahoo.onesearch': 'Yahoo OneSearch'
+'jp.co.yahoo.android.yjtop': 'Yahoo! Japan'
+'it.ideasolutions.kyms': 'KYMS - Keep Your Media Safe'
+'it.tolelab.fvd': 'FVD - Free Video Downloader'
+'kik.android': 'Kik'
+'com.tinder': 'Tinder'
+'com.videochat.livu': 'LivU'
+'io.metamask': 'MetaMask'
+'com.totalav.android': 'TotalAV'
+'com.fsecure.ms.saunalahti_m': 'Elisa Turvapaketti'
+'com.fsecure.ms.ziggo': 'Ziggo Safe Online'
+'com.aol.mobile.aolapp': 'AOL'
+'com.fancyclean.security.antivirus': 'Fancy Security'
+'com.google.android.gms': 'Google Play'
+'com.appsinnova.android.keepclean': 'KeepClean'
+'com.turtc': 'TurTc'
+'com.sony.nfx.app.sfrc': 'News Suite by Sony'
+'com.rcplatform.livechat': 'Tumile'
+'jp.gocro.smartnews.android': 'SmartNews'
+'com.lenovo.anyshare.gps': 'SHAREit'
+'com.espn.score_center': 'ESPN'
+'com.active.cleaner': 'Active Cleaner'
+'com.hld.anzenbokusucal': 'Calculator Photo Vault'
+'com.hld.anzenbokusufake': 'Calculator Hide Photos'
+'com.hld.anzenbokusu': 'Sgallery'
+'com.huawei.appmarket': 'AppGallery'
+'com.michatapp.im': 'MiChat'
+'com.michatapp.im.lite': 'MiChat Lite'
+'com.noxgroup.app.security': 'Nox Security'
+'phone.cleaner.antivirus.speed.booster': 'Super Cleaner'
+'com.yy.hiyo': 'Hago'
+'com.instagram.android': 'Instagram App'
+'com.microsoft.office.outlook': 'Microsoft Outlook'
+'com.microsoft.bing': 'Microsoft Bing Search'
+'com.microsoft.bingintl': 'Microsoft Bing Search'
+'com.nhn.android.search': 'Naver'
+'com.jb.security': 'GO Security'
+'com.fsecure.ms.safe': 'F-Secure SAFE'
+'com.jaumo': 'Jaumo'
+'com.jaumo.prime': 'Jaumo Prime'
+'com.skout.android': 'SKOUT'
+'com.hornet.android': 'Hornet'
+'com.fsecure.ms.darty': 'Darty Sécurité'
+'com.fsecure.ms.dc': 'F-Secure Mobile Security'
+'com.fsecure.ms.swisscom.sa': 'Swisscom Internet Security'
+'com.andrewshu.android.reddit': 'Reddit is fun'
+'com.andrewshu.android.redditdonation': 'Reddit is fun'
+'org.quantumbadger.redreader': 'RedReader'
+'com.sina.weibo': 'Sina Weibo'
+'com.wiseplay': 'Wiseplay'
+'com.fsecure.ms.nifty': 'Always Safe Security 24'
+'com.zeebusiness.news': 'Zee Business'
+'com.awesapp.isp': 'iSafePlay'
+'com.baidu.searchbox': 'Baidu Box App'
+'hesoft.T2S': 'T2S'
+'hippeis.com.photochecker': 'Photo Sherlock'
+'com.thinkfree.searchbyimage': 'Reverse Image Search'
+'com.tct.launcher': 'Joy Launcher'
+'com.tcl.live': 'TCL Live'
+'com.harshad.someto': 'Social Media Explorer'
+'com.reddit.frontpage': 'Reddit'
+'com.opera.app.news': 'Opera News'
+'com.palmteam.imagesearch': 'Search By Image'
+'com.sharekaro.app': 'ShareKaro'
+'com.til.timesnews': 'NewsPoint'
+'com.transsion.XOSLauncher': 'XOS Launcher'
+'com.transsion.hilauncher': 'HiOS Launcher'
+'com.transsion.itel.launcher': 'itel Launcher'
+'com.twitter.android': 'Twitter'
+'com.waze': 'Waze'
+'com.tuya.smartlife': 'Tuya Smart Life'
+'com.cleanmaster.mguard': 'Clean Master'
+'com.cleanmaster.mguard.huawei': 'Clean Master'
+'de.twokit.castbrowsernexusplayer': 'TV Cast'
+'de.twokit.video.tv.cast.browser.firetv': 'TV Cast'
+'de.twokit.video.tv.cast.browser.lg': 'TV Cast'
+'de.twokit.video.tv.cast.browser.samsung': 'TV Cast'
+'com.cleanmaster.security': 'CM Security'
+'idm.video.free': 'IDM Video Download Manager'
+'mobi.deallauncher.coupons.shopping': 'Coupons & Deals'
+'com.wukongtv.wkcast.intl': 'Quick Cast'
+'com.tt.android.dm.view': 'Download Manager'
+'com.fsecure.ms.kpn.veilig': 'KPN Veilig'
+'com.fsecure.ms.actshield': 'ACT Shield'
+'com.fsecure.ms.talktalksa': 'TalkTalk SuperSafe'
+'com.bifrostwallet.app': 'Bifrost Wallet'
+'com.anydesk.anydeskandroid': 'AnyDesk Remote Desktop'
+'com.google.android.youtube': 'YouTube'
+'io.bluewallet.bluewallet': 'BlueWallet'
+
+# Vpns
+'org.torproject.android': 'Orbot'
+'free.vpn.unblock.proxy.vpnmonster': 'VPN Monster'
+'com.udicorn.proxy': 'Blue Proxy'
+'com.v2.vpn.security.free': 'V2Free'
+'com.surfshark.vpnclient.android': 'Surfshark'
+'com.omshyapps.vpn': 'Omshy VPN'
+'com.kuto.vpn': 'KUTO VPN'
diff --git a/priv/ua_inspector/client_hints.browsers.yml b/priv/ua_inspector/client_hints.browsers.yml
new file mode 100644
index 000000000..6b0e2bb1a
--- /dev/null
+++ b/priv/ua_inspector/client_hints.browsers.yml
@@ -0,0 +1,205 @@
+# Browsers
+'mark.via.gp': 'Via'
+'com.pure.mini.browser': 'Pure Mini Browser'
+'pure.lite.browser': 'Pure Lite Browser'
+'acr.browser.Hexa': 'Hexa Web Browser'
+'acr.browser.raisebrowserfull': 'Raise Fast Browser'
+'acr.tez.browse': 'Browspeed Browser'
+'com.Fast.BrowserUc.lite': 'Fast Browser UC Lite'
+'acr.browser.barebones': 'Lightning Browser'
+'anar.app.darkweb': 'Dark Web Browser'
+'com.kiwibrowser.browser': 'Kiwi'
+'com.cloudmosa.puffinFree': 'Puffin Web Browser'
+'com.aloha.browser': 'Aloha Browser'
+'com.cake.browser': 'Cake Browser'
+'com.UCMobile.intl': 'UC Browser'
+'com.iebrowser.fast': 'IE Browser Fast'
+'com.internet.browser.secure': 'Internet Browser Secure'
+'acr.browser.linxy': 'Vegas Browser'
+'com.oh.bro': 'OH Browser'
+'com.oh.brop': 'OH Private Browser'
+'com.duckduckgo.mobile.android': 'DuckDuckGo Privacy Browser'
+'net.onecook.browser': 'Stargon'
+'com.mi.globalbrowser.mini': 'Mint Browser'
+'com.hisense.odinbrowser': 'Odin Browser'
+'com.brave.browser': 'Brave'
+'org.mozilla.klar': 'Firefox Klar'
+'phx.hot.browser': 'Anka Browser'
+'org.mozilla.focus': 'Firefox Focus'
+'com.vivaldi.browser': 'Vivaldi'
+'web.browser.dragon': 'Dragon Browser'
+'org.easyweb.browser': 'Easy Browser'
+'com.xbrowser.play': 'XBrowser Mini'
+'com.sharkeeapp.browser': 'Sharkee Browser'
+'com.mobiu.browser': 'Lark Browser'
+'com.qflair.browserq': 'Pluma'
+'com.noxgroup.app.browser': 'Nox Browser'
+'com.jio.web': 'JioPages'
+'com.ume.browser.cust': 'Ume Browser'
+'com.ume.browser.international': 'Ume Browser'
+'com.ume.browser.bose': 'Ume Browser'
+'com.ume.browser.euas': 'Ume Browser'
+'com.ume.browser.latinamerican': 'Ume Browser'
+'com.ume.browser.mexicotelcel': 'Ume Browser'
+'com.ume.browser.venezuelavtelca': 'Ume Browser'
+'com.ume.browser.northamerica': 'Ume Browser'
+'com.ume.browser.newage': 'Ume Browser'
+'com.kuto.browser': 'KUTO Mini Browser'
+'com.dolphin.browser.zero': 'Dolphin Zero'
+'mobi.mgeek.TunnyBrowser': 'Dolphin'  # Dolphin + AdBlock
+'nextapp.atlas': 'Atlas'
+'org.mozilla.rocket': 'Firefox Rocket' # Firefox Lite
+'com.mx.browser': 'Maxthon'
+'com.ecosia.android': 'Ecosia'
+'org.lineageos.jelly': 'Jelly'
+'com.opera.gx': 'Opera GX'
+'br.marcelo.monumentbrowser': 'Monument Browser'
+'com.airfind.deltabrowser': 'Delta Browser'
+'com.apusapps.browser': 'APUS Browser'
+'com.ask.browser': 'Ask.com'
+'com.browser.tssomas': 'Super Fast Browser'
+'iron.web.jalepano.browser': 'SuperFast Browser'
+'yuce.browser.mini': 'Ui Browser Mini'
+'SavySoda.PrivateBrowsing': 'SavySoda'
+'savannah.internet.web.browser': 'Savannah Browser'
+'com.gl9.cloudBrowser': 'Surf Browser'
+'com.ucold.browser.secure.browse': 'UC Browser Mini'
+'com.mycompany.app.soulbrowser': 'Soul Browser'
+'com.quickbig.browser': 'Indian UC Mini Browser' # (alternative name Splash UC Mini Browser)
+'com.opera.browser': 'Opera'
+'com.opera.mini.native': 'Opera Mini'
+'com.wSilverMobBrowser': 'SilverMob US'
+'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.safe.browser': 'Belva Browser'
+'com.youcare.browser': 'YouCare'
+'org.lilo.mobile.android2020': 'Lilo'
+'com.opera.cryptobrowser': 'Opera Crypto'
+'AlohaBrowser': 'Aloha Browser'
+'mark.via': 'Via'
+'com.xpp.floatbrowser': 'Float Browser'
+'com.kiddoware.kidsafebrowser': 'Kids Safe Browser'
+'com.hideitpro.vbrowser': 'vBrowser'
+'com.cgbrowser.rn': 'CG Browser'
+'com.azka.browser.anti.blokir': 'Azka Browser'
+'com.azka.browser': 'Azka Browser'
+'com.micromaxinfo.browser': 'Mmx Browser'
+'com.zeesitech.bitchutebrowser': 'Bitchute Browser'
+'nova.all.video.downloader': 'Nova Video Downloader Pro'
+'tukidev.pronhubbrowser.tanpavpn': 'PronHub Browser'
+'com.crowbar.beaverbrowser': 'Frost+'
+'com.lenovo.browser': 'Lenovo Browser'
+'com.transsion.phoenix': 'Phoenix Browser'
+'quick.browser.secure': 'Quick Browser'
+'com.asus.browser': 'Asus Browser'
+'com.opera.touch': 'Opera Touch'
+'com.ghostery.android.ghostery': 'Ghostery Privacy Browser'
+'com.oceanhero.search': 'OceanHero'
+'com.mebrowser.webapp': 'Me Browser'
+'info.plateaukao.einkbro': 'EinkBro'
+'com.fevdev.nakedbrowser': 'Naked Browser'
+'com.fevdev.nakedbrowserlts': 'Naked Browser'
+'com.fevdev.nakedbrowserpro': 'Naked Browser Pro'
+'com.yasirshakoor.ducbrowser': 'DUC Browser'
+'com.wDesiBrowser_13255326': 'Desi Browser'
+'com.huawei.browser': 'Huawei Browser Mobile'
+'com.phantom.me': 'Phantom.me'
+'com.opera.mini.android': 'Opera Mini'
+'jp.ejimax.berrybrowser': 'Berry Browser'
+'com.fulldive.mobile': 'Fulldive'
+'com.talpa.hibrowser': 'Hi Browser'
+'org.midorinext.android': 'Midori Lite'
+'reactivephone.msearch': 'Smart Search & Web Browser'
+'com.sibimobilelab.amazebrowser': 'Amaze Browser'
+'com.alohamobile.browser.lite': 'Aloha Browser Lite'
+'com.tcl.browser': 'BrowseHere'
+'com.seraphic.openinet.pre': 'Open Browser'
+'com.seraphic.openinet.cvte': 'Open Browser'
+'privatebrowser.securebrowser.com.klar': 'Secure Private Browser'
+'in.pokebbrowser.bukablokirsitus': 'HUB Browser'
+'com.wOpenBrowser_12576500': 'Open Browser fast 5G'
+'com.wOpenbrowser_13506467': 'Open Browser 4U'
+'com.MaxTube.browser': 'MaxTube Browser'
+'com.ninexgen.chowbo': 'Chowbo'
+'net.pertiller.debuggablebrowser': 'Debuggable Browser'
+'com.appssppa.idesktoppcbrowser': 'iDesktop PC Browser'
+'pi.browser': 'Pi Browser'
+'com.xooloo.internet': 'Xooloo Internet'
+'com.u_browser': 'U Browser'
+'ai.blokee.browser.android': 'Bloket'
+'com.vast.vpn.proxy.unblock': 'Vast Browser'
+'com.security.xvpn.z35kb': 'X-VPN'
+'com.security.xvpn.z35kb.amazon': 'X-VPN'
+'com.security.xvpn.z35kb.huawei': 'X-VPN'
+'com.yandex.browser.lite': 'Yandex Browser Lite'
+'cz.seznam.sbrowser': 'Seznam Browser'
+'com.morrisxar.nav88': 'Office Browser'
+'com.rabbit.incognito.browser': 'Rabbit Private Browser'
+'arun.com.chromer': 'Lynket Browser'
+'jp.hazuki.yuzubrowser': 'Yuzu Browser'
+'com.swiftariel.browser.cherry': 'Cherry Browser'
+'id.browser.vivid3': 'Vivid Browser Mini'
+'com.browser.yo.indian': 'Yo Browser'
+'com.mercandalli.android.browser': 'G Browser'
+'com.bf.browser': 'BF Browser'
+'com.qihoo.browser': '360 Browser'
+'com.qihoo.haosou': '360 Browser'
+'com.qihoo.padbrowser': '360 Browser'
+'org.zirco': 'Zirco Browser'
+'org.tint': 'Tint Browser'
+'com.skyfire.browser': 'Skyfire'
+'com.sonymobile.smallbrowser': 'Sony Small Browser'
+'org.hola': 'hola! Browser'
+'it.ideasolutions.amerigo': 'Amerigo'
+'org.xbrowser.prosuperfast': 'xBrowser Pro Super Fast'
+'org.plus18.android': '18+ Privacy Browser'
+'com.beyond.privatebrowser': 'Beyond Private Browser'
+'com.blacklion.browser': 'Black Lion Browser'
+'com.opera.mini.native.ShonizME': 'Opera Mini'
+'com.tuc.mini.st': 'TUC Mini Browser'
+'com.roidtechnologies.appbrowzer': 'AppBrowzer'
+'com.futuristic.sx': 'SX Browser'
+'hot.fiery.browser': 'Fiery Browser'
+'in.nismah.yagi': 'YAGI'
+'com.apn.mobile.browser.cherry': 'APN Browser'
+'com.apn.mobile.browser.umeatt': 'APN Browser'
+'com.apn.mobile.browser.zte': 'APN Browser'
+'com.tencent.mtt': 'QQ Browser'
+'com.wordly.translate.browser': 'NextWord Browser'
+'idm.internet.download.manager': '1DM Browser'
+'idm.internet.download.manager.plus': '1DM+ Browser'
+'com.veeraapps.newadult': 'Adult Browser'
+'com.xnxbrowser.rampage': 'XNX Browser'
+'com.xtremecast': 'XtremeCast'
+'com.xvideobrowserlite.xvideoDownloaderbrowserlite': 'X Browser Lite'
+'com.xxnxx.browser.proxy.vpn': 'xBrowser'
+'com.sweetbrowser.ice': 'Sweet Browser'
+'com.mcent.browser': 'mCent'
+'com.htc.sense.browser': 'HTC Browser'
+'com.browlser': 'Browlser'
+'app.browserhub.download': 'Browser Hup Pro'
+'com.flyperinc.flyperlink': 'Flyperlink'
+'com.w3engineers.banglabrowser': 'Bangla Browser'
+'com.coccoc.trinhduyet': 'Coc Coc'
+'com.browser.explore': 'Explore Browser'
+'com.microsoft.emmx': 'Microsoft Edge'
+'com.explore.web.browser': 'Web Browser & Explorer'
+'privacy.explorer.fast.safe.browser': 'Privacy Explorer Fast Safe'
+'app.soundy.browser': 'Soundy Browser'
+'com.ivvi.browser': 'IVVI Browser'
+'com.nomone.vrbrowser': 'NOMone VR Browser'
+'com.opus.browser': 'Opus Browser'
+'com.arvin.browser': 'Arvin'
+'com.pawxy.browser': 'Pawxy'
+'com.internet.tvbrowser': 'LUJO TV Browser'
+'com.logicui.tvbrowser2': 'LogicUI TV Browser'
+'com.opera.browser.afin': 'Opera'
+'com.quark.browser': 'Quark'
+'jp.co.yahoo.android.ybrowser': 'Yahoo! Japan Browser'
+'com.tv.browser.open': 'Open TV Browser'
+'com.ornet.torbrowser': 'OrNET Browser'
+'com.browsbit': 'BrowsBit'
diff --git a/priv/ua_inspector/device.car_browsers.yml b/priv/ua_inspector/device.car_browsers.yml
index d806cc50d..682947a08 100644
--- a/priv/ua_inspector/device.car_browsers.yml
+++ b/priv/ua_inspector/device.car_browsers.yml
@@ -7,7 +7,7 @@
 
 # Tesla Model S
 Tesla:
-  regex: '(?:Tesla/(?:(?:develop|feature)-)?[0-9.]+|QtCarBrowser)'
+  regex: '(?:Tesla/(?:(?:develop|feature|terminal-das-fsd-eap)-)?[0-9.]+|QtCarBrowser)'
   device: 'car browser'
   models:
     - regex: 'QtCarBrowser'
diff --git a/priv/ua_inspector/device.consoles.yml b/priv/ua_inspector/device.consoles.yml
index 49f872426..dced28912 100644
--- a/priv/ua_inspector/device.consoles.yml
+++ b/priv/ua_inspector/device.consoles.yml
@@ -26,7 +26,7 @@ Microsoft:
       model: 'Xbox 360'
 
 Nintendo:
-  regex: 'Nintendo (([3]?DS[i]?)|Wii[U]?|Switch)'
+  regex: 'Nintendo (([3]?DS[i]?)|Wii[U]?|Switch|GameBoy)'
   device: 'console'
   model: '$1'
 
@@ -52,6 +52,6 @@ Sony:
 
 # Retroid Pocket (www.goretroid.com)
 Retroid Pocket:
-  regex: 'Retroid Pocket 2Plus'
+  regex: 'Retroid Pocket 2(?:Plus|\+)'
   device: 'console'
   model: '2 Plus'
diff --git a/priv/ua_inspector/device.mobiles.yml b/priv/ua_inspector/device.mobiles.yml
index 458c4fb21..ed8f9c5c3 100644
--- a/priv/ua_inspector/device.mobiles.yml
+++ b/priv/ua_inspector/device.mobiles.yml
@@ -7,7 +7,7 @@
 
 # Ace or ACE France (www.acemobile.fr)
 Ace:
-  regex: '(?:BUZZ [123]|CLEVER 1|URBAN 1(?: Pro)?)(?:[);/ ]|$)'
+  regex: '(?:BUZZ [123]|CLEVER 1|URBAN [13](?: Pro)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BUZZ ([12]) Lite'
@@ -20,8 +20,8 @@ Ace:
       model: 'Clever 1'
     - regex: 'URBAN 1 Pro'
       model: 'Urban 1 Pro'
-    - regex: 'URBAN 1'
-      model: 'Urban 1'
+    - regex: 'URBAN ([13])'
+      model: 'Urban $1'
 
 'Tunisie Telecom':
   regex: 'StarTrail TT(?:[);/ ]|$)'
@@ -103,7 +103,7 @@ Adronix:
 
 # Cherry Mobile (cherrymobile.com)
 'Cherry Mobile':
-  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][43][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'
+  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2'
   device: 'smartphone'
   models:
     - regex: '(Flare2X|Aqua S9(?: (?:Max|Lite|Pro))?)'
@@ -163,6 +163,8 @@ Adronix:
       model: 'Flare Lite S3'
     - regex: 'Flare(?:[ _])?(A1_Roam|A[123]|J8 LTE|J1s|J[1235678]|P[13]|S[4-8]|X2|Y3s|Y7_LTE|Y[3567]|[45])'
       model: 'Flare $1'
+    - regex: 'Touch XL 2'
+      model: 'Touch XL 2'
     - regex: 'OMEGA[ _]HD[ _]([45])'
       model: 'Omega HD $1'
     - regex: 'Omega_HD_Duo'
@@ -171,7 +173,7 @@ Adronix:
       model: 'Omega Icon Lite 2'
     - regex: 'Omega Icon 2'
       model: 'Omega Icon 2'
-    - regex: 'Omega[_ ]Lite[_ ](3[Cs]|4)'
+    - regex: 'Omega[_ ]Lite[_ ](3[Cs]|[24])'
       model: 'Omega Lite $1'
     - regex: 'Omega[_ ]X'
       model: 'Omega X'
@@ -276,7 +278,7 @@ HTC:
       model: 'One M9'
     - regex: 'One[ _](X9|[EM]8) dual sim(?:[);/ ]|$)'
       model: 'One $1 Dual SIM'
-    - regex: 'Desire[ _](.+) dual sim(?:[);/ ]|$)'
+    - regex: 'Desire[ _]([\d\w]+) dual sim(?:[);/ ]|$)'
       model: 'Desire $1 Dual SIM'
     - regex: 'HTC(?: One m7|6500LVW|PN071)(?:[);/ ]|$)'
       model: 'One M7'
@@ -288,7 +290,7 @@ HTC:
       model: 'One E8'
     - regex: 'HTC[_ ]E9x(?:[);/ ]|$)'
       model: 'One E9'
-    - regex: 'HTC[_ ]E9pw(?:[);/ ]|$)'
+    - regex: 'HTC[_ ]?(?:One[_ ])?E9(?:pw|PLUS dual sim)(?:[);/ ]|$)'
       model: 'One E9 Plus'
     - regex: 'HTC_S9u(?:[);/ ]|$)'
       model: 'One S9'
@@ -354,9 +356,9 @@ HTC:
       model: 'Desire 10 Pro'
     - regex: 'HTC[ _](?:10[ _]evo|M10f)(?:[);/ ]|$)'
       model: '10 Evo'
-    - regex: 'HTC Desire (.+) pro 5G(?:[);/ ]|$)'
+    - regex: 'HTC Desire (\d+) pro 5G(?:[);/ ]|$)'
       model: 'Desire $1 Pro 5G'
-    - regex: 'HTC Desire (.+) pro(?:[);/ ]|$)'
+    - regex: 'HTC Desire (\d+) pro(?:[);/ ]|$)'
       model: 'Desire $1 Pro'
     - regex: 'Desire 10 lifestyle(?:[);/ ]|$)'
       model: 'Desire 10 Life Style'
@@ -378,12 +380,6 @@ HTC:
     - regex: 'HTC(?:[ _-])?(?:One[ _\-]max|6600LVW|0P3P7)(?:[);/ ]|$)'
       device: 'phablet'
       model: 'One Max'
-    - regex: 'HTC[ _]([^/;]+) [0-9]+(?:\.[0-9]+)+ Build'
-      model: '$1'
-    - regex: 'HTC[ _]([^/;]+) Build'
-      model: '$1'
-    - regex: 'HTC[ _]([a-z0-9]+[ _\-]?(?:[a-z0-9_+\-])*)'
-      model: '$1'
     - regex: 'USCCHTC(\d+)'
       model: '$1'
     - regex: 'Sprint (ATP.*) Build'
@@ -391,13 +387,19 @@ HTC:
       model: '$1 (Sprint)'
     - regex: 'Sprint (APA.*) Build'
       model: '$1 (Sprint)'
-    - regex: '(?:HTC-)?HTC(?:[\-/ ])?([a-z0-9\-_]+)'
+    - regex: 'Wildfire (E2?) plus'
+      model: 'Wildfire $1 Plus'
+    - regex: 'HTC[ _]([^/;]+) [0-9]+(?:\.[0-9]+)+ Build'
+      model: '$1'
+    - regex: 'HTC[ _]([^/;]+) Build'
+      model: '$1'
+    - regex: 'HTC[ _]([a-z0-9]+[ _\-]?(?:[a-z0-9_+\-])*)'
+      model: '$1'
+    - regex: '(?:HTC-)?HTC(?:[-/ ])?([a-z0-9\-_]+)'
       model: '$1'
     - regex: 'HTC;(?: )?([a-z0-9 ]+)'
       model: '$1'
-    - regex: 'Wildfire (E2?) plus'
-      model: 'Wildfire $1 Plus'
-    - regex: '(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|\))'
+    - regex: '(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|[);])'
       model: '$1 $2'
     - regex: '(Amaze[ _]4G|One ?[XELSV\+]*) Build'
       model: '$1'
@@ -521,6 +523,8 @@ Nokia:
       model: '2 V Tella'
     - regex: 'Nokia 8 V 5G UW'
       model: '8V 5G UW'
+    - regex: 'Nokia[_ ]Xplus'
+      model: 'X+'
     # Nokia phones
     - regex: 'N152DL'
       model: 'C100'
@@ -560,7 +564,7 @@ Nokia:
       model: '3105'
     - regex: 'NOKIA-RM-11'
       model: '3205'
-    - regex: 'Nokia808 PureView'
+    - regex: 'Nokia808 ?PureView'
       model: '808 PureView'
     - regex: 'Nokia ?([0-9]{4})c(?:-)?'
       model: '$1 Classic'
@@ -620,9 +624,9 @@ Nokia:
     - regex: 'NOKIA;? 1520\.1'
       model: 'Lumia 1520.1'
 
-    - regex: 'Nokia T20'
+    - regex: 'Nokia T([12]0|21)'
       device: 'tablet'
-      model: 'T20'
+      model: 'T$1'
 
     - regex: 'Nokia ([A-Za-z0-9\. ]+)(?: Build|\))'
       model: '$1'
@@ -719,7 +723,7 @@ RIM:
 
 # Ghia or GHIA (www.ghia.com.mx)
 Ghia:
-  regex: 'GHIA|QS702|SVEGLIO[ _][QH]1|VECTOR10\.1|GTKIDS7[BVR]?|(?:A7_WF|GTA7WF|VENUS7|TREO_TAB8G?|VECTOR_SLIM|GTAB718|GTABPND|GTABKIDS|GTVR10S|AXIS7_SLIM|AXIS7_LED)(?:[);/ ]|$)'
+  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'
   models:
     - regex: 'SVEGLIO[ _]([QH]1)'
@@ -757,6 +761,9 @@ Ghia:
     - regex: 'GTA7WF'
       device: 'tablet'
       model: 'A7 ROJA'
+    - regex: 'GTA7PLUS'
+      device: 'tablet'
+      model: 'A7 Plus'
     - regex: 'TREO_TAB8G'
       device: 'tablet'
       model: 'TREO TAB8G'
@@ -883,7 +890,7 @@ TiVo:
 
 # Apple
 Apple:
-  regex: '(?:iTunes-)?Apple[ _]?TV|Apple/|(?:Apple-|iTunes-)?(?<!like )(?:iPad|iPhone)|iPh(?:[0-9]|1[0-4]),[0-9]|CFNetwork|HomePod|AirPlay|Watch ?OS|Watch1,[12]|MDCR_Mac|ICRU_iP(?:ad|hone)|Mac OS X[,;]|macOS,'
+  regex: '(?:iTunes-)?Apple[ _]?TV|Apple/|(?:Apple-|iTunes-)?(?<!like )(?:iPad|iPhone)(?!\: Build/)|iPh(?:[0-9]|1[0-4]),[0-9]|CFNetwork|HomePod|AirPlay|Watch ?OS|Watch1,[12]|MDCR_Mac|ICRU_iP(?:ad|hone)|Mac OS X[,;]|macOS,'
   models:
     - regex: 'HomePod'
       device: 'smart speaker'
@@ -1494,7 +1501,7 @@ Apple:
     - regex: 'Apple-?TV3[C,_][12]'
       model: 'Apple TV 3'
       device: 'tv'
-    - regex: 'Apple-?TV5[C,_]3'
+    - regex: 'Apple-?TV5[C,_]3|Apple TV 4'
       model: 'Apple TV 4'
       device: 'tv'
     - regex: 'Apple-?TV6[C,_]2'
@@ -1838,7 +1845,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|211|50[10]|51[10]|70[10])(?:[);/ ]|$)|Android.*V3[67]0(?:[);/ ]|$)|Android.*Z1[23456]0 Build|Android.*Z5\d{2} Build|Android.*T0[234678] Build|Android 5(?:[\d.]*);(?: [\w-]+;)? S59|Android.*S55(?! Nova)(?:[);/ ]|$)|(?:A1-(713(HD)?|7[23]4|830|841|840(?:FHD)?|81[01])|A3-A[1-5][01]|B1-(7[1235-9][01](HD)?|7[23]3|7A0|8[1235]0|A71|860A)|TPA60W|B3-(A[125]0|A3[02]|A40FHD)|E39)(?:[);/ ]|$)|S5[12]0 Build|(DA[0-9]+HQ?L|Aspire (?:V5-121|XC-704G|V5-573G|4349)|Chromebook 14 \(CB3-431\)|Predator G9-793|GT-810|B1-870|B3-A20B|B3-A4[02]|B3-A50FHD|ET-108-11A|AC?TAB(?:721E?|821|1021(?:E|_A)|1022)|A3-A20FHD|E380)(?:[);/ ]|$)'
+  regex: 'acer|ACTAB|TravelMate|(?<!Satellite |ZTE BLADE |ImSmart |ERGO |X-Style Tab )(?<!Optima 7 )a(?:101|110|2[10]0|211|50[10]|51[10]|70[10])(?:[);/ ]|$)|Android.*V3[67]0(?:[);/ ]|$)|Android.*Z1[23456]0 Build|Android.*Z5\d{2} Build|Android.*T0[234678] Build|Android 5(?:[\d.]*);(?: [\w-]+;)? S59|Android.*S55(?! Nova)(?:[);/ ]|$)|(?:A1-(713(HD)?|7[23]4|830|841|840(?:FHD)?|81[01])|A3-A[1-5][01]|B1-(7[1235-9][01](HD)?|7[23]3|7A0|8[1235]0|A71|860A)|TPA60W|B3-(A[125]0|A3[02]|A40FHD)|E39)(?:[);/ ]|$)|S5[12]0 Build|(DA[0-9]+HQ?L|Aspire (?:V5-121|XC-704G|V5-573G|4349)|Chromebook 14 \(CB3-431\)|Predator G9-793|GT-810|B1-870|B3-A20B|B3-A4[02]|B3-A50FHD|ET-108-11A|AC?TAB(?:721E?|1422E|821|1021(?:E|_A)|1022)|A3-A20FHD|E380|Swift SF113-31)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # smart displays
@@ -1856,7 +1863,7 @@ Acer:
     - regex: 'A1-81[01]'
       model: 'Iconia A'
       device: 'tablet'
-    - regex: 'ATAB(102[12]|721)E'
+    - regex: 'ATAB(102[12]|721|1422)E'
       model: 'ATAB$1E'
       device: 'tablet'
     - regex: 'ACTAB1021(?:_A)?'
@@ -2002,32 +2009,33 @@ Acer:
     - regex: 'TravelMate Spin (B118-G2-R)'
       model: 'TravelMate Spin $1'
       device: 'desktop'
-    - regex: 'TravelMate (P653-M|5760G|8371)'
+    - regex: 'TravelMate (P653-M|5760G|8371|B118-M)'
       model: 'TravelMate $1'
       device: 'desktop'
     - regex: '(?:Acer )?(Chromebook 1[45])'
       model: '$1'
       device: 'desktop'
-    - regex: '(Aspire (?:V5-121|XC-704G|V5-573G|A515-51G|4349))'
-      model: '$1'
+    - regex: 'Aspire (V5-121|XC-704G|V5-573G|A515-51G|4349|E5-511)'
+      model: 'Aspire $1'
       device: 'desktop'
-    - regex: '(Predator G9-793|Aspire E5-511)'
+    - regex: '(Predator G9-793|Swift SF113-31)'
       model: '$1'
       device: 'desktop'
 
-    - regex: 'Acer; ?([^;\(\)/]+)'
-      model: '$1'
-    - regex: 'Acer(?! ?inc)[ _\-]?([^;\(\)/]+)[();/ ]'
-      model: '$1'
-    - regex: 'acer[\-_]([a-z0-9]+)'
-      model: '$1'
     - regex: 'a(101|110|2[10]0|211|50[10]|51[10]|70[10])(?:[);/ ]|$)'
       model: 'Iconia Tab A$1'
       device: 'tablet'
 
+    - regex: 'Acer; ?([^;()/]+)'
+      model: '$1'
+    - regex: 'Acer(?! ?inc)[ _-]?([^;)/]+)(?: Build|[;)])'
+      model: '$1'
+    - regex: 'acer[_-]([a-z0-9]+)'
+      model: '$1'
+
 # Advan or advan digital
 Advan:
-  regex: '(?:ADVAN (?:M4|S40|T5C)|i7U|S45E|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+|S4\+|1011|E1C_3G)(?:[);/ ]|$)| (?:E1C Pro|5505|5202|50(?:[46]1|5[89]|62)|600[24]|6201|Android [56].*; (?:i5C|i7A)|i5G)(?: Build|[;)])'
+  regex: '(?:ADVAN (?:M4|S40|T5C)|i7U|S45E|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+|S4\+|1011|E1C_3G)(?:[);/ ]|$)| (?:E1C Pro|5505|5202|50(?:[46]1|5[89]|62)|600[234]|6[25]01|Android [56].*; (?:i5C|i7A)|i5G|E1C 3G)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'ADVAN M4'
@@ -2048,6 +2056,8 @@ Advan:
       model: 'NASA'
     - regex: ' 6201(?: Build|[;)])'
       model: 'G5'
+    - regex: ' 6501(?: Build|[;)])'
+      model: 'G5 Elite'
     - regex: ' i5G(?: Build|[;)])'
       model: 'S50 4G'
     - regex: ' 6004(?: Build|[;)])'
@@ -2056,7 +2066,7 @@ Advan:
       model: 'G3 Pro'
     - regex: '(S45E|50[46]1|505[89]|5062|S50H|I7D|S7D|S4Z|S5J\+|S4\+|i5C)(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'E1C_3G'
+    - regex: 'E1C[_ ]3G'
       device: 'tablet'
       model: 'E1C 3G'
     - regex: 'E1C Pro'
@@ -2071,13 +2081,16 @@ Advan:
 
 # Advance (advanceperu.com)
 Advance:
-  regex: 'Hollogram|(?:HL(?:4[79]36|6246|5576|5585|[56]575|5[67]67|6577|6256|7257|9000)|IntroTr3544|Pr(?:61(?:4[56]|50)|60[27]0|5[69]50)|Tr3845|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)|Tr3845|TR7989|SP[345]701)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit table models
     - regex: 'IntroTr3544|Tr3845'
       model: 'Intro'
       device: 'tablet'
+    - regex: 'TR7989'
+      model: 'TR7989'
+      device: 'tablet'
     - regex: 'SP([345]701)'
       model: 'SmartPad SP$1'
       device: 'tablet'
@@ -2085,7 +2098,7 @@ Advance:
       model: 'Prime PR$1'
       device: 'tablet'
     # explicit smartphone models
-    - regex: 'HL(4[79]36|6246|[56]575|5576|5585|5[67]67|6577|6256|7257|9000)'
+    - regex: 'HL(4[79]36|6246|[56]575|5576|5585|5[67]67|6[05]77|6256|7257|9000)'
       model: 'Hollogram HL$1'
     - regex: 'Hollogram ([^;/)]+)(?: Build|[;)])'
       model: 'Hollogram $1'
@@ -2729,6 +2742,8 @@ Allview:
       model: 'X$1 Soul Xtreme'
     - regex: 'X4_Soul_Infinity_(L|N|S|Z)'
       model: 'X4 Soul Infinity $1'
+    - regex: 'X4[_ ]Soul[_ ]Infinity[_ ]Plus'
+      model: 'X4 Soul Infinity Plus'
     - regex: 'X([34])_Soul_Lite'
       model: 'X$1 Soul Lite'
     - regex: 'X4_Soul_Mini_S(?:_TM)?'
@@ -2987,22 +3002,22 @@ Ainol:
       model: 'Novo 7 Fire'
     - regex: 'Novo7 ?Flame(?:[);/ ]|$)'
       model: 'Novo 7 Flame'
+    - regex: 'novo ?7[_ ]ELF(?:[);/ ]|$)'
+      model: 'Novo 7 Elf'
     - regex: 'NOVO7(?:[);/ ]|$)'
       model: 'Novo 7'
-    - regex: 'Numy[ _]([^;/]+) Build'
+    - regex: 'Numy[ _]([^;/)]+)(?: Build|[;)])'
       model: 'Numy $1'
-    - regex: 'Novo([0-9]+)[ \-]([^;/]+) Build'
+    - regex: 'Novo([0-9]+)[_ \-]([^;/)]+)(?: Build|[;)])'
       model: 'Novo $1 $2'
 
 # Archos (www.archos.com)
 Archos:
-  regex: '(?:YL-)?Archos|(?:A50TI|AC101BHE|AC50BHE|AC45NE|Logic Instrument Fieldbook F1B|X67 5G)(?:[);/ ]|$)'
+  regex: '(?:YL-)?Archos|(?:A50TI|AC101BHE|AC50BHE|AC45NE|X67 5G|AC45BHE|AC101PL3GV2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Archos (Oxygen (?:63|57|68XL))(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'Logic Instrument Fieldbook F1B'
-      model: 'Logic Instrument Fieldbook F1B'
     - regex: 'Archos 55 diamond Selfie'
       model: '55 Diamond Selfie'
     - regex: 'A50TI(?:[);/ ]|$)'
@@ -3011,6 +3026,8 @@ Archos:
       model: '40c Titanium v2'
     - regex: '45B Titanium'
       model: '45b Titanium'
+    - regex: 'AC45BHE'
+      model: '45b Helium'
     - regex: 'AC45NE(?:[);/ ]|$)'
       model: '45 Neon'
     - regex: 'X67 5G(?:[);/ ]|$)'
@@ -3035,18 +3052,27 @@ Archos:
     - regex: 'Archos Access 70 3G(?:[);/ ]|$)'
       device: 'tablet'
       model: '70 Access 3G'
+    - regex: 'Archos Access 101 3G V2'
+      device: 'tablet'
+      model: '101 Access 3G V2'
+    - regex: 'AC101PL3GV2'
+      device: 'tablet'
+      model: '101 Platinum 3G V2'
     - regex: 'Archos Oxygen 101S ARDOIZ(?:[);/ ]|$)'
       device: 'tablet'
       model: '101s Oxygen Ardoiz'
     - regex: 'Archos Oxygen 101S(?:[);/ ]|$)'
       device: 'tablet'
       model: '101s Oxygen'
-    - regex: 'Archos T ?101 4G(?:[);/ ]|$)'
+    - regex: 'Archos T ?(101X?) 4G(?:[);/ ]|$)'
       device: 'tablet'
-      model: 'T101 4G'
+      model: 'T$1 4G'
     - regex: 'Archos Core (101) 3G Ultra'
       device: 'tablet'
       model: 'Core $1 3G Ultra'
+    - regex: 'Archos Core 3g v4'
+      device: 'tablet'
+      model: 'Core 101 3G V4'
     - regex: 'Archos Core (70|101) 3G'
       device: 'tablet'
       model: 'Core $1 3G'
@@ -3281,7 +3307,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)(?:[);/ ]|$)|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'
+  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'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -3387,6 +3413,9 @@ Asus:
     - regex: '(?:ASUS_)?P00I'
       model: 'ZenPad 3S 10 LTE'
       device: 'tablet'
+    - regex: '(?:ASUS_)?P008'
+      model: 'ZenPad 3 8.0'
+      device: 'tablet'
     - regex: '(?:ASUS_)?P00C|P02[138]|P00L|P01T_1'
       model: 'ZenPad 10'
       device: 'tablet'
@@ -3473,7 +3502,7 @@ Asus:
       model: 'ZenFone 6'
     - regex: '(?:ASUS_)?ZS671KS'
       model: 'ZenFone 7 Pro'
-    - regex: '(?:ASUS_)?(?:ZS670KS|I002D)(?:[);/ ]|$)'
+    - regex: '(?:ASUS_)?(?:ZS670KS|I002D|AI2205_[AC])(?:[);/ ]|$)'
       model: 'ZenFone 7'
     - regex: '(?:ASUS_)?Z010D'
       model: 'ZenFone Max'
@@ -3550,6 +3579,9 @@ Asus:
     - regex: 'ZN220IC'
       device: 'desktop'
       model: 'Zen AiO ZN220IC'
+    - regex: '(K50IJ)(?:[);/ ]|$)'
+      device: 'desktop'
+      model: '$1'
 
     # peripheral detections
     - regex: 'Tinker Board( S)?'
@@ -3577,7 +3609,7 @@ Asus:
 
 # Audiovox
 Audiovox:
-  regex: 'Audiovox|CDM|UTS(?:TARCOM)?\-|audio(?!book)[a-z0-9\-]+'
+  regex: 'Audiovox|(?<!M5 lite )CDM|UTS(?:TARCOM)?\-|audio(?!book)[a-z0-9\-]+'
   device: 'smartphone'
   models:
     - regex: 'Audiovox[_\-]([a-z0-9\-]+)'
@@ -3691,7 +3723,7 @@ Bitel:
 
 # Blu
 Blu:
-  regex: 'BLU[ _]|(?:blu|(?<!DROIDZ )Dash)[ _]([^/;)]+)(?: Build|[;)])|(?:Studio[ _](G3|J8M|X10L|X12|5.0K|5.5|View XL|Mega|C 8\+8|[CGM][ _]HD|G2 HD|G4|[CGX]|SELFIE|Selfie LTE|Touch|M5 Plus|J[1258]|X8 HD|X10\+?|XL(?: 2)?)|Advance (4.0 ?[LM]|5.[02](?: HD)?|A4|L[45])|M6 2021|ENERGY (DIAMOND|XL)|ENERGY[_ ]DIAMOND[_ ]MINI|Energy X 2|LIFE XL|B110DL|Dash (?:X[2L]|L3)|PURE (?:X[LR]|MINI|View)|Life One X2|G50 (?:Mega|Plus)|G51 Plus|G90(?: PRO)?|G91 Pro|GRAND (?:M3|Max|5.5 HD|XL LTE|Mini|Energy)|R1 (?:HD|PLUS)|R2 (?:LTE|Plus)|Tank Xtreme [45].0|Tank Xtreme(?: Pro)?|Touchbook M7 Pro|DASH X PLUS|C[456] 2019|BOLD (?:M7|N1)|B1[34]0DL|Vivo (?:5 Mini|One Plus|5R|XL[234]| Plus|8L|XI[+]?|GO)|(?<!Neffos )C[56]L(?: 2020)?|C6 2020|G9 PRO|D701|VIEW 1|B131DL|R2 3G|Grand (?:M2X?|XL|M2 LTE)|D600|D5[01]0|DIAMOND M|M8L Plus|STUDIO ENERGY)(?:[);/ ]|$)'
+  regex: 'BLU[ _]|(?:blu|(?<!DROIDZ )Dash)[ _]([^/;)]+)(?: Build|[;)])|(?:Studio[ _](G3|J8M|X10L|X12|5.0K|5.5|View(?: XL)?|Mega(?: LTE)?|C 8\+8|[CGM][ _]HD|G2 HD|G4|[CGX]|SELFIE|Selfie LTE|Touch|M[45] Plus|J[1258]|X[89] HD|X10\+?|XL(?: 2)?)|Advance (4.0 ?[LM]|5.[02](?: HD)?|A4|L[45])|M6 2021|ENERGY (DIAMOND|XL)|ENERGY[_ ]DIAMOND[_ ]MINI|Energy X 2|LIFE XL|B110DL|Dash (?:X[2L]|L3)|PURE (?:X[LR]|MINI|View)|Life One X2|G50 (?:Mega|Plus)|G51 Plus|G90(?: PRO)?|G91 Pro|GRAND (?:M3|Max|5.5 HD|XL LTE|Mini|Energy)|R1 (?:HD|PLUS)|R2 (?:LTE|Plus)|Tank Xtreme [45].0|Tank Xtreme(?: Pro)?|Touchbook M7 Pro|DASH X PLUS|C[456] 2019|BOLD (?:M7|N1)|B1[34]0DL|Vivo (?:5 Mini|One Plus|5R|XL[234]| Plus|8L|XI[+]?|GO)|(?<!Neffos )C[56]L(?: 2020)?|C6 2020|G9 PRO|D701|VIEW 1|B131DL|R2 3G|Grand (?:M2X?|XL|M2 LTE)|D600|D5[01]0|DIAMOND M|M8L Plus|STUDIO ENERGY|M8L 2022|LIFE X8|M10L Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Advance (4.0 ?[LM]|4.0|5.[02](?: HD)?|A4|L[54])'
@@ -3702,7 +3734,7 @@ Blu:
       model: 'Studio X Mini'
     - regex: 'Studio X10 2022'
       model: 'Studio X10 (2022)'
-    - regex: '(?:BLU[_ ])?Studio[ _](G3|J8M|5.0 C|5.5|C 5\+5 LTE|View XL|Mega|C 8\+8|G HD LTE|[CG][ _]HD|C|G|Touch|M HD|G2 HD|M5 Plus|J[1258]|X8 HD|X5|X10\+?|XL(?: 2)?|X|G4)(?:[);/ ]|$)'
+    - 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(?:[);/ ]|$)'
       model: 'Studio 5.0 K'
@@ -3760,6 +3792,8 @@ Blu:
       model: 'Life One'
     - regex: 'LIFE X LTE'
       model: 'Life X LTE'
+    - regex: 'LIFE X8'
+      model: 'Life X8'
     - regex: 'LIFE MARK'
       model: 'Life Mark'
     - regex: 'NEO X PLUS'
@@ -3846,8 +3880,14 @@ Blu:
     - regex: 'Touchbook M7 Pro'
       model: 'Touchbook M7 Pro'
       device: 'tablet'
-    - regex: 'M8L Plus'
-      model: 'M8L Plus'
+    - regex: 'M(8|10)L Plus'
+      model: 'M$1L Plus'
+      device: 'tablet'
+    - regex: 'M(10)L Pro'
+      model: 'M$1L Pro'
+      device: 'tablet'
+    - regex: 'M8L (2022)'
+      model: 'M8L ($1)'
       device: 'tablet'
     - regex: 'STUDIO 7.0 II'
       model: 'Studio 7.0" II'
@@ -3872,12 +3912,12 @@ Bluegood:
 
 # Blackview
 Blackview:
-  regex: 'Blackview|(BL8800|BV([24-9]000|8800|[46]900|(5[1589]|9[15689])00|6[1368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550|BV9700Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))|(?:SOLID 4 G2|A[86]0Plus|A80S|BL6000Pro|BL8800Pro|R6 Lite|P2Lite|A8 MAX|A30-RU|A20Pro|Android 10;(?: [\w-]+;)? Tab[89]|Android 1[12];(?: [\w-]+;)? (?:A[79]0|A70 Pro|A55 Pro|Tab 1[0135]|Tab 6)|BV500|BV[579]200)(?:[);/ ]|$)'
+  regex: 'Blackview|(BL8800|BV([24-9]000|8800|[46]900|(5[1589]|9[135689])00|6[1368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550|BV9700Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))|(?:SOLID 4 G2|A[86]0Plus|A80S|BL6000Pro|BL8800Pro|R6 Lite|P2Lite|A8 MAX|A30-RU|A20Pro|Android 10;(?: [\w-]+;)? Tab[89]|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:A80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A95)|Android 1[12];(?: [\w-]+;)? (?:A[79]0|A70 Pro|A55 Pro|Tab 1[01356]|Tab 6)|BV500|BV[579]200|SOLID_4G1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A([2678]0|55) ?Pro(?:[);/ ]|$)'
       model: 'A$1 Pro'
-    - regex: 'A([679]0)(?: Build|[;)])'
+    - regex: 'A([6798]0|95)(?: Build|[;)])'
       model: 'A$1'
     - regex: 'A8 MAX(?:[);/ ]|$)'
       model: 'A8 Max'
@@ -3897,6 +3937,8 @@ Blackview:
       model: '$1 Pro'
     - regex: 'Blackview (A[78]|E7S)'
       model: '$1'
+    - regex: 'SOLID_4G1'
+      model: 'Solid-4 G1'
     - regex: 'SOLID 4 G2'
       model: 'Solid-4 G2'
     - regex: '(BV6[13]00)(?:[);/ ]|$)'
@@ -3907,13 +3949,16 @@ Blackview:
     - regex: '(BV\d+[\w]?|P10000)(?:[-_](?:RU|F))?(?:[);/ ]|$)'
       model: '$1'
 
-    - regex: 'Tab 10 Pro(?:[);/ ]|$)'
+    - regex: 'Tab (1[05]) Pro(?:[);/ ]|$)'
       device: 'tablet'
-      model: 'Tab 10 Pro'
+      model: 'Tab $1 Pro'
     - regex: ' Tab ?(6 Kids)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1'
-    - regex: ' Tab ?([689]|1[0135])(?:[);/ ]|$)'
+    - regex: 'Tab 11 SE(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab 11 SE'
+    - regex: ' Tab ?([689]|1[01356])(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab $1'
 
@@ -4069,7 +4114,7 @@ VGO TEL:
 
 # Vivo (vivo.com.cn, vivo.com)
 Vivo:
-  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|(?:V1730(D[AT]|GA)|V18(01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2044|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[12368]|I2127|V211[4-8]A?|V204[57]A?|V210[28]A?|I2009|I2017|I2022|V215[4678]A|V215[0-478]|V218[0358]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|V220[37]A|V220[1-9]|V221[789]A|V221[247]|V222[079]A|V222[18]|V22[34]1A|V224[234]A|V223[18]A|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|iQOO U1x?)(?:[);/ ]|$)'
+  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|iQOO Neo \d|(?:V1730(D[AT]|GA)|V18(01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2044|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[12368]|I2127|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|V220[37]A|V220[1-9]|V221[789]A|V221[247]|V222[079]A|V222[18]|V22[34]1A|V224[234]A|V224[67]|V2266A|V2301A|V223[189]A|V223[017]|V2254A|V228[34]A|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|iQOO U[13]x?|NEX 3s 5G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PA2170(?:[);/ ]|$)'
@@ -4081,6 +4126,9 @@ Vivo:
     - regex: 'V2178A'
       device: 'phablet'
       model: 'X Fold'
+    - regex: 'V2266A'
+      device: 'phablet'
+      model: 'X Fold 2'
     - regex: 'V2229A'
       device: 'phablet'
       model: 'X Fold+'
@@ -4105,6 +4153,8 @@ Vivo:
       model: 'iQOO 10'
     - regex: 'V2243A'
       model: 'iQOO 11'
+    - regex: 'V2254A'
+      model: 'iQOO 11 Pro'
     - regex: 'I192[78](?:[);/ ]|$)'
       model: 'iQOO 3 5G'
     - regex: 'V2165A(?:[);/ ]|$)'
@@ -4121,7 +4171,7 @@ Vivo:
       model: 'iQOO Neo 7 SE'
     - regex: 'V2157A'
       model: 'iQOO Neo 5 SE'
-    - regex: 'V2154A'
+    - regex: 'V2154A|iQOO Neo 5S'
       model: 'iQOO Neo 5S'
     - regex: 'I2012(?:[);/ ]|$)'
       model: 'iQOO 7 5G'
@@ -4131,13 +4181,15 @@ Vivo:
       model: 'iQOO Pro 5G'
     - regex: 'V1914A(?:[);/ ]|$)'
       model: 'iQOO Neo'
-    - regex: 'V1981A(?:[);/ ]|$)'
+    - regex: '(?:V1981A|iQOO Neo 3)(?:[);/ ]|$)'
       model: 'iQOO Neo 3'
     - regex: 'V1936A[L]?(?:[);/ ]|$)'
       model: 'iQOO Neo 855'
+    - regex: 'V2301A'
+      model: 'iQOO Neo 8'
     - regex: 'V2055A(?:[);/ ]|$)'
       model: 'iQOO Neo 5'
-    - regex: 'V2118A(?:[);/ ]|$)'
+    - regex: '(?:V2118A|iQOO Neo 5 Lite)(?:[);/ ]|$)'
       model: 'iQOO Neo 5 Lite'
     - regex: 'V2199A(?:[);/ ]|$)'
       model: 'iQOO Neo 6 SE'
@@ -4167,7 +4219,7 @@ Vivo:
       model: 'iQOO U1'
     - regex: '(?:V2065A|iQOO U1x)(?:[);/ ]|$)'
       model: 'iQOO U1x'
-    - regex: 'V2061A(?:[);/ ]|$)'
+    - regex: '(?:V2061A|iQOO U3)(?:[);/ ]|$)'
       model: 'iQOO U3'
     - regex: 'V2143A(?:[);/ ]|$)'
       model: 'iQOO U3x'
@@ -4207,6 +4259,8 @@ Vivo:
       model: 'Nex 3S'
     - regex: 'vivo NEX S(?:[);/ ]|$)'
       model: 'Nex S'
+    - regex: 'NEX 3s 5G(?:[);/ ]|$)'
+      model: 'Nex 3S 5G'
     - regex: 'vivo NEX A(?:[);/ ]|$)'
       model: 'Nex A'
     - regex: 'vivo NEX(?:[);/ ]|$)'
@@ -4251,6 +4305,12 @@ Vivo:
       model: 'V25 SE'
     - regex: 'V220[19]'
       model: 'V25e'
+    - regex: 'V2230'
+      model: 'V27 Pro'
+    - regex: 'V2237'
+      model: 'V27e'
+    - regex: 'V22(?:31|46)'
+      model: 'V27'
     - regex: 'V1932[AT](?:[);/ ]|$)'
       model: 'S5'
     - regex: 'V2207A'
@@ -4263,8 +4323,14 @@ Vivo:
       model: 'S15e'
     - regex: 'V2244A'
       model: 'S16'
+    - regex: 'V2239A'
+      model: 'S16e'
     - regex: 'V2020C?A(?:[);/ ]|$)'
       model: 'S7'
+    - regex: 'V2283A'
+      model: 'S17'
+    - regex: 'V2284A'
+      model: 'S17 Pro'
     - regex: 'V2031EA(?:[);/ ]|$)'
       model: 'S7e'
     - regex: 'V2080A(?:[);/ ]|$)'
@@ -4389,7 +4455,7 @@ Vivo:
       model: 'X90 Pro'
     - regex: 'V2227A'
       model: 'X90 Pro+'
-    - regex: 'V2185A|V2145'
+    - regex: 'V218[56]A|V2145'
       model: 'X80 Pro'
     - regex: 'V2208(?:[);/ ]|$)'
       model: 'X80 Lite 5G'
@@ -4521,6 +4587,8 @@ Vivo:
       model: 'Y33s (2022)'
     - regex: 'V2205(?:[);/ ]|$)'
       model: 'Y35'
+    - regex: 'V2247(?:[);/ ]|$)'
+      model: 'Y36'
     - regex: 'V1934A(?:[);/ ]|$)'
       model: 'Y5s'
     - regex: '(?:V1965A|vivo 1935)(?:[);/ ]|$)'
@@ -4744,7 +4812,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]|BP_6010'
+  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)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Discovery[_ ](1000|111|10[28])C'
@@ -4767,21 +4835,27 @@ Blaupunkt:
       model: 'Atlantis $1'
     - regex: 'SLplus02'
       model: 'SL Plus 02'
-    - regex: '(BP_6010)'
-      model: '$1'
+    - regex: 'BP_(6010|6110)'
+      model: 'BP $1'
     - regex: 'Blaupunkt[_ ](SL[_ ]0[124]|SM[_ ]0[12])'
       device: 'smartphone'
       model: '$1'
-    - regex: '(SF02)'
+    - regex: '(SF02|SL05)'
       device: 'smartphone'
       model: '$1'
+    - regex: 'SM 02 2019'
+      device: 'smartphone'
+      model: 'SM 02 (2019)'
     - regex: '(4K Android TV)'
       device: 'tv'
       model: '$1'
+    - regex: 'B-STREAM'
+      device: 'tv'
+      model: 'Box Stream'
 
 # Bmobile
 Bmobile:
-  regex: 'Bmobile[_ ]|B60Pro(?:_MV03)?|BL50P_TG0[567]|BL51_MV05|BL54_?Pro|(?:B50Pro|BL50|BL60_TG(?:05|17)|BL60M_MV05|FUN 4 2018|AX686A|AX-?(?:[1-9][0-9]{2,3}[eEO+]?|7OO))(?:[);/ ]|$)'
+  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))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'AX-?([1-9][0-9]{2,3}[eAEO+]?)'
@@ -4800,8 +4874,8 @@ Bmobile:
       model: 'B50 Pro'
     - regex: 'BL50P_TG0[567](?:[);/ ]|$)'
       model: 'BL50 Pro'
-    - regex: 'BL50(?:[);/ ]|$)'
-      model: 'BL50'
+    - regex: 'BL(5[02])(?:[);/ ]|$)'
+      model: 'BL$1'
     - regex: 'BL51_MV05(?:[);/ ]|$)'
       model: 'BL51'
     - regex: 'BL54_?Pro'
@@ -5145,6 +5219,9 @@ bq:
     - regex: 'BQ-1085L(?:[);/ ]|$)'
       model: 'Hornet Max Pro'
       device: 'tablet'
+    - regex: 'BQ-1036L'
+      model: 'Exion Advant'
+      device: 'tablet'
     - regex: 'BQ-1084L(?:[);/ ]|$)'
       model: 'Hornet Max'
       device: 'tablet'
@@ -5189,6 +5266,9 @@ bq:
     - regex: 'BQ-9055L'
       model: 'Exion Pro Mini'
       device: 'tablet'
+    - regex: 'BQ-8088L'
+      model: 'Exion Surf'
+      device: 'tablet'
     - regex: 'BQ-7062G(?:[);/ ]|$)'
       model: 'Fiji'
       device: 'tablet'
@@ -5332,11 +5412,11 @@ Casio:
 
 # Casper (casper.com.tr)
 Casper:
-  regex: 'CASPER[_ ]|VIA[- _]([XF]20|T7D|A[34]|E[43]|E30|F[123]|G[345]|M4|[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)(?:[);/ ]|$)'
+  regex: 'CASPER[_ ]|VIA[- _](X30 Plus|[XF]20|T7D|A[34]|E[43]|E30|F[123]|G[345]|M4|[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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(?:CASPER[_ ])?VIA_A1_Plus(?:_64)?'
-      model: 'VIA A1 Plus'
+    - regex: '(?:CASPER[_ ])?VIA[_ ](A1|X30)[_ ]Plus(?:_64)?'
+      model: 'VIA $1 Plus'
     - regex: '(?:CASPER[_ ])?VIA[_ ]([XF]20|G1_Plus|F30 Plus|A3_Plus|G[135]|E[14]|E30|[AE]2|M[123]|V[35689]|V10|G3|V6X|A[34]|E3|F[123]|G4|M4|P[23]|S|V8C|A1(?:_1)?)(?:[);/ ]|$)'
       model: 'VIA $1'
     - regex: 'CASPER_VIA_E1c'
@@ -5359,7 +5439,7 @@ Casper:
 
 # Cat (Caterpillar, Catphones)
 Cat:
-  regex: 'Cat ?(tablet|stargate|nova)|(?:B15Q|CAT B35|CAT-B100|S62 Pro|S48c|Android 9;(?: [\w-]+;)? S52|Android 10;(?: [\w-]+;)? S42)(?:[);/ ]|$)'
+  regex: 'B30_Dorado|Cat ?(tablet|stargate|nova)|(?:B15Q|CAT B35|CAT-B100|S62 Pro|S48c|Android 9;(?: [\w-]+;)? S52|Android 10;(?: [\w-]+;)? S42)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'B15Q'
@@ -5382,17 +5462,20 @@ Cat:
     - regex: 'CAT-(B100)'
       device: 'feature phone'
       model: '$1'
+    - regex: '(B30)_Dorado'
+      device: 'feature phone'
+      model: '$1'
 
 # Carrefour
 Carrefour:
-  regex: 'CT(?:10[0123]0|7[12]0|820|735_16GB|1005)(?:W|FR)?(?:[);/ ]|$)'
+  regex: 'CT(?:10[0123]0|7[12]0|820|735_16GB|1056_32GB|1005)(?:W|FR)?(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'CT820'
       model: 'Touch Tablet Neo2'
     - regex: 'CT(10[0123]0(?:W|FR)?)'
       model: 'CT$1'
-    - regex: 'CT(7[12]0(?:W|FR)?|735|1005)'
+    - regex: 'CT(7[12]0(?:W|FR)?|735|1005|1056)'
       model: 'CT$1'
 
 # Celcus
@@ -5439,10 +5522,10 @@ Cellution:
   regex: 'Cosmas|CT_Cosmas_V|PADUA'
   device: 'smartphone'
   models:
+    - regex: '(?:CT_)?Cosmas_(TF|[VF])'
+      model: 'Cosmas $1'
     - regex: 'Cosmas'
       model: 'Cosmas'
-    - regex: 'CT_Cosmas_V'
-      model: 'Cosmas V'
     - regex: 'PADUA'
       model: 'Padua'
 
@@ -5470,7 +5553,7 @@ Changhong:
 
 # China Mobile
 'China Mobile':
-  regex: '(M812C|1501_M02|9930i|A1303|A309W|M651CY|M653|CMCC[ -]M(?:670|860))(?: Build|[);]|$)'
+  regex: '(M812C|1501_M02|9930i|A1303|A309W|M651CY|M653|CMCC[ -]M(?:670|860)|M762G)(?: Build|[);]|$)'
   device: 'smartphone'
   models:
     - regex: 'M651CY'
@@ -5479,6 +5562,8 @@ Changhong:
       model: 'N5 Pro'
     - regex: 'M653'
       model: 'A3s'
+    - regex: 'M762G'
+      model: 'N5'
     - regex: '(M812C|1501_M02|9930i|A1303|A309W|M670)'
       model: '$1'
 
@@ -5508,15 +5593,17 @@ Compal:
 
 # Artel (artelgroup.org)
 Artel:
-  regex: 'Artel[_ ]|\w+_ARTEL_\w+|(?: GAP|GAP YOQ| ALO|U1 MINI|Android 8.+; U4(?!/))(?:[);/ ]|$)'
+  regex: 'Artel[_ ]|\w+_ARTEL_\w+|(?: GAP|GAP YOQ| ALO|U1 MINI|Android 8(?:[\d.]*);(?: [\w-]+;)? U[124](?!/)|U3_4G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: ' GAP|GAP YOQ(?:[);/ ]|$)'
       model: 'Gap Yo Q'
     - regex: 'U1 MINI(?:[);/ ]|$)'
       model: 'U1 Mini'
-    - regex: 'Android 8.+ U4(?:[);/ ]|$)'
-      model: 'U4'
+    - regex: 'U3_4G(?:[);/ ]|$)'
+      model: 'U3 4G'
+    - regex: ' U([124])(?:[);/ ]|$)'
+      model: 'U$1'
     - regex: ' ALO(?:[);/ ]|$)'
       model: 'Allo'
     - regex: 'Artel[_ ](Quadro(?: Pro)?|Tesla|Air|Tomchi|Premium|U3_4G|Z5|Sentinel (?:X 8G|X D5|X)|T10|T21)'
@@ -5525,6 +5612,8 @@ Artel:
       model: 'Komi 3'
     - regex: 'Artel[_ ]Q21_PRO'
       model: 'Q21 Pro'
+    - regex: 'Artel[_ ]Q21'
+      model: 'Q21'
     - regex: 'Artel[_ ](Star|Nova|Connect|Choice|Style)'
       model: '$1'
       device: 'tablet'
@@ -5624,7 +5713,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)(?:[);/ ]|$)|CTAB[^/;]+ Build'
+  regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX71[12]G|TFX71[34]L|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411|SP413)(?:[);/ ]|$)|CTAB[^/;]+ Build'
   device: 'smartphone'
   models:
     - regex: 'CTAB([^/;]+) Build'
@@ -5674,6 +5763,8 @@ Condor:
       model: 'G2S'
     - regex: 'PGN-?513'
       model: 'Griffe G4'
+    - regex: 'SP413'
+      model: 'Griffe T1'
     - regex: 'PKT411'
       model: 'Griffe G2'
     - regex: 'PHQ519'
@@ -5752,7 +5843,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])(?:[);/ ]|$)|(8295|5860S) Build'
+  regex: '(?:YL-)?Coolpad|(?:Cool_9S|1824-S0|8190Q|1831-A0|8676-[AM]01|1872-A0|CP8298_I00|CP3648AT?|CP8676_I0[23]|REVVLPLUS C3701A|VCR-[AI]0|C105-(?:8|E0)|C106-[789]|C107-9| C106|MTS-T0|cp3705A[S]?|ORL-C0|DLS-E0|182[56]-I01|1825-E0| 1825|8298-(?:M02|A01)|5560S|CP3320AS2|CP3667AT|CP3706AS|CP3669AS|CP3321AT|CP350[34]L|C103|CP03|C1-U02|SAC-A0| 203[29]|CP05)(?:[);/ ]|$)|(8295|5860S) Build'
   device: 'smartphone'
   models:
     - regex: 'VCR-[AI]0'
@@ -5811,6 +5902,8 @@ Coolpad:
       model: 'Cool 9S'
     - regex: 'CP03(?:[);/ ]|$)'
       model: 'Cool 20'
+    - regex: 'CP05(?:[);/ ]|$)'
+      model: 'Cool 20 Pro'
     - regex: 'SAC-A0(?:[);/ ]|$)'
       model: '26' # Tibetan Peak Edition
     - regex: '5560S(?:[);/ ]|$)'
@@ -5856,7 +5949,7 @@ Clarmin:
 
 # CORN (corn-mobile.com)
 CORN:
-  regex: 'CORN[_ ]|(?:C55 Pro|C60 Ultra|Fenix8_3G|Note1|Tronik_1|Star7 3G)(?:[);/ ]|$)'
+  regex: 'CORN[_ ]|(?:C55 Pro|C60 Ultra|Fenix8_3G|Note1|Tronik_[123]|Star7 3G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(C55 Pro|C60 Ultra|Star7 3G)(?:[);/ ]|$)'
@@ -5867,8 +5960,8 @@ CORN:
       model: 'Note 1'
     - regex: 'CORN R([124])0'
       model: 'R$10'
-    - regex: 'Tronik_1(?:[);/ ]|$)'
-      model: 'Tronik 1'
+    - regex: 'Tronik_(\d)(?:[);/ ]|$)'
+      model: 'Tronik $1'
     - regex: 'CORN[_ ]X(4|55|5)'
       model: 'X$1'
 
@@ -5962,7 +6055,7 @@ Crown:
 
 # AllDocube (alldocube.com)
 AllDocube:
-  regex: '(?:T1001XS?|T1006S?|T1001|iPlay[_ ][2345]0|U1006H?|U63PLUS|iPlay8|iPlay_?[89]T|iPlay[134]0|iPlay_40H|iPlay_?20[SP]|kPad|X_Game|T806MHE?|Power M3|Smile_X)(?:[);/ ]|$)'
+  regex: '(?:T1001XS?|T1006S?|T1001|iPlay[_ ][2345]0|U1006H?|U63PLUS|iPlay8|iPlay_?[89]T|iPlay[134]0|iPlay_40H|iPlay50 Pro|iPlay_?20[SP]|kPad|X_Game|T806MHE?|Power M3|Smile_X)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Smile_X(?:[);/ ]|$)'
@@ -5985,6 +6078,8 @@ AllDocube:
       model: 'iPlay 10 Pro 10.1"'
     - regex: 'T806MHE?'
       model: 'iPlay 8 Pro'
+    - regex: 'iPlay50 Pro'
+      model: 'iPlay 50 Pro'
     - regex: 'iPlay[_ ]?([1-5]0|[89]T?|40H|20[sP])(?:[);/ ]|$)'
       model: 'iPlay $1'
     - regex: 'X_Game(?:[);/ ]|$)'
@@ -6006,7 +6101,7 @@ MyTab:
 
 # Cube (short name Alldocube)
 Cube:
-  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)|(?:T8-PLUSM?S?|T8PLUSML|I1-TF[BD]?|I1-TC|i15-T[CG]|I1_3GD|i1002S|Iwork10 Flagship|iwork10 Pro|T10 PLUS|CUBE-T970|U55GT_C8)(?:[);/ ]|$)'
+  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)|(?:T8-PLUSM?S?|T8PLUSML|I1-TF[BD]?|I1-TC|i15-T[CG]?|I1_3GD|i1002S|Iwork10 Flagship|iwork10 Pro|T10 PLUS|CUBE-T970|U55GT_C8)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'U27GT-C8X?'
@@ -6019,7 +6114,7 @@ Cube:
       model: 'Talk 8'
     - regex: 'U55GT_C8'
       model: 'Talk 79'
-    - regex: 'U51GT-SL'
+    - regex: 'U51GT-SL|U51GT-C8'
       model: 'Talk 7X'
     - regex: 'U31GT'
       model: 'Talk 10'
@@ -6039,6 +6134,8 @@ Cube:
       model: 'iWork 8 Ultimate'
     - regex: 'i15-TG(?:[);/ ]|$)'
       model: 'iWork 10 Ultimate'
+    - regex: 'i15-T(?:[);/ ]|$)'
+      model: 'iWork 10'
     - regex: '(?:i1002S|iwork10 Pro)(?:[);/ ]|$)'
       model: 'iWork 10 Pro'
     - regex: 'Iwork10 Flagship|i15-TC(?:[);/ ]|$)'
@@ -6067,7 +6164,7 @@ Meta:
 
 # CUBOT (www.cubot.net)
 CUBOT:
-  regex: 'CUBOT|(?<!QUMO )QUEST(?!(?:[0-9]|\s[0-9]))(?: LITE)?|(?:(?<!(?:Redmi|Tegra) )NOTE 7|NOTE 20(?: PRO)?|RAINBOW 2|KING_KONG_3|KINGKONG [567]|KINGKONG 5 Pro|ZORRO 001|KINGKONG[_ ]MINI2?|KING KONG CS|R15_PRO|S550 Pro| CHEETAH| [RX]19|X19 S|(?<!MI )MAX 3|Android 9;(?: [\w-]+;)? (?:J5|MAX 2)|Android [89](?:[\d.]*);(?: [\w-]+;)? R15|Android 11;(?: [\w-]+;)? (?:Pocket|NOTE 9)|POCKET 3)(?:[);/ ]|$)'
+  regex: 'CUBOT|(?<!QUMO )QUEST(?!(?:[0-9]|\s[0-9]))(?: LITE)?|(?:(?<!(?:Redmi|Tegra) )NOTE 7|(?<!Galaxy )NOTE 20(?: PRO)?|RAINBOW 2|KING_KONG_3|KINGKONG [5679]|KINGKONG 5 Pro|ZORRO 001|KINGKONG[_ ](?:MINI2?|POWER)|KING KONG CS|R15_PRO|S550 Pro| CHEETAH| [RX]19|X19 S|(?<!MI )MAX 3|Android 9;(?: [\w-]+;)? (?:J5|MAX 2)|Android [89](?:[\d.]*);(?: [\w-]+;)? R15(?! Dream Mirror)|Android 11;(?: [\w-]+;)? (?:Pocket|NOTE 9|P50)|POCKET 3)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'POCKET (3)'
@@ -6082,6 +6179,8 @@ CUBOT:
       model: 'Rainbow'
     - regex: 'DINOSAUR'
       model: 'Dinosaur'
+    - regex: 'KINGKONG POWER'
+      model: 'King Kong Power'
     - regex: 'KINGKONG MINI2 Pro'
       model: 'King Kong Mini 2 Pro'
     - regex: 'KINGKONG MINI ?([23])'
@@ -6090,7 +6189,7 @@ CUBOT:
       model: 'King Kong Mini'
     - regex: 'KINGKONG 5 Pro'
       model: 'King Kong 5 Pro'
-    - regex: 'KING[_ ]?KONG[_ ]([3567])'
+    - regex: 'KING[_ ]?KONG[_ ]([35679])'
       model: 'King Kong $1'
     - regex: 'KING KONG CS'
       model: 'King Kong CS'
@@ -6132,7 +6231,7 @@ CUBOT:
       model: 'X18 Plus'
     - regex: 'CUBOT[ _](A5|C6W|H3|J3|P7|P20|[RXJ]9|R11|X18)(?:[);/ ]|$)'
       model: '$1'
-    - regex: ' (X19 S|[RX]19|R15|J5)(?:[);/ ]|$)'
+    - regex: ' (X19 S|[RX]19|R15|J5|P[56]0)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'CUBOT ([^;/]+) Build'
       model: '$1'
@@ -6277,7 +6376,7 @@ Denver:
 
 # Dell
 Dell:
-  regex: 'Dell[^a-z]|Venue|XCD35|Latitude \d{4}|Inspiron N?\d{4}|Inspiron 13'
+  regex: 'Dell[^a-z]|Venue|XCD35|Latitude E?\d{4}|Inspiron N?\d{4}|Inspiron 13|Vostro (?:3546|14-3468)'
   device: 'smartphone'
   models:
     - regex: 'XCD35'
@@ -6293,6 +6392,9 @@ Dell:
     - regex: '(OptiPlex (?:3050|7010))'
       device: 'desktop'
       model: '$1'
+    - regex: 'Vostro (3546|14-3468)'
+      device: 'desktop'
+      model: 'Vostro $1'
     - regex: 'Chromebook (\d{2} \(\d{4}\))'
       device: 'desktop'
       model: 'Chromebook $1'
@@ -6300,7 +6402,7 @@ Dell:
     - regex: '(?:Dell )?(Streak|Venue) ?([^/;]*) Build'
       model: '$1 $2'
       device: 'tablet'
-    - regex: '(?:Dell Inc./)?(XPS 13 9360|Latitude (?:7480|7390)|Inspiron N?\d{4}|Inspiron 13-\d{4})(?:[);/ ]|$)'
+    - regex: '(?:Dell Inc./)?(XPS 13 9360|Latitude (?:7480|7390|E4310)|Inspiron N?\d{4}|Inspiron 13-\d{4})(?:[);/ ]|$)'
       device: 'desktop'
       model: '$1'
     - regex: 'Dell; ((?:Streak|Venue)[^;/\)]*)'
@@ -6323,7 +6425,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])|M445|M[12]10|T155|H32F8000C|U43F8000Q|A(?:1[456]0|340|[34]55)|GS15[035]|GL[23]55|G25[035]|G355|G550|G15[05]|ES750|XL150|Z[1-4]55|H[13]70|H[34]10|P[45]10|L2[17]0)|Z250|A440|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[45]70|S[127]70i|S180i?|S770|A555(?! Universe)|(?:U50G8000QG|U43G9000CG|U43F8100QG|U55G8000QG|U50G9000CG|H32H8001C|H32G8000CG|H32F8000QG(?:-a)?|H32F8[01]00Q|H39F8000Q|U43H8000E|U43F8000EG|F43F8000QG?|F32[FG]8000C|H24H8000C|H24F8000Q)(?:-[Afed])?|Android 8(?:[\d.]*);(?: [\w-]+;)? A240|android 10;(?: [\w-]+;)? (?:B[23]1|B38|B1[87]|K28)|android 9;(?: [\w-]+;)? (?:K18|K21|B11)|android 11;(?: [\w-]+;)? (?:D[12]1|T21|K[345]1|K[342]8|K61|C37|B28|B27)|H32H8051C-G)(?:[);/ ]|$)'
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|Larus_TV1|Ixion(?:ML4.7|ES250)|M150Storm|(?:SENIOR|F4[38]D8000K|VA(?:[12]10|170)|ML450|MS[56]50|BL(?:[123]50|160|155)|BS(?:155|160|[1256]50)|(?<!ILIUM )S(?:3[78]0|2[89]0|670)|AL(?:[12]40|[23]50)|AS(?:155|[123]60)| (?:B260|B245|H[12]10|H270|L470|N280i|P310|P380i?|R1[18]0|Q110|E1[78]0|E[12]10|B(?:450|340|35[05])|M170|M445|M[12]10|T155|H32F8000C|U43F8000Q|A(?:1[456]0|340|[34]55)|GS15[035]|GL[23]55|G25[035]|G355|G550|G15[05]|ES750|XL150|Z[1-4]55|H[13]70|H[34]10|P[45]10|L2[17]0)|Z250|A440|(?<!MITO )A350(?! TV)|N[13]80i|(?<!Blade )L1[178]0|L3[17]0i|(?<!VOX )G450|G660|Q[123]10|Q[12]80|N[234]10|N[35]70|EX111|S[245]70|S[127]70i|S169|S110|S180i?|S770|A555(?! Universe)|(?:U75H8000K|U50H8000E|U65H8000K|U50G8000QG|U55H8050E|U43G9000CG|U43F8100QG|U55G8000QG|U50G9000CG|H32H8001C|H32G8000CG|H32F8000QG?(?:-[abc])?|H32F8[01]00Q|H39F8000Q|F43H8000K|U43H8000E|U43F8000EG|F43F8000[CQ]G?|F32[FG]8000C|F43G8000C|H24H8000C|H24F8000Q|F43F8000Q-G)(?:-[AbcfedH])?|Android 8(?:[\d.]*);(?: [\w-]+;)? A240|android 10;(?: [\w-]+;)? (?:B[23]1|B38|B1[87]|K28|K[34]1)|android 9;(?: [\w-]+;)? (?:K18|K21|B11)|android 11;(?: [\w-]+;)? (?:D[12]1|T21|K[345]1|K[342]8|K61|C3[78]|B28|B27|H28)|H32H8051C-G|H3218000K|U50H8050EG|H32I8000K|U65G8000Q|U43G8100QG|Android 11;(?: [\w-]+;)? P11)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:DEXP_)?(ML450|MS[56]50|ES750|XL150|ES1050)(?:[);/ ]|$)'
@@ -6353,19 +6455,25 @@ DEXP:
       model: '6.22" AS360'
       device: 'phablet'
 
+    - regex: 'Ursus 9EV mini 3G'
+      model: 'Ursus 9EV Mini 3G'
+      device: 'tablet'
     - 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|C37)(?:[);/ ]|$)'
+    - 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|S770|S180i?)(?:[);/ ]|$)'
+    - 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)(?:[);/ ]|$)'
       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|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'
@@ -6377,7 +6485,7 @@ DEXP:
       device: 'console'
       model: 'Freya'
 
-    - regex: '([HFU]\d{2}[A-Z]\d{4}[A-Z]{1,2}|AL-2020|H32H8051C-G)(?:-[Afed])?(?:[);/ ]|$)'
+    - regex: '([HFU]\d{2}[A-Z]\d{4}[A-Z]{1,2}|AL-2020|H32F8000Q|H32[1I]8000K|H32H8051C-G|F43F8000Q-G)(?:-[AbcfedH]|U50H8050EG|U65G8000Q)?(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
 
@@ -6434,17 +6542,17 @@ Digi:
   device: 'smartphone'
   model: '$1'
 
-# Digicel
+# Digicel (digicelgroup.com)
 Digicel:
-  regex: 'DIGICEL|DL3(?:PlusPro)?(?:[);/ ]|$)'
+  regex: 'DIGICEL|(?:DL3(?:PlusPro)?|DL501)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'DL3PlusPro'
       model: 'DL3 Plus Pro'
     - regex: 'DL3(?:[);/ ]|$)'
       model: 'DL3'
-    - regex: 'DL755'
-      model: 'DL755'
+    - regex: 'DL(755|501)'
+      model: 'DL$1'
     - regex: 'DL810'
       model: 'DL810'
     - regex: 'DIGICEL[ _]([^/);]+)(?: Build|[;)])'
@@ -6466,12 +6574,12 @@ Digihome:
 
 # Digiland
 Digiland:
-  regex: '(?:DL721-RB|DL(?:1016|1023|1036|900[23]|[78]006|1008M)|Compumax Blue)(?:[);/ ]|$)'
+  regex: '(?:DL721-RB|DL(?:1016|1023|1025GH|1036|900[23]|[78]006|1008M)|Compumax Blue)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'DL1008M'
       model: 'DL1008M'
-    - regex: 'DL(1016|1023|1036|900[23]|[78]006|721-RB)'
+    - regex: 'DL(1016|1025GH|1023|1036|900[23]|[78]006|721-RB)'
       model: 'DL$1'
     - regex: '(Compumax Blue)' # Compumax
       model: '$1'
@@ -6496,7 +6604,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)|(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|VRL42|((?:Optima(?![_ ]T-II)(?: Kids 7)?|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)|DM-LED(?:32SR21|43SR23|42SR24|24SR20|55UR31)|RS1248PL|RS1253PL|RS1249PL'
+  regex: 'Digma[_ ]([^;/]+) Build|iD[sr]Q\d+|DiMagic|HIT HT707[10]MG|CITI (?:7 E401 4G|8 E400 4G|ATL 4G|Kids|Octa [178]0|1902 3G|10 E402|Z530 3G|13 X703 4G)|(CITI[_ ](?:[A-Z0-9]+)[_ ][34]G)[ _][TC][ST](?:[0-9]{4}[PM][LG])|HIT 4G|HT7074ML|IDX5|(iDx10|iDx7)|MVM900H(?:WZ|C)|MVM908HCZ|(iDxD8 3G|iDxD10 3G|iDrQ10 3G|iDxD[45]|iDxQ5|iD[nx]D7(?:[_ ]3G)?)|PS604M|PT452E|Linx.+ [34]G L[TS][0-9]{4}[PM][GL]|Linx PS474S|PS1043MG|HT7071MG|HT5035PG|HT4039PG|NS6902QL|NS9797MG|TS7854M|TS1012E 3G|TT1004PG|TT702[045]MG|TT1002MG|TT7026MW|WS8251PL|VRL42|((?:Optima(?![_ ]T-II)(?: Kids 7)?|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)|DM-LED(?:32SR21|43SR23|42SR24|24SR20|55UR31)|RS1248PL|RS1253PL|RS1249PL|RS1267PL|WS1250PL'
   device: 'smartphone'
   models:
     - regex: 'HIT(?: 3G)? HT707[10]MG'
@@ -6508,6 +6616,8 @@ Digma:
       model: 'HIT Q500 3G'
     - regex: 'HT4039PG'
       model: 'HIT Q401 3G'
+    - regex: 'VS5037PL'
+      model: 'VOX Fire 4G'
     - regex: '(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
       model: '$1'
     - regex: 'PS604M'
@@ -6579,10 +6689,10 @@ Digma:
     - regex: 'DIGMA[_ ]IDSD'
       model: 'IDsD 10 3G'
       device: 'tablet'
-    - regex: 'CITI[_ ](1902 3G|Kids(?:[_ ]81)?|8527_4G|Octa [178]0|10 E402 4G|8 E400 4G|7 E401 4G)'
+    - regex: 'CITI[_ ](1902 3G|Kids(?:[_ ](?:8[01]|10))?|8527_4G|Octa [178]0|10 E402 4G|8 E400 4G|7 E401 4G|13 X703 4G|1312C 4G|8443E 4G)'
       model: 'CITI $1'
       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)'
+    - 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'
     - regex: 'iDxD8 3G'
@@ -6633,6 +6743,15 @@ Digma:
     - regex: 'TT7000MG'
       model: 'Optima Prime 3G'
       device: 'tablet'
+    - regex: '8402D 4G'
+      model: '8402D 4G'
+      device: 'tablet'
+    - regex: '1402D 4G WS1250PL'
+      model: '1402D 4G'
+      device: 'tablet'
+    - regex: 'RS1267PL'
+      model: 'Pro 1480E 4G'
+      device: 'tablet'
     - regex: '((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.STNMEVCD]+|Prime(?:[ _][345])?)(?:[ _][43]G)?)'
       model: '$1'
       device: 'tablet'
@@ -6668,12 +6787,14 @@ 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)?|X[679]pro|S96GT|android 10;(?: [\w-]+;)? (?:S59|S35|X95i?|X93)|android 12;(?: [\w-]+;)? (?:S98|S61|S89)|Y7Plus|S35T|Android 9(?:[\d.]*);(?: [\w-]+;)? Y8)(?:[);/ ]|$)'
+  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)?|X[679]pro|S96GT|android 10;(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12;(?: [\w-]+;)? (?:S98|S61|S89|V Max|S100|V30T?)|Y7Plus|S35T|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:N100|Y8)|D60 Pro|Turbo_mini_F1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'V Max'
+      model: 'V Max'
     - regex: '(?:Valencia2_)?Y100_Plus(?:[);/ ]|$)'
       model: 'Valencia2 Y100 Plus'
-    - regex: 'Valencia2_Y100pro'
+    - regex: 'Valencia2[_ ]Y100pro'
       model: 'Valencia2 Y100 Pro'
     - regex: 'Valencia2_Y100(?:[);/ ]|$)'
       model: 'Valencia2 Y100'
@@ -6681,7 +6802,7 @@ Doogee:
       model: 'Leo $1'
     - regex: 'Iron-bone (DG750)'
       model: 'Iron Bone $1'
-    - regex: '(X95i?|BL[579]000|S90C|X10S|X[569]0L|X93)(?:[);/ ]|$)'
+    - regex: '(X95i?|BL[579]000|S90C|X10S|X[569]0L|X93|V30T?)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'X(9[567])Pro(?:[);/ ]|$)'
       model: 'X$1 Pro'
@@ -6689,6 +6810,8 @@ Doogee:
       model: 'N$1 Pro'
     - regex: 'BL12000 PRO'
       model: 'BL12000 Pro'
+    - regex: 'D60 Pro'
+      model: 'D60 Pro'
     - regex: 'BL5500[_ ]Lite'
       model: 'BL5500 Lite'
     - regex: 'BL12000'
@@ -6729,11 +6852,17 @@ Doogee:
       model: 'Y6 Max'
     - regex: 'Y7Plus'
       model: 'Y7 Plus'
-    - regex: 'X([679])pro'
+    - regex: '(?:Doogee[_ ])?X([679])[_ ]?pro'
       model: 'X$1 Pro'
+    - regex: 'T6pro'
+      model: 'T6 Pro'
+    - regex: 'DG550'
+      model: 'DG550 Dagger'
+    - regex: 'Turbo_mini_F1'
+      model: 'Turbo Mini F1'
     - regex: 'Y([89]) ?Plus(?:[);/ ]|$)'
       model: 'Y$1 Plus'
-    - regex: ' (S59|S35T?|S98|S89|Y8|Y6C|S61)(?:[);/ ]|$)'
+    - regex: ' (S59|S35T?|S98|S89|Y8|Y6C|S61|N30|[NS]100)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(X5max(?:[_ ]PRO)?)'
       model: '$1'
@@ -6856,13 +6985,13 @@ EBEST:
 
 # Horizont (https://horizont.by/en/)
 Horizont:
-  regex: 'Horizont (32LE7011D|43LE7022D)'
+  regex: '(?:Horizont[_ ])?(32LE7011D|43LE7022D|32LE7052D|65LE7053D)'
   device: 'tv'
   model: '$1'
 
-# Echo Mobiles
+# Echo Mobiles or echo
 Echo Mobiles:
-  regex: 'ECHO[ _](HOLI|HORIZON|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA|FUSION)|(?:HORIZON_M|Stellar [34]G|FEELING|MOON(?![ _]HD[ _]Quad)|LOOK)(?:[);/ ]|$)'
+  regex: 'ECHO[ _](HOLI|HORIZON|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA|FUSION|PUSH|PRISM|STUDIO)|(?:HORIZON_M|Stellar [34]G|FEELING|MOON(?![ _]HD[ _]Quad)|LOOK)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ECHO_HORIZON_LITE'
@@ -6873,17 +7002,17 @@ Echo Mobiles:
       model: 'STELLAR $1G'
     - regex: 'ECHO_SMART_4G'
       model: 'SMART 4G'
-    - regex: 'ECHO[ _](HOLI|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA|FUSION)'
+    - regex: 'ECHO[ _](HOLI|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA|FUSION|PUSH|PRISM|STUDIO)'
       model: '$1'
 
 # ECS
 ECS:
-  regex: '(?:TA10CA3|TM105A?|TR10[CR]S1|TF10EA2)(?:[);/ ]|$)'
+  regex: '(?:TA10CA3|TM105A?|TR10[CR]S1|TF10EA2|TR10CS2)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'TA10CA3(?:[);/ ]|$)'
       model: 'TA10CA3'
-    - regex: '(TR10[CR]S1|TF10EA2)(?:[);/ ]|$)'
+    - regex: '(TR10[CR]S1|TF10EA2|TR10CS2)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'TM105A(?:[);/ ]|$)'
       model: 'TM105A'
@@ -6925,10 +7054,10 @@ EKT:
 
 # Eks Mobility
 Eks Mobility:
-  regex: 'S5[UL]S|X4UPlus'
+  regex: '(?:S5[UL]S|X4UPlus|S45U)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(S5[UL]S)'
+    - regex: '(S5[UL]S|S45U)'
       model: '$1'
     - regex: 'X4UPlus'
       model: 'X4U Plus'
@@ -7021,7 +7150,7 @@ E-tel:
 
 # Evercoss
 Evercoss:
-  regex: 'EVERCOSS[ _]|(U6 PRIME|A75A\*|AT8B|U50A_PLUS|M50 (?:MAX|STAR)|A75 MAX|M50A|R40K|R70A|7.*; (?:R70|R5C)|S55[AB])(?:[);/ ]|$)'
+  regex: 'EVERCOSS[ _]|(U6 PRIME|A75A\*|AT8B|U50A_PLUS|M50 (?:MAX|STAR)|A75 MAX|M55[ABC]|M50A|R40K|R70A|7.*; (?:R70|R5C)|S55[AB]|U70[CB])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A75A\*(?:[);/ ]|$)'
@@ -7036,9 +7165,9 @@ Evercoss:
       model: 'M50 Max'
     - regex: 'U6 PRIME'
       model: 'U6 Prime'
-    - regex: ' (M50A|R40K|R70|R5C|S55[AB])(?:[);/ ]|$)'
+    - regex: ' (M50A|R40K|R70|R5C|S55[AB]|M55[ABC])(?:[);/ ]|$)'
       model: '$1'
-    - regex: '(AT8B|R70A)(?:[);/ ]|$)'
+    - regex: '(AT8B|R70A|U70[CB])(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
     - regex: 'EVERCOSS[ _](A7[BRLZ]|A65|A74A|A5Z)(?:[);/ ]|$)'
@@ -7134,12 +7263,16 @@ Senseit:
 
 # SunWind (sunwind.ru.com)
 SUNWIND:
-  regex: 'SUNWIND[_ ]|SUN[-_]LED\d+|(?:SKY 9 [EA]\d+ 3G)(?:[);/ ]|$)'
+  regex: 'SUNWIND[_ ]|SUN[-_]LED\d+|(?:SKY 9 [EA]\d+ 3G|Sky (?:1262C|1123B|7143B|8244B|8421D|1430D) [43]G|SKY Kids 70 SS7238PG)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'SKY ([79]) ([EA]\d+) 3G'
       model: 'Sky $1 $2 3G'
-    - regex: 'SUN[-_]LED(\d+\w\d+)'
+    - regex: 'SKY Kids 70'
+      model: 'Sky Kids 70'
+    - regex: 'Sky (\d{4}[BCD]) ([34])G'
+      model: 'Sky $1 $2G'
+    - regex: 'SUN[-_]LED(\d+\w{1,2}\d+)'
       device: 'tv'
       model: 'SUN-LED$1'
 
@@ -7149,6 +7282,12 @@ ZoomSmart:
   device: 'smartphone'
   model: '$1'
 
+# Smartab
+Smartab:
+  regex: '(ST1009|ST7160|ST1009X)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # 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|SOG0[1-9]|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][ABC]|A[12]03SO|A002SO|NW-(A[13]00|ZX500|Z1000)Series|NSZ-GS7|SmartWatch 3|SVP-DTV15'
@@ -7206,6 +7345,9 @@ Sony:
     - regex: '(?:Sony(?:Ericsson)?)?R800'
       model: 'Xperia PLAY'
       brand: 'Sony Ericsson'
+    - regex: 'Xperia Acro S'
+      model: 'Xperia Acro S'
+      brand: 'Sony Ericsson'
     - regex: '(?:Sony(?:Ericsson)?)?WT19|LiveWithWalkman'
       model: 'Live with Walkman'
       brand: 'Sony Ericsson'
@@ -7337,7 +7479,7 @@ Sony:
       model: 'Xperia 5 II'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SO-53B|A103SO|SOG05|XQ-BQ[4567]2)'
       model: 'Xperia 5 III'
-    - regex: '(?:SOG09|XQ-CQ72|SO-54C|XQ-CQ44|A204SO)'
+    - regex: '(?:SOG09|XQ-CQ72|SO-54C|XQ-CQ[45]4|A204SO)'
       model: 'Xperia 5 IV'
     - regex: '(?:Sony(?:Ericsson)?)?(?:SOV42|902SO)'
       model: 'Xperia 8'
@@ -7573,7 +7715,7 @@ Sony:
       model: 'Xperia X Performance Dual'
 
     # SONY: explicit tablet models
-    - regex: '(?:SGP(?:311|312|321)|(Sony)?SO-03E|Tablet Z LTE)(?:[);/ ]|$)'
+    - regex: '(?:Sony)?(?:SGP(?:311|312|321)|(Sony)?SO-03E|Tablet Z LTE)(?:[);/ ]|$)'
       model: 'Xperia Tablet Z'
       device: 'tablet'
     - regex: 'SGP712(?:[);/ ]|$)'
@@ -7815,7 +7957,7 @@ Everest:
 
 # Evertek
 Evertek:
-  regex: '(Ever(?:Allure|Glory|Shine|Miracle|Mellow|Classic|Trendy|Fancy|Vivid|Slim|Glow|Magic|Solo|Smart|Star)[^/);]*)(?: Build|[;)])|(?:E70[25]0HD|E805[01]HD|E9054HD|E8050HG|E1014HG|E7224HG|E7914HG|V5_Nano|M10 Nano|V4 Nano| V4\+)(?:[);/ ]|$)'
+  regex: '(Ever(?:Allure|Glory|Shine|Miracle|Mellow|Classic|Trendy|Fancy|Vivid|Slim|Glow|Magic|Solo|Smart|Star)[^/);]*)(?: Build|[;)])|(?:E70[25]0HD|E805[01]HD|E9054HD|E8050HG|E1014HG|E7224HG|E7914HG|V5_Nano|M10\+Max|M10 Nano|V4 Nano| V4\+)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(E70[25]0HD|E805[01]HD|E9054HD|E8050HG|E7914HG|E7224HG|E1014HG)'
@@ -7823,6 +7965,8 @@ Evertek:
       model: 'Everpad $1'
     - regex: '(M10|V[45])[_ ]Nano'
       model: '$1 Nano'
+    - regex: 'M10\+Max'
+      model: 'M10 Max'
     - regex: 'EverMiracle Plus'
       model: 'EverMiracle Plus'
     - regex: ' V4\+'
@@ -7854,6 +7998,9 @@ Evolveo:
     - regex: 'EVOLVEO MultiMedia Box M4'
       device: 'tv'
       model: 'MultiMedia Box M4'
+    - regex: 'EVOLVEO Android Box (H[48])'
+      device: 'tv'
+      model: 'Android Box $1'
     - regex: 'Smart TV ([^;/]*) Build'
       device: 'tv'
       model: 'Smart TV $1'
@@ -7986,6 +8133,35 @@ Forstar:
     - regex: 'Amosta ?3G5'
       model: 'Amosta 3G5'
 
+# InFocus
+InFocus:
+  regex: '(?:IF(900[1237]|902[19]|903[15]|236a|195a)|M370i?|InFocus M808i?)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'IF9001'
+      model: 'Turbo 5'
+    - regex: '(M370i?)'
+      model: '$1'
+    - regex: 'IF9007'
+      model: 'A3'
+    - regex: 'IF9021'
+      model: 'Turbo 5 Plus'
+    - regex: 'IF9035'
+      model: 'A2'
+    - regex: 'IF9002'
+      model: 'M5s'
+    - regex: 'IF9003'
+      model: 'M6s'
+    - regex: 'IF9031'
+      model: 'Vision 3'
+    - regex: 'IF9029'
+      model: 'Vision 3 Pro'
+    - regex: 'IF(236|195)a'
+      model: 'Big Tab IF$1a'
+      device: 'tablet'
+    - regex: 'InFocus M([0-9]+[a-z]?)'
+      model: 'M$1'
+
 # Foxconn
 Foxconn:
   regex: 'InFocus M[0-9]+[a-z]?'
@@ -8069,7 +8245,7 @@ FNB:
 
 # Fujitsu
 Fujitsu:
-  regex: '(?:F-01[FHJKLM]|F-02[EFGHLK]|F-03[DEFGKHL]|F-04[EGFHKJ]|F-05[DEFJG]|F-06[EF]|F-07[DE]|F-08D|F-09[DE]|F-10D|F-[45]1A|F-41B|F-[45]2A|F-11D|F-12C|F-5[12]B|M532|FARTM933KZ|901FJ|arrows(?:RX|M03|M0[45](?:-PREMIUM)?)|801FJ|FJL2[12]|RM02|FCG01|A101FC)(?:[);/ ]|$)'
+  regex: '(?:F-01[FHJKLM]|F-02[EFGHLK]|F-03[DEFGKHL]|F-04[EGFHKJ]|F-05[DEFJG]|F-06[EF]|F-07[DE]|F-08D|F-09[DE]|F-10D|F-[45]1A|F-41B|F-[45]2A|F-11D|F-12C|F-5[12]B|M532|FARTM933KZ|901FJ|arrows(?:RX|M03|M0[45](?:-PREMIUM)?)|801FJ|FJL2[12]|RM02|FCG01|A101FC|BZ02)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'F-51A(?:[);/ ]|$)'
@@ -8158,6 +8334,8 @@ Fujitsu:
       model: 'Arrows M03'
     - regex: 'RM02(?:[);/ ]|$)'
       model: 'Arrows RM02'
+    - regex: 'BZ02(?:[);/ ]|$)'
+      model: 'Arrows BZ02'
     - regex: 'arrowsRX(?:[);/ ]|$)'
       model: 'Arrows RX'
     - regex: 'arrowsM04-PREMIUM(?:[);/ ]|$)'
@@ -8182,7 +8360,7 @@ G-TiDE:
   models:
     - regex: 'Shining7'
       model: 'Shining 7'
-    - regex: 'G-TiDE[_ ](A1|S[34]|E520|Vans 8)'
+    - regex: 'G-TiDE[_ ](A1|S[34]|E520|Vans [89]c?|V7s)'
       model: '$1'
     - regex: 'G-TiDE V6'
       model: 'V6'
@@ -8273,7 +8451,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 11;(?: [\w-]+;)? P61|WBL7519|WBL7361|20190419Q)(?:[);/ ]|$)'
+  regex: '(?:GIO-)?GIONEE[ _-]?[a-z0-9]+|(?:Dream_D1|V188S?|GN(?!2200)[0-9]{3,4}[a-z]?)(?:[);/ ]|$)|F103(?: Pro)?(?: Build|\))|P5 mini Build|(M7 Power|F106L|F100A|F103S|F103 Pro|M6 mirror|20190620G|20190619G|20190418Q|GNP21M02|GNS2161B|GAU0820|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:P8 Max|P7 Max)|Android 5(?:[\d.]*);(?: [\w-]+;)? M5 (?:mini|Plus)|Android 11;(?: [\w-]+;)? P61|WBL7519|WBL7361|20190419Q|M5 lite CDMA|GLY1620|M2mini)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GNP21M02'
@@ -8304,15 +8482,21 @@ Gionee:
       model: 'M18'
     - regex: 'GN([0-9]{3,4}[a-z]?)(?:[);/ ]|$)'
       model: 'GN$1'
-    - regex: '(F106L|F100A|V188S|V188|F103S)(?:[);/ ]|$)'
+    - regex: '(F106L|F100A|V188S|V188|F103S|F8 Neo)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'M7 Power(?:[);/ ]|$)'
       model: 'M7 Power'
+    - regex: 'M5 Plus'
+      model: 'M5 Plus'
+    - regex: 'M([25]) ?mini'
+      model: 'M$1 Mini'
     - regex: '20190620G(?:[);/ ]|$)'
       model: 'M11'
-    - regex: 'P5 mini Build'
+    - regex: 'P5 mini'
       model: 'P5 mini'
-    - regex: 'P7 Max Build'
+    - regex: 'M5 lite CDMA'
+      model: 'M5 Lite CDMA'
+    - regex: 'P7 Max'
       model: 'P7 Max'
     - regex: 'P8 Max'
       model: 'P8 Max'
@@ -8320,6 +8504,8 @@ Gionee:
       model: '$1 Lite'
     - regex: 'M6 mirror(?:[);/ ]|$)'
       model: 'M6 Mirror'
+    - regex: 'GLY1620'
+      model: 'M50 Pro'
     - regex: 'F9 Plus(?:[);/ ]|$)'
       model: 'F9 Plus'
     - regex: '20190419Q(?:[);/ ]|$)'
@@ -8403,7 +8589,7 @@ TIMvision:
 
 # GOCLEVER (goclever.com)
 GOCLEVER:
-  regex: 'GOCLEVER|QUANTUM_(?:[235]_)?[0-9]{3}|QUANTUM [0-9]{1}|QUANTUM 700N|Quantum2 500|QUANTUM_(1010N|1010M|900|II_500_N)|ARIES|INSIGNIA|ORION_|ELIPSO|LIBRA[ _]97|TERRA_7o[WL]|TQ700(?:[);/ ]|$)'
+  regex: 'GOCLEVER|QUANTUM_(?:[235]_)?[0-9]{3}|QUANTUM [0-9]{1}|QUANTUM 700N|Quantum2 500|QUANTUM_(1010N|1010M|900|II_500_N)|ARIES|INSIGNIA|ORION_|ELIPSO|LIBRA[ _]97|TERRA_7o[WL]|(?:TQ700|ORION7oL)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'QUANTUM_(1010N|1010M|900)'
@@ -8418,6 +8604,9 @@ GOCLEVER:
     - regex: 'TQ700N'
       model: 'QUANTUM 700N'
       device: 'tablet'
+    - regex: 'ORION7oL'
+      model: 'ORION 70L'
+      device: 'tablet'
     - regex: 'TQ700(?:[);/ ]|$)'
       model: 'QUANTUM 700'
       device: 'tablet'
@@ -8484,7 +8673,7 @@ GoMobile:
 
 # Explay
 Explay:
-  regex: 'Explay|[\w]+-EXPLAY-FIN|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|Surfer7773G|sQuad[ _][0-9\.]|Onliner[1-4]|RioPlay|Leader|Pulsar|Infinityll|Joy_TV|Imperium[78]|Winner[78]|Indigo|Lagoon|Tornado(?! 348| Slim)(?:3G)?|Onyx(?!_[A-Z]{1,2})(?:[);/ ]|$)|android 4([\d.]*);(?: [\w-]+;)? Discovery.+(?<! Mobile )Safari/|Party|Scream 3G'
+  regex: 'Explay|[\w]+-EXPLAY-FIN|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|Surfer7773G|sQuad[ _][0-9\.]|Onliner[1-4]|RioPlay|Leader|Pulsar|Infinityll|Joy_TV|Imperium[78]|Winner[78]|Indigo|Lagoon|Tornado(?! 348| Slim)(?:3G)?|Onyx(?!_[A-Z]{1,2})(?:[);/ ]|$)|android 4([\d.]*);(?: [\w-]+;)? Discovery.+(?<! Mobile )Safari/|Party|Scream 3G|A350 TV'
   device: 'tablet'
   models:
     - regex: 'ActiveD[ _]7.4[ _]3G'
@@ -8540,6 +8729,8 @@ Explay:
 
     - regex: 'Lagoon(?:[);/ ]|$)'
       model: 'Lagoon'
+    - regex: 'A350 TV(?:[);/ ]|$)'
+      model: 'A350TV'
     - regex: 'Party(?:[);/ ]|$)'
       model: 'Party'
     - regex: 'Explay[ _-]([^;/]+)(?: Build|[;)])'
@@ -8552,7 +8743,7 @@ Explay:
 
 # General Mobile (www.generalmobile.com)
 General Mobile:
-  regex: 'General_Mobile_|GM 5 Plus|GM8 go|GM[ _][568][ _]d|GM [86]|General Mobile 4G|GM6_Tur|GM 9 (?:Pro|Plus)|(?: GM 5|e-tab 20|Android 1[012];(?: [\w-]+;)? (?:G[35]01|G[35]10|(?<!Huawei )G700)|Discovery(?![_ ]XT) (?:Air|Elite(?: Plus)?)|GM Discovery II|Discovery II Mini| GM6|G300|G008|android 4([\d.]*);(?: [\w-]+;)? Discovery|e-?tab5)(?:[);/ ]|$)'
+  regex: 'General_Mobile_|GM 5 Plus|GM8 go|GM[ _][568][ _]d|GM [86]|General Mobile 4G|GM6_Tur|GM 9 (?:Pro|Plus)|(?: GM 5|e-tab 20|Android 1[012];(?: [\w-]+;)? (?:G[35]01|G[35]10|(?<!Huawei )G700)|Discovery(?![_ ]XT) (?:Air|Elite(?: Plus)?)|GM Discovery II|GM Discovery tab 8|Discovery II Mini| GM6|G300|G008|android 4([\d.]*);(?: [\w-]+;)? Discovery|e-?tab5|G512|G312)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'GM 5 Plus'
@@ -8563,6 +8754,10 @@ General Mobile:
       model: 'GM 21'
     - regex: 'G510'
       model: 'GM 21 Plus'
+    - regex: 'G312'
+      model: 'GM 22'
+    - regex: 'G512'
+      model: 'GM 22 Plus'
     - regex: 'G700'
       model: 'GM 21 Pro'
     - regex: 'G301'
@@ -8589,6 +8784,9 @@ General Mobile:
       model: 'Discovery II Mini'
     - regex: 'GM Discovery II'
       model: 'GM Discovery II'
+    - regex: 'GM Discovery tab 8'
+      device: 'tablet'
+      model: 'Discovery Tab 8'
     - regex: 'Discovery(?:[);/ ]|$)'
       model: 'Discovery'
     - regex: 'General[ _]Mobile[ _]4G[ _]Dual'
@@ -8626,7 +8824,7 @@ Goly:
 
 # Google
 Google:
-  regex: 'Nexus(?! 6P)|GoogleTV|Google Fiber|Google Pixel|Glass(?<!Browser)|CrKey[^a-z0-9]|(?:Pixel|sailfish|taimen|blueline|Chromecast)(?: Build|[)])|Pixel (?:XL|C|[2-7]|[2-4] XL)|Google 2XL|PIXEL4X|G011A|AOSP on (?:bramble|HammerHead|Manta|sunfish)|Pipit|ADT-2'
+  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-7]|[2-4] XL)|Google 2XL|PIXEL4X|G011A|AOSP on (?:bramble|HammerHead|Manta|sunfish)|Pipit|ADT-2'
   device: 'smartphone'
   models:
     - regex: 'Glass'
@@ -8656,6 +8854,9 @@ Google:
     - regex: 'CrKey[^a-z0-9]'
       model: 'Chromecast'
       device: 'tv'
+    - regex: 'Chromecast HD'
+      model: 'Chromecast HD (2022)'
+      device: 'tv'
     - regex: 'Chromecast'
       model: 'Chromecast (2020)'
       device: 'tv'
@@ -8681,9 +8882,9 @@ Google:
       model: 'Pixel 4 X'
     - regex: 'AOSP on sunfish'
       model: 'Pixel 4a'
-    - regex: 'Pixel 4a \(5G\)|AOSP on bramble'
+    - regex: 'Pixel 4a \(?5G\)?|AOSP on bramble'
       model: 'Pixel 4a (5G)'
-    - regex: 'pixel ([3-6])a'
+    - regex: 'pixel ([3-7])a'
       model: 'Pixel $1a'
     - regex: 'G011A'
       model: 'Pixel 2'
@@ -8700,6 +8901,9 @@ Google:
     - regex: 'Pixel C'
       device: 'tablet'
       model: 'Pixel C'
+    - regex: 'Pixelbook Go'
+      device: 'desktop'
+      model: 'Pixelbook Go'
     - regex: 'Pixelbook'
       device: 'tablet'
       model: 'Pixelbook'
@@ -8836,6 +9040,9 @@ Haier:
     - regex: 'haierATV'
       device: 'tv'
       model: 'Android TV'
+    - regex: 'haier Android TV DVB2K'
+      device: 'tv'
+      model: 'Android TV DVB2K'
     - regex: 'Android TV FF Pro'
       device: 'tv'
       model: 'Android TV FF Pro'
@@ -8881,7 +9088,7 @@ Hasee:
 
 # Hisense (www.hisense-usa.com)
 Hisense:
-  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense [^);/]+|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|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'
+  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense [^);/]+|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'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -8961,6 +9168,8 @@ Hisense:
       model: 'E20'
     - regex: 'Hisense E50 128G'
       model: 'E50'
+    - regex: 'HLTE229T'
+      model: 'R7 Pro'
     - regex: 'HLTE500T(?:[);/ ]|$)'
       model: 'H11'
     - regex: '(?:HLTE230E|Infinity H40 Lite)(?:[);/ ]|$)'
@@ -8980,8 +9189,8 @@ Hisense:
       model: 'Nana'
     - regex: '(U972|U601S)[ _]Pro(?:[);/ ]|$)'
       model: '$1 Pro'
-    - regex: 'Infinity H50 ZOOM(?:[);/ ]|$)'
-      model: 'Infinity H50 Zoom'
+    - regex: 'Infinity H([56]0) ZOOM(?:[);/ ]|$)'
+      model: 'Infinity H$1 Zoom'
     - regex: 'Infinity E30SE(?:[);/ ]|$)'
       model: 'Infinity E30 SE'
     - regex: '(HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*|U972)'
@@ -9022,14 +9231,14 @@ HKPro:
 
 # Hoffmann (hoffmann-electric.com)
 Hoffmann:
-  regex: '(HOFFMANN|Neo[_ ]A[1379]00|X-Go|X-Play|X-Pro|X_Ultra)(?:[);/ ]|$)'
+  regex: '(HOFFMANN|Neo[_ ]A[1379]00|X-Go|X-Play|X-Pro|X_Ultra|X-Max)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Neo[_ ](A[1379]00)'
       model: 'Neo $1'
     - regex: 'HOFFMANN[ _]X[-_ ](Prime|Twist|Max)'
       model: 'X $1'
-    - regex: 'X[-_](Play|Go|Pro|Ultra)'
+    - regex: 'X[-_](Play|Go|Pro|Ultra|Max)'
       model: 'X $1'
 
 # Huagan
@@ -9040,6 +9249,16 @@ Huagan:
     - regex: 'Huagan[ _]([^;/)]+)(?: Build|[);])'
       model: '$1'
 
+# Stream or Stream System
+Stream:
+  regex: '(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'
+
 # Homtom
 Homtom:
   regex: 'Homtom|(?:HT[0-9]{1,2}(?: ?Pro)?|HT3_Pro|P30 Pro|android 8([\d.]*);(?: [\w-]+;)? S17)(?:[);/ ]|$)'
@@ -9193,9 +9412,11 @@ TD Tech:
 
 # Huawei
 Huawei:
-  regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ultym5|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[234]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR(?!-[AH]0)|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N39|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)|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]|AN50|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|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[056]0|LX9)|AGS5-(?:L09|W09)|AGS3K-(?:W20|[WL]0[09])|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-(?:AL00|L49)|BZI-(?:AL00|W00)|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-(?:AL[0689]0|LX9)|GIA-AN00|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-(?:AL00|LX[39])|60[56]HW|Peppa-(?:L2[23]B|L0[23]B)|KANT-\d{3}[BCS]?|Kobe3-L09|FNE-(?:NX9|AN00)|HPB-AN00|Mate ?(?:[34]0 RS|Xs|30)|Y530|SDY-AN00|EC6108V[89]|CTR-(?:LX[123]|AL00)|VNE-(?:LX[123]|N41|AN00)|HMW-W09|GLA-(?:LX[13]|AL00)|HEY-W09|GOT-(?:AL09|W29)|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|NX1)|RKY-(?:AN00|LX[123])|M300-L09|EVE-LX9N?|BNE-(?:LX1|AL00)|dtab01|BZT4-W19|ROD-W09|ANP-AN00|WGRR-W09|HN3-U01|Holly-U19|BLM-00|ANN-AN00|VNA-LX2|CRT-LX[123]'
+  regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ultym5|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[234]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR(?!-[AH]0)|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U)|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]|AN50|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2K-L09|KOB2-(?:AL00|[LW]09|L03)|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN[10]0|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[0568]0|LX9)|AGS5-(?:L09|W09)|AGS3K-(?:W20|[WL]0[09])|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-(?:AL00|L49)|BZI-(?:AL00|W00)|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-(?:AL[0689]0|LX9)|GIA-AN00|LEO-DLXXE?|BZA-L00|MGI-AN00|CMA-(?:LX[123]|AN[04]0)|NEW-AN90|KRJ2-(?:W09|AN00)|BRT-(?:W09|AN09)|ANY-(?:[LN]X1|LX[23]|AN00)|JLN-(?:LX[13]|AL00)|LGE-(?:NX[19]|AN[012]0)|TNA-AN00|TFY-(?:LX[123]|AN[04]0)|DIO-AN00|BZW-AL[01]0|MOGOLIA|CM990|MGA-(?:AL[04]0|LX[39])|60[56]HW|Peppa-(?:L2[23]B|L0[23]B)|KANT-\d{3}[BCS]?|Kobe3-L09|FNE-(?:NX9|AN00)|HPB-AN00|Mate ?(?:[34]0 RS|Xs|30)|Y530|SDY-AN00|EC6108V[89]|CTR-(?:LX[123]|AL00)|VNE-(?:LX[123]|N41|AN[04]0)|HMW-W09|GLA-(?:LX[13]|AL00)|HEY-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|NX1)|RKY-(?:AN00|LX[123])|M300-L09|EVE-LX9N?|BNE-(?:LX1|AL00)|dtab01|BZT4-W19|ROD-W09|ANP-AN00|WGRR-W09|HN3-U01|Holly-U19|BLM-00|ANN-AN00|VNA-(?:LX[23]|L29)|CRT-(?:NX1|LX[123]|AN00)|AGM-W09HN|PGT-(?:AN[12]0|N19)|GLL-AL01|MNA-(?:LX9|AL00)|LNA-(?:AL00|LX9)|ALT-L29|MAO-LX9N?|Enjoy 20 SE|ANB-AN00|STG-(?:AL00|LX1)|LTK-LX3|GOA-(?:LX9|AL80)|nova 6 5G| Angela-L|DBR-W09'
   device: 'smartphone'
   models:
+    - regex: 'CRT-NX1'
+      model: 'Honor 90 Lite'
     - regex: 'FNE-AN00'
       model: 'Honor 70'
     - regex: 'FNE-NX9'
@@ -9204,6 +9425,8 @@ Huawei:
       model: 'Honor 70 Pro'
     - regex: 'ANP-AN00'
       model: 'Honor 80 Pro'
+    - regex: 'ANB-AN00'
+      model: 'Honor 80 Pro Flat'
     - regex: 'ANN-AN00'
       model: 'Honor 80 5G'
     - regex: 'HPB-AN00'
@@ -9262,8 +9485,12 @@ Huawei:
       model: 'Enjoy 5S'
     - regex: 'MGA-AL00'
       model: 'Enjoy 50'
+    - regex: 'MGA-AL40'
+      model: 'Enjoy 60'
     - regex: 'CTR-AL00'
       model: 'Enjoy 50 Pro'
+    - regex: 'STG-AL00'
+      model: 'Enjoy 60X'
     - regex: 'TAG-(?:L0[13]|L32|L13|L2[123])(?:[);/ ]|$)'
       model: 'GR3'
     - regex: 'NCE-(AL[10]0|TL10)(?:[);/ ]|$)'
@@ -9288,7 +9515,7 @@ Huawei:
       model: 'Enjoy 20 Pro'
     - regex: 'DVC-AN00(?:[);/ ]|$)'
       model: 'Enjoy Z 5G'
-    - regex: 'PPA-AL20(?:[);/ ]|$)'
+    - regex: '(?:PPA-AL20|Enjoy 20 SE)(?:[);/ ]|$)'
       model: 'Enjoy 20 SE'
     - regex: 'FRL-[AT]N00'
       model: 'Enjoy 20 Plus 5G'
@@ -9316,7 +9543,11 @@ Huawei:
       model: 'G8'
     - regex: 'RIO-[UT]L00(?:[);/ ]|$)'
       model: 'G7 Plus'
-    - regex: 'JAD-(?:AL[056]0|LX9)(?:[);/ ]|$)'
+    - regex: 'MNA-(?:AL00|LX9)'
+      model: 'P60 Pro'
+    - regex: 'LNA-(?:AL00|LX9)'
+      model: 'P60'
+    - regex: 'JAD-(?:AL[0568]0|LX9)(?:[);/ ]|$)'
       model: 'P50 Pro'
     - regex: 'ABR-(?:AL[08]0|LX9)'
       model: 'P50'
@@ -9346,7 +9577,7 @@ Huawei:
       model: 'Honor 20S'
     - regex: 'EBG-[AT]N00(?:[);/ ]|$)'
       model: 'Honor 30 Pro'
-    - regex: 'EBG-AN10(?:[);/ ]|$)'
+    - regex: '(?:EBG-AN10|EBG-N19)(?:[);/ ]|$)'
       model: 'Honor 30 Pro Plus'
     - regex: '(?:CDY-(?:AN9[05]|NX9A|TN90)|Honor 30S)(?:[);/ ]|$)'
       model: 'Honor 30S'
@@ -9488,6 +9719,10 @@ Huawei:
       model: 'Honor Magic 4 Lite'
     - regex: 'MGI-AN00'
       model: 'Honor Magic 5'
+    - regex: 'PGT-(?:AN10|N19)'
+      model: 'Honor Magic 5 Pro'
+    - regex: 'PGT-AN20'
+      model: 'Honor Magic 5 Ultimate'
     - regex: 'RVL-AL09(?:[);/ ]|$)'
       model: 'Honor Note 10'
     - regex: 'EDI-AL10(?:[);/ ]|$)'
@@ -9510,6 +9745,8 @@ Huawei:
       model: 'Honor Play 30 Plus'
     - regex: 'VNE-AN00'
       model: 'Honor Play 30'
+    - regex: 'VNE-AN40'
+      model: 'Honor Play 6C'
     - regex: 'KSA-AL10(?:[);/ ]|$)'
       model: 'Honor Play 3E'
     - regex: 'NNH-AN00(?:[);/ ]|$)'
@@ -9524,7 +9761,7 @@ Huawei:
       model: 'Honor Play 4 Pro'
     - regex: 'RKY-AN00(?:[);/ ]|$)'
       model: 'Honor Play 40 Plus'
-    - regex: 'RKY-LX[13]'
+    - regex: 'RKY-LX[123]'
       model: 'Honor X7a'
     - regex: '(?:NZA-AL00?|KOZ-AL40)(?:[);/ ]|$)'
       model: 'Honor Play 5T' # Vitality Edition
@@ -9564,14 +9801,18 @@ Huawei:
       model: 'Honor View 10'
     - regex: 'PCT-L29(?:[);/ ]|$)'
       model: 'Honor View 20'
+    - regex: 'VNA-L29'
+      model: 'Honor View 20'
     - regex: 'OXF-AN00(?:[);/ ]|$)'
       model: 'Honor View 30'
     - regex: 'OXF-AN10(?:[);/ ]|$)'
       model: 'Honor View 30 Pro'
     - regex: '(?:Honor_|HW-)?SCL-L(0[1-4]|21|32)(?:_TD)?(?:[);/ ]|$)'
       model: 'Honor Y6'
-    - regex: '(?:Honor_|HW-)?LYO-L21(?:[);/ ]|$)'
+    - regex: '(?:Honor_|HW-)?LYO-L[02]1(?:[);/ ]|$)'
       model: 'Honor Y6 II Compact'
+    - regex: '(?:Honor_|HW-)?LYO-L02(?:[);/ ]|$)'
+      model: 'Y6 Elite'
     - regex: 'NTN-AN20(?:[);/ ]|$)'
       model: 'Honor X20'
     - regex: '(?:TEL-(?:AN(?:00a?|10)|TN00)|Honor X10 5G)(?:[);/ ]|$)'
@@ -9613,8 +9854,10 @@ Huawei:
       model: 'Honor X9 5G'
     - regex: 'ANY-(?:LX[23])'
       model: 'Honor X9'
-    - regex: 'VNA-LX2'
+    - regex: 'VNA-LX[23]'
       model: 'Honor X5'
+    - regex: 'CRT-AN00'
+      model: 'Honor X50i'
     - regex: 'ALA-AN70(?:[);/ ]|$)'
       model: 'Honor V40 Lite'
     - regex: 'U8500(?:[);/ ]|$)'
@@ -9623,6 +9866,8 @@ Huawei:
       model: 'Ideos X3'
     - regex: 'U8800(?:[);/ ]|$)'
       model: 'Ideos X5'
+    - regex: 'IDEOS[_ ]X5[_ ]PRO(?:[);/ ]|$)'
+      model: 'Ideos X5 Pro'
     - regex: 'MLA-AL10(?:[);/ ]|$)'
       model: 'Maimang 5'
     - regex: 'RIO-AL00'
@@ -9639,6 +9884,8 @@ Huawei:
       model: 'Mate XS 2'
     - regex: 'TAH-AN00'
       model: 'Mate X'
+    - regex: 'ALT-L29'
+      model: 'Mate X3'
     - regex: 'TET-(?:A[NL]00|AN10)'
       model: 'Mate X2'
     - regex: 'TET-AN50'
@@ -9669,7 +9916,7 @@ Huawei:
       model: 'Mate 30 Lite'
     - regex: 'LIO-(?:[TA]L00|L[02]9|AN00)(?:[);/ ]|$)'
       model: 'Mate 30 Pro'
-    - regex: 'LIO-N29(?:[);/ ]|$)'
+    - regex: 'LIO-(?:N29|TN00)(?:[);/ ]|$)'
       model: 'Mate 30 Pro 5G'
     - regex: 'LIO-AN00m(?:[);/ ]|$)'
       model: 'Mate 30E Pro 5G'
@@ -9739,11 +9986,13 @@ Huawei:
       model: 'Nova 5 Pro'
     - regex: 'GLK-(?:[AT]L00|LX1U)(?:[);/ ]|$)'
       model: 'Nova 5i'
+    - regex: 'YAL-L61'
+      model: 'Nova 5T'
     - regex: 'SPN-TL00(?:[);/ ]|$)'
       model: 'Nova 5i Pro'
     - regex: 'WLZ-AL10(?:[);/ ]|$)'
       model: 'Nova 6'
-    - regex: 'WLZ-AN00(?:[);/ ]|$)'
+    - regex: '(?:WLZ-AN00|nova 6 5G)(?:[);/ ]|$)'
       model: 'Nova 6 5G'
     - regex: 'JNY-AL10(?:[);/ ]|$)'
       model: 'Nova 6 SE'
@@ -9753,9 +10002,13 @@ Huawei:
       model: 'Nova 7 Pro 5G'
     - regex: '(?:CDY-(?:[AT]N00|NX9B|[AT]N20)|CDL-AN50|CND-AN00)(?:[);/ ]|$)'
       model: 'Nova 7 SE 5G'
+    - regex: 'MAO-LX9'
+      model: 'Nova 11i'
+    - regex: 'GOA-(?:LX9|AL80)'
+      model: 'Nova 11 Pro'
     - regex: 'JNY-LX2(?:[);/ ]|$)'
       model: 'Nova 7i'
-    - regex: 'ANG-LX[12](?:[);/ ]|$)'
+    - regex: '(?:ANG-LX[12]|Angela-(?:L2[12]B|L02B))(?:[);/ ]|$)'
       model: 'Nova 8'
     - regex: 'NEN-L(?:X[13]|22)(?:[);/ ]|$)'
       model: 'Nova 8i'
@@ -9783,6 +10036,8 @@ Huawei:
       model: 'Nova 10 4G'
     - regex: 'BNE-(?:LX1|AL00)'
       model: 'Nova 10 SE'
+    - regex: 'MAO-LX9N'
+      model: 'Nova 11i'
     - regex: 'DIG-L01(?:[);/ ]|$)'
       model: 'Nova Smart'
     - regex: 'WAS-AL00(?:[);/ ]|$)'
@@ -9797,7 +10052,9 @@ Huawei:
       model: 'Nova Y70'
     - regex: 'CTR-LX[123]'
       model: 'Nova Y90'
-    - regex: 'FIG-L(?:A1|X[123])(?:[);/ ]|$)'
+    - regex: 'STG-LX1'
+      model: 'Nova Y91'
+    - regex: 'FIG-L(?:A1|X[123]|11)(?:[);/ ]|$)'
       model: 'P smart'
     - regex: 'POT-(?:LX(?:[13]|1T|2J|1AF)|AL00|L01)(?:[);/ ]|$)'
       model: 'P smart (2019)'
@@ -9825,7 +10082,7 @@ Huawei:
       model: 'P20 Pro'
     - regex: '(ELE-L(?:04|09|29)|ELE-[AT]L00)(?:[);/ ]|$)'
       model: 'P30'
-    - regex: '(?:MAR-(?:LX(?:1[BM]|2B|[13]Am?|2J?|3BM)|TL00|L21B)|NIC-LX1A|HWV33)(?:[);/ ]|$)'
+    - regex: '(?:MAR-(?:LX(?:1[BM]|2B|[13]Am?|2J?|3BM)|TL00|L21B|L21MEB)|NIC-LX1A|HWV33)(?:[);/ ]|$)'
       model: 'P30 Lite'
     - regex: '(?:VOG-(?:L(?:04|09|29)|TL00|AL10)|HW-02L)(?:[);/ ]|$)'
       model: 'P30 Pro'
@@ -9839,7 +10096,7 @@ Huawei:
       model: 'P40 Lite E NFC'
     - regex: '(?:ELS-(?:[AT]N00|NX9|N04)|NEY-NX9)(?:[);/ ]|$)'
       model: 'P40 Pro'
-    - regex: 'ELS-(?:AN10|N39)(?:[);/ ]|$)'
+    - regex: 'ELS-(?:AN10|N[23]9)(?:[);/ ]|$)'
       model: 'P40 Pro Plus'
     - regex: 'GRA-(?:L09|[TU]L00)(?:[);/ ]|$)'
       model: 'P8'
@@ -9949,7 +10206,7 @@ Huawei:
       model: 'Y9 (2018)'
     - regex: 'JKM-(?:[TA]L00[ab]?|LX[123])(?:[);/ ]|$)'
       model: 'Y9 (2019)'
-    - regex: 'STK-(L2[12]|LX3)(?:[);/ ]|$)'
+    - regex: 'STK-(L2[12]|LX3)|LTK-LX3'
       model: 'Y9 Prime (2019)'
     - regex: 'FRL-L2[23](?:[);/ ]|$)'
       model: 'Y9a'
@@ -9989,13 +10246,13 @@ Huawei:
     - regex: 'BAH3-AN10(?:[);/ ]|$)'
       model: 'MatePad 10.4" 5G'
       device: 'tablet'
-    - regex: 'DBY-W09(?:[);/ ]|$)'
+    - regex: 'DB[YR]-W09(?:[);/ ]|$)'
       model: 'MatePad 11 WiFi'
       device: 'tablet'
     - regex: 'GOT-AL09(?:[);/ ]|$)'
       model: 'MatePad Pro 11'
       device: 'tablet'
-    - regex: 'GOT-W29(?:[);/ ]|$)'
+    - regex: 'GOT-W[02]9(?:[);/ ]|$)'
       model: 'MatePad Pro 11 WiFi'
       device: 'tablet'
     - regex: 'SCMR-W09(?:[);/ ]|$)'
@@ -10049,12 +10306,18 @@ Huawei:
     - regex: 'KOB2-W09HN'
       device: 'tablet'
       model: 'Honor Pad X7 8" WiFi'
+    - regex: 'KOB2K-L09'
+      device: 'tablet'
+      model: 'MatePad T8 8" LTE'
     - regex: 'KOB2-AL00HN'
       device: 'tablet'
       model: 'Honor Pad X7 8" LTE'
     - regex: 'AGR-W09HN'
       device: 'tablet'
       model: 'Honor Pad X6'
+    - regex: 'AGM-W09HN'
+      device: 'tablet'
+      model: 'Honor Pad X8 Lite WiFi'
     - regex: 'AGR-AL09HN'
       device: 'tablet'
       model: 'Honor Pad X6 9.7"'
@@ -10261,6 +10524,9 @@ Huawei:
     - regex: 'LEO-DLXXE?(?:[);/ ]|$)'
       device: 'wearable'
       model: 'Smart Watch 2 Sport'
+    - regex: 'GLL-AL01'
+      device: 'wearable'
+      model: 'Watch 3 Pro Elite'
 
     # smart display regex
     - regex: 'BLM-00(?:[);/ ]|$)'
@@ -10274,6 +10540,9 @@ Huawei:
     - regex: 'KANT-369'
       device: 'tv'
       model: 'Vision S 65"'
+    - regex: 'KANT-359'
+      device: 'tv'
+      model: 'Vision S 55"'
     - regex: 'KANT-350[BC]'
       device: 'tv'
       model: 'Smart Screen S 55"'
@@ -10311,7 +10580,7 @@ Huawei:
 
 # Hyundai
 Hyundai:
-  regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|L503F Plus|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|(?:Android 9;(?: [\w-]+;)? [EL]553)|10LB1|L601F|10WB1|E601F|E503F|E465GO|H-LED55EU1311|H-LED40GS5003|H-DMP100|HT0703W08)(?:[);/ ]|$)'
+  regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|L503F Plus|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|(?:Android 9;(?: [\w-]+;)? [EL]553)|10LB1|L601F|10WB1|E601F|E503F|E465GO|H-LED(?:55GU7003|55EU1311|24BS5000|40GS5003|43FS5003|32FS5005)|H-DMP100|HT070[34]W08|Koral 7W4)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Ultra[_ ]Vision[_ ]Plus'
@@ -10346,6 +10615,8 @@ Hyundai:
       model: 'Hymi 5S Plus'
     - regex: 'E465GO'
       model: 'E465 Go'
+    - regex: 'ULTRA ROCK'
+      model: 'Ultra Rock'
     - regex: 'E(475|504|503F|553|603|601F)(?:[);/ ]|$)'
       model: 'E$1'
     - regex: 'L(553|601F)(?:[);/ ]|$)'
@@ -10358,6 +10629,9 @@ Hyundai:
       model: '$1'
 
     # explicit tables models
+    - regex: 'HT0704W08|Koral 7W4'
+      model: 'Koral 7W4'
+      device: 'tablet'
     - regex: 'HT0701L16'
       model: 'Koral 7XL'
       device: 'tablet'
@@ -10444,7 +10718,7 @@ Hyundai:
 
 # iBall (iball.co.in)
 iBall:
-  regex: 'iBall[ _]([^;/)]+)[ _]Build|iBall[_ ]Slide|(?:Snap[_ ]4G2|3G 1026-Q18|6351-Q400i|iT-KSA0003|iT-KSA0012|iT-KSA0066|Avid|Twinkle_i5|Gorgeo[_ ]4GL|Brisk 4G2|Slide[_ ]Dazzle[_ ]3500|Blaze_V4|Wondro 10|Q27 4G|Andi (?:Wink|5G Blink) 4G|Co-Mate|Nova_4G|Brace-X1|DD-1GB)(?:[);/ ]|$)'
+  regex: 'iBall[ _]([^;/)]+)[ _]Build|iBall[_ ]Slide|(?:Snap[_ ]4G2|3G 1026-Q18|6351-Q400i|iT-KSA0003|iT-KSA0012|iT-KSA0066|Avid|Twinkle_i5|Gorgeo[_ ]4GL|Brisk 4G2|Slide[_ ](?:Dazzle[_ ]3500|Skye_03)|Blaze_V4|Wondro 10|Q27 4G|Andi (?:Wink|5G Blink) 4G|Co-Mate|Nova_4G|Brace-X1|DD-1GB|Elan 4G2|Spirit_X2)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Andi Wink 4G'
@@ -10453,7 +10727,7 @@ iBall:
     - regex: 'Andi 5G Blink 4G'
       device: 'smartphone'
       model: 'Andi 5G Blink 4G'
-    - regex: '(Snap[_ ]4G2|Avid|Twinkle_i5|Gorgeo[_ ]4GL|Blaze_V4|Wondro 10|Q27 4G|Brisk 4G2|Co-Mate|Nova_4G)(?:[);/ ]|$)'
+    - regex: '(Snap[_ ]4G2|Avid|Twinkle_i5|Gorgeo[_ ]4GL|Blaze_V4|Wondro 10|Q27 4G|Brisk 4G2|Co-Mate|Nova_4G|Elan 4G2)(?:[);/ ]|$)'
       model: '$1'
     - regex: '6351-Q400i(?:[);/ ]|$)'
       model: 'Slide'
@@ -10463,6 +10737,10 @@ iBall:
       model: 'Slide Dazzle 3500'
     - regex: '1026-Q18(?:[);/ ]|$)'
       model: 'Slide 3G'
+    - regex: 'Spirit_X2'
+      model: 'Spirit X2'
+    - regex: 'Slide_Skye_03'
+      model: 'Slide Skye 03'
     - regex: 'Brace-X1(?:[);/ ]|$)'
       model: 'Brace X1'
     - regex: 'iT-KSA0003(?:[);/ ]|$)'
@@ -10499,7 +10777,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)|43F1YDX000BS2)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(TZ(?:[0-9]+)|TZ(?:one|art|HIT|81L))(?:[);/ ]|$)'
@@ -10507,7 +10785,7 @@ Irbis:
     - regex: '(SP[0-9]+)(?:[);/ ]|$)'
       device: 'smartphone'
       model: '$1'
-    - regex: '(43F1YDX000BS2)'
+    - regex: '(43F1YDX000BS2|50U1YDX000BS2|32H1YDX000BS2|32H1YDX000FBS2|39H1YDX000BS2)'
       device: 'tv'
       model: '$1'
 
@@ -10523,9 +10801,11 @@ iBerry:
 
 # iHunt
 iHunt:
-  regex: 'iHunt|One_ Love_|TIT?AN[_ ]P\d+|Like_(3|4U|3_Pro)|X300 Elite|S10_Tank_2019|S10 Tank PRO 2020|S60 Discovery Plus|S60_Discovery_2019|AlienXLite2020|Alien X (?:Lite|Pro)|Alien_X|(?:Titan ?P6000|S[23]0 Ultra ApeX 2021|S21 Ultra 4G 2021|Like 11 Panda Pro|Like_Hi10_2021|Like Hi5|S21 Plus 2021|Like_[78]|S10 Tank 2020|(?:S100|S90_)Apex)(?:_EEA)?(?:[);/ ]|$)'
+  regex: 'iHunt|One_ Love_|TIT?AN[_ ]P\d+|Like_(3|4U|3_Pro)|X300 Elite|S10_Tank_2019|S10 Tank PRO 2020|S60 Discovery Plus|S60_Discovery_2019|AlienXLite2020|Alien X (?:Lite|Pro)|Alien_X|(?:Titan ?P6000|S[23]0 Ultra ApeX 2021|S21 Ultra 4G 2021|Like 11 Panda Pro|Like_Hi10_2021|Like Hi5|S21 Plus 2021|Like_[78]|Cyber DOG 4G|S10 Tank 2020|(?:S100|S90_)Apex)(?:_EEA)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Cyber DOG 4G'
+      model: 'Cyber Dog 4G'
     - regex: 'Like_Hi10_2021'
       model: 'Like Hi10 (2021)'
     - regex: 'S10[_ ]Tank[_ ]20(19|20)'
@@ -10601,7 +10881,7 @@ iHunt:
 
 # IconBIT
 IconBIT:
-  regex: 'IconBIT|NT-(3506M|1501C|0704S|0909T|1009T|10[01]1T|1017T|3601P/3602P|3603P|3702S|3805C|3905T|3701S|0701S|0805C|0902S|370[23]M)|XDS[789]4K|Omnicast UHD|Movie Smart 4K|Movie IPTV Quad|TOUCAN (?:NANO|Stick) 4K|NetTAB_Space_3G'
+  regex: 'IconBIT|NT-(3506M|1501C|0704S|0909T|1009T|10[01]1T|1017T|3601P/3602P|3603P|3702S|3805C|3905T|3701S|0701S|0805C|0902S|370[23]M)|XDS[789]4K|Omnicast UHD|Movie Smart 4K|Movie IPTV Quad|TOUCAN (?:Smart 3D Quad|(?:NANO|Stick) 4K)|NetTAB_Space_3G'
   device: 'tablet'
   models:
     - regex: 'NT-3506M'
@@ -10651,10 +10931,13 @@ IconBIT:
     - regex: 'TOUCAN NANO 4K'
       model: 'Toucan Nano 4K'
       device: 'tv'
+    - regex: 'TOUCAN Smart 3D Quad'
+      model: 'Toucan Smart 3D Quad'
+      device: 'tv'
     - 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?)'
+    - regex: '(?:iconBIT )?(Movie (?:Smart 4K|UNO|Play|IPTV Quad|Ultra HD 4K)|XDS[789]4K|Omnicast UHD|Stick|XDS1[01]00?|Movie [XZ])'
       model: '$1'
       device: 'tv'
 
@@ -10850,13 +11133,13 @@ IMO Mobile:
 
 # iLA or ILA Mobile
 iLA:
-  regex: '(?:iLA[-_ ](?:Silk|X)|R1 Lite)(?:[);/ ]|$)'
+  regex: '(?:iLA[-_ ](?:Silk|X|R1)|R1 Lite)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'iLA[-_ ](Silk|X)(?:[);/ ]|$)'
-      model: '$1'
     - regex: '(R1) Lite(?:[);/ ]|$)'
       model: '$1 Lite'
+    - regex: 'iLA[-_ ](Silk|X|R1)(?:[);/ ]|$)'
+      model: '$1'
 
 # iNew
 iNew:
@@ -10880,7 +11163,7 @@ 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|S501A|WAVE 4.0 II|WAVE 5.0|MEGA7|SAMBA65S)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Kylin_5.0S'
@@ -10921,7 +11204,7 @@ iPro:
       model: 'Wave 4.0 II'
     - regex: 'WAVE 5.0'
       model: 'Wave 5.0'
-    - regex: '(I9355A|S501A|Perla)'
+    - regex: '(I9355A|S[45]01A|Perla)'
       model: '$1'
     - regex: 'MEGA7'
       device: 'tablet'
@@ -11018,6 +11301,12 @@ Infinix:
       model: 'Hot 2'
     - regex: 'Infinix[ _-]X55[34]'
       model: 'Hot 3'
+    - regex: 'Infinix[ _-]X669'
+      model: 'Hot 30i'
+    - regex: 'Infinix[ _-](?:X6831|X6833B)'
+      model: 'Hot 30'
+    - regex: 'Infinix[ _-]X6835B'
+      model: 'Hot 30 Play'
     - regex: 'Infinix[ _-]X622'
       model: 'Hot S3X'
     - regex: 'Infinix[ _-]X521'
@@ -11121,6 +11410,12 @@ Infinix:
       model: 'Smart 6'
     - regex: 'Infinix[ _-]X6512'
       model: 'Smart 6 HD'
+    - regex: 'Infinix[ _-]X6517'
+      model: 'Smart 7 Plus'
+    - regex: 'Infinix[ _-]X6515'
+      model: 'Smart 7'
+    - regex: 'Infinix[ _-]X6516'
+      model: 'Smart 7 HD'
     - regex: 'Infinix[ _-]X652B'
       model: 'S5 Lite'
     - regex: 'Infinix[ _-]X626'
@@ -11177,6 +11472,9 @@ Infinix:
     - regex: 'Infinix[ _-]X663C'
       model: 'Note 12'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X677'
+      model: 'Note 12i (2022)'
+      device: 'phablet'
     - regex: 'Infinix[ _-]X6819'
       model: 'Note 12i'
       device: 'phablet'
@@ -11210,6 +11508,15 @@ Infinix:
     - regex: 'Infinix[ _-]X676C'
       model: 'Note 12 (2023)'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X6716'
+      model: 'Note 30i'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X6710'
+      model: 'Note 30 VIP'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X678B'
+      model: 'Note 30 Pro'
+      device: 'phablet'
 
     - regex: 'Infinix HOT ([a-z]?[1-6])( (?:Lite|Plus|Pro))?'
       model: 'Hot $1$2'
@@ -11223,33 +11530,9 @@ Infinix:
     - regex: 'Infinix[ _-]([a-z0-9_\-]+)'
       model: '$1'
 
-# InFocus
-InFocus:
-  regex: '(?:IF(900[1237]|902[19]|903[15])|M370i?)(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: 'IF9001'
-      model: 'Turbo 5'
-    - regex: '(M370i?)'
-      model: '$1'
-    - regex: 'IF9007'
-      model: 'A3'
-    - regex: 'IF9021'
-      model: 'Turbo 5 Plus'
-    - regex: 'IF9035'
-      model: 'A2'
-    - regex: 'IF9002'
-      model: 'M5s'
-    - regex: 'IF9003'
-      model: 'M6s'
-    - regex: 'IF9031'
-      model: 'Vision 3'
-    - regex: 'IF9029'
-      model: 'Vision 3 Pro'
-
 # InnJoo (innjoo.es)
 InnJoo:
-  regex: 'InnJoo|(?:Halo Plus|Halo X|Halo 5 3G|Halo[ _]4(?:[ _]mini[ _]LTE)?|VISION LTE|Halo2 3G|Fire_Plus_LTE|Fire3 mini|Fire2 (?:Air|Pro|Plus) LTE|Fire2 LTE|Superb(?:_PLus)?)(?:[);/ ]|$)'
+  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)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'InnJoo[ _]X3(?:[);/ ]|$)'
@@ -11286,6 +11569,12 @@ InnJoo:
       model: 'Fire 2 LTE'
     - regex: 'Fire3 mini'
       model: 'Fire 3 Mini'
+    - regex: 'Fire 4 Pro'
+      model: 'Fire 4 Pro'
+    - regex: 'Fire 4 Plus'
+      model: 'Fire 4 Plus'
+    - regex: 'Fire 4'
+      model: 'Fire 4'
     - regex: 'Superb_PLus'
       model: 'SuperB Plus'
     - regex: 'Superb'
@@ -11337,11 +11626,13 @@ Insignia:
 
 # INSYS (https://www.insys.pt/)
 INSYS:
-  regex: 'INSYS|(?:HK9-4010|IH9-L614)(?:[);/ ]|$)'
+  regex: 'INSYS|(?:HK9-4010|IH9-L614|AC7_DJ17)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'HK9-4010'
       model: 'HK9-4010'
+    - regex: 'AC7_DJ17'
+      model: 'AC7-DJ17'
     - regex: 'IH9-L614'
       model: 'MX IH9-L614'
     - regex: '(VI4-103|GU4-K147)'
@@ -11535,6 +11826,8 @@ Intex:
       model: 'Aqua Fulvu E5'
     - regex: 'AQUA JEWEL 2(?:[);/ ]|$)'
       model: 'Aqua Jewel 2'
+    - regex: 'Aqua[_ ]Life[_ ]?III(?:[);/ ]|$)'
+      model: 'Aqua Life III'
     - regex: '(?:INTEX[_ ])?AQUA[_ ]4\.0[_ ]4G'
       model: 'Aqua 4.0 4G'
     - regex: '(?:INTEX[_ ])?AQUA[_ ]4G[_ ]MINI'
@@ -11543,6 +11836,10 @@ Intex:
       model: 'Aqua Lions 4G'
     - regex: '(?:INTEX[_ ])?AQUA[_ ]PRIME[_ ]4G'
       model: 'Aqua Prime 4G'
+    - regex: '(?:INTEX[_ ])?AQUA[_ ]ZENITH'
+      model: 'Aqua Zenith'
+    - regex: '(?:INTEX[_ ])?AQUA[_ ]POWER[_ ]IV'
+      model: 'Aqua Power IV'
     - regex: '(?:INTEX[ _])?AQUA[_ ]YOUNG[_ ]4G'
       model: 'Aqua Young 4G'
     - regex: '(?:INTEX[ _])?AQUA[_ ]TREND[_ ]LITE'
@@ -11551,6 +11848,8 @@ Intex:
       model: 'Aqua Amaze Plus'
     - regex: '(?:INTEX[ _])?AQUA[_ ]Supreme\+'
       model: 'Aqua Supreme Plus'
+    - regex: '(?:INTEX[ _])?AQUA[_ ]STYLE (\d)'
+      model: 'Aqua Style $1'
     - regex: '(?:INTEX[ _])?AQUA[_ ]Strong 5\.1\+'
       model: 'Aqua Strong 5.1 Plus'
     - regex: '(?:INTEX[ _])?AQUA[_ ]CRYSTAL'
@@ -11700,6 +11999,8 @@ iTel:
       model: 'S16 Pro'
     - regex: 'W5505'
       model: 'A36'
+    - regex: 'A662L'
+      model: 'A60'
     - regex: 'W5504'
       model: 'P33'
     - regex: 'W5503'
@@ -11708,10 +12009,14 @@ iTel:
       model: 'A35'
     - regex: 'A571W'
       model: 'A37'
+    - regex: 'A631L'
+      model: 'A49 Play'
     - regex: 'W6002E?'
       model: 'S15'
-    - regex: 'S663LN'
+    - regex: 'S663L[NC]'
       model: 'Vision 5'
+    - regex: 'S662LCN'
+      model: 'Vision 5 Plus'
     - regex: 'S663L'
       model: 'S18'
     - regex: 'S661W'
@@ -11750,6 +12055,8 @@ iTel:
       model: 'P38'
     - regex: 'L5007'
       model: 'A24'
+    - regex: 'A512W'
+      model: 'A18'
     - regex: 'L6003P'
       model: 'A55 LTE'
     - regex: 'L6002P'
@@ -11798,6 +12105,8 @@ iTel:
       model: 'A57'
     - regex: 'itel[ _]A15R'
       model: 'A15'
+    - regex: 'P662LN?'
+      model: 'P40'
     - regex: 'L6005'
       model: 'Vision 1'
     - regex: 'P682LPN'
@@ -11839,6 +12148,8 @@ iTel:
     - regex: 'itel it170([23])'
       device: 'tablet'
       model: 'iNote Prime $1'
+    - regex: 'itel A(\d{1,2}) ?Plus'
+      model: 'A$1 Plus'
 
     - regex: 'iTel ([^/;)]+)(?: Build|[;)])'
       model: '$1'
@@ -11920,12 +12231,12 @@ 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[ _][GZ]|Black_G_2|BLACK_PRO|ATV R[12]|GOLD_PRO|KBOOK7M)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Black_G_2'
       model: 'Black G 2'
-    - regex: 'Black[ _]([GZ])'
+    - regex: 'Black[ _]([GXZ])'
       model: 'Black $1'
     - regex: 'BLACK_PRO'
       model: 'Black Pro'
@@ -12129,7 +12440,7 @@ Kogan:
       model: 'Agora 11'
     - regex: 'Agora Go'
       model: 'Agora Go'
-    - regex: 'Kogan[ _-]([^;/]+) Build'
+    - regex: 'Kogan[ _-]([^;/)]+)(?: Build|[;)])'
       model: '$1'
     - regex: 'Kogan[ _-]([a-z0-9_-]+)'
       model: '$1'
@@ -12149,7 +12460,7 @@ Koobee:
   regex: 'Koobee|F2_Plus(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'F2_Plus'
+    - regex: 'F2[_ ]Plus'
       model: 'F2 Plus'
     - regex: 'Koobee[ _\-]?([^;/]+) Build'
       model: '$1'
@@ -12208,14 +12519,14 @@ Kodak:
       device: 'tablet'
       model: 'Tablet $1'
 
-# KOPO
+# KOPO or JKOPO (http://www.jkopo.com/)
 KOPO:
-  regex: 'KOPO[ _-]'
+  regex: 'J?KOPO[ _-]'
   device: 'smartphone'
   models:
-    - regex: 'KOPO[ _\-]?([^/;]+) Build'
+    - regex: 'J?KOPO[ _-]?([^/;)]+)(?: Build|[;)])'
       model: '$1'
-    - regex: 'KOPO[ _\-]?([^);/ ]+)'
+    - regex: 'J?KOPO[ _-]?([^/;)]+)'
       model: '$1'
 
 # Koridy
@@ -12280,7 +12591,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|KYV40U?|KYY31|KYV4[1-8]|KYV4[47]|KC-S301AE|X3-KC|E6560[CT]|E6782[L]?|E6790(?:TM)?|SZJ-JS20[12]|KCP01K|[47]04KC|A[012]01KC|WX10K|URBANO PROGRESSO|E7110|E6921|KY-51B|C6930|A101BM)(?:[-_][uj]2?)?(?:[);/ ]|$)'
+  regex: 'Kyocera|KWC-|QC-[0-9]{4}|(?:QC6035|NP501KC|302KC|503KC|602KC|705KC|901KC|C51[27]0|C5155|C5215|C67[35]0|C6522N?|C6530N|C6740N?|C6743|E6[89]10|KYL2[13]|KYV3[1-9]|KYT3[123]|KYF3[1235789]|KYF4[012]|KYX31|KYG01|KYY2[1-4]|S2151|KC-S701|S[468]-KC|S9-KC|S10-KC|KYV40U?|KYY31|KYV4[1-8]|KYV4[47]|KC-S301AE|KC-S302|X3-KC|E6560[CT]|E6782[L]?|E6790(?:TM)?|SZJ-JS20[12]|KCP01K|[47]04KC|A[012]01KC|WX10K|URBANO PROGRESSO|E7110|E6921|KY-51B|C6930|A101BM)(?:[-_][uj]2?)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -12288,7 +12599,7 @@ Kyocera:
       model: 'Milano'
     - regex: '(A101BM)(?:[);/ ]|$)'
       model: 'Balmuda $1'
-    - regex: 'S([4689])-KC(?:[);/ ]|$)'
+    - regex: 'S([4689]|10)-KC(?:[);/ ]|$)'
       model: 'One S$1'
     - regex: 'C5155(?:[);/ ]|$)'
       model: 'Rise'
@@ -12302,6 +12613,8 @@ Kyocera:
       model: 'Digno J'
     - regex: '302KC(?:[);/ ]|$)'
       model: 'Digno T'
+    - regex: 'KC-S302(?:[);/ ]|$)'
+      model: 'Digno XS2'
     - regex: 'NP501KC(?:[);/ ]|$)'
       model: 'Digno'
     - regex: 'WX10K(?:[);/ ]|$)'
@@ -12549,7 +12862,7 @@ Benco:
 
 # Lava (Lavamobiles.com)
 Lava:
-  regex: 'Lava[ _]|LAVA(?:A1|X10)|(?:DISCOVER136|KKT QUADRA)|iris(?! Plus 2021|_Pad_G)[ _]?([^/;)]+)(?<!Plus 2021)(?: Build|[;)])|A(?:67|76) Build|X1 Selfie Build|X41 Plus Build|X1_atom_L|(?:Flair (?:[ZS]1|P8)|PixelV1|Pixel V2\+?|Z60s|Z61_2GB|A97 IPS|A97 2GB PLUS|L[EH]9920(?:[_ ]P)?|L[NEH]9910|LH9810|Ivory(?:S1|S4G)?|A76Plus|Grand2c|AH9910| A3_mini|T71_w|V23GB|R1_Lite|Atom 2X|AF9030|Z50_Pro| Z(?:[56]1|92)|Android 6(?:[\d.]*);(?: [\w-]+;)? (:?X28|P7plus)|AF9020|Alfa L)(?:[);/ ]|$)'
+  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])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -12605,6 +12918,8 @@ Lava:
       model: 'X2'
     - regex: 'LZG403(?:[);/ ]|$)'
       model: 'Z3'
+    - regex: 'LZG401(?:[);/ ]|$)'
+      model: 'Z6'
     - regex: 'Z60s(?:[);/ ]|$)'
       model: 'Z60s'
     - regex: 'V23GB(?:[);/ ]|$)'
@@ -12633,6 +12948,10 @@ Lava:
       model: 'Iris 59'
     - regex: 'LH9950(?:[);/ ]|$)'
       model: 'Iris 46'
+    - regex: 'LN9821(?:[);/ ]|$)'
+      model: 'Iris 45C'
+    - regex: 'LN9820(?:[);/ ]|$)'
+      model: 'Iris 45'
     - regex: 'Atom 2X(?:[);/ ]|$)'
       model: 'Iris Atom 2X'
     - regex: 'Alfa L(?:[);/ ]|$)'
@@ -12673,6 +12992,12 @@ Lava:
     - regex: 'Ivory(S1|S4G)?(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Ivory $1'
+    - regex: 'T81N_UP(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T81N Up'
+    - regex: 'T81N(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T81N'
     - regex: 'T71_w(?:[);/ ]|$)'
       device: 'tablet'
       model: 'T71'
@@ -12715,7 +13040,7 @@ Landvo:
 
 # Land Rover
 Land Rover:
-  regex: 'Land[ ]?Rover[d]?[ _-](?:X1[0-9]|Explore|T878|L15\+|V18|V[168]|X)(?:[);/ ]|$)|Polar3|Vphone[- ]X3'
+  regex: 'Land[ ]?Rover[d]?[ _-](?:X1[0-9]|Explore|T878|L15\+|V18|V[168]|X)(?:[);/ ]|$)|Polar3|Vphone[- ]X3|ST11-A5'
   device: 'smartphone'
   models:
     - regex: 'Land[ ]?Rover[d]?[ _-](X1[0-9]|Explore(?: R)?|T878|L15\+|V18|V[168]|X)(?:[);/ ]|$)'
@@ -12724,6 +13049,9 @@ Land Rover:
       model: 'Vphone X3'
     - regex: 'Polar3'
       model: 'Ioutdoor Polar 3'
+    - regex: '(ST11-A5)'
+      device: 'tablet'
+      model: '$1'
 
 # iOutdoor
 iOutdoor:
@@ -12739,7 +13067,7 @@ Lanin:
 
 # lanix (lanix.com)
 Lanix:
-  regex: 'LANIX-([a-z0-9]+)|Ilium[ _]|LANIX_PAD|IliumPad|X120C|(?:Alpha 950(?:XL)?|Alpha [135]V)(?:[);/ ]|$)'
+  regex: 'LANIX-([a-z0-9]+)|Ilium[ _]|LANIX_PAD|IliumPad|X120C|(?:Alpha 950(?:XL)?|Alpha [135]V|X540)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ILIUM_PAD_RX10v5'
@@ -12753,14 +13081,16 @@ Lanix:
       device: 'tablet'
     - regex: 'X120C'
       model: 'Ilium X120C'
-    - regex: 'Ilium[ _](Alpha [15]s|Alpha [379]|Alpha 1T|L(?:200|6[12]0|9[0125]0|1[0124]00|1050|1120)|LT5[012]0|M[579]s|M7T|M[13579]|S(?:106|520|6[27]0)|X(?:1[12]0|2[0126]0|5[12]0|500B|710))(?:[);/ ]|$)'
+    - regex: 'Ilium[ _](Alpha [15]s|Alpha [379]|Alpha 1T|L(?:200|6[12]0|9[0125]0|1[0124]00|1050|1120)|LT5[012]0|M[579]s|M7T|M[13579]|S(?:106|520|6[27]0)|X(?:1[12]0|2[0126]0|400|5[12]0|500B|710))(?:[);/ ]|$)'
       model: 'Ilium $1'
-    - regex: 'ILIUM[ _]([^;/]+) Build'
+    - regex: 'ILIUM[ _]([^;/)]+)(?: Build|[;)])'
       model: 'Ilium $1'
     - regex: 'Alpha (9500|950(?:XL)?)'
       model: 'Ilium Alpha $1'
     - regex: 'Alpha ([135])V'
       model: 'Alpha $1V'
+    - regex: '(X540)'
+      model: '$1'
     - regex: 'LANIX-([a-z0-9]+)'
       device: 'feature phone'
       model: '$1'
@@ -12831,7 +13161,7 @@ LCT:
 
 # Leagoo
 Leagoo:
-  regex: '(?:MY)?LEAGOO[ _-]?|(?:XRover(?: C)?|Shark (5000|1|6300)|M5 EDGE|KIICAA (POWER|MIX)|Leapad[ _](?:X|7s|7Pro)|Alfa [125]|Elite [15]|Venture 1|Z10-E|M9 Pro|Power 5|Power[ _]2(?: Pro)?|Android 9;(?: [\w-]+;)? M1[23]|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:Z9A|T8s)|Lead 3| T5c)(?:[);/ ]|$)'
+  regex: '(?:MY)?LEAGOO[ _-]?|(?:XRover(?: C)?|Shark (5000|1|6300)|M5 EDGE|KIICAA (POWER|MIX)|Leapad[ _](?:X|7s|7Pro)|Alfa [125]|Elite [15Y]|Venture 1|Z10-E|M9 Pro|Power 5|Power[ _]2(?: Pro)?|Android 9;(?: [\w-]+;)? M1[23]|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:Z9A|T8s)|Lead 3| T5c)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:LEAGOO[- _])?M([89])[_-]?Pro(?:[);/ ]|$)'
@@ -12846,7 +13176,7 @@ Leagoo:
       model: 'KICCAA Power'
     - regex: 'KIICAA MIX'
       model: 'KICCAA Mix'
-    - regex: 'Elite ([15])(?:[);/ ]|$)'
+    - regex: 'Elite ([15Y])(?:[);/ ]|$)'
       model: 'Elite $1'
     - regex: 'Shark (1|5000|6300)(?:[);/ ]|$)'
       model: 'Shark $1'
@@ -12907,7 +13237,7 @@ LeEco:
       model: '$1'
     - regex: 'X900 Build'
       model: 'Le X900'
-    - regex: 'LEX72[07](?:[);/ ]|$)'
+    - regex: 'LEX72[057](?:[);/ ]|$)'
       model: 'Le Pro 3'
     - regex: 'LEX65[0137](?:[);/ ]|$)'
       model: 'Le Pro 3 AI'
@@ -12917,7 +13247,7 @@ LeEco:
       model: 'Le 2'
     - regex: 'lineage_c106'
       model: 'Cool 1'
-    - regex: 'LEX82[019]'
+    - regex: 'LEX82[019]|Le Max 2'
       model: 'Le Max 2'
     - regex: 'Le ?X([^;/]+) Build'
       model: 'Le X$1'
@@ -12949,12 +13279,15 @@ Lephone:
 
 # lenco
 Lenco:
-  regex: 'Lenco ([^/);]*)(?: Build|[);])'
+  regex: 'Lenco (?:[^/);]*)(?: Build|[);])|(?:TDV900)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'LENCO Diverso-700'
       device: 'portable media player'
       model: 'Diverso 700'
+    - regex: 'TDV900'
+      model: 'TDV900'
+
     - regex: 'Lenco ([^/);]*)(?: Build|[);])'
       model: '$1'
 
@@ -12968,7 +13301,7 @@ Aligator:
 
 # lenovo (lenovo.com)
 Lenovo:
-  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|ZUK[ -_]|(?:TB2-X30L|TB3-710I|TB328FU|TB128FU|YT3-X50[ML]|K50a40|TB-(?:X103F|8504F|X304F|X704V|X704A)|A5500-H|A2107A-H|A3500-HV|A2109A|S6000|Z2 Plus|Vibe[ _](?:P1|S6i Plus|S[23567]i|C|[ZX]2|K5(?: Plus)?|V7)|P2A42|L38011|L18011|[5-8]01LV|[67]02LV|Z2131|K350t|K31-t3|TAB 2 A8-50LC|S90-A|A101LV|P70-A|VR-1541F|d-42A|lineage_A6020|EveryPad2|A2010l36|F0CU0028RK|TB132FU|TB328XU|TB138FC|PB-6505Y)(?:[);/ ]|$)'
+  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|ZUK[ -_]|(?:TB2-X30L|TB3-710I|TB328FU|TB128FU|YT3-X50[MFL]|K50a40|TB-(?:X103F|8504F|X304F|X704V|X704A)|A5500-H|A2107A-H|A3500-HV|A2109A|S6000|Z2 Plus|Vibe[ _](?:P1|S6i Plus|S[23567]i|C|[ZX]2|K5(?: Plus)?|V7)|P2A42|L38011|L18011|[5-8]01LV|[67]02LV|Z2131|K350t|K31-t3|TAB 2 A8-50LC|S90-A|A101LV|P70-A|VR-1541F|d-42A|lineage_A6020|EveryPad2|A2010l36|F0CU0028RK|TB132FU|TB328XU|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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Lenovo ?G780'
@@ -12983,7 +13316,7 @@ Lenovo:
     - regex: '(?:Lenovo[ _])?A5500-[HF]'
       model: 'IdeaTab A8-50'
       device: 'tablet'
-    - regex: 'Lenovo ?A7600'
+    - regex: 'Lenovo ?A7600|A7600-H'
       model: 'IdeaTab A10-70'
       device: 'tablet'
     - regex: 'A2107A-H'
@@ -13019,6 +13352,9 @@ Lenovo:
     - regex: 'TB3-X70L'
       model: 'TAB3 10 Plus'
       device: 'tablet'
+    - regex: 'TB3-X70F'
+      model: 'TAB3 10 Business'
+      device: 'tablet'
     - regex: 'TB-8703[XF]'
       model: 'TAB3 8 Plus'
       device: 'tablet'
@@ -13079,6 +13415,9 @@ Lenovo:
     - regex: 'TB-J607F(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab QT K11 Pro WiFi'
+    - regex: 'TB-J6C6F(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Tab QT K11 WiFi'
     - regex: 'TB-J616[XF](?:[);/ ]|$)'
       model: 'Tab P11 Plus'
       device: 'tablet'
@@ -13088,6 +13427,9 @@ Lenovo:
     - regex: 'TB132FU(?:[);/ ]|$)'
       model: 'Tab P11 Pro (Gen 2)'
       device: 'tablet'
+    - regex: 'TB350[FX]U(?:[);/ ]|$)'
+      model: 'Tab P11 (Gen 2)'
+      device: 'tablet'
     - regex: 'TB-J607Z(?:[);/ ]|$)'
       model: 'Tab K11 Pro 5G'
       device: 'tablet'
@@ -13127,7 +13469,7 @@ Lenovo:
     - regex: '(?:Lenovo )?TB328[FX]U'
       model: 'Tab M10 (Gen 3)'
       device: 'tablet'
-    - regex: 'Lenovo TB-X505' # 2019
+    - regex: '(?:Lenovo )?TB-X505' # 2019
       model: 'Tab M10'
       device: 'tablet'
     - regex: 'TB-7305[IXF](?:[);/ ]|$)'
@@ -13139,6 +13481,9 @@ Lenovo:
     - regex: 'Lenovo ?B8000(-[FH])?'
       model: 'Yoga Tablet 10'
       device: 'tablet'
+    - regex: 'Lenovo ?B8080(-[FH])?'
+      model: 'Yoga Tablet 10 HD'
+      device: 'tablet'
     - regex: 'YOGA Tablet 2 Pro-1380[FL]'
       model: 'Yoga Tablet 2 Pro 13.3"'
       device: 'tablet'
@@ -13200,7 +13545,7 @@ Lenovo:
     - regex: 'TB-8504F'
       model: 'TAB 4 8'
       device: 'tablet'
-    - regex: 'TB-8704F'
+    - regex: 'TB-8704[FV]'
       model: 'Tab 4 8" Plus'
       device: 'tablet'
     - regex: 'TB-X304X'
@@ -13233,9 +13578,15 @@ Lenovo:
     - regex: 'TB-8505[FX]S'
       model: 'Smart Tab M8'
       device: 'tablet'
-    - regex: 'TB-8505[FX]|TB-8506F'
+    - regex: 'TB-8505[FX]'
       model: 'Tab M8'
       device: 'tablet'
+    - regex: 'TB-8506[FX]'
+      model: 'Tab M8 (Gen 3)'
+      device: 'tablet'
+    - regex: 'TB300[FX]U'
+      model: 'Tab M8 (Gen 4)'
+      device: 'tablet'
     - regex: 'TB-8705[FX]'
       model: 'Tab M8 FHD'
       device: 'tablet'
@@ -13512,16 +13863,16 @@ Lexibook:
 
 # LG or LGE (lg.com)
 LG:
-  regex: '(?<!TECNO )LG|Web0S; Linux/SmartTV|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?: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)(?:[);/ ]|$)|NetCast|RS98[78]|RS500|VS(?:50[01]|835|876|880|98[05-8]|99[056]|(410|415|425|500|880)PP)|VS820|VS870 4G|Nexsus 5|LML(41[34]D|211B|713D|212V)L|VK810 4G|VK815|X5-LG|L-05[DE]|L-03K|L-01[LJK]|L-52A|L-[45]1A|901LG|A001LG|80[12]LG|402LG|LGT32|L-02K|L-01F|LM-V40|DM-01K|DM-02H|LMX130IM|VS810PP|VS425|VM670|VS930 4G'
+  regex: '(?<!TECNO )LG|Web0S; Linux/SmartTV|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:(?!VX20|VX19)VX[0-9]+|L-0[12]D|L-07C|P713|(LM-[A-Z][0-9]{3}[A-Z]{0,3}(?:\(FGN?\)|\(G\)|\.FN|\.F(?:GN?)?)?)|LM-(X625N1|G820QM[0127])|G Watch|lucye)(?:[);/ ]|$)|NetCast|RS98[78]|RS500|VS(?:50[01]|835|876|880|98[05-8]|99[056]|(410|415|425|500|880)PP)|VS820|VS870 4G|Nexsus 5|LML(41[34]D|211B|713D|212V)L|VK810 4G|VK815|X5-LG|L-05[DE]|L-03K|L-01[LJK]|L-52A|L-[45]1A|901LG|A001LG|80[12]LG|402LG|LGT32|L-02K|L-01F|LM-V40|DM-01K|DM-02H|LMX130IM|VS810PP|VS425|VM670|VS930 4G'
   device: 'smartphone'
   models:
     - regex: 'DM-(01K|02H)'
       model: 'Disney Mobile DM-$1'
-    - regex: 'LG-D32[015]|LG-?AS323|LG-?LS620'
+    - regex: 'LG-?(?:D32[0159]|AS323|LS620)'
       model: 'L70'
     - regex: 'LG-?(D315|L31L|F370)'
       model: 'F70'
-    - regex: 'LG-D4(?:[01]5|10)'
+    - regex: 'LG-D4(?:[01]5|[01]0)'
       model: 'L90'
     - regex: 'LG-D37[35]'
       model: 'L80'
@@ -13531,13 +13882,17 @@ LG:
       model: 'L30'
     - regex: 'LG-D160'
       model: 'L40'
-    - regex: 'LG-D107'
+    - regex: 'LG-?(?:X132|X130g)'
+      model: 'L45'
+    - regex: 'LG-?(?:D157f|D150)'
+      model: 'L35'
+    - regex: 'LG-D10[057]'
       model: 'L20'
-    - regex: 'LG-X145'
+    - regex: 'LG-X14[057]'
       model: 'L60'
-    - regex: 'LG-X135'
+    - regex: 'LG-X13[57]'
       model: 'L60i'
-    - regex: 'LG-D285'
+    - regex: 'LG-D28[05]'
       model: 'L65'
     - regex: 'LM-X210APM'
       model: 'Phoenix 4'
@@ -13549,24 +13904,30 @@ LG:
       model: 'Tribute Empire'
     - regex: 'LG-SP200'
       model: 'Tribute Dynasty'
-    - regex: 'LGLS675'
+    - regex: 'LG-?LS675'
       model: 'Tribute 5'
+    - regex: 'LG-?LS665'
+      model: 'Tribute 2'
     - regex: 'LG-F570'
       model: 'Band Play'
     - regex: 'VS930 4G'
       model: 'Spectrum II 4G'
-    - regex: 'VS980|L-01F|LG-(?:F320[LK]|D80[02]|LS980)'
+    - regex: 'VS980|L-01F|LG-(?:F320[LKS]|D80[012356]|LS980)'
       model: 'G2'
     - regex: 'LG-D6(?:1[08]|2[05])'
       model: 'G2 Mini'
-    - regex: 'LG-(?:D85[012568]|AS990)|(?:LG-)?(?:VS985|LGLS990|LGUS990|LGL24)(?:[);/ ]|$)'
+    - regex: 'LG-(?:D85[012568]|AS990|F400[LKS])|LG-?LS990|(?:LG-)?(?:VS985|LGUS990|LGL24|LGD85[05]|LGV31)(?:[);/ ]|$)'
       model: 'G3'
-    - regex: 'LG-D722'
+    - regex: 'LG-?LS885'
+      model: 'G3 Vigor'
+    - regex: 'LG-F410S'
+      model: 'G3 A'
+    - regex: 'LG-D722(?!J)'
       model: 'G3S'
+    - regex: 'LG-(?:D72[23568]|F470[LKS]|D722J)'
+      model: 'G3 Beat'
     - regex: 'LG-D693n?|LG-D690n'
       model: 'G3 Stylus'
-    - regex: 'LG-(?:D72[23568]|F470K)'
-      model: 'G3 Beat'
     - regex: 'LG-F460'
       model: 'G3 Cat. 6'
     - regex: 'LG-D724'
@@ -13575,32 +13936,38 @@ LG:
       model: 'G4'
     - regex: 'LG-H525n?'
       model: 'G4c'
+    - regex: 'LG-H22[012]'
+      model: 'Joy'
     - regex: 'LG-(?:H540|H542|H630)'
       model: 'G4 Stylus'
-    - regex: 'LG-H736'
+    - regex: 'LG-H73[46]'
       model: 'G4s'
     - regex: 'LG-H735'
       model: 'G4 Beat'
+    - regex: 'LG-H731'
+      model: 'G4 Vigor'
     - regex: 'LG-H8(?:20|3[01]|5[08]|6[08])|VS987|(?:LG-)?RS988|LG-F700[SKL]|LG-?(?:[LU]S992|AS992)'
       model: 'G5'
     - regex: 'LG-H84[05]'
       model: 'G5 SE'
-    - regex: 'VS988|LG-H87(?:[01](?:DS|[SI]|AR)?|[23])|LG-?US997|LGM-G600[SKL]|LG-[AL]S993'
+    - regex: 'VS988|LG-H87(?:[01](?:DS|[SI]|AR)?|[23])|LG-?US997|LGM-G600[SKL]|LG-[AL]S993|lucye'
       model: 'G6'
     - regex: 'LM-Q850'
       model: 'G7 Fit'
     - regex: 'LM-Q910'
       model: 'G7 One'
-    - regex: 'LG-?(?:L23|D950|F340S)(?:[);/ ]|$)'
+    - regex: 'LG-?(?:L23|D95[015689]|LS995|D950G|F340[LKS])(?:[);/ ]|$)'
       model: 'G Flex'
-    - regex: 'LG-(?:H950|F510L)'
+    - regex: 'LG-?(?:H95[059]|F510[KLS]|LS996|AS995)'
       model: 'G Flex 2'
-    - regex: 'LG-D68[056]'
+    - regex: 'LG-D68[0-6]'
       model: 'G Pro Lite'
     - regex: 'LM-G820([NV]|QM[0127]|UMB)?'
       model: 'G8'
     - regex: 'LG-F430L'
       model: 'Gx2'
+    - regex: 'LG-F310LR?'
+      model: 'Gx'
     - regex: 'LM-G850'
       model: 'G8X ThinQ'
     - regex: 'LM-G810'
@@ -13609,11 +13976,17 @@ LG:
       model: 'G8X ThinQ'
     - regex: 'LG-H410(?:[);/ ]|$)'
       model: 'Wine Smart H410'
+    - regex: 'LG-?(?:D486|F480[LKS])(?:[);/ ]|$)'
+      model: 'Wine Smart'
+    - regex: 'LG-?T480[KS]'
+      model: 'Wine Smart 3G'
+    - regex: 'LG-F610[KS]'
+      model: 'Wine Smart Jazz'
     - regex: 'VS501|LM-X120'
       model: 'K20'
-    - regex: 'LGMS395'
+    - regex: 'LGMS395|LG-D393'
       model: 'F60'
-    - regex: 'LG-(?:F520[KS]|H788)'
+    - regex: 'LG-(?:F520[LKS]|H788)'
       model: 'AKA'
     - regex: 'LM-K920'
       model: 'K92'
@@ -13625,11 +13998,11 @@ LG:
       model: 'Magna'
     - regex: 'LGL63BL'
       model: 'Fiesta'
-    - regex: 'LGL163BL'
+    - regex: 'LGL16(?:3BL|4VL)'
       model: 'Fiesta 2'
     - regex: 'LG-(?:X15[05]|X165g)'
       model: 'Bello 2'
-    - regex: 'LG-D33[15]'
+    - regex: 'LG-D33[157]'
       model: 'L Bello'
     - regex: 'LG-D29[05]'
       model: 'L Fino'
@@ -13647,15 +14020,23 @@ LG:
       model: 'X400'
     - regex: 'LGM-X320[SKL]?(?:[);/ ]|$)'
       model: 'X500'
-    - regex: 'LG-F620[KL]'
+    - regex: 'LGM-X100S'
+      model: 'Smart Folder X100S'
+    - regex: 'LG-F620[KLS]'
       model: 'Class'
+    - regex: 'LG-?L18VC'
+      model: 'Classic'
     - regex: '(?:LG-)?P500H'
       model: 'Optimus One'
-    - regex: '(?:LG-)?VS450PP'
+    - regex: '(?:LG-?)?VS450PP'
       model: 'Optimus Exceed 2'
-    - regex: 'LG-(?:E97[57]|F180S|E987)'
+    - regex: 'LG-(?:E97[567]|F180[KLS]|E987|LS970)|LGL01E'
       model: 'Optimus G'
-    - regex: 'LG-(?:F240[KLS]|E986)'
+    - regex: 'LG-F220K'
+      model: 'Optimus GK'
+    - regex: 'LG-?L39C'
+      model: 'Optimus Dynamic II'
+    - regex: 'LG-(?:F240[KLS]|E98[69]|E98[015])'
       model: 'Optimus G Pro'
     - regex: 'LG-E435f?'
       model: 'Optimus L3 II'
@@ -13663,24 +14044,40 @@ LG:
       model: 'Optimus L4 II'
     - regex: 'LG-E4(?:67f|45)'
       model: 'Optimus L4 II Dual'
+    - regex: 'LG-?(?:D180f|D175f|D170|D165)'
+      model: 'Optimus L40'
     - regex: 'LG-E4[56]0'
       model: 'Optimus L5 II'
+    - regex: 'LG-E61[02]'
+      model: 'Optimus L5'
     - regex: 'LG-(?:E4[17]5f|E410)'
       model: 'Optimus L1 II'
+    - regex: 'LG-(?:D605)'
+      model: 'Optimus L9 II'
     - regex: 'LG-P875'
       model: 'Optimus F5'
-    - regex: 'LG-P655H'
+    - regex: 'LG-?(?:P655H|MS659)'
       model: 'Optimus F3'
-    - regex: 'LGMS500'
+    - regex: 'LGMS500|LG-D505'
       model: 'Optimus F6'
     - regex: 'LG-US780'
       model: 'Optimus F7'
     - regex: '(L-05[DE])(?:[);/ ]|$)'
       model: 'Optimus it $1'
-    - regex: 'LG-L160L(?:[);/ ]|$)'
+    - regex: 'LG-L160L|LG-F160'
       model: 'Optimus LTE 2'
-    - regex: '(?:P713|LG-P71[0245])(?:[);/ ]|$)'
+    - regex: 'LG-F260S'
+      model: 'Optimus LTE 3'
+    - regex: 'LG-F120'
+      model: 'Optimus LTE Tag'
+    - regex: 'LG-P705'
+      model: 'Optimus L7'
+    - regex: '(?:LG-)?(?:P713|P71[0245]|P713TR)(?:[);/ ]|$)'
       model: 'Optimus L7 II'
+    - regex: 'LG-P716(?:[);/ ]|$)'
+      model: 'Optimus L7 II Dual'
+    - regex: 'LG-?MS323'
+      model: 'Optimus L70'
     - regex: 'L-01D(?:[);/ ]|$)'
       model: 'Optimus LTE L-01D'
     - regex: 'L-02D(?:[);/ ]|$)'
@@ -13691,13 +14088,15 @@ LG:
       model: 'V20'
     - regex: 'LM-Q710(?:\(FGN\)|[\.]?FGN)'
       model: 'Q Stylus Plus'
+    - regex: 'LG-?(?:D22[17]|D213)'
+      model: 'L50 Sporty'
     - regex: 'LG-LS840'
       model: 'Viper 4G LTE'
     - regex: '801LG'
       model: 'Q Stylus'
     - regex: 'LG-M400'
       model: 'Stylus 3'
-    - regex: 'LG-?(?:K520|F720[SL])'
+    - regex: 'LG-?(?:K520|F720[KLS])'
       model: 'Stylus 2'
     - regex: 'LG-(?:K53[05])'
       model: 'Stylus 2 Plus'
@@ -13723,7 +14122,7 @@ LG:
       model: 'Style'
     - regex: 'L-01L(?:[);/ ]|$)'
       model: 'Style 2'
-    - regex: 'LGLS775'
+    - regex: 'LGLS775|LGL8(?:2V|1A)L'
       model: 'Stylo 2'
     - regex: 'VS835(?:[);/ ]|$)'
       model: 'Stylo 2 V'
@@ -13731,7 +14130,7 @@ LG:
       model: 'Stylo 2 Plus'
     - regex: 'L-41A(?:[);/ ]|$)'
       model: 'Style 3'
-    - regex: 'LG-?(?:MS63[14]|H63[45]|F560K)(?:[);/ ]|$)'
+    - regex: 'LG-?(?:MS63[14]|H63[145]|F560K|LS770)(?:[);/ ]|$)'
       model: 'G Stylo'
     - regex: 'LG-?(?:LS777|L84VL|M430|L83BL)(?:[);/ ]|$)'
       model: 'Stylo 3'
@@ -13749,12 +14148,18 @@ LG:
       model: 'Fortune'
     - regex: 'LM-X210CM'
       model: 'Fortune 2'
+    - regex: 'LG-H44[35]'
+      model: 'Escape 2'
     - regex: 'LM-X410\.FG?(?:[);/ ]|$)'
       model: 'Premier Pro'
     - regex: 'LGL455DL(?:[);/ ]|$)'
       model: 'Premier Pro Plus'
     - regex: 'LML41[34]DL(?:[);/ ]|$)'
       model: 'Premier Pro LTE'
+    - regex: 'LG-?L6(?:2V|1A)L(?:[);/ ]|$)'
+      model: 'Premier'
+    - regex: 'LG-?L5(?:2V|1A)L(?:[);/ ]|$)'
+      model: 'Treasure'
     - regex: 'LM-X525'
       model: 'Q60'
     - regex: 'LM-K315IM'
@@ -13807,8 +14212,10 @@ LG:
       model: 'Rabel 2'
     - regex: 'LG-X190'
       model: 'Ray'
-    - regex: 'LGLS740'
+    - regex: 'LG-?LS740'
       model: 'Volt'
+    - regex: 'LG-?LS751'
+      model: 'Volt II'
     - regex: 'LM-X410'
       model: 'LM-X410'
     - regex: 'LGM-K121'
@@ -13817,7 +14224,7 @@ LG:
       model: 'X401'
     - regex: 'LM-X420N'
       model: 'X4 (2019)'
-    - regex: '(?:LG-X230|VS425|LG-M151)(?:[);/ ]|$)'
+    - regex: '(?:VS425|LG-?(?:K120GT|K121|M151|X230))(?:[);/ ]|$)'
       model: 'K4'
     - regex: 'LG-K130(?:[);/ ]|$)'
       model: 'K4 LTE'
@@ -13863,7 +14270,7 @@ LG:
       model: 'Q92'
     - regex: 'LM-Q927L'
       model: 'Q9 One'
-    - regex: '(?:LG-)?(?:RS987|H90[01]|H96[0218]|VS990|F600[LK]|K428)'
+    - regex: '(?:LG-)?(?:RS987|H90[01]|H96[0218]|VS990|F600[LKS]|K428)'
       model: 'V10'
     - regex: 'LG-(?:X240|M200)'
       model: 'K8 (2017)'
@@ -13963,7 +14370,7 @@ LG:
       model: 'Phoenix 3'
     - regex: '(?:LG-)?F100[SL]'
       model: 'Optimus Vu'
-    - regex: '(?:LG-)?F200K'
+    - regex: '(?:LG-)?F200(?:[KLS]|LS)'
       model: 'Optimus Vu II'
     - regex: '(?:LG-)?VM670'
       model: 'Optimus V'
@@ -13971,7 +14378,7 @@ LG:
       model: 'Optimus 4X HD'
     - regex: '(?:LG-)?(H340n?|H32[04])'
       model: 'Leon'
-    - regex: '(?:LG-)?H342|LGMS345'
+    - regex: '(?:LG-)?H34[25]|LGMS345'
       model: 'Leon 4G LTE'
     - regex: '(?:LG-)?H4(?:40|2[02])'
       model: 'Spirit'
@@ -13981,18 +14388,36 @@ LG:
       model: 'Rebel 3'
     - regex: 'LML21(?:1B|2V)L'
       model: 'Rebel 4'
+    - regex: 'LG-?L4(?:4V|3A)L'
+      model: 'Rebel'
     - regex: 'VS876'
       model: 'Lucid 3'
-    - regex: 'VS880(PP)?|LG-D690'
+    - regex: 'VS880(PP)?|LG-(?:D690|D631)'
       model: 'G Vista'
+    - regex: 'LG-H740'
+      model: 'G Vista 2'
     - regex: 'VS820'
       model: 'Lancet'
     - regex: 'VS870 4G'
       model: 'Lucid 2'
     - regex: 'VS810PP'
       model: 'Transpyre'
-    - regex: 'LG-D838'
+    - regex: 'LG-F580L'
+      model: 'Gentle'
+    - regex: 'LG-?(?:D838|F350[LKS])'
       model: 'G Pro 2'
+    - regex: 'LG-F300[LKS]'
+      model: 'Vu 3'
+    - regex: 'LG-FL40L'
+      model: '070 Touch'
+    - regex: 'LG-F440L'
+      model: 'Ice Cream Smart'
+    - regex: 'LG-D38[05]'
+      model: 'L80 Dual'
+    - regex: 'LG-D370'
+      model: 'L80 Single'
+    - regex: 'LG-?(?:L16C|L15G)'
+      model: 'Y25'
 
     - regex: 'LM-F100N?(?:[);/ ]|$)'
       device: 'phablet'
@@ -14001,7 +14426,7 @@ LG:
     - regex: 'LM-T60[05]'
       model: 'G Pad 5 10.1" FHD'
       device: 'tablet'
-    - regex: 'LG-?(?:UK|V)410'
+    - regex: 'LG-?(?:(?:UK|V)410|V411|V400Y7)'
       model: 'G Pad 7.0" LTE'
       device: 'tablet'
     - regex: 'LG-V533'
@@ -14022,10 +14447,10 @@ LG:
     - regex: 'LG-V4[89]0'
       model: 'G Pad 8.0'
       device: 'tablet'
-    - regex: 'LGT01'
+    - regex: 'LGT01|LG-P490L'
       model: 'G Pad 8.0" LTE'
       device: 'tablet'
-    - regex: 'LG-V500'
+    - regex: 'LG-V50(?:0|7L)'
       model: 'G Pad 8.3'
       device: 'tablet'
     - regex: 'LG-V700'
@@ -14037,6 +14462,9 @@ LG:
     - regex: 'LG-V935'
       model: 'G Pad II 10.1'
       device: 'tablet'
+    - regex: 'LG-V940'
+      model: 'G Pad II 10.1 FHD'
+      device: 'tablet'
     - regex: 'LGT02|LG-?V522'
       model: 'G Pad III 8.0'
       device: 'tablet'
@@ -14058,6 +14486,9 @@ LG:
     - regex: 'LG-V52[01]'
       model: 'G Pad X 8.0"'
       device: 'tablet'
+    - regex: 'LG-V930'
+      model: 'G Pad X 10.1"'
+      device: 'tablet'
     - regex: 'LG-V530'
       model: 'G Pad X2 8.0" Plus'
       device: 'tablet'
@@ -14147,11 +14578,16 @@ Lingwin:
 
 # Logic Instrument (https://logic-instrument.com/)
 Logic Instrument:
-  regex: 'Logic Instrument'
+  regex: 'Logic Instrument|Fieldbook K101'
   device: 'smartphone'
   models:
     - regex: 'Fieldbook F1(?:[);/ ]|$)'
       model: 'Fieldbook F1'
+    - regex: 'Fieldbook F1B'
+      model: 'Fieldbook F1B'
+    - regex: 'Fieldbook K101'
+      device: 'tablet'
+      model: 'Fieldbook K101'
 
 # Logicom (logicom-europe.com)
 Logicom:
@@ -14357,7 +14793,7 @@ K-Lite:
 
 # Karbonn (karbonnmobiles.com)
 Karbonn:
-  regex: '(?:Browser-)?Karbonn|K9 Kavach 4G|K9[_ ](?:Viraat|Smart)[_ ]Plus|K9 Music 4G|K9 Smart|K9 VIRAAT 4G|Aura (?:Sleek Plus|Power 4G Plus|Note Play|Note 2)|Titanium[ _](?:3D-Plex|Octane Plus|Vista 4G|Jumbo|S360|S1[059]|S35|S20[13]|S22|S[15]|S200 HD|Frames S7|MOGHUL|S9)|MACHFIVE|MACHONE|Sparkle V|Alfa A114 Quad|Quattro[ _]L(?:45|5[025])[ _](?:HD|IPS|VR)|A(?:9|4[05])[ _]Indian|S2052GB|MACH SIX VR|K-Lite F3|Titanium Vista'
+  regex: '(?:Browser-)?Karbonn|K9 Kavach 4G|K9[_ ](?:Viraat|Smart)[_ ]Plus|K9 Music 4G|K9 Smart|K9 VIRAAT 4G|Aura (?:Sleek Plus|Sleek 4G|Power 4G Plus|Note Play|Note 2|Storm|Champ)|Titanium[ _](?:3D-Plex|Octane Plus|Vista 4G|Jumbo|S360|S1[059]|S35|S20[13]|S22|S[15]|S200 HD|Frames S7|MOGHUL|S9)|MACHFIVE|MACHONE|Sparkle V|Alfa A114 Quad|Quattro[ _]L(?:45|5[025])[ _](?:HD|IPS|VR)|A41 Power|A(?:[19]|4[05])[ _]Indian|S2052GB|MACH SIX VR|K-Lite F3|Titanium Vista'
   device: 'smartphone'
   models:
     - regex: 'K9 Kavach 4G'
@@ -14382,7 +14818,7 @@ Karbonn:
       model: 'K9 Smart'
     - regex: 'A40 Indian Plus'
       model: 'A40 Indian Plus'
-    - regex: 'A(9|4[05])[ _]Indian'
+    - regex: 'A([19]|4[05])[ _]Indian'
       model: 'A$1 Indian'
     - regex: 'K9[_ ]Viraat[_ ]Plus'
       model: 'K9 Viraat Plus'
@@ -14394,9 +14830,15 @@ Karbonn:
       model: 'Aura Note Play'
     - regex: 'Aura Note 2'
       model: 'Aura Note 2'
+    - regex: 'Aura Storm'
+      model: 'Aura Storm'
+    - regex: 'Aura Champ'
+      model: 'Aura Champ'
+    - regex: 'Aura Sleek 4G'
+      model: 'Aura Sleek 4G'
     - regex: 'Alfa A114 Quad'
       model: 'Alfa A114 Quad'
-    - regex: 'karbonnK9 Viraat 4G|K9 VIRAAT 4G'
+    - regex: '(?:karbonn)?K9 Viraat 4G'
       model: 'K9 Viraat 4G'
     - regex: 'MACHFIVE'
       model: 'Mach Five'
@@ -14430,6 +14872,8 @@ Karbonn:
       model: 'K-Lite F3'
     - regex: 'Sparkle V'
       model: 'Sparkle V'
+    - regex: 'A41 Power'
+      model: 'A41 Power'
     - regex: 'Quattro[ _]L(5[05])[ _]HD'
       model: 'Quattro L$1 HD'
     - regex: 'Quattro[ _]L(45)[ _]IPS'
@@ -14498,21 +14942,28 @@ Mpman:
 
 # Majestic (www.newmajestic.com)
 Majestic:
-  regex: 'MAJESTIC[ _-]|CRONO ?[0-9]+|(?:TAB (?:647|411) 3G|TAB_911_3G|TAB_811_4G|TAB_912_4G|TAB-714|TAB 711 4G|URANO27|URANO 47|URANO 77LTE|PLUTO__?26N?)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'JACK(?:[);/ ]|$)'
+      model: 'Jack'
+    - regex: ' JOE(?:[);/ ]|$)'
+      model: 'Joe'
     - regex: 'URANO 77LTE(?:[);/ ]|$)'
       model: 'Urano 77 LTE'
     - regex: 'URANO ?([24]7)(?:[);/ ]|$)'
       model: 'Urano $1'
     - regex: 'PLUTO__?(26N?)(?:[);/ ]|$)'
       model: 'Pluto $1'
-    - regex: 'TAB[ _](647|[478]11|91[12])[ _]([34])G'
+    - regex: 'TAB[ _](\d{3})[ _]([34])G'
       model: 'Tab $1 $2G'
       device: 'tablet'
     - regex: 'TAB-714'
       model: 'Tab 714 WiFi'
       device: 'tablet'
+    - regex: 'TAB_814'
+      model: 'Tab 814'
+      device: 'tablet'
     - regex: 'MAJESTIC[ _]Tab([^;/]+)Build'
       model: 'Tab$1'
       device: 'tablet'
@@ -14562,8 +15013,8 @@ Masstel:
   models:
     - regex: 'Masstel[_ ]Juno[_ ]Q5Plus'
       model: 'Juno Q5 Plus'
-    - regex: 'Hapi10(?:[);/ ]|$)'
-      model: 'Hapi 10'
+    - regex: '(?:Masstel_)?Hapi ?(1[05]|30)(?:[);/ ]|$)'
+      model: 'Hapi $1'
     - regex: 'Masstel[_ ]N660s'
       model: 'N660S'
     - regex: 'Masstel[_ ]\((M18)\)'
@@ -14608,7 +15059,7 @@ Talius:
 
 # Maxwest
 Maxwest:
-  regex: '(?:Astro[_ ](?:Phablet_9|55?N[_ ]LTE|55R|5 PRO|5[sTX]|[45]P|X4|5_GO_LTE|X55s?|4\.5|4|X5)|Astro6|Virtue Z5|Nitro[_ ](?:4S?|55[RCMN]|5[XRPNM]|[45] GO|4[sN] LTE|55[ _]LTE)|Gravity_(?:55?_GO|6P)|Nitro_Phablet_9s|Nitro Phablet 7N)(?:[);/ ]|$)'
+  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)|Gravity_(?:55?_GO|6P)|Nitro_Phablet_9s|Nitro Phablet 7N|Nitro 8)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Astro[_ ](55?)N[_ ]LTE'
@@ -14619,7 +15070,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)(?:[);/ ]|$)'
+    - regex: 'Astro[_ ](55R|X55s?|5[sTX]|4|X[45]|[45]P|8R)(?:[);/ ]|$)'
       model: 'Astro $1'
     - regex: 'Astro[_ ](4\.5)'
       model: 'Astro $1"'
@@ -14633,7 +15084,7 @@ Maxwest:
       model: 'Nitro 4s LTE'
     - regex: 'Nitro[ _]4s'
       model: 'Nitro 4s'
-    - regex: 'Nitro[_ ]((?:55|4N)[_ ]LTE|4|55[RCNM]|5[XRPNM])'
+    - regex: 'Nitro[_ ]((?:55|4N)[_ ]LTE|4|55[ARCNM]|5[XRPNM]|8)'
       model: 'Nitro $1'
     - regex: 'Gravity_(55?)_GO'
       model: 'Gravity $1 GO'
@@ -14679,7 +15130,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 3 Lite|M-WPW801)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'SmartPad7503G(?:[);/ ]|$)'
@@ -14752,14 +15203,20 @@ Mediacom:
       model: 'SmartPad 10.1" HD Pro 3G'
     - regex: 'M-IPRO([18][01]0)[BW](?:[);/ ]|$)'
       model: 'SmartPad 8.0" HD iPro$1 3G'
-    - regex: '1AZ2[TP](?:[);/ ]|$)'
+    - regex: '(?:1AZ2[TP]|Azimut2)(?:[);/ ]|$)'
       model: 'SmartPad 10.0" Azimut 2'
     - regex: 'Azimut 3 Lite(?:[);/ ]|$)'
       model: 'SmartPad 10.1" Azimut 3 Lite'
+    - regex: 'Azimut ?3 Pro(?:[);/ ]|$)'
+      model: 'SmartPad 10.1" Azimut 3 Pro'
+    - regex: 'Azimut 3(?:[);/ ]|$)'
+      model: 'SmartPad 10.1" Azimut 3'
     - regex: '8DY(?:[);/ ]|$)'
       model: 'SmartPad iyo 8"'
     - regex: '10edge(?:[);/ ]|$)'
       model: 'SmartPad 10 Edge'
+    - regex: ' 1EY(?:[);/ ]|$)'
+      model: 'SmartPad 1EY'
     - regex: 'M-WPW801(?:[);/ ]|$)'
       model: 'WinPad W801'
     - regex: ' (7[BCD]Y|8AY|1BEC|1CY|1AZ|1AZ2TW)(?:_eea)?(?:[);/ ]|$)'
@@ -14801,7 +15258,6 @@ Mediacom:
     - regex: 'M-PPxS551U(?:[);/ ]|$)'
       model: 'PhonePad Duo S551U'
       device: 'phablet'
-
     - regex: 'M-PPAG4(?:[);/ ]|$)'
       model: 'PhonePad Duo G4'
       device: 'smartphone'
@@ -14811,6 +15267,9 @@ Mediacom:
     - regex: 'M-PP2S500[BC]?(?:[);/ ]|$)'
       model: 'PhonePad Duo S500'
       device: 'smartphone'
+    - regex: 'M-PPx(S510|G551|G51[0125]|G415)(?:[);/ ]|$)'
+      model: 'PhonePad Duo $1'
+      device: 'smartphone'
     - regex: 'M[_-]PP[Ax]X(470|510|555|520)U(?:[);/ ]|$)'
       model: 'PhonePad Duo X$1U'
       device: 'smartphone'
@@ -14820,10 +15279,16 @@ Mediacom:
     - regex: 'M-PPxS(532[LU]|470|501|5P?|7P?)(?:[);/ ]|$)'
       model: 'PhonePad Duo S$1'
       device: 'smartphone'
-    - regex: 'M-PPxG(450)(?:[);/ ]|$)'
+    - regex: 'M-PPxG(4[15]0)(?:[);/ ]|$)'
       model: 'PhonePad Duo G$1'
       device: 'smartphone'
+    - regex: 'M-PPA(S520|R450|G552)(?:[);/ ]|$)'
+      model: 'PhonePad Duo $1'
+      device: 'smartphone'
 
+    - regex: 'M-PPx([XS]5\d{2}[UL])(?:[);/ ]|$)'
+      model: 'PhonePad Duo $1'
+      device: 'phablet'
     - regex: 'M-MP([0-9a-z]+)'
       model: 'SmartPad $1'
 
@@ -14913,13 +15378,15 @@ Memup:
 
 # Mecer (mecer.co.za)
 Mecer:
-  regex: '(MF716\+?|M785|800P3[12]C|101P51C|X1010|M7[67]QF6|M17QF[67]_[43]G)(?:[);/ ]|$)'
+  regex: '(MF716\+?|M785|800P3[12]C|101P51C|X1010|M7[67]QF6|M17QF[67][_-][43]G(?:plus)?)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'M785(?:[);/ ]|$)'
       model: 'Xpress Smartlife M785'
     - regex: 'X1010(?:[);/ ]|$)'
       model: 'X1010'
+    - regex: 'M17QF6-3Gplus(?:[);/ ]|$)'
+      model: 'M17QF6 3G Plus'
     - regex: 'M17QF([67])_([34])G(?:[);/ ]|$)'
       model: 'M17QF$1 $2G'
     - regex: '800P31C'
@@ -14944,6 +15411,8 @@ Mione:
       model: 'Hero $1'
     - regex: 'Mione III'
       model: 'Hero 3'
+    - regex: 'Mione P2\+'
+      model: 'P2+'
     - regex: 'Mione_PUBG_1'
       model: 'PUBG 1'
     - regex: 'Mione_Pro(?:[);/ ]|$)'
@@ -15051,23 +15520,29 @@ Matrix:
 
 # Mobicel or Mobicell
 Mobicel:
-  regex: 'Mobicel[_ ](R1|METRO2)|ASTRO(?: Build|[;)]|$)|(?:Android 8(?:[\d.]*);(?: [\w-]+;)? (?:BEAM|ZOOM)|FAME(?:_DS)?|CLIK|R7_1|(?<!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)|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_1|OREO|Neo_Plus)(?:[);/ ]|$)'
+  regex: 'Mobicel[_ ](R1|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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'EPIC PRO_1'
-      model: 'Epic Pro 1'
+    - regex: 'EPIC PRO_([12])'
+      model: 'Epic Pro $1'
     - regex: 'Matrix'
       model: 'Matrix'
     - regex: 'LEGEND MAX'
       model: 'Legend Max'
     - regex: 'LEGEND PRO_1'
       model: 'Legend Pro 1'
+    - regex: 'Legend Pro LTE'
+      model: 'Legend Pro LTE'
     - regex: 'BLINK'
       model: 'Blink'
+    - regex: 'FORCE'
+      model: 'Force'
     - regex: 'EPIC_([12])'
       model: 'Epic $1'
     - regex: 'BERRY1'
       model: 'Berry 1'
+    - regex: 'BERRY PRO'
+      model: 'Berry Pro'
     - regex: 'BERRY 2'
       model: 'Berry 2'
     - regex: 'TRENDY 2'
@@ -15102,7 +15577,9 @@ Mobicel:
       model: 'Fendy DS'
     - regex: 'REBEL'
       model: 'Rebel'
-    - regex: 'R7_1'
+    - regex: 'RUBY'
+      model: 'Ruby'
+    - regex: 'R7_[12]'
       model: 'R7'
     - regex: 'OREO'
       model: 'Oreo'
@@ -15120,6 +15597,8 @@ Mobicel:
       model: 'Fame'
     - regex: 'BEAM'
       model: 'Beam'
+    - regex: 'Cosmo LTE'
+      model: 'Cosmo LTE'
     - regex: 'Neo[ _]LTE'
       model: 'Neo LTE'
     - regex: 'NEO_1'
@@ -15140,6 +15619,8 @@ Mobicel:
       model: 'Clik Plus'
     - regex: 'CLIK'
       model: 'Clik'
+    - regex: 'VX(19|20)'
+      model: 'VX$1'
     - regex: 'PULSE_1'
       model: 'Pulse 1'
     - regex: 'PURE PLUS'
@@ -15276,7 +15757,7 @@ MobiIoT:
 
 # Mecool
 Mecool:
-  regex: 'Mecool[ _-]|(?:KM9 ?PRO|BB2 PRO|K[I]{1,3} PRO|KI PLUS|KM9_TV_BOX|M8SPROW|M8S (?:PLUS|PRO) (?:DVB|[LW]|PLUS)|M8S (?:MAX|PRO)| KM[13569])(?:[);/ ]|$)'
+  regex: 'Mecool[ _-]|(?:KM9 ?PRO|BB2 PRO|K[I]{1,3} PRO|KI PLUS|KM9_TV_BOX|M8SPROW|M8S (?:PLUS|PRO) (?:DVB|[LW]|PLUS)|M8S (?:MAX|PRO)| KM[13569]| KD1)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'KM9 ?PRO(?:[);/ ]|$)'
@@ -15303,20 +15784,22 @@ Mecool:
       model: 'M8S Pro'
     - regex: 'M8S MAX(?:[);/ ]|$)'
       model: 'M8S Max'
-    - regex: ' KM(\d+)(?:[);/ ]|$)'
-      model: 'KM$1'
+    - regex: ' K([MD]\d+)(?:[);/ ]|$)'
+      model: 'K$1'
     - regex: 'Mecool[ _-]([^/);]+)(?: Build|[;)])'
       model: '$1'
 
 # Modecom
 Modecom:
-  regex: 'Modecom|Free(?:Way )?Tab|xino z[\d]+ x[\d]+'
+  regex: 'Modecom|Free(?:Way )?Tab|xino z[\d]+ x[\d]+|(?:ECHO LOLLY)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'xino Z([\d]+) X([\d]+)'
       model: 'Xino Z$1 X$2'
       device: 'smartphone'
 
+    - regex: 'ECHO LOLLY'
+      model: 'Echo Lolly'
     - regex: 'FreeTab[ _\-]?([^/;]+)? Build'
       model: 'FreeTab $1'
     - regex: 'FreeTab[ _\-]?((?!Build)[^);/ ]+)?'
@@ -15352,7 +15835,7 @@ Verssed:
 
 # Torque
 Torque:
-  regex: '(?:EGO[ _](?:Max[ _]S|Surf[_ ][iS]|Phab 3G)|DROIDZ (?:Drive\+|ATOM [SX]|Portal(?: X)?|Swivel|Smart|Trend|Force|Span|Play|Blast|Sport|Excel|Motion|Sky 3g|Rotate|Duo(?: Slim)?|Dash(?: X)?|Quad|Match TV|Beat TV|Avatar TV|Easy|Push i|Edge\+))(?:[);/ ]|$)'
+  regex: '(?:EGO[ _](?:Max[ _]S|Surf[_ ][iS]|Phab 3G|Note 4G)|DROIDZ (?:Drive\+|ATOM [SX]|Portal(?: X)?|Swivel|Smart|Trend|Force|Span|Play|Blast|Sport|Excel|Motion|Sky 3g|Rotate|Duo(?: Slim)?|Dash(?: X)?|Quad|Match TV|Beat TV|Avatar TV|Easy|Push i|Edge\+))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'DROIDZ (Duo(?: Slim)?|Dash(?: X)?|Push i|Edge\+|Drive\+|Portal(?: X)?)'
@@ -15369,10 +15852,12 @@ Torque:
     - regex: 'EGO Phab 3G'
       device: 'phablet'
       model: 'EGO Phab 3G'
+    - regex: 'EGO Note 4G'
+      model: 'EGO Note 4G'
 
 # 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|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
+  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-6|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2243-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT2335-3|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -15392,6 +15877,8 @@ Motorola:
       model: 'Fire'
     - regex: '(?:MOT-|Motorola-)?XT2125-4'
       model: 'Edge S'
+    - regex: '(?:MOT-|Motorola-)?edge \((202\d)\)'
+      model: 'Edge ($1)'
     - regex: '(?:MOT-|Motorola-)?XT2175-2'
       model: 'Edge S30'
     - regex: 'motorola edge 30 ultra'
@@ -15466,6 +15953,8 @@ Motorola:
       model: 'Droid RAZR Maxx'
     - regex: 'moto g52j 5G'
       model: 'Moto G52j 5G'
+    - regex: 'XT2335-3'
+      model: 'Moto G53'
     - regex: '(?:MOT-|Motorola-)?(?:XT102[12]|XT830C|XT15[12]4|XT152[67])' # 2015
       model: 'Moto E'
     - regex: 'Moto E \(XT2052DL\)'
@@ -15568,6 +16057,8 @@ Motorola:
       model: 'Moto M'
     - regex: '(?:MOT-|Motorola-)?XT2241-1'
       model: 'Moto X30 Pro'
+    - regex: '(?:MOT-|Motorola-)?XT2243-2'
+      model: 'Moto S30'
     - regex: '(?:MOT-|Motorola-)?XT2201-6'
       model: 'Moto X30'
     - regex: '(?:MOT-|Motorola-)?XT1943-1'
@@ -15576,6 +16067,10 @@ Motorola:
       model: 'P30 Play'
     - regex: '(?:MOT-|Motorola-)?XT1942-1|P30 Note(?:[);/ ]|$)'
       model: 'P30 Note'
+    - regex: '(?:MOT-|Motorola-)?edge plus 5G UW \(2022\)'
+      model: 'Edge Plus 5G UW (2022)'
+    - regex: '(?:MOT-|Motorola-)?edge plus \(?(202[23])\)?'
+      model: 'Edge Plus ($1)'
     - regex: '(?:MOT-|Motorola-)?edge plus'
       model: 'Edge Plus'
     - regex: 'XT2201-2'
@@ -15710,8 +16205,8 @@ Motorola:
 
     - regex: 'XT2071-4'
       model: 'RAZR 5G'
-    - regex: 'razr \(2020\)'
-      model: 'RAZR (2020)'
+    - regex: 'razr \(?(202[02])\)?'
+      model: 'RAZR ($1)'
     - regex: 'MOTORAZR[ _-]([a-z0-9]+)'
       model: 'RAZR $1'
     - regex: 'MOTORIZR[ _\-]([a-z0-9]+)'
@@ -15751,19 +16246,21 @@ Movic:
 
 # Movitel
 Movitel:
-  regex: 'M(?:8421|9106)(?:[);/ ]|$)'
+  regex: 'M(?:8421|9101[AB]|910[36]|841[4568]|8601)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'M(8421|9106)(?:[);/ ]|$)'
+    - regex: 'M(\d{4}[AB]?)(?:[);/ ]|$)'
       model: 'M$1'
 
 # MTN
 MTN:
-  regex: 'MTN-|(?:Kafit V900|Faith29)(?:[);/ ]|$)'
+  regex: 'MTN-|(?:Kafit V900|Faith29|Ka ?Chocolate)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Faith29(?:[);/ ]|$)'
       model: 'Faith 29'
+    - regex: 'Ka ?Chocolate(?:[);/ ]|$)'
+      model: 'Ka Chocolate'
     - regex: 'Kafit V900'
       model: 'KaFit V900'
     - regex: 'MTN-(L860|S620)'
@@ -15776,9 +16273,11 @@ MTN:
 
 # Hammer (hammerphones.com) sub brand MyPhone
 Hammer:
-  regex: '(?:Hammer[_ ](?:Explorer[_ ](?:Plus|Pro)|FORCE|Blade_3|Blade2_PRO|Blade_5G|IRON_[23](?:[_ ]LTE)?|IRON|Explorer|ENERGY(?:_18x9|_2_2022|_2)?|Titan 2|Active2?(?:_LTE)?)|Iron[_ ]2)(?:[);/ ]|$)'
+  regex: '(?:Hammer[_ ](?:Construction|Explorer[_ ](?:Plus|Pro)|FORCE|Blade_3|Blade2_PRO|Blade_5G|IRON_[23](?:[_ ]LTE)?|IRON|Explorer|ENERGY(?:_18x9|_2_2022|_2)?|Titan 2|Active2?(?:_LTE)?)|Iron[_ ]2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'Hammer[_ ]Construction'
+      model: 'Construction'
     - regex: 'Hammer[_ ]Explorer[_ ]Plus'
       model: 'Explorer Plus'
     - regex: 'Hammer[_ ]Explorer[_ ]Pro'
@@ -15814,7 +16313,7 @@ Hammer:
 
 # 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'
+  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'
   device: 'smartphone'
   models:
     # explicit table models
@@ -15833,13 +16332,15 @@ MyPhone:
     - regex: 'SmartView_8_LTE'
       model: 'SmartView 8" LTE'
       device: 'tablet'
-    - regex: 'SmartView_9_6_3G'
+    - 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)'
@@ -15961,9 +16462,9 @@ M.T.T.:
     - regex: 'M\.T\.T\. ?([^;/)]+)(?: Build|[;)])'
       model: '$1'
 
-# Navon
+# Navon (https://smartnavon.eu/)
 Navon:
-  regex: 'Navon[_ ]|(?:Vision_Tab_(?:7|10)|Pure Micro|Superme_Max|Raptor3G8GB|Predator (?:10|3G)|Platinum[_ ]?10[_ ]?3G(?:_V2|2019)?|Supreme[_ ](?:Fine(?:[_ ]Micro)?|Chief|Pure|Pro)(?:[_ ](?:Mini|Plus))?)(?:[);/ ]|$)'
+  regex: 'Navon[_ ]|(?:Vision_Tab_(?:7|10)|Pure Micro|Superme_Max|Raptor3G8GB|Predator (?:10|3G)|Platinum[_ ]?10[_ ]?3G(?:_V2|2019)?|Supreme[_ ](?:Fine(?:[_ ]Micro)?|Chief|Pure|Pro)(?:[_ ](?:Mini|Plus))?|T400 3G 2017|Spirit_Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'M505 LTE(?:[);/ ]|$)'
@@ -15990,6 +16491,10 @@ Navon:
       model: 'Supreme Pro'
     - regex: 'Pure Micro(?:[);/ ]|$)'
       model: 'Pure Micro'
+    - regex: 'Spirit_Plus(?:[);/ ]|$)'
+      model: 'Spirit Plus'
+    - regex: 'T400 3G 2017'
+      model: 'T400 3G (2017)'
     - regex: 'Navon[_ ]Infinity(?:[);/ ]|$)'
       model: 'Infinity'
     - regex: 'Navon[_ ](D405)(?:[);/ ]|$)'
@@ -16094,7 +16599,7 @@ Novey:
 
 # 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)(?:[);/ ]|$)'
+  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))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'N-06C(?:[);/ ]|$)'
@@ -16110,9 +16615,18 @@ NEC:
     - regex: 'LAVIE Tab E ((?:10|8)FHD[12]|7SD1|8HD1)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'LAVIE Tab E $1'
+    - regex: 'LAVIE Tab 10FHD3(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'LAVIE Tab T10 FHD (Gen 3)'
+    - regex: 'LAVIE Tab T12 12QHD1(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'LAVIE Tab T12 QHD'
     - regex: 'LAVIE T11 (11QHD1|112K1)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'LAVIE Tab T11 $1'
+    - regex: 'LAVIE T7 (7SD1)(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'LAVIE Tab T7 $1'
     - regex: 'LAVIE T8 (8HD1)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'LAVIE Tab T8 $1'
@@ -16252,7 +16766,7 @@ Noain:
 
 # Noblex (https://noblex.com.ar/)
 Noblex:
-  regex: 'Noblex|NBX-|(?:A[56]0UNS|T7A6INC)(?:[;/)]|$)'
+  regex: 'Noblex|NBX-|(?:A[56]0UNS|T7A6INC|T7A6N)(?:[;/)]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Noblex|NBX)[ _-]([^;/]+) Build'
@@ -16261,18 +16775,21 @@ Noblex:
       model: '$1'
     - regex: '(A[56]0)UNS'
       model: '$1'
-    - regex: '(T7A6INC)'
+    - regex: '(T7A6INC|T7A6N)'
       device: 'tablet'
       model: '$1'
 
 # NOGA (https://noganet.ar/)
 NOGA:
-  regex: '(?:NOGAPC (?:LIVE|PRO)|NOGAPAD ?7G)(?:[);/ ]|$)'
+  regex: '(?:NOGAPC (?:LIVE|PRO)|NOGAPAD ?(?:7G|10\.1GHD))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NOGAPAD ?7G(?:[);/ ]|$)'
       device: 'tablet'
       model: 'NOGAPAD 7G'
+    - regex: 'NOGAPAD ?10\.1GHD(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'NOGAPAD 10.1" GHD'
     - regex: 'NOGAPC PRO(?:[);/ ]|$)'
       device: 'tv'
       model: 'PC Pro'
@@ -16282,7 +16799,7 @@ NOGA:
 
 # Nomu
 Nomu:
-  regex: '(?:Nomu[ _-](?:T18|S30mini|S10)|(?:V1600S|S10 PRO|S50_Pro)|LMCV1)(?:[);/ ]|$)'
+  regex: '(?:Nomu[ _-](?:T18|S30mini|S10)|(?:V1600S|S10 PRO|S50_Pro)|LMCV1|Xeno V1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Nomu[ _-]T18(?:[);/ ]|$)'
@@ -16297,6 +16814,8 @@ Nomu:
       model: 'S$1 Pro'
     - regex: '(V1600S)(?:[);/ ]|$)'
       model: '$1'
+    - regex: '(Xeno V1)(?:[);/ ]|$)' #T9
+      model: '$1'
 
 # Noontec (http://www.noontec.com.au/)
 Noontec:
@@ -16320,7 +16839,7 @@ Opsson:
 
 # Nomi (nomi-electronics.com)
 Nomi:
-  regex: 'Nomi[ _-]|(C101010 Ultra2|i501[234]|i5032|i50[537]0|i5031|i55[13]0|i5532|C0(700(?:[02358]|2HD)|7850)|C1010[0-3]|i(?:50[0158]|450|40[01]|55[02]))(?:[);/ ]|$)'
+  regex: 'Nomi[ _-]|(C101010 Ultra2|i501[234]|i5032|i50[537]0|i5031|i55[13]0|i5532|C0(700(?:[02358]|2HD)|7850)|C1010[0-3]|i(?:50[0158]|450|40[01]|55[02])|i504 Dream|AB5116-01)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'i501[23](?:[);/ ]|$)'
@@ -16375,10 +16894,13 @@ Nomi:
       model: 'Spark'
     - regex: 'Nomi[ _]i503(?:[);/ ]|$)'
       model: 'Jump'
-    - regex: 'Nomi[ _]i504(?:[);/ ]|$)'
+    - regex: '(?:Nomi[ _]i504|i504 Dream)(?:[);/ ]|$)'
       model: 'Dream'
     - regex: 'Nomi[ _](\w+)[ _]PLUS(?:[);/ ]|$)'
       model: '$1 Plus'
+    - regex: '(AB5116-01)(?:[);/ ]|$)'
+      device: 'tv'
+      model: '$1'
 
     - regex: 'C101010 Ultra2'
       model: 'Ultra 2'
@@ -16453,7 +16975,7 @@ Nomi:
 
 # NUU Mobile
 NUU Mobile:
-  regex: 'NUU_|(?:(?:N(570[24]|500[12])L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L)(?:[);/ ]|$)'
+  regex: 'NUU_|(?:(?:N(570[24]|500[12])L|S5701L|S6001L|[SN]5501L)|A6L-[CG]|N5502L|S6303L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NUU_A([13]L?)'
@@ -16474,6 +16996,8 @@ NUU Mobile:
       model: 'A5L'
     - regex: 'N5002L'
       model: 'A7L'
+    - regex: 'S6303L'
+      model: 'A9L'
     - regex: 'N5502L'
       model: 'A10L'
     - regex: 'S5701L'
@@ -16606,6 +17130,9 @@ O2:
       model: '$1'
     - regex: '(COCOON)'
       model: '$1'
+    - regex: 'O2-(X[12]i|X4)'
+      device: 'feature phone'
+      model: '$1'
     - regex: 'O2 ([a-z0-9 ]+)'
       model: '$1'
     - regex: 'O2-([a-z0-9]+)'
@@ -16635,7 +17162,7 @@ Fusion5:
 
 # ZH&K Mobile (zhnkmobile.com)
 'ZH&K':
-  regex: '(?:Odyssey[_ ](?:evo|DTV[67]|J[59]|J10|GLAZE\+?|RANGE|ACE|AEON|VICTORY|SACRED|SAGA|SWIFT|O2|ULTRA|FLAME|POPO|PERRI|TYTAN)|ODYSSEY[ _]?NEXT|INTENSE (?:RISE|Hype|GAME))(?:[);/ ]|$)'
+  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:
     - regex: 'ODYSSEY[ _]J10[ _]Mini'
@@ -16674,6 +17201,12 @@ Fusion5:
       model: 'Odyssey Glaze Plus'
     - regex: 'Odyssey[_ ]GLAZE'
       model: 'Odyssey Glaze'
+    - regex: 'Odyssey[_ ]HIGH'
+      model: 'Odyssey High'
+    - regex: 'Odyssey[_ ]SOAR'
+      model: 'Odyssey Soar'
+    - regex: 'Odyssey[_ ]ERA'
+      model: 'Odyssey Era'
     - regex: 'INTENSE RISE'
       model: 'Intense Rise'
     - regex: 'INTENSE Hype'
@@ -16683,7 +17216,7 @@ Fusion5:
 
 # Odys (odys.de)
 Odys:
-  regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]|PACE_10_LTE|(?:ADM816HC|ADM8000KP|NEO6_LTE|EOS10|AEON|FALCON_10_PLUS_3G|SPACE_ONE10|FUSION|THANOS_10|MAVEN_X10_HD(?:_LTE)?|JUNIOR_8_PRO|JuniorT8Pro|(?:NOVA|PYRO)_X?7_PLUS_3G|UNO_X8|MAVEN_[GT]10(?:_pro)?|MAVEN_7_PLUS|SLADE_X55|XELIO_PRO_10_LTE|GOAL_10_PLUS_3G|NOTOSplus3G|PACE ?10|Titan_10_LTE|PEDI_PLUS_W|NoteTab_Pro)(?:[);/ ]|$)'
+  regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]|PACE_10_LTE|(?:ADM816HC|ADM8000KP|NEO6_LTE|EOS10|AEON|FALCON_10_PLUS_3G|SPACE_ONE10|FUSION|THANOS_10|MAVEN_X10_HD(?:_LTE)?|JUNIOR_8_PRO|JuniorT8Pro|(?:NOVA|PYRO)_X?7_PLUS_3G|UNO_X8|MAVEN_[GT]10(?:_pro)?|MAVEN_7_PLUS|SLADE_X55|XELIO_PRO_10_LTE|GOAL_10_PLUS_3G|NOTOSplus3G|PACE ?10|Titan_10_LTE|PEDI_PLUS_W|NoteTab_Pro|UNO_X10|NERON)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'XELIO[_ ]HD10[_ ]LTE'
@@ -16762,8 +17295,8 @@ Odys:
       model: 'Falcon 10 Plus 3G'
     - regex: 'FUSION'
       model: 'Fusion 7'
-    - regex: 'UNO_X8'
-      model: 'Uno X8'
+    - regex: 'UNO[_ ]X(8|10)'
+      model: 'Uno X$1'
     - regex: 'ADM8000KP'
       model: 'Titan'
     - regex: 'Titan_10_LTE'
@@ -16788,8 +17321,12 @@ Odys:
       model: 'Goal 10 Plus 3G'
     - regex: 'IEOS[_ ]QUAD[_ ]W'
       model: 'Ieos Quad W'
+    - regex: 'IEOS[_ ]NEXT[_ ]10'
+      model: 'Ieos Next 10'
     - regex: 'IEOS[_ ]QUAD[_ ]PRO'
       model: 'Ieos Quad Pro'
+    - regex: 'NERON'
+      model: 'Neron'
 
     # explicit smartphones models
     - regex: 'NEO6[_ ]LTE'
@@ -16804,7 +17341,7 @@ Odys:
       model: 'Ieos $1'
     - regex: '(?:ODYS[ _-])?NOON Build'
       model: 'Noon'
-    - regex: '(?:ODYS[ _-])?NOON_PRO Build'
+    - regex: '(?:ODYS[ _-])?NOON_PRO'
       model: 'Noon Pro'
     - regex: 'Odys[ _-]([^/;]+) Build'
       model: '$1'
@@ -16864,6 +17401,8 @@ Okapia:
       model: 'Signature $1'
     - regex: 'Okapia X1(?:[);/ ]|$)'
       model: 'X1'
+    - regex: 'Okapia[_ ]Mirage(?:[);/ ]|$)'
+      model: 'Mirage'
 
 # Olax
 Olax:
@@ -16958,11 +17497,13 @@ Onda:
 
 # OnePlus (www.oneplus.com or oneplus.com.ru)
 OnePlus:
-  regex: '(?:du_)?ONEPLUS|(?:PGKM10|CPH2447|CPH240[19]|CPH24[12]3|CPH2469|CPH241[15]|CPH2459|CPH2399|CPH2381|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]|PGZ110|PGP110|PHK110)(?: Build|\))'
+  regex: '(?:du_)?ONEPLUS|(?:PGKM10|CPH244[79]|CPH240[19]|CPH24[12]3|CPH246[579]|CPH2487|CPH241[157]|CPH2459|CPH2399|CPH2381|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]|PGZ110|PGP110|PHK110|PHB110)(?: Build|[;)])'
   device: 'smartphone'
   models:
-    - regex: 'CPH2447(?:[);/ ]|$)'
+    - regex: '(?:CPH244[79]|PHB110)(?:[);/ ]|$)'
       model: '11'
+    - regex: 'CPH2487(?:[);/ ]|$)'
+      model: '11R 5G'
     - regex: 'PGKM10(?:[);/ ]|$)'
       model: 'Ace'
     - regex: 'PHK110(?:[);/ ]|$)'
@@ -16979,6 +17520,8 @@ OnePlus:
       model: 'Nord CE 5G'
     - regex: 'CPH(?:2381|2409)(?:[);/ ]|$)'
       model: 'Nord CE 2 Lite'
+    - regex: 'CPH246[57](?:[);/ ]|$)'
+      model: 'Nord CE 3 Lite'
     - regex: 'BE2012(?:[);/ ]|$)'
       model: 'Clover'
     - regex: 'BE201[135](?:[);/ ]|$)'
@@ -17037,8 +17580,10 @@ OnePlus:
       model: '7T Pro'
     - regex: '(?:HD1925|GM192[05])(?:[);/ ]|$)'
       model: '7T Pro 5G'
-    - regex: 'KB200[1357](?:[);/ ]|$)'
+    - regex: 'KB200[135](?:[);/ ]|$)'
       model: '8T'
+    - regex: '(?:KB2007|OnePlus ?8TMO)(?:[);/ ]|$)'
+      model: '8T+ 5G'
     - regex: 'A0001(?:[);/ ]|$)'
       model: 'One'
     - regex: 'A200[135]|OnePlus2'
@@ -17057,14 +17602,18 @@ OnePlus:
       model: '6'
     - regex: 'A601[03](?:[);/ ]|$)'
       model: '6T'
-    - regex: '(?:du_)?ONEPLUS[ _]?([^;/,)]+)(?: Build|[;,)])'
+    - 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[059]|9[345])|220[0125]|30(?:[3468]1|4[23]|9[23]|63|85)|31(?:15|2[125]|42|51|6[16]|71|9[1357])|32(?:0[13]|35|42|[346]1|6[0235689]|86)|33(?:[0157]0|[17]2|71|6[036]|[0186]1|57|88|9[12356])|34(?:30|78|[69]1|[67]2|7[145]|9[23])|35(?:0[1236]|1[1367]|21|[578]1|6[0123]|7[24])|36(?:1[012]|[39]0|2[34]|8[67]|6[13]))|(?:OPPO[ _]?)?CPH1861|RMP210[235-8])(?:[);/ ]|$)'
+  regex: 'Realme[ _]|(?:RMX(?:18(0[13579]|11|3[13]|2[1257]|[45]1|53|45)|19(03|4[1235]|19|9[23]|2[1579]|[01379]1|73)|20(?:[025-7]1|42|[0357]2|03|2[257]|63|7[56]|63L1|8[1356]|[2-5]0)|21(?:0[13]|1[27]|[12]1|4[24]|5[156]|6[13]|7[036]|8[0359]|9[345])|220[0125]|30(?:[3468]1|4[23]|9[23]|63|85)|31(?:15|2[125]|42|51|6[16]|71|9[1357])|32(?:0[13]|35|42|[346]1|6[0235689]|86)|33(?:[0157]0|[17]2|71|6[036]|[0186]1|57|88|9[12356])|34(?:30|78|[69]1|[67]2|7[145]|9[23])|35(?:0[1236]|1[1367]|21|[578]1|6[0123]|7[24])|36(?:1[0125]|[39]0|2[347]|8[67]|6[013])|370[0689]|3710|37[47]1)|(?:OPPO[ _]?)?CPH1861|RMP210[235-8]|4K Google TV Stick)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'RMX370[68]'
+      model: 'GT Neo 5'
+    - regex: 'RMX3700'
+      model: 'GT Neo 5 SE'
     - regex: '(?:OPPO[ _]?)?RMX3142(?:[);/ ]|$)'
       model: 'Q3 Pro Play'
     - regex: '(?:OPPO[ _]?)?CPH1861(?:[);/ ]|$)'
@@ -17157,12 +17706,16 @@ Realme:
       model: '9 Pro+ 5G'
     - regex: 'RMX347[12]'
       model: '9 Pro 5G'
-    - regex: 'RMX3630'
+    - regex: 'RMX36(?:30|15)'
       model: '10'
-    - regex: 'RMX3661'
+    - regex: 'RMX366[01]'
       model: '10 Pro 5G'
     - regex: 'RMX368[67]'
       model: '10 Pro+ 5G'
+    - regex: 'RMX3741'
+      model: '11 Pro+ 5G'
+    - regex: 'RMX3771'
+      model: '11 Pro 5G'
     - regex: 'RMX1925(?:[);/ ]|$)'
       model: '5S'
     - regex: 'RMX1811(?:[);/ ]|$)'
@@ -17175,7 +17728,7 @@ Realme:
       model: 'C11'
     - regex: 'RMX2189(?:[);/ ]|$)'
       model: 'C12'
-    - regex: 'RMX2180(?:[);/ ]|$)'
+    - regex: 'RMX218[03](?:[);/ ]|$)'
       model: 'C15'
     - regex: 'RMX219[45](?:[);/ ]|$)'
       model: 'C15 Qualcomm Edition'
@@ -17187,7 +17740,7 @@ Realme:
       model: 'C21'
     - regex: 'RMX326[123]'
       model: 'C21Y'
-    - regex: 'RMX319[13]'
+    - regex: 'RMX319[13]|realme C25 Series'
       model: 'C25'
     - regex: 'RMX319[57]'
       model: 'C25s'
@@ -17199,12 +17752,16 @@ Realme:
       model: 'C30'
     - regex: 'RMX3690'
       model: 'C30s'
-    - regex: 'RMX3624'
+    - regex: 'RMX362[47]'
       model: 'C33'
     - regex: 'RMX351[13]'
       model: 'C35'
+    - regex: 'RMX3710'
+      model: 'C55'
     - regex: 'RMX3231'
       model: 'C11 (2021)'
+    - regex: 'RMX3709'
+      model: 'GT 3'
     - regex: 'RMX330[01]'
       model: 'GT 2 Pro'
     - regex: 'RMX331[012]'
@@ -17308,10 +17865,13 @@ Realme:
     - regex: 'RMP210[56](?:[);/ ]|$)'
       device: 'tablet'
       model: 'Pad Mini'
+    - regex: '4K Google TV Stick'
+      device: 'tv'
+      model: '4K Google TV Stick'
 
 # Oppo (oppo.com)
 OPPO:
-  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|R820[16]|A101OP|OPG0[1-4]|A00[12]OP|(?:X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057])[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDCT00|PDET10|PDS[TM]00|PEC[MT]30|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10|A103OP|PCCT00|PFTM[12]0|PFFM20|OW19W[123]|OW20W1|PGJM10|PGAM10|PF[EF]M10|Reno[45] Z 5G|Reno5 Pro 5G|Reno5 5G|Find X[23]|Find N| R7sf| 1201|[56].*; (?:R7[gf])|OPD210[12]A?|OPD2201|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PHA120|PGGM10|PHM110|PG[WX]110|PGU110|PHJ110|PCCM40|PHQ110)(?:[);/ ]|$)'
+  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])[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDCT00|PDET10|PDS[TM]00|PEC[MT]30|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10|A103OP|PCCT00|PFTM[12]0|PFFM20|OW19W[123]|OW20W1|PGJM10|PGAM10|PF[EF]M10|Reno[45] Z 5G|Reno5 Pro 5G|Reno[56] 5G|Find X[23]|Find N| R7sf| 1201|[56].*; (?:R7[gf])|OPD210[12]A?|OPD2201|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PHA120|PGGM10|PHM110|PG[WX]110|PGU110|PHJ110|PCCM40|PHQ110|CHP1723|PGT110|PGEM10|RX17Neo|R15 Dream Mirror|R9 Plustm A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PCHM10(?:[);/ ]|$)'
@@ -17394,7 +17954,7 @@ OPPO:
       model: 'A55s 5G'
     - regex: 'PFVM10'
       model: 'A56 5G'
-    - regex: '(?:OPPO[ _]?)?(?:CPH170[15])(?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?(?:CPH170[15]|CPH2407)(?:[);/ ]|$)'
       model: 'A57'
     - regex: 'PFTM20|CPH2387'
       model: 'A57 (2022)'
@@ -17428,7 +17988,7 @@ OPPO:
       model: 'A77'
     - regex: '(?:OPPO[ _]?)?(?:CPH2339|CPH2385)'
       model: 'A77 5G'
-    - regex: '(?:OPPO[ _]?)?(?:CPH2495)'
+    - regex: '(?:OPPO[ _]?)?(?:CPH2495|CPH2483)'
       model: 'A78 5G'
     - regex: '(?:OPPO[ _]?)?A79kt'
       model: 'A79'
@@ -17480,6 +18040,8 @@ OPPO:
       model: 'F21s Pro'
     - regex: '(?:OPPO[ _]?)?X9009(?:[);/ ]|$)'
       model: 'F1 Plus'
+    - regex: 'CPH2527'
+      model: 'F23 5G'
     - regex: 'CPH191[135](?:[);/ ]|$)'
       model: 'F11'
     - regex: 'CPH19(?:69|87)(?:[);/ ]|$)'
@@ -17494,7 +18056,7 @@ OPPO:
       model: 'F3'
     - regex: '(?:OPPO[ _]?)?CPH1613(?:[);/ ]|$)'
       model: 'F3 Plus'
-    - regex: '(?:OPPO[ _]?)?CPH172[37](?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?(?:CPH172[37]|CHP1723)(?:[);/ ]|$)'
       model: 'F5'
     - regex: '(?:OPPO[ _]?)?CPH1725(?:[);/ ]|$)'
       model: 'F5 Youth'
@@ -17506,7 +18068,7 @@ OPPO:
       model: 'F9 Pro'
     - regex: '(?:OPPO[ _]?)?CPH2223(?:[);/ ]|$)'
       model: 'F19s'
-    - regex: '(?:OPPO[ _]?)?CPH2285(?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?(?:CPH2285|F19 Pro)(?:[);/ ]|$)'
       model: 'F19 Pro'
     - regex: '(?:OPPO[ _]?)?CPH2213(?:[);/ ]|$)'
       model: 'F19 Pro Plus'
@@ -17524,6 +18086,8 @@ OPPO:
       model: 'Find N'
     - regex: '(?:OPPO[ _]?)?PGU110(?:[);/ ]|$)'
       model: 'Find N2'
+    - regex: '(?:OPPO[ _]?)?(?:CPH2437|PGT110)(?:[);/ ]|$)'
+      model: 'Find N2 Flip'
     - regex: '(?:OPPO[ _]?)?R815[TW]?(?:[);/ ]|$)'
       model: 'Find Clover'
     - regex: '(?:OPPO[ _]?)?R8015(?:[);/ ]|$)'
@@ -17550,12 +18114,18 @@ OPPO:
       model: 'Find X3'
     - regex: 'Find X3 Neo(?:[);/ ]|$)'
       model: 'Find X3 Neo'
-    - regex: '(?:PEEM00|CPH2173|OPG03)(?:[);/ ]|$)'
+    - regex: '(?:PEEM00|CPH2173|OPG03|Find X3 Pro)(?:[);/ ]|$)'
       model: 'Find X3 Pro'
+    - regex: 'Find X3 Lite(?:[);/ ]|$)'
+      model: 'Find X3 Lite'
     - regex: 'CPH2307|PFFM10'
       model: 'Find X5'
     - regex: 'CPH2305|PFEM10|PFFM20'
       model: 'Find X5 Pro'
+    - regex: 'PGEM10'
+      model: 'Find X6 Pro'
+    - regex: 'PGFM10'
+      model: 'Find X6'
     - regex: '(?:OPPO[ _]?)?R1011 Build'
       model: 'Joy Plus'
     - regex: '(?:OPPO[ _]?)?(PBC(?:M30|T10))(?:[);/ ]|$)'
@@ -17618,6 +18188,10 @@ OPPO:
       model: 'R15x'
     - regex: '(?:OPPO[ _]?)?(?:CPH1879|PBE[MT]00)(?:[);/ ]|$)'
       model: 'R17'
+    - regex: 'RX17Neo'
+      model: 'RX17 Neo'
+    - regex: 'R15 Dream Mirror'
+      model: 'R15 Dream Mirror'
     - regex: '(?:OPPO[ _]?)?(?:CPH1893)(?:[);/ ]|$)'
       model: 'R17 Neo'
     - regex: '(?:OPPO[ _]?)?(?:CPH1877|PBD[MT]00)(?:[);/ ]|$)'
@@ -17640,7 +18214,7 @@ OPPO:
       model: 'R7 Plus'
     - regex: '(?:OPPO[ _]?)?R7Plusf(?:[);/ ]|$)'
       model: 'R7 Plus F'
-    - regex: '(?:OPPO[ _]?)?X9079(?:[);/ ]|$)'
+    - regex: '(?:OPPO[ _]?)?(?:X9079|R9 Plustm A)(?:[);/ ]|$)'
       model: 'R9 Plus'
     - regex: '(?:OPPO[ _]?)?(?:CPH1607|R9sk)(?:[);/ ]|$)'
       model: 'R9s'
@@ -17706,7 +18280,7 @@ OPPO:
       model: 'Reno 5 Pro Plus 5G'
     - regex: '(?:CPH1921|PCCM40)(?:[);/ ]|$)'
       model: 'Reno 5G'
-    - regex: '(?:CPH2235|PEQM00|CPH2251)(?:[);/ ]|$)'
+    - regex: '(?:CPH2235|PEQM00|CPH2251|Reno6 5G)(?:[);/ ]|$)'
       model: 'Reno 6'
     - regex: 'CPH2237(?:[);/ ]|$)'
       model: 'Reno 6 Z 5G'
@@ -17734,7 +18308,7 @@ OPPO:
       model: 'Reno 8 Z'
     - regex: 'PGBM10'
       model: 'Reno 8'
-    - regex: 'CPH2481'
+    - regex: 'CPH2481|CPH2505'
       model: 'Reno 8T'
     - regex: 'PHM110'
       model: 'Reno 9'
@@ -17829,17 +18403,19 @@ Orange:
       model: 'Dive $1 Dual'
     - regex: '(?:Orange[ _-])?Dive ?(\d+)(?:[);/ ]|$)'
       model: 'Dive $1'
-    - regex: 'Orange[ _-](Daytona|Dublin|Fova|Gova|Hi 4G|Hiro|Kivo|Monte Carlo|Neva 80|Neva play|Nura|Reyo|Rise[_ ](3[034]|40|5[345])|Rono|Roya|San Francisco|Tactile internet 2|Tado|Yomi|Yumo|Zali|Mahpee|Neva leaf|Sanza touch|Viking L508)(?:[);/ ]|$)'
+    - regex: 'Orange[ _-](Daytona|Dublin|Fova|Gova|Hi 4G|Hiro|Kivo|Monte Carlo|Neva 80|Neva play|Nura|Reyo|Rise[_ ](3[034]|40|5[345])|Rono|Roya|San Francisco|Tactile internet 2|Tado|Yomi|Yumo|Zali|Mahpee|Neva leaf|Sanza touch|Viking L508|Zilo)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'SPV[ \-]?([a-z0-9]+)'
       model: 'SPV $1'
 
 # Oukitel
 Oukitel:
-  regex: 'OUKITEL|(?:Android 10;(?: [\w-]+;)? (?:C19|C22)|Android 8(?:[\d.]*);(?: [\w-]+;)? U23|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|OK6000 Plus|WP5000|WP[58] Pro|K[46]000[ _](?:Plus|Lite)|Y4800|K10000|K7 Power|K[4-8]000| RT[12]| WP(?:[15-79]|1[02356789]|2[01])|K[37]_Pro|K13_Pro|U25_Pro|OKT1|UniverseTap)(?:[);/ ]|$)'
+  regex: 'OU[Kc]ITEL|(?:Android 10;(?: [\w-]+;)? (?:C19|C22)|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:C11|U23)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:C25)|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:C32)|Android 7(?:[\d.]*);(?: [\w-]+;)? (?:U1[78]|U22)|(?:C1[569]|K10000|K[46]000)(?:[ _]Pro)|K4000Pro|C1[18]_Pro|C1[0237] Pro|C2[13] Pro|C12 Plus|[UK]15 Pro|K15_Plus|U16 Max|C11_F|U7 Max|U7 Plus|U11[_ ]Plus|U20_Plus|OK6000 Plus|WP5000|WP[58] Pro|K[46]000[ _](?:Plus|Lite)|K9 Pro|Y4800|K10000|K7 Power|K[4-8]000| RT[123]| WP(?:[15-79]|1[02356789]|2[0123])|K[37]_Pro|K13_Pro|U25_Pro|OKT1|UniverseTap)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(C1[0-9]|C2[13]|K10000|K[46]000|WP[258]|WP1[28]|WP20|U[12]5|K[37]|K1[35])[ _]?Pro(?:[);/ ]|$)'
+    - regex: 'WP21 Ultra'
+      model: 'WP21 Ultra'
+    - regex: '(C1[0-9]|C2[13]|K10000|K[46]000|WP[258]|WP1[28]|WP20|U[12]5|K[379]|K1[35])[ _]?Pro(?:[);/ ]|$)'
       model: '$1 Pro'
     - regex: 'OUKITEL K([37])(?:[);/ ]|$)'
       model: 'K$1'
@@ -17855,10 +18431,10 @@ Oukitel:
       model: 'K7 Power'
     - regex: 'UniverseTap(?:[);/ ]|$)'
       model: 'U8 Universe Tap'
-    - regex: '(?:Oukitel-)?(Y4800|K10000|K[4-8]000|WP5000|[CU]2|U1[078]|U2[23]|C19|C22|C3|WP15 S)(?:[);/ ]|$)'
+    - regex: '(?:Oukitel-)?(Y4800|K10000|K[4-8]000|WP5000|[CU]2|U1[078]|U2[23]|C1[19]|C[23]2|C3|WP15 S|C25)(?:[);/ ]|$)'
       model: '$1'
 
-    - regex: ' (RT[12]|OKT1)(?:[);/ ]|$)'
+    - regex: ' (RT[123]|OKT1)(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
@@ -17978,7 +18554,7 @@ Oysters:
 
 # öwn (own mobile)
 öwn:
-  regex: 'OWN[ _]|(?:S4035[ _][34]G|Smart8|SMART PLUS LTE|FUN VALUE 4G)(?:[);/ ]|$)'
+  regex: 'OWN[ _]|(?:S4035[ _][34]G|Smart8|SMART PLUS LTE|FUN VALUE (?:4G|Lite)|FUN_VALUE)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'FUN ([67])'
@@ -17991,7 +18567,9 @@ Oysters:
       model: 'One Plus'
     - regex: 'One'
       model: 'One'
-    - regex: 'FUN VALUE 4G'
+    - regex: 'Fun Value Lite'
+      model: 'Fun Value Lite'
+    - regex: 'FUN[_ ]VALUE(?: 4G)?'
       model: 'Fun Value 4G'
     - regex: 'Smart ?(8|9)(?:[);/ ]|$)'
       model: 'Smart $1'
@@ -18009,7 +18587,7 @@ Panacom:
 
 # panasonic
 Panasonic:
-  regex: 'Panasonic|PANATV[0-9]+|Viera/|(?:P902i|P-0[28]D|FZ-B2D|FZ-[NX]1|DMC-CM1|P-01[JK]|P-0[23]E|P55 Max)(?:[);/ ]|$)|Eluga[ _]|P55 Novo 4G'
+  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'
   device: 'smartphone'
   models:
     - regex: 'P-01J(?:[);/ ]|$)'
@@ -18033,8 +18611,8 @@ Panasonic:
       model: 'Lumix Phone P-02D'
     - regex: '(FZ-[XN]1)(?:[);/ ]|$)'
       model: 'Toughpad $1'
-    - regex: 'FZ-B2D(?:[);/ ]|$)'
-      model: 'Toughpad FZ-B2D'
+    - regex: 'FZ-(B2D|A2A)(?:[);/ ]|$)'
+      model: 'Toughpad FZ-$1'
       device: 'tablet'
     - regex: 'P55 Novo 4G'
       model: 'P55 Novo 4G'
@@ -18136,19 +18714,25 @@ Pentagram:
 
 # Tcl (tcl.com)
 TCL:
-  regex: 'TCL,|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRS]|5004S|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JM]|5133A|5148A|5152D|5159[AJ]|5164D|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9317X1|9161G| 9061| 8182| 8167|BeyondTV\d?|T507U)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
+  regex: 'TCL,|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRSVO]|5004S|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JMEI]|5133A|5148A|5152D|5159[AJ]|5164D|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9317X1|9161G| 9061| 8182| 8167| 8095|BeyondTV\d?|T507U|T610[KE]|9132G|9137W|T430W|T431D|T501[CL]|T768S)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TCLGalaG60(?:\(9108A\))?(?:[);/ ]|$)'
       model: 'Gala G60'
     - regex: '5004S(?:[);/ ]|$)'
       model: 'Signa'
+    - regex: 'T430W(?:[);/ ]|$)'
+      model: 'Ion X'
+    - regex: 'T501[CL](?:[);/ ]|$)'
+      model: 'Ion'
     - regex: 'T779W(?:[);/ ]|$)'
       model: 'Stylus 5G'
     - regex: '4187D(?:[);/ ]|$)'
       model: '205'
     - regex: '(?:4163D|4188S)(?:[);/ ]|$)'
       model: '304'
+    - regex: 'T431D(?:[);/ ]|$)'
+      model: '403'
     - regex: '6102[AD](?:[);/ ]|$)'
       model: '305'
     - regex: '5164D(?:[);/ ]|$)'
@@ -18159,6 +18743,8 @@ TCL:
       model: '405'
     - regex: 'T507U(?:[);/ ]|$)'
       model: '408'
+    - regex: 'T610[KE](?:[);/ ]|$)'
+      model: '40 SE'
     - regex: 'T774[BH](?:[);/ ]|$)'
       model: '20L'
     - regex: 'T775B(?:[);/ ]|$)'
@@ -18195,7 +18781,7 @@ TCL:
       model: 'L9S'
     - regex: '5124J(?:[);/ ]|$)'
       model: 'L10'
-    - regex: '5130J(?:[);/ ]|$)'
+    - regex: '5130[JEI](?:[);/ ]|$)'
       model: 'L10+'
     - regex: '4187[MU](?:[);/ ]|$)'
       model: 'L10 Lite'
@@ -18231,13 +18817,17 @@ TCL:
       model: '10 SE'
     - regex: 'T671[HFEO](?:_EEA)?(?:[);/ ]|$)'
       model: '20 SE'
+    - regex: 'T768S(?:_EEA)?(?:[);/ ]|$)'
+      model: '20 A'
     - regex: '6165[AHS]'
       model: '30 SE'
+    - regex: '4188V'
+      model: '30 LE'
     - regex: 'T676[KJ]'
       model: '30+'
     - regex: 'T676H'
       model: '30'
-    - regex: '(?:4188[CLR]|T602DL)(?:[);/ ]|$)'
+    - regex: '(?:4188[CLRO]|T602DL)(?:[);/ ]|$)'
       model: '30 Z'
     - regex: '(?:T781S|T781SPP)(?:[);/ ]|$)'
       model: '30 V 5G'
@@ -18267,9 +18857,15 @@ TCL:
     - regex: '9317X1'
       device: 'tablet'
       model: 'Smart Tab 7'
+    - regex: ' 8095(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'TKEE Max'
     - regex: '9048S(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Tab 8" 4G'
+    - regex: '9132G'
+      device: 'tablet'
+      model: 'Tab 8"'
     - regex: '9295G'
       device: 'tablet'
       model: '10 TabMax 4G'
@@ -18294,6 +18890,9 @@ TCL:
     - regex: '9060X'
       device: 'tablet'
       model: 'Tab 10 HD 4G'
+    - regex: '9137W'
+      device: 'tablet'
+      model: 'Tab 8 LE'
     - regex: '8491X'
       device: 'tablet'
       model: 'Tab 10L'
@@ -18497,12 +19096,12 @@ PPTV:
 
 # ProScan
 ProScan:
-  regex: 'PLT([^;/]+) Build|PLT(?:777[45]|9774|1074)G(?:[);/ ]|$)'
+  regex: 'PLT([^;/]+) Build|PLT(?:777[045]|9774|1074|9999)G(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'PLT([^;/]+) Build'
       model: 'PLT$1'
-    - regex: 'PLT(777[45]|9774|1074)G'
+    - regex: 'PLT(777[045]|9774|1074|9999)G'
       model: 'PLT$1G'
 
 # RCA Tablets (RCA) (www.rca.com)
@@ -18599,7 +19198,7 @@ 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|[GDFQL]2|[AF]3|H4)|TV (?:Ultima|Fly)|Smart Stick Pro|TV Mercury|TV Air)(?:[);/ ]|$)'
+    - regex: '(Infinity K8|Smart Box (?:Q1|v00[3-9]|Quad|Ultra HD v002|4K V001|[ABCDXYZ]1|[AGDFQL]2|[AF]3|H4)|TV (?:Ultima|Fly)|Smart Stick Pro|TV Mercury|TV Air)(?:[);/ ]|$)'
       model: '$1'
 
 # Rover
@@ -18643,17 +19242,17 @@ RT Project:
 
 # S-TELL
 S-TELL:
-  regex: 'S-TELL|(?:M630|M55[78]|P760|P750i|M555i|M655)(?:[);/ ]|$)'
+  regex: 'S-TELL|(?:M630|M55[78]|P760|P750i|M555i|M580|M457|M655)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(P760|P750i)(?:[);/ ]|$)'
       model: '$1'
-    - regex: '(?:S-TELL[ _])?M([0-9]{3}|555i|M655)(?:[);/ ]|$)'
+    - regex: '(?:S-TELL[ _])?M([0-9]{3}|555i|M580|M655)(?:[);/ ]|$)'
       model: 'M$1'
 
 # Safaricom
 Safaricom:
-  regex: 'NEON[_ ]RAY|(?:NEON_NOVA|NEON PLUS|NEON PLUS|NEON LITE|Neon Storm)(?:[);/ ]|$)'
+  regex: 'NEON[_ ]RAY|(?:NEON_NOVA|NEON PLUS|NEON PLUS|NEON LITE|Neon Storm|SFCSTB2LITE)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NEON_RAY_PRO'
@@ -18670,10 +19269,13 @@ Safaricom:
       model: 'Neon Lite'
     - regex: 'Neon Storm'
       model: 'Neon Storm'
+    - regex: 'SFCSTB2LITE'
+      device: 'tv'
+      model: 'STB2 Lite'
 
 # Santin
 Santin:
-  regex: 'SANTIN|(?:BiTBiZ_V58|ACTOMA ACE|DREAMPLUS03A|Candy U7 Pro|GAAMII|RS635H|HY-002 Plus|HongQi HQ1|G101-OG)(?:[);/ ]|$)'
+  regex: 'SANTIN|(?:BiTBiZ_V58|ACTOMA ACE|DREAMPLUS03A|Candy U7 Pro|GAAMII|RS635H|HY-002 Plus|HongQi HQ1|G101-OG|HEXIN-H2-A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BiTBiZ_V58(?:[);/ ]|$)'
@@ -18682,6 +19284,8 @@ Santin:
       model: 'GAAMII G1'
     - regex: 'GAAMII(?:[);/ ]|$)'
       model: 'GAAMII'
+    - regex: 'HEXIN-H2-A(?:[);/ ]|$)'
+      model: 'Hexin H2-A'
     - regex: 'Candy U7 Pro(?:[);/ ]|$)'
       model: 'Candy U7 Pro'
     - regex: 'DREAMPLUS03A(?:[);/ ]|$)'
@@ -18744,7 +19348,7 @@ Soundmax:
 
 # Samsung
 Samsung:
-  regex: 'SAMSUNG(?! ?(?:Browser|Redmi))|FamilyHub|Maple (?!III)|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)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[678]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
+  regex: 'SAMSUNG(?! ?(?:Browser|Redmi))|FamilyHub|Maple (?!III)|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)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|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]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit tv models
@@ -19053,7 +19657,7 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T73[57]'
       device: 'tablet'
       model: 'Galaxy Tab S7 FE 12.4" LTE'
-    - regex: '(?:SAMSUNG-)?(?:SM-T736|SM-T738U)'
+    - regex: '(?:SAMSUNG-)?(?:SM-T736|SM-T738[UTV])'
       device: 'tablet'
       model: 'Galaxy Tab S7 FE 12.4" 5G'
     - regex: '(?:SAMSUNG-)?SM-T733'
@@ -19184,9 +19788,30 @@ Samsung:
     - regex: 'SM-R800'
       device: 'wearable'
       model: 'Galaxy Watch 46mm'
+    - regex: 'SM-R875'
+      device: 'wearable'
+      model: 'Galaxy Watch 4 44mm'
+    - regex: 'SM-R8[76]0'
+      device: 'wearable'
+      model: 'Galaxy Watch 4 40mm'
+    - regex: 'SM-R90[05]'
+      device: 'wearable'
+      model: 'Galaxy Watch 5 40mm'
+    - regex: 'SM-R91[05]'
+      device: 'wearable'
+      model: 'Galaxy Watch 5 44mm'
+    - regex: 'SM-R925'
+      device: 'wearable'
+      model: 'Galaxy Watch 5 Pro 50mm'
+    - regex: 'SM-R920'
+      device: 'wearable'
+      model: 'Galaxy Watch 5 Pro 45mm'
     - regex: 'SM-R805'
       device: 'wearable'
       model: 'Galaxy Watch 46mm LTE'
+    - regex: 'SM-R895'
+      device: 'wearable'
+      model: 'Galaxy Watch 4 46mm'
     - regex: 'SM-R810'
       device: 'wearable'
       model: 'Galaxy Watch 42mm'
@@ -19202,6 +19827,12 @@ Samsung:
     - regex: 'SM-R760'
       device: 'wearable'
       model: 'Galaxy Gear S3 Frontier 46mm'
+    - regex: 'SM-R720'
+      device: 'wearable'
+      model: 'Galaxy Gear S2 43mm'
+    - regex: 'SM-R730'
+      device: 'wearable'
+      model: 'Galaxy Gear S2 44mm'
     - regex: 'SM-R750'
       device: 'wearable'
       model: 'Gear S 40mm'
@@ -19236,6 +19867,8 @@ Samsung:
       model: 'Family Hub'
 
     # explicit smartphone models
+    - regex: '(?:SAMSUNG-)?SM-A245'
+      model: 'Galaxy A24'
     - regex: '(?:SAMSUNG-)?SM-G850(?:8S|[AFKLMSWXY])'
       model: 'Galaxy Alpha'
     - regex: '(?:SAMSUNG-)?GT-B5330'
@@ -19492,7 +20125,7 @@ Samsung:
       model: 'Galaxy S6 Edge+'
     - regex: '(?:SAMSUNG-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
       model: 'Galaxy S7'
-    - regex: '(?:SAMSUNG-)?SM-G935(?:R4|W8|[0AFKLPSTUVX])|SC-02H|SCV33'
+    - regex: '(?:SAMSUNG-)?SM-G935(?:R4|W8|[0AFKLPSTUVX])|SC-02H|SCV33|Galaxy s7 edge'
       model: 'Galaxy S7 Edge'
     - regex: '(?:SAMSUNG-)?SM-G891A'
       model: 'Galaxy S7 Active'
@@ -19516,7 +20149,7 @@ Samsung:
       model: 'Galaxy S10+'
     - regex: 'SC-05L'
       model: 'Galaxy S10+ Olympic Games Edition'
-    - regex: '(?:SAMSUNG-)?SM-G970(?:U1|[08FUNWX])(?:[);/ ]|$)'
+    - regex: '(?:(?:SAMSUNG-)?SM-G970(?:U1|[08FUNWX])|beyond0q?)(?:[);/ ]|$)'
       model: 'Galaxy S10e'
     - regex: '(?:SAMSUNG-)?SM-G980F'
       model: 'Galaxy S20'
@@ -19534,7 +20167,7 @@ Samsung:
       model: 'Galaxy S20+ 5G'
     - regex: '(?:SAMSUNG-)?SM-G991V'
       model: 'Galaxy S21 5G UW'
-    - regex: '(?:SAMSUNG-)?SM-G991(?:U1|[0ABNWQU])|SCG09'
+    - regex: '(?:SAMSUNG-)?SM-G991(?:U1|R4|[0ABNWQU])|SCG09'
       model: 'Galaxy S21 5G'
     - regex: '(?:SAMSUNG-)?SM-G990'
       model: 'Galaxy S21 FE 5G'
@@ -19550,7 +20183,7 @@ Samsung:
       model: 'Galaxy S22 Ultra'
     - regex: '(?:SAMSUNG-)?SM-S906(?:U1|[0BENUW])'
       model: 'Galaxy S22+'
-    - regex: '(?:SAMSUNG-)?SM-S911'
+    - regex: '(?:SAMSUNG-)?(?:SM-S911|SCG19)'
       model: 'Galaxy S23'
     - regex: '(?:SAMSUNG-)?SM-S916'
       model: 'Galaxy S23+'
@@ -19598,6 +20231,10 @@ Samsung:
       model: 'Galaxy A2 Core'
     - regex: '(?:SAMSUNG-)?(?:SM-S115(?:DL)?|SM-A115V)'
       model: 'Galaxy A11'
+    - regex: '(?:SAMSUNG-)?(?:SM-A146)'
+      model: 'Galaxy A14 5G'
+    - regex: '(?:SAMSUNG-)?(?:SM-A145)'
+      model: 'Galaxy A14'
     - regex: '(?:SAMSUNG-)?SM-A225[F]?'
       model: 'Galaxy A22'
     - regex: '(?:SAMSUNG-)?SM-A226L'
@@ -19610,6 +20247,8 @@ Samsung:
       model: 'Galaxy A3 (2016)'
     - regex: '(?:SAMSUNG-)?SM-A320(?:FL|[FXY])'
       model: 'Galaxy A3 (2017)'
+    - regex: '(?:SAMSUNG-)?SM-A346'
+      model: 'Galaxy A34 5G'
     - regex: '(?:SAMSUNG-)?SM-A430F'
       model: 'Galaxy A4'
     - regex: '(?:SAMSUNG-)?(?:SM-A500(?:YZ|[9LSWY])?|SM-A5OOH)(?:[);/ ]|$)'
@@ -19650,7 +20289,7 @@ Samsung:
       model: 'Galaxy A72'
     - regex: '(?:SAMSUNG-)?SM-A736'
       model: 'Galaxy A73 5G'
-    - regex: '(?:SAMSUNG-)?SM-A716(?:U1|[0BUV])(?:[);/ ]|$)'
+    - regex: '(?:SAMSUNG-)?SM-A716(?:U1|[0BUVT])(?:[);/ ]|$)'
       model: 'Galaxy A71 5G'
     - regex: '(?:SAMSUNG-)?SM-A(?:530F|800[0FISXY])|SCV32'
       model: 'Galaxy A8'
@@ -19682,9 +20321,9 @@ Samsung:
       model: 'Galaxy A10e'
     - regex: '(?:SAMSUNG-)?SM-A115(?:A[PZ]|U1|[AFMUW])'
       model: 'Galaxy A11'
-    - regex: '(?:SAMSUNG-)?SM-(?:A12(?:5[AFMNUWTP]|7[FM])|S127DL)'
+    - regex: '(?:SAMSUNG-)?SM-(?:A12(?:5[AFMNUWTPV]|7[FM])|S127DL)'
       model: 'Galaxy A12'
-    - regex: '(?:SAMSUNG-)?SM-(?:A136(?:U1|[BMWU])|S136DL)'
+    - regex: '(?:SAMSUNG-)?SM-(?:A136(?:U1|[BMWUS])|S136DL)'
       model: 'Galaxy A13 5G'
     - regex: '(?:SAMSUNG-)?(?:SM-A135|SM-A137F)'
       model: 'Galaxy A13'
@@ -19730,12 +20369,14 @@ Samsung:
       model: 'Galaxy A50s'
     - regex: '(?:SAMSUNG-)?SM-(?:A515[FUW]|S515DL)'
       model: 'Galaxy A51'
-    - regex: '(?:SAMSUNG-)?(?:SM-A516(?:U1|[0BNUV])|SC-54A|SCG07)'
+    - regex: '(?:SAMSUNG-)?(?:SM-A516(?:U1|[0BNUVT])|SC-54A|SCG07)'
       model: 'Galaxy A51 5G'
     - regex: '(?:SAMSUNG-)?SM-A536V'
       model: 'Galaxy A53 5G UW'
-    - regex: '(?:SAMSUNG-)?(?:SM-A536|SC-53C|SCG15)'
+    - regex: '(?:SAMSUNG-)?(?:SM-A536|SC-53C|SCG15|SM-S536DL)'
       model: 'Galaxy A53 5G'
+    - regex: '(?:SAMSUNG-)?(?:SM-A546)'
+      model: 'Galaxy A54 5G'
     - regex: '(?:SAMSUNG-)?SM-A705(?:GM|[MYF]N|[0FUWX])'
       model: 'Galaxy A70'
     - regex: '(?:SAMSUNG-)?SM-A707[0F]'
@@ -19824,6 +20465,8 @@ Samsung:
       model: 'Galaxy J5 (2015)'
     - regex: '(?:SAMSUNG-)?SM-(?:J510(?:[FGMU]N|FQ|[8FGHKLSY])?|5108|G510H)(?:[);/ ]|$)'
       model: 'Galaxy J5 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-J530[GY]'
+      model: 'Galaxy J5 Pro (2017)'
     - regex: '(?:SAMSUNG-)?SM-J530|(?:lineage_)?j5y17lte'
       model: 'Galaxy J5 (2017)'
     - regex: '(?:SAMSUNG-)?SM-G570[0FMY]'
@@ -19886,7 +20529,7 @@ Samsung:
       model: 'Galaxy Jump 2'
     - regex: '(?:SAMSUNG-)?SM-M015[FG]'
       model: 'Galaxy M01'
-    - regex: '(?:SAMSUNG-)?SM-M045F'
+    - regex: '(?:SAMSUNG-)?SM-[EM]045F'
       model: 'Galaxy M04'
     - regex: '(?:SAMSUNG-)?SM-M013F'
       model: 'Galaxy M01 Core'
@@ -19908,6 +20551,8 @@ Samsung:
       model: 'Galaxy M13'
     - regex: '(?:SAMSUNG-)?SM-M136'
       model: 'Galaxy M13 5G'
+    - regex: '(?:SAMSUNG-)?SM-M146B'
+      model: 'Galaxy M14 5G'
     - regex: '(?:SAMSUNG-)?SM-(?:M205(?:[FGMN]|FN)|M20)(?:[);/ ]|$)'
       model: 'Galaxy M20'
     - regex: '(?:SAMSUNG-)?SM-M215F'
@@ -19952,6 +20597,8 @@ Samsung:
       model: 'Galaxy W201$1'
     - regex: '(?:SAMSUNG-)?SM-W2022'
       model: 'Galaxy W22'
+    - regex: '(?:SAMSUNG-)?SM-W2020'
+      model: 'Galaxy W20'
     - regex: '(?:SAMSUNG-)?SM-W2021'
       model: 'Galaxy W21'
 
@@ -20054,7 +20701,7 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-N935[FSLK](?:[);/ ]|$)'
       model: 'Galaxy Note Fan Edition'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?(?:(?:GT-)?N7100|SCH-(?:I605|N719|R950)|SPH-L900)(?:[);/ ]|$)'
+    - regex: '(?:SAMSUNG-)?(?:(?:GT-)?N7100|SCH-(?:I605|N719|R950)|SPH-L900|Galaxy Note 2)(?:[);/ ]|$)'
       model: 'Galaxy Note II'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-N7105'
@@ -20125,27 +20772,27 @@ Samsung:
     - regex: '(?:SAMSUNG[- ])?SM-N950|SCV37|SC-01K'
       model: 'Galaxy Note 8'
       device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?(?:SM-N960|SCV40|SC-01L)'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N960|SCV40|SC-01L)|crownqlte'
       model: 'Galaxy Note 9'
       device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?SM-(?:N970(?:U1|W8|[089DFJKLSUWX])|N971N)'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N975(?:U1|XU|[0CFUWX])|SM-N976[0BVNQU]|SC-01M|SCV45)|Galaxy Note 10\+'
+      model: 'Galaxy Note 10+'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?SM-(?:N970(?:U1|W8|[089DFJKLSUWX])|N971N)|Galaxy Note 10'
       model: 'Galaxy Note 10'
       device: 'phablet'
     - regex: '(?:SAMSUNG[- ])?SM-N770[FX]'
       model: 'Galaxy Note 10 Lite'
       device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?(?:SM-N975(?:U1|XU|[0CFUWX])|SM-N976[0BVNQU]|SC-01M|SCV45)'
-      model: 'Galaxy Note 10+'
-      device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?(?:SM-N980(?:F/DS|F))'
-      model: 'Galaxy Note 20'
-      device: 'phablet'
     - regex: '(?:SAMSUNG[- ])?(?:SM-N981(?:B/DS|U1|[0BNUW]))'
       model: 'Galaxy Note 20 5G'
       device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?(?:SM-N985(?:F/DS|F))'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N985(?:F/DS|F))|Galaxy Note 20 Ultra(?! 5G)'
       model: 'Galaxy Note 20 Ultra'
       device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N980(?:F/DS|F)|Galaxy Note 20)'
+      model: 'Galaxy Note 20'
+      device: 'phablet'
     - regex: '(?:SAMSUNG[- ])?(?:SM-N986(?:B/DS|U1|[0BCNUW])|SC-53A|SCG06)'
       model: 'Galaxy Note 20 Ultra 5G'
       device: 'phablet'
@@ -20313,9 +20960,19 @@ Senwa:
     - regex: 'Senwa[ _-]*([^;/]+)(?: Build|[;)])'
       model: '$1'
 
+# Visual Land (www.visual-land.com)
+Visual Land:
+  regex: '(?:Prime10(?:SE|ES)|Elite(?:9QL|8QI|7QS))(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'Prime10(SE|ES)'
+      model: 'Prestige Prime 10$1'
+    - regex: 'Elite(9QL|8QI|7QS)'
+      model: 'Prestige Elite $1'
+
 # Sky or Sky Devices (skydevices.com)
 Sky:
-  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:PHOTOPRO|5_0T|M45|[45]T|45T|GO|M5Plus|T[46]|[ABCDHP]5|5_5_Octa|Octa|[BCEFGHJPTV]55|[AB]65)|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)|SKYVISION|SKY Black| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Premier5'
+  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:PHOTOPRO|5_0T|M45|[45]T|45T|GO|M5Plus|T[46]|[ABCDHP]5|5_5_Octa|Octa|[BCEFGHJPTV]55|[AB]65|N55|T10)|Platinum[_ ](?:5.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10)|SKYVISION|SKY Black| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Premier5'
   device: 'smartphone'
   models:
     - regex: 'Platinum[_ ](?:5\.0M|M5)'
@@ -20335,6 +20992,9 @@ Sky:
     - regex: 'Platinum[_ ]?VIEW(2)?(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Platinum View$1'
+    - regex: 'SKY[ _]PAD10'
+      device: 'tablet'
+      model: 'Pad 10'
     - regex: 'SKYVISION'
       device: 'tablet'
       model: 'Vision'
@@ -20361,7 +21021,10 @@ Sky:
       model: 'Elite M5 Plus'
     - regex: 'Elite E55Max'
       model: 'Elite E55 Max'
-    - regex: 'Elite[ _](M45|Go|[45]T|T[46]|[ABCDHP]5|[ABCEFGHJPTV]55|[AB]65|45T)(?:[);/ ]|$)'
+    - regex: 'Elite[ _](M45|Go|[45]T|T[46]|[ABCDHP]5|[ABCEFGHJPTV]55|[AB]65|45T|N55)(?:[);/ ]|$)'
+      model: 'Elite $1'
+    - regex: 'Elite (T10)'
+      device: 'tablet'
       model: 'Elite $1'
     - regex: 'Elite[_ ]([3-7])[\._]([05](?:[A-Z]{1,2})?\+?)'
       model: 'Elite $1.$2'
@@ -20388,12 +21051,14 @@ Sky:
 
 # Skyworth
 Skyworth:
-  regex: 'Sky_?worth|FlowBox-F1'
+  regex: 'Sky_?worth|(?:FlowBox-F1|SWTV-20AE)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'FlowBox-F1'
       model: 'FlowBox-F1'
-    - regex: 'Sky_?worth ([^;/]+) Build'
+    - regex: '(SWTV-20AE)'
+      model: '$1'
+    - regex: 'Sky_?worth ([^;/)]+)(?: Build|[;)])'
       model: '$1'
 
 # Smartfren
@@ -20500,16 +21165,20 @@ STF Mobile:
 
 # STK
 STK:
-  regex: 'STK[_ ]|Storm 2e Pluz'
+  regex: 'STK[_ ]|(?:Storm 2e Pluz|Life 7S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Life 8'
       model: 'Life 8'
+    - regex: 'Life 7S'
+      model: 'Life 7S'
     - regex: 'Storm 2e Pluz'
       model: 'Storm 2e Plus'
     - regex: 'Sync 5z Plus'
       model: 'Sync 5z Plus'
-    - regex: 'STK[_ ]([^/;]+) Build'
+    - regex: 'STK[_ ]Transporter[_ ]1'
+      model: 'Transporter 1'
+    - regex: 'STK[_ ]([^/;)]+)(?: Build|[;)])'
       model: '$1'
     - regex: 'STK[_ ]([a-z0-9]+)'
       model: '$1'
@@ -20652,6 +21321,10 @@ Pantech:
     # explicit smartphone models
     - regex: 'ADR910L'
       model: 'Star Q'
+    - regex: 'IM-A860'
+      model: 'Vega No 6'
+    - regex: 'IM-A850'
+      model: 'Vega R3'
     - regex: 'IM-A870K'
       model: 'Vega Iron'
     - regex: 'Pantech[ -]?(P4100)'
@@ -20699,9 +21372,7 @@ Ployer:
       model: 'MOMO mini S'
     - regex: 'momo mini 3GS'
       model: 'MOMO Mini 3GS'
-    - regex: 'MOMO([0-9][^);/]*) Build'
-      model: 'MOMO $1'
-    - regex: 'MOMO([0-9][^);/]*)(?:[);/]|$)'
+    - regex: 'MOMO([0-9][^);/]*)(?: Build|[;)])'
       model: 'MOMO $1'
 
 # Plum (plum-mobile.com)
@@ -20731,7 +21402,7 @@ Plum:
 
 # Polaroid
 Polaroid:
-  regex: 'Polaroid|POLPAROID|(?:PMID|MIDC)[0-9a-z]+(?:[);/ ]|$)|MID(?:1014|0714)|PRO[VG]?(?:[0-9]{3,}[a-z]*|[0-9]{2}[a-z])|(?:P(?:400[56]|4526|500[56]|502[56]|504[67]|552[56])A|P902/A900|PSPC(?:505|550|[MZL]20A0|K2[01]NA)|SIGMA 5|MIDI109PDE|MIDI156PDE|MIDB1048PHE|MIDS145PXE|MIDS747PX|MID4004JBL|MIDS185PR|PSPTD21NA|POMDTB00[56]|PSPCL30A0|PSN-H116|BDL0232PR|Mobility3G)(?:[);/ ]|$)'
+  regex: 'Polaroid|POLPAROID|(?:PMID|MIDC)[0-9a-z]+(?:[);/ ]|$)|MID(?:1014|0714)|PRO[VG]?(?:[0-9]{3,}[a-z]*|[0-9]{2}[a-z])|(?:P(?:400[56]|4526|500[56]|502[56]|504[67]|552[56])A|P902/A900|PSPC(?:505|550|[MZL]20A0|K2[01]NA)|SIGMA 5|MIDI109PDE|MIDI156PDE|MIDB1048PHE|MIDS145PXE|MIDS747PX|MID4004JBL|MIDS185PR|PSPTD21NA|POMDTB00[56]|PSPCL30A0|PSN-H116|BDL0232PR|Mobility3G|BDL1064PR001)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -20800,7 +21471,7 @@ Polaroid:
     - regex: 'Mobility3G'
       model: 'Mobility 10.1" 3G'
       device: 'tablet'
-    - regex: '(MID(?:1014|0714|S145PXE|S747PX|4004JBL|B1048PHE|I109PDE|I156PDE)|POMDTB00[56]|BDL0232PR)'
+    - regex: '(MID(?:1014|0714|S145PXE|S747PX|4004JBL|B1048PHE|I109PDE|I156PDE)|POMDTB00[56]|BDL0232PR|BDL1064PR001)'
       model: '$1'
       device: 'tablet'
 
@@ -20912,11 +21583,13 @@ 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)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'YPY_S450'
       model: 'YPY S450'
+    - regex: 'X400(?:[);/ ]|$)'
+      model: 'X400'
     - regex: 'Positivo (Q20|Slim)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Twist 4 (Fit|Pro)'
@@ -20938,7 +21611,7 @@ Positivo:
 
 # Prestigio (prestigio.ru)
 Prestigio:
-  regex: 'Prestigio 5500 DUO|(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+(?:[);/ ]|$)|Muze C3|PTV50SS04X_CIS_BK|PTV40SS04Y_CIS_ML|PTV32SS04Z_CIS_(?:ML|BK)|SILVER POS|PAB4411'
+  regex: 'Prestigio 5500 DUO|(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+(?:[);/ ]|$)|Muze C3|PTV50SS04X_CIS_BK|PTV32SS08Z|PTV40SS04Y_CIS_ML|PTV32SS04Z_CIS_(?:ML|BK)|SILVER POS|PAB4411'
   device: 'tablet'
   models:
     # explicit smartphone models
@@ -21098,8 +21771,12 @@ Prestigio:
       model: 'Seed A7 3G'
     - regex: 'PMT3997_W_D'
       model: 'SmartKids'
+    - regex: 'PMT3103_W'
+      model: 'SmartKids Max'
     - regex: 'PMT3104_Wi_D'
       model: 'SmartKids Up'
+    - regex: 'PMT4511_4G'
+      model: 'SmartKids Pro'
     - regex: 'PMT4208'
       model: 'Node A8 3G'
     - regex: 'PMT4771'
@@ -21133,6 +21810,9 @@ Prestigio:
     - regex: '(PAB4411)'
       device: 'tv'
       model: 'MultiCenter $1'
+    - regex: '(PTV32SS08Z)'
+      device: 'tv'
+      model: '$1'
     # general detection
     - regex: '(PM[PT][0-9]+[a-z0-9_]+)(?:[);/ ]|$)'
       model: '$1'
@@ -21225,12 +21905,12 @@ Qilive:
 
 # Vankyo
 Vankyo:
-  regex: 'Vankyo[_ ]|(?:QTAB1010X|S10_ROW|S[23]0_EEA|Z4_EEA)(?:[);/ ]|$)'
+  regex: 'Vankyo[_ ]|(?:QTAB1010X|S10_ROW|S[23]0_EEA|Z[14]_EEA)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Vankyo[_ ]S(10|[78])'
       model: 'MatrixPad S$1'
-    - regex: '(S[23]0|Z4)_EEA'
+    - regex: '(S[23]0|Z[14])_EEA'
       model: 'MatrixPad $1'
     - regex: 'QTAB(1010X)'
       model: 'QTab $1'
@@ -21247,7 +21927,7 @@ Quest:
 
 # QMobile or QSmart or Q-Smart (qmobile.com.pk)
 QMobile:
-  regex: 'QMobile|QTab(?!10EW)|Q-?Smart|(?:Mark [25]|E2 Noir|Noir[ _](A[18]|X1S)|LUNA PRO|NICE S|JazzX JS(?:[27]|10)(?: PRO)?|LT[57]00[ _]PRO|LT950|Infinity (?:Cinema 2|triple|santos|Prime 2)|Q Infinity|Hot 5|Hot Pro 2|VITA S|i7i 2020|i10[ _]20(?:20|19)|V2 2018|Z12 PRO|Smart HD Pro|V[67]_Metal|Rocket (?:Lite|Pro)| GLi|i6i 2020|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:J5|S2 Pro|J7 PRO|M350 Pro)|Android 5(?:[\d.]*);(?: [\w-]+;)? Z9 Plus|i8i Dual)(?:[);/ ]|$)'
+  regex: 'QMobile|QTab(?!10EW)|Q-?Smart|(?:Mark [25]|E2 Noir|Noir[ _](A[18]|X1S)|LUNA PRO|NICE S|JazzX JS(?:[27]|10)(?: PRO)?|LT[57]00[ _]PRO|LT950|Infinity (?:Cinema 2|triple|santos|Prime 2)|Q Infinity|Hot 5|Hot Pro 2|VITA S|i7i 2020|i10[ _]20(?:20|19)|V2 2018|Z12 PRO|Smart HD Pro|V[67]_Metal|Rocket (?:Lite|Pro)| GLi|i6i 2020|Android 6(?:[\d.]*);(?: [\w-]+;)? (?:J5|S2 Pro|J7 PRO|M350 Pro)|Android 5(?:[\d.]*);(?: [\w-]+;)? Z9 Plus|i8i Dual|View Max Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'JazzX JS7 PRO'
@@ -21274,6 +21954,8 @@ QMobile:
       model: 'Hot 5'
     - regex: 'LT([57]00)[ _]PRO'
       model: 'Noir LT$1 Pro'
+    - regex: 'View Max Pro'
+      model: 'View Max Pro'
     - regex: 'X700 PRO II'
       model: 'X700 Pro II'
     - regex: 'X700 PRO Lite'
@@ -21379,6 +22061,14 @@ Maximus:
       device: 'tablet'
       model: '$1'
 
+# TOOGO
+TOOGO:
+  regex: 'TOOGO[_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'TOOGO[_ ]([^/;)]+)(?: Build|[);])'
+      model: '$1'
+
 # Quantum
 Quantum:
   regex: '(?: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))(?:[);/ ]|$)'
@@ -21469,7 +22159,7 @@ Ophone:
 
 # Sigma or Sigma Mobile (sigmamobile.net)
 Sigma:
-  regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|X[-_ ]?treme[-_ ]?PQ[0-9]{2}|X-Style_S5501|Tab A1015)(?:[);/ ]|$)'
+  regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|X[-_ ]?treme[-_ ]?PQ[0-9]{2}|X-Style_(?:S5501|S3502)|Tab A1015)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2}) Max(?:[);/ ]|$)'
@@ -21502,6 +22192,16 @@ Spice:
       model: 'Xlife Proton 5 Pro'
     - regex: 'Xlife-Electro55HD'
       model: 'Xlife Electro 55 HD'
+    - regex: 'Spice[-_ ]?Mi-?(7\d{2})N(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Mi-$1N'
+    - regex: 'Spice[-_ ]?Mi-?(7\d{2})(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Mi-$1'
+    - regex: 'Spice[-_ ]?Mi-?(\d{3})N(?:[);/ ]|$)'
+      model: 'Mi-$1N'
+    - regex: 'Spice[-_ ]?Mi-?(\d{3})(?:[);/ ]|$)'
+      model: 'Mi-$1'
     - regex: 'Spice[-_ ]?([^/;]+)(?: Build|[;)])'
       model: '$1'
     - regex: 'Spice[-_ ]?([^/;]+)(?:/|$)'
@@ -21515,12 +22215,14 @@ SGIN:
 
 # Sharp (jp.sharp)
 Sharp:
-  regex: 'SHARP(?!_2|1)|SBM|SH-?[0-9]+[a-z]?(?:[);/ ]|$)|AQUOS|(?:SH-T01|SH-M0[14-9]|SH-M1[1-7](?:-y)?|S[357]-SH|SH-[MZ]([12]0|01|22)|SH-[CL]02|SH-RM(?:1[1258]|02)|SH-R?M19s?|SH-R10A|[34]04SH|401SH|[45]02SH|306SH|[36]05SH|70[1246]SH|80[138]SH|90[1678]SH|50[3679]SH|SHL2[1235]|SHV4[0-8]|SHV3[1-9](?:[-_]u)?|FS80(?:1[08]|32|28|0[29])|TG-L900S|NP601SH|403SH|603SH|SHF3[1-4]|SHV4[035][-_]u|SW001SH|SHG0[1-8]|X4-SH|A002SH|DM-01[JH]|A[01]01SH|606SH|FS801[56]|d-41A|d-51C|NP80[567]SH|NP501SH|A00[34]SH|A102SH|IS05|SH-(?:S50|53A|51B|[HDA]01|01FDQ|S40P|M24)|LP-0[12]|FS8014|SBM00[35]SH|SBM103SH|A10[345]SH|lineage_ss2|LCD_xxSUFOC475A|A20[1248]SH|FS802[56]|ADS1|NPA205SH|SHG10)(?:[);/ ]|$)'
+  regex: 'SHARP(?!_2|1)|SBM|SH-?[0-9]+[a-z]?(?:[);/ ]|$)|AQUOS|(?:SH-T01|SH-M0[14-9]|SH-M1[1-7](?:-y)?|S[357]-SH|SH-[MZ]([12]0|01|22)|SH-[CL]02|SH-RM(?:1[1258]|02)|SH-R?M19s?|SH-R10A|[34]04SH|401SH|[45]02SH|306SH|[36]05SH|70[1246]SH|80[138]SH|90[1678]SH|50[3679]SH|SHL2[1235]|SHV4[0-8]|SHV3[1-9](?:[-_]u)?|FS80(?:1[08]|32|28|0[29])|TG-L900S|NP601SH|403SH|603SH|SHF3[1-4]|SHV4[035][-_]u|SW001SH|SHG0[1-8]|X4-SH|A002SH|DM-01[JH]|A[01]01SH|606SH|FS801[56]|d-41A|d-51C|NP80[567]SH|NP501SH|A00[34]SH|A102SH|IS05|SH-(?:S50|53A|51B|[HDA]01|01FDQ|S40P|M24)|LP-0[12]|FS8014|SBM00[35]SH|SBM103SH|A10[345]SH|lineage_ss2|LCD_xxSUFOC475A|A20[1248]SH|FS802[56]|ADS1|STTM21VAPP|NPA205SH|SHG10)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
     - regex: '506SH(?:[);/ ]|$)'
       model: 'Aquos Xx3'
+    - regex: 'STTM21VAPP'
+      model: 'Rouvo V'
     - regex: '603SH(?:[);/ ]|$)'
       model: 'Aquos Xx3 Mini'
     - regex: '50[23]SH(?:[);/ ]|$)'
@@ -21587,7 +22289,7 @@ Sharp:
       model: 'Dragon Quest'
     - regex: 'SH-?06D(?:[);/ ]|$)'
       model: 'Aquos Phone SH-06D'
-    - regex: '(SHL2[1235]|SH-M01)(?:[);/ ]|$)'
+    - regex: '(SHL2[1235]|SH-M01|SH-01E)(?:[);/ ]|$)'
       model: 'Aquos Phone $1'
     - regex: 'SBM(203SH|30[23]SH)(?:[);/ ]|$)'
       model: 'Aquos Phone XX $1'
@@ -21917,6 +22619,9 @@ Amazon:
     - regex: 'AFTSS'
       model: 'Fire TV Stick Lite (Gen 1)'
       device: 'tv'
+    - regex: 'AFTTIFF43'
+      model: 'Fire TV Omni QLED (2022)'
+      device: 'tv'
     - regex: 'AFT[MST]'
       model: 'Fire TV Stick'
       device: 'tv'
@@ -22009,7 +22714,7 @@ Syco:
 
 # Symphony
 Symphony:
-  regex: 'SYMPHONY[ \_]([a-z0-9]+)|(?:(?:roar[ _](?:V20|A50|V78|E80|V150))|roarV95|ZVIII?|V10[25]|V1[23]0|V128|V14[012]|V1[45]5|SYMTAB\d+| (?:i97|i7[245]|i6[58]|i30|i1[58]|i120|Z30 pro|[ZR]30|V9[246789]|V75m)|INOVA|6.*; (?:V75|i2[015])|EASY_NAV_2)(?:[);/ ]|$)'
+  regex: 'SYMPHONY[ \_]([a-z0-9]+)|(?:(?:roar[ _](?:V20|A50|V78|E80|V150))|roarV95|ZVIII?|V10[25]|V1[23]0|V128|V14[012]|V1[45]5|SYMTAB\d+| (?:i97|i7[245]|i6[58]|i30|i1[58]|i120|Z30 pro|[ZR]30|V9[246789]|V75m)|INOVA|Android 7(?:[\d.]*);(?: [\w-]+;)? P11|Android 6.*; (?:V75|i2[015])|EASY_NAV_2|G10\+)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ZVIII'
@@ -22024,7 +22729,9 @@ Symphony:
       model: 'Roar $1'
     - regex: '(Z30|P7) pro'
       model: '$1 Pro'
-    - regex: ' (V141|V1[23]0|V10[25]|V128|V14[012]|i97|i7[245]|i6[58]|i30|i1[58]|i120|V1[45]5|[ZR]30|V9[246789]|V75m?|i2[015])(?:[);/ ]|$)'
+    - regex: ' G10\+'
+      model: 'G10 Plus'
+    - regex: ' (V141|V1[23]0|V10[25]|V128|V14[012]|i97|i7[245]|i6[58]|i30|i1[58]|i120|V1[45]5|[ZR]30|V9[246789]|V75m?|i2[015]|P11)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'SYMPHONY[ \_]([a-z0-9]+)'
       model: '$1'
@@ -22131,28 +22838,34 @@ 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\)|(?:[TM]40 Plus|T30|P80[XH]|P20HD|P10[_ ]HD|M40|P10SE?|M30_Pro|M40SE|P8[05]|P25(?:_T)?|P20S|P30HD)_(?: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[13]\)|P20HD\(N6H7\)|M40SE\(M5T3\)|M40(?:SE|Pro|Air)_(?:ROW|EEA|RUS)| P80X|P30Air|P10HD_Lite'
+  regex: 'Teclast|P80_G3M2|TLA00[12]|TLA016|X98 Air III|M20_4G|X98 Air II\(HG5N\)|Tbook|X80 Power\(B2N4\)|P80H\(D1C2\)|T20\(T2E1\)|(?:[TM]40 Plus|T30|P80[XH]|P20HD|P10[_ ]HD|M40|P10SE?|M30_Pro|M40SE|P8[05]|P25(?:_T)?|P[23]0S|P[34]0HD)_(?:ROW|EEA|RUS)|P20HD\(N6H5\)|T40 Plus\(M7T3\)|T40Pro|T40 PRO(?:\(T1A1\))?|T10\(E3C[56]\)|P10S\(N4H5\)|98\(M1E[45789]\)|98\(M3E3\)|X10 \(M1D3\)|M89 Pro|M40\(N9H[123]\)|P20HD\(N6H7\)|M40SE\(M5T3\)|M40(?:SE?|Pro|Air)_(?:ROW|EEA|RUS)| P80X|P30Air|P10HD_Lite|(?:T50|M40_Plus|M40 Pro)_(?:ROW|EEA)'
   device: 'tablet'
   models:
     - regex: 'Tbook[_ -]([^;/]+)(?: Build|[;)]|$)'
       model: 'Tbook $1'
     - regex: 'T10\(E3C[56]\)'
       model: 'T10'
+    - regex: 'T20\(T2E1\)'
+      model: 'T20'
     - regex: 'X10 \(M1D3\)'
       model: 'X10'
     - regex: 'P10S(?:\(N4H5\)|_(?:ROW|EEA))(?:[);/ ]|$)'
       model: 'P10S'
     - regex: 'P20HD_?(?:ROW|EEA|RUS)|P20HD\(N6H[57]\)'
       model: 'P20HD'
+    - regex: 'P40HD_?(?:ROW|EEA|RUS)'
+      model: 'P40HD'
     - 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)'
+      model: 'P30S'
     - regex: 'P85[_ ](?:ROW|EEA|RUS)'
       model: 'P85'
-    - regex: 'M([43]0)_?Pro[_ ](?:ROW|EEA|RUS)'
+    - regex: 'M([43]0)[_ ]?Pro[_ ](?:ROW|EEA|RUS)'
       model: 'M$1 Pro'
     - regex: 'M20_4G'
       model: 'M20 4G'
@@ -22164,10 +22877,14 @@ Teclast:
       model: 'M16'
     - regex: 'M40Air'
       model: 'M40 Air'
-    - regex: 'M40\(N9H[13]\)'
+    - regex: 'M40\(N9H[123]\)'
       model: 'M40'
     - regex: 'M40SE'
       model: 'M40 SE'
+    - regex: 'M40[_ ]Plus'
+      model: 'M40 Plus'
+    - regex: 'M40S[_ ](?:ROW|EEA|RUS)'
+      model: 'M40S'
     - regex: 'M40 Plus'
       model: 'M40 Plus'
     - regex: 'T40 ?PRO'
@@ -22176,7 +22893,9 @@ Teclast:
       model: 'T40'
     - regex: 'T40 Plus(?:_(?:ROW|EEA)|\(M7T3\))'
       model: 'T40 Plus'
-    - regex: '(P80[Xh]|P30HD|T30|M40|P25(?:_T)?|P10SE|P20S)[_ ](?:ROW|EEA)'
+    - regex: 'P80H\(D1C2\)'
+      model: 'P80h'
+    - regex: '(P80[Xh]|P30HD|T30|M40|P25(?:_T)?|P10SE|P20S|T50)[_ ](?:ROW|EEA)'
       model: '$1'
     - regex: 'P80X'
       model: 'P80X'
@@ -22204,8 +22923,12 @@ Tecno Mobile:
       model: 'Phantom $1'
     - regex: 'TECNO[ _]AD8'
       model: 'Phantom X2'
+    - regex: 'TECNO[ _]AD9'
+      model: 'Phantom X2 Pro'
     - regex: 'TECNO[ _]AC8(?:[);/ ]|$)'
       model: 'Phantom X'
+    - regex: 'TECNO[ _]AD10(?:[);/ ]|$)'
+      model: 'Phantom V Fold'
     - regex: 'TECNO[ _]AB7(?:[);/ ]|$)'
       model: 'Phantom 9'
     - regex: 'TECNO[ _]AX8(?:[);/ ]|$)'
@@ -22232,6 +22955,8 @@ Tecno Mobile:
       model: 'Camon iClick 2'
     - regex: 'TECNO[ _]IN2(?:[);/ ]|$)'
       model: 'Camon iSky'
+    - regex: 'TECNO[ _]IN1 Pro(?:[);/ ]|$)'
+      model: 'Camon iSky 2'
     - regex: 'TECNO[ _]KB3(?:[);/ ]|$)'
       model: 'Camon iSky 3'
     - regex: 'Tecno[ _]7C(?:[);/ ]|$)'
@@ -22305,11 +23030,21 @@ Tecno Mobile:
       model: 'Camon 19'
     - regex: 'Tecno[ _-]CI8n?(?:[);/ ]|$)'
       model: 'Camon 19 Pro'
+    - regex: 'Tecno[ _-]CI7n(?:[);/ ]|$)'
+      model: 'Camon 19 Pro 5G'
+    - regex: 'Tecno[ _-]CK7n?(?:[);/ ]|$)'
+      model: 'Camon 20 Pro'
+    - regex: 'Tecno[ _-]CK6n?(?:[);/ ]|$)'
+      model: 'Camon 20'
+    - regex: 'Tecno[ _-]CK8n(?:[);/ ]|$)'
+      model: 'Camon 20 Pro 5G'
+    - regex: 'Tecno[ _-]CK9n(?:[);/ ]|$)'
+      model: 'Camon 20 Premier 5G'
     - regex: 'Tecno[ _-]CA6S?(?:[);/ ]|$)'
       model: 'Camon CM'
     - regex: 'Tecno[ _-]CA7(?:[);/ ]|$)'
       model: 'Camon X'
-    - regex: 'Tecno[ _-]CA8(?:[);/ ]|$)'
+    - regex: 'Tecno[ _-]CA8S?(?:[);/ ]|$)'
       model: 'Camon X Pro'
     - regex: 'Tecno[ _-]Camon CX(?:[);/ ]|$)'
       model: 'Camon CX'
@@ -22355,6 +23090,8 @@ Tecno Mobile:
       model: 'Pop 4 LTE'
     - regex: 'TECNO[ _]BD2[dp]?(?:[);/ ]|$)'
       model: 'Pop 5'
+    - regex: 'TECNO[ _]L6502S(?:[);/ ]|$)'
+      model: 'Pop 5X'
     - regex: 'TECNO[ _]BD1(?:[);/ ]|$)'
       model: 'Pop 5 Go'
     - regex: 'TECNO[ _]W5006S(?:[);/ ]|$)'
@@ -22365,7 +23102,7 @@ Tecno Mobile:
       model: 'Pop 5 Pro'
     - regex: 'TECNO[ _]BD3(?:[);/ ]|$)'
       model: 'Pop 5P'
-    - regex: 'TECNO[ _]BE7(?:[);/ ]|$)'
+    - regex: 'TECNO[ _]B(?:E7|F6)(?:[);/ ]|$)'
       model: 'Pop 6'
     - regex: 'TECNO[ _]BE6j?(?:[);/ ]|$)'
       model: 'Pop 6 Go'
@@ -22377,6 +23114,8 @@ Tecno Mobile:
       model: 'SA1s Pro'
     - regex: 'Tecno[ _]KG5[mh]?(?:[);/ ]|$)'
       model: 'Spark Go (2022)'
+    - regex: 'Tecno[ _]BF7n(?:[);/ ]|$)'
+      model: 'Spark Go (2023)'
     - regex: 'Tecno[ _]KA7O?(?:[);/ ]|$)'
       model: 'Spark 2'
     - regex: 'Tecno[ _]LB6?(?:[);/ ]|$)'
@@ -22403,7 +23142,7 @@ Tecno Mobile:
       model: 'Spark 6 Air'
     - regex: 'TECNO[ _]KE5[jk]?(?:[);/ ]|$)'
       model: 'Spark 6 Go'
-    - regex: 'TECNO[ _](?:KF6(?:ks|[nmjki])?|PR651[EH]?)(?:[);/ ]|$)'
+    - regex: 'TECNO[ _](?:KF6(?:ks|[nhmjki])?|PR651[EH]?)(?:[);/ ]|$)'
       model: 'Spark 7'
     - regex: 'TECNO[ _]KF8(?:[);/ ]|$)'
       model: 'Spark 7 Pro'
@@ -22413,13 +23152,13 @@ Tecno Mobile:
       model: 'Spark 7T'
     - regex: 'TECNO[ _](?:Mobile )?KG6k?(?:[);/ ]|$)'
       model: 'Spark 8'
-    - regex: 'TECNO[ _]KG5[nkj]?(?:[);/ ]|$)'
+    - regex: 'TECNO[ _]KG5[nkjq]?(?:[);/ ]|$)'
       model: 'Spark 8C'
     - regex: 'TECNO[ _]KG7[nh]?(?:[);/ ]|$)'
       model: 'Spark 8P'
-    - regex: 'TECNO[ _]KG6p(?:[);/ ]|$)'
+    - regex: 'TECNO(?: Mobile)?[ _]KG6p(?:[);/ ]|$)'
       model: 'Spark 8T'
-    - regex: 'TECNO[ _]KG8(?:[);/ ]|$)'
+    - regex: 'TECNO(?: Mobile)?[ _]KG8(?:[);/ ]|$)'
       model: 'Spark 8 Pro'
     - regex: 'TECNO[ _]KH7n?(?:[);/ ]|$)'
       model: 'Spark 9 Pro'
@@ -22427,6 +23166,14 @@ Tecno Mobile:
       model: 'Spark 9'
     - regex: 'TECNO[ _]KH6(?:[);/ ]|$)'
       model: 'Spark 9T'
+    - regex: 'TECNO[ _]KI5[km]'
+      model: 'Spark 10C'
+    - regex: 'TECNO[ _]KI5'
+      model: 'Spark 10'
+    - regex: 'TECNO[ _]KI8'
+      model: 'Spark 10 5G'
+    - regex: 'TECNO[ _]KI7'
+      model: 'Spark 10 Pro'
     - regex: 'TECNO[ _]KC1h(?:[);/ ]|$)'
       model: 'Spark Go'
     - regex: 'TECNO[ _]KE5S(?:[);/ ]|$)'
@@ -22496,6 +23243,9 @@ Tecno Mobile:
     - regex: 'TECNO[ _]LG8n(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Pova 4 Pro'
+    - regex: 'TECNO[ _]LH7n(?:[);/ ]|$)'
+      device: 'phablet'
+      model: 'Pova 5'
     - regex: 'Tecno (F2) ?LTE'
       model: '$1 LTE'
     - regex: '(?:TECNO[-_])?L8Plus'
@@ -22510,6 +23260,14 @@ Tecno Mobile:
     - regex: 'Tecno[ _-]?([a-z0-9_\-]+)'
       model: '$1'
 
+# TechSmart or Techmade
+TechSmart:
+  regex: 'TECHSMART[_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'TECHSMART[_ ]([^/;)]+)(?: Build|[);])'
+      model: '$1'
+
 # TechPad (techpad.mx)
 TechPad:
   regex: 'Tech[ _]?pad|XTAB[ _-]|(?:3G_16|Dual (?:C1081HD|C981HD)|S813G|NOTE[_ ]4CAM|M5(?:Go|Plus)|M6Plus|Android 8(?:[\d.]*);(?: [\w-]+;)? 816x?)(?:[);/ ]|$)'
@@ -22523,7 +23281,7 @@ TechPad:
       model: '10XX'
     - regex: 'TechPad703'
       model: '703'
-    - regex: 'Tech ?Pad[_ ](10Y|9x|i700|10Z)'
+    - regex: 'Tech ?Pad[_ ](10Y|9x|i700|10Z|7QC|10QC)'
       model: '$1'
     - regex: 'TechPad[_ ]3Gx'
       model: '3Gx'
@@ -22711,7 +23469,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(?:58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU))|LTE_LIMA|LTE Mike|Diamond_LTE|Outdoor (?:LTE|WT4|WT4-S)|TELP-1013KBC'
+  regex: 'TELEFUNKEN|Foxtrot|TEL-1013GIQA|TEL-1014GIQ|TEL-73GIQA|TEL-74GIQ|TF-SP(?:500[12]|4002)|(TF-MID(?:[78]02G|70[78]G|80[46]G|9705RG|9707G|7805G|100[57]G|1010G))| TF5X| TF6|TF500|TF501_EC|(TF-LED(?:50S04T2SU|50S25T2SU|58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU))|LTE_LIMA|LTE Mike|Diamond_LTE|Outdoor (?:LTE|WT4|WT4-S)|TELP-1013KBC'
   device: 'tablet'
   models:
     - regex: 'TEL-1013GIQA'
@@ -22735,7 +23493,7 @@ Telefunken:
       device: 'smartphone'
     - regex: '(TF-MID(?:[78]02G|70[78]G|80[46]G|9705RG|9707G|7805G|100[57]G|1010G)|TF501_EC|TELP-1013KBC)'
       model: '$1'
-    - regex: '(TF-LED(?:58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU)|TF500)'
+    - regex: '(TF-LED(?:50S04T2SU|50S25T2SU|58S06T2SU|65S75T2SU|32S39T2S|32S5[289]T2S|32S60T2S|32S7[045]T2S|40S63T2S|40S19T2S|40S41T2S|43S94T2S|43S22T2SU)|TF500)'
       model: '$1'
       device: 'tv'
     - regex: 'TELEFUNKEN, ([a-z0-9_ \-]+), (?:wired|wireless)'
@@ -22778,13 +23536,21 @@ Telit:
 
 # Telma (https://www.telma.mg/)
 Telma:
-  regex: 'Telma|F1x4G(?:[);/ ]|$)'
+  regex: 'Telma|(?:F1x4G|Feel_Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Telma_F1_Max_4G'
       model: 'F1 Max 4G'
+    - regex: 'TELMA F1\+4G'
+      model: 'F1 Plus 4G'
     - regex: 'F1x4G'
       model: 'F1x 4G'
+    - regex: 'Feel_Plus'
+      model: 'Feel Plus'
+    - regex: 'TELMA[_ ]FEEL'
+      model: 'Feel'
+    - regex: 'Telma[_ ](F2|Titan[_ ]4G|EGO)'
+      model: '$1'
 
 # Telpo (https://www.telpo.com.cn/)
 Telpo:
@@ -22805,6 +23571,12 @@ ThL:
       model: '$1'
     - regex: '(T200)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'Box 1 Pro(?:[);/ ]|$)'
+      device: 'tv'
+      model: 'Box 1 Pro'
+    - regex: 'Box 1(?:[);/ ]|$)'
+      device: 'tv'
+      model: 'Box 1'
     - regex: 'ThL[ _-]*([^;/)]+)(?: Build|[;)])'
       model: '$1'
     - regex: 'ThL[ _-]*([^ ;/)]+)(?:[);/ ]|$)'
@@ -22832,7 +23604,7 @@ Tooky:
 
 # Tolino
 Tolino:
-  regex: 'Tolino Tab ([^/;]+) Build'
+  regex: 'Tolino Tab ([^/);]+)(?: Build|[);])'
   device: 'tablet'
   model: 'Tolino Tab $1'
 
@@ -22869,7 +23641,7 @@ Touchmate:
   regex: 'TOUCHMATE|(TM-(?:MID870SB|MID1050WKD|MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|SM500N|SM410|MID1010))'
   device: 'smartphone'
   models:
-    - regex: '(TM-(?:MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|MID1010))'
+    - regex: '(TM-(?:MID1020A|MID794C|MID795|MID710|MID798|MID792|MID788D|MID10[14]0))'
       device: 'tablet'
       model: '$1'
     - regex: 'TM-MID870SB'
@@ -22885,7 +23657,7 @@ Touchmate:
 
 # TrekStor (www.trekstor.de)
 TrekStor:
-  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|ST13416-1|VT10416-[12]|TFMTKAW01232|PEAQ PET 100|Xintroni10.1'
+  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|ST13416-1|VT10416-[12]|TFQCOAL01232|TFMTKAW01232|PEAQ PET 100|Xintroni10.1'
   device: 'tablet'
   models:
     - regex: 'ST10216-2A|VT10416-[12]'
@@ -22904,6 +23676,8 @@ TrekStor:
       model: 'SurfTab $1'
     - regex: 'TFMTKAW01232'
       model: 'SurfTab L15'
+    - regex: '(TFQCOAL01232)'
+      model: '$1'
     - regex: 'Xintroni10.1'
       model: 'SurfTab Xintron I 10.1"'
     - regex: '(PEAQ PET 100)'
@@ -23007,7 +23781,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 (?:11P|7T)|Tiger_lite|Note_7P|Paris_(?:Lite|X)|P6000_Plus|Vienna|Android 11;(?: [\w-]+;)? Note 6)(?:[);/ ]|$)'
+  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)|Tiger_lite|Note_7P|Note 10P|Paris_(?:Lite|X)|Paris|P6000_Plus|Vienna|Android 11;(?: [\w-]+;)? Note 6P?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S(10|9)_Pro'
@@ -23032,12 +23806,14 @@ Ulefone:
       model: 'Paris Lite'
     - regex: 'Paris_X'
       model: 'Paris X'
+    - regex: 'Paris'
+      model: 'Paris'
     - regex: 'Tiger_lite'
       model: 'Tiger Lite'
-    - regex: 'Power Armor (\d+)(?:[);/ ]|$)'
+    - regex: 'Power Armor ?(\d+) Pro'
+      model: 'Power Armor $1 Pro'
+    - regex: 'Power Armor (\d+|19T)(?:[);/ ]|$)'
       model: 'Power Armor $1'
-    - regex: 'Power Armor ?14 Pro'
-      model: 'Power Armor 14 Pro'
     - regex: 'Power Armor X11 Pro'
       model: 'Power Armor X11 Pro'
     - regex: 'Power Armor 18T'
@@ -23072,9 +23848,9 @@ Ulefone:
       model: 'Vienna'
     - regex: 'Power[_ ]([356][SL]?)'
       model: 'Power $1'
-    - regex: 'Note[ _]([78]P|7T|6)(?:[);/ ]|$)'
+    - regex: 'Note[ _]([78]P|7T|6|14)(?:[);/ ]|$)'
       model: 'Note $1'
-    - regex: 'Note (9|1[123])P(?:[);/ ]|$)'
+    - regex: 'Note ([69]|1[123]|10)P(?:[);/ ]|$)'
       device: 'phablet'
       model: 'Note $1P'
     - regex: 'Ulefone[_ ]Tab[_ ]([^;/)]+)(?: Build|[);])'
@@ -23245,7 +24021,7 @@ Unonu:
 
 # UTOK
 UTOK:
-  regex: 'UTOK (45[01]D)|(?:Dorel \d|Dorel 3S)(?:[);/ ]|$)'
+  regex: 'UTOK (45[01]D)|(?:Dorel \d|Dorel 3S|Hello 7Q)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'UTOK (45[01]D)'
@@ -23254,6 +24030,9 @@ UTOK:
       model: 'Dorel 3S'
     - regex: 'Dorel (\d)'
       model: 'Dorel $1'
+    - regex: 'Hello 7Q'
+      device: 'tablet'
+      model: 'Hello 7Q'
 
 # Vastking
 Vastking:
@@ -23344,12 +24123,18 @@ Vernee:
 
 # Vertu (www.vertu.com)
 Vertu:
-  regex: 'Vertu[ ]?([a-z0-9]+)|(?:ASTER(?: [PT])?|CONSTELLATION X)(?:[);/ ]|$)'
+  regex: 'Vertu[ ]?([a-z0-9]+)|(?:ASTER(?: [PT])?|CONSTELLATION X|VTL-202[12]01)(?:[);/ ]|$)'
   device: 'feature phone'
   models:
     - regex: 'ASTER( [PT])?(?:[);/ ]|$)'
       device: 'smartphone'
       model: 'Aster$1'
+    - regex: 'VTL-202101(?:[);/ ]|$)'
+      device: 'smartphone'
+      model: 'iVertu 5G'
+    - regex: 'VTL-202201(?:[);/ ]|$)'
+      device: 'smartphone'
+      model: 'Metavertu 5G'
     - regex: 'CONSTELLATION X(?:[);/ ]|$)'
       device: 'smartphone'
       model: 'Constellation X'
@@ -23498,7 +24283,7 @@ Verykool:
 
 # 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 Z1'
+  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]'
   device: 'smartphone'
   models:
     - regex: 'VT97PRO'
@@ -23519,7 +24304,7 @@ Vestel:
     - regex: 'V_TAB_([0-9]{4}[A-Z]?)'
       model: 'VTab $1'
       device: 'tablet'
-    - regex: 'V[_ ]TAB[_ ](Z1)'
+    - regex: 'V[_ ]TAB[_ ](Z[12])'
       model: 'VTab $1'
       device: 'tablet'
     - regex: 'V3_5580_Dual'
@@ -23616,7 +24401,7 @@ Vodafone:
       model: 'Smart Mini 7 Dual'
     - regex: 'VFD 50[012]'
       model: 'Smart Turbo 7'
-    - regex: 'VFD 51[013]'
+    - regex: 'VFD 51[0123]'
       model: 'Smart E8'
     - regex: 'VFD 52[789]'
       model: 'Smart E9'
@@ -23785,6 +24570,9 @@ Vonino:
     - regex: 'Druid[_ ](L10)'
       model: 'Druid $1'
       device: 'tablet'
+    - regex: ' Magnet[_ ]M10[_ ]2020'
+      device: 'tablet'
+      model: 'Magnet M10 (2020)'
     - regex: 'Magnet[ _](M[19]|G[135]0|W10)'
       model: 'Magnet $1'
       device: 'tablet'
@@ -23838,7 +24626,7 @@ Voxtel:
 
 # Vulcan
 Vulcan:
-  regex: '(?:VP5004A|HT0704W08|VS5513|VS4011|VR6031)(?:[);/ ]|$)'
+  regex: '(?:VP5004A|VS5513|VS4011|VR6031)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(VP5004A|VR6031)(?:[);/ ]|$)'
@@ -23847,9 +24635,12 @@ Vulcan:
       model: 'Tempo S13'
     - regex: 'VS4011(?:[);/ ]|$)'
       model: 'Tempo S11'
-    - regex: 'HT0704W08' # Hyundai
-      model: 'Koral 7W4'
-      device: 'tablet'
+
+# Ober
+Ober:
+  regex: 'OBER[_ ](Primo E8)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
 
 # Walton (waltonbd.com)
 Walton:
@@ -23948,13 +24739,30 @@ Wink:
 
 # Smart (smartgsmphone.com)
 Smart:
-  regex: '(Coral 4|Slide Lite|Notrino)(?:[);/ ]|$)'
+  regex: '(?:Coral 4|Slide Lite|Notrino|Smart PRIME II)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'Smart PRIME II'
+      model: 'Prime II'
+    - regex: '(Coral 4|Slide Lite|Notrino|Smart PRIME II)'
+      model: '$1'
+
+# Sunny
+Sunny:
+  regex: '(?:SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola|SN7014S?|SN7016|SN10016|SUNNY (?:SS01|S52D))(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: '(SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'SUNNY (SS01|S52D)'
+      model: '$1'
+    - regex: '(SN7014S?|SN7016|SN10016)(?:[);/ ]|$)'
+      device: 'tablet'
+      model: '$1'
 
 # Wiko (wikomobile.com)
 Wiko:
-  regex: '(?:WIKO[_ -])|(?:WIKO-)?CINK_[a-z0-9_]+|(?:WIKO-)?HIGHWAY_[a-z0-9_]+|(?:WIKO-)?(?:Cink([^/;]*)|Highway([^/;]*)|Iggy|Stairway|Rainbow ?(Jam|Lite|Up)?|Darkside|Darkmoon|Darkfull|Darknight|Freddy|FEVER|Jerry[2]?|Sublim|Ozzy|JIMMY|Barry|Birdy|Bloom(?!4)|Getaway|Goa(?!nna|lPlus)|Kite|Robby|Lenny[2-9]?|(?<!iBall[_ ])Slide|Sunset[2-9]?|Sunny[2-9]?|Tommy[2-9]?|PULP(?: Fab)?|Wax|HARRY|Ridge(?! Plus)(?: Fab)?|U FEEL(?: Prime| Lite)?|U PULSE(?: LITE)?|View2 (?:Go|Plus)|View XL|View Prime)(?: Plus)?(?: 4G)?(?: Build|$)?|W_(?:C8[06]0|K[346]00|P130|P200|C200SN)|WC300|W-(?:V7[23]0|V745|V755|V8[035]0|P[36]11|K130|K211|K3[68]0|K420|K510S?|K521|K560|K610|K630)-(?:BYT|EEA|FRA|OPE|SU[IN]|SWI|TIM|TMV|TVM|DU|T[HV]|ID)|WIM Lite|W-V851|W-V6[08]0|W-V750BN|W-V770|W-K200|W-U300|U307AS|CINK PEAX 2|HIGHWAY PURE|C210AE|v3913|U614AS|V3991AN|v12fnlite|K-KOOL|p6901|U616AT|VHEM|KENNY'
+  regex: '(?:WIKO[_ -])|(?:WIKO-)?CINK_[a-z0-9_]+|(?:WIKO-)?HIGHWAY_[a-z0-9_]+|(?:WIKO-)?(?:Cink([^/;]*)|Highway([^/;]*)|Iggy|Stairway|Rainbow ?(Jam|Lite|Up)?|Darkside|Darkmoon|Darkfull|Darknight|Freddy|FEVER|Jerry[2]?|Sublim|Ozzy|JIMMY|Barry|Birdy|Bloom(?!4)|Getaway|Goa(?!nna|lPlus|-)|Kite|Robby|Lenny[2-9]?|(?<!iBall[_ ])Slide|Sunset[2-9]?|Sunny[2-9]?|Tommy[2-9]?|PULP(?: Fab)?|Wax|HARRY|Ridge(?! Plus)(?: Fab)?|U FEEL(?: Prime| Lite)?|U PULSE(?: LITE)?|View2 (?:Go|Plus)|View XL|View Prime)(?: Plus)?(?: 4G)?(?: Build|$)?|W_(?:C8[06]0|K[346]00|P130|P200|C200SN)|WC300|W-(?:V7[23]0|V745|V755|V8[035]0|P[36]11|K130|K211|K3[68]0|K420|K510S?|K521|K560|K610|K630)-(?:BYT|EEA|FRA|OPE|SU[IN]|SWI|TIM|TMV|TVM|DU|T[HV]|ID)|WIM Lite|W-V851|W-V6[08]0|W-V750BN|W-V770|W-K200|W-U300|(?:U307AS|CINK PEAX 2|HIGHWAY PURE|C210AE|v3913|U614AS|V3991AN|v12fnlite|K-KOOL|p6901|U616AT|VHEM|KENNY|View Go| WIM)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:WIKO-)?W-V770'
@@ -24101,6 +24909,8 @@ Wiko:
       model: 'Harry 2'
     - regex: '(?:WIKO-)?WIM Lite|p6901'
       model: 'WIM Lite'
+    - regex: '(?:WIKO-)?WIM'
+      model: 'WIM'
     - regex: '(?:WIKO-)?Pulp Fab 4G'
       model: 'Pulp Fab 4G'
     - regex: '(?:WIKO-)?Pulp Fab'
@@ -24141,7 +24951,7 @@ Wiko:
       model: 'View 2 Pro'
     - regex: 'W_P200'
       model: 'View Max'
-    - regex: 'W_P130'
+    - regex: 'W_P130|View Go'
       model: 'View Go'
     - regex: 'W-V800-(TVM|TIM|EEA|OPE|DU)'
       model: 'View 3 Lite'
@@ -24328,13 +25138,17 @@ X-View:
 
 # POCO (sub brand Xiaomi)
 POCO:
-  regex: '(?:POCO[ _](?:X[2-5](?:_SN)?|F2 PRO|M[3245]|M5s|F3|F4(?: GT)?|C40|C3)|M2010J19(?:C[GI]|GC)|M2007J20C[ITG]|M2012K11AG|M2006C3MI|M2004J19PI|M2102J20S[GI]|M2103K19P[IGY]|21091116AG|21061110AG|M2104K10I|211033MI|2201117P[GI]|camellian?|2201116P[GI]|21121210G|22031116AI|22021211R[GI]|2204121(?:6U?G|9P[GI])|220333QPG|22071219C[GI]|2207117BPG|22101320G|22111317PG)(?:[);/ ]|$)'
+  regex: '(?:POCO[ _](?:X[2-5](?:_SN)?|F2 PRO|M[3245]|M5s|F[35]|F4(?: GT)?|C40|C3)|M2010J19(?:C[GI]|GC)|M2007J20C[ITG]|M2012K11AG|M2006C3MI|M2004J19PI|M2102J20S[GI]|M2103K19P[IGY]|21091116AG|21061110AG|M2104K10I|211033MI|2201117P[GI]|camellian?|2201116P[GI]|21121210G|22031116AI|22021211R[GI]|2204121(?:6U?G|9P[GI])|220333QPG|22071219C[GI]|2207117BPG|22101320[GI]|22111317P[GI]|23013PC75G|23049PCD8G|2305EPCC4G|22127PC95I)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'POCO X2(?:[);/ ]|$)'
       model: 'X2'
     - regex: '(?:M2012K11AG|POCO F3)(?:[);/ ]|$)'
       model: 'F3'
+    - regex: '23013PC75G|POCO F5 Pro'
+      model: 'F5 Pro'
+    - regex: '23049PCD8G|POCO F5'
+      model: 'F5'
     - regex: 'M2004J19PI(?:[);/ ]|$)'
       model: 'M2'
     - regex: '(?:M2103K19P[IGY]|M3 Pro 5G|camellian?)(?:[);/ ]|$)'
@@ -24365,11 +25179,11 @@ POCO:
       model: 'X3'
     - regex: '(?:22041216G|POCO X4 GT)(?:[);/ ]|$)'
       model: 'X4 GT'
-    - regex: '22111317PG(?:[);/ ]|$)'
+    - regex: '(?:22111317P[GI]|POCO X5 5G)(?:[);/ ]|$)'
       model: 'X5 5G'
     - regex: '(?:22041216UG)(?:[);/ ]|$)'
       model: 'X4 GT Pro'
-    - regex: '22101320G(?:[);/ ]|$)'
+    - regex: '(?:22101320[GI]|POCO X5 Pro 5G)(?:[);/ ]|$)'
       model: 'X5 Pro 5G'
     - regex: '2201116P[GI]|POCO X4 Pro 5G'
       model: 'X4 Pro 5G'
@@ -24385,12 +25199,18 @@ POCO:
       model: 'C31'
     - regex: '(?:220333QPG|POCO C40)(?:[);/ ]|$)'
       model: 'C40'
+    - regex: '2305EPCC4G'
+      model: 'C51'
+    - regex: '22127PC95I'
+      model: 'C55'
     - regex: 'POCO F2 PRO(?:[);/ ]|$)'
       model: 'F2 Pro'
+    - regex: 'X5 GT PRO(?:[);/ ]|$)'
+      model: 'X5 GT Pro'
 
 # Zopo
 Zopo:
-  regex: 'ZOPO|(?:ZOPO[_ ])?(HERO2|Flash X3|F2_Color5_5|F5_Color_M5|ZP[0-9]{2,}[^/;]+)(?:\)| Build)'
+  regex: 'ZOPO|(?:ZOPO[_ ])?(HERO2|Flash X3|F2_Color5_5|F5_Color_M5|C2_Color_M4|ZP[0-9]{2,}[^/;]+)(?:\)| Build)'
   device: 'smartphone'
   models:
     - regex: '(?:ZOPO_C2_MOD|ZP998)(?:[);/ ]|$)'
@@ -24425,6 +25245,8 @@ Zopo:
       model: 'Color F2'
     - regex: 'F5_Color_M5(?:[);/ ]|$)'
       model: 'F5 Color M5'
+    - regex: 'C2_Color_M4(?:[);/ ]|$)'
+      model: 'C2 Color M4'
     - regex: 'ZP5(63|86)(?:[);/ ]|$)'
       model: 'Color X'
     - regex: 'ZP567(?:[);/ ]|$)'
@@ -24446,7 +25268,7 @@ Zopo:
 
 # Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)|MiTV-\w|MiProjA1|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo)(?:[);/ ]|$)|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|19BI)|M2001(?:J2G|C3K3I)|M2004J15SC|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|XIG01|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG02|21061119(?:[AD]G|AL)|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|22021119KR|22021211RC|220233L2[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)|2208128(?:1AC|3[GC])|22081212(?:U?G|C)|220712(?:2MC|12AG|19AI)|220733S(?:F?G|[IL])|22087RA4DI|Black Shark|MZB8298IN|22101317C|22101316(?:[CI]|UP|UCP?)|22101(?:29SG|32C)|221113(?:3C|17I)|23013RK75C|22095RA98C'
+  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)| ONC(?: Build|[;)])|MiTV-\w|MiProjA1|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo)(?:[);/ ]|$)|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(?:J2G|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|XIG01|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG02|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|[IL])|43FI)|2208(?:7RA4DI|1212(?:U?G|C)|128(?:1AC|3[GC]))|Black Shark|MZB8298IN|2210(?:1317C|1316(?:U[PG]|UCP?|[CIG])|1(?:29SG|32[CG]))|2211(?:13(?:3[CG]|17I)|1317G)|23013RK75C|23053RN02[AY]|2209(?:5RA98C|116AG|129SC)|2212(?:0RN86[GI]|6RN91Y|ARNC4L|2RK93C|7RK46C)|2302(?:6RN54G|1RAA(?:EG|2Y)|8R(?:N4DG|A60L|NCAG))|angelican|vnd_camellia|2304(?:9RAD8C|FPN6D[GC])|2303(?:0RAC7Y|CRA44A|ERA42L)|M1906G7G|Hongmi 4A|23046RP50C|M1912G7BC'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -24488,6 +25310,8 @@ Xiaomi:
       model: 'Hongmi 2'
     - regex: 'Xiaomi[_-]201481[123]|201481[123] Build'
       model: 'Hongmi 2 4G'
+    - regex: 'Hongmi 4A'
+      model: 'Hongmi 4A'
     - regex: 'MI[_ ]PLAY(?:[);/ ]|$)'
       model: 'Mi Play'
     - regex: 'Mi 9 SE(?:[);/ ]|$)'
@@ -24548,11 +25372,13 @@ Xiaomi:
       model: '12 Pro'
     - regex: '2201123[CG](?:[);/ ]|$)'
       model: '12'
+    - regex: '2209116AG(?:[);/ ]|$)'
+      model: 'Note 12 Pro'
     - regex: '22071212AG(?:[);/ ]|$)'
       model: '12T'
     - regex: '2207122MC(?:[);/ ]|$)'
       model: '12 Pro Dimensity'
-    - regex: '22081212(?:U?G|C)(?:[);/ ]|$)'
+    - regex: '(?:22081212(?:U?G|C)|Xiaomi 12T Pro)(?:[);/ ]|$)'
       model: '12T Pro'
     - regex: '(?:2206122SC|Xiaomi 12S Pro)(?:[);/ ]|$)'
       model: '12S Pro'
@@ -24564,13 +25390,15 @@ Xiaomi:
       model: '12 Lite'
     - regex: '(?:2112123A[CG]|Xiaomi 12X)(?:[);/ ]|$)'
       model: '12X'
-    - regex: '2210132C(?:[);/ ]|$)'
+    - regex: '2210132[CG](?:[);/ ]|$)'
       model: '13 Pro'
     - regex: '2210129SG(?:[);/ ]|$)'
       model: '13 Lite'
-    - regex: '2211133C(?:[);/ ]|$)'
+    - regex: '2211133[CG](?:[);/ ]|$)'
       model: '13'
-    - regex: 'MI[ _]8[ _]Lite(?:[);/ ]|$)'
+    - regex: '2304FPN6D[CG](?:[);/ ]|$)'
+      model: '13 Ultra'
+    - regex: 'MI[ _]8[ _]?Lite(?:[);/ ]|$)'
       model: 'Mi 8 Lite'
     - regex: 'MI 8 Explorer Edition(?:[);/ ]|$)'
       model: 'Mi 8 Explorer Edition'
@@ -24644,7 +25472,7 @@ Xiaomi:
       model: 'Redmi 10X'
     - regex: '220333Q(?:AG|NY|L)(?:[);/ ]|$)'
       model: 'Redmi 10C'
-    - regex: '(?:M2004J19[CG]|M2006C3MII|lancelot|galahad)(?:[);/ ]|$)'
+    - regex: '(?:M2004J19[CG]|M2006C3MII|lancelot|galahad|M2004J19AG)(?:[);/ ]|$)'
       model: 'Redmi 9'
     - regex: '(?:M2004J19I|Redmi 9 Prime)(?:[);/ ]|$)'
       model: 'Redmi 9 Prime'
@@ -24662,12 +25490,14 @@ Xiaomi:
       model: 'Redmi 9T'
     - regex: 'Redmi 9T NFC(?:_SN)?(?:[);/ ]|$)'
       model: 'Redmi 9T NFC'
-    - regex: '(?:M2006C3MNG|Redmi 9C NFC)(?:[);/ ]|$)'
+    - regex: '(?:M2006C3MNG|Redmi 9C NFC|angelican)(?:[);/ ]|$)'
       model: 'Redmi 9C NFC'
     - regex: '(?:22041219(?:G|NY)|Redmi 10 5G)(?:[);/ ]|$)'
       model: 'Redmi 10 5G'
-    - regex: '(?:21061119D[CG]|220333QBI)(?:[);/ ]|$)'
+    - regex: '(?:21061119D[CG])(?:[);/ ]|$)'
       model: 'Redmi 10'
+    - regex: '(?:220333QBI|Redmi 10 Power)(?:[);/ ]|$)'
+      model: 'Redmi 10 Power'
     - regex: '220233L2[CGI](?:[);/ ]|$)'
       model: 'Redmi 10A'
     - regex: '(?:21061119A[GL]|21121119(?:SG|VL)|22011119UY|Redmi 10 2022)(?:[);/ ]|$)'
@@ -24680,6 +25510,10 @@ Xiaomi:
       model: 'Redmi 10 Prime'
     - regex: '(?:M2004J7BC|Redmi 10X Pro)(?:[);/ ]|$)'
       model: 'Redmi 10X Pro'
+    - regex: '22120RN86[GI]|22126RN91Y|2212ARNC4L'
+      model: 'Redmi 12C'
+    - regex: '23053RN02[AY]'
+      model: 'Redmi 12'
     - regex: '22071219AI(?:[);/ ]|$)'
       model: 'Redmi 11 Prime'
     - regex: 'Redmi K20 Pro Premium Edition(?:[);/ ]|$)'
@@ -24692,6 +25526,8 @@ Xiaomi:
       model: 'Redmi K$1 Pro'
     - regex: 'Redmi K30 5G(?:[);/ ]|$)'
       model: 'Redmi K30 5G'
+    - regex: 'M1912G7BC(?:[);/ ]|$)'
+      model: 'Redmi K30 4G'
     - regex: 'Redmi K30i 5G(?:[);/ ]|$)'
       model: 'Redmi K30i 5G'
     - regex: 'M2012K11AC(?:[);/ ]|$)'
@@ -24716,20 +25552,30 @@ Xiaomi:
       model: 'Redmi K50 Pro'
     - regex: '23013RK75C'
       model: 'Redmi K60'
+    - regex: '22122RK93C'
+      model: 'Redmi K60E'
+    - regex: '22127RK46C'
+      model: 'Redmi K60 Pro'
     - 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|[;)])'
+      model: 'Redmi 7'
     - regex: 'Redmi (\d+) Pro(?:[);/ ]|$)'
       model: 'Redmi $1 Pro'
     - regex: 'Redmi 4 Prime(?:[);/ ]|$)'
       model: 'Redmi 4 Prime'
-    - regex: '(?:220733SFG|Redmi A1\+)(?:[);/ ]|$)'
+    - regex: '(?:220733SFG|Redmi A1\+|220743FI)(?:[);/ ]|$)'
       model: 'Redmi A1+'
     - regex: '220733S[GIL](?:[);/ ]|$)'
       model: 'Redmi A1'
+    - regex: '2302(?:8RN4DG|6RN54G)'
+      model: 'Redmi A2'
+    - regex: '23028RNCAG'
+      model: 'Redmi A2+'
     - regex: 'Qin ?2 Pro(?:[);/ ]|$)'
       model: 'Qin 2 Pro'
     - regex: 'Qin 2(?:[);/ ]|$)'
@@ -24738,6 +25584,8 @@ Xiaomi:
       model: 'CC11'
     - regex: '2109119BC(?:[);/ ]|$)'
       model: 'Civi'
+    - regex: '2209129SC(?:[);/ ]|$)'
+      model: 'Civi 2'
 
       # specific tablet models
     - regex: '(?:M2105K81AC|22081281AC|(?:Xiao)?mi Pad 5 Pro)(?:[);/ ]|$)'
@@ -24749,6 +25597,9 @@ Xiaomi:
     - regex: 'M2105K81C(?:[);/ ]|$)'
       model: 'Mi Pad 5 Pro 5G'
       device: 'tablet'
+    - regex: '23046RP50C(?:[);/ ]|$)'
+      model: 'Pad 6 Pro'
+      device: 'tablet'
 
     - regex: 'MI PAD 4 PLUS(?:[);/ ]|$)'
       model: 'Mi Pad 4 Plus'
@@ -24798,6 +25649,12 @@ Xiaomi:
     - regex: 'MiTV-MOOQ0(?:[);/ ]|$)'
       model: 'MiTV P1'
       device: 'tv'
+    - regex: 'MiTV-MOSR1(?:[);/ ]|$)'
+      model: 'MiTV R1'
+      device: 'tv'
+    - regex: 'MiTV-MOOQ1(?:[);/ ]|$)'
+      model: 'MiTV Q1'
+      device: 'tv'
     - regex: '(?:MiTV-AXSO0|MiTV4(?:A|-ANSM0)|MiTV-MSSP0)(?:[);/ ]|$)'
       model: 'MiTV 4A'
       device: 'tv'
@@ -24862,6 +25719,9 @@ Xiaomi:
     - regex: 'Redmi Note 10 Lite|M2002F4LG(?:[);/ ]|$)'
       model: 'Redmi Note 10 Lite'
       device: 'phablet'
+    - regex: 'Redmi Note ?9 Pro Max(?:[);/ ]|$)'
+      model: 'Redmi Note 9 Pro Max'
+      device: 'phablet'
     - regex: 'M2101K7A[GI]'
       model: 'Redmi Note 10'
       device: 'phablet'
@@ -24871,7 +25731,7 @@ Xiaomi:
     - regex: 'M2101K7B(?:[GI]|NY)(?:[);/ ]|$)'
       model: 'Redmi Note 10S'
       device: 'phablet'
-    - regex: '(?:M2103K19[GC]|Redmi Note 10 5G)(?:[);/ ]|$)'
+    - regex: '(?:M2103K19[GC]|Redmi Note 10 5G|vnd_camellia)(?:[);/ ]|$)'
       model: 'Redmi Note 10 5G'
       device: 'phablet'
     - regex: 'M2103K19I|A101XM|Redmi Note 10T 5G'
@@ -24883,15 +25743,24 @@ Xiaomi:
     - regex: '(?:M2101K6[GIRP]|M2104K10AC|Redmi Note 10 Pro(?! Max))(?:[);/ ]|$)'
       model: 'Redmi Note 10 Pro'
       device: 'phablet'
-    - regex: '(?:22101316[CI])(?:[);/ ]|$)'
+    - regex: '(?:22101316[CIG])(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro'
       device: 'phablet'
-    - regex: '22101317C(?:[);/ ]|$)'
+    - regex: '2303(?:0RAC7Y|CRA44A|ERA42L|Redmi Note 12S)(?:[);/ ]|$)'
+      model: 'Redmi Note 12S'
+      device: 'phablet'
+    - regex: '(?:22101317C|23021RAA2Y|23021RAAEG|23028RA60L|22111317G)(?:[);/ ]|$)'
       model: 'Redmi Note 12'
       device: 'phablet'
+    - regex: '(?:23049RAD8C)(?:[);/ ]|$)'
+      model: 'Redmi Note 12T'
+      device: 'phablet'
     - regex: '(?:22101316UC)(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro DE'
       device: 'phablet'
+    - regex: '(?:22101316UG)(?:[);/ ]|$)'
+      model: 'Redmi Note 12 Pro+ 5G'
+      device: 'phablet'
     - regex: '(?:22101316UP)(?:[);/ ]|$)'
       model: 'Redmi Note 12 Discovery'
       device: 'phablet'
@@ -24952,7 +25821,7 @@ Xiaomi:
     - regex: '(?:M1908C3JGG|Redmi Note 8 \(2021\))(?:[);/ ]|$)'
       model: 'Redmi Note 8 (2021)'
       device: 'phablet'
-    - regex: 'begonia(?:[);/ ]|$)'
+    - regex: '(?:begonia|M1906G7G)(?:[);/ ]|$)'
       model: 'Redmi Note 8 Pro'
       device: 'phablet'
     - regex: 'willow(?:[);/ ]|$)'
@@ -25022,18 +25891,20 @@ Xion:
 
 # Xolo
 Xolo:
-  regex: 'Xolo|(?:Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05]|Era5X|Era[ _]2V|era_HD|era[_ ]4[GK]|Era_4?X(?:_2GB)?|BLACK-1XM|A1000s_Lite|cube 5\.0_2GB|Opus 3)(?:[);/ ]|$)'
+  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'
       model: 'Black 1X'
-    - regex: 'Era_?([45])X(?:[);/ ]|$)'
+    - regex: 'Era[ _]?1X ?Pro'
+      model: 'Era 1X Pro'
+    - regex: 'Era[_ ]?([145])X(?:[);/ ]|$)'
       model: 'Era $1X'
     - regex: 'Era_4X_2GB(?:[);/ ]|$)'
       model: 'Era 4X 2GB'
     - regex: 'Era[ _]2V(?:[);/ ]|$)'
       model: 'Era 2V'
-    - regex: 'era[_ ](HD|4[GK]|X)'
+    - regex: 'era[_ ](HD|4[GK]|2X?|X)'
       model: 'Era $1'
     - regex: 'cube 5\.0_2GB'
       model: 'Cube 5.0'
@@ -25097,17 +25968,20 @@ Yarvik:
     - regex: 'YES (Altitude 4|MPY(?:48|54))'
       model: '$1'
 
-# Yestel
+# Yestel or YesTeL
 Yestel:
-  regex: 'yestel'
+  regex: 'yestel|(?:T5|X2)_EEA(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'yestel P30(?:[);/ ]|$)'
       model: 'P30'
+    - regex: '(X2|T5)_EEA(?:[);/ ]|$)'
+      device: 'tablet'
+      model: '$1'
 
 # Yezz
 Yezz:
-  regex: 'Yezz|ANDY[ _]|(?: (?:4E4|5EQ)|A5EI|LIV 1S|LIV1|LIV2[_ ]?LTE|ART[12](?:_?PRO)?|MAX_1_PLUS|MAX2 PLUS)(?:[);/ ]|$)'
+  regex: 'Yezz|ANDY[ _]|(?: (?:4E4|5EQ)|A5EI|LIV 1S|LIV1|LIV2[_ ]?LTE|ART[12](?:_?PRO)?|MAX_1_PLUS|MAX2 PLUS|EPIC T)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:YEZZ[_-])?(4E4|5EQ|A4M|A5EI)'
@@ -25120,6 +25994,8 @@ Yezz:
       model: 'Art 1'
     - regex: 'ART2PRO'
       model: 'Art 2 Pro'
+    - regex: 'EPIC T'
+      model: 'Epic T'
     - regex: 'LIV1'
       model: 'LIV1'
     - regex: 'LIV 1S'
@@ -25287,7 +26163,7 @@ 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|806)3G)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Fly5[_ ]Lite(?:[);/ ]|$)'
@@ -25313,7 +26189,7 @@ Vivax:
     - regex: 'TPC[-_ ](7121|806)([34])G'
       model: 'TPC-$1 $2G'
       device: 'tablet'
-    - regex: 'VIVAX (?:TABLET )?TPC[-_ ](\d+) ([34])G(?:[);/ ]|$)'
+    - regex: '(?:TABLET )?TPC[-_ ](\d+) ?([34])G(?:[);/ ]|$)'
       device: 'tablet'
       model: 'TPC-$1 $2G'
 
@@ -25487,7 +26363,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)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Fly_)?IQ310(?:[);/ ]|$)'
@@ -25496,6 +26372,8 @@ Fly:
 
     - regex: '(?:Fly_)?IQ236(?:[);/ ]|$)'
       model: 'Victory'
+    - regex: '(?:Fly_)?View Max(?:[);/ ]|$)'
+      model: 'View Max'
     - regex: 'Slimline(?:[);/ ]|$)'
       model: 'Slimline'
     - regex: 'Power Plus 5000(?:[);/ ]|$)'
@@ -25730,7 +26608,7 @@ FinePower:
 
 # Freetel (freetel.jp)
 Freetel:
-  regex: '(?:FTJ17[AC]00|FTJ152[ABCD]|FTU18A00|FT141B|FT142D(?:_LTEXM)?|FT142A?|FTJ161[AB]|FTJ1[56]2E|FTJ162[BD]|FT162D|FTE161[GE]|SAKURA_FTE1)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'FTJ152C'
@@ -25743,7 +26621,9 @@ Freetel:
       model: 'Cricket Wave'
     - regex: 'FTJ161A'
       model: 'Musashi'
-    - regex: 'FTE161E'
+    - regex: 'FTE171A'
+      model: 'Ice 3'
+    - regex: 'FTE161E|FTJ161E'
       model: 'Ice 2'
     - regex: 'FTE161G'
       model: 'Ice 2 Plus'
@@ -25771,6 +26651,8 @@ Freetel:
       model: 'Katana 1'
     - regex: 'SAKURA_FTE1'
       model: 'Sakura FTE1'
+    - regex: 'FUN PLUS'
+      model: 'Fun Plus'
 
 # Western Digital
 Western Digital:
@@ -25808,7 +26690,7 @@ 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|679J|70[129]J|711J|729J|709S|907J))(?:[);/ ]|$)'
+  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|711J|729J|709S|907J))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NX711J'
@@ -25825,7 +26707,7 @@ Nubia:
       model: 'Red Magic 8 Pro'
     - regex: 'NX709S'
       model: 'Red Magic 7S Pro'
-    - regex: 'NX679J'
+    - regex: 'NX679[JS]'
       model: 'Red Magic 7'
     - regex: 'NX669J'
       model: 'Red Magic 6'
@@ -25928,7 +26810,7 @@ Rakuten:
 
 # ZTE
 ZTE:
-  regex: 'ZTE(?!; MegaFon)|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade[ _](?:E01|V0820|L110|L[2357]|L7A|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|VERGATARIO ?5(?:PLUS)?|Axon mini|KIS C341|A103ZT|Z335(?:1S|[23]CA)|Z5156CC|B867RE|MEO Smart A80|P65[10] 2021|Z6201V|Z6252CA|Z6251V?|A2020N3|A202ZT)(?:[);/ ]|$)'
+  regex: 'ZTE(?!; MegaFon)|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade[ _](?:E01|V0820|L110|L[2357]|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 A80|P65[10] 2021|Z6201V|Z6252CA|Z6251V?|A2020N3|A202ZT|Z719DL|Z5158|B2017G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -25964,6 +26846,8 @@ ZTE:
       model: 'Blade A3 (2019)'
     - regex: 'Z3353CA(?:[);/ ]|$)'
       model: 'Blade A3 Plus'
+    - regex: 'ZTE[_ ]Blade[_ ]A31[_ ]Plus'
+      model: 'Blade A31 Plus'
     - regex: '(?:A7020(?:RU)?|Blade A7S 2020-T)(?:[);/ ]|$)'
       model: 'Blade A7s (2020)'
     - regex: 'A7000(?:[);/ ]|$)'
@@ -25974,6 +26858,8 @@ ZTE:
       model: 'Blade A71'
     - regex: 'N939Sc'
       model: 'Blade A711'
+    - regex: 'Z5157[VY]'
+      model: 'Blade A3v'
     - regex: '7540N'
       model: 'Blade A72 5G'
     - regex: 'A0722(?:[);/ ]|$)'
@@ -26016,6 +26902,8 @@ ZTE:
       model: 'Axon 40 Ultra'
     - regex: 'A2023G'
       model: 'Axon 40 Pro'
+    - regex: 'ZTE[ _]?9047'
+      model: 'Axon 40 SE'
     - regex: 'A2016'
       model: 'Axon Elite'
     - regex: 'N799D(?:[);/ ]|$)'
@@ -26042,6 +26930,8 @@ ZTE:
       model: 'Avid'
     - regex: 'Z5156CC(?:[);/ ]|$)'
       model: 'Avid 579'
+    - regex: 'Z5158(?:[);/ ]|$)'
+      model: 'Avid 589'
     - regex: 'N9130(?:[);/ ]|$)'
       model: 'Speed'
     - regex: 'N9132(?:[);/ ]|$)'
@@ -26090,6 +26980,8 @@ ZTE:
       model: 'Blade C2'
     - regex: 'ZTE[_ ]Blade[_ ](C2|V7)[_ ]Plus'
       model: 'Blade $1 Plus'
+    - regex: '(?:ZTE[_ ])?BA521'
+      model: 'Blade 521'
     - regex: 'Blade G Plus'
       model: 'Blade G Plus'
     - regex: 'ZTE_Blade_III'
@@ -26104,6 +26996,8 @@ ZTE:
       model: 'Grand X'
     - regex: 'Z959(?:[);/ ]|$)'
       model: 'Grand X3'
+    - regex: '(?:[RV]880H|V965)(?:[);/ ]|$)'
+      model: 'V965'
     - regex: 'V8000'
       model: 'Nova 4'
     - regex: 'Z95[67]'
@@ -26230,8 +27124,16 @@ ZTE:
       model: 'Blade V30'
     - regex: 'ZTE A7040'
       model: 'Blade V40 Smart'
+    - regex: 'ZTE A7050'
+      model: 'Blade V41 Smart'
     - regex: 'ZTE 8045'
       model: 'Blade V40 Vita'
+    - regex: 'ZTE 9046'
+      model: 'Blade V40 Pro'
+    - regex: 'ZTE 8046'
+      model: 'Blade V40 Design'
+    - regex: 'ZTE 9045'
+      model: 'Blade V40'
     - regex: 'Blade V(9|10) Vita(?:[);/ ]|$)'
       model: 'Blade V$1 Vita'
     - regex: 'Blade V([89]|10)(?:[);/ ]|$)'
@@ -26296,6 +27198,8 @@ ZTE:
       model: 'Fanfare'
     - regex: '(?:ZTE-)?Z812'
       model: 'Maven'
+    - regex: '(?:ZTE-)?Z719DL'
+      model: 'ZMax One'
     - regex: 'Z815'
       model: 'Fanfare 2'
     - regex: 'Z831'
@@ -26422,6 +27326,9 @@ ZTE:
     - regex: 'K87CA(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Grand X View 4'
+    - regex: 'K87CC(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Grand X View 3.8'
     - regex: 'ZTE-K88(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Trek 2' # AT&T
@@ -26438,6 +27345,8 @@ ZTE:
       device: 'tablet'
     - regex: 'Blade[_ ](A(\d+)C?|L111|V580|E01)(?:[);/ ]|$)'
       model: 'Blade $1'
+    - regex: 'ZTE Blade A52'
+      model: 'Blade A52'
     - regex: 'Blade[_ ]V0730(?:[);/ ]|$)'
       model: 'Blade V7'
     - regex: 'Blade[_ ]V0800(?:[);/ ]|$)'
@@ -26446,7 +27355,7 @@ ZTE:
       model: 'Blade V10'
     - regex: 'ZTE B(A601|A910|A510)(?:[);/ ]|$)'
       model: 'Blade $1'
-    - regex: 'ZTE Blade (A[35]1|A7s)'
+    - regex: 'ZTE Blade (A[35]1|A7s|C370)'
       model: 'Blade $1'
     - regex: 'ZTE BA610T(?:[);/ ]|$)'
       model: 'Blade A610'
@@ -26548,6 +27457,30 @@ Zen:
   models:
     - regex: 'AdmireGlam'
       model: 'Admire Glam'
+    - regex: 'ADMIRE[_ ]SENSE\+'
+      model: 'Admire Sense+'
+    - regex: 'ADMIRE[_ ]SWADESH\+'
+      model: 'Admire Swadesh+'
+    - regex: 'ADMIRE[_ ]SENSE[_ ]DUO'
+      model: 'Admire Sense Duo'
+    - regex: 'ADMIRE[_ ]CURVE[_ ]NEO'
+      model: 'Admire Curve Neo'
+    - regex: 'ADMIRE[_ ]CURVE\+'
+      model: 'Admire Curve+'
+    - regex: 'ADMIRE[_ ]NEO\+'
+      model: 'Admire Neo+'
+    - regex: 'ADMIRE[_ ]DUO'
+      model: 'Admire Duo'
+    - regex: 'ADMIRE[_ ]SHINE'
+      model: 'Admire Shine'
+    - regex: 'ADMIRE[_ ]INFINITY'
+      model: 'Admire Infinity'
+    - regex: 'ADMIRE[_ ]Unity'
+      model: 'Admire Unity'
+    - regex: 'ADMIRE[_ ]STRONG'
+      model: 'Admire Strong'
+    - regex: 'ADMIRE[_ ]GLORY\+'
+      model: 'Admire Glory+'
     - regex: '(M72 Smart)'
       model: '$1'
     - regex: '(Admire[_ ][^/;]+|Cinemax[^/;)]+)(?:Build|\))'
@@ -26579,7 +27512,7 @@ Lemhoov:
 
 # 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|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|DV8304-C|Osmartphona'
   device: 'smartphone'
   models:
     - regex: 'Osmartphona'
@@ -26614,12 +27547,15 @@ MTC:
     - regex: 'Redbox Mini 5\(MTS\)'
       device: 'tv'
       model: 'Redbox Mini 5'
-    - regex: 'MTS TV Box 317'
+    - regex: 'MTS TV Box (\d{3})'
       device: 'tv'
-      model: 'SB-317'
+      model: 'SB-$1'
     - regex: 'DV8304-C'
       device: 'tv'
       model: 'SuperWave DV8304-C'
+    - regex: '(DV8235)'
+      device: 'tv'
+      model: '$1'
 
 # MegaFon
 MegaFon:
@@ -26643,9 +27579,9 @@ MegaFon:
       device: 'tablet'
       model: 'V9 Plus'
 
-# Inoi
+# Inoi (inoi.com)
 Inoi:
-  regex: 'INOI|(?:A126)(?:[);/ ]|$)'
+  regex: 'INOI|(?:A126|A161|A170_Plus|A181_Plus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'inoiPad mini 2\+32 Wi-Fi\+3G'
@@ -26661,10 +27597,16 @@ Inoi:
       model: 'Easy Phone'
     - regex: 'INOI (2|5) Lite (2019|2021)'
       model: '$1 Lite ($2)'
-    - regex: 'INOI[_ ]([13])[_ ]LITE'
+    - regex: 'INOI[_ ]([123])[_ ]LITE'
       model: '$1 Lite'
     - regex: ' (A126)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'A170_Plus'
+      model: 'A72'
+    - regex: 'A181_Plus'
+      model: 'A181 Plus'
+    - regex: ' A161(?:[);/ ]|$)'
+      model: 'A62'
     - regex: 'INOI ([257]) (?:\d\+\d+ )?(2019|202[01])(?:[);/ ]|$)'
       model: '$1 ($2)'
     - regex: 'INOI[_ ]([^);/]+)(?: Build|[;)])'
@@ -26672,7 +27614,7 @@ Inoi:
 
 # Vertex (vertex-digital.ru)
 Vertex:
-  regex: 'Vertex[_ -]|(?:Luck|Luck_L1[02]0_[34]G|Lion_Dual|V709X|TAB X8|TAB X10|Tab [43]G (?:7-2|8-1|10-1)|Tab_3G_7-1|Pro_P3[01]0_4G|Lion_DC|Baccara|Eagle[ _]4G|ImpressMAX)(?:[);/ ]|$)|Impress[ _]([^;/]+)(?:Build|\))'
+  regex: 'Vertex[_ -]|(?:Luck|Luck_L1[02]0_[34]G|Lion_Dual|V709X|TAB X8|TAB X10|Tab [43]G (?:7-2|8-1|10-1)|Tab_3G_7-1|Pro_P3[01]0_4G|Lion_DC|Baccara|Eagle[ _]4G|ImpressMAX|Lion [1-3])(?:[);/ ]|$)|Impress[ _]([^;/]+)(?:Build|\))'
   device: 'smartphone'
   models:
     - regex: '(?:Vertex_)?Luck[_ ]L[_ ](5045)[_ ]([34])G'
@@ -26687,6 +27629,8 @@ Vertex:
       model: 'Pro P$1 4G'
     - regex: 'Impress_Luck[_ ]?4G_NFC(?:[);/ ]|$)'
       model: 'Impress Luck 4G NFC'
+    - regex: 'Lion ([1-3])(?:[);/ ]|$)'
+      model: 'Impress Lion $1'
     - regex: '(Impress[ _][a-z]+)([34])G(?:Build|\))'
       model: '$1 $2G'
     - regex: '(Impress[ _](?:[^;/]+))(?:Build|\))'
@@ -26751,9 +27695,9 @@ MYFON:
   device: 'tablet'
   model: 'My Pad 7s'
 
-# X-TIGI
+# X-TIGI (x-tigi.com)
 X-TIGI:
-  regex: 'X[-_]TIGI|Hope(?:[78]|10)[_ ](?:Mate|Max|Pro|Plus)|JOY(?:10|8) Mate|Photo_P15_Lite|SHARP_2|SHARP1|V18 pro_A'
+  regex: 'X[-_]TIGI|Hope(?:[78]|10)[_ ](?:Mate|Max|Pro|Plus|LTE)|JOY(?:10|8) Mate|JOY10_LTE|Photo_P15_Lite|SHARP_2|SHARP1|V18 pro_A'
   device: 'smartphone'
   models:
     - regex: 'X-TIGI_JOY10_PRO'
@@ -26768,6 +27712,9 @@ X-TIGI:
     - regex: 'Hope([78])[_ ](Mate|Max)'
       model: 'Hope $1 $2'
       device: 'tablet'
+    - regex: 'Hope ?8 LTE'
+      model: 'Hope 8 LTE'
+      device: 'tablet'
     - regex: 'Hope10[_ ]Pro'
       model: 'Hope 10 Pro'
       device: 'tablet'
@@ -26777,6 +27724,9 @@ X-TIGI:
     - regex: 'X-TIGI_JOY7_MAX'
       model: 'Joy 7 Max'
       device: 'tablet'
+    - regex: 'JOY10_LTE'
+      model: 'Joy 10 LTE'
+      device: 'tablet'
     - regex: 'X-TIGI[_ ]V28[_ ]LTE'
       model: 'V28 LTE'
     - regex: 'X[-_]TIGI[_ ]V19'
@@ -26867,19 +27817,23 @@ 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'
+  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'
   device: 'smartphone'
   models:
     - regex: 'Alpha 5G(?:[);/ ]|$)'
       model: 'Alpha 5G'
     - regex: 'SMART MAX 4.0 PLUS'
       model: 'Smart Max 4.0 Plus'
+    - regex: 'SMART Champ 4\.0'
+      model: 'Smart Champ 4.0'
     - regex: 'SMART 4G Gen C ([45].[05])'
       model: 'Smart 4G Gen C $1"'
     - regex: 'SMART 4G Speedy 5.0 Plus'
       model: 'Smart 4G Speedy 5.0 Plus'
     - regex: 'SMART 4G Adventure Pro'
       model: 'Smart 4G Adventure Pro'
+    - regex: 'SMART 4G Adventure'
+      model: 'Smart 4G Adventure'
     - regex: 'SMART[ _]4G[_ ]Speedy[_ ]5inch'
       model: 'Smart 4G Speedy 5'
     - regex: 'SMART[ _]4G[_ ]Champion'
@@ -26893,18 +27847,24 @@ NEXBOX:
     - regex: 'TRUE BEYOND TAB 3G'
       device: 'tablet'
       model: 'Beyond Tab 3G'
+    - regex: 'TRUE SMART 7\.0 Quadcore'
+      device: 'tablet'
+      model: 'Smart Tab 7.0 QuadCore'
 
     - regex: 'HPH07'
       device: 'tv'
       model: 'ID TV HPH07'
 
 Yandex:
-  regex: '(?:YNDX-?000SB|YandexModule2-00001)(?:[);/ ]|$)'
+  regex: '(?:YNDX-?(?:000SB|0007[12])|YandexModule2-00001)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'YandexModule2-00001'
       device: 'tv'
       model: 'Module'
+    - regex: 'YNDX-?(0007[12])'
+      device: 'tv'
+      model: 'YNDX-$1'
     - regex: 'YNDX-?000SB'
       model: 'YNDX-000SB'
 
@@ -26948,7 +27908,7 @@ HiHi:
 
 # Hi or Hi TFG (https://www.hi-online.co.za/)
 Hi:
-  regex: '(?:(?<!Thrill )Boost(?:[ _](?:Hypa|Max|Ultra))?(?:[);/ ]|$)|HMR(?:5012|5450)|Crusader|(?:VHIX-)?VHIX-\w+(?:-[A-Z])?|32HSY119X|39HSY111X|55USY151X)(?:[);/ ]|$)'
+  regex: '(?:(?<!Thrill )Boost(?:[ _](?:Hypa|Max|Ultra))?(?: Build|[;)])|HMR(?:5012|5450)|Crusader|(?:VHIX-)?VHIX-\w+(?:-[A-Z])?|43FSY112X[cd]|32HSY119X|39HSY111X|55USY151X|50USY151X)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Boost[ _](Hypa|Max|Ultra)(?:[);/ ]|$)'
@@ -26965,7 +27925,7 @@ Hi:
     - regex: '(?:VHIX-)?VHIX-(\w+)'
       device: 'tv'
       model: 'VHIX-$1'
-    - regex: '(32HSY119X|39HSY111X|55USY151X)(?:[);/ ]|$)'
+    - regex: '(32HSY119X|39HSY111X|55USY151X|43FSY112X[cd]|50USY151X)(?:[);/ ]|$)'
       device: 'tv'
       model: '$1'
 
@@ -26985,7 +27945,7 @@ Boost:
 
 # Highscreen
 Highscreen:
-  regex: 'HIGHSCREEN|(Easy[- ]Power(?:[- ]Pro)?|Pure[_ ](?:Power|F)|Power Ice(?: Max)?|Easy[_ ]([SFL]|XL)(?:_Pro)?|Razar_Pro|Power Rage(?: Evo)?|Zera-S-Power|Zera[ _][UFS]|Power[ _]?Five[ _]?(?:Pro|Evo|Max|Max(?:Lite|2))|Power(?:Four|Five)|BOOST II(?:se)?|Fest(?:XL)?(?:-Pro)?|Tasty|Boost3|Boost 3(?: Pro)? SE|Expanse|Hercules|Alpha Rage|VergeM|Ice2|Prime [LS]|Spade|Spark 2|Alpha GT[RX]|Wallet|Thunder|Razar|COSMO DUO|Prime Mini SE)(?:[);/ ]|$)'
+  regex: 'HIGHSCREEN|(Easy[- ]Power(?:[- ]Pro)?|Pure[_ ](?:Power|F)|Power Ice(?: Max)?|Easy[_ ]([SFL]|XL)(?:_Pro)?|Razar_Pro|Power Rage(?: Evo)?|Zera-S-Power|Zera[ _][UFS]|Power[ _]?Five[ _]?(?:Pro|Evo|Max|Max(?:Lite|2))|Power(?:Four|Five)|BOOST II(?:se)?|Fest(?:XL)?(?:-Pro)?|Tasty|Boost3|Boost 3(?: Pro)? SE|Expanse|Hercules|Alpha Rage|VergeM|Ice2|Prime [LS]|Spade|Spark 2|Alpha GT[RX]|Wallet|Thunder|Razar|COSMO DUO|Prime Mini SE| Bay|Omega Q)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(Power Ice(?:[ ](?:Max|Evo))?|Power Rage(?: Evo)?|Zera[ _][UFS]|Alpha GT[RX]|Wallet)(?:[);/ ]|$)'
@@ -27014,6 +27974,8 @@ Highscreen:
       model: 'Fest Pro'
     - regex: 'Fest(?:[);/ ]|$)'
       model: 'Fest'
+    - regex: ' Bay(?:[);/ ]|$)'
+      model: 'Bay'
     - regex: 'PowerFour(?:[);/ ]|$)'
       model: 'Power Four'
     - regex: 'Pure[_ ]Power(?:[);/ ]|$)'
@@ -27066,6 +28028,8 @@ Highscreen:
       model: 'Prime $1'
     - regex: 'COSMO DUO'
       model: 'Cosmo Duo'
+    - regex: 'Omega Q'
+      model: 'Omega Q'
 
 # CVTE
 CVTE:
@@ -27162,7 +28126,7 @@ Mann:
 
 # Unihertz (unihertz.com)
 Unihertz:
-  regex: '((?<!Astra )Titan(_pocket)?|Jelly-Pro|Jelly2(?:_JP)?|Atom_X?L|Ticktock|Titan Slim|TANK 01)(?:[);/ ]|$)'
+  regex: '((?<!Astra )Titan(_pocket)?|Jelly-Pro|Jelly2(?:_JP)?|Atom_X?L|Ticktock(?:-S)?|Titan Slim|TANK 01|TANK2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(Jelly)-Pro(?:[);/ ]|$)'
@@ -27173,16 +28137,20 @@ Unihertz:
       model: 'Titan Pocket'
     - regex: 'Titan Slim'
       model: 'Titan Slim'
+    - regex: 'Ticktock-S'
+      model: 'Ticktock S'
     - regex: 'Ticktock'
       model: 'Ticktock'
     - regex: 'TANK 01'
       model: 'Tank 01'
+    - regex: 'TANK2'
+      model: '8849 Tank 2'
     - regex: '(Titan|Atom_X?L)(?:[);/ ]|$)'
       model: '$1'
 
 # Chuwi
 Chuwi:
-  regex: '(?:CW-(Hi8-super|Hi12|V99i?|V17HD3G|VX8-3G|V88-QUAD|V9-DUAL|V88S|Vi[78]|[HV]i10 (?:pro|plus))|Hi10 (?:Pro|plus)|HiPad[ -](?:X|Pro|Air|Max)|HiPadX|HiBox-hero|HiBook(?: pro)?|Hi[89] ?(?:Air|Pro)|HiPad ?Plus|Hi8SE|Vi8 plus|Vi10(?: ?Pro)?|Surpad|HiPadPro)(?:[);/ ]|$)'
+  regex: '(?:CW-(Hi8-super|Hi12|V99i?|V17HD3G|VX8-3G|V88-QUAD|V9-DUAL|V88S|Vi[78]|[HV]i10 (?:pro|plus))|Hi10 (?:Pro|plus)|HiPad[ -](?:X|X?Pro|Air|Max)|HiPadX|HiBox-hero|HiBook(?: pro)?|Hi[89] ?(?:Air|Pro)|HiPad ?Plus|Hi8SE|Vi8 plus|Vi10(?: ?Pro)?|Surpad|HiPadPro)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(CW-Hi8-super)(?:[);/ ]|$)'
@@ -27205,6 +28173,8 @@ Chuwi:
       model: 'HiPad X'
     - regex: 'HiPad ?Pro(?:[);/ ]|$)'
       model: 'HiPad Pro'
+    - regex: 'HiPad ?XPro(?:[);/ ]|$)'
+      model: 'HiPad X Pro'
     - regex: 'HiPad-Air(?:[);/ ]|$)'
       model: 'HiPad Air'
     - regex: 'HiPad ?Plus(?:[);/ ]|$)'
@@ -27268,7 +28238,7 @@ Ghost:
 
 # Xoro (www.xoro.de)
 Xoro:
-  regex: 'XORO[ _]|(?:TelePAD(?:795|731|1032|10A3|7A3)|Era 2X|HMT(?:390Q?|400)|HST 260)(?:[);/ ]|$)'
+  regex: 'XORO[ _]|(?:TelePAD(?:795|731|1032|10A3|7A3)|HMT(?:390Q?|400)|HST 260)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'TelePAD(7|10)A3 4G(?:[);/ ]|$)'
@@ -27286,10 +28256,6 @@ Xoro:
       model: 'HST 260'
       device: 'tv'
 
-    - regex: '(Era 2X)(?:[);/ ]|$)'
-      model: '$1'
-      device: 'smartphone'
-
 # Vinga
 Vinga:
   regex: 'VMP-(015-162|021-82|041-162|011-81|025-324|045-664)(?:[);/ ]|$)|VMP023\.'
@@ -27370,12 +28336,15 @@ Yxtel:
 
 # Proline
 Proline:
-  regex: 'Proline_|(?:H10882M-TN|H1088[28]M|H1010)(?:[);/ ]|$)'
+  regex: 'Proline_|(?:H10882M-TN|H1088[28]M|H1010|M504)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Proline[_ ]FalconXL'
       device: 'smartphone'
       model: 'Falcon XL'
+    - regex: 'M504'
+      device: 'smartphone'
+      model: 'Falcon X'
     - regex: '(H10882M-TN|H1088[28]M|H1010)'
       model: '$1'
 # Yota
@@ -27574,11 +28543,21 @@ Shift Phones:
 
 # RugGear
 RugGear:
-  regex: '(RugGear|RG(?:310|500|65[05]|702|7[13]0|850))(?:[);/ ]|$)'
+  regex: '(?:RugGear|RG(?:310|500|65[05]|702|7[13]0|850)|RG725)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(RG[0-9]+)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'RG725'
+      model: 'RG725'
+
+# RuggeTech
+RuggeTech:
+  regex: '(FieldPad 8)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(FieldPad 8)'
+      model: '$1'
 
 # Ruggex (https://www.ruggex.com/)
 Ruggex:
@@ -27604,12 +28583,12 @@ Maxcom:
     - regex: 'Neva Rise S1' # Orange
       model: 'Neva Rise S1'
 
-# Luna
+# Luna (http://luna.id/)
 Luna:
-  regex: '(?:LUNA[ _](?:[VG]55|G[56]0)|TG-L800S)(?:[);/ ]|$)'
+  regex: '(?:LUNA[ _](?:[VG]55|G[56]0|G9|G6E)|TG-L800S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'LUNA[ _]([VG]55|G[56]0)(?:[);/ ]|$)'
+    - regex: 'LUNA[ _]([VG]55|G[56]0|G9|G6E)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(TG-L800S)(?:[);/ ]|$)'
       model: '$1'
@@ -27650,7 +28629,7 @@ Soyes:
 
 # Zidoo
 Zidoo:
-  regex: 'ZIDOO[ _](H6 Pro|X6 Pro|X9S|Z10|X[158]|X20 Pro|Z9S)(?:[);/ ]|$)'
+  regex: 'ZIDOO[ _](H6 Pro|X6 Pro|X9S|Z10|X[1589]|X20 Pro|Z9S)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -27660,11 +28639,23 @@ Zfiner:
   device: 'tablet'
   model: 'Y900'
 
+# EKINOX (https://ekinoxnigeria.com/)
+EKINOX:
+  regex: '(?:E8_Ultra)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'E8_Ultra'
+      model: 'E8 Ultra'
+
 # iGet
 iGet:
-  regex: 'SMART[_ ](L20X|G10[12]|S7[02]|G71|G81[H]?|L10[34]|W[12]0X|W8X|W20[23]|L206)(?:_eea)?(?:[);/ ]|$)'
+  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))(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Smart $1'
+  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)'
+      model: 'Smart $1'
 
 # Phicomm
 Phicomm:
@@ -27682,9 +28673,13 @@ Phicomm:
 
 # Huadoo
 Huadoo:
-  regex: 'Huadoo[ _](HG0[46]|HG11|V[34])(?:[);/ ]|$)'
+  regex: 'Huadoo[ _]|(?: HG11)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'Huadoo[ _](HG0[46]|HG11|V[34])'
+      model: '$1'
+    - regex: ' HG11(?:[);/ ]|$)'
+      model: 'HG11'
 
 # Gome
 Gome:
@@ -27740,10 +28735,10 @@ Ryte:
 
 # Vontar
 Vontar:
-  regex: '(HK1 (?:Max|MINI\+?|PLUS|PRO)|KK MAX|VONTAR[ -](?:Z[58]|V1|KIII|MX-4K|X[234]))(?:[);/ ]|$)'
+  regex: '(HK1 (?:Max|MINI\+?|PLUS|PRO)|KK MAX|VONTAR[ -](?:Z[58]|[VH]1|KIII|MX-4K|X[234]))(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'VONTAR[ -](Z[58]|V1|KIII|MX-4K|X[234])(?:[);/ ]|$)'
+    - regex: 'VONTAR[ -](Z[58]|[VH]1|KIII|MX-4K|X[234])(?:[);/ ]|$)'
       model: '$1'
     - regex: 'HK1 Max(?:[);/ ]|$)'
       model: 'HK1 Max'
@@ -27772,7 +28767,7 @@ Wigor:
 
 # NEXON (nexon.ua)
 NEXON:
-  regex: 'NEXON (X[13]\+|X[12589])(?:[);/ ]|$)'
+  regex: 'NEXON (X[13]\+|X[123589])(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -27864,7 +28859,7 @@ PocketBook:
       model: 'SURFpad 3 $1.$2"'
     - regex: 'SURFpad 4 ([LMS])(?:[);/ ]|$)'
       model: 'SURFpad 4 $1'
-    - regex: 'PocketBook/(515|614|62[23467]|63[012]|64[01]|650|740|801|840)(?:[);/ ]|$)'
+    - regex: 'PocketBook/(515|614|62[23467]|63[012]|64[01]|650|740|801|840|970)(?:[);/ ]|$)'
       model: '$1'
 
 # Bitmore
@@ -28067,11 +29062,14 @@ Magnus:
 
 # Newland (www.newland-id.com)
 Newland:
-  regex: 'NLS-(?:MT90|NFT10)(?:[);/ ]|$)'
+  regex: 'NLS-(?:MT90|NFT10|MT65)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NLS-MT90'
       model: 'MT90 Orca'
+    - regex: 'NLS-MT65'
+      device: 'peripheral'
+      model: 'MT65 Beluga IV'
     - regex: 'NLS-NFT10'
       model: 'NFT10 Pilot Pro'
 
@@ -28096,6 +29094,12 @@ Orbic:
       device: 'tablet'
       model: 'Tab8 5G'
 
+# RedLine (https://redline.com.tr/)
+RedLine:
+  regex: '(Space_M10)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
 # RED
 RED:
   regex: '(?:H1A1000)(?:[);/ ]|$)'
@@ -28287,12 +29291,14 @@ Maxtron:
 
 # Philco (philco.com.br)
 Philco:
-  regex: 'PHILCO |(PCS0[12]|PH350B|PTB[78]R|PTB7PAP_PTB7PAB_PTB7PAR|Hit Max|Hit P1[023]|HIT P10a|TP7A4|TP10A1I)(?:[);/ ]|$)'
+  regex: 'PHILCO |(PCS0[12]|PH350B|PTB[78]R|PTB7PAP_PTB7PAB_PTB7PAR|Hit Max|Hit P1[023]|HIT P8|HIT P10a|TP7A4|TP10A1I)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'HIT P10a'
       model: 'Hit P10a'
-    - regex: '(PCS0[12]|PH350B|Hit Max|Hit P1[023])(?:[);/ ]|$)'
+    - regex: 'Hit (P1[023]|P8)'
+      model: 'Hit $1'
+    - regex: '(PCS0[12]|PH350B|Hit Max)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(PTB[78]R|TP7A4|TP10A1I)(?:[);/ ]|$)'
       device: 'tablet'
@@ -28326,14 +29332,23 @@ Newman:
 
 # Swipe
 Swipe:
-  regex: '(?:Elite Sense|Elite_VR|Slate2|Swipe_Elite_3M?)(?:[);/ ]|$)'
+  regex: '(?:Slate2|Swipe_(?:Elite_3M?|Strike8)|Elite_(?:Grace|VR)|EliteDual|Elite (?:Prime|Star|Note|Sense)|Konnect (?:Prime|Power|Neo 4G))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(?:Swipe_)?(Elite Sense|Elite_VR|Elite_3M?)(?:[);/ ]|$)'
-      model: '$1'
+    - regex: 'Konnect Power'
+      model: 'Konnect Power'
+    - regex: 'Konnect Prime'
+      model: 'Konnect Prime'
+    - regex: 'Konnect Neo 4G'
+      model: 'Konnect Neo 4G'
+    - regex: '(?:Swipe_)?Elite[_ ]?(Sense|VR|3M?|Grace|Star|Prime|Note|Dual)(?:[);/ ]|$)'
+      model: 'Elite $1'
     - regex: 'Slate2(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Slate 2'
+    - regex: 'Swipe[_ ]Strike8'
+      device: 'tablet'
+      model: 'Strike 8'
 
 # Owwo
 Owwo:
@@ -28377,13 +29392,13 @@ Owwo:
 
 # TD Systems
 TD Systems:
-  regex: '(K(?:24|32)DLX9HS|K40DLM8FS|K40DLX9FS|K50DLX9US)(?:[);/ ]|$)'
+  regex: '(K(?:24|32)DLX9HS|K40DLM8FS|K40DLX9FS|K50DLX9US|K50DLJ10US|K43DLJ10US|K32DLX10HS|K32DLJ12HS)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Ravoz (https://www.ravoz.online/)
 Ravoz:
-  regex: 'RAVOZ[ _](Z[57] (?:Lite|Pro)|Z[3-7]|R[4789]|V[23])(?:[);/ ]|$)'
+  regex: 'RAVOZ[ _](Z[357] (?:Lite|Pro)|Z[3-7]|R[4789]|V[23])(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -28395,7 +29410,7 @@ Tone:
 
 # AT&T
 AT&T:
-  regex: '(?:EA1002|EA21100[125]|U(?:202|304|31[89]|328|626|705)AA|QS5509A|V340U|V350U)(?:[);/ ]|$)'
+  regex: '(?:EA1002|EA21100[125]|U(?:202|304|31[89]|328|626|668|705)AA|QS5509A|V340U|V350U)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'EA211005'
@@ -28424,6 +29439,8 @@ AT&T:
       model: 'Maestro 3'
     - regex: 'EA211002(?:[);/ ]|$)'
       model: 'Motivate 2'
+    - regex: 'U668AA(?:[);/ ]|$)'
+      model: 'Motivate Max'
     - regex: 'V340U(?:[);/ ]|$)'
       model: 'Fusion Z' # Vsmart
 
@@ -28475,7 +29492,7 @@ Winds:
 
 # Asano
 Asano:
-  regex: '(?:32LH7010T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7020T)(?:[);/ ]|$)'
+  regex: '(?:32LH7010T|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7020T|24LH8010T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: '(\d{2})(L[FHU]\d+[ST])(?:[);/ ]|$)'
@@ -28504,6 +29521,8 @@ Vipro:
   models:
     - regex: 'VIPRO PRO2X(?:[);/ ]|$)'
       model: 'Pro 2X'
+    - regex: 'Vipro Edge 2(?:[);/ ]|$)'
+      model: 'Edge 2'
     - regex: 'VIPRO PRO[ _-]?([0-9])(?:[);/ ]|$)'
       model: 'Pro $1'
 
@@ -28601,9 +29620,11 @@ Neo:
 
 # NEKO
 NEKO:
-  regex: 'NEKO_LT-(\w+)(?:[);/ ]|$)'
+  regex: '(?:NEKO_LT-(\w+)|LT-\d{2}N(?:H8020S|F7021S))(?:[);/ ]|$)'
   device: 'tv'
-  model: 'LT-$1'
+  models:
+    - regex: '(?:NEKO_)?LT-(\w+)(?:[);/ ]|$)'
+      model: 'LT-$1'
 
 # Neomi
 Neomi:
@@ -28694,9 +29715,11 @@ Billion:
 
 # Tele2 (www.tele2.com) mobile operator
 Tele2:
-  regex: 'Tele2[ _]'
+  regex: 'Tele2[ _]|Tele2fon'
   device: 'smartphone'
   models:
+    - regex: 'Tele2fon[_ ]V6'
+      model: 'V6'
     - regex: 'Tele2[ _](Mi[dn]i)[ _]1.1(?:[);/ ]|$)'
       model: '$1 1.1'
     - regex: 'Tele2[ _]Midi[ _]2.0(?:[);/ ]|$)'
@@ -28781,7 +29804,7 @@ Türk Telekom:
 
 # Jinga (jinga.ru)
 Jinga:
-  regex: 'Jinga[-_ ]|(?:(?:Fresh|Optim)4G|Pass(?:Plus|3G)|PicassoNote|Hotz[_ ]M1|WinPRO|Touch4G|Start(?:3G|LTE)?|IGO[ _]L[41]|Basco (?:L3|L[45]00|XS1|S2)|M500-1|Hit4G|A450|Neon(?!/)|JoyPRO|Fresh|GoalPlus)(?:[);/ ]|$)'
+  regex: 'Jinga[-_ ]|(?:(?:Fresh|Optim)4G|Pass(?:Plus|3G)|PicassoNote|Hotz[_ ]M1|WinPRO|Touch4G|Start(?:3G|LTE)?|IGO[ _]L[41]|Basco[ _](?:L3|L[45]00|L45[01]|XS1|S2|M1)|M500-1|Hit4G|A450|Neon(?!/)|IGO_L3|JoyPRO|Fresh|GoalPlus)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Optim4G(?:[);/ ]|$)'
@@ -28814,11 +29837,13 @@ Jinga:
       model: 'Iron'
     - regex: 'Fresh(?:[);/ ]|$)'
       model: 'Fresh'
+    - regex: 'IGO_L3(?:[);/ ]|$)'
+      model: 'IGO L3'
     - regex: 'Jinga Basco neo(?:[);/ ]|$)'
       model: 'Basco Neo'
     - regex: 'M500-1(?:[);/ ]|$)'
       model: 'Basco M500 3G'
-    - regex: '(?:Jinga[ _])?Basco[ _](L[13]|L[45]00|XS1|S2)(?:[);/ ]|$)'
+    - regex: '(?:Jinga[ _])?Basco[ _](L[13]|L[45]00|XS1|S2|L45[01]|M1)(?:[);/ ]|$)'
       model: 'Basco $1'
     - regex: 'Jinga Trezor S1 Plus(?:[);/ ]|$)'
       model: 'Trezor S1 Plus'
@@ -28868,7 +29893,7 @@ Torex:
 
 # Doffler
 Doffler:
-  regex: '(24DHS54|32GHS57)(?:[);/ ]|$)'
+  regex: '(24DHS54|32GHS57|40KFS57|32KHS57|43KUS65)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -28880,7 +29905,7 @@ Oyyu:
 
 # Primux (primux.es)
 Primux:
-  regex: 'Primux|SirocoY'
+  regex: 'Primux|SirocoY|Omega6_4G(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Primux_ioxphone(?:[);/ ]|$)'
@@ -28895,6 +29920,8 @@ Primux:
       model: 'Beta 2'
     - regex: 'Primux_?Omega([57])(?:[);/ ]|$)'
       model: 'Omega $1'
+    - regex: 'Omega6_4G(?:[);/ ]|$)'
+      model: 'Omega 6 4G'
 
     - regex: 'PrimuxUP(?:[);/ ]|$)'
       device: 'tablet'
@@ -28930,6 +29957,8 @@ Logic:
       model: 'X60 Plus'
     - regex: 'LOGIC[_ ](L65|X5|X4M)[_ ]LITE(?:[);/ ]|$)'
       model: '$1 Lite'
+    - regex: 'LOGIC[_ ](L65)(?:[);/ ]|$)'
+      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)(?:[);/ ]|$)'
@@ -28939,12 +29968,12 @@ Logic:
 
 # Cloud or Cloud TruConnect (www.cloudmobileusa.com)
 Cloud:
-  regex: '(?:Cirrus_C2|Cyclone_C4|Storm_C3|Stratus_C5(?:_Elite)?|Sunshine_T1|Typhoon_C6|Sunshine_T1_Elite)(?:[);/ ]|$)'
+  regex: '(?:Cirrus_C2|Cyclone_C4|Storm_C3|Stratus_C[57](?:_Elite)?|Sunshine_T1|Typhoon_C6|Sunshine_T1_Elite)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Stratus_C5_Elite'
       model: 'Stratus C5 Elite'
-    - regex: '(Cirrus_C2|Cyclone_C4|Storm_C3|Stratus_C5|Typhoon_C6)'
+    - regex: '(Cirrus_C2|Cyclone_C4|Storm_C3|Stratus_C[57]|Typhoon_C6)'
       model: '$1'
     - regex: '(Sunshine_T1(?:_Elite)?)'
       device: 'tablet'
@@ -29011,7 +30040,7 @@ Völfen:
 
 # Vsmart
 Vsmart:
-  regex: '(?:Joy [123]\+|Joy [34]|Active 1\+|Bee 3|Active [13]|V341U|Bee Lite|Aris| Bee)(?:[);/ ]|$)'
+  regex: '(?:Joy [123]\+|Joy [34]|Active 1\+|Bee 3|Active [13]|V341U|Bee Lite|Aris| Bee|Star [34])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Joy ([123])\+(?:[);/ ]|$)'
@@ -29026,6 +30055,8 @@ Vsmart:
       model: 'Bee Lite'
     - regex: 'Bee(?:[);/ ]|$)'
       model: 'Bee'
+    - regex: 'Star (\d)(?:[);/ ]|$)'
+      model: 'Star $1'
     - regex: 'Active (\d)(?:[);/ ]|$)'
       model: 'Active $1'
     - regex: 'V341U(?:[);/ ]|$)'
@@ -29091,13 +30122,15 @@ Ziox:
 
 # iDroid
 iDroid:
-  regex: '(?:APACHE G6|iDroid Royal V5)(?:[);/ ]|$)'
+  regex: '(?:APACHE G6|iDroid Royal V5|BALR_?X7(?:_PAK)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'APACHE G6'
       model: 'Apache G6'
     - regex: 'Royal V5'
       model: 'Royal V5'
+    - regex: 'BALR_?X7'
+      model: 'Barl X7'
 
 # Aoson
 Aoson:
@@ -29219,13 +30252,13 @@ Time2:
 
 # Sunstech (sunstech.com)
 Sunstech:
-  regex: '(TAB(?:2323GMQC|1081|918QC|917QC-(?:8|16)GB))(?:[);/ ]|$)'
+  regex: '(TAB(?:2323GMQC|1081|918QC|917QC-(?:8|16)GB)|TAB1090)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
 # 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)|Symbol|Cyber [78]|Cyber 9 Pro|Cosmos|W10 Pro|TAB R6 Pro|T5 Pro)(?:[);/ ]|$)|Android 12;(?: [\w-]+;)? W10(?: Build|[;)])'
+  regex: '(?:Venus[_ ](?:X[12]|X1[0245679]|R8 PLUS|R[236-9]|R1[028]|X16-1)|Cosmos[ _](?:V8_lite|V19_Plus|V2[0-3]|U2?|V1[359]|V[45689]|V8-2)|Pearl K[123]|Magic Q8|Magic 5 Plus|Magic (?:[89]|1[13])|Hot[_ ]6|Symbol (?:M1|X|Max|R60|Pro|S4)|Symbol|Cyber [78]|Cyber 9 Pro|Cosmos|W10 Pro|TAB R6 Pro|T5 Pro| M5i)(?:[);/ ]|$)|(?:Android 8(?:[\d.]*);(?: [\w-]+;)? M5 Plus|Android 12;(?: [\w-]+;)? W10)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Cosmos[ _]V8_lite(?:[);/ ]|$)'
@@ -29242,19 +30275,21 @@ Hotwav:
       model: 'Cyber $1 Pro'
     - regex: 'Cyber (\d*)'
       model: 'Cyber $1'
-    - regex: 'Symbol M1'
-      model: 'Symbol M1'
+    - regex: 'Symbol (S4|M1)'
+      model: 'Symbol $1'
     - regex: '(W10|T5) Pro'
       model: '$1 Pro'
     - regex: ' W10?(?:[);/ ]|$)'
       model: 'W10'
+    - regex: ' M5i(?:[);/ ]|$)'
+      model: 'M5i'
     - regex: 'Symbol R60'
       device: 'phablet'
       model: 'Symbol R60'
     - regex: 'TAB R6 Pro'
       device: 'tablet'
       model: 'Tab R6 Rro'
-    - 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)(?:-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'
       model: 'Symbol Pro'
@@ -29323,14 +30358,14 @@ Nos:
 
 # Accent (DBM Maroc) (accent.ma)
 Accent:
-  regex: '(?:ACCENT[_ ]NEON|FAST7 ?3G|PEARL[_ ]A[24567]|TANK_P55|CAMELEON[_ ](?:C[456]|A1|H2)(?:[_ ]PLUS)?|Speed[- ](?:[AXYM]2|X2\+)|SURF1000)(?:[);/ ]|$)'
+  regex: '(?:ACCENT[_ ]NEON|FAST7 ?3G|PEARL[_ ]A[24567]|TANK_P55|CAMELEON[_ ](?:C[456]|A1|H2)(?:[_ ]PLUS)?|Speed[- ](?:[AXYM]2|X2\+)|SURF1000|KIDZY70|SPEED_S8)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ACCENT[_ ]NEON(?:[);/ ]|$)'
       model: 'Neon'
     - regex: 'CAMELEON[_ ]C([65])[_ ]PLUS(?:[);/ ]|$)'
       model: 'Cameleon C$1 Plus'
-    - regex: 'Speed[- ]([AXYM]2)(?:[);/ ]|$)'
+    - regex: 'Speed[- _]([AXYM]2|S8)(?:[);/ ]|$)'
       model: 'Speed $1'
     - regex: 'Speed-X2\+(?:[);/ ]|$)'
       model: 'Speed X2 Plus'
@@ -29350,6 +30385,9 @@ Accent:
     - regex: 'SURF1000(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Surf 1000'
+    - regex: 'KIDZY70(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Kidzy 70'
 
 # Avenzo (www.avenzo.es)
 Avenzo:
@@ -29560,7 +30598,7 @@ Transpeed:
   models:
     - regex: 'TR99 MINI\+'
       model: 'TR99 Mini Plus'
-    - regex: '(?:Transpeed[_ ])?(TR99|H616|6K|X4S)(?:[);/ ]|$)'
+    - regex: '(?:Transpeed[_ ])?(TR99|H616|6K|X4S?)(?:[);/ ]|$)'
       model: '$1'
 
 # 8848 (everest 8848, 8848 titanium)
@@ -29646,11 +30684,13 @@ Pixela:
 
 # Iris
 Iris:
-  regex: '(?:Vox[_ ](?:[45]S|Alpha|POP|STEEL Plus|Energy|FORTIS|VERO)|IS2_?Plus|IS[36]Plus|IS2S|Next_P(?:_PRO)?|NEXT U|NEXT P\+|IRS002-16|X1 mini|Iris_Pad_G8020|G7060|G7100|G8060)(?:[);/ ]|$)'
+  regex: '(?:Vox[_ ](?:[45]S|Alpha|POP|STEEL Plus|Energy|FORTIS|VERO)|IS2_?Plus|IS[36]Plus|IS2S|Next_P(?:_PRO)?|NEXT U|NEXT P\+|IRS002-16|X1 mini|Iris_Pad_G8020|G7060|G7100|G8060)(?:[);/ ]|$)|android 9;(?: [\w-]+;)? (?:N30)(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Vox[_ ]([45])S'
       model: 'Vox $1S'
+    - regex: 'N30(?: Build|[;)])'
+      model: 'N30'
     - regex: 'VOX[_ ]FORTIS'
       model: 'Vox Fortis'
     - regex: 'VOX[_ ]VERO'
@@ -29793,9 +30833,13 @@ Tinmo:
 
 # Verico
 Verico:
-  regex: '(RP-UDM0[12]A|RP-UDP05A|JO-UQM10A)(?:[);/ ]|$)'
+  regex: '(?:RP-UDM0[12]A|RP-UDP05A|JO-UQM10A|UQM1[23]A)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Uni Pad $1'
+  models:
+    - regex: '(RP-UDM0[12]A|RP-UDP05A|JO-UQM10A)'
+      model: 'Uni Pad $1'
+    - regex: '(UQM1[23]A)'
+      model: 'Uni Pad PM-$1'
 
 # TTEC (ttec.com.tr)
 TTEC:
@@ -29805,7 +30849,7 @@ TTEC:
 
 # eSTAR
 eSTAR:
-  regex: 'eSTAR[_ ](?:Grand|GO\!?|Zoom Quad|Gemini|MINI[_ ]3G|BEAUTY|MOON)|MERCURY HD Quad core'
+  regex: 'eSTAR[_ ](?:Grand|GO\!?|Zoom Quad|Gemini|MINI[_ ]3G|BEAUTY|MOON)|(?:MERCURY HD Quad core|MID1020L)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'eSTAR (Grand|GO\!?) (HD Intel|IPS Intel|IPS|HD|Intel) Quad Core 3G'
@@ -29826,6 +30870,8 @@ eSTAR:
       model: 'Beauty 2 HD Quad Core'
     - regex: 'eSTAR[_ ]MINI[_ ]3G'
       model: 'Mini 3G'
+    - regex: '(MID1020L)'
+      model: '$1'
 
 # Hometech (hometech.com.tr)
 Hometech:
@@ -29883,7 +30929,17 @@ NorthTech:
 
 # UNIWA
 UNIWA:
-  regex: 'UNIWA[ _](X5|F40)(?:[);/ ]|$)'
+  regex: 'UNIWA[ _]|(?:W888)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'UNIWA[ _](X5|F40)'
+      model: '$1'
+    - regex: '(W888)'
+      model: '$1'
+
+# ASSE
+ASSE:
+  regex: 'ASSE[-._ ](Q[35]s?)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -29901,13 +30957,13 @@ Silelis:
 
 # Bluedot (bluedot.co.jp)
 Bluedot:
-  regex: 'BLUEDOT[_ ]|(?:BNT-71)(?:[);/ ]|$)'
+  regex: 'BLUEDOT[_ ]|(?:BNT-71|BNT-801W)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(?:BLUEDOT[_ ])?(BNP-500)(?:[);/ ]|$)'
       device: 'smartphone'
       model: '$1'
-    - regex: '(BNT-71)(?:[);/ ]|$)'
+    - regex: '(BNT-71|BNT-801W)(?:[);/ ]|$)'
       model: '$1'
 
 # Planet Computers (https://www.www3.planetcom.co.uk/)
@@ -29948,7 +31004,7 @@ Hezire:
 
 # Hurricane (hurricanemobile.com)
 Hurricane:
-  regex: 'Hurricane[ _]|(?:Flame_Plus|Glaze|Cobra|Ridge Plus|Rush Plus|DZIRE|Android 7(?:[\d.]*);(?: [\w-]+;)? Beam|Vulcan|SAGE|Iris Plus 2021|VortexPlus|Excite|Flint|Panther)(?:[);/ ]|$)'
+  regex: 'Hurricane[ _]|(?:Flame_Plus|Glaze|Cobra|Ridge Plus|Rush Plus|DZIRE|Android 7(?:[\d.]*);(?: [\w-]+;)? Beam|Vulcan|SAGE|Iris Plus 2021|VortexPlus|Excite|Flint|Panther|Slam|Epic)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Hurricane[ _]IGNITE'
@@ -29969,6 +31025,10 @@ Hurricane:
       model: 'Sage'
     - regex: 'Beam'
       model: 'Beam'
+    - regex: 'Slam'
+      model: 'Slam'
+    - regex: 'Epic'
+      model: 'Epic'
     - regex: 'Vulcan'
       model: 'Vulcan'
     - regex: 'Flame_Plus'
@@ -30012,7 +31072,7 @@ iSWAG:
 
 # Reeder (reeder.com.tr)
 Reeder:
-  regex: '(?:reeder[_ ](?:3G_Tablet|A7iC|A[78]i[_ ]Quad|A8i Q2|M8 Plus|[TM]8|M10 Plus|P11SE|M7_Go)|M8_Go|M10SPlus|P12Curve|M10 Pro LTE|M10 Blue Max|P13_Blue_Plus|P13_Max_Blue|P13[_ ]Blue[_ ]Ma(?:ks|x|xL)|P13_Blue|P13 Blue 202[12]|M7Plus|A8i-Q2|M7Go_2019)(?:[);/ ]|$)'
+  regex: '(?:reeder[_ ](?:3G_Tablet|A7iC|A[78]i[_ ]Quad|A8i Q2|M8 Plus|[TM]8|M10 Plus|P11SE|M7_Go)|M8_Go|M10SPlus|P12Curve|M10 Pro LTE|M10 Blue Max|P13_Blue_Plus|P13_Max_Blue|P13[_ ]Blue[_ ]Ma(?:ks|x|xL)|P13_Blue|P13 Blue 202[12]|M7Plus|A8i-Q2|M7Go_2019|M10 GO|S19 Max 64GB)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'A8i-Q2'
@@ -30025,8 +31085,8 @@ Reeder:
       model: 'M7 Plus'
     - regex: '(?:reeder_)?(?:M7Go_2019|M7_Go)'
       model: 'M7 Go'
-    - regex: '(?:reeder_)?(?:M8_Go)'
-      model: 'M8 Go'
+    - regex: '(?:reeder_)?(M8|M10)[_ ]Go'
+      model: '$1 Go'
     - regex: 'M10 Blue Max'
       model: 'M10 Blue Max'
     - regex: 'M10 Pro LTE'
@@ -30064,6 +31124,9 @@ Reeder:
     - regex: 'P13_Blue'
       device: 'smartphone'
       model: 'P13 Blue'
+    - regex: 'S19 Max 64GB'
+      device: 'smartphone'
+      model: 'S19 Max'
 
 # ELARI (elari.net)
 ELARI:
@@ -30073,11 +31136,13 @@ ELARI:
 
 # Epik One or EPIKONE (epikmobile.com)
 '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)(?:[);/ ]|$)'
+  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:
     - regex: 'K501 Plus'
       model: 'Leo Plus'
+    - regex: 'RS550'
+      model: 'RS550'
     - regex: 'K501'
       model: 'Leo'
     - regex: 'K500'
@@ -30110,6 +31175,8 @@ ELARI:
       model: 'Royal'
     - regex: 'K540'
       model: 'Excalibur'
+    - regex: 'X400'
+      model: 'Pebble X400'
     - regex: 'K573'
       model: 'Panther'
     - regex: 'K600'
@@ -30266,7 +31333,7 @@ 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)(?:[);/ ]|$)'
+  regex: ' (MC2[27]00|TC15|TC2[0156]|TC5[1267]|TC7[05]x|TC7[57]|TC700H|ET51|MC33|MC93|EC30|TC55|PS20J|VC8300)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(TC15|TC2[0156]|TC5[1267]|TC7[05]x|TC7[57]|TC700H|MC33|EC30|TC55)(?:[);/ ]|$)'
@@ -30274,9 +31341,12 @@ Zebra:
     - regex: '(ET51)(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
-    - regex: '(MC2[27]00|MC93)(?:[);/ ]|$)'
+    - regex: '(MC2[27]00|MC93|PS20J)(?:[);/ ]|$)'
       device: 'peripheral'
       model: '$1'
+    - regex: '(VC8300)'
+      device: 'car browser'
+      model: '$1'
 
 # Thuraya (thuraya.com)
 Thuraya:
@@ -30338,13 +31408,19 @@ Artizlee:
 
 # Mint or Mint Connect
 Mint:
-  regex: '(?:Pearl_Neo|M4CRD?)(?:[);/ ]|$)'
+  regex: '(?:Pearl_Neo|M4CRD?|Emerald_M55CR|Mint[ _](?:VirGo|Orion))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Pearl_(Neo)'
       model: 'Pearl $1'
+    - regex: 'Emerald[_ ]M55CR'
+      model: 'Emerald'
     - regex: 'M4CR'
       model: 'Clover'
+    - regex: '(?:Mint[_ ])?VirGo'
+      model: 'VirGo'
+    - regex: '(?:Mint[_ ])?Orion'
+      model: 'Orion'
 
 # Mintt (www.mintt.co)
 Mintt:
@@ -30353,7 +31429,7 @@ Mintt:
   models:
     - regex: 'Coolmintt ?(Blaze 2|[PM]1|P3|A[35]|M2)(?:[);/ ]|$)'
       model: 'CoolMintt $1'
-    - regex: 'Ultramintt ?([SR]1|S2|Y3|[AY]5|X6)(?:[);/ ]|$)'
+    - regex: 'Ultramintt ?([SR]1|S2|Y3|[AY]5|X[56])(?:[);/ ]|$)'
       model: 'UltraMintt $1'
     - regex: 'FRESHMINTT ?(A7|A10)(?:[);/ ]|$)'
       device: 'tablet'
@@ -30493,11 +31569,13 @@ Sansui:
 
 # Sico (sico.com.eg)
 Sico:
-  regex: 'SICO[_ ](?:PLUS|e1002|Topaz)|(?:Express3-Max|SSR3-1-51-5M|SSD-1-53-13M|Mega2(?:max)?|Express3|Diamond 2|Plus3_4G|Plus2 4G|Infinity Max|Nile X)(?:[);/ ]|$)'
+  regex: 'SICO[_ ](?:PLUS|e1002|Topaz)|(?:Express3-Max|SSR3-1-51-5M|SSD-1-53-13M|Mega2(?:max)?|Express3|Diamond 2|Plus3_4G|Plus2 4G|Infinity Max|Nile X|More_3)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'SICO[_ ]PLUS2|Plus2 4G'
       model: 'Plus 2'
+    - regex: 'More_3'
+      model: 'More 3'
     - regex: 'Plus3_4G'
       model: 'Plus 3'
     - regex: 'SICO[_ ]PLUS'
@@ -30850,7 +31928,7 @@ Invens:
 
 # Chico Mobile (chicomobile.ph)
 Chico Mobile:
-  regex: '(?:ALTO (?:Bombo|classic|Estrella|JUEGO|SUBIR|[235])|FUEGO MAX|OJOS[ _](?:CAMBIO|NUBE|[68i]|ORO)|AVANCE classic)(?:[);/ ]|$)'
+  regex: '(?:ALTO (?:Bombo|classic|Estrella|JUEGO|SUBIR|[235])|FUEGO MAX|OJOS[ _](?:CIELO|CAMBIO|NUBE|[68i]|ORO|VIVIR|Plus|DOS mini|DOS|LUNA|X1)|AVANCE classic)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ALTO Bombo'
@@ -30867,7 +31945,7 @@ Chico Mobile:
       model: 'Alto Subir'
     - regex: 'ALTO ([235])'
       model: 'Alto $1'
-    - regex: 'OJOS[ _]([68i])'
+    - regex: 'OJOS[ _]([68i]|X1)'
       model: 'Ojos $1'
     - regex: 'OJOS NUBE'
       model: 'Ojos Nube'
@@ -30875,6 +31953,18 @@ Chico Mobile:
       model: 'Ojos Cambio'
     - regex: 'OJOS ORO'
       model: 'Ojos Oro'
+    - regex: 'OJOS LUNA'
+      model: 'Ojos Luna'
+    - regex: 'OJOS CIELO'
+      model: 'Ojos Cielo'
+    - regex: 'OJOS PLUS'
+      model: 'Ojos Plus'
+    - regex: 'OJOS VIVIR'
+      model: 'Ojos Vivir'
+    - regex: 'OJOS DOS mini'
+      model: 'Ojos DOS Mini'
+    - regex: 'OJOS DOS'
+      model: 'Ojos DOS'
 
     - regex: 'FUEGO MAX'
       device: 'tablet'
@@ -30894,11 +31984,13 @@ 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)(?:[);/ ]|$)'
+  regex: '(?:Camfone (?:SE)|Hero[_ ](?:H5\+|SE2|H9|(?: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)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'Furious 7 Pro'
+      model: 'Furious 7 Pro'
     - regex: 'Camfone (SE)(?:[);/ ]|$)'
       model: '$1'
 
@@ -30910,15 +32002,17 @@ Bellphone:
 
 # Gini
 Gini:
-  regex: 'Gini[ _]'
+  regex: 'Gini[ _]|(?:SW17W13|SW17W08)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Gini[ _]W(7)'
       model: 'W$1'
     - regex: 'Gini[ _]n(8)'
       model: 'N$1'
-    - regex: 'Gini[ _]s5Pro'
+    - regex: 'Gini[ _]s5Pro|SW17W13'
       model: 'S5 Pro'
+    - regex: 'SW17W08'
+      model: 'S5'
     - regex: 'Gini[ _]Tab[ _](V[78])'
       device: 'tablet'
       model: 'Tab $1'
@@ -30975,7 +32069,7 @@ EWIS:
 
 # Leader Phone or LP (lp.tn) or LP (TN)
 Leader Phone:
-  regex: '(Vyper|N-5[07]|N-45|LP DAISY|LP_(?:VEYRON|PRADO|Pro1|B-50)|LP_T70|LP INFINITY\+|LP T70 Lite|INFINITY_light|Alphatel_T1)(?:[);/ ]|$)'
+  regex: '(Vyper|N-5[07]|N-45|LP DAISY|LP_(?:Spectrum_S2|VEYRON|PRADO|Pro1|B-50|EVORA_light)|LP_T70|LP[ _]INFINITY\+?|LP T70 Lite|INFINITY_light|Alphatel_T1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'N-45 light'
@@ -30990,10 +32084,16 @@ Leader Phone:
       model: 'Prado'
     - regex: 'LP_B-50'
       model: 'B50'
+    - regex: 'LP_Spectrum_S2'
+      model: 'Spectrum S2'
     - regex: 'INFINITY_light'
       model: 'Infinity Light'
     - regex: 'LP INFINITY\+'
       model: 'Infinity Plus'
+    - regex: 'LP_INFINITY'
+      model: 'Infinity'
+    - regex: 'LP_EVORA_light'
+      model: 'Evora Light'
     - regex: 'LP T70 Lite'
       device: 'tablet'
       model: 'T70 Lite'
@@ -31095,13 +32195,13 @@ NOVO:
 
 # Winnovo (www.mywinnovo.com)
 Winnovo:
-  regex: 'Winnovo|(?:T10LTE|H10_US)(?:[);/ ]|$)'
+  regex: 'Winnovo|(?:T10LTE|H(?:7|10)_US)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'T10LTE(?:[);/ ]|$)'
       model: 'T10 LTE'
-    - regex: 'H10_US(?:[);/ ]|$)'
-      model: 'H10'
+    - regex: 'H(7|10)_US(?:[);/ ]|$)'
+      model: 'H$1'
     - regex: 'Winnovo[ _]?(M866|M798|VTab|750[PK]|T2)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Winnovo[ _](V51)'
@@ -31191,11 +32291,13 @@ Shtrikh-M:
 
 # BBK (bbk.ru)
 BBK:
-  regex: '(?:32LEX-7272|([65]5|50|4[03]|3[29]|2[48])LEX[-_](81(?:27|39|45|58|6[12]|7[34])|71(?:[23]7|4[345]|5[45]|6[2368]|[57]8|7[15]))[_/]([FU]?TS2C))(?:[);/ ]|$)'
+  regex: '(?:32LEX-7272|([65]5|50|4[03]|3[29]|2[48])LEX[-_](81(?:27|39|45|58|6[12]|7[34])|71(?:[23]7|4[345]|5[45]|6[2368]|[57]8|7[15])|725[79]|7225|8243)[_/]?([FU]?TS2C)|39LEX-7289)(?:[);/ ]|$)'
   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: '39LEX-7289(?:[);/ ]|$)'
+      model: '39LEX-7289/TS2C'
     - regex: '(\d{2})LEX[-_](\d{3,4})'
       model: '$1LEX-$2'
 
@@ -31266,7 +32368,7 @@ Formuler:
   regex: 'Formuler[ _]|(?:S_TURBO_PRO)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'Formuler[ _](Z8(?: Pro)?|Z Alpha)(?:[);/ ]|$)'
+    - regex: 'Formuler[ _](Z(?:8|10)(?: Pro)?|Z Alpha)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'S_TURBO_PRO(?:[);/ ]|$)'
       model: 'S Turbo Pro'
@@ -31317,9 +32419,9 @@ Jiake:
   device: 'smartphone'
   model: 'JK-$1'
 
-# iQ&T (iqandt.com)
+# iQ&T or iQandT (iqandt.com)
 'iQ&T':
-  regex: '(IFoo (?:U200|H55))(?:[);/ ]|$)'
+  regex: '(IFoo (?:U200|H55|S50))(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -31367,17 +32469,15 @@ Linnex:
   device: 'smartphone'
   model: 'Li $1'
 
-# Smartab
-Smartab:
-  regex: '(ST1009|ST7160)(?:[);/ ]|$)'
-  device: 'tablet'
-  model: '$1'
-
 # SuperTab (supertab-dz.com)
 SuperTab:
-  regex: 'SuperTab(A10|K7|S7G)(?:[);/ ]|$)'
+  regex: '(?:SuperTab(?:A10|K7|S7G)|K7 Kids)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: 'SuperTab(A10|K7|S7G)'
+      model: '$1'
+    - regex: 'K7 Kids'
+      model: 'K7 Kids'
 
 # Suzuki (suzukitech.com)
 Suzuki:
@@ -31508,7 +32608,7 @@ Gresso:
 
 # Pendoo  (pendoo.tv)
 Pendoo:
-  regex: 'Pendoo|A5X MAX(?:[\.-]\w+)?\.01\.d4'
+  regex: 'Pendoo|A5X MAX(?:[\.-]\w+)?\.01\.d4|(?:PNDP60L10BLK|PNDP60M7PUR)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'Pendoo ?(T95Z|X10) PLUS'
@@ -31519,8 +32619,13 @@ Pendoo:
       model: '$1'
     - regex: 'pendoo mini'
       model: 'Mini'
+    - regex: 'X11 PRO'
+      model: 'X11 Pro'
     - regex: 'A5X MAX(?:[\.-]\w+)?\.01\.d4'
       model: 'A5X Max'
+    - regex: '(PNDP60L10BLK|PNDP60M7PUR)'
+      device: 'tablet'
+      model: '$1'
 
 # PiPO (pipo.com)
 PiPO:
@@ -31561,9 +32666,14 @@ Blloc:
 
 # Huskee
 Huskee:
-  regex: 'VULKANO(?:[);/ ]|$)'
+  regex: '(?:VULKANO|ST-810)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: 'Vulkano'
+  models:
+    - regex: 'VULKANO'
+      model: 'Vulkano'
+    - regex: '(ST-810)'
+      device: 'tablet'
+      model: '$1'
 
 # SOLE
 SOLE:
@@ -31603,17 +32713,6 @@ Singtech:
     - regex: 'Infinity_I_Mix(?:[);/ ]|$)'
       model: 'Infinity I Mix'
 
-# Sunny
-Sunny:
-  regex: '(?:SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola|SN7014S?|SN7016|SN10016)(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: '(SS4G9 Mira|SS4G7 Sole|SS4G1 Luna|SS4G8 Nora|SS4G6 Lola)(?:[);/ ]|$)'
-      model: '$1'
-    - regex: '(SN7014S?|SN7016|SN10016)(?:[);/ ]|$)'
-      device: 'tablet'
-      model: '$1'
-
 # TEENO sub brand GOWN(HK)
 TEENO:
   regex: 'TEENO'
@@ -31682,7 +32781,7 @@ F150:
   regex: '(?:Bison2021|B2021|[HR]2022|Air1 Pro| Air1| B1 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '([HR]2022|Air1 (?:Ultra|Pro)|Air1|B1 Pro)(?:[);/ ]|$)'
+    - regex: '([HR]2022|Air1 (?:Ultra\+?|Pro)|Air1|B1 Pro)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(?:Bison2021|B2021)(?:[);/ ]|$)'
       model: 'B2021'
@@ -31719,7 +32818,7 @@ Kyowon:
 
 # LT Mobile or LT Electronics (lt-smartphone.com or lt-yemen.com)
 LT Mobile:
-  regex: 'LT[ _-](?:P[89]|P10I|NOTE 10[SM]|NOTE 30|C1[45]00|C3[1235]00|S10[ _]Lite|S10|S9_NOTE)|(?:C3[67]00)(?:[);/ ]|$)'
+  regex: 'LT[ _-](?:P[89]|P10I|NOTE 10[SM]|NOTE 30|C1[45]00|C3[1235]00|S10[ _]Lite|S10|S9_NOTE|M[56]|M5_lite)|(?:C3[67]00)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'LT[- ]NOTE ([13]0[SM]?)'
@@ -31748,14 +32847,20 @@ LT Mobile:
       model: 'P10i'
     - regex: 'LT[ _]P([89])(?:[);/ ]|$)'
       model: 'P$1'
+    - regex: 'LT[ _]M([56])[_ ]lite(?:[);/ ]|$)'
+      model: 'M$1 Lite'
+    - regex: 'LT[ _]M([56])(?:[);/ ]|$)'
+      model: 'M$1'
 
 # ONYX BOOX (onyx-boox.ru)
 ONYX BOOX:
-  regex: '(?:KON_TIKI(2)?|Nova3Color|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?)(?:[);/ ]|$)'
+  regex: '(?:KON_TIKI(2)?|Nova3Color|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?|LIVINGSTONE2|MC_FAUST[23]|DARWIN9|MC_DARWIN[678]|MC_GAMA4|MC_Cristo4|MC_NovaPro)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'NovaAirC'
       model: 'Nova Air C'
+    - regex: 'MC_NovaPro'
+      model: 'Nova Pro'
     - regex: 'NoteAir2P'
       model: 'Nova Air 2 Plus'
     - regex: 'NoteAir2'
@@ -31768,6 +32873,16 @@ ONYX BOOX:
       model: 'Kon Tiki $1'
     - regex: 'Lomonosov'
       model: 'Lomonosov'
+    - regex: 'MC_FAUST([23])'
+      model: 'Faust $1'
+    - regex: '(?:MC_)?DARWIN([6789])'
+      model: 'Darwin $1'
+    - regex: 'MC_GAMA4'
+      model: 'Gama 4'
+    - regex: 'MC_Cristo4'
+      model: 'Monte Cristo 4'
+    - regex: 'LIVINGSTONE2'
+      model: 'Living Stone 2'
 
 # AIRON (airon.ua)
 AIRON:
@@ -31775,17 +32890,42 @@ AIRON:
   device: 'tablet'
   model: 'AirBook Pro 8S'
 
+# 5IVE
+5IVE:
+  regex: 'Tarzan F1(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'Tarzan F1'
+
 # GFive or G'Five (www.gfivepakistan.com)
 GFive:
-  regex: '(?:PRESIDENT_GOLD_(9|10)|President Gpower 1|Stark(?![_ ]K1))(?:[);/ ]|$)'
+  regex: 'GFIVE[_ ]|(?:PRESIDENT_GOLD_(9|10)|President Gpower 1|Stark(?![_ ]K1)|Gpad70[12])(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PRESIDENT_GOLD_(9|10)'
       model: 'President Gold $1'
     - regex: 'President Gpower 1'
       model: 'President GPower 1'
+    - regex: 'GFIVE[_ ]President[_ ]Xhero[_ ](\d)'
+      model: 'President XHero $1'
+    - regex: 'President (A97)'
+      model: 'President $1'
+    - regex: 'President Classic (\d)'
+      model: 'President Classic $1'
+    - regex: 'President G6 Plus'
+      model: 'President G6 Plus'
+    - regex: 'President G10 Fashion'
+      model: 'President G10 Fashion'
+    - regex: 'President ?\(?G(\d)\)?'
+      model: 'President G$1'
+    - regex: 'President Tango (\d)'
+      model: 'President Tango $1'
+    - regex: 'GFIVE[_ ]President[_ ]Smart[_ ](A98|\d)'
+      model: 'President Smart $1'
     - regex: 'Stark'
       model: 'Stark'
+    - regex: 'GPad(70[12])'
+      device: 'tablet'
+      model: 'GPad$1'
 
 # KINGZONE or KING ZONE
 KINGZONE:
@@ -31799,7 +32939,7 @@ KINGZONE:
 
 # MTech
 M-Tech:
-  regex: '(?:Eros[_ ](4G|Star|Smart)|MTECH (?:ACE9|TURBO L\d+|TEZ 4G|JAZBAA)|Foto3)(?:[);/ ]|$)'
+  regex: '(?:Eros[_ ](4G|Star|Smart|Plus|Power)|MTECH (?:ACE9|TURBO L\d+|TEZ 4G|JAZBAA)|Foto3)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'EROS 4G'
@@ -31808,6 +32948,10 @@ M-Tech:
       model: 'Eros Star'
     - regex: 'Eros[_ ]Smart'
       model: 'Eros Smart'
+    - regex: 'Eros[_ ]Plus'
+      model: 'Eros Plus'
+    - regex: 'Eros[_ ]Power'
+      model: 'Eros Power'
     - regex: 'ACE9'
       model: 'Ace 9'
     - regex: 'JAZBAA'
@@ -31960,7 +33104,7 @@ Axioo:
 
 # Pico (pico-interactive.com)
 Pico:
-  regex: 'Pico (G2 4K)(?:[);/ ]|$)'
+  regex: 'Pico (G2 4K|Neo 3)(?:[);/ ]|$)'
   device: 'wearable'
   model: '$1'
 
@@ -31972,9 +33116,13 @@ STG Telecom:
 
 # Rivo
 Rivo:
-  regex: 'PHANTOM (?:PZ|RX)|RHYTHM[ _]RX'
+  regex: 'PHANTOM (?:PZ|RX)|RHYTHM[ _]RX|(?:STORM_S8(?: ?plus)?)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'STORM_S8plus'
+      model: 'Storm S8 Plus'
+    - regex: 'STORM_S8'
+      model: 'Storm S8'
     - regex: 'PHANTOM PZ ?(2[05]|[13]5|4|18)(?:[);/ ]|$)'
       model: 'Phantom PZ$1'
     - regex: 'PHANTOM RX ?(298|387)(?:[);/ ]|$)'
@@ -32033,10 +33181,10 @@ KREZ:
 
 # KRIP (https://www.krip.com/)
 KRIP:
-  regex: 'KRIP_|K(?:4[bm]|5[bdm]|6b|55h?|57|65)(?:[);/ ]|$)'
+  regex: 'KRIP_|K(?:4[bm]|5[bdm]|6b|55h?|57|65|700A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(?:KRIP_)?K(4[bm]?|5[bdm]|6b|55h?|57|65)(?:[);/ ]|$)'
+    - regex: '(?:KRIP_)?K(4[bm]?|5[bdm]|6b|55h?|57|65|700A)(?:[);/ ]|$)'
       model: 'K$1'
 
 # Kurio or KD Interactive (www.group-kd.com, kdplanet.com)
@@ -32231,7 +33379,7 @@ Elekta:
 
 # YASIN (yasintv.kz)
 YASIN:
-  regex: 'YASIN Android TV(?:[);/ ]|$)'
+  regex: 'YASIN (?:Android|2K) TV(?:[);/ ]|$)'
   device: 'tv'
   model: ''
 
@@ -32251,7 +33399,7 @@ Blow:
 
 # FNF
 FNF:
-  regex: 'ifive(?:[_ ]mini[_ ][43]G?S|X2|Mini3|3| Air)(?:[);/ ]|$)'
+  regex: '(?:ifive[_ ]?(?:mini[_ ][43]G?S|X2|Mini3|3|Air|Pro 2))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'ifive[_ ]mini[_ ]([43]G?S)'
@@ -32260,8 +33408,10 @@ FNF:
       model: 'iFive $1'
     - regex: 'ifiveMini3'
       model: 'iFive Mini 3'
-    - regex: 'ifive Air'
+    - regex: 'ifive ?Air'
       model: 'iFive Air'
+    - regex: 'ifive Pro 2'
+      model: 'iFive Pro 2'
 
 # iMan
 iMan:
@@ -32289,11 +33439,13 @@ ivvi:
 
 # Dragon Touch (dragontouch.com)
 Dragon Touch:
-  regex: '(?:Notepad[_ ](?:K10|102|Y80)|MAX 10)(?:[);/ ]|$)'
+  regex: '(?:Notepad[_ ](?:K10|102|Y80)|MAX 10|T12M_EEA)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'MAX 10'
       model: 'Max 10'
+    - regex: 'T12M'
+      model: 'T12M'
     - regex: 'Notepad[_ ](K10|102|Y80)'
       model: 'Notepad $1'
 
@@ -32347,15 +33499,19 @@ VIWA:
     - regex: 'POWER P1'
       model: 'Power P1'
 
-# M-Horse (www.mhorse.com)
+# M-Horse or M Horse (www.mhorse.com)
 M-Horse:
-  regex: 'M-HORSE|(?:Pure (?:3|2A?)|Pure ?1|Power1)(?:[);/ ]|$)'
+  regex: 'M-HORSE|(?:Pure (?:3|2A?)|Pure ?1|Power1|Top_(?:S[78]|P9|H740|10|i7|Note8)|Top-V30)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Pure ?([13]|2A?)(?:[);/ ]|$)'
       model: 'Pure $1'
     - regex: 'Power1'
       model: 'Power 1'
+    - regex: 'Top[_ -](S[78]|P9|H740|10|i7|V30)'
+      model: 'Top $1'
+    - regex: 'TOP_Note8'
+      model: 'Top Note 8'
 
 # ProVision (www.provision.co.ir/en)
 ProVision:
@@ -32484,7 +33640,7 @@ 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)(?:[);/ ]|$)| 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|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|[;)])'
   device: 'smartphone'
   models:
     - regex: 'STYLO[ _](F1|Viva)'
@@ -32560,6 +33716,9 @@ Stylo:
     - regex: 'TARISTAB([2-4])'
       device: 'tablet'
       model: 'Taris Tab $1'
+    - regex: 'DVK87'
+      device: 'tablet'
+      model: 'Orion 8 Tab'
 
 # galaxy innovations or GI  (www.galaxy-innovations.ru)
 Galaxy Innovations:
@@ -32575,9 +33734,14 @@ Galaxy Innovations:
 
 # Benzo
 Benzo:
-  regex: '(Class S300 LTE)(?:[);/ ]|$)'
+  regex: '(?:Class S300 LTE|G-PADLITE)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'G-PADLITE'
+      device: 'tablet'
+      model: 'GPad Lite'
+    - regex: '(Class S300 LTE)'
+      model: '$1'
 
 # Vexia (www.vexia.eu)
 Vexia:
@@ -32619,7 +33783,7 @@ Packard Bell:
 
 # Qnet Mobile (qnetmobile.com)
 Qnet Mobile:
-  regex: ' Passion[ _]P|Hynex plus|Stark K1|Hynex H[356]|Levin V[12]'
+  regex: ' Passion[ _]P|Hynex plus|Stark K1|Hynex H[356]|Levin V[12]|Aston A[357]\+'
   device: 'smartphone'
   models:
     - regex: 'Passion[ _](P[0-9]+)'
@@ -32634,6 +33798,8 @@ Qnet Mobile:
       model: 'Hynex $1'
     - regex: 'Levin (V[12])'
       model: 'Levin $1'
+    - regex: 'Aston A([357])\+'
+      model: 'Aston A$1 Plus'
 
 # Bluebird (www.bluebirdcorp.com)
 Bluebird:
@@ -32695,7 +33861,7 @@ Glofiish:
 
 # Polar (polar.ru)
 Polar:
-  regex: 'Polar(?:_WK)?[_ ](P32L32T2CSM|P24L51T2CSM|P40L33T2CSM|P43U51T2SCSM|P39L21T2CSM)(?:[);/ ]|$)'
+  regex: 'Polar(?:_WK?)?[_ ](P32L32T2CSM|P24L51T2CSM|P40L33T2CSM|P43U51T2SCSM|P39L21T2CSM|P32L21T2SCSM|P65U51T2CSM|P42L21T2CSM|P50U51T2SCSM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -32731,7 +33897,7 @@ neoCore:
 
 # Novex
 Novex:
-  regex: '(NWX-40F171MSY)(?:[);/ ]|$)'
+  regex: '(NWX-40F171MSY|NVX-32H219MSY|NVX-43U329MSY|NVX-39H211MSY|NWX-43F149MSYv?|NWX-24H121MSY|NWX-32H171MSY)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -32743,10 +33909,10 @@ Epson:
 
 # Awow or AWOW (awowtech.com)
 Awow:
-  regex: '(UTBook|CreaPad_1009_EEA)'
+  regex: '(?:AWOW_)?(UTBook|CreaPad_100[39]_EEA)'
   device: 'tablet'
   models:
-    - regex: '(UTBook|CreaPad_1009)'
+    - regex: '(?:AWOW_)?(UTBook|CreaPad_100[39])'
       model: '$1'
 
 # Mitsui (www.diamond-electronics.com)
@@ -32773,10 +33939,10 @@ LEMFO:
 
 # Urovo (en.urovo.com)
 Urovo:
-  regex: '(?:DT[45]0)(?:[);/ ]|$)'
+  regex: '(?:DT[45]0|i6200[AS])(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(DT[45]0)'
+    - regex: '(DT[45]0|i6200[AS])'
       device: 'peripheral'
       model: '$1'
 
@@ -32822,7 +33988,7 @@ Bubblegum:
 
 # Erisson
 Erisson:
-  regex: '(42FLEA73T2SM|42FLX9060T2|39LES80T2SM)(?:[);/ ]|$)'
+  regex: '(42FLEA73T2SM|42FLX9060T2|39LES80T2SM|32LX9051T2|55ULES92T2SM)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -32963,6 +34129,12 @@ Atvio:
   device: 'tablet'
   model: '$1'
 
+# XY AUTO or XY LINK OR CAR AUDIO
+XY Auto:
+  regex: '(YT5760[ABL]|YT5716C?|YT7216C?|YT7260[BL]|YT9216[BC]J|YT9213AJ|YT9270)(?:[);/ ]|$)'
+  device: 'car browser'
+  model: '$1'
+
 # Alps
 Alps:
   regex: '(?:FF-5000|ZQ8003|825X_Pro|03_v89_jbl|benz_hy1920x720|8227L_demo)(?:[);/ ]|$)'
@@ -32977,11 +34149,11 @@ Alps:
 
 # Starwind (starwind.com.ru)
 Starwind:
-  regex: 'Smart_Starwind|(?:SW-LED32SB302|SW-LED42SB300)(?:[);/ ]|$)'
+  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB302|42SB300|40SG300|43SG30[20]|32SG30[012]|55UG400))(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: '(SW-LED32SB302|SW-LED42SB300)'
-      model: '$1'
+    - regex: 'SW-LED(\d{2}[SU][BG]\d{3})'
+      model: 'SW-LED$1'
 
 # QTECH (https://www.qtech.ru/en/)
 QTECH:
@@ -32993,7 +34165,7 @@ QTECH:
 
 # Prology (www.prology.ru)
 Prology:
-  regex: '(MPC-(?:[57]0|65)|MPC-110DSP)(?:[);/ ]|$)'
+  regex: '(MPC-(?:[57]0|65|100)|MPC-110DSP)(?:[);/ ]|$)'
   device: 'car browser'
   model: '$1'
 
@@ -33040,7 +34212,7 @@ Smarty:
 
 # Leff
 Leff:
-  regex: '(32H540S|32H5[235]0T)(?:[);/ ]|$)'
+  regex: '(32H540S|32H5[235]0T|5[05]U540S|40F540S|43F5[35]0T|32H511T)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -33094,10 +34266,16 @@ Sunmi:
 
 # iData (idataglobal.com)
 iData:
-  regex: 'iData (K1)'
+  regex: 'iData[ _](K1|50|i3AL)(?:[);/ ]|$)'
   device: 'peripheral'
   model: '$1'
 
+# iDino
+iDino:
+  regex: 'NOTEBOOK6(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'Notebook 6'
+
 # AIDATA
 AIDATA:
   regex: '(?:AIDATA ELDE 10 TABLET|ADT_?1061(?:_1)?|ADT1012L)(?:[);/ ]|$)'
@@ -33178,17 +34356,23 @@ Amino:
 
 # Saiet (acquistaonline.saiet.it)
 Saiet:
-  regex: '(?:STS5[57]0)(?:[);/ ]|$)'
+  regex: '(?:STS5[57]0|STS502)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(STS5[57]0)'
       model: 'Sicuro Smart $1'
+    - regex: '(STS502)'
+      model: '$1'
 
 # Magicsee (magicsees.com)
 Magicsee:
-  regex: 'N5NOVA(?:[);/ ]|$)'
+  regex: '(?:N5NOVA|IRON\+)(?:[);/ ]|$)'
   device: 'tv'
-  model: 'N5 Nova'
+  models:
+    - regex: 'N5NOVA'
+      model: 'N5 Nova'
+    - regex: 'IRON\+'
+      model: 'Iron+'
 
 # Obabox (www.obabox.com.br)
 Obabox:
@@ -33226,7 +34410,7 @@ IRA:
 
 # Microtech (microtech.store)
 Microtech:
-  regex: '(?:ETL101(?:GB|AL)|ETW101GT)(?:[);/ ]|$)'
+  regex: '(?:ETL101(?:GB|AL)|ETW101GT(?:_C)?)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'ETW101GT'
@@ -33236,7 +34420,7 @@ Microtech:
 
 # Gplus (gpluselectronics.com)
 Gplus:
-  regex: 'Gplus[ _]([ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus)(?:[);/ ]|$)'
+  regex: 'Gplus[ _]([ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus|S10)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -33256,17 +34440,27 @@ VEON:
 
 # FiGi (figi-mobile.com)
 FiGi:
-  regex: '(?:Note_(?:[37]|11)_Pro|Note_1C|Note_1_Lite|Nopal|[MGF]two)(?:[);/ ]|$)|Android 8(?:[\d.]*);(?: [\w-]+;)? Fj(?: Build|[;)])'
+  regex: 'FIGI[_ ]|(?:Note_(?:[37]|11)_Pro|Note_(?:1C|5)|Note_1_Lite|Nopal|[MGF]two|Hola)(?:[);/ ]|$)|Android 8(?:[\d.]*);(?: [\w-]+;)? Fj(?: Build|[;)])'
   device: 'smartphone'
   models:
     - regex: 'Nopal'
       model: 'Nopal'
+    - regex: 'FIGI[_ ]P40 Max'
+      model: 'P40 Max'
+    - regex: 'FIGI[_ ]P40'
+      model: 'P40'
+    - regex: 'Hola'
+      model: 'Hola'
     - regex: '([MGF])two'
       model: '$1two'
+    - regex: '(FSE1020)'
+      model: '$1'
     - regex: ' Fj(?: Build|[;)])'
       model: 'Fj'
     - regex: 'Note_1C'
       model: 'Note 1C'
+    - regex: 'Note_5'
+      model: 'Note 5'
     - regex: 'Note_([37]|11)_Pro'
       device: 'phablet'
       model: 'Note $1 Pro'
@@ -33332,9 +34526,13 @@ Beista:
 
 # YOTOPT (www.yotopt.com)
 YOTOPT:
-  regex: '(Y103|Q11)[-_]EEA(?:[);/ ]|$)'
+  regex: '(?:X109|(?:Y103|Q11)[-_]EEA)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: '(Y103|Q11)[-_]EEA'
+      model: '$1'
+    - regex: '(X109)(?:[);/ ]|$)'
+      model: '$1'
 
 # Ookee
 Ookee:
@@ -33424,7 +34622,7 @@ Technopc:
 
 # OMIX or OMIX Mobile (omixmobile.com)
 OMIX:
-  regex: 'OMIX[ _]|(?:X600 NFC)(?:[);/ ]|$)'
+  regex: 'OMIX[ _]|(?:X600 NFC|Android 11;(?: [\w-]+;)? X400)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'X600 NFC'
@@ -33677,8 +34875,8 @@ Zeeker:
   regex: 'ZEEKER'
   device: 'smartphone'
   models:
-    - regex: 'ZEEKER[ _]P10'
-      model: 'P10'
+    - regex: 'ZEEKER[ _](P10|T100)'
+      model: '$1'
 
 # AUX
 AUX:
@@ -33738,7 +34936,7 @@ Vortex:
 
 # Xiaodu or Baidu Xiaodu
 Xiaodu:
-  regex: '(XDH-(?:0F-A1|1[78]-A1|21-A1|29-B1|2A-B1))(?:[);/ ]|$)'
+  regex: '(XDH-(?:0F-A1|1[78]-A1|21-A1|29-B1|2A-B1)|XD-SDD05-2101)(?:[);/ ]|$)'
   device: 'smart display'
   model: '$1'
 
@@ -33808,7 +35006,7 @@ Listo:
 
 # ECON
 ECON:
-  regex: '(EX-32HS016B)'
+  regex: '(EX-32HS016B|EX-39HS004B)'
   device: 'tv'
   model: '$1'
 
@@ -33937,11 +35135,15 @@ I-INN:
   device: 'tablet'
   model: 'Communicator 9.7" 3G'
 
-# Emporia
+# Emporia (emporia.eu)
 Emporia:
-  regex: 'emporia[_ ]([^/;)]+)(?: Build|[);])'
+  regex: 'emporia[_ ]|(?:Android 9;(?: [\w-]+;)? S3mini)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'S3mini'
+      model: 'S3 Mini'
+    - regex: 'emporia[_ ]([^/;)]+)(?: Build|[);])'
+      model: '$1'
 
 # BLISS
 BLISS:
@@ -33975,9 +35177,13 @@ DreamTab:
 
 # DL
 DL:
-  regex: 'DL_Horizon_Selfie|Tablet_DL_\d{4}'
+  regex: 'Smartphone[ _]DL|DL_Horizon_Selfie|Tablet_DL_\d{4}|Smartphone[_ ](?:YZU[_ ]DS53)'
   device: 'smartphone'
   models:
+    - regex: 'Smartphone[_ ]YZU[_ ]DS53'
+      model: 'YZU DS53'
+    - regex: 'DL[_ ]Horizon[ _]H8'
+      model: 'Horizon H8'
     - regex: 'DL_Horizon_Selfie'
       model: 'Horizon Selfie'
     - regex: 'Tablet_DL_3910'
@@ -34024,13 +35230,15 @@ Redway:
 
 # iNo Mobile or SGiNO (inomobile.com.sg)
 iNo Mobile:
-  regex: '(?:iNO SCOUT 2|SGINO6)(?:[);/ ]|$)'
+  regex: '(?:iNO SCOUT 2|SGINO6|iNO S9)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'iNO SCOUT 2'
       model: 'Scout 2'
     - regex: 'SGINO6'
       model: '6'
+    - regex: 'iNO S9'
+      model: 'S9'
 
 
 # iReplace
@@ -34093,7 +35301,7 @@ ENACOM:
 
 # Yuno
 Yuno:
-  regex: 'YUNO\.|ULX-55UTCS3234|ULX-32TCS226|ULX-43UTCS347'
+  regex: 'YUNO\.|ULX-55UTCS3234|ULX-32TCS226|ULX-43UTCS347|ULX-39TCS222'
   device: 'tv'
   models:
     - regex: 'ULX-(\d{2}U?TCS\d{2,4})'
@@ -34156,18 +35364,21 @@ OneClick:
 
 # D-Tech (www.d-tech.dz)
 D-Tech:
-  regex: '(?:D5-L|DT07-TAB4G)(?:[);/ ]|$)'
+  regex: '(?:D5-L|DT07-TAB4G|LM-01)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'DT07-TAB4G'
       device: 'tablet'
       model: 'DT07 Tab 4G'
+    - regex: '(LM-01)'
+      device: 'tablet'
+      model: '$1'
     - regex: '(D5-L)(?:[);/ ]|$)'
       model: '$1'
 
 # nJoy or Njoy
 nJoy:
-  regex: '(?:nJoy[_ ])?(Deimos 7|Kali_8|Turnus_8|Tityos_10|Arcas_7)(?:[);/ ]|$)'
+  regex: '(?:nJoy[_ ])?(Deimos 7|Kali_8|Turnus_8|Tityos_10|Arcas_7|Theia_10)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
@@ -34249,7 +35460,7 @@ PIRANHA:
 
 # CipherLab (www.cipherlab.com)
 CipherLab:
-  regex: '(RK25WO|RK[29]5|RS35)(?:[);/ ]|$)'
+  regex: '(RK25WO|RK[29]5|RS35|RS51_HS)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -34324,11 +35535,11 @@ FILIX:
 
 # Odotpad or DotPad
 Odotpad:
-  regex: '(?:FIRE_V7|POMELO-MAX\+)(?:[);/ ]|$)'
+  regex: '(?:FIRE_V[78]|POMELO-MAX\+)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'FIRE_V7'
-      model: 'Dragon Fruit Fire V7'
+    - regex: 'FIRE_V([78])'
+      model: 'Dragon Fruit Fire V$1'
     - regex: 'POMELO-MAX\+'
       model: 'Pomelo Max+'
 
@@ -34354,7 +35565,7 @@ Topsion:
 
 # Ceibal (www.ceibal.edu.uy)
 Ceibal:
-  regex: '(?:ACRUX|BELLATRIX|BETELGEUSE|Kil-82WFDC)(?:[);/ ]|$)'
+  regex: '(?:ACRUX|BELLATRIX|BETELGEUSE|Kil-82WFDC|U800B)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'ACRUX'
@@ -34365,6 +35576,8 @@ Ceibal:
       model: 'Betelgeuse'
     - regex: 'Kil-82WFDC'
       model: 'Kiland T8'
+    - regex: '(U800B)'
+      model: '$1'
 
 # Wecool
 Wecool:
@@ -34389,9 +35602,13 @@ M3 Mobile:
 
 # Hugerock
 Hugerock:
-  regex: 'T101_2021(?:[);/ ]|$)'
+  regex: 'Hugerock|T101_2021(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'T101 (2021)'
+  models:
+    - regex: 'Hugerock[_ ](T70H)'
+      model: '$1'
+    - regex: 'T101_2021'
+      model: 'T101 (2021)'
 
 # Geanee (geanee.jp or www.jenesis.jp)
 Geanee:
@@ -34417,16 +35634,6 @@ Lovme:
   device: 'smartphone'
   model: '$1'
 
-# Stream or Stream System
-Stream:
-  regex: '(B3 (?:Maxi|Simply)|B3Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? B1s)(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: '(B3 (?:Maxi|Simply)|B1s)(?:[);/ ]|$)'
-      model: '$1'
-    - regex: 'B3Pro(?:[);/ ]|$)'
-      model: 'B3 Pro'
-
 # DASS
 DASS:
   regex: 'DASS[-_ ](H-ONE)(?:[);/ ]|$)'
@@ -34447,21 +35654,25 @@ ENIE:
 
 # Dcode (dcode.com.pk)
 Dcode:
-  regex: 'DS-(?:BD1|CR1)(?:[);/ ]|$)'
+  regex: 'DS-(?:BD1|CR1|CL2 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'DS-CR1'
       model: 'Cypher'
+    - regex: 'DS-CL2 Pro'
+      model: 'Cygnal 2 Pro'
     - regex: 'DS-BD1'
       model: 'Bold'
 
 # Pritom
 Pritom:
-  regex: 'Pritom_|(?:Android 1[01];(?: [\w-]+;)? (?:M10_Lite|M10_(?:PLUS|Air)(?:_EEA)?)|P7PRO)(?:[);/ ]|$)'
+  regex: 'Pritom_|(?:K7_A101(?:_EEA)?|Android 1[01];(?: [\w-]+;)? (?:M10_Lite|M10_(?:PLUS|Air)(?:_EEA)?)|P7PRO)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'M10_Lite'
       model: 'M10 Lite'
+    - regex: 'K7_A101'
+      model: 'K7 A101'
     - regex: 'M10_Air'
       model: 'M10 Air'
     - regex: 'M10_PLUS'
@@ -34489,9 +35700,9 @@ Chainway:
     - regex: ' (C66)'
       model: '$1'
 
-# Harper
+# Harper (https://harper.ru/)
 Harper:
-  regex: '(ABX-332|ABX-[12]10)(?:[);/ ]|$)'
+  regex: '(?:HARPER[_ ])?(ABX-332|ABX-[12]10|40F660TS|24R490TS)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -34634,7 +35845,7 @@ ECOO:
 
 # Dom.ru
 Dom.ru:
-  regex: '(Movix Pro(?: Voice)?)(?:[);/ ]|$)'
+  regex: '(Movix Pro(?: Voice)?|Movix Go)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -34678,7 +35889,7 @@ Dinax:
 
 # EFT Group (eft-survey.ru)
 EFT:
-  regex: 'EFT_(H2)(?:[);/ ]|$)'
+  regex: 'EFT_(H[234])(?:[);/ ]|$)'
   device: 'peripheral'
   model: '$1'
 
@@ -34741,7 +35952,7 @@ Marshal:
 
 # V-HOME
 V-HOME:
-  regex: '(32LH1210)(?:[);/ ]|$)'
+  regex: '(32LH1210|50LU1210|55LU1210|43LU1210|24LH1211)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -34781,11 +35992,21 @@ Blackpcs:
   device: 'tv'
   model: '$1-BL'
 
-# GoldMaster
+# GoldMaster (www.goldmaster.com.tr)
 GoldMaster:
-  regex: 'BENGAL_6(?:[);/ ]|$)'
+  regex: '(?:Netta 2 Pro|Netta 3\.100m|BENGAL_6|DETROIT 3)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Bengal 6'
+  models:
+    - regex: 'Netta 2 Pro'
+      model: 'Netta 2 Pro'
+      device: 'tv'
+    - regex: 'Netta 3\.100m'
+      model: 'Netta 3'
+      device: 'tv'
+    - regex: 'BENGAL_6'
+      model: 'Bengal 6'
+    - regex: 'DETROIT 3'
+      model: 'Detroit 3'
 
 # Facime
 Facime:
@@ -34845,7 +36066,7 @@ DRAGON:
 
 # Skyline (skylinetv.ru)
 Skyline:
-  regex: '(?:SKYLINE[_ ])?(32YST5970|50UST5970)(?:[);/ ]|$)'
+  regex: '(?:SKYLINE[_ ])?(32YST5970|50UST5970|24YST5970|40LST5970|32YST5975|43LST5975)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -34857,7 +36078,7 @@ Hiberg:
 
 # Hartens
 Hartens:
-  regex: '(HTY-\d{2}\w+-(?:S2|HC22)|HTY-32HDR06G)(?:[);/ ]|$)'
+  regex: '(HTY-\d{2}\w+-(?:S2|HC22)|HTY-32HDR06G|HTY-43F06B-VZ|HTY-24H06W-VZ)(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -34883,11 +36104,16 @@ Revomovil:
 
 # OSCAL (www.oscal.hk)
 OSCAL:
-  regex: '(?:S60Pro)(?:[);/ ]|$)'
+  regex: '(?:S60Pro|android 12;(?: [\w-]+;)? (?:C80|Pad 10))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S60Pro'
       model: 'S60 Pro'
+    - regex: ' (C80)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'Pad 10'
+      device: 'tablet'
+      model: 'Pad 10'
 
 # UE or United Education (www.ue.cn)
 UE:
@@ -34903,9 +36129,14 @@ Hykker:
 
 # Fluo
 Fluo:
-  regex: 'S554020(?:[);/ ]|$)'
-  device: 'tablet'
-  model: 'L'
+  regex: '(?:S554020|F_Plus)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'S554020'
+      device: 'tablet'
+      model: 'L'
+    - regex: 'F_Plus'
+      model: 'F Plus'
 
 # Quatro
 Quatro:
@@ -34951,7 +36182,7 @@ Vizmo:
 
 # Uniden
 Uniden:
-  regex: 'Uniden[ _](C505)(?:[);/ ]|$)'
+  regex: 'Uniden[ _](C505|Prime 500)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -35031,12 +36262,18 @@ Mobell:
     - regex: 'NOVA P3'
       model: 'Nova P3'
 
+# Mobvoi (https://www.mobvoi.com/)
+Mobvoi:
+  regex: 'TicWatch (C2|C2\+|Pro S|S2?)(?:[);/ ]|$)'
+  device: 'wearable'
+  model: 'TicWatch $1'
+
 # Smartex
 Smartex:
-  regex: '(?:Android 7(?:[\d.]*);(?: [\w-]+;)? M512)(?:[);/ ]|$)'
+  regex: '(?:Android 7(?:[\d.]*);(?: [\w-]+;)? M512| M520| M700)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(M512)(?:[);/ ]|$)'
+    - regex: '(M512|M520|M700)(?:[);/ ]|$)'
       model: '$1'
 
 # Citycall
@@ -35175,10 +36412,16 @@ MOVISUN:
 
 # Samtech
 Samtech:
-  regex: '(T3G_04)(?:[);/ ]|$)'
+  regex: '(T3G_04|TWIFI-06)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
 
+# Samtron (samtron.ru)
+Samtron:
+  regex: '(55SA703)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
 # MwalimuPlus (www.mwalimuplus.com)
 MwalimuPlus:
   regex: '(MP01A3G)(?:[);/ ]|$)'
@@ -35187,9 +36430,9 @@ MwalimuPlus:
 
 # OLTO (olto.su)
 OLTO:
- regex: 'OLTO-(43ST20U)(?:[);/ ]|$)'
- device: 'tv'
- model: '$1'
+  regex: 'OLTO-(43ST20U)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
 
 # DSIC
 DSIC:
@@ -35199,7 +36442,7 @@ DSIC:
 
 # Mascom
 Mascom:
-  regex: 'Mascom (S750)(?:[);/ ]|$)'
+  regex: 'Mascom (S750|SS289)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -35319,11 +36562,16 @@ RelNAT:
   device: 'smartphone'
   model: '$1'
 
-# TeloSystems or TELO
+# TeloSystems or TELO or Telox (https://www.telox.com/)
 TeloSystems:
-  regex: 'TELO[_ ](TE6)(?:[);/ ]|$)'
+  regex: 'TELO[_ ](?:TE6|M5|TE580_CO)(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'TELO[_ ](TE6|TE580_CO)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'TELO_M5'
+      device: 'peripheral'
+      model: 'M5'
 
 # Frunsi
 Frunsi:
@@ -35491,19 +36739,579 @@ Versus:
 
 # NGPon
 NGpon:
-   regex: 'Android 4(?:[\d.]*);(?: [\w-]+;)? (3188HD)(?: Build|[;)])'
-   device: 'tv'
-   model: '$1'
+  regex: 'Android 4(?:[\d.]*);(?: [\w-]+;)? (3188HD)(?: Build|[;)])'
+  device: 'tv'
+  model: '$1'
 
 # Rupa
 Rupa:
-   regex: 'Pyramid A5X'
-   device: 'tv'
-   model: 'Pyramid A5X'
+  regex: 'Pyramid A5X'
+  device: 'tv'
+  model: 'Pyramid A5X'
+
+# SEBBE
+SEBBE:
+  regex: '(S2[23])_EEA(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Webfleet or Webfleet Solutions (www.webfleet.com)
+Webfleet:
+  regex: 'PRO 8475(?:[);/ ]|$)'
+  device: 'car browser'
+  model: 'Pro 8475'
+
+# ROiK
+ROiK:
+  regex: 'ROiK ?(10)(?:[);/ ]|$)'
+  device: 'car browser'
+  model: '$1'
+
+# Kinstone
+Kinstone:
+  regex: '(KST103SD)'
+  device: 'tablet'
+  model: '$1'
+
+# HIPER
+HIPER:
+  regex: 'HIPER MEDIA|(?:U(?:65|50)YQ2200GR)(?:[);/ ]|$)'
+  device: 'tv'
+  models:
+    - regex: 'MEDIA STICK 4K'
+      model: 'Media Stick 4K'
+    - regex: 'MEDIA TV (i4 Pro|i4|[46]K)'
+      model: 'Media TV $1'
+    - regex: '(U(?:65|50)YQ2200GR)'
+      model: '$1'
+
+# TopDevice (https://topdevice.ru/)
+TopDevice:
+  regex: 'TopDevice|TDTV\d{2}BS\d{2}[FHU]|TDT4518_4G'
+  device: 'tv'
+  models:
+    - regex: '(?:TopDevice_)?(TDTV\d{2}BS\d{2}[FHU])'
+      model: '$1'
+    - regex: 'TDT4518_4G'
+      device: 'tablet'
+      model: 'A8'
+
+# Ctroniq (https://www.ctroniq.com/)
+Ctroniq:
+  regex: '(?:SNOOK-X10)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'SNOOK-X10'
+      model: 'Snook X10'
+
+# Punos
+Punos:
+  regex: 'Punos (10)'
+  device: 'tablet'
+  model: '$1'
+
+# ANXONIT
+ANXONIT:
+  regex: '(AnPad_U2)'
+  device: 'tablet'
+  model: '$1'
+
+# VITYAZ
+Vityaz:
+  regex: '(24LH1207)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# VIIPOO
+VIIPOO:
+  regex: '(?:vi20220819)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'vi20220819'
+      model: 'R6'
+
+# GOODTEL
+GOODTEL:
+  regex: '(?:G10_EEA|CNOTE 50)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'G10_EEA'
+      model: 'G10'
+    - regex: 'CNOTE 50'
+      device: 'smartphone'
+      model: 'CNOTE 50'
+
+# Viper (https://viper.pk/)
+Viper:
+  regex: '(Z08MK)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# HAOQIN (https://haoqinofficial.com/)
+HAOQIN:
+  regex: '(SpaceTab_H20)(?:_EEA)?(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Advantage Air
+Advantage Air:
+  regex: '(PIC7GS8)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# OneLern
+OneLern:
+  regex: 'OneLern(DB\d{3})(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Motiv
+Motiv:
+  regex: '(TurboPhone4G Compact 2108)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Olkya
+Olkya:
+  regex: 'Olkya (Liger 71G)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Oking
+Oking:
+  regex: 'OK-(?:LS[12]|smart11|LX[56])(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'OK-smart11'
+      model: 'Smart 11'
+    - regex: 'OK-(LS[12]|LX[56])'
+      model: '$1'
+
+# Inhon
+Inhon:
+  regex: 'Inhon[_ ](V6)(?:_EEA)?(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# SKK Mobile
+SKK Mobile:
+  regex: '(?:LYNX_LUXE|Hyper X Dragon|HYPER X BLADE(?: II)?)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'LYNX_LUXE'
+      model: 'Lynx Luxe'
+    - regex: 'Hyper X Dragon'
+      model: 'Hyper X Dragon'
+    - regex: 'HYPER X BLADE II'
+      model: 'Hyper X Blade II'
+    - regex: 'HYPER X BLADE'
+      model: 'Hyper X Blade'
+
+# NeuTab
+NeuTab:
+  regex: 'neutab ?k1(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'neutab ?k1'
+      model: 'K1'
+
+# Kraft (kraftltd.com)
+Kraft:
+  regex: '(?:Kraft[_ -])?KTV-(\w+)'
+  device: 'tv'
+  model: 'KTV-$1'
+
+# Zoom
+Zoom:
+  regex: 'Android 8(?:[\d.]*);(?: [\w-]+;)? (LitePro)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Linsay (linsaydigital.com)
+Linsay:
+  regex: 'LINSAY[_ ]|(?:F10XIPSQ)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: '(F10XIPSQ)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'LINSAY[_ ]([^/;)]+)(?: Build|[);])'
+      model: '$1'
+
+# Disney
+Disney:
+  regex: '(?:MARVEL|FROZEN|Toy_story)(?:[);/ ]|$)'
+  device: 'tablet'
+  models:
+    - regex: 'Toy_story'
+      model: 'TOY STORY'
+    - regex: '(MARVEL|FROZEN)'
+      model: '$1'
+
+# WAF or W.A.F
+WAF:
+  regex: '(F808NM|F803YM)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Geant
+Geant:
+  regex: 'GEANT[_ ](T\d)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Galactic
+Galactic:
+  regex: 'Galactic[_ ](Astro)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Zigo
+Zigo:
+  regex: '(?:Eon45i)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'Eon45i'
+      model: 'Eon 45i'
+
+# AEEZO
+AEEZO:
+  regex: '(TK701)_EEA(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# TPS or SZ TPS
+TPS:
+  regex: 'TPS-(SC10)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Conceptum
+Conceptum:
+  regex: '(GoCAM_G301)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# DPA
+DPA:
+  regex: '(?:DPA_ZETA|DPA H3)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'DPA_ZETA'
+      model: 'Zeta'
+    - regex: 'DPA (H3)'
+      model: '$1'
+
+# SkyStream
+SkyStream:
+  regex: 'SKYSTREAM_3Plus(?:[);/ ]|$)'
+  device: 'tv'
+  models:
+    - regex: 'SKYSTREAM_3Plus'
+      model: 'III Plus'
+
+# Supraim
+Supraim:
+  regex: '(SN10)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Bolva (bolva.it)
+Bolva:
+  regex: 'B_TAB1021(?:[);/ ]|$)'
+  device: 'tablet'
+  model: 'B-TAB1021'
+
+# DIJITSU
+DIJITSU:
+  regex: 'DIJITSU_'
+  device: 'smartphone'
+  models:
+    - regex: 'DIJITSU[_ ]Smart[_ ]A11s'
+      model: 'Smart A11s'
+
+# Hathway
+Hathway:
+  regex: '(DVB-ATV100)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# iLepo
+iLepo:
+  regex: 'ILEPO[ _](MXQ-4K)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# SEEWO
+SEEWO:
+  regex: 'SEEWO[ _](SD02)(?:[);/ ]|$)'
+  device: 'peripheral'
+  model: '$1'
+
+# TOPSHOWS
+TOPSHOWS:
+  regex: 'TOPSHOWS[ _-](X[19])(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# KN Mobile or knmobile
+KN Mobile:
+  regex: 'knmobile[_ ]([^/;)]+)(?: Build|[);])'
+  device: 'smartphone'
+  model: '$1'
+
+# Green Orange
+Green Orange:
+  regex: '(?:GO 55303)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'GO 55303'
+      model: 'C5 GO'
+
+# UOOGOU
+UOOGOU:
+  regex: 'UOOGOU'
+  device: 'smartphone'
+  models:
+    - regex: 'UOOGOU[_ ]([^/;)]+)(?: Build|[);])'
+      model: '$1'
+
+# MLAB or MicroLab
+MLAB:
+  regex: 'MLAB[ _-]'
+  device: 'tablet'
+  models:
+    - regex: 'MLAB[ _-]GLOWY([78]|10)'
+      model: 'Glowy $1'
+
+# Zeblaze
+Zeblaze:
+  regex: '(THOR 4 Plus|THOR S|THOR PRO)(?:[);/ ]|$)'
+  device: 'wearable'
+  models:
+    - regex: 'THOR (S|4 Plus)(?:[);/ ]|$)'
+      model: 'Thor $1'
+    - regex: 'THOR PRO'
+      model: 'Thor Pro'
+
+# noDROPOUT
+noDROPOUT:
+  regex: 'NODROPOUT[_ ]'
+  device: 'tablet'
+  models:
+    - regex: 'NODROPOUT[_ ]([^/;)]+)(?: Build|[);])'
+      model: '$1'
+
+# G-Fone or Gfone
+Gfone:
+  regex: 'G-Fone ?(\d{1,3})'
+  device: 'feature phone'
+  model: '$1'
+
+# TechniSat
+TechniSat:
+  regex: 'TechniPhone 5(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: 'TechniPhone 5'
+
+# Durabook
+Durabook:
+  regex: '(Diamond R8)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# DangcapHD
+DangcapHD:
+  regex: 'DangcapHD'
+  device: 'tv'
+  models:
+    - regex: 'D8 Pro'
+      model: 'D8 Pro'
+
+# Panoramic
+Panoramic:
+  regex: 'Panoramic[_ ](FQ-058/2)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Platoon
+Platoon:
+  regex: '(PLT-[12]00)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Premier
+Premier:
+  regex: '(?:MAXI 20)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'MAXI 20'
+      model: 'Maxi 20'
+
+# A95X (OEM OTT TV BOX)
+A95X:
+  regex: 'A95X'
+  device: 'tv'
+  models:
+    - regex: 'A95X Plus'
+      model: 'Plus'
+    - regex: 'A95X F3 Slim'
+      model: 'F3 Slim'
+    - regex: 'A95X MAX \+'
+      model: 'Max+'
+    - regex: 'A95X_F3Air_II'
+      model: 'F3 Air II'
+    - regex: 'A95X MAX'
+      model: 'Max'
+    - regex: 'A95X PRO'
+      model: 'Pro'
+    - regex: 'A95X F3 Air'
+      model: 'F3 Air'
+    - regex: 'A95X ?Z2PLUS'
+      model: 'Z2 Plus'
+    - regex: 'A95X[ _-]?(F[1-4]|R[1235]|[AWZ]2|A1)'
+      model: '$1'
+
+# ibowin
+ibowin:
+  regex: '(M10ES11)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# MultiPOS pos terminal
+MultiPOS:
+  regex: 'MultiPOS[ _]?(X9)(?:[);/ ]|$)'
+  device: 'peripheral'
+  model: '$1'
+
+# BAFF
+BAFF:
+  regex: 'BAFF\d{2}'
+  device: 'tv'
+  models:
+    - regex: 'BAFF(\d{2})YFHD'
+      model: '$1Y FHD'
+    - regex: 'BAFF(\d{2})Y(STV-R)'
+      model: '$1Y $2'
+
+# GroBerwert
+GroBerwert:
+  regex: 'GroBerwert[ _]?(HD7)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# BARTEC (www.pixavi.com)
+BARTEC:
+  regex: 'Pixavi'
+  device: 'smartphone'
+  models:
+    - regex: 'Pixavi[ _](Phone)'
+      model: 'Pixavi $1'
+
+# FOSSiBOT (www.fossibot.com)
+FOSSiBOT:
+  regex: 'android 12;(?: [\w-]+;)? (?:F101)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'F101(?:[);/ ]|$)'
+      model: 'F101'
+
+# Nanho
+Nanho:
+  regex: 'android 7(?:[\d.]*);(?: [\w-]+;)? (?:F101)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'F101(?:[);/ ]|$)'
+      model: 'F101'
+
+# Vekta (myvekta.ru)
+Vekta:
+  regex: '(LD-65SU8815BS|LD-32SR4850BS)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# Accesstyle (accesstyle.ru)
+Accesstyle:
+  regex: '(U43EY1500B|F32EY1500B)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# SobieTech
+SobieTech:
+  regex: 'SobieTech'
+  device: 'peripheral'
+  models:
+    - regex: 'SOBIETECH SLP'
+      model: 'Smart LED 3D Projector'
+
+# Lime
+Lime:
+  regex: 'LimeZ2PLUS'
+  device: 'tv'
+  model: 'Z2 Plus'
+
+# VETAS
+VETAS:
+  regex: 'VETAS[_ ]([^/;)]+)(?: Build|[);])'
+  device: 'smartphone'
+  model: '$1'
+
+# Canguro
+Canguro:
+  regex: '(M75TG)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Gamma
+Gamma:
+  regex: '(EDU-7MT4)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Xcell
+Xcell:
+  regex: '(Enia)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Epic
+Epic:
+  regex: '(ePad 7i)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# AMCV
+AMCV:
+  regex: '(LE-3[29]ZTHS25)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# F+ or F-Plus (fplusmobile.ru)
+F+:
+  regex: '(SH6[05]|SA50)_2[13]\d{3}(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Sber (sberdevices.ru)
+Sber:
+  regex: '(SberBox)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# Sveon
+Sveon:
+  regex: '(SBX604)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
+
+# DSDevices
+DSDevices:
+  regex: '(DSCS9)(?:[);/ ]|$)'
+  device: 'tv'
+  model: '$1'
 
 # Devices with undectable brand, but detectable model
 Unknown:
-  regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro|(?: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|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|hx322x_box)(?:[);/ ]|$)'
+  regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro|(?: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|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|hx322x_box|X98_S500)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'WebTV/(\d+\.\d+)'
@@ -35512,9 +37320,9 @@ Unknown:
     - regex: 'M10 Ultra(?:[);/ ]|$)'
       device: 'phablet'
       model: 'M10 Ultra' # clone xiaomi m10 ultra
-    - regex: 'FO-R15(?:[);/ ]|$)'
+    - regex: '(FO-R15|X98_S500)(?:[);/ ]|$)'
       device: 'tv'
-      model: 'FO-R15'
+      model: '$1'
     - regex: '(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)(?:[);/ ]|$)'
       device: 'tv'
       model: ''
diff --git a/priv/ua_inspector/device.portable_media_player.yml b/priv/ua_inspector/device.portable_media_player.yml
index b9a2e3a21..cbc2afd25 100644
--- a/priv/ua_inspector/device.portable_media_player.yml
+++ b/priv/ua_inspector/device.portable_media_player.yml
@@ -100,3 +100,9 @@ Sylvania:
   regex: '(SLTDVD102[34])'
   device: 'portable media player'
   model: '$1'
+
+# KuGou
+KuGou:
+  regex: 'KuGou[_ -](P5)'
+  device: 'portable media player'
+  model: '$1'
diff --git a/priv/ua_inspector/os.oss.yml b/priv/ua_inspector/os.oss.yml
index bee404ee8..b05a031e1 100644
--- a/priv/ua_inspector/os.oss.yml
+++ b/priv/ua_inspector/os.oss.yml
@@ -128,7 +128,6 @@
   name: 'Tizen'
   version: '$1'
 
-
 ##########
 # YunOS (Android based)
 ##########
@@ -264,6 +263,13 @@
   name: 'FreeBSD'
   version: ''
 
+##########
+# Wear OS (https://wearos.google.com/)
+##########
+- regex: 'Chrome/(\d+\.[.\d]+) Odd/|SM-R(?:8[6-9]|9)'
+  name: 'Wear OS'
+  version: ''
+
 ##########
 # Android TV (https://android.com/tv/)
 ##########
@@ -282,30 +288,34 @@
 ##########
 # Android SDK Level Api
 ##########
-- regex: '\d+/tclwebkit(?:\d+[\.\d]*)'
+- regex: '(?:Android API \d+|\d+/tclwebkit(?:\d+[\.\d]*))'
   name: 'Android'
   versions:
-    - regex: '33/tclwebkit'
+    - regex: '(?:Android API 34|34/tclwebkit)'
+      version: '14'
+    - regex: '(?:Android API 33|33/tclwebkit)'
       version: '13'
-    - regex: '3[12]/tclwebkit'
+    - regex: '(?:Android API 32|32/tclwebkit)'
+      version: '12.1'
+    - regex: '(?:Android API 31|31/tclwebkit)'
       version: '12'
-    - regex: '30/tclwebkit'
+    - regex: '(?:Android API 30|30/tclwebkit)'
       version: '11'
-    - regex: '29/tclwebkit'
+    - regex: '(?:Android API 29|29/tclwebkit)'
       version: '10'
-    - regex: '28/tclwebkit'
+    - regex: '(?:Android API 28|28/tclwebkit)'
       version: '9'
-    - regex: '27/tclwebkit'
+    - regex: '(?:Android API 27|27/tclwebkit)'
       version: '8.1'
-    - regex: '26/tclwebkit'
+    - regex: '(?:Android API 26|26/tclwebkit)'
       version: '8'
-    - regex: '25/tclwebkit'
+    - regex: '(?:Android API 25|25/tclwebkit)'
       version: '7.1'
-    - regex: '24/tclwebkit'
+    - regex: '(?:Android API 24|24/tclwebkit)'
       version: '7'
-    - regex: '23/tclwebkit'
+    - regex: '(?:Android API 23|23/tclwebkit)'
       version: '6'
-    - regex: '22/tclwebkit'
+    - regex: '(?:Android API 22|22/tclwebkit)'
       version: '5.1'
     - regex: '21/tclwebkit'
       version: '5'
@@ -329,7 +339,7 @@
   name: 'Android'
   version: '6'
 
-- regex: '(?:Podbean|Podimo)(?:.*)/Android'
+- regex: '(?:Podbean|Podimo)(?:.*)/Android|Rutube(?:TV)?BlackAndroid'
   name: 'Android'
   version: ''
 
@@ -715,11 +725,15 @@
 ##########
 # tvOS (https://developer.apple.com/tvos/)
 ##########
-- regex: 'Apple ?TV.*CPU (?:iPhone )?OS ((?:9|1[0-6])[_\.]\d+(?:[_.]\d+)*)'
+- regex: 'Apple ?TV.*CPU (?:iPhone )?OS ((?:9|1[0-7])[_\.]\d+(?:[_.]\d+)*)'
   name: 'tvOS'
   version: '$1'
 
-- regex: 'iOS(?:; |/)((?:9|1[0-6]).\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
+- regex: 'iOS(?:; |/)((?:9|1[0-7]).\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
+  name: 'tvOS'
+  version: '$1'
+
+- regex: 'tvOS((?:9|1[0-7]).\d+(?:[_\.]\d+)*);'
   name: 'tvOS'
   version: '$1'
 
@@ -783,9 +797,17 @@
   name: 'iOS'
   version: '$1'
 
-- regex: '^(?!com.apple.Safari.SearchHelper).*CFNetwork/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
+- regex: '^(?!com.apple.Safari.SearchHelper|Safari).*CFNetwork/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
+    - regex: 'Darwin/23.0.0'
+      version: '17.0'
+    - regex: 'Darwin/22.6.0'
+      version: '16.6'
+    - regex: 'Darwin/22.5.0'
+      version: '16.5'
+    - regex: 'Darwin/22.4.0'
+      version: '16.4'
     - regex: 'Darwin/22.3.0'
       version: '16.3'
     - regex: 'Darwin/22.2.0'
@@ -998,9 +1020,17 @@
 ##########
 # Mac
 ##########
-- regex: 'CFNetwork/.+ Darwin/(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com.apple.Safari.SearchHelper'
+- regex: 'CFNetwork/.+ Darwin/(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com.apple.Safari.SearchHelper|^Safari'
   name: 'Mac'
   versions:
+    - regex: '(?:x86_64-apple-)?Darwin/?23.0.0'
+      version: '14.0'
+    - regex: '(?:x86_64-apple-)?Darwin/?22.6.0'
+      version: '13.5'
+    - regex: '(?:x86_64-apple-)?Darwin/?22.5.0'
+      version: '13.4'
+    - regex: '(?:x86_64-apple-)?Darwin/?22.4.0'
+      version: '13.3'
     - regex: '(?:x86_64-apple-)?Darwin/?22.3.0'
       version: '13.2'
     - regex: '(?:x86_64-apple-)?Darwin/?22.2.0'
@@ -1231,9 +1261,9 @@
 ##########
 # BeOS
 ##########
-- regex: 'BeOS'
+- regex: 'BeOS[ +]?(\d[.\d]*)?'
   name: 'BeOS'
-  version: ''
+  version: '$1'
 
 ##########
 # Symbian
@@ -1331,7 +1361,6 @@
   name: 'WebTV'
   version: '$1'
 
-
 ##########
 # Unix
 ##########
diff --git a/priv/ua_inspector/short_codes.browser_families.yml b/priv/ua_inspector/short_codes.browser_families.yml
index 084c5f8ac..683058bee 100644
--- a/priv/ua_inspector/short_codes.browser_families.yml
+++ b/priv/ua_inspector/short_codes.browser_families.yml
@@ -205,6 +205,14 @@
   - "B8"
   - "F5"
   - "B9"
+  - "WA"
+  - "T0"
+  - "HC"
+  - "O6"
+  - "P7"
+  - "LJ"
+  - "LC"
+  - "O7"
   - ""
 - "Firefox":
   - "AX"
diff --git a/priv/ua_inspector/short_codes.client_browsers.yml b/priv/ua_inspector/short_codes.client_browsers.yml
index 62a2e4aca..49701993d 100644
--- a/priv/ua_inspector/short_codes.client_browsers.yml
+++ b/priv/ua_inspector/short_codes.client_browsers.yml
@@ -89,6 +89,7 @@
 - "BX": "BrowseX"
 - "BZ": "Browzar"
 - "B7": "Browlser"
+- "4B": "BrowsBit"
 - "BY": "Biyubi"
 - "BF": "Byffox"
 - "B4": "BF Browser"
@@ -221,6 +222,7 @@
 - "I4": "IceCat"
 - "ID": "IceDragon"
 - "IV": "Isivioo"
+- "I8": "IVVI Browser"
 - "IW": "Iceweasel"
 - "IN": "Inspect Browser"
 - "IE": "Internet Explorer"
@@ -258,10 +260,12 @@
 - "LH": "Light"
 - "L1": "Lilo"
 - "LI": "Links"
+- "LC": "LogicUI TV Browser"
 - "IF": "Lolifox"
 - "LO": "Lovense Browser"
 - "LT": "LT Browser"
 - "LU": "LuaKit"
+- "LJ": "LUJO TV Browser"
 - "LL": "Lulumi"
 - "LS": "Lunascape"
 - "LN": "Lunascape Lite"
@@ -298,6 +302,7 @@
 - "NO": "Nokia OSS Browser"
 - "NV": "Nokia Ovi Browser"
 - "NX": "Nox Browser"
+- "N1": "NOMone VR Browser"
 - "NE": "NetSurf"
 - "NF": "NetFront"
 - "NL": "NetFront Life"
@@ -306,6 +311,7 @@
 - "WR": "NextWord Browser"
 - "NT": "NTENT Browser"
 - "OC": "Oculus Browser"
+- "O6": "Odd Browser"
 - "O1": "Opera Mini iOS"
 - "OB": "Obigo"
 - "O2": "Odin"
@@ -330,22 +336,26 @@
 - "OR": "Oregano"
 - "O0": "Origin In-Game Overlay"
 - "OY": "Origyn Web Browser"
+- "O8": "OrNET Browser"
 - "OV": "Openwave Mobile Browser"
 - "O3": "OpenFin"
 - "O4": "Open Browser"
 - "4U": "Open Browser 4U"
 - "5G": "Open Browser fast 5G"
+- "O7": "Open TV Browser"
 - "OW": "OmniWeb"
 - "OT": "Otter Browser"
 - "PL": "Palm Blazer"
 - "PM": "Pale Moon"
 - "PY": "Polypane"
 - "PP": "Oppo Browser"
+- "P6": "Opus Browser"
 - "PR": "Palm Pre"
 - "PU": "Puffin"
 - "2P": "Puffin Web Browser"
 - "PW": "Palm WebPro"
 - "PA": "Palmscape"
+- "P7": "Pawxy"
 - "PE": "Perfect Browser"
 - "P1": "Phantom.me"
 - "PH": "Phantom Browser"
@@ -384,6 +394,7 @@
 - "SO": "Sogou Mobile Browser"
 - "RF": "SOTI Surf"
 - "2S": "Soul Browser"
+- "T0": "Soundy Browser"
 - "SF": "Safari"
 - "PV": "Safari Technology Preview"
 - "S5": "Safe Exam Browser"
@@ -470,6 +481,7 @@
 - "WE": "WebPositive"
 - "WF": "Waterfox"
 - "WB": "Wave Browser"
+- "WA": "Wavebox"
 - "WH": "Whale Browser"
 - "WO": "wOSBrowser"
 - "WT": "WeTab Browser"
diff --git a/priv/ua_inspector/short_codes.client_hint_browser_mapping.yml b/priv/ua_inspector/short_codes.client_hint_browser_mapping.yml
new file mode 100644
index 000000000..dfaf904a6
--- /dev/null
+++ b/priv/ua_inspector/short_codes.client_hint_browser_mapping.yml
@@ -0,0 +1,2 @@
+- "Chrome":
+  - "Google Chrome"
diff --git a/priv/ua_inspector/short_codes.client_hint_os_mapping.yml b/priv/ua_inspector/short_codes.client_hint_os_mapping.yml
new file mode 100644
index 000000000..a2f61cfb7
--- /dev/null
+++ b/priv/ua_inspector/short_codes.client_hint_os_mapping.yml
@@ -0,0 +1,4 @@
+- "GNU/Linux":
+  - "Linux"
+- "Mac":
+  - "MacOS"
diff --git a/priv/ua_inspector/short_codes.mobile_browsers.yml b/priv/ua_inspector/short_codes.mobile_browsers.yml
index eb292a2c4..607e811b7 100644
--- a/priv/ua_inspector/short_codes.mobile_browsers.yml
+++ b/priv/ua_inspector/short_codes.mobile_browsers.yml
@@ -116,3 +116,9 @@
 - "HT"
 - "B7"
 - "B9"
+- "T0"
+- "I8"
+- "O6"
+- "P7"
+- "O8"
+- "4B"
diff --git a/priv/ua_inspector/short_codes.os_families.yml b/priv/ua_inspector/short_codes.os_families.yml
index 7f385df71..7b8293f36 100644
--- a/priv/ua_inspector/short_codes.os_families.yml
+++ b/priv/ua_inspector/short_codes.os_families.yml
@@ -16,6 +16,7 @@
   - "LEN"
   - "SIR"
   - "RRS"
+  - "WER"
   - ""
 - "AmigaOS":
   - "AMG"
diff --git a/priv/ua_inspector/short_codes.oss.yml b/priv/ua_inspector/short_codes.oss.yml
index 1ebca12d2..854a387c4 100644
--- a/priv/ua_inspector/short_codes.oss.yml
+++ b/priv/ua_inspector/short_codes.oss.yml
@@ -114,6 +114,7 @@
 - "TOS": "TmaxOS"
 - "UBT": "Ubuntu"
 - "WAS": "watchOS"
+- "WER": "Wear OS"
 - "WTV": "WebTV"
 - "WHS": "Whale OS"
 - "WIN": "Windows"
diff --git a/priv/ua_inspector/ua_inspector.release b/priv/ua_inspector/ua_inspector.release
new file mode 100644
index 000000000..31026ba3d
--- /dev/null
+++ b/priv/ua_inspector/ua_inspector.release
@@ -0,0 +1 @@
+66d80de32fbb265941f4d7941fadc19097375097
\ No newline at end of file