From 6e8ccdd47343876914ce4dfe00bceed1a4345dbc Mon Sep 17 00:00:00 2001
From: Uku Taht <uku.taht@gmail.com>
Date: Wed, 14 Oct 2020 12:25:18 +0300
Subject: [PATCH] Download updated user-agent files

Closes #309
---
 priv/ua_inspector/bot.bots.yml                |   410 +-
 .../browser_engine.browser_engine.yml         |     8 +-
 priv/ua_inspector/client.browsers.yml         |   862 +-
 priv/ua_inspector/client.feed_readers.yml     |     8 +-
 priv/ua_inspector/client.libraries.yml        |    35 +-
 priv/ua_inspector/client.mediaplayers.yml     |    16 +-
 priv/ua_inspector/client.mobile_apps.yml      |   116 +-
 priv/ua_inspector/client.pim.yml              |     7 +-
 priv/ua_inspector/device.cameras.yml          |     2 +-
 priv/ua_inspector/device.car_browsers.yml     |    10 +-
 priv/ua_inspector/device.consoles.yml         |     6 +-
 priv/ua_inspector/device.mobiles.yml          | 11030 ++++++++++++++--
 .../device.portable_media_player.yml          |     4 +-
 priv/ua_inspector/device.televisions.yml      |    18 +-
 priv/ua_inspector/os.oss.yml                  |    80 +-
 .../short_codes.client_browsers.yml           |   110 +-
 .../short_codes.device_brands.yml             |   349 +
 .../short_codes.mobile_browsers.yml           |    27 +
 priv/ua_inspector/short_codes.os_families.yml |     2 +
 priv/ua_inspector/short_codes.oss.yml         |     2 +
 .../vendor_fragment.vendorfragments.yml       |     8 +-
 21 files changed, 11792 insertions(+), 1318 deletions(-)

diff --git a/priv/ua_inspector/bot.bots.yml b/priv/ua_inspector/bot.bots.yml
index 541d5e95c6..d27a15da49 100644
--- a/priv/ua_inspector/bot.bots.yml
+++ b/priv/ua_inspector/bot.bots.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -61,6 +61,13 @@
     name: 'Alexa Internet'
     url: 'http://www.alexa.com'
 
+- regex: 'Amazon[ -]Route ?53[ -]Health[ -]Check[ -]Service'
+  name: 'Amazon Route53 Health Check'
+  category: 'Service Agent'
+  producer:
+    name: 'Amazon Web Services'
+    url: 'https://aws.amazon.com/'
+
 - regex: 'AmorankSpider'
   name: 'Amorank Spider'
   category: 'Crawler'
@@ -93,6 +100,14 @@
     name: 'Sarosys LLC'
     url: 'http://www.sarosys.com/'
 
+- regex: 'AspiegelBot'
+  name: 'AspiegelBot'
+  category: 'Crawler'
+  url: 'https://aspiegel.com/'
+  producer:
+    name: 'Huawei'
+    url: 'https://www.huawei.com/'
+
 - regex: 'Castro 2, Episode Duration Lookup'
   name: 'Castro 2'
   category: 'Service Agent'
@@ -197,6 +212,13 @@
     name: 'Blogtrottr Ltd'
     url: 'https://blogtrottr.com/'
 
+- regex: 'BoardReader Blog Indexer'
+  name: 'BoardReader Blog Indexer'
+  category: 'Crawler'
+  producer:
+    name: 'BoardReader'
+    url: 'http://boardreader.com/'
+
 - regex: 'BountiiBot'
   name: 'Bountii Bot'
   category: 'Search bot'
@@ -269,13 +291,13 @@
     name: 'CloudFlare'
     url: 'http://www.cloudflare.com'
 
-- regex: 'coccoc/'
+- regex: 'coccoc|coccocbot(-ads|-fast|-image|-shopping|-web)?'
   name: 'Cốc Cốc Bot'
-  url: 'http://help.coccoc.com/'
+  url: 'https://help.coccoc.com/en/search-engine/coccoc-robots'
   category: 'Search bot'
   producer:
     name: 'Cốc Cốc'
-    url: 'http://coccoc.com/'
+    url: 'https://coccoc.com/'
 
 - regex: 'collectd'
   name: 'Collectd'
@@ -309,6 +331,15 @@
     name: 'Datadog'
     url: 'https://www.datadoghq.com/'
 
+- regex: 'Datanyze'
+  name: 'Datanyze'
+  url: ''
+  category: 'Crawler'
+  producer:
+    name: 'Datanyze'
+    url: 'https://www.datanyze.com'
+
+
 - regex: 'Dataprovider'
   name: 'Dataprovider'
   category: 'Crawler'
@@ -357,7 +388,7 @@
     name: 'SEOmoz, Inc.'
     url: 'http://moz.com/'
 
-- regex: 'DuckDuck'
+- regex: 'DuckDuck(?:Go-Favicons-)?Bot'
   name: 'DuckDuckGo Bot'
   category: 'Search bot'
   url: 'https://duckduckgo.com/duckduckbot'
@@ -373,6 +404,13 @@
     name: 'easou ICP'
     url: 'http://www.easou.com'
 
+- regex: 'eCairn-Grabber'
+  name: 'eCairn-Grabber'
+  category: 'Crawler'
+  producer:
+    name: 'eCairn'
+    url: 'https://ecairn.com'
+
 - regex: 'EMail Exractor'
   name: 'EMail Exractor'
   category: 'Crawler'
@@ -413,7 +451,7 @@
     name: 'SEOmoz, Inc.'
     url: 'http://moz.com/'
 
-- regex: 'facebookexternalhit|facebookplatform'
+- regex: 'facebookexternalhit|facebookplatform|facebookexternalua'
   name: 'Facebook External Hit'
   category: 'Social Media Agent'
   url: 'https://www.facebook.com/externalhit_uatext.php'
@@ -482,6 +520,11 @@
   category: 'Crawler'
   url: 'http://www.findxbot.com'
 
+- regex: 'FreshRSS'
+  name: 'FreshRSS'
+  category: 'Feed Fetcher'
+  url: 'https://freshrss.org/'
+
 - regex: 'Genieo'
   name: 'Genieo Web filter'
   category: ''
@@ -514,6 +557,10 @@
     name: 'NTT Resonant'
     url: 'http://goo.ne.jp'
 
+- regex: 'Google Favicon'
+  name: 'Google Favicon'
+  category: 'Crawler'
+
 - regex: 'Google Search Console'
   name: 'Google Search Console'
   category: 'Crawler'
@@ -538,6 +585,14 @@
     name: 'Google Inc.'
     url: 'http://www.google.com'
 
+- regex: 'Google-Cloud-Scheduler'
+  name: 'Google Cloud Scheduler'
+  category: 'Crawler'
+  url: 'https://cloud.google.com/scheduler'
+  producer:
+    name: 'Google Inc.'
+    url: 'https://www.google.com'
+
 - regex: 'Google-Structured-Data-Testing-Tool'
   name: 'Google Structured Data Testing Tool'
   category: 'Validator'
@@ -546,6 +601,14 @@
     name: 'Google Inc.'
     url: 'http://www.google.com'
 
+- regex: 'GoogleStackdriverMonitoring'
+  name: 'Google Stackdriver Monitoring'
+  category: 'Site Monitor'
+  url: 'https://cloud.google.com/monitoring'
+  producer:
+    name: 'Google Inc.'
+    url: 'https://www.google.com'
+
 - regex: 'via ggpht\.com GoogleImageProxy'
   name: 'Gmail Image Proxy'
   category: 'Crawler'
@@ -553,7 +616,7 @@
   producer:
     name: 'Google Inc.'
     url: 'http://www.google.com'
-    
+
 - regex: 'SeznamEmailProxy'
   name: 'Seznam Email Proxy'
   category: 'Crawler'
@@ -586,7 +649,7 @@
     name: 'Visual Meta'
     url: 'https://www.shopalike.cz/'
 
-- regex: 'Googlebot(-Mobile|-Image|-Video|-News)?|Feedfetcher-Google|Google-Test|Google-Site-Verification|Google Web Preview|AdsBot-Google(-Mobile)?|Google-Adwords-Instant|Mediapartners-Google|Google.*/\+/web/snippet|GoogleProducer|Google[ -]Publisher[ -]Plugin|Google-Shopping-Quality|Google-Adwords-DisplayAds|Google-Assess|Google-AdWords-Express'
+- regex: 'AdsBot-Google(-Mobile)?|Adwords-(DisplayAds|Express|Instant)|Google Web Preview|Google[ -]Publisher[ -]Plugin|Google-(Adwords|AMPHTML|Assess|HotelAdsVerifier|Read-Aloud|Shopping-Quality|Site-Verification|speakr|Test|Youtube-Links)|(APIs|DuplexWeb|Feedfetcher|Mediapartners)-Google|Googlebot(-Mobile|-Image|-Video|-News)?|GoogleProducer|Google.*/\+/web/snippet'
   name: 'Googlebot'
   category: 'Search bot'
   url: 'http://www.google.com/bot.html'
@@ -626,6 +689,11 @@
     name: ''
     url: ''
 
+- regex: 'inoreader.com'
+  name: 'inoreader'
+  category: 'Feed Reader'
+  url: 'https://www.inoreader.com'
+
 - regex: 'iisbot'
   name: 'IIS Site Analysis'
   category: 'Crawler'
@@ -728,6 +796,10 @@
     name: 'Robert Graham'
     url: 'https://github.com/robertdavidgraham'
 
+- regex: 'Mastodon/'
+  name: 'Mastodon Bot'
+  category: 'Social Media Agent'
+
 - regex: 'meanpathbot'
   name: 'Meanpath Bot'
   category: 'Search bot'
@@ -804,6 +876,10 @@
     name: 'Nagios Plugins Development Team'
     url: 'https://nagios.org'
 
+- regex: 'nbertaupete95\(at\)gmail.com'
+  name: 'nbertaupete95'
+  category: 'Crawler'
+
 - regex: 'Netcraft( Web Server Survey| SSL Server Survey|SurveyAgent)'
   name: 'Netcraft Survey Bot'
   category: 'Search bot'
@@ -814,7 +890,7 @@
 
 - regex: 'netEstate NE Crawler'
   name: 'netEstate'
-  category: 'Analytics SEO Crawler'
+  category: 'Crawler'
   url: 'http://www.website-datenbank.de/Impressum'
   producer:
     name: 'netEstate GmbH'
@@ -860,6 +936,13 @@
     name: 'Nmap'
     url: 'https://nmap.org/'
 
+- regex: 'Nuzzel'
+  name: 'Nuzzel'
+  category: 'Crawler'
+  producer:
+    name: 'Nuzzel'
+    url: https://www.nuzzel.com/ 
+
 - regex: 'Octopus [0-9]'
   name: 'Octopus'
 
@@ -940,6 +1023,14 @@
     name: 'Bitlove'
     url: 'http://bitlove.org/'
 
+- regex: 'PRTG Network Monitor'
+  name: 'PRTG Network Monitor'
+  category: 'Network Monitor'
+  url: 'https://www.paessler.com/prtg'
+  producer:
+    name: 'Paessler AG'
+    url: 'https://www.paessler.com'
+
 - regex: 'psbot(-page)?'
   name: 'Picsearch bot'
   category: 'Search bot'
@@ -1107,6 +1198,14 @@
     name: 'Seznam.cz, a.s.'
     url: 'http://www.seznam.cz/'
 
+- regex: 'shopify-partner-homepage-scraper'
+  name: 'Shopify Partner'
+  category: 'Crawler'
+  url: 'https://www.shopify.com/partners'
+  producer:
+    name: 'Shopify'
+    url: 'https://www.shopify.com/'
+
 - regex: 'ShopWiki'
   name: 'ShopWiki'
   category: 'Search tools'
@@ -1139,6 +1238,14 @@
     name: 'SISTRIX GmbH'
     url: 'http://www.sistrix.de'
 
+- regex: 'compatible; (?:SISTRIX )?Optimizer'
+  name: 'SISTRIX Optimizer'
+  category: 'Crawler'
+  url: 'https://optimizer.sistrix.com'
+  producer:
+    name: 'SISTRIX GmbH'
+    url: 'http://www.sistrix.de'
+
 - regex: 'SiteSucker'
   name: 'SiteSucker'
   category: 'Crawler'
@@ -1243,7 +1350,7 @@
   category: 'Search bot'
 
 - regex: 'TelegramBot'
-  name: 'TelgramBot'
+  name: 'TelegramBot'
   url: 'https://telegram.org/blog/bot-revolution'
 
 - regex: 'TLSProbe'
@@ -1270,6 +1377,11 @@
     name: ''
     url: ''
 
+- regex: 'theoldreader.com'
+  name: 'theoldreader'
+  category: 'Feed Reader'
+  url: 'https://theoldreader.com'
+
 - regex: 'trendictionbot'
   name: 'Trendiction Bot'
   category: 'Crawler'
@@ -1302,6 +1414,13 @@
     name: 'Mediasift'
     url: ''
 
+- regex: 'Twingly Recon'
+  name: 'Twingly Recon'
+  category: 'Crawler'
+  producer:
+    name: 'Twingly'
+    url: 'https://www.twingly.com'
+
 - regex: 'Twitterbot'
   name: 'Twitterbot'
   category: 'Social Media Agent'
@@ -1474,6 +1593,14 @@
     name: 'Wotbox'
     url: 'http://www.wotbox.com'
 
+- regex: 'XenForo'
+  name: 'XenForo'
+  category: 'Service Agent'
+  url: 'https://xenforo.com/'
+  producer:
+    name: 'XenForo Ltd.'
+    url: 'https://xenforo.com/'
+
 - regex: 'yacybot'
   name: 'YaCy'
   category: 'Search bot'
@@ -1506,7 +1633,15 @@
     name: 'Yahoo! Inc.'
     url: 'http://www.yahoo.com'
 
-- regex: 'Yandex(SpravBot|ScreenshotBot|MobileBot|AccessibilityBot|ForDomain|Vertis|Market|Catalog|Calendar|Sitelinks|AdNet|Pagechecker|Webmaster|Media|Video|Bot|Images|Antivirus|Direct|Blogs|Favicons|ImageResizer|Verticals|News(links)?|Metrika|\.Gazeta Bot)|YaDirectFetcher'
+- regex: 'Y!J-BRW'
+  name: 'Yahoo! Japan BRW'
+  category: 'Crawler'
+  url: 'https://www.yahoo-help.jp/app/answers/detail/p/595/a_id/42716/~/ウェブページにアクセスするシステムのユーザーエージェントについて'
+  producer:
+    name: 'Yahoo! Japan Corp.'
+    url: 'https://www.yahoo.co.jp/'
+
+- regex: 'Yandex(SpravBot|ScreenshotBot|MobileBot|AccessibilityBot|ForDomain|Vertis|Market|Catalog|Calendar|Sitelinks|AdNet|Pagechecker|Webmaster|Media|Video|Bot|Images|Antivirus|Direct|Blogs|Favicons|ImageResizer|Verticals|News(links)?|Metrika|\.Gazeta Bot)|YaDirectFetcher|YandexTurbo|YandexTracker|YandexSearchShop|YandexRCA|YandexPartner|YandexOntoDBAPI|YandexOntoDB|YandexMobileScreenShotBot'
   name: 'Yandex Bot'
   category: 'Search bot'
   url: 'http://www.yandex.com/bots'
@@ -1514,7 +1649,7 @@
     name: 'Yandex LLC'
     url: 'http://company.yandex.com'
 
-- regex: 'Yeti'
+- regex: 'Yeti|NaverJapan'
   name: 'Yeti/Naverbot'
   category: 'Search bot'
   url: 'http://help.naver.com/robots/'
@@ -1596,9 +1731,9 @@
     name: 'HubPages'
     url: 'http://hubpages.com/'
 
-- regex: 'Pinterest/\d\.\d.*www\.pinterest\.com.*'
+- regex: 'Pinterest(bot)?/\d\.\d.*www\.pinterest\.com.*'
   name: 'Pinterest'
-  url: ''
+  url: 'http://www.pinterest.com/bot.html'
   category: 'Crawler'
   producer:
     name: 'Pinterest'
@@ -1715,7 +1850,10 @@
 - regex: 'Server Density Service Monitoring.*'
   name: 'Server Density'
 
-- 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)|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|Minimo|RackspaceBot)'
+- 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)|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|RackspaceBot|robots|SeopultContentAnalyzer|7Siters|centuryb.o.t9)'
   name: 'Generic Bot'
 
 - regex: '^sentry'
@@ -1724,7 +1862,191 @@
     name: 'Sentry'
     url: 'https://sentry.io'
 
-# Generic detections
+- regex: '^Spotify'
+  name: 'Spotify'
+  producer:
+    name: 'Spotify'
+    url: 'https://www.spotify.com'
+
+- regex: 'The Knowledge AI'
+  name: 'The Knowledge AI'
+  category: 'Crawler'
+
+- regex: 'Embedly'
+  name: 'Embedly'
+  category: 'Crawler'
+  url: 'https://support.embed.ly/hc/en-us'
+  producer:
+    name: 'A Medium, Corp.'
+    url: 'https://medium.com/'
+
+- regex: 'BrandVerity'
+  name: 'BrandVerity'
+  category: 'Crawler'
+  url: 'https://www.brandverity.com/why-is-brandverity-visiting-me'
+  producer:
+    name: 'BrandVerity, Inc.'
+    url: 'https://www.brandverity.com/'
+
+- regex: 'Kaspersky Lab CFR link resolver'
+  name: 'Kaspersky'
+  category: 'Security Checker'
+  url: 'https://www.kaspersky.com/'
+  producer:
+    name: 'AO Kaspersky Lab'
+    url: 'https://www.kaspersky.com/'
+
+- regex: 'eZ Publish Link Validator'
+  name: 'eZ Publish Link Validator'
+  category: 'Crawler'
+  url: 'https://ez.no/'
+  producer:
+    name: 'eZ Systems AS'
+    url: 'https://ez.no/'
+
+- regex: 'woorankreview'
+  name: 'WooRank'
+  category: 'Search bot'
+  url: 'https://www.woorank.com/'
+  producer:
+    name: 'WooRank sprl'
+    url: 'https://www.woorank.com/'
+
+- regex: '(Match|LinkCheck) by Siteimprove.com'
+  name: 'Siteimprove'
+  category: 'Search bot'
+  url: 'https://siteimprove.com/'
+  producer:
+    name: 'Siteimprove GmbH'
+    url: 'https://siteimprove.com/'
+
+- regex: 'CATExplorador'
+  name: 'CATExplorador'
+  category: 'Search bot'
+  url: 'https://fundacio.cat/ca/domini/'
+  producer:
+    name: 'Fundació puntCAT'
+    url: 'https://fundacio.cat/ca/domini/'
+
+- regex: 'Buck'
+  name: 'Buck'
+  category: 'Search bot'
+  url: 'https://hypefactors.com/'
+  producer:
+    name: 'Hypefactors A/S'
+    url: 'https://hypefactors.com/'
+
+- regex: 'tracemyfile'
+  name: 'TraceMyFile'
+  category: 'Search bot'
+  url: 'https://www.tracemyfile.com/'
+  producer:
+    name: 'Idee Inc.'
+    url: 'http://ideeinc.com/'
+
+- regex: 'zelist.ro feed parser'
+  name: 'Ze List'
+  url: 'https://www.zelist.ro/'
+  category: 'Feed Fetcher'
+  producer:
+    name: 'Treeworks SRL'
+    url: 'https://www.tree.ro/'
+
+- regex: 'weborama-fetcher'
+  name: 'Weborama'
+  category: 'Search bot'
+  url: 'https://weborama.com/'
+  producer:
+    name: 'Weborama SA'
+    url: 'https://weborama.com/'
+
+- regex: 'BoardReader Favicon Fetcher'
+  name: 'BoardReader'
+  category: 'Search bot'
+  url: 'http://boardreader.com/'
+  producer:
+    name: 'Effyis Inc'
+    url: 'http://boardreader.com/'
+
+- regex: 'IDG/IT'
+  name: 'IDG/IT'
+  category: 'Search bot'
+  url: 'https://spaziodati.eu/'
+  producer:
+    name: 'SpazioDati S.r.l.'
+    url: 'https://spaziodati.eu/'
+
+- regex: 'Bytespider'
+  name: 'Bytespider'
+  category: 'Search bot'
+  url: 'https://bytedance.com/'
+  producer:
+    name: 'ByteDance Ltd.'
+    url: 'https://bytedance.com/'
+
+- regex: 'WikiDo'
+  name: 'WikiDo'
+  category: 'Search bot'
+  url: 'https://www.wikido.com/'
+  producer:
+    name: 'Fotolitografie Fiorentine di Becchi Antonio s.n.c.'
+    url: 'https://www.wikido.com/'
+
+- regex: 'AwarioSmartBot'
+  name: 'Awario'
+  category: 'Search bot'
+  url: 'https://awario.com/bots.html'
+  producer:
+    name: 'Awario'
+    url: 'https://awario.com/'
+
+- regex: 'AwarioRssBot'
+  name: 'Awario'
+  category: 'Feed Fetcher'
+  url: 'https://awario.com/bots.html'
+  producer:
+    name: 'Awario'
+    url: 'https://awario.com/'
+
+- regex: 'oBot'
+  name: 'oBot'
+  category: 'Search bot'
+  url: 'http://www.xforce-security.com/crawler/'
+  producer:
+    name: 'IBM Germany Research & Development GmbH'
+    url: 'https://exchange.xforce.ibmcloud.com/'
+
+- regex: 'SMTBot'
+  name: 'SMTBot'
+  category: 'Search bot'
+  url: 'https://www.similartech.com/smtbot'
+  producer:
+    name: 'SimilarTech Ltd.'
+    url: 'https://www.similartech.com/'
+
+- regex: 'LCC'
+  name: 'LCC'
+  category: 'Search bot'
+  url: 'https://corpora.uni-leipzig.de/crawler_faq.html'
+  producer:
+    name: 'Universität Leipzig'
+    url: 'https://www.uni-leipzig.de/'
+
+- regex: 'Startpagina-Linkchecker'
+  name: 'Startpagina Linkchecker'
+  category: 'Search bot'
+  url: 'https://www.startpagina.nl/linkchecker'
+  producer:
+    name: 'Startpagina B.V.'
+    url: 'https://www.startpagina.nl/'
+
+- regex: 'GTmetrix'
+  name: 'GTmetrix'
+  category: 'Crawler'
+  url: 'https://gtmetrix.com/'
+  producer:
+    name: 'Carbon60 Operating Co. Ltd.'
+    url: 'https://www.carbon60.com/'
 
 - regex: 'Nutch'
   name: 'Nutch-based Bot'
@@ -1734,5 +2056,61 @@
     name: 'The Apache Software Foundation'
     url: 'http://www.apache.org/foundation/'
 
+- regex: 'Seobility'
+  name: 'Seobility'
+  category: 'Crawler'
+  url: 'https://www.seobility.net/en/faq/?category=crawling#!aboutourbot'
+
+- regex: 'Vercelbot'
+  name: 'Vercel Bot'
+  category: 'Service bot'
+  url: 'https://vercel.com'
+
+- regex: 'Grammarly'
+  name: 'Grammarly'
+  category: 'Service bot'
+  url: 'http://www.grammarly.com'
+
+- regex: 'Robozilla'
+  name: 'Robozilla'
+  category: 'Crawler'
+
+- regex: 'Domains Project'
+  name: 'Domains Project'
+  category: 'Crawler'
+  url: 'https://domainsproject.org'
+
+- regex: 'PetalBot'
+  name: 'Petal Bot'
+  category: 'Crawler'
+  url: 'https://aspiegel.com/petalbot'
+
+- regex: 'SerendeputyBot'
+  name: 'Serendeputy Bot'
+  category: 'Crawler'
+  url: 'http://serendeputy.com/about/serendeputy-bot'
+
+- regex: 'ias-va.*admantx.*service-fetcher'
+  name: 'ADmantX Service Fetcher'
+  category: 'Service bot'
+  url: 'https://www.admantx.com/service-fetcher.html'
+
+- regex: 'SemanticScholarBot'
+  name: 'Semantic Scholar Bot'
+  category: 'Crawler'
+  url: 'https://www.semanticscholar.org/crawler'
+
+- regex: 'VelenPublicWebCrawler'
+  name: 'Velen Public Web Crawler'
+  category: 'Crawler'
+  url: 'https://hunter.io/robot'
+
+- regex: 'Barkrowler'
+  name: 'Barkrowler'
+  category: 'Crawler'
+  url: 'http://www.exensa.com/crawl'
+
+# Generic detections
+
 - regex: '[a-z0-9\-_]*((?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9])|crawler|crawl|checker|archiver|transcoder|spider)([^a-z]|$)'
   name: 'Generic Bot'
diff --git a/priv/ua_inspector/browser_engine.browser_engine.yml b/priv/ua_inspector/browser_engine.browser_engine.yml
index 1c784a6249..a4770deb49 100644
--- a/priv/ua_inspector/browser_engine.browser_engine.yml
+++ b/priv/ua_inspector/browser_engine.browser_engine.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -31,3 +31,9 @@
 
 - regex: 'NetSurf'
   name: 'NetSurf'
+
+- regex: 'Servo'
+  name: 'Servo'
+
+- regex: 'Goanna'
+  name: 'Goanna'
diff --git a/priv/ua_inspector/client.browsers.yml b/priv/ua_inspector/client.browsers.yml
index 8774e5b13b..27f76f678d 100644
--- a/priv/ua_inspector/client.browsers.yml
+++ b/priv/ua_inspector/client.browsers.yml
@@ -1,11 +1,330 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
-# Microsoft Edge (newer versions of IE)
+# Safe Exam Browser (https://safeexambrowser.org/)
+- regex: 'SEB/(?:(\d+[\.\d]+))?'
+  name: 'Safe Exam Browser'
+  version: '$1'
+
+# Colibri (https://colibri.opqr.co/)
+- regex: 'Colibri/(?:(\d+[\.\d]+))?'
+  name: 'Colibri'
+  version: '$1'
+
+# Xvast (https://www.xvast.com/)
+- regex: 'Xvast/(?:(\d+[\.\d]+))?'
+  name: 'Xvast'
+  version: '$1'
+
+# Tungsten (https://en.tungsten-start.net/)
+- regex: 'TungstenBrowser/(?:(\d+[\.\d]+))?'
+  name: 'Tungsten'
+  version: '$1'
+
+# Lulumi (https://github.com/LulumiProject/lulumi-browser)
+- regex: 'Lulumi-browser/(?:(\d+[\.\d]+))?'
+  name: 'Lulumi'
+  version: '$1'
+
+# Yahoo! Japan Browser (https://promo-ybrowser.yahoo.co.jp/)
+- regex: 'ybrowser/(?:(\d+[\.\d]+))?'
+  name: 'Yahoo! Japan Browser'
+  version: '$1'
+
+# Lunascape Lite (https://www.lunascape.tv/)
+- regex: 'iLunascapeLite/(?:(\d+[\.\d]+))?'
+  name: 'Lunascape Lite'
+  version: '$1'
+
+# Polypane (https://polypane.app/)
+- regex: 'Polypane/(?:(\d+[\.\d]+))?'
+  name: 'Polypane'
+  version: '$1'
+
+# OhHai Browser (https://ohhaibrowser.com/)
+- regex: 'OhHaiBrowser/(?:(\d+[\.\d]+))?'
+  name: 'OhHai Browser'
+  version: '$1'
+
+# Sizzy (https://sizzy.co/)
+- regex: 'Sizzy/(?:(\d+[\.\d]+))?'
+  name: 'Sizzy'
+  version: '$1'
+
+# Glass Browser (https://github.com/mitchas/glass-browser)
+- regex: 'GlassBrowser/(?:(\d+[\.\d]+))?'
+  name: 'Glass Browser'
+  version: '$1'
+
+# ToGate (https://tmaxanc.com/#!/product-introduce/ToGate)
+- regex: 'ToGate/(?:(\d+[\.\d]+))?'
+  name: 'ToGate'
+  version: '$1'
+
+# VMware AirWatch (https://www.air-watch.com/)
+- regex: 'AirWatch Browser v(?:(\d+[\.\d]+))?'
+  name: 'VMware AirWatch'
+  version: '$1'
+
+# AOL Desktop (https://beta.aol.com/projects/desktop/windows)
+- regex: 'ADG/(?:(\d+[\.\d]+))?'
+  name: 'AOL Desktop'
+  version: '$1'
+
+# Elements Browser (https://elementsbrowser.com/)
+- regex: 'Elements Browser/(?:(\d+[\.\d]+))?'
+  name: 'Elements Browser'
+  version: '$1'
+
+# Light (https://sourceforge.net/projects/lightfirefox/)
+- regex: 'Light/(\d+[\.\d]+)'
+  name: 'Light'
+  version: '$1'
+
+# Steam (https://www.valvesoftware.com/)
+- regex: 'Valve Steam GameOverlay/(?:(\d+[\.\d]+))?'
+  name: 'Steam In-Game Overlay'
+  version: '$1'
+
+# 115 Browser (https://pc.115.com/)
+- regex: '115Browser/(?:(\d+[\.\d]+))?'
+  name: '115 Browser'
+  version: '$1'
+
+# Atom (https://browser.ru/)
+- regex: 'Atom/(?:(\d+[\.\d]+))?'
+  name: 'Atom'
+  version: '$1'
+
+# Firefox Reality (https://mixedreality.mozilla.org/firefox-reality/)
+- regex: 'Mobile VR.+Firefox'
+  name: 'Firefox Reality'
+  version: ''
+
+# AVG Secure Browser (https://www.avg.com/en-us/secure-browser)
+- regex: 'AVG(?:/(\d+[\.\d]+))?'
+  name: 'AVG Secure Browser'
+  version: '$1'
+
+# START Internet Browser (https://play.google.com/store/apps/details?id=fyi.start.web.browser)
+- regex: 'Start/(?:(\d+[\.\d]+))?'
+  name: 'START Internet Browser'
+  version: '$1'
+
+# Lovense Browser (https://www.lovense.com/cam-model/download)
+- regex: 'Lovense(?:/(\d+[\.\d]+))?'
+  name: 'Lovense Browser'
+  version: '$1'
+
+# Delta Browser (https://play.google.com/store/apps/details?id=com.airfind.deltabrowser)
+- regex: 'com.airfind.deltabrowser(?:/(\d+[\.\d]+))?'
+  name: 'Delta Browser'
+  version: '$1'
+
+# Ordissimo (https://www.ordissimo.fr/)
+- regex: '(?:Ordissimo|webissimo3)(?:/(\d+[\.\d]+))?'
+  name: 'Ordissimo'
+  version: '$1'
+
+# CCleaner (https://www.ccleaner.com/ccleaner/browser)
+- regex: 'CCleaner(?:/(\d+[\.\d]+))?'
+  name: 'CCleaner'
+  version: '$1'
+
+# Aloha Browser Lite (https://play.google.com/store/apps/details?id=com.alohamobile.browser.lite)
+- regex: 'AlohaLite(?:/(\d+[\.\d]+))?'
+  name: 'Aloha Browser Lite'
+  version: '$1'
+
+# Tao Browser (https://browser.taobao.com/)
+- regex: 'TaoBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Tao Browser'
+  version: '$1'
+
+# Falkon (https://www.falkon.org/)
+- regex: 'Falkon(?:/(\d+[\.\d]+))?'
+  name: 'Falkon'
+  version: '$1'
+
+# mCent (http://mcentbrowser.com/)
+- regex: 'mCent(?:/(\d+[\.\d]+))?'
+  name: 'mCent'
+  version: '$1'
+
+# SalamWeb (https://salamweb.com/)
+- regex: 'SalamWeb(?:/(\d+[\.\d]+))?'
+  name: 'SalamWeb'
+  version: '$1'
+
+# BlackHawk (http://www.netgate.sk/blackhawk/)
+- regex: 'BlackHawk(?:/(\d+[\.\d]+))?'
+  name: 'BlackHawk'
+  version: '$1'
+
+# Minimo (https://www-archive.mozilla.org/projects/minimo/)
+- regex: 'Minimo(?:/(\d+[\.\d]+))?'
+  name: 'Minimo'
+  version: '$1'
+
+# Wear Internet Browser (https://play.google.com/store/apps/details?id=com.appfour.wearbrowser)
+- regex: 'WIB(?:/(\d+[\.\d]+))?'
+  name: 'Wear Internet Browser'
+  version: '$1'
+
+# Origyn Web Browser (https://en.wikipedia.org/wiki/Origyn_Web_Browser)
+- regex: 'Origyn Web Browser'
+  name: 'Origyn Web Browser'
+  version: ''
+
+# Kinza (https://www.kinza.jp/en/)
+- regex: 'Kinza(?:/(\d+[\.\d]+))?'
+  name: 'Kinza'
+  version: '$1'
+
+# Beamrise (https://web.archive.org/web/20170520043839/http://beamrise.com/)
+- regex: 'Beamrise(?:/(\d+[\.\d]+))?'
+  name: 'Beamrise'
+  version: '$1'
+
+# Faux Browser (https://apps.apple.com/us/app/faux-browser/id472250940)
+- regex: 'Faux(?:/(\d+[\.\d]+))?'
+  name: 'Faux Browser'
+  version: '$1'
+
+# Splash (https://scrapinghub.com/splash)
+- regex: 'splash Version(?:/(\d+[\.\d]+))?'
+  name: 'Splash'
+  version: '$1'
+
+# Meizu Browser (https://www.meizu.com/)
+- regex: 'MZBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Meizu Browser'
+  version: '$1'
+
+# COS Browser (https://sj.qq.com/myapp/detail.htm?apkName=com.qcloud.cos.client)
+- regex: 'COSBrowser(?:/(\d+[\.\d]+))?'
+  name: 'COS Browser'
+  version: '$1'
+
+# Crusta (https://github.com/Crusta/CrustaBrowser)
+- regex: 'Crusta(?:/(\d+[\.\d]+))?'
+  name: 'Crusta'
+  version: '$1'
+
+# Hawk Turbo Browser
+- regex: 'Hawk/TurboBrowser(?:/v?(\d+[\.\d]+))?'
+  name: 'Hawk Turbo Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# FreeU (https://freeu.online/)
+- regex: 'FreeU(?:/(\d+[\.\d]+))?'
+  name: 'FreeU'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# Nox Browser (https://play.google.com/store/apps/details?id=com.noxgroup.app.browser)
+- regex: 'NoxBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Nox Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# Basilisk (https://www.basilisk-browser.org/)
+- regex: 'Basilisk(?:/(\d+[\.\d]+))?'
+  name: 'Basilisk'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
+# Sputnik Browser (https://play.google.com/store/apps/details?id=ru.sputnik.browser)
+- regex: 'SputnikBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Sputnik Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# K.Browser (https://play.google.com/store/apps/details?id=com.tnsua.browser)
+- regex: 'TNSBrowser(?:/(\d+[\.\d]+))?'
+  name: 'K.Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# Oculus Browser (https://developer.oculus.com/documentation/oculus-browser/latest/concepts/)
+- regex: 'OculusBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Oculus Browser'
+  version: '$1'
+
+# Jio Browser (https://play.google.com/store/apps/details?id=com.jio.web)
+- regex: 'JioBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Jio Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# hola! Browser (https://hola.org/browser)
+- regex: 'Chrome/.+ Hola(?:/(\d+[\.\d]+))?'
+  name: 'hola! Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# Huawei Browser
+- regex: 'HuaweiBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Huawei Browser'
+  version: '$1'
+
+# vivo Browser
+- regex: 'VivoBrowser(?:/(\d+[\.\d]+))?'
+  name: 'vivo Browser'
+  version: '$1'
+
+# Realme Browser
+- regex: 'RealmeBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Realme Browser'
+  version: '$1'
+
+# Beaker distributed web browser (https://beakerbrowser.com/)
+- regex: 'Beaker ?Browser(?:[/ ](\d+[\.\d]+))?'
+  name: 'Beaker Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# Qwant Mobile
+- regex: 'QwantMobile(?:/(\d+[\.\d]+))?'
+  name: 'Qwant Mobile'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+- regex: 'Qwant/(\d+[\.\d]+)'
+  name: 'Qwant Mobile'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# TenFourFox
+- regex: 'TenFourFox(?:/(\d+[\.\d]+))?'
+  name: 'TenFourFox'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# AOL Shield
+- regex: 'AOLShield(?:/(\d+[\.\d]+))?'
+  name: 'AOL Shield'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# Microsoft Edge (Spartan Edge)
 - regex: 'Edge[ /](\d+[\.\d]+)'
   name: 'Microsoft Edge'
   version: '$1'
@@ -26,6 +345,13 @@
   engine:
     default: 'Blink'
 
+# Microsoft Edge (Anaheim Edge)
+- regex: 'Edg[ /](\d+[\.\d]+)'
+  name: 'Microsoft Edge'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
 # 360 Browser
 - regex: 'QIHU 360[ES]E'
   name: '360 Browser'
@@ -45,10 +371,17 @@
   engine:
     default: 'Gecko'
 
-# SeaMonkey
-- regex: '(Iceape|SeaMonkey|gnuzilla)(?:/(\d+[\.\d]+))?'
-  name: '$1'
-  version: '$2'
+# IceCat
+- regex: 'IceCat(?:/(\d+[\.\d]+))?'
+  name: 'IceCat'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# Mobicip
+- regex: 'Mobicip'
+  name: 'Mobicip'
+  version: ''
   engine:
     default: 'Gecko'
 
@@ -71,13 +404,13 @@
   name: 'Aloha Browser'
   version: '$1'
 
-#Avast Secure Browser
-- regex: 'Avast(?:/(\d+[\.\d]+))?'
+# Avast Secure Browser | Avast SafeZone Browser (https://www.avast.com/)
+- regex: '(?:Avast|ASW|Safer)(?:/(\d+[\.\d]+))?'
   name: 'Avast Secure Browser'
   version: '$1'
 
 #Epic
-- regex: 'Epic(?:/(\d+[\.\d]+))?'
+- regex: 'Epic(?:/(\d+[\.\d]+))'
   name: 'Epic'
   version: '$1'
   engine:
@@ -167,6 +500,11 @@
 
 
 #Pale Moon
+- regex: '.*Goanna.*PaleMoon(?:/(\d+[\.\d]+))?'
+  name: 'Pale Moon'
+  version: '$1'
+  engine:
+    default: 'Goanna'
 - regex: 'PaleMoon(?:/(\d+[\.\d]+))?'
   name: 'Pale Moon'
   version: '$1'
@@ -196,6 +534,11 @@
     versions:
       3: 'WebKit'
 
+# Jig Browser Plus (https://jig.jp/)
+- regex: 'JigBrowserPlus/(?:(\d+[\.\d]+))?'
+  name: 'Jig Browser Plus'
+  version: '$1'
+
 #Jig Browser
 - regex: 'jig browser(?: web;|9i?)?(?:[/ ](\d+[\.\d]+))?'
   name: 'Jig Browser'
@@ -215,11 +558,49 @@
   engine:
     default: 'Gecko'
 
+# Origin (https://www.origin.com/)
+- regex: 'Origin/(?:(\d+[\.\d]+))?'
+  name: 'Origin In-Game Overlay'
+  version: '$1'
+
 #Cunaguaro
 - regex: 'Cunaguaro(?:/(\d+[\.\d]+))?'
   name: 'Cunaguaro'
   version: '$1'
 
+# t-online.de Browser (https://www.t-online.de/computer/browser/)
+- regex: 'TO-Browser(?:/TOB(\d+[\.\d]+))?'
+  name: 't-online.de Browser'
+  version: '$1'
+
+#Kazehakase
+- regex: 'Kazehakase(?:/(\d+[\.\d]+))?'
+  name: 'Kazehakase'
+  version: '$1'
+  engine:
+    default: '' # multi engine
+
+# ArcticFox (https://github.com/wicknix/Arctic-Fox)
+- regex: 'ArcticFox(?:/(\d+[\.\d]+))?'
+  name: 'Arctic Fox'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
+# Mypal (https://github.com/Feodor2/Mypal)
+- regex: 'Mypal(?:/(\d+[\.\d]+))?'
+  name: 'Mypal'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
+# Centaury (https://github.com/Feodor2/Centaury)
+- regex: 'Centaury(?:/(\d+[\.\d]+))?'
+  name: 'Centaury'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
 #Firefox Focus / Firefox Klar
 - regex: '(?:Focus|Klar)(?:/(\d+[\.\d]+))?'
   name: 'Firefox Focus'
@@ -240,28 +621,38 @@
     default: 'Gecko'
 
 #Firefox Mobile
-- regex: '(Mobile|Tablet).*Firefox(?:/(\d+[\.\d]+))?'
+- regex: '(?:Mobile|Tablet).*Servo.*Firefox(?:/(\d+[\.\d]+))?'
   name: 'Firefox Mobile'
-  version: '$2'
+  version: '$1'
+  engine:
+    default: 'Servo'
+- regex: '(?:Mobile|Tablet).*Firefox(?:/(\d+[\.\d]+))?'
+  name: 'Firefox Mobile'
+  version: '$1'
   engine:
     default: 'Gecko'
+- regex: 'FxiOS/(\d+[\.\d]+)'
+  name: 'Firefox Mobile iOS'
+  version: '$1'
+  engine:
+    default: 'WebKit'
 
 #Firefox
-- regex: 'Firefox(?:/(\d+[\.\d]+))?'
+- regex: '.*Servo.*Firefox(?:/(\d+[\.\d]+))?'
+  name: 'Firefox'
+  version: '$1'
+  engine:
+    default: 'Servo'
+- regex: '(?!.*Opera[ /])Firefox(?:/(\d+[\.\d]+))?'
   name: 'Firefox'
   version: '$1'
   engine:
     default: 'Gecko'
-- regex: '(BonEcho|GranParadiso|Lorentz|Minefield|Namoroka|Shiretoko)/(\d+[\.\d]+)'
+- regex: '(?:BonEcho|GranParadiso|Lorentz|Minefield|Namoroka|Shiretoko)/(\d+[\.\d]+)'
   name: 'Firefox'
-  version: '$1 ($2)'
+  version: '$1'
   engine:
     default: 'Gecko'
-- regex: 'FxiOS/(\d+[\.\d]+)'
-  name: 'Firefox Mobile'
-  version: 'iOS $1'
-  engine:
-    default: 'WebKit'
 
 #ANT Fresco
 - regex: 'ANTFresco(?:[/ ](\d+[\.\d]+))?'
@@ -317,6 +708,44 @@
   name: 'Dooble'
   version: '$1'
 
+# Whale
+- regex: 'Whale/(\d+[\.\d]+)'
+  name: 'Whale Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+#Obigo
+- regex: 'Obigo[ ]?(?:InternetBrowser|Browser)?(?:[ /]([a-z0-9]*))?'
+  name: 'Obigo'
+  version: '$1'
+- regex: 'Obigo|Teleca'
+  name: 'Obigo'
+  version: ''
+
+#UC Browser Mini
+- regex: 'UCMini(?:[ /]?(\d+[\.\d]+))?'
+  name: 'UC Browser Mini'
+  version: '$1'
+- regex: 'UC[ ]?Browser.* \(UCMini\)'
+  name: 'UC Browser Mini'
+  version: ''
+
+# UC Browser Turbo
+- regex: 'UCTurbo(?:[ /]?(\d+[\.\d]+))?'
+  name: 'UC Browser Turbo'
+  version: '$1'
+- regex: 'UC[ ]?Browser.* \(UCTurbo\)'
+  name: 'UC Browser Turbo'
+  version: ''
+
+# Opera GX (https://www.opera.com/gx#start | http://ftp.opera.com/pub/opera_gx/)
+- regex: 'OPRGX(?:/(\d+[\.\d]+))?'
+  name: 'Opera GX'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
 #Opera
 - regex: '(?:Opera Tablet.*Version|Opera/.+Opera Mobi.+Version|Mobile.+OPR)/(\d+[\.\d]+)'
   name: 'Opera Mobile'
@@ -325,9 +754,21 @@
     default: 'Presto'
     versions:
       15: 'Blink'
-- regex: '(?:OPT)/(\d+[\.\d]+)'
+- regex: 'MMS/(\d+[\.\d]+)'
+  name: 'Opera Neon'
+  version: '$1'
+  engine:
+    default: 'Blink'
+- regex: 'OMI/(\d+[\.\d]+)'
+  name: 'Opera Devices'
+  version: '$1'
+  engine:
+    default: 'Blink'
+- regex: 'OPT/(\d+[\.\d]+)'
   name: 'Opera Touch'
   version: '$1'
+  engine:
+    default: 'Blink'
 - regex: 'Opera/(\d+[\.\d]+).+Opera Mobi'
   name: 'Opera Mobile'
   version: '$1'
@@ -345,6 +786,11 @@
   version: '$1'
   engine:
     default: 'Presto'
+- regex: 'OPiOS/(\d+[\.\d]+)'
+  name: 'Opera Mini iOS'
+  version: '$1'
+  engine:
+    default: 'WebKit'
 - regex: 'Opera.+Edition Next.+Version/(\d+[\.\d]+)'
   name: 'Opera Next'
   version: '$1'
@@ -384,7 +830,7 @@
     default: '' # multi engine
 
 #Comodo Dragon
-- regex: 'Comodo[ _]Dragon(?:/(\d+[\.\d]+))?'
+- regex: '(?:Comodo[ _])?Dragon(?!fruit)(?:/(\d+[\.\d]+))?'
   name: 'Comodo Dragon'
   version: '$1'
   engine:
@@ -416,7 +862,10 @@
       4: '' # multiple (KHTML or WebKit)
 
 #Baidu Browser
-- regex: 'baidubrowser(?:[/ ](\d+[\.\d]*))?'
+- regex: '(?:baidubrowser|bdbrowser_i18n|bdbrowser)(?:[/ ](\d+[\.\d]*))?'
+  name: 'Baidu Browser'
+  version: '$1'
+- regex: 'FlyFlow(?:[/ ](\d+[\.\d]*))?'
   name: 'Baidu Browser'
   version: '$1'
 
@@ -425,9 +874,23 @@
   name: 'Baidu Spark'
   version: '$1'
 
+# Yandex Browser Lite
+- regex: 'YaBrowser(?:/(\d+[\.\d]*)) \(lite\)?'
+  name: 'Yandex Browser Lite'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
 #Yandex Browser
-- regex: 'YaBrowser(?:/(\d+[\.\d]*))?'
+- regex: 'YaBrowser(?:/(\d+[\.\d]*))(?: \((alpha|beta)\))?'
   name: 'Yandex Browser'
+  version: '$1 $2'
+  engine:
+    default: 'Blink'
+
+# Yaani Browser
+- regex: 'YaaniBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Yaani Browser'
   version: '$1'
   engine:
     default: 'Blink'
@@ -467,7 +930,7 @@
     versions:
       3: 'WebKit'
 
-- regex: '(?:Maxthon|MyIE2|Uzbl)'
+- regex: '(?:Maxthon|MyIE2)'
   name: 'Maxthon'
   version: ''
   engine:
@@ -478,7 +941,20 @@
   name: 'Puffin'
   version: '$1'
 
-#Iron
+#MobileIron
+- regex: 'MobileIron(?:/(\d+[\.\d]+))?'
+  name: 'Iron Mobile'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# Iron
+- regex: 'Chrome(?:/(\d+[\.\d]+))?.*Iron'
+  name: 'Iron'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
 - regex: 'Iron(?:/(\d+[\.\d]+))?'
   name: 'Iron'
   version: '$1'
@@ -497,9 +973,14 @@
       '2.9.16': '' # multi engine
       '2.28': 'WebKit'
 
-# Liebao
+# LieBaoFast
+- regex: 'LieBaoFast(?:[ /](\d+[\.\d]+))?'
+  name: 'LieBaoFast'
+  version: '$1'
+
+# Cheetah Browser
 - regex: 'LBBrowser(?:[ /](\d+[\.\d]+))?'
-  name: 'Liebao'
+  name: 'Cheetah Browser'
   version: '$1'
 
 # Sogou Explorer
@@ -507,15 +988,26 @@
   name: 'Sogou Explorer'
   version: '$1'
 
+# QQ Browser Mini
+- regex: 'M?QQBrowser/Mini([\.\d]+)?'
+  name: 'QQ Browser Mini'
+  version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
 # QQ Browser
-- regex: 'M?QQBrowser(?:/(?:Mini)?([\.\d]+))?'
+- regex: 'M?QQBrowser(?:/([\.\d]+))?'
   name: 'QQ Browser'
   version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
 
 # MIUI Browser
-- regex: 'MIUIBrowser(?:/(\d+[\.\d]+))?'
+- regex: '(?:MIUIBrowser|MiuiBrowser)(?:/(\d+[\.\d]+))?'
   name: 'MIUI Browser'
   version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
 
 # Coc Coc
 # This browser (http://coccoc.vn/) is built on top of Chromium with
@@ -530,23 +1022,40 @@
     versions:
       28: 'Blink'
 
+- regex: 'DuckDuckGo/(\d+[\.\d]*)'
+  name: 'DuckDuckGo Privacy Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
 #Samsung Browser
 - regex: 'Samsung ?Browser(?:[/ ](\d+[\.\d]+))?'
   name: 'Samsung Browser'
   version: '$1'
 
-#Streamy
-#This browser is built on top of Chromium.
-#It should be checked first.
+# Super Fast Browser (https://play.google.com/store/apps/details?id=com.browser.tssomas)
+- regex: '(?:SFBrowser|com.browser.tssomas)(?:/(\d+[\.\d]+))?'
+  name: 'Super Fast Browser'
+  version: '$1'
+
+# EUI Browser
+- regex: 'EUI Browser(?:/(\d+[\.\d]+))?'
+  name: 'EUI Browser'
+  version: '$1'
+
+# UBrowser (https://callumprentice.github.io/)
+- regex: 'UBrowser(?:/(\d+[\.\d]+))?'
+  name: 'UBrowser'
+  version: '$1'
+
+#Streamy (Chromium based)
 - regex: 'Streamy(?:/(\d+[\.\d]+))?'
   name: 'Streamy'
   version: '$1'
   engine:
     default: 'WebKit'
 
-#Isivioo
-#Andorid version of the browser is built on top of Chrome Mobile.
-#It should be checked first.
+#Isivioo (Android version is Chrome based)
 - regex: 'isivioo'
   name: 'Isivioo'
   version: ''
@@ -560,6 +1069,175 @@
 - regex: 'UCWEB(?:[ /]?(\d+[\.\d]+))?'
   name: 'UC Browser'
   version: '$1'
+- regex: 'UC AppleWebKit'
+  name: 'UC Browser'
+  version: ''
+
+#Tenta Browser
+#It should be checked before Chrome since the UA contains the Chrome
+- regex: 'Tenta/(\d+[\.\d]+)'
+  name: 'Tenta Browser'
+  version: '$1'
+  engine:
+    default: 'Webkit'
+
+# Firefox Rocket
+- regex: 'Rocket/(\d+[\.\d]+)'
+  name: 'Firefox Rocket'
+  version: '$1'
+  engine:
+    default: 'Webkit'
+
+# Web Explorer
+- regex: 'Web Explorer/(\d+[\.\d]+).*Chrome'
+  name: 'Web Explorer'
+  version: '$1'
+  engine:
+    default: 'Webkit'
+
+# Seznam Browser
+- regex: 'SznProhlizec/(\d+[\.\d]+)'
+  name: 'Seznam Browser'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
+# SogouMobileBrowser
+- regex: 'SogouMobileBrowser/(\d+[\.\d]+)'
+  name: 'Sogou Mobile Browser'
+  version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+# Mint Browser
+- regex: 'Mint Browser/(\d+[\.\d]+)'
+  name: 'Mint Browser'
+  version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+# Ecosia
+- regex: 'Ecosia (?:android|ios)@(\d+[\.\d]+)'
+  name: 'Ecosia'
+  version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+# CM Browser
+- regex: 'ACHEETAHI'
+  name: 'CM Browser'
+  version: ''
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+# Kiwi Browser
+- regex: 'Kiwi Chrome'
+  name: 'Kiwi'
+  version: ''
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+# 2345 Browser
+- regex: 'Mb2345Browser/(\d+[\.\d]+)'
+  name: '2345 Browser'
+  version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+# QtWebEngine
+- regex: 'QtWebEngine/(\d+[\.\d]+)'
+  name: 'QtWebEngine'
+  version: '$1'
+  engine:
+    default: '' # multi engine -- WebKit or Blink
+
+#Mobile Silk
+- regex: 'Silk/(\d+[\.\d]+) like Chrome'
+  name: 'Mobile Silk'
+  version: '$1'
+  engine:
+    default: 'Blink'
+- regex: 'Silk(?:/(\d+[\.\d]+))?'
+  name: 'Mobile Silk'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+#IBrowse
+- regex: 'IBrowse(?:[ /](\d+[\.\d]+))?'
+  name: 'IBrowse'
+  version: '$1'
+
+#Openwave Mobile Browser
+- regex: 'UP.Browser(?:/(\d+[\.\d]+))?'
+  name: 'Openwave Mobile Browser'
+  version: '$1'
+- regex: 'Openwave(?:/(\d+[\.\d]+))?'
+  name: 'Openwave Mobile Browser'
+  version: '$1'
+
+#ONE Browser
+- regex: 'OneBrowser(?:[ /](\d+[\.\d]+))?'
+  name: 'ONE Browser'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+#Nokia Browser
+- regex: '(?:NokiaBrowser|BrowserNG)(?:/(\d+[\.\d]+))?'
+  name: 'Nokia Browser'
+  version: '$1'
+- regex: 'Series60/5\.0'
+  name: 'Nokia Browser'
+  version: '7.0'
+- regex: 'Series60/(\d+[\.\d]+)'
+  name: 'Nokia OSS Browser'
+  version: '$1'
+- regex: 'S40OviBrowser/(\d+[\.\d]+)'
+  name: 'Nokia Ovi Browser'
+  version: '$1'
+- regex: '^Nokia|Nokia[EN]?\d+'
+  name: 'Nokia Browser'
+  version: ''
+
+#Sleipnir
+- regex: 'Sleipnir(?:[ /](\d+[\.\d]+))?'
+  name: 'Sleipnir'
+  version: '$1'
+  engine:
+    default: '' # multi engine
+
+# NTENT Browser
+- regex: 'NTENTBrowser(?:/(\d+[\.\d]+))?'
+  name: 'NTENT Browser'
+  version: '$1'
+
+# TV Bro
+- regex: 'TV Bro/(\d+[\.\d]+)'
+  name: 'TV Bro'
+  version: '$1'
+
+# Quark
+- regex: 'Chrome/.+ Quark(?:/(\d+[\.\d]+))?'
+  name: 'Quark'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+- regex: 'BlueBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Blue Browser'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+# Chrome Webview
+- regex: 'Version/.* Chrome(?:/(\d+[\.\d]+))?'
+  name: 'Chrome Webview'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+    versions:
+      28: 'Blink'
 
 #Chrome
 - regex: 'CrMo(?:/(\d+[\.\d]+))?'
@@ -598,7 +1276,7 @@
   version: '$1'
   engine:
     default: 'Blink'
-- regex: 'Chrome(?:/(\d+[\.\d]+))?'
+- regex: 'Chrome(?!book)(?:/(\d+[\.\d]+))?'
   name: 'Chrome'
   version: '$1'
   engine:
@@ -740,6 +1418,11 @@
   name: 'Element Browser'
   version: '$1'
 
+# eZ Browser (https://play.google.com/store/apps/details?id=com.asc.csbrowser)
+- regex: 'eZBrowser(?:/(\d+[\.\d]+))?'
+  name: 'eZ Browser'
+  version: '$1'
+
 #Firebird
 - regex: 'Firebird(?! Build)(?:/(\d+[\.\d]+))?'
   name: 'Firebird'
@@ -773,11 +1456,6 @@
   name: 'HotJava'
   version: '$1'
 
-#IBrowse
-- regex: 'IBrowse(?:[ /](\d+[\.\d]+))?'
-  name: 'IBrowse'
-  version: '$1'
-
 #iCabMobile
 - regex: 'iCabMobile(?:[ /](\d+[\.\d]+))?'
   name: 'iCab Mobile'
@@ -794,15 +1472,8 @@
     versions:
       4: 'WebKit'
 
-#Sleipnir
-- regex: 'Sleipnir(?:[ /](\d+[\.\d]+))?'
-  name: 'Sleipnir'
-  version: '$1'
-  engine:
-    default: '' # multi engine
-
 #Lunascape
-- regex: 'Lunascape(?:[/ ](\d+[\.\d]+))?'
+- regex: 'i?Lunascape(?:[/ ](\d+[\.\d]+))?'
   name: 'Lunascape'
   version: '$1'
   engine:
@@ -834,7 +1505,7 @@
   version: 10.0
   engine:
     default: 'Trident'
-- regex: 'Trident/7.0'
+- regex: 'Trident/[78].0'
   name: 'Internet Explorer'
   version: 11.0
   engine:
@@ -850,13 +1521,6 @@
   engine:
     default: 'Trident'
 
-#Kazehakase
-- regex: 'Kazehakase(?:/(\d+[\.\d]+))?'
-  name: 'Kazehakase'
-  version: '$1'
-  engine:
-    default: '' # multi engine
-
 #Kindle Browser
 - regex: 'Kindle/(\d+[\.\d]+)'
   name: 'Kindle Browser'
@@ -886,14 +1550,6 @@
   name: 'LuaKit'
   version: '$1'
 
-#Openwave Mobile Browser
-- regex: 'UP.Browser(?:/(\d+[\.\d]+))?'
-  name: 'Openwave Mobile Browser'
-  version: '$1'
-- regex: 'Openwave(?:/(\d+[\.\d]+))?'
-  name: 'Openwave Mobile Browser'
-  version: '$1'
-
 #OmniWeb
 - regex: 'OmniWeb(?:/[v]?(\d+[\.\d]+))?'
   name: 'OmniWeb'
@@ -906,13 +1562,6 @@
   name: 'Phoenix'
   version: '$1'
 
-#Mobile Silk
-- regex: 'Silk(?:/(\d+[\.\d]+))?'
-  name: 'Mobile Silk'
-  version: '$1'
-  engine:
-    default: 'Blink'
-
 #NetFront
 - regex: 'NetFrontLifeBrowser(?:/(\d+[\.\d]+))?'
   name: 'NetFront Life'
@@ -924,7 +1573,7 @@
   version: '$1'
   engine:
     default: 'NetFront'
-- regex: 'PLAYSTATION|NINTENDO 3|AppleWebKit.+ NX/\d+\.\d+\.\d+'
+- regex: 'PLAYSTATION|NINTENDO 3|AppleWebKit.+ N[XF]/\d+\.\d+\.\d+'
   name: 'NetFront'
   version: ''
 
@@ -933,19 +1582,6 @@
   name: 'NetPositive'
   version: '$1'
 
-# NTENT Browser
-- regex: 'NTENTBrowser(?:/(\d+[\.\d]+))?'
-  name: 'NTENT Browser'
-  version: '$1'
-
-#Obigo
-- regex: 'Obigo[ ]?(?:InternetBrowser|Browser)?(?:[ /]([a-z0-9]*))?'
-  name: 'Obigo'
-  version: '$1'
-- regex: 'Obigo|Teleca'
-  name: 'Obigo'
-  version: ''
-
 #Odyssey Web Browser
 - regex: 'Odyssey Web Browser(?:.*OWB/(\d+[\.\d]+))?'
   name: 'Odyssey Web Browser'
@@ -956,13 +1592,6 @@
   name: 'Off By One'
   version: ''
 
-#ONE Browser
-- regex: 'OneBrowser(?:[ /](\d+[\.\d]+))?'
-  name: 'ONE Browser'
-  version: '$1'
-  engine:
-    default: 'WebKit'
-
 #Oregano
 - regex: 'Oregano(?:[ /](\d+[\.\d]+))?'
   name: 'Oregano'
@@ -1034,23 +1663,6 @@
   name: 'Xiino'
   version: '$1'
 
-#Nokia Browser
-- regex: '(?:NokiaBrowser|BrowserNG)(?:/(\d+[\.\d]+))?'
-  name: 'Nokia Browser'
-  version: '$1'
-- regex: 'Series60/5\.0'
-  name: 'Nokia Browser'
-  version: '7.0'
-- regex: 'Series60/(\d+[\.\d]+)'
-  name: 'Nokia OSS Browser'
-  version: '$1'
-- regex: 'S40OviBrowser/(\d+[\.\d]+)'
-  name: 'Nokia Ovi Browser'
-  version: '$1'
-- regex: '^Nokia|Nokia[EN]?\d+'
-  name: 'Nokia Browser'
-  version: ''
-
 #BlackBerry Browser
 - regex: 'BlackBerry|PlayBook|BB10'
   name: 'BlackBerry Browser'
@@ -1078,6 +1690,13 @@
   name: 'Qutebrowser'
   version: '$1'
 
+# surf (https://surf.suckless.org/)
+- regex: 'Surf(?:/(\d+[\.\d]+))?'
+  name: 'surf'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
 #Safari
 - regex: '(?:(?:iPod|iPad|iPhone).+Version|MobileSafari)/(\d+[\.\d]+)'
   name: 'Mobile Safari'
@@ -1111,3 +1730,26 @@
   version: '$1'
   engine:
     default: 'NetSurf'
+
+# Uzbl (https://www.uzbl.org/)
+- regex: 'Uzbl'
+  name: 'Uzbl'
+  version: ''
+
+# SimpleBrowser (https://github.com/SimpleBrowserDotNet/SimpleBrowser)
+- regex: 'SimpleBrowser'
+  name: 'SimpleBrowser'
+  version: ''
+
+# Zvu
+- regex: 'Zvu(?:/(\d+[\.\d]+))?'
+  name: 'Zvu'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# GOG Galaxy
+- regex: 'GOGGalaxyClient/(?:(\d+[\.\d]+))?'
+  name: 'GOG Galaxy'
+  version: '$1'
+  
\ No newline at end of file
diff --git a/priv/ua_inspector/client.feed_readers.yml b/priv/ua_inspector/client.feed_readers.yml
index a43bf4da87..96f02bb97a 100644
--- a/priv/ua_inspector/client.feed_readers.yml
+++ b/priv/ua_inspector/client.feed_readers.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -47,6 +47,12 @@
   url: 'http://www.chebinliu.com/projects/iphone/feeddler-rss-reader/'
   type: 'Feed Reader App'
 
+- regex: 'QuiteRSS(?:[/ ](\d+[\.\d]+))?'
+  name: 'QuiteRSS'
+  version: '$1'
+  url: https://quiterss.org
+  type: 'Feed Reader App'
+
 - regex: 'gPodder/([\d\.]+)'
   name: 'gPodder'
   version: '$1'
diff --git a/priv/ua_inspector/client.libraries.yml b/priv/ua_inspector/client.libraries.yml
index bf82cc7e8f..2f40d469f4 100644
--- a/priv/ua_inspector/client.libraries.yml
+++ b/priv/ua_inspector/client.libraries.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -78,3 +78,36 @@
 - regex: 'libdnf(?:/(\d+[\.\d]+))?'
   name: 'libdnf'
   version: '$1'
+
+- regex: 'HTTPie(?:/(\d+[\.\d]+))?'
+  name: 'HTTPie'
+  version: '$1'
+
+- regex: 'rest-client/(\d+[\.\d]+).*ruby'
+  name: 'REST Client for Ruby'
+  version: '$1'
+
+- regex: 'RestSharp/(\d+[\.\d]+)'
+  name: 'RestSharp'
+  version: '$1'
+  url: 'http://restsharp.org/'
+
+- regex: 'scalaj-http/(\d+[\.\d]+)'
+  name: 'ScalaJ HTTP'
+  version: '$1'
+  url: 'https://github.com/scalaj/scalaj-http'
+
+- regex: 'REST::Client/(\d+)'
+  name: 'Perl REST::Client'
+  version: '$1'
+  url: 'https://metacpan.org/pod/REST::Client'
+
+- regex: 'node-fetch/(\d+[\.\d]+)'
+  name: 'Node Fetch'
+  version: $1
+  url: 'https://github.com/node-fetch/node-fetch'
+
+- regex: 'ReactorNetty/(\d+[\.\d]+)'
+  name: 'ReactorNetty'
+  version: $1
+  url: 'https://github.com/reactor/reactor-netty'
diff --git a/priv/ua_inspector/client.mediaplayers.yml b/priv/ua_inspector/client.mediaplayers.yml
index 484773718e..51e284b235 100644
--- a/priv/ua_inspector/client.mediaplayers.yml
+++ b/priv/ua_inspector/client.mediaplayers.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -87,4 +87,16 @@
 
 - regex: 'stagefright(?:/([\d\.]+))?'
   name: 'Stagefright'
-  version: '$1'
\ No newline at end of file
+  version: '$1'
+
+- regex: 'GoogleChirp(?:/(\d+[\.\d]+))?'
+  name: 'Google Podcasts'
+  version: '$1'
+
+- regex: 'Music Player Daemon (?:(\d+[\.\d]+))?'
+  name: 'Music Player Daemon'
+  version: '$1'
+
+- regex: 'mpv (?:(\d+[\.\d]+))?'
+  name: 'mpv'
+  version: '$1'
diff --git a/priv/ua_inspector/client.mobile_apps.yml b/priv/ua_inspector/client.mobile_apps.yml
index c252fea642..6a20292e46 100644
--- a/priv/ua_inspector/client.mobile_apps.yml
+++ b/priv/ua_inspector/client.mobile_apps.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -28,12 +28,20 @@
 - regex: '(?:FBAV|com.facebook.katana)(?:[ /]([\d\.]+))?'
   name: 'Facebook'
   version: '$1'
+- regex: '(?:FBAN|FBSV|FBID|FBBV)/'
+  name: 'Facebook'
+  version: ''
 
 # FeedR
 - regex: 'FeedR(?:/([\d\.]+))?'
   name: 'FeedR'
   version: '$1'
 
+# Google Go
+- regex: 'com.google.android.apps.searchlite'
+  name: 'Google Go'
+  version: ''
+
 # Google Play Kiosk
 - regex: 'com.google.android.apps.magazines'
   name: 'Google Play Newsstand'
@@ -49,6 +57,11 @@
   name: 'WeChat'
   version: '$1'
 
+# DingTalk
+- regex: 'DingTalk/([0-9\.]+)'
+  name: 'DingTalk'
+  version: '$1'
+
 # Sina Weibo
 - regex: '.*__weibo__([0-9\.]+)__'
   name: 'Sina Weibo'
@@ -113,6 +126,10 @@
   regex: 'Overcast/([\d\.]+)'
   name: 'Overcast'
   version: '$1'
+-
+  regex: '(?:CastBox|fm.castbox.audiobook.radio.podcast)/?([\d\.]+)?'
+  name: 'CastBox'
+  version: '$1'
 -
   regex: 'Player FM'
   name: 'Player FM'
@@ -161,3 +178,100 @@
   regex: 'jp.co.yahoo.android.yjtop/([\d\.]+)'
   name: 'Yahoo! Japan'
   version: '$1'
+-
+  regex: 'RSSRadio/([\d]+)?'
+  name: 'RSSRadio'
+  version: '$1'
+-
+  regex: 'SogouSearch Android[\d\.]+ version([\d\.]+)?'
+  name: 'SogouSearch App'
+  version: '$1'
+-
+  regex: 'NewsArticle/([\d\.]+)?'
+  name: 'NewsArticle App'
+  version: '$1'
+-
+  regex: 'tieba/([\d\.]+)?'
+  name: 'tieba'
+  version: '$1'
+-
+  regex: 'com\.douban\.group/([\d\.]+)?'
+  name: 'douban App'
+  version: '$1'
+-
+  regex: 'BingWeb/([\d\.]+)?'
+  name: 'BingWebApp'
+  version: '$1'
+-
+  regex: 'GSA/([\d\.]+)?'
+  name: 'Google Search App'
+  version: '$1'
+-
+  regex: 'Flipboard/([\d\.]+)?'
+  name: 'Flipboard App'
+  version: '$1'
+-
+  regex: 'Instagram[ /]([\d\.]+)?'
+  name: 'Instagram App'
+  version: '$1'
+-
+  regex: 'baiduboxapp/([\d\.]+)?'
+  name: 'Baidu Box App'
+  version: '$1'
+-
+  regex: 'Crosswalk(?!.*(?:Streamy|QwantMobile))/([\d\.]+)?'
+  name: 'CrosswalkApp'
+  version: '$1'
+-
+  regex: 'Twitter for iPhone[/]?([\d\.]+)?'
+  name: 'Twitter'
+  version: '$1'
+-
+  regex: 'Twitter/([\d\.]+)'
+  name: 'Twitter'
+  version: '$1'
+-
+  regex: 'TwitterAndroid[/]?([\d\.]+)?'
+  name: 'Twitter'
+  version: '$1'
+
+-
+  regex: 'TopBuzz/([\d\.]+)'
+  name: 'TopBuzz'
+  version: '$1'
+-
+  regex: 'Snapchat/([\d\.]+)'
+  name: 'Snapchat'
+  version: '$1'
+
+# UnityPlayer
+- regex: 'UnityPlayer/([\d\.]+)'
+  name: 'UnityPlayer'
+  version: '$1'
+
+# (https://play.google.com/store/apps/details?id=cl.uchile.ing.adi.ucursos)
+- regex: 'UCURSOS/v([\d\.]+)'
+  name: 'U-Cursos'
+  version: '$1'
+
+# HeyTabBrowser or HeyTabAccount
+- regex: 'HeyTapBrowser/([\d\.]+)'
+  name: 'HeyTapBrowser'
+  version: '$1'
+
+# Roblox App
+- regex: 'RobloxApp/([\d\.]+)'
+  name: 'Roblox'
+  version: '$1'
+
+- regex: 'Viber/([\d\.]+)'
+  name: 'Viber'
+  version: '$1'
+
+- regex: 'Siri/1'
+  name: 'Siri'
+  version: '1.0'
+
+- regex: 'LinkedIn/([\d\.]+)'
+  name: 'LinkedIn'
+  version: '$1'
diff --git a/priv/ua_inspector/client.pim.yml b/priv/ua_inspector/client.pim.yml
index fbd9728d42..7a16a557d1 100644
--- a/priv/ua_inspector/client.pim.yml
+++ b/priv/ua_inspector/client.pim.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -43,4 +43,9 @@
 
 - regex: 'DAVdroid(?:/(\d+[\.\d]+))?'
   name: 'DAVdroid'
+  version: '$1'
+
+# SeaMonkey
+- regex: '(?:SeaMonkey|Iceape)(?:/(\d+[\.\d]+))?'
+  name: 'SeaMonkey'
   version: '$1'
\ No newline at end of file
diff --git a/priv/ua_inspector/device.cameras.yml b/priv/ua_inspector/device.cameras.yml
index 3d319c481a..904423b7da 100644
--- a/priv/ua_inspector/device.cameras.yml
+++ b/priv/ua_inspector/device.cameras.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
diff --git a/priv/ua_inspector/device.car_browsers.yml b/priv/ua_inspector/device.car_browsers.yml
index 5870ccbdfa..c5446b4b82 100644
--- a/priv/ua_inspector/device.car_browsers.yml
+++ b/priv/ua_inspector/device.car_browsers.yml
@@ -1,12 +1,16 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
 # Tesla Model S
 Tesla:
-  regex: 'QtCarBrowser'
+  regex: '(?:Tesla/[0-9.]+|QtCarBrowser)'
   device: 'car browser'
-  model: 'Model S'
+  models:
+    - regex: 'QtCarBrowser'
+      model: 'Model S'
+    - regex: 'Tesla/[0-9.]+'
+      model: ''
diff --git a/priv/ua_inspector/device.consoles.yml b/priv/ua_inspector/device.consoles.yml
index c17793ada5..60047a3fbc 100644
--- a/priv/ua_inspector/device.consoles.yml
+++ b/priv/ua_inspector/device.consoles.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -20,7 +20,7 @@ Microsoft:
       model: 'Xbox 360'
 
 Nintendo:
-  regex: 'Nintendo (([3]?DS[i]?)|Wii[U]?)'
+  regex: 'Nintendo (([3]?DS[i]?)|Wii[U]?|Switch)'
   device: 'console'
   model: '$1'
 
@@ -35,6 +35,6 @@ Sega:
   model: 'Dreamcast'
 
 Sony:
-  regex: 'PlayStation (3|4|Portable|Vita)'
+  regex: 'PlayStation (3|4 Pro|4|Portable|Vita)'
   device: 'console'
   model: 'PlayStation $1'
diff --git a/priv/ua_inspector/device.mobiles.yml b/priv/ua_inspector/device.mobiles.yml
index 88779dba4a..f8d1939b11 100644
--- a/priv/ua_inspector/device.mobiles.yml
+++ b/priv/ua_inspector/device.mobiles.yml
@@ -1,14 +1,24 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Ace (https://www.acemobile.fr/)
+Ace:
+  regex: 'BUZZ 1 (?:Lite|Plus)'
+  device: 'smartphone'
+  models:
+    - regex: 'BUZZ 1 Lite'
+      model: 'Buzz 1 Lite'
+    - regex: 'BUZZ 1 Plus'
+      model: 'Buzz 1 Plus'
+
 'Tunisie Telecom':
   regex: 'StarTrail TT[);/ ]'
   device: 'smartphone'
-  model: 'StarTrail'
+  model: 'StarTrail by TT'
 
 # SFR
 SFR:
@@ -29,6 +39,8 @@ SFR:
       model: 'StarShine 2' # ZTE
     - regex: 'StarShine[);/ ]'
       model: 'StarShine' # Huawei U8180
+    - regex: 'STARADDICT 4[);/ ]'
+      model: 'Staraddict 4'
     - regex: 'STARADDICT III[);/ ]'
       model: 'Staraddict 3' # Coolpad 8861U
     - regex: 'STARADDICT II Plus[);/ ]'
@@ -54,20 +66,34 @@ SFR:
 
 # HTC
 HTC:
-  regex: 'HTC|Sprint (?:APA|ATP)|ADR(?!910L)[a-z0-9]+|NexusHD2|Amaze[ _]4G[);/ ]|(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/]+) Build|(Amaze[ _]4G|One ?[XELSV\+]+)[);/ ]|SPV E6[05]0|One M8|X525a|PG86100|PC36100|XV6975|PJ83100[);/ ]|2PYB2|0PJA10|0PJA2'
+  regex: 'HTC|Sprint (?:APA|ATP)|ADR(?!910L)[a-z0-9]+|NexusHD2|Amaze[ _]4G[);/ ]|(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|\))|(Amaze[ _]4G|One ?[XELSV\+]+)[);/ ]|SPV E6[05]0|(One M8|X525a|PG86100|PC36100|XV6975|PJ83100|2PYB2|2PZC5|0PJA10|0PJA2|HTV33|0PM92|0PCV1|601HT|0PAJ5|HTL2[23]|HTV32|2PQ93)[);/ ]'
   device: 'smartphone'
   models:
     # explicit smartphone models
+    - regex: '2PZC5[);/ ]'
+      model: 'U11'
     - regex: 'XV6975[);/ ]'
       model: 'Imagio'
     - regex: 'PG86100[);/ ]'
       model: 'Evo 3G'
     - regex: 'PC36100[);/ ]'
       model: 'Evo 4G'
+    - regex: '(?:HTV33|601HT)[);/ ]'
+      model: 'U11'
+    - regex: '(?:801e|802[wdt])'
+      model: 'One'
     - regex: 'PJ83100[);/ ]'
       model: 'One X'
+    - regex: 'HTL22[);/ ]'
+      model: 'J One'
+    - regex: 'HTL23[);/ ]'
+      model: 'J Butterfly'
     - regex: '(?:0PJA2|0PJA10)[);/ ]'
       model: 'One M9'
+    - regex: 'X525a[);/ ]'
+      model: 'One X+'
+    - regex: '2PQ93[);/ ]'
+      model: 'One A9'
     - regex: 'ADR6300'
       model: 'Droid Incredible'
     - regex: 'ADR6400L'
@@ -78,10 +104,14 @@ HTC:
       model: 'Excalibur'
     - regex: 'SPV E650'
       model: 'Vox'
-    - regex: 'X525a'
-      model: 'One X+'
     - regex: '2PYB2'
       model: 'Bolt'
+    - regex: '0PM92[);/ ]'
+      model: 'Desire 626S'
+    - regex: '0PCV1[);/ ]'
+      model: 'Desire 510'
+    - regex: '608t[);/ ]'
+      model: 'Desire 608t'
 
     - regex: 'NexusHD2' # custom rom for hd2
       model: 'HD2'
@@ -114,7 +144,7 @@ HTC:
       model: '$1'
     - regex: 'HTC;(?: )?([a-z0-9 ]+)'
       model: '$1'
-    - 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'
@@ -124,43 +154,61 @@ HTC:
       model: '$1'
     - regex: '(One M8)'
       model: '$1'
+    - regex: '0PAJ5[);/ ]'
+      model: 'One E8'
+    - regex: 'HTV32[);/ ]'
+      model: '10'
 
 # microsoft
 Microsoft:
-  regex: 'KIN\.(One|Two)|RM-(?:1031|106[57]|109[02]|1096|1099|1109|1114|1127|1141|1154)|Microsoft; Lumia'
+  regex: 'KIN\.(One|Two)|RM-(?:1010|1031|106[57]|107[23467]|1089|109[02]|1096|1099|1109|111[34]|1127|1141|115[24]|994)|Microsoft; Lumia|Lumia (?:1530|1320|950|850|650|640|550|535|435)'
   device: 'smartphone'
   models:
     - regex: 'KIN\.(One|Two)'
       device: 'feature phone'
       model: 'Kin $1'
 
-    - regex: 'RM-1031'
-      model: 'Lumia 532'
-    - regex: 'RM-106[57]'
-      model: 'Lumia 640 XL'
-    - regex: 'RM-1096'
-      model: 'Lumia 640 XL'
-    - regex: 'RM-109[02]'
-      model: 'Lumia 535'
-    - regex: 'RM-1099'
+    - regex: 'RM-1099|Lumia 430'
       model: 'Lumia 430'
-    - regex: 'RM-1109'
-      model: 'Lumia 640'
-    - regex: 'RM-1114'
+    - regex: 'RM-1114|Lumia 435'
       model: 'Lumia 435'
-    - regex: 'RM-1127'
-      model: 'Lumia 550'
-    - regex: 'RM-1141'
+    - regex: 'RM-1031|Lumia 532'
+      model: 'Lumia 532'
+    - regex: 'RM-109[02]|RM-1089|Lumia 535'
+      model: 'Lumia 535'
+    - regex: 'RM-1141|Lumia 540'
       model: 'Lumia 540'
-    - regex: 'RM-1154'
+    - regex: 'RM-1127|Lumia 550'
+      model: 'Lumia 550'
+    - regex: 'RM-1010'
+      model: 'Lumia 638'
+    - regex: 'RM-106[57]|RM-1096|Lumia 640 XL'
+      model: 'Lumia 640 XL'
+      device: 'phablet'
+    - regex: 'RM-1109|RM-1113|RM-107[23467]|Lumia 640'
+      model: 'Lumia 640'
+    - regex: 'RM-1154|Lumia 650'
       model: 'Lumia 650'
+    - regex: 'RM-1152'
+      model: 'Lumia 650 SS'
+    - regex: 'Lumia 850'
+      model: 'Lumia 850'
+    - regex: 'Lumia 950 XL'
+      model: 'Lumia 950 XL'
+      device: 'phablet'
+    - regex: 'Lumia 950'
+      model: 'Lumia 950'
+    - regex: 'RM-994|Lumia 1320'
+      model: 'Lumia 1320'
+    - regex: 'Lumia 1530'
+      model: 'Lumia 1530'
 
     - regex: 'Microsoft; Lumia ([^;/)]+)[;/)]'
       model: 'Lumia $1'
 
 # NOKIA
 Nokia:
-  regex: 'Nokia|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-z0-9]+)$|RX-51 N900|TA-[0-9]{4} Build'
+  regex: 'Nokia(?!Browser|Webview|; GT-I8750)|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-z0-9]+)$|RX-51 N900|TA-[0-9]{4}|ARM; 909'
   device: 'smartphone'
   models:
     # Nokia branded phones by HMD Global
@@ -171,17 +219,130 @@ Nokia:
       model: '3'
     - regex: 'TA-10(24|27|44|53)'
       model: '5'
-    - regex: 'TA-10(00|03|21|25|33|39)'
+    - regex: 'TA-10(00|03|21|25|33|39|54)'
       model: '6'
-    - regex: 'TA-10(04|12)'
+    - regex: 'TA-1041'
+      model: '7'
+    - regex: 'TA-10(04|12|52)'
       model: '8'
     # 2018 Models
-    - regex: 'Nokia ([A-Za-z0-9\. ]+) Build'
-      model: '$1'
+    - regex: 'Nokia 8\.1'
+      model: '8.1'
+    - regex: 'Nokia 8 Sirocco'
+      model: '8 Sirocco'
+    - regex: 'Nokia 7\.1'
+      model: '7.1'
+    - regex: 'Nokia 7 plus'
+      model: '7 plus'
+    - regex: 'Nokia 6\.1 Plus'
+      model: '6.1 Plus'
+    - regex: 'Nokia 6\.1'
+      model: '6.1'
+    - regex: 'Nokia 5\.1 Plus'
+      model: '5.1 Plus'
+    - regex: 'Nokia 5\.1'
+      model: '5.1'
+    - regex: 'Nokia 3\.1 Plus'
+      model: '3.1 Plus'
+    - regex: 'Nokia 3\.1'
+      model: '3.1'
+    - regex: 'Nokia 2\.1'
+      model: '2.1'
+    - regex: 'Nokia 1 Plus'
+      model: '1 Plus'
+    - regex: 'Nokia 1'
+      model: '1'
 
     # Nokia phones
     - regex: 'RX-51 N900'
       model: 'N900'
+    - regex: '(?: )?(Nokia500|nokiaasha500(?:dualsim)?)(?: Build|[_);/])'
+      model: 'Asha 500'
+    - regex: 'Nokia5130c(?:-2)?'
+      model: '5130 XpressMusic'
+    - regex: 'Nokia5230'
+      model: 'Nuron'
+    - regex: 'Nokia5233'
+      model: '5233'
+    - regex: 'Nokia5800d-1'
+      model: '5800 XpressMusic'
+    - regex: 'Nokia6210Navigator'
+      model: 'Navigator'
+    - regex: 'Nokia8800e?'
+      model: 'Sapphire Arte'
+    - regex: 'NOKIA-RH-17'
+      model: '2280'
+    - regex: 'NOKIA-RH-27'
+      model: '6225'
+    - regex: 'NOKIA-RH-34'
+      model: '6585'
+    - regex: 'NOKIA-RH-48'
+      model: '3105'
+    - regex: 'NOKIA-RM-11'
+      model: '3205'
+    - regex: 'Nokia808 PureView'
+      model: '808 PureView'
+    - regex: 'Nokia ?([0-9]{4})c(?:-)?'
+      model: '$1 Classic'
+    - regex: 'Nokia ?([0-9]{4})s(?:-)?'
+      model: '$1 Slide'
+    - regex: 'Nokia ?([0-9]{4})'
+      model: '$1'
+    - regex: '(?: )?Nokia([235][0-9]{2})(?: Build|[_);/])'
+      model: 'Asha $1'
+    - regex: 'Nokia([CEX]-?[0-9]{1,2}i?)-[0-9]{1,2}u?(?: Build|[_);/])'
+      model: '$1'
+
+    - regex: 'Nokia;? 520T'
+      model: 'Lumia 520T'
+    - regex: 'RM-91[45]'
+      model: 'Lumia 520'
+    - regex: 'RM-997|Nokia 526'
+      model: 'Lumia 526'
+    - regex: 'RM-846'
+      model: 'Lumia 620'
+    - regex: 'RM-97[68]'
+      model: 'Lumia 630'
+    - regex: 'RM-97[45]'
+      model: 'Lumia 635'
+    - regex: 'RM-1027'
+      model: 'Lumia 636'
+    - regex: 'NOKIA;? 710'
+      model: 'Lumia 710'
+    - regex: 'Nokia;? 720T'
+      model: 'Lumia 720T'
+    - regex: 'RM-885'
+      model: 'Lumia 720'
+    - regex: 'Lumia 730'
+      model: 'Lumia 730'
+    - regex: 'RM-103[89]'
+      model: 'Lumia 735'
+    - regex: 'Nokia;? 800C'
+      model: 'Lumia 800C'
+    - regex: 'Nokia;? 800'
+      model: 'Lumia 800'
+    - regex: 'Nokia 820'
+      model: 'Lumia 820'
+    - regex: 'RM-984'
+      model: 'Lumia 830'
+    - regex: 'Nokia;? 900'
+      model: 'Lumia 900'
+    - regex: '(RM-82[12]|Nokia;? 920)(?: Build|[_);/])'
+      model: 'Lumia 920'
+    - regex: '(RM-89[23]|RM-910|Nokia;? 925)(?: Build|[a_);/])'
+      model: 'Lumia 925'
+    - regex: 'Lumia 929'
+      model: 'Lumia Icon'
+    - regex: 'RM-1045'
+      model: 'Lumia 930'
+    - regex: '(ARM; 909|NOKIA;? 909|NOKIA; id300)(?: Build|[_);/])'
+      model: 'Lumia 1020'
+    - regex: 'NOKIA;? 1520\.1'
+      model: 'Lumia 1520.1'
+
+    - regex: 'Nokia ([A-Za-z0-9\. ]+)(?: Build|\))'
+      model: '$1'
+
     - regex: 'Nokia(N[0-9]+)'
       model: '$1'
     - regex: 'Nokia-([a-z0-9]+)'
@@ -278,18 +439,27 @@ Palm:
 
 # HP
 HP:
-  regex: 'TouchPad/\d+\.\d+|hp-tablet|HP ?iPAQ|webOS.*P160U|HP Slate|HP [78]|Compaq [7|8]|HP; [^;/)]+'
+  regex: 'TouchPad/\d+\.\d+|hp-tablet|HP ?iPAQ|webOS.*P160U|HP (?:Pro )?Slate|HP [78]|HP 10 Plus|Compaq [7|8]|HP; [^;/)]+'
   device: 'smartphone'
   models:
     - regex: 'HP Slate 6 Voice Tab'
       model: 'Slate 6 VoiceTab'
       device: 'phablet'
-    - regex: 'HP ([78][^/;]*) Build'
+
+    - regex: 'HP 10 Plus'
+      model: '10 Plus'
+      device: 'tablet'
+
+    - regex: 'HP ([78][^)/;]*)(?: Build|\))'
       model: 'Slate $1'
       device: 'tablet'
+
     - regex: 'Compaq ([78][^/;]*) Build'
       model: 'Compaq $1'
       device: 'tablet'
+    - regex: 'HP Pro Slate 8'
+      model: 'Pro Slate 8'
+      device: 'tablet'
     - regex: 'HP Slate ?(.+) Build'
       model: 'Slate $1'
       device: 'tablet'
@@ -314,117 +484,167 @@ TiPhone:
 
 # Apple
 Apple:
-  regex: '(?:iTunes-)?Apple[ _]?TV|(?:Apple-|iTunes-)?(?:iPad|iPhone)|iPh[0-9],[0-9]|CFNetwork'
+  regex: '(?:iTunes-)?Apple[ _]?TV|(?:Apple-|iTunes-)?(?<!like )(?:iPad|iPhone)|iPh[0-9],[0-9]|CFNetwork|HomePod'
   models:
+    - regex: 'HomePod'
+      device: 'smart speaker'
+      model: 'HomePod'
+
     # specific smartphone devices
-    - regex: '(?:Apple-)?iPh(?:one)?1[C,]1'
+    - regex: '(?:Apple-)?iPh(?:one)?1[C,_]1'
       model: 'iPhone'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?1[C,]2'
+    - regex: '(?:Apple-)?iPh(?:one)?1[C,_]2'
       model: 'iPhone 3G'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?2[C,]1'
+    - regex: '(?:Apple-)?iPh(?:one)?2[C,_]1| 3GS\)$'
       model: 'iPhone 3GS'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?3[C,][123]'
+    - regex: '(?:Apple-)?iPh(?:one)?3[C,_][123]'
       model: 'iPhone 4'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?4[C,]1'
+    - regex: '(?:Apple-)?iPh(?:one)?4[C,_]1|1C2%254enohPi| 4S\)$'
       model: 'iPhone 4S'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?5[C,][12]'
+    - regex: '(?:Apple-)?iPh(?:one)?5[C,_][12]| 5\)$'
       model: 'iPhone 5'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?5[C,][34]'
+    - regex: '(?:Apple-)?iPh(?:one)?5[C,_][34]'
       model: 'iPhone 5C'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?6[C,][12]'
+    - regex: '(?:Apple-)?iPh(?:one)?6[C,_][12]| 5S\)$'
       model: 'iPhone 5S'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?7[C,]1'
+    - regex: '(?:Apple-)?iPh(?:one)?7[C,_]1|1C2%257enohPi| 6PLUS\)$'
       model: 'iPhone 6 Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?7[C,]2'
+    - regex: '(?:Apple-)?iPh(?:one)?7[C,_]2| 6\)$'
       model: 'iPhone 6'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?8[C,]1'
-      model: 'iPhone 6s'
-      device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?8[C,]2'
+    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]2| 6SPLUS\)$'
       model: 'iPhone 6s Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?8[C,]4'
+    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]1|iPhone 6s| 6S\)$'
+      model: 'iPhone 6s'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]4| SE\)$'
       model: 'iPhone SE'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?9[C,][13]'
+    - regex: '(?:Apple-)?iPh(?:one)?9[C,_][13]| 7\)$'
       model: 'iPhone 7'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?9[C,][24]'
+    - regex: '(?:Apple-)?iPh(?:one)?9[C,_][24]| 7PLUS\)$'
       model: 'iPhone 7 Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?10[C,][14]'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][14]| 8\)$'
       model: 'iPhone 8'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?10[C,][25]'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][25]| 8PLUS\)$'
       model: 'iPhone 8 Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?10[C,][36]'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][36]|iPhone X| X\)$'
       model: 'iPhone X'
       device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][2]| XS\)$'
+      model: 'iPhone XS'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][46]| XSMAX\)$'
+      model: 'iPhone XS Max'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][8]| XR\)$'
+      model: 'iPhone XR'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][1]| 11\)$'
+      model: 'iPhone 11'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][3]| 11PRO\)$'
+      model: 'iPhone 11 Pro'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][5]| 11PROMAX\)$'
+      model: 'iPhone 11 Pro Max'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][8]'
+      model: 'iPhone SE (2020)'
+      device: 'phablet'
 
     # specific tablet devices
-    - regex: '(?:Apple-)?iPad1[C,]1'
+    - regex: '(?:Apple-)?iPad1[C,_]1'
       model: 'iPad'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad2[C,][1234]'
+    - regex: '(?:Apple-)?iPad2[C,_][1234]'
       model: 'iPad 2'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad2[C,][567]'
+    - regex: '(?:Apple-)?iPad2[C,_][567]'
       model: 'iPad Mini'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad3[C,][123]'
+    - regex: '(?:Apple-)?iPad3[C,_][123]'
       model: 'iPad 3'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad3[C,][456]'
+    - regex: '(?:Apple-)?iPad3[C,_][456]'
       model: 'iPad 4'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad4[C,][123]'
+    - regex: '(?:Apple-)?iPad4[C,_][123]'
       model: 'iPad Air'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad4[C,][456]'
+    - regex: '(?:Apple-)?iPad4[C,_][456]'
       model: 'iPad Mini 2'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad4[C,][789]'
+    - regex: '(?:Apple-)?iPad4[C,_][789]'
       model: 'iPad Mini 3'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad5[C,][12]'
+    - regex: '(?:Apple-)?iPad5[C,_][12]'
       model: 'iPad Mini 4'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad5[C,][34]'
+    - regex: '(?:Apple-)?iPad5[C,_][34]'
       model: 'iPad Air 2'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad6[C,][34]'
+    - regex: '(?:Apple-)?iPad6[C,_][34]'
       model: 'iPad Pro 9.7'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad6[C,][78]'
+    - regex: '(?:Apple-)?iPad6[C,_][78]'
       model: 'iPad Pro 12.9'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad6[C,](?:11|12)'
-      model: 'iPad 5'
+    - regex: '(?:Apple-)?iPad6[C,_](?:11|12)'
+      model: 'iPad 5 9.7'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad7[C,][12]'
+    - regex: '(?:Apple-)?iPad7[C,_][12]'
       model: 'iPad Pro 2 12.9'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad7[C,][34]'
+    - regex: '(?:Apple-)?iPad7[C,_][34]'
       model: 'iPad Pro 10.5'
       device: 'tablet'
-    - regex: '(?:Apple-)?iPad7[C,][56]'
-      model: 'iPad 6'
+    - regex: '(?:Apple-)?iPad7[C,_][56]'
+      model: 'iPad 6 9.7'
       device: 'tablet'
+    - regex: '(?:Apple-)?iPad7[C,_](?:11|12)'
+      model: 'iPad 7 10.2'
+      device: 'tablet'
+    - regex: '(?:Apple-)?iPad8[C,_][1-4]'
+      model: 'iPad Pro 3 11.0'
+      device: 'tablet'
+    - regex: '(?:Apple-)?iPad8[C,_][5-8]'
+      model: 'iPad Pro 3 12.9'
+      device: 'tablet'
+
+    - regex: 'Apple-?TV2[C,_]1'
+      model: 'Apple TV 2'
+      device: 'tv'
+    - regex: 'Apple-?TV3[C,_][12]'
+      model: 'Apple TV 3'
+      device: 'tv'
+    - regex: 'Apple-?TV5[C,_]3'
+      model: 'Apple TV 4'
+      device: 'tv'
+    - regex: 'Apple-?TV6[C,_]2'
+      model: 'Apple TV 4K'
+      device: 'tv'
 
     - regex: '(?:iTunes-)?Apple[ _]?TV'
       model: 'Apple TV'
       device: 'tv'
+    - regex: 'HomePod'
+      model: 'HomePod'
+      device: 'smart speaker'
     - regex: 'iTunes-iPad/[0-9]+(?:\.[0-9]+)* \(([^;]+);'
       model: 'iPad $1'
       device: 'tablet'
@@ -440,11 +660,15 @@ Apple:
 
 # micromax
 MicroMax:
-  regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|P70221 Build'
+  regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221 Build|(?:YU(?:5040|5530)|AQ5001 Canvas Power)[);/ ]'
   device: 'smartphone'
   models:
+    - regex: 'AQ5001 Canvas Power'
+      model: 'Canvas Power'
     - regex: 'AQ5001'
       model: 'Canvas Juice 2'
+    - regex: '4560MMX[);/ ]'
+      model: '4560MMX'
     - regex: 'E481'
       model: 'Canvas 5'
     - regex: 'P70221 Build'
@@ -454,6 +678,12 @@ MicroMax:
       model: 'Bolt'
     - regex: 'Q417'
       model: 'Canvas Mega'
+    - regex: 'Q402\+'
+      model: 'Bolt Pace'
+    - regex: 'YU5040[);/ ]'
+      model: 'YU Yureka YU5040'
+    - regex: 'YU5530[);/ ]'
+      model: 'YU Yureka S YU5530'
     - regex: 'Q424'
       model: 'Bolt Selfie'
     - regex: 'Q426'
@@ -466,42 +696,149 @@ MicroMax:
 
 # 3Q
 3Q:
-  regex: '(AC0731B|AC1024C|AC7803C|BC9710AM|EL72B|LC0720C|LC0723B|LC0725B|LC0804B|LC0808B|LC0809B|LC0810C|LC0816C|LC0901D|LC1016C|MT0724B|MT0729B|MT0729D|MT0811B|OC1020A|RC0709B|RC0710B|RC0718C|RC0719H|RC0721B|RC0722C|RC0726B|RC0734H|RC0743H|RC0817C|RC1018C|RC1019G|RC1025F|RC1301C|RC7802F|RC9711B|RC9712C|RC9716B|RC9717B|RC9724C|RC9726C|RC9727F|RC9730C|RC9731C|TS0807B|TS1013B|VM0711A|VM1017A|RC0813C|QS9719D|QS9718C|QS9715F|QS1023H|QS0815C|QS0730C|QS0728C|QS0717D|QS0716D|QS0715C|MT7801C)'
+  regex: 'AC0731B|AC1024C|AC7803C|BC9710AM|EL72B|LC0720C|LC0723B|LC0725B|LC0804B|LC0808B|LC0809B|LC0810C|LC0816C|LC0901D|LC1016C|MT0724B|MT0729[BD]|MT0811B|OC1020A|RC0709B|RC0710B|RC0718C|RC0719H|RC0721B|RC0722C|RC0726B|RC0734H|RC0743H|RC0817C|RC1018C|RC1019G|RC1025F|RC1301C|RC7802F|RC9711B|RC9712C|RC9716B|RC9717B|RC9724C|RC9726C|RC9727F|RC9730C|RC9731C|TS0807B|TS1013B|VM0711A|VM1017A|RC0813C|QS9719D|QS9718C|QS9715F|QS1023H|QS0815C|QS0730C|QS0728C|QS0717D|QS0716D|QS0715C|MT7801C|TS9708B|AC0732C|MT0739D|MT0812E|(?:3Q_)?ER71B'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: 'MT0724B|LC0901D|LC0816C|LC0810C|LC0809B|LC0808B|LC0804B|LC0725B|LC0723B'
+      model: 'Qoo! P-Pad'
+    - regex: 'VM1017A|TS1013B|TS0807B|RC9731C|RC9730C|RC9727F|RC9726C|RC9724C|RC9717B|RC9716B|RC9712C|RC9711B|RC1301C|RC1025F|RC1019G|RC1018C|RC0817C|RC0813C|RC0743H|RC0734H|RC0726B|RC0722C|RC0721B|RC0719H|RC0718C|RC0710B|RC0709B|QS9715F|QS1023H|QS0815C|QS0730C|QS0728C|QS0717D|QS0716D|QS0715C|MT0811B|MT0739D|MT0729[BD]|LC1016C|LC0720C|BC9710AM|AC1024C|AC0731B'
+      model: 'Qoo! Q-Pad'
+    - regex: 'MT7801C|QS9718C|QS9719D|VM0711A|OC1020A'
+      model: 'Qoo! Surf'
+    - regex: 'TS9708B'
+      model: 'Surf TS1009B'
+    - regex: 'AC7803C|AC0732C'
+      model: 'Qoo! Lite'
+    - regex: 'MT0812E|RC7802F'
+      model: 'Qoo! Meta'
+    - regex: 'EL72B|(?:3Q_)?ER71B'
+      model: 'Qoo! Q-Book'
 
 # 4Good
 4Good:
-  regex: '4Good[ _]|(?:4Good)?(S450m [43]G|S555m 4G|S501m 3G|T700i_3G|Light A103)'
+  regex: '4Good[ _]|S450m [43]G|S555m 4G|S501m 3G|T700i_3G|People (?:G503|G410|GT300)|Light (?:A103|B100)'
   device: 'smartphone'
   models:
     - regex: 'T700i_3G'
       model: 'T700i 3G'
       device: 'tablet'
-    - regex: '(S(?:450m|555m|501m)[_ ][43]G|Light A103)'
+    - regex: 'People GT300'
+      model: 'People GT300'
+      device: 'tablet'
+    - regex: 'S555m[_ ]4G'
+      model: 'People'
+    - regex: '(S(?:450m|501m)[_ ][43]G|Light (?:A103|B100)|People (?:G503|G410))'
       model: '$1'
     - regex: '4Good[ _]([^;/]+) Build'
       model: '$1'
     - regex: '4Good[ _]([^);/ ]+)'
       model: '$1'
 
-# Bravis
-Bravis:
-  regex: 'Bravis|A501 Bright|NB(?:10[56]|751|7[145])|NP101'
+# Alba
+Alba:
+  regex: 'Alba 57'
   device: 'smartphone'
   models:
-    - regex: 'A501 Bright'
+    - regex: 'Alba 57'
+      model: '5.7'
+
+# AllCall
+AllCall:
+  regex: 'AllCall_|Heat[34]|Hot ?[125][^;/]+ Build'
+  device: 'smartphone'
+  models:
+    - regex: 'AllCall_(Alpha|Atom|Bro|Madrid)'
+      model: '$1'
+    - regex: 'AllCall_S1_X'
+      model: 'S1 X'
+    - regex: 'AllCall_S1'
+      model: 'S1'
+    - regex: 'AllCall_RIO_S'
+      model: 'Rio S'
+    - regex: 'AllCall_RIO_PRO'
+      model: 'Rio Pro'
+    - regex: 'AllCall_RIO'
+      model: 'Rio'
+    - regex: 'Heat([34])'
+      model: 'Heat $1'
+    - regex: 'Hot ?([125][^;/]+) Build'
+      model: 'Hot $1'
+
+# Bravis
+Bravis:
+  regex: 'Bravis[ _]|A501 Bright|A552 JOY Max|A504 Trace|A505 JOY Plus|A503 Joy|NB(?:106M|10[1-8]|751|7[145]|8[57]1|76)|NP101|NB961|NP 104 3G|B501|N1-570 Space|Atlas A551|A512 Harmony Pro|A510_Jeans_4G|A509_Jeans|N1_550_Cruiser'
+  device: 'smartphone'
+  models:
+    - regex: 'A501 BRIGHT'
       model: 'A501 Bright'
+    - regex: 'Bravis[_ ]X500'
+      model: 'Trace Pro'
+    - regex: 'Bravis[_ ]A506'
+      model: 'Crystal'
+    - regex: 'Bravis[_ ]A553'
+      model: 'Discovery'
+    - regex: 'BRAVIS[ _]TAU'
+      model: 'Tau'
+    - regex: 'BRAVIS[ _]DELTA'
+      model: 'Delta'
+    - regex: 'BRAVIS[ _]TREND'
+      model: 'Trend'
+    - regex: 'B501'
+      model: 'Easy'
+    - regex: 'N1-570'
+      model: 'Space'
+    - regex: 'BRAVIS[ ]A554'
+      model: 'A554 Grand'
+    - regex: 'BRAVIS[ ]S500'
+      model: 'S500 Diamond'
+    - regex: 'A505 JOY Plus'
+      model: 'A505 Joy Plus'
+    - regex: 'A552 JOY Max'
+      model: 'A552 Joy Max'
+    - regex: 'Atlas A551'
+      model: 'A551 Atlas'
+    - regex: 'A503 Joy'
+      model: 'A503 Joy'
+    - regex: 'A504 Trace'
+      model: 'A504 Trace'
+    - regex: 'A512 Harmony Pro'
+      model: 'A512 Harmony Pro'
+    - regex: 'A510_Jeans_4G'
+      model: 'A510 Jeans 4G'
+    - regex: 'A509_Jeans'
+      model: 'A509 Jeans'
+    - regex: 'N1_550_Cruiser'
+      model: 'N1-550 Cruiser'
+    - regex: 'BRAVIS OMEGA'
+      model: 'Omega'
+    - regex: 'BRAVIS BIZ'
+      model: 'Biz'
+    - regex: 'BRAVIS POWER'
+      model: 'Power'
+
+    - regex: 'BRAVIS[ _]SLIM[ _]3G'
+      model: 'Slim 3G'
+      device: 'tablet'
+    - regex: 'NP 104 3G'
+      model: 'NP104 3G'
+      device: 'tablet'
+    - regex: 'BRAVIS NP 103'
+      model: 'NP103'
+      device: 'tablet'
+    - regex: 'BRAVIS NP 844'
+      model: 'NP844'
+      device: 'tablet'
+
     - regex: 'Bravis[_ ]([^;\)]+) Build'
       model: '$1'
-    - regex: '(NB(?:10[156]|751|7[145])|NP101)'
+    - regex: '(NB(?:106M|10[1-8]|751|7[145]|8[57]1|76)|NP101|NB961)'
       model: '$1'
       device: 'tablet'
 
 
 # Acer
 Acer:
-  regex: 'acer|(?<!ZTE BLADE |ImSmart )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|A1-830|A1-81[01]|A3-A[1234][01]|B1-7[1235678][01]|B1-7[23]3|B1-8[1235]0|B1-A71|B3-A[12]0|B3-A3[02]|E39 Build|S5[12]0 Build|DA[0-9]+HQ?L[);/ ]'
+  regex: 'acer|(?<!Satellite |ZTE BLADE |ImSmart |ERGO |X-Style Tab )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.*S55[);/ ]|(?:A1-(713(HD)?|7[23]4|830|841|840FHD|81[01])|A3-A[1234][01]|B1-(7[1235-8][01](HD)?|7[23]3|7A0|8[1235]0|A71|860A)|B3-(A[125]0|A3[02]|A40FHD)|E39)[);/ ]|S5[12]0 Build|(DA[0-9]+HQ?L|Aspire V5-121|Predator G9-793|GT-810|B1-870|B3-A4[02])[);/ ]'
   device: 'smartphone'
   models:
     # smart displays
@@ -519,63 +856,130 @@ Acer:
     - regex: 'A1-81[01]'
       model: 'Iconia A'
       device: 'tablet'
+    - regex: 'A1-84(1|0FHD)'
+      model: 'Iconia Tab 8'
+      device: 'tablet'
+    - regex: 'A1-713(HD)?'
+      model: 'Iconia Tab 7'
+      device: 'tablet'
     - regex: 'A1-830'
       model: 'Iconia A1'
       device: 'tablet'
+    - regex: 'A1-7[23]4'
+      model: 'Iconia Talk S'
+      device: 'tablet'
     - regex: 'A3-A[12][01]'
       model: 'Iconia A3'
       device: 'tablet'
     - regex: 'A3-A[34]0'
       model: 'Iconia Tab 10'
       device: 'tablet'
-    - regex: 'B1-7[1235][01]|B1-A71'
+    - regex: 'B1-7(?:[5678]0|30HD|A0)'
+      model: 'Iconia One 7'
+      device: 'tablet'
+    - regex: 'B1-7[123][01]|B1-A71'
       model: 'Iconia B1'
       device: 'tablet'
     - regex: 'B1-7[23]3'
       model: 'Iconia Talk 7'
       device: 'tablet'
-    - regex: 'B1-7[678]0'
-      model: 'Iconia One 7'
-      device: 'tablet'
-    - regex: 'B1-8[1235]0'
+    - regex: 'B1-8[123567]0'
       model: 'Iconia One 8'
       device: 'tablet'
-    - regex: 'B3-A[12]0|B3-A3[02]'
+    - regex: 'B3-A([125]0|3[02]|40FHD|4[02])'
       model: 'Iconia One 10'
       device: 'tablet'
+    - regex: 'A101'
+      model: 'Vangogh'
+      device: 'tablet'
+    - regex: 'A200'
+      model: 'Picasso E'
+      device: 'tablet'
+    - regex: 'A50[01]'
+      model: 'Picasso'
+      device: 'tablet'
+    - regex: 'Acer One 7'
+      model: 'One 7'
+      device: 'tablet'
+    - regex: 'GT-810'
+      model: 'Predator 8'
+      device: 'tablet'
 
     # explicit smartphone models
-    - regex: 'E39 Build'
+    - regex: 'E39[);/ ]'
       model: 'Liquid E700'
+    - regex: 'E310[);/ ]'
+      model: 'Liquid Mini'
+    - regex: 'E320(?:-orange)?[);/ ]'
+      model: 'Liquid Express'
+    - regex: 'E310[);/ ]'
+      model: 'beTouch E210'
     - regex: 'Android.*V360[);/ ]'
-      model: 'Liquid E1'
+      model: 'Liquid E1 Duo'
     - regex: 'Android.*V370[);/ ]'
-      model: 'Liquid E2'
-    - regex: 'S510 Build'
+      model: 'Liquid E2 Duo'
+    - regex: 'S510[);/ ]'
       model: 'Liquid S1'
-    - regex: 'S520 Build'
+    - regex: 'S520[);/ ]'
       model: 'Liquid S2'
-    - regex: 'Android.*Z1([2345])0 Build'
+    - regex: '(?:Acer_)?P400[);/ ]'
+      model: 'neoTouch P400'
+    - regex: '(?:Acer_)?P300[);/ ]'
+      model: 'neoTouch P300'
+    - regex: '(?:Acer_)?S200[);/ ]'
+      model: 'neoTouch S200'
+    - regex: '(?:Acer_)?E100[);/ ]'
+      model: 'beTouch E100'
+    - regex: 'Android.*Z1([234])0[);/ ]'
       model: 'Liquid Z$1'
-    - regex: 'Android.*Z160 Build'
-      model: 'Liquid Z4'
-    - regex: 'Android.*Z(5\d{2}) Build'
+    - regex: 'Android.*Z110[);/ ]'
+      model: 'Liquid Z110'
+    - regex: 'Android.*Z150[);/ ]'
+      model: 'Liquid Z5 Duo'
+    - regex: 'Android.*Z160[);/ ]'
+      model: 'Liquid Z4 Duo'
+    - regex: 'Android.*Z(5\d{2})[);/ ]'
       model: 'Liquid Z$1'
-    - regex: 'Android.*T02 Build'
+    - regex: 'Android.*S57[);/ ]'
+      model: 'Liquid Jade Z'
+    - regex: 'Android.*T02[);/ ]'
       model: 'Liquid Z530'
-    - regex: 'Android.*T03 Build'
+    - regex: 'Android.*T03[);/ ]'
       model: 'Liquid Z630'
-    - regex: 'Android.*T04 Build'
+    - regex: 'Android.*T04[);/ ]'
       model: 'Liquid Z630S'
-    - regex: 'Android.*T06 Build'
+    - regex: 'Android.*T06[);/ ]'
       model: 'Liquid Zest'
-    - regex: 'Android.*T07 Build'
+    - regex: 'Android.*T07[);/ ]'
       model: 'Liquid Zest 4G'
-    - regex: 'Android.*T08 Build'
+    - regex: 'Android.*T08[);/ ]'
       model: 'Liquid Zest Plus'
-    - regex: 'Acer; ?([^;\)]+)'
+    - regex: 'TM01[);/ ]'
+      model: 'Liquid M330'
+    - regex: 'M220[);/ ]'
+      model: 'Liquid M220'
+    - regex: 'AcerTD600'
+      model: 'TD600'
+    - regex: 'Android.*S55[);/ ]'
+      model: 'Liquid Jade'
+
+    # desktop models
+    - regex: '(?:Acer )?(Chromebook R1[13])'
       model: '$1'
-    - regex: 'Acer[ _\-]?([^;\)]+) Build'
+      device: 'desktop'
+    - regex: '(?:Acer )?(Chromebook 14)'
+      model: '$1'
+      device: 'desktop'
+    - regex: '(Aspire V5-121)'
+      model: '$1'
+      device: 'desktop'
+    - regex: '(Predator G9-793)'
+      model: '$1'
+      device: 'desktop'
+
+    - regex: 'Acer; ?([^;\(\)/]+)'
+      model: '$1'
+    - regex: 'Acer(?! ?inc)[ _\-]?([^;\(\)/]+)[();/ ]'
       model: '$1'
     - regex: 'acer[\-_]([a-z0-9]+)'
       model: '$1'
@@ -583,6 +987,26 @@ Acer:
       model: 'Iconia Tab A$1'
       device: 'tablet'
 
+# Advan
+Advan:
+  regex: '(?:ADVAN (?:M4|S40)|i7U|S45E|50[46]1|5059|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'ADVAN M4'
+      model: 'M4'
+    - regex: 'ADVAN S40'
+      model: 'S40'
+    - regex: 'i7U'
+      model: 'I Lite i7U'
+    - regex: 'S5E[ _]NXT'
+      model: 'S5E NXT'
+    - regex: 'i(55[KD]|5[KE])'
+      model: 'I$1'
+    - regex: 'i4U'
+      model: 'I4U'
+    - regex: '(S45E|50[46]1|5059|S50H|I7D|S7D|S4Z|S5J\+)[);/ ]'
+      model: '$1'
+
 # Advance
 Advance:
   regex: 'Hollogram|HL6246|IntroTr3544|Tr3845'
@@ -596,6 +1020,12 @@ Advance:
     - regex: 'Hollogram ([^;\)]+) Build'
       model: 'Hollogram $1'
 
+# AGM
+AGM:
+  regex: 'AGM ([^/;\)]+)(?: Build|\))'
+  device: 'smartphone'
+  model: '$1'
+
 # Airness
 Airness:
   regex: 'AIRNESS-([\w]+)'
@@ -604,12 +1034,16 @@ Airness:
 
 # Aiwa
 Aiwa:
-  regex: 'AW790|M300'
+  regex: '(?:AW790|M300|AWM533|AW500)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: 'AW790'
+    - regex: 'AW790[);/ ]'
       model: 'AW790'
-    - regex: 'M300'
+    - regex: 'AW500[);/ ]'
+      model: 'AW500'
+    - regex: 'AWM533[);/ ]'
+      model: 'AWM533'
+    - regex: 'M300[);/ ]'
       model: 'M300'
       device: 'phablet'
 
@@ -621,9 +1055,9 @@ Akai:
     - regex: 'TAB-([79]8[03]0Q?)'
       device: 'tablet'
       model: 'TAB $1'
-    - regex: '(AKTB-703MZ)'
+    - regex: 'AKTB-703MZ'
       device: 'tablet'
-      model: '$1'
+      model: 'AKTB-703MZ'
 
     - regex: 'X6 METAL'
       model: 'iLike'
@@ -636,9 +1070,23 @@ Akai:
     - regex: 'Akai[ _-]([^;/]+)[;/)]'
       model: '$1'
 
+# Arian
+Arian Space:
+  regex: 'Arian Space'
+  device: 'tablet'
+  models:
+    - regex: '100 ST1004PG'
+      model: '100'
+    - regex: '80 SS8003PG'
+      model: '80'
+    - regex: '71 ST7002PG'
+      model: '71'
+    - regex: '70 ST7001RW'
+      model: '70'
+
 # Alcatel
 Alcatel:
-  regex: 'Alcatel|Alc[a-z0-9]+|One[ _]?Touch|idol3|(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[EDX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034[ADEFGX]|4035[ADXY]|4045[ADEX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|4114E|5009[AD]|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AXJ]|5017[ABDEOX]|5019D|5022[EDX]|5023[EF]|5025[DG]|5026[AD]|5027B|5038[ADEX]|5042[ADEFGWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052D|5054[ADNSWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIY]|5059[ADXY]|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADYUI]|5116J|5145A|6016[ADEX]|6036[AXY]|6037[BKY]|6039[AHJKY]|6043[AD]|6044D|6045[BFIKOY]|6050[AFY]|6055[ABDHIKPUYZ]|6058[ADX]|6062W|6070K|7040[ADEFKRT]|7041[DX]|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7055A|7070X|8030Y|8050[DEGX]|9001[DIX]|9002X|9003[AX]|9005X|9007[ATX]|9008[ADIJNTUX]|9010X|9022X|9203A|I213|I216X)[);/ ]'
+  regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol3|(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[EDX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034L_EEA|4034[ADEFGX]|4035[ADXY]|4045[ADEX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|A466BG|A621BL|4114E|5001[ADJTU](?:_EEA|_RU)?|5003[ADG](?:_(?:EEA|RU))?|5007A|5008[DUY](?:_(?:EEA|RU))?|5009[AD](?:_RU|_EEA)?|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AXJ]|5017[ABDEOX]|5019D|5022[EDX]|5023[EF]|5024[ADJ](?:_RU|_EEA)?|5025[DEG]|5026[ADJ]|5027B|5028A|5029E|5032W|5033[AEFXDJGMOTXY](?:_(?:EEA|RU))?|5034D(_RU)?|5036D|5038[ADEX]|5039[D](?:_EEA|_RU)?|5041[CD]|5042[ADEFGWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5048[AYU](?:_RU|_EEA)?|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[ADY](_RU)?|5053[AKY](?:_EEA|_RU)?|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIY](_RU)?|5059[ADXYZIST](_RU)?|5060D(?:_EEA|_RU)?|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADYUI](_RU)?|5116J|5145A|6016[ADEX]|6036[AXY]|6037[BKY]|6039[AHJKY]|6043[AD]|6044D|6045[BFIKOYX]|6050[AFY]|6055[ABDHIKPUYZ]|6058[ADX]|6060S|6062W|6070K|7040[ADEFKRT]|7041[DX]|7042A|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7053D|7055A|7070X|8030Y|8050[DEGX]|8063|9001[DIX]|9002X|9003[AX]|9024O|9005X|9026X|9007[ATX]|9008[ADIJNTUX]|9010X|9022X|9027[FTWX]|9203A|A570BL|I213|I216X|A50[13]DL|A574BL|A57[17]VL|A464BG|5028Y[_ ]EEA)[);/ ]|TIMXL'
   device: 'smartphone'
   models:
     - regex: '(?:5022[EDX]|5070D)[);/ ]'
@@ -653,7 +1101,9 @@ Alcatel:
       model: 'One Touch Pop C2'
     - regex: '4032[DE][);/ ]'
       model: 'One Touch Pop C2 Dual SIM'
-    - regex: '(?:7040[AFK]|7041X)[);/ ]'
+    - regex: '5036D[);/ ]'
+      model: 'One Touch Pop C5 Dual SIM'
+    - regex: '(?:7040[AFK]|7041X|7042A)[);/ ]'
       model: 'One Touch Pop C7'
     - regex: '(?:7040[DE]|7041D)[);/ ]'
       model: 'One Touch Pop C7 Dual SIM'
@@ -679,7 +1129,7 @@ Alcatel:
       model: 'One Touch Pop 3'
     - regex: '(?:5015[AE]|5016[AJ]|5065[ADWX]|5116J)[);/ ]'
       model: 'One Touch Pop 3 5"'
-    - regex: '(?:5025[DG]|5054[ADSX])[);/ ]'
+    - regex: '(?:5025[DEG]|5054[ADSTX])[);/ ]'
       model: 'One Touch Pop 3 5.5"'
     - regex: '5015D[);/ ]'
       model: 'One Touch Pop 3 Dual SIM'
@@ -703,6 +1153,10 @@ Alcatel:
       model: 'One Touch Idol 2'
     - regex: '5027B[);/ ]'
       model: 'One Touch Dawn'
+    - regex: '(?:5024[AD](?:_RU|_EEA)?|5028Y[_ ]EEA)[);/ ]'
+      model: '1S'
+    - regex: '5034D(_RU)?[);/ ]'
+      model: '3L'
     - regex: '7040[RT][);/ ]'
       model: 'One Touch Fierce 2'
     - regex: '5056[NW]'
@@ -719,7 +1173,7 @@ Alcatel:
       model: 'One Touch Idol 2S'
     - regex: '6039[AHJKY][);/ ]|idol3'
       model: 'One Touch Idol 3'
-    - regex: '6045[BFIKOY][);/ ]'
+    - regex: '6045[BFIKOYX][);/ ]'
       model: 'One Touch Idol 3 5.5"'
     - regex: '6055[ABDHIKPUYZ][);/ ]'
       model: 'One Touch Idol 4'
@@ -727,18 +1181,36 @@ Alcatel:
       model: 'One Touch Idol 4S'
     - regex: '6058[ADX][);/ ]'
       model: 'One Touch Idol 5'
+    - regex: '6060S[);/ ]'
+      model: 'One Touch Idol 5S'
     - regex: '6043[AD][);/ ]'
       model: 'One Touch Idol X+'
     - regex: '8030Y[);/ ]'
       model: 'One Touch Hero 2'
     - regex: '7055A[);/ ]'
       model: 'One Touch Hero 2C'
+    - regex: '7053D[);/ ]'
+      model: 'One Touch X1'
     - regex: '5065N[);/ ]'
       model: 'TRU'
-    - regex: '5056I'
+    - regex: 'A574BL[);/ ]'
+      model: 'Raven'
+    - regex: 'A577VL[);/ ]'
+      model: 'Zip'
+    - regex: 'A466BG[);/ ]'
+      model: 'Pixi Unite'
+    - regex: '5056I[);/ ]'
       model: 'One Touch Optus X Smart'
+    - regex: 'A570BL[);/ ]'
+      model: 'One Touch Pixi Avion LTE'
+    - regex: 'A571VL[);/ ]'
+      model: 'One Touch Pixi Avion 4G LTE'
     - regex: '4024[DEX][);/ ]'
       model: 'One Touch Pixi First'
+    - regex: 'A464BG[);/ ]'
+      model: 'One Touch Pixi Glitz'
+    - regex: 'A621BL[);/ ]'
+      model: 'One Touch Pixi Glory'
     - regex: '4014D[);/ ]'
       model: 'One Touch Pixi 2'
     - regex: '4009[AFIKMSX][);/ ]'
@@ -768,7 +1240,7 @@ Alcatel:
       device: 'tablet'
     - regex: '4017[ADEFSX][);/ ]'
       model: 'One Touch Pixi 4 3.5"'
-    - regex: '4034[ADEFGX][);/ ]'
+    - regex: '4034(?:[ADEFGX]|L_EEA)[);/ ]'
       model: 'One Touch Pixi 4 4"'
     - regex: '4060[SW][);/ ]'
       model: 'One Touch Pixi 4 4.5"'
@@ -776,12 +1248,18 @@ Alcatel:
       model: 'One Touch Pixi 4 Plus Power'
     - regex: '5010[DEGSUX][);/ ]'
       model: 'One Touch Pixi 4 5" 3G'
+    - regex: '5041D[);/ ]'
+      model: 'One Touch Pixi 4 5.0"'
     - regex: '5012[DFG][);/ ]'
       model: 'One Touch Pixi 4 5.5" 3G'
     - regex: '(?:5045[ADFGIJTXY]|5145A)[);/ ]'
       model: 'One Touch Pixi 4 5" 4G'
     - regex: '5098O[);/ ]'
       model: 'One Touch Pixi Theatre'
+    - regex: 'A501DL[);/ ]'
+      model: 'A1'
+    - regex: 'A503DL[);/ ]'
+      model: 'A1X'
     - regex: '5046[ADIJTUY][);/ ]'
       model: 'A3'
     - regex: '(?:5011A|5049[EG])[);/ ]'
@@ -791,6 +1269,12 @@ Alcatel:
     - regex: '9203A[);/ ]'
       model: 'A3 7" 3G'
       device: 'tablet'
+    - regex: '9027[FTWX][);/ ]'
+      model: '3T 8.0"'
+      device: 'tablet'
+    - regex: '9026X[);/ ]'
+      model: 'A3 10"'
+      device: 'tablet'
     - regex: '5085[BQ][);/ ]'
       model: 'A5'
     - regex: '5085[ADHIJY][);/ ]'
@@ -807,6 +1291,8 @@ Alcatel:
       model: 'A30 Fierce'
     - regex: '5085[GO]'
       model: 'A50'
+    - regex: '5048[AYU](?:_RU|_EEA)?[);/ ]'
+      model: '3X (2019)'
     - regex: '5049W[);/ ]'
       model: 'Revvl'
     - regex: '8050[GX][);/ ]'
@@ -818,6 +1304,12 @@ Alcatel:
     - regex: '9003[AX][);/ ]'
       model: 'One Touch Pixi 4 7" 3G'
       device: 'tablet'
+    - regex: '8063[);/ ]'
+      model: 'One Touch Pixi 4 7" WiFi'
+      device: 'tablet'
+    - regex: '9024O[);/ ]'
+      model: 'One Touch Pixi 5'
+      device: 'tablet'
     - regex: 'I216X[);/ ]'
       model: 'One Touch Pixi 7'
       device: 'tablet'
@@ -835,6 +1327,22 @@ Alcatel:
       device: 'tablet'
     - regex: '7048[ASWX][);/ ]'
       model: 'One Touch Go Play'
+    - regex: '(?:Alcatel-)?OT-802[);/ ]'
+      model: 'Wave'
+    - regex: 'ALCATEL_ONE_TOUCH_768T[);/ ]'
+      model: 'Island'
+    - regex: '(?:TRIBE_)?3075A[);/ ]'
+      model: 'One Touch Tribe'
+    - regex: 'ALCATEL_one_touch_585[);/ ]'
+      model: 'One Touch 585'
+    - regex: 'ALCATEL_ONE_TOUCH_838[);/ ]'
+      model: 'One Touch 838'
+    - regex: 'ALCATEL_one_touch_813d[);/ ]'
+      model: 'One Touch 813D'
+    - regex: 'ALCATEL_one_touch_813[);/ ]'
+      model: 'One Touch 813'
+    - regex: 'OT871A'
+      model: 'One Touch 871A'
     - regex: '(?:Alcatel[ _])?One[ _]?Touch[ _]((?:T[0-9]+|TAB[^/;]+|EVO[78](?:HD)?)) Build'
       device: 'tablet'
       model: 'One Touch $1'
@@ -844,6 +1352,8 @@ Alcatel:
       model: 'One Touch$1'
     - regex: '5080[ADFQUX][);/ ]'
       model: 'Shine Lite'
+    - regex: 'TIMXL'
+      model: 'TIM XL'
     - regex: '5085C'
       model: 'PulseMix'
     - regex: '4049[DEGMX][);/ ]'
@@ -858,19 +1368,49 @@ Alcatel:
       model: 'U5 Lite'
     - regex: '4047A[);/ ]'
       model: 'U5 Plus'
+    - regex: '4044[CV][);/ ]'
+      model: 'Quick Flip'
+    - regex: '4044O[);/ ]'
+      model: 'Cingular Flip 2'
+    - regex: '4044[MNT][);/ ]'
+      model: 'Go Flip'
     - regex: '5044[GS][);/ ]'
       model: 'U50'
-    - regex: '5009[AD][);/ ]'
+    - regex: '5033[ADXJEFGMOTXY](?:_(?:EEA|RU))?[);/ ]'
+      model: '1'
+    - regex: '5009[AD](?:_RU|_EEA)?[);/ ]'
       model: '1C'
-    - regex: '5059[ADXY][);/ ]'
+    - regex: '5008[DUY](?:_(?:EEA|RU))?[);/ ]'
+      model: '1X (2019)'
+    - regex: '5007A[);/ ]'
+      model: '1V (2020)'
+    - regex: '5003[ADG](?:_(?:EEA|RU))?[);/ ]'
+      model: '1C (2019)'
+    - regex: '5024J[);/ ]'
+      model: '1S'
+    - regex: '5028A[);/ ]'
+      model: '1S (2020)'
+    - regex: '5001[ADJTU](?:_EEA|_RU)?[);/ ]'
+      model: '1V'
+    - regex: '5059[ADXYZIT](_RU)?[);/ ]'
       model: '1X'
-    - regex: '5052D[);/ ]'
+    - regex: '5059S[);/ ]'
+      model: 'Avalon V'
+    - regex: '5060D(?:_EEA|_RU)?[);/ ]'
+      model: '5V'
+      device: 'phablet'
+    - regex: '(?:5052[ADY]|5053[AKY])(?:_EEA|_RU)?[);/ ]'
       model: '3'
-    - regex: '5099[ADYUI][);/ ]'
+    - regex: '5029E[);/ ]'
+      model: '3 (2020)'
+    - regex: '(?:5032W|5099[ADYUI](_RU)?)[);/ ]'
       model: '3V'
-    - regex: '5026[AD][);/ ]'
+    - regex: '5026[ADJ][);/ ]'
       model: '3C'
-    - regex: '5058[AIY][);/ ]'
+    - regex: '5039[D](?:_(?:EEA|RU))?[);/ ]'
+      model: '3L'
+      device: 'phablet'
+    - regex: '5058[AIY](_RU)?[);/ ]'
       model: '3X'
     - regex: '5086[ADY][);/ ]'
       model: '5'
@@ -878,6 +1418,10 @@ Alcatel:
       model: '7'
     - regex: 'Alcatel UP'
       model: ''
+    - regex: '(?:ALCATEL_)?A383G[);/ ]'
+      model: 'Big Easy Plus'
+    - regex: '5041C'
+      model: 'TETRA'
     - regex: 'ALCATEL([^/;]+) Build'
       model: '$1'
     - regex: 'ALCATEL[ \-]?([^/;\)]+)'
@@ -889,36 +1433,223 @@ Alcatel:
 
 # Allview
 Allview:
-  regex: 'Allview|P[567]_Lite(?:_TM)?|P5_Energy|P6_Energy_(?:Lite|Mini)|X2_Soul_Xtreme|A5_(?:Easy|Ready|Quad_Plus_TM)|A6_Duo|A[89]_Lite'
+  regex: 'Allview|A4You|A5_(?:Easy(?:_TM)?|Ready(?:_TM)?|Quad|Quad_Plus_TM)|A[56789]_Lite|A5Smiley|A6_Duo|A10_Lite_2019|A10_Plus|AX2_Frenzy|AX4Nano|AX5NanoQ|C6_Duo|E[23]_Living|E3_(?:Jump|Sign)|E4_Lite|M9_Connect|P(?:43_Easy|[5689]_Energy|6_Energy_Lite|[68]_Energy_Mini(?:_TM)?|(41|[458])_eMagic(?:_TM)?|[589](?:_)?Life(?:_TM)?|[567]_Lite(?:_TM)?|6_plus|[45678]_Pro|7_Seon|10_Life|10_Max|10_Style|7_Xtreme|6_Qmax|4_Quad)|V(?:[134]_Viper|1_Viper_I|2_Viper_(?:E|I|S|X|X_plus|Xe))|X(?:[1234]_Soul_Xtreme|[12345]_Soul|3_Soul_Lite|[23456]_Soul_Mini(?:_TM)?|4_Soul_Mini_S(?:_TM)?|[234]_Soul_Style(?:_TM)?|2_Soul_Style_Plus|2_Twin)|Viva_(H801|100[13]G|H1001_LTE)'
   device: 'smartphone'
   models:
+    - regex: 'A4You'
+      model: 'A4 You'
+    - regex: 'AX2_Frenzy'
+      model: 'AX2 Frenzy'
+      device: 'tablet'
+    - regex: 'AX4Nano'
+      model: 'AX4 Nano'
+    - regex: 'AX5NanoQ'
+      model: 'AX5 Nano Q'
+      device: 'tablet'
+    - regex: 'C6_Duo'
+      model: 'C6 Duo'
+    - regex: 'E([23])_Living'
+      model: 'E$1 Living'
+    - regex: 'E3_Jump'
+      model: 'E3 Jump'
+    - regex: 'E3_Sign'
+      model: 'E3 Sign'
+    - regex: 'E4_Lite'
+      model: 'E4 Lite'
+    - regex: 'M9_Connect'
+      model: 'M9 Connect'
+    - regex: 'P43_Easy'
+      model: 'P43 Easy'
+    - regex: 'P(41|[458])_eMagic(?:_TM)?'
+      model: 'P$1 eMagic'
     - regex: 'P([567])_Lite(?:_TM)?'
       model: 'P$1 Lite'
-    - regex: 'P5_Energy'
-      model: 'P5 Energy'
-    - regex: 'P6_Energy_Lite'
-      model: 'P6 Energy Lite'
-    - regex: 'P6_Energy_mini'
-      model: 'P6 Energy Mini'
-    - regex: 'X2_Soul_Xtreme'
-      model: 'X2 Soul Xtreme'
-    - regex: 'A5_Easy'
+    - regex: 'P6_plus'
+      model: 'P6 Plus'
+    - regex: 'P6_Qmax'
+      model: 'P6 Qmax'
+    - regex: 'P([45678])_Pro'
+      model: 'P$1 Pro'
+    - regex: 'P4_Quad'
+      model: 'P4 Quad'
+    - regex: 'P9_Energy_Lite_2017'
+      model: 'P9 Energy Lite (2017)'
+    - regex: 'P9_Energy_S'
+      model: 'P9 Energy S'
+    - regex: 'P([69])_Energy_Lite'
+      model: 'P$1 Energy Lite'
+    - regex: 'P8_Energy_PRO'
+      model: 'P8 Energy Pro'
+    - regex: 'P([689])_Energy_mini(?:_TM)?'
+      model: 'P$1 Energy Mini'
+    - regex: 'P([5689])_Energy'
+      model: 'P$1 Energy'
+    - regex: 'P7_Seon'
+      model: 'P7 Seon'
+    - regex: 'P7_Xtreme'
+      model: 'P7 Xtreme'
+    - regex: 'P([589])(?:_)?Life(?:_TM)?'
+      model: 'P$1 Life'
+    - regex: 'P10_Life'
+      model: 'P10 Life'
+    - regex: 'P10_Max'
+      model: 'P10 Max'
+    - regex: 'P10_Style'
+      model: 'P10 Style'
+    - regex: 'V([12])_Viper_I4G(?:_TM)?'
+      model: 'V$1 Viper I 4G'
+    - regex: 'V1_Viper_I'
+      model: 'V1 Viper I'
+    - regex: 'V([134])_Viper'
+      model: 'V$1 Viper'
+    - regex: 'V2_Viper_X_plus'
+      model: 'V2 Viper X Plus'
+    - regex: 'V2_Viper_(E|I|S|X(?:e)?)'
+      model: 'V2 Viper $1'
+    - regex: 'X([124])_Soul_Xtreme'
+      model: 'X$1 Soul Xtreme'
+    - regex: 'X4_Soul_Infinity_(L|N|S|Z)'
+      model: 'X4 Soul Infinity $1'
+    - regex: 'X([34])_Soul_Lite'
+      model: 'X$1 Soul Lite'
+    - regex: 'X4_Soul_Mini_S(?:_TM)?'
+      model: 'X4 Soul Mini S'
+    - regex: 'X([23456])_Soul_Mini(?:_TM)?'
+      model: 'X$1 Soul Mini'
+    - regex: 'X3_Soul_PLUS'
+      model: 'X3 Soul Plus'
+    - regex: 'X([35])_Soul_Pro'
+      model: 'X$1 Soul Pro'
+    - regex: 'X2_Soul_Style_Plus'
+      model: 'X2 Soul Style Plus'
+    - regex: 'X([234])_Soul_Style(?:_TM)?'
+      model: 'X$1 Soul Style'
+    - regex: 'X([12345])_Soul'
+      model: 'X$1 Soul'
+    - regex: 'X2_Twin'
+      model: 'X2 Twin'
+    - regex: 'A5_Easy(?:_TM)?'
       model: 'A5 Easy'
-    - regex: 'A5_Ready'
+    - regex: 'A([56789])_Lite'
+      model: 'A$1 Lite'
+    - regex: 'A5_Ready(?:_TM)?'
       model: 'A5 Ready'
+    - regex: 'A5Smiley'
+      model: 'A5 Smiley'
     - regex: 'A5_Quad_Plus_TM'
       model: 'A5 Quad Plus'
+    - regex: 'A5_Quad'
+      model: 'A5 Quad'
     - regex: 'A6_Duo'
       model: 'A6 Duo'
-    - regex: 'A8_Lite'
-      model: 'A8 Lite'
-    - regex: 'A9_Lite'
-      model: 'A9 Lite'
+    - regex: 'A10_Lite_2019'
+      model: 'A10 Lite (2019)'
+    - regex: 'A10_Plus'
+      model: 'A10 Plus'
+    - regex: 'Impera S'
+      model: 'Impera S'
+    - regex: 'ALLVIEW P4i'
+      model: 'AllDro P4'
+    - regex: 'Allview_P2'
+      model: 'AllDro'
+
+    # explicit tablet models
+    - regex: 'AllviewCityPlus'
+      device: 'tablet'
+      model: 'City Plus'
+    - regex: 'AllviewCity'
+      device: 'tablet'
+      model: 'City'
+    - regex: 'AllviewAX2Frenzy'
+      device: 'tablet'
+      model: 'AX2 Frenzy'
+    - regex: 'Allview2SpeedDuo'
+      device: 'tablet'
+      model: 'Alldro 2 Speed Duo'
+    - regex: 'Allview3SpeedQuad'
+      device: 'tablet'
+      model: 'Alldro 3 Speed Quad'
+    - regex: 'Viva_(H801|100[13]G|H1001_LTE)'
+      device: 'tablet'
+      model: 'Viva $1'
+    - regex: 'ALLVIEW ?SPEEDI'
+      device: 'tablet'
+      model: 'Speed I'
+    - regex: 'ALLVIEW ?SPEED'
+      device: 'tablet'
+      model: 'Speed'
+    - regex: 'ALLVIEWSPEED'
+      device: 'tablet'
+      model: 'Speed'
+    - regex: 'AX4Nano'
+      device: 'tablet'
+      model: 'AX4 Nano'
+    - regex: 'ALLVIEW_TX1_Quasar'
+      device: 'tablet'
+      model: 'TX1 Quasar'
+
     - regex: 'Allview[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Allview[ _-]([^;/]+)[;/)]'
       model: '$1'
 
+# Allwinner
+Allwinner:
+  regex: '(?:QUAD-CORE A64 p3|ZY-07B)[);/ ]'
+  device: 'tablet'
+  models:
+      - regex: 'QUAD-CORE A64 p3'
+        model: 'A64 QUAD-CORE p3'
+      - regex: 'ZY-07B'
+        model: 'ZY-07B'
+
+# altron
+altron:
+  regex: 'AL-555|GI-626'
+  device: 'smartphone'
+  models:
+    - regex: 'AL-555'
+      model: 'AL-555'
+    - regex: 'GI-626'
+      device: 'phablet'
+      model: 'GI-626'
+
+# AMGOO
+AMGOO:
+  regex: 'AM(350|355|40[257]|41[05]|450|50[89]|52[037]|51[58]|53[05])'
+  device: 'smartphone'
+  models:
+    - regex: 'AM350'
+      model: 'Jack Pro'
+    - regex: 'AM(355|407)'
+      model: 'Tigo'
+    - regex: 'AM402'
+      model: 'Pronto'
+    - regex: 'AM410'
+      model: 'Unico'
+    - regex: 'AM450'
+      model: 'Swift'
+    - regex: 'AM508'
+      model: 'Fuego'
+    - regex: 'AM509'
+      model: 'Uno'
+    - regex: 'AM515'
+      model: 'D1'
+    - regex: 'AM518'
+      model: 'C1'
+    - regex: 'AM520'
+      model: 'Pro'
+    - regex: 'AM523'
+      model: 'Plus'
+    - regex: 'AM527'
+      model: 'Geo'
+    - regex: 'AM530'
+      model: 'A1'
+    - regex: 'AM535'
+      model: 'P1'
+    - regex: 'AM([0-9]{3})'
+      model: 'AM$1'
+
 # Amoi
 Amoi:
   regex: 'Amoi|A862W'
@@ -927,7 +1658,6 @@ Amoi:
     # explicit smartphone models
     - regex: 'A862W'
       model: 'A862W'
-
     - regex: 'Amoi[\- /]([a-z0-9]+)'
       model: '$1'
     - regex: 'Amoisonic-([a-z0-9]+)'
@@ -935,31 +1665,59 @@ Amoi:
 
 # Ainol
 Ainol:
-  regex: 'Numy|novo[0-9]'
+  regex: 'Numy|novo[0-9]|Novo 10 Hero|AX10PRO|NUMY3GAX9|NOVO10 Spark'
   device: 'tablet'
   models:
+    - regex: 'Numy 3G AX1'
+      model: 'Novo 7 Numy AX1 3G'
+    - regex: 'NOVO10 Spark'
+      model: 'Novo 10 Spark'
+    - regex: 'AX10PRO'
+      model: 'Numy AX10 Pro'
+    - regex: 'Numy_3G_AX3'
+      model: 'Numy AX3 Sword'
+    - regex: 'Numy3GTalos'
+      model: 'Numy 3G Talos'
+    - regex: 'Numy_3G_BW1'
+      model: 'Numy 3G Talos 2'
+    - regex: 'NUMY3GAX9[);/ ]'
+      model: 'Numy 3G AX9'
+    - regex: '(Novo 10 Hero QuadCore)'
+      model: '$1'
+    - regex: 'Novo7 Flame[);/ ]'
+      model: 'Novo 7 Flame'
+    - regex: 'NOVO7[);/ ]'
+      model: 'Novo 7'
     - regex: 'Numy[ _]([^;/]+) Build'
       model: 'Numy $1'
     - regex: 'Novo([0-9]+)[ \-]([^;/]+) Build'
       model: 'Novo $1 $2'
 
+
 # Archos
 Archos:
-  regex: 'Archos'
+  regex: '(?:YL-)?Archos|(?:A50TI|AC101BHE)[);/ ]'
   device: 'smartphone'
   models:
+    - regex: 'Archos (Oxygen 63)[);/ ]'
+      model: '$1'
+    - regex: 'A50TI[);/ ]'
+      model: '50 Titanium 4G'
     - regex: 'Archos ?5[);/ ]'
       device: 'tablet'
       model: '5'
-    - regex: 'Archos ([^/;]*(?:PAD)[^/;]*) Build'
+    - regex: 'AC101BHE[);/ ]'
+      device: 'tablet'
+      model: '101B Helium 4G'
+    - regex: '(?:YL-)?Archos ([^/;]*(?:PAD)[^/;]*) Build'
       device: 'tablet'
       model: '$1'
     - regex: 'Archos ((?:[789]|10)[0-9]?[a-z]* ?(?:G9|G10|Helium|Titanium|Cobalt|Platinum|Xenon|Carbon|Neon|XS|IT)[^/;]*) Build'
       device: 'tablet'
       model: '$1'
-    - regex: 'Archos ([a-z0-9 ]+) Build'
+    - regex: '(?:YL-)?Archos ([a-z0-9 ]+) Build'
       model: '$1'
-    - regex: 'Archos ([a-z0-9]+)'
+    - regex: '(?:YL-)?Archos ([a-z0-9]+)'
       model: '$1'
 
 # Axxion
@@ -1050,6 +1808,96 @@ ARRIS:
     - regex: 'ARRIS[,;] ([^),;/]+)'
       model: '$1'
 
+# Ask
+Ask:
+  regex: 'ASK[ _]'
+  device: 'smartphone'
+  models:
+    - regex: 'ASK[ _]791SP[ _]3G'
+      model: '791SP 3G'
+      device: 'tablet'
+    - regex: 'ASK[_ ]([^/;]*) Build'
+      model: '$1'
+
+# ANS
+ANS:
+  regex: 'UL40 Build'
+  device: 'smartphone'
+  model: 'UL40'
+
+# Assistant
+Assistant:
+  regex: '(AS[-_](?:50[123]|543[1-6]|44[12]1|541[12]|54[23]1|6431|[46]01L)|AP-(?:109|115G|721N|753G|7[25]7G|10[68]|107G|110N|941|719))[;/)_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'AS[-_]401L[);/ ]'
+      model: 'Asper'
+    - regex: 'AS-5432[);/ ]'
+      model: 'Agio'
+    - regex: 'AS[-_](?:5434|501)[);/ ]'
+      model: 'Club'
+    - regex: 'AS_601L[);/ ]'
+      model: 'AS-601L'
+    - regex: 'AS-5433 Secret[);/ ]'
+      model: 'Secret'
+    - regex: 'AS-5433[);/ ]'
+      model: 'Max Secret'
+    - regex: 'AS-5421[);/ ]'
+      model: 'Surf'
+    - regex: 'AS-44[12]1[);/ ]'
+      model: 'Unami'
+    - regex: 'AS-5431[);/ ]'
+      model: 'Prima'
+    - regex: 'AS-502[);/ ]'
+      model: 'Shot'
+    - regex: 'AS-503[);/ ]'
+      model: 'Target'
+    - regex: 'AS-5435[);/ ]'
+      model: 'Shine'
+    - regex: 'AS-5436[ _]'
+      model: 'Grid'
+    - regex: 'AS-6431[);/ ]'
+      model: 'Rider'
+    - regex: 'AS-5411[_ ]'
+      model: 'Max Ritm'
+    - regex: 'AS-5412 Max[);/ ]'
+      model: 'AS-5412 Max'
+    - regex: 'AP-721N[);/ ]'
+      model: 'AP-721N Force'
+      device: 'tablet'
+    - regex: 'AP-941[);/ ]'
+      model: 'AP-941'
+      device: 'tablet'
+    - regex: 'AP-108[);/ ]'
+      model: 'Cetus'
+      device: 'tablet'
+    - regex: 'AP-106[);/ ]'
+      model: 'AP-106 Force'
+      device: 'tablet'
+    - regex: '(AP-(?:109|115G|7[25]7G|753G|107G|110N|719))[/;) ]'
+      device: 'tablet'
+      model: '$1'
+
+# Ark (Ark Electronic Technology)
+Ark:
+  regex: '(ARK[_ -])?Benefit[_ -]([^/;]*)(?: Build|\))|EDGE A5HD|Elf_S8|ICON (R40\+|R45)|Impulse[ _](P[12])|Wizard_1[/;) ]'
+  device: 'smartphone'
+  models:
+    - regex: '(?:ARK[_ -])?Benefit[_ -]([^/;]*)(?: Build|\))'
+      model: 'Benefit $1'
+    - regex: 'Impulse[ _]P1\+'
+      model: 'Impulse P1 Plus'
+    - regex: 'Impulse[ _](P[12])'
+      model: 'Impulse $1'
+    - regex: 'EDGE (A5HD)'
+      model: 'Edge $1'
+    - regex: 'ICON (R40\+|R45)'
+      model: 'Icon $1'
+    - regex: 'Wizard_1'
+      model: 'Wizard 1'
+    - regex: 'Elf_S8[);/ ]'
+      model: 'Elf S8'
+
 # Garmin-Asus
 Garmin-Asus:
   regex: 'Garmin-Asus|Garminfone'
@@ -1064,26 +1912,35 @@ Garmin-Asus:
 
 # Asus
 Asus:
-  regex: 'Asus|Transformer|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|P(?:008|024|027) Build|X018D|X003|X00[7ABT]D|Z00D|Z00[MY]D|Z01[7FHMR]D)[);/ ]|ZB(602|555)KL|ZC553KL|ZA550KL|ZE(520|620|55[2345])KL'
+  regex: 'Asus|Transformer|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|P(?:00[18ACIL]|01[MTVWYZ]|01MA|01T_1|02[13478])(?: Build|\))|X015D|X018D|X003|X00[7ABT]D|Z00D|Z00[MTY]D|Z01[7FGHKMR]D)[);/ ]|G55[023]KL|ZB(631|602|633|55[135]|50[01])KL|ZC(55[134]|520|600)KL|ZA550KL|ZE(520|620|55[2345])KL|ZD55[23]KL|ZS600KL|ZS(6[236]0|55[10])KL|ZB(500KG|601KL)|MeMo Pad FHD 10 LTE|Z00VD'
   device: 'smartphone'
   models:
     # explicit tablet models
     - regex: 'ME171[);/ ]'
       model: 'Eee Pad MeMO 171'
       device: 'tablet'
+    - regex: 'ASUS Z906[);/ ]'
+      model: 'Z906 10.1"'
+      device: 'tablet'
     - regex: 'ME172V'
       model: 'MeMO Pad'
       device: 'tablet'
     - regex: 'ME302C[);/ ]'
       model: 'MeMO Pad FHD 10'
       device: 'tablet'
-    - regex: 'ME302KL[);/ ]'
+    - regex: '(ME302KL|MeMo Pad FHD 10 LTE)[);/ ]'
       model: 'MeMO Pad FHD 10 LTE'
       device: 'tablet'
     - regex: 'ME301T[);/ ]'
       model: 'MeMO Pad Smart 10'
       device: 'tablet'
-    - regex: '(?:K01[3A]|K007|K00R)[);/ ]'
+    - regex: 'Z101[);/ ]'
+      model: 'Z101'
+      device: 'tablet'
+    - regex: 'X Pad 10 LTE[);/ ]'
+      model: 'X Pad 10 LTE'
+      device: 'tablet'
+    - regex: '(?:K01[3A]|K007|K00R)[);/ ]|MeMO Pad 7'
       model: 'MeMO Pad 7'
       device: 'tablet'
     - regex: 'K01E[);/ ]'
@@ -1122,16 +1979,37 @@ Asus:
     - regex: 'Slider SL101'
       model: 'Eee Pad Slider SL101'
       device: 'tablet'
+    - regex: 'P01[YZ]'
+      model: 'ZenPad C 7.0'
+      device: 'tablet'
     - regex: 'P008 Build'
       model: 'ZenPad Z8'
       device: 'tablet'
-    - regex: 'P024 Build'
+    - regex: 'P001'
+      model: 'ZenPad Z10'
+      device: 'tablet'
+    - regex: '(?:ASUS_)?P00J'
+      model: 'ZenPad Z8s'
+      device: 'tablet'
+    - regex: 'P01[VW]'
+      model: 'ZenPad 7.0'
+      device: 'tablet'
+    - regex: 'P024 Build|P00A'
       model: 'ZenPad 8.0'
       device: 'tablet'
-    - regex: 'P027 Build'
+    - regex: 'P01MA(?: Build|\))|P01M(?: Build|\))'
+      model: 'ZenPad S 8.0'
+      device: 'tablet'
+    - regex: 'P027'
       model: 'ZenPad 3S 10'
       device: 'tablet'
-
+    - regex: '(?:ASUS_)?P00I'
+      model: 'ZenPad 3S 10 LTE'
+      device: 'tablet'
+    - regex: '(?:ASUS_)?P00C|P02[138]|P00L|P01T_1'
+      model: 'ZenPad 10'
+      device: 'tablet'
+      
     # explicit phablet models
     - regex: 'ME371MG[);/ ]'
       model: 'Fonepad'
@@ -1150,29 +2028,45 @@ Asus:
       device: 'phablet'
 
     # explicit smartphone models
+    - regex: '(?:ASUS_)?T00N'
+      model: 'PadFone S'
+    - regex: '(?:ASUS_)?A002(A)?'
+      model: 'ZenFone AR'
+    - regex: '(?:ASUS_)?A006'
+      model: 'ZenFone V'
+    - regex: '(?:ASUS_)?A009'
+      model: 'ZenFone V Live'
     - regex: '(?:ASUS_)?Z007'
       model: 'ZenFone C'
-    - regex: '(?:ASUS_)?ZB555KL'
+    - regex: '(?:ASUS_)?(X00PD|ZB555KL)'
       model: 'ZenFone Max M1'
-    - regex: '(?:ASUS_)?(?:Z00D|Z008D|Z00AD[AB]?)'
+    - regex: '(?:ASUS_)?(ZB601KL)'
+      model: 'ZenFone Max Pro M1'
+    - regex: '(?:ASUS_)?(X01([AB]D)|ZB633KL)[);/ ]'
+      model: 'ZenFone Max M2'
+    - regex: '(?:ASUS_)?(?:Z00[AD]|Z008D|Z008|Z00AD[AB]?)'
       model: 'ZenFone 2'
-    - regex: '(?:ASUS_)?A007|ZA550KL'
+    - regex: '(?:ASUS_)?A007|ZA550KL|ZB553KL|ZB501KL'
       model: 'ZenFone Live'
+    - regex: '(?:ASUS_)?(X00RD|G552KL)'
+      model: 'ZenFone Live L1'
+    - regex: 'G553KL'
+      model: 'ZenFone Lite L1'
     - regex: '(?:ASUS_)Z00YD'
       model: 'Live'
-    - regex: '(?:ASUS_)?(?:Z00[ERLM]D|Z011D)'
+    - regex: '(?:ASUS_)?(?:Z00[ERLMT]D|Z011D)'
       model: 'ZenFone 2 Laser'
-    - regex: '(?:ASUS_)?T00[IQ1]'
+    - regex: '(?:ASUS_)?(?:T00[IQ1]|Z01KD)'
       model: 'ZenFone 4'
-    - regex: '(?:ASUS_)?(?:T00[JF]|X00QD|ZE620KL)'
+    - regex: '(?:ASUS_)?(?:T00[JF]|X00QD|X00QSA|ZE620KL)'
       model: 'ZenFone 5'
     - regex: '(?:ASUS_)?T00P'
       model: 'ZenFone 5 LTE'
-    - regex: '(?:ASUS_)?T00K'
+    - regex: '(?:ASUS_)?(?:T00K|X017DA|X017D|ZC600KL)'
       model: 'ZenFone 5 Lite'
-    - regex: '(?:ASUS_)?Z01RD'
+    - regex: '(?:ASUS_)?(?:Z01RD|ZS620KL)'
       model: 'ZenFone 5Z'
-    - regex: '(?:ASUS_)?(?:T00G|Z002)'
+    - regex: '(?:ASUS_)?(?:T00G|Z002|ZS630KL|I01WD[X]?)'
       model: 'ZenFone 6'
     - regex: '(?:ASUS_)?Z010D'
       model: 'ZenFone Max'
@@ -1180,36 +2074,66 @@ Asus:
       model: 'ZenFone Max Plus M1'
     - regex: '(?:ASUS_)?X00TD'
       model: 'ZenFone Max Pro M1'
+    - regex: '(?:ASUS_)?X01BDA|ZB631KL'
+      model: 'ZenFone Max Pro M2'
     - regex: '(?:ASUS_)?X014D'
       model: 'ZenFone Go Plus'
-    - regex: '(?:ASUS_)?(X00[7AB]D|Z00[SV]D|X009[DB][DA])'
+    - regex: '(?:ASUS_)?(L001|X00[7AB]D|X009[DB][DA]|Z00[SV]D|ZB500K[LG]|ZB551KL)'
       model: 'ZenFone Go'
     - regex: '(?:ASUS_)?X013D'
       model: 'ZenFone Go Life'
+    - regex: '(?:ASUS_)?G550KL'
+      model: 'ZenFone Go TV'
+    - regex: '(?:ASUS_)?Z00VD' #ZC500TG
+      model: 'ZenFone Go'
     - regex: '(?:ASUS_)?(X003)'
       model: 'ZenFone Pegasus'
+    - regex: '(?:ASUS_)?X005'
+      model: 'ZenFone Pegasus 5000'
+    - regex: '(?:ASUS_)?X550'
+      model: 'ZenFone Pegasus 2 Plus'
+    - regex: '(?:ASUS_)?(X00GD)'
+      model: 'ZenFone Pegasus 3S Max'
     - regex: '(?:ASUS_)?(X008)'
       model: 'ZenFone 3 Pegasus'
     - regex: '(?:ASUS_)?(ZE553KL|Z01HD)'
       model: 'ZenFone 3 Zoom'
+    - regex: '(?:ASUS_)?ZS550KL'
+      model: 'ZenFone 3 Deluxe'
     - regex: '(?:ASUS_)?Z00UD'
       model: 'ZenFone Selfie'
-    - regex: '(?:ASUS_)?Z01FD'
+    - regex: '(?:ASUS_)?(Z016[DS]|Z01FD)'
       model: 'ZenFone 3 Deluxe'
-    - regex: '(?:ASUS_)?(Z017DA|ZE520KL|ZE552KL|Z017D|Z012D)'
+    - regex: '(?:ASUS_)?(Z017DA|ZE520KL|ZE552KL|Z017D|Z012(D|S))'
       model: 'ZenFone 3'
-    - regex: '(?:ASUS_)?Z01BD'
+    - regex: '(?:ASUS_)?Z01B[DS]|ZC551KL'
       model: 'ZenFone 3 Laser'
-    - regex: '(?:ASUS_)?X00DD|ZC553KL'
+    - regex: '(?:ASUS_)?X00D[DS]|ZC553KL'
       model: 'ZenFone 3 Max'
+    - regex: '(?:ASUS_)?A001'
+      model: 'ZenFone 3 Ultra'
     - regex: '(?:ASUS_)?(X00LDA|Z01MD)'
       model: 'ZenFone 4 Selfie'
-    - regex: '(?:ASUS_)?(?:X00LD|Z01KDA|ZE554KL)'
+    - regex: '(?:ASUS_)?(?:X00LD|Z01KS|Z01KDA|ZE554KL)'
       model: 'ZenFone 4'
-    - regex: '(?:ASUS_)?X00[IH]D'
+    - regex: '(?:ASUS_)?X00(?:[HIK]D|IS)|ZC554KL|ZC520KL'
       model: 'ZenFone 4 Max'
+    - regex: '(?:ASUS_)?X015D'
+      model: 'ZenFone 4 Max Plus'
+    - regex: 'ZD552KL'
+      model: 'ZenFone 4 Selfie Pro'
+    - regex: 'ZD553KL'
+      model: 'ZenFone 4 Selfie'
+    - regex: '(?:ASUS_)?(:?Z01GD|ZS551KL)'
+      model: 'ZenFone 4 Pro'
     - regex: '(?:ASUS_)?ZB602KL'
       model: 'ZenFone Max Pro'
+    - regex: '(?:ASUS_)?Z00XS'
+      model: 'ZenFone Zoom'
+    - regex: '(?:ASUS_)?(?:Z01QD|ZS600KL)'
+      model: 'ROG Phone'
+    - regex: '(?:ASUS_)?(I001D[ABCE]?|ZS660KL)'
+      model: 'ROG Phone 2'
 
     # general detections
     - regex: 'Asus(?:-|;)?([a-z0-9]+)'
@@ -1227,7 +2151,7 @@ Asus:
 
 # Audiovox
 Audiovox:
-  regex: 'Audiovox|CDM|UTS(?:TARCOM)?\-|audio[a-z0-9\-]+'
+  regex: 'Audiovox|CDM|UTS(?:TARCOM)?\-|audio(?!book)[a-z0-9\-]+'
   device: 'smartphone'
   models:
     - regex: 'Audiovox[_\-]([a-z0-9\-]+)'
@@ -1239,15 +2163,27 @@ Audiovox:
     - regex: 'audio([a-z0-9\-]+)'
       model: 'CDM-$1'
 
+# AVH
+AVH:
+  regex: 'Excer[ _]'
+  device: 'tablet'
+  models:
+    - regex: 'Excer[ _]G5.3'
+      model: 'Excer G5.3'
+    - regex: 'Excer[ _]G5'
+      model: 'Excer G5'
+    - regex: 'Excer[ _]10[ _]PRO'
+      model: 'Excer 10 Pro'
+
 # Avvio
 Avvio:
-  regex: 'Avvio[ _]([a-z0-9\-]+)'
+  regex: 'Avvio[ _]?([a-z0-9\-]+)'
   device: 'smartphone'
   models:
     - regex: 'Avvio[ _]PAD'
       model: 'PAD'
       device: 'tablet'
-    - regex: 'Avvio[ _]([a-z0-9\-]+)'
+    - regex: 'Avvio[ _]?([a-z0-9\-]+)'
       model: '$1'
 
 # Azumi Mobile
@@ -1274,42 +2210,130 @@ Avvio:
 
 # BGH
 BGH:
-  regex: '(?<!Positivo )BGH ([^/;]+) Build'
+  regex: '(?!Positivo )BGH ([^/;\)]+)(?: Build|\))'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'Y([17]00|2[01]0|1010)'
+      device: 'tablet'
+      model: 'Y$1'
+    - regex: 'BGH (\+Simple|Mini)'
+      device: 'tablet'
+      model: '$1'
+    - regex: 'Y710 KIDS'
+      device: 'tablet'
+      model: 'Y710 Kids'
+    - regex: 'JOY X2'
+      model: 'Joy X2'
+    - regex: 'BGH ([^/;\)]+)(?: Build|\))'
+      model: '$1'
 
 # Bitel
 Bitel:
-  regex: 'Bitel[ _-]([^/;]+) Build|B8604|B9501'
+  regex: 'Bitel[ _-]([^/;]+) Build|B(840[5789]|841[0456]|850[2346]|860[146]|9401|950[12345])'
   device: 'smartphone'
   models:
-    - regex: 'B8604'
-      model: 'B8604'
-    - regex: 'B9501'
-      model: 'B9501'
+    - regex: '(B(840[5789]|841[0456]|850[2346]|860[146]|9401|950[12345]))'
+      model: '$1'
     - regex: 'Bitel[ _-]([^/;]+) Build'
       model: '$1'
 
 # Blu
 Blu:
-  regex: '(?:blu|Dash)[ _]([^/;]+) Build|STUDIO 5.5|Studio View XL'
+  regex: 'BLU |(?:blu|Dash)[ _]([^/;]+) Build|Studio (5.0K|5.5|View XL|Mega|C 8\+8|C HD|C|G|Selfie LTE|Touch|M HD|M5 Plus|J[1258]|X|X8 HD)|Advance (4.0 ?[LM]|5.0(?: HD)?|A4)|ENERGY (DIAMOND|XL)|LIFE XL|Dash (?:X[2L]|L3)|PURE XL|Life One X2|GRAND 5.5 HD|R1 (HD|PLUS)|Tank Xtreme 5.0|Tank Xtreme Pro|STUDIO SELFIE'
   device: 'smartphone'
   models:
-   - regex: 'Studio View XL'
-     model: 'Studio View XL'
-   - regex: 'STUDIO 5.5'
-     model: 'Studio 5.5'
+   - regex: 'Advance (4.0 ?[LM]|4.0|5.0(?: HD)?|A4)'
+     model: 'Advance $1'
+   - regex: 'Studio (5.0 C|5.5|View XL|Mega|C 8\+8|C HD|C|G|Touch|M HD|M5 Plus|J[1258]|X|X8 HD)'
+     model: 'Studio $1'
+   - regex: 'Studio (5.0)K'
+     model: 'Studio $1 K'
+   - regex: 'STUDIO SELFIE LTE'
+     model: 'Studio Selfie LTE'
+   - regex: 'STUDIO ONE'
+     model: 'Studio One'
+   - regex: 'STUDIO SELFIE ([23]|LTE)'
+     model: 'Studio Selfie $1'
+   - regex: 'STUDIO SELFIE'
+     model: 'Studio Selfie'
+   - regex: 'ENERGY DIAMOND'
+     model: 'Energy Diamond'
+   - regex: 'ENERGY XL'
+     model: 'Energy XL'
+   - regex: 'ENERGY X PLUS 2'
+     model: 'Energy X Plus 2'
+   - regex: 'ENERGY X PLUS'
+     model: 'Energy X Plus'
+   - regex: 'LIFE XL'
+     model: 'Life XL'
+   - regex: 'Dash XL'
+     model: 'Dash XL'
+   - regex: 'PURE XL'
+     model: 'Pure XL'
+   - regex: 'Life One X2'
+     model: 'Life One X2'
+   - regex: 'LIFE ONE'
+     model: 'Life One'
+   - regex: 'NEO X PLUS'
+     model: 'Neo X Plus'
+   - regex: 'NEO (XL|X)'
+     model: 'Neo $1'
+   - regex: 'GRAND 5.5 HD'
+     model: 'Grand 5.5 HD'
+   - regex: 'Grand X LTE'
+     model: 'Grand X LTE'
+   - regex: 'R1 HD'
+     model: 'R1 HD'
+   - regex: 'R1 PLUS'
+     model: 'R1 Plus'
+   - regex: 'Tank Xtreme 5.0'
+     model: 'Tank Xtreme 5.0'
+   - regex: 'Tank Xtreme Pro'
+     model: 'Tank Xtreme Pro'
+   - regex: 'VIVO AIR LTE'
+     model: 'Vivo Air LTE'
    - regex: 'DASH[ _]([^/;]+) Build'
      model: 'Dash $1'
+   - regex: 'DASH (5.0|L3|L|M|X2|X)'
+     model: 'Dash $1'
    - regex: 'blu[ _]([^/;]+) Build'
      model: '$1'
 
-# Blackview
-Blackview:
-  regex: '(BV[2567]000(?:[ _](?:PRO))?|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550)[ _]Build'
+# Bluegood
+Bluegood:
+  regex: 'BLUEGOOD'
   device: 'smartphone'
   models:
-    - regex: '(BV[2567]000(?:[ _](?:PRO))?)[ _]Build'
+    - regex: 'V6'
+      model: 'V6'
+
+# Blackview
+Blackview:
+  regex: 'Blackview|(BV([24-9]000|(5[589]|9[15689])00|6[18]00)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550|BV9700Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))'
+  device: 'smartphone'
+  models:
+    - regex: 'A60Pro\)'
+      model: 'A60 Pro'
+    - regex: 'A60\)'
+      model: 'A60'
+    - regex: 'A80Pro[);/ ]'
+      model: 'A80 Pro'
+    - regex: '(BV6000S)'
+      model: '$1'
+    - regex: '(BV9700)Pro'
+      model: '$1 Pro'
+    - regex: 'Blackview (A8|E7S)'
+      model: '$1'
+    - regex: 'BV9000Pro-F'
+      model: 'BV9000 Pro F'
+    - regex: '(BV([48]000|9[56]00|6800))Pro'
+      model: '$1 Pro'
+    - regex: '(BV6100)[);/ ]'
+      model: '$1'
+      device: 'phablet'
+    - regex: '(BV([24-9]000|(5[589]|9[15689])00)(?:[ _](?:PRO))?)'
+      model: '$1'
+    - regex: '(P10000(?:[ _](?:PRO))?)'
       model: '$1'
     - regex: 'omega[ _]pro'
       model: 'Omega Pro'
@@ -1318,13 +2342,15 @@ Blackview:
 
 # Bluboo
 Bluboo:
-  regex: 'Bluboo|Xfire|Maya Build'
+  regex: 'Bluboo|Xfire|Picasso 4G|Maya Build'
   device: 'smartphone'
   models:
     - regex: 'Maya Build'
       model: 'Maya'
     - regex: 'Xfire2'
       model: 'Xfire 2'
+    - regex: 'Picasso 4G'
+      model: 'Picasso 4G'
     - regex: 'Xfire'
       model: 'Xfire'
     - regex: 'Bluboo[ _-]?([^;/)]+) Build'
@@ -1332,6 +2358,56 @@ Bluboo:
     - regex: 'Bluboo[ _-]?([^;/)]+)'
       model: '$1'
 
+# Black Fox
+'Black Fox':
+  regex: 'BMM[ _-]?((44[123]D|441S|431D|533D|54[12]S|541[ABW]|54[123]D|543S|531[ABD]))[;/) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'BMM443D'
+      model: 'B7 Fox+'
+    - regex: 'BMM441S'
+      model: 'B8 Fox'
+    - regex: 'BMM442D'
+      model: 'B7'
+    - regex: 'BMM531D'
+      model: 'B6'
+    - regex: 'BMM531A'
+      model: 'B5'
+    - regex: 'BMM541A'
+      model: 'B5+'
+    - regex: 'BMM543[DS]'
+      model: 'B4'
+    - regex: 'BMM441D'
+      model: 'B4 Mini'
+    - regex: 'BMM541B'
+      model: 'B4 Mini NFC'
+    - regex: 'BMM531B'
+      model: 'B4 Mini (2019)'
+    - regex: 'BMM542D'
+      model: 'B3+'
+    - regex: 'BMM541D'
+      model: 'B3'
+    - regex: 'BMM541W'
+      model: 'B7R Fox'
+    - regex: 'BMM[ _-]?(533D|431D|54[12]S)[;/) ]'
+      model: 'BMM $1'
+
+# bogo
+bogo:
+  regex: 'BO-(FRSP4|LFSPBS5|LFSP4|LFSPSL4|LFSPBS5|LFSPSL6QCI)'
+  device: 'smartphone'
+  models:
+    - regex: 'BO-LFSP4'
+      model: 'LifeStyle 4DC'
+    - regex: 'BO-LFSPSL4'
+      model: 'LifeStyle 4SL'
+    - regex: 'BO-LFSPBS5'
+      model: 'LifeStyle 5BS'
+    - regex: 'BO-LFSPSL6QCI'
+      model: 'LifeStyle 6QC'
+    - regex: 'BO-(FRSP4)'
+      model: '$1'
+
 # Boway
 Boway:
   regex: '(?:sprd-)?(BOWAY)'
@@ -1346,9 +2422,11 @@ Boway:
 
 # Brondi
 Brondi:
-  regex: '(?:CENTURION|GLADIATOR| GLORY|LUXURY|SENSUELLE|VICTORY)(?:[ _-]?[2-6])?[);/ ]|Surfing Tab'
+  regex: 'Brondi[ _]|(?:CENTURION|GLADIATOR| GLORY|LUXURY|SENSUELLE|VICTORY)(?:[ _-]?[2-6])?[);/ ]|Surfing Tab|501 SZ'
   device: 'smartphone'
   models:
+    - regex: '(?:Brondi[ _])?(620 SZ|730_4G_HD|501 SZ)[);/ ]'
+      model: '$1'
     - regex: 'CENTURION(?:[ _-]?([2-6]))?[);/ ]'
       model: 'CENTURION $1'
     - regex: 'GLADIATOR(?:[ _-]?([2-6]))?[);/ ]'
@@ -1369,13 +2447,187 @@ Brondi:
       model: 'SURFING TAB $1'
       device: 'tablet'
 
-# Vivo
-Vivo:
-  regex: '(?:VIV-|BBG-)?vivo'
+# VGO TEL
+VGO TEL:
+  regex: 'Venture V(?:[278]|12)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: '(?:VIV-|BBG-)?vivo[ _]1601 Build'
+    - regex: 'Venture V([278]|12)[);/ ]'
+      model: 'Venture V$1'
+
+#
+# Vivo
+Vivo:
+  regex: '((?:VIV-|BBG-)?(?<!FBCR/)vivo(?!(?:Browser)))|(?:V1730(D[AT]|GA)|V18(18CA|01A0|13B[AT]|18T|09[AT]|1[346][AT]|[13]8[AT]|14A|24[B]?A|2[19][AT]|3[12][AT]|36[AT])|V1731CA|V1732[AT]|V1818CT|V19[01]1[AT]|V1932[AT]|V191[346][AT]|V192[1348]A|V193[04]A|V194[15]A|V1938CT|V1955A|V1938T|V1730EA|V19[26]2A|V196[35]A|V198[16]A|V1936A[L]?|V19[59]0A|V200[125]A|1819)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'V1824[B]?A[);/ ]'
+      model: 'iQOO'
+    - regex: 'V1955A[);/ ]'
+      model: 'iQOO 3'
+    - regex: 'V1922A[);/ ]'
+      model: 'iQOO Pro' # 2019
+    - regex: 'V1916A[);/ ]'
+      model: 'iQOO Pro 5G'
+    - regex: 'V1914A[);/ ]'
+      model: 'iQOO Neo'
+    - regex: 'V1981A[);/ ]'
+      model: 'iQOO Neo 3'
+    - regex: 'V1936A[L]?[);/ ]'
+      model: 'iQOO Neo 855'
+    - regex: 'V1986A[);/ ]'
+      model: 'iQOO Z1'
+    - regex: 'vivo 1805[);/ ]'
+      model: 'Nex'
+    - regex: 'V1923A[);/ ]'
+      model: 'Nex 3'
+    - regex: 'V1924A[);/ ]'
+      model: 'Nex 3 5G'
+    - regex: 'V1950A[);/ ]'
+      model: 'Nex 3S'
+    - regex: 'V1821[AT][);/ ]'
+      model: 'Nex Dual Display'
+    - regex: 'Vivo ONE[);/ ]'
+      model: 'One'
+    - regex: 'V1831[AT][);/ ]'
+      model: 'S1'
+    - regex: 'V1832[AT][);/ ]'
+      model: 'S1 Pro'
+    - regex: 'V1932[AT][);/ ]'
+      model: 'S5'
+    - regex: 'V1962A[);/ ]'
+      model: 'S6 5G'
+    - regex: 'V1941A[);/ ]'
+      model: 'U3'
+    - regex: 'V1928A[);/ ]'
+      model: 'U3X'
+    - regex: 'vivo 1804[);/ ]'
+      model: 'V11 Pro'
+    - regex: 'vivo 1806[);/ ]'
+      model: 'V11i'
+    - regex: '1819[);/ ]'
+      model: 'V15'
+    - regex: 'vivo 1818[);/ ]'
+      model: 'V15 Pro'
+    - regex: 'vivo 1909[);/ ]'
+      model: 'V17 Pro'
+    - regex: '(?:VIV-|BBG-)?vivo[ _]1601[);/ ]'
       model: 'V5'
+    - regex: 'vivo 1609[);/ ]'
+      model: 'V5 Lite'
+    - regex: 'vivo 1611[);/ ]'
+      model: 'V5 Plus'
+    - regex: 'vivo (1713|1612)[);/ ]'
+      model: 'V5s'
+    - regex: 'vivo 1718[);/ ]'
+      model: 'V7'
+    - regex: 'vivo 1716[);/ ]'
+      model: 'V7 Plus'
+    - regex: 'vivo 1723[);/ ]'
+      model: 'V9'
+    - regex: 'vivo 1727[);/ ]'
+      model: 'V9 Youth'
+    - regex: 'vivo 1721[);/ ]'
+      model: 'X20'
+    - regex: 'X20Plus[);/ ]'
+      model: 'X20 Plus'
+    - regex: 'vivo 1725[);/ ]'
+      model: 'X21'
+    - regex: 'V1814[AT][);/ ]'
+      model: 'X21S'
+    - regex: 'V1809[AT][);/ ]'
+      model: 'X23'
+    - regex: 'V1816[AT][);/ ]'
+      model: 'X23'
+    - regex: 'V18(38|29)[AT][);/ ]'
+      model: 'X27'
+    - regex: 'V1836[AT][);/ ]'
+      model: 'X27 Pro'
+    - regex: 'V1938CT[);/ ]'
+      model: 'X30'
+    - regex: 'V1938T[);/ ]'
+      model: 'X30 Pro'
+    - regex: 'V2001A[);/ ]'
+      model: 'X50'
+    - regex: 'V2005A[);/ ]'
+      model: 'X50 Pro'
+    - regex: 'X9Plus[);/ ]'
+      model: 'X9 Plus'
+    - regex: 'vivo 1902[);/ ]'
+      model: 'Y17'
+    - regex: 'vivo 1915[);/ ]'
+      model: 'Y19'
+    - regex: 'V1901[AT][);/ ]'
+      model: 'Y3'
+    - regex: 'V1930A[);/ ]'
+      model: 'Y3 Standard'
+    - regex: 'V1934A[);/ ]'
+      model: 'Y5s'
+    - regex: 'V1965A[);/ ]'
+      model: 'Y50'
+    - regex: 'vivo 1606[);/ ]'
+      model: 'Y53i'
+    - regex: 'vivo 1603[);/ ]'
+      model: 'Y55l'
+    - regex: 'vivo 1610[);/ ]'
+      model: 'Y55s'
+    - regex: 'vivo 1719[);/ ]'
+      model: 'Y65'
+    - regex: 'vivo 1714[);/ ]'
+      model: 'Y69'
+    - regex: 'V2002A[);/ ]'
+      model: 'Y70s'
+    - regex: 'vivo 1724[);/ ]'
+      model: 'Y71'
+    - regex: 'vivo 1801[);/ ]'
+      model: 'Y71i'
+    - regex: 'V1731CA[);/ ]'
+      model: 'Y73'
+    - regex: 'V1913[AT][);/ ]'
+      model: 'Y7s'
+    - regex: 'vivo 180([38]|8i)[);/ ]'
+      model: 'Y81'
+    - regex: 'vivo 1812[);/ ]'
+      model: 'Y81i'
+    - regex: 'V1732[AT][);/ ]'
+      model: 'Y81s'
+    - regex: 'vivo 1726[);/ ]'
+      model: 'Y83 Pro'
+    - regex: 'V1730EA[);/ ]'
+      model: 'Y89'
+    - regex: 'vivo 181[17][);/ ]'
+      model: 'Y91'
+    - regex: 'V1945A[);/ ]'
+      model: 'Y9s'
+    - regex: 'vivo 18(16|20)[);/ ]'
+      model: 'Y91i'
+    - regex: '(V1818[AT]|vivo 181[45])[);/ ]'
+      model: 'Y93'
+    - regex: 'V1818C[AT][);/ ]'
+      model: 'Y93s'
+    - regex: 'vivo 1807[);/ ]'
+      model: 'Y95'
+    - regex: 'V1813[AT][);/ ]'
+      model: 'Y97'
+    - regex: 'V1801A0[);/ ]'
+      model: 'Z1'
+    - regex: 'V1730D[AT][);/ ]'
+      model: 'Z1i'
+    - regex: 'vivo 1917[);/ ]'
+      model: 'Z1x'
+    - regex: 'V1813B[AT][);/ ]'
+      model: 'Z3'
+    - regex: 'V1730GA[);/ ]'
+      model: 'Z3x'
+    - regex: 'V1921A[);/ ]'
+      model: 'Z5'
+    - regex: 'V1911A[);/ ]'
+      model: 'Z5x'
+    - regex: 'V1990A[);/ ]'
+      model: 'Z5x (2020)'
+    - regex: 'V1963A[);/ ]'
+      model: 'Z6'
+
     - regex: '(?:VIV-|BBG-)?vivo[ _]([^/;]+) Build'
       model: '$1'
     - regex: '(?:VIV-|BBG-)?vivo[ _]([^);/]+)[);/]+'
@@ -1403,6 +2655,35 @@ Becker:
   device: 'feature phone'
   model: '$1'
 
+# Beeline
+Beeline:
+  regex: 'Beeline'
+  device: 'smartphone'
+  models:
+    - regex: 'Beeline[_ ]Pro[_ ]([2436])'
+      model: 'Pro $1'
+    - regex: 'Tab (Fast|Pro)'
+      model: 'Tab $1'
+      device: 'tablet'
+    - regex: 'Tab ([0-9])'
+      model: 'Tab $1'
+      device: 'tablet'
+    - regex: 'Tab'
+      model: 'Tab'
+      device: 'tablet'
+    - regex: 'E700'
+      model: 'E700'
+    - regex: 'Smart2'
+      model: 'Smart 2'
+    - regex: 'Smart ([0-9])'
+      model: 'Smart $1'
+    - regex: 'Smart Dual'
+      model: 'Smart Dual'
+    - regex: '(?:Beeline[_ ])?Fast[_ ]2[);/ ]'
+      model: 'Fast 2'
+    - regex: 'Fast[);/ ]'
+      model: 'Fast'
+
 # Beetel
 Beetel:
   regex: 'Beetel ([a-z0-9]+)'
@@ -1423,11 +2704,13 @@ BenQ:
 
 # Blaupunkt
 Blaupunkt:
-  regex: 'Atlantis[_ ](?:1001A|1010A|A10\.G402)|Discovery[_ ](?:111C|1000C|1001A?)|Endeavour[_ ](?:785|101[GLM]|1000|1001|101[03]|1100)|Polaris[_ ]803'
+  regex: 'Blaupunkt|Atlantis[_ ](?:1001A|1010A|A10\.G40[23])|Discovery[_ ](?:A10_302|111C|1000C|1001A?)|Endeavour[_ ](?:785|101[GLM]|1000|1001|101[03]|1100)|Polaris[_ ]803'
   device: 'tablet'
   models:
     - regex: 'Discovery[_ ]111C'
       model: 'Discovery 111C'
+    - regex: 'Discovery[_ ]A10_302'
+      model: 'Discovery A10.302'
     - regex: 'Discovery[_ ]1000C'
       model: 'Discovery 1000C'
     - regex: 'Discovery[_ ]1001A'
@@ -1438,8 +2721,11 @@ Blaupunkt:
       model: 'Endeavour $1'
     - regex: 'Polaris[_ ](803)'
       model: 'Polaris $1'
-    - regex: 'Atlantis[_ ](1001A|1010A|A10\.G402)'
+    - regex: 'Atlantis[_ ](1001A|1010A|A10\.G40[23])'
       model: 'Atlantis $1'
+    - regex: 'Blaupunkt (SL 0[124]|SM 01)'
+      device: 'smartphone'
+      model: '$1'
 
 # Bmobile
 Bmobile:
@@ -1457,18 +2743,388 @@ Bmobile:
 
 # bq
 bq:
-  regex: 'Aquaris|bq [^/;]+ Build|BQS-4007'
-  device: 'tablet'
+  regex: 'Aquaris|bq [^/;]+ Build|BQS[-_]([0-9]{4})|(BQ(ru)?[_ -][0-9]{3,4})|BQ5059|BQ1008G'
+  device: 'smartphone'
   models:
-    - regex: 'BQS-4007'
-      device: 'smartphone'
+    - regex: 'BQ(?:ru)?-(?:5209L|5044)[);/ ]'
+      model: 'Strike LTE'
+    - regex: 'BQ(?:ru)?-(?:6035L)[);/ ]'
+      model: 'Strike Power Max'
+    - regex: 'BQ(?:ru)?-(5535L)[);/ ]'
+      model: 'Strike Power Plus'
+    - regex: 'BQ(S|ru)?-(5070|6040L)[);/ ]'
+      model: 'Magic'
+    - regex: 'BQ(?:S|ru)?-(?:5730L)[);/ ]'
+      model: 'Magic C'
+    - regex: 'BQ(?:S|ru)?-(?:5731L)[);/ ]'
+      model: 'Magic S'
+    - regex: 'BQ-9011[G]?[);/ ]'
+      model: 'Vision'
+      device: 'tablet'
+    - regex: 'BQ-8068L[);/ ]'
+      model: 'Hornet Plus Pro'
+    - regex: 'BQ-8067L'
+      model: 'Hornet Plus'
+      device: 'tablet'
+    - regex: 'BQ-8052G'
+      model: 'BQ-8052G'
+      device: 'tablet'
+    - regex: 'BQ-8041L'
+      model: 'Art'
+      device: 'tablet'
+    - regex: 'BQ-7084G'
+      model: 'Simple'
+      device: 'tablet'
+    - regex: 'BQ-7061G'
+      model: 'Andros'
+      device: 'tablet'
+    - regex: 'BQ(ru)?-(7082)'
+      model: 'Armor'
+      device: 'tablet'
+    - regex: 'BQ-7051G'
+      model: 'Elba'
+      device: 'tablet'
+    - regex: 'BQ-7036L'
+      model: 'Hornet'
+      device: 'tablet'
+    - regex: 'BQ-7022(G)?'
+      model: 'Canion'
+      device: 'tablet'
+    - regex: 'BQ-7021G'
+      model: 'Hit'
+      device: 'tablet'
+    - regex: 'BQ-7010G'
+      model: 'Max'
+      device: 'tablet'
+    - regex: 'BQ-7006G'
+      model: 'Union'
+      device: 'tablet'
+    - regex: 'BQ-7003'
+      model: 'Jamaica'
+      device: 'tablet'
+    - regex: 'BQ-6200L|BQ-6000L'
+      model: 'Aurora'
+    - regex: 'BQ(ru)?[ -]6015L'
+      model: 'Universe'
+    - regex: 'BQ-6010G|BQ(?:ru)?-5525'
+      model: 'Practic'
+    - regex: 'BQ-6001L|BQ-6050'
+      model: 'Jumbo'
+    - regex: 'BQ-5707G[);/ ]'
+      model: 'Next Music'
+    - regex: 'BQ-5702[);/ ]'
+      model: 'Spring'
+    - regex: 'BQ-5700L[);/ ]'
+      model: 'Space X'
+    - regex: 'BQ-(?:5591|5518G)[);/ ]'
+      model: 'Jeans'
+    - regex: 'BQ-5522'
+      model: 'Next'
+    - regex: 'BQ-5520L[);/ ]'
+      model: 'Silk'
+    - regex: 'BQ-5519L[);/ ]'
+      model: 'Fast Plus'
+    - regex: 'BQ-5517L[);/ ]'
+      model: 'Twin Pro'
+    - regex: 'BQ-5516L[);/ ]'
+      model: 'Twin'
+    - regex: 'BQS-5515[);/ ]'
+      model: 'Wide'
+    - regex: 'BQ-5515[L]?[);/ ]'
+      model: 'Fast'
+    - regex: 'BQ-(?:5512L|5528L)[);/ ]'
+      model: 'Strike Forward'
+    - regex: 'BQ-5511L[);/ ]'
+      model: 'Bliss'
+    - regex: 'BQS[_ ]5505[);/ ]'
+      model: 'Amsterdam'
+    - regex: 'BQ(?:ru)?-5510[);/ ]'
+      model: 'Strike Power Max 4G'
+    - regex: 'BQ(?:ru)?-(?:5521|5594)[);/ ]'
+      model: 'Strike Power Max'
+    - regex: 'BQ-5508L[);/ ]'
+      model: 'Next LTE'
+    - regex: 'BQ-5507L[);/ ]'
+      model: 'Iron Max'
+    - regex: 'BQ(?:ru)?-5504[);/ ]'
+      model: 'Strike Selfie Max'
+    - regex: 'BQ(?:ru)?-5503[);/ ]'
+      model: 'Nice 2'
+    - regex: 'BQS-5502[);/ ]'
+      model: 'Hammer'
+    - regex: 'BQS-5501[);/ ]'
+      model: 'Kawasaki'
+    - regex: 'BQS-5500[);/ ]'
+      model: 'Vancouver'
+    - regex: 'BQ-5500L[);/ ]'
+      model: 'Advance'
+    - regex: 'BQ-5302G[);/ ]'
+      model: 'Velvet 2'
+    - regex: 'BQ-5301[);/ ]'
+      model: 'Strike View'
+    - regex: 'BQ-5300G[);/ ]'
+      model: 'Velvet View'
+    - regex: 'BQ(ru|S)?-(?:5211|5020)[);/ ]'
+      model: 'Strike'
+    - regex: 'BQ-5206L[);/ ]'
+      model: 'Balance'
+    - regex: 'BQ(?:ru|S)?-(?:5204|5050)[);/ ]'
+      model: 'Strike Selfie'
+    - regex: 'BQ(?:ru)?-5203[);/ ]'
+      model: 'Vision'
+    - regex: 'BQ(?:ru)?-5202[);/ ]'
+      model: 'Space Lite'
+    - regex: 'BQ(?:ru)?-5201[);/ ]'
+      model: 'Space'
+    - regex: 'BQ-5082[);/ ]'
+      model: 'Sense 2'
+    - regex: 'BQ-5071[);/ ]'
+      model: 'Belief'
+    - regex: 'BQ[S]?-(?:5065|5340)[);/ ]'
+      model: 'Choice'
+    - regex: 'BQ(?:ru)?-?(?:5059|5514G)[);/ ]'
+      model: 'Strike Power'
+    - regex: 'BQ-5058[);/ ]'
+      model: 'Strike Power Easy'
+    - regex: 'BQ(?:ru)?-5057[);/ ]'
+      model: 'Strike 2'
+    - regex: 'BQ[S]?-(?:5056|5030)[);/ ]'
+      model: 'Fresh'
+    - regex: 'BQ-6042l[);/ ]'
+      model: 'Magic E'
+    - regex: 'BQS-5055[);/ ]'
+      model: 'Turbo Plus'
+    - regex: 'BQ(?:ru)?-5054[);/ ]'
+      model: 'Crystal'
+    - regex: 'BQ-5052[);/ ]'
+      model: 'Sense'
+    - regex: 'BQ[S]?-5045[);/ ]'
+      model: 'Fast'
+    - regex: 'BQ(?:ru)?-(?:5037|5514L)[);/ ]'
+      model: 'Strike Power 4G'
+    - regex: 'BQ(?:ru)?-5035[);/ ]'
+      model: 'Velvet'
+    - regex: 'BQ(?:ru)?-5033[);/ ]'
+      model: 'Shark'
+    - regex: 'BQ-5541L[);/ ]'
+      model: 'Shark Rush'
+    - regex: 'BQ-5032[);/ ]'
+      model: 'Element'
+    - regex: 'BQS-5025[);/ ]'
+      model: 'High Way'
+    - regex: 'BQ(?:ru)?-5022[);/ ]'
+      model: 'Bond'
+    - regex: 'BQ-5015L[);/ ]'
+      model: 'First'
+    - regex: 'BQ-5012L[);/ ]'
+      model: 'Rich'
+    - regex: 'BQS-5011[);/ ]'
+      model: 'Monte Carlo'
+    - regex: 'BQ-5010G[);/ ]'
+      model: 'Spot'
+    - regex: 'BQS-5010[);/ ]'
+      model: 'Prague'
+    - regex: 'BQ-5009L[);/ ]'
+      model: 'Trend'
+    - regex: 'BQS-500[59][);/ ]'
+      model: 'Sydney'
+    - regex: 'BQ-5008L[);/ ]'
+      model: 'Brave'
+    - regex: 'BQ-5007L[);/ ]'
+      model: 'Iron'
+    - regex: 'BQS-5006[);/ ]'
+      model: 'Los Angeles'
+    - regex: 'BQ-(?:5005L|5530L)[);/ ]'
+      model: 'Intense'
+    - regex: 'BQS-5004[);/ ]'
+      model: 'Paris'
+    - regex: 'BQ-5003L[);/ ]'
+      model: 'Shark Pro'
+    - regex: 'BQ-5002G[);/ ]'
+      model: 'Fun'
+    - regex: 'BQS-5002[);/ ]'
+      model: 'Colombo'
+    - regex: 'BQS-5003[);/ ]'
+      model: 'Colombo II'
+    - regex: 'BQ-5001L[);/ ]'
+      model: 'Contact'
+    - regex: 'BQS-5001[);/ ]'
+      model: 'Milan'
+    - regex: 'BQ(?:ru|S)?-5000[);/ ]'
+      model: 'Tokyo'
+    - regex: 'BQS-4800[);/ ]'
+      model: 'Blade'
+    - regex: 'BQS-4707[);/ ]'
+      model: 'Montreal'
+    - regex: 'BQS-4702[);/ ]'
+      model: 'Оsaka'
+    - regex: 'BQS-4701[);/ ]'
+      model: 'Venice'
+    - regex: 'BQ-(?:4585|5011G)[);/ ]'
+      model: 'Fox View'
+    - regex: 'BQ(?:ru)?-4583[);/ ]'
+      model: 'Fox Power'
+    - regex: 'BQS-4570[);/ ]'
+      model: 'Drive'
+    - regex: 'BQS-4560[);/ ]'
+      model: 'Golf'
+    - regex: 'BQS-4555[);/ ]'
+      model: 'Turbo'
+    - regex: 'BQS-4550[);/ ]'
+      model: 'Richmond'
+    - regex: 'BQ(?:ru)?-(?:4526|5004G)[);/ ]'
+      model: 'Fox'
+    - regex: 'BQS-4525[);/ ]'
+      model: 'Vienna'
+    - regex: 'BQS-4516[);/ ]'
+      model: 'Singapore'
+    - regex: 'BQS-4515[);/ ]'
+      model: 'Moscow'
+    - regex: 'BQS-4510[);/ ]'
+      model: 'Florence'
+    - regex: 'BQS-4505[);/ ]'
+      model: 'Santiago'
+    - regex: 'BQS-4503[);/ ]'
+      model: 'Dubai'
+    - regex: 'BQS-4502[);/ ]'
+      model: 'Kingston'
+    - regex: 'BQS-4501 Bristol'
+      model: 'Bristol'
+    - regex: 'BQ-4501G[);/ ]'
+      model: 'Fox Easy'
+    - regex: 'BQ(?:ru)?-4500[);/ ]'
+      model: 'Fox LTE'
+    - regex: 'BQ-4077[);/ ]'
+      model: 'Shark Mini'
+    - regex: 'BQ(?:ru)?-4072[);/ ]'
+      model: 'Strike Mini'
+    - regex: 'BQ(?:ru)?[- ]402[68][);/ ]'
+      model: 'Up!'
+    - regex: 'BQS-4010[);/ ]'
+      model: 'Aspen'
+    - regex: 'BQS-4009[);/ ]'
+      model: 'Orleans'
+    - regex: 'BQS-4008[);/ ]'
+      model: 'Shanghai'
+    - regex: 'BQS-4007[);/ ]'
       model: 'Valencia'
-
+    - regex: 'BQS-4005[);/ ]'
+      model: 'Seoul'
+    - regex: 'BQS-4004[);/ ]'
+      model: 'Dusseldorf'
+    - regex: 'BQS-4003[);/ ]'
+      model: 'Verona'
+    - regex: 'BQ-4001G[);/ ]'
+      model: 'Cool'
+    - regex: 'BQS-4001[);/ ]'
+      model: 'Oxford'
+    - regex: 'BQS-3510[);/ ]'
+      model: 'Aspen Mini'
+    - regex: 'BQS-3503[);/ ]'
+      model: 'Bombay'
+    - regex: 'BQ-1085L[);/ ]'
+      model: 'Hornet Max Pro'
+      device: 'tablet'
+    - regex: 'BQ-1084L[);/ ]'
+      model: 'Hornet Max'
+      device: 'tablet'
+    - regex: 'BQ-1083G[);/ ]'
+      model: 'Armor Pro Plus'
+      device: 'tablet'
+    - regex: 'BQ-1082G[);/ ]'
+      model: 'Armor Pro'
+      device: 'tablet'
+    - regex: 'BQ-1077L[);/ ]'
+      model: 'Armor Pro LTE'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?-1057L[);/ ]'
+      model: 'Passion'
+      device: 'tablet'
+    - regex: 'BQ-1051G[);/ ]'
+      model: 'Corsika'
+      device: 'tablet'
+    - regex: 'BQ-1050G[);/ ]'
+      model: 'Hawaii'
+      device: 'tablet'
+    - regex: 'BQ[-]?1008G[);/ ]'
+      model: 'Grace'
+      device: 'tablet'
+    - regex: 'Aquaris M8'
+      model: 'Aquaris M8'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?[_ ]5590[);/ ]'
+      model: 'Spring'
+    - regex: 'BQ[S]?-(?:6016L|5520)[);/ ]'
+      model: 'Mercury'
+    - regex: 'BQ(?:S|ru)?-(?:5701L|5060)[);/ ]'
+      model: 'Slim'
+    - regex: '(BQ-7850|BQ-700[12]G|BQ-8002G|BQ-905[12]G|BQ-9702G|BQ-7056G)'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'BQ-8006G[);/ ]'
+      model: 'Java'
+      device: 'tablet'
+    - regex: 'BQ-7062G[);/ ]'
+      model: 'Fiji'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?-1081G[);/ ]'
+      model: 'Grace 3G'
+      device: 'tablet'
+    - regex: 'BQ-7802G[);/ ]'
+      model: 'Luzon'
+      device: 'tablet'
+    - regex: 'BQ-7008G[);/ ]'
+      model: 'Clarion'
+      device: 'tablet'
+    - regex: 'BQ-7064G[);/ ]'
+      model: 'Fusion'
+      device: 'tablet'
+    - regex: 'BQ-7050G[);/ ]'
+      model: 'Malta'
+      device: 'tablet'
+    - regex: 'BQ-7000G[);/ ]'
+      model: 'Сharm'
+      device: 'tablet'
+    - regex: 'BQ-7040G[);/ ]'
+      model: 'Сharm Plus'
+      device: 'tablet'
+    - regex: 'BQ-7038G[);/ ]'
+      model: 'Light Plus'
+      device: 'tablet'
+    - regex: 'BQ-7005G[);/ ]'
+      model: 'Maui'
+      device: 'tablet'
+    - regex: 'BQ-7098G[);/ ]'
+      model: 'Armor Power'
+      device: 'tablet'
+    - regex: 'BQ-1007[);/ ]'
+      model: 'Necker'
+      device: 'tablet'
+    - regex: 'BQ-1045[G]?[);/ ]'
+      model: 'Orion'
+      device: 'tablet'
+    - regex: 'BQ-1054L[);/ ]'
+      model: 'Nexion'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?-7083[);/ ]'
+      model: '7083'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?-1056L[);/ ]'
+      model: '1056L'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?-1022l[);/ ]'
+      model: 'Armor Pro LTE+'
+      device: 'tablet'
+    - regex: 'BQ(?:ru)?-7081[);/ ]'
+      model: 'Charm'
+      device: 'tablet'
     - regex: '(?:bq )?(Aquaris[^/;]*) Build'
       model: '$1'
-      device: 'smartphone'
+    - regex: 'Aquaris (E(4.5|[56])|M(5|10)|U2 Lite|U2|U (Lite|Plus)|V Plus|X5 Plus|X5|X Pro|[CMUVX])'
+      model: 'Aquaris $1'
     - regex: 'bq ([^/;]+) Build'
       model: '$1'
+      device: 'tablet'
 
 # Bush
 Bush:
@@ -1481,6 +3137,16 @@ Bush:
     - regex: 'BUSH ([^;/]+) Build'
       model: '$1'
 
+# CAGI
+CAGI:
+  regex: 'CAGI-'
+  device: 'smartphone'
+  models:
+    - regex: 'CAGI-OMEGA'
+      model: 'Omega'
+    - regex: 'CAGI-([a-z0-9_\-]+)'
+      model: '$1'
+
 # Capitel
 Capitel:
   regex: 'Capitel-([a-z0-9]+)'
@@ -1489,7 +3155,7 @@ Capitel:
 
 # Captiva
 Captiva:
-  regex: 'Captiva[ _-]([^;/]+) Build'
+  regex: 'Captiva[ _-]([^;/)]+)(?: Build|\))'
   device: 'tablet'
   model: 'Pad $1'
 
@@ -1505,14 +3171,38 @@ Casio:
     - regex: 'C811 4G[);/ ]'
       model: "G'zOne Commando 4G LTE"
 
-# Cat
+# Casper
+Casper:
+  regex: 'CASPER[_ ]|VIA[- _](T7D|A[34]|E3|F[123]|G4|M4|[LS]8|S7|P2|V8C|A1_Plus|A1|S10|S|T17_M|T1[07]|T7|T7-3G|T8B|T8D-3G)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'CASPER[_ ]VIA_(G1_Plus|G1|E1|[AE]2|M[123]|V[35689]|V10|G3)[);/ ]'
+      model: 'VIA $1'
+    - regex: 'CASPER_VIA_E1c'
+      model: 'VIA E1C'
+    - regex: 'CASPER_L10_4.5G'
+      model: 'L10 4.5G'
+      device: 'tablet'
+    - regex: 'VIA[- _](T7|T8D)-3G'
+      model: 'VIA $1 3G'
+      device: 'tablet'
+    - regex: 'VIA[- _](T7D|S10|[LS]8|S7|T17_M|T1[07]|T7|T8B)[);/ ]'
+      model: 'VIA $1'
+      device: 'tablet'
+    - regex: 'VIA[_ ](A[34]|E3|F[123]|G4|M4|P2|S|V8C|A1_Plus|A1)'
+      model: 'VIA $1'
+
+# Cat (Caterpillar, Catphones)
 Cat:
-  regex: 'Cat ?(tablet|stargate|nova)|B15Q'
+  regex: 'Cat ?(tablet|stargate|nova)|B15Q|CAT B35'
   device: 'tablet'
   models:
     - regex: 'B15Q'
       model: 'B15Q'
       device: 'smartphone'
+    - regex: 'CAT B35'
+      model: 'B35'
+      device: 'smartphone'
     - regex: 'Cat ?(?:tablet)? ?((?:Galactica|Nova|StarGate|PHOENIX)[^/;]*) Build'
       model: '$1'
     - regex: 'Cat ?tablet'
@@ -1556,13 +3246,47 @@ Changhong:
 
 # Cherry Mobile
 'Cherry Mobile':
-  regex: 'Cherry|Flare2X|Fusion Bolt'
+  regex: 'Cherry|Flare([ _])?(2X|4|A[123]|J[1235]|P[13]|S[4568]|X2)|Flare[ _](?:S Play|HD_MAX|LITE|XL Plus|X_V2)|Fusion Bolt|OMEGA HD 4'
   device: 'smartphone'
   models:
     - regex: 'Cherry(?: ?Mobile)?[ _]?([^/;]+) Build'
       model: '$1'
     - regex: '(Flare2X)'
       model: '$1'
+    - regex: 'Flare_HD_MAX'
+      model: 'Flare HD Max'
+    - regex: 'FLARE LITE'
+      model: 'Flare Lite'
+    - regex: 'Flare S Play'
+      model: 'Flare S Play'
+    - regex: 'Flare XL Plus'
+      model: 'Flare XL Plus'
+    - regex: 'Flare[ _]X[_ ]V2'
+      model: 'Flare X V2'
+    - regex: 'Flare[ _](A2|J3|P1|S[46])[ _]Lite'
+      model: 'Flare $1 Lite'
+    - regex: 'Flare[ _](J[12]|S5)[ _]mini'
+      model: 'Flare $1 Mini'
+    - regex: 'Flare J2S'
+      model: 'Flare J2s'
+    - regex: 'Flare S4 Max LTE'
+      model: 'Flare S4 Max LTE'
+    - regex: 'Flare S4 Max'
+      model: 'Flare S4 Max'
+    - regex: 'FlareS5LiteDTV '
+      model: 'Flare S5 Lite DTV'
+    - regex: 'Flare_S6_Plus'
+      model: 'Flare S6 Plus'
+    - regex: 'FLARE S6 POWER'
+      model: 'Flare S6 Power'
+    - regex: 'Flare S6'
+      model: 'Flare S6'
+    - regex: 'Flare S8'
+      model: 'Flare S8'
+    - regex: 'Flare(?:[ _])?(4|A[13]|J[135]|P[13]|S4|X2)'
+      model: 'Flare $1'
+    - regex: 'OMEGA HD 4'
+      model: 'Omega HD 4'
     - regex: '(Fusion Bolt)'
       model: '$1'
       device: 'tablet'
@@ -1681,12 +3405,21 @@ ConCorde:
 
 # Condor
 Condor:
-  regex: '(?:PGN\-?[456][012][0-9]|PHS\-601|Plume L1)[;/) ]|CTAB[^/;]+ Build'
+  regex: 'Allure M[13]|Griffe T[256789]|TFX712G|TRA-901G|TGW[-]?(710G|709)|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PHQ52[056]|PKT\-301|Plume (?:H1|L[123]|P8))[;/) ]|CTAB[^/;]+ Build'
   device: 'smartphone'
   models:
     - regex: 'CTAB([^/;]+) Build'
       device: 'tablet'
       model: 'CTAB $1'
+    - regex: '(TGW)-?(710G|709)[);/ ]'
+      device: 'tablet'
+      model: '$1 $2'
+    - regex: '(TFX712G)[);/ ]'
+      device: 'tablet'
+      model: '$1'
+    - regex: '(TRA)-(901G)[);/ ]'
+      device: 'tablet'
+      model: '$1 $2'
 
     - regex: 'PHS\-601'
       model: 'C8'
@@ -1696,12 +3429,16 @@ Condor:
       model: 'C7 Mini'
     - regex: 'PGN\-?409'
       model: 'Plume P4'
+    - regex: 'PKT\-?301'
+      model: 'C2'
     - regex: 'PGN\-?504'
       model: 'C5'
     - regex: 'PGN\-?505'
       model: 'C8S'
     - regex: 'PGN\-?506'
       model: 'C7'
+    - regex: '(Allure M[13])'
+      model: '$1'
     - regex: 'PGN\-?507'
       model: 'Allure A9'
     - regex: 'PGN\-?508'
@@ -1712,6 +3449,14 @@ Condor:
       model: 'Allure A9 Plus'
     - regex: 'PGN\-?513'
       model: 'Griffe G4'
+    - regex: 'PHQ519'
+      model: 'Griffe G4S'
+    - regex: 'PHQ520'
+      model: 'Griffe G5'
+    - regex: 'PHQ525'
+      model: 'Griffe G6'
+    - regex: 'PHQ526'
+      model: 'Griffe G6 Pro'
     - regex: 'PGN\-?514'
       model: 'Plume P7'
     - regex: 'PGN\-?515'
@@ -1722,6 +3467,18 @@ Condor:
       model: 'Plume P6'
     - regex: 'PGN\-?521'
       model: 'Griffe G4 Plus'
+    - regex: 'Griffe T2'
+      model: 'Griffe T2'
+    - regex: 'Griffe T5'
+      model: 'Griffe T5'
+    - regex: 'Griffe T6'
+      model: 'Griffe T6'
+    - regex: 'Griffe T7'
+      model: 'Griffe T7'
+    - regex: 'Griffe T8 Plus'
+      model: 'Griffe T8 Plus'
+    - regex: 'Griffe T9'
+      model: 'Griffe T9'
     - regex: 'PGN\-?522'
       model: 'P6 Plus'
     - regex: 'PGN\-?523'
@@ -1748,38 +3505,65 @@ Condor:
       model: 'Allure A8 Plus'
     - regex: 'PGN\-?613'
       model: 'Allure A55 Plus'
-
+    - regex: 'Plume H1'
+      model: 'Plume H1'
     - regex: 'Plume L1'
       model: 'Plume L1'
+    - regex: 'Plume L2 Pro'
+      model: 'Plume L2 Pro'
+    - regex: 'Plume L3 Plus'
+      model: 'Plume L3 Plus'
+    - regex: 'Plume P8 Pro'
+      model: 'Plume P8 Pro'
 
     - regex: 'PGN\-?([0-9]{3})'
       model: 'PGN-$1'
 
 # Coolpad
 Coolpad:
-  regex: '(?:YL-)?Coolpad|8190Q[ ;/\)]|(8295|5860S) Build|CP8676_I0[23] Build|CP8298_I00 Build|REVVLPLUS C3701A|VCR-I0'
+  regex: '(?:YL-)?Coolpad|(?:8190Q|8676-A01|CP8298_I00|CP3648A|CP8676_I0[23]|REVVLPLUS C3701A|VCR-[AI]0|C106-7|MTS-T0|cp3705A[S]?|ORL-C0)[);/ ]|(8295|5860S) Build'
   device: 'smartphone'
   models:
-    - regex: 'VCR-I0'
+    - regex: 'VCR-[AI]0'
       model: 'Cool Play 6'
     - regex: 'REVVLPLUS C3701A'
       model: 'REVVL Plus'
       device: 'phablet'
-    - regex: '8190Q[ ;/\)]'
+    - regex: '8190Q[);/ ]'
       model: '8190Q'
+    - regex: 'CP3705A[S]?[);/ ]'
+      model: 'Legacy'
+    - regex: 'CP3648A[);/ ]'
+      model: 'Legacy S'
+    - regex: 'MTS-T0[);/ ]'
+      model: 'N2M'
+    - regex: 'C106-7[);/ ]'
+      model: 'Cool 1'
+    - regex: 'ORL-C0[);/ ]'
+      model: 'Cool 9'
     - regex: '(5860S|8295) Build'
       model: '$1'
-    - regex: 'CP8676_I02 Build'
+    - regex: 'CP8676_I02[);/ ]'
       model: 'Note 3'
-    - regex: 'CP8676_I03 Build'
+    - regex: 'CP8676_I03[);/ ]'
       model: 'Note 3 Plus'
-    - regex: 'CP8298_I00 Build'
+    - regex: 'CP8298_I00[);/ ]'
       model: 'Note 3 Lite'
+    - regex: '(8676-A01)[);/ ]'
+      model: '$1'
     - regex: '(?:YL-)?Coolpad[ _\-]?([^/;]+) Build'
       model: '$1'
     - regex: '(?:YL-)?Coolpad[ _\-]?([a-z0-9\-]+)'
       model: '$1'
 
+# Clarmin
+Clarmin:
+  regex: 'Clarmin'
+  device: 'smartphone'
+  models:
+    - regex: 'Clarmin_B6'
+      model: 'B6'
+
 # Cricket
 Cricket:
   regex: 'Cricket-([a-z0-9]+)'
@@ -1794,25 +3578,31 @@ Cricket:
 
 # Crosscall
 Crosscall:
-  regex: 'Crosscall|ODYSSEY_Plus|Odyssey S1|Trekker-[MSX][123]'
+  regex: 'Crosscall|ODYSSEY_Plus|Odyssey S1|Trekker-[MSX][1234]|Action-X3|Core-X3'
   device: 'smartphone'
   models:
+    - regex: 'Action-X3'
+      model: 'Action-X3'
+    - regex: 'Core-X3'
+      model: 'Core-X3'
     - regex: 'Crosscall ([^;/]+) Build'
       model: '$1'
     - regex: 'ODYSSEY_Plus'
       model: 'ODYSSEY+'
     - regex: 'Odyssey S1'
       model: 'ODYSSEY S1'
-    - regex: 'Trekker-([MSX][123](?: Core)?)'
+    - regex: 'Trekker-([MSX][1234](?: Core)?)'
       model: 'Trekker-$1'
 
 # Cube
 Cube:
-  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)'
+  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)|(?:T8-PLUSM?S?|T8PLUSML)[);/ ]'
   device: 'tablet'
   models:
     - regex: 'U27GT'
       model: 'Talk 8'
+    - regex: '(?:T8-PLUSM?S?|T8PLUSML)[);/ ]'
+      model: 'T8 Ultimate'
     - regex: 'U55GT'
       model: 'Talk 79'
     - regex: 'U65GT'
@@ -1827,14 +3617,93 @@ Cube:
 
 # CUBOT
 CUBOT:
-  regex: 'CUBOT'
+  regex: 'CUBOT|RAINBOW 2|KING_KONG_3|KINGKONG_MINI'
   device: 'smartphone'
   models:
+    - regex: 'CHEETAH 2'
+      model: 'Cheetah 2'
+    - regex: 'RAINBOW 2'
+      model: 'Rainbow 2'
+    - regex: 'RAINBOW'
+      model: 'Rainbow'
+    - regex: 'DINOSAUR'
+      model: 'Dinosaur'
+    - regex: 'KINGKONG_MINI'
+      model: 'King Kong Mini'
+    - regex: 'KING_KONG_3'
+      model: 'King Kong 3'
+    - regex: 'KING KONG'
+      model: 'King Kong'
+    - regex: 'CUBOT[ _]Echo'
+      model: 'Echo'
+    - regex: 'CUBOT[ _]MANITO'
+      model: 'Manito'
+    - regex: 'CUBOT[ _]MAGIC'
+      model: 'Magic'
+    - regex: 'CUBOT[ _]MAX'
+      model: 'Max'
+    - regex: 'NOTE Plus'
+      model: 'Note Plus'
+    - regex: 'CUBOT[_ ]NOTE[_ ]S'
+      model: 'Note S'
+    - regex: 'CUBOT_NOVA'
+      model: 'Nova'
+    - regex: 'CUBOT_POWER'
+      model: 'Power'
+    - regex: 'CUBOT_X18_Plus'
+      model: 'X18 Plus'
+    - regex: 'CUBOT[ _](A5|C6W|H3|J3|P7|P20|[RX]9|R11|X18)[);/ ]'
+      model: '$1'
     - regex: 'CUBOT ([^;/]+) Build'
       model: '$1'
     - regex: '([^;/]+) Build/CUBOT'
       model: '$1'
 
+# Clout
+Clout:
+  regex: 'Hind[ _]5\.1|X417[ _]Amaze|X418[ _]Zest|X421[ _]Nova|X422[ ]Exotic|X425[ _]Shavit|X428[ _]Astute'
+  device: 'smartphone'
+  models:
+    - regex: 'Hind[ _]5\.1'
+      model: 'Hind 5.1'
+    - regex: 'X417[ _]Amaze'
+      model: 'X417 Amaze'
+    - regex: 'X418[ _]Zest'
+      model: 'X418 Zest'
+    - regex: 'X421[ _]Nova'
+      model: 'X421 Nova'
+    - regex: 'X422[ _]Exotic'
+      model: 'X422 Exotic'
+    - regex: 'X425[ _]Shavit'
+      model: 'X425 Shavit'
+    - regex: 'X428[ _]Astute'
+      model: 'X428 Astute'
+
+# Concord
+Concord:
+  regex: 'Concord[ _-]|Flyfix 6|C-721[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'M10'
+      model: 'M10'
+    - regex: 'Flyfix 6'
+      model: 'Flyfix 6'
+    - regex: 'C-721'
+      model: 'Flyfix Q'
+      device: 'tablet'
+
+# Crescent
+Crescent:
+  regex: 'WING 5|WING9|Venus[ _][14]'
+  device: 'smartphone'
+  models:
+    - regex: 'WING 5'
+      model: 'Wing 5'
+    - regex: 'WING9'
+      model: 'Wing 9'
+    - regex: 'Venus[ _]([14])'
+      model: 'Venus $1'
+
 # Cyrus
 Cyrus:
   regex: 'Cyrus[ _-]'
@@ -1855,17 +3724,36 @@ Datang:
     - regex: '(?:DATANG[ _-])+([^;/)]+)[;/)]'
       model: '$1'
 
+# Datsun
+Datsun:
+  regex: 'DATSUN'
+  device: 'smartphone'
+  models:
+    - regex: 'DATSUN_D5500'
+      model: 'D5500'
+    - regex: 'Datsun_D5001'
+      model: 'D5001'
+
 # Danew
 Danew:
-  regex: 'Dslide ?([^;/]+) Build'
-  device: 'tablet'
-  model: 'DSlide $1'
+  regex: 'Dslide ?([^;/]+) Build|Konnect_?(402|504|60[127])'
+  device: 'smartphone'
+  models:
+    - regex: 'Konnect_?(402|504|60[127])'
+      model: 'Konnect $1'
+    - regex: 'Dslide ?([^;/]+) Build'
+      device: 'tablet'
+      model: 'DSlide $1'
 
 # Denver Electronics
 Denver:
-  regex: '(TA[CDQ]-[0-9]+)'
+  regex: '(?:TA[CDQ]-[0-9]+)|P(?:.+)TAQ-(?:[0-9]+)'
   device: 'tablet'
-  model: '$1'
+  models:
+    - regex: 'P(?:.+)TAQ-(10172MK3|10242MK2|70242MK2|[0-9]+)[);/ ]'
+      model: 'TAQ-$1'
+    - regex: '(TA[CDQ]-[0-9]+)'
+      model: '$1'
 
 # Dell
 Dell:
@@ -1874,6 +3762,13 @@ Dell:
   models:
     - regex: 'XCD35'
       model: 'XCD35'
+    - regex: 'Venue (8 7840|10 7040)'
+      model: 'Venue $1'
+      device: 'tablet'
+    - regex: '(?:Dell )?Venue Build'
+      model: 'Venue'
+    - regex: 'Dell; Venue Pro'
+      model: 'Venue Pro'
     - regex: '(?:Dell )?(Streak|Venue) ?([^/;]*) Build'
       model: '$1 $2'
       device: 'tablet'
@@ -1897,26 +3792,44 @@ Desay:
 
 # DEXP
 DEXP:
-  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/]+) Build|H135[ _]Build'
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|(SENIOR|F4[38]D8000K|VA[12]10|ML450|MS[56]50|BL[12]50|BS155|BS160|BS[1256]50|AL[12]40|AS260| (?:B450|B340))[);/ ]'
   device: 'smartphone'
   models:
 
-    - regex: 'Ixion[_ ]([^;/]+) Build'
+    - regex: 'Ixion[_ ]([^;/]+)(?: Build|\))'
       model: 'Ixion $1'
+    - regex: '(ML450|MS[56]50)[);/ ]'
+      model: 'Ixion $1'
+    - regex: 'AS260[);/ ]'
+      model: '5.85" AS260'
+      device: 'phablet'
 
-    - regex: 'Ursus ([^;/]+) Build'
+    - regex: 'Ursus ([^;/)]+)(?: Build|\))'
       model: 'Ursus $1'
       device: 'tablet'
+    - regex: '(VA[21]10)[);/ ]'
+      model: 'Ursus $1'
+      device: 'tablet'
+
+    - regex: ' (B450|B340)[);/ ]'
+      model: '$1'
+    - regex: 'SENIOR[);/ ]'
+      model: 'Senior'
 
     - regex: 'H135[ _]Build'
       model: 'Atlas'
       device: 'desktop'
-
+    - regex: '(BL[12]50|BS155|BS160|BS[1256]50|AL[12]40)[);/ ]'
+      model: '$1'
     - regex: 'DEXP[ _]([^;/]+) Build'
       model: '$1'
     - regex: 'DEXP[ _]([^);/]+)[);/ ]'
       model: '$1'
 
+    - regex: '(F4[38]D8000K)[);/ ]'
+      device: 'tv'
+      model: '$1'
+
 # Dbtel
 Dbtel:
   regex: 'DBTEL(?:[\-/])?([a-z0-9]+)'
@@ -1935,38 +3848,90 @@ Dicam:
   device: 'feature phone'
   model: '$1'
 
-# Digma
-Digma:
-  regex: 'Digma[_ ]([^;/]+) Build|HIT HT707[10]MG|CITI 1902 3G|(CITI (?:[A-Z0-9]+) 3G) C[ST]500[67]PG|iDrQ10 3G|iDxD8 3G|iDnD7|HIT 4G HT7074ML|IDX5|(iDx10|iDx7)|MVM900H(?:WZ|C)|MVM908HCZ|iDxD10 3G|(iDxD[45]|iDxQ5)|iDxD7[_ ]3G|PS604M|PT452E|Linx A400 3G LT4001PG|Linx C500 3G LT5001PG|Linx PS474S|NS6902QL|NS9797MG|((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
+# Digi
+Digi:
+  regex: '(?<!FBCR/)Digi[ _]([^);/]+)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Digicel
+Digicel:
+  regex: 'DIGICEL'
   device: 'smartphone'
   models:
-    - regex: 'HIT HT707[10]MG'
+    - regex: 'DL810'
+      model: 'DL810'
+    - regex: 'DIGICEL ([^/;]+) Build'
+      model: '$1'
+
+# Digiland
+Digiland:
+  regex: 'DL1008M'
+  device: 'smartphone'
+  models:
+    - regex: 'DL1008M'
+      device: 'tablet'
+      model: 'DL1008M'
+
+# Digma
+Digma:
+  regex: 'Digma[_ ]([^;/]+) Build|HIT HT707[10]MG|CITI ATL 4G|CITI Octa 80|CITI 1902 3G|CITI Z530 3G|(CITI[_ ](?:[A-Z0-9]+)[_ ][34]G)[ _][TC][ST](11[459]4MG|1195MG|1196ML|3001ML|500[67]PG|7113PL|7193MG|8209MG|8139ML|8152ML|1050PL|8205PG|7203MG)|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 B510 3G LT5037MG|LINX A452 3G LT4030PG|LINX A453 3G LT4038PG|LINX A420 3G LS4019PG|LINX A450 3G LT4028PG|Linx A400 3G LT4001PG|Linx C500 3G LT5001PG|Linx PS474S|LS504[01]PL|LT40(47|54)MG|PS1043MG|LS405[01]MG|LS5053ML|LT5048MG|HT7071MG|LT5052ML|HT5035PG|HT4039PG|LT4049PG|NS6902QL|NS9797MG|TT1004PG|TT7025MG|((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
+  device: 'smartphone'
+  models:
+    - regex: 'HIT(?: 3G)? HT707[10]MG'
       model: 'HIT 3G'
       device: 'tablet'
     - regex: 'iDx5'
       model: 'iDx5'
-    - regex: 'iDxD10 3G'
-      model: 'iDxD10 3G'
-      device: 'tablet'
+    - regex: 'HT5035PG'
+      model: 'HIT Q500 3G'
+    - regex: 'HT4039PG'
+      model: 'HIT Q401 3G'
     - regex: '(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
       model: '$1'
     - regex: 'PS604M'
       model: 'Linx 6.0'
-    - regex: '(Linx A400 3G) LT4001PG'
-      model: '$1'
-    - regex: '(Linx C500 3G) LT5001PG'
-      model: '$1'
+    - regex: 'LT4049PG'
+      model: 'Linx Atom 3G'
+    - regex: 'LT5048MG'
+      model: 'Linx Joy 3G'
+    - regex: 'LT5052ML'
+      model: 'Linx Base 4G'
+    - regex: 'LT4047MG'
+      model: 'Linx Alfa 3G'
+    - regex: 'LS4050MG'
+      model: 'Linx X1 3G'
+    - regex: 'LS4051MG'
+      model: 'Linx X1 Pro 3G'
+    - regex: 'LT4054MG'
+      model: 'Linx Argo 3G'
+    - regex: 'LS5041PL'
+      model: 'Linx Trix 4G'
+    - regex: 'LS5040PL'
+      model: 'Linx Rage 4G'
+    - regex: 'LS5053ML'
+      model: 'Linx Pay 4G'
+    - regex: 'Linx ([A-Z][0-9]{3}) 3G (?:LT4028PG|LS4019PG|LT4001PG|LT5001PG|LT4038PG|LT5037MG|LT4030PG)'
+      model: 'Linx $1 3G'
     - regex: '(Linx PS474S)'
       model: '$1'
     - regex: 'PT452E'
       model: 'Linx 4.5'
+    - regex: 'CITI ATL 4G CS5029ML'
+      model: 'CITI ATL 4G'
+    - regex: '(CITI Z530 3G)'
+      model: '$1'
+
+    - regex: 'PS1043MG'
+      model: 'Plane 10.3" 3G'
+      device: 'tablet'
     - regex: 'MVM900H(?:WZ|C)'
       model: 'iDx8'
       device: 'tablet'
     - regex: 'MVM908HCZ'
       model: 'iDx9'
       device: 'tablet'
-    - regex: '(iDxD7[_ ]3G)'
+    - regex: '(iD(?:xD10|rQ10|xD7)[_ ]3G)'
       model: '$1'
       device: 'tablet'
     - regex: '(iDx10|iDx7)'
@@ -1979,13 +3944,16 @@ Digma:
     - regex: '(CITI 1902 3G)'
       model: '$1'
       device: 'tablet'
-    - regex: '(CITI (?:[A-Z0-9]+) 3G) C[ST]500[67]PG'
+    - regex: '(CITI_8527_4G|CITI Octa 80)'
+      model: '$1'
+      device: 'tablet'
+    - regex: '(CITI[ _](?:[A-Z0-9]+)[ _][34]G)[ _][TC][ST](?:3001ML|500[67]PG|8209MG|11[459]4MG|1195MG|1196ML|3001ML|8152ML|1050PL|7113PL|7193MG|8205PG|7203MG)'
       model: '$1'
       device: 'tablet'
     - regex: 'iDxD8 3G'
       model: 'D-Plane2 8'
       device: 'tablet'
-    - regex: '(iDrQ10 3G|iDnD7)'
+    - regex: '(iDnD7)'
       model: '$1'
       device: 'tablet'
     - regex: 'NS6902QL'
@@ -1994,7 +3962,13 @@ Digma:
     - regex: 'NS9797MG'
       model: 'Platina 7.2 3G'
       device: 'tablet'
-    - regex: '((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)'
+    - regex: 'TT1004PG'
+      model: 'Optima 10.4" 3G'
+      device: 'tablet'
+    - regex: 'TT7025MG'
+      model: 'Optima 7.5" 3G'
+      device: 'tablet'
+    - regex: '((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.STNM]+|Prime)(?:[ _][43]G)?)'
       model: '$1'
       device: 'tablet'
     - regex: 'Digma[_ ]([^;/]+) Build'
@@ -2015,13 +3989,29 @@ DoCoMo:
 
 # Doogee
 Doogee:
-  regex: 'DOOGEE[ _-]|Valencia2_Y100pro|X5max(?:[_ ]PRO)?|(BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)[);/ ]|BL5000[);/ ]'
+  regex: 'DOOGEE[ _-]|Valencia2_Y100_?(?:pro|plus)|Y100_Plus|X5max(?:[_ ]PRO)?|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)[);/ ]|BL[579]000[);/ ]|BL12000|BL5500[_ ]Lite|X9 Mini|LEO_DG280|Y9Plus|Hitman_DG850'
   device: 'smartphone'
   models:
+    - regex: '(?:Valencia2_)?Y100_Plus[);/ ]'
+      model: 'Valencia2 Y100 Plus'
     - regex: 'Valencia2_Y100pro'
-      model: 'Valencia2 Y100pro'
-    - regex: 'BL5000'
-      model: 'BL5000'
+      model: 'Valencia2 Y100 Pro'
+    - regex: 'LEO_(DG280)'
+      model: 'Leo $1'
+    - regex: '(BL[579]000)[);/ ]'
+      model: '$1'
+    - regex: 'BL12000 PRO'
+      model: 'BL12000 Pro'
+    - regex: 'BL5500[_ ]Lite'
+      model: 'BL5500 Lite'
+    - regex: 'BL12000'
+      model: 'BL12000'
+    - regex: 'KISSME-DG580'
+      model: 'Kissme DG580'
+    - regex: 'Hitman_DG850'
+      model: 'Hitman DG580'
+    - regex: 'X9 Mini'
+      model: 'X9 Mini'
     - regex: '(X5max(?:[_ ]PRO)?)'
       model: '$1'
     - regex: '(?:DOOGEE[ _-])?(BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|Valencia2_Y100pro|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)[);/ ]'
@@ -2030,6 +4020,8 @@ Doogee:
       model: '$1'
     - regex: 'DOOGEE[ _-]([^);/]+)[);/ ]'
       model: '$1'
+    - regex: 'Y9Plus[);/ ]'
+      model: 'Y9 Plus'
 
 # Doov
 Doov:
@@ -2069,11 +4061,11 @@ Doro:
 
 # DNS
 DNS:
-  regex: '(?:DNS|AirTab)[ _\-]([^;/]+)Build|S4505M[);/ ]'
+  regex: '(?:DNS|AirTab)[ _\-]([^;/)]+)(?: Build|\))|(?:S4505M|SD01M)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: 'S4505M[);/ ]'
-      model: 'S4505M'
+    - regex: '(?:DNS[_ ])?(S4505M|SD01M|S4502|S4003|S4003)[);/ ]'
+      model: '$1'
     - regex: 'AirTab[ _\-]([^;/]+)Build'
       model: 'AirTab $1'
       device: 'tablet'
@@ -2082,12 +4074,14 @@ DNS:
 
 # E-Boda
 E-Boda:
-  regex: 'E-Boda'
+  regex: 'E-Boda|Eclipse_(?:G400M|G500)'
   device: 'smartphone'
   models:
     - regex: 'E-Boda ((?:Revo|Izzycomm|Essential|Intelligence|Supreme)[^/;]+) Build'
       device: 'tablet'
       model: '$1'
+    - regex: 'Eclipse_(G400M|G500)'
+      model: 'Eclipse $1'
     - regex: 'E-Boda ([^/;]+) Build'
       model: '$1'
 
@@ -2112,6 +4106,20 @@ EBEST:
     - regex: 'EBEST[ _-]?([^;/)]+)[);/ ]'
       model: '$1'
 
+# Echo Mobiles
+Echo Mobiles:
+  regex: 'ECHO[ _](HOLI|HORIZON|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA)|HORIZON_M'
+  device: 'smartphone'
+  models:
+    - regex: 'ECHO_HORIZON_LITE'
+      model: 'HORIZON Lite'
+    - regex: '(HORIZON_M)[);/ ]'
+      model: '$1'
+    - regex: 'ECHO_SMART_4G'
+      model: 'SMART 4G'
+    - regex: 'ECHO[ _](HOLI|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA)'
+      model: '$1'
+
 # ECS
 ECS:
   regex: '(?:TA10CA3|TM105A?|TR10CS1)[);/ ]'
@@ -2126,21 +4134,52 @@ ECS:
     - regex: 'TM105[);/ ]'
       model: 'TM105'
 
-# Elephone
-Elephone:
-  regex: 'Elephone[ _\-]([^/;]+) Build|P6000( ?Pro| ?Plus|\+| ?02)? Build'
+# EE
+EE:
+  regex: 'Hawk_from_EE'
   device: 'smartphone'
   models:
+    - regex: 'Hawk_from_EE'
+      model: 'Hawk'
+
+# Eks Mobility
+Eks Mobility:
+  regex: 'S5LS|X4UPlus'
+  device: 'smartphone'
+  models:
+    - regex: 'S5LS'
+      model: 'S5LS'
+    - regex: 'X4UPlus'
+      model: 'X4U Plus'
+
+# Elephone
+Elephone:
+  regex: 'Elephone|P6000( ?Pro| ?Plus|\+| ?02)? Build'
+  device: 'smartphone'
+  models:
+    - regex: 'Elephone Trunk[);/ ]'
+      model: 'Trunk'
+    - regex: 'P6000(\+| ?Plus)[);/ ]'
+      model: 'P6000 Plus'
+    - regex: 'P6000 02[);/ ]'
+      model: 'P6000 02'
+    - regex: 'P6000 ?Pro[);/ ]'
+      model: 'P6000 Pro'
+    - regex: '(?:Elephone[ _])?(P[68]000|S2)[);/ ]'
+      model: '$1'
     - regex: 'Elephone[ _\-]([^/;]+) Build'
       model: '$1'
-    - regex: 'P6000 Build'
-      model: 'P6000'
-    - regex: 'P6000(\+| ?Plus) Build'
-      model: 'P6000 Plus'
-    - regex: 'P6000 02 Build'
-      model: 'P6000 02'
-    - regex: 'P6000 ?Pro Build'
-      model: 'P6000 Pro'
+# Element
+Element:
+  regex: 'AFTRS'
+  model: 'Element 4K (2017)'
+  device: 'tv'
+
+# Elenberg
+Elenberg:
+  regex: '(TAB(?:101|728)[ _]3G|TAB7(?:[03]8|16|40|3[30]))[/;) ]'
+  device: 'tablet'
+  model: '$1'
 
 # Energy Sistem
 'Energy Sistem':
@@ -2156,12 +4195,45 @@ Ericy:
 
 # Essential
 Essential:
-  regex: 'PH-1 Build'
+  regex: 'PH-1[ )]'
   device: 'smartphone'
   models:
-    - regex: 'PH-1 Build'
+    - regex: 'PH-1[ )]'
       model: 'PH-1'
 
+# E-tel
+E-tel:
+  regex: 'E-tel_i250'
+  device: 'smartphone'
+  models:
+    - regex: 'E-tel[_ ]i250'
+      model: 'i250'
+
+# Evercoss
+Evercoss:
+  regex: 'EVERCOSS[ _]|(A75A\*|U50A_PLUS|M50 STAR)[/;) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'A75A\*[/;) ]'
+      model: 'A75A Star'
+    - regex: 'U50A_PLUS[/;) ]'
+      model: 'U50A Plus'
+    - regex: 'M50 STAR[/;) ]'
+      model: 'M50 Star'
+    - regex: 'EVERCOSS[ _](A7[BRLZ]|A65|A74A)[/;) ]'
+      model: '$1'
+
+# Eurostar
+Eurostar:
+  regex: '(ET7002C-H12|Onyx-[13]S)[/;) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Onyx-([13]S)[/;) ]'
+      model: 'Onyx $1'
+    - regex: 'ET7002C-H12[/;) ]'
+      model: 'ePad 4S'
+      device: 'tablet'
+
 # Eton
 Eton:
   regex: 'Eton'
@@ -2174,9 +4246,13 @@ Eton:
 
 # Essentielb
 Essentielb:
-  regex: '(Wooze[_ ](?:I5|L|XL)) Build'
+  regex: '(?:Wooze[_ ](?:I55?|L|XL)|HEYOU[135])[);/ ]'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'HEYOU([135])[);/ ]'
+      model: 'HEYou $1'
+    - regex: '(Wooze[_ ](?:I55?|L|XL))[);/ ]'
+      model: '$1'
 
 # Rikomagic
 Rikomagic:
@@ -2184,15 +4260,29 @@ Rikomagic:
   device: 'tv'
   model: 'MK$1'
 
+# Rinno
+Rinno:
+  regex: 'Rinno (R(?:400|505))'
+  device: 'smartphone'
+  model: '$1'
+
+# Riviera
+Riviera:
+  regex: 'RIVIERA '
+  device: 'smartphone'
+  models:
+    - regex: 'F23'
+      model: 'F23'
+
 # Senseit
 Senseit:
-   regex: 'SENSEIT[ _]?([^;/)]+) Build'
+   regex: 'SENSEIT[ _]?([^;/)]+)( Build|\))'
    device: 'smartphone'
    model: '$1'
 
 # Sony & Sony Ericsson (combined as they are mixed up)
 Sony:
-  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|502SO|701SO|C1[569]0[45]|C2[01]0[45]|C2305|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D200[45]|D21(?:0[45]|14)|D22(?:0[236]|12|43)|D230[2356]|D240[36]|D25(?:02|33)|D510[236]|D530[36]|D5322|D5503|D58[03]3|D65(?:0[23]|43)|D66[035]3|D6708|E210[45]|E2115|E5506|E2033|E2[03]03|E23[36]3|E2306|E2312|E2353|E53[03]3|E55[36]3|E56[46305][36]|E58[02]3|E65[35]3|E66[0358]3|E68[358]3|F311[12356]|F331[13]|F321[12356]|F5[13]21|F5122|F813[12]|F833[12]|G312[135]|G311[26]|G322[136]|G3212|G331[123]|G3412|G3416|G3423|G823[12]|G834[123]|G8[14]4[12]|H(?:3213|3223|4213|4233)|H[34]113|H8216|H8324|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]*[0-9]*(?: Build|\))|X?L39H|XM50[ht]|W960|portalmmm/2\.0 K|S3[69]h|SOL22|SOV32|SOV36|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[345]D|[234]E|[12]C|[1235]F|[12]G|[3]H)|R800[aix]|LiveWithWalkman'
+  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)|D200[45]|D21(?:0[45]|14)|D22(?:0[236]|12|43)|D230[2356]|D240[36]|D25(?:02|33)|D510[236]|D530[36]|D5316|D5322|D5503|D58[03]3|D65(?:0[23]|43|63)|D66[03458]3|D66[14]6|D6708|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|65[35]3|66[0358]3|68[358]3)|I[34]312|I4332|F311[12356]|F331[13]|F321[12356]|F5[13]21|F5122|F813[12]|F833[12]|G312[135]|G311[26]|G322[136]|G3212|G331[123]|G3412|G3416|G342[136]|G823[12]|G834[123]|G8[14]4[12]|H(?:3113|3123|3133|3213|3223|3311|3321|4113|4133|4213|4233|4311|4331|4413|4433|82[167]6|83[12]4|8416|9436)|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]+[0-9]*(?: Build|\))|X?L39H|XM50[ht]|W960|portalmmm/2\.0 K|S3[69]h|SOL2[246]|SOV3[1-9]|SOV4[0-2]|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[12]C|[345]D|[234]E|[1-5]F|[1-5]G|[1-4]H|[1-4]J|[1-5]K|1M|[1-3]L)|R800[aix]|J82[17]0|J9110|J9210|J81[17]0|I[34]113|I3[12]23|I42[19]3|H9493|H8296|H8166|H4493|LiveWithWalkman|BRAVIA|SGP771|E3 Dual|A001SO|I4193|E6508|SOT31|XQ-AD51'
   device: 'smartphone'
   models:
     # SONY ERICSSON: explicit smartphone models
@@ -2229,6 +4319,9 @@ Sony:
     - regex: '(?:Sony(?:Ericsson)?)?ST17[ai]'
       model: 'Xperia active'
       brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?SO-02L'
+      model: 'Xperia Ace'
+      brand: 'Sony Ericsson'
     - regex: '(?:Sony(?:Ericsson)?)?ST18[ai]'
       model: 'Xperia ray'
       brand: 'Sony Ericsson'
@@ -2319,10 +4412,30 @@ Sony:
       device: 'feature phone'
 
     # SONY: explicit smartphone models
+    - regex: 'SO-04F'
+      model: 'Xperia A2'
+    - regex: 'SO-04G'
+      model: 'Xperia A4'
+    - regex: '(?:Sony(?:Ericsson)?)?I(?:4113|31[12]3)'
+      model: 'Xperia 10'
+    - regex: 'A001SO[);/ ]'
+      model: 'Xperia 10 II'
+    - regex: '(?:Sony(?:Ericsson)?)?I(?:42[19]3|3223)'
+      model: 'Xperia 10 Plus'
+    - regex: '(?:Sony(?:Ericsson)?)?I4193'
+      model: 'Xperia 10 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:J(?:9110|81[17]0)|SOV40|SO-03L|802SO)'
+      model: 'Xperia 1'
     - regex: '(?:Sony(?:Ericsson)?)?LT22i'
       model: 'Xperia P'
     - regex: '(?:Sony(?:Ericsson)?)?LT25i'
       model: 'Xperia V'
+    - regex: '(?:Sony(?:Ericsson)?)?J9210'
+      model: 'Xperia 5 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:J82[17]0|SO-01M|SOV41|901SO)'
+      model: 'Xperia 5'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:SOV42|902SO)'
+      model: 'Xperia 8'
     - regex: '(?:Sony(?:Ericsson)?)?LT26ii'
       model: 'Xperia SL'
     - regex: '(?:Sony(?:Ericsson)?)?LT26i'
@@ -2359,9 +4472,9 @@ Sony:
       model: 'Xperia E'
     - regex: '(?:Sony(?:Ericsson)?)?C160[45]'
       model: 'Xperia E Dual'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:E210[45]|E2115)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E210[45]|E2115|E2124)'
       model: 'Xperia E4'
-    - regex: '(?:Sony(?:Ericsson)?)?E2003'
+    - regex: '(?:Sony(?:Ericsson)?)?E20[05]3|E2006'
       model: 'Xperia E4G'
     - regex: '(?:Sony(?:Ericsson)?)?C190[45]'
       model: 'Xperia M'
@@ -2369,7 +4482,7 @@ Sony:
       model: 'Xperia M Dual'
     - regex: '(?:Sony(?:Ericsson)?)?C210[45]|S36h'
       model: 'Xperia L'
-    - regex: '(?:Sony(?:Ericsson)?)?C2305|S39h'
+    - regex: '(?:Sony(?:Ericsson)?)?C230[45]|S39h'
       model: 'Xperia C'
     - regex: '(?:Sony(?:Ericsson)?)?C530[236]'
       model: 'Xperia SP'
@@ -2379,7 +4492,7 @@ Sony:
       model: 'Xperia ZL'
     - regex: '(?:Sony(?:Ericsson)?)?(?:C66(?:0[236]|16)|SO-02E)'
       model: 'Xperia Z'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:C68(?:0[26]|[34]3)|XL39H)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:C68(?:0[26]|[34]3)|XL39H|SOL24)'
       device: 'phablet'
       model: 'Xperia Z Ultra'
     - regex: '(?:Sony(?:Ericsson)?)?(?:C69(?:0[236]|16|43)|L39H|SO-0[12]F)'
@@ -2390,10 +4503,20 @@ Sony:
       model: 'Xperia E1 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D22(?:0[236]|43)'
       model: 'Xperia E3'
-    - regex: '(?:Sony(?:Ericsson)?)?D2212'
+    - regex: '(?:Sony(?:Ericsson)?)?D2212|E3 Dual'
       model: 'Xperia E3 Dual'
-    - regex: '(?:Sony(?:Ericsson)?)?E2033'
+    - regex: '(?:Sony(?:Ericsson)?)?E20[34]3'
       model: 'Xperia E4g Dual'
+    - regex: 'H33[12]1'
+      model: 'Xperia L2'
+    - regex: 'H43[13]1'
+      model: 'Xperia L2 Dual'
+    - regex: 'I3312'
+      model: 'Xperia L3'
+    - regex: 'I43[13]2'
+      model: 'Xperia L3 Dual'
+    - regex: 'XQ-AD51'
+      model: 'Xperia L4'
     - regex: '(?:Sony(?:Ericsson)?)?D2302'
       model: 'Xperia M2 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D230[356]'
@@ -2412,17 +4535,17 @@ Sony:
       model: 'Xperia C3 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D2533'
       model: 'Xperia C3'
-    - regex: '(?:Sony(?:Ericsson)?)?E5303'
+    - regex: '(?:Sony(?:Ericsson)?)?E53[05]3|E5306'
       model: 'Xperia C4'
-    - regex: '(?:Sony(?:Ericsson)?)?E53[03]3'
+    - regex: '(?:Sony(?:Ericsson)?)?E53[0346]3'
       model: 'Xperia C4 Dual'
-    - regex: '(?:Sony(?:Ericsson)?)?E5506'
+    - regex: '(?:Sony(?:Ericsson)?)?E5506|E5553'
       model: 'Xperia C5 Ultra'
     - regex: '(?:Sony(?:Ericsson)?)?E55[36]3'
       model: 'Xperia C5 Ultra Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D510[236]'
       model: 'Xperia T3'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:D530[36]|XM50[ht])'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:D530[36]|D5316|XM50[ht])'
       model: 'Xperia T2 Ultra'
       device: 'phablet'
     - regex: '(?:Sony(?:Ericsson)?)?D5322'
@@ -2434,17 +4557,26 @@ Sony:
       model: 'Xperia Z3 Compact'
     - regex: '(?:Sony(?:Ericsson)?)?(?:D65(?:0[23]|43)|SO-03F)'
       model: 'Xperia Z2'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:D66[05]3|SO-01G)'
+    - regex: 'D6563'
+      model: 'Xperia Z2a'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:D66[045]3|D66[14]6|SO-01G|SOL26|401SO)'
       model: 'Xperia Z3'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:D6633)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:D6633|D6683)'
       model: 'Xperia Z3 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?(?:E65[35]3)'
       model: 'Xperia Z3+'
     - regex: '(?:Sony(?:Ericsson)?)?(?:D6708)'
       model: 'Xperia Z3v'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:E58[02]3)'
+    - regex: 'SOV31|402SO|SO-03G'
+      model: 'Xperia Z4'
+    - regex: 'E6508'
+      model: 'Xperia Z4v'
+    - regex: 'SGP771|SOT31|SO-05G'
+      model: 'Xperia Z4'
+      device: 'tablet'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E58[02]3|SO-02H)'
       model: 'Xperia Z5 Compact'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:E66[05]3|SOV32)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E66[05]3|SOV32|501SO|SO-01H)'
       model: 'Xperia Z5'
     - regex: '(?:Sony(?:Ericsson)?)?E66[38]3'
       model: 'Xperia Z5 Dual'
@@ -2460,32 +4592,46 @@ Sony:
       model: 'Xperia XA Ultra'
     - regex: '(?:Sony(?:Ericsson)?)?F321[26]'
       model: 'Xperia XA Ultra Dual'
-    - regex: '(?:Sony(?:Ericsson)?)?F833[12]'
+    - regex: '(?:Sony(?:Ericsson)?)?F833[12]|SOV34|601SO|SO-01J'
       model: 'Xperia XZ'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:701SO|SOV36|G834[123])'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:701SO|SOV36|G834[123]|SO-01K)'
       model: 'Xperia XZ1'
-    - regex: '(?:Sony(?:Ericsson)?)?G8441'
+    - regex: '(?:Sony(?:Ericsson)?)?G8441|SO-02K'
       model: 'Xperia XZ1 Compact'
     - regex: '(?:Sony(?:Ericsson)?)?F331[13]'
       model: 'Xperia E5'
     - regex: '(?:Sony(?:Ericsson)?)?G312[135]|G311[26]'
       model: 'Xperia XA1'
-    - regex: '(?:Sony(?:Ericsson)?)?G3412|G3416|G3423'
+    - regex: '(?:Sony(?:Ericsson)?)?G341[26]|G342[13]'
       model: 'Xperia XA1 Plus'
+    - regex: '(?:Sony(?:Ericsson)?)?G3426'
+      model: 'Xperia XA1 Plus Dual'
     - regex: '(?:Sony(?:Ericsson)?)?G322[136]|G3212'
       model: 'Xperia XA1 Ultra'
-    - regex: '(?:Sony(?:Ericsson)?)?H3113'
+    - regex: '(?:Sony(?:Ericsson)?)?H31[123]3'
       model: 'Xperia XA2'
-    - regex: '(?:Sony(?:Ericsson)?)?H4113'
+    - regex: '(?:Sony(?:Ericsson)?)?H41[13]3'
       model: 'Xperia XA2 Dual'
+    - regex: 'H44[19]3'
+      model: 'Xperia XA2 Plus Dual'
+    - regex: 'H4433'
+      model: 'H4433'
     - regex: '(?:Sony(?:Ericsson)?)?H(?:3213|3223|4213|4233)'
       model: 'Xperia XA2 Ultra'
-    - regex: '(?:Sony(?:Ericsson)?)?G823[12]'
+    - regex: '(?:Sony(?:Ericsson)?)?G823[12]|SOV35|602SO|SO-03J'
       model: 'Xperia XZs'
-    - regex: '(?:Sony(?:Ericsson)?)?G814[12]'
+    - regex: '(?:Sony(?:Ericsson)?)?G814[12]|SO-04[JK]'
       model: 'Xperia XZ Premium'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:H8324|H8216)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:H83[12]4|H82[17]6|SOV37|SO-03K|H8296|702SO)'
       model: 'Xperia XZ2'
+    - regex: 'H8266'
+      model: 'Xperia XZ2 Dual'
+    - regex: 'SO-05K'
+      model: 'Xperia XZ2 Compact'
+    - regex: '(?:H8166|SOV38)[);/ ]'
+      model: 'Xperia XZ2 Premium Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:H(8416|9436|9493)|SO-01L|SOV39|801SO)'
+      model: 'Xperia XZ3'
     - regex: '(?:Sony(?:Ericsson)?)?G331[13]'
       model: 'Xperia L1'
     - regex: '(?:Sony(?:Ericsson)?)?G3312'
@@ -2500,9 +4646,9 @@ Sony:
       model: 'Xperia X'
     - regex: '(?:Sony(?:Ericsson)?)?F5122'
       model: 'Xperia X Dual'
-    - regex: '(?:Sony(?:Ericsson)?)?F5321'
+    - regex: '(?:Sony(?:Ericsson)?)?F5321|SO-02J'
       model: 'Xperia X Compact'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:F8131|502SO)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:F8131|502SO|SOV33|SO-04H)'
       model: 'Xperia X Performance'
     - regex: '(?:Sony(?:Ericsson)?)?F8132'
       model: 'Xperia X Performance Dual'
@@ -2511,16 +4657,24 @@ Sony:
     - regex: 'SGP(?:311|312|321)[);/ ]|SO-03E'
       model: 'Xperia Tablet Z'
       device: 'tablet'
+    - regex: 'SGP712[);/ ]'
+      model: 'Xperia Tablet Z4'
+      device: 'tablet'
     - regex: 'SGP(?:511|512|521)[);/ ]|SO-05F'
       model: 'Xperia Tablet Z2'
       device: 'tablet'
-    - regex: 'SGP(?:6[24]1)[);/ ]'
+    - regex: 'SGP(?:6[124]1|612)[);/ ]'
       model: 'Xperia Tablet Z3 Compact'
       device: 'tablet'
     - regex: 'SGPT(?:12|121|122|123|13|131|132|133)[);/ ]'
       model: 'Xperia Tablet S'
       device: 'tablet'
 
+    # SONY: Bravia
+    - regex: '(?:BRAVIA )(2K GB ATV3|4K UR2|4K GB ATV3|4K GB|4K 2015|2015)[);/ ]'
+      model: 'Bravia $1'
+      device: 'tv'
+
     # general detections
     - regex: 'SonyBDP|SonyDBV'
       model: 'Blu-ray Player'
@@ -2567,6 +4721,72 @@ Sony:
     - regex: 'Sony[ -]?([a-z0-9\-]+)'
       model: '$1'
 
+# Ergo
+Ergo:
+  regex: 'ERGO|(V550[_ ]Vision|B502 Basic|B504[_ ]Unit|A502[_ ]Aurum|A503[ _]Optima|Prime B400|A551 Sky 4G|A553 Power|A555 Universe|Force F500|GoTab GBT9|GoTab Gti8|F501_Magic|V551[ _]Aura|V540_Level|V570_BIG_BEN|B506[_ ]INTRO|A503-Optima|B505_Unit_4G)'
+  device: 'smartphone'
+  models:
+    - regex: 'F501_Magic'
+      model: 'F501 Magic'
+    - regex: 'B502 Basic'
+      model: 'B502 Basic'
+    - regex: 'A503-Optima'
+      model: 'A503 Optima'
+    - regex: 'B506[_ ]INTRO'
+      model: 'B506 Intro'
+    - regex: 'V550[_ ]Vision'
+      model: 'V550 Vision'
+    - regex: 'B504[_ ]Unit'
+      model: 'B504 Unit'
+    - regex: 'B505_Unit_4G'
+      model: 'B505 Unit 4G'
+    - regex: 'V551[ _]Aura'
+      model: 'V551 Aura'
+    - regex: 'V540_Level'
+      model: 'V540 Level'
+    - regex: 'V570_BIG_BEN'
+      model: 'V570 Big Ben'
+    - regex: 'Ergo F502'
+      model: 'F502 Platinum'
+    - regex: '(ERGO_)?A500[ _]Best'
+      model: 'A500 Best'
+    - regex: '(ERGO_)?A550[ _]Maxx'
+      model: 'A550 Maxx'
+    - regex: 'Prime B400'
+      model: 'Prime B400'
+    - regex: 'A502[_ ]Aurum'
+      model: 'A502 Aurum'
+    - regex: 'A503[ _]Optima'
+      model: 'A503 Optima'
+    - regex: 'A551 Sky 4G'
+      model: 'A551 Sky 4G'
+    - regex: 'A553 Power'
+      model: 'A553 Power'
+    - regex: 'A555 Universe'
+      model: 'A555 Universe'
+    - regex: 'ERGO[_ ]A556'
+      model: 'A556'
+    - regex: 'ERGO[_ ]F500'
+      model: 'F500'
+    - regex: 'ERGO[_ ]F501'
+      model: 'F501'
+    - regex: 'B500 First'
+      model: 'B500 First'
+    - regex: 'Force F500'
+      model: 'Force F500'
+    - regex: 'GoTab GBT9'
+      model: 'GoTab GBT9'
+      device: 'tablet'
+    - regex: 'GoTab Gti8'
+      model: 'GoTab GTi8'
+      device: 'tablet'
+    - regex: 'ERGO[_ ]Tab[ _]Crystal[ _]Lite'
+      model: 'Tab Crystal Lite'
+      device: 'tablet'
+    - regex: 'ERGO[_ ]Tab[ _]Hero[ _]II'
+      model: 'Tab Hero II'
+      device: 'tablet'
+
 # Ericsson
 Ericsson:
   regex: '(?:Ericsson(?:/ )?[a-z0-9]+)|(?:R380 2.0 WAP1.1)'
@@ -2577,12 +4797,39 @@ Ericsson:
     - regex: 'R380 2.0 WAP1.1'
       model: 'R380'
 
+# Energizer
+Energizer:
+  regex: 'PowerMax|ENERGY[_ ]?(?:[45]00|400S|S[56]00|E520)(?:[_ ]LTE)?'
+  device: 'smartphone'
+  models:
+    - regex: 'PowerMax(P[0-9]+S?)'
+      model: 'Power Max $1'
+    - regex: 'ENERGY[_ ]([45]00|E520)[_ ]LTE'
+      model: 'Energy $1 LTE'
+    - regex: 'ENERGY[_ ]400S'
+      model: 'Energy 400S'
+    - regex: 'ENERGY400'
+      model: 'Energy 400'
+    - regex: 'ENERGY[_ ]S([56]00)'
+      model: 'Energy S$1'
+
 # eTouch
 eTouch:
   regex: 'eTouch ?([a-z0-9]+)'
   device: 'smartphone'
   model: '$1'
 
+# Etuline
+Etuline:
+  regex: '(ETL-S(?:3520|4521|5042|5084|6022)|ETL-T(?:752G|882G|9[78]0))[/); ]'
+  device: 'smartphone'
+  models:
+    - regex: '(ETL-S(?:[^/); ]+))'
+      model: '$1'
+    - regex: '(ETL-T(?:[^/); ]+))'
+      device: 'tablet'
+      model: '$1'
+
 # Storex
 Storex:
   regex: "eZee[^a-z]*Tab ?([^;/]*) Build|STOREX LinkBox"
@@ -2605,28 +4852,46 @@ Evertek:
     - regex: '(Ever(?:Glory|Shine|Miracle|Mellow|Classic|Trendy|Fancy|Vivid|Slim|Glow|Magic|Smart|Star)[^/;]*) Build'
       model: '$1'
 
+# Evolio
+Evolio:
+  regex: 'Evolio|M4MAGIC'
+  device: 'smartphone'
+  models:
+    - regex: 'M4MAGIC'
+      model: 'M4 Magic'
+    - regex: 'Evolio_M5Pro'
+      model: 'M5 Pro'
+    - regex: 'Evolio[ _](M6|S4 Cobalt|S5|X10|Yuppi)'
+      model: '$1'
+
 # Evolveo
 Evolveo:
-  regex: 'EVOLVEO[ _]([^;/]*) Build'
+  regex: 'EVOLVEO'
   device: 'smartphone'
   models:
     - regex: 'Smart TV ([^;/]*) Build'
       device: 'tv'
       model: 'Smart TV $1'
+    - regex: 'EVOLVEO StrongPhone G([248])'
+      model: 'StrongPhone G$1'
     - regex: 'EVOLVEO[ _]([^;/]*) Build'
       model: '$1'
 
 # Explay
 Explay:
-  regex: 'Explay|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|sQuad[ _][0-9\.]|Onliner[1-3]|RioPlay|Leader'
+  regex: 'Explay|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|sQuad[ _][0-9\.]|Onliner[1-3]|RioPlay|Leader|Infinityll|Imperium[78]'
   device: 'tablet'
   models:
     - regex: 'ActiveD[ _]7.4[ _]3G'
       model: 'ActiveD 7.4 3G'
+    - regex: 'Imperium([78])[;/) ]'
+      model: 'Imperium $1 3G'
     - regex: 'ActiveD[ _]8.2[ _]3G'
       model: 'ActiveD 8.2 3G'
     - regex: 'CinemaTV[ _]3G'
       model: 'CinemaTV 3G'
+    - regex: 'Infinityll'
+      model: 'Infinity II'
     - regex: 'Informer[ _]([0-9]+(?:[ _]3G)?)'
       model: 'Informer $1'
     - regex: 'Surfer[ _]([0-9\.]+(?:[ _]3G)?)'
@@ -2648,6 +4913,17 @@ Explay:
     - regex: 'Leader'
       model: 'Leader'
 
+# EvroMedia
+EvroMedia:
+  regex: 'EVROMEDIA|Playpad[ _]'
+  device: 'tablet'
+  models:
+    - regex: 'Playpad 3G GOO'
+      model: 'Play Pad 3G Goo'
+    - regex: 'Play Pad PRO'
+      model: 'Play Pad Pro'
+    - regex: 'PlayPad 3GTab XL'
+      model: 'Play Pad 3G Tab XL'
 # EKO
 EKO:
   regex: 'EKO'
@@ -2658,9 +4934,17 @@ EKO:
     - regex: 'EKO[ _-]?([^;/)]+)[);/ ]'
       model: '$1'
 
+# Extrem
+Extrem:
+  regex: 'Rock X9+'
+  device: 'smartphone'
+  models:
+    - regex: 'Rock X9+'
+      model: 'Rock X9+'
+
 # Ezze
 Ezze:
-  regex: 'EZZE-|EZ[a-z0-9]+'
+  regex: 'EZZE-|EZ(?!Browser)[a-z0-9]+'
   device: 'feature phone'
   models:
     - regex: 'EZZE-([a-z0-9]+)'
@@ -2674,6 +4958,14 @@ Ezio:
   device: 'feature phone'
   model: '$1'
 
+# Forstar
+Forstar:
+  regex: 'Amosta 3G5'
+  device: 'smartphone'
+  models:
+    - regex: 'Amosta 3G5'
+      model: 'Amosta 3G5'
+
 # Foxconn
 Foxconn:
   regex: 'InFocus M[0-9]+[a-z]?'
@@ -2682,19 +4974,66 @@ Foxconn:
     - regex: 'InFocus M([0-9]+[a-z]?)'
       model: 'InFocus M$1'
 
+# Fondi
+Fondi:
+  regex: 'Fondi[- _]([^;/)]+)|(T702|Q008B|Q010B|Q718B|Q902|T602B|T707G|T708B|T725B|T725B1|T907B)(?:\)| Build)'
+  device: 'smartphone'
+  models:
+    - regex: '(T702|T602B)'
+      model: '$1'
+    - regex: '(Q008B|Q010B|Q718B|Q902|T707G|T708B|T725B|T725B1|T907B)'
+      device: 'tablet'
+      model: '$1'
+    - regex: 'Fondi[- _]([^;/)]+)'
+      model: '$1'
+
 # Fairphone
 Fairphone:
-  regex: '(FP1U?)[);/ ]'
+  regex: '(FP(?:1U?|2))[);/ ]'
   device: 'smartphone'
   model: '$1'
 
+# Famoco
+Famoco:
+  regex: '(FX[123]00)'
+  device: 'smartphone'
+  model: '$1'
+
+# FiGO
+FiGO:
+  regex: 'ATRIUM II F55L2|TRIO F40LT|EPIC F50G|Gravity X55L|Orion M50L|ULTRA M50G|M405B|VIRTUE3|F55L Build'
+  device: 'smartphone'
+  models:
+    - regex: 'ATRIUM II F55L2'
+      model: 'Atrium II'
+    - regex: '(F55L)'
+      model: '$1'
+    - regex: 'TRIO F40LT'
+      model: 'Trio F40LT'
+    - regex: 'EPIC F50G'
+      model: 'Epic F50G'
+    - regex: '(Gravity X55L|Orion M50L)'
+      model: '$1'
+    - regex: 'ULTRA M50G'
+      model: 'Prime'
+    - regex: 'M405B_8GB'
+      model: 'Virtue II 8GB'
+    - regex: 'M405B'
+      model: 'Virtue II'
+    - regex: 'VIRTUE3'
+      model: 'Virtue III'
+
 # FNB
 FNB:
-  regex: 'ConeXis X[12]|SP5045V'
+  regex: 'ConeXis (A[12]|X[12])|SP5045V'
   device: 'smartphone'
   models:
     - regex: 'SP5045V'
       model: 'SP5045V'
+    - regex: 'ConeXis A1'
+      model: 'ConeXis A1'
+    - regex: 'ConeXis A2'
+      model: 'ConeXis A2'
     - regex: 'ConeXis X1'
       model: 'ConeXis X1'
     - regex: 'ConeXis X2'
@@ -2702,67 +5041,84 @@ FNB:
 
 # Fujitsu
 Fujitsu:
-  regex: 'F-01[FHJK]|F-02[EFGH]|F-03[DEFGH]|F-04[EG]|F-05[DEFJ]|F-06E|F-07[DE]|F-08D|F-09[DE]|F-10D|F-11D|F-12C|M532|FARTM933KZ[);/ ]'
+  regex: '(?:F-01[FHJKL]|F-02[EFGHLK]|F-03[DEFGH]|F-04[EGKJ]|F-05[DEFJ]|F-06E|F-07[DE]|F-08D|F-09[DE]|F-10D|F-41A|F-11D|F-12C|M532|FARTM933KZ|901FJ|arrowsM03)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: 'F-01F'
+    - regex: 'F-01F[);/ ]'
       model: 'Arrows NX F-01F'
-    - regex: 'F-01J'
+    - regex: 'F-01L[);/ ]'
+      model: 'Easy Phone F-01L'
+    - regex: 'F-01J[);/ ]'
       model: 'Arrows NX F-01J'
-    - regex: 'F-01K'
+    - regex: 'F-01K[);/ ]'
       model: 'Arrows NX F-01K'
-    - regex: 'F-01H'
+    - regex: 'F-01H[);/ ]'
       model: 'Arrows Fit F-01H'
-    - regex: 'F-02E'
+    - regex: 'F-02E[);/ ]'
       model: 'Arrows X F-02E'
-    - regex: 'F-02G'
+    - regex: 'F-02G[);/ ]'
       model: 'Arrows NX F-02G'
-    - regex: 'F-02H'
+    - regex: 'F-02H[);/ ]'
       model: 'Arrows NX F-02H'
-    - regex: 'F-03D'
+    - regex: 'F-03D[);/ ]'
       model: 'Arrows Kiss F-03D'
-    - regex: 'F-03E'
+    - regex: 'F-03E[);/ ]'
       model: 'Arrows Kiss F-03E'
-    - regex: 'F-03F'
+    - regex: 'F-03F[);/ ]'
       model: 'Disney Mobile F-03F'
-    - regex: 'F-03H'
+    - regex: 'F-03H[);/ ]'
       model: 'Arrows SV F-03H'
-    - regex: 'F-04E'
+    - regex: '901FJ[);/ ]'
+      model: 'Arrows J 901FJ'
+    - regex: 'F-04E[);/ ]'
       model: 'Arrows V F-04E'
-    - regex: 'F-04G'
+    - regex: 'F-04G[);/ ]'
       model: 'Arrows NX F-04G'
-    - regex: 'F-05D'
+    - regex: 'F-05D[);/ ]'
       model: 'Arrows X LTE F-05D'
-    - regex: 'F-05F'
+    - regex: 'F-05F[);/ ]'
       model: 'Arrows NX F-05F'
-    - regex: 'F-05J'
+    - regex: 'F-05J[);/ ]'
       model: 'Arrows Be F-05J'
-    - regex: 'F-06E'
+    - regex: 'F-04K[);/ ]'
+      model: 'Arrows Be F-04K'
+    - regex: 'F-02L[);/ ]'
+      model: 'Arrows Be 3 F-02L'
+    - regex: 'F-41A[);/ ]'
+      model: 'Arrows Be 4 F-41A'
+    - regex: 'F-06E[);/ ]'
       model: 'Arrows NX F-06E'
-    - regex: 'F-07D'
+    - regex: 'F-07D[);/ ]'
       model: 'Arrows μ F-07D'
-    - regex: 'F-07E'
+    - regex: 'F-07E[);/ ]'
       model: 'Disney Mobile F-07E'
-    - regex: 'F-08D'
+    - regex: 'F-08D[);/ ]'
       model: 'Disney Mobile F-08D'
-    - regex: 'F-09D'
+    - regex: 'F-09D[);/ ]'
       model: 'ANTEPRIMA F-09D'
-    - regex: 'F-09E'
+    - regex: 'F-09E[);/ ]'
       model: 'Raku-Raku Smartphone Premium F-09E'
-    - regex: 'F-10D'
+    - regex: 'F-10D[);/ ]'
       model: 'Arrows X F-10D'
-    - regex: 'F-11D'
+    - regex: 'F-11D[);/ ]'
       model: 'Arrows Me F-11D'
-    - regex: 'F-12C'
+    - regex: 'F-12C[);/ ]'
       model: 'F-12C'
+    - regex: 'F-04J[);/ ]'
+      model: 'F-04J'
+    - regex: 'arrowsM03[);/ ]'
+      model: 'Arrows M03'
 
-    - regex: 'F-02F'
+    - regex: 'F-02F[);/ ]'
       model: 'Arrows Tab F-02F'
       device: 'tablet'
-    - regex: 'F-03G'
+    - regex: 'F-02K[);/ ]'
+      model: 'Arrows Tab F-02K'
+      device: 'tablet'
+    - regex: 'F-03G[);/ ]'
       model: 'Arrows Tab F-03G'
       device: 'tablet'
-    - regex: 'F-05E'
+    - regex: 'F-05E[);/ ]'
       model: 'Arrows Tab F-05E'
       device: 'tablet'
     - regex: 'FARTM933KZ'
@@ -2772,18 +5128,69 @@ Fujitsu:
       model: 'Stylistic'
       device: 'tablet'
 
+# G-TiDE
+G-TiDE:
+  regex: 'G-TiDE'
+  device: 'smartphone'
+  models:
+    - regex: 'Shining7'
+      model: 'Shining 7'
+    - regex: 'G-TiDE_(A1|S[34])'
+      model: '$1'
+    - regex: 'G-TiDE V6'
+      model: 'V6'
+    - regex: 'E(57|60|66|72|77)'
+      model: '$1'
+
 # Gemini
 Gemini:
   regex: '(GEM[0-9]+[a-z]*)'
   device: 'tablet'
   model: '$1'
 
-# Gigabyte
-Gigabyte:
-  regex: 'GSmart [a-z0-9 ]+ Build|Gigabyte-[a-z0-9]+'
+# General Mobile
+General Mobile:
+  regex: 'GM 5 Plus|GM8 go|GM 8 d|GM 8'
   device: 'smartphone'
   models:
-    - regex: '(GSmart [a-z0-9 ]+) Build'
+    - regex: 'GM 5 Plus'
+      model: 'GM 5 Plus'
+    - regex: 'GM 8 d'
+      model: 'GM 8D'
+    - regex: 'GM 8'
+      model: 'GM 8'
+    - regex: 'GM8 go'
+      model: 'GM 8 Go'
+
+# Geotel
+Geotel:
+  regex: 'GEOTEL[ _]?'
+  device: 'smartphone'
+  models:
+    - regex: 'G1'
+      model: 'G1'
+    - regex: 'GEOTEL[ _]?Note'
+      model: 'Note'
+
+# Ghia
+Ghia:
+  regex: 'GHIA|QS702'
+  device: 'smartphone'
+  models:
+    - regex: 'QS702'
+      model: 'QS702'
+    - regex: 'GHIA_ZEUS_3G'
+      model: 'Zeus 3G'
+    - regex: 'GHIA_AXIS7'
+      model: 'Axis 7'
+      device: 'tablet'
+
+# Gigabyte
+Gigabyte:
+  regex: 'GSmart[ _][a-z0-9 ]+(?: Build|\))|Gigabyte-[a-z0-9]+'
+  device: 'smartphone'
+  models:
+    - regex: '(GSmart[ _][a-z0-9 ]+)(?: Build|\))'
       model: '$1'
     - regex: 'Gigabyte-([a-z0-9]+)'
       model: '$1'
@@ -2801,9 +5208,24 @@ Gigaset:
     - regex: 'Gigaset ([^;/)]+)[);/ ]'
       model: '$1'
 
+# Ginzzu
+Ginzzu:
+  regex: 'GINZZU[_ ]|((?:RS(?:7[14]|81|9[67])D)|S50[45]0|S5120|RS(6[12]|9[45])D|S40[23]0|RS8502|RS9602)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'GINZZU[_ ]?(S40[17]0|S4710|ST6040|ST6120)'
+      model: '$1'
+    - regex: 'GINZZU[_ ]?(GT-(?:1050|7105|70[1-4]0|7115|7210|[WX]831|X770|7810|8[01]10))'
+      model: '$1'
+      device: 'tablet'
+    - regex: '(RS6[12]D) ULTIMATE'
+      model: '$1 Ultimate'
+    - regex: '(?:GINZZU[ _])?((?:RS(?:7[14]|81|9[4-7])D)|S50[45]0|S5120|S40[23]0|RS8502|RS9602|RS94D)[);/ ]'
+      model: '$1'
+
 # Gionee
 Gionee:
-  regex: '(?:GIO-)?GIONEE[ _-]?[a-z0-9]+|(?:Dream_D1|V188S?|GN[0-9]{3,4}[a-z]?)[);/ ]|F103(?: Pro)? Build|P5 mini Build'
+  regex: '(?:GIO-)?GIONEE[ _-]?[a-z0-9]+|(?:Dream_D1|V188S?|GN[0-9]{3,4}[a-z]?)[);/ ]|F103(?: Pro)? Build|P5 mini Build|P7 Max Build|(M7 Power|F106L|F100A)[);/ ]'
   device: 'smartphone'
   models:
     - regex: 'GN810[);/ ]'
@@ -2811,14 +5233,16 @@ Gionee:
       device: 'phablet'
     - regex: 'GN([0-9]{3,4}[a-z]?)[);/ ]'
       model: 'GN$1'
-    - regex: 'V188S[);/ ]'
-      model: 'V188S'
-    - regex: 'V188[);/ ]'
-      model: 'V188'
+    - regex: '(F106L|F100A|V188S|V188)[);/ ]'
+      model: '$1'
     - regex: 'F103( Pro)? Build'
       model: 'F103$1'
+    - regex: 'M7 Power[);/ ]'
+      model: 'M7 Power'
     - regex: 'P5 mini Build'
       model: 'P5 mini'
+    - regex: 'P7 Max Build'
+      model: 'P7 Max'
     - regex: '(?:(?:GIO-)?GIONEE[ _-])?Dream_D1[);/ ]'
       model: 'Dream D1'
     - regex: '(?:GIO-)?GIONEE[ _-]([a-z0-9_-]+).*Android'
@@ -2848,14 +5272,14 @@ Vizio:
 
 # GOCLEVER
 GOCLEVER:
-  regex: 'GOCLEVER|QUANTUM|ARIES|INSIGNIA|ORION_|ELIPSO|LIBRA[ _]97'
+  regex: 'GOCLEVER|QUANTUM_[0-9]{3}|QUANTUM [0-9]{1}|QUANTUM 700N|QUANTUM_(1010N|1010M|900)|ARIES|INSIGNIA|ORION_|ELIPSO|LIBRA[ _]97'
   device: 'smartphone'
   models:
     - regex: 'QUANTUM_(1010N|1010M|900)'
       model: 'QUANTUM $1'
       device: 'tablet'
-    - regex: 'INSIGNIA_785_PRO'
-      model: 'INSIGNIA 785 PRO'
+    - regex: 'INSIGNIA_(785_PRO|1010M|800M)'
+      model: 'INSIGNIA $1'
       device: 'tablet'
     - regex: '(ORION|ARIES|ELIPSO)[_ ](71|101|102)'
       model: '$1 $2'
@@ -2863,7 +5287,7 @@ GOCLEVER:
     - regex: 'TQ700N'
       model: 'QUANTUM 700N'
       device: 'tablet'
-    - regex: '((?:QUANTUM|ARIES|INSIGNIA|ORION|ELIPSO)[ _-]?[^;/]+) Build'
+    - regex: '((?:QUANTUM|ARIES|INSIGNIA|ORION|ELIPSO)[ _-]?[^;/]+)(?: Build|\))'
       model: '$1'
     - regex: 'GOCLEVER[ _-]TAB[ _-]?([^;/]+) Build'
       model: 'TAB $1'
@@ -2906,7 +5330,7 @@ Goly:
 
 # Google
 Google:
-  regex: 'Nexus|GoogleTV|Glass|CrKey[^a-z0-9]|Pixel Build|Pixel (?:XL|C|2|[23] XL)'
+  regex: 'Nexus|GoogleTV|Glass(?<!Browser)|CrKey[^a-z0-9]|Pixel(?: Build|\))|Pixel (?:XL|C|[2-4]|[2-4] XL)|Google 2XL|G011A'
   device: 'smartphone'
   models:
     - regex: 'Glass'
@@ -2927,7 +5351,7 @@ Google:
     - regex: 'GoogleTV'
       device: 'tv'
       model: 'GoogleTV'
-    - regex: 'Pixel Build'
+    - regex: 'Pixel(?: Build|\))'
       model: 'Pixel'
     - regex: 'Pixel XL'
       model: 'Pixel XL'
@@ -2935,8 +5359,22 @@ Google:
       model: 'Pixel 3 XL'
     - regex: 'Pixel 2 XL'
       model: 'Pixel 2 XL'
-    - regex: 'Pixel 2'
+    - regex: 'Pixel 3a XL'
+      model: 'Pixel 3a XL'
+    - regex: 'Pixel 3a'
+      model: 'Pixel 3a'
+    - regex: 'Pixel 3'
+      model: 'Pixel 3'
+    - regex: 'Pixel 4 XL'
+      model: 'Pixel 4 XL'
+    - regex: 'pixel 4a'
+      model: 'Pixel 4a'
+    - regex: 'pixel 4'
+      model: 'Pixel 4'
+    - regex: 'Pixel 2|G011A'
       model: 'Pixel 2'
+    - regex: 'Google 2XL'
+      model: 'Pixel 2 XL'
     - regex: 'Pixel C'
       device: 'tablet'
       model: 'Pixel C'
@@ -2953,7 +5391,7 @@ Gradiente:
 
 # Grundig
 Grundig:
-  regex: 'GR?-TB[0-9]+[a-z]*|GRUNDIG|portalmmm/2\.0 G'
+  regex: 'GR?-TB[0-9]+[a-z]*|GRUNDIG|portalmmm/2\.0 G|AFTEU(?:011|014|FF014)'
   device: 'tv'
   models:
     - regex: '(GR?-TB[0-9]+[a-z]*)'
@@ -2963,12 +5401,36 @@ Grundig:
       model: '$1'
     - regex: 'portalmmm/2\.0 G([a-z0-9]+)'
       model: 'G$1'
+    - regex: 'AFTEU014'
+      model: 'Vision 7 4K (2019)'
+    - regex: 'AFTEUFF014'
+      model: 'OLED 4K (2019)'
+    - regex: 'AFTEU011'
+      model: 'Vision 6 HD (2019)'
+
+# Hafury
+Hafury:
+  regex: 'HAFURY'
+  device: 'smartphone'
+  models:
+    - regex: '(MIX|UMAX)'
+      model: '$1'
 
 # Haier
 Haier:
-  regex: 'Haier|(?:HW-)?W(?:716|757|860|970)[);/ ]|(?:PAD[ _](D71|G781|d85))'
+  regex: 'Haier|I6_Infinity|Titan[ _]T[13]|(?:HW-)?W(?:716|757|860|970)[);/ ]|(?:HM-)?(N505|N700|G(?:152|303|353|552|70[01])?-FL|HM-N501-FL|G(?:303)?-W|I(?:557)?-FL)|(?:PAD[ _](D71|G781|d85))'
   device: 'smartphone'
   models:
+    - regex: 'HM-N505-FL'
+      model: 'I8'
+    - regex: 'HM-N700-FL'
+      model: 'L7'
+    - regex: 'HM-N501-FL'
+      model: 'L56'
+    - regex: '(?:HM-)?(G(?:152|353|552|70[01])|G(?:303)|I(?:557))'
+      model: '$1'
+    - regex: '(Titan[_ ]T[13]|I6_Infinity)'
+      model: '$1'
     - regex: '(?:HW-)?W(716|757|860|970)[);/ ]'
       model: 'W$1'
     - regex: 'PAD[ -_](D71|G781|d85)'
@@ -3016,7 +5478,7 @@ Hasee:
 
 # Hisense
 Hisense:
-  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense [^);/]+|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*|E270BSA|M470BS[AE]|E2281|EG680'
+  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense [^);/]+|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*|E270BSA|HITV300C|M470BS[AE]|E2281|EG680|I46D1G|HAT4KDTV|HLTE([237]00T|200M|21[237]T|22[13]E|310M|510T)'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -3029,11 +5491,37 @@ Hisense:
     - regex: 'E2281'
       device: 'tablet'
       model: 'Sero 8'
+    - regex: 'HLTE700T'
+      model: 'A6'
+    - regex: 'HLTE221E'
+      model: 'E Max'
+    - regex: 'HLTE223E'
+      model: 'H30'
+    - regex: 'I46D1G'
+      model: 'Smartfren Andromax R'
     - regex: 'EG680'
       model: 'Smartfren Andromax Z'
-
+    - regex: 'HLTE200T[);/ ]'
+      model: 'F26'
+    - regex: 'HLTE213T[);/ ]'
+      model: 'King Kong 4'
+    - regex: 'HLTE217T[);/ ]'
+      model: 'F30S'
+    - regex: 'HLTE310M[);/ ]'
+      model: 'H18'
+    - regex: 'HLTE510T[);/ ]'
+      model: 'H20'
+    - regex: '(HLTE300T|HLTE200M|HLTE212T)[);/ ]'
+      model: '$1'
+    - regex: 'HITV300C[);/ ]'
+      model: 'E9'
     - regex: '(HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*)'
       model: '$1'
+
+    - regex: '(HAT4KDTV)[);/ ]'
+      device: 'tv'
+      model: '$1'
+
     - regex: '(?:HS-)?Hisense ([^;/]+) Build'
       model: '$1'
     - regex: 'Hisense ([^);/]+)'
@@ -3045,16 +5533,26 @@ Hi-Level:
   device: 'tablet'
   model: 'HLV-T$1'
 
-# Homtom
-Homtom:
-  regex: 'Homtom|(?:HT[0-9]{1,2})(?: ?Pro)? Build'
+# Hoffmann
+Hoffmann:
+  regex: '(HOFFMANN|Neo[_ ]A[1379]00)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: '(HT[0-9]{1,2}(?: ?Pro)?) Build'
-      model: '$1'
+    - regex: 'Neo[_ ](A[1379]00)'
+      model: 'Neo $1'
+    - regex: 'HOFFMANN[ _]X[-_ ](Prime|Twist|Max)'
+      model: 'X $1'
+
+
+# Homtom
+Homtom:
+  regex: 'Homtom|(?:HT[0-9]{1,2})(?: ?Pro)?[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(?:Homtom[_ ])?HT([0-9]{1,2}(?: ?Pro)?)[);/ ]'
+      model: 'HT$1'
     - regex: 'Homtom ([^;/]+) Build'
       model: '$1'
-
 # Hosin
 Hosin:
   regex: 'HOSIN[ _-]'
@@ -3065,152 +5563,640 @@ Hosin:
     - regex: 'HOSIN[ _-]([^;/]+)[;/)]'
       model: '$1'
 
+# Hoozo
+Hoozo:
+  regex: 'HOOZO[_ ](MT232|MT116|MT Pad 116 LTE|X1001)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Minix (minix.us)
+Minix:
+  regex: 'NEO-(?:X8-H|U9-H|X[57]-mini|X8H-PLUS|X88-?I|X7-216A|X5-116A|X[68]|U1|Z64)[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'NEO-X8-H[);/ ]'
+      model: 'NEO X8H'
+    - regex: 'NEO-X([57])-mini[);/ ]'
+      model: 'NEO X$1 Mini'
+    - regex: 'NEO-X8H-PLUS[);/ ]'
+      model: 'NEO X8H Plus'
+    - regex: 'NEO-X88-?I[);/ ]'
+      model: 'NEO X88i'
+    - regex: 'NEO-X7-216A[);/ ]'
+      model: 'NEO X7'
+    - regex: 'NEO-X5-116A[);/ ]'
+      model: 'NEO X5'
+    - regex: 'NEO-X([68])[);/ ]'
+      model: 'NEO X$1'
+    - regex: 'NEO-U1[);/ ]'
+      model: 'NEO U1'
+    - regex: 'NEO-Z64[);/ ]'
+      model: 'NEO Z64'
+    - regex: 'NEO-U9-H[);/ ]'
+      model: 'NEO U9H'
+
 # Huawei
 Huawei:
-  regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]?|(?:(?:ALE|ALP|ANE|ATU|BAC|BLN|BND|BLA|CAM|CHE[12]|CHM|CLT|COL|DLI|DRA|EML|EVA|FIG|FRD|SLA|STF|G621|H[36]0|KIW|LDN|LLD|LYA|MHA|MYA|NEO|NEM|PLE|PLK|PRA|RNE|SCL|SNE|TRT|VKY|VTR|WAS)-[A-Z]{0,2}[0-9]{1,4}[A-Z]?|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))[);/ ])|Bucare Y330-U05|hi6210sft'
+  regex: '(HW-)?(?:Huawei|MediaPad T1|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[23]?|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|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|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|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|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]|A23L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|NIC-LX1A|MRX-(AL09|W09)|CDY-([AT]N00|AN90)|GLK-[AT]L00|JER-[AT]N10|ELS-(?:[AT]N00|NX9)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-(AL00|LX9N)|NTS-AL00|ART-[AT]L00[xm]|JEF-[AT]N00|MED-(?:[AT]L00|LX9N)|EBG-AN[01]0|ANA-[AT]N00|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-AN00a?|TAH-AN00m|C8817D|T1-821W|d-01J|d-02[HK]|HWT31|Y320-U10|Y541-U02|VAT-L19|605HW'
   device: 'smartphone'
   models:
-    - regex: 'U(8230|8661|8667)[);/ ]'
-      model: 'U$1'
+    - regex: 'POT-[TA]L00a[);/ ]'
+      model: '9S'
+    - regex: 'U9500[);/ ]'
+      model: 'Ascend D1'
+    - regex: 'Z100-UL00[);/ ]'
+      model: 'Ascend D3'
+    - regex: 'Y320-(?:U10|T00|U05)[);/ ]'
+      model: 'Ascend Y320'
+    - regex: 'Y330-U05[);/ ]'
+      model: 'Ascend Y330'
+    - regex: 'Y541-U02[);/ ]'
+      model: 'Ascend Y5C'
+    - regex: 'U8818[);/ ]'
+      model: 'Ascend G300'
+    - regex: 'G527-U081[);/ ]'
+      model: 'Ascend G527'
+    - regex: '(G620S-L0[13]|C8817D)[);/ ]'
+      model: 'Ascend G620S'
+    - regex: 'G630-U251[);/ ]'
+      model: 'Ascend G630'
+    - regex: 'G7-(?:L01|TL00)[);/ ]'
+      model: 'Ascend G7'
+    - regex: 'G730-C00[);/ ]'
+      model: 'Ascend G730'
+    - regex: 'U9200[);/ ]'
+      model: 'Ascend P1'
+    - regex: 'H1711[);/ ]'
+      model: 'Ascend XT2'
+    - regex: 'Y221-U(?:[12]2|[0345]3)[);/ ]'
+      model: 'Ascend Y221'
+    - regex: 'Y550-L03[);/ ]'
+      model: 'Ascend Y550'
+    - regex: 'ART-[AT]L00[xm][);/ ]'
+      model: 'Enjoy 10'
+    - regex: 'STK-[AT]L00[);/ ]'
+      model: 'Enjoy 10 Plus'
+    - regex: 'MED-[AT]L00[);/ ]'
+      model: 'Enjoy 10E'
+    - regex: 'AQM-[AT]L00[);/ ]'
+      model: 'Enjoy 10S'
+    - regex: 'TAG-[ACT]L00[);/ ]'
+      model: 'Enjoy 5S'
+    - regex: 'NCE-(AL[10]0|TL10)[);/ ]'
+      model: 'Enjoy 6'
+    - regex: 'DIG-(?:TL10|AL00)[);/ ]'
+      model: 'Enjoy 6S'
+    - regex: 'SLA-(?:AL00|TL10)[);/ ]'
+      model: 'Enjoy 7'
+    - regex: 'FIG-(?:[AT]L[10]0)[);/ ]'
+      model: 'Enjoy 7S'
+    - regex: 'TRT-AL00[A]?[);/ ]'
+      model: 'Enjoy 7 Plus'
+    - regex: 'LDN-(?:AL[12]0|TL[02]0)[);/ ]'
+      model: 'Enjoy 8'
+    - regex: 'FLA-AL10[);/ ]'
+      model: 'Enjoy 8 Plus'
+    - regex: 'ATU-[AT]L10[);/ ]'
+      model: 'Enjoy 8e'
+    - regex: 'MRD-[TA]L00[);/ ]'
+      model: 'Enjoy 9e'
+    - regex: 'U8665[);/ ]'
+      model: 'Fusion 2'
+    - regex: 'MED-LX9N[);/ ]'
+      model: 'Y6p'
+    - regex: 'G735-L(?:03|12|23)[);/ ]'
+      model: 'G Play'
+    - regex: 'CHC-U(?:0[13]|23)[);/ ]'
+      model: 'G Play Mini'
+    - regex: '(?:Honor_|HW-)?G621-TL00M?[);/ ]'
+      model: 'G621'
+    - regex: 'DIG-L2[12][);/ ]'
+      model: 'GR3 (2017)'
+    - regex: 'KII-L21[);/ ]'
+      model: 'GR5'
+    - regex: 'BLL-L2[12][);/ ]'
+      model: 'GR5 (2017)'
+    - regex: 'RIO-L03[);/ ]'
+      model: 'GX8'
+    - regex: 'U8860[);/ ]'
+      model: 'Honor'
+    - regex: 'COL-(?:AL[01]0|TL[01]0|L29)[);/ ]'
+      model: 'Honor 10'
+    - regex: 'HRY-(?:[AT]L00[A]?|LX[12]|LX1MEB)[);/ ]'
+      model: 'Honor 10 Lite'
+    - regex: 'HRY-LX1T[);/ ]'
+      model: 'Honor 10I'
+    - regex: 'U9508[);/ ]'
+      model: 'Honor 2'
+    - regex: 'YAL-(?:L21|[AT]L00)[);/ ]'
+      model: 'Honor 20'
+    - regex: 'LRA-AL00[);/ ]'
+      model: 'Honor 20 Lite'
+    - regex: '(HRY-AL00T[a]?)[);/ ]'
+      model: 'Honor 20I'
+    - regex: 'YAL-(L41|AL10)[);/ ]'
+      model: 'Honor 20 Pro'
+    - regex: '(MAR-LX1H|YAL-AL50)[);/ ]'
+      model: 'Honor 20S'
+    - regex: 'BMH-AN[12]0[);/ ]'
+      model: 'Honor 30'
+    - regex: 'EBG-AN00[);/ ]'
+      model: 'Honor 30 Pro'
+    - regex: 'EBG-AN10[);/ ]'
+      model: 'Honor 30 Pro Plus'
+    - regex: 'CDY-AN90[);/ ]'
+      model: 'Honor 30S'
+    - regex: '(?:Honor_|HW-)?H30-(?:C00|L01M?|L02|U10|T00|T10)(?:_TD)?[);/ ]'
+      model: 'Honor 3C'
+    - regex: 'Hol-U19[);/ ]'
+      model: 'Honor 3C Lite'
+    - regex: 'G750-T01[);/ ]'
+      model: 'Honor 3X'
+    - regex: '(?:Honor_|HW-)?SCL-(?:AL00|CL00|TL00H?)(?:_TD)?[);/ ]'
+      model: 'Honor 4A'
+    - regex: '(?:Honor_|HW-)?CHM-U01(?:_TD)?[);/ ]'
+      model: 'Honor 4C'
+    - regex: 'AQM-AL10[);/ ]'
+      model: 'Honor 4T Pro'
+    - regex: '(CHE2?-[UT]L00[HM]?|CHE1-CL[12]0|CHE2-L(?:1[12]|23)|Che1-L04|CHE-TL00)[);/ ]'
+      model: 'Honor 4X'
+    - regex: '(?:Honor_|HW-)?CUN-[AT]L00[);/ ]'
+      model: 'Honor 5 Play'
+    - regex: '(?:Honor_|HW-)?CAM-(?:AL00|TL00H|TL00)(?:_TD)?[);/ ]'
+      model: 'Honor 5A'
+    - regex: '(?:Honor_|HW-)?NEM-(?:AL10|L51|UL10|TL00)[);/ ]'
+      model: 'Honor 5C'
+    - regex: '(?:Honor_|HW-)?NEM-(?:L22|TL00H)[);/ ]'
+      model: 'Honor 5C Dual SIM'
+    - regex: '(?:Honor_|HW-)?KIW-(?:AL10|TL00H|[TC]L00|L2[1-4]|UL00)(?:_TD)?[);/ ]'
+      model: 'Honor 5X'
+    - regex: '((?:Honor_|HW-)?H60-L(?:01|02|03|04|11|12)(?:_TD)?|HW-H60-J1)[);/ ]'
+      model: 'Honor 6'
+    - regex: 'MYA-TL10[);/ ]'
+      model: 'Honor 6 Play'
+    - regex: 'PE-(UL00|TL[12]0|TL00M)[);/ ]'
+      model: 'Honor 6 Plus'
+    - regex: '(?:HONOR[ _]?)?DLI-(?:AL10|L[24]2|TL20)[);/ ]'
+      model: 'Honor 6A'
+    - regex: 'DIG-L21HN[);/ ]'
+      model: 'Honor 6C'
+    - regex: 'JMM-L22[);/ ]'
+      model: 'Honor 6C Pro'
+    - regex: '(?:HONOR[ _]?)?BLN-(?:L2[124]|AL[1234]0|TL[01]0[);/ ])'
+      model: 'Honor 6X'
+    - regex: '(?:Honor[_]?|HW-)?PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)[);/ ]'
+      model: 'Honor 7'
+    - regex: '(?:Honor_|HW-)?NEM-L21[);/ ]'
+      model: 'Honor 7 Lite'
+    - regex: 'AUM-(?:AL[20]0|L33[A]?|TL20)[);/ ]'
+      model: 'Honor 7A'
+    - regex: 'AUM-L29[);/ ]'
+      model: 'Honor 7A Pro'
+    - regex: '(?:Honor_|HW-)?(?:LND-(?:AL[34]0|L29|TL40)|AUM-L41)[);/ ]'
+      model: 'Honor 7C'
+    - regex: 'ATH-(?:AL00|UL00|TL00H)[);/ ]'
+      model: 'Honor 7i'
+    - regex: '(?:Honor_|HW-)?DUA-(?:L22|LX3)[);/ ]'
+      model: 'Honor 7S'
+    - regex: '(?:HONOR[ _]?)?BND-(?:AL[01]0|TL10|L2[14]|L31)[);/ ]'
+      model: 'Honor 7X'
+    - regex: '(?:FRD-(?:AL[01]0|L0[249]|L1[49]|DL00)|VAT-L19)[);/ ]'
+      model: 'Honor 8'
+    - regex: 'PRA-(?:AL00X|AL00|TL10)[);/ ]'
+      model: 'Honor 8 Lite'
+    - regex: 'DUK-(?:L09|TL30)[);/ ]'
+      model: 'Honor 8 Pro'
+    - regex: 'VEN-L22[);/ ]'
+      model: 'Honor 8 Smart'
+    - regex: 'JAT-L(29|X[13])[);/ ]'
+      model: 'Honor 8A'
+    - regex: 'JAT-L41[);/ ]'
+      model: 'Honor 8A Pro'
+    - regex: 'BKK-(?:AL[10]0|L21|L22|LX2|TL00)[);/ ]'
+      model: 'Honor 8C'
+    - regex: 'KSA-(LX[29]|AL00)[);/ ]'
+      model: 'Honor 8S'
+    - regex: 'JSN-L(?:2[123]|42)|JSN-[TA]L00[a]?[);/ ]'
+      model: 'Honor 8X'
+    - regex: 'ARE-(?:AL[10]0|L22HN|TL00)[);/ ]'
+      model: 'Honor 8X Max'
+    - regex: 'STF-(?:AL[10]0|L09|TL10)[);/ ]'
+      model: 'Honor 9'
+    - regex: 'MOA-LX9N[);/ ]'
+      model: 'Honor 9A'
+    - regex: 'AKA-L29[);/ ]'
+      model: 'Honor 9C'
+    - regex: 'LLD-(?:AL[01]0|L[23]1|TL10)[);/ ]'
+      model: 'Honor 9 Lite'
+    - regex: 'LLD-AL[23]0[);/ ]'
+      model: 'Honor 9i'
+    - regex: 'DUA-LX9[);/ ]'
+      model: 'Honor 9S'
+    - regex: 'HLK-AL00a?[);/ ]'
+      model: 'Honor 9X'
+    - regex: 'HLK-AL10[);/ ]'
+      model: 'Honor 9X Pro'
+    - regex: 'CAM-UL00[);/ ]'
+      model: 'Honor Holly 3'
+    - regex: 'NTS-AL00[);/ ]'
+      model: 'Honor Magic'
+    - regex: 'TNY-[AT]L00[);/ ]'
+      model: 'Honor Magic 2'
+    - regex: 'RVL-AL09[);/ ]'
+      model: 'Honor Note 10'
+    - regex: 'EDI-AL10[);/ ]'
+      model: 'Honor Note 8'
+    - regex: 'VKY-TL00[);/ ]'
+      model: 'Honor P10 Plus'
+    - regex: 'VOG-AL00[);/ ]'
+      model: 'Honor P30 Pro'
+    - regex: 'ANA-[AT]N00[);/ ]'
+      model: 'Honor P40'
+    - regex: 'COR-(?:AL[01]0|L29|TL10)[);/ ]'
+      model: 'Honor Play'
+    - regex: 'ASK-AL00x[);/ ]'
+      model: 'Honor Play 3'
+    - regex: 'KSA-AL10[);/ ]'
+      model: 'Honor Play 3E'
+    - regex: 'CHM-[CUT]L00[HM]?[);/ ]'
+      model: 'Honor Play 4C'
+    - regex: 'AKA-AL10[);/ ]'
+      model: 'Honor Play 4T'
+    - regex: 'DUA-[TA]L00[);/ ]'
+      model: 'Honor Play 7'
+    - regex: 'JAT-[AT]L00[);/ ]'
+      model: 'Honor Play 8A'
+    - regex: 'MOA-AL00[);/ ]'
+      model: 'Honor Play 9A'
+    - regex: 'BKL-(?:AL00|AL20|AL30|L09|TL10)[);/ ]'
+      model: 'Honor V10'
+    - regex: 'PCT-[TA]L10[);/ ]'
+      model: 'Honor V20'
+    - regex: 'KNT-(?:AL[12]0|[TU]L10)[);/ ]'
+      model: 'Honor V8'
+    - regex: 'DUK-AL20[);/ ]'
+      model: 'Honor V9'
+    - regex: 'JMM-[AT]L[01]0[);/ ]'
+      model: 'Honor V9 Play'
+    - regex: 'BKL-L04[);/ ]'
+      model: 'Honor View 10'
+    - regex: 'PCT-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(01|32)(?:_TD)?[);/ ]'
+      model: 'Honor Y6'
+    - regex: '(?:Honor_|HW-)?LYO-L21[);/ ]'
+      model: 'Honor Y6 II Compact'
+    - regex: 'TEL-AN00a?[);/ ]'
+      model: 'Honor X10'
     - regex: 'U8500[);/ ]'
       model: 'Ideos X2'
     - regex: 'U8510[);/ ]'
       model: 'Ideos X3'
-    - regex: 'U8665[);/ ]'
-      model: 'Fusion 2'
     - regex: 'U8800[);/ ]'
       model: 'Ideos X5'
-    - regex: 'U8818[);/ ]'
-      model: 'Ascend G300'
-    - regex: 'U8860[);/ ]'
-      model: 'Honor'
-    - regex: 'U9200[);/ ]'
-      model: 'Ascend P1'
-    - regex: 'U9500[);/ ]'
-      model: 'Ascend D1'
-    - regex: 'U9508[);/ ]'
-      model: 'Honor 2'
-    - regex: 'CHE2?-[UT]L00[HM]?|CHE1-CL[12]0|CHE2-L11'
-      model: 'Honor 4X'
-    - regex: 'CHM-[CUT]L00[HM]?'
-      model: 'Honor Play 4C'
-    - regex: 'DUK-AL20'
-      model: 'Honor V9'
-    - regex: '(?:Honor_|HW-)?G621-TL00M?[);/ ]'
-      model: 'G621'
-    - regex: '(?:Honor_|HW-)?H30-(?:C00|L01M?|L02|U10|T00|T10)(?:_TD)?[);/ ]'
-      model: 'Honor 3C'
-    - regex: '(?:Honor_|HW-)?SCL-(?:AL00|CL00|TL00H?)(?:_TD)?[);/ ]'
-      model: 'Honor 4A'
-    - regex: '(?:Honor_|HW-)?CAM-TL00(?:_TD)?[);/ ]'
-      model: 'Honor 5A'
-    - regex: '(?:Honor_|HW-)?KIW-(?:TL00H|L21)(?:_TD)?[);/ ]'
-      model: 'Honor 5X'
-    - regex: '(?:Honor_|HW-)?CHM-U01(?:_TD)?[);/ ]'
-      model: 'Honor 4C'
-    - regex: '(?:Honor_|HW-)?H60-L(?:01|02|03|04|11|12)(?:_TD)?[);/ ]'
-      model: 'Honor 6'
-    - regex: '(?:Honor_|HW-)?SCL-L01(?:_TD)?[);/ ]'
-      model: 'Honor Y6'
-    - regex: '(?:Honor_|HW-)?PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)[);/ ]'
-      model: 'Honor 7'
-    - regex: '(?:Honor_|HW-)?LND-AL[34]0[);/ ]'
-      model: 'Honor 7C'
-    - regex: '(?:Honor_|HW-)?NEM-L51[);/ ]'
-      model: 'Honor 5C'
-    - regex: '(?:Honor_|HW-)?NEM-L22[);/ ]'
-      model: 'Honor 5C Dual SIM'
-    - regex: '(?:Honor_|HW-)?NEM-L21[);/ ]'
-      model: 'Honor 7 Lite'
-    - regex: '(?:HONOR[ _]?)?DLI-(?:AL10|L[24]2|TL20)'
-      model: 'Honor 6A'
-    - regex: '(?:HONOR[ _]?)?BLN-(?:L2[124]|AL[13]0)'
-      model: 'Honor 6X'
-    - regex: '(?:HONOR[ _]?)?BND-(?:AL10|L21)'
-      model: 'Honor 7X'
-    - regex: 'FRD-(AL00|L09)'
-      model: 'Honor 8'
-    - regex: 'PRA-AL00X'
-      model: 'Honor 8 Lite'
-    - regex: 'STF-(AL10|L09)'
-      model: 'Honor 9'
-    - regex: 'LLD-AL20'
-      model: 'Honor 9i'
-    - regex: 'LLD-(?:AL[01]0|L31)'
-      model: 'Honor 9 Lite'
-    - regex: 'COL-(?:AL[01]0|TL[01]0|L29)'
-      model: 'Honor 10'
-    - regex: 'GRA-L09'
-      model: 'P8'
-    - regex: 'ALE-L(?:02|21|23)'
-      model: 'P8 Lite (2015)'
-    - regex: 'PRA-L[AX]1|hi6210sft'
-      model: 'P8 Lite (2017)'
-    - regex: 'RNE-L22'
-      model: 'Nova 2I'
-    - regex: 'ANE-AL00'
-      model: 'Nova 3e'
-    - regex: 'EVA-L[012]9'
-      model: 'P9'
-    - regex: 'VNS-L[23]1'
-      model: 'P9 Lite'
-    - regex: 'SLA-L(02|03|22)'
-      model: 'P9 Lite Mini'
-    - regex: 'VTR-(?:L[02]9|AL00|TL00)'
-      model: 'P10'
-    - regex: 'WAS-L(?:X1|X1A|X2|X2J|X3|03T)'
-      model: 'P10 Lite'
-    - regex: 'BAC-L[02]3'
-      model: 'P10 Selfie'
-    - regex: 'VKY-(?:AL00|L09|L29)'
-      model: 'P10 Plus'
-    - regex: 'EML-(?:AL00|L09|L29)'
-      model: 'P20'
-    - regex: 'ANE-LX[123]'
-      model: 'P20 Lite'
-    - regex: 'CLT-L[02]9'
-      model: 'P20 Pro'
-    - regex: 'FIG-LX1'
-      model: 'P smart'
-    - regex: 'CAM-L(?:03|21)'
-      model: 'Y6II'
-    - regex: 'TRT-LX1'
-      model: 'Y7 (2017)'
-    - regex: 'LDN-L(?:01|X3)'
-      model: 'Y7 (2018)'
-    - regex: 'LDN-(?:AL00|L21)'
-      model: 'Y7 Prime'
-    - regex: 'MHA-(?:L[02]9|AL00)'
-      model: 'Mate 9'
-    - regex: 'ALP-AL00'
+    - regex: 'MLA-AL10[);/ ]'
+      model: 'Maimang 5'
+    - regex: 'POT-AL10[);/ ]'
+      model: 'Maimang 8'
+    - regex: 'TAH-AN00m[);/ ]'
+      model: 'Mate XS'
+    - regex: 'ALP-(?:[TA]L00|L[02]9)[);/ ]'
       model: 'Mate 10'
-    - regex: 'RNE-L(?:03|21)'
+    - regex: 'RNE-(?:AL00|L(?:01|03|21|23))[);/ ]'
       model: 'Mate 10 Lite'
-    - regex: 'BLA-(?:L[02]9|AL00)'
+    - regex: 'BLA-(?:A09|L[02]9|[TA]L00)[);/ ]'
       model: 'Mate 10 Pro'
-    - regex: 'LYA-L(09|29)'
-      model: 'Mate 20 Pro'
-    - regex: 'SNE-LX[0-3]'
+    - regex: 'HMA-(?:[AT]L00|L[02]9)[);/ ]'
+      model: 'Mate 20'
+    - regex: 'SNE-(?:AL00|LX[0-3])[);/ ]'
       model: 'Mate 20 Lite'
-    - regex: 'NEO-AL00'
+    - regex: 'LYA-(?:AL[01]0|L[02]9|L0C|TL00)[);/ ]'
+      model: 'Mate 20 Pro'
+    - regex: 'LYA-AL00P[);/ ]'
+      model: 'Mate 20 RS'
+    - regex: 'EVR-(?:[TA]L00|L29|N29|AN00)[);/ ]'
+      model: 'Mate 20 X'
+    - regex: 'TAS-([AT]L00|L29)[);/ ]'
+      model: 'Mate 30'
+    - regex: 'TAS-AN00[);/ ]'
+      model: 'Mate 30 5G'
+    - regex: 'SPN-AL00[);/ ]'
+      model: 'Mate 30 Lite'
+    - regex: 'LIO-(?:[TA]L00|L29|AN00)[);/ ]'
+      model: 'Mate 30 Pro'
+    - regex: 'NXT-(?:AL10|L29)[);/ ]'
+      model: 'Mate 8'
+    - regex: 'MHA-(?:L[02]9|[AT]L00)[);/ ]'
+      model: 'Mate 9'
+    - regex: 'BLL-L23[);/ ]'
+      model: 'Mate 9 Lite'
+    - regex: 'LON-(?:AL00|L29)[);/ ]'
+      model: 'Mate 9 Pro'
+    - regex: 'NEO-AL00[);/ ]'
       model: 'Mate RS'
-    - regex: 'Bucare Y330-U05'
-      model: 'Y330-U05'
-    - regex: 'MYA-L11'
-      model: 'Y6 (2016)'
-    - regex: 'MYA-L22'
+    - regex: 'NEO-L29[);/ ]'
+      model: 'Mate RS Porsche Design'
+    - regex: 'CRR-(?:L09|UL00)[);/ ]'
+      model: 'Mate S'
+    - regex: 'BND-L34[);/ ]'
+      model: 'Mate SE'
+    - regex: '(CAZ-(?:AL[01]0|TL[12]0)|CAN-L[01][1-3])[);/ ]'
+      model: 'Nova'
+    - regex: '(?:PIC-(?:[AT]L00|LX9)|HWV31)[);/ ]'
+      model: 'Nova 2'
+    - regex: '704HW[);/ ]'
+      model: 'Nova 2 Lite'
+    - regex: 'BAC-(?:L01|TL00)[);/ ]'
+      model: 'Nova 2 Plus'
+    - regex: 'BAC-(?:AL00|L2[12])[);/ ]'
+      model: 'Nova 2 Plus Dual SIM'
+    - regex: 'RNE-L[02]2[);/ ]'
+      model: 'Nova 2I'
+    - regex: 'HWI-[AT]L00[);/ ]'
+      model: 'Nova 2S'
+    - regex: 'PAR-(?:[AT]L00|LX[19]|TL20)[);/ ]'
+      model: 'Nova 3'
+    - regex: 'ANE-AL00[);/ ]'
+      model: 'Nova 3e'
+    - regex: 'INE-(?:AL00|LX1r|LX[12]|TL00)[);/ ]'
+      model: 'Nova 3i'
+    - regex: 'VCE-(L22|[AT]L00)[);/ ]'
+      model: 'Nova 4'
+    - regex: 'MAR-AL00[);/ ]'
+      model: 'Nova 4e'
+    - regex: 'SEA-AL00[);/ ]'
+      model: 'Nova 5'
+    - regex: 'SEA-AL10[);/ ]'
+      model: 'Nova 5 Pro'
+    - regex: 'GLK-[AT]L00[);/ ]'
+      model: 'Nova 5i'
+    - regex: 'SPN-TL00[);/ ]'
+      model: 'Nova 5i Pro'
+    - regex: 'WLZ-AL10[);/ ]'
+      model: 'Nova 6'
+    - regex: 'WLZ-AN00[);/ ]'
+      model: 'Nova 6 5G'
+    - regex: 'JNY-AL10[);/ ]'
+      model: 'Nova 6 SE'
+    - regex: 'JEF-[AT]N00[);/ ]'
+      model: 'Nova 7 5G'
+    - regex: 'JER-[AT]N10[);/ ]'
+      model: 'Nova 7 Pro 5G'
+    - regex: 'CDY-[AT]N00[);/ ]'
+      model: 'Nova 7 SE 5G'
+    - regex: 'JNY-LX2[);/ ]'
+      model: 'Nova 7i'
+    - regex: 'DIG-L01[);/ ]'
+      model: 'Nova Smart'
+    - regex: 'WAS-AL00[);/ ]'
+      model: 'Nova Youth'
+    - regex: 'FIG-L(?:A1|X[123])[);/ ]'
+      model: 'P smart'
+    - regex: 'POT-(?:LX(?:[13]|2J|1AF)|AL00)[);/ ]'
+      model: 'P smart (2019)'
+    - regex: 'STK-LX1[);/ ]'
+      model: 'P smart Z'
+    - regex: 'VTR-(?:L[02]9|AL00|TL00)[);/ ]'
+      model: 'P10'
+    - regex: 'WAS-(?:L(?:X1|X1A|X2|X2J|X3|03T)|TL10)[);/ ]'
+      model: 'P10 Lite'
+    - regex: 'VKY-(?:AL00|L09|L29)[);/ ]'
+      model: 'P10 Plus'
+    - regex: 'BAC-L[02]3[);/ ]'
+      model: 'P10 Selfie'
+    - regex: 'EML-(?:[TA]L00|L[02]9)[);/ ]'
+      model: 'P20'
+    - regex: '(?:ANE-(?:LX[123]|LX2J|TL00)|HWV32)[);/ ]'
+      model: 'P20 Lite'
+    - regex: '(?:CLT-(?:AL0[01]|TL0[01]|L(?:04|[02]9))|HW-01K)[);/ ]'
+      model: 'P20 Pro'
+    - regex: '(ELE-L(?:04|09|29)|ELE-[AT]L00)[);/ ]'
+      model: 'P30'
+    - regex: '(?:MAR-(?:LX(?:1[BM]|2J?|3BM)|TL00)|NIC-LX1A|HWV33)[);/ ]'
+      model: 'P30 Lite'
+    - regex: 'MAR-LX[13]A[);/ ]'
+      model: 'P30 Lite Dual SIM'
+    - regex: '(?:VOG-(?:L(?:04|09|29)|TL00|AL10)|HW-02L)[);/ ]'
+      model: 'P30 Pro'
+    - regex: 'JNY-LX1[);/ ]'
+      model: 'P40 Lite'
+    - regex: 'ELS-(?:[AT]N00|NX9)[);/ ]'
+      model: 'P40 Pro'
+    - regex: 'GRA-(?:L09|UL00)[);/ ]'
+      model: 'P8'
+    - regex: '(?:ALE-L(?:02|21|23)|ALE-UL00|ALE-TL00)[);/ ]'
+      model: 'P8 Lite (2015)'
+    - regex: '(?:PRA-L(?:A1|X2|X1|X3)|hi6210sft)[);/ ]'
+      model: 'P8 Lite (2017)'
+    - regex: 'EVA-(?:AL[10]0|L[012]9|[TCD]L00)[);/ ]'
+      model: 'P9'
+    - regex: 'VNS-L(?:[23]1|[26]2)[);/ ]'
+      model: 'P9 Lite'
+    - regex: 'SLA-L(?:02|03|22|23)[);/ ]'
+      model: 'P9 Lite Mini'
+    - regex: 'DIG-L(?:03|23)[);/ ]'
+      model: 'P9 Lite Smart'
+    - regex: 'VIE-(?:AL10|L[02]9)[);/ ]'
+      model: 'P9 Plus'
+    - regex: 'ATH-UL0[16][);/ ]'
+      model: 'ShotX'
+    - regex: 'U(8230|8661|8667)[);/ ]'
+      model: 'U$1'
+    - regex: 'ARS-([AT]L00|L22)[);/ ]'
+      model: 'Y Max'
+    - regex: 'CRO-(?:L[02]2|U00)[);/ ]'
+      model: 'Y3 (2017)'
+    - regex: 'CAG-L[02]2[);/ ]'
+      model: 'Y3 (2018)'
+    - regex: 'LUA-(U22|L2[12]|U03)[);/ ]'
+      model: 'Y3II'
+    - regex: 'MYA-(?:L(?:02|03|2[23])|U29)[);/ ]'
       model: 'Y5 (2017)'
-    - regex: 'DRA-L(01|03|21|23)'
+    - regex: 'DRA-L(?:01|03|21|23|X3)[);/ ]'
       model: 'Y5 (2018)'
-    - regex: 'T1-A21w'
+    - regex: 'AMN-LX[129][);/ ]'
+      model: 'Y5 (2019)'
+    - regex: 'DRA-LX5[);/ ]'
+      model: 'Y5 lite'
+    - regex: 'CRO-L[02]3[);/ ]'
+      model: 'Y5 Lite (2017)'
+    - regex: 'CAG-L[02]3[);/ ]'
+      model: 'Y5 Lite (2018)'
+    - regex: 'DRA-(?:LX2|[AT]L00)[);/ ]'
+      model: 'Y5 Prime (2018)'
+    - regex: 'MYA-L13[);/ ]'
+      model: 'Y5 Pro (2017)'
+    - regex: 'CUN-(?:L(?:0[123]|2[123]|33)|U29)[);/ ]'
+      model: 'Y5II'
+    - regex: 'SCC-U21[);/ ]'
+      model: 'Y6'
+    - regex: 'MYA-L11[);/ ]'
+      model: 'Y6 (2016)'
+    - regex: 'MYA-(L41|AL10)[);/ ]'
+      model: 'Y6 (2017)'
+    - regex: 'ATU-L(?:11|21|22|X3)[);/ ]'
+      model: 'Y6 (2018)'
+    - regex: 'MRD-L(?:X1[NF]?|X3)[);/ ]'
+      model: 'Y6 (2019)'
+    - regex: 'ATU-L(?:31|42)[);/ ]'
+      model: 'Y6 Prime (2018)'
+    - regex: 'TIT-(?:AL00|L01|U02)[);/ ]'
+      model: 'Y6 Pro'
+    - regex: 'MRD-LX2[);/ ]'
+      model: 'Y6 Pro (2019)'
+    - regex: 'MED-LX9[);/ ]'
+      model: 'Y6p'
+    - regex: 'Y625-U03[);/ ]'
+      model: 'Y625'
+    - regex: 'Y635-L0[123][);/ ]'
+      model: 'Y635'
+    - regex: 'Y635-L21[);/ ]'
+      model: 'Y635 Dual SIM'
+    - regex: 'CAM-L(?:03|21|23|32)[);/ ]'
+      model: 'Y6II'
+    - regex: 'TRT-LX[123][);/ ]'
+      model: 'Y7 (2017)'
+    - regex: 'LDN-L(?:01|X3)[);/ ]'
+      model: 'Y7 (2018)'
+    - regex: 'DUB-(?:LX[13]|TL00)[);/ ]'
+      model: 'Y7 (2019)'
+    - regex: '(LDN-(?:AL00|L21)|TRT-TL10)[);/ ]'
+      model: 'Y7 Prime'
+    - regex: '(LDN-(?:LX2|TL10)|TRT-(?:L21A|L53))[);/ ]'
+      model: 'Y7 Prime (2018)'
+    - regex: 'DUB-(?:LX2|AL00)[);/ ]'
+      model: 'Y7 Pro (2019)'
+    - regex: 'DUB-AL20[);/ ]'
+      model: 'Y7 Pro (2019)'
+    - regex: 'AQM-LX1[);/ ]'
+      model: 'Y8p'
+    - regex: 'FLA-(LX[123]|AL20|TL10)[);/ ]'
+      model: 'Y9 (2018)'
+    - regex: 'JKM-(?:[TA]L00|LX[123])[);/ ]'
+      model: 'Y9 (2019)'
+    - regex: 'STK-(L2[12]|LX3)[);/ ]'
+      model: 'Y9 Prime (2019)'
+
+    - regex: 'HWT31[);/ ]'
+      model: 'Qua Tab 02 10.1"'
       device: 'tablet'
-      model: 'Honor Tablet Note'
-    - regex: 'PLE-70[13]L'
+    - regex: 'HDN-[LW]09[);/ ]'
+      model: 'Honor Water Play 10.1'
+      device: 'tablet'
+    - regex: 'BAH3-AL00[);/ ]'
+      model: 'MatePad 10.4'
+      device: 'tablet'
+    - regex: 'HDL-(?:W09|AL09)[);/ ]'
+      model: 'Honor Water Play 8.0'
+      device: 'tablet'
+    - regex: 'JDN-(?:AL00|W09)[);/ ]'
+      model: 'Honor Pad 2'
+      device: 'tablet'
+    - regex: 'MON-(W|AL)19[);/ ]'
+      device: 'tablet'
+      model: 'MatePad C5 8'
+    - regex: 'BZA-W00[);/ ]'
+      device: 'tablet'
+      model: 'C3 9.6'
+    - regex: 'M2-801L[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M2 8.0"'
+    - regex: 'MRX-(AL09|W09)[);/ ]'
+      device: 'tablet'
+      model: 'MatePad Pro'
+    - regex: 'CMR-(?:AL[01]9|W09)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M5 10.8'
+    - regex: 'CMR-W19[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M5 Pro 10.8'
+    - regex: 'SCM-AL09[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M5 Pro'
+    - regex: 'GEM-70[1-3]L[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad X2'
+    - regex: '(?:JDN2-(:?[WL]09|AL[50]0)|BAH2-(?:AL[01]0|L09|W[01]9))[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M5 Lite'  #8.4
+    - regex: 'SHT-(?:AL|W)09[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M5 8.4'
+    - regex: 'VRD-(?:(AL|W)09|AL10|W10)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M6 8.4'
+    - regex: 'SCM-W09[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M6 10'
+    - regex: 'BTV-W09[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M3 8'
+    - regex: '(BAH-W09|CPN-(?:L|W)09|CPN-AL00)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M3 Lite'
+    - regex: '(BAH-(?:L09|AL00)|BAH3-W09)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad M3 Lite 10'
+    - regex: 'BTV-DL09'
+      device: 'tablet'
+      model: 'MediaPad M3'
+    - regex: '(AGS2-AL00|JDN2-W09)HN[);/ ]'
+      device: 'tablet'
+      model: 'Honor Tab 5'
+    - regex: 'AGS2-(?:[LW]09|L03)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T5 10'
+    - regex: 'AGS-(?:L0[39]|W09)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T3 10'
+    - regex: '(KOB-(?:L|W)09|BZK-[LW]00)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T3 8'
+    - regex: 'BG2-(?:U0[13]|W09)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T3 7'
+    - regex: 'BGO-L03[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T2 7.0'
+    - regex: '(?:BGO-DL09|PLE-70[13]L)[);/ ]'
       device: 'tablet'
       model: 'MediaPad T2 7.0 Pro'
-    - regex: 'T1-A21L'
+    - regex: 'JDN-L01[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T2 8.0 Pro'
+    - regex: '(?:FDR-(A01[LW]|A03L)|605HW)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T2 10.0" Pro'
+    - regex: 'T1-(?:A21[LW]|A23L)[);/ ]'
       device: 'tablet'
       model: 'MediaPad T1 10'
+    - regex: 'T1-701u[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T1 7'
+    - regex: '(?:T1-82(?:3L|1W)|MediaPad T1 8.0)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad T1 8'
+    - regex: 'AGS2-AL00[);/ ]'
+      device: 'tablet'
+      model: 'Enjoy Tablet 10.1'
+    - regex: 'BZT-(W09|AL[01]0)[);/ ]'
+      device: 'tablet'
+      model: 'MediaPad C5 10.1'
+    - regex: '(?:d-01J|d-02[HK])[);/ ]'
+      device: 'tablet'
+      model: 'D Tab Compact'
+
+
+      # smart watch regex
+    - regex: 'LEO-BX9[);/ ]'
+      device: 'wearable'
+      model: 'Smart Watch 2'
+
+      # common regex
     - regex: '(MediaPad[^/;]*) Build'
       device: 'tablet'
       model: '$1'
@@ -3228,15 +6214,19 @@ Huawei:
 
 # Hyundai
 Hyundai:
-  regex: 'Hyundai|Ultra Air|Ultra Live'
+  regex: 'Hyundai|Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|G(24027|2552[34])K|W25042L'
   device: 'smartphone'
   models:
-    - regex: 'Ultra Live II'
-      model: 'Ultra Live II'
-    - regex: 'Ultra Live'
-      model: 'Ultra Live'
-    - regex: 'Ultra Air'
-      model: 'Ultra Air'
+    - regex: 'Ultra (Active|Air|Charm|Dream|Energy Lite|Energy Plus|Energy|Latitude|Link|Live II|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)'
+      model: 'Ultra $1'
+    - regex: 'G25523K'
+      model: 'Eternity G23'
+    - regex: 'G25524K'
+      model: 'Eternity G24'
+    - regex: 'G24027K'
+      model: 'Eternity G27'
+    - regex: 'W25042L'
+      model: 'Eternity W42'
     - regex: 'Hyundai ([^;/]+) Build'
       model: '$1'
       device: 'tablet'
@@ -3278,10 +6268,43 @@ Hyundai:
 
 # iBall
 iBall:
-  regex: 'iBall[ _]([^/;]*)[ _]Build'
+  regex: 'iBall[ _]([^;/)]+)[ _]Build|(Snap_4G2)[;)\ ]'
+  device: 'tablet'
+  models:
+    - regex: '(Snap_4G2)[;)\ ]'
+      model: '$1'
+    - regex: 'iBall[ _]([^;/)]+)[ _]Build'
+      model: '$1'
+
+# iRola
+iRola:
+  regex: 'iRola ([^/;]+) Build|(DX758|DX752|DX752|DX758[ _]?Pro) Build'
+  device: 'tablet'
+  models:
+    - regex: 'DX758[ _]?Pro'
+      model: 'DX758 Pro'
+    - regex: '(DX758|DX752)'
+      model: '$1'
+    - regex: 'iRola ([^/;]+) Build'
+      model: '$1'
+
+# iRulu
+iRulu:
+  regex: 'iRULU[ _](X11|V[34])[;)\ ]'
   device: 'tablet'
   model: '$1'
 
+# Irbis
+Irbis:
+  regex: 'IRBIS|TZ(1(?:00|42|50|84|65|7[035-89]|8[36]|9[578])|49|7(?:1[2467]|2[01567]|37|4[257]|5[23457]|62|72|7[17]|8[1]|9[47])|8(?:[34]1|5[3-8]|6[45]|7[2478]|8[1-5]|9[0127])|96[0-9])|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))[;)\ ]'
+  device: 'tablet'
+  models:
+    - regex: '(TZ(?:[0-9]+)|TZ(?:one|art|HIT|81L))[;)\ ]'
+      model: '$1'
+    - regex: '(SP[0-9]+)[;)\ ]'
+      device: 'smartphone'
+      model: '$1'
+
 iBerry:
   regex: 'AUXUS ([^/;]+) Build'
   device: 'smartphone'
@@ -3292,9 +6315,35 @@ iBerry:
     - regex: 'AUXUS ([^/;]+) Build'
       model: '$1'
 
+# iHunt
+iHunt:
+  regex: 'iHunt|One_ Love_|TITAN_P11000_PRO|Like_(3|4U|3_Pro)|X300 Elite|S10_Tank_2019|S60_Discovery_2019|AlienXLite2020'
+  device: 'smartphone'
+  models:
+    - regex: 'iHunt_Like'
+      model: 'Like'
+    - regex: 'S10_Tank_2019'
+      model: 'S10 Tank (2019)'
+    - regex: 'One_ Love_'
+      model: 'One Love'
+    - regex: 'TITAN_P11000_PRO'
+      model: 'Titan P11000 Pro'
+    - regex: 'Like_3_Pro'
+      model: 'Like 3 Pro'
+    - regex: 'Like_3'
+      model: 'Like 3'
+    - regex: 'Like_4U'
+      model: 'Like 4U'
+    - regex: 'X300 Elite'
+      model: 'X300 Elite'
+    - regex: 'S60_Discovery_2019'
+      model: 'S60 Discovery (2019)'
+    - regex: 'AlienXLite2020'
+      model: 'Alien X Lite (2020)'
+
 # IconBIT
 IconBIT:
-  regex: 'NT-(3506M|0704S|0909T|1009T|10[01]1T|1017T|3601P/3602P|3603P|3702S|3805C|3905T|3701S|0701S|0805C|0902S|370[23]M)'
+  regex: 'IconBIT|NT-(3506M|0704S|0909T|1009T|10[01]1T|1017T|3601P/3602P|3603P|3702S|3805C|3905T|3701S|0701S|0805C|0902S|370[23]M)|XDS[789]4K'
   device: 'tablet'
   models:
     - regex: 'NT-3506M'
@@ -3333,6 +6382,10 @@ IconBIT:
     - regex: 'NT-3703M'
       model: 'NetTAB Matrix 3GT'
 
+    - regex: '(?:iconBIT )?(Movie Ultra HD 4K|XDS[789]4K)'
+      model: '$1'
+      device: 'tv'
+
 # LYF
 LYF:
   regex: '(LYF[ _])?LS-[456][0-9]{3}|LYF/[^/]+/'
@@ -3360,7 +6413,7 @@ LYF:
       model: 'Flame 7'
     - regex: 'LS-4008'
       model: 'Flame 7S'
-    - regex: 'LS-4505'
+    - regex: 'LS-450[58]'
       model: 'Flame 8'
     - regex: 'LS-5002'
       model: 'Water 1'
@@ -3384,6 +6437,8 @@ LYF:
       model: 'Wind 7'
     - regex: 'LS-5504'
       model: 'Water 7'
+    - regex: 'LS-5507'
+      model: 'Water 7S'
     - regex: 'LS-5017'
       model: 'Water 11'
     - regex: 'LS-5018'
@@ -3404,138 +6459,305 @@ LYF:
     - regex: 'LYF/([^/]+)/'
       model: '$1'
 
-# iNew
-iNew:
-  regex: 'iNew|(?:V7A|V3 Plus|V3-?E|V3C)(?: Build|[;/\)])'
+# Lumus
+Lumus:
+  regex: '(?:NEO(SR620|SC600)|Lumus[_ ]Ion)[;)/ ]'
   device: 'smartphone'
   models:
-    - regex: 'V3C(?: Build|[;/\)])'
+    - regex: 'NEO(SR620|SC600)[;)/ ]'
+      model: 'Neo $1'
+    - regex: 'Lumus[_ ]Ion[;)/ ]'
+      model: 'Ion'
+
+# M4tel
+M4tel:
+  regex: 'M4 SS[0-9]{4}(?:-R)?|M4_B[23]'
+  device: 'smartphone'
+  models:
+    - regex: 'SS1050'
+      model: 'Joy'
+    - regex: 'SS1060'
+      model: 'Live'
+    - regex: 'SS1070'
+      model: 'Sense'
+    - regex: 'SS1080'
+      model: 'Max One'
+    - regex: 'SS1090'
+      model: 'Max Ultra'
+    - regex: 'SS4020'
+      model: 'Play'
+    - regex: 'SS4040'
+      model: 'In Touch'
+    - regex: 'SS4045'
+      model: 'Style'
+    - regex: 'SS4345'
+      model: 'Soul Mini'
+    - regex: 'SS4350'
+      model: 'Soul'
+    - regex: 'SS4445'
+      model: 'Style Access'
+    - regex: 'SS4450'
+      model: 'Share'
+    - regex: 'SS4451'
+      model: 'Believe'
+    - regex: 'SS4452'
+      model: 'Dream'
+    - regex: 'SS4453'
+      model: 'Inspiration'
+    - regex: 'SS4455'
+      model: 'Excite'
+    - regex: 'SS4456'
+      model: 'Evolution'
+    - regex: 'SS4457-R'
+      model: 'Ever'
+    - regex: 'SS4457'
+      model: 'Elegance'
+    - regex: 'SS4458-R'
+      model: 'Feel Plus'
+    - regex: 'SS4458'
+      model: 'Attitude'
+    - regex: 'M4_B([23])'
+      model: 'B$1'
+
+# IMO Mobile
+IMO Mobile:
+  regex: '(?:IMO)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'IMO[ _]Q2 Plus[);/ ]'
+      model: 'Q2 Plus'
+    - regex: 'IMO[ _]Q2[);/ ]'
+      model: 'Q2'
+    - regex: 'IMO[ _]FEEL A2[);/ ]'
+      model: 'Feel A2'
+    - regex: 'IMO[ _]S50[);/ ]'
+      model: 'S50 Light'
+    - regex: 'IMO[ _]S89[);/ ]'
+      model: 'S89 Miracle'
+    - regex: 'IMO[ _]S88[);/ ]'
+      model: 'S88 Discovery'
+    - regex: 'IMO[ _]S99[);/ ]'
+      model: 'S99 Ocean'
+    - regex: 'IMO[ _]S98[);/ ]'
+      model: 'S98 Champion'
+    - regex: 'IMO[ _]S87[);/ ]'
+      model: 'S87 Raptor'
+    - regex: 'IMO[ _]S67[);/ ]'
+      model: 'S67 Blast'
+    - regex: 'IMO[ _]S78[);/ ]'
+      model: 'S78 Glory'
+    - regex: 'IMO[ _]Q8[);/ ]'
+      model: 'Q8 Clarity'
+    - regex: 'IMO[ _]Discovery II[);/ ]'
+      model: 'Discovery II'
+
+    - regex: 'IMO[ _](Y5|Z[67])[);/ ]'
+      model: 'Tab $1'
+      device: 'tablet'
+    - regex: 'IMO TAB X9[);/ ]'
+      model: 'Tab X9'
+      device: 'tablet'
+
+# iLA
+iLA:
+  regex: 'iLA[-_ ](Silk|X)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# iNew
+iNew:
+  regex: 'iNew|(?:V7A|V3 Plus|V3-?E|V3C)[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'V3C[;)/ ]'
       model: 'V3C'
-    - regex: 'V3-?E(?: Build|[;/\)])'
+    - regex: 'V3-?E[;)/ ]'
       model: 'V3-E'
-    - regex: 'V3 Plus(?: Build|[;/\)])'
+    - regex: 'V3 Plus[;)/ ]'
       model: 'V3 Plus'
-    - regex: 'V7A(?: Build|[;/\)])'
+    - regex: 'V7A[;)/ ]'
       model: 'V7A'
     - regex: 'iNew[ -_]([^;/]+) Build'
       model: '$1'
 
+# iPro
+iPro:
+  regex: 'Kylin[ _]5.[05]'
+  device: 'smartphone'
+  models:
+    - regex: 'Kylin_5.0S'
+      model: 'Kylin 5.0S'
+    - regex: 'Kylin 5.0'
+      model: 'Kylin 5.0'
+    - regex: 'Kylin 5.5'
+      model: 'Kylin 5.5'
+
 # Infinix
 Infinix:
   regex: 'Infinix'
   device: 'smartphone'
   models:
-    - regex: 'Infinix X260'
+    - regex: 'Infinix[ _-]X260'
       model: 'Buzz'
-    - regex: 'Infinix X502'
+    - regex: 'Infinix[ _-]X502'
       model: 'Alpha Marvel'
-    - regex: 'Infinix X570'
+    - regex: 'Infinix[ _-]X570'
       model: 'Alpha'
 
-    - regex: 'Infinix X350'
+    - regex: 'Infinix[ _-]X350'
       model: 'Surf Smart'
-    - regex: 'Infinix X351'
+    - regex: 'Infinix[ _-]X351'
       model: 'Surf Smart 3G'
-    - regex: 'Infinix X352'
+    - regex: 'Infinix[ _-]X352'
       model: 'Surf Smart 2'
-    - regex: 'Infinix X403'
+    - regex: 'Infinix[ _-]X403'
       model: 'Surf Spice'
-    - regex: 'Infinix X503'
+    - regex: 'Infinix[ _-]X503'
       model: 'Surf Bravo'
-    - regex: 'Infinix X511'
+    - regex: 'Infinix[ _-]X511'
       model: 'Surf Noir'
 
-    - regex: 'Infinix X400'
+    - regex: 'Infinix[ _-]X400'
       model: 'Race'
-    - regex: 'Infinix X401'
+    - regex: 'Infinix[ _-]X401'
       model: 'Race Lite'
-    - regex: 'Infinix X450'
+    - regex: 'Infinix[ _-]X450'
       model: 'Race Bolt'
-    - regex: 'Infinix X451'
+    - regex: 'Infinix[ _-]X451'
       model: 'Race Bolt Q'
-    - regex: 'Infinix X454'
+    - regex: 'Infinix[ _-]X454'
       model: 'Race Bolt 2'
-    - regex: 'Infinix X500'
+    - regex: 'Infinix[ _-]X500'
       model: 'Race Eagle'
-    - regex: 'Infinix X501'
+    - regex: 'Infinix[ _-]X501'
       model: 'Race Jet'
 
-    - regex: 'Infinix X506'
+    - regex: 'Infinix[ _-]X506'
       model: 'Zero'
-    - regex: 'Infinix X509'
+    - regex: 'Infinix[ _-]X509'
       model: 'Zero 2'
-    - regex: 'Infinix X552'
+    - regex: 'Infinix[ _-]X552'
       model: 'Zero 3'
-    - regex: 'Infinix X555'
+    - regex: 'Infinix[ _-]X555'
       model: 'Zero 4'
-    - regex: 'Infinix X(?:574|602)'
+    - regex: 'Infinix[ _-]X(?:574|602)'
       model: 'Zero 4 Plus'
-    - regex: 'Infinix X603'
+    - regex: 'Infinix[ _-]X603'
       model: 'Zero 5'
-    - regex: 'Infinix X603B'
+    - regex: 'Infinix[ _-]X603B'
       model: 'Zero 5 Pro'
-    - regex: 'Infinix X507'
+    - regex: 'Infinix[ _-]X620'
+      model: 'Zero 6'
 
+    - regex: 'Infinix[ _-]X507'
       model: 'Hot'
-    - regex: 'Infinix X510'
+    - regex: 'Infinix[ _-]X510'
       model: 'Hot 2'
-    - regex: 'Infinix X55[34]'
+    - regex: 'Infinix[ _-]X55[34]'
       model: 'Hot 3'
-    - regex: 'Infinix X521'
+    - regex: 'Infinix[ _-]X521'
       model: 'Hot S'
-    - regex: 'Infinix X522'
+    - regex: 'Infinix[ _-]X522'
       model: 'Hot S2'
-    - regex: 'Infinix X557'
+    - regex: 'Infinix[ _-]X557'
       model: 'Hot 4'
-    - regex: 'Infinix X556'
+    - regex: 'Infinix[ _-]X556'
       model: 'Hot 4 Pro'
-    - regex: 'Infinix X559c'
+    - regex: 'Infinix[ _-]X559c'
       model: 'Hot 5'
-    - regex: 'Infinix X559'
+    - regex: 'Infinix[ _-]X559'
       model: 'Hot 5 Lite'
-    - regex: 'Infinix X606B?'
+    - regex: 'Infinix[ _-]X606[BC]?'
       model: 'Hot 6'
-    - regex: 'Infinix X573B?'
+    - regex: 'Infinix[ _-]X608'
+      model: 'Hot 6 Pro'
+    - regex: 'Infinix[ _-]X624'
+      model: 'Hot 7'
+    - regex: 'Infinix[ _-]X650'
+      model: 'Hot 8'
+    - regex: 'Infinix[ _-]X680'
+      model: 'Hot 9 Play'
+    - regex: 'Infinix[ _-]X573B?'
       model: 'Hot S3'
-    - regex: 'Infinix X556'
-      model: 'Hot 4 Pro'
 
-    - regex: 'Infinix X5010'
+    - regex: 'Infinix[ _-]X5010'
       model: 'Smart'
-    - regex: 'Infinix X5515F'
+    - regex: 'Infinix[ _-]X5515F'
       model: 'Smart 2'
-    - regex: 'Infinix X5514D'
+    - regex: 'Infinix[ _-]X5514D'
       model: 'Smart 2 Pro'
+    - regex: 'Infinix[ _-]X653'
+      model: 'Smart 4'
 
-    - regex: 'Infinix X551'
+    - regex: 'Infinix[ _-]X626'
+      model: 'S4'
+    - regex: 'Infinix[ _-]X652'
+      model: 'S5'
+    - regex: 'Infinix[ _-]X660'
+      model: 'S5 Pro'
+
+    - regex: 'Infinix[ _-]X551'
       model: 'Hot Note'
       device: 'phablet'
-    - regex: 'Infinix X600'
+    - regex: 'Infinix[ _-]X600'
       model: 'Note 2'
       device: 'phablet'
-    - regex: 'Infinix X601'
+    - regex: 'Infinix[ _-]X601'
       model: 'Note 3'
       device: 'phablet'
-    - regex: 'Infinix X572'
+    - regex: 'Infinix[ _-]X572'
       model: 'Note 4'
       device: 'phablet'
-    - regex: 'Infinix X571'
+    - regex: 'Infinix[ _-]X571'
       model: 'Note 4 Pro'
       device: 'phablet'
-    - regex: 'Infinix X604'
+    - regex: 'Infinix[ _-]X604'
       model: 'Note 5'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X610'
+      model: 'Note 6'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X690'
+      model: 'Note 7'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X656'
+      model: 'Note 7 Lite'
+      device: 'phablet'
 
     - regex: 'Infinix HOT ([a-z]?[1-6])( (?:Lite|Plus|Pro))?'
       model: 'Hot $1$2'
-    - regex: 'Infinix (X[78]00)'
+    - regex: 'Infinix[ _-](X[78]00)'
       device: 'tablet'
       model: '$1'
-    - regex: 'Infinix (X\d+)'
+    - regex: 'Infinix[ _-](X\d+)'
       model: '$1'
-    - regex: 'Infinix[ _]([a-z0-9_\-]+)'
+    - regex: 'Infinix[ _-]([a-z0-9_\-]+)'
       model: '$1'
 
+# InFocus
+InFocus:
+  regex: 'IF(9001|9007|9021|9035|9031)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'IF9001'
+      model: 'Turbo 5'
+    - regex: 'IF9007'
+      model: 'A3'
+    - regex: 'IF9021'
+      model: 'Turbo 5 Plus'
+    - regex: 'IF9035'
+      model: 'A2'
+    - regex: 'IF9031'
+      model: 'Vision 3'
+
+# InnJoo
+InnJoo:
+  regex: 'InnJoo'
+  device: 'smartphone'
+  models:
+    - regex: 'InnJoo[ _]X'
+      model: 'X'
+
 # Inkti
 Inkti:
   regex: 'intki[ _]([^/;]*)[ _]Build'
@@ -3548,6 +6770,30 @@ Innostream:
   device: 'feature phone'
   model: 'INNO$1'
 
+# Insignia
+Insignia:
+  regex: 'NS-(P11A8100|P10A8100|P10A6100|P16AT08|P16AT10|P16AT785HD|P08A7100|P10A7100)[);/ ]|AFTEAMR311|AFTJMST12'
+  device: 'tablet'
+  models:
+    - regex: 'NS-P11A8100'
+      model: '11.6"'
+    - regex: 'NS-(P10A6100|P16AT10)'
+      model: 'Flex 10.1"'
+    - regex: 'NS-P16AT08'
+      model: 'Flex 8"'
+    - regex: 'NS-P08A7100'
+      model: '8"'
+    - regex: 'NS-(P10A8100|P10A7100)'
+      model: '10.1"'
+    - regex: 'NS-P16AT785HD'
+      model: 'Flex Elite 7.85"'
+    - regex: 'AFTEAMR311'
+      model: 'HD (2018)'
+      device: 'tv'
+    - regex: 'AFTJMST12'
+      model: '4K (2018)'
+      device: 'tv'
+
 # Inq
 INQ:
   regex: 'INQ[/ ]'
@@ -3561,11 +6807,13 @@ INQ:
 
 # Intex
 Intex:
-  regex: 'Intex|(Aqua|Cloud[ _][XY][0-9]{1})'
+  regex: 'Intex|(Aqua|Cloud[ _][XY][0-9]{1}|Cloud (?:Fame|Glory) 4G)'
   device: 'smartphone'
   models:
     - regex: 'Intex[ _]([^/;]*)[ _]Build'
       model: '$1'
+    - regex: '(Cloud (?:Fame|Glory) 4G)'
+      model: '$1'
     - regex: '(Aqua|Cloud)[ _\.]([^/;\)]+)(?:[ _]Build|(?<!Build)/|\))'
       model: '$1 $2'
     - regex: 'Intex[ _]([a-z0-9_+\-]+)'
@@ -3607,33 +6855,58 @@ iKoMo:
 
 # iOcean
 iOcean:
-  regex: 'iOCEAN'
+  regex: 'iOCEAN|M6752|W180|X7[ _]?S|X8 mini'
   device: 'smartphone'
   models:
+    - regex: 'X7S-T'
+      model: 'X7S-T'
+    - regex: 'X8 mini pro'
+      model: 'X8 Mini Pro'
+    - regex: 'X8 mini'
+      model: 'X8 Mini'
+    - regex: 'X7[ _]?S'
+      model: 'X7S Elite'
+    - regex: '(M6752|W180) Build'
+      model: '$1'
     - regex: 'iOCEAN[ _\-]?([^/;]+) Build'
       model: '$1'
     - regex: 'iOCEAN[ _\-]?([^);/ ]+)'
       model: '$1'
 
+# iView
+iView:
+  regex: '733TPC'
+  device: 'smartphone'
+  models:
+    - regex: '733TPC'
+      device: 'tablet'
+      model: '733TPC'
+
 # Impression
 Impression:
-  regex: '(?:Impression[ _\-]?([^/;]+)|A502|I10\-LE|ImPad[ _]?(.*)|ImSmart[ _]?(.*)) Build'
+  regex: '(?:Impression[ _\-]?([^/;]+)|A502|I10\-LE|ImPad[ _]?(.*)|ImSmart[ _]?(.*))[);/ ]'
   device: 'tablet'
   models:
     - regex: '(A502)'
       model: '$1'
       device: 'smartphone'
-    - regex: 'ImSmart[ _]?(.*) Build'
+    - regex: 'ImSmart[ _]?([^/;)]+)(?: Build|\))'
       model: 'ImSmart $1'
       device: 'smartphone'
-    - regex: 'ImPad[ _]?(.*) Build'
+    - regex: 'ImPad[ _]?([^/;)]+)(?: Build|\))'
       model: 'ImPad $1'
     - regex: '(I10\-LE)'
       model: '$1'
       device: 'smartphone'
-    - regex: 'Impression[ _\-]?([^/;]+) Build'
+    - regex: 'Impression[ _\-]?([^/;)]+)(?: Build|\))'
       model: '$1'
 
+#iLife or i-life (lifedigital.com)
+iLife:
+  regex: '(ITELL_K3500N)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
 # iTel
 iTel:
   regex: 'itel|iNote'
@@ -3645,22 +6918,40 @@ iTel:
       model: 'iNote $1'
     - regex: 'iTel ([^/;]*)Build'
       model: '$1'
-    - regex: 'iTel_([a-z0-9\-_]*)'
+    - regex: 'iTel[_ ]([a-z0-9\-_]*)'
       model: '$1'
 
+# iZotron
+iZotron:
+  regex: '(Mi7_HERO_(?:BETA|TAB))[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'Mi7[_ ]HERO[_ ]BETA[);/ ]'
+      model: 'MI7 Hero Beta'
+    - regex: 'Mi7[_ ]HERO[_ ]TAB[);/ ]'
+      model: 'MI7 Hero Tab'
+
 # JAY-Tech
 JAY-Tech:
-  regex: 'TPC-[A-Z0-9]+'
+  regex: 'TPC-[A-Z0-9]+|TPCY-TX[TE][^);/ ]+'
   device: 'tablet'
   models:
     - regex: 'TPC-([A-Z0-9]+)'
       model: 'Tablet PC $1'
+    - regex: '(TPCY-TX[TE][^);/ ]+)'
+      model: '$1'
 
 # Jiayu
 Jiayu:
-  regex: '(JY-[a-z0-9]+)[);/ ]'
+  regex: 'JIAYU[ _-]|(?:JY-G4[\\_]G5|(?:JY-[a-z0-9]+))[);/ ]'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: '(?:JIAYU G4_G5|JY-G4[\\_]G5)[);/ ]'
+      model: 'G4/G5'
+    - regex: 'JIAYU[ _-](G4[S]?|G2F|G3[S]?|S[23])[);/ ]'
+      model: '$1'
+    - regex: '(JY-[a-z0-9]+)[);/ ]'
+      model: '$1'
 
 # Jolla
 Jolla:
@@ -3668,31 +6959,93 @@ Jolla:
   device: 'smartphone'
   model: ''
 
+# Just5
+Just5:
+  regex: 'JUST5(-)?SPACER(s)?|COSMO[_ ](L707|L808)|BLASTER|FREEDOM[ _](C100|M303|X1)|Freedom'
+  device: 'smartphone'
+  models:
+    - regex: 'COSMO[_ ](L707|L808)'
+      model: 'Cosmo $1'
+    - regex: 'FREEDOM[ _](C100|M303|X1)'
+      model: 'Freedom $1'
+    - regex: 'Freedom'
+      model: 'Freedom'
+    - regex: 'JUST5(-)?SPACER2s'
+      model: 'Spacer 2S'
+    - regex: 'JUST5(-)?SPACER2'
+      model: 'Spacer 2'
+    - regex: 'JUST5SPACER'
+      model: 'Spacer'
+    - regex: 'BLASTER 2'
+      model: 'Blaster 2'
+    - regex: 'BLASTER'
+      model: 'Blaster'
+
+# Kalley
+Kalley:
+  regex: 'ELEMENT Q'
+  device: 'smartphone'
+  models:
+    - regex: 'ELEMENT Q'
+      model: 'Element Q'
+
+# Kaan
+Kaan:
+  regex: 'KAAN[ _](N[12]|A1)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
 # Kazam
 Kazam:
-  regex: 'Kazam ([^;/]+) Build|Trooper_X[0-9][0-9][);/ ]|Tornado 348'
+  regex: 'Kazam ([^;/)]+)( Build|\))|Trooper_X[0-9][0-9][);/ ]|Tornado 348'
   device: 'smartphone'
   models:
     - regex: 'Tornado 348'
       model: 'Tornado 348'
     - regex: 'Trooper_X([0-9])([0-9])[);/ ]'
       model: 'Trooper X$1.$2'
-    - regex: 'Kazam ([^;/]+) Build'
+    - regex: 'Kazam ([^;/)]+)(?: Build|\))'
+      model: '$1'
+
+# Keneksi
+Keneksi:
+  regex: 'KENEKSI|(Hemera|Teta Dual)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(Hemera|Teta Dual)[);/ ]'
+      model: '$1'
+    - regex: 'KENEKSI[ _-]liberty'
+      model: 'Liberty'
+    - regex: 'KENEKSI[ _-]FLASH'
+      model: 'Flash'
+    - regex: 'KENEKSI[ _-]SUN'
+      model: 'Sun'
+    - regex: 'KENEKSI[ _-]ZETA'
+      model: 'Zeta'
+    - regex: 'KENEKSI[ _-]SIGMA'
+      model: 'Sigma'
+    - regex: 'KENEKSI[ _-](Moon|Libra_Dual|Glass|Amber|Chance|Amulet|Choice|Crystal|Dream|Delta[_ ]Dual|Norma 2|Norma|Sky|Fire 2|Fire|Flame|Flora|Rock|Solo|Soul|Step|Smart|Star|Storm|Wind)'
       model: '$1'
 
 # Kempler & Strauss
 'Kempler & Strauss':
-  regex: 'Alumini3Plus|Alumini ?2'
+  regex: 'Alumini_?3_?Plus|Alumini ?[23]|KEMPLER_(TV|X)'
   device: 'smartphone'
   models:
     - regex: 'Alumini ?2'
       model: 'Alumini 2'
-    - regex: 'Alumini3Plus'
+    - regex: 'Alumini_?3_?Plus'
       model: 'Alumini 3 Plus'
+    - regex: 'Alumini3'
+      model: 'Alumini 3'
+    - regex: 'KEMPLER_TV'
+      model: 'TV'
+    - regex: 'KEMPLER_X'
+      model: 'X'
 
 # Kiano
 Kiano:
-  regex: 'Kiano|Elegance_5_0|CORE 10.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?[);/ ]|Cavion[_ ]'
+  regex: 'Kiano|Elegance_[45]_[015](?:_PRO)?|CORE 10.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?[);/ ]|Cavion[_ ]'
   device: 'smartphone'
   models:
     - regex: 'Slim ?Tab ?(\d+)(?:[_ ]3GR?)?'
@@ -3704,8 +7057,10 @@ Kiano:
     - regex: 'CORE 10.1 DUAL 3G'
       model: 'CORE 10.1 DUAL 3G'
       device: 'tablet'
-    - regex: 'Elegance_5_0'
-      model: 'Elegance 5.0'
+    - regex: 'Elegance_(5)_([51])_Pro'
+      model: 'Elegance $1.$2" Pro'
+    - regex: 'Elegance_([45])_([015])'
+      model: 'Elegance $1.$2"'
     - regex: '(Kiano)?(Intelect|Elegance) ?(7|8|10)?'
       model: '$2 $3'
       device: 'tablet'
@@ -3722,6 +7077,40 @@ Kingsun:
     - regex: 'Kingsun[ -]((?!Build)[a-z0-9_-]+)'
       model: '$1'
 
+# Kocaso
+Kocaso:
+  regex: 'Kocaso|M(?:729|7[357][026][hw]?|76[01236][bw]?|83[016]|8[567]0|1050s|106[012368]w?|1070|X736(?:-kit)?|X780)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'M729[);/ ]'
+      model: 'M729'
+    - regex: 'M(7[357][026])[hw]?[);/ ]'
+      model: 'M$1'
+    - regex: 'M(76[01236])[bw]?[);/ ]'
+      model: 'M$1'
+    - regex: 'MX780[);/ ]'
+      model: 'MX780'
+    - regex: 'M(83[016])[);/ ]'
+      model: 'M$1'
+    - regex: 'M(8[567]0)[);/ ]'
+      model: 'M$1'
+    - regex: 'M851[);/ ]'
+      model: 'M851'
+    - regex: 'M1050S[);/ ]'
+      model: 'M1050s'
+    - regex: 'M(106[012368])W?[);/ ]'
+      model: 'M$1'
+    - regex: 'M1070[);/ ]'
+      model: 'M1070'
+    - regex: 'MX736(?:-kit)?[);/ ]'
+      model: 'MX736'
+    - regex: 'MX780[);/ ]'
+      model: 'MX780'
+    - regex: 'Kocaso[ _\-]?([^;/]+) Build'
+      model: '$1'
+    - regex: 'Kocaso[ _\-]?([a-z0-9_-]+)'
+      model: '$1'
+
 # Kogan
 Kogan:
   regex: 'Kogan'
@@ -3774,6 +7163,23 @@ KDDI:
   device: 'feature phone'
   model: '$1'
 
+# Kodak
+Kodak:
+  regex: 'KODAK|IM5|Ektra[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'IM5'
+      model: 'IM5'
+    - regex: 'Ektra[);/ ]'
+      model: 'Ektra'
+    - regex: 'KODAK_SMARTWAY_((M|T)1)'
+      model: 'Smartway $1'
+    - regex: 'SMARTWAY X1'
+      model: 'Smartway X1'
+    - regex: 'Tablet (7|10)'
+      device: 'tablet'
+      model: 'Tablet $1'
+
 # KOPO
 KOPO:
   regex: 'KOPO[ _-]'
@@ -3790,6 +7196,14 @@ Koridy:
   device: 'smartphone'
   model: '$1'
 
+# KRONO
+KRONO:
+  regex: 'NET1100'
+  device: 'smartphone'
+  models:
+    - regex: 'NET1100'
+      model: 'NET 1100'
+
 #k-touch
 K-Touch:
   regex: 'K-?Touch[ _][a-z0-9]+'
@@ -3800,30 +7214,106 @@ K-Touch:
     - regex: 'K-?Touch[ _]([a-z0-9]+)'
       model: '$1'
 
-# kyocera
+# kyocera (kyocera.co.jp, kyocera.com)
 Kyocera:
-  regex: 'Kyocera|KWC-|QC-|C5120|C5170|C5155|C5215|C6750|C6522N?|C6530N|KYL21|S2151|KC-S701'
+  regex: 'Kyocera|KWC-|QC-|(?:NP501KC|503KC|602KC|705KC|C51[27]0|C5155|C5215|C67[35]0|C6522N?|C6530N|C6740N?|C6743|E6[89]10|KYL2[13]|KYV3[13-9]|KYF3[179]|KYY2[1-4]|S2151|KC-S701|S4-KC|KYV40U|KYV4[1-6]|KYV47-u|KC-S301AE|X3-KC|S6-KC|E6560[CT]|E6782[L]?|E6790(?:TM)?)[;/) ]'
   device: 'smartphone'
   models:
     # explicit smartphone models
-    - regex: 'C5120'
+    - regex: 'C5120[;/) ]'
       model: 'Milano'
-    - regex: 'C5155'
+    - regex: 'S4-KC[;/) ]'
+      model: 'One S4'
+    - regex: 'S6-KC[;/) ]'
+      model: 'One S6'
+    - regex: 'C5155[;/) ]'
       model: 'Rise'
-    - regex: 'C5170'
+    - regex: '602KC[;/) ]'
+      model: 'Digno G'
+    - regex: '503KC[;/) ]'
+      model: 'Digno E'
+    - regex: 'NP501KC[;/) ]'
+      model: 'Digno'
+    - regex: 'KYV36[;/) ]'
+      model: 'Digno Rafre'
+    - regex: 'KYV39[;/) ]'
+      model: 'Miraie F'
+    - regex: 'C5170[;/) ]'
       model: 'Hydro'
-    - regex: 'C5215'
+    - regex: 'C5215[;/) ]'
       model: 'Hydro EDGE'
     - regex: 'C6522N?'
       model: 'Hydro XTRM'
+    - regex: 'C6730'
+      model: 'Hydro ICON'
     - regex: 'C6750'
       model: 'Hydro ELITE'
-    - regex: 'C6530N '
+    - regex: 'C6530N'
       model: 'Hydro LIFE'
+    - regex: 'C6740(N)?'
+      model: 'Hydro WAVE'
+    - regex: 'C6743'
+      model: 'Hydro Reach'
+    - regex: 'E6560[CT]'
+      model: 'DuraForce'
+    - regex: 'E6810'
+      model: 'DuraForce Pro'
+    - regex: 'E6910'
+      model: 'DuraForce Pro 2'
     - regex: 'KC-S701'
       model: 'Torque'
-    - regex: 'KYL21'
+    - regex: 'KYL21[;/) ]'
       model: 'Digno S'
+    - regex: 'KYL23[;/) ]'
+      model: 'Miraie'
+    - regex: 'KYY24[;/) ]'
+      model: 'Torque G01'
+    - regex: 'KYF3[179][;/) ]'
+      model: 'Gratina 4G'
+    - regex: 'KYV35[;/) ]'
+      model: 'Torque G02'
+    - regex: 'KYV41[;/) ]'
+      model: 'Torque G03'
+    - regex: 'KYV46[;/) ]'
+      model: 'Torque G04'
+    - regex: 'KYV47-u[;/) ]'
+      model: 'Basio 4'
+    - regex: 'KYV43[;/) ]'
+      model: 'Basio 3'
+    - regex: '705KC[;/) ]'
+      model: 'Kantan Sumaho'
+    - regex: 'KYV37[;/) ]'
+      model: 'Qua Phone'
+    - regex: 'KYV42[;/) ]'
+      model: 'Qua Phone QX'
+    - regex: 'KYV44[;/) ]'
+      model: 'Qua Phone QZ'
+    - regex: 'KYV40U[;/) ]'
+      model: 'Rafre'
+    - regex: 'KYV33[;/) ]'
+      model: 'Infobar A03'
+    - regex: 'KYY21[;/) ]'
+      model: 'Urbano L01'
+    - regex: 'KYY22[;/) ]'
+      model: 'Urbano L02'
+    - regex: 'KYY23[;/) ]'
+      model: 'Urbano L03'
+    - regex: 'KYV31[;/) ]'
+      model: 'Urbano V01'
+    - regex: 'KYV34[;/) ]'
+      model: 'Urbano V02'
+    - regex: 'KYV(?:45|38)[;/) ]'
+      model: 'Urbano V03'
+    - regex: '(?:Kyocera-)?E6790(?:TM)?'
+      model: 'DuraForce XD'
+    - regex: 'X3-KC[;/) ]'
+      model: 'One X3'
+    - regex: 'E6782[;/) ]'
+      model: 'Brigadier'
+    - regex: 'E6782L[;/) ]'
+      model: 'DuraScout'
+    - regex: '(KC-S301AE)[;/) ]'
+      model: '$1'
 
     # explicit feature phone models
     - regex: 'S2151'
@@ -3837,19 +7327,84 @@ Kyocera:
     - regex: '(?:KWC|QC)-([a-z0-9]+)'
       model: '$1'
 
-# Lava
-Lava:
-  regex: 'Lava |iris[ _]?([^/;]+)(?:\)| Build)|A76 Build|X1 Selfie Build|X41 Plus Build|Flair Z1'
+# Krüger&Matz (Kruger&Matz)
+Krüger&Matz:
+  regex: 'Kruger[ _&]Matz|KrugerMatz[ _]|MOVE_|LIVE4_KM043[89]|KM(?:106[67]|1065G|0701_1|0805_1)'
   device: 'smartphone'
   models:
-    - regex: 'Flair Z1'
+    - regex: 'MOVE_6_mini'
+      model: 'MOVE 6 Mini'
+    - regex: 'MOVE[_ ]([78]|6S)'
+      model: 'MOVE $1'
+    - regex: 'DRIVE 4 mini LTE'
+      model: 'DRIVE 4 mini LTE'
+    - regex: 'DRIVE (4[S]?)[;/) ]'
+      model: 'DRIVE $1'
+    - regex: 'Drive 5[;/) ]'
+      model: 'DRIVE 5'
+    - regex: 'FLOW (4[S]?)[;/) ]'
+      model: 'FLOW $1'
+    - regex: 'LIVE4_(KM043[89])[;/) ]'
+      model: 'LIVE 4 $1'
+    - regex: 'KrugerMatz_LIVE4[;/) ]'
+      model: 'LIVE 4'
+    - regex: '_LIVE5_(KM0450)[;/) ]'
+      model: 'LIVE 5 $1'
+
+    - regex: 'KM(106[67])[;/) ]'
+      device: 'tablet'
+      model: 'EAGLE $1 10.1"'
+    - regex: 'KM(1065G)[;/) ]'
+      device: 'tablet'
+      model: 'EAGLE $1 10.1"'
+    - regex: 'KM0(701)_1[;/) ]'
+      device: 'tablet'
+      model: 'EAGLE $1 7.1"'
+    - regex: 'KM0(805)_1[;/) ]'
+      device: 'tablet'
+      model: 'EAGLE $1 8.0"'
+
+# LAIQ
+LAIQ:
+  regex: 'LAIQ'
+  device: 'smartphone'
+  models:
+    - regex: '(Glam|New York)'
+      model: '$1'
+
+# AIS
+AIS:
+  regex: 'iris708'
+  device: 'smartphone'
+  models:
+    - regex: 'iris708'
+      model: 'LAVA PRO 4.5'
+
+# Lava
+Lava:
+  regex: 'Lava[ _]|iris[ _]?([^/;]+)(?:\)| Build)|A(?:67|76) Build|X1 Selfie Build|X41 Plus Build|(?:Flair Z1|PixelV1|Z61_2GB|A97 IPS)[/;) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Flair Z1[/;) ]'
       model: 'Flair Z1'
+    - regex: 'A97 IPS[/;) ]'
+      model: 'A97 IPS'
+    - regex: 'A67 Build'
+      model: 'A67'
     - regex: 'A76 Build'
       model: 'A76'
+    - regex: 'PixelV1[/;) ]'
+      model: 'Pixel V1'
     - regex: 'X1 Selfie Build'
       model: 'Iris X1 Selfie'
     - regex: 'X41 Plus Build'
       model: 'X41 Plus'
+    - regex: 'LAVA_A3'
+      model: 'A3'
+    - regex: 'LAVA_R1'
+      model: 'R1'
+    - regex: 'Z61_2GB[/;) ]'
+      model: 'Z61'
     - regex: 'iris[ _]?([^/;]+)(?:\)| Build)'
       model: 'Iris $1'
     - regex: 'Lava[ _]?([^/;]+)(?:/| Build)'
@@ -3865,20 +7420,69 @@ Landvo:
     - regex: 'XM([123])00([^/;]*) Build'
       model: 'XM$100$2'
 
+# Land Rover
+Land Rover:
+  regex: 'Land[ ]?Rover[d]?[ _-](X1[0-9]|Explore|T878|L15\+|V18|V[168]|X)[;/) ]'
+  device: 'smartphone'
+  model: '$1'
+
 # lanix
 Lanix:
-  regex: 'LANIX-([a-z0-9]+)|ILIUM[ _]([^;/]+) Build'
-  device: 'feature phone'
+  regex: 'LANIX-([a-z0-9]+)|Ilium[ _]|X120C|Alpha 950'
+  device: 'smartphone'
   models:
     - regex: 'ILIUM[ _]PAD[ _]([^;/]+) Build'
       model: 'Ilium Pad $1'
       device: 'tablet'
+    - regex: 'X120C'
+      model: 'Ilium X120C'
+    - regex: 'Ilium[ _](Alpha 3|L(?:200|6[12]0|9[125]0|1[0124]00|1050|1120)|LT5[012]0|M[13579]|S(?:106|520|6[27]0)|X(?:1[12]0|2[0126]0|5[12]0|500B|710))'
+      model: 'Ilium $1'
     - regex: 'ILIUM[ _]([^;/]+) Build'
       model: 'Ilium $1'
-      device: 'smartphone'
+    - regex: 'Alpha 950'
+      model: 'Ilium Alpha 950'
     - regex: 'LANIX-([a-z0-9]+)'
+      device: 'feature phone'
       model: '$1'
 
+# Lark
+Lark:
+  regex: '(Lark|Cumulus|Evolution|FreeMe|Ultimate (?:X4|7i))[ _-]|Build/Lark|Bjorn[_ ]SP-500'
+  device: 'tablet'
+  models:
+    - regex: 'Cumulus[ _](5\.5|[56])[ _]HD'
+      model: 'Cumulus $1 HD'
+      device: 'smartphone'
+    - regex: 'FreeMe X2 ([79]) (?:ver|v)?\.([23])'
+      model: 'FreeMe X2 $1 Version $2'
+    - regex: 'FreeMe X4 7 3G HD'
+      model: 'FreeMe X4 7HD 3G'
+    - regex: 'FreeMe[ _]X2[ _]([7-9])'
+      model: 'FreeMe X2 $1'
+    - regex: 'FreeMe X4[ _]7[_ ]HD'
+      model: 'FreeMe X4 7HD'
+    - regex: 'FreeMe X4[ _]9'
+      model: 'FreeMe X4 9'
+    - regex: '(?:Lark[ _-])?Evolution[ _](X2 7 3G-GPS|X4[_ ]10\.1|10|X4[_ ]7[ _]IPS)'
+      model: 'Evolution $1'
+    - regex: 'Ultimate (X4 10\.1 3G IPS|X4 8s 3G|7i)'
+      model: 'Ultimate $1'
+    - regex: 'PHABLET 7'
+      model: 'Phablet 7'
+    - regex: 'Phablet 6\.0'
+      model: 'Phablet 6.0'
+      device: 'smartphone'
+    - regex: 'Bjorn[_ ]SP-500'
+      model: 'Bjorn SP-500'
+      device: 'smartphone'
+    - regex: 'Cirrus[ _](4\.5|[45])'
+      model: 'Cirrus $1'
+      device: 'smartphone'
+    - regex: 'Lark[ _](Stratus[_ ]5)'
+      model: '$1'
+      device: 'smartphone'
+
 # lct
 LCT:
   regex: 'LCT_([a-z0-9]+)'
@@ -3899,18 +7503,62 @@ LCT:
     - regex: 'Le ?Pan ?([^;/]+) Build'
       model: '$1'
 
-# LeEco
-LeEco:
-  regex: 'LeEco|Le ?X[0-9][^;/]+|Le Max|Le [12]|X900 Build'
+# Leagoo
+Leagoo:
+  regex: 'LEAGOO[ _-]?|(?:M5 EDGE|KIICAA (POWER|MIX)|Leapad[ _]7s|Elite 1|Venture 1)[);/ ]'
   device: 'smartphone'
   models:
+    - regex: 'LEAGOO[- _]M8[_-]?Pro[);/ ]'
+      model: 'M8 Pro'
+    - regex: 'LEAGOO[- _](Z[156]|M[58]|T1)[);/ ]'
+      model: '$1'
+    - regex: 'M5 EDGE'
+      model: 'M5 Edge'
+    - regex: 'LEAGOO[_ ]Lead([57])'
+      model: 'Lead $1'
+    - regex: 'KIICAA POWER'
+      model: 'KICCAA Power'
+    - regex: 'KIICAA MIX'
+      model: 'KICCAA Mix'
+    - regex: 'Elite 1[);/ ]'
+      model: 'Elite 1'
+    - regex: 'Venture 1[);/ ]'
+      model: 'Venture 1'
+
+    - regex: '(Leapad[ _]7s)'
+      model: '$1'
+      device: 'tablet'
+
+# Ledstar
+Ledstar:
+  regex: '(?:Ledstar[_ ])?(?:Trendy 5.0|Novus_Premium_6.0)'
+  device: 'smartphone'
+  models:
+    - regex: 'Trendy 5.0'
+      model: 'Trendy 5.0'
+    - regex: 'Ledstar_Novus_Premium_6.0[);/ ]'
+      model: 'Novus Premium 6.0"'
+
+# LeEco
+LeEco:
+  regex: 'Letv|LeEco|X[89]00\+[;/) ]|Le ?X[0-9][^;/]+|Le Max|Le [12]|X900 Build'
+  device: 'smartphone'
+  models:
+    - regex: 'X800\+'
+      model: 'Le 1 Pro'
+    - regex: 'X900\+'
+      model: 'Max X900+'
+    - regex: 'X50[10]'
+      model: 'Le 1S'
+    - regex: '(X910)'
+      model: '$1'
     - regex: 'X900 Build'
       model: 'Le X900'
     - regex: 'Le ?X526 Build'
       model: 'Le 2'
     - regex: 'Le ?X([^;/]+) Build'
       model: 'Le X$1'
-    - regex: 'Le ?X([^ ;/]+)'
+    - regex: 'Le ?X([^) ;/]+)'
       model: 'Le X$1'
     - regex: 'Le ?([12][^;/]+) Build'
       model: 'Le $1'
@@ -3921,6 +7569,34 @@ LeEco:
     - regex: 'LeEco ([^;/]+) Build'
       model: '$1'
 
+# Leotec
+Leotec:
+  regex: 'LESPH501[14]|LESPH5003B|SUPERNOVA (Qi16|i3G96[X]?)'
+  device: 'smartphone'
+  models:
+    - regex: 'LESPH5011'
+      model: 'Argon e250'
+    - regex: 'LESPH5003B'
+      model: 'Argon A250B'
+    - regex: 'LESPH5014'
+      model: 'Krypton K150'
+    - regex: 'SUPERNOVA (Qi16|i3G96[X]?)'
+      device: 'tablet'
+      model: 'Supernova $1'
+
+# Lephone
+Lephone:
+  regex: 'lephone[ _]'
+  device: 'smartphone'
+  models:
+    - regex: 'lephone[ _](K7|K10)'
+      device: 'feature phone'
+      model: '$1'
+    - regex: 'lephone[ _](W(1[0125]|[279])|T2)[/;) ]'
+      model: '$1'
+    - regex: 'lephone_W7_plus'
+      model: 'W7 Plus'
+
 # lenco
 Lenco:
   regex: 'Lenco ([^/;]*) Build'
@@ -3929,7 +7605,7 @@ Lenco:
 
 # lenovo
 Lenovo:
-  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|YT3-X50L|ZUK[ -_]|K50a40|TB-(8504F|X304F|X704V|X704A)'
+  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|TB2-X30L|TB3-710I|YT3-X50[ML]|ZUK[ -_]|K50a40|TB-(8504F|X304F|X704V|X704A)|A2107A-H|S6000[ ;)]|(Z2 Plus|VIBE Z2|Vibe K5( Plus)?|P2A42|L18011|[67]01LV|Z2131|K350t|VIBE X2|K31-t3|TAB 2 A8-50LC)[/;) ]'
   device: 'smartphone'
   models:
     - regex: 'Lenovo ?G780'
@@ -3947,30 +7623,51 @@ Lenovo:
     - regex: 'Lenovo ?A7600-[HF]'
       model: 'IdeaTab A10-70'
       device: 'tablet'
+    - regex: 'A2107A-H'
+      model: 'A2107'
+      device: 'tablet'
     - regex: 'TB2-X30[FL]'
       model: 'Tab 2 A10-30'
       device: 'tablet'
-    - regex: 'YT3-X50[FL]'
+    - regex: 'YT3-X50[FLM]'
       model: 'Yoga Tab 3'
       device: 'tablet'
+    - regex: 'TB3-730X'
+      model: 'TAB3 7'
+      device: 'tablet'
     - regex: 'TB3-710[IF]'
       model: 'TAB3 7 Essential'
       device: 'tablet'
-    - regex: 'TB3-850[FM]'
+    - regex: 'TAB 2 A8-50LC'
+      model: 'TAB2 A8-50LC'
+      device: 'tablet'
+    - regex: '(?:TB3-850[FM]|601LV)[/;) ]'
       model: 'TAB3 8'
       device: 'tablet'
     - regex: 'Lenovo TB-X304[FL]'
       model: 'TAB4 10'
       device: 'tablet'
-    - regex: 'TB-X704V'
+    - regex: '(?:TB-X704V|701LV)[/;) ]'
       model: 'TAB4 10 Plus'
       device: 'tablet'
-    - regex: 'TB-X704A'
+    - regex: 'TB-X704A[/;) ]'
       model: 'Moto Tab'
       device: 'tablet'
+    - regex: 'TB-X605F[/;) ]'
+      model: 'Tab M10'
+      device: 'tablet'
     - regex: 'Lenovo ?B8000(-[FH])?'
       model: 'Yoga Tablet 10'
       device: 'tablet'
+    - regex: 'YOGA Tablet 2 Pro-1380[FL]'
+      model: 'Yoga Tablet 2 Pro 13.3"'
+      device: 'tablet'
+    - regex: 'YOGA Tablet 2-1050[FL]'
+      model: 'Yoga Tablet 2 10.1"'
+      device: 'tablet'
+    - regex: 'YOGA Tablet 2-830(?:[FL]|LC)'
+      model: 'Yoga Tablet 2 8.0"'
+      device: 'tablet'
     - regex: 'Lenovo ?B6000(-[FH])?'
       model: 'Yoga Tablet 8'
       device: 'tablet'
@@ -3980,7 +7677,13 @@ Lenovo:
     - regex: 'YT3-850[FL]'
       model: 'Yoga Tab 3 8'
       device: 'tablet'
+    - regex: 'YT3-850M'
+      model: 'Yoga Tab 3 10'
+      device: 'tablet'
 
+    - regex: 'S6000[/;) ]'
+      model: 'IdeaTab S6000'
+      device: 'tablet'
     - regex: 'Lenovo ([ASB][0-9]{4})[A-Z]?\-[EHF]'
       model: 'IdeaTab $1'
       device: 'tablet'
@@ -4005,6 +7708,12 @@ Lenovo:
     - regex: 'TB-X304F'
       model: 'TAB 4 10'
       device: 'tablet'
+    - regex: 'Lenovo TB-X505F'
+      model: 'M10'
+      device: 'tablet'
+    - regex: 'Lenovo TB-X104[FXL]'
+      model: 'E10'
+      device: 'tablet'
     - regex: 'Tab2A([0-9]-[0-9]{2}[a-z]?)'
       model: 'TAB 2 A$1'
       device: 'tablet'
@@ -4020,26 +7729,66 @@ Lenovo:
     - regex: 'Lenovo (TB[0-9]?\-[a-z0-9\-]+) Build'
       model: '$1'
       device: 'tablet'
-    - regex: 'ZUK[ -_]([^/;]*) Build'
+    - regex: 'L18011[/;) ]'
+      model: 'A5'
+    - regex: 'Z2 Plus'
+      model: 'Z2 Plus'
+    - regex: 'Z2151'
+      model: 'ZUK Edge'
+    - regex: 'Z213[12]'
+      model: 'ZUK Z2'
+    - regex: 'Z2121'
+      model: 'ZUK Z2 Pro'
+    - regex: 'ZUK[ -_]([^/;]*)(?: Build|\))'
       model: 'ZUK $1'
-    - regex: 'k50a40 Build'
+    - regex: 'K10a40[/;) ]'
+      model: 'C2'
+    - regex: 'k50a40[/;) ]'
       model: 'K3 Note'
-    - regex: 'A7010a48 Build'
+    - regex: 'A7010a48[/;) ]'
       model: 'K4 Note'
-    - regex: 'A7020a48 Build'
+    - regex: 'K350t[/;) ]'
+      model: 'K5'
+    - regex: 'A7020a4[08][/;) ]'
       model: 'K5 Note'
-    - regex: '(?:Lenovo-)?A6020(?:a40|l36) Build'
-      model: 'K5 Vibe'
-    - regex: 'A6020a46 Build'
-      model: 'K5 Vibe Plus'
-    - regex: 'k53a48 Build'
-      model: 'K6 Note'
-    - regex: 'K33a42 Build'
-      model: 'K6 Power'
-    - regex: 'P1ma40 Build'
-      model: 'P1 Vibe'
-    - regex: 'P2a42 Build'
+    - regex: 'K31-t3[/;) ]'
+      model: 'K31'
+    - regex: '(?:A6020a46|Vibe K5 Plus)[/;) ]'
+      model: 'Vibe K5 Plus'
+    - regex: '(?:Lenovo-)?(?:A6020(?:a40|l36)|Vibe K5)[/;) ]'
+      model: 'Vibe K5'
+    - regex: 'VIBE Z2[);/ ]'
+      model: 'Vibe Z2'
+    - regex: 'VIBE X2[);/ ]'
+      model: 'Vibe X2'
+    - regex: 'k33a48[/;) ]'
+      model: 'K6'
+    - regex: 'P2A42[);/ ]'
       model: 'P2'
+    - regex: 'k53a48[/;) ]'
+      model: 'K6 Note'
+    - regex: 'K33a42[/;) ]'
+      model: 'K6 Power'
+    - regex: 'P1ma40[/;) ]'
+      model: 'Vibe P1m'
+    - regex: 'P1a42[/;) ]'
+      model: 'Vibe P1'
+    - regex: 'A2016a40[/;) ]'
+      model: 'Vibe B'
+    - regex: 'A1010a20[/;) ]'
+      model: 'A Plus'
+    - regex: 'Z90a40[/;) ]'
+      model: 'Vibe Shot'
+    - regex: 'S1a40[/;) ]'
+      model: 'Vibe S1'
+    - regex: 'L78071[/;) ]'
+      model: 'Z5s'
+    - regex: 'L58041[/;) ]'
+      model: 'S5 Pro'
+    - regex: 'L18021[/;) ]'
+      model: 'A3'
+    - regex: 'PB2-670M[/;) ]'
+      model: 'Phab 2'
     - regex: 'Lenovo ([^/;]*) Build'
       model: '$1'
     - regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]?([a-z0-9_+\-]+)'
@@ -4136,12 +7885,26 @@ Lexibook:
 
 # LG
 LG:
-  regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713|LM-Q710(?:\(FGN\))?|LM-X210(?:\(G\)|CM)?|LM-G710N)[);/ ]|NetCast|VS(?:988|99[56]|410PP|415PP|425PP)|Nexsus 5'
+  regex: 'LG|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]))[);/ ]|NetCast|RS98[78]|RS500|VS(?:50[01]|835|876|880|98[0578]|99[056]|(410|415|425|500|880)PP)|Nexsus 5|LML(41[34]D|211B|713D|212V)L|VK810 4G|VK815|X5-LG|L-05D|L-03K|L-01[LK]|L-51A|901LG'
   device: 'smartphone'
   models:
     - regex: 'LG-D325'
       model: 'L70'
-    - regex: 'LG-D85[0125]'
+    - regex: 'LG-D340F8'
+      model: 'L70 Tri'
+    - regex: 'LM-X210APM'
+      model: 'Phoenix 4'
+    - regex: 'LG-P505R'
+      model: 'Phoenix'
+    - regex: 'LM-X210VPP'
+      model: 'Zone 4'
+    - regex: 'LM-X220PM'
+      model: 'Tribute Empire'
+    - regex: 'VS980'
+      model: 'G2'
+    - regex: 'LG-D6(?:18|20)'
+      model: 'G2 Mini'
+    - regex: 'LG-D85[0125]|VS985'
       model: 'G3'
     - regex: 'LG-D72[2458]'
       model: 'G3 Beat'
@@ -4149,16 +7912,30 @@ LG:
       model: 'G4'
     - regex: 'LG-H525n?'
       model: 'G4c'
-    - regex: 'LG-H540'
+    - regex: 'LG-(?:H540|H542|H630)'
       model: 'G4 Stylus'
+    - regex: 'LG-H736'
+      model: 'G4s'
     - regex: 'LG-H735'
       model: 'G4 Beat'
-    - regex: 'LG-H8(?:20|30|5[08]|60)'
+    - regex: 'LG-H8(?:20|30|5[08]|60)|VS987|RS988'
       model: 'G5'
     - regex: 'LG-H84[05]'
       model: 'G5 SE'
-    - regex: 'VS988'
+    - regex: 'VS988|LG-H870DS'
       model: 'G6'
+    - regex: 'LM-Q850'
+      model: 'G7 Fit'
+    - regex: 'LM-Q910'
+      model: 'G7 One'
+    - regex: 'LM-G820(N|QM[0127]|UMB)?'
+      model: 'G8'
+    - regex: 'LM-G810'
+      model: 'G8S ThinQ'
+    - regex: '901LG[);/ ]'
+      model: 'G8X ThinQ'
+    - regex: 'VS501'
+      model: 'K20'
     - regex: '(?:LG-)?H502'
       model: 'Magna'
     - regex: '(?:LG-)?H343'
@@ -4169,24 +7946,104 @@ LG:
       model: 'Risio 2'
     - regex: '(?:LG-)?P500H'
       model: 'Optimus One'
-    - regex: 'P713'
+    - regex: 'L-05D[);/ ]'
+      model: 'Optimus it L-05D'
+    - regex: 'LG-L160L[);/ ]'
+      model: 'Optimus LTE 2'
+    - regex: 'P713[);/ ]'
       model: 'Optimus L7II'
-    - regex: 'L-01D'
+    - regex: 'L-01D[);/ ]'
       model: 'Optimus LTE L-01D'
-    - regex: 'L-02D'
+    - regex: 'L-02D[);/ ]'
       model: 'PRADA phone L-02D'
     - regex: 'L-07C'
       model: 'Optimus Bright L-07C'
     - regex: '(?:LG-)?F800(?:S|K|L)?'
       model: 'V20'
-    - regex: 'LM-Q710'
+    - regex: 'LM-Q710(?:\(FGN\)|[\.]?FGN)'
+      model: 'Q Stylus Plus'
+    - regex: 'LM-Q[67]10\.FG[);/ ]'
+      model: 'Q7'
+    - regex: 'LM-(Q725[KL]|Q610.FGN)[);/ ]'
+      model: 'Q7+'
+    - regex: 'LM-Q815[SL][);/ ]'
+      model: 'Q8+'
+    - regex: 'LM-Q925L[);/ ]'
+      model: 'Q9'
+    - regex: 'LGV33[);/ ]'
+      model: 'Qua Phone PX'
+    - regex: 'L-03K[);/ ]'
+      model: 'Style'
+    - regex: 'L-01L[);/ ]'
+      model: 'Style 2'
+    - regex: 'VS835[);/ ]'
+      model: 'Stylo 2 V'
+    - regex: 'LM-Q710|LML713DL'
       model: 'Stylo 4'
-    - regex: 'LM-G710N'
+    - regex: 'LM-Q720'
+      model: 'Stylo 5'
+    - regex: 'LM-G710(N|VM)?'
       model: 'G7 ThinQ'
     - regex: 'LM-X210CM'
       model: 'Fortune 2'
-    - regex: 'LM-X210'
+    - regex: 'LM-X410\.F[);/ ]'
+      model: 'Premier Pro'
+    - regex: 'LML41[34]DL[);/ ]'
+      model: 'Premier Pro LTE'
+    - regex: 'LM-X525'
+      model: 'Q60'
+    - regex: 'LM-X210K'
+      model: 'X2'
+    - regex: 'LG-K580'
+      model: 'X Cam'
+    - regex: 'LM-X510WM'
+      model: 'X Power 3'
+    - regex: 'LM-X(?:41[05]K|410S)'
+      model: 'X4'
+    - regex: 'LM-X(415[LS]|410L)'
+      model: 'X4+'
+    - regex: 'LM-X410\.FN'
+      model: 'K11'
+    - regex: 'LM-X(?:320|410[UP]M)'
+      model: 'K30'
+    - regex: 'LM-X410'
+      model: 'LM-X410'
+    - regex: 'LM-X420N'
+      model: 'X4 (2019)'
+    - regex: 'LG-X230'
+      model: 'K4'
+    - regex: 'LM-X420'
+      model: 'K40'
+    - regex: 'LG-X220'
+      model: 'K5'
+    - regex: 'LM-X540'
+      model: 'K50S'
+    - regex: '(?:LM-X510[KLS]|X5-LG)'
+      model: 'X5'
+    - regex: 'LM-X625N1'
+      model: 'X6'
+    - regex: 'LM-X625N'
+      model: 'X6 (2019)'
+    - regex: 'LGMS210'
+      model: 'Aristo'
+    - regex: 'LM-X210[G]?'
       model: 'Aristo 2'
+    - regex: 'LM-X220'
+      model: 'Aristo 3'
+    - regex: 'LM-V40(5|9N)'
+      model: 'V40 ThinQ'
+    - regex: 'LM-V500N'
+      model: 'V50'
+    - regex: '(?:LG-)?(?:RS987|H901|H96[0128]|VS990)'
+      model: 'V10'
+    - regex: 'LG-X240'
+      model: 'K8 (2017)'
+    - regex: '(?:LG-)?RS500'
+      model: 'K8 4G'
+    - regex: '(?:LG-)?VS500'
+      model: 'K8 V'
+    - regex: 'LM-X212\(G\)'
+      model: 'K8 (2018)'
     - regex: '(?:LG-)?H91[058]'
       model: 'V20'
     - regex: '(?:LG-)?H990(?:DS|N|T)?'
@@ -4199,8 +8056,14 @@ LG:
       model: 'V20'
     - regex: 'VS996'
       model: 'V30'
+    - regex: 'L-01K[);/ ]'
+      model: 'V30 Plus'
+    - regex: 'L-51A[);/ ]'
+      model: 'V60'
     - regex: '(?:LG-)?VS410PP'
       model: 'Optimus Zone'
+    - regex: 'LM-V350[N]?'
+      model: 'V35'
     - regex: '(?:LG-)?VS415PP'
       model: 'Optimus Zone 2'
     - regex: '(?:LG-)?VS425PP'
@@ -4211,6 +8074,8 @@ LG:
       model: 'K7'
     - regex: '(?:LG-?)?(?:K|MS)350'
       model: 'K8'
+    - regex: 'VS500PP'
+      model: 'K8 V'
     - regex: '(?:LG-)?K420(?:N)?'
       model: 'K10'
     - regex: '(?:LG-)?K430(?:DS|DSF|DSY)?'
@@ -4219,16 +8084,40 @@ LG:
       model: 'K10 (2017)'
     - regex: '(?:LG-)?F670[KLS]?'
       model: 'K10'
+    - regex: '(?:LG-)?M255'
+      model: 'K20'
+    - regex: '(?:LG-?)?[MT]P260'
+      model: 'K20 Plus'
     - regex: '(?:LG-)?M700(?:N|A|DSK|AN)?'
       model: 'Q6'
+    - regex: 'LM-X440IM'
+      model: 'W30'
+    - regex: '(?:LG-?)?K220'
+      model: 'X Power'
+    - regex: '(?:LG-?)?M320'
+      model: 'X Power 2'
     - regex: '(?:LG-)?K371'
       model: 'Phoenix 2'
     - regex: '(?:LG-)?M150'
       model: 'Phoenix 3'
     - regex: '(?:LG-)?F100[SL]'
       model: 'Optimus Vu'
-    - regex: '(?:LG-)?H340n?'
+    - regex: '(?:LG-)?P880'
+      model: 'Optimus 4X HD'
+    - regex: '(?:LG-)?(H340n?|H324)'
       model: 'Leon'
+    - regex: '(?:LG-)?H342'
+      model: 'Leon 4G LTE'
+    - regex: '(?:LG-)?H422'
+      model: 'Spirit'
+    - regex: '(?:LG)?C660'
+      model: 'Optimus Pro'
+    - regex: 'LML21(?:1B|2V)L'
+      model: 'Rebel 4'
+    - regex: 'VS876'
+      model: 'Lucid 3'
+    - regex: 'VS880(PP)?'
+      model: 'G Vista'
 
     - regex: 'LG-V490'
       model: 'G Pad 8.0'
@@ -4245,6 +8134,12 @@ LG:
     - regex: 'LG-V521'
       model: 'G Pad X 8.0'
       device: 'tablet'
+    - regex: 'VK810'
+      model: 'G Pad 8.3 LTE'
+      device: 'tablet'
+    - regex: 'VK815'
+      model: 'G Pad X 8.3'
+      device: 'tablet'
 
     - regex: 'webOS.TV'
       device: 'tv'
@@ -4253,8 +8148,17 @@ LG:
       device: 'tv'
       model: 'NetCast'
 
+    - regex: 'LG Watch Urbane'
+      device: 'wearable'
+      model: 'Watch Urbane'
+
+    # general detections
+    - regex: '(LM-[A-Z]{1}[0-9]{3}([A-Z]{1,3})?)'
+      model: '$1'
     - regex: 'LGE(?: |-LG| LG-AX|-)([a-z0-9]+)'
       model: '$1'
+    - regex: 'FBDV/LG-([a-z0-9]+);FBSV'
+      model: '$1'
     - regex: 'LGE;([a-z0-9\-]+)'
       model: '$1'
     - regex: 'LG[ _\-](V90.*|Optimus[ _\-]Pad.*) Build'
@@ -4283,9 +8187,13 @@ Lingwin:
 
 # Logicom
 Logicom:
-  regex: '(TAB950|TAB1062|E731|E812|E912|E1031|POWER BOT|(?:B|C|M|ID|VR)[ _]?BOT[ _]?(?:TAB[ _])?([0-9]+\+?)(?:PLUS)?|KT712A_4\.4|L-?IXIR[0-9]*|L-ITE|L-?EMENT)[_);/ ]'
+  regex: 'LOGICOM[_ ]|(TAB950|TAB1062|E731|E812|E912|E1031|POWER BOT|La Tab 72|(?:B|C|M|ID|VR)[ _]?BOT[ _]?(?:TAB[ _])?([0-9]+\+?)(?:PLUS)?|KT712A_4\.4|L-?IXIR[0-9]*|L-ITE|L-?EMENT|Le[ _]?(?:Hop|Lift|Hola|Moov[2]?|Fit FR|Smooth(?: FR)?))[_);/ ]'
   device: 'tablet'
   models:
+    - regex: 'La Tab 72'
+      model: 'La Tab 72'
+    - regex: 'LOGICOM_LA_TAB_LINK_71'
+      model: 'La Tab Link 71'
     - regex: 'KT712A_4.4'
       model: 'L-ixir Tab 701'
     - regex: 'LIXIR1041'
@@ -4302,6 +8210,33 @@ Logicom:
       model: 'POWER BOT'
     - regex: '((?:B|C|M|ID|VR))[ _]?BOT[ _]?((?:TAB[ _])?([0-9]+\+?)(?:PLUS)?)'
       model: '$1 BOT $2'
+    - regex: 'Le Lift'
+      model: 'Le Lift'
+      device: 'smartphone'
+    - regex: 'Le Hola FR[);/ ]'
+      model: 'Le Hola FR'
+      device: 'smartphone'
+    - regex: 'Le[ _]Hola[);/ ]'
+      model: 'Le Hola'
+      device: 'smartphone'
+    - regex: 'LeMoov2[);/ ]'
+      model: 'Le Moov 2'
+      device: 'smartphone'
+    - regex: 'LeMoov[);/ ]'
+      model: 'Le Moov'
+      device: 'smartphone'
+    - regex: 'Le Fit FR[);/ ]'
+      model: 'Le Fit FR'
+      device: 'smartphone'
+    - regex: 'Le Hop[);/ ]'
+      model: 'Le Hop'
+      device: 'smartphone'
+    - regex: 'Le Smooth FR[);/ ]'
+      model: 'Le Smooth FR'
+      device: 'smartphone'
+    - regex: 'Le Smooth[);/ ]'
+      model: 'Le Smooth'
+      device: 'smartphone'
 
 # Konka
 Konka:
@@ -4340,11 +8275,39 @@ Konrow:
 
 # Karbonn
 Karbonn:
-  regex: '(?:Browser-)?Karbonn|K9 Smart Grand'
+  regex: '(?:Browser-)?Karbonn|K9 Kavach 4G|K9 Music 4G|K9 Smart|K9 VIRAAT 4G|Aura Sleek Plus|Aura Note Play|Titanium (?:Vista 4G|Jumbo)'
   device: 'smartphone'
   models:
+    - regex: 'K9 Kavach 4G'
+      model: 'K9 Kavach 4G'
+    - regex: 'K9 Music 4G'
+      model: 'K9 Music 4G'
+    - regex: 'K9 Smart 1GB'
+      model: 'K9 Smart'
+    - regex: 'K9 Smart 4G'
+      model: 'K9 Smart 4G'
     - regex: 'K9 Smart Grand'
       model: 'K9 Smart Grand'
+    - regex: 'K9 Smart Yuva'
+      model: 'K9 Smart Yuva'
+    - regex: 'K9 Smart'
+      model: 'K9 Smart'
+    - regex: 'Aura Sleek Plus'
+      model: 'Aura Sleek Plus'
+    - regex: 'Aura Note Play'
+      model: 'Aura Note Play'
+    - regex: 'karbonnK9 Viraat 4G|K9 VIRAAT 4G'
+      model: 'K9 Viraat 4G'
+    - regex: 'Titanium[ _]S2[ _]Plus'
+      model: 'Titanium S2 Plus'
+    - regex: 'Titanium_S99'
+      model: 'Titanium S99'
+    - regex: 'Titanium Vista 4G'
+      model: 'Titanium Vista 4G'
+    - regex: 'Titanium Jumbo 2'
+      model: 'Titanium Jumbo 2'
+    - regex: 'Titanium Jumbo'
+      model: 'Titanium Jumbo'
     - regex: 'Karbonn ([a-z0-9]+) WAP-Browser'
       model: '$1'
       device: 'feature phone'
@@ -4381,11 +8344,13 @@ Coby Kyros:
 
 # Mpman
 Mpman:
-  regex: '(?:MPQC|MPDC)[0-9]+|PH(?:150|340|350|360|451|500|520)|(?:MID(?:7C|74C|82C|84C|801|811|701|711|170|77C|43C|102C|103C|104C|114C)|MP(?:843|717|718|1010|7007|7008|843|888|959|969)|MGP7)[);/ ]'
+  regex: '(?:MPQC|MPDC)[0-9]+|PH(?:150|340|350|360|451|500|520)|(?:MID(?:7C|74C|82C|84C|801|811|701|711|170|77C|43C|102C|103C|104C|114C)|MP100i OCTA|MP(?:843|717|718|1010|7007|7008|843|888|959|969)|MGP7)[);/ ]'
   device: 'tablet'
   models:
-    - regex: '((?:MPQC|MPDC)[0-9]+[^/;]+) Build'
+    - regex: '((?:MPQC|MPDC)[0-9]+[^/;)]+)(?: Build|\))'
       model: '$1'
+    - regex: 'MP100i OCTA[);/ ]'
+      model: 'MP100i OCTA'
     - regex: '(MID(?:7C|74C|82C|84C|801|811|701|711|170|77C|43C|102C|103C|104C|114C)|MP(?:843|717|718|1010|7007|7008|843|888|959|969)|MGP7)[);/ ]'
       model: '$1'
     - regex: '(PH(?:150|340|350|360|451|500|520))'
@@ -4394,9 +8359,14 @@ Mpman:
 
 # Majestic
 Majestic:
-  regex: 'MAJESTIC[ _-]|CRONO ?[0-9]+'
+  regex: 'MAJESTIC[ _-]|CRONO ?[0-9]+|TAB (?:647|411) 3G|URANO 77LTE'
   device: 'smartphone'
   models:
+      - regex: 'URANO 77LTE[);/ ]'
+        model: 'Urano 77 LTE'
+      - regex: 'TAB (647|411) 3G'
+        model: 'Tab $1 3G'
+        device: 'tablet'
       - regex: 'MAJESTIC[ _]Tab([^;/]+)Build'
         model: 'Tab$1'
         device: 'tablet'
@@ -4414,13 +8384,68 @@ Majestic:
 
 # Manta Multimedia
 Manta Multimedia:
-  regex: '((?<!/)MID713|MID(?:06[SN]|08[S]?|12|13|14|15|701|702|703|704|705(?:DC)?|706[AS]?|707|708|709|711|712|714|717|781|801|802|901|1001|1002|1003|1004(?: 3G)?|1005|1009|1010|7802|9701|9702))[);/ ]'
-  device: 'tablet'
-  model: '$1'
+  regex: 'MSP950(1[45]|2[01])|MSP96017|((?<!/)MID713|MID(?:06[SN]|08[S]?|12|13|14|15|701|702|703|704|705(?:DC)?|706[AS]?|707|708|709|711|712|714|717|781|801|802|901|1001|1002|1003|1004(?: 3G)?|1005|1009|1010|7802|9701|9702))[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '((?<!/)MID713|MID(?:06[SN]|08[S]?|12|13|14|15|701|702|703|704|705(?:DC)?|706[AS]?|707|708|709|711|712|714|717|781|801|802|901|1001|1002|1003|1004(?: 3G)?|1005|1009|1010|7802|9701|9702))[);/ ]'
+      device: 'tablet'
+      model: '$1'
+    - regex: 'MSP95014'
+      model: 'Titano 3'
+    - regex: 'MSP95015'
+      model: 'Mezo 2'
+    - regex: 'MSP95020'
+      model: 'Rocky 2'
+    - regex: 'MSP95021'
+      model: 'Rocky 3 Pro'
+    - regex: 'MSP96017'
+      model: 'Forto 2'
+
+# Masstel
+Masstel:
+  regex: 'Masstel'
+  device: 'smartphone'
+  models:
+    - regex: 'Masstel[_ ](Juno[_ ]Q3|X9|N4[56]0|N5[2458]0|N536|M05|M1[29]0|M1[125]|M250|M25)[);/ ]'
+      model: '$1'
+    - regex: 'Masstel[_ ]\((M18)\)'
+      model: '$1'
+    - regex: 'Masstel_Tab7LTE[);/ ]'
+      model: 'Tab 7 LTE'
+      device: 'tablet'
+    - regex: 'Masstel Tab (840|700i)[);/ ]'
+      model: 'Tab $1'
+      device: 'tablet'
+
+# Maxwest
+Maxwest:
+  regex: '(?:Astro_5N_LTE|Virtue Z5|Astro X55s|Nitro_4)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Astro_5N_LTE'
+      model: 'Astro 5N LTE'
+    - regex: 'Virtue Z5'
+      model: 'Virtue Z5'
+    - regex: 'Astro X55s'
+      model: 'Astro X55s'
+    - regex: 'Nitro_4'
+      model: 'Nitro 4'
+
+# Maze
+Maze:
+  regex: '(?:SSB-500|Alpha[_ ]X|SSB504R)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'SSB-500[);/ ]'
+      model: 'SSB-500'
+    - regex: 'SSB504R[);/ ]'
+      model: 'Speed'
+    - regex: 'Alpha[_ ]X[);/ ]'
+      model: 'Alpha X'
 
 # Mediacom
 Mediacom:
-  regex: '(?:SmartPad7503G|SmartPad970s2(?:3G)?|M[_-][MP]P[0-9a-z]+|M-IPRO[0-9a-z]+)[);/ ]'
+  regex: '(?:SmartPad7503G|M-SP10MXA|SmartPad970s2(?:3G)?|M[_-][MPS]P[0-9a-z]+|M-IPRO[0-9a-z]+)[);/ ]'
   device: 'tablet'
   models:
     - regex: 'SmartPad7503G[);/ ]'
@@ -4433,6 +8458,8 @@ Mediacom:
       model: 'SmartPad 8.0 Mobile'
     - regex: 'M-MP940M[);/ ]'
       model: 'SmartPad 9.7 Mobile'
+    - regex: 'M-SP10MXA[);/ ]'
+      model: 'SmartPad MX 10'
     - regex: 'M-MP(?:710|720|725|726|740)GOx?[);/ ]'
       model: 'SmartPad 7.0 Go'
     - regex: 'M-MP876S2[);/ ]'
@@ -4443,6 +8470,8 @@ Mediacom:
       model: 'SmartPad $1 S2'
     - regex: 'M-MP85S23G[);/ ]'
       model: 'SmartPad 875 S2 3G'
+    - regex: 'M-SP1AGO3G'
+      model: 'SmartPad 10 Go 3G'
     - regex: 'M-MP10[45][01]S2[);/ ]'
       model: 'SmartPad 10.1 S2'
     - regex: 'M-MP1S2[AB]3G[);/ ]'
@@ -4477,6 +8506,9 @@ Mediacom:
     - regex: 'M-MP5303G[);/ ]'
       model: 'SmartPad Mini Mobile'
       device: 'phablet'
+    - regex: 'M-PPxB400[);/ ]'
+      model: 'PhonePad Duo B400'
+      device: 'phablet'
     - regex: 'M-PPAG550[);/ ]'
       model: 'PhonePad Duo G550'
       device: 'phablet'
@@ -4520,15 +8552,20 @@ Mediacom:
 
 # Medion
 Medion:
-  regex: 'Medion|(?:MD_)?LIFETAB|X5001[);/ ]|[SPX]10[0-9]{2}X[);/ ]'
+  regex: 'Medion|(?:MD_)?LIFETAB|([SPX]10[0-9]{2}X|E10[45]1X|X5001|P851X|P850X)[);/ ]'
   device: 'smartphone'
   models:
     - regex: '(?:MD_)?LIFETAB_([a-z0-9]+)'
       device: 'tablet'
       model: 'Lifetab $1'
-    - regex: 'X5001'
-      model: 'Life X5001'
-    - regex: '([SPX]10[0-9]{2}X)[);/ ]'
+    - regex: '(E450[46]|E5004|S5004|X5001|E5020|P5015)[);/ ]'
+      model: 'Life $1'
+    - regex: '(B5530)[);/ ]'
+      model: '$1'
+    - regex: '(E10[45]1X)[);/ ]'
+      device: 'tablet'
+      model: '$1'
+    - regex: '([SPX]10[0-9]{2}X|P851X|P850X)[);/ ]'
       model: 'Lifetab $1'
       device: 'tablet'
     - regex: 'Medion(?: Smartphone)? ([^/;]+) Build'
@@ -4546,7 +8583,7 @@ MEEG:
 
 # Meizu
 Meizu:
-  regex: 'Meizu|MZ-[a-z]|(M04[05]|M35[1356]|M6T|MX[ -]?[2345](?: Pro)?|(?:MZ-)?m[1-6] note|M57[18]C|M3[ESX]|M031|m1 metal|M1 E|M2|M2 E|PRO 6|PRO 7-H)[);/ ]'
+  regex: 'Meizu|MZ-[a-z]|(M04[05]|MZ-16th(?: Plus)?|MZ-16[st]|M7[12]1C|M35[1356]|M612C|M578CA|M181[36]|M1822|M681C|M6T|MX[ -]?[2345](?: Pro)?|(?:MZ-)?m[1-6] note|M621C|M1852|M57[18]C|M3[ESX]|M031|m1 metal|M1 E|M2|M2 E|M5s Build|PRO 6|PRO 7-H|MZ-15 (?:Lite|Plus)|MZ-16 X)[);/ ]'
   device: 'smartphone'
   models:
     - regex: '(?:MZ-)?M571C'
@@ -4559,8 +8596,19 @@ Meizu:
       model: 'M1E'
     - regex: 'M2 E[);/ ]'
       model: 'M2E'
-    - regex: '(?:MZ-)?M578C|M2[);/ ]'
+    - regex: '(?:MZ-)?M578C[A]?|M2[);/ ]'
       model: 'M2'
+    - regex: 'M681C[);/ ]'
+      model: 'M3 Note'
+      device: 'phablet'
+    - regex: 'M621C[);/ ]'
+      model: 'M5 Note'
+      device: 'phablet'
+    - regex: 'M711C[);/ ]'
+      model: 'M6'
+    - regex: 'M721C[);/ ]'
+      model: 'M6 Note'
+      device: 'phablet'
     - regex: 'M6T'
       model: 'M6T'
     - regex: 'M3E'
@@ -4569,6 +8617,8 @@ Meizu:
       model: 'M3S'
     - regex: 'M3X'
       model: 'M3X'
+    - regex: 'M5S|M612C'
+      model: 'M5S'
     - regex: '(M04[05]|MX[ -]?2)[);/ ]'
       model: 'MX2'
     - regex: '(M35[1356]|MX[ -]?3)[);/ ]'
@@ -4581,12 +8631,36 @@ Meizu:
       model: 'MX5'
     - regex: 'm1 metal'
       model: 'M1 Metal'
+    - regex: 'M1813[);/ ]'
+      model: 'M8'
+    - regex: 'M1816[);/ ]'
+      model: 'M8 Lite'
     - regex: 'PRO 6'
       model: 'PRO 6'
-    - regex: 'PRO 7-H'
+    - regex: 'PRO 7-H[);/ ]'
       model: 'PRO 7'
-    - regex: 'M031'
+    - regex: 'M031[);/ ]'
       model: 'MX Dual Core'
+    - regex: 'M1852[);/ ]'
+      model: 'X8'
+    - regex: 'M1822[);/ ]'
+      model: 'Note 8'
+    - regex: 'MZ-16T[);/ ]'
+      model: '16T'
+    - regex: 'MZ-16th Plus[);/ ]'
+      model: '16th Plus'
+    - regex: 'MZ-15 Plus[);/ ]'
+      model: '15 Plus'
+    - regex: 'MZ-15 Lite[);/ ]'
+      model: '15 Lite'
+    - regex: 'MZ-16th[);/ ]'
+      model: '16th'
+    - regex: 'MZ-16 X[);/ ]'
+      model: '16X'
+    - regex: 'Meizu[_ ]note([89])[);/ ]'
+      device: 'phablet'
+      model: 'Note $1'
+
     - regex: '(?:MZ-)?Meizu[_ ]([^/;]+) Build'
       model: '$1'
     - regex: '(?:MZ-)?Meizu[_ ]([a-z0-9_]+)'
@@ -4594,6 +8668,30 @@ Meizu:
     - regex: 'MZ-([^/;]+) Build'
       model: '$1'
 
+# Meitu
+Meitu:
+  regex: '(?:(?<!MI CC 9 )Meitu[2]?|MP1503|MP1512|MP160[23]|MP170[19]|MP171[138])[ ;/)]'
+  device: 'smartphone'
+  models:
+    - regex: 'MP1503[ ;/)]'
+      model: 'M6'
+    - regex: 'MP1512[ ;/)]'
+      model: 'M6s'
+    - regex: 'MP1602[ ;/)]'
+      model: 'T8'
+    - regex: 'MP17(?:01|13)[ ;/)]'
+      model: 'T8s'
+    - regex: 'MP1718[ ;/)]'
+      model: 'T9'
+    - regex: 'MP1603[ ;/)]'
+      model: 'M8'
+    - regex: 'MP17(?:09|11)[ ;/)]'
+      model: 'M8s'
+    - regex: 'Meitu2[ ;/)]'
+      model: '2'
+    - regex: 'Meitu (Kiss|[MV]4)[ ;/)]'
+      model: '$1'
+
 # Memup
 Memup:
   regex: 'SlidePad ?([^;/]*) Build|SPNG?[0-9]{2,4}[a-z]{0,2}[ ;/)]|SP704CE?'
@@ -4624,9 +8722,13 @@ Mecer:
 
 # mio
 Mio:
-  regex: 'MIO(?:/)?([a-z0-9]+)'
+  regex: 'MIO(?:/)?([a-z0-9]+)|MOBIX M6[);/ ]'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'MOBIX M6[);/ ]'
+      model: 'Mobix M6'
+    - regex: 'MIO(?:/)?([a-z0-9]+)'
+      model: '$1'
 
 # Miray
 Miray:
@@ -4661,11 +8763,61 @@ MIXC:
     - regex: '(G[0-9]{4})[ );/]'
       model: '$1'
 
-# Mobiistar
-Mobiistar:
-  regex: 'Mobiistar|Zumbo_|PRIME X MAX'
+# Mobiola
+Mobiola:
+  regex: '(MS5[50]X6|MS55X5|MS55L1|MS50L1|MS43A3000|MS45A4000|MS50A4000|MS50A4500|MS50A5000|MS50A6000|MS50B11000|MB-2900 QUATTRO|POLYS[_ ]MS45L1|Wave5)'
   device: 'smartphone'
   models:
+    - regex: 'MS50X6'
+      model: 'Atmos II'
+    - regex: 'POLYS[_ ]MS45L1'
+      model: 'Polys MS45L1'
+    - regex: 'MS55X6'
+      model: 'Atmos Pro II'
+    - regex: 'MS55X5'
+      model: 'Atmos Pro'
+    - regex: 'MS55L1'
+      model: 'GAIA'
+    - regex: 'MS50L1'
+      model: 'Inti'
+    - regex: 'MB-2900 QUATTRO'
+      model: 'MB-2900 Quattro'
+    - regex: 'MS43A3000'
+      model: 'MS43A3000'
+    - regex: 'MS45A4000'
+      model: 'eOn 45'
+    - regex: 'MS50A4000'
+      model: 'eOn 50'
+    - regex: 'MS50A4500'
+      model: 'eOn 50 Elegance'
+    - regex: 'MS50A5000'
+      model: 'eOn 50 Quad 8'
+    - regex: 'MS50A6000'
+      model: 'eOn 50 Quad 16'
+    - regex: 'MS50B11000'
+      model: 'MS50B11000'
+    - regex: 'Wave5'
+      model: 'Wave 5'
+
+# Mobicel
+Mobicel:
+  regex: 'Mobicel_(R1)|Matrix'
+  device: 'smartphone'
+  models:
+    - regex: 'Matrix'
+      model: 'Matrix'
+    - regex: 'Mobicel_(R1)'
+      model: '$1'
+
+# Mobiistar
+Mobiistar:
+  regex: 'Mobiistar|Zumbo_|PRIME X MAX|X1 Notch|E1 Selfie'
+  device: 'smartphone'
+  models:
+    - regex: 'X1 Notch[/;) ]'
+      model: 'X1 Notch'
+    - regex: 'E1 Selfie[/;) ]'
+      model: 'E1 Selfie'
     - regex: 'mobiistar_LAI_Zumbo Build'
       model: 'Zumbo'
     - regex: 'Zumbo_S_2017 Build'
@@ -4680,6 +8832,8 @@ Mobiistar:
       model: 'Lai Zumbo J (2017)'
     - regex: 'Mobiistar_Zumbo_J2'
       model: 'Lai Zumbo J2'
+    - regex: 'Mobiistar[_ ]Zumbo[_ ]S2'
+      model: 'Zumbo S2'
     - regex: 'mobiistar ZUMBO Power'
       model: 'Zumbo Power'
     - regex: 'mobiistar[ _]LAI[ _]YUNA[ _]([1XCS])'
@@ -4740,10 +8894,38 @@ MLLED:
 
 # Mobistel
 Mobistel:
-  regex: '(Cynus[ _][^/;]+) Build'
+  regex: '(Cynus[ _][^/;)]+)( Build|\))'
   device: 'smartphone'
   model: '$1'
 
+# Mecool
+Mecool:
+  regex: '(?:KM9PRO|BB2 PRO|KII PRO|KM9_TV_BOX|M8SPROW|M8S (?:PLUS|PRO) (?:DVB|[LW]|PLUS)|M8S (?:MAX|PRO))[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'KM9PRO[);/ ]'
+      model: 'KM9 Pro'
+    - regex: 'KM9_TV_BOX[);/ ]'
+      model: 'KM9 TV Box'
+    - regex: 'BB2 PRO[);/ ]'
+      model: 'BB2 Pro'
+    - regex: 'KII PRO[);/ ]'
+      model: 'KII Pro'
+    - regex: 'M8SPROW[);/ ]'
+      model: 'M8S Pro W'
+    - regex: 'M8S PLUS DVB[);/ ]'
+      model: 'M8S Plus DVB'
+    - regex: 'M8S PLUS ([LW])[);/ ]'
+      model: 'M8S Plus $1'
+    - regex: 'M8S PRO ([LW])[);/ ]'
+      model: 'M8S Pro $1'
+    - regex: 'M8S PRO PLUS[);/ ]'
+      model: 'M8S Pro Plus'
+    - regex: 'M8S PRO[);/ ]'
+      model: 'M8S Pro'
+    - regex: 'M8S MAX[);/ ]'
+      model: 'M8S Max'
+
 # Modecom
 Modecom:
   regex: 'Modecom|Free(?:Way )?Tab|xino z[\d]+ x[\d]+'
@@ -4774,7 +8956,7 @@ Mofut:
 
 # motorola
 Motorola:
-  regex: 'MOT|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?: Build|\))'
+  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1970-5|XT1799-2|XT1021|XT1710-08|XT180[3-5]|XT194[23]-1|XT1929-15|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -4847,34 +9029,74 @@ Motorola:
       model: 'Droid RAZR D3'
     - regex: '(?:MOT-|Motorola-)?XT925'
       model: 'Droid RAZR HD'
-    - regex: '(?:MOT-|Motorola-)?XT1022'
+    - regex: '(?:MOT-|Motorola-)?XT102[12]'
       model: 'Moto E'
     - regex: '(?:MOT-|Motorola-)?XT1706'
       model: 'Moto E3 Power'
+    - regex: '(?:MOT-|Motorola-)?XT1924-9'
+      model: 'Moto E5 Plus'
     - regex: '(?:MOT-|Motorola-)?XT1030'
       model: 'Droid Mini'
+    - regex: '(?:MOT-|Motorola-)?XT1096'
+      model: 'Moto X2'
     - regex: '(?:MOT-|Motorola-)?XT1254'
       model: 'Droid Turbo'
-    - regex: '(?:MOT-|Motorola-)?XT10(?:28|3[1234]|68)'
+    - regex: 'moto g power'
+      model: 'Moto G Power'
+    - regex: 'moto g\(([0-9])\) power'
+      model: 'Moto G$1 Power'
+    - regex: 'moto g\(([0-9])\) plus'
+      model: 'Moto G$1 Plus'
+    - regex: '(?:MOT-|Motorola-)?XT10(?:28|3[1234]|68|69)'
       model: 'Moto G'
-    - regex: '(?:MOT-|Motorola-)?XT10(?:49|5[23568]|60|9[2345])'
+    - regex: '(?:MOT-|Motorola-)?XT1799-2'
+      model: 'Moto G5s'
+    - regex: '(?:MOT-|Motorola-)?XT180[3-5]'
+      model: 'Moto G5s Plus'
+    - regex: '(?:MOT-|Motorola-)?XT168[57]'
+      model: 'Moto G5 Plus'
+    - regex: '(?:MOT-|Motorola-)?XT1670' #XT1671 XT1677
+      model: 'Moto G5'
+    - regex: '(?:MOT-|Motorola-)?XT1925-10'
+      model: 'Moto G6'
+    - regex: '(?:MOT-|Motorola-)?XT10(?:49|5[23568]|60|9[23457])'
       model: 'Moto X'
     - regex: '(?:MOT-|Motorola-)?XT1562'
       model: 'Moto X Play'
+    - regex: '(?:MOT-|Motorola-)?XT1572'
+      model: 'Moto X Style'
     - regex: '(?:MOT-|Motorola-)?XT1080'
       model: 'Droid Ultra'
     - regex: '(?:MOT-|Motorola-)?XT1650-05'
       model: 'Moto Z'
     - regex: '(?:MOT-|Motorola-)?XT1635(?:-0[1-3])?'
       model: 'Moto Z Play'
+    - regex: '(?:MOT-|Motorola-)?XT1710-(?:-0[28])?'
+      model: 'Moto Z2 Play'
+    - regex: '(?:MOT-|Motorola-)?XT1789-05'
+      model: 'Moto Z2 Force'
+    - regex: '(?:MOT-|Motorola-)?XT1929-15'
+      model: 'Moto Z3'
     - regex: '(?:MOT-|Motorola-)?XT1663'
       model: 'Moto M'
+    - regex: '(?:MOT-|Motorola-)?XT1943-1'
+      model: 'P30'
+    - regex: '(?:MOT-|Motorola-)?XT1941-2'
+      model: 'P30 Play'
+    - regex: '(?:MOT-|Motorola-)?XT1942-1'
+      model: 'P30 Note'
+    - regex: '(?:MOT-|Motorola-)?XT1970-5'
+      model: 'One Vision'
+    - regex: '(?:MOT-|Motorola-)?one zoom'
+      model: 'One Zoom'
+    - regex: 'motorola one action'
+      model: 'One Action'
 
-    - regex: 'Moto ([CGEZ]) \(([a-z0-9]+)\)( Plus| Play)?'
+    - regex: 'Moto ([CGEXZ]) ?\(([a-z0-9]+)\)( Plus| Play)?'
       model: 'Moto $1$2$3'
-    - regex: 'Moto ?([CGEZ])([0-9]+)( Plus| Play)?'
+    - regex: 'Moto ?([CGEXZ])([0-9]+)( Plus| Play)?'
       model: 'Moto $1$2$3'
-    - regex: 'Moto ?([CGEZ])( Plus| Play)?'
+    - regex: 'Moto ?([CGEXZ])( Plus| Play)?'
       model: 'Moto $1$2'
 
     - regex: 'Motorola[ _\-]([a-z0-9]+)'
@@ -4900,9 +9122,40 @@ Motorola:
     - regex: '((?:ME|MB|XT)[0-9]{3,4}(?:\(Defy\))?)[);/ ]'
       model: '$1'
 
+# Movic
+Movic:
+  regex: 'MOVIC'
+  device: 'smartphone'
+  models:
+    - regex: 'MOVIC[ -]W([2345])'
+      model: 'W$1'
+
+# MTN
+MTN:
+  regex: 'MTN-'
+  device: 'smartphone'
+  models:
+    - regex: 'MTN-(L860|S620)'
+      model: 'Sm@rt Mini $1'
+    - regex: 'MTN-8978P'
+      device: 'tablet'
+      model: 'Steppa'
+    - regex: 'MTN-([a-z0-9_\-]+)'
+      model: 'MTN-$1'
+
+# MyTab
+MyTab:
+  regex: 'MyTAB[ _-](?:8 MINI Dual Core|U55GT)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'MyTAB[ _-]8 MINI Dual Core[);/ ]'
+      model: '8 Mini Dual Core'
+    - regex: 'MyTAB-U55GT[);/ ]'
+      model: 'U55GT'
+
 # myphone
 MyPhone:
-  regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/]+ Build|Cube_LTE|myTab10II'
+  regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/)]+( Build|\))|Cube_LTE|myTab10II|HAMMER[ _](Blade2_PRO|ENERGY|Titan 2|AXE[_ ](?:M[_ ]LTE|Pro)|Iron 2|Active[2]?(_LTE)?)|C-Smart_pix|myPhone_Fun_8|myA17'
   device: 'smartphone'
   models:
     - regex: 'MyPad[ _]([^;/]+) Build'
@@ -4916,18 +9169,58 @@ MyPhone:
       device: 'tablet'
     - regex: 'Cube_LTE'
       model: 'Cube LTE'
-    - regex: 'MyPhone[ _]([^;/]+) Build'
+    - regex: 'HAMMER[ _]ENERGY'
+      model: 'Hammer Energy'
+    - regex: 'HAMMER_AXE[_ ]M[_ ]LTE'
+      model: 'Hammer Axe M LTE'
+    - regex: 'Hammer Titan 2'
+      model: 'Hammer Titan 2'
+    - regex: 'Hammer Iron 2'
+      model: 'Hammer Iron 2'
+    - regex: 'Hammer Active[);/ ]'
+      model: 'Hammer Active'
+    - regex: 'Hammer_Active2[);/ ]'
+      model: 'Hammer Active 2'
+    - regex: 'Hammer_Active2_LTE[);/ ]'
+      model: 'Hammer Active 2 LTE'
+    - regex: 'Hammer AXE Pro'
+      model: 'Hammer Axe Pro'
+    - regex: 'Hammer_Blade2_PRO'
+      model: 'Hammer Blade 2 Pro'
+    - regex: 'C-Smart_pix'
+      model: 'C-Smart Pix'
+    - regex: 'myA17[);/ ]'
+      model: 'myA17'
+    - regex: 'myPhone_Fun_8'
+      model: 'FUN 8'
+    - regex: 'MyPhone[ _]([^;/)]+)( Build|\))'
       model: '$1'
 
+# MyWigo
+MyWigo:
+  regex: 'MyWigo '
+  device: 'smartphone'
+  models:
+    - regex: 'City3'
+      model: 'City 3'
+
 # Myria
 Myria:
-  regex: ' (Myria_[^/;]+|502M|Cozy|Easy tab 9|Grand) Build'
+  regex: ' (Myria_[^/;]+|502M|Cozy|Easy tab 9|Grand) Build|Myria_FIVE|Myria_Grand_4G|Myria_Wide_2|Myria_Wide_4G'
   device: 'smartphone'
   models:
     - regex: 'Myria_([^/;]+) Build'
       model: '$1'
+    - regex: 'Myria_FIVE'
+      model: 'Five'
     - regex: '(502M|Grand)'
       model: '$1'
+    - regex: 'Myria_Grand_4G'
+      model: 'Grand 4G'
+    - regex: 'Myria_Wide_4G'
+      model: 'Wide 4G'
+    - regex: 'Myria_Wide_2'
+      model: 'Wide 2'
     - regex: '(Cozy|Easy tab 9)'
       model: '$1'
       device: 'tablet'
@@ -4943,9 +9236,72 @@ M.T.T.:
     - regex: 'M.T.T. ?([^;/]+) Build'
       model: '$1'
 
+# Navon
+Navon:
+  regex: '(?:Superme_Max|Supreme[_ ](?:Fine|Chief|Pure|Pro)(?:[_ ](?:Mini|Plus))?|Navon[_ ]Infinity)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Superme_Max[);/ ]'
+      model: 'Supreme Max'
+    - regex: 'Supreme_Fine_Mini[);/ ]'
+      model: 'Supreme Fine Mini'
+    - regex: 'Supreme[_ ]Fine[_ ]Plus[);/ ]'
+      model: 'Supreme Fine Plus'
+    - regex: 'Supreme_Fine[);/ ]'
+      model: 'Supreme Fine'
+    - regex: 'Supreme[_ ]Chief[);/ ]'
+      model: 'Supreme Chief'
+    - regex: 'Supreme[_ ]Pure[ _]Plus[);/ ]'
+      model: 'Supreme Pure Plus'
+    - regex: 'Supreme Pure[);/ ]'
+      model: 'Supreme Pure'
+    - regex: 'Supreme[_ ]Pro[);/ ]'
+      model: 'Supreme Pro'
+    - regex: 'Navon[_ ]Infinity[);/ ]'
+      model: 'Infinity'
+
+# NOA
+NOA:
+  regex: 'NOA[ _]|HummerLE|NextSE'
+  device: 'smartphone'
+  models:
+    - regex: 'NOA[_ ]CORE[_ ]FORTE'
+      model: 'Core Forte'
+    - regex: 'HummerLE'
+      model: 'Hummer LE'
+    - regex: 'NOA[_ ]Hummer[_ ]Lite'
+      model: 'Hummer Lite'
+    - regex: 'NOA[_ ]MOVEse'
+      model: 'Move SE'
+    - regex: 'NextSE'
+      model: 'Next SE'
+    - regex: 'NOA[_ ]NEXT'
+      model: 'Next'
+    - regex: 'NOA[_ ]VISION[_ ]H3SE'
+      model: 'Vision H3SE'
+    - regex: 'NOA[_ ]VISION[_ ]H3'
+      model: 'Vision H3'
+    - regex: 'NOA[_ ]LOOP'
+      model: 'Loop'
+    - regex: 'NOA[_ ]H4se'
+      model: 'H4SE'
+    - regex: 'NOA[_ ]Mg12'
+      model: 'MG12'
+    - regex: 'NOA[_ ]H44SE'
+      model: 'H44SE'
+    - regex: 'NOA[_ ]H10LE'
+      model: 'H10LE'
+    - regex: 'NOA[_ ]([^;)/ ]+)'
+      model: '$1'
+
+Nobby:
+  regex: 'Nobby[ ](S500|X800|S300(?: Pro)?)[;/) ]'
+  device: 'smartphone'
+  model: '$1'
+
 # nec
 NEC:
-  regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N'
+  regex: 'NEC[ _\-]|KGT/2\.0|PC-TE508HAW|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N'
   device: 'smartphone'
   models:
     - regex: '(?:NEC[ _\-]|KGT/2\.0 )([a-z0-9]+)'
@@ -4954,15 +9310,22 @@ NEC:
       model: '$1'
     - regex: '(?:portalmmm|o2imode)/2\.0[ ,](N[a-z0-9]+)'
       model: '$1'
+    - regex: 'PC-TE508HAW[;/) ]'
+      device: 'tablet'
+      model: 'LAVIE Tab E TE508'
 
-# Neffos
+# Neffos (TP-Link)
 Neffos:
-  regex: 'Neffos'
+  regex: 'Neffos|(TP601A)[;)/ ]'
   device: 'smartphone'
   models:
-    - regex: 'Neffos ([^/;]+) Build'
-      model: '$1'
-    - regex: 'Neffos ([^/;]+)/'
+    - regex: 'TP601A[;)/ ]'
+      model: 'C5L'
+    - regex: 'Neffos[_ ]Y50'
+      model: 'Y50'
+    - regex: 'Neffos X20 Pro'
+      model: 'X20 Pro'
+    - regex: 'Neffos[_ ]((?:Y|N|C|X)[0-9][A-Z]?(?: Max| Lite)?)'
       model: '$1'
 
 # Nextbit
@@ -4985,13 +9348,23 @@ Netgear:
    - regex: 'GTV100'
      model: 'NeoTV Prime'
 
+# NeuImage
+NeuImage:
+  regex: 'NIM-'
+  device: 'smartphone'
+  models:
+    - regex: 'NIM-(450D|550O|600Q)'
+      model: '$1'
+
 # NextBook
 NextBook:
-  regex: 'Next[0-9]|NX785QC8G|NXM900MC|NX008HD8G|NX010HI8G|NXM908HC|NXM726'
+  regex: 'Next[0-9]|NX785QC8G|NXM900MC|NX008HD8G|NX010HI8G|NXM908HC|NXM726|NXA8QC116'
   device: 'tablet'
   models:
     - regex: 'NX008HD8G'
       model: 'Premium 8 HD'
+    - regex: 'NXA8QC116'
+      model: 'Ares 8'
     - regex: 'NXM908HC'
       model: 'Premium 9'
     - regex: 'NX010HI8G'
@@ -5050,36 +9423,146 @@ Noblex:
     - regex: '(?:Noblex|NBX)[ _-]([^;/)]+)[;/)]'
       model: '$1'
 
-# Nomi
-Nomi:
-  regex: 'Nomi[ _-]'
+# Nomu
+Nomu:
+  regex: 'Nomu[ _-](?:T18|S30mini)[;/) ]'
   device: 'smartphone'
   models:
+    - regex: 'Nomu[ _-]T18[;/) ]'
+      model: 'T18'
+    - regex: 'Nomu[ _-]S30mini[;/) ]'
+      model: 'S30 Mini'
+
+# Nomi
+Nomi:
+  regex: 'Nomi[ _-]|(C101010 Ultra2|i501[234]|i5032|i5050|i5510|i5532|C0(700(?:[02358]|2HD)|7850)|C1010[0-3])[;/) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'i501[23][;/) ]'
+      model: 'Evo M2'
+    - regex: 'i5014[;/) ]'
+      model: 'Evo M4'
+    - regex: 'i5032[;/) ]'
+      model: 'Evo X2'
+    - regex: 'i5050[;/) ]'
+      model: 'Evo Z'
+    - regex: 'Nomi_i4510[;/) ]'
+      model: 'Beat M'
+    - regex: 'i5532[;/) ]'
+      model: 'Space X2'
+    - regex: 'i5510[;/) ]'
+      model: 'Space M'
+    - regex: 'C101010 Ultra2'
+      model: 'Ultra 2'
+      device: 'tablet'
+    - regex: '(C0(?:700(?:[02358]|2HD)|7850)|C1010[0-3])[;/) ]'
+      model: '$1'
+      device: 'tablet'
     - regex: 'Nomi[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Nomi[ _-]([^;/)]+)[;/)]'
       model: '$1'
 
-# Nous
-Nous:
-  regex: 'NS([356]|500[346]|5511) Build'
+# NUU Mobile
+NUU Mobile:
+  regex: 'NUU_|(?:(?:N(5702|5001)L|S6001L)|A6L-[CG])[;)/ ]'
   device: 'smartphone'
   models:
-    - regex: '(NS[0-9]{1,4}) Build'
+    - regex: 'NUU_A([13])'
+      model: 'A$1'
+    - regex: 'NUU_M3[;)/ ]'
+      model: 'M3'
+    - regex: 'NUU_X5[;)/ ]'
+      model: 'X5'
+    - regex: 'S6001L'
+      model: 'G2'
+    - regex: 'N5702L'
+      model: 'G3'
+    - regex: '(N5001L|A6L-[CG])[;)/ ]'
+      model: '$1'
+
+# NYX Mobile
+NYX Mobile:
+  regex: 'NYX[ _]'
+  device: 'smartphone'
+  models:
+    - regex: 'NYX_A1'
+      model: 'A1'
+    - regex: 'NYX_Blink'
+      model: 'Blink'
+    - regex: 'NYX_EGO'
+      model: 'Ego'
+    - regex: 'NYX_FENIX'
+      model: 'Fenix'
+    - regex: 'NYX_FLY_II'
+      model: 'Fly II'
+    - regex: 'NYX_FLY_MINI'
+      model: 'Fly Mini'
+    - regex: 'NYX_FLY'
+      model: 'Fly'
+    - regex: 'NYX_HIT'
+      model: 'Hit'
+    - regex: 'NYX_JAK'
+      model: 'Jak'
+    - regex: 'NYX_JOIN'
+      model: 'Join'
+    - regex: 'NYX_NOBA_II'
+      model: 'Noba II'
+    - regex: 'NYX_NOBA'
+      model: 'Noba'
+    - regex: 'NYX_ORBIS'
+      model: 'Orbis'
+    - regex: 'NYX[ _]REX'
+      model: 'Rex'
+    - regex: 'NYX_SHADE'
+      model: 'Shade'
+    - regex: 'NYX_SKY'
+      model: 'Sky'
+    - regex: 'NYX_SPARK'
+      model: 'Spark'
+    - regex: 'NYX_VOX'
+      model: 'Vox'
+    - regex: 'NYX_ZEUZ_HD'
+      model: 'Zeus HD'
+
+# Nous
+Nous:
+  regex: '(?:NS(?:[356]|500[2-68]|5511|5502)|NS 5511)[;/) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'NS 5511[;/) ]'
+      model: 'NS5511'
+    - regex: '(NS[0-9]{1,4})[;/) ]'
       model: '$1'
 
 # Nvidia
 Nvidia:
-  regex: '(SHIELD Tablet K1) Build'
+  regex: '(SHIELD Tablet K1) Build|SHIELD Android TV|Tegra(Note-P1640| Note 7)'
   device: 'tablet'
   models:
-    - regex: '(SHIELD Tablet K1) Build'
+    - regex: 'TegraNote-P1640'
+      model: 'Tegra Note P1640'
+    - regex: '(SHIELD Tablet K1|Tegra Note 7)(?: Build|\))'
       model: '$1'
+    - regex: 'SHIELD Android TV'
+      model: 'SHIELD Android TV'
+      device: 'tv'
 
+# O+ (OPlus)
+O+:
+  regex: 'O\+[ _](Air|Crunch|Ultra|Upsized|Venti|360 ALPHA PLUS 2.0)'
+  device: 'smartphone'
+  models:
+    - regex: 'O\+[ _](Crunch|Ultra 2.0|Ultra|Upsized|Venti 4G)'
+      model: '$1'
+    - regex: 'O\+_AIR'
+      model: 'Air'
+    - regex: 'O\+ 360 ALPHA PLUS 2.0'
+      model: '360 Alpha Plus 2.0'
 
 # o2
 O2:
-  regex: 'Xda|O2[ \-]|COCOON'
+  regex: 'Xda|(?<!FBCR/)O2[ \-]|COCOON'
   device: 'smartphone'
   models:
     - regex: '(Xda[ _][a-z0-9_]+)'
@@ -5091,6 +9574,81 @@ O2:
     - regex: 'O2-([a-z0-9]+)'
       model: '$1'
 
+# Odys
+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]|ADM816HC|ADM8000KP|NEO6_LTE|EOS10|AEON|FALCON_10_PLUS_3G|FUSION|THANOS_10|MAVEN_X10_HD(?:_LTE)?'
+  device: 'tablet'
+  models:
+    - regex: 'XELIO[_ ]A10'
+      model: 'Xelio A10'
+    - regex: 'XELIOPHONETAB3'
+      model: 'Xelio Phonetab 3'
+    - regex: 'THANOS_10'
+      model: 'Thanos 10'
+    - regex: 'XELIO_NEXT_10_PLUS_3G'
+      model: 'Xelio Next 10 Plus 3G'
+    - regex: 'XELIO_PHONE_TAB7_3G'
+      model: 'Xelio Phonetab 7 3G'
+    - regex: 'XELIO10EXTREME'
+      model: 'Xelio 10 Xtreme'
+    - regex: 'XELIO10_PLUS_3G'
+      model: 'Xelio 10 Plus 3G'
+    - regex: 'ELEMENT10_PLUS_3G'
+      model: 'Element 10 Plus 3G'
+    - regex: 'CONNECT8PLUS'
+      model: 'Connect 8 Plus'
+    - regex: 'CONNECT7PRO'
+      model: 'Connect 7 Pro'
+    - regex: 'MAVEN_X10_HD_LTE'
+      model: 'Maven X10 HD LTE'
+    - regex: 'MAVEN_X10_HD'
+      model: 'Maven X10 HD'
+    - regex: 'MAVEN_?10_PRO_PLUS_3G'
+      model: 'Maven 10 Pro Plus 3G'
+    - regex: 'MAVEN_?10_?PLUS'
+      model: 'Maven 10 Plus'
+    - regex: 'MAVEN_?10_?PRO'
+      model: 'Maven 10 Pro'
+    - regex: 'MAVEN_?10_?HD'
+      model: 'Maven 10 HD'
+    - regex: 'RAPID_?7_?LTE'
+      model: 'Rapid 7 LTE'
+    - regex: 'RAPID_?10_?LTE'
+      model: 'Rapid 10 LTE'
+    - regex: 'TAO_X10'
+      model: 'Tao X10'
+    - regex: 'SPACE10_PLUS_3G'
+      model: 'Space 10 Plus 3G'
+    - regex: 'SPACE10_PRO_3G'
+      model: 'Space 10 Pro 3G'
+    - regex: 'THOR_?10 Build'
+      model: 'Thor 10'
+    - regex: 'ADM816HC'
+      model: 'Neo X'
+    - regex: 'EOS10'
+      model: 'EOS 10'
+    - regex: 'AEON'
+      model: 'Aeon'
+    - regex: 'FALCON_10_PLUS_3G'
+      model: 'Falcon 10 Plus 3G'
+    - regex: 'FUSION'
+      model: 'Fusion 7'
+    - regex: 'NEO6[_ ]LTE'
+      model: 'Neo 6 LTE'
+      device: 'smartphone'
+    - regex: 'ADM8000KP'
+      model: 'Titan'
+    - regex: 'THOR_?10_PLUS_3G'
+      model: 'Thor 10 Plus 3G'
+    - regex: 'IEOS[ _]([^/;]+) Build'
+      model: 'Ieos $1'
+    - regex: '(?:ODYS[ _-])?NOON Build'
+      model: 'Noon'
+    - regex: '(?:ODYS[ _-])?NOON_PRO Build'
+      model: 'Noon Pro'
+    - regex: 'Odys[ _-]([^/;]+) Build'
+      model: '$1'
+
 # Obi
 Obi:
   regex: 'Obi[ _-]|(SJ1\.5|SJ2\.6|S400|S452\+|S451|S453|S501|S502|S503\+?|S507|S520|S550|S551|falcon)[ _]'
@@ -5131,67 +9689,51 @@ Obi:
     - regex: 'Obi[ _-]([^;/)]+)[;/)]'
       model: '$1'
 
-# Odys
-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]'
-  device: 'tablet'
-  models:
-    - regex: 'XELIOPHONETAB3'
-      model: 'Xelio Phonetab 3'
-    - regex: 'XELIO_NEXT_10_PLUS_3G'
-      model: 'Xelio Next 10 Plus 3G'
-    - regex: 'XELIO_PHONE_TAB7_3G'
-      model: 'Xelio Phonetab 7 3G'
-    - regex: 'XELIO10EXTREME'
-      model: 'Xelio 10 Xtreme'
-    - regex: 'XELIO10_PLUS_3G'
-      model: 'Xelio 10 Plus 3G'
-    - regex: 'ELEMENT10_PLUS_3G'
-      model: 'Element 10 Plus 3G'
-    - regex: 'CONNECT8PLUS'
-      model: 'Connect 8 Plus'
-    - regex: 'CONNECT7PRO'
-      model: 'Connect 7 Pro'
-    - regex: 'MAVEN_?10_PRO_PLUS_3G'
-      model: 'Maven 10 Pro Plus 3G'
-    - regex: 'MAVEN_?10_?PLUS'
-      model: 'Maven 10 Plus'
-    - regex: 'MAVEN_?10_?PRO'
-      model: 'Maven 10 Pro'
-    - regex: 'MAVEN_?10_?HD'
-      model: 'Maven 10 HD'
-    - regex: 'RAPID_?7_?LTE'
-      model: 'Rapid 7 LTE'
-    - regex: 'RAPID_?10_?LTE'
-      model: 'Rapid 10 LTE'
-    - regex: 'TAO_X10'
-      model: 'Tao X10'
-    - regex: 'SPACE10_PLUS_3G'
-      model: 'Space 10 Plus 3G'
-    - regex: 'SPACE10_PRO_3G'
-      model: 'Space 10 Pro 3G'
-    - regex: 'THOR_?10 Build'
-      model: 'Thor 10'
-    - regex: 'THOR_?10_PLUS_3G'
-      model: 'Thor 10 Plus 3G'
-    - regex: 'IEOS[ _]([^/;]+) Build'
-      model: 'Ieos $1'
-    - regex: '(?:ODYS[ _-])?NOON Build'
-      model: 'Noon'
-    - regex: '(?:ODYS[ _-])?NOON_PRO Build'
-      model: 'Noon Pro'
-    - regex: 'Odys[ _-]([^/;]+) Build'
-      model: '$1'
-
 # onda
 Onda:
-  regex: 'Onda'
+  regex: 'Onda|(?:(?:V820w|V891[w]?|V919(?: 3G)? Air)[ _-]DualOS|(?:V919 4G Air|V989 Air) Core8|T2101L2B1C| V10 4G|OBOOK (?:20 SE|20 PLUS DUALOS)|OBOOK10 SE|V919 Air CH DualOS)[);/ ]'
   device: 'smartphone'
   models:
     # explicit tablet models
     - regex: 'ONDA MID'
       model: 'MID'
       device: 'tablet'
+    - regex: 'V820w[ _-]DualOS'
+      model: 'V820W Dual OS'
+      device: 'tablet'
+    - regex: 'V891W[ _-]DualOS'
+      model: 'V891W Dual OS'
+      device: 'tablet'
+    - regex: 'V891[ _-]DualOS'
+      model: 'V891 Dual OS'
+      device: 'tablet'
+    - regex: 'V919 3G Air[ _-]DualOS'
+      model: 'V919 3G Air Dual OS'
+      device: 'tablet'
+    - regex: 'V919 Air[ _-]DualOS'
+      model: 'V919 Air Dual OS'
+      device: 'tablet'
+    - regex: 'V919 Air CH DualOS'
+      model: 'V919 Air CH Dual OS'
+      device: 'tablet'
+    - regex: 'V919 4G Air Core8'
+      model: 'V919 4G Air Core 8'
+      device: 'tablet'
+    - regex: 'V989 Air Core8'
+      model: 'V989 Air Core 8'
+      device: 'tablet'
+    - regex: 'T2101L2B1C|OBOOK 20 PLUS DUALOS'
+      model: 'oBook 20 Plus Dual OS'
+      device: 'tablet'
+    - regex: ' V10 4G[);/ ]'
+      model: 'V10 10.1" 4G'
+      device: 'tablet'
+    - regex: 'OBOOK 20 SE[);/ ]'
+      model: 'oBook 20 SE'
+      device: 'tablet'
+    - regex: 'OBOOK10 SE[);/ ]'
+      model: 'oBook 10 SE'
+      device: 'tablet'
 
     - regex: '([a-z0-9]+)[ _]Onda'
       model: '$1'
@@ -5200,14 +9742,30 @@ Onda:
 
 # OnePlus
 OnePlus:
-  regex: '(?:du_)?ONEPLUS|(?:A0001|A200[135]|A300[03]|A3010|A5000|A600[03]|E1003) Build'
+  regex: '(?:du_)?ONEPLUS|(?:A0001|A200[135]|AC200[13]|A300[03]|A3010|A5000|A600[03]|A601[03]|E100[135]|GM191[03517]|GM190[0135]|GM1920|HD191[013]|HD190[01357]|HD1925|IN201[037]|IN202[03])(?: Build|\))'
   device: 'smartphone'
   models:
-    - regex: 'A0001'
+    - regex: 'AC200[13][);/ ]'
+      model: 'Nord 5G'
+    - regex: 'IN202[03][);/ ]'
+      model: '8 Pro'
+    - regex: 'IN201[037][);/ ]'
+      model: '8'
+    - regex: 'GM191[03517][);/ ]'
+      model: '7 Pro'
+    - regex: 'GM190[0135][);/ ]'
+      model: '7'
+    - regex: 'HD190[01357][);/ ]'
+      model: '7T'
+    - regex: 'HD191[013][);/ ]'
+      model: '7T Pro'
+    - regex: '(HD1925|GM1920)[);/ ]'
+      model: '7T Pro 5G'
+    - regex: 'A0001[);/ ]'
       model: 'One'
     - regex: 'A200[135]|OnePlus2'
       model: '2'
-    - regex: 'E1003'
+    - regex: 'E100[135][);/ ]'
       model: 'X'
     - regex: 'A3010|OnePlus3T'
       model: '3T'
@@ -5219,111 +9777,292 @@ OnePlus:
       model: '5'
     - regex: 'A600[03]|OnePlus6'
       model: '6'
+    - regex: 'A601[03][);/ ]'
+      model: '6T'
     - regex: '(?:du_)?ONEPLUS ?([^;/]+) Build'
       model: '$1'
 
-# oppo
-OPPO:
-  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|(?:X90[07][0679]|U707T?|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|A33f|A37fw?|PAAM00|PAC[T|M]00|PBAM00)[);/ ]|R7kf|R7Plusm|A1601|CPH[0-9]{4}|PADM00'
+# Realme (sub brand Oppo)
+Realme:
+  regex: '(?:RMX(?:19(03|4[1235]|19|9[23]|2[157]|[01379]1)|20[025-7]1|20[03]2|2027|2063|2072|2086|20[234]0|218[059]|18(0[1579]|11|3[13]|2[157]|[45]1|45))|(?:OPPO[ _]?)?CPH1861)[ ;/)]'
   device: 'smartphone'
   models:
-    - regex: '(?:OPPO[ _]?)?U707T?[);/ ]'
-      model: 'Find Way S'
+    - regex: '(?:OPPO[ _]?)?CPH1861[);/ ]'
+      model: '1'
+    - regex: 'RMX180[59]'
+      model: '2'
+    - regex: 'RMX180[17]'
+      model: '2 Pro'
+    - regex: 'RMX(1833|182[15])'
+      model: '3'
+    - regex: 'RMX1827'
+      model: '3i'
+    - regex: 'RMX1851'
+      model: '3 Pro'
+    - regex: 'RMX190[13]'
+      model: 'X'
+    - regex: 'RMX199[12]'
+      model: 'X2'
+    - regex: 'RMX1993'
+      model: 'X2 Dual'
+    - regex: 'RMX1931'
+      model: 'X2 Pro'
+    - regex: 'RMX1921'
+      model: 'XT'
+    - regex: 'RMX19(1[19]|27)'
+      model: '5'
+    - regex: 'RMX1971'
+      model: '5 Pro'
+    - regex: 'RMX203[02]'
+      model: '5i'
+    - regex: 'RMX2001'
+      model: '6'
+    - regex: 'RMX2040'
+      model: '6I'
+    - regex: 'RMX2002'
+      model: '6S'
+    - regex: 'RMX206[13][);/ ]'
+      model: '6 Pro'
+    - regex: 'RMX1925[);/ ]'
+      model: '5S'
+    - regex: 'RMX1811[);/ ]'
+      model: 'C1'
+    - regex: 'RMX194[1235][);/ ]'
+      model: 'C2'
+    - regex: 'RMX202[107][);/ ]'
+      model: 'C3'
+    - regex: 'RMX2185[);/ ]'
+      model: 'C11'
+    - regex: 'RMX2189[);/ ]'
+      model: 'C12'
+    - regex: 'RMX2180[);/ ]'
+      model: 'C15'
+    - regex: 'RMX1831[);/ ]'
+      model: 'U1'
+    - regex: 'RMX2051[);/ ]'
+      model: 'X50 5G'
+    - regex: 'RMX2071[);/ ]'
+      model: 'X50 Pro'
+    - regex: 'RMX2072[);/ ]'
+      model: 'X50 Pro Player'
+    - regex: 'RMX2086[);/ ]'
+      model: 'X3 Super Zoom'
+
+# oppo
+OPPO:
+  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|OPG01|(?:X90[07][0679]|U707T?|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|A33f|A33fw|A37fw?|PAAM00|PAAT00|PAC[TM]00)[);/ ]|R7kf|R7plusf|R7Plusm|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(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|CLM10|DEM[13]0|DHM00|DK[TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00)'
+  device: 'smartphone'
+  models:
+    - regex: 'PCHM10[);/ ]'
+      model: 'A11'
+    - regex: 'PCHM00[);/ ]'
+      model: 'A11x'
+    - regex: 'CPH1923[);/ ]'
+      model: 'A1K'
+    - regex: '(?:OPPO[ _]?)?(CPH1837|PAD[TM]00)[);/ ]'
+      model: 'A3'
+    - regex: 'A37f[);/ ]'
+      model: 'A37f'
+    - regex: '(?:OPPO[ _]?)?A37f(w)?(?: Build|\))'
+      model: 'A37f$1'
+    - regex: '(?:OPPO[ _]?)?CPH1605[);/ ]'
+      model: 'A39'
+    - regex: '(?:OPPO[ _]?)?(?:CPH18(?:0[35]|53)|PBBM30)[);/ ]'
+      model: 'A3s'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1809|PBA[TM]00|PBBT30)[);/ ]'
+      model: 'A5'
+    - regex: 'CPH19(?:3[13]|43)[);/ ]'
+      model: 'A5 (2020)'
+    - regex: 'PDAM10[);/ ]'
+      model: 'A52'
+    - regex: '(?:OPPO[ _]?)?CPH170[15][);/ ]'
+      model: 'A57'
+    - regex: 'CPH1909[);/ ]'
+      model: 'A5S'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1901|PBF[TM]00)[);/ ]'
+      model: 'A7'
+    - regex: '(?:OPPO[ _]?)?(CPH1801|CPH1717)[);/ ]'
+      model: 'A71'
+    - regex: '(?:OPPO[ _]?)?CPH1715[);/ ]'
+      model: 'A77'
+    - regex: 'PCD[TM]00[);/ ]'
+      model: 'A7n'
+    - regex: '(PBBT00|PBBM00)[);/ ]'
+      model: 'A7x'
+    - regex: '(?:OPPO[ _]?)?(?:PDBM00)[);/ ]'
+      model: 'A8'
+    - regex: '(?:OPPO[ _]?)?CPH1729[);/ ]'
+      model: 'A83'
+    - regex: '(?:OPPO[ _]?)?CPH1827[);/ ]'
+      model: 'A83 (2018)'
+    - regex: 'PCA[TM]10[);/ ]'
+      model: 'A9'
+    - regex: '(CPH1937|CPH1941|PCHM30)[);/ ]'
+      model: 'A9 (2020)'
+    - regex: '(?:OPPO[ _]?)?CPH1938[);/ ]'
+      model: 'A9 (EN)'
+    - regex: 'PCPM00[);/ ]'
+      model: 'A91'
+    - regex: 'PDKT00[);/ ]'
+      model: 'A92s'
+    - regex: 'PDKM00[);/ ]'
+      model: 'A93s'
+    - regex: 'PCE[TM]00[);/ ]'
+      model: 'A9x'
+    - regex: '(?:OPPO[ _]?)?CPH1851[);/ ]'
+      model: 'AX5'
+    - regex: 'CPH1920[);/ ]'
+      model: 'AX5s'
+    - regex: '(?:OPPO[ _]?)?CPH1903[);/ ]'
+      model: 'AX7'
+    - regex: '(?:OPPO[ _]?)?X9009[);/ ]'
+      model: 'F1 Plus'
+    - regex: 'CPH1911[);/ ]'
+      model: 'F11'
+    - regex: 'CPH1969[);/ ]'
+      model: 'F11 Pro'
+    - regex: '(?:OPPO[ _]?)?A1601[);/ ]'
+      model: 'F1s'
+    - regex: '(?:OPPO[ _]?)?CPH1609[);/ ]'
+      model: 'F3'
+    - regex: '(?:OPPO[ _]?)?CPH1613[);/ ]'
+      model: 'F3 Plus'
+    - regex: '(?:OPPO[ _]?)?CPH172[37][);/ ]'
+      model: 'F5'
+    - regex: '(?:OPPO[ _]?)?CPH1725[);/ ]'
+      model: 'F5 Youth'
+    - regex: '(?:OPPO[ _]?)?CPH(1859|18(?:19|21))[);/ ]'
+      model: 'F7'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1825|CPH1881)[);/ ]'
+      model: 'F9'
+    - regex: '(?:OPPO[ _]?)?CPH1823[);/ ]'
+      model: 'F9 Pro'
     - regex: '(?:OPPO[ _]?)?X909T?[);/ ]'
       model: 'Find 5'
+    - regex: '(?:OPPO[ _]?)?R827T?[);/ ]'
+      model: 'Find 5 Mini'
     - regex: '(?:OPPO[ _]?)?X907[067][);/ ]'
       model: 'Find 7'
     - regex: '(?:OPPO[ _]?)?X900[067][);/ ]'
       model: 'Find 7a'
-    - regex: '(?:OPPO[ _]?)?X9009[);/ ]'
-      model: 'F1 Plus'
+    - regex: '(?:OPPO[ _]?)?R815[TW]?[);/ ]'
+      model: 'Find Clover'
+    - regex: '(?:OPPO[ _]?)?R8015[);/ ]'
+      model: 'Find Guitar'
+    - regex: '(?:OPPO[ _]?)?R8111[);/ ]'
+      model: 'Find Melody'
+    - regex: '(?:OPPO[ _]?)?R821T?[);/ ]'
+      model: 'Find Muse'
+    - regex: '(?:OPPO[ _]?)?U707T?[);/ ]'
+      model: 'Find Way S'
+    - regex: '(?:OPPO[ _]?)?(?:CPH187[15]|PAF[MT]00)[);/ ]'
+      model: 'Find X'
+    - regex: '(?:OPPO[ _]?)?(?:PAHM00)[);/ ]'
+      model: 'Find X Lamborghini'
+    - regex: '(?:OPPO[ _]?)?(PDEM10)[);/ ]'
+      model: 'Find X2'
+    - regex: '(?:OPPO[ _]?)?(PDEM30|OPG01)[);/ ]'
+      model: 'Find X2 Pro'
+    - regex: '(?:OPPO[ _]?)?R1011 Build'
+      model: 'Joy Plus'
+    - regex: '(?:OPPO[ _]?)?(PBC(?:M30|T10))[);/ ]'
+      model: 'K1'
+    - regex: '(?:OPPO[ _]?)?(PCNM00)[);/ ]'
+      model: 'K5'
+    - regex: '(?:OPPO[ _]?)?N5117[);/ ]'
+      model: 'N1 Mini'
+    - regex: '(?:OPPO[ _]?)?N520[79][);/ ]'
+      model: 'N3'
+    - regex: '(?:OPPO[ _]?)?R831T?[);/ ]'
+      model: 'Neo'
+    - regex: '(?:OPPO[ _]?)?R831K[);/ ]'
+      model: 'Neo 3'
+    - regex: '(?:OPPO[ _]?)?R831[SL][);/ ]'
+      model: 'Neo 5'
+    - regex: '(?:OPPO[ _]?)?A33f[);/ ]'
+      model: 'Neo 7'
+    - regex: '(?:OPPO[ _]?)?A33fw[);/ ]'
+      model: 'Neo 7s'
+    - regex: '(?:OPPO[ _]?)?R8113[);/ ]'
+      model: 'Piano'
+    - regex: '(?:OPPO[ _]?)?CPH1707[);/ ]'
+      model: 'R11'
+    - regex: '(?:OPPO[ _]?)?CPH1719[);/ ]'
+      model: 'R11s'
+    - regex: '(?:OPPO[ _]?)?CPH1721[);/ ]'
+      model: 'R11s Plus'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1835|PAC[TM]00|PAAM00)[);/ ]'
+      model: 'R15'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1831|PAAT00)[);/ ]'
+      model: 'R15 Pro'
+    - regex: 'PBCM10[);/ ]'
+      model: 'R15x'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1879|PBE[MT]00)[);/ ]'
+      model: 'R17'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1893)[);/ ]'
+      model: 'R17 Neo'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1877|PBD[MT]00)[);/ ]'
+      model: 'R17 Pro'
     - regex: '(?:OPPO[ _]?)?R8006[);/ ]'
       model: 'R1L'
     - regex: '(?:OPPO[ _]?)?R800[07][);/ ]'
       model: 'R1S'
-    - regex: '(?:OPPO[ _]?)?R8015[);/ ]'
-      model: 'Find Guitar'
     - regex: '(?:OPPO[ _]?)?R810[679][);/ ]'
       model: 'R5'
     - regex: '(?:OPPO[ _]?)?R7kf[);/ ]'
       model: 'R7 Lite'
     - regex: '(?:OPPO[ _]?)?R7Plusm[);/ ]'
       model: 'R7 Plus'
-    - regex: '(?:OPPO[ _]?)?R8111[);/ ]'
-      model: 'Find Melody'
-    - regex: '(?:OPPO[ _]?)?R8113[);/ ]'
-      model: 'Piano'
-    - regex: '(?:OPPO[ _]?)?R815[TW]?[);/ ]'
-      model: 'Find Clover'
-    - regex: '(?:OPPO[ _]?)?R821T?[);/ ]'
-      model: 'Find Muse'
-    - regex: '(?:OPPO[ _]?)?R827T?[);/ ]'
-      model: 'Find 5 Mini'
-    - regex: '(?:OPPO[ _]?)?A33f[);/ ]'
-      model: 'Neo 7'
-    - regex: '(?:OPPO[ _]?)?R831[SL][);/ ]'
-      model: 'Neo 5'
-    - regex: '(?:OPPO[ _]?)?R831K[);/ ]'
-      model: 'Neo 3'
-    - regex: '(?:OPPO[ _]?)?R831T?[);/ ]'
-      model: 'Neo'
-    - regex: '(?:OPPO[ _]?)?N520[79][);/ ]'
-      model: 'N3'
-    - regex: '(?:OPPO[ _]?)?N5117[);/ ]'
-      model: 'N1 Mini'
-    - regex: '(?:OPPO[ _]?)?CPH1609[);/ ]'
-      model: 'F3'
-    - regex: '(?:OPPO[ _]?)?CPH1707[);/ ]'
-      model: 'R11'
-    - regex: '(?:OPPO[ _]?)?CPH1715[);/ ]'
-      model: 'A77'
-    - regex: '(?:OPPO[ _]?)?CPH1717[);/ ]'
-      model: 'A71'
-    - regex: '(?:OPPO[ _]?)?CPH1719[);/ ]'
-      model: 'R11s'
-    - regex: '(?:OPPO[ _]?)?CPH1721[);/ ]'
-      model: 'R11s Plus'
-    - regex: '(?:OPPO[ _]?)?CPH172[37][);/ ]'
-      model: 'F5'
-    - regex: '(?:OPPO[ _]?)?CPH1725[);/ ]'
-      model: 'F5 Youth'
+    - regex: '(?:OPPO[ _]?)?R7Plusf[);/ ]'
+      model: 'R7 Plus F'
     - regex: '(?:OPPO[ _]?)?CPH1607[);/ ]'
       model: 'R9s'
-    - regex: '(?:OPPO[ _]?)?CPH1611[);/ ]'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1611|R9s Plus)[);/ ]'
       model: 'R9s Plus'
-    - regex: '(?:OPPO[ _]?)?CPH1613[);/ ]'
-      model: 'F3 Plus'
-    - regex: '(?:OPPO[ _]?)?CPH1701[);/ ]'
-      model: 'A57'
-    - regex: '(?:OPPO[ _]?)?CPH1729[);/ ]'
-      model: 'A83'
-    - regex: '(?:OPPO[ _]?)?CPH1801[);/ ]'
-      model: 'A71'
-    - regex: '(?:OPPO[ _]?)?CPH1819[);/ ]'
-      model: 'F7'
-    - regex: '(?:OPPO[ _]?)?CPH1859[);/ ]'
-      model: 'F7'
-    - regex: '(?:OPPO[ _]?)?A37f(w)? Build'
-      model: 'A37f$1'
-    - regex: '(?:OPPO[ _]?)?PADM00'
-      model: 'A3'
-    - regex: '(?:OPPO[ _]?)?PBAM00'
-      model: 'A5'
-    - regex: '(?:OPPO[ _]?)?A1601 Build'
-      model: 'F1s'
-    - regex: '(?:OPPO[ _]?)?R1011 Build'
-      model: 'Joy Plus'
-    - regex: '(?:OPPO[ _]?)?(?:PAC[TM]00|PAAM00) Build'
-      model: 'R15'
+    - regex: '(?:CPH1917|PCA[MT]00)[);/ ]'
+      model: 'Reno'
+    - regex: 'CPH1983[);/ ]'
+      model: 'Reno A'
+    - regex: 'PCCM00[);/ ]'
+      model: 'Reno 10X'
+    - regex: 'CPH1919[);/ ]'
+      model: 'Reno 10X Zoom'
+    - regex: '(?:PCKM00|CPH1907)[);/ ]'
+      model: 'Reno 2'
+    - regex: 'CPH1989[);/ ]'
+      model: 'Reno 2F'
+    - regex: '(?:PCKM80|CPH1945)[);/ ]'
+      model: 'Reno 2Z'
+    - regex: 'PDCM00[);/ ]'
+      model: 'Reno 3 5G'
+    - regex: 'PCRM00[);/ ]'
+      model: 'Reno 3 Pro'
+    - regex: 'PDP[TM]00[);/ ]'
+      model: 'Reno 4 5G'
+    - regex: 'PDNM00[);/ ]'
+      model: 'Reno 4 Pro 5G'
+    - regex: 'CPH1921[);/ ]'
+      model: 'Reno 5G'
+    - regex: 'PCLM10[);/ ]'
+      model: 'Reno Ace'
+    - regex: 'PDHM00[);/ ]'
+      model: 'Reno Ace 2'
+    - regex: 'PCGM00[);/ ]'
+      model: 'Reno K3'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1979|PCD[TM]10)[);/ ]'
+      model: 'Reno Z'
 
     - regex: 'N1T?[);/ ]'
       model: 'N1T'
       device: 'phablet'
-
     - regex: 'R([0-9]{3,4}[KSTW]?)[);/ ]' # valid model numbers are filtered in main regex
       model: 'R$1'
 
-    - regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)'
+    # general detections
+    - regex: '(CPH[0-9]{4})'
+      model: '$1'
+
+    - regex: '(?:OB-)?OPPO[ _]?((?!Browser)[a-z0-9]+)'
       model: '$1'
 
 # Opsson
@@ -5342,7 +10081,7 @@ Opsson:
 
 # orange
 Orange:
-  regex: 'SPV[ \-]?([a-z0-9]+)|Orange[ _-]([^/;]+) Build|SC/IHD92|FunTab ([^/;]+) Build'
+  regex: 'SPV[ \-]?([a-z0-9]+)|(?<!FBCR/)Orange[ _-](?!Tahiti-LS\))([^/;]+)( Build|\))(?<!Tahiti-LS\))|SC/IHD92|FunTab ([^/;]+) Build'
   device: 'smartphone'
   models:
     - regex: 'SC/IHD92'
@@ -5354,7 +10093,11 @@ Orange:
     - regex: 'FunTab ([^/;]+) Build'
       model: 'FunTab $1'
       device: 'tablet'
-    - regex: 'Orange[ _-]([^/;]+) Build'
+    - regex: 'Orange[ _-](Rise)(3[12]|5[12])[ ;/)]'
+      model: '$1 $2'
+    - regex: 'Orange[ _-](Dive)72[ ;/)]'
+      model: '$1 72'
+    - regex: 'Orange[ _-](Daytona|Dive (30|7[13])|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)[ ;/)]'
       model: '$1'
     - regex: 'SPV[ \-]?([a-z0-9]+)'
       model: 'SPV $1'
@@ -5373,14 +10116,33 @@ Ouki:
     - regex: '(OK[AU][0-9]+[a-z]*) Build'
       model: '$1'
 
+# Oukitel
+Oukitel:
+  regex: '(?:(?:C15|C16|K10000|K[46]000)(?:[ _]Pro)|U20_Plus|K[46]000[ _](?:Plus|Lite)|Y4800|K10000|K[4567]000)[ ;/)]'
+  device: 'smartphone'
+  models:
+    - regex: '(C15|C16|K10000|K[46]000)[ _]Pro[ ;/)]'
+      model: '$1 Pro'
+    - regex: '(K10000)[ _]Max[ ;/)]'
+      model: '$1 Max'
+    - regex: '(U20|K[46]000)[_ ]Plus[ ;/)]'
+      model: '$1 Plus'
+    - regex: '(K4000)[_ ]Lite[ ;/)]'
+      model: '$1 Lite'
+    - regex: '(Y4800|K10000|K[4567]000)[ ;/)]'
+      model: '$1'
+
 # Overmax
 Overmax:
-  regex: 'OV-[a-z]+(?:[^;(/]*)[();/ ]|Qualcore 1010'
+  regex: 'OV-[a-z]+(?:[^;(/]*)[();/ ]|Qualcore 1010|Vertis 5021 Aim|OV1027[34]G'
   device: 'tablet'
   models:
     - regex: 'OV-V10'
       model: 'Vertis Yard'
       device: 'smartphone'
+    - regex: 'Vertis 5021 Aim'
+      model: 'Vertis 5021 Aim'
+      device: 'smartphone'
     - regex: 'OV-Vertis[ _-]([^;/]+) Build'
       model: 'Vertis $1'
       device: 'smartphone'
@@ -5388,32 +10150,84 @@ Overmax:
     - regex: 'Qualcore 1010'
       model: 'Qualcore 1010'
       device: 'tablet'
+    - regex: 'OV1027([34])G'
+      model: 'Qualcore 1027 $1G'
+      device: 'tablet'
 
     - regex: '(OV-[a-z]+(?:[^;(/]*))(?<!Build)[();/ ]'
       model: '$1'
 
 # Oysters
 Oysters:
-  regex: 'Oysters'
+  regex: 'Oysters|T84ERI[ _]3G|T72HM(s_)?3G|T102MS_3G|T102ER3G|(T74HMi|T84Bi)[_ ]4G|T74MR4G|T84Ni[_ ][34]G|Pacific[ ]?800i|T104B_[34]G|IndianV|T72HA_3G|T74D_3G|T74N_3G|T74SC_3G|T74Mai_3G|T104MBi_3G|T104SCi_3G|T104ER4G|Atlantic4G|AntarcticE'
   device: 'tablet'
   models:
+    - regex: 'Pacific[ ]?800i'
+      device: 'smartphone'
+      model: 'Pacific 800i'
+    - regex: 'Atlantic4G'
+      device: 'smartphone'
+      model: 'Atlantic 4G'
+    - regex: 'AntarcticE'
+      device: 'smartphone'
+      model: 'Antarctic E'
+    - regex: 'IndianV'
+      device: 'smartphone'
+      model: 'Indian V'
     - regex: 'Oysters ((?:Arctic|Indian|Atlantic|Pacific)[^/;]+) Build'
       device: 'smartphone'
       model: '$1'
-    - regex: 'Oysters ([^/;]+) Build'
+    - regex: '(T84ERI[ _]3G|T72HM(s_)?3G|(?:(T74HMi|T84Bi)[_ ]4G)|T84Ni[_ ][34]G)'
       model: '$1'
+    - regex: '(T74MR|T102MS|T104B|T74SC|T74[DN]|T72HA|T102ER|T104SCi|T104MBi|T104ER)[ _]?([34]G)'
+      model: '$1 $2'
+    - regex: 'T74Mai_3G'
+      model: 'T74MAi 3G'
+    - regex: 'Oysters ([^/;]+)( Build|\))'
+      model: '$1'
+# öwn (own)
+öwn:
+  regex: 'OWN|S4035[ _][34]G'
+  device: 'smartphone'
+  models:
+    - regex: 'FUN ([67])'
+      model: 'Fun $1'
+    - regex: 'FUN 5\(4G\)'
+      model: 'Fun 5 4G'
+    - regex: '(?:OWN[ _])?(S3000D|S3010|S3020D|S4010|S4025|S4035[ _][34]G)'
+      model: '$1'
+    - regex: 'One Plus'
+      model: 'One Plus'
+    - regex: 'One'
+      model: 'One'
+    - regex: 'SMART 9'
+      model: 'Smart 9'
+
+# Panacom
+Panacom:
+  regex: 'T-i708D'
+  device: 'smartphone'
+  models:
+    - regex: 'T-i708D'
+      device: 'tablet'
+      model: 'T-i708D'
 
 # panasonic
 Panasonic:
-  regex: 'Panasonic|PANATV[0-9]+|Viera/|P902i[);/ ]|Eluga[ _]|FZ-N1'
+  regex: 'Panasonic|PANATV[0-9]+|Viera/|(?:P902i|P-08D)[);/ ]|Eluga[ _]|FZ-N1|P55 Novo 4G|DMC-CM1'
   device: 'smartphone'
   models:
     - regex: 'Eluga[ _-]([^;/]+) Build'
       model: 'Eluga $1'
     - regex: 'Eluga[ _-]([^;/]+)[;/)]'
       model: 'Eluga $1'
+    - regex: '(DMC-CM1)'
+      model: 'Lumix $1'
+      device: 'camera'
     - regex: 'FZ-N1'
       model: 'Toughpad'
+    - regex: 'P55 Novo 4G'
+      model: 'P55 Novo 4G'
     - regex: 'P902i[);/ ]'
       device: 'feature phone'
       model: 'P902i'
@@ -5428,6 +10242,50 @@ Panasonic:
     - regex: 'portalmmm/2.0 (P[a-z0-9]+)'
       model: '$1'
 
+    - regex: 'P-08D[);/ ]'
+      model: 'Eluga Live 10.1"'
+      device: 'tablet'
+
+# PCBOX
+PCBOX:
+  regex: 'Art-PCB-V116|Bee-PCB-V216|Clap-PCB-I316|PCB-T(103|715)'
+  device: 'smartphone'
+  models:
+    - regex: 'Art-PCB-V116'
+      model: 'Art'
+    - regex: 'Bee-PCB-V216'
+      model: 'Bee'
+    - regex: 'Clap-PCB-I316'
+      model: 'Clap'
+    - regex: 'PCB-T103'
+      device: 'tablet'
+      model: 'Curi Lite'
+    - regex: 'PCB-T715'
+      device: 'tablet'
+      model: 'T715'
+
+# PCD
+PCD:
+  regex: 'PH4001'
+  device: 'smartphone'
+  models:
+    - regex: 'PH4001'
+      model: 'PH4001'
+
+# PCD Argentina
+PCD Argentina:
+  regex: 'PCD[ ]?50[689]'
+  device: 'smartphone'
+  models:
+    - regex: 'PCD[ ]?(50[689])'
+      model: '$1'
+
+# ArmPhone
+ArmPhone:
+  regex: '(TSD Octa A0520P|TSD Quadra A0509P)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
 # Pentagram
 Pentagram:
   regex: 'Pentagram|Quadra|Monster X5'
@@ -5450,7 +10308,7 @@ Pentagram:
 
 # philips
 Philips:
-  regex: 'Philips|AND1E[);/ ]|NETTV/|PI3210G'
+  regex: 'Philips|AND1E[);/ ]|NETTV/|PI3210G|TLE(821L|722G)|TPM1[79]1E|70PUH6774_96|QM16[134]E'
   device: 'smartphone'
   models:
     - regex: 'AND1E(?: TV)?[);/ ]'
@@ -5459,6 +10317,21 @@ Philips:
     - regex: '(PI3210G)'
       model: '$1'
       device: 'tablet'
+    - regex: '(TPM1[79]1E)' # Smart Tv 2018/2019
+      model: '$1'
+      device: 'tv'
+    - regex: '(QM16[134]E)'
+      model: '$1'
+      device: 'tv'
+    - regex: '(70PUH6774)_96'
+      model: '$1/96 4K UHD'
+      device: 'tv'
+    - regex: '(TLE821L)[);/ ]'
+      model: '$1 4G LTE'
+      device: 'tablet'
+    - regex: '(TLE722G)[);/ ]'
+      model: '$1'
+      device: 'tablet'
     - regex: 'Philips, BDP([0-9]{4})'
       model: 'Blu-ray Player (BDP$1)'
       device: 'tv'
@@ -5488,7 +10361,7 @@ Primepad:
 
 # Pioneer
 Pioneer:
-  regex: 'Pioneer|.*; R1 Build'
+  regex: 'Pioneer|.*; R1 Build|dvr700pi'
   device: 'smartphone'
   models:
     - regex: '.*; R1 Build'
@@ -5498,7 +10371,35 @@ Pioneer:
       model: '$1'
     - regex: 'Pioneer[ _-]?([^;/)]+)[;/)]'
       model: '$1'
+    - regex: 'dvr700pi'
+      model: 'DVR700PI 7.0"'
+      device: 'tablet'
 
+# Pixus
+Pixus:
+  regex: 'Pixus|(Ride[_ ][34]G|Play[ _]Three[ _]v(?:[24].0|3.1))[;)\ ]'
+  device: 'tablet'
+  models:
+    - regex: 'Ride[_ ]([34])G'
+      model: 'Ride $1G'
+    - regex: 'Play[ _]Three[ _]v([24].0|3.1)'
+      model: 'Play Three v$1'
+    - regex: 'Play Two'
+      model: 'Play Two'
+    - regex: 'Touch 7 3G'
+      model: 'Touch 7 3G'
+    - regex: 'Pixus[ _]hiMax'
+      model: 'HiMax 9.6"'
+
+    - regex: 'Raze'
+      model: 'Raze'
+      device: 'smartphone'
+    - regex: 'Pixus_Jet'
+      model: 'Jet'
+      device: 'smartphone'
+    - regex: 'pixus hit 2'
+      model: 'Hit 2'
+      device: 'smartphone'
 
 # PULID
 PULID:
@@ -5570,9 +10471,14 @@ ProScan:
 
 # RCA Tablets
 'RCA Tablets':
-  regex: 'RCT([^;/]+) Build'
-  device: 'tablet'
-  model: 'RCT$1'
+  regex: 'RCT([^;/]+) Build|RCA RLTP4028'
+  device: 'smartphone'
+  models:
+    - regex: 'RCA RLTP4028'
+      model: 'RLTP4028'
+    - regex: 'RCT([^;/]+) Build'
+      device: 'tablet'
+      model: 'RCT$1'
 
 # Readboy
 Readboy:
@@ -5590,12 +10496,94 @@ Roku:
   device: 'tv'
   model: 'Digital Video Player'
 
+# Rokit
+Rokit:
+  regex: 'IO Pro'
+  device: 'smartphone'
+  models:
+    - regex: 'IO Pro'
+      model: 'IO Pro'
+
+# Rombica
+Rombica:
+  regex: '(Rombica|SSQ-A0500)[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'SSQ-A0500[);/ ]'
+      model: 'Smart Stick 4K'
+    - regex: '(Infinity K8|Smart Box (?:v005|Quad|Ultra HD v002|4K V001))[);/ ]'
+      model: '$1'
+
 # Rover
 Rover:
   regex: 'Rover ([0-9]+)'
   device: 'feature phone'
   model: '$1'
 
+# RoverPad
+RoverPad:
+  regex: '(RoverPad|RoverPhone)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'RoverPhone[);/ ]'
+      model: ''
+      device: 'smartphone'
+    - regex: 'RoverPad sky 7.85[);/ ]'
+      model: 'Sky 7.85'
+    - regex: 'RoverPad (10.4|Air S70|9.7 3G|Sky 9.7|3W A73|3W7|3WT70|3W9.4)[);/ ]'
+      model: '$1'
+
+# Roadrover
+Roadrover:
+  regex: 'Roadrover ChangAn S'
+  device: 'tablet'
+  model: 'ChangAn S'
+
+# RT Project
+RT Project:
+  regex: 'Shock 5'
+  device: 'smartphone'
+  models:
+    - regex: 'Shock 5'
+      model: 'Shock 5'
+
+# Safaricom
+Safaricom:
+  regex: 'NEON_RAY'
+  device: 'smartphone'
+  models:
+    - regex: 'NEON_RAY'
+      model: 'Neon Ray'
+
+
+# Santin
+Santin:
+  regex: '(?:SANTIN|BiTBiZ_V58|ACTOMA ACE|DREAMPLUS03A|Candy U7 Pro)[);/_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'BiTBiZ_V58[);/ ]'
+      model: 'BiTBiZ V58'
+    - regex: 'Candy U7 Pro[);/ ]'
+      model: 'Candy U7 Pro'
+    - regex: 'DREAMPLUS03A[);/ ]'
+      model: 'Dream Plus 03A'
+    - regex: 'GreenOrange[);/ ]'
+      model: 'Green Orange'
+    - regex: 'halove[);/ ]'
+      model: 'Halove'
+    - regex: 'ACTOMA ACE[);/ ]'
+      model: 'Actoma Ace'
+    - regex: 'monica[);/ ]'
+      model: 'Monica'
+    - regex: 'POWER[);/ ]'
+      model: 'Power'
+    - regex: 'GALAZ[);/ ]'
+      model: 'Galaz'
+    - regex: 'NEWDUN[);/ ]'
+      model: 'Newdun'
+    - regex: 'SANTIN[ _][#]?(Dante|Candy U7|Armor|YSL-Y7|ANT.W|N[13]|JS|S6|V9)[);/ ]'
+      model: '$1'
+
 # Siemens
 Siemens:
   regex: 'SIEMENS|SIE-|portalmmm/2\.0 SI|S55|SL45i'
@@ -5605,14 +10593,20 @@ Siemens:
       model: '$1'
     - regex: 'SIE(?:MENS )?[\-]?([a-z0-9]+)'
       model: '$1'
-    - regex: '(S55|SL45i)'
+    - regex: '(?:SIE-)?(S55|SL45i)'
       model: '$1'
     - regex: 'portalmmm/2.0 (SI[a-z0-9]+)'
       model: '$1'
 
+# Soundmax
+Soundmax:
+   regex: '(SM-LED32M(?:11|04)S)(?:_-Ver01)?[);/ ]'
+   device: 'tv'
+   model: '$1'
+
 # Samsung
 Samsung:
-  regex: 'SAMSUNG|Maple |SC-(?:02[CH]|04E|01F)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|vollo Vi86[);/ ]|(?:OTV-)?SMT-E5015|ISW11SC|SCV35|404SC'
+  regex: 'SAMSUNG(?! ?Browser)|Maple |SC-(?:02[CHMKJG]|03[JLK]|04[ELJ]|05G|52A|01[HFGLKM])|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[);/ ]|(?:OTV-)?SMT-E5015|ISW11SC|SCV4[0-356]|SCV3[1-9]|40[34]SC|SCL22|SCG0[12]'
   device: 'smartphone'
   models:
     # explicit tv models
@@ -5630,6 +10624,9 @@ Samsung:
     - regex: '(?:SAMSUNG-)?(?:GT-)?N5100'
       device: 'tablet'
       model: 'GALAXY Note 8.0"'
+    - regex: '(?:SAMSUNG-)?SM-T677A'
+      device: 'tablet'
+      model: 'GALAXY View 18.4" LTE'
     - regex: '(?:SAMSUNG-)?(?:GT-)?N5110'
       device: 'tablet'
       model: 'GALAXY Note 8.0" WiFi'
@@ -5681,16 +10678,16 @@ Samsung:
     - regex: '(?:SAMSUNG-)?GT-P7100'
       device: 'tablet'
       model: 'GALAXY Tab 10.1v'
-    - regex: '(?:SAMSUNG-)?GT-P7500'
+    - regex: '(?:SAMSUNG-)?GT-P75[01]0'
       device: 'tablet'
-      model: 'GALAXY Tab 10.1" P7500'
+      model: 'GALAXY Tab 10.1"'
     - regex: '(?:SAMSUNG-)?SM-P600'
       device: 'tablet'
       model: 'GALAXY Note 10.1" 2014 Edition WiFi'
     - regex: '(?:SAMSUNG-)?SM-P60[12]'
       device: 'tablet'
       model: 'GALAXY Note 10.1" 2014 Edition'
-    - regex: '(?:SAMSUNG-)?SM-P605'
+    - regex: '(?:SAMSUNG-)?SM-(?:P605|P607T)'
       device: 'tablet'
       model: 'GALAXY Note 10.1" 2014 Edition LTE'
     - regex: '(?:SAMSUNG-)?SM-P900'
@@ -5702,30 +10699,69 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-P905'
       device: 'tablet'
       model: 'GALAXY NotePRO 12.2" LTE'
-    - regex: '(?:SAMSUNG-)?SM-T110'
+    - regex: '(?:SAMSUNG-)?SM-P587[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab A 10.1" with S Pen (2016) LTE'
+    - regex: '(?:SAMSUNG-)?SM-P205[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab A 8.0" with S Pen (2019) LTE'
+    - regex: '(?:SAMSUNG-)?SM-P200[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab A 8.0" with S Pen (2019) WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T11[03]'
       device: 'tablet'
       model: 'GALAXY Tab 3 7.0" Lite WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T111'
+    - regex: '(?:SAMSUNG-)?SM-(?:T830[X]?|T837R4)[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S4 10.5" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-(?:T835[CN]?|T837[VTA])[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S4 10.5"'
+    - regex: '(?:SAMSUNG-)?SM-(?:T725[N]?|T720X|T727[AV])[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S5e 10.5"'
+    - regex: '(?:SAMSUNG-)?SM-T720[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S5e 10.5" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T865N?[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S6 10.5"'
+    - regex: '(?:SAMSUNG-)?SM-T867[V]?[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S6 10.5" LTE'
+    - regex: '(?:SAMSUNG-)?SM-P615[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S6 10.4" Lite'
+    - regex: '(?:SAMSUNG-)?SM-P610[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S6 10.4" Lite WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T860[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S6 10.5" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T111[M]?[);/ ]'
       device: 'tablet'
       model: 'GALAXY Tab 3 7.0" Lite'
     - regex: '(?:SAMSUNG-)?SM-T116(?:BU|NU|NY)?'
       device: 'tablet'
       model: 'GALAXY Tab 3 V'
-    - regex: '(?:SAMSUNG-)?SM-T2105'
+    - regex: '(?:SAMSUNG-)?SM-(?:T2105|T212)'
       device: 'tablet'
       model: 'GALAXY Tab 3 7.0" Kids'
     - regex: '(?:SAMSUNG-)?SM-T210R?'
       device: 'tablet'
       model: 'GALAXY Tab 3 7.0" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T21(?:1|7[AS])'
+    - regex: '(?:SAMSUNG-)?SM-T21(?:[15]|7[AS])'
       device: 'tablet'
       model: 'GALAXY Tab 3 7.0"'
     - regex: '(?:SAMSUNG-)?SM-T230(?:NU)?'
       device: 'tablet'
       model: 'GALAXY Tab 4 7.0" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T231'
+    - regex: '(?:SAMSUNG-)?SM-T23[15]|403SC'
       device: 'tablet'
       model: 'GALAXY Tab 4 7.0" 3G'
+    - regex: '(?:SAMSUNG-)?SM-(?:T239|T237P)'
+      device: 'tablet'
+      model: 'GALAXY Tab 4 7.0" LTE'
     - regex: '(?:SAMSUNG-)?SM-T310'
       device: 'tablet'
       model: 'GALAXY Tab 3 8.0" WiFi'
@@ -5738,15 +10774,18 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T330'
       device: 'tablet'
       model: 'GALAXY Tab 4 8.0" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T335'
+    - regex: '(?:SAMSUNG-)?SM-T33[15]'
       device: 'tablet'
       model: 'GALAXY Tab 4 8.0" LTE'
     - regex: '(?:SAMSUNG-)?SM-T520'
       device: 'tablet'
       model: 'GALAXY TabPRO 10.1" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T535'
+    - regex: '(?:SAMSUNG-)?SM-T53[15]'
       device: 'tablet'
       model: 'GALAXY Tab 4 10.1" LTE'
+    - regex: '(?:SAMSUNG-)?SM-T536[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab 4 10.1" Advanced'
     - regex: '(?:SAMSUNG-)?SM-T320'
       device: 'tablet'
       model: 'GALAXY TabPRO 8.4" WiFi'
@@ -5768,19 +10807,25 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T800'
       device: 'tablet'
       model: 'GALAXY Tab S 10.5" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T805'
+    - regex: '(?:SAMSUNG-)?SM-(?:T805|T807[VP]?)'
       device: 'tablet'
       model: 'GALAXY Tab S 10.5" LTE'
-    - regex: '(?:SAMSUNG-)?SM-T813'
+    - regex: '(?:SAMSUNG-)?SM-(?:T813|T810)'
       device: 'tablet'
       model: 'GALAXY Tab S2 9.7" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T815'
+    - regex: '(?:SAMSUNG-)?SM-(?:T719[YC]?|T715(?:[YC]|N0)?)[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S2 8.0" LTE'
+    - regex: '(?:SAMSUNG-)?SM-(?:T71[03]|T710X)[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab S2 8.0" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-(?:T815|T817[ATW]?|T819[Y]?)'
       device: 'tablet'
       model: 'GALAXY Tab S2 9.7" LTE'
     - regex: '(?:SAMSUNG-)?SM-T820'
       device: 'tablet'
       model: 'GALAXY Tab S3 9.7" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T825'
+    - regex: '(?:SAMSUNG-)?SM-T82[57]'
       device: 'tablet'
       model: 'GALAXY Tab S3 9.7" LTE'
     - regex: '(?:SAMSUNG-)?SM-T900'
@@ -5792,34 +10837,75 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T285'
       device: 'tablet'
       model: 'GALAXY Tab A 7.0" LTE'
-    - regex: '(?:SAMSUNG-)?SM-T350'
+    - regex: '(?:SAMSUNG-)?SM-T3[58]0'
       device: 'tablet'
       model: 'GALAXY Tab A 8.0" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T3[58]5(?:Y)?'
+    - regex: '(?:SAMSUNG-)?SM-(?:P350|T3[58]5)'
       device: 'tablet'
       model: 'GALAXY Tab A 8.0" LTE'
-    - regex: '(?:SAMSUNG-)?SM-T550'
+    - regex: '(?:SAMSUNG-)?SM-T387(?:VK|AA|[WVT])'
+      device: 'tablet'
+      model: 'GALAXY Tab A 8.0" LTE (2018)'
+    - regex: '(?:SAMSUNG-)?SM-T295'
+      device: 'tablet'
+      model: 'GALAXY Tab A 8.0" LTE (2019)'
+    - regex: '(?:SAMSUNG-)?SM-T290'
+      device: 'tablet'
+      model: 'GALAXY Tab A 8.0" WiFi (2019)'
+    - regex: '(?:SAMSUNG-)?SM-(?:P355([MY])?|T550)'
       device: 'tablet'
       model: 'GALAXY Tab A 9.7" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-T555'
+    - regex: '(?:SAMSUNG-)?SM-(?:P550|P555(M)?|T555)'
       device: 'tablet'
       model: 'GALAXY Tab A 9.7" LTE'
-    - regex: '(?:SAMSUNG-)?SM-T580'
+    - regex: '(?:SAMSUNG-)?SM-(?:T58[05]|P58[05])'
       device: 'tablet'
       model: 'GALAXY Tab A 10.1" WiFi (2016)'
+    - regex: '(?:SAMSUNG-)?SM-T587[P]?'
+      device: 'tablet'
+      model: 'GALAXY Tab A 10.1" LTE (2016)'
+    - regex: '(?:SAMSUNG-)?SM-T59[057]'
+      device: 'tablet'
+      model: 'GALAXY Tab A 10.5" LTE (2018)'
+    - regex: '(?:SAMSUNG-)?SM-T51[05]'
+      device: 'tablet'
+      model: 'GALAXY Tab A 10.1" (2019)'
+    - regex: '(?:SAMSUNG-)?SM-(?:T37[57]|T378[LSV])'
+      device: 'tablet'
+      model: 'GALAXY Tab E 8.0"'
     - regex: '(?:SAMSUNG-)?SM-T560'
       device: 'tablet'
       model: 'GALAXY Tab E 9.6" WiFi'
     - regex: '(?:SAMSUNG-)?SM-T561'
       device: 'tablet'
       model: 'GALAXY Tab E 9.6" 3G'
-    - regex: '(?:SAMSUNG-)?SM-T365'
+    - regex: '(?:SAMSUNG-)?SM-T567V'
       device: 'tablet'
-      model: 'GALAXY Tab Active 8"'
+      model: 'GALAXY Tab E 9.6" 4G'
+    - regex: '(?:SAMSUNG-)?SM-T365[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab Active 8.0"'
+    - regex: '(?:SAMSUNG-)?SM-T39[057][U]?[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Tab Active 2 8.0"'
+    - regex: '(?:SAMSUNG-)?SM-P902[);/ ]'
+      device: 'tablet'
+      model: 'GALAXY Note Pro 12.2"'
+
+    # explicit wearable models
+    - regex: '(?:SAMSUNG )?SM-R820'
+      device: 'wearable'
+      model: 'GALAXY Watch Active 2'
 
     # explicit smartphone models
+    - regex: '(?:SAMSUNG-)?SM-G850[AMSWYKL]'
+      model: 'GALAXY Alpha'
     - regex: '(?:SAMSUNG-)?GT-B5330'
       model: 'GALAXY Chat'
+    - regex: '(?:SAMSUNG-)?SM-A605K'
+      model: 'GALAXY Jean'
+    - regex: '(?:SAMSUNG-)?SM-A202K'
+      model: 'GALAXY Jean 2'
     - regex: '(?:SAMSUNG-)?GT-B5510'
       model: 'GALAXY Y Pro'
     - regex: '(?:SAMSUNG-)?GT-B5512'
@@ -5834,29 +10920,49 @@ Samsung:
       model: 'GALAXY 3'
     - regex: '(?:SAMSUNG-)?GT-I8000'
       model: 'Omnia II'
-    - regex: '(?:SAMSUNG-)?GT-I8150'
+    - regex: '(?:SAMSUNG-)?(?:GT-I8150|SM-T255S)'
       model: 'GALAXY W'
+    - regex: 'SC-01H[);/ ]'
+      model: 'GALAXY Active Neo'
     - regex: '(?:SAMSUNG-)?GT-S5830'
       model: 'GALAXY Ace'
+    - regex: '(?:SAMSUNG-)?SM-(?:G357(?:FZ|M)|G310HN)'
+      model: 'GALAXY Ace Style'
     - regex: '(?:SAMSUNG-)?GT-I8160'
       model: 'GALAXY Ace 2'
+    - regex: '(?:SAMSUNG-)?SM-G313(?:HY|M[LUY]|[FM])'
+      model: 'GALAXY Ace 4'
+    - regex: '(?:SAMSUNG-)?SM-G316M'
+      model: 'GALAXY Ace 4 Duos'
+    - regex: '(?:SAMSUNG-)?SM-G313[HU]'
+      model: 'GALAXY Ace 4 Lite'
+    - regex: '(?:SAMSUNG-)?SM-G318H[);/ ]'
+      model: 'GALAXY Ace 4 Neo'
+    - regex: '(?:SAMSUNG-)?SHV-E120S[);/ ]'
+      model: 'GALAXY S II HD LTE'
     - regex: '(?:SAMSUNG-)?GT-I8190'
       model: 'GALAXY S III mini'
     - regex: '(?:SAMSUNG-)?GT-I8200'
       model: 'GALAXY S III mini Value Edition'
     - regex: '(?:SAMSUNG-)?GT-I826[02]'
       model: 'GALAXY Core'
+    - regex: '(?:SAMSUNG-)?SM-G386W'
+      model: 'GALAXY Core LTE'
     - regex: '(?:SAMSUNG-)?GT-I8320'
       model: 'H1'
     - regex: '(?:SAMSUNG-)?GT-I85[23]0'
       model: 'GALAXY Beam'
+    - regex: '(?:SAMSUNG-)?SM-G600S'
+      model: 'GALAXY Wide'
     - regex: '(?:SAMSUNG-)?GT-I855[028]'
       model: 'GALAXY Win'
+    - regex: '(?:SAMSUNG-)?SM-G381[28]'
+      model: 'GALAXY Win Pro'
     - regex: '(?:SAMSUNG-)?GT-I8580'
       model: 'GALAXY Core Advance'
     - regex: '(?:SAMSUNG-)?GT-I8730'
       model: 'GALAXY Express'
-    - regex: '(?:SAMSUNG-)?SM-E500(?:F|H|HQ|M)'
+    - regex: '(?:SAMSUNG-)?SM-E500(?:HQ|[0FHM])'
       model: 'GALAXY E5'
     - regex: '(?:SAMSUNG-)?SM-E700(?:0|9|F|H|M)'
       model: 'GALAXY E7'
@@ -5878,17 +10984,19 @@ Samsung:
       model: 'GALAXY R'
     - regex: '(?:SAMSUNG-)?GT-I9105'
       model: 'GALAXY S II Plus'
-    - regex: '(?:SAMSUNG-)?(?:GT-I919[05]|SCH-I435)'
+    - regex: '(?:SAMSUNG-)?SM-G730(?:W8|[AV])'
+      model: 'GALAXY S3 mini'
+    - regex: '(?:SAMSUNG-)?(?:GT-I919[025]|SCH-I435)'
       model: 'GALAXY S4 mini'
     - regex: '(?:SAMSUNG-)?GT-I9515'
       model: 'GALAXY S4 Value Edition'
     - regex: '(?:SAMSUNG-)?GT-I9295'
       model: 'GALAXY S4 ACTIVE'
-    - regex: '(?:SAMSUNG-)?(?:GT-I9300|SCH-I535|SCH-L710)'
+    - regex: '(?:SAMSUNG-)?(?:GT-I9300|SCH-I535|SCH-L710|SCH-I939)'
       model: 'GALAXY S III'
     - regex: '(?:SAMSUNG-)?(?:GT-I9305|SCH-R530)'
       model: 'GALAXY S III LTE'
-    - regex: '(?:SAMSUNG-)?(?:GT-I9500|GT-I9505|SCH-I545|SCH-I959|SCH-R970|GALAXY-S4|SGH-M919N?)'
+    - regex: '(?:SAMSUNG-)?(?:GT-I9500|GT-I9502|GT-I9505|SCH-I545|SCH-I959|SCH-R970|GALAXY-S4|SGH-M919N?)'
       model: 'GALAXY S4'
     - regex: '(?:SAMSUNG-)?GT-I9506'
       model: 'GALAXY S4 with LTE+'
@@ -5898,32 +11006,54 @@ Samsung:
       model: 'GALAXY POCKET Plus'
     - regex: '(?:SAMSUNG-)?GT-S5310'
       model: 'GALAXY POCKET Neo'
+    - regex: '(?:SAMSUNG-)?SM-G110[BHM]'
+      model: 'GALAXY POCKET 2'
     - regex: '(?:SAMSUNG-)?GT-S5360'
       model: 'GALAXY Y Hello Kitty'
     - regex: '(?:SAMSUNG-)?GT-S6310'
       model: 'GALAXY Young'
     - regex: '(?:SAMSUNG-)?GT-S6312'
       model: 'GALAXY Young DUOS'
+    - regex: '(?:SAMSUNG-)?SM-G130(?:BT|HN|[EHMU])'
+      model: 'GALAXY Young 2'
+    - regex: '(?:SAMSUNG-)?SM-G130BU'
+      model: 'GALAXY Young 2 Pro'
     - regex: '(?:SAMSUNG-)?GT-S6790'
       model: 'GALAXY FAME Lite with NFC'
     - regex: '(?:SAMSUNG-)?GT-S6810'
       model: 'GALAXY FAME'
+    - regex: '(?:SAMSUNG-)?GT-S6812'
+      model: 'GALAXY FAME Duos'
+    - regex: 'SC-04J[);/ ]'
+      model: 'GALAXY Feel'
     - regex: '(?:SAMSUNG-)?GT-S7275'
       model: 'GALAXY ACE 3'
-    - regex: '(?:SAMSUNG-)?GT-S7390'
-      model: 'GALAXY Trend Lite'
     - regex: '(?:SAMSUNG-)?GT-S7500'
       model: 'GALAXY ACE Plus'
     - regex: '(?:SAMSUNG-)?(?:GT-S7560|SCH-I699)'
       model: 'GALAXY Trend'
-    - regex: '(?:SAMSUNG-)?(?:GT-S7562|SCH-I919)'
-      model: 'GALAXY S DUOS'
+    - regex: '(?:SAMSUNG-)?GT-S7390'
+      model: 'GALAXY Trend Lite'
     - regex: '(?:SAMSUNG-)?GT-S7580'
       model: 'GALAXY Trend Plus'
+    - regex: '(?:SAMSUNG-)?SCH-I739'
+      model: 'GALAXY Trend 2'
+    - regex: '(?:SAMSUNG-)?(?:GT-S7562|SCH-I919)'
+      model: 'GALAXY S DUOS'
     - regex: '(?:SAMSUNG-)?GT-S7582'
-      model: 'GALAXY DUOS 2'
+      model: 'GALAXY S DUOS 2'
+    - regex: '(?:SAMSUNG-)?SM-(?:G31[36]HU|G313HZ)'
+      model: 'GALAXY S DUOS 3'
     - regex: '(?:SAMSUNG-)?GT-S7710'
       model: 'GALAXY Xcover 2'
+    - regex: '(?:SAMSUNG-)?SM-G389F'
+      model: 'GALAXY Xcover 3'
+    - regex: '(?:SAMSUNG-)?SM-G715FN'
+      model: 'GALAXY Xcover Pro'
+    - regex: '(?:SAMSUNG-)?SM-G398FN'
+      model: 'GALAXY Xcover 4s'
+    - regex: '(?:SAMSUNG-)?SM-G390Y'
+      model: 'GALAXY Xcover 4'
     - regex: '(?:SAMSUNG-)?GT-S8500'
       model: 'Wave'
     - regex: '(?:SAMSUNG-)?GT-S8530'
@@ -5942,54 +11072,90 @@ Samsung:
       model: 'Wave 578'
     - regex: '(?:SAMSUNG-)?GT-S7230'
       model: 'Wave 723'
-    - regex: '(?:SAMSUNG-)?SM-C101'
+    - regex: '(?:SAMSUNG-)?SM-(?:C101|C105([AL])?)'
       model: 'GALAXY S4 zoom'
-    - regex: '(?:SAMSUNG-)?SM-C115'
+    - regex: '(?:SAMSUNG-)?SM-(?:C111(M)?|C115)'
       model: 'GALAXY K zoom'
+    - regex: '(?:SAMSUNG-)?SM-G318[HM]Z'
+      model: 'GALAXY V Plus'
+    - regex: '(?:SAMSUNG-)?SM-(?:G355[HM]|G3556D)'
+      model: 'GALAXY CORE 2'
     - regex: '(?:SAMSUNG-)?SM-G350'
       model: 'GALAXY CORE Plus'
     - regex: '(?:SAMSUNG-)?SM-G360[FH]?'
       model: 'GALAXY CORE Prime'
     - regex: '(?:SAMSUNG-)?SM-G361[FH]?'
       model: 'GALAXY CORE Prime Value Edition'
-    - regex: '(?:SAMSUNG-)?SM-G386F'
+    - regex: '(?:SAMSUNG-)?SM-(?:G386F|G3586V)'
       model: 'GALAXY CORE LTE'
+    - regex: '(?:SAMSUNG-)?SM-G3568V'
+      model: 'GALAXY CORE Mini 4G'
     - regex: '(?:SAMSUNG-)?SM-G3815'
       model: 'GALAXY EXPRESS II'
     - regex: '(?:SAMSUNG-)?SM-G388F'
       model: 'GALAXY Xcover 3'
-    - regex: '(?:SAMSUNG-)?SM-G390F'
+    - regex: '(?:SAMSUNG-)?SM-G390[FW]'
       model: 'GALAXY Xcover 4'
     - regex: '(?:SAMSUNG-)?SM-G800'
       model: 'GALAXY S5 mini'
     - regex: '(?:SAMSUNG-)?SM-G9009D'
       model: 'GALAXY S5 Dual-SIM'
-    - regex: '(?:SAMSUNG-)?SM-G900|GALAXY-S5'
+    - regex: '(?:SAMSUNG-)?SM-(?:G900|G906[KLS]|S902L|S903VL)|GALAXY-S5'
       model: 'GALAXY S5'
     - regex: '(?:SAMSUNG-)?SM-G901F'
       model: 'GALAXY S5 LTE+'
-    - regex: '(?:SAMSUNG-)?SM-G903F'
+    - regex: '(?:SAMSUNG-)?SM-G870[AFW]|SC-02G'
+      model: 'GALAXY S5 Active'
+    - regex: '(?:SAMSUNG-)?SM-G903[FMW]'
       model: 'GALAXY S5 Neo'
-    - regex: '(?:SAMSUNG-)?SM-G920(?:A|F|FD|FQ|I|P|R|S|T|V|8|9)'
+    - regex: '(?:SAMSUNG-)?SM-G860P'
+      model: 'GALAXY S5 K Sport'
+    - regex: '(?:SAMSUNG-)?SM-G920(?:F[DQ]|W8|[089AFIKLPRSTVX])?|SC-05G'
       model: 'GALAXY S6'
-    - regex: '404SC'
-      model: 'GALAXY S6 edge (Softbank)'
-    - regex: '(?:SAMSUNG-)?SM-G925[FIPRVW]'
-      model: 'GALAXY S6 edge'
-    - regex: '(?:SAMSUNG-)?SM-G928[FI]'
-      model: 'GALAXY S6 edge+'
-    - regex: '(?:SAMSUNG-)?SM-G930(?:A|F|FD|K|P|R|T|U|V|W8)'
+    - regex: '(?:SAMSUNG-)?SM-G890A'
+      model: 'GALAXY S5 Active'
+    - regex: '(?:SAMSUNG-)?SM-G925[0ADFIKLPRSTVW]|SCV31|404SC'
+      model: 'GALAXY S6 Edge'
+    - regex: '(?:SAMSUNG-)?SM-G928(?:7C|R4|W8|[07ACFGIKLPSTV])'
+      model: 'GALAXY S6 Edge+'
+    - regex: '(?:SAMSUNG-)?SM-G930(?:FD|W8|[0AFKLPRSTUVX])?[);/ ]'
       model: 'GALAXY S7'
-    - regex: '(?:SAMSUNG-)?SM-G935[AFLPSTV]|SC-02H'
-      model: 'GALAXY S7 edge'
-    - regex: '(?:SAMSUNG-)?SM-G950[FU]'
+    - regex: '(?:SAMSUNG-)?SM-G935(?:R4|W8|[0AFKLPSTUVX])|SC-02H|SCV33'
+      model: 'GALAXY S7 Edge'
+    - regex: '(?:SAMSUNG-)?SM-G891A'
+      model: 'GALAXY S7 Active'
+    - regex: '(?:SAMSUNG-)?SM-G950[08FNUW]?|SCV36|SC-02J'
       model: 'GALAXY S8'
-    - regex: '(?:SAMSUNG-)?SM-G955[AFKLNPRTUVW0]|SCV35'
+    - regex: '(?:SAMSUNG-)?SM-G8750'
+      model: 'GALAXY S8 Lite'
+    - regex: '(?:SAMSUNG-)?SM-G892[AU]'
+      model: 'GALAXY S8 Active'
+    - regex: '(?:SAMSUNG-)?SM-G955[AFKLNPRTUVW0X]?|SCV35|SC-03J'
       model: 'GALAXY S8+'
-    - regex: '(?:SAMSUNG-)?SM-G960[FNUW0]'
+    - regex: '(?:SAMSUNG-)?SM-G960[FNUWX0]?|SCV38|SC-02K'
       model: 'GALAXY S9'
-    - regex: '(?:SAMSUNG-)?SM-G965[FUW0]'
+    - regex: '(?:SAMSUNG-)?SM-G965[FNUWX0]|SCV39|SC-03K'
       model: 'GALAXY S9+'
+    - regex: '(?:SAMSUNG-)?(?:SM-(?:G973|G977[PUTNB])|SCV41|SC-03L)'
+      model: 'GALAXY S10'
+    - regex: '(?:SAMSUNG-)?SM-G770F'
+      model: 'GALAXY S10 Lite'
+    - regex: '(?:SAMSUNG-)?(?:SM-G975[0FUWNX]|SCV42|SC-04L)'
+      model: 'GALAXY S10+'
+    - regex: '(?:SAMSUNG-)?SM-G970[08FUNWX][);/ ]'
+      model: 'GALAXY S10e'
+    - regex: '(?:SAMSUNG-)?SM-G980F'
+      model: 'GALAXY S20'
+    - regex: '(?:SAMSUNG-)?SM-G981(?:[0BNUW]|U1)|SCG01'
+      model: 'GALAXY S20 5G'
+    - regex: '(?:SAMSUNG-)?SM-G988(?:[0BNUW]|U1)'
+      model: 'GALAXY S20 Ultra 5G'
+    - regex: '(?:SAMSUNG-)?SM-G985F|SCG02'
+      model: 'GALAXY S20+'
+    - regex: '(?:SAMSUNG-)?SM-G986(?:[0BNUW]|U1)|SC-52A'
+      model: 'GALAXY S20+ 5G'
+    - regex: '(?:SAMSUNG-)?SM-F700(?:[0FNUW]|U1)|SCV47'
+      model: 'GALAXY Z Flip'
     - regex: '(?:SAMSUNG-)?SCH-I200'
       model: 'GALAXY Stellar'
     - regex: '(?:SAMSUNG-)?SCH-I829'
@@ -6000,87 +11166,291 @@ Samsung:
       model: 'GALAXY Centura'
     - regex: 'vollo Vi86[);/ ]'
       model: 'Vollo Vi86'
-    - regex: '(?:SAMSUNG-)?SM-A300(?:F|FU|G|H|M)'
+    - regex: '(?:SAMSUNG-)?SM-G386(?:T1|T)'
+      model: 'GALAXY Avant'
+    - regex: '(?:SAMSUNG-)?SM-A015[AFGM]'
+      model: 'GALAXY A01'
+    - regex: '(?:SAMSUNG-)?SM-A260[FG]'
+      model: 'GALAXY A2 Core'
+    - regex: '(?:SAMSUNG-)?SM-A300(?:FU|YZ|[09FGHMY])'
       model: 'GALAXY A3 (2015)'
-    - regex: '(?:SAMSUNG-)?SM-A310F'
+    - regex: '(?:SAMSUNG-)?SM-A310(?:N0|[FMYX])'
       model: 'GALAXY A3 (2016)'
-    - regex: '(?:SAMSUNG-)?SM-A320(?:FL|F|Y)'
+    - regex: '(?:SAMSUNG-)?SM-A320(?:FL|[FYX])'
       model: 'GALAXY A3 (2017)'
-    - regex: '(?:SAMSUNG-)?SM-A500[FGHM0]'
+    - regex: '(?:SAMSUNG-)?SM-A500[LSWY]?[);/ ]'
+      model: 'GALAXY A5'
+    - regex: '(?:SAMSUNG-)?SM-A500[FGHKM0]'
       model: 'GALAXY A5 Duos'
-    - regex: '(?:SAMSUNG-)?SM-A500FU'
+    - regex: '(?:SAMSUNG-)?SM-A500(?:FU|X)'
       model: 'GALAXY A5 (2015)'
-    - regex: '(?:SAMSUNG-)?SM-A510F'
+    - regex: '(?:SAMSUNG-)?SM-A510[08FKLMSYX]'
       model: 'GALAXY A5 (2016)'
-    - regex: '(?:SAMSUNG-)?SM-A520F'
+    - regex: '(?:SAMSUNG-)?SM-A520[FKLSW]'
       model: 'GALAXY A5 (2017)'
-    - regex: '(?:SAMSUNG-)?SM-(?:A720F|A700[FKLS]|A710[FMY0])'
+    - regex: '(?:SAMSUNG-)?SM-A600(?:AZ|FN|GN|T1|[AFGNPTU])'
+      model: 'GALAXY A6'
+    - regex: '(?:SAMSUNG-)?SM-A605(?:[FG]N|[08FG])'
+      model: 'GALAXY A6+'
+    - regex: '(?:SAMSUNG-)?SM-G6200'
+      model: 'GALAXY A6s (2018)'
+    - regex: '(?:SAMSUNG-)?SM-A60(?:60|6Y)'
+      model: 'GALAXY A60'
+    - regex: '(?:SAMSUNG-)?SM-A700(?:YD|[09FHKLS])'
       model: 'GALAXY A7'
-    - regex: '(?:SAMSUNG-)?SM-A(?:530F|800F)'
+    - regex: '(?:SAMSUNG-)?SM-A710[08FKLMSYX]'
+      model: 'GALAXY A7 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-A720[FS]'
+      model: 'GALAXY A7 (2017)'
+    - regex: '(?:SAMSUNG-)?SM-A750(?:GN|[FGCN])'
+      model: 'GALAXY A7 (2018)'
+    - regex: '(?:SAMSUNG-)?SM-A71(?:5[FW])?[);/ ]'
+      model: 'GALAXY A71'
+    - regex: '(?:SAMSUNG-)?SM-A716U[);/ ]'
+      model: 'GALAXY A71 5G'
+    - regex: '(?:SAMSUNG-)?SM-A(?:530F|800[0FISY])|SCV32'
       model: 'GALAXY A8'
+    - regex: '(?:SAMSUNG-)?SM-G885[FSY]'
+      model: 'GALAXY A8 Star'
+    - regex: '(?:SAMSUNG-)?SM-A810(?:YZ|[FS])'
+      model: 'GALAXY A8 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-G887[0F]'
+      model: 'GALAXY A8s'
+    - regex: '(?:SAMSUNG-)?SM-A530[NW]'
+      model: 'GALAXY A8 (2018)'
+    - regex: '(?:SAMSUNG-)?SM-A730F'
+      model: 'GALAXY A8+ (2018)'
     - regex: '(?:SAMSUNG-)?SM-A9000'
       model: 'GALAXY A9'
-    - regex: '(?:SAMSUNG-)?SM-A910F'
+    - regex: 'SM-A9\[7\]'
+      model: 'GALAXY A9 7'
+    - regex: '(?:SAMSUNG-)?SM-A920[0FXN]'
+      model: 'GALAXY A9 (2018)'
+    - regex: '(?:SAMSUNG-)?SM-G8850'
+      model: 'GALAXY A9 Star'
+    - regex: '(?:SAMSUNG-)?SM-(?:A910[0F]|G887N)'
       model: 'GALAXY A9 Pro'
+    - regex: '(?:SAMSUNG-)?SM-A105[FGMN]'
+      model: 'GALAXY A10'
+    - regex: '(?:SAMSUNG-)?SM-A107[FM]'
+      model: 'GALAXY A10s'
+    - regex: '(?:SAMSUNG-)?SM-(?:S102DL|A102[NWU])'
+      model: 'GALAXY A10e'
+    - regex: '(?:SAMSUNG-)?SM-A115F'
+      model: 'GALAXY A11'
+    - regex: '(?:SAMSUNG-)?SM-(?:A205(?:[FGSWU]|YN|U1)|S205DL)|SC-02M|SCV46'
+      model: 'GALAXY A20'
+    - regex: '(?:SAMSUNG-)?SM-A215U[);/ ]'
+      model: 'GALAXY A21'
+    - regex: '(?:SAMSUNG-)?SM-A217F[);/ ]'
+      model: 'GALAXY A21s'
+    - regex: '(?:SAMSUNG-)?SM-A202[FG]'
+      model: 'GALAXY A20e'
+    - regex: '(?:SAMSUNG-)?SM-A207[0FM]'
+      model: 'GALAXY A20s'
+    - regex: '(?:SAMSUNG-)?(?:SM-A305(?:[GYF]N|GT|[NFG])|SCV43)'
+      model: 'GALAXY A30'
+    - regex: '(?:SAMSUNG-)?SM-A307(?:FN|GN|GT|[FG])'
+      model: 'GALAXY A30s'
+    - regex: '(?:SAMSUNG-)?SM-A315[FNG][);/ ]'
+      model: 'GALAXY A31'
+    - regex: '(?:SAMSUNG-)?SM-A405(?:F[NM]|S)'
+      model: 'GALAXY A40'
+    - regex: '(?:SAMSUNG-)?SM-A305[01][);/ ]'
+      model: 'GALAXY A40s'
+    - regex: '(?:SAMSUNG-)?SM-A415F'
+      model: 'GALAXY A41'
+    - regex: '(?:SAMSUNG-)?SM-(?:A505(?:F[NG]|[FGNWU]|YN|U1?)|S506DL|505FN)'
+      model: 'GALAXY A50'
+    - regex: '(?:SAMSUNG-)?SM-A5070[);/ ]'
+      model: 'GALAXY A50s'
+    - regex: '(?:SAMSUNG-)?SM-A507FN'
+      model: 'GALAXY A50s'
+    - regex: '(?:SAMSUNG-)?SM-A515[F]'
+      model: 'GALAXY A51'
+    - regex: '(?:SAMSUNG-)?SM-A705(?:GM|[MYF]N|F|[W0X])'
+      model: 'GALAXY A70'
+    - regex: '(?:SAMSUNG-)?SM-A707[0F]'
+      model: 'GALAXY A70s'
+    - regex: '(?:SAMSUNG-)?SM-A805[0FNX]'
+      model: 'GALAXY A80'
+    - regex: '(?:SAMSUNG-)?SM-A908[BN]'
+      model: 'GALAXY A90'
     - regex: '(?:SAMSUNG-)?GT-I9301I'
       model: 'GALAXY S III Neo'
-    - regex: '(?:SAMSUNG-)?SM-J100(?:F|FN|H|M|MU)'
+    - regex: '(?:SAMSUNG-)?SM-J100(?:FN|MU|[FHMY])'
       model: 'GALAXY J1'
-    - regex: '(?:SAMSUNG-)?SM-J105(?:B|H)'
+    - regex: '(?:SAMSUNG-)?SM-J105[BFHY]'
       model: 'GALAXY J1 mini'
-    - regex: '(?:SAMSUNG-)?SM-J120[AFHMT]'
+    - regex: '(?:SAMSUNG-)?SM-J106[FMHB]'
+      model: 'GALAXY J1 mini Prime'
+    - regex: '(?:SAMSUNG-)?SM-J120[AFHGMT]'
       model: 'GALAXY J1 (2016)'
-    - regex: '(?:SAMSUNG-)?SM-J110[FHML]'
-      model: 'GALAXY J1 Ace'
-    - regex: '(?:SAMSUNG-)?SM-J111[FM]'
+    - regex: '(?:SAMSUNG-)?SM-(?:J110[FHMLG]|J111[FM])'
       model: 'GALAXY J1 Ace'
     - regex: '(?:SAMSUNG-)?SM-J200[FGHY]'
       model: 'GALAXY J2'
-    - regex: '(?:SAMSUNG-)?SM-J2[15]0F'
+    - regex: '(?:SAMSUNG-)?SM-J260AZ'
+      model: 'GALAXY J2 Pure'
+    - regex: '(?:SAMSUNG-)?SM-(?:J260([AFGMY]|T1)|S260DL)'
+      model: 'GALAXY J2 Core'
+    - regex: '(?:SAMSUNG-)?SM-J(?:210F|250[FMGY])'
       model: 'GALAXY J2 Pro'
-    - regex: '(?:SAMSUNG-)?SM-J320(?:A|F|FN|G|H|M|P|V)'
+    - regex: '(?:SAMSUNG-)?SM-S367VL'
+      model: 'GALAXY J3 Orbit'
+    - regex: '(?:SAMSUNG-)?SM-J311(?:[09]|9S)'
+      model: 'GALAXY J3 Pro'
+    - regex: '(?:SAMSUNG-)?SM-J327(?:T1|[ATW])[);/ ]'
+      model: 'GALAXY J3 Prime'
+    - regex: '(?:SAMSUNG-)?SM-J327(?:F|R4)'
+      model: 'GALAXY J3 Emerge'
+    - regex: '(?:SAMSUNG-)?SM-J337R4[);/ ]'
+      model: 'GALAXY J3 Aura'
+    - regex: '(?:SAMSUNG-)?SM-J337T[);/ ]'
+      model: 'GALAXY J3 Star'
+    - regex: '(?:SAMSUNG-)?SM-J327V'
+      model: 'GALAXY J3 Eclipse'
+    - regex: '(?:SAMSUNG-)?SM-S337TL'
+      model: 'GALAXY J3 Luna Pro'
+    - regex: '(?:SAMSUNG-)?SM-J3109'
+      model: 'GALAXY J3 (2015)'
+    - regex: '(?:SAMSUNG-)?SM-J320(?:FN|R4|W8|[AFGHMNPV])'
       model: 'GALAXY J3 (2016)'
-    - regex: '(?:SAMSUNG-)?SM-J330(?:F|G)'
+    - regex: '(?:SAMSUNG-)?SM-(?:J330(?:[08FGLN]|FN)|J327(?:R7|U))[);/ ]'
       model: 'GALAXY J3 (2017)'
-    - regex: '(?:SAMSUNG-)?SM-J400(?:F|G)'
+    - regex: '(?:SAMSUNG-)?SM-J337(?:[AWPUV]|VPP)[);/ ]'
+      model: 'GALAXY J3 (2018)'
+    - regex: '(?:SAMSUNG-)?SM-J400[FGM]'
       model: 'GALAXY J4'
-    - regex: '(?:SAMSUNG-)?SM-J500(?:F|FN|G|Y|M|H)'
+    - regex: '(?:SAMSUNG-)?SM-J500(?:[8F]|FN|G|Y|M|H|N0)[);/ ]'
       model: 'GALAXY J5 (2015)'
-    - regex: '(?:SAMSUNG-)?SM-J510[FM]N'
+    - regex: '(?:SAMSUNG-)?SM-(?:J510(?:[8FHKLS]|[UFMG]N)|5108|G510H)[);/ ]'
       model: 'GALAXY J5 (2016)'
-    - regex: '(?:SAMSUNG-)?SM-J530[FY]'
+    - regex: '(?:SAMSUNG-)?SM-J530'
       model: 'GALAXY J5 (2017)'
-    - regex: '(?:SAMSUNG-)?SM-G570[FY]'
+    - regex: '(?:SAMSUNG-)?SM-G570[0FMY]'
       model: 'GALAXY J5 Prime'
-    - regex: '(?:SAMSUNG-)?SM-J600[FG]'
+    - regex: '(?:SAMSUNG-)?SM-J600[NFGL]'  # 2018
       model: 'GALAXY J6'
-    - regex: '(?:SAMSUNG-)?SM-J7[01]0(?:F|FN|H|M|MN)'
+    - regex: '(?:SAMSUNG-)?SM-J610[FG]'
+      model: 'GALAXY J6+'
+    - regex: '(?:SAMSUNG-)?SM-J410[FG]'
+      model: 'GALAXY J4 Core'
+    - regex: '(?:SAMSUNG-)?SM-J415(?:[FNG]|[FG]N)'
+      model: 'GALAXY J4+'
+    - regex: '(?:SAMSUNG-)?SM-J7[01]0(?:8|F|FN|H|K|M|MN)'
       model: 'GALAXY J7'
+    - regex: '(?:SAMSUNG-)?SM-J700P'
+      model: 'GALAXY J7 (2015)'
+    - regex: '(?:SAMSUNG-)?SM-(?:J700(?:T1|T)|J710GN|J7109)'
+      model: 'GALAXY J7 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-(?:J730[K]|J727(?:[USF]|R4))'
+      model: 'GALAXY J7 (2017)'
+    - regex: '(?:SAMSUNG-)?SM-J737(?:[AVPUS]|T1?|VPP|R4)[);/ ]'
+      model: 'GALAXY J7 (2018)'
     - regex: '(?:SAMSUNG-)?SM-C710F'
       model: 'GALAXY J7+ (C7)'
     - regex: '(?:SAMSUNG-)?SM-G610[FMY]'
       model: 'GALAXY J7 Prime'
+    - regex: '(?:SAMSUNG-)?SM-G611(?:FF|MT|M)'
+      model: 'GALAXY J7 Prime 2'
     - regex: '(?:SAMSUNG-)?SM-G615[F]'
       model: 'GALAXY J7 Max'
+    - regex: '(?:SAMSUNG-)?SM-(?:S727VL|S737TL)'
+      model: 'GALAXY J7 Sky Pro'
     - regex: '(?:SAMSUNG-)?SM-J730(?:F|G|GM)'
       model: 'GALAXY J7 Pro'
     - regex: '(?:SAMSUNG-)?SM-J701(?:F|M)'
       model: 'GALAXY J7 Core' # also GALAXY J7 Nxt and GALAXY J7 Neo
+    - regex: '(?:SAMSUNG-)?SM-J720[FM]'
+      model: 'GALAXY J7 Duo'
+    - regex: '(?:SAMSUNG-)?SM-S767VL'
+      model: 'GALAXY J7 Crown'
+    - regex: '(?:SAMSUNG-)?SM-J727(?:P|T|V)'
+      model: 'GALAXY J7 V'
+    - regex: 'SM-J7\[7\]'
+      model: 'GALAXY J7 7'
+    - regex: '(?:SAMSUNG-)?SM-J810'
+      model: 'GALAXY J8'
+    - regex: 'SM-J8 Pro'
+      model: 'GALAXY J8 Pro'
+    - regex: 'SM-J9\[7\] Prime'
+      model: 'GALAXY J9 7 Prime'
+    - regex: 'SM-J9\[8\] Pro'
+      model: 'GALAXY J9 8 Pro'
+    - regex: '(?:SAMSUNG-)?SM-M015[FG]'
+      model: 'GALAXY M01'
+    - regex: '(?:SAMSUNG-)?SM-M105[FGM]'
+      model: 'GALAXY M10'
+    - regex: '(?:SAMSUNG-)?SM-M107F'
+      model: 'GALAXY M10s'
+    - regex: '(?:SAMSUNG-)?SM-M115F'
+      model: 'GALAXY M11'
+    - regex: '(?:SAMSUNG-)?SM-M205[FGNM]'
+      model: 'GALAXY M20'
+    - regex: '(?:SAMSUNG-)?SM-M215F'
+      model: 'GALAXY M21'
+    - regex: '(?:SAMSUNG-)?SM-M307([0F]|FN)'
+      model: 'GALAXY M30s'
+    - regex: '(?:SAMSUNG-)?SM-M305'
+      model: 'GALAXY M30'
+    - regex: '(?:SAMSUNG-)?SM-M315F'
+      model: 'GALAXY M31'
+    - regex: '(?:SAMSUNG-)?SM-M405'
+      model: 'GALAXY M40'
+
     - regex: '(?:SAMSUNG-)?SM-G850F'
       model: 'GALAXY Alpha'
-    - regex: '(?:SAMSUNG-)?SM-(?:G550FY|G5520)'
+    - regex: '(?:SAMSUNG-)?SM-G910S'
+      model: 'GALAXY Round'
+    - regex: '(?:SAMSUNG-)?SM-(?:G550(?:FY|T[12]?)|G55[01]0|G5520)'
       model: 'GALAXY On5'
-    - regex: '(?:SAMSUNG-)?SM-G600FY'
-      model: 'GALAXY On7'
-    - regex: '(?:SAMSUNG-)?SM-C900[FY0]'
+    - regex: '(?:SAMSUNG-)?SM-G5528'
+      model: 'GALAXY On5 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-G600(?:FY|[0F])'
+      model: 'GALAXY On7'     
+    - regex: '(?:SAMSUNG-)?SM-G610[0KLS]'
+      model: 'GALAXY On7 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-G611[FSKL]'
+      model: 'GALAXY On7 Prime'
+    - regex: '(?:SAMSUNG-)?SM-C5000'
+      model: 'GALAXY C5'
+    - regex: '(?:SAMSUNG-)?SM-C501[08]'
+      model: 'GALAXY C5 Pro'
+    - regex: '(?:SAMSUNG-)?SM-C7000'
+      model: 'GALAXY C7'
+    - regex: '(?:SAMSUNG-)?SM-C701[08F]'
+      model: 'GALAXY C7 Pro'
+    - regex: '(?:SAMSUNG-)?SM-C710[08]'
+      model: 'GALAXY C8'
+    - regex: '(?:SAMSUNG-)?SM-C900[08FY]'
       model: 'GALAXY C9 Pro'
-    - regex: '(?:SAMSUNG-)?SM-G150'
+    - regex: '(?:SAMSUNG-)?SM-Z130H'
+      model: 'GALAXY Z1'
+    - regex: '(?:SAMSUNG-)?SM-Z200[FMY]'
+      model: 'GALAXY Z2'
+    - regex: '(?:SAMSUNG-)?SM-Z300H'
+      model: 'GALAXY Z3'
+    - regex: '(?:SAMSUNG-)?SM-Z400[FY]'
+      model: 'GALAXY Z4'
+    - regex: '(?:SAMSUNG-)?SM-(?:G150|G155S)[);/ ]'
       model: 'GALAXY Folder'
-    - regex: '(?:SAMSUNG-)?SM-G165'
+    - regex: '(?:SAMSUNG-)?(?:SM-G16(?:[05]0?|0N))[);/ ]'
       model: 'GALAXY Folder 2'
+    - regex: '(?:SAMSUNG-)?SM-J321AZ[);/ ]'
+      model: 'GALAXY Sol'
+    - regex: '(?:SAMSUNG-)?SM-J727AZ[);/ ]'
+      model: 'GALAXY Halo'
+    - regex: '(?:SAMSUNG-)?SM-J327AZ'
+      model: 'GALAXY Amp Prime 2'
+    - regex: '(?:SAMSUNG-)?SM-J337AZ'
+      model: 'GALAXY Amp Prime 3 (2018)'
 
     # explicit phablet models
-    - regex: '(?:SAMSUNG-)?GT-I9060'
+    - regex: '(?:SAMSUNG-)?SM-(?:F900[0FU]|F907[BN])'
+      model: 'GALAXY Fold'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?GT-I9060[);/ ]'
       model: 'GALAXY Grand Neo'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-I9063'
@@ -6098,66 +11468,107 @@ Samsung:
     - regex: '(?:SAMSUNG-)?GT-N7000'
       model: 'GALAXY Note'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?(?:(?:GT-)?N7100|SCH-I605|SCH-N719|SCH-R950|SPH-L900)'
+    - regex: 'SC-01G[);/ ]'
+      model: 'GALAXY Note Edge'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-N935[FSLK][);/ ]'
+      model: 'GALAXY Note Fan Edition'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?(?:(?:GT-)?N7100|SCH-I605|SCH-N719|SCH-R950|SPH-L900)[);/ ]'
       model: 'GALAXY Note II'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-N7105'
       model: 'GALAXY Note II LTE'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-G710[25]'
+    - regex: '(?:SAMSUNG-)?SM-G710[25L]?[);/ ]'
       model: 'GALAXY Grand 2'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-G53(?:0F|0FZ|0Y|0H|0FZ|1F|1H)'
+    - regex: '(?:SAMSUNG-)?SM-G720(?:AX|N0|2)[);/ ]'
+      model: 'GALAXY Grand Max'
+    - regex: '(?:SAMSUNG-)?SM-G53(?:0[FTYHWMP]|0[AF]Z|1[FH]|0[89]W|0MU|0BT|0R4)[);/ ]'
       model: 'GALAXY Grand Prime'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-G532F'
+    - regex: '(?:SAMSUNG-)?SM-G531BT[);/ ]'
+      model: 'GALAXY Grand Prime VE Duos'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-G532F[);/ ]'
       model: 'GALAXY Grand Prime Plus' # also GALAXY J2 Prime
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-G532MT'
+    - regex: '(?:SAMSUNG-)?SM-G532MT[);/ ]'
       model: 'GALAXY J2 Prime (TV)'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-G532[MG]'
+    - regex: '(?:SAMSUNG-)?SM-G532[MG][);/ ]'
       model: 'GALAXY J2 Prime'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N7502'
+    - regex: '(?:SAMSUNG-)?SM-N7502[);/ ]'
       model: 'GALAXY Note 3 Neo Duos'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N750[L50]?'
+    - regex: '(?:SAMSUNG-)?SM-N750[QL50]?'
       model: 'GALAXY Note 3 Neo'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N9002'
+    - regex: '(?:SAMSUNG-)?SM-N9002[);/ ]'
       model: 'GALAXY Note 3 Duos'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N900(?:[05689][VQ]?|[AKLPSTV]|W8)?'
+    - regex: '(?:SAMSUNG-)?SM-9005[);/ ]'
+      model: 'GALAXY Note 3 LTE'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?(?:SM-N900(?:[05689][VQ]?|[AKLPSTV]|W8)?|SCL22|SC-01F[);/ ])'
       model: 'GALAXY Note 3'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N910|N9100'
+    - regex: '(?:SAMSUNG-)?SM-(?:N910|910U)|N9100[);/ ]'
       model: 'GALAXY Note 4'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-N916[SKL]'
+      model: 'GALAXY Note 4 LTE'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?SM-N915'
       model: 'GALAXY Note 4 Edge'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N920[0ACGIKLST]'
+    - regex: '(?:SAMSUNG-)?SM-N920(?:[0ACGIKLSTPFV]|R[46]|W8)'
       model: 'GALAXY Note 5'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?SM-N9208'
       model: 'GALAXY Note 5 Duos'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-G750(?:8Q|[9AFH])'
+      model: 'GALAXY Mega 2'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-I915[028]'
       model: 'GALAXY Mega 5.8'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-I920[05]'
       model: 'GALAXY Mega 6.3'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N930F'
+    - regex: '(?:SAMSUNG-)?(?:SM-N930F|SCV34)'
       model: 'GALAXY Note 7'
       device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?SM-N950'
+    - regex: '(?:SAMSUNG[- ])?SM-N950|SCV37|SC-01K'
       model: 'GALAXY Note 8'
       device: 'phablet'
-    - regex: '(?:SAMSUNG[- ])?SM-N960'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N960|SCV40|SC-01L)'
       model: 'GALAXY Note 9'
       device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?SM-(?:N970(?:U1|W8|[089DFJKLSXUW])|N971N)'
+      model: 'GALAXY Note 10'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?SM-N770[FX]'
+      model: 'GALAXY Note 10 Lite'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N975(?:[0FUXW]|U1|Xu)|SM-N976[0BVNUQ]|SC-01M|SCV45)'
+      model: 'GALAXY Note 10+'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N980(?:F|F/DS))'
+      model: 'GALAXY Note 20'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N981(?:B|B/DS|N|U|U1|W))'
+      model: 'GALAXY Note 20 5G'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N985(?:F|F/DS))'
+      model: 'GALAXY Note 20 Ultra'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N986(?:[B|N|U|W]|B/DS|U1))'
+      model: 'GALAXY Note 20 Ultra 5G'
+      device: 'phablet'
 
     # explicit feature phones
     - regex: '(?:SAMSUNG-)?GT-E2152'
@@ -6170,9 +11581,6 @@ Samsung:
       model: '$1'
     - regex: 'SC-02C'
       model: 'GALAXY S II'
-    - regex: 'SC-01F'
-      model: 'GALAXY Note 3'
-      device: 'phablet'
     - regex: 'SC-04E'
       model: 'GALAXY S4'
     - regex: '(?:SAMSUNG-)?((?:SM-[TNP]|GT-P)[a-z0-9_\-]+)'
@@ -6191,7 +11599,7 @@ Samsung:
       model: '$1'
     - regex: 'SAMSUNG;[ ]?([a-z0-9]+[\-_][a-z0-9]+)'
       model: '$1'
-    - regex: 'SAMSUNG(?!Browser)[ _/\-]?([a-z0-9\-]+)'
+    - regex: 'SAMSUNG[ _/\-]?([a-z0-9\-]+)'
       model: '$1'
     - regex: 'SAMSUNG;[ ]?([a-z0-9 ]+)'
       model: '$1'
@@ -6218,6 +11626,16 @@ Sanei:
     - regex: 'G(60[25]|70[3568]G?|785|803)'
       model: 'G$1'
 
+# Selfix
+Selfix:
+  regex: 'SELFIX'
+  device: 'smartphone'
+  models:
+    - regex: 'SELFIX_SLASH6'
+      model: 'Slash 6'
+    - regex: 'VOYAGER-V45'
+      model: 'Voyager V45'
+
 # Sencor
 Sencor:
   regex: 'Sencor|ELEMENT[ _]?(?:7|8|9\.7|10[ _]1)(?:[ _]?V[23])?[);/ ]|ELEMENT[ _]?(?:P[0-9]+)[);/ ]'
@@ -6252,6 +11670,46 @@ Sencor:
     - regex: 'Sencor[ _]([^;/]+) Build'
       model: '$1'
 
+# Senwa
+Senwa:
+  regex: 'Senwa|(?:S\-?(?:471|7[12]5|6[01]5|915|905TL|1000|5018)|V705B)[ /;\)]'
+  device: 'smartphone'
+  models:
+    - regex: 'S\-?471[ /;\)]'
+      model: 'Jazz'
+    - regex: 'S\-?605[ /;\)]'
+      model: 'City'
+    - regex: 'S\-?905TL[ /;\)]'
+      model: 'Odin'
+    - regex: 'S\-?1000[ /;\)]'
+      model: 'Odin'
+    - regex: 'S\-?5018[ /;\)]'
+      model: 'Inizio'
+    - regex: 'S\-?(615|7[12]5|915)[ /;\)]'
+      model: 'S$1'
+    - regex: 'V705B[ /;\)]'
+      model: 'V705B'
+    - regex: 'Senwa[ _-]*([^;/]+) Build'
+      model: '$1'
+    - regex: 'Senwa[ _-]*([^ ;/)]+)[ ;/)]'
+      model: '$1'
+
+# Sky
+Sky:
+  regex: '(SKY|Elite|Fuego)[_ ][3-7]\.[05]([A-Z]{1,2})?|Elite_5_5_Octa|Platinum_(5.0M|M5)'
+  device: 'smartphone'
+  models:
+    - regex: 'Platinum_(5.0M|M5)'
+      model: 'Platinum 5.0M'
+    - regex: 'Elite_5_5_Octa'
+      model: 'Elite 5.5 Octa'
+    - regex: 'Elite[_ ]([3-7]\.[05](?:[A-Z]{1,2})?\+?)'
+      model: 'Elite $1'
+    - regex: 'Fuego[_ ]([3-7]\.[05](?:[A-Z]{1,2})?\+?)'
+      model: 'Fuego $1'
+    - regex: 'SKY[_ ]([3-7]\.[05](?:[A-Z]{1,2})?)'
+      model: '$1'
+
 # Skyworth
 Skyworth:
   regex: 'Sky_?worth'
@@ -6302,7 +11760,7 @@ Smartfren:
 
 # Smartisan
 Smartisan:
-  regex: 'SM(?:70[15]|801|901|919)|OD10[35]|YQ60[1357][ /;\)]'
+  regex: '(SM(?:70[15]|[89]01|919)|OD10[35]|YQ60[1357]|DE106|DT1901A|O[CE]106|OS103|O[CS]105)[ /;\)]'
   device: 'smartphone'
   models:
     - regex: 'SM70[15]'
@@ -6317,6 +11775,30 @@ Smartisan:
       model: 'U1'
     - regex: 'OD10[35]'
       model: 'Pro'
+    - regex: 'OS105[ /;\)]'
+      model: 'Pro 2'
+    - regex: 'DE106[ /;\)]'
+      model: 'R1'
+    - regex: 'OE106[ /;\)]'
+      model: 'Nut Pro 2s'
+    - regex: 'OC10[56][ /;\)]'
+      model: 'Nut 3'
+    - regex: 'DT1901A[ /;\)]'
+      model: 'Nut Pro 3'
+    - regex: 'OS103[ /;\)]'
+      model: 'JianGuo Pro 2'
+
+# STF Mobile
+STF Mobile:
+  regex: 'Fractal|AERIAL PLUS|Origins Pro'
+  device: 'smartphone'
+  models:
+    - regex: 'Fractal'
+      model: 'Fractal'
+    - regex: 'Origins Pro'
+      model: 'Origins Pro'
+    - regex: 'AERIAL PLUS'
+      model: 'Aerial Plus'
 
 # STK
 STK:
@@ -6346,10 +11828,10 @@ SuperSonic:
 
 # Supra
 Supra:
-  regex: 'SUPRA ([^;/]+) Build|NVTAB 7.0 3G'
+  regex: 'SUPRA|NVTAB 7.0 3G'
   device: 'smartphone'
   models:
-    - regex: 'SUPRA ([^;/]+) Build'
+    - regex: 'SUPRA[ _]([^;/]+)(?: Build|\))'
       device: 'tablet'
       model: '$1'
     - regex: '(NVTAB 7.0 3G)'
@@ -6372,9 +11854,20 @@ SunVan:
     - regex: 'SUNVAN[ _\-]?([^);/ ]+)'
       model: '$1'
 
+# SWISSMOBILITY
+SWISSMOBILITY:
+  regex: 'SCHR9GR|ZUR722M'
+  device: 'smartphone'
+  models:
+    - regex: 'SCHR9GR'
+      model: 'SCHON R9'
+    - regex: 'ZUR722M'
+      device: 'phablet'
+      model: 'Z72 go'
+
 # Thomson
 Thomson:
-  regex: '(?:Primo(7|8)|QM73[45]-8G|QM734-2|QM736-8G\(HD\)|8950|MID1002)[);/ ]|(?:Tlink|Every)[0-9]+'
+  regex: '(?:Primo(7|8)|QM73[45]-8G|QM734-2|QM736-8G\(HD\)|8950|MID1002|5014G)[);/ ]|(?:Tlink|Every)[0-9]+'
   device: 'tablet'
   models:
     # already detected as manta device
@@ -6390,9 +11883,12 @@ Thomson:
       model: 'QM735-8G'
     - regex: 'QM736-8G\(HD\)'
       model: 'QM736-8G (HD)'
-    - regex: '8950 Build'
+    - regex: '8950[);/ ]'
       model: '3G 8950'
 
+    - regex: '5014G[);/ ]'
+      device: 'smartphone'
+      model: '5014G'       # EGO-5014G
     - regex: 'Tlink([0-9]+)'
       device: 'smartphone'
       model: 'Tlink$1'
@@ -6424,47 +11920,84 @@ Pantech:
 
 # Ployer
 Ployer:
-  regex: 'MOMO([0-9]|miniS)'
+  regex: 'MOMO([0-9]|[ ]?mini[ ]?(?:S|3GS)?)'
   device: 'tablet'
   models:
     - regex: 'MOMOminiS'
       model: 'MOMO mini S'
+    - regex: 'momo mini 3GS'
+      model: 'MOMO Mini 3GS'
     - regex: 'MOMO([0-9][^);/]*) Build'
       model: 'MOMO $1'
     - regex: 'MOMO([0-9][^);/]*)[);/]'
       model: 'MOMO $1'
 
+# Plum
+Plum:
+  regex: 'PLUM '
+  device: 'smartphone'
+  models:
+    - regex: 'Z405'
+      model: 'Gator 3'
+
 # Polaroid
 Polaroid:
-  regex: 'Polaroid|(?:PMID|MIDC)[0-9a-z]+[);/ ]|MID(?:1014|0714)|PRO[VG]?(?:[0-9]{3,}[a-z]*|[0-9]{2}[a-z])|P4526A|P5006A'
-  device: 'tablet'
+  regex: 'Polaroid|(?: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|PSPC(?:505|550|[MZL]20A0|K21NA)|SIGMA 5)[);/ ]'
+  device: 'smartphone'
   models:
     # explicit smartphone models
+    - regex: 'P4005A'
+      model: 'Turbo C4'
+    - regex: 'P5005A'
+      model: 'Turbo C5'
+    - regex: 'P4006A'
+      model: 'Turbo D4'
     - regex: 'P4526A'
       model: 'Turbo E'
-      device: 'smartphone'
+    - regex: 'PSPC(505|550)'
+      model: 'Cosmo $1'
     - regex: 'P5006A'
       model: 'Cosmo K'
-      device: 'smartphone'
+    - regex: 'P5526A'
+      model: 'Cosmo K Plus'
+    - regex: 'PSPCK21NA'
+      model: 'Cosmo K2 Plus'
+    - regex: 'P5026A'
+      model: 'Cosmo L'
+    - regex: 'PSPCL20A0'
+      model: 'Cosmo L2'
+    - regex: 'PSPCM20A0'
+      model: 'Cosmo M2'
+    - regex: 'P5046A'
+      model: 'Cosmo P5s'
+    - regex: 'P5525A'
+      model: 'Cosmo Q5s'
+    - regex: 'P5047A'
+      model: 'Cosmo Z'
+    - regex: 'PSPCZ20A0'
+      model: 'Cosmo Z2'
+    - regex: 'P5025A'
+      model: 'L5s'
     - regex: 'PRO4611(?:PR201)?'
       model: 'Pro4611'
-      device: 'smartphone'
     - regex: 'PROV400'
       model: 'Agate'
-      device: 'smartphone'
     - regex: 'PROV350'
       model: 'ProV350'
-      device: 'smartphone'
-
+    - regex: 'SIGMA 5[);/ ]'
+      model: 'Sigma 5'
     - regex: 'PRO([VG]?(?:[0-9]{3,}[a-z]*|[0-9]{2}[a-z]))'
       model: 'Pro$1'
-      device: 'smartphone'
+
     - regex: '(MID(?:1014|0714))'
       model: '$1'
+      device: 'tablet'
     - regex: '((?:PMID|MIDC)[0-9a-z]+)[);/ ]'
       model: '$1'
+      device: 'tablet'
     - regex: 'Polaroid'
       model: ''
+      device: 'tablet'
 
 # PolyPad
 PolyPad:
@@ -6476,6 +12009,83 @@ PolyPad:
     - regex: 'POLY ?PAD[_\.]([a-z0-9]+)'
       model: '$1'
 
+# Polytron
+Polytron:
+  regex: 'POLYTRON|W8480|W7430|PW1100S|W7550|W7531|W8570|R2401'
+  device: 'smartphone'
+  models:
+    - regex: 'R2508'
+      model: 'Rocket'
+    - regex: 'POLYTRON[ _]R1500'
+      model: 'Rocket Q-Five'
+    - regex: 'R2401'
+      model: 'Rocket 2X'
+    - regex: 'POLYTRON[ _-]R2402'
+      model: 'Rocket R2402'
+    - regex: 'POLYTRON[ _-]R2403'
+      model: 'Rocket R1'
+    - regex: 'POLYTRON[ _-]R2406'
+      model: 'Rocket R2'
+    - regex: 'POLYTRON[ _-]R2407'
+      model: 'Rocket R3'
+    - regex: 'POLYTRON[ _-]R2457'
+      model: 'Rocket S2'
+    - regex: 'POLYTRON[ _-]R2501'
+      model: 'Rocket T1'
+    - regex: 'POLYTRON[ _-]R2509SE'
+      model: 'Rocket T6 SE'
+    - regex: 'POLYTRON[ _-]R2509'
+      model: 'Rocket T6'
+    - regex: 'POLYTRON[ _-]R2506'
+      model: 'Rocket T4'
+    - regex: 'POLYTRON[ _-](?:R3450|W1400)'
+      model: 'Rocket Jetz'
+    - regex: 'POLYTRON[ _-]R3500'
+      model: 'Rocket Jetz 5.0'
+    - regex: '4G450'
+      model: 'Zap 5'
+    - regex: 'W6500'
+      model: 'Quadra Rocket'
+    - regex: 'W7452'
+      model: 'Quadra S2'
+    - regex: 'W7550'
+      model: 'Quadra V5'
+    - regex: 'W8570'
+      model: 'Quadra V7'
+    - regex: 'POLYTRON[ _]L501'
+      model: 'Rocket L501'
+    - regex: 'POLYTRON[ _]P520'
+      model: 'Prime 7S'
+    - regex: '4G500'
+      model: 'Zap 6 Cleo'
+    - regex: 'W8480'
+      model: 'Crystal 4 W8480'
+    - regex: 'W7531'
+      model: 'Wizard V'
+    - regex: 'W7430'
+      model: 'Quadra Mini W7430'
+    - regex: 'POLYTRON[ _]4G501'
+      model: 'Zap 6 Posh'
+    - regex: 'POLYTRON[ _]4G502'
+      model: 'Zap 6 Power'
+    - regex: 'POLYTRON[ _]4G503'
+      model: 'Zap 6 Flaz'
+    - regex: 'POLYTRON[_ ]?[ _]4G550'
+      model: 'Zap 6 Note'
+    - regex: 'POLYTRON[ _]4G551'
+      model: 'Zap 6 Posh Note'
+    - regex: 'PW1100S'
+      model: 'PW1100S'
+    - regex: 'Q2352'
+      model: 'Q2352'
+    - regex: 'POLYTRON[ _]T7800'
+      model: 'Cosmica T7800'
+      device: 'tablet'
+    - regex: 'POLYTRON[ _]T7700'
+      model: 'Rocket Pad'
+      device: 'tablet'
+
+
 # Positivo
 Positivo:
   regex: 'YPY_S450'
@@ -6486,19 +12096,35 @@ Positivo:
 
 # Prestigio
 Prestigio:
-  regex: '(?:PMP|PAP|PMT|PSP)[0-9]+[a-z0-9_]+[);/ ]'
+  regex: '(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+[);/ ]|Muze C3'
   device: 'tablet'
   models:
     - regex: 'PMT3277_3G'
       model: 'MultiPad Ranger 7.0 3G'
+    - regex: 'PGPS7799CIS08GBPG[);/ ]'
+      model: 'Geo Vision Tour 3'
+    - regex: 'PGPS7797[);/ ]'
+      model: 'Geo Vision Tour 2'
+    - regex: 'PMT3201_4G'
+      model: 'Grace 4G'
+    - regex: 'PSP5551DUO'
+      model: 'Grace S5'
     - regex: 'PMT3287_3G'
       model: 'MultiPad Ranger 8.0 3G'
-
+    - regex: 'PMT3208[_ ]3G'
+      model: 'MultiPad Wize 8.0 3G'
+    - regex: 'PSP7546DUO([ _][A-Z]{2})?'
+      model: 'X Pro'
+    - regex: 'PSP7610DUO([ _][A-Z]{2})?'
+      model: 'S Max'
     - regex: '(PM[PT][0-9]+[a-z0-9_]+)[);/ ]'
       model: '$1'
     - regex: '((?:PAP|PSP)[0-9]+[a-z0-9_]+(?: DUO)?)[);/ ]'
       model: '$1'
       device: 'smartphone'
+    - regex: 'Muze C3[);/ ]'
+      model: 'Muze C3'
+      device: 'smartphone'
 
 # Sanyo
 Sanyo:
@@ -6518,11 +12144,40 @@ Sanyo:
     - regex: 'MobilePhone ([a-z0-9\-]+)'
       model: '$1'
 
-# Qilive
+# Qilive (Auchan)
 Qilive:
-  regex: 'Qilive [0-9][^;/]*'
+  regex: 'Qilive [0-9][^;/]*|Q(7S5[5]?IN4G|7T10INP|8T10IN|8S55IN4G2|8S[56]IN4G|10S5[37]IN4G|10S[56]IN4G|10S[56]IN4GR|9S5IN4G|6T7IN)'
   device: 'smartphone'
   models:
+    - regex: 'Q7S5IN4G'
+      model: 'Q7 5.0" 4G'
+    - regex: 'Q7S55IN4G'
+      model: 'Q7 5.5" 4G'
+    - regex: 'Q8S55IN4G2'
+      model: 'Q8 5.5" 4G'
+    - regex: 'Q8S6IN4G'
+      model: 'Q8 6.0" 4G'
+    - regex: 'Q8S5IN4GP'
+      model: 'Q8 5.1" 4G'
+    - regex: 'Q9S5IN4G'
+      model: 'Q9 5.0" 4G'
+    - regex: 'Q10S53IN4G'
+      model: 'Q10 5.3" 4G'
+    - regex: 'Q10S57IN4G'
+      model: 'Q10 5.7" 4G'
+    - regex: 'Q10S5IN4G[R]?'
+      model: 'Q10 5.0" 4G'
+    - regex: 'Q10S6IN4G'
+      model: 'Q10 6.0" 4G'
+    - regex: 'Q6T7IN'
+      model: 'Q6'
+      device: 'tablet'
+    - regex: 'Q7T10INP'
+      model: 'Q7 10.1"'
+      device: 'tablet'
+    - regex: 'Q8T10IN'
+      model: 'Q8 10.1"'
+      device: 'tablet'
     - regex: 'Qilive ([0-5][^;/]*) Build'
       model: '$1'
     - regex: 'Qilive ([0-5][^;/]*)/'
@@ -6536,7 +12191,7 @@ Qilive:
 
 # QMobile
 QMobile:
-  regex: 'QMobile|QTab|Q-Smart'
+  regex: 'QMobile|QTab|Q-Smart|Noir X1S|LUNA PRO|NICE S'
   device: 'smartphone'
   models:
     - regex: 'QTab[ _-]([^;/]+) Build'
@@ -6549,6 +12204,24 @@ QMobile:
       model: '$1'
     - regex: '(?:QMobile|Q-Smart)[ _-]([^;/)]+)[;/)]'
       model: '$1'
+    - regex: 'Noir X1S'
+      model: 'Noir X1S'
+    - regex: 'LUNA PRO'
+      model: 'Luna Pro'
+    - regex: 'NICE S'
+      model: 'Nice S'
+
+# Quantum
+Quantum:
+  regex: 'Quantum (?:Fit|MUV (?:PRO|UP)|Go|Mini|V|You [2E])[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Quantum (Fit|Go|Mini|V|You [2E])[);/ ]'
+      model: '$1'
+    - regex: 'Quantum MUV PRO[);/ ]'
+      model: 'MUV Pro'
+    - regex: 'Quantum MUV UP[);/ ]'
+      model: 'MUV Up'
 
 # Quechua
 Quechua:
@@ -6562,6 +12235,12 @@ Ramos:
   device: 'tablet'
   model: '$1'
 
+# Razer
+Razer:
+  regex: 'Phone 2'
+  device: 'smartphone'
+  model: 'Phone 2'
+
 # Sendo
 Sendo:
   regex: 'Sendo([a-z0-9]+)'
@@ -6570,18 +12249,67 @@ Sendo:
 
 # Turbo-X
 Turbo-X:
-  regex: 'Turbo-X'
+  regex: 'Turbo-X|Hive V 3G|Turbox_S3'
   device: 'smartphone'
   models:
+    - regex: 'Turbox_S3'
+      model: 'S3'
+    - regex: 'Turbo-X_A2[);/ ]'
+      model: 'A2'
+    - regex: 'Turbo-X_e3[);/ ]'
+      model: 'E3'
     - regex: 'Turbo-X Ice[);/ ]'
       device: 'tablet'
       model: 'Ice'
+    - regex: 'Hive V 3G[);/ ]'
+      device: 'tablet'
+      model: 'Hive V 3G'
+
     - regex: 'Turbo-X Tablet([^;/]+) Build'
       device: 'tablet'
       model: 'Tablet$1'
     - regex: 'Turbo-X ([^;/]+) Build'
       model: '$1'
 
+# Turbo
+Turbo:
+  regex: 'Turbo[_ ]?(?:X5[_ ]?(?:Max|Black|Space|Hero)|X8|X6[ _]Z|X[ _]Ray)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'TurboX5Space[);/ ]'
+      model: 'X5 Space'
+    - regex: 'TurboX5Hero[);/ ]'
+      model: 'X5 Hero'
+    - regex: 'TurboX[ _]Ray[);/ ]'
+      model: 'X Ray'
+    - regex: 'Turbo[ _]?X5[ _]?Black[);/ ]'
+      model: 'X5 Black'
+    - regex: 'Turbo[ _]X5[ _]Max[);/ ]'
+      model: 'X5 Max'
+    - regex: 'Turbo[ _]X6[ _]Z[);/ ]'
+      model: 'X6 Z'
+    - regex: 'Turbo[ _]X8[);/ ]'
+      model: 'X8'
+
+# Silent Circle
+'Silent Circle':
+  regex: 'Blackphone 2'
+  device: 'smartphone'
+  model: 'Blackphone 2'
+
+# Sigma
+Sigma:
+  regex: 'Sigma|(X[_-]Style[ _]?Tab[_ ]A([0-9]{2,3})|X[-_ ]?treme[-_ ]?PQ[0-9]{2}|X-Style_S5501)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2})[);/ ]'
+      model: 'X-Treme PQ$1'
+    - regex: 'X[_-]Style[ _]?Tab[_ ]A([0-9]{2,3})[);/ ]'
+      model: 'X-Style Tab A$1'
+      device: 'tablet'
+    - regex: '(?:Sigma[ _])?X[-_ ]?Style[-_ ]S([0-9]+)[);/ ]'
+      model: 'X-Style S$1'
+
 # Spice
 Spice:
   regex: 'Spice'
@@ -6592,23 +12320,95 @@ Spice:
     - regex: 'Spice[ _\-]?([^/;]+)(?:/|$)'
       model: '$1'
 
-# Sharp
+# Sharp (jp.sharp)
 Sharp:
-  regex: 'SHARP|SBM|SH-?[0-9]+[a-z]?[);/ ]|AQUOS|506SH|SHL22 '
+  regex: 'SHARP|SBM|SH-?[0-9]+[a-z]?[);/ ]|AQUOS|(?:SH-M0[589]|S[35]-SH|SH-Z(10|01)|SH-[CL]02|[45]02SH|[36]05SH|70[126]SH|80[138]SH|901SH|50[3679]SH|SHL22|SHV4[0-7]|SHV3[35689]|FS80(?:1[08]|32|28|0[29])|TG-L900S|NP601SH|603SH|SHV40_u)[);/ ]'
   device: 'smartphone'
   models:
     # explicit smartphone models
-    - regex: '506SH'
+    - regex: '506SH[);/ ]'
       model: 'Aquos Xx3'
-    - regex: 'SH-02E'
+    - regex: '603SH[);/ ]'
+      model: 'Aquos Xx3 Mini'
+    - regex: '50[23]SH[);/ ]'
+      model: 'Aquos Xx2'
+    - regex: '507SH[);/ ]'
+      model: 'One'
+    - regex: 'S3-SH[);/ ]'
+      model: 'One S3'
+    - regex: 'S5-SH[);/ ]'
+      model: 'One S5'
+    - regex: 'SH-M05[);/ ]'
+      model: 'Aquos Sense Lite'
+    - regex: '(?:SH-Z10|801SH)[);/ ]'
+      model: 'Aquos zero'
+    - regex: 'SH-Z01[);/ ]'
+      model: 'Aquos S2 (C10)'
+    - regex: '(?:SH-02E|SH-01[GH]|SH-04H)[);/ ]'
       model: 'Aquos Phone Zeta'
-    - regex: 'SH06D'
+    - regex: 'SH06D[);/ ]'
       model: 'Aquos Phone SH-06D'
-    - regex: 'SHL22'
+    - regex: 'SHL22[);/ ]'
       model: 'Aquos Phone SHL22'
+    - regex: 'SH-L02[);/ ]'
+      model: 'Aquos L2'
+    - regex: '(?:605SH|SH-03J|SHV39)[);/ ]'
+      model: 'Aquos R'
+    - regex: '(?:701SH|SHV41)[);/ ]'
+      model: 'Aquos R Compact'
+    - regex: '(?:SH-M09|SHV42|706SH|SH-03K)[);/ ]'
+      model: 'Aquos R2'
+    - regex: '803SH[);/ ]'
+      model: 'Aquos R2 Compact'
+    - regex: 'SH-C02[);/ ]'
+      model: 'Aquos V'
+    - regex: '(?:SH-02J|SH-04G)[);/ ]'
+      model: 'Aquos Ever'
+    - regex: 'SH-02H[);/ ]'
+      model: 'Aquos Compact'
+    - regex: '305SH[);/ ]'
+      model: 'Aquos Crystal'
+    - regex: '402SH[);/ ]'
+      model: 'Aquos Crystal X'
+    - regex: '509SH[);/ ]'
+      model: 'Aquos 3'
+    - regex: 'NP601SH[);/ ]'
+      model: 'Aquos 2'
+    - regex: 'SHV40(?:_u)?[);/ ]'
+      model: 'Aquos S'
+    - regex: '702SH[);/ ]'
+      model: 'Aquos S Basic'
+    - regex: 'SHV3[83][);/ ]'
+      model: 'Aquos S Mini'
+    - regex: '(?:FS8010|SH-M08|SHV43|SH-01[KL])[);/ ]'
+      model: 'Aquos S2'
+    - regex: 'SHV46[);/ ]'
+      model: 'Aquos S3 Plus'
+    - regex: '(?:SHV44|808SH|SH-04L|SH-03G)[);/ ]'
+      model: 'Aquos R3'
+    - regex: '(?:FS8032|SH-02M|SHV45)[);/ ]'
+      model: 'Aquos S3'
+    - regex: 'FS8018[);/ ]'
+      model: 'Aquos S3 Mini'
+    - regex: '901SH[);/ ]'
+      model: 'Aquos S3 Plus'
+    - regex: 'SH-51A[);/ ]'
+      model: 'Aquos R5G'
+    - regex: 'SHV35[);/ ]'
+      model: 'Aquos U'
+    - regex: 'TG-L900S[);/ ]'
+      model: 'Luna S'
+    - regex: '(?:FS8002|SHV47)[);/ ]'
+      model: 'Z2'
+    - regex: 'FS8009[);/ ]'
+      model: 'Z3'
+    - regex: 'FS8028[);/ ]'
+      model: 'R1S'
+    - regex: 'SHV36[);/ ]'
+      model: 'Basio 2'
 
     # explicit tablet models
-    - regex: 'SH-08E'
+    - regex: 'SH-08E[);/ ]'
       device: 'tablet'
       model: 'Sharp Aquos Pad'
 
@@ -6637,6 +12437,19 @@ Softbank:
     - regex: 'J-PHONE/[0-9]\.[0-9]/([a-z0-9\-]+)'
       model: '$1'
 
+# Sonim
+Sonim:
+  regex: 'Sonim[ -]|XP[67]700[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Sonim-XP3400'
+      model: 'XP3400'
+      device: 'feature phone'
+    - regex: 'XP6700[);/ ]'
+      model: 'XP6700'
+    - regex: 'XP7700[);/ ]'
+      model: 'XP7700'
+
 # Star
 Star:
   regex: 'N(9[5678]00|8800|9000|9977)[);/ ]'
@@ -6650,9 +12463,18 @@ Star:
 
 # Kindle
 Amazon:
-  regex: 'KF(?:OT|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|SAW[IA]|GIWI)[);/ ]|Kindle|Silk/\d+\.\d+|Amazon (?:Tate|Jem)|AFT[BMST]|SD4930UR'
+  regex: 'KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|SAW[IA]|GIWI|KAWI|MAWI|MEWI|MUWI|SUWI)[);/ ]|Kindle|Silk/\d+\.\d+|Amazon (?:Tate|Jem)|AFT[ABMNRST]|SD4930UR|AEO(BC|KN)[);/ ]'
   device: 'tablet'
   models:
+    - regex: 'AFTA'
+      model: 'Fire TV Cube (Gen 1)'
+      device: 'tv'
+    - regex: 'AFTR'
+      model: 'Fire TV Cube (Gen 2)'
+      device: 'tv'
+    - regex: 'AFTN'
+      model: 'Fire TV (Gen 3)'
+      device: 'tv'
     - regex: 'AFTB'
       model: 'Fire TV'
       device: 'tv'
@@ -6661,6 +12483,8 @@ Amazon:
       device: 'tv'
     - regex: 'KFFOWI[);/ ]'
       model: 'Fire 7"'
+    - regex: 'KFMUWI[);/ ]'
+      model: 'Fire 7" (2019)'
     - regex: 'KFTT[);/ ]'
       model: 'Kindle Fire HD'
     - regex: 'KFJWI[);/ ]|Amazon Jem'
@@ -6682,17 +12506,27 @@ Amazon:
     - regex: 'KFASWI[);/ ]'
       model: 'Fire HD 7'
     - regex: 'KFAUWI[);/ ]'
-      model: 'Fire HD 7 2017'
+      model: 'Fire HD 7 (2017)'
+    - regex: 'KFMEWI[);/ ]'
+      model: 'Fire HD 8 (2015)'
     - regex: 'KFGIWI[);/ ]'
-      model: 'Fire HD 8 2016'
+      model: 'Fire HD 8 (2016)'
     - regex: 'KFDOWI[);/ ]'
-      model: 'Fire HD 8 2017'
+      model: 'Fire HD 8 (2017)'
+    - regex: 'KFKAWI[);/ ]'
+      model: 'Fire HD 8 (2018)'
+    - regex: 'KFONWI[);/ ]'
+      model: 'Fire HD 8 (2020)'
     - regex: 'KFSAWI[);/ ]'
       model: 'Fire HDX 8.9'
     - regex: 'KFSAWA[);/ ]'
       model: 'Fire HDX 8.9 4G'
     - regex: 'KFTBWI[);/ ]'
       model: 'Fire HD 10'
+    - regex: 'KFSUWI[);/ ]'
+      model: 'Fire HD 10 (2017)'
+    - regex: 'KFMAWI[);/ ]'
+      model: 'Fire HD 10 (2019)'
     - regex: 'SD4930UR'
       model: 'Fire Phone'
       device: 'smartphone'
@@ -6703,10 +12537,26 @@ Amazon:
     - regex: 'Kindle'
       model: 'Kindle'
 
+    - regex: 'AEO(BC|KN)[);/ ]'
+      model: 'Echo'
+      device: 'smart speaker'
+
 # Symphony
 Symphony:
-  regex: 'SYMPHONY[ \_]([a-z0-9]+)'
+  regex: 'SYMPHONY[ \_]([a-z0-9]+)|roar (V20|E80)'
   device: 'smartphone'
+  models:
+    - regex: 'roar V20'
+      model: 'Roar V20'
+    - regex: 'roar E80'
+      model: 'Roar E80'
+    - regex: 'SYMPHONY[ \_]([a-z0-9]+)'
+      model: '$1'
+
+# Syrox
+Syrox:
+  regex: '(SYX-(?:T70[04]|T10[12]))[;)/ ]'
+  device: 'tablet'
   model: '$1'
 
 # Qtek
@@ -6715,11 +12565,23 @@ Qtek:
   device: 'smartphone'
   model: '$1'
 
+# Q-Touch
+Q-Touch:
+  regex: '(Q09) Build'
+  device: 'smartphone'
+  model: '$1'
+
 # T-Mobile
 T-Mobile:
-  regex: 'T-Mobile[ _][a-z0-9 ]+'
+  regex: 'T-Mobile[ _][a-z0-9 ]+|REVVLRY|REVVL 2( PLUS)?[);/ ]'
   device: 'smartphone'
   models:
+    - regex: 'REVVL 2 PLUS'
+      model: 'REVVL 2 Plus'
+    - regex: 'REVVLRY'
+      model: 'REVVL Plus'
+    - regex: 'REVVL 2[);/ ]'
+      model: 'REVVL 2'
     - regex: 'T-Mobile[ _]([a-z0-9_ ]+) Build'
       model: '$1'
     - regex: 'T-Mobile[ _]([a-z0-9_ ]+)'
@@ -6735,35 +12597,88 @@ T-Mobile:
 
 # Tcl
 TCL:
-  regex: 'TCL[ -][a-z0-9]+|(TCL[_ -][^;/]+|7040N) Build|TCLGalaG60'
+  regex: 'TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|(?:TCLGalaG60(?:\(9108A\))?|A502DL|T780H|5199I|7040N|5133A|5159[AJ]|5152D)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: 'TCLGalaG60'
+    - regex: 'TCLGalaG60(?:\(9108A\))?[);/ ]'
       model: 'Gala G60'
+    - regex: '5199I[);/ ]'
+      model: 'C9'
+    - regex: '5152D[);/ ]'
+      model: 'C5'
+    - regex: '5133A[);/ ]'
+      model: 'L5'
+    - regex: 'T780H[);/ ]'
+      model: 'Plex'
     - regex: 'TCL[_ -]([^;/]+) Build'
       model: '$1'
-    - regex: 'TCL[ -]([a-z0-9]+)'
+    - regex: 'TCL[_ -]([a-z0-9]+)'
       model: '$1'
-    - regex: '(7040N)'
+    - regex: '(7040N)[);/ ]'
       model: '$1'
+    - regex: 'A502DL[);/ ]'
+      model: 'LX'
+    - regex: '5159[AJ][);/ ]'
+      model: 'L9'
 
 # Teclast
 Teclast:
-  regex: 'Teclast|Tbook'
+  regex: 'Teclast|X98 Air III|X98 Air II\(HG5N\)|Tbook|X80 Power\(B2N4\)|T30_(ROW|EEA)|T10\(E3C6\)|P10S\(N4H5\)|98\(M1E[45789]\)|98\(M3E3\)'
   device: 'tablet'
   models:
     - regex: 'Tbook[_ -]([^;/]+) Build'
       model: 'Tbook $1'
+    - regex: 'T10\(E3C6\)'
+      model: 'T10'
+    - regex: 'T30_(ROW|EEA)'
+      model: 'T30 $1'
+    - regex: 'P10S\(N4H5\)'
+      model: 'P10S'
+    - regex: '98\(M1E[45789]\)|98\(M3E3\)'
+      model: 'TPad 98 10.1" 4G'
+    - regex: 'X80 Power\(B2N4\)[);/ ]'
+      model: 'X98 Power'
+    - regex: 'X98 Air III[);/ ]'
+      model: 'X98 Air III'
+    - regex: 'X98 Air II\(HG5N\)[);/ ]'
+      model: 'X98 Air II'
     - regex: 'Teclast[_ -]([^;/]+) Build'
       model: '$1'
 
 # Tecno Mobile
 Tecno Mobile:
-  regex: 'Tecno|Phantom6-Plus'
+  regex: 'Tecno|Phantom6|Phantom6-Plus|DP7C Pro-SGA1'
   device: 'smartphone'
   models:
     - regex: 'Phantom6-Plus'
       model: 'Phantom 6 Plus'
+    - regex: 'Phantom6'
+      model: 'Phantom 6'
+    - regex: 'TECNO-W3'
+      model: 'W3'
+    - regex: 'TECNO[ _]F4 Pro[);/ ]'
+      model: 'F4 Pro'
+    - regex: 'TECNO[ _]ID6[);/ ]'
+      model: 'Camon iClick 2'
+    - regex: 'Tecno[ _]7C[);/ ]'
+      model: 'DroidPad 7C'
+      device: 'tablet'
+    - regex: 'DP7C Pro-SGA1[);/ ]'
+      model: 'DroidPad 7C Pro'
+      device: 'tablet'
+    - regex: 'TECNO[ _]DP10A Pro[);/ ]'
+      model: 'DroidPad 10A Pro'
+      device: 'tablet'
+    - regex: 'TECNO[ _]P904[);/ ]'
+      model: 'DroidPad 10D 4G'
+      device: 'tablet'
+    - regex: 'Tecno[ _]CB7[j]?'
+      model: 'Camon i4'
+    - regex: 'Tecno[ _]DP8D[);/ ]'
+      model: 'DroidPad 8D'
+      device: 'tablet'
+    - regex: 'Tecno[ _]LB8'
+      model: 'Pouvoir 3 Plus'
     - regex: 'Tecno ([^;/]+) Build'
       model: '$1'
     - regex: 'Tecno[ _]?([a-z0-9_\-]+)'
@@ -6796,7 +12711,7 @@ Tesco:
 
 # teXet
 teXet:
-  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|4003|4071|450[34]|451[30]|4377|4082R|550[83]|5010|5017|5[23]77|6003|6906|702[13]|7055HD|709[69]|9747BT|9758|9751HD|9767|5513|520[410]|5505|507[13]|5581|7859|8044|9748[ _]3G|9720|7047HD[ _]3G|9757|9740|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|973[78]W|974[10]|9743W|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?|X-pad (?:AIR 8|iX 7) 3G'
+  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|4003|4071|450[34]|451[30]|4377|4082R|550[83]|5010|5017|507[4-7]|5[23]77|6003|6906|702[13]|7055HD|709[69]|9747BT|9758|9751HD|9767|5513|520[410]|5505|507[13]|5581|7859|8044|9748[ _]3G|9720|7047HD[ _]3G|9757|9740|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|973[78]W|974[170]|9743W|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?|TM_5011|X-pad (?:AIR 8|iX 7|NAVI 7.[35]|NAVI 10|SKY 8.1|STYLE 8|STYLE 10.1|HIT|LITE 7.[12]|QUAD (?:7.2|10|7)|SHINE 8.1)(?: 3G)?'
   device: 'tablet'
   models:
     - regex: 'TM-9749'
@@ -6814,29 +12729,51 @@ teXet:
     - regex: 'TM-7055HD'
       model: 'NaviPad 3G'
     - regex: 'TM-9758'
-      model: 'X-pad Style 10'
+      model: 'X-pad Style 10.0"'
+    - regex: 'X-pad SHINE 8.1 3G'
+      model: 'X-pad Shine 8.1" 3G'
+    - regex: 'X-pad QUAD 10 3G'
+      model: 'X-pad Quad 10.0" 3G'
+    - regex: 'X-pad QUAD 7 3G'
+      model: 'X-pad Quad 7.0" 3G'
+    - regex: 'X-pad QUAD 7.2 3G'
+      model: 'X-pad Quad 7.2" 3G'
+    - regex: 'X-pad STYLE 8 3G'
+      model: 'X-pad Style 8.0" 3G'
+    - regex: 'X-pad HIT 3G'
+      model: 'X-pad Hit 3G'
+    - regex: 'X-pad LITE (7.[12])'
+      model: 'X-pad Lite $1"'
+    - regex: 'TM-9767'
+      model: 'X-pad Style 10.0" 3G'
+    - regex: 'X-pad STYLE 10.1 3G'
+      model: 'X-pad Style 10.1" 3G'
     - regex: '(X-pad (?:AIR 8|iX 7) 3G)'
       model: '$1'
-    - regex: 'TM-7096'
-      model: 'X-pad NAVI 7.3 3G'
+    - regex: 'TM-7096|X-pad NAVI 7.3 3G'
+      model: 'X-pad NAVI 7.3" 3G'
     - regex: 'TM-7099'
-      model: 'X-pad NAVI 7.4 3G'
-    - regex: 'TM-1046'
-      model: 'X-pad NAVI 10 3G'
+      model: 'X-pad NAVI 7.4" 3G'
+    - regex: 'X-pad NAVI 7.5 3G'
+      model: 'X-pad NAVI 7.5" 3G'
+    - regex: 'X-pad SKY 8.1 3G'
+      model: 'X-pad Sky 8.1" 3G'
+    - regex: 'TM-1046|X-pad NAVI 10 3G'
+      model: 'X-pad NAVI 10.0" 3G'
     - regex: 'TM-7859'
-      model: 'X-pad NAVI 8.2 3G'
+      model: 'X-pad NAVI 8.2" 3G'
     - regex: 'TM-7049'
       model: 'NaviPad TM-7049 3G'
     - regex: 'TM-7887'
       model: 'NaviPad TM-7887 3G'
     - regex: 'TM-8066'
-      model: 'X-pad Rapid 8.2 4G'
-    - regex: '(TM-(?:1057|1067|6906|8043|9748[_ ]3G|9740|9757(?:[_ ]3G)?|7047HD[ _]3G|9747BT|9751HD|702[13]|705[23]|7041|9720|7047HD[_ ]3G|8044|8041HD|973[78]W|9743W|974[10]|9750HD|7043XD|7037W|702[46])|TB-(?:771A|711A|8041HD))'
+      model: 'X-pad Rapid 8.2" 4G'
+    - regex: '(TM-(?:1057|1067|6906|8043|9748[_ ]3G|9740|9757(?:[_ ]3G)?|7047HD[ _]3G|9747BT|9751HD|702[13]|705[23]|7041|9720|7047HD[_ ]3G|8044|8041HD|973[78]W|9743W|974[710]|9750HD|7043XD|7037W|702[46])|TB-(?:771A|711A|8041HD))'
       model: '$1'
     - regex: 'TM-4503'
       device: 'smartphone'
       model: 'X-Quad'
-    - regex: '(TM-(?:3000|3200R|4003|4083|4377|4504|451[30]|500[35]|5[23]77|5571|3204R|520[04]|5581|5505|507[13]|5017|6003|5513))'
+    - regex: '(TM-(?:3000|3200R|4003|4083|4377|4504|451[30]|500[35]|5[23]77|5571|3204R|520[04]|5581|5505|507[13]|5017|507[4-7]|6003|5513))'
       device: 'smartphone'
       model: '$1'
     - regex: 'TM-5006'
@@ -6845,14 +12782,15 @@ teXet:
     - regex: 'TM-5007'
       device: 'smartphone'
       model: 'X-Shine'
+    - regex: 'TM_5011'
+      device: 'smartphone'
+      model: 'X-Omega'
     - regex: 'TM-5201'
       device: 'smartphone'
       model: 'Rock'
     - regex: 'TM-4515'
       device: 'smartphone'
       model: 'X-Style'
-    - regex: 'TM-9767'
-      model: 'X-pad Style 10 3G'
     - regex: 'TM-(5016|3500)'
       device: 'smartphone'
       model: 'X-Maxi 2'
@@ -6881,9 +12819,37 @@ teXet:
       device: 'smartphone'
       model: 'X-Plus'
 
+# Telefunken
+Telefunken:
+  regex: 'TELEFUNKEN|Foxtrot|TEL-1013GIQA|TF-SP5001|(TF-MID(?:[78]02G|9705RG|7805G|1010G))|(TF-LED(?:65S75T2SU|32S39T2S|32S5[289]T2S|32S70T2S))'
+  device: 'tablet'
+  models:
+    - regex: 'TEL-1013GIQA'
+      model: 'Giqa 10.1 3G'
+    - regex: '(?:TELEFUNKEN)?(TF-SP5001|Outdoor LTE|Foxtrot)'
+      model: '$1'
+      device: 'smartphone'
+    - regex: '(TF-MID(?:[78]02G|9705RG|7805G|1010G))'
+      model: '$1'
+    - regex: '(TF-LED(?:65S75T2SU|32S39T2S|32S5[289]T2S|32S70T2S))'
+      model: '$1'
+      device: 'tv'
+
+# Telego
+Telego:
+  regex: 'TELEGO'
+  device: 'smartphone'
+  models:
+    - regex: 'TELEGO-W503'
+      model: 'W503'
+    - regex: 'Telego_JOY2'
+      model: 'Joy 2'
+    - regex: 'Telego[ _]Mate'
+      model: 'Mate'
+
 # Telenor
 Telenor:
-  regex: 'Telenor'
+  regex: '(?<!FBCR/)Telenor'
   device: 'smartphone'
   models:
     - regex: 'Telenor[ _]([^;/]+) Build'
@@ -6921,6 +12887,32 @@ TIANYU:
     - regex: 'TIANYU-KTOUCH/([a-z0-9]+)'
       model: '$1'
 
+# Timovi
+Timovi:
+  regex: 'Tmovi|Infinit_Lite_2'
+  device: 'smartphone'
+  models:
+    - regex: 'Tmovi[ _]Prime'
+      model: 'Prime'
+    - regex: 'TMOVI_YEAH_BEAT'
+      model: 'Yeah Beat'
+    - regex: 'YeahLIVE'
+      model: 'Yeah LIVE'
+    - regex: 'Infinit Lite'
+      model: 'Infinit Lite'
+    - regex: 'Infinit_Lite_2'
+      model: 'Infinit Lite 2'
+
+# Tooky
+Tooky:
+  regex: 'TOOKY'
+  device: 'smartphone'
+  models:
+    - regex: 'TOOKY (A19|W1|T8[368]|T1982)[);/ ]'
+      model: '$1'
+    - regex: 'TOOKY A9PLUS[);/ ]'
+      model: 'A9 Plus'
+
 # Tolino
 Tolino:
   regex: 'Tolino Tab ([^/;]+) Build'
@@ -6940,6 +12932,8 @@ Top House:
     - regex: 'X1013'
       model: 'X1013'
       device: 'tablet'
+    - regex: 'COTO_T40017'
+      model: 'T40017'
 
 # Toplux
 Toplux:
@@ -6962,17 +12956,21 @@ Touchmate:
 
 # TrekStor
 TrekStor:
-  regex: '(?:TrekStor|Surftab) ([^/;]+) Build|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|VT10416-[12]'
+  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|VT10416-[12]|TFMTKAW01232'
   device: 'tablet'
   models:
     - regex: 'ST10216-2A|VT10416-[12]'
       model: 'SurfTab 10.1'
+    - regex: 'PrimeTab P10'
+      model: 'PrimeTab P10'
     - regex: 'TrekStor ([^/;]+) Build'
       model: '$1'
     - regex: 'Surftab ([^/;]+) Build'
       model: 'SurfTab $1'
     - regex: 'Surftab[ _]([^;\)]*)(?:[;\)]|$)'
       model: 'SurfTab $1'
+    - regex: 'TFMTKAW01232'
+      model: 'SurfTab L15'
 
 # Trevi
 Trevi:
@@ -7020,6 +13018,16 @@ TVC:
   device: 'smartphone'
   model: 'Nuclear SX-SP5'
 
+# U.S. Cellular
+U.S. Cellular:
+  regex: 'USCC-'
+  device: 'smartphone'
+  models:
+    - regex: 'USCC-E6762' # Kyocera DuraForce
+      model: 'Kyocera DuraForce'
+    - regex: '(USCC-[a-z0-9_\-]+)'
+      model: '$1'
+
 # Uhappy
 Uhappy:
   regex: 'Uhappy|UP?580|UP350|UP[35679]20'
@@ -7038,6 +13046,12 @@ Uhappy:
     - regex: 'Uhappy[ _-]?([^;/)]+)[);/ ]'
       model: '$1'
 
+# Unimax (UMX)
+Unimax:
+  regex: 'U((?:67[013]|680)C|(?:452|504)TL|683CL|693CL)[);/ ]'
+  device: 'smartphone'
+  model: 'U$1'
+
 # Unowhy
 Unowhy:
   regex: 'QOOQ '
@@ -7053,9 +13067,11 @@ UTStarcom:
 
 # Ulefone
 Ulefone:
-  regex: 'Ulefone|(Armor(?:[ _]2)?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?) Build'
+  regex: 'Ulefone|Gemini Pro|Power_[356]|S10_Pro|(?:Armor(?:(?:[ _])(?:[2367]|X[236]|6S|X))?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?)[);\ ]'
   device: 'smartphone'
   models:
+    - regex: 'S10_Pro'
+      model: 'S10 Pro'
     - regex: 'Be[ _]Touch([ _][23])?'
       model: 'Be Touch$1'
     - regex: 'Be[ _]Pure[ _]Lite'
@@ -7072,10 +13088,32 @@ Ulefone:
       model: 'U007 Pro'
     - regex: 'U008 Pro'
       model: 'U008 Pro'
-    - regex: 'Armor[ _]2 Build'
+    - regex: 'Armor[ _]2[);\ ]'
       model: 'Armor 2'
-    - regex: 'Armor Build'
+    - regex: 'Armor[ _]3[);\ ]'
+      model: 'Armor 3'
+    - regex: 'Armor[ _]7[);\ ]'
+      model: 'Armor 7'
+    - regex: 'Armor[ _]X([236])[);\ ]'
+      model: 'Armor X$1'
+    - regex: 'Armor[ _]6S[);\ ]'
+      model: 'Armor 6S'
+    - regex: 'Armor[ _]6[);\ ]'
+      model: 'Armor 6'
+    - regex: 'Armor[ _]X5[);\ ]'
+      model: 'Armor X5'
+    - regex: 'Armor[ _]5S[);\ ]'
+      model: 'Armor 5S'
+    - regex: 'Armor[ _]X[);\ ]'
+      model: 'Armor X'
+    - regex: 'Armor[);\ ]'
       model: 'Armor'
+    - regex: 'Gemini Pro[);\ ]'
+      model: 'Gemini Pro'
+    - regex: 'Power_([356])'
+      model: 'Power $1'
+    - regex: 'Ulefone[_ ](X|S1[ _]Pro|S[17])[);\ ]'
+      model: '$1'
     - regex: 'Ulefone[ _-]?([^;/]+) Build'
       model: '$1'
     - regex: 'Ulefone[ _-]?([^;/)]+)[;/)]'
@@ -7083,10 +13121,18 @@ Ulefone:
 
 # UMIDIGI
 UMIDIGI:
-  regex: 'UMI(?:DIGI)?[ _]'
+  regex: 'UMI(?:DIGI)?[ _]|A5_Pro'
   device: 'smartphone'
   models:
-    - regex: 'UMI(?:DIGI)?[ _]([^/;]+) Build'
+    - regex: 'A5_Pro'
+      model: 'A5 Pro'
+    - regex: 'UMI TOUCH X'
+      model: 'Touch X'
+    - regex: 'UMI TOUCH'
+      model: 'Touch'
+    - regex: 'UMI_(London|Diamond(?:_X)?)'
+      model: '$1'
+    - regex: 'UMI(?:DIGI)?[ _]([^/;)]+)(?: Build|\))'
       model: '$1'
 
 # Uniscope
@@ -7101,11 +13147,13 @@ Uniscope:
 
 # Unnecto
 Unnecto:
-  regex: 'Unnecto|(?:U513|U61[1356]|U7[12]0|U-830|U90[35])[);/ ]'
+  regex: 'Unnecto|(?:U513|U5151|U61[1356]|U7[12]0|U-830|U90[35])[);/ ]'
   device: 'smartphone'
   models:
     - regex: 'U513'
       model: 'Drone XT'
+    - regex: 'U5151'
+      model: 'Bolt'
     - regex: 'U611'
       model: 'Quattro X'
     - regex: 'U613'
@@ -7135,14 +13183,17 @@ Unonu:
     - regex: 'Unonu[ _-]?([^;/)]+)[);/ ]'
       model: '$1'
 
+# UTOK
+UTOK:
+  regex: 'UTOK (45[01]D)'
+  device: 'smartphone'
+  model: '$1'
 
 # Vastking
 Vastking:
-  regex: 'M910A[);/ ]'
+  regex: '(M910A|M783K|M783K-16G|M1072R-3G)[);/ ]'
   device: 'tablet'
-  models:
-    - regex: 'M910A[);/ ]'
-      model: 'M910A'
+  model: '$1'
 
 # ViewSonic
 ViewSonic:
@@ -7152,6 +13203,9 @@ ViewSonic:
     - regex: '(?:ViewSonic-)?V500[);/ ]'
       model: 'V500'
       device: 'smartphone'
+    - regex: 'ViewSonic A8\+[);/ ]'
+      model: 'A8 Plus'
+      device: 'smartphone'
     - regex: '(?:ViewSonic-)?ViewPhone ?([^;/]+) Build'
       model: 'ViewPhone $1'
       device: 'smartphone'
@@ -7173,9 +13227,15 @@ Vitelcom:
     - regex: 'portalmmm/[12].0 (TSM[a-z0-9 ]+)'
       model: '$1'
 
+# Fengxiang
+Fengxiang:
+  regex: '(vKB011B|vKB004L)'
+  device: 'tablet'
+  model: '$1'
+
 # VK Mobile
 VK Mobile:
-  regex: 'VK(?!share)[\-]?([a-z0-9 ]+)[ ;\)/]'
+  regex: 'VK(?!share)[\-]?([a-z0-9 ]+)([;\)/ ]| Build)'
   device: 'feature phone'
   model: '$1'
 
@@ -7203,35 +13263,117 @@ Vernee:
 
 # Vertu
 Vertu:
-  regex: 'Vertu[ ]?([a-z0-9]+)'
+  regex: 'Vertu[ ]?([a-z0-9]+)|(?:ASTER P|CONSTELLATION X)[/;) ]'
   device: 'feature phone'
+  models:
+    - regex: 'ASTER P[/;) ]'
+      device: 'smartphone'
+      model: 'Aster P'
+    - regex: 'CONSTELLATION X[/;) ]'
+      device: 'smartphone'
+      model: 'Constellation X'
+    - regex: 'Vertu[ ]?([a-z0-9]+)'
+      model: '$1'
+
+# Venso mobile
+Venso:
+  regex: '(CX-508|CX-551|Reiv 500|Creon F5)[/;) ]'
+  device: 'smartphone'
   model: '$1'
 
+# Verizon
+Verizon:
+  regex: 'QTA(SUN[12]|XIA1|QZ3|QZ3KID|IR7)|QMV7B'
+  device: 'tablet'
+  models:
+    - regex: 'QTAXIA1|QTAIR7'
+      model: 'Ellipsis 10'
+    - regex: 'QTASUN1'
+      model: 'Ellipsis 8 HD'
+    - regex: 'QTASUN2'
+      model: 'Ellipsis 8 HD 4G LTE'
+    - regex: 'QTAQZ3KID'
+      model: 'Ellipsis Kids LTE'
+    - regex: 'QTAQZ3'
+      model: 'Ellipsis 8'
+    - regex: 'QMV7B'
+      model: 'Ellipsis 7'
+
 # Verykool
 Verykool:
   regex: 'verykool'
   device: 'smartphone'
   models:
+    - regex: 'verykoolS5004'
+      model: 'Lotus JR.'
     - regex: 'verykool[ _]?([^/;]+) Build'
       model: '$1'
+    - regex: 'verykool[ _]?([^/;]+);'
+      model: '$1'
+
+# Vestel
+Vestel:
+  regex: 'Venus[ _](GO|V[1-9]|Z[1-9]0)|V_?TAB|VP74|VT97PRO|VSP145M|VSP250[GS]|VSP355[GS]|V3_5580_Dual'
+  device: 'smartphone'
+  models:
+    - regex: 'VT97PRO'
+      model: 'VTab 9.7 Pro'
+      device: 'tablet'
+    - regex: 'VP74'
+      model: 'VTab Lite II'
+      device: 'tablet'
+    - regex: 'VTAB10'
+      model: 'VTab 10'
+      device: 'tablet'
+    - regex: 'V_TAB_7_ECO_III '
+      model: 'VTab 7 Eco 3'
+      device: 'tablet'
+    - regex: 'V_TAB_([0-9]{4}[A-Z]?)'
+      model: 'VTab $1'
+      device: 'tablet'
+    - regex: 'V3_5580_Dual'
+      model: 'Venus V3 5580 Dual'
+    - regex: 'VSP145M'
+      model: 'Venus 4.5'
+    - regex: 'VSP250G'
+      model: 'Venus 5.0V'
+    - regex: 'VSP250S'
+      model: 'Venus 5.0X'
+    - regex: 'VSP355G'
+      model: 'Venus 5.5V'
+    - regex: 'VSP355S'
+      model: 'Venus 5.5X'
+    - regex: 'Venus[ _]V([1-9])'
+      model: 'Venus V$1'
+    - regex: 'Venus[ _]Z([1-9]0)'
+      model: 'Venus Z$1'
+    - regex: 'Venus[ _]GO'
+      model: 'Venus Go'
 
 # Videocon
 Videocon:
-  regex: 'Videocon[_ \-]|VT75C'
+  regex: 'Videocon[_ \-]|VT75C|V502430'
   device: 'smartphone'
   models:
     - regex: 'Videocon[_ \-]([a-z0-9]+)'
       model: '$1'
     - regex: 'VT75C[/;) ]'
       model: 'VT75C'
+      device: 'tablet'
+    - regex: 'V502430[/;) ]'
+      model: 'Kryton 3'
 
 # Vodafone
 Vodafone:
-  regex: 'Vodafone[ _-]|Smart ?Tab ?(?:III? ?)?(?:|4G|7|10)[);/ -]|VodafoneSmartChat|VFD[ _][0-9]+[;/) ]'
+  regex: '(?<!FBCR/)Vodafone[ _-]|Smart ?Tab ?(?:III? ?)?(?:|4G|7|10)[);/ -]|VodafoneSmartChat|VFD[ _][0-9]+[;/) ]|VFD320|VF6[89]5|VF-(696|1397|795|895N|1497)'
   device: 'smartphone'
   models:
     - regex: 'VFD 100'
       model: 'Smart Mini'
+    - regex: 'VF685'
+      model: 'Smart Kicka'
+    - regex: 'VF695'
+      model: 'Smart First 6'
     - regex: 'VFD 200'
       model: 'Smart First 7'
     - regex: 'VFD 300'
@@ -7242,10 +13384,18 @@ Vodafone:
       model: 'Smart E8'
     - regex: 'VFD 600'
       model: 'Smart Prime 7'
+    - regex: 'VFD320'
+      model: 'Smart C9'
+    - regex: 'VFD 820'
+      model: 'Smart X9'
     - regex: 'VFD 610'
       model: 'Smart N8'
+    - regex: 'Smart ultra 6'
+      model: 'Smart Ultra 6'
     - regex: 'VFD 700'
       model: 'Smart Ultra 7'
+    - regex: 'VFD 720'
+      model: 'Smart N9'
     - regex: 'VFD 900'
       model: 'Smart Platinum 7'
     - regex: 'Vodafone[ _]875[);/ ]'
@@ -7260,8 +13410,20 @@ Vodafone:
       model: 'Smart 4 Power'
     - regex: 'VodafoneSmartChat'
       model: 'Smart Chat'
+    - regex: 'VF-696'
+      model: 'Smart Grand 6'
+    - regex: 'VF-795'
+      model: 'Smart Speed 6'
+    - regex: 'VF-895N'
+      model: 'Smart Prime 6'
 
     # explicit table models
+    - regex: 'VF-1397'
+      model: 'Tab Speed 6'
+      device: 'tablet'
+    - regex: 'VF-1497'
+      model: 'Tab Prime 6'
+      device: 'tablet'
     - regex: 'VFD 1100'
       device: 'tablet'
       model: 'Tab Mini 7'
@@ -7277,6 +13439,9 @@ Vodafone:
     - regex: 'Smart ?Tab ?4G'
       device: 'tablet'
       model: 'Smart Tab 4G'  # Alcatel
+    - regex: 'Smart ?Tab ?4'
+      model: 'Smart Tab 4' # ZTE
+      device: 'tablet'
     - regex: 'SmartTab7[);/ -]'
       model: 'Smart Tab 7' # ZTE
       device: 'tablet'
@@ -7305,7 +13470,7 @@ Vodafone:
 
 # Vonino
 Vonino:
-  regex: 'Vonino|Zun[ _]X[OS]?|Xylo[ _][XSP]|Gyga[ _](?:X|S|QS|XS)|Pluri[ _](?:[BCMQ]7|C8)|Magnet[ _]M[19]|Jax[ _](?:Q|QS|S|X|Mini)'
+  regex: 'Vonino|Epic (?:E8|P7)|Gyga[ _](?:X|S|QS|XS)|Jax[ _](?:QS|[SXQN]|Mini)|Magnet[ _]M[19]|Navo_QS|Onyx_(QS|Z)|Orin_QS|Pluri[ _](?:[BCMQ]7|[CQ]8)|Sirius_QS|Volt[ _][XS]|Xavy_(T7|L8)|Xylo[ _][XSPQ]|Zun[ _]X[OS]?|JAX_N'
   device: 'smartphone'
   models:
     - regex: 'Zun[ _]XO'
@@ -7314,51 +13479,66 @@ Vonino:
       model: 'Zun XS'
     - regex: 'Zun[ _]X'
       model: 'Zun X'
-    - regex: 'Xylo[ _]P'
-      model: 'Xylo P'
-    - regex: 'Xylo[ _]X'
-      model: 'Xylo X'
-    - regex: 'Xylo[ _]S'
-      model: 'Xylo S'
+    - regex: 'Xylo[ _](P|S|X|Q)'
+      model: 'Xylo $1'
+    - regex: 'Volt[ _]S_A7'
+      model: 'Volt S A7'
+    - regex: 'Volt[ _]S'
+      model: 'Volt S'
+    - regex: 'Volt[ _]X'
+      model: 'Volt X'
     - regex: 'Gyga[ _]QS'
       model: 'Gyga QS'
     - regex: 'Gyga[ _]XS'
       model: 'Gyga XS'
-    - regex: 'Gyga[ _]X'
-      model: 'Gyga X'
-    - regex: 'Gyga[ _]S'
-      model: 'Gyga S'
+    - regex: 'Gyga[ _](S|X)'
+      model: 'Gyga $1'
     - regex: 'Jax[ _]QS'
       model: 'Jax QS'
-    - regex: 'Jax[ _]S'
-      model: 'Jax S'
-    - regex: 'Jax[ _]X'
-      model: 'Jax X'
-    - regex: 'Jax[ _]Q'
-      model: 'Jax Q'
+    - regex: 'Jax[ _]S_A7'
+      model: 'Jax S A7'
+    - regex: 'Jax[ _]([SQXN])'
+      model: 'Jax $1'
     - regex: 'Jax[ _]Mini'
       model: 'Jax Mini'
-    - regex: 'Pluri[ _]B7'
-      model: 'Pluri B7'
+    - regex: 'Epic (E8|P7)'
+      model: 'Epic $1'
       device: 'tablet'
-    - regex: 'Pluri[ _]C7'
-      model: 'Pluri C7'
+    - regex: 'Pluri[ _](B|C|M|Q)7'
+      model: 'Pluri $17'
       device: 'tablet'
-    - regex: 'Pluri[ _]C8'
-      model: 'Pluri C8'
+    - regex: 'Pluri[ _](C|Q)8'
+      model: 'Pluri $18'
       device: 'tablet'
-    - regex: 'Pluri[ _]M7'
-      model: 'Pluri M7'
+    - regex: 'Magnet[ _]M([19])'
+      model: 'Magnet M$1'
       device: 'tablet'
-    - regex: 'Pluri[ _]Q7'
-      model: 'Pluri Q7'
+    - regex: 'Navo_QS'
+      model: 'Navo QS'
       device: 'tablet'
-    - regex: 'Magnet[ _]M1'
-      model: 'Magnet M1'
+    - regex: 'Onyx_(QS|Z)'
+      model: 'Onyx $1'
       device: 'tablet'
-    - regex: 'Magnet[ _]M9'
-      model: 'Magnet M9'
+    - regex: 'Orin_QS'
+      model: 'Orin QS'
       device: 'tablet'
+    - regex: 'Sirius_QS'
+      model: 'Sirius QS'
+      device: 'tablet'
+    - regex: 'Xavy_T7'
+      model: 'Xavy T7'
+      device: 'tablet'
+    - regex: 'Xavy_L8'
+      model: 'Xavy L8'
+      device: 'tablet'
+
+# Vorago
+Vorago:
+  regex: 'VORAGO'
+  device: 'smartphone'
+  models:
+    - regex: 'CELL-500'
+      model: 'CELL-500'
 
 # Voto
 Voto:
@@ -7378,14 +13558,24 @@ Voxtel:
   device: 'feature phone'
   model: '$1'
 
+# Vulcan
+Vulcan:
+  regex: 'VP5004A'
+  device: 'smartphone'
+  models:
+    - regex: 'VP5004A'
+      model: 'VP5004A'
+
 # Walton
 Walton:
-  regex: 'Walton|Walpad|Primo[ _](C[1234]?|D[12345]|E[12345]|EF[23]?|EM|F[123456]i?|G[12345]|GF[234]?|GH[23]?|GM|H[23]|HM|N|N1|NF|NX2?|R[123]|RH2?|RM2?|RX[23]?|S[1234]|V1|X[123]|Z|ZX)'
+  regex: 'Walton|Walpad|Primo[ _](C[1234]?|D[1-68]|E[1-58]|EF[23]?|EM|F[1-7]i?|G[1-7]|GF[234]?|GH[23]?|GM|H[2346]|HM|N|N1|NF|NX2?|R[12346]|RH2?|RM2?|RX[23]?|S[123456]|V1|X[1234]|Z|ZX)'
   device: 'smartphone'
   models:
     - regex: 'Walpad ([^;/]+) Build'
       device: 'tablet'
       model: 'Primo Walpad $1'
+    - regex: 'Primo S6 infinity'
+      model: 'Primo S6 Infinity'
     - regex: 'Walton[ _]([^;/]+) Build'
       model: '$1'
     - regex: 'Walton[ _]([^;/]+)\)'
@@ -7403,7 +13593,7 @@ WellcoM:
 
 # Wexler
 Wexler:
-  regex: 'Wexler|TAB[ _]10Q[);/ ]|ZEN[ _](?:4\.5|4\.7|5)'
+  regex: 'Wexler|ULTIMA 7 TWIST PLUS|TAB[ _]10Q[);/ ]|ZEN[ _](?:4\.5|4\.7|5)'
   device: 'tablet'
   models:
     - regex: '(?:Wexler[ _\-\.])?ZEN[ _]4\.5[);/ ]'
@@ -7421,12 +13611,16 @@ Wexler:
       model: '$1'
     - regex: 'Wexler[ _\-\.]([^);/]+)[);/]'
       model: '$1'
+    - regex: '(ULTIMA 7 TWIST PLUS)[);/ ]'
+      model: '$1'
 
 # Wiko
 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|Getaway|Goa|Kite|Robby|Lenny[2-9]?|Slide|Sunset[2-9]?|Sunny[2-9]?|Tommy[2-9]?|PULP(?: Fab)?|Wax|HARRY|WIM Lite|Ridge(?: Fab)?|U FEEL(?: Prime| Lite)?|U PULSE(?: LITE)?|View XL|View Prime)(?: Plus)?(?: 4G)?(?: Build|$)|W_K600'
+  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|Getaway|Goa(?!nna)|Kite|Robby|Lenny[2-9]?|Slide|Sunset[2-9]?|Sunny[2-9]?|Tommy[2-9]?|PULP(?: Fab)?|Wax|HARRY|Ridge(?: Fab)?|U FEEL(?: Prime| Lite)?|U PULSE(?: LITE)?|View2 Go|View XL|View Prime)(?: Plus)?(?: 4G)?(?: Build|$)?|W_(?:C800|K[346]00|P200|C200SN)|WC300|W-(V720|V800|P[36]11|K420|K510)-(TVM|EEA|SUN|OPE)|WIM Lite|W-K360-TV|W-U300|U307AS|CINK PEAX 2'
   device: 'smartphone'
   models:
+    - regex: '(?:WIKO-)?Cink Peax 2'
+      model: 'Cink Peax 2'
     - regex: '(?:Wiko-)?Cink([^/;]*) Build'
       model: 'Cink$1'
     - regex: '(?:WIKO-)?CINK_([a-z0-9_]+)'
@@ -7471,18 +13665,28 @@ Wiko:
       model: 'Bloom'
     - regex: '(?:WIKO-)?JIMMY'
       model: 'Jimmy'
+    - regex: 'JERRY MAX'
+      model: 'Jerry Max'
+    - regex: 'W_K300'
+      model: 'Jerry 3'
     - regex: '(?:WIKO-)?Jerry2'
       model: 'Jerry 2'
     - regex: '(?:WIKO-)?Jerry'
       model: 'Jerry'
     - regex: '(?:WIKO-)?Getaway'
       model: 'Getaway'
-    - regex: '(?:WIKO-)?Goa'
+    - regex: '(?:WIKO-)?Goa(?!nna)'
       model: 'Goa'
     - regex: '(?:WIKO-)?Freddy'
       model: 'Freddy'
     - regex: '(?:WIKO-)?Kite'
       model: 'Kite'
+    - regex: 'W_K400'
+      model: 'Lenny 5'
+    - regex: 'U307AS[;/) ]'
+      model: 'Life 2'
+    - regex: '(?:WIKO-)?Lenny[ -_]?3 Max'
+      model: 'Lenny 3 Max'
     - regex: '(?:WIKO-)?Lenny[ -_]?4 Plus'
       model: 'Lenny 4 Plus'
     - regex: '(?:WIKO-)?Lenny[ -_]?([2-9])'
@@ -7495,20 +13699,24 @@ Wiko:
       model: 'Sunset 2'
     - regex: '(?:WIKO-)?Sunset'
       model: 'Sunset'
+    - regex: '(?:WIKO-)?Sunny3'
+      model: 'Sunny 3'
     - regex: '(?:WIKO-)?Sunny2 Plus'
       model: 'Sunny 2 Plus'
     - regex: '(?:WIKO-)?Sunny2'
       model: 'Sunny 2'
+    - regex: 'W-K360-TV'
+      model: 'Sunny 4 Plus'
     - regex: '(?:WIKO-)?Sunny'
       model: 'Sunny'
+    - regex: '(?:W_K600|Tommy3|W_C200SN)'
+      model: 'Tommy 3'
     - regex: '(?:WIKO-)?Tommy2 Plus'
       model: 'Tommy 2 Plus'
     - regex: '(?:WIKO-)?Tommy2'
       model: 'Tommy 2'
     - regex: '(?:WIKO-)?Tommy'
       model: 'Tommy'
-    - regex: 'W_K600'
-      model: 'Tommy 3'
     - regex: '(?:WIKO-)?Wax'
       model: 'Wax'
     - regex: '(?:WIKO-)?HARRY'
@@ -7535,35 +13743,89 @@ Wiko:
       model: 'U Feel Prime'
     - regex: '(?:WIKO-)?U FEEL'
       model: 'U Feel'
+    - regex: '(?:WIKO-)?View2 Go'
+      model: 'View 2 Go'
     - regex: '(?:WIKO-)?View XL'
       model: 'View XL'
     - regex: '(?:WIKO-)?View Prime'
       model: 'View Prime'
+    - regex: 'WC300'
+      model: 'View Lite'
+    - regex: 'W_C800'
+      model: 'View 2'
+    - regex: 'W_P200'
+      model: 'View Max'
+    - regex: 'W-V800-(TVM|EEA|OPE)'
+      model: 'View 3 Lite'
+    - regex: 'W-K420-EEA'
+      model: 'Y50'
+    - regex: 'W-K510-(TVM|EEA|OPE|SUN)'
+      model: 'Y60'
+    - regex: 'W-V720-(EEA|OPE)'
+      model: 'Y80'
+    - regex: 'W-P311-(EEA|OPE)'
+      model: 'View 3'
+    - regex: 'W-P611-EEA'
+      model: 'View 3 Pro'
+    - regex: 'W-U300[;/) ]'
+      model: 'Ride'
     - regex: 'Wiko ([^/;]+) Build'
       model: '$1'
     - regex: 'Wiko ([^/; ]+)'
       model: '$1'
 
-# Wileyfox
-Wileyfox:
-  regex: '(?:Wileyfox [^/]+)|Swift([^/]+) Build'
+# Wieppo
+Wieppo:
+  regex: 'Wieppo (S6 Lite|S[658])[;/) ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Wink
+Wink:
+  regex: 'Wink_'
   device: 'smartphone'
   models:
-    - regex: 'Wileyfox ([^/]+) Build'
+    - regex: 'Wink_City_(SE|S)'
+      model: 'City $1'
+
+# Weimei
+Weimei:
+  regex: 'weplus_3'
+  device: 'smartphone'
+  models:
+    - regex: 'weplus_3'
+      model: 'WePlus 3'
+
+# Wileyfox
+Wileyfox:
+  regex: '(?:Wileyfox [^/]+)|Swift 2[;/) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Wileyfox Spark \+'
+      model: 'Spark +'
+    - regex: 'Wileyfox Spark X'
+      model: 'Spark X'
+    - regex: 'Wileyfox (Spark|Swift)'
       model: '$1'
-    - regex: 'Swift ([^/]+) Build'
-      model: 'Swift $1'
+    - regex: 'Wileyfox ([^/)]+)(?: Build|\))'
+      model: '$1'
+    - regex: 'Swift 2 (X|Plus)[;/) ]'
+      model: 'Swift 2 $1'
+    - regex: 'Swift 2[;/) ]'
+      model: 'Swift 2'
 
 # Wolder
 Wolder:
-  regex: 'miSmart|miTab|WIAM \#24'
+  regex: 'miSmart|miTab|WIAM \#24|WOLDER'
   device: 'smartphone'
   models:
     - regex: 'WIAM \#24'
       model: 'Wiam #24'
+    - regex: 'WOLDER_WIAM_65'
+      model: 'Wiam #65'
     - regex: 'miSmart[ \-_]?([^/]+) Build'
       model: 'miSmart $1'
-    - regex: 'miTab[ \-_]?([^/]+) Build'
+    - regex: 'miTab[ \-_]?([^/)]+)(?: Build|\))'
       device: 'tablet'
       model: 'miTab $1'
 
@@ -7579,41 +13841,199 @@ Wonu:
   device: 'feature phone'
   model: '$1'
 
+# Woo
+Woo:
+  regex: 'SP5026i-Scorpio'
+  device: 'smartphone'
+  models:
+    - regex: 'SP5026i-Scorpio'
+      model: 'Scorpio'
+
 # Woxter
 Woxter:
   regex: 'Woxter[ _]([^/;]+) Build'
   device: 'tablet'
   model: '$1'
 
-#Xiaomi
+# X-View
+X-View:
+  regex: 'ZEN_U5+'
+  device: 'smartphone'
+  models:
+    - regex: 'ZEN_U5+'
+      model: 'ZEN U5+'
+
+# POCO
+POCO:
+  regex: 'POCO[ _](?:X2|F2 PRO)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'POCO X2[);/ ]'
+      model: 'X2'
+    - regex: 'POCO F2 PRO[);/ ]'
+      model: 'F2 Pro'
+
+# Xiaomi
 Xiaomi:
-  regex: 'Xiaomi|(MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX 2S?)[);/ ]|HM ([^/;]+) (?:Build|MIUI)|(2014501|2014011|201481[138]|201302[23]|2013061) Build|Redmi'
+  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?)[);/ ]|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|MI_NOTE_Pro|POCOPHONE|(?:SHARK )?(KLE|MBU)-A0|SKR-[AH]0|SKW-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[CSX]?|MiTV-(MSSP1|AXSO0)|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|MiTV4A|M2006C3LG|M2002J9E|HM2014819|WT88047|M2004J(?:7[AB]|19)C|M2003J15SC|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY'
   device: 'smartphone'
   models:
     # specific smartphone models
+    - regex: 'SKR-[AH]0'
+      model: 'Black Shark'
+    - regex: 'AWM-A0'
+      model: 'Black Shark Helo'
+    - regex: 'SKW-[AH]0'
+      model: 'Black Shark 2'
+    - regex: 'DLT-[AH]0'
+      model: 'Black Shark 2 Pro'
+    - regex: '(?:SHARK )?KLE-A0'
+      model: 'Black Shark 3'
+    - regex: '(?:SHARK )?MBU-A0'
+      model: 'Black Shark 3 Pro'
     - regex: 'Xiaomi_2014501|2014501 Build'
       model: 'Hongmi 4G'
     - regex: 'Xiaomi_2014011|2014011 Build'
       model: 'Hongmi 1S'
     - regex: 'Xiaomi_201302[23]|201302[23] Build'
       model: 'Hongmi'
-    - regex: 'Xiaomi_201481[138]|201481[138] Build'
+    - regex: 'Xiaomi_2014818|2014818 Build'
+      model: 'Hongmi 2 3G'
+    - regex: 'Xiaomi_2014817|2014817 Build'
       model: 'Hongmi 2'
+    - regex: 'Xiaomi_201481[123]|201481[123] Build'
+      model: 'Hongmi 2 4G'
+    - regex: 'MI[_ ]PLAY[);/ ]'
+      model: 'MI Play'
+    - regex: 'Mi 9 SE[);/ ]'
+      model: 'MI 9 SE'
+    - regex: 'MI CC 9 Meitu Edition[);/ ]'
+      model: 'MI CC 9'
+    - regex: 'Xiaomi_M2001J2E_TD-LTE[);/ ]'
+      model: 'MI 10'
+    - regex: 'M2002J9E[);/ ]'
+      model: 'MI 10 Lite 5G'
+    - regex: 'Mi 9T Pro[);/ ]'
+      model: 'MI 9T Pro'
+    - regex: 'Mi9 Pro 5G[);/ ]'
+      model: 'MI 9 Pro 5G'
+    - regex: 'MI 8 Lite[);/ ]'
+      model: 'MI 8 Lite'
+    - regex: 'MI 5s Plus[);/ ]'
+      model: 'MI 5s Plus'
     - regex: 'Xiaomi_2013061|2013061 Build'
       model: 'MI 3'
     - regex: 'Mi-4c[);/ ]'
       model: 'MI 4C'
+    - regex: 'MI MAX 3[);/ ]'
+      model: 'MI MAX 3'
+    - regex: 'MI MAX 2[);/ ]'
+      model: 'MI MAX 2'
+    - regex: 'Mi A2 Lite[);/ ]'
+      model: 'MI A2 Lite'
+    - regex: 'MIX 3[);/ ]'
+      model: 'MI MIX 3'
     - regex: 'MIX 2S[);/ ]'
       model: 'MI MIX 2S'
     - regex: 'MIX 2[);/ ]'
       model: 'MI MIX 2'
+    - regex: 'MIX[);/ ]'
+      model: 'MI MIX'
+    - regex: 'POCOPHONE[ _]F1|POCO F1'
+      model: 'Pocophone F1'
+    - regex: 'Redmi 5 Plus'
+      model: 'Redmi 5 Plus'
+    - regex: 'WT88047[);/ ]'
+      model: 'Redmi 2'
+    - regex: 'HM2014819[);/ ]'
+      model: 'Redmi 2 Pro'
+    - regex: 'HM 2A[);/ ]'
+      model: 'Redmi 2A'
+    - regex: 'HM 1S[CW]?[);/ ]'
+      model: 'Redmi 1S'
+    - regex: 'HM 1[);/ ]'
+      model: 'Redmi 1'
+    - regex: 'M2004J7AC[);/ ]'
+      model: 'Redmi 10X'
+    - regex: 'M2004J19C[);/ ]'
+      model: 'Redmi 9'
+    - regex: 'M2006C3LG[);/ ]'
+      model: 'Redmi 9A'
+    - regex: 'M2004J7BC[);/ ]'
+      model: 'Redmi 10X Pro'
+    - regex: 'Redmi K20 Pro[);/ ]'
+      model: 'Redmi K20 Pro'
 
-    - regex: 'Redmi Note ([^;/) ]+)?'
+    - regex: 'MI PAD 4 PLUS[);/ ]'
+      model: 'Mi Pad 4 Plus'
+      device: 'tablet'
+    - regex: 'MI PAD 4[);/ ]'
+      model: 'Mi Pad 4'
+      device: 'tablet'
+    - regex: 'MI PAD 3[);/ ]'
+      model: 'Mi Pad 3'
+      device: 'tablet'
+    - regex: 'MI PAD 2[);/ ]'
+      model: 'Mi Pad 2'
+      device: 'tablet'
+    - regex: 'MI PAD[);/ ]'
+      model: 'Mi Pad'
+      device: 'tablet'
+    - regex: 'MIBOX3[ _]Pro[);/ ]'
+      model: 'Mi Box 3 Pro'
+      device: 'tv'
+    - regex: 'MIBOX([234])[);/ ]'
+      model: 'Mi Box $1'
+      device: 'tv'
+    - regex: 'MiBOX1S[);/ ]'
+      model: 'Mi Box 1S'
+      device: 'tv'
+    - regex: 'MiTV-MSSP1[);/ ]'
+      model: 'MiTV 4S'
+      device: 'tv'
+    - regex: '(?:MiTV-AXSO0|MiTV4(?:A|-ANSM0))[);/ ]'
+      model: 'MiTV 4A'
+      device: 'tv'
+    - regex: '(MiTV)(4[CSX]|4)[);/ ]'
+      model: '$1 $2'
+      device: 'tv'
+    - regex: 'HM NOTE 1W[);/ ]'
+      device: 'phablet'
+      model: 'Redmi Note'
+    - regex: 'HM NOTE 1TD (?:Build|MIUI)'
+      device: 'phablet'
+      model: 'Hongmi Note 1TD'
+    - regex: 'HM NOTE 1(?:LTE|S)(?:W|GLOBAL|TD)? (?:Build|MIUI)|HM NOTE 1LTE'
+      device: 'phablet'
+      model: 'Redmi Note 4G'
+    - regex: 'Redmi Note 6 Pro'
+      model: 'Redmi Note 6 Pro'
+      device: 'phablet'
+    - regex: 'Redmi Note 5 Pro'
+      model: 'Redmi Note 5 Pro'
+      device: 'phablet'
+    - regex: 'Redmi Note 5A Prime'
+      model: 'Redmi Note 5A Prime'
+      device: 'phablet'
+    - regex: 'M2003J15SC[);/ ]'
+      model: 'Redmi Note 9'
+      device: 'phablet'
+    - regex: 'Redmi Note 7 Pro[);/ ]'
+      model: 'Redmi Note 7 Pro'
+      device: 'phablet'
+    - regex: 'Redmi Note 8 Pro[);/ ]'
+      model: 'Redmi Note 8 Pro'
+      device: 'phablet'
+
+    - regex: 'Redmi[ _]Note[ _]([^;/) ]+)?'
       model: 'Redmi Note $1'
       device: 'phablet'
-    - regex: 'Redmi ([^;/) ]+)?'
+    - regex: 'Redmi[ _]([^;/) ]+)?'
       model: 'Redmi $1'
-    - regex: 'MI Note ([^;/) ]+)?'
+    - regex: 'MI_NOTE_Pro'
+      model: 'MI Note Pro'
+      device: 'phablet'
+    - regex: 'MI[ _]Note[ _]([^;/) ]+)?'
       model: 'MI Note $1'
       device: 'phablet'
     - regex: '(MI(?:-One)?[ _](?:[^;/]*))Build'
@@ -7628,13 +14048,22 @@ Xiaomi:
     - regex: 'Xiaomi[ _]([^/;]+)(?: Build|$)'
       model: '$1'
 
+# Xion
+Xion:
+  regex: 'XI-CE(?:655|U[48])'
+  device: 'smartphone'
+  models:
+    - regex: 'XI-CE(655|U[48])'
+      model: 'CE$1'
 
 # Xolo
 Xolo:
-  regex: 'Xolo|(?:Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05])[);/ ]'
+  regex: 'Xolo|(?:Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05])[);/ ]|BLACK-1XM'
   device: 'smartphone'
   models:
-    - regex: '(Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05])[);/ ]'
+    - regex: 'BLACK-1XM'
+      model: 'Black 1X'
+    - regex: '(Q600 Club|Q600|Q700s?|Q800|Q1000s Plus|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05])[);/ ]'
       model: '$1'
     - regex: 'Xolo[ _]?([^;/]+) Build'
       model: '$1'
@@ -7680,6 +14109,86 @@ Yarvik:
     - regex: 'TAB13-201'
       model: 'Xenta 13c'
 
+# Yes
+'Yes':
+  regex: 'M631Y|M651G_MY|YES (MPY(?:48|54))'
+  device: 'smartphone'
+  models:
+    - regex: 'M631Y'
+      model: 'Altitude'
+    - regex: 'M651G_MY'
+      model: 'Altitude 2'
+    - regex: 'YES (MPY(?:48|54))'
+      model: '$1'
+
+# Yezz
+Yezz:
+  regex: 'Yezz|ANDY[ _]|4E4|A5EI'
+  device: 'smartphone'
+  models:
+    - regex: 'ANDY_35E2I'
+      model: 'Andy 3.5E2I'
+    - regex: 'ANDY_35EI2'
+      model: 'Andy 3.5EI2'
+    - regex: 'Andy 3.5EI'
+      model: 'Andy 3.5EI'
+    - regex: 'ANDY_45EL'
+      model: 'Andy 4.5EL'
+    - regex: 'Andy 4.7T'
+      model: 'Andy 4.7T'
+    - regex: 'ANDY_4E2I'
+      model: 'Andy 4E2I'
+    - regex: '4E4'
+      model: 'Andy 4E4'
+    - regex: 'ANDY_4EI2'
+      model: 'Andy 4EI2'
+    - regex: 'Yezz-AC4EI'
+      model: 'Andy 4EI'
+    - regex: 'YEZZ-A4M'
+      model: 'Andy A4M'
+    - regex: 'ANDY_4EL2_LTE'
+      model: 'Andy 4EL2 LTE'
+    - regex: 'Andy_55EI'
+      model: 'Andy 55EI'
+    - regex: 'ANDY_5EI'
+      model: 'Andy 5EI'
+    - regex: 'Andy 5EL2 LTE'
+      model: 'Andy 5EL2 LTE'
+    - regex: 'Andy_5ML_LTE'
+      model: 'Andy 5ML LTE'
+    - regex: 'Andy_5T'
+      model: 'Andy 5T'
+    - regex: 'A3.5EP'
+      model: 'Andy A3.5EP'
+    - regex: 'A5EI'
+      model: 'Andy A5EI'
+    - regex: 'ANDY_C5QL'
+      model: 'Andy C5QL'
+    - regex: 'ANDY_5EL'
+      model: 'Andy 5EL'
+    - regex: 'ANDY[_ ]5EI'
+      model: 'Andy 5EI'
+
+# Yu
+Yu:
+  regex: '(?:YU5[05]10[A]?|YU4711|AO5510|YU5050|YU5014)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'YU5010[A]?[);/ ]'
+      model: 'Yuphoria'
+    - regex: 'YU5050[);/ ]'
+      model: 'Yutopia'
+    - regex: 'AO5510[);/ ]'
+      model: 'Yureka'
+    - regex: 'YU5510[A]?[);/ ]'
+      model: 'Yureka Plus'
+    - regex: 'YU4711[);/ ]'
+      model: 'Yunique'
+    - regex: 'YU4711[);/ ]'
+      model: 'Yunique'
+    - regex: 'YU5014[);/ ]'
+      model: 'Ace'
+
 # Yuandao
 Yuandao:
   regex: 'N101[ _]DUAL(?:[ _]CORE)?(?:[ _]?2|\|\|)?(?:[ _]V11)?[);/ ]'
@@ -7712,13 +14221,93 @@ Ytone:
 
 # Zonda
 Zonda:
-  regex: '(ZM(?:CK|EM|TFTV|TN)[a-z0-9]+)'
+  regex: '(ZM(?:CK|EM|TFTV|TN)[a-z0-9]+)|ZA409'
   device: 'feature phone'
-  model: '$1'
+  models:
+    - regex: 'ZA409'
+      device: 'smartphone'
+      model: 'Muzic'
+    - regex: '(ZM(?:CK|EM|TFTV|TN)[a-z0-9]+)'
+      model: '$1'
+
+# ZYQ
+ZYQ:
+  regex: 'ZYQ-Q88|(Q(?:2602|262[436]|638|2688|272[89]|3022|3623|TAB Tab4|328 m9|328|668)|J77|Q[._](?:Up|Boss P99|Dee R09|Good M9|Hi|Hot|Me|Mate R99|Next|TOP-X8|You))[); ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Q638'
+      model: 'I7'
+    - regex: 'Q2624'
+      model: 'Cheer 3G'
+    - regex: 'Q2602'
+      model: 'TV Next'
+    - regex: 'Q2728'
+      model: 'Zone 3G'
+    - regex: 'Q2729'
+      model: 'Q2729'
+    - regex: 'Q2688'
+      model: 'Q2688'
+    - regex: 'Q2623'
+      model: 'Win 3G'
+    - regex: 'Q2626'
+      model: 'Care 3G'
+    - regex: 'Q3623'
+      model: 'Braw 3G'
+    - regex: 'Q3022'
+      model: 'Q3022'
+    - regex: 'Q328 m9'
+      model: 'Q328 M9'
+    - regex: 'Q328'
+      model: 'Speed 3G'
+    - regex: 'Q668'
+      model: 'TV I4'
+    - regex: 'J77'
+      model: 'Q.Dee'
+    - regex: 'Q\.Up C5'
+      model: 'Q.Up C5'
+    - regex: 'Q\.Up'
+      model: 'Q.Up'
+    - regex: 'Q\.Boss P99'
+      model: 'Q.Boss P99'
+    - regex: 'Q[._]Dee R09'
+      model: 'Q.Dee R09'
+    - regex: 'Q\.Good M9'
+      model: 'Q.Good M9'
+    - regex: 'Q[._]Hi S1'
+      model: 'Q.Hi S1'
+    - regex: 'Q[._]Hi'
+      model: 'Q.Hi'
+    - regex: 'Q[._]Hot P7 3G'
+      model: 'Q.Hot P7 3G'
+    - regex: 'Q[._]Hot'
+      model: 'Q.Hot'
+    - regex: 'Q[._]Me Phone7 3G'
+      model: 'Q.Me Phone 7 3G'
+    - regex: 'Q[._]Me Plus7'
+      model: 'Q.Me Plus 7'
+    - regex: 'Q[._]Me'
+      model: 'Q.Me'
+    - regex: 'Q[._]Mate R99'
+      model: 'Q.Mate R99'
+    - regex: 'Q[._]Next B7'
+      model: 'Q.Next B7'
+    - regex: 'Q[._]Next J2'
+      model: 'Q.Next J2'
+    - regex: 'Q[._]TOP-X8'
+      model: 'Q.Top X8'
+    - regex: 'Q[._]You'
+      model: 'Q.You'
+    - regex: 'QTAB Tab4'
+      model: 'QTab Tab4'
+      device: 'tablet'
+    - regex: 'ZYQ-Q88'
+      model: 'Q88'
+      device: 'tablet'
+
 
 # Toshiba
 Toshiba:
-  regex: 'Toshiba|TSBNetTV/|portalmmm/[12].0 TS|T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AT(10-A|10[PL]E-A|100|200|270|300|330|374|400|470|500|503|570|703|830)'
+  regex: 'Toshiba|TSBNetTV/|portalmmm/[12].0 TS|T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AT(7-C|10-A|10[PL]E-A|100|200|270|300|330|374|400|470|500|503|570|703|830)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -7734,6 +14323,9 @@ Toshiba:
       model: 'Regza IS11T'
 
     # explicit tablet models
+    - regex: 'AT7-C'
+      model: 'Excite'
+      device: 'tablet'
     - regex: 'AT1S0'
       model: 'Regza AT1S0'
       device: 'tablet'
@@ -7763,17 +14355,174 @@ Toshiba:
     - regex: 'portalmmm/[12].0 (TS[a-z0-9 ]+)'
       model: '$1'
 
-# Fly
-Fly:
-  regex: 'Fly(?!Flow|touch)|FS50[1-9]|FS511|FS551|FS40[1-7]|FS452|FS451|FS454|4FS06|MERIDIAN-|(?:IQ[0-9]{3,})[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?(?: Build|[;/\)])'
+# Vivax
+Vivax:
+  regex: 'VIVAX|(?:Fly5[_ ]Lite|Fun[_ ]S500)[;)/ ]'
   device: 'smartphone'
   models:
-    - regex: '(?:Fly_)?IQ310(?: Build|[;/\)])'
+    - regex: 'Fly5[_ ]Lite[;)/ ]'
+      model: 'Fly 5 Lite'
+    - regex: 'Fun[_ ]S500[;)/ ]'
+      model: 'Fun S500'
+    - regex: 'VIVAX[ _]Fly3[;)/ ]'
+      model: 'Fly 3'
+    - regex: 'VIVAX (Point X551)[;)/ ]'
+      model: '$1'
+    - regex: 'SMART Point X5010[;)/ ]'
+      model: 'Smart Point X5010'
+
+# MLS
+MLS:
+  regex: 'IQ(?:0705|L550|1010w?|1012N?|1019N|1025|1380|1401|1436|1452a|1453|1470|1502a|1511|1552|1553|1568|1570|1805N|1806|1808|1810B_M|1832|1850|1890|5017|9610|181011N|E[12]00|EL41|G550|GW516|L30|L5[01]|M801|M1001|N700|P50|R300|S300|S1001|W503|W511T|W553N?|W60[38]|W626|M960|D700|9013_4N)[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'IQ0705[;)/ ]'
+      model: 'iQTalk Twist'
+    - regex: 'IQL550[;)/ ]'
+      model: 'Notch Lite'
+    - regex: 'IQ1010W?[;)/ ]'
+      model: 'iQTab 10'
+      device: 'tablet'
+    - regex: 'IQ1012N?[;)/ ]'
+      model: 'iQTab Brave 3G'
+      device: 'tablet'
+    - regex: 'IQ1025[;)/ ]'
+      model: 'iQTab Action 4G'
+      device: 'tablet'
+    - regex: 'iQ9013_4N[;)/ ]'
+      model: 'Life 10.1"'
+      device: 'tablet'
+    - regex: 'IQ1019N[;)/ ]'
+      model: 'Alu Plus 4G 10.1"'
+      device: 'tablet'
+    - regex: 'iQ1805N[;)/ ]'
+      model: 'iQTab Ideal 8.0"'
+      device: 'tablet'
+    - regex: 'iQ181011N[;)/ ]'
+      model: 'iQTab Care 8.0"'
+      device: 'tablet'
+    - regex: 'IQ1380[;)/ ]'
+      model: 'Brain 3G'
+    - regex: 'IQ1401[;)/ ]'
+      model: 'iQTalk Verse 4G'
+    - regex: 'IQ1436[;)/ ]'
+      model: 'Color mini 4G'
+    - regex: 'IQ1452a[;)/ ]'
+      model: 'TOP-S 4G'
+    - regex: 'IQ1453[;)/ ]'
+      model: 'Trend 4G'
+    - regex: 'IQ1470[;)/ ]'
+      model: 'iQTalk Onyx'
+    - regex: 'IQ1502a[;)/ ]'
+      model: 'iQTalk Flame'
+    - regex: 'IQ1511[;)/ ]'
+      model: 'iQTalk Spicy'
+    - regex: 'IQ1552[;)/ ]'
+      model: 'iQTalk Titan 4G'
+    - regex: 'IQ1553[;)/ ]'
+      model: 'Color 3 4G'
+    - regex: 'IQ1568[;)/ ]'
+      model: 'Range 4G'
+    - regex: 'IQ1570[;)/ ]'
+      model: 'iQTalk Color 5.5 4G'
+    - regex: 'IQ1806[;)/ ]'
+      model: 'iQTab Rose'
+      device: 'tablet'
+    - regex: 'IQ1808[;)/ ]'
+      model: 'iQTab Master'
+      device: 'tablet'
+    - regex: 'IQ1810B_M[;)/ ]'
+      model: 'iQTab Novel 3G'
+      device: 'tablet'
+    - regex: 'IQ1832[;)/ ]'
+      model: 'Jet 3G'
+      device: 'tablet'
+    - regex: 'IQ1850[;)/ ]'
+      model: 'Diamond 5.2 4G'
+    - regex: 'IQ1890[;)/ ]'
+      model: 'iQTalk Aura'
+    - regex: 'IQ5017[;)/ ]'
+      model: 'Slice 4G'
+    - regex: 'IQ9610[;)/ ]'
+      model: 'Angel 3G'
+      device: 'tablet'
+    - regex: 'iQM960[;)/ ]'
+      model: 'Angel 3G (2018)'
+      device: 'tablet'
+    - regex: 'IQG550[;)/ ]'
+      model: 'Style 4G'
+    - regex: 'IQGW516[;)/ ]'
+      model: 'F5'
+    - regex: 'IQE100[;)/ ]'
+      model: 'Energy 4G'
+    - regex: 'iQE200[;)/ ]'
+      model: 'MX 4G'
+    - regex: 'IQEL41[;)/ ]'
+      model: 'Fab 4G'
+    - regex: 'IQL30[;)/ ]'
+      model: 'Status 4G'
+    - regex: 'IQL50[;)/ ]'
+      model: 'More 4G'
+    - regex: 'IQL51[;)/ ]'
+      model: 'Wave 4G'
+    - regex: 'IQM801[;)/ ]'
+      model: 'Brace 2018 4G'
+      device: 'tablet'
+    - regex: 'IQM1001[;)/ ]'
+      model: 'Level 4G'
+      device: 'tablet'
+    - regex: 'IQN700[;)/ ]'
+      model: 'Inspire 4G'
+    - regex: 'IQP50[;)/ ]'
+      model: 'Ruby 4G'
+    - regex: 'IQS300[;)/ ]'
+      model: 'DX 4G'
+    - regex: 'IQS1001[;)/ ]'
+      model: 'Vista 4G' ## Gold
+      device: 'tablet'
+    - regex: 'IQR300[;)/ ]'
+      model: 'R3 4G'
+    - regex: 'IQW608[;)/ ]'
+      model: 'Regal'
+    - regex: 'iQW603[;)/ ]'
+      model: 'Phab 6.0"'
+      device: 'phablet'
+    - regex: 'IQW626[;)/ ]'
+      model: 'D6 4G'
+    - regex: 'IQW511T[;)/ ]'
+      model: 'Liberal'
+    - regex: 'IQW553N?[;)/ ]'
+      model: 'Alu 5.5"'
+    - regex: 'IQW503[;)/ ]'
+      model: 'Flame 4G (2018)'
+    - regex: 'iQD700[;)/ ]'
+      model: 'Color Fingerprint 4G'
+
+# Fly
+Fly:
+  regex: 'Fly(?!Flow|touch)|Power Plus 5000|Photo Pro|Slimline|Life (?:Ace|Jet|Sky|Compact 4G)|FS50[1-9]|FS51[0-8]|FS52[0-9]|FS530|FS55[134]|FS40[1-9]|FS45[1-9]|4FS06|MERIDIAN-|(?:IQ(?!10[134]0)[0-9]{3,}[i]?)[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(?:Fly_)?IQ310[;)/ ]'
       model: 'Panorama'
       device: 'tablet'
 
-    - regex: '(?:Fly_)?IQ236(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ236[;)/ ]'
       model: 'Victory'
+    - regex: 'Slimline[;)/ ]'
+      model: 'Slimline'
+    - regex: 'Power Plus 5000[;)/ ]'
+      model: 'Power Plus 5000'
+    - regex: 'Photo Pro[;)/ ]'
+      model: 'Photo Pro'
+    - regex: 'Life Ace[;)/ ]'
+      model: 'Life Ace'
+    - regex: 'Life Jet[;)/ ]'
+      model: 'Life Jet'
+    - regex: 'Life Sky[;)/ ]'
+      model: 'Life Sky'
+    - regex: 'Life Compact 4G[;)/ ]'
+      model: 'Life Compact 4G'
     - regex: 'FS506'
       model: 'Cirrus 3'
     - regex: 'FS403'
@@ -7800,99 +14549,157 @@ Fly:
       model: 'Nimbus 3'
     - regex: 'FS502'
       model: 'Cirrus 1'
+    - regex: 'FS507'
+      model: 'Cirrus 4'
     - regex: 'FS505'
       model: 'Nimbus 7'
     - regex: 'FS551'
       model: 'Nimbus 4'
+    - regex: 'FS514'
+      model: 'Cirrus 8'
+    - regex: 'FS553'
+      model: 'Cirrus 9'
+    - regex: 'FS554'
+      model: 'Power Plus FHD'
+    - regex: 'FS517'
+      model: 'Cirrus 11'
+    - regex: 'FS516'
+      model: 'Cirrus 12'
+    - regex: 'FS518'
+      model: 'Cirrus 13'
+    - regex: 'FS520'
+      model: 'Selfie 1'
+    - regex: 'FS521'
+      model: 'Power Plus 1'
+    - regex: 'FS522'
+      model: 'Cirrus 14'
+    - regex: 'FS523'
+      model: 'Cirrus 16'
+    - regex: 'FS524'
+      model: 'Knockout'
+    - regex: 'FS526'
+      model: 'Power Plus 2'
+    - regex: 'FS527'
+      model: 'Nimbus 17'
+    - regex: 'FS528'
+      model: 'Memory Plus'
+    - regex: 'FS529'
+      model: 'Сhamp'
+    - regex: 'FS530'
+      model: 'Power Plus XXL'
     - regex: 'FS454'
       model: 'Nimbus 8'
     - regex: 'FS452'
       model: 'Nimbus 2'
+    - regex: 'FS512'
+      model: 'Nimbus 10'
+    - regex: 'FS510'
+      model: 'Nimbus 12'
     - regex: 'FS451'
       model: 'Nimbus 1'
     - regex: 'FS405'
       model: 'Stratus 4'
-    - regex: '(?:Fly_)?IQ237(?: Build|[;/\)])'
+    - regex: 'FS408'
+      model: 'Stratus 8'
+    - regex: 'FS409'
+      model: 'Stratus 9'
+    - regex: 'FS455'
+      model: 'Nimbus 11'
+    - regex: 'FS456'
+      model: 'Nimbus 14'
+    - regex: 'FS457'
+      model: 'Nimbus 15'
+    - regex: 'FS459'
+      model: 'Nimbus 16'
+    - regex: 'FS458'
+      model: 'Stratus 7'
+    - regex: '(?:Fly_)?IQ237[;)/ ]'
       model: 'Dynamic'
-    - regex: '(?:Fly_)?IQ238(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ238[;)/ ]'
       model: 'Jazz'
-    - regex: '(?:Fly_)?IQ240(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ240[;)/ ]'
       model: 'Whizz'
-    - regex: '(?:Fly_)?IQ255(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ255[;)/ ]'
       model: 'Pride'
-    - regex: '(?:Fly_)?IQ270(?: Firebird)?(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ270(?: Firebird)?[;)/ ]'
       model: 'Firebird'
-    - regex: '(?:Fly_)?IQ275(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ275[;)/ ]'
       model: 'Marathon'
-    - regex: '(?:Fly_)?IQ285(?: Turbo)?(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ285(?: Turbo)?[;)/ ]'
       model: 'Turbo'
-    - regex: '(?:Fly_)?IQ430(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ430[;)/ ]'
       model: 'Evoke'
-    - regex: '(?:Fly_)?IQ431(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ431[;)/ ]'
       model: 'Glory'
-    - regex: '(?:Fly_)?IQ432(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ432[;)/ ]'
       model: 'Era Nano 1'
-    - regex: '(?:Fly_)?IQ434(?: Build|[;/\)])'
-      model: 'Era Nano 5'
-    - regex: '(?:Fly_)?IQ436(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ436[;)/ ]'
       model: 'Era Nano 3'
-    - regex: '(?:Fly_)?IQ440(?: Build|[;/\)])'
-      model: 'Energy'
-    - regex: '(?:Fly_)?IQ441(?: Build|[;/\)])'
-      model: 'Radiance'
-    - regex: '(?:Fly_)?IQ442(?: Build|[;/\)])'
-      model: 'Miracle'
-    - regex: '(?:Fly_)?IQ442 Quad(?: Build|[;/\)])'
-      model: 'Miracle 2'
-    - regex: '(?:Fly_)?IQ443(?: Build|[;/\)])'
-      model: 'Trend'
-    - regex: '(?:Fly_)?IQ444(?: Quattro)?(?: Build|[;/\)])'
-      model: 'Diamond 2'
-    - regex: '(?:Fly_)?IQ445(?: Build|[;/\)])'
-      model: 'Genius'
-    - regex: '(?:Fly_)?IQ446(?: Magic)?(?: Build|[;/\)])'
-      model: 'Magic'
-    - regex: '(?:Fly_)?IQ447(?: Build|[;/\)])'
-      model: 'Era Life 1'
-    - regex: '(?:Fly_)?IQ448(?: Build|[;/\)])'
-      model: 'Chic'
-    - regex: '(?:Fly_)?IQ449(?: Build|[;/\)])'
-      model: 'Pronto'
-    - regex: '(?:Fly_)?IQ450(?: Build|[;/\)])'
-      model: 'Horizon'
-    - regex: '(?:Fly_)?IQ450[ _]Quattro(?: Build|[;/\)])'
-      model: 'Horizon 2'
-    - regex: '(?:Fly_)?IQ451(?: Build|[;/\)])'
-      model: 'Vista'
-    - regex: '(?:Fly_)?IQ452 Quad(?: Build|[;/\)])'
-      model: 'Ego Vision 1'
-    - regex: '(?:Fly_)?IQ454(?: Build|[;/\)])'
-      model: 'Evo Tech 1'
-    - regex: '(?:Fly_)?IQ456(?: Build|[;/\)])'
-      model: 'Era Life 2'
-    - regex: '(?:Fly_)?IQ4403(?: Build|[;/\)])'
-      model: 'Energy 3'
-    - regex: '(?:Fly_)?IQ4404(?: Build|[;/\)])'
-      model: 'Spark'
-    - regex: '(?:Fly_)?IQ4406(?: Build|[;/\)])'
-      model: 'Era Nano 6'
-    - regex: '(?:Fly_)?IQ4410 Quad(?: Build|[;/\)])'
-      model: 'Phoenix'
-    - regex: '(?:Fly_)?IQ4411(?: Build|[;/\)])'
-      model: 'Energy 2'
-    - regex: '(?:Fly_)?IQ4412 Quad(?: Build|[;/\)])'
-      model: 'Coral'
-    - regex: '(?:Fly_)?IQ4413[ _]Quad(?: Build|[;/\)])'
-      model: 'Evo Chic 3'
-    - regex: '(?:Fly_)?IQ4414 Quad(?: Build|[;/\)])'
-      model: 'Evo Tech 3'
-    - regex: '(?:Fly_)?IQ4415 Quad(?: Build|[;/\)])'
-      model: 'Era Style 3'
-    - regex: '(?:Fly_)?IQ4490(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ4490[;)/ ]'
       model: 'Era Nano 4'
-    - regex: '(?:Fly_)?IQ4504 Quad(?: Build|[;/\)])'
+    - regex: '(?:Fly_)?IQ434[;)/ ]'
+      model: 'Era Nano 5'
+    - regex: '(?:Fly_)?IQ4406[;)/ ]'
+      model: 'Era Nano 6'
+    - regex: '(?:Fly_)?IQ436i[;)/ ]'
+      model: 'Era Nano 9'
+    - regex: '(?:Fly_)?IQ440[;)/ ]'
+      model: 'Energy'
+    - regex: '(?:Fly_)?IQ4401[;)/ ]'
+      model: 'Era Energy 2'
+    - regex: '(?:Fly_)?IQ441[;)/ ]'
+      model: 'Radiance'
+    - regex: '(?:Fly_)?IQ442 Quad[;)/ ]'
+      model: 'Miracle 2'
+    - regex: '(?:Fly_)?IQ442[;)/ ]'
+      model: 'Miracle'
+    - regex: '(?:Fly_)?IQ443[;)/ ]'
+      model: 'Trend'
+    - regex: '(?:Fly_)?IQ444(?: Quattro)?[;)/ ]'
+      model: 'Diamond 2'
+    - regex: '(?:Fly_)?IQ445[;)/ ]'
+      model: 'Genius'
+    - regex: '(?:Fly_)?IQ446(?: Magic)?[;)/ ]'
+      model: 'Magic'
+    - regex: '(?:Fly_)?IQ447[;)/ ]'
+      model: 'Era Life 1'
+    - regex: '(?:Fly_)?IQ456[;)/ ]'
+      model: 'Era Life 2'
+    - regex: '(?:Fly_)?IQ4409 Quad[;)/ ]'
+      model: 'Era Life 4'
+    - regex: '(?:Fly_)?IQ448[;)/ ]'
+      model: 'Chic'
+    - regex: '(?:Fly_)?IQ449[;)/ ]'
+      model: 'Pronto'
+    - regex: '(?:Fly_)?IQ450[;)/ ]'
+      model: 'Horizon'
+    - regex: '(?:Fly_)?IQ450[ _]Quattro[;)/ ]'
+      model: 'Horizon 2'
+    - regex: '(?:Fly_)?IQ451[;)/ ]'
+      model: 'Vista'
+    - regex: '(?:Fly_)?IQ452 Quad[;)/ ]'
+      model: 'Ego Vision 1'
+    - regex: '(?:Fly_)?IQ454[;)/ ]'
+      model: 'Evo Tech 1'
+    - regex: '(?:Fly_)?IQ4403[;)/ ]'
+      model: 'Energy 3'
+    - regex: '(?:Fly_)?IQ4404[;)/ ]'
+      model: 'Spark'
+    - regex: '(?:Fly_)?IQ4410 Quad[;)/ ]'
+      model: 'Phoenix'
+    - regex: '(?:Fly_)?IQ4411[;)/ ]'
+      model: 'Energy 2'
+    - regex: '(?:Fly_)?IQ4412 Quad[;)/ ]'
+      model: 'Coral'
+    - regex: '(?:Fly_)?IQ4413[ _]Quad[;)/ ]'
+      model: 'Evo Chic 3'
+    - regex: '(?:Fly_)?IQ4414 Quad[;)/ ]'
+      model: 'Evo Tech 3'
+    - regex: '(?:Fly_)?IQ4415 Quad[;)/ ]'
+      model: 'Era Style 3'
+    - regex: '(?:Fly_)?IQ4504 Quad[;)/ ]'
       model: 'Evo Energy 5'
-    - regex: '(?:Fly_)?IQ([0-9]+) ?(?:Quad|Firebird|Quattro)? Build'
+    - regex: '(?:Fly_)?IQ([0-9]+[i]? ?(?:Quad|Firebird|Quattro)?)[;)/ ]'
       model: 'IQ$1'
     - regex: 'Fly[ _\-]?([a-z0-9_]+)/'
       model: '$1'
@@ -7905,13 +14712,34 @@ Fly:
     - regex: 'MERIDIAN-([a-z0-9]+)'
       model: '$1'
 
+# FinePower
+FinePower:
+  regex: 'FinePower[_ ]?([AB][1-9]|[CD][1-9])[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'FinePower[_ ]?([AB][1-9])[;)/ ]'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'FinePower[_ ]?([CD][1-9])[;)/ ]'
+      model: '$1'
+
 # Freetel
 Freetel:
-  regex: '(FTJ152[ABCD]|FT141B|FT142D_LTEXM|FT142A?|FTJ161B|FTJ152E|FTJ162D) Build'
+  regex: '(?:FTJ17A00|FTJ152[ABCD]|FT141B|FT142D_LTEXM|FT142A?|FTJ161[AB]|FTJ1[56]2E|FTJ162D|FTE161[GE])[;)/ ]'
   device: 'smartphone'
   models:
    - regex: 'FTJ152C'
      model: 'Samurai Miyabi'
+   - regex: 'FTJ17A00[;)/ ]'
+     model: 'Rei 2 Dual'
+   - regex: 'FTJ161A'
+     model: 'Musashi'
+   - regex: 'FTE161E'
+     model: 'Ice 2'
+   - regex: 'FTE161G'
+     model: 'Ice 2 Plus'
+   - regex: 'FTJ162E'
+     model: 'Raijin'
    - regex: 'FT141B'
      model: 'Nico'
    - regex: 'FT142D_LTEXM'
@@ -7941,26 +14769,104 @@ Zeemi:
     - regex: 'ZEEMI[ _-]([^/;)]+)[/;)]'
       model: '$1'
 
+# Zenek
+Zenek:
+  regex: 'Z5007|Z551[679]|Z6001'
+  device: 'smartphone'
+  models:
+    - regex: 'Z5517'
+      model: 'Leopardo'
+    - regex: 'Z6001'
+      model: 'Libelula'
+    - regex: 'Z5007'
+      model: 'Oso'
+    - regex: 'Z5519'
+      model: 'Pingûino'
+    - regex: 'Z5516'
+      model: 'Zebra'
+
 # Zopo
 Zopo:
-  regex: '(?:ZOPO[_ ])?(ZP[0-9]{2,}[^/;]+) Build'
+  regex: 'ZOPO|(?:ZOPO[_ ])?(Flash X3|ZP[0-9]{2,}[^/;]+)(?:\)| Build)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: '(ZOPO_C2_MOD|ZP998)[);/ ]'
+      model: 'C2 II'
+    - regex: '(?:ZOPO_)?ZP980[+][);/ ]'
+      model: 'ZP980+'
+    - regex: '(?:ZOPO_)?ZP980[);/ ]'
+      model: 'Scorpio'
+    - regex: 'ZP952[);/ ]'
+      model: 'Speed 7 Plus'
+    - regex: 'ZP951[);/ ]'
+      model: 'Speed 7'
+    - regex: 'ZP955[);/ ]'
+      model: 'Speed 8'
+    - regex: 'ZP950[+h]?[);/ ]'
+      model: 'Leader Max'
+    - regex: 'ZP(?:900H?|910)[);/ ]'
+      model: 'Leader'
+    - regex: 'ZP(?:800H|810)[);/ ]'
+      model: 'Libero HD'
+    - regex: 'ZP500[+]?[);/ ]'
+      model: 'Libero'
+    - regex: 'ZP330[);/ ]'
+      model: 'Color C'
+    - regex: 'ZP370[);/ ]'
+      model: 'Color S'
+    - regex: 'ZP5(63|86)[);/ ]'
+      model: 'Color X'
+    - regex: 'ZP567[);/ ]'
+      model: 'Color C5i'
+    - regex: 'ZP300[S+]?[);/ ]'
+      model: 'Field'
+    - regex: 'ZP200[+]?[);/ ]'
+      model: 'Shining'
+    - regex: 'ZP100[);/ ]'
+      model: 'Pilot'
+    - regex: 'ZP1790[);/ ]'
+      model: 'Flash X2'
+    - regex: 'ZP781[);/ ]'
+      model: 'Flash G5 Plus'
+    - regex: '(Flash X3|ZP[0-9]{2,}[^/;)]+)(?: Build|\))'
+      model: '$1'
 
 # ZTE
 ZTE:
-  regex: 'ZTE|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade (?:L[2357]|S6|V[678]|X7|A520)|N9[15]8St|NX(?:403A|40[X2]|507J|503A|505J|506J|508J|510J|511J|513J|529J|531J|549J|551J|563J|569H|601J)|N951[057]|N9180|N9101|N913[67]|NX406E|N952[01]|N9560|N9810|N799D|[UV]9180|[UV]9815|Z(?:233V|331|667T|768G|792|81[25]|820|83[12359]|85[125]|851M|(557|717|798|836|861|916)BL|986DL|(232|718|828)TL|(233|353|558|717|799|837|862|899|917)VL|955A|95[68]|965|97[18]|98[123]|986U|999)|A460)[);/ ]'
+  regex: 'ZTE|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade (?:L110|L[2357]|L7A|S6|V[6789]|V8Q|V8 SE|V9 VITA|X7|A(310|460|465|475|520|530|602)|V580|V Ultra|Q Lux)|N9[15]8St|NX(?:403A|404H|406E|40[X2]|507J|503A|505J|506J|508J|510J|512J|511J|513J|521J|523J_V1|529J|531J|541J|5[48]9J|551J|563J|569[HJ]|573J|575J|59[157]J|60[1689]J|61[12679]J|62[79]J|659J|907J)|N818S|N951[0579]|N91[38]0|N9101|N913[267]|N952[01]|N9560|N9810|N799D|[UV]9180|[UV]9815|Z(?:233V|331|5031O|559DL|6621O|667T|768G|792|81[25]|818L|82[08]|83[12359]|85[125]|851M|(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)|Apex2|G (LTE|Lux)|Vec|Z959|V865M|Z3001S|902ZT|KIS II Max|Kis 3|K3DX-V5G|Z930L|Optus X|Blade[ _](A510|A[35] 2019-T|A6 MAX|A0622|X9)|Nubia Z(?:9|11)|Ctyon-A9|602ZT|MO-01J|Z963U|402ZT|P545|P609|dandelion)[);/ ]'
   device: 'smartphone'
   models:
     # explicit smartphone models
+    - regex: '602ZT[);/ ]'
+      model: 'Libero 2'
+    - regex: 'ZTE 2050[);/ ]'
+      model: 'Blade 20 Smart'
+    - regex: '902ZT[);/ ]'
+      model: 'Axon 10 Pro 5G'
     - regex: 'N799D[);/ ]'
-      model: 'MTS Blaze 4'
+      model: 'Blade Eg'
+    - regex: 'Z818L[);/ ]'
+      model: 'Allstar'
+    - regex: 'Z3001S[);/ ]'
+      model: 'Quest Plus'
+    - regex: 'Ctyon-A9[);/ ]'
+      model: 'Ctyon A9'
+    - regex: 'K3DX-V5G[);/ ]'
+      model: 'V5G'
     - regex: 'N918St[);/ ]'
       model: 'V5S'
     - regex: 'N958St[);/ ]'
       model: 'V5 Max'
     - regex: 'N9101[);/ ]'
       model: 'Imperial'
+    - regex: 'Z963U[);/ ]'
+      model: 'Imperial Max'
+    - regex: 'N9120[);/ ]'
+      model: 'Avid'
+    - regex: 'N9130[);/ ]'
+      model: 'Speed'
+    - regex: 'N9132[);/ ]'
+      model: 'Prestige'
     - regex: 'N9136[);/ ]'
       model: 'Prestige 2'
     - regex: 'N9137[);/ ]'
@@ -7968,11 +14874,19 @@ ZTE:
     - regex: 'N9180[);/ ]'
       model: 'V5'
     - regex: 'N9510[);/ ]'
-      model: 'Wrap 4G'
+      model: 'Warp 4G'
     - regex: 'N9517[);/ ]'
       model: 'Blade Force'
+    - regex: 'Z559DL[);/ ]'
+      model: 'Blade T2'
+    - regex: '402ZT[);/ ]'
+      model: 'Blade Q+'
+    - regex: 'Blade Q Lux[);/ ]'
+      model: 'Blade Q Lux'
     - regex: 'N9515[);/ ]'
-      model: 'Wrap Sync'
+      model: 'Warp Sync'
+    - regex: 'N9519[);/ ]'
+      model: 'Warp 7'
     - regex: 'N9520[);/ ]'
       model: 'Boost Max'
     - regex: 'N9521[);/ ]'
@@ -7983,8 +14897,8 @@ ZTE:
       model: 'Vital'
     - regex: 'NX40[X2][);/ ]'
       model: 'Nubia Z5 mini'
-    - regex: 'NX403A[);/ ]'
-      model: 'Nubia Z5S mini'
+    - regex: 'NX(403[AE]|406E|404H)[);/ ]'
+      model: 'Nubia Z5S Mini'
     - regex: 'NX503A[);/ ]'
       model: 'Nubia Z5S'
     - regex: 'NX506J[);/ ]'
@@ -7995,58 +14909,178 @@ ZTE:
       model: 'Nubia Z7 max'
     - regex: 'NX508J[);/ ]'
       model: 'Nubia Z9'
-    - regex: 'NX511J[);/ ]'
+    - regex: '(NX5[12]1J|Nubia Z9 mini)[);/ ]'
       model: 'Nubia Z9 mini'
-    - regex: 'NX510J[);/ ]'
+    - regex: '(NX510J|Nubia Z9 Max)[);/ ]'
       model: 'Nubia Z9 max'
+    - regex: 'NX512J[);/ ]'
+      model: 'Nubia Z9 max dual'
     - regex: 'NX531J[);/ ]'
       model: 'Nubia Z11'
+    - regex: 'NX523J_V1'
+      model: 'Nubia Z11 Max'
     - regex: 'NX529J[);/ ]'
       model: 'Nubia Z11 mini'
-    - regex: 'NX549J[);/ ]'
+    - regex: '(?:NX549J|Nubia Z11 mini S)[);/ ]'
       model: 'Nubia Z11 mini S'
+    - regex: 'NX606J[);/ ]'
+      model: 'Nubia Z18'
+    - regex: 'NX616J[);/ ]'
+      model: 'Nubia Z18S'
+    - regex: 'NX611J[);/ ]'
+      model: 'Nubia Z18 mini'
     - regex: 'NX551J[);/ ]'
       model: 'Nubia M2'
-    - regex: '(?:NX569H|NX563J)[);/ ]'
+    - regex: 'NX563J[);/ ]'
       model: 'Nubia Z17'
+    - regex: 'NX569[HJ][);/ ]'
+      model: 'Nubia Z17 Mini'
+    - regex: 'NX589J[);/ ]'
+      model: 'Nubia Z17 Mini S'
+    - regex: 'NX591J[);/ ]'
+      model: 'Nubia Z17 Lite'
+    - regex: 'NX595J'
+      model: 'Nubia Z17S'
+    - regex: 'NX612J[);/ ]'
+      model: 'Nubia V18'
+    - regex: 'NX627J'
+      model: 'Nubia Z20'
     - regex: 'NX513J[);/ ]'
       model: 'Nubia My Prague'
     - regex: 'NX601J[);/ ]'
       model: 'Nubia X6'
+    - regex: 'NX609J[);/ ]'
+      model: 'Nubia Red Magic'
+    - regex: 'NX659J[);/ ]'
+      model: 'Nubia Red Magic 5G'
+    - regex: 'NX619J[);/ ]'
+      model: 'Nubia Red Magic Mars'
+    - regex: 'NX629J[);/ ]'
+      model: 'Nubia Red Magic 3'
+    - regex: 'NX573J'
+      model: 'Nubia M2 Lite'
+    - regex: 'NX907J[);/ ]'
+      model: 'Nubia M2 Play'
+    - regex: 'NX541J'
+      model: 'Nubia N1'
+    - regex: 'NX597J'
+      model: 'Nubia N1 Lite'
+    - regex: 'NX575J'
+      model: 'Nubia N2'
+    - regex: 'NX6(08|17)J[);/ ]'
+      model: 'Nubia N3'
     - regex: '[UV]9180[);/ ]'
       model: 'V5 Red Bull'
     - regex: '[UV]9815[);/ ]'
-      model: 'Grand Memo'
+      model: 'Grand Memo LTE'
+    - regex: 'V779M'
+      model: 'Joey Jump 2'
+    - regex: 'V807'
+      model: 'Blade C'
+    - regex: 'V809'
+      model: 'Blade C2'
+    - regex: '(?:ZTE_)?V829'
+      model: 'Blade G Pro'
+    - regex: 'V882'
+      model: 'Lord'
+    - regex: 'V967S'
+      model: 'Grand X2'
+    - regex: 'V970M?|V987'
+      model: 'Grand X'
+    - regex: 'Z959[);/ ]'
+      model: 'Grand X3'
+    - regex: 'V8000'
+      model: 'Nova 4'
+    - regex: 'Z95[67]'
+      model: 'Grand X4'
+    - regex: 'Z987'
+      model: 'Grand X Max+'
+    - regex: '(?:ZTE_)?Grand[ _]Era'
+      model: 'Grand Era'
+    - regex: 'V788D'
+      model: 'Kis Plus'
     - regex: 'Z331[);/ ]'
       model: 'Z331'
-    - regex: 'Blade A520[);/ ]'
-      model: 'Blade A520'
+    - regex: 'N818S[);/ ]'
+      model: 'N818S'
+    - regex: 'Z5031O[);/ ]'
+      model: 'Optus X Spirit 2'
+    - regex: 'P545[);/ ]'
+      model: 'Optus X Power 2'
+    - regex: 'P609[);/ ]'
+      model: 'Optus X Wave'
+    - regex: 'Optus X Start[);/ ]'
+      model: 'Optus X Start'
+    - regex: 'Blade (A(0620|310|452|460|462|465|475|510|512|520|530|602|612|910)|L110|V0730|V0800|V580|V1000)[);/ ]'
+      model: 'Blade $1'
     - regex: 'Blade L2 Plus[);/ ]'
       model: 'Blade L2 Plus'
     - regex: 'Blade L2[);/ ]'
       model: 'Blade L2'
     - regex: 'Blade L3 Plus[);/ ]'
       model: 'Blade L3 Plus'
+    - regex: 'Blade L3 Apex[);/ ]'
+      model: 'Blade L3 Apex'
     - regex: 'Blade L3[);/ ]'
       model: 'Blade L3'
+    - regex: 'Blade L5 Plus[);/ ]'
+      model: 'Blade L5 Plus'
     - regex: 'Blade L5[);/ ]'
       model: 'Blade L5'
+    - regex: 'Blade L6[);/ ]'
+      model: 'Blade L6'
+    - regex: 'Blade L7A[);/ ]'
+      model: 'Blade L7A'
+    - regex: 'Blade L7[);/ ]'
+      model: 'Blade L7'
+    - regex: 'Blade L8(?:RU)?[);/ ]'
+      model: 'Blade L8'
+    - regex: 'Blade A3 2019-T[);/ ]'
+      model: 'Blade A3 (2019)'
+    - regex: 'Blade A5 2019-T[);/ ]'
+      model: 'Blade A5 (2019)'
+    - regex: 'BLADE A0622[);/ ]'
+      model: 'Blade A6'
+    - regex: 'BLADE A6 MAX[);/ ]'
+      model: 'Blade A6 Max'
+    - regex: 'Blade S6 Plus[);/ ]'
+      model: 'Blade S6 Plus'
     - regex: 'Blade S6[);/ ]'
       model: 'Blade S6'
+    - regex: 'T920[);/ ]'
+      model: 'Blade S7'
+    - regex: 'BLADE V Ultra[);/ ]'
+      model: 'Blade V Ultra'
     - regex: 'Blade V6 MAX[);/ ]'
       model: 'Blade V6 Max'
     - regex: 'Blade V6 Plus[);/ ]'
       model: 'Blade V6 Plus'
     - regex: 'Blade V6[);/ ]'
       model: 'Blade V6'
-    - regex: 'Blade L7[);/ ]'
-      model: 'Blade L7'
+    - regex: 'Blade (?:V7 Lite|V0720)[);/ ]'
+      model: 'Blade V7 Lite'
     - regex: 'Blade V7[);/ ]'
       model: 'Blade V7'
     - regex: 'Blade X7[);/ ]'
       model: 'Blade X7'
+    - regex: 'Blade X9[);/ ]'
+      model: 'Blade X9'
+    - regex: 'Blade V8Q[);/ ]'
+      model: 'Blade V8Q'
     - regex: 'Blade V8 SE[);/ ]'
       model: 'Blade V8 SE'
+    - regex: 'Blade V9 Vita[);/ ]'
+      model: 'Blade V9 Vita'
+    - regex: 'Blade V9[);/ ]'
+      model: 'Blade V9'
+    - regex: 'Blade V10 Vita[);/ ]'
+      model: 'Blade V10 Vita'
+    - regex: 'BLADE V0820[);/ ]'
+      model: 'Blade V8 Lite'
+    - regex: 'BLADE V0850[);/ ]'
+      model: 'Blade V8 Mini'
+    - regex: '(?:Blade[ _])?(Apex2|G (LTE|Lux)|Vec|A510)'
+      model: 'Blade $1'
     - regex: 'Z768G[);/ ]'
       model: 'Midnight'
     - regex: 'Z820'
@@ -8059,6 +15093,8 @@ ZTE:
       model: 'Blade V8 Pro'
     - regex: 'Z839'
       model: 'Blade Vantage'
+    - regex: 'Z930L'
+      model: 'Unico LTE'
     - regex: 'Z965'
       model: 'Blade X'
     - regex: 'Z981'
@@ -8067,30 +15103,28 @@ ZTE:
       model: 'Blade Z Max'
     - regex: 'Z983'
       model: 'Blade X Max'
-    - regex: 'Blade (A460)'
-      model: 'Blade $1'
     - regex: 'Z717[BV]L[);/ ]'
       model: 'Citrine LTE'
+    - regex: 'Z233VL[);/ ]'
+      model: 'Cymbal-C LTE'
     - regex: 'Z233V'
       model: 'Cymbal LTE'
-    - regex: 'Z233VL'
-      model: 'Cymbal-C LTE'
     - regex: 'Z232TL'
       model: 'Cymbal-G LTE'
     - regex: 'Z353VL'
       model: 'Cymbal-T LTE'
-    - regex: 'Z956'
-      model: 'Grand X 4'
     - regex: 'Z718TL'
       model: 'Jasper LTE'
+    - regex: 'KIS II Max'
+      model: 'Kis II Max'
+    - regex: 'Kis 3'
+      model: 'Kis 3'
     - regex: '(?:Z798BL|Z799VL)[);/ ]'
       model: 'Majesty Pro LTE'
     - regex: 'Z899VL'
       model: 'Majesty Pro Plus LTE'
     - regex: 'Z828TL'
       model: 'Midnight Pro LTE'
-    - regex: 'NX406E[);/ ]'
-      model: 'Nubia Z5S'
     - regex: 'Z792'
       model: 'Fanfare'
     - regex: 'Z812'
@@ -8104,11 +15138,13 @@ ZTE:
     - regex: 'Z835'
       model: 'Maven 3'
     - regex: 'Z851[);/ ]'
-      model: 'Prelude+'
+      model: 'Prelude Plus'
     - regex: 'Z851M'
       model: 'Overture 3'
     - regex: 'Z852'
       model: 'Fanfare 3'
+    - regex: 'Z828'
+      model: 'Avid Plus'
     - regex: 'Z855'
       model: 'Avid 4'
     - regex: 'Z833'
@@ -8127,17 +15163,53 @@ ZTE:
       model: 'ZMax Champ LTE'
     - regex: '(?:Z958|Z955A)[);/ ]'
       model: 'ZMax 2'
+    - regex: 'dandelion[);/ ]'
+      model: 'ZMax 3'
+    - regex: 'Z963VL'
+      model: 'Max Duo LTE'
+    - regex: 'Z970'
+      model: 'ZMax Z970'
     - regex: 'Z986DL'
       model: 'MAX Blue LTE'
+    - regex: 'Z992'
+      model: 'Avail 2'
     - regex: 'Z999'
       model: 'Axon M'
-    - regex: 'A2017U'
+    - regex: 'B2016'
+      model: 'Axon Mini'
+    - regex: 'A2015'
+      model: 'Axon Tianji'
+    - regex: 'A2017[GU]?'
       model: 'Axon 7'
+    - regex: 'A2019G Pro'
+      model: 'Axon Pro'
     - regex: 'B2017G'
       model: 'Axon 7 Mini'
+    - regex: 'A2020G? Pro[);/ ]'
+      model: 'Axon 10 Pro'
     - regex: 'Z667T'
       model: 'Zinger'
-      
+    - regex: 'V?975|geek'
+      model: 'Geek'
+    - regex: 'Z716BL'
+      model: 'Citrine LTE'
+    - regex: 'X500'
+      model: 'Score'
+    - regex: 'X501'
+      model: 'Groove'
+    - regex: 'G-X991'
+      model: 'Rio'
+    - regex: 'F-450'
+      model: 'Adamant'
+    - regex: 'Z936L[);/ ]'
+      model: 'Lever'
+    - regex: 'MO-01J[);/ ]'
+      model: 'Mono'
+    - regex: 'V865M[);/ ]'
+      model: 'V865M'
+    - regex: 'Z6621O[);/ ]'
+      model: 'Optus X Vista'
+
     - regex: 'AxonPhone ([^;/]+) Build'
       model: 'AxonPhone $1'
     - regex: '([a-z0-9]+)_USA_Cricket'
@@ -8153,15 +15225,19 @@ ZTE:
       model: '$1'
 
 Zuum:
-  regex: 'Zuum[ _-]|MAGNO|STEDI|COVET'
+  regex: 'Zuum[ _-]|COVET|MAGNO|ONIX S|STEDI|STELLAR Z'
   device: 'smartphone'
   models:
     - regex: 'COVET'
       model: 'Covet'
     - regex: 'MAGNO'
       model: 'Magno'
+    - regex: 'ONIX S'
+      model: 'Onix S'
     - regex: 'STEDI'
       model: 'Stedi'
+    - regex: 'STELLAR Z'
+      model: 'Stellar Z'
     - regex: 'Zuum[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Zuum[ _-]?([^;/)]+)[);/ ]'
@@ -8169,9 +15245,13 @@ Zuum:
 
 # Zen
 Zen:
-  regex: '(Admire[_ ][^/;]+|Cinemax[^/;)]+)(?:Build|\))'
+  regex: '(Admire[_ ][^/;]+|Cinemax[^/;)]+)(?:Build|\))|AdmireGlam'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'AdmireGlam[);/ ]'
+      model: 'Admire Glam'
+    - regex: '(Admire[_ ][^/;]+|Cinemax[^/;)]+)(?:Build|\))'
+      model: '$1'
 
 # Zync
 Zync:
@@ -8196,16 +15276,76 @@ Lemhoov:
   models:
     - regex: 'Lemhoov[ _-]([^/;]+) Build'
       model: '$1'
-
-#MTC
+# MTC
 MTC:
-  regex: 'MTC[ _](978|982[OT]|982)|SMART[ _]Race[ _]4G'
+  regex: 'MTC[ _](968|97[82]|970|982[OT]?|1078)|(?:MTC[_ ])?SMART[ _]?(?:Race[2]?|Sprint|Run|Surf[2]?)[ _]4G|MTC975|MTC[ _]SMART[ _](?:Run|Start_2)'
   device: 'smartphone'
   models:
-    - regex: 'MTC[ _](978|982[OT]|982)'
+    - regex: 'MTC[ _]?(97[258]|970[H]?|982[OT]?|968)'
       model: '$1'
+    - regex: 'MTC[ _](1078)'
+      model: '$1'
+      device: 'tablet'
     - regex: 'SMART[ _]Race[ _]4G'
       model: 'Smart Race 4G'
+    - regex: 'SMART[ _]Race2[ _]4G'
+      model: 'Smart Race 2 4G'
+    - regex: '(MTC_)?SMART[ _]Sprint[ _]4G'
+      model: 'Smart Sprint 4G'
+    - regex: '(MTC_)?SMART[ _]Start_2'
+      model: 'Smart Start 2'
+    - regex: 'SMART[ _]?Run(?:[ _]4G)?'
+      model: 'Smart Run 4G'
+    - regex: 'SMART[ _]Surf2[ _]4G'
+      model: 'Smart Surf 2 4G'
+    - regex: 'SMART[ _]Surf[ _]4G'
+      model: 'Smart Surf 4G'
+
+# MegaFon
+MegaFon:
+  regex: 'MegaFon|MFLoginPh|MegLogPh|(MFLogin[34]T?|MS3B|SP-A5|SP-A20i)[)\; ]'
+  device: 'smartphone'
+  models:
+    - regex: 'MFLoginPh|MegLogPh'
+      model: 'Login+'
+    - regex: 'MFLogin4'
+      model: 'Login 4 LTE'
+    - regex: 'MFLogin3T|MegaFon Login 3'
+      model: 'Login 3'
+      device: 'tablet'
+    - regex: 'MS3B|Megafon Optima'
+      model: 'Optima'
+    - regex: 'SP-A20i'
+      model: 'Mint'
+    - regex: '(SP-A5)'
+      model: '$1'
+
+# Inoi
+Inoi:
+  regex: 'INOI'
+  device: 'smartphone'
+  models:
+    - regex: 'INOI 2 Lite 2019'
+      model: '2 Lite (2019)'
+    - regex: 'INOI 2 2019'
+      model: '2 (2019)'
+    - regex: 'INOI[_ ]([^;/]+)(?: Build|\))'
+      model: '$1'
+
+# Vertex
+Vertex:
+  regex: 'Lion_Dual|V709X|Baccara|Eagle[ _]4G|ImpressMAX|Impress[ _]([^;/]+)(?:Build|\))'
+  device: 'smartphone'
+  models:
+    - regex: '(Lion_Dual|Baccara|Eagle[ _]4G)'
+      model: '$1'
+    - regex: 'ImpressMAX[)\; ]'
+      model: 'Impress Max'
+    - regex: '(Impress[ _]([^;/]+))(?:Build|\))'
+      model: '$1'
+    - regex: '(V709X)'
+      device: 'tablet'
+      model: '$1'
 
 # Devices with undectable brand, but detectable model
 Unknown:
@@ -8213,6 +15353,12 @@ Unknown:
   device: 'tv'
   model: 'Web TV'
 
+# Starway
+Starway:
+  regex: 'Andromeda[ _]S(707|84[05]|850|8)[;/) ]'
+  device: 'tablet'
+  model: 'Andromeda S$1'
+
 # Savio
 Savio:
   regex: 'TB-PO1 Build'
@@ -8220,3 +15366,1619 @@ Savio:
   models:
     - regex: '(TB-PO1)'
       model: '$1'
+
+# Simbans
+Simbans:
+  regex: 'TangoTab|Presto[ )]|Ultimax|Valumax|S72-B|SX2W'
+  device: 'tablet'
+  models:
+    - regex: 'TangoTab'
+      model: 'TangoTab'
+    - regex: 'Ultimax'
+      model: 'Ultimax'
+    - regex: 'Valumax'
+      model: 'Valumax'
+    - regex: 'Presto'
+      model: 'Presto'
+    - regex: 'S72-B'
+      model: 'S72-B'
+    - regex: 'SX2W'
+      model: 'SX2W'
+
+# MYFON
+MYFON:
+  regex: 'MYPAD7s'
+  device: 'tablet'
+  model: 'My Pad 7s'
+
+# X-TIGI
+X-TIGI:
+  regex: 'X[-_]TIGI'
+  device: 'smartphone'
+  models:
+    - regex: 'X-TIGI_JOY10_PRO'
+      model: 'Joy 10 Pro'
+      device: 'tablet'
+    - regex: 'X-TIGI_JOY7_MAX'
+      model: 'Joy 7 Max'
+      device: 'tablet'
+    - regex: 'X-TIGI[_ ]V28[_ ]LTE'
+      model: 'V28 LTE'
+    - regex: 'X[-_]TIGI[_ ]V19'
+      model: 'V19'
+    - regex: 'X-TIGI[_ ]Photo[_ ]P11'
+      model: 'Photo P11'
+    - regex: 'X[-_]TIGI[ _-]([^/;)]+) Build'
+      model: '$1'
+
+# Xiaolajiao
+Xiaolajiao:
+  regex: '(LA2-(?:L|S[N]?)|HLA Note3|20190416Q|20170608S|20180322D)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'HLA Note3[);/ ]'
+      model: 'Red Pepper Note 3'
+    - regex: '(LA2-(?:L|S[N]?))[);/ ]'
+      model: '$1'
+    - regex: '(20190416Q)[);/ ]'
+      model: '$1'
+    - regex: '20170608S[);/ ]'
+      model: 'Red Pepper Plus'
+    - regex: '20180322D[);/ ]'
+      model: 'E Sports'
+
+# Ritmix
+Ritmix:
+  regex: '(RMD[-_](?:10(?:2[689]|30|5[089])|1121|75[01]|726|85[57]|870)|RMP-(?:450|50[56]|530|600))[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'RMD[-_](10(?:2[689]|30|5[089])|1121|75[01]|726|85[57]|870)[);/ ]'
+      model: 'RMD-$1'
+    - regex: 'RMP[-_](450|50[56]|530|600)[);/ ]'
+      model: 'RMP-$1'
+      device: 'smartphone'
+
+# Ross&Moor
+'Ross&Moor':
+  regex: 'RMD[-_](974R|600)[);/ ]'
+  device: 'tablet'
+  model: 'RMD-$1'
+
+# R-TV
+R-TV:
+  regex: 'R-TV BOX[ _]?(MINI\+|X99|X10 PRO|[RXS]10)'
+  device: 'tv'
+  model: 'Box $1'
+
+# NEXBOX
+NEXBOX:
+  regex: '(MXQ|MXQ-Pro)-NEXBOX|NEXBOX-([^) ]+)'
+  device: 'tv'
+  models:
+    - regex: 'MXQ-Pro-NEXBOX'
+      model: 'MXQ Pro'
+    - regex: 'MXQ-NEXBOX'
+      model: 'MXQ'
+    - regex: 'NEXBOX-([^) ]+)'
+      model: '$1'
+
+# True
+'True':
+  regex: 'SMART[ _](MAX 4.0 PLUS|4G GEN C [45].[05]|4G Speedy 5.0 Plus|4G[_ ]Speedy[_ ]5inch)'
+  device: 'smartphone'
+  models:
+    - regex: 'SMART MAX 4.0 PLUS'
+      model: 'Smart Max 4.0 Plus'
+    - 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[_ ]Speedy[_ ]5inch'
+      model: 'Smart 4G Speedy 5'
+
+Yandex:
+  regex: '(YNDX-?000SB)[;)\ ]'
+  device: 'smartphone'
+  model: 'YNDX-000SB'
+
+# FORME
+FORME:
+  regex: 'FORME[ _-]'
+  device: 'smartphone'
+  models:
+    - regex: 'FORME[ _-]F520[;)\ ]'
+      model: 'Forever'
+    - regex: 'FORME[ _-](A37|R7S)[;)\ ]'
+      model: '$1'
+
+# Shuttle
+Shuttle:
+  regex: '(PNT-704[025])[;)/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# BDF
+BDF:
+  regex: '(BDF[- ](?:819|P10|K107H|KT107|MT6753|X20)|K960N_MT(?:6580|6753)(?:_32_N)?)[;)/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'BDF[- ](819|P10|K107H|KT107|MT6753|X20)[;)/ ]'
+      model: '$1'
+    - regex: 'K960N_MT(6580|6753)(_32_N)?[;)/ ]'
+      model: 'BK960N MT$1'
+
+# Highscreen
+Highscreen:
+  regex: 'HIGHSCREEN|(Easy[- ]Power(?:[- ]Pro)?|Pure[_ ]Power|Power Ice(?: Max)?|Easy[_ ]([SFL]|XL)(?:_Pro)?|Razar_Pro|Power Rage(?: Evo)?|Zera-S-Power|Zera[ _][UFS]|Power[ _]?Five[ _]?(?:Pro|Evo|Max)|PowerFour|BOOST II(?:se)?|FestXL|Tasty|Boost3)[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(Power Ice(?:[ ](?:Max|Evo))?|Power Rage(?: Evo)?|Zera[ _][UFS])[;)/ ]'
+      model: '$1'
+    - regex: 'PowerFivePro[;)/ ]'
+      model: 'Power Five Pro'
+    - regex: 'Power Five Evo[;)/ ]'
+      model: 'Power Five Evo'
+    - regex: 'Power Five Max[;)/ ]'
+      model: 'Power Five Max'
+    - regex: 'FestXL[;)/ ]'
+      model: 'Fest XL'
+    - regex: 'PowerFour[;)/ ]'
+      model: 'Power Four'
+    - regex: 'Pure[_ ]Power[;)/ ]'
+      model: 'Pure Power'
+    - regex: 'Razar_Pro[;)/ ]'
+      model: 'Razar Pro'
+    - regex: 'Easy[_ ]([SLF]|XL)[_ ]Pro[;)/ ]'
+      model: 'Easy $1 Pro'
+    - regex: 'Easy[_ ]([SFL]|XL)[;)/ ]'
+      model: 'Easy $1'
+    - regex: '(?:HIGHSCREEN )?Easy[- ]Power[- ]Pro[;)/ ]'
+      model: 'Easy Power Pro'
+    - regex: '(?:HIGHSCREEN )?Easy-Power[;)/ ]'
+      model: 'Easy Power'
+    - regex: 'BOOST II[;)/ ]'
+      model: 'Boost 2'
+    - regex: 'BOOST IIse[;)/ ]'
+      model: 'Boost 2 SE'
+    - regex: 'BOOST3[;)/ ]'
+      model: 'Boost 3'
+    - regex: 'Zera-S-Power[;)/ ]'
+      model: 'Zera S Power'
+    - regex: 'Tasty[;)/ ]'
+      model: 'Tasty'
+
+# CVTE
+CVTE:
+  regex: 'CVTE[_ ](MSD338_(:?1G|512M))[;)/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Globex
+Globex:
+  regex: '(GU1011C|GU8012C|GU7013C|GU730C|GU-6012B)[;)/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'GU8012C[;)/ ]'
+      model: 'X8'
+    - regex: 'GU-6012B[;)/ ]'
+      model: 'GU6012B'
+    - regex: '(GU1011C|GU7013C|GU730C)[;)/ ]'
+      model: '$1'
+
+# Atom
+Atom:
+  regex: 'ATOM-(108AM)[;)/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Qumo
+Qumo:
+  regex: 'QUMO[ _]?|(Vega[ _]?78[23])[;)/ ]'
+  device: 'tablet'
+  models:
+    - regex: '(?:QUMO[ _]?)?Vega[ _]?(78[23]|8002)[;)/ ]'
+      model: 'Vega $1'
+    - regex: 'Yooda[;)/ ]'
+      model: 'Yooda'
+    - regex: '(?:QUMO)?(Sirius 101-4G 8GB Black|Altair 701 8GB Black|Altair 71 4GB Black|Altair 700[24]|Altair 706)[;)/ ]'
+      model: '$1'
+    - regex: 'QUMO[ _]Quest[ _]?(35[34]|40[26]|45[28]|476|507|570|600)[;)/ ]'
+      device: 'smartphone'
+      model: 'Quest $1'
+
+# Umax
+Umax:
+  regex: 'VisionBook[ _]|[78]Qa_3G[;)/ ]'
+  device: 'tablet'
+  models:
+    - regex: '(VisionBook[ _](?:10Qi|7Q[i]?|8Q[ei]?|P70|8Qi_3G)(?:[ _](?:[34]G|Plus|LTE))?)[;)/ ]'
+      model: '$1'
+    - regex: '([78])Qa_3G[;)/ ]'
+      model: 'VisionBook $1Qa 3G'
+    - regex: '(VisionBook[ _](?:P50 LTE|P55 LTE(?: Pro)?))[;)/ ]'
+      device: 'smartphone'
+      model: '$1'
+
+# Mann
+Mann:
+  regex: '(ZUG 3|ZUG 5S(?: Q)?)[;)/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Unihertz
+Unihertz:
+  regex: '(Titan|Jelly-Pro)[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(Jelly)-(Pro)[;)/ ]'
+      model: '$1 $2'
+    - regex: '(Titan)[;)/ ]'
+      model: '$1'
+
+# Chuwi
+Chuwi:
+  regex: 'CW-(Hi8-super|Hi12|V99|V17HD3G|VX8-3G|V88-QUAD|V9-DUAL|V88S|Vi[78]|[HV]i10 (pro|plus))[;)/ ]'
+  device: 'tablet'
+  models:
+    - regex: '(CW-Hi8-super)[;)/ ]'
+      model: 'Hi8'
+    - regex: 'CW-(Vi10) plus[;)/ ]'
+      model: '$1 Plus'
+    - regex: 'CW-(V88)-QUAD[;)/ ]'
+      model: '$1 Quad'
+    - regex: 'CW-(V9)-DUAL[;)/ ]'
+      model: '$1 Dual'
+    - regex: 'CW-(V17HD|VX8)-?(3G)[;)/ ]'
+      model: '$1 $2'
+    - regex: 'CW-(Hi10) pro[;)/ ]'
+      model: '$1 Pro'
+    - regex: 'CW-(Vi[78]|Hi12|V99|V88S)[;)/ ]'
+      model: '$1'
+
+# Bezkam
+Bezkam:
+  regex: 'BEZKAM (BK-RAM2)[;)/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# NG Optics
+'NG Optics':
+  regex: '(NG3128HD)[;)/ ]'
+  device: 'tv'
+  model: '$1'
+
+# KATV1
+KATV1:
+  regex: '(KATV-01) PRO[;)/ ]'
+  device: 'tv'
+  model: '$1 Pro'
+
+# Ghong
+Ghong:
+  regex: 'GHONG(V10)[;)/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Xoro
+Xoro:
+  regex: '(?:TelePAD(?:795|731|1032|10A3|7A3)|Era 2X|HMT(?:390Q?|400)|HST 260)[;)/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'TelePAD(7|10)A3 4G[;)/ ]'
+      model: 'TelePad $1 A3 4G'
+    - regex: 'TelePAD(795|731|1032)[;)/ ]'
+      model: 'TelePad $1'
+
+    - regex: 'HMT(390Q?|400)[;)/ ]'
+      model: 'HMT $1'
+      device: 'portable media player'
+
+    - regex: 'HST 260[;)/ ]'
+      model: 'HST 260'
+      device: 'tv'
+
+    - regex: '(Era 2X)[;)/ ]'
+      model: '$1'
+      device: 'smartphone'
+
+# Vinga
+Vinga:
+  regex: 'VMP-(021-82|041-162|011-81)[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'VMP-021-82'
+      model: '021'
+    - regex: 'VMP-041-162'
+      model: '041'
+    - regex: 'VMP-011-81'
+      model: '011'
+
+# Nuvo
+Nuvo:
+  regex: 'Nuvo[_ ](NS35|Blue ND40|Green[_ ]ND[_ ]45)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Nuvo[_ ](NS35)[);/ ]'
+      model: '$1'
+    - regex: 'Blue (ND40)[);/ ]'
+      model: '$1'
+    - regex: 'Green[_ ]ND[_ ]45[);/ ]'
+      model: 'ND45'
+
+# Sunvell
+Sunvell:
+  regex: 'T95ZPLUS[);/ ]'
+  device: 'tv'
+  model: 'T95Z Plus'
+
+# AllDocube (https://www.alldocube.com/)
+AllDocube:
+  regex: '(?:T1001XS|iPlay_20|U1006)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'T1001XS[);/ ]'
+      model: 'M5XS'
+    - regex: 'U1006[);/ ]'
+      model: 'iPlay 10 Pro 10.1"'
+    - regex: 'iPlay_20[);/ ]'
+      model: 'iPlay 20'
+
+# Ugoos
+Ugoos:
+  regex: 'UGOOS-AM6[);/ ]'
+  device: 'tv'
+  model: 'AM6'
+
+# Yxtel
+Yxtel:
+  regex: 'YXTEL_([HU]1|U3)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Proline
+Proline:
+  regex: '(H10882M-TN)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Yota
+Yota:
+  regex: '(YD20[16]|YOTA 3[+])[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'YD20[16][);/ ]'
+      model: 'Phone 2'
+    - regex: 'YOTA 3[+][);/ ]'
+      model: 'Phone 3 Plus'
+
+# Mystery
+Mystery:
+  regex: '(MYSTERY|MID-(?:123G|72[12]|7[01348]3G|753G|833G))[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'MID-(123G|72[12]|7[01348]3G|753G|833G)[);/ ]'
+      model: 'MID-$1'
+
+# Ritzviva
+Ritzviva:
+  regex: '(RITZVIVA[_ ]S500C)[);/ ]'
+  device: 'smartphone'
+  model: 'S500C'
+
+# DeWalt
+DeWalt:
+  regex: 'DeWalt (MD501)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Runbo
+Runbo:
+  regex: 'Runbo'
+  device: 'smartphone'
+  models:
+    - regex: 'Runbo[ _-]?(X5-W|F1 Plus|F1-TT|F1-EN|F1|TT|Q5-S|X5-King|X6|Q5)[);/ ]'
+      model: '$1'
+
+# NewsMy
+NewsMy:
+  regex: '(CarPad-(?:II|III)-P)[);/ ]'
+  device: 'car browser'
+  model: '$1'
+
+# Daewoo
+Daewoo:
+  regex: 'Daewoo|(DTA-07IDRF)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: '(DTA-07IDRF)[);/ ]'
+      model: 'Archive 7P'
+
+    - regex: 'Daewoo (Android TV 638)[);/ ]'
+      model: '$1'
+      device: 'tv'
+
+# Vesta
+Vesta:
+  regex: 'VESTA32LD86[);/ ]'
+  device: 'tv'
+  model: 'SmartT V2.0 32LD86S'
+
+# Spectrum
+Spectrum:
+  regex: '(CARBONO_5|CUARZO_6|DIAMANTE_5|VULCANO_55)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'VULCANO_55[);/ ]'
+      model: 'Vulcano 5.5"'
+    - regex: 'CARBONO_5[);/ ]'
+      model: 'Carbono 5.0"'
+    - regex: 'CUARZO_6[);/ ]'
+      model: 'Cuarzo 6.0"'
+    - regex: 'DIAMANTE_5[);/ ]'
+      model: 'Diamante 5.0"'
+
+# Kivi
+Kivi:
+  regex: '(?:24H600G[RU]|24FR50WU|24HK30B|32HR55GU|4[39]UP50GU|40UR50G[RU]|40U600G[RU]|55UP50GU|50U600GU|55UR50GR|40FK30G|40FR50BR|43UK35G|50FK30G|50UK35G|32HR50GR|55UC30G|32HK30G|40FK30G|32HR50GU|43UK30G|32FR50(?:WR|BU)|32FK3[02]G)(?:_-Ver0[0-9])?[);/ ]'
+  device: 'tv'
+  models:
+    - regex: '(24H600G[RU]|24FR50WU|24HK30B|32HR55GU|4[39]UP50GU|40UR50G[RU]|40U600G[RU]|55UP50GU|50U600GU|55UR50GR|40FK30G|40FR50BR|43UK35G|50FK30G|50UK35G|32HR50GR|32FR50(?:WR|BU)|32FK3[02]G)[);/ ]'
+      model: '$1'
+    - regex: '(55UC30G|40FK30G|43UK30G|32HR50G[RU]|32HK30G|32FK32G)_-Ver0([0-9])[);/ ]'
+      model: '$1 v$2'
+
+# Divisat
+Divisat:
+  regex: '(Divisat)[);/ ]'
+  device: 'tv'
+  models:
+    - regex: '(J-Link)[);/ ]'
+      model: '$1'
+
+# Kanji
+Kanji:
+  regex: 'KJ-(OB03|YUBI)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'KJ-OB03[);/ ]'
+      model: 'Cata 7'
+    - regex: 'KJ-YUBI[);/ ]'
+      model: 'Yubi 3G'
+
+#Kaiomy
+Kaiomy:
+   regex: 'KaiCloud[ ]?(7[48]4|942)[);/ ]'
+   device: 'tablet'
+   model: 'KaiCloud $1'
+
+# National
+National:
+  regex: '(NX-32THS100)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Vsun
+Vsun:
+  regex: 'VSUN (ILLUSION|RACE|V9)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'ILLUSION[);/ ]'
+      model: 'Illusion'
+    - regex: 'RACE[);/ ]'
+      model: 'Race'
+    - regex: '(V9)[);/ ]'
+      model: '$1'
+
+# Shift Phones
+Shift Phones:
+  regex: '(SHIFT6m)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# RugGear
+RugGear:
+  regex: '(RugGear|RG(?:310|500|65[05]|702|710|850))[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(RG[0-9]+)[);/ ]'
+      model: '$1'
+
+# Aligator
+Aligator:
+  regex: 'ALIGATOR[_);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'ALIGATOR[ _](S4080|S50(?:6[56]|[678]0)|RX510)[);/ ]'
+      model: '$1'
+
+# Maxcom
+Maxcom:
+  regex: '(MS(?:45[036]|505|514)|MS457(?:PLUS)?)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(MS457)PLUS[);/ ]'
+      model: '$1 Plus'
+    - regex: 'MS(45[0367]|505|514)[);/ ]'
+      model: 'MS$1'
+
+# Luna
+Luna:
+  regex: 'LUNA[ _](V55|G60)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Protruly
+Protruly:
+  regex: 'PROTRULY[ _](D[78]|V10S)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# JFone
+JFone:
+  regex: 'JFone[ _](JS501)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Uhans
+Uhans:
+  regex: '(A101S)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Soyes
+Soyes:
+  regex: 'SOYES[ _]([67]S)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Zidoo
+Zidoo:
+  regex: 'ZIDOO[ _](H6 Pro|X6 Pro|X9S|Z10|X[158])[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Zfiner
+Zfiner:
+  regex: 'ZFINERY900[);/ ]'
+  device: 'tablet'
+  model: 'Y900'
+
+# iGet
+iGet:
+  regex: 'SMART_(G10[12]|G71|G81[H]?)[);/ ]'
+  device: 'tablet'
+  model: 'Smart $1'
+
+# iVA
+iVA:
+  regex: '(LAMCY L350|IVA S6)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'LAMCY L350[);/ ]'
+      model: 'Lamcy L350'
+    - regex: 'IVA S6[);/ ]'
+      model: 'S6'
+
+# Phicomm
+Phicomm:
+  regex: '(PHICOMM)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'C630 \(CLUE L\)[);/ ]'
+      model: 'Clue L'
+    - regex: 'E653\(ENERGY L\)[);/ ]'
+      model: 'Energy L'
+    - regex: 'PHICOMM ENERGY 3\+[);/ ]'
+      model: 'Energy 3+'
+    - regex: 'CLUE (2S|M)[);/ ]'
+      model: 'Clue $1'
+
+# Huadoo
+Huadoo:
+  regex: 'Huadoo[ _](HG0[46]|HG11|V[34])[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Gome
+Gome:
+  regex: 'GOME[_ ](2018X38A|2016G68A|2017M27A|2016M25A|C7_Note_Plus|U9|S[17])[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'GOME[_ ](2018X38A)[);/ ]'
+      model: 'C72'
+    - regex: 'GOME[_ ](2016G68A)[);/ ]'
+      model: 'K1'
+    - regex: 'GOME[_ ](2016M25A)[);/ ]'
+      model: 'U1'
+    - regex: 'GOME[_ ](2017M27A)[);/ ]'
+      model: 'U7'
+    - regex: 'GOME[_ ](C7_Note_Plus|U9|S[17])[);/ ]'
+      model: '$1'
+
+# Voyo
+Voyo:
+  regex: 'VOYO[_ ](A15)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Ryte (Ryte Mobile)
+Ryte:
+  regex: 'RYTE (U55 LTE)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Vontar
+Vontar:
+  regex: '(HK1 (?:Max|MINI|PLUS|PRO)|VONTAR[ -](?:Z[58]|V1|KIII|MX-4K))[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'VONTAR[ -](Z[58]|V1|KIII|MX-4K)[);/ ]'
+      model: '$1'
+    - regex: 'HK1 Max[);/ ]'
+      model: 'HK1 Max'
+    - regex: 'HK1 MINI[);/ ]'
+      model: 'HK1 Mini'
+    - regex: 'HK1 PLUS[);/ ]'
+      model: 'HK1 Plus'
+    - regex: 'HK1 PRO[);/ ]'
+      model: 'HK1 Pro'
+
+# Vorke
+Vorke:
+  regex: 'VORKE (Z[15]|Z6(?: Plus)?)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Wigor
+Wigor:
+  regex: 'Wigor (V4)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# NEXON
+NEXON:
+   regex: 'NEXON (X[19])[);/ ]'
+   device: 'tv'
+   model: '$1'
+
+# ONN
+ONN:
+  regex: '(ONA19TB00[27])[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Q.Bell
+'Q.Bell':
+  regex: '(QPHONE[_ ](?:10.1|9.1|5.4))[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Datawind
+Datawind:
+  regex: '(DW-PS3G5)[);/ ]'
+  device: 'smartphone'
+  model: 'Pocket Surfer 3G5'
+
+# Droxio
+Droxio:
+  regex: 'DROXIO (C40|B45)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Goophone
+Goophone:
+  regex: '(?:M(G492|L7[JK]2)CH|MN(4A2|8J2)ZP|MGA92ZP|MKU82ZP|MNGW2CH|MNH02CH|MNRM2CH)[/]A[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(?:MG492CH|MGA92ZP)[/]A[);/ ]'
+      model: 'I6 Plus'
+    - regex: 'ML7[JK]2CH[/]A[);/ ]'
+      model: 'I6'
+    - regex: 'MKU82ZP[/]A[);/ ]'
+      model: 'I6S'
+    - regex: 'MNGW2CH[/]A[);/ ]'
+      model: 'I6S Plus'
+    - regex: '(?:MN4A2ZP|MNH02CH)[/]A[);/ ]'
+      model: 'I7'
+    - regex: '(?:MN8J2ZP|MNRM2CH)[/]A[);/ ]'
+      model: 'I7 Plus'
+
+# PocketBook
+PocketBook:
+  regex: 'PocketBook SURFpad 3 \(([\d]+).([\d]+)["]?\)[);/ ]'
+  device: 'tablet'
+  model: 'Surfpad 3 $1.$2"'
+
+# Bitmore
+Bitmore:
+  regex: '(?:Mobitab10c-3G|Tab1011Q_II)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: '(Mobitab)(10)c-3G[);/ ]'
+      model: '$1 $2C 3G'
+    - regex: 'Tab1011Q_II[);/ ]'
+      model: 'Tab1011Q II'
+
+# Kuliao
+Kuliao:
+  regex: 'KULIAO (K10)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Sugar
+Sugar:
+  regex: 'SUGAR (?:C[12]1|[YF]11|[YFS]9|C6|[FY]7|Y8|Y1[25])[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'SUGAR Y([78]) MAX[);/ ]'
+      model: 'Y$1 Max'
+    - regex: 'SUGAR F7 Mini[);/ ]'
+      model: 'F7 Mini'
+    - regex: 'SUGAR (C[12]1|[YF]11|[YFS]9|C6|Y7|Y1[25])[);/ ]'
+      model: '$1'
+
+
+# Xshitou
+Xshitou:
+  regex: 'Xshitou[_ ](P7)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# JKL
+JKL:
+  regex: 'JKL[_ ](A28)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Gree
+Gree:
+  regex: '(G0215D|G0245D|G0335D)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Vodacom
+Vodacom:
+  regex: '(?:Vodacom)[ _](Power Tab 10)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# VKworld
+VKworld:
+  regex: '(?:(?:VK700)-MAX|T5SE)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(VK700)-MAX[);/ ]'
+      model: '$1 Max'
+    - regex: 'T5SE[);/ ]'
+      model: 'T5 SE'
+
+# Mito
+Mito:
+  regex: 'MITO[- _](A(?:1[068]|39|55|180|2[36]0|313|322|33|3[136]0|[35]50|6[89]|7[235]|82|[356]0|810|950)|T(?:10|35|3[03]0|510|888)|311)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'MITO[ _](A(?:1[068]|39|55|180|2[36]0|33|322|313|3[136]0|[35]50|6[89]|7[235]|82|[356]0|810|950))[);/ ]'
+      model: '$1'
+    - regex: 'MITO-(311)[);/ ]'
+      model: '$1'
+    - regex: 'MITO[ _](T(?:10|35|3[03]0|510|888))[);/ ]'
+      device: 'tablet'
+      model: '$1'
+
+# TWM
+TWM:
+  regex: 'Amazing[ _](X[35]s|X[2356]|A5S|A[48]|A4S)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Amazing[ _](X[35])s[);/ ]'
+      model: 'Amazing $1S'
+    - regex: 'Amazing[ _](A5S|X[2356]|A[48]|A4S)[);/ ]'
+      model: 'Amazing $1'
+
+# Onix
+Onix:
+  regex: '(AT101-1116)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Mobo
+Mobo:
+  regex: '(MT7-442D)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Macoox
+Macoox:
+  regex: '(MC-X7MINI)[);/ ]'
+  device: 'smartphone'
+  model: 'MC-X7 Mini'
+
+# Prixton
+Prixton:
+  regex: '(T7012Q)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Newland
+Newland:
+  regex: '(?:NLS-MT90)[);/ ]'
+  device: 'smartphone'
+  model: 'MT90 Orca'
+
+# Orbic
+Orbic:
+  regex: '(?:RC555L|RC501L)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'RC555L[);/ ]'
+      model: 'Wonder'
+    - regex: 'RC501L[);/ ]'
+      model: 'Slim'
+
+# RED
+RED:
+  regex: '(?:H1A1000)[);/ ]'
+  device: 'smartphone'
+  model: 'Hydrogen One'
+
+# Contixo
+Contixo:
+  regex: 'Contixo|(?:CX-1045 3G)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'CX-1045 3G[);/ ]'
+      model: 'CX-1045 3G'
+    - regex: 'CONTIXO GX 1035[);/ ]'
+      model: 'GX-1035 4G 10.1"'
+    - regex: 'B105[);/ ]'
+      model: 'B105 3G 10.1"'
+    - regex: 'B108[);/ ]'
+      model: 'B108 4G 10.1"'
+    - regex: 'KT107(?: 3G)?[);/ ]'
+      model: 'KT107 3G 10.1"'
+    - regex: 'KT715 3G[);/ ]'
+      model: 'KT715 3G 7.0"'
+    - regex: 'KT995[);/ ]'
+      model: 'KT995 3G 10.1"'
+
+# E-Ceros
+'E-Ceros':
+   regex: '(?:CT9716(?:-B)?)[);/ ]'
+   device: 'tablet'
+   models:
+     - regex: 'CT9716[);/ ]'
+       model: 'Revolution'
+     - regex: 'CT9716-B[);/ ]'
+       model: 'Revolution HD'
+
+# How (how.com.br)
+How:
+  regex: '(?:HT-705XS|705-G Go|1001-G Go)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: '(HT-705XS)[);/ ]'
+      model: '$1'
+    - regex: '(1001-G Go)[);/ ]'
+      model: 'HT-1001G Go Kids'
+    - regex: '(705-G Go)[);/ ]'
+      model: 'HT-$1'
+
+# Multilaser
+Multilaser:
+  regex: '(?:Multilaser[ _](?:[FEGH])(?:[_ ](?:Pro|Max|Lite))?|MS50[LGX]|M7[_-]3G[_-]PLUS|MS5\.V2|MS45S_A6|MS45S|MS50S|MS60[XZ]|M7SQC_Plus|MS80X|MS40[GS]|MS55M|MS70|M7-3G QUAD CORE|M7sLite)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Multilaser[ _]G[_ ]Pro[);/ ]'
+      model: 'G Pro'
+    - regex: 'Multilaser[ _]G[_ ]Max[);/ ]'
+      model: 'G Max'
+    - regex: 'Multilaser[ _]G[);/ ]'
+      model: 'G'
+    - regex: 'Multilaser[ _]E[_ ]Lite[);/ ]'
+      model: 'E Lite'
+    - regex: 'Multilaser[ _]([FEH])[);/ ]'
+      model: '$1'
+    - regex: '(MS50[LGX]|MS45S_A6|MS40[GS]|MS55M|MS70|MS60[XZ]|MS45S|MS80X|MS50S|MS5\.V2)[);/ ]'
+      model: '$1'
+    - regex: 'M7[_-]3G[_-]PLUS[);/ ]'
+      device: 'tablet'
+      model: 'M7 3G Plus'
+    - regex: 'M7SQC_PLUS[);/ ]'
+      device: 'tablet'
+      model: 'M7SQC Plus'
+    - regex: 'M7-3G QUAD CORE[);/ ]'
+      device: 'tablet'
+      model: 'M7 3G Quad Core'
+    - regex: 'M7sLite[);/ ]'
+      device: 'tablet'
+      model: 'M7s Lite'
+
+# Positivo BGH
+Positivo BGH:
+  regex: '(?:T1060B|S455|Positivo (?:Twist|Ypy|Mini I)|Twist[ _](?:\(2018\)|2 (?:Fit|Pro)|Mini|Tab|Metal(?: 32GB)?|Max|XL|SE|[23SM]))[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'S455[);/ ]'
+      model: 'Selfie'
+    - regex: 'Twist \(2018\)[);/ ]'
+      model: 'Twist (2018)'
+    - regex: 'Twist Metal 32GB[);/ ]'
+      model: 'Twist Metal 32GB'
+    - regex: 'Twist Metal[);/ ]'
+      model: 'Twist Metal'
+    - regex: 'Twist Max[);/ ]'
+      model: 'Twist Max'
+    - regex: 'Twist[ _]Mini[);/ ]'
+      model: 'Twist Mini'
+    - regex: 'Twist 2 Fit[);/ ]'
+      model: 'Twist 2 Fit'
+    - regex: 'Twist 2 Pro[);/ ]'
+      model: 'Twist 2 Pro'
+    - regex: 'Twist XL[);/ ]'
+      model: 'Twist XL'
+    - regex: 'Twist SE[);/ ]'
+      model: 'Twist SE'
+    - regex: '(?:Positivo )?Twist ([23SM])[);/ ]'
+      model: 'Twist $1'
+    - regex: '(?:Positivo )Mini I[);/ ]'
+      model: 'Mini I'
+
+    - regex: 'T1060B[);/ ]'
+      device: 'tablet'
+      model: 'T1060B'
+    - regex: 'Positivo Ypy L1050E[);/ ]'
+      device: 'tablet'
+      model: 'Ypy L1050E'
+    - regex: 'Twist Tab[);/ ]'
+      device: 'tablet'
+      model: 'Twist Tab'
+
+# Maxtron
+Maxtron:
+  regex: 'Maxtron[ _-](V[327]|S8)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Philco (philco.com.br)
+Philco:
+  regex: '(PCS01|PH350B|PTB7R)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '(PCS01|PH350B)[);/ ]'
+      model: '$1'
+    - regex: '(PTB7R)[);/ ]'
+      device: 'tablet'
+      model: '$1'
+
+# SEMP TCL
+SEMP TCL:
+  regex: '(?:GO[35]E|5101J|GO3C(?: Plus)?)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '5101J[);/ ]'
+      model: 'L9 Plus'
+    - regex: 'GO3C Plus[);/ ]'
+      model: 'GO! 3C Plus'
+    - regex: 'GO3C[);/ ]'
+      model: 'GO! 3C'
+    - regex: '(GO[35]E)[);/ ]'
+      model: '$1'
+
+# Newman
+Newman:
+  regex: 'Newman[ _](P308|K1)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Swipe
+Swipe:
+  regex: '(Elite Sense)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Owwo
+Owwo:
+  regex: 'OWWO[ _]?([1457]S|Q[78])[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# 360 or names Qihoo 360, +360
+'360':
+  regex: '(?:180[1379]-A01|1713-A01|1707-A01|1509-A00|1603-A03|1607-A01)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '1807-A01[);/ ]'
+      model: 'N7'
+    - regex: '1803-A01[);/ ]'
+      model: 'N7 Lite'
+    - regex: '1809-A01[);/ ]'
+      model: 'N7 Pro'
+    - regex: '1713-A01[);/ ]'
+      model: 'N6 Lite'
+    - regex: '1707-A01[);/ ]'
+      model: 'N6'
+    - regex: '1801-A01[);/ ]'
+      model: 'N6 Pro'
+    - regex: '1509-A00[);/ ]'
+      model: 'Q5 Plus'
+    - regex: '1603-A03[);/ ]'
+      model: 'N4A'
+    - regex: '1607-A01[);/ ]'
+      model: 'N5S'
+
+# TD Systems
+TD Systems:
+  regex: '(K32DLX9HS|K40DLM8FS|K40DLX9FS)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Ravoz
+Ravoz:
+  regex: 'RAVOZ[ _](Z[347]|R[478])[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Tone Mobile
+Tone:
+  regex: 'TONE (e19|m15)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# AT&T
+AT&T:
+   regex: '(?:U304AA|QS5509A)[);/ ]'
+   device: 'smartphone'
+   models:
+     - regex: 'U304AA[);/ ]'
+       model: 'Radiant Core'
+     - regex: 'QS5509A[);/ ]'
+       model: 'Axia'
+
+# BIHEE
+BIHEE:
+  regex: '(ZBH-)?BIHEE'
+  device: 'smartphone'
+  models:
+    - regex: '(A1[12]|A[78]\+|A[56])[);/ ]'
+      model: '$1'
+
+# Enot
+Enot:
+  regex: 'Enot[ _-](E102|J101)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Kooper
+Kooper:
+  regex: 'Kooper-mobile-W502[);/ ]'
+  device: 'smartphone'
+  model: 'Mobile W502'
+
+# Lesia
+Lesia:
+  regex: 'ANOVA A5[);/ ]'
+  device: 'smartphone'
+  model: 'Anova A5'
+
+# Anry
+Anry:
+  regex: 'ANRY-(RS10)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Tinai
+Tinai:
+  regex: 'Tinai (K[12])[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Winds (Windsmobile)
+Winds:
+  regex: 'NOTE GRACE V[);/ ]'
+  device: 'smartphone'
+  model: 'Note Grace V'
+
+# Asano
+Asano:
+  regex: '32LF7130S[);/ ]'
+  device: 'tv'
+  model: '32LF7130S 32.0"'
+
+# Phonemax
+Phonemax:
+  regex: 'PHONEMAX[_ ](Saturn(?:[_ ]X)?|Mars)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'PHONEMAX[_ ]Saturn[_ ]X[);/ ]'
+      model: 'Saturn X'
+    - regex: 'PHONEMAX[_ ]Saturn[);/ ]'
+      model: 'Saturn'
+    - regex: 'PHONEMAX[_ ]Mars[);/ ]'
+      model: 'Mars'
+
+# Vipro (Vipro Mobile)
+Vipro:
+  regex: 'VIPRO[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'VIPRO PRO2X[);/ ]'
+      model: 'Pro 2X'
+    - regex: 'VIPRO PRO[ _-]?([0-9])[);/ ]'
+      model: 'Pro $1'
+
+# OzoneHD
+OzoneHD:
+  regex: 'OzoneHD[ _](T2 WiFi|4K(?: TV)?)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# KZEN
+Kzen:
+  regex: 'Ureki_U1[);/ ]'
+  device: 'smartphone'
+  model: 'Ureki U1'
+
+# MELROSE
+Melrose:
+  regex: 'MELROSE_S9[);/ ]'
+  device: 'smartphone'
+  model: 'S9'
+
+# Crony
+Crony:
+  regex: 'CRONY-7021[);/ ]'
+  device: 'tablet'
+  model: '7021'
+
+# Takara
+Takara:
+  regex: '(MID211H)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Tronsmart
+Tronsmart:
+  regex: '(Orion R68G|Draco AW80|Draco H3|Vega S95_(?:Meta|Pro|Telos))[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Amigoo
+Amigoo:
+  regex: 'AMIGOO (R300|R9 Max|M1 Max|X15)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Lumigon
+Lumigon:
+  regex: 'Lumigon[ _](T3)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Neomi
+Neomi:
+  regex: 'NEO[ ]?(90[689])[);/ ]'
+  device: 'smartphone'
+  model: 'Neo $1'
+
+# Eltex (eltex-co.ru)
+Eltex:
+  regex: '(?:NV501WAC|NV501)[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'NV501WAC[);/ ]'
+      model: 'NV-501-Wac'
+    - regex: 'NV501[);/ ]'
+      model: 'NV-501'
+
+# Senkatel
+Senkatel:
+  regex: 'Senkatel[ _](T1009|T8002|T701[12]|T9702)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Bobarry
+Bobarry:
+  regex: '(?:K10[ ]?SE)[);/ ]'
+  device: 'tablet'
+  model: 'K10 SE'
+
+# Wortmann
+Wortmann:
+  regex: 'TERRA PAD 1004[);/ ]'
+  device: 'tablet'
+  model: 'Terra Pad 1004'
+
+# BB Mobile
+BB Mobile:
+  regex: 'Techno[_ ](TQ863Q|X595BT|S700BF|I700AJ|10.1 LTE TQ060X|7.0 LTE TQ763I)[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'Techno[_ ]S700BF[);/ ]'
+      model: 'Techno 7.0" Pioneer LTE S700BF'
+    - regex: 'Techno[_ ]10.1 LTE TQ060X[);/ ]'
+      model: 'Techno 10.0" LTE TQ060X'
+    - regex: 'Techno[_ ]TQ863Q[);/ ]'
+      model: 'Techno 8.0" Poplar LTE TQ863Q'
+    - regex: 'Techno[_ ]I700AJ[);/ ]'
+      model: 'Techno 7.0" Mozg LTE I700AJ'
+    - regex: 'Techno[_ ]7.0 LTE TQ763I[);/ ]'
+      model: 'Techno 7.0" Kalash LTE TQ763I'
+
+    - regex: 'Techno[_ ](X595BT)[);/ ]'
+      device: 'smartphone'
+      model: 'Techno Spark 3G X595BT'
+
+# 2E (2e.ua)
+2E:
+  regex: '(?:E500A_2019|2E E450 2018)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'E500A_2019[);/ ]'
+      model: 'E500A (2019)'
+    - regex: '2E E450 2018[);/ ]'
+      model: 'E450 (2018)'
+
+# Billion
+Billion:
+  regex: 'Capture\+[);/ ]'
+  device: 'smartphone'
+  model: 'Capture Plus'
+
+# Tele2 (mobile operator)
+Tele2:
+  regex: 'Tele2[ _](?:Mi[dn]i[ _][12][\._][10]|Mi[dn]i|Maxi(?:[ _](?:Plus|LTE))?)[);/ ]'
+  device: 'smartphone'
+  models:
+      - regex: 'Tele2[ _]Mini[ _]1[_\.]1[);/ ]'
+        model: 'Mini 1.1'
+      - regex: 'Tele2[ _]Midi[ _]2[_\.]0[);/ ]'
+        model: 'Midi 2.0'
+      - regex: 'Tele2[ _](Maxi(?:[_ ](?:Plus|LTE))?)[);/ ]'
+        model: '$1'
+      - regex: 'Tele2[ _](Midi[ _]1\.1|Mi[dn]i)[);/ ]'
+        model: '$1'
+
+# Alfawise
+Alfawise:
+  regex: '(A95X_R1)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Klipad
+Klipad:
+  regex: '(KL-V905)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# SQOOL (sqool.fr)
+SQOOL:
+  regex: 'SQOOL-V(41?)[);/ ]'
+  device: 'tablet'
+  model: 'V$1'
+
+# TurboKids
+TurboKids:
+  regex: 'Turbokids[-_ ]?(TMNT|3G|S4)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Jinga
+Jinga:
+  regex: 'Jinga[-_ ]|(?:Optim4G|PassPlus)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Optim4G[);/ ]'
+      model: 'Optim 4G'
+    - regex: 'PassPlus[);/ ]'
+      model: 'Pass Plus'
+    - regex: 'Jinga Iron[);/ ]'
+      model: 'Iron'
+    - regex: 'Jinga Basco neo[);/ ]'
+      model: 'Basco Neo'
+    - regex: 'Jinga Basco L3[);/ ]'
+      model: 'Basco L3'
+    - regex: 'Jinga Trezor S1 Plus[);/ ]'
+      model: 'Trezor S1 Plus'
+    - regex: 'JINGA_IGO_L2[);/ ]'
+      model: 'IGO L2'
+    - regex: 'JINGA_IGO_M1[);/ ]'
+      model: 'IGO M1'
+    - regex: 'Jinga Trezor S1 Plus[);/ ]'
+      model: 'Trezor S1 Plus'
+
+# Twoe
+Twoe:
+  regex: 'TWOE[-_ ](E450R)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# iTruck
+iTruck:
+  regex: 'iTRUCK 7 3G[);/ ]'
+  device: 'smartphone'
+  model: '7.0" 3G'
+
+# Torex
+Torex:
+  regex: 'TOREX-(PS12)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Doffler
+Doffler:
+  regex: '(24DHS54)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Oyyu
+Oyyu:
+  regex: 'OYYUT11[);/ ]'
+  device: 'tablet'
+  model: 'T11 3G'
+
+# Primux
+Primux:
+   regex: 'Primux'
+   device: 'smartphone'
+   models:
+     - regex: 'PrimuxDelta6[);/ ]'
+       model: 'Delta 6'
+
+# iMars
+iMars:
+  regex: 'IMARS VEGA X7[);/ ]'
+  device: 'smartphone'
+  model: 'Vega X7'
+
+# Logic
+Logic:
+  regex: 'LOGIC[_ ](X[135]|X4M|L5D|X5[AFT]|X60G)(:?[_ ]LITE2?)?[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'LOGIC[_ ](X5|X4M)[_ ]LITE[);/ ]'
+      model: '$1 Lite'
+    - regex: 'LOGIC[_ ](X5)[_ ]LITE2[);/ ]'
+      model: '$1 Lite 2'
+    - regex: 'LOGIC[_ ](X[13]|X4M|L5D|X5[AFT]|X60G)[);/ ]'
+      model: '$1'
+
+# Cloudfone
+Cloudfone:
+  regex: 'Thrill (?:Boost[ ]?(2|3)?|Snap|Access)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Thrill Boost (2|3)[);/ ]'
+      model: 'Thrill Boost $1'
+    - regex: 'Thrill Boost[);/ ]'
+      model: 'Thrill Boost'
+    - regex: 'Thrill Snap[);/ ]'
+      model: 'Thrill Snap'
+    - regex: 'Thrill Access[);/ ]'
+      model: 'Thrill Access'
+
+# Vsmart
+Vsmart:
+  regex: '(?:Joy 1\+|Active 1\+|Bee 3)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Joy 1\+[);/ ]'
+      model: 'Joy 1 Plus'
+    - regex: 'Active 1\+[);/ ]'
+      model: 'Active 1 Plus'
+    - regex: 'Bee 3[);/ ]'
+      model: 'Bee 3'
+
+# MiXzo
+MiXzo:
+  regex: '(?:MiXzo )?(?:ME1030|MX1037|MX1041)[ _][34]G[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'MiXzo ME1030[_ ]3G[);/ ]'
+      model: 'ME1030 3G'
+    - regex: '(?:MiXzo )?MX1041[ _]4G[);/ ]'
+      model: 'MX1041 4G'
+    - regex: '(?:MiXzo )?MX1037[ _]4G[);/ ]'
+      model: 'MX1037 4G'
+
+# Openbox
+Openbox:
+  regex: 'Openbox (A[34](?: (?:Pro|Lite))?)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Ziox
+Ziox:
+  regex: 'ZIOX[_ ]|(?:Astra Viva 4G)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'ZIOX_F9_PRO[);/ ]'
+      model: 'F9 Pro'
+    - regex: 'Astra Viva 4G[);/ ]'
+      model: 'Astra Viva 4G'
+
+# iDroid
+iDroid:
+  regex: 'APACHE G6[);/ ]'
+  device: 'smartphone'
+  model: 'Apache G6'
+
+# Aoson
+Aoson:
+  regex: 'aoson(?:R10[1-3]|S[78]|M707TG)(?:[_ ]?Pro)?[);/ ]'
+  device: 'tablet'
+  models:
+    - regex: 'aosonR10([1-3])[);/ ]'
+      model: 'R10$1 10.1"'
+    - regex: 'aosonS7_Pro[);/ ]'
+      model: 'S7 Pro 7.0"'
+    - regex: 'aosonS7[);/ ]'
+      model: 'S7 7.0"'
+    - regex: 'aosonS8Pro[);/ ]'
+      model: 'S8 Pro 8.0"'
+    - regex: 'aoson(M707TG)[);/ ]'
+      model: '$1'
+
+# FireFly Mobile
+FireFly Mobile:
+  regex: '(AURII[ _](?:Passion|Virtuoso|Secret Lite|FORCE|FUSION|F8[_ ]Premium|XCITE))[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'AURII[ _]FORCE[);/ ]'
+      model: 'AURII Force'
+    - regex: 'AURII[ _]FUSION[);/ ]'
+      model: 'AURII Fusion'
+    - regex: 'AURII[ _]XCITE[);/ ]'
+      model: 'AURII xCite'
+    - regex: '(AURII[ _](?:Passion|Virtuoso|Secret Lite|F8[_ ]Premium))[);/ ]'
+      model: '$1'
+
+# i-Cherry or iCherry
+i-Cherry:
+  regex: 'iCherry_?'
+  device: 'smartphone'
+  models:
+     - regex: 'iCherry[ _]C(25[125]|21[16]|110|121|22[079]|23[03])[);/ ]'
+       model: 'C$1'
+
+# NextTab
+NextTab:
+  regex: 'TAB (A40[13]0)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Time 2
+Time2:
+ regex: '(TC1050G)[);/ ]'
+ device: 'tablet'
+ model: '$1 10.1"'
+
+# Sunstech
+Sunstech:
+  regex: '(TAB2323GMQC)[);/ ]'
+  device: 'tablet'
+  model: '$1'
+
+# Hotwav
+Hotwav:
+  regex: '(Venus[_ ]X1[024569])[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Tetratab
+Tetratab:
+  regex: 'CASEBOOK_3[);/ ]'
+  device: 'tablet'
+  model: 'Casebook 3'
+
+# Dolamee
+Dolamee:
+  regex: 'Dolamee[_ -](D[56])[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# INVIN
+Invin:
+  regex: 'INVIN[ _-](X[24]|KM6)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# Doopro
+Doopro:
+  regex: 'Doopro P3[);/ ]'
+  device: 'smartphone'
+  model: 'P3'
+
+# IQM
+IQM:
+  regex: 'IQM (?:picasso|vivaldi|newton)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'IQM picasso[);/ ]'
+      model: 'Picasso'
+    - regex: 'IQM vivaldi[);/ ]'
+      model: 'Vivaldi'
+    - regex: 'IQM newton[);/ ]'
+      model: 'Newton'
+
+# Nos
+Nos:
+  regex: 'Nos (?:FIVE|NOVU|NEVA|Roya)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'NOS FIVE[);/ ]'
+      model: 'Five'
+    - regex: 'NOS NOVU III[);/ ]'
+      model: 'Novu III'
+    - regex: 'NOS NOVU II[);/ ]'
+      model: 'Novu II'
+    - regex: 'NOS NOVU[);/ ]'
+      model: 'Novu'
+    - regex: 'NOS NEVA 80[);/ ]'
+      model: 'Neva 80'
+    - regex: 'NOS Roya[);/ ]'
+      model: 'Roya'
+
+# Accent
+Accent:
+  regex: 'ACCENT_NEON[);/ ]'
+  device: 'smartphone'
+  model: 'Neon'
+
+# Avenzo (www.avenzo.es)
+Avenzo:
+  regex: 'Avenzo[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'MOB4 4G[);/ ]'
+      model: 'Mob 4 4G'
+    - regex: 'MOB4PRO 4G[);/ ]'
+      model: 'Mob 4 Pro 4G'
+
+# Beelink
+Beelink:
+  regex: 'Beelink (GT1|LAKE I|SEA I|A1)[);/ ]'
+  device: 'tv'
+  model: '$1'
+
+# MAXVI
+MAXVI:
+  regex: 'MAXVI[ _](MS401)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# meanIT (meanit.hr)
+meanIT:
+  regex: 'meanIT[ _](?:C[12]|X10|X[126]|MG430|Q[145])[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'meanIT[ _]Q1 plus[);/ ]'
+      model: 'Q1 Plus'
+    - regex: 'meanIT[ _](C[12]|X[126]|MG430|Q[145])[);/ ]'
+      model: '$1'
+    - regex: 'meanIT[ _]X10[);/ ]'
+      device: 'tablet'
+      model: 'X10'
+
+# Kenxinda
+Kenxinda:
+  regex: 'Three[_ ]Proofings[_ ]W([5-9])[);/ ]'
+  device: 'smartphone'
+  model: 'Three Proofings W$1'
+
+# X-BO or XBO
+X-BO:
+  regex: 'X[-]?BO (V[78]|V1[01]|V[89]\+)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Xgody
+Xgody:
+  regex: 'XGODY'
+  device: 'smartphone'
+  models:
+    - regex: 'XGODY Y17[);/ ]'
+      model: 'Y17'
+
+    - regex: 'XGODY_X96[);/ ]'
+      model: 'X96'
+      device: 'tv'
diff --git a/priv/ua_inspector/device.portable_media_player.yml b/priv/ua_inspector/device.portable_media_player.yml
index 314db79bca..3972fe97f1 100644
--- a/priv/ua_inspector/device.portable_media_player.yml
+++ b/priv/ua_inspector/device.portable_media_player.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -56,4 +56,4 @@ Samsung:
     - regex: 'YP-G50'
       model: 'Galaxy Player 50'
     - regex: 'YP-GB70D'
-      model: 'Galaxy Player 70 Plus'
+      model: 'Galaxy Player 70 Plus'
\ No newline at end of file
diff --git a/priv/ua_inspector/device.televisions.yml b/priv/ua_inspector/device.televisions.yml
index f3eaa1eff5..ca9963ca48 100644
--- a/priv/ua_inspector/device.televisions.yml
+++ b/priv/ua_inspector/device.televisions.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 #
 #  ATTENTION: This file may only include tv user agents that contain 'HbbTV/([1-9]{1}(\.[0-9]{1}){1,2})'
@@ -258,14 +258,28 @@ TCL:
   regex: 'TCL'
   device: 'tv'
   models:
+    - regex: '(32D1820)'
+      model: '$1'
     - regex: '(LF1V[0-9]{3})'
       model: '$1'
 
 # Thomson
 Thomson:
-  regex: 'THOMSON|THOM'
+  regex: 'THOMSON[,]?|THOM'
   device: 'tv'
   models:
+    - regex: '(TB28D19DHS-01|T28D18SFS-01B)'
+      model: '$1 28.0"'
+    - regex: '(T32RTM5040|T32D18SFS-01B)'
+      model: '$1 32.0"'
+    - regex: '(T43FSL5031|T43D18SFS-01B)'
+      model: '$1 43.0"'
+    - regex: '(T40D18SFS-01B)'
+      model: '$1 40.0"'
+    - regex: '(T49D18SFS-01B)'
+      model: '$1 49.0"'
+    - regex: '(T55D18[SD]FS-01B)'
+      model: '$1 55.0"'
     - regex: '(LF1V[0-9]{3})'
       model: '$1'
 
diff --git a/priv/ua_inspector/os.oss.yml b/priv/ua_inspector/os.oss.yml
index 28043ba213..447f9d0b37 100644
--- a/priv/ua_inspector/os.oss.yml
+++ b/priv/ua_inspector/os.oss.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -31,7 +31,7 @@
 ##########
 # Windows Mobile
 ##########
-- regex: 'Windows Phone (?:OS)?[ ]?(\d+[\.\d]+)'
+- regex: '(?:Windows Phone (?:OS)?|wds)[ ]?(\d+[\.\d]+)'
   name: 'Windows Phone'
   version: '$1'
   
@@ -98,11 +98,14 @@
 ##########
 # Android
 ##########
+- regex: '[ ]([\d\.]+)\) AppleWebKit.*ROBLOX Android App'
+  name: 'Android'
+  version: '$1'
+
 - regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
   
-  
 - regex: 'Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
@@ -111,6 +114,10 @@
   name: 'Android'
   version: '$1'
 
+- regex: 'FB4A.*FBSV/(\d+[\.\d]*);'
+  name: 'Android'
+  version: '$1'
+
 - regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe'
   name: 'Android'
   version: ''
@@ -147,6 +154,14 @@
 ##########
 # Linux
 ##########
+- regex: '(Ordissimo|webissimo3)'
+  name: 'Ordissimo'
+  version: ''
+
+- regex: 'TOS; Linux'
+  name: 'TmaxOS'
+  version: ''
+
 - regex: 'Maemo'
   name: 'Maemo'
   version: ''
@@ -172,7 +187,7 @@
 ##########
 # webOS
 ##########
-- regex: '(?:webOS|Palm webOS)(?:/(\d+[\.\d]+))?'
+- regex: '(?:webOS|web0S|Palm webOS)(?:/(\d+[\.\d]+))?'
   name: 'webOS'
   version: '$1'
 
@@ -197,70 +212,62 @@
   name: 'Windows'
   version: '10'
 
-- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10'
+- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10|win10'
   name: 'Windows'
   version: '10'
-  
+
 - regex: 'CYGWIN_NT-6.3|Windows NT 6.3|Windows 8.1'
   name: 'Windows'
   version: '8.1'
 
-
 - regex: 'CYGWIN_NT-6.2|Windows NT 6.2|Windows 8'
   name: 'Windows'
   version: '8'
-  
-  
-- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7'
+
+- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7|win7'
   name: 'Windows'
   version: '7'
-  
-  
+
 - regex: 'CYGWIN_NT-6.0|Windows NT 6.0|Windows Vista'
   name: 'Windows'
   version: 'Vista'
-  
-  
+
 - regex: 'CYGWIN_NT-5.2|Windows NT 5.2|Windows Server 2003 / XP x64'
   name: 'Windows'
   version: 'Server 2003'
-  
-  
+
 - regex: 'CYGWIN_NT-5.1|Windows NT 5.1|Windows XP'
   name: 'Windows'
   version: 'XP'
-  
-  
+
 - regex: 'CYGWIN_NT-5.0|Windows NT 5.0|Windows 2000'
   name: 'Windows'
   version: '2000'
-  
-  
+
 - regex: 'CYGWIN_NT-4.0|Windows NT 4.0|WinNT|Windows NT'
   name: 'Windows'
   version: 'NT'
-  
-  
+
 - regex: 'CYGWIN_ME-4.90|Win 9x 4.90|Windows ME'
   name: 'Windows'
   version: 'ME'
-  
-  
+
 - regex: 'CYGWIN_98-4.10|Win98|Windows 98'
   name: 'Windows'
   version: '98'
-  
-  
+
 - regex: 'CYGWIN_95-4.0|Win32|Win95|Windows 95|Windows_95'
   name: 'Windows'
   version: '95'
-  
-  
+
 - regex: 'Windows 3.1'
   name: 'Windows'
   version: '3.1'
-  
-  
+
+- regex: 'FBW.*FBSV/(\d+[\.\d]*);'
+  name: 'Windows'
+  version: '$1'
+
 - regex: 'Windows'
   name: 'Windows'
   version: ''
@@ -413,11 +420,15 @@
   name: 'iOS'
   version: '$1'
 
+- regex: 'FBIOS.*FBSV/(\d+[\.\d]*);'
+  name: 'iOS'
+  version: '$1'
+
 - regex: '(?:Apple-)?(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)?'
   name: 'iOS'
   version: '$1'
 
-- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher'
+- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher|RSSRadio/'
   name: 'iOS'
   version: ''
 
@@ -724,11 +735,10 @@
 ##########
 # Gaming Console
 ##########
-- regex: 'Nintendo Wii'
+- regex: 'Nintendo (Wii|Switch)'
   name: 'Nintendo'
-  version: 'Wii'
-  
-  
+  version: '$1'
+
 - regex: 'PlayStation ?([3|4])'
   name: 'PlayStation'
   version: '$1'
diff --git a/priv/ua_inspector/short_codes.client_browsers.yml b/priv/ua_inspector/short_codes.client_browsers.yml
index 0d45154d18..8237458935 100644
--- a/priv/ua_inspector/short_codes.client_browsers.yml
+++ b/priv/ua_inspector/short_codes.client_browsers.yml
@@ -1,3 +1,5 @@
+- "1B": "115 Browser"
+- "2B": "2345 Browser"
 - "36": "360 Phone Browser"
 - "3B": "360 Browser"
 - "AA": "Avant Browser"
@@ -5,28 +7,43 @@
 - "AF": "ANT Fresco"
 - "AG": "ANTGalio"
 - "AL": "Aloha Browser"
+- "AH": "Aloha Browser Lite"
 - "AM": "Amaya"
 - "AO": "Amigo"
 - "AN": "Android Browser"
+- "AE": "AOL Desktop"
+- "AD": "AOL Shield"
 - "AR": "Arora"
+- "AX": "Arctic Fox"
 - "AV": "Amiga Voyager"
 - "AW": "Amiga Aweb"
+- "A0": "Atom"
 - "AT": "Atomic Web Browser"
 - "AS": "Avast Secure Browser"
+- "VG": "AVG Secure Browser"
+- "BA": "Beaker Browser"
+- "BM": "Beamrise"
 - "BB": "BlackBerry Browser"
 - "BD": "Baidu Browser"
 - "BS": "Baidu Spark"
+- "BI": "Basilisk"
 - "BE": "Beonex"
+- "BH": "BlackHawk"
 - "BJ": "Bunjalloo"
 - "BL": "B-Line"
+- "BU": "Blue Browser"
 - "BR": "Brave"
 - "BK": "BriskBard"
 - "BX": "BrowseX"
 - "CA": "Camino"
+- "CL": "CCleaner"
+- "C0": "Centaury"
 - "CC": "Coc Coc"
+- "C2": "Colibri"
 - "CD": "Comodo Dragon"
 - "C1": "Coast"
 - "CX": "Charon"
+- "CE": "CM Browser"
 - "CF": "Chrome Frame"
 - "HC": "Headless Chrome"
 - "CH": "Chrome"
@@ -35,39 +52,60 @@
 - "CM": "Chrome Mobile"
 - "CN": "CoolNovo"
 - "CO": "CometBird"
+- "CB": "COS Browser"
 - "CP": "ChromePlus"
 - "CR": "Chromium"
 - "CY": "Cyberfox"
 - "CS": "Cheshire"
+- "CT": "Crusta"
 - "CU": "Cunaguaro"
+- "CV": "Chrome Webview"
 - "DB": "dbrowser"
 - "DE": "Deepnet Explorer"
+- "DT": "Delta Browser"
 - "DF": "Dolphin"
 - "DO": "Dorado"
 - "DL": "Dooble"
 - "DI": "Dillo"
+- "DD": "DuckDuckGo Privacy Browser"
+- "EC": "Ecosia"
 - "EI": "Epic"
 - "EL": "Elinks"
 - "EB": "Element Browser"
+- "EE": "Elements Browser"
+- "EZ": "eZ Browser"
+- "EU": "EUI Browser"
 - "EP": "GNOME Web"
 - "ES": "Espial TV Browser"
+- "FA": "Falkon"
+- "FX": "Faux Browser"
+- "F1": "Firefox Mobile iOS"
 - "FB": "Firebird"
 - "FD": "Fluid"
 - "FE": "Fennec"
 - "FF": "Firefox"
 - "FK": "Firefox Focus"
+- "FY": "Firefox Reality"
+- "FR": "Firefox Rocket"
 - "FL": "Flock"
 - "FM": "Firefox Mobile"
 - "FW": "Fireweb"
 - "FN": "Fireweb Navigator"
+- "FU": "FreeU"
 - "GA": "Galeon"
+- "GB": "Glass Browser"
 - "GE": "Google Earth"
+- "GO": "GOG Galaxy"
+- "HA": "Hawk Turbo Browser"
+- "HO": "hola! Browser"
 - "HJ": "HotJava"
-- "IA": "Iceape"
+- "HU": "Huawei Browser"
 - "IB": "IBrowse"
 - "IC": "iCab"
 - "I2": "iCab Mobile"
 - "I1": "Iridium"
+- "I3": "Iron Mobile"
+- "I4": "IceCat"
 - "ID": "IceDragon"
 - "IV": "Isivioo"
 - "IW": "Iceweasel"
@@ -76,50 +114,77 @@
 - "IR": "Iron"
 - "JS": "Jasmine"
 - "JI": "Jig Browser"
+- "JP": "Jig Browser Plus"
+- "JO": "Jio Browser"
+- "KB": "K.Browser"
 - "KI": "Kindle Browser"
 - "KM": "K-meleon"
 - "KO": "Konqueror"
 - "KP": "Kapiko"
+- "KN": "Kinza"
+- "KW": "Kiwi"
 - "KY": "Kylo"
 - "KZ": "Kazehakase"
-- "LB": "Liebao"
+- "LB": "Cheetah Browser"
+- "LF": "LieBaoFast"
 - "LG": "LG Browser"
+- "LH": "Light"
 - "LI": "Links"
+- "LO": "Lovense Browser"
 - "LU": "LuaKit"
+- "LL": "Lulumi"
 - "LS": "Lunascape"
+- "LN": "Lunascape Lite"
 - "LX": "Lynx"
+- "M1": "mCent"
 - "MB": "MicroB"
 - "MC": "NCSA Mosaic"
+- "MZ": "Meizu Browser"
 - "ME": "Mercury"
 - "MF": "Mobile Safari"
 - "MI": "Midori"
+- "MO": "Mobicip"
 - "MU": "MIUI Browser"
 - "MS": "Mobile Silk"
+- "MN": "Minimo"
+- "MT": "Mint Browser"
 - "MX": "Maxthon"
+- "MY": "Mypal"
 - "NB": "Nokia Browser"
 - "NO": "Nokia OSS Browser"
 - "NV": "Nokia Ovi Browser"
+- "NX": "Nox Browser"
 - "NE": "NetSurf"
 - "NF": "NetFront"
 - "NL": "NetFront Life"
 - "NP": "NetPositive"
 - "NS": "Netscape"
 - "NT": "NTENT Browser"
+- "OC": "Oculus Browser"
+- "O1": "Opera Mini iOS"
 - "OB": "Obigo"
 - "OD": "Odyssey Web Browser"
 - "OF": "Off By One"
+- "HH": "OhHai Browser"
 - "OE": "ONE Browser"
+- "OX": "Opera GX"
+- "OG": "Opera Neon"
+- "OH": "Opera Devices"
 - "OI": "Opera Mini"
 - "OM": "Opera Mobile"
 - "OP": "Opera"
 - "ON": "Opera Next"
 - "OO": "Opera Touch"
+- "OS": "Ordissimo"
 - "OR": "Oregano"
+- "O0": "Origin In-Game Overlay"
+- "OY": "Origyn Web Browser"
 - "OV": "Openwave Mobile Browser"
 - "OW": "OmniWeb"
 - "OT": "Otter Browser"
 - "PL": "Palm Blazer"
 - "PM": "Pale Moon"
+- "PY": "Polypane"
 - "PP": "Oppo Browser"
 - "PR": "Palm Pre"
 - "PU": "Puffin"
@@ -129,9 +194,14 @@
 - "PO": "Polaris"
 - "PT": "Polarity"
 - "PS": "Microsoft Edge"
+- "Q1": "QQ Browser Mini"
 - "QQ": "QQ Browser"
 - "QT": "Qutebrowser"
+- "QU": "Quark"
 - "QZ": "QupZilla"
+- "QM": "Qwant Mobile"
+- "QW": "QtWebEngine"
+- "RE": "Realme Browser"
 - "RK": "Rekonq"
 - "RM": "RockMelt"
 - "SB": "Samsung Browser"
@@ -139,24 +209,58 @@
 - "SC": "SEMC-Browser"
 - "SE": "Sogou Explorer"
 - "SF": "Safari"
+- "S5": "Safe Exam Browser"
+- "SW": "SalamWeb"
 - "SH": "Shiira"
+- "S1": "SimpleBrowser"
+- "SY": "Sizzy"
 - "SK": "Skyfire"
 - "SS": "Seraphic Sraf"
 - "SL": "Sleipnir"
-- "SM": "SeaMonkey"
 - "SN": "Snowshoe"
+- "SO": "Sogou Mobile Browser"
+- "S2": "Splash"
+- "SI": "Sputnik Browser"
 - "SR": "Sunrise"
 - "SP": "SuperBird"
+- "SU": "Super Fast Browser"
+- "S3": "surf"
+- "S0": "START Internet Browser"
+- "S4": "Steam In-Game Overlay"
 - "ST": "Streamy"
 - "SX": "Swiftfox"
+- "SZ": "Seznam Browser"
+- "TO": "t-online.de Browser"
+- "TA": "Tao Browser"
+- "TF": "TenFourFox"
+- "TB": "Tenta Browser"
 - "TZ": "Tizen Browser"
+- "TU": "Tungsten"
+- "TG": "ToGate"
 - "TS": "TweakStyle"
+- "TV": "TV Bro"
+- "UB": "UBrowser"
 - "UC": "UC Browser"
+- "UM": "UC Browser Mini"
+- "UT": "UC Browser Turbo"
+- "UZ": "Uzbl"
 - "VI": "Vivaldi"
+- "VV": "vivo Browser"
 - "VB": "Vision Mobile Browser"
+- "VM": "VMware AirWatch"
+- "WI": "Wear Internet Browser"
+- "WP": "Web Explorer"
 - "WE": "WebPositive"
 - "WF": "Waterfox"
+- "WH": "Whale Browser"
 - "WO": "wOSBrowser"
 - "WT": "WeTab Browser"
+- "YJ": "Yahoo! Japan Browser"
 - "YA": "Yandex Browser"
+- "YL": "Yandex Browser Lite"
+- "YN": "Yaani Browser"
 - "XI": "Xiino"
+- "XV": "Xvast"
+- "ZV": "Zvu"
+- "IA": "Iceape"
+- "SM": "SeaMonkey"
diff --git a/priv/ua_inspector/short_codes.device_brands.yml b/priv/ua_inspector/short_codes.device_brands.yml
index 7ab3944ed4..2cc47a84be 100644
--- a/priv/ua_inspector/short_codes.device_brands.yml
+++ b/priv/ua_inspector/short_codes.device_brands.yml
@@ -1,42 +1,82 @@
+- "36": "360"
 - "3Q": "3Q"
 - "4G": "4Good"
+- "AE": "Ace"
+- "AA": "AllCall"
 - "AC": "Acer"
+- "00": "Accent"
+- "A9": "Advan"
 - "AD": "Advance"
+- "A3": "AGM"
 - "AZ": "Ainol"
 - "AI": "Airness"
+- "0A": "AIS"
 - "AW": "Aiwa"
 - "AK": "Akai"
+- "1A": "Alba"
 - "AL": "Alcatel"
+- "4A": "Aligator"
+- "3A": "AllDocube"
 - "A2": "Allview"
+- "A7": "Allwinner"
 - "A1": "Altech UEC"
+- "A5": "altron"
+- "3L": "Alfawise"
 - "AN": "Arnova"
+- "7A": "Anry"
+- "5A": "ArmPhone"
+- "2A": "Atom"
 - "KN": "Amazon"
+- "AG": "AMGOO"
+- "9A": "Amigoo"
 - "AO": "Amoi"
+- "3N": "Aoson"
 - "AP": "Apple"
 - "AR": "Archos"
 - "AS": "ARRIS"
+- "AB": "Arian Space"
 - "AT": "Airties"
+- "6A": "AT&T"
+- "A6": "Ark"
+- "A4": "Ask"
+- "8A": "Asano"
+- "A8": "Assistant"
+- "A0": "ANS"
 - "AU": "Asus"
+- "AH": "AVH"
+- "ZA": "Avenzo"
 - "AV": "Avvio"
 - "AX": "Audiovox"
 - "AY": "Axxion"
 - "AM": "Azumi Mobile"
 - "BB": "BBK"
+- "0B": "BB Mobile"
 - "BE": "Becker"
+- "B5": "Beeline"
+- "B0": "Beelink"
 - "BI": "Bird"
+- "1B": "Billion"
 - "BT": "Bitel"
+- "B8": "BIHEE"
+- "B7": "Bitmore"
 - "BG": "BGH"
 - "BL": "Beetel"
 - "BP": "Blaupunkt"
 - "B3": "Bluboo"
+- "BF": "Black Fox"
+- "B6": "BDF"
 - "BM": "Bmobile"
 - "BN": "Barnes & Noble"
 - "BO": "BangOlufsen"
+- "B9": "Bobarry"
 - "BQ": "BenQ"
 - "BS": "BenQ-Siemens"
 - "BU": "Blu"
+- "BD": "Bluegood"
 - "B2": "Blackview"
+- "B4": "bogo"
 - "BW": "Boway"
+- "BZ": "Bezkam"
 - "BX": "bq"
 - "BV": "Bravis"
 - "BR": "Brondi"
@@ -45,11 +85,18 @@
 - "CF": "Carrefour"
 - "CP": "Captiva"
 - "CS": "Casio"
+- "R4": "Casper"
 - "CA": "Cat"
+- "C9": "CAGI"
 - "CE": "Celkon"
 - "CC": "ConCorde"
 - "C2": "Changhong"
+- "2C": "Ghong"
 - "CH": "Cherry Mobile"
+- "1C": "Chuwi"
+- "L8": "Clarmin"
+- "CD": "Cloudfone"
+- "C0": "Clout"
 - "CK": "Cricket"
 - "C1": "Crosscall"
 - "CL": "Compal"
@@ -57,8 +104,10 @@
 - "CM": "Crius Mea"
 - "C3": "China Mobile"
 - "CR": "CreNova"
+- "0C": "Crony"
 - "CT": "Capitel"
 - "CQ": "Compaq"
+- "3C": "Contixo"
 - "CO": "Coolpad"
 - "C5": "Condor"
 - "CW": "Cowon"
@@ -66,265 +115,509 @@
 - "CY": "Coby Kyros"
 - "C6": "Comio"
 - "C7": "ComTrade Tesla"
+- "C8": "Concord"
+- "CX": "Crescent"
 - "C4": "Cyrus"
+- "CV": "CVTE"
+- "D5": "Daewoo"
 - "DA": "Danew"
 - "DT": "Datang"
+- "D7": "Datawind"
+- "D1": "Datsun"
 - "DE": "Denver"
+- "DW": "DeWalt"
 - "DX": "DEXP"
 - "DS": "Desay"
 - "DB": "Dbtel"
 - "DC": "DoCoMo"
+- "D9": "Dolamee"
+- "D0": "Doopro"
 - "DG": "Dialog"
 - "DI": "Dicam"
+- "D4": "Digi"
+- "D3": "Digicel"
+- "DD": "Digiland"
 - "D2": "Digma"
+- "D6": "Divisat"
 - "DL": "Dell"
 - "DN": "DNS"
 - "DM": "DMM"
 - "DO": "Doogee"
+- "DF": "Doffler"
 - "DV": "Doov"
 - "DP": "Dopod"
 - "DR": "Doro"
+- "D8": "Droxio"
 - "DU": "Dune HD"
 - "EB": "E-Boda"
+- "2E": "E-Ceros"
+- "5E": "2E"
 - "EA": "EBEST"
 - "EC": "Ericsson"
+- "E7": "Ergo"
+- "ED": "Energizer"
+- "E4": "Echo Mobiles"
 - "ES": "ECS"
+- "E6": "EE"
 - "EI": "Ezio"
+- "EM": "Eks Mobility"
 - "EL": "Elephone"
+- "4E": "Eltex"
+- "L0": "Element"
+- "EG": "Elenberg"
 - "EP": "Easypix"
 - "EK": "EKO"
 - "E1": "Energy Sistem"
+- "3E": "Enot"
 - "ER": "Ericy"
 - "EE": "Essential"
 - "EN": "Eton"
 - "E2": "Essentielb"
+- "1E": "Etuline"
 - "ET": "eTouch"
 - "EV": "Evertek"
+- "E3": "Evolio"
 - "EO": "Evolveo"
 - "EX": "Explay"
+- "E0": "EvroMedia"
+- "E5": "Extrem"
 - "EZ": "Ezze"
+- "E8": "E-tel"
+- "E9": "Evercoss"
+- "EU": "Eurostar"
 - "FA": "Fairphone"
+- "FM": "Famoco"
+- "FE": "Fengxiang"
+- "FI": "FiGO"
+- "F3": "FireFly Mobile"
 - "FL": "Fly"
+- "F1": "FinePower"
 - "FT": "Freetel"
+- "FR": "Forstar"
 - "FO": "Foxconn"
+- "F2": "FORME"
 - "FN": "FNB"
 - "FU": "Fujitsu"
+- "FD": "Fondi"
+- "GT": "G-TiDE"
 - "GM": "Garmin-Asus"
 - "GA": "Gateway"
 - "GD": "Gemini"
+- "GN": "General Mobile"
+- "GE": "Geotel"
+- "GH": "Ghia"
 - "GI": "Gionee"
 - "GG": "Gigabyte"
 - "GS": "Gigaset"
+- "GZ": "Ginzzu"
+- "G4": "Globex"
 - "GC": "GOCLEVER"
 - "GL": "Goly"
 - "GO": "Google"
+- "G5": "Gome"
 - "G1": "GoMobile"
 - "GR": "Gradiente"
 - "GP": "Grape"
+- "G6": "Gree"
+- "G0": "Goophone"
 - "GU": "Grundig"
+- "HF": "Hafury"
 - "HA": "Haier"
 - "HS": "Hasee"
 - "HE": "HannSpree"
 - "HI": "Hisense"
 - "HL": "Hi-Level"
+- "H2": "Highscreen"
+- "H1": "Hoffmann"
 - "HM": "Homtom"
 - "HO": "Hosin"
+- "HW": "How"
+- "HV": "Hotwav"
+- "HZ": "Hoozo"
 - "HP": "HP"
 - "HT": "HTC"
+- "HD": "Huadoo"
 - "HU": "Huawei"
 - "HX": "Humax"
 - "HY": "Hyrican"
 - "HN": "Hyundai"
+- "IG": "iGet"
 - "IA": "Ikea"
 - "IB": "iBall"
+- "3I": "i-Cherry"
 - "IJ": "i-Joy"
+- "IC": "iDroid"
 - "IY": "iBerry"
+- "IH": "iHunt"
 - "IK": "iKoMo"
+- "IE": "iView"
+- "I8": "iVA"
+- "1I": "iMars"
 - "IM": "i-mate"
+- "2I": "iLife"
 - "I1": "iOcean"
 - "I2": "IconBIT"
+- "IL": "IMO Mobile"
+- "I7": "iLA"
 - "IW": "iNew"
+- "IP": "iPro"
 - "IF": "Infinix"
+- "I0": "InFocus"
+- "I5": "InnJoo"
 - "IN": "Innostream"
+- "IS": "Insignia"
+- "I4": "Inoi"
+- "IR": "iRola"
+- "IU": "iRulu"
+- "I6": "Irbis"
 - "II": "Inkti"
 - "IX": "Intex"
+- "4I": "Invin"
 - "IO": "i-mobile"
 - "IQ": "INQ"
+- "8Q": "IQM"
 - "IT": "Intek"
 - "IV": "Inverto"
 - "I3": "Impression"
 - "IZ": "iTel"
+- "0I": "iTruck"
+- "I9": "iZotron"
 - "JA": "JAY-Tech"
 - "JI": "Jiayu"
+- "JG": "Jinga"
 - "JO": "Jolla"
+- "J5": "Just5"
+- "JF": "JFone"
+- "JK": "JKL"
+- "KL": "Kalley"
+- "0K": "Klipad"
+- "K4": "Kaan"
+- "K7": "Kaiomy"
+- "K6": "Kanji"
 - "KA": "Karbonn"
+- "K5": "KATV1"
 - "KD": "KDDI"
 - "K1": "Kiano"
+- "KV": "Kivi"
 - "KI": "Kingsun"
+- "KC": "Kocaso"
 - "KG": "Kogan"
 - "KO": "Konka"
 - "KM": "Komu"
 - "KB": "Koobee"
+- "K9": "Kooper"
 - "KT": "K-Touch"
 - "KH": "KT-Tech"
+- "KK": "Kodak"
 - "KP": "KOPO"
 - "KW": "Konrow"
 - "KR": "Koridy"
+- "K2": "KRONO"
 - "KS": "Kempler & Strauss"
+- "K3": "Keneksi"
+- "K8": "Kuliao"
 - "KU": "Kumai"
 - "KY": "Kyocera"
 - "KZ": "Kazam"
+- "1K": "Kzen"
+- "KE": "Krüger&Matz"
+- "KX": "Kenxinda"
+- "LQ": "LAIQ"
 - "L2": "Landvo"
+- "L6": "Land Rover"
 - "LV": "Lava"
 - "LA": "Lanix"
+- "LK": "Lark"
 - "LC": "LCT"
+- "L5": "Leagoo"
+- "LD": "Ledstar"
 - "L1": "LeEco"
 - "L4": "Lemhoov"
 - "LE": "Lenovo"
 - "LN": "Lenco"
+- "LT": "Leotec"
+- "L7": "Lephone"
+- "LZ": "Lesia"
 - "LP": "Le Pan"
 - "LG": "LG"
 - "LI": "Lingwin"
 - "LO": "Loewe"
 - "LM": "Logicom"
+- "1L": "Logic"
 - "L3": "Lexand"
 - "LX": "Lexibook"
 - "LY": "LYF"
+- "LU": "Lumus"
+- "0L": "Lumigon"
+- "L9": "Luna"
+- "MN": "M4tel"
+- "XM": "Macoox"
 - "MJ": "Majestic"
 - "MA": "Manta Multimedia"
+- "6X": "Maxtron"
+- "5M": "Mann"
+- "2M": "Masstel"
+- "MW": "Maxwest"
+- "7M": "Maxcom"
+- "0D": "MAXVI"
+- "M0": "Maze"
 - "MB": "Mobistel"
+- "9M": "Mobo"
+- "0M": "Mecool"
 - "M3": "Mecer"
 - "MD": "Medion"
 - "M2": "MEEG"
 - "M1": "Meizu"
+- "3M": "Meitu"
 - "ME": "Metz"
+- "09": "meanIT"
+- "0E": "Melrose"
 - "MX": "MEU"
 - "MI": "MicroMax"
+- "8M": "Mito"
+- "1X": "Minix"
 - "M5": "MIXC"
+- "1Z": "MiXzo"
+- "MH": "Mobiola"
+- "4M": "Mobicel"
 - "M6": "Mobiistar"
 - "MC": "Mediacom"
 - "MK": "MediaTek"
 - "MO": "Mio"
 - "M7": "Miray"
 - "MM": "Mpman"
+- "LS": "MLS"
 - "M4": "Modecom"
 - "MF": "Mofut"
 - "MR": "Motorola"
+- "MV": "Movic"
 - "MS": "Microsoft"
 - "M9": "MTC"
+- "MP": "MegaFon"
 - "MZ": "MSI"
 - "MU": "Memup"
 - "MT": "Mitsubishi"
 - "ML": "MLLED"
 - "MQ": "M.T.T."
+- "N4": "MTN"
 - "MY": "MyPhone"
+- "3T": "MyTab"
+- "1M": "MYFON"
+- "MG": "MyWigo"
 - "M8": "Myria"
+- "6M": "Mystery"
+- "1R": "Multilaser"
+- "N3": "Navon"
+- "N7": "National"
+- "N5": "NOA"
 - "NE": "NEC"
+- "4N": "NextTab"
+- "5N": "Nos"
+- "1N": "Neomi"
 - "NF": "Neffos"
 - "NA": "Netgear"
+- "NU": "NeuImage"
 - "NG": "NGM"
+- "NZ": "NG Optics"
+- "N6": "Nobby"
 - "NO": "Nous"
 - "NI": "Nintendo"
+- "0N": "Newman"
 - "N1": "Noain"
 - "N2": "Nextbit"
 - "NK": "Nokia"
 - "NV": "Nvidia"
 - "NB": "Noblex"
 - "NM": "Nomi"
+- "2N": "Nomu"
+- "N0": "Nuvo"
+- "NL": "NUU Mobile"
+- "NY": "NYX Mobile"
 - "NN": "Nikon"
+- "N9": "Newland"
 - "NW": "Newgen"
+- "NS": "NewsMy"
 - "NX": "Nexian"
+- "N8": "NEXON"
 - "NT": "NextBook"
+- "O3": "O+"
 - "OB": "Obi"
 - "O1": "Odys"
 - "OD": "Onda"
 - "ON": "OnePlus"
+- "OX": "Onix"
+- "OH": "Openbox"
 - "OP": "OPPO"
+- "O4": "ONN"
 - "OR": "Orange"
+- "O5": "Orbic"
+- "OS": "Ordissimo"
 - "OT": "O2"
 - "OK": "Ouki"
+- "OE": "Oukitel"
 - "OU": "OUYA"
 - "OO": "Opsson"
 - "OV": "Overmax"
 - "OY": "Oysters"
+- "O6": "Oyyu"
+- "OW": "öwn"
+- "O2": "Owwo"
+- "OZ": "OzoneHD"
+- "PN": "Panacom"
 - "PA": "Panasonic"
+- "PB": "PCBOX"
+- "PC": "PCD"
+- "PD": "PCD Argentina"
 - "PE": "PEAQ"
 - "PG": "Pentagram"
 - "PH": "Philips"
+- "4P": "Philco"
+- "1P": "Phicomm"
 - "PI": "Pioneer"
+- "PX": "Pixus"
 - "PL": "Polaroid"
+- "P5": "Polytron"
 - "P9": "Primepad"
+- "2P": "Prixton"
+- "P6": "Proline"
 - "PM": "Palm"
+- "0P": "POCO"
+- "3P": "Positivo BGH"
 - "PO": "phoneOne"
+- "5P": "Phonemax"
 - "PT": "Pantech"
 - "PY": "Ployer"
+- "P4": "Plum"
+- "P8": "PocketBook"
 - "PV": "Point of View"
 - "PP": "PolyPad"
 - "P2": "Pomp"
 - "P3": "PPTV"
 - "PS": "Positivo"
 - "PR": "Prestigio"
+- "6P": "Primux"
+- "P7": "Protruly"
 - "P1": "ProScan"
 - "PU": "PULID"
+- "QB": "Q.Bell"
 - "QI": "Qilive"
 - "QT": "Qtek"
+- "QH": "Q-Touch"
 - "QM": "QMobile"
+- "QA": "Quantum"
 - "QU": "Quechua"
+- "QO": "Qumo"
 - "RA": "Ramos"
+- "RE": "Realme"
+- "R8": "RED"
+- "R9": "Ravoz"
+- "RZ": "Razer"
 - "RC": "RCA Tablets"
 - "RB": "Readboy"
 - "RI": "Rikomagic"
+- "RN": "Rinno"
+- "RV": "Riviera"
 - "RM": "RIM"
 - "RK": "Roku"
 - "RO": "Rover"
+- "R6": "RoverPad"
+- "RR": "Roadrover"
+- "R1": "Rokit"
+- "R3": "Rombica"
+- "RT": "RT Project"
+- "RX": "Ritmix"
+- "R7": "Ritzviva"
+- "R5": "Ross&Moor"
+- "R2": "R-TV"
+- "RG": "RugGear"
+- "RU": "Runbo"
+- "RY": "Ryte"
+- "SQ": "Santin"
 - "SA": "Samsung"
 - "S0": "Sanei"
+- "CZ": "Schneider"
 - "SD": "Sega"
+- "SL": "Selfix"
 - "SE": "Sony Ericsson"
+- "01": "Senkatel"
 - "S1": "Sencor"
 - "SF": "Softbank"
 - "SX": "SFR"
 - "SG": "Sagem"
 - "SH": "Sharp"
+- "7S": "Shift Phones"
+- "3S": "Shuttle"
 - "SI": "Siemens"
+- "SJ": "Silent Circle"
+- "1S": "Sigma"
 - "SN": "Sendo"
+- "0S": "SEMP TCL"
 - "S6": "Senseit"
+- "EW": "Senwa"
+- "SW": "Sky"
 - "SK": "Skyworth"
 - "SC": "Smartfren"
 - "SO": "Sony"
+- "OI": "Sonim"
+- "X2": "Soundmax"
+- "8S": "Soyes"
 - "SP": "Spice"
+- "6S": "Spectrum"
+- "9S": "Sugar"
+- "5S": "Sunvell"
+- "0H": "Sunstech"
 - "SU": "SuperSonic"
 - "S5": "Supra"
 - "SV": "Selevision"
 - "SY": "Sanyo"
 - "SM": "Symphony"
+- "4S": "Syrox"
 - "SR": "Smart"
 - "S7": "Smartisan"
 - "S4": "Star"
+- "SB": "STF Mobile"
 - "S8": "STK"
 - "S9": "Savio"
+- "2S": "Starway"
 - "ST": "Storex"
 - "S2": "Stonex"
 - "S3": "SunVan"
 - "SZ": "Sumvision"
+- "SS": "SWISSMOBILITY"
+- "QS": "SQOOL"
+- "0W": "Swipe"
+- "10": "Simbans"
+- "X1": "Safaricom"
 - "TA": "Tesla"
+- "TK": "Takara"
+- "4T": "Tronsmart"
 - "T5": "TB Touch"
 - "TC": "TCL"
 - "T7": "Teclast"
 - "TE": "Telit"
+- "9T": "Tetratab"
 - "T4": "ThL"
 - "TH": "TiPhone"
 - "TB": "Tecno Mobile"
 - "TP": "TechPad"
 - "TD": "Tesco"
+- "T0": "TD Systems"
 - "TI": "TIANYU"
+- "2T": "Tinai"
+- "TG": "Telego"
 - "TL": "Telefunken"
+- "2L": "Tele2"
 - "T2": "Telenor"
 - "TM": "T-Mobile"
 - "TN": "Thomson"
+- "8T": "Time2"
+- "TQ": "Timovi"
+- "TY": "Tooky"
+- "0T": "Tone"
 - "T1": "Tolino"
 - "T9": "Top House"
 - "TO": "Toplux"
+- "7T": "Torex"
 - "T8": "Touchmate"
 - "TS": "Toshiba"
 - "TT": "TechnoTrend"
@@ -332,55 +625,111 @@
 - "T3": "Trevi"
 - "TU": "Tunisie Telecom"
 - "TR": "Turbo-X"
+- "1T": "Turbo"
+- "5T": "TurboKids"
+- "11": "True"
 - "TV": "TVC"
+- "TW": "TWM"
+- "6T": "Twoe"
 - "TX": "TechniSat"
 - "TZ": "teXet"
+- "UC": "U.S. Cellular"
 - "UH": "Uhappy"
+- "U1": "Uhans"
+- "UG": "Ugoos"
 - "UL": "Ulefone"
 - "UO": "Unnecto"
 - "UN": "Unowhy"
 - "US": "Uniscope"
+- "UX": "Unimax"
 - "UM": "UMIDIGI"
 - "UU": "Unonu"
+- "UK": "UTOK"
+- "UA": "Umax"
 - "UT": "UTStarcom"
+- "UZ": "Unihertz"
 - "VA": "Vastking"
 - "VD": "Videocon"
 - "VE": "Vertu"
+- "VN": "Venso"
+- "V5": "Vivax"
+- "0V": "Vipro"
 - "VI": "Vitelcom"
+- "V7": "Vinga"
 - "VK": "VK Mobile"
 - "VS": "ViewSonic"
+- "VH": "Vsmart"
+- "V9": "Vsun"
+- "V8": "Vesta"
 - "VT": "Vestel"
 - "VR": "Vernee"
+- "V4": "Verizon"
 - "VL": "Verykool"
+- "V6": "VGO TEL"
 - "VV": "Vivo"
+- "VX": "Vertex"
 - "V3": "Vinsoc"
 - "V2": "Vonino"
+- "1V": "Vontar"
+- "VG": "Vorago"
+- "2V": "Vorke"
 - "V1": "Voto"
 - "VO": "Voxtel"
 - "VF": "Vodafone"
+- "VM": "Vodacom"
+- "V0": "VKworld"
+- "VY": "Voyo"
 - "VZ": "Vizio"
 - "VW": "Videoweb"
+- "VU": "Vulcan"
 - "WA": "Walton"
 - "WF": "Wileyfox"
+- "WN": "Wink"
+- "WM": "Weimei"
 - "WE": "WellcoM"
 - "WY": "Wexler"
+- "W2": "Wigor"
 - "WI": "Wiko"
+- "WS": "Winds"
+- "WP": "Wieppo"
 - "WL": "Wolder"
 - "WG": "Wolfgang"
 - "WO": "Wonu"
+- "W1": "Woo"
 - "WX": "Woxter"
+- "WR": "Wortmann"
+- "XV": "X-View"
 - "XI": "Xiaomi"
+- "XL": "Xiaolajiao"
+- "XN": "Xion"
 - "XO": "Xolo"
+- "XR": "Xoro"
+- "XG": "Xgody"
 - "YA": "Yarvik"
+- "YD": "Yandex"
+- "Y2": "Yes"
+- "YE": "Yezz"
+- "Y1": "Yu"
 - "YU": "Yuandao"
 - "YS": "Yusun"
+- "YO": "Yota"
 - "YT": "Ytone"
+- "YX": "Yxtel"
 - "ZE": "Zeemi"
+- "ZK": "Zenek"
+- "ZF": "Zfiner"
 - "ZO": "Zonda"
+- "ZI": "Zidoo"
+- "ZX": "Ziox"
 - "ZP": "Zopo"
 - "ZT": "ZTE"
 - "ZU": "Zuum"
 - "ZN": "Zen"
 - "ZY": "Zync"
+- "ZQ": "ZYQ"
+- "XS": "Xshitou"
+- "XT": "X-TIGI"
+- "XB": "NEXBOX"
+- "X3": "X-BO"
 - "WB": "Web TV"
 - "XX": "Unknown"
diff --git a/priv/ua_inspector/short_codes.mobile_browsers.yml b/priv/ua_inspector/short_codes.mobile_browsers.yml
index 9ce9a1b8ed..b6426d96d6 100644
--- a/priv/ua_inspector/short_codes.mobile_browsers.yml
+++ b/priv/ua_inspector/short_codes.mobile_browsers.yml
@@ -1,9 +1,11 @@
 - "36"
+- "OC"
 - "PU"
 - "SK"
 - "MF"
 - "OI"
 - "OM"
+- "DD"
 - "DB"
 - "ST"
 - "BL"
@@ -12,3 +14,28 @@
 - "C1"
 - "AL"
 - "SA"
+- "SB"
+- "FR"
+- "WP"
+- "HA"
+- "NX"
+- "HU"
+- "VV"
+- "RE"
+- "CB"
+- "MZ"
+- "UM"
+- "FK"
+- "FX"
+- "WI"
+- "MN"
+- "M1"
+- "AH"
+- "SU"
+- "EU"
+- "EZ"
+- "UT"
+- "DT"
+- "S0"
+- "QU"
+- "YN"
diff --git a/priv/ua_inspector/short_codes.os_families.yml b/priv/ua_inspector/short_codes.os_families.yml
index f6eca7b492..ae35189aff 100644
--- a/priv/ua_inspector/short_codes.os_families.yml
+++ b/priv/ua_inspector/short_codes.os_families.yml
@@ -57,6 +57,8 @@
   - "CES"
   - "BTR"
   - "SAF"
+  - "ORD"
+  - "TOS"
 - "Mac":
   - "MAC"
 - "Mobile Gaming Console":
diff --git a/priv/ua_inspector/short_codes.oss.yml b/priv/ua_inspector/short_codes.oss.yml
index 8d42b1706d..31a0e1725a 100644
--- a/priv/ua_inspector/short_codes.oss.yml
+++ b/priv/ua_inspector/short_codes.oss.yml
@@ -45,6 +45,7 @@
 - "OS2": "OS/2"
 - "T64": "OSF1"
 - "OBS": "OpenBSD"
+- "ORD": "Ordissimo"
 - "PSP": "PlayStation Portable"
 - "PS3": "PlayStation"
 - "RHT": "Red Hat"
@@ -64,6 +65,7 @@
 - "SY3": "Symbian^3"
 - "TDX": "ThreadX"
 - "TIZ": "Tizen"
+- "TOS": "TmaxOS"
 - "UBT": "Ubuntu"
 - "WTV": "WebTV"
 - "WIN": "Windows"
diff --git a/priv/ua_inspector/vendor_fragment.vendorfragments.yml b/priv/ua_inspector/vendor_fragment.vendorfragments.yml
index 5a026115a4..f18f9954ee 100644
--- a/priv/ua_inspector/vendor_fragment.vendorfragments.yml
+++ b/priv/ua_inspector/vendor_fragment.vendorfragments.yml
@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -20,7 +20,7 @@ Sony:
 
 Asus:
   - 'MAAU'
-  - 'NP0[6789]'
+  - 'NP0[26789]'
   - 'ASJB'
   - 'ASU2(JS)?'
 
@@ -69,3 +69,7 @@ HP:
 
 Hyrican:
   - 'MANM(JS)?'
+
+Ordissimo:
+  - 'Ordissimo'
+  - 'webissimo3'