device_detector 1.0.2 → 1.0.3

data/regexes/client/feed_readers.yml

@@ -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'

data/regexes/client/libraries.yml

@@ -82,3 +82,12 @@
 - 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/'

data/regexes/client/mobile_apps.yml

@@ -165,4 +165,43 @@
   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)/([\d\.]+)?'
+  name: 'CrosswalkApp'
+  version: '$1'

data/regexes/client/pim.yml

@@ -43,4 +43,9 @@
 
 - regex: 'DAVdroid(?:/(\d+[\.\d]+))?'
   name: 'DAVdroid'
+  version: '$1'
+
+# SeaMonkey
+- regex: '(?:SeaMonkey|Iceape)(?:/(\d+[\.\d]+))?'
+  name: 'SeaMonkey'
   version: '$1'

data/regexes/device/mobiles.yml

@@ -8,7 +8,7 @@
 'Tunisie Telecom':
   regex: 'StarTrail TT[);/ ]'
   device: 'smartphone'
-  model: 'StarTrail'
+  model: 'StarTrail by TT'
 
 # SFR
 SFR:
@@ -29,6 +29,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,10 +56,12 @@ 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'
   device: 'smartphone'
   models:
     # explicit smartphone models
+    - regex: '2PZC5[);/ ]'
+      model: 'U11'
     - regex: 'XV6975[);/ ]'
       model: 'Imagio'
     - regex: 'PG86100[);/ ]'
@@ -127,40 +131,52 @@ HTC:
 
 # 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|1154|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: '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}'
+  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
@@ -178,12 +194,121 @@ Nokia:
     - 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'
+      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]+)'
@@ -316,117 +441,160 @@ 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'
   models:
     # 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'
       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'
       model: 'iPhone 4S'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?5[C,][12]'
+    - regex: '(?:Apple-)?iPh(?:one)?5[C,_][12]'
       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]'
       model: 'iPhone 5S'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?7[C,]1'
+    - regex: '(?:Apple-)?iPh(?:one)?7[C,_]1|1C2%257enohPi'
       model: 'iPhone 6 Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?7[C,]2'
+    - regex: '(?:Apple-)?iPh(?:one)?7[C,_]2'
       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'
       model: 'iPhone 6s Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?8[C,]4'
+    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]1|iPhone 6s'
+      model: 'iPhone 6s'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]4'
       model: 'iPhone SE'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?9[C,][13]'
+    - regex: '(?:Apple-)?iPh(?:one)?9[C,_][13]'
       model: 'iPhone 7'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?9[C,][24]'
+    - regex: '(?:Apple-)?iPh(?:one)?9[C,_][24]'
       model: 'iPhone 7 Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?10[C,][14]'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][14]'
       model: 'iPhone 8'
       device: 'smartphone'
-    - regex: '(?:Apple-)?iPh(?:one)?10[C,][25]'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][25]'
       model: 'iPhone 8 Plus'
       device: 'phablet'
-    - regex: '(?:Apple-)?iPh(?:one)?10[C,][36]'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][36]|iPhone X'
       model: 'iPhone X'
       device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][2]'
+      model: 'iPhone XS'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][46]'
+      model: 'iPhone XS Max'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][8]'
+      model: 'iPhone XR'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][1]'
+      model: 'iPhone 11'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][3]'
+      model: 'iPhone 11 Pro'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][5]'
+      model: 'iPhone 11 Pro Max'
+      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'
@@ -442,7 +610,7 @@ Apple:
 
 # micromax
 MicroMax:
-  regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|P70221 Build'
+  regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|P70221 Build|YU(5040|5530)[);/ ]'
   device: 'smartphone'
   models:
     - regex: 'AQ5001'
@@ -456,6 +624,10 @@ MicroMax:
       model: 'Bolt'
     - regex: 'Q417'
       model: 'Canvas Mega'
+    - regex: 'YU5040[);/ ]'
+      model: 'YU Yureka YU5040'
+    - regex: 'YU5530[);/ ]'
+      model: 'YU Yureka S YU5530'
     - regex: 'Q424'
       model: 'Bolt Selfie'
     - regex: 'Q426'
@@ -468,9 +640,23 @@ 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:
@@ -480,7 +666,9 @@ MicroMax:
     - regex: 'T700i_3G'
       model: 'T700i 3G'
       device: 'tablet'
-    - regex: '(S(?:450m|555m|501m)[_ ][43]G|Light A103)'
+    - regex: 'S555m[_ ]4G'
+      model: 'People'
+    - regex: '(S(?:450m|501m)[_ ][43]G|Light A103)'
       model: '$1'
     - regex: '4Good[ _]([^;/]+) Build'
       model: '$1'
@@ -511,7 +699,7 @@ AllCall:
 
 # Bravis
 Bravis:
-  regex: 'Bravis[ _]|A501 Bright|NB(?:106M|10[1-8]|751|7[145]|8[57]1|76)|NP101|NP 104 3G|B501'
+  regex: 'Bravis[ _]|A501 Bright|NB(?:106M|10[1-8]|751|7[145]|8[57]1|76)|NP101|NP 104 3G|B501|N1-570 Space'
   device: 'smartphone'
   models:
     - regex: 'A501 Bright'
@@ -530,6 +718,8 @@ Bravis:
       model: 'Trend'
     - regex: 'B501'
       model: 'Easy'
+    - regex: 'N1-570'
+      model: 'Space'
     - regex: 'BRAVIS[ ]A554'
       model: 'A554 Grand'
     - regex: 'BRAVIS[ _]SLIM[ _]3G'
@@ -546,7 +736,7 @@ Bravis:
 
 # Acer
 Acer:
-  regex: 'acer|(?<!ZTE BLADE )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|(?<!ZTE BLADE )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-830|A1-81[01]|A1-7[23]4|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[);/ ]|S5[12]0 Build|DA[0-9]+HQ?L[);/ ]|Aspire V5-121|Predator G9-793|GT-810'
   device: 'smartphone'
   models:
     # smart displays
@@ -567,60 +757,121 @@ Acer:
     - 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|B1-730HD'
+      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'
       model: 'Iconia One 8'
       device: 'tablet'
     - regex: 'B3-A[12]0|B3-A3[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'
+      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[ _\-]?([^;\)]+) Build'
+    - regex: 'Acer(?! ?inc)[ _\-]?([^;\(\)/]+)[();/ ]'
       model: '$1'
     - regex: 'acer[\-_]([a-z0-9]+)'
       model: '$1'
@@ -721,7 +972,7 @@ Arian Space:
 
 # 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]|5024A|5025[DG]|5026[AD]|5027B|5033[AX]|5033D[ _]RU|5038[ADEX]|5041C|5042[ADEFGWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[AD]|5054[ADNSWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIY]|5059[ADXYZ]|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]|6060S|6062W|6070K|7040[ADEFKRT]|7041[DX]|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7055A|7070X|8030Y|8050[DEGX]|8063|9001[DIX]|9002X|9003[AX]|9024O|9005X|9007[ATX]|9008[ADIJNTUX]|9010X|9022X|9203A|A570BL|I213|I216X)[);/ ]|TIMXL'
+  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]|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]|5024A|5025[DEG]|5026[AD]|5027B|5033[AX]|5033D[ _]RU|5034D|5038[ADEX]|5041C|5042[ADEFGWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[AD]|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIY]|5059[ADXYZ]|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]|6060S|6062W|6070K|7040[ADEFKRT]|7041[DX]|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7055A|7070X|8030Y|8050[DEGX]|8063|9001[DIX]|9002X|9003[AX]|9024O|9005X|9007[ATX]|9008[ADIJNTUX]|9010X|9022X|9203A|A570BL|I213|I216X)[);/ ]|TIMXL'
   device: 'smartphone'
   models:
     - regex: '(?:5022[EDX]|5070D)[);/ ]'
@@ -762,7 +1013,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'
@@ -790,6 +1041,8 @@ Alcatel:
       model: 'One Touch Dawn'
     - regex: '5024A[);/ ]'
       model: '1S'
+    - regex: '5034D[);/ ]'
+      model: '3L'
     - regex: '7040[RT][);/ ]'
       model: 'One Touch Fierce 2'
     - regex: '5056[NW]'
@@ -932,6 +1185,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'
@@ -957,6 +1226,12 @@ 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: '5033[AX][);/ ]'
@@ -979,6 +1254,8 @@ Alcatel:
       model: '7'
     - regex: 'Alcatel UP'
       model: ''
+    - regex: '(?:ALCATEL_)?A383G[);/ ]'
+      model: 'Big Easy Plus'
     - regex: '5041C'
       model: 'TETRA'
     - regex: 'ALCATEL([^/;]+) Build'
@@ -992,13 +1269,19 @@ Alcatel:
 
 # Allview
 Allview:
-  regex: 'Allview|A4You|A5_(?:Easy(?:_TM)?|Ready(?:_TM)?|Quad|Quad_Plus_TM)|A[56789]_Lite|A5Smiley|A6_Duo|AX4Nano|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_Style|7_Xtreme|6_Qmax|4_Quad)|V(?:[13]_Viper|1_Viper_I|2_Viper_(?:E|I|S|X|X_plus|Xe))|X(?:[1234]_Soul_Xtreme|[12345]_Soul|3_Soul_Lite|[24]Soul_Mini(?:_TM)?|4_Soul_Mini_S(?:_TM)?|[234]_Soul_Style(?:_TM)?|2_Soul_Style_Plus|2_Twin)|Viva_H801'
+  regex: 'Allview|A4You|A5_(?:Easy(?:_TM)?|Ready(?:_TM)?|Quad|Quad_Plus_TM)|A[56789]_Lite|A5Smiley|A6_Duo|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_Style|7_Xtreme|6_Qmax|4_Quad)|V(?:[13]_Viper|1_Viper_I|2_Viper_(?:E|I|S|X|X_plus|Xe))|X(?:[1234]_Soul_Xtreme|[12345]_Soul|3_Soul_Lite|[24]Soul_Mini(?:_TM)?|4_Soul_Mini_S(?:_TM)?|[234]_Soul_Style(?:_TM)?|2_Soul_Style_Plus|2_Twin)|Viva_H801'
   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'
@@ -1091,10 +1374,12 @@ Allview:
       model: 'A5 Quad'
     - regex: 'A6_Duo'
       model: 'A6 Duo'
-    - regex: 'Allview[ _-]([^;/]+) Build'
-      model: '$1'
-    - regex: 'Allview[ _-]([^;/]+)[;/)]'
-      model: '$1'
+    - regex: 'Impera S'
+      model: 'Impera S'
+    - regex: 'ALLVIEW P4i'
+      model: 'AllDro P4'
+    - regex: 'Allview_P2'
+      model: 'AllDro'
 
     # explicit tablet models
     - regex: 'AllviewCityPlus'
@@ -1115,6 +1400,32 @@ Allview:
     - regex: 'Viva_H801'
       device: 'tablet'
       model: 'Viva H801'
+    - 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'
+  device: 'tablet'
+  model: 'A64 QUAD-CORE p3'
 
 # altron
 altron:
@@ -1181,6 +1492,13 @@ Ainol:
   regex: 'Numy|novo[0-9]'
   device: 'tablet'
   models:
+    - regex: 'Numy 3G AX1'
+      model: 'Novo 7 Numy AX1 3G'
+    - regex: 'Numy_3G_AX3'
+      model: 'Numy AX3 Sword'
+    - regex: 'Numy_3G_BW1'
+      model: 'Numy 3G Talos 2'
+
     - regex: 'Numy[ _]([^;/]+) Build'
       model: 'Numy $1'
     - regex: 'Novo([0-9]+)[ \-]([^;/]+) Build'
@@ -1191,6 +1509,8 @@ Archos:
   regex: '(?:YL-)?Archos'
   device: 'smartphone'
   models:
+    - regex: 'Archos (Oxygen 63)[);/ ]'
+      model: '$1'
     - regex: 'Archos ?5[);/ ]'
       device: 'tablet'
       model: '5'
@@ -1351,7 +1671,7 @@ Assistant:
 
 # Ark
 Ark:
-  regex: '(ARK[_ -])?Benefit[_ -]([^/;]*) Build|EDGE A5HD|ICON (R40\+|R45)|Impulse[ _](P[12])'
+  regex: '(ARK[_ -])?Benefit[_ -]([^/;]*) Build|EDGE A5HD|ICON (R40\+|R45)|Impulse[ _](P[12])|Wizard_1[/;) ]'
   device: 'smartphone'
   models:
     - regex: '(?:ARK[_ -])?Benefit[_ -]([^/;]*) Build'
@@ -1364,6 +1684,8 @@ Ark:
       model: 'Edge $1'
     - regex: 'ICON (R40\+|R45)'
       model: 'Icon $1'
+    - regex: 'Wizard_1'
+      model: 'Wizard 1'
 
 # Garmin-Asus
 Garmin-Asus:
@@ -1379,7 +1701,7 @@ 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(?:00[18ACIL]|01[MTVWYZ]|01MA|01T_1|02[13478])(?: Build|\))|X015D|X018D|X003|X00[7ABT]D|Z00D|Z00[MTY]D|Z01[7FGHKMR]D)[);/ ]|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|ZS6[23]0KL|ZB500KG'
+  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)[);/ ]|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|ZS6[23]0KL|ZB(500KG|601KL)'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -1501,6 +1823,8 @@ Asus:
       model: 'ZenFone C'
     - regex: '(?:ASUS_)?(X00PD|ZB555KL)'
       model: 'ZenFone Max M1'
+    - regex: '(?:ASUS_)?(ZB601KL)'
+      model: 'ZenFone Max Pro M1'
     - regex: '(?:ASUS_)?(X01AD|ZB633KL)'
       model: 'ZenFone Max M2'
     - regex: '(?:ASUS_)?(?:Z00[AD]|Z008D|Z008|Z00AD[AB]?)'
@@ -1583,6 +1907,8 @@ Asus:
       model: 'ZenFone Zoom'
     - regex: '(?:ASUS_)?Z01QD'
       model: 'ROG Phone'
+    - regex: '(?:ASUS_)?I001DA'
+      model: 'ROG Phone 2'
 
     # general detections
     - regex: 'Asus(?:-|;)?([a-z0-9]+)'
@@ -1751,11 +2077,13 @@ Bluegood:
 
 # Blackview
 Blackview:
-  regex: '(BV([2456789]000|(5[58]|9[56])00)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550)'
+  regex: '(BV([2456789]000|(5[58]|9[56])00)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550|BV9700Pro)'
   device: 'smartphone'
   models:
     - regex: '(BV6000S)'
       model: '$1'
+    - regex: '(BV9700)Pro'
+      model: '$1 Pro'
     - regex: 'BV9000Pro-F'
       model: 'BV9000 Pro F'
     - regex: '(BV([48]000|9[56]00))Pro'
@@ -1860,27 +2188,91 @@ Brondi:
       model: 'SURFING TAB $1'
       device: 'tablet'
 
+# VGO TEL
+VGO TEL:
+  regex: 'Venture V8'
+  device: 'smartphone'
+  models:
+    - regex: 'Venture V8'
+      model: 'Venture V8'
+
 # Vivo
 Vivo:
-  regex: '((?:VIV-|BBG-)?vivo)|V1813BA|V1818T|V1731CA|V1809T|V1813T'
+  regex: '((?:VIV-|BBG-)?vivo)|V1813BA|V1818T|V1731CA|V1809T|V1813T|V1818A'
   device: 'smartphone'
   models:
-    - regex: '(?:VIV-|BBG-)?vivo[ _]1601 Build'
+    - regex: '(?:VIV-|BBG-)?vivo[ _]1601[);/ ]'
       model: 'V5'
     - regex: 'V1813BA'
       model: 'Z3'
+    - regex: 'Vivo ONE'
+      model: 'One'
+    - regex: 'X9Plus'
+      model: 'X9 Plus'
+    - regex: 'X20Plus'
+      model: 'X20 Plus'
     - regex: 'V1809T'
       model: 'X23'
-    - regex: 'V1818T'
+    - regex: 'V1818[AT]|vivo 181[45]'
       model: 'Y93'
     - regex: 'V1813T'
       model: 'Y97'
     - regex: 'V1731CA'
       model: 'Y73'
-    - regex: 'vivo 1816'
+    - regex: 'vivo 18(16|20)'
       model: 'Y91i'
-    - regex: 'vivo 1817'
+    - regex: 'vivo 1606'
+      model: 'Y53i'
+    - regex: 'vivo 1603'
+      model: 'Y55l'
+    - regex: 'vivo 1609'
+      model: 'V5 Lite'
+    - regex: 'vivo 1610'
+      model: 'Y55s'
+    - regex: 'vivo 1611'
+      model: 'V5 Plus'
+    - regex: 'vivo 181[17]'
       model: 'Y91'
+    - regex: 'vivo (1713|1612)'
+      model: 'V5s'
+    - regex: 'vivo 1714'
+      model: 'Y69'
+    - regex: 'vivo 1716'
+      model: 'V7 Plus'
+    - regex: 'vivo 1718'
+      model: 'V7'
+    - regex: 'vivo 1719'
+      model: 'Y65'
+    - regex: 'vivo 1723'
+      model: 'V9'
+    - regex: 'vivo 1726'
+      model: 'Y83 Pro'
+    - regex: 'vivo 1721'
+      model: 'X20'
+    - regex: 'vivo 1724'
+      model: 'Y71'
+    - regex: 'vivo 1725'
+      model: 'X21'
+    - regex: 'vivo 1727'
+      model: 'V9 Youth'
+    - regex: 'vivo 1801'
+      model: 'Y71i'
+    - regex: 'vivo 1804'
+      model: 'V11 Pro'
+    - regex: 'vivo 1805'
+      model: 'Nex'
+    - regex: 'vivo 1806'
+      model: 'V11i'
+    - regex: 'vivo 1807'
+      model: 'Y95'
+    - regex: 'vivo 180([38]|8i)'
+      model: 'Y81'
+    - regex: 'vivo 1818'
+      model: 'V15 Pro'
+    - regex: 'vivo 1902'
+      model: 'Y17'
+    - regex: 'vivo 1909'
+      model: 'V17 Pro'
     - regex: 'vivo 1812'
       model: 'Y81i'
     - regex: '(?:VIV-|BBG-)?vivo[ _]([^/;]+) Build'
@@ -1915,8 +2307,8 @@ Beeline:
   regex: 'Beeline'
   device: 'smartphone'
   models:
-    - regex: 'Beeline_Pro_6'
-      model: 'Pro 6'
+    - regex: 'Beeline[_ ]Pro[_ ]([26])'
+      model: 'Pro $1'
     - regex: 'Tab (Fast|Pro)'
       model: 'Tab $1'
       device: 'tablet'
@@ -1995,230 +2387,297 @@ bq:
   regex: 'Aquaris|bq [^/;]+ Build|BQS-([0-9]{4})|(BQ(ru)?[_ -][0-9]{3,4})'
   device: 'smartphone'
   models:
-    - regex: 'BQ-5594'
-      model: 'Strike Power Max'
-    - regex: 'BQ(ru)?-5054'
-      model: 'Crystal'
-    - regex: 'BQ(ru)?-5503'
-      model: 'Nice 2'
-    - regex: 'BQ-5056'
-      model: 'Fresh'
-    - regex: 'BQ-5507L'
-      model: 'Iron Max'
-    - regex: 'BQ-5508L'
-      model: 'Next LTE'
-    - regex: 'BQ-5010G'
-      model: 'Spot'
-    - regex: 'BQ-5500L'
-      model: 'Advance'
-    - regex: 'BQ-5012L'
-      model: 'Rich'
-    - regex: 'BQ(ru)?-5022'
-      model: 'Bond'
-    - regex: 'BQ-5002G'
-      model: 'Fun'
-    - regex: 'BQ(S)?-(5701L|5060)'
-      model: 'Slim'
-    - regex: 'BQ-5511L'
-      model: 'Bliss'
-    - regex: 'BQ-5520L'
-      model: 'Silk'
-    - regex: 'BQ-5071'
-      model: 'Belief'
-    - regex: 'BQ-5301'
-      model: 'Strike View'
-    - regex: 'BQS-4007'
-      model: 'Valencia'
-    - regex: 'BQ-4501G'
-      model: 'Fox Easy'
-    - regex: 'BQ-5515(L)?'
-      model: 'Fast'
-    - regex: 'BQ(S)?-5045'
-      model: 'Fast'
-    - regex: 'BQ-5015L'
-      model: 'First'
-    - regex: 'BQ-5519L'
-      model: 'Fast Plus'
-    - regex: 'BQ(S)?-(6016L|5520)'
-      model: 'Mercury'
+    - regex: 'BQ(ru)?-(5209L|5044)'
+      model: 'Strike LTE'
+    - regex: 'BQ(S|ru)?-(5070|6040L)'
+      model: 'Magic'
+    - 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-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'
+      model: 'Practic'
     - regex: 'BQ-6001L|BQ-6050'
       model: 'Jumbo'
-    - regex: 'BQ-5700L'
-      model: 'Space X'
-    - regex: 'BQ(ru)?-5201'
-      model: 'Space'
-    - regex: 'BQ(ru)?-(5209L|5044)'
-      model: 'Strike LTE'
-    - regex: 'BQ-4526|BQ-5004G'
-      model: 'Fox'
-    - regex: 'BQ(ru)?[- ]402[68]'
-      model: 'Up!'
-    - regex: 'BQ-(4585|5011G)'
-      model: 'Fox View'
-    - regex: 'BQS-5025'
-      model: 'High Way'
-    - regex: 'BQ-5008L'
-      model: 'Brave'
-    - regex: 'BQ-5052'
-      model: 'Sense'
-    - regex: 'BQ-5512L|BQ-5528L'
-      model: 'Strike Forward'
-    - regex: 'BQ-5003L'
-      model: 'Shark Pro'
-    - regex: 'BQ-5005L'
-      model: 'Intense'
-    - regex: 'BQ-5522'
-      model: 'Next'
     - regex: 'BQ-5707G'
       model: 'Next Music'
+    - regex: 'BQ-5702'
+      model: 'Spring'
+    - regex: 'BQ-5700L'
+      model: 'Space X'
+    - regex: 'BQ-5594'
+      model: 'Strike Power Max'
     - regex: 'BQ-5591'
       model: 'Jeans'
-    - regex: 'BQ-5009L'
-      model: 'Trend'
-    - regex: 'BQ-5300G'
-      model: 'Velvet View'
-    - regex: 'BQS-4701'
-      model: 'Venice'
-    - regex: 'BQS-4003'
-      model: 'Verona'
+    - regex: 'BQ-5522'
+      model: 'Next'
+    - regex: 'BQ(ru)?-5521'
+      model: 'Strike Power Max'
+    - 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: 'BQS-5055'
-      model: 'Turbo Plus'
+    - regex: 'BQ-5515(L)?'
+      model: 'Fast'
+    - regex: 'BQ-5512L|BQ-5528L'
+      model: 'Strike Forward'
+    - regex: 'BQ-5511L'
+      model: 'Bliss'
+    - regex: 'BQ(ru)?-5510'
+      model: 'Strike Power Max 4G'
+    - 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(ru)?[_ ]5590'
-      model: 'Spring'
-    - regex: 'BQ(ru)?-5035'
-      model: 'Velvet'
-    - regex: 'BQ(S|ru)?-(5070|6040L)'
-      model: 'Magic'
-    - regex: 'BQ-4001G'
-      model: 'Cool'
+    - 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)?-5211|BQS-5020'
+      model: 'Strike'
+    - regex: 'BQ-5206L'
+      model: 'Balance'
+    - regex: 'BQ(ru)?-5204|BQS-5050'
+      model: 'Strike Selfie'
+    - regex: 'BQ(ru)?-5203'
+      model: 'Vision'
     - regex: 'BQ(ru)?-5202'
       model: 'Space Lite'
-    - regex: 'BQ(ru)?-5037|BQ-5514L'
-      model: 'Strike Power 4G'
-    - regex: 'BQ(ru)?-5510'
-      model: 'Strike Power Max 4G'
+    - regex: 'BQ(ru)?-5201'
+      model: 'Space'
+    - regex: 'BQ-5082'
+      model: 'Sense 2'
+    - regex: 'BQ-5071'
+      model: 'Belief'
+    - regex: 'BQS-5065|BQ-5340'
+      model: 'Choice'
     - regex: 'BQ(ru)?-5059|BQ-5514G'
       model: 'Strike Power'
-    - regex: 'BQ(ru)?-4072'
-      model: 'Strike Mini'
-    - regex: 'BQ(ru)?-5521'
-      model: 'Strike Power Max'
     - regex: 'BQ-5058'
       model: 'Strike Power Easy'
-    - regex: 'BQ-6200L|BQ-6000L'
-      model: 'Aurora'
-    - regex: 'BQ(ru)?-5000'
-      model: 'Tokyo'
-    - regex: 'BQ-6010G'
-      model: 'Practic'
-    - regex: 'BQ(ru)?-5204|BQS-5050'
-      model: 'Strike Selfie'
-    - regex: 'BQ(ru)?-5504'
-      model: 'Strike Selfie Max'
     - regex: 'BQ(ru)?-5057'
       model: 'Strike 2'
-    - regex: 'BQ(ru)?-5203'
-      model: 'Vision'
-    - regex: 'BQ(ru)?-5211|BQS-5020'
-      model: 'Strike'
+    - regex: 'BQ-5056|BQS-5030'
+      model: 'Fresh'
+    - 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|BQ-5514L'
+      model: 'Strike Power 4G'
+    - regex: 'BQ(ru)?-5035'
+      model: 'Velvet'
     - regex: 'BQ(ru)?-5033'
       model: 'Shark'
-    - regex: 'BQ-4077'
-      model: 'Shark Mini'
     - regex: 'BQ-5032'
       model: 'Element'
-    - regex: 'BQ-5082'
-      model: 'Sense 2'
-    - regex: 'BQS-5065|BQ-5340'
-      model: 'Choice'
-    - regex: 'BQ-5702'
-      model: 'Spring'
-    - regex: 'BQ-5302G'
-      model: 'Velvet 2'
-    - regex: 'BQ-5001L'
-      model: 'Contact'
+    - 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: 'BQ-5516L'
-      model: 'Twin'
-    - regex: 'BQ-5517L'
-      model: 'Twin Pro'
-    - regex: 'BQ-5206L'
-      model: 'Balance'
-    - regex: 'Aquaris M8'
-      model: 'Aquaris M8'
-      device: 'tablet'
-    - regex: 'BQ-7084G'
-      model: 'Simple'
-      device: 'tablet'
-    - regex: 'BQ-7021G'
-      model: 'Hit'
-      device: 'tablet'
-    - regex: 'BQ-8067L'
-      model: 'Hornet Plus'
-      device: 'tablet'
-    - regex: 'BQ-7036L'
-      model: 'Hornet'
-      device: 'tablet'
-    - regex: 'BQ-9011(G)?'
-      model: 'Vision'
-      device: 'tablet'
-    - regex: 'BQ-7061G'
-      model: 'Andros'
-      device: 'tablet'
+    - regex: 'BQS-5006'
+      model: 'Los Angeles'
+    - regex: 'BQ-5005L'
+      model: 'Intense'
+    - regex: 'BQS-5004'
+      model: 'Paris'
+    - regex: 'BQ-5003L'
+      model: 'Shark Pro'
+    - regex: 'BQ-5002G'
+      model: 'Fun'
+    - regex: 'BQS-5002'
+      model: 'Colombo'
+    - 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: 'BQS-4570'
+      model: 'Drive'
+    - regex: 'BQS-4560'
+      model: 'Golf'
+    - regex: 'BQS-4555'
+      model: 'Turbo'
+    - regex: 'BQS-4550'
+      model: 'Richmond'
+    - regex: 'BQ-(?: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-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-8068L'
-      model: 'Hornet Plus Pro'
-    - regex: 'BQ-7010G'
-      model: 'Max'
-      device: 'tablet'
-    - regex: 'BQ-7051G'
-      model: 'Elba'
+    - regex: 'BQ-1083G'
+      model: 'Armor Pro Plus'
       device: 'tablet'
     - regex: 'BQ-1082G'
       model: 'Armor Pro'
       device: 'tablet'
-    - regex: 'BQ-1083G'
-      model: 'Armor Pro Plus'
-      device: 'tablet'
     - regex: 'BQ-1077L'
       model: 'Armor Pro LTE'
       device: 'tablet'
-    - regex: 'BQ-7022(G)?'
-      model: 'Canion'
-      device: 'tablet'
-    - regex: 'BQ-8041L'
-      model: 'Art'
-      device: 'tablet'
-    - regex: 'BQ-7006G'
-      model: 'Union'
+    - regex: 'BQ(ru)?-1057L'
+      model: 'Passion'
       device: 'tablet'
     - regex: 'BQ-1051G'
       model: 'Corsika'
       device: 'tablet'
-    - regex: 'BQ-8052G'
-      model: 'BQ-8052G'
-      device: 'tablet'
     - regex: 'BQ-1050G'
       model: 'Hawaii'
       device: 'tablet'
     - regex: 'BQ-1008G'
       model: 'Grace'
       device: 'tablet'
-    - regex: 'BQ-7003'
-      model: 'Jamaica'
+    - regex: 'Aquaris M8'
+      model: 'Aquaris M8'
       device: 'tablet'
+    - regex: 'BQ(ru)?[_ ]5590'
+      model: 'Spring'
+    - regex: 'BQ(S)?-(6016L|5520)'
+      model: 'Mercury'
+    - regex: 'BQ(S)?-(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'
@@ -2243,9 +2702,15 @@ bq:
     - regex: 'BQ-7050G'
       model: 'Malta'
       device: 'tablet'
+    - regex: 'BQ-7000G'
+      model: 'Сharm'
+      device: 'tablet'
     - regex: 'BQ-7005G'
       model: 'Maui'
       device: 'tablet'
+    - regex: 'BQ-7098G'
+      model: 'Armor Power'
+      device: 'tablet'
     - regex: 'BQ-1007'
       model: 'Necker'
       device: 'tablet'
@@ -2314,6 +2779,16 @@ Casio:
     - regex: 'C811 4G[);/ ]'
       model: "G'zOne Commando 4G LTE"
 
+# Casper
+Casper:
+  regex: 'CASPER_|VIA_(G4|M4|P2|V8C)'
+  device: 'smartphone'
+  models:
+    - regex: 'CASPER_VIA_(E2|M[13]|V[69])'
+      model: 'VIA $1'
+    - regex: 'VIA_(G4|M4|P2|V8C)'
+      model: 'VIA $1'
+
 # Cat
 Cat:
   regex: 'Cat ?(tablet|stargate|nova)|B15Q'
@@ -2518,7 +2993,7 @@ ConCorde:
 
 # Condor
 Condor:
-  regex: '(?:PGN\-?[456][012][0-9]|PHS\-601|Plume L1)[;/) ]|CTAB[^/;]+ Build'
+  regex: 'Allure M3|(?:PGN\-?[456][012][0-9]|PHS\-601|Plume L1)[;/) ]|CTAB[^/;]+ Build'
   device: 'smartphone'
   models:
     - regex: 'CTAB([^/;]+) Build'
@@ -2539,6 +3014,8 @@ Condor:
       model: 'C8S'
     - regex: 'PGN\-?506'
       model: 'C7'
+    - regex: 'Allure M3'
+      model: 'Allure M3'
     - regex: 'PGN\-?507'
       model: 'Allure A9'
     - regex: 'PGN\-?508'
@@ -2617,6 +3094,14 @@ Coolpad:
     - 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]+)'
@@ -2647,11 +3132,13 @@ Crosscall:
 
 # Cube
 Cube:
-  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)'
+  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)|(T8-PLUSM?S?)[);/ ]'
   device: 'tablet'
   models:
     - regex: 'U27GT'
       model: 'Talk 8'
+    - regex: 'T8-PLUSM?S?[);/ ]'
+      model: 'T8 Ultimate'
     - regex: 'U55GT'
       model: 'Talk 79'
     - regex: 'U65GT'
@@ -2689,7 +3176,7 @@ CUBOT:
       model: 'Power'
     - regex: 'CUBOT_X18_Plus'
       model: 'X18 Plus'
-    - regex: 'CUBOT[ _](H3|J3|P7|P20|C6W|X18)'
+    - regex: 'CUBOT[ _](A5|C6W|H3|J3|P7|P20|R9|R11|X18)'
       model: '$1'
     - regex: 'CUBOT ([^;/]+) Build'
       model: '$1'
@@ -2774,6 +3261,12 @@ Dell:
   models:
     - regex: 'XCD35'
       model: 'XCD35'
+    - regex: '(?:Dell )?Venue Build'
+      model: 'Venue'
+      device: 'smartphone'
+    - regex: 'Dell; Venue Pro'
+      model: 'Venue Pro'
+      device: 'smartphone'
     - regex: '(?:Dell )?(Streak|Venue) ?([^/;]*) Build'
       model: '$1 $2'
       device: 'tablet'
@@ -2797,7 +3290,7 @@ Desay:
 
 # DEXP
 DEXP:
-  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build'
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|(BL150|BS155|BS160|BS550|BS650)[);/ ]'
   device: 'smartphone'
   models:
 
@@ -2811,7 +3304,8 @@ DEXP:
     - regex: 'H135[ _]Build'
       model: 'Atlas'
       device: 'desktop'
-
+    - regex: '(BL150|BS155|BS160|BS550|BS650)[);/ ]'
+      model: '$1'
     - regex: 'DEXP[ _]([^;/]+) Build'
       model: '$1'
     - regex: 'DEXP[ _]([^);/]+)[);/ ]'
@@ -2862,7 +3356,7 @@ Digiland:
 
 # 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)'
+  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|LS504[01]PL|LT40(47|54)MG|LS405[01]MG|LS5053ML|LT5048MG|LT5052ML|LT4049PG|NS6902QL|NS9797MG|((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
   device: 'smartphone'
   models:
     - regex: 'HIT HT707[10]MG'
@@ -2877,6 +3371,26 @@ Digma:
       model: '$1'
     - regex: 'PS604M'
       model: 'Linx 6.0'
+    - 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 A400 3G) LT4001PG'
       model: '$1'
     - regex: '(Linx C500 3G) LT5001PG'
@@ -2940,7 +3454,7 @@ 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?)[);/ ]|BL[579]000[);/ ]|BL12000|BL5500[_ ]Lite'
+  regex: 'DOOGEE[ _-]|Valencia2_Y100pro|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'
   device: 'smartphone'
   models:
     - regex: 'Valencia2_Y100pro'
@@ -2953,6 +3467,8 @@ Doogee:
       model: 'BL5500 Lite'
     - regex: 'BL12000'
       model: 'BL12000'
+    - regex: 'KISSME-DG580'
+      model: 'Kissme DG580'
     - 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?)[);/ ]'
@@ -3147,6 +3663,17 @@ Evercoss:
     - regex: 'A75A\*'
       model: 'A75A Star'
 
+# 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'
@@ -3169,6 +3696,12 @@ Rikomagic:
   device: 'tv'
   model: 'MK$1'
 
+# Rinno
+Rinno:
+  regex: 'Rinno (R(?:400|505))'
+  device: 'smartphone'
+  model: '$1'
+
 # Riviera
 Riviera:
   regex: 'RIVIERA '
@@ -3185,7 +3718,7 @@ Senseit:
 
 # Sony & Sony Ericsson (combined as they are mixed up)
 Sony:
-  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|([456]0[12]|701)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)|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[1234567]|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[12]C|[345]D|[234]E|[1235]F|[1234]G|[134]H|[1234]J|2K)|R800[aix]|J9110|I4293|H9493|H8296|H8166|H4493|LiveWithWalkman'
+  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|([456]0[12]|701)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[1234567]|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[12]C|[345]D|[234]E|[1235]F|[1234]G|[134]H|[1234]J|[12]K)|R800[aix]|J9110|J81[17]0|I[34]113|I3[12]23|I42[19]3|H9493|H8296|H8166|H4493|LiveWithWalkman'
   device: 'smartphone'
   models:
     # SONY ERICSSON: explicit smartphone models
@@ -3314,9 +3847,11 @@ Sony:
     # SONY: explicit smartphone models
     - regex: 'SO-04G'
       model: 'Xperia A4'
-    - regex: '(?:Sony(?:Ericsson)?)?I4293'
+    - regex: '(?:Sony(?:Ericsson)?)?I(?:4113|31[12]3)'
+      model: 'Xperia 10'
+    - regex: '(?:Sony(?:Ericsson)?)?I(?:42[19]3|3223)'
       model: 'Xperia 10 Plus'
-    - regex: '(?:Sony(?:Ericsson)?)?J9110'
+    - regex: '(?:Sony(?:Ericsson)?)?J(?:9110|81[17]0)'
       model: 'Xperia 1'
     - regex: '(?:Sony(?:Ericsson)?)?LT22i'
       model: 'Xperia P'
@@ -3397,6 +3932,10 @@ Sony:
       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: '(?:Sony(?:Ericsson)?)?D2302'
       model: 'Xperia M2 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D230[356]'
@@ -3469,7 +4008,7 @@ Sony:
       model: 'Xperia XA Ultra Dual'
     - 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|SO-02K'
       model: 'Xperia XZ1 Compact'
@@ -3658,6 +4197,17 @@ eTouch:
   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"
@@ -3687,6 +4237,8 @@ Evolio:
   models:
     - regex: 'M4MAGIC'
       model: 'M4 Magic'
+    - regex: 'Evolio_M5Pro'
+      model: 'M5 Pro'
     - regex: 'Evolio[ _](M6|S4 Cobalt|S5|X10|Yuppi)'
       model: '$1'
 
@@ -3811,6 +4363,12 @@ Fairphone:
   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'
@@ -3930,8 +4488,10 @@ G-TiDE:
   models:
     - regex: 'Shining7'
       model: 'Shining 7'
-    - regex: 'G-TiDE_(A1|S3)'
+    - regex: 'G-TiDE_(A1|S[34])'
       model: '$1'
+    - regex: 'G-TiDE V6'
+      model: 'V6'
     - regex: 'E(57|60|66|72|77)'
       model: '$1'
 
@@ -3992,6 +4552,9 @@ Ginzzu:
   models:
     - regex: 'GINZZU[_ ]?(S40[17]0|S4710|ST6040)'
       model: '$1'
+    - regex: 'GINZZU[_ ]?(GT-7105)'
+      model: '$1'
+      device: 'tablet'
     - regex: '(RS6[12]D) ULTIMATE'
       model: '$1 Ultimate'
     - regex: '((?:RS(?:7[14]|81|9[67])D)|S50[45]0|S5120|S40[23]0|RS8502|RS9602|RS94D)[);/ ]'
@@ -3999,7 +4562,7 @@ Ginzzu:
 
 # Gionee
 Gionee:
-  regex: '(?:GIO-)?GIONEE[ _-]?[a-z0-9]+|(?:Dream_D1|V188S?|GN[0-9]{3,4}[a-z]?)[);/ ]|F103(?: Pro)? Build|P5 mini Build|M7 Power '
+  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 '
   device: 'smartphone'
   models:
     - regex: 'GN810[);/ ]'
@@ -4017,6 +4580,8 @@ Gionee:
       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'
@@ -4104,7 +4669,7 @@ Goly:
 
 # Google
 Google:
-  regex: 'Nexus|GoogleTV|Glass|CrKey[^a-z0-9]|Pixel Build|Pixel (?:XL|C|[23]|[23] XL)'
+  regex: 'Nexus|GoogleTV|Glass|CrKey[^a-z0-9]|Pixel(?: Build|\))|Pixel (?:XL|C|[23]|[23] XL)'
   device: 'smartphone'
   models:
     - regex: 'Glass'
@@ -4125,7 +4690,7 @@ Google:
     - regex: 'GoogleTV'
       device: 'tv'
       model: 'GoogleTV'
-    - regex: 'Pixel Build'
+    - regex: 'Pixel(?: Build|\))'
       model: 'Pixel'
     - regex: 'Pixel XL'
       model: 'Pixel XL'
@@ -4257,6 +4822,17 @@ Hi-Level:
   device: 'tablet'
   model: 'HLV-T$1'
 
+# Hoffmann
+Hoffmann:
+  regex: '(HOFFMANN|Neo[_ ]A[139]00)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Neo[_ ](A[139]00)'
+      model: 'Neo $1'
+    - regex: 'HOFFMANN[ _]X[-_ ](Prime|Twist)'
+      model: 'X $1'
+
+
 # Homtom
 Homtom:
   regex: 'Homtom|(?:HT[0-9]{1,2})(?: ?Pro)?[);/ ]'
@@ -4285,23 +4861,33 @@ Hoozo:
 
 # Huawei
 Huawei:
-  regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANE|ARE|ATH|ATU|AUM|BAC|BAH|BG2|BGO|BKK|BKL|BLA|BLL|BLN|BND|BTV|CAG|CAM|CAN|CAZ|CHC|CHE[12]?|CHM|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|GRA|HMA|HRY|HWI|H[36]0|INE|JAT|JDN2|JKM|JMM|JSN|KIW|KOB|KSA|LDN|LLD|LND|LON|LUA|LYA|MAR|MHA|MRD|MYA|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|PRA|RIO|RNE|RVL|SCC|SCL|SEA|SHT|SLA|SNE|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|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,2}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))[);/ ])|hi6210sft|HRY-LX1MEB'
+  regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANE|ARE|ARS|ATH|ATU|AUM|BAC|BAH|BAH2|BG2|BGO|BKK|BKL|BLA|BLL|BLN|BND|BTV|CAG|CAM|CAN|CAZ|CHC|CHE[12]?|CHM|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|GRA|HLK|HMA|HRY|HWI|H[36]0|INE|JAT|JDN|JDN2|JKM|JMM|JSN|KIW|KNT|KOB|KSA|LDN|LLD|LND|LON|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|PRA|RIO|RNE|RVL|SCC|SCL|SEA|SHT|SLA|SNE|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,2}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))[);/ ])|hi6210sft|HRY-LX1MEB|GEM-70[1-3]L|PE-UL00|VRD-W09'
   device: 'smartphone'
   models:
+    - regex: 'ARS-([AT]L00|L22)[);/ ]'
+      model: 'Y Max'
     - regex: 'U(8230|8661|8667)[);/ ]'
       model: 'U$1'
     - regex: 'TAG-[ACT]L00'
       model: 'Enjoy 5S'
-    - regex: 'DUA-AL00'
-      model: 'Enjoy 7'
-    - regex: 'FIG-AL10'
+    - regex: 'DIG-(?:TL10|AL00)'
+      model: 'Enjoy 6S'
+    - regex: 'NCE-AL[10]0'
+      model: 'Enjoy 6'
+    - regex: 'SLA-(?:AL00|TL10)'
+      model: 'Enjoy 7'              # Nova Lite (2017)
+    - regex: 'DUA-[TA]L00'
+      model: 'Honor Play 7'
+    - regex: 'FIG-(?:AL[10]0|TL10)'
       model: 'Enjoy 7S'
-    - regex: 'LDN-(?:AL20|TL20)'
+    - regex: 'LDN-(?:AL[12]0|TL20)'
       model: 'Enjoy 8'
-    - regex: 'ATU-AL1'
+    - regex: 'ATU-(?:AL1|TL10)'
       model: 'Enjoy 8e'
     - regex: 'FLA-AL10'
       model: 'Enjoy 8 Plus'
+    - regex: 'MRD-[TA]L00'
+      model: 'Enjoy 9e'
     - regex: 'U8500[);/ ]'
       model: 'Ideos X2'
     - regex: 'U8510[);/ ]'
@@ -4342,21 +4928,30 @@ Huawei:
       model: 'Ascend Y550'
     - regex: 'U9508[);/ ]'
       model: 'Honor 2'
-    - regex: 'YAL-L21[);/ ]'
+    - regex: 'YAL-(?:L21|AL00)'
       model: 'Honor 20'
+    - regex: 'YAL-L41[);/ ]'
+      model: 'Honor 20 Pro'
     - regex: 'VOG-AL00[);/ ]'
       model: 'Honor P30 Pro'
-    - regex: 'CHE2?-[UT]L00[HM]?|CHE1-CL[12]0|CHE2-L(?:11|23)|Che1-L04|CHE-TL00'
+    - regex: 'CHE2?-[UT]L00[HM]?|CHE1-CL[12]0|CHE2-L(?:1[12]|23)|Che1-L04|CHE-TL00'
       model: 'Honor 4X'
     - regex: 'CHM-[CUT]L00[HM]?'
       model: 'Honor Play 4C'
+    - regex: 'JDN-AL00'
+      model: 'Honor Pad 2'
+      device: 'tablet'
+    - regex: 'JAT-AL00'
+      model: 'Honor Play 8A'
+    - regex: 'KNT-(?:AL[12]0|[TU]L10)'
+      model: 'Honor V8'
     - regex: 'DUK-AL20'
       model: 'Honor V9'
     - regex: 'JMM-AL[10]0'
       model: 'Honor V9 Play'
     - regex: 'BKL-(?:AL00|AL20|AL30|L09|TL10)'
       model: 'Honor V10'
-    - regex: 'PCT-AL10'
+    - regex: 'PCT-[TA]L10'
       model: 'Honor V20'
     - regex: 'BKL-L04'
       model: 'Honor View 10'
@@ -4370,7 +4965,7 @@ Huawei:
       model: 'Honor 4A'
     - regex: '(?:Honor_|HW-)?CAM-(?:AL00|TL00H|TL00)(?:_TD)?[);/ ]'
       model: 'Honor 5A'
-    - regex: '(?:Honor_|HW-)?KIW-(?:AL10|TL00H|L2[124]|UL00)(?:_TD)?[);/ ]'
+    - regex: '(?:Honor_|HW-)?KIW-(?:AL10|TL00H|[TC]L00|L2[124]|UL00)(?:_TD)?[);/ ]'
       model: 'Honor 5X'
     - regex: '(?:Honor_|HW-)?CHM-U01(?:_TD)?[);/ ]'
       model: 'Honor 4C'
@@ -4378,21 +4973,23 @@ Huawei:
       model: 'Honor 6'
     - regex: 'MYA-TL10'
       model: 'Honor 6 Play'
+    - regex: 'PE-UL00'
+      model: 'Honor 6 Plus'
     - regex: '(?:Honor_|HW-)?SCL-L01(?:_TD)?[);/ ]'
       model: 'Honor Y6'
     - regex: '(?:Honor_|HW-)?LYO-L21'
-      model: 'Honor Y6 II Compact'
+      model: 'Honor Y6 II Compact' # Honor 5A
     - regex: '(?:Honor_|HW-)?PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)[);/ ]'
       model: 'Honor 7'
-    - regex: 'AUM-(?:AL[20]0|L33)'
+    - 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|LND-L29|AUM-L41)[);/ ]'
+    - regex: '(?:Honor_|HW-)?(?:LND-(?:AL[34]0|L29|TL40)|AUM-L41)[);/ ]'
       model: 'Honor 7C'
-    - regex: '(?:Honor_|HW-)?DUA-L22[);/ ]'
+    - regex: '(?:Honor_|HW-)?DUA-(?:L22|LX3)[);/ ]'
       model: 'Honor 7S'
-    - regex: '(?:Honor_|HW-)?NEM-(?:AL10|L51|UL10)[);/ ]'
+    - regex: '(?:Honor_|HW-)?NEM-(?:AL10|L51|UL10|TL00)[);/ ]'
       model: 'Honor 5C'
     - regex: '(?:Honor_|HW-)?NEM-(?:L22|TL00H)[);/ ]'
       model: 'Honor 5C Dual SIM'
@@ -4404,7 +5001,7 @@ Huawei:
       model: 'Honor 6C Pro'
     - regex: '(?:HONOR[ _]?)?BLN-(?:L2[124]|AL[1234]0|TL[01]0)'
       model: 'Honor 6X'
-    - regex: 'ATH-AL00'
+    - regex: 'ATH-(?:AL00|UL00|TL00H)'
       model: 'Honor 7i'
     - regex: '(?:HONOR[ _]?)?BND-(?:AL[01]0|TL10|L2[14]|L31)'
       model: 'Honor 7X'
@@ -4418,21 +5015,23 @@ Huawei:
       model: 'Honor 8X'
     - regex: 'KSA-LX9'
       model: 'Honor 8S'
-    - regex: 'ARE-AL[10]0|ARE-L22HN'
+    - regex: 'ARE-(?:AL[10]0|L22HN|TL00)'
       model: 'Honor 8X Max'
     - regex: 'PRA-(?:AL00X|AL00|TL10)'
       model: 'Honor 8 Lite'
-    - regex: 'DUK-L09'
+    - regex: 'DUK-(?:L09|TL30)'
       model: 'Honor 8 Pro'
     - regex: 'JAT-L41'
       model: 'Honor 8A Pro'
     - regex: 'VEN-L22'
       model: 'Honor 8 Smart'
-    - regex: 'STF-(?:AL[10]0|L09)'
+    - regex: 'STF-(?:AL[10]0|L09|TL10)'
       model: 'Honor 9'
+    - regex: 'HLK-AL00'
+      model: 'Honor 9X'
     - regex: 'LLD-AL[23]0'
       model: 'Honor 9i'
-    - regex: 'LLD-(?:AL[01]0|L[23]1)'
+    - regex: 'LLD-(?:AL[01]0|L[23]1|TL10)'
       model: 'Honor 9 Lite'
     - regex: 'COL-(?:AL[01]0|TL[01]0|L29)'
       model: 'Honor 10'
@@ -4446,7 +5045,7 @@ Huawei:
       model: 'Honor Holly 4 Plus'
     - regex: 'TNY-AL00'
       model: 'Honor Magic 2'
-    - regex: 'COR-(?:AL[01]0|L29)'
+    - regex: 'COR-(?:AL[01]0|L29|TL10)'
       model: 'Honor Play'
     - regex: 'EDI-AL10'
       model: 'Honor Note 8'
@@ -4454,7 +5053,7 @@ Huawei:
       model: 'Honor Note 10'
     - regex: 'GRA-(?:L09|UL00)'
       model: 'P8'
-    - regex: 'ALE-L(?:02|21|23)|ALE-UL00'
+    - 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)'
@@ -4466,13 +5065,13 @@ Huawei:
       model: 'Nova 2'
     - regex: 'HWI-[AT]L00'
       model: 'Nova 2S'
-    - regex: 'BAC-L01'
+    - 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: 'PAR-(?:AL00|LX[19])'
+    - regex: 'PAR-(?:[AT]L00|LX[19]|TL20)'
       model: 'Nova 3'
     - regex: 'ANE-AL00'
       model: 'Nova 3e'
@@ -4480,7 +5079,7 @@ Huawei:
       model: 'Nova 3i'
     - regex: 'SEA-AL10'
       model: 'Nova 5 Pro'
-    - regex: 'VCE-L22'
+    - regex: 'VCE-(L22|[AT]L00)'
       model: 'Nova 4'
     - regex: 'MAR-AL00'
       model: 'Nova 4e'
@@ -4490,7 +5089,7 @@ Huawei:
       model: 'Nova Smart'
     - regex: 'RIO-L03'
       model: 'GX8'
-    - regex: 'EVA-(?:AL10|L[012]9|TL00)'
+    - regex: 'EVA-(?:AL[10]0|L[012]9|[TCD]L00)'
       model: 'P9'
     - regex: 'VNS-L(?:[23]1|62)'
       model: 'P9 Lite'
@@ -4508,15 +5107,15 @@ Huawei:
       model: 'P10 Selfie'
     - regex: 'VKY-(?:AL00|L09|L29)'
       model: 'P10 Plus'
-    - regex: 'EML-(?:AL00|L09|L29)'
+    - regex: 'EML-(?:[TA]L00|L[02]9)'
       model: 'P20'
-    - regex: 'ANE-LX[123]'
+    - regex: 'ANE-(?:LX[123]|TL00)'
       model: 'P20 Lite'
-    - regex: 'CLT-(?:AL0[01]|L(?:04|[02]9))'
+    - regex: 'CLT-(?:AL0[01]|TL00|L(?:04|[02]9))'
       model: 'P20 Pro'
     - regex: 'ELE-L(?:04|09|29)|ELE-AL00'
       model: 'P30'
-    - regex: 'VOG-L(?:04|09|29)'
+    - regex: 'VOG-L(?:04|09|29)|VOG-TL00'
       model: 'P30 Pro'
     - regex: 'MAR-LX(1M|2)'
       model: 'P30 Lite'
@@ -4542,13 +5141,13 @@ Huawei:
       model: 'Y5II'
     - regex: 'MYA-(?:L(?:02|03|2[23])|U29)'
       model: 'Y5 (2017)'
-    - regex: 'AMN-LX[19]'
+    - regex: 'AMN-LX[129]'
       model: 'Y5 (2019)'
     - regex: 'CRO-L[02]3'
       model: 'Y5 Lite (2017)'
     - regex: 'CAG-L[02]3'
       model: 'Y5 Lite (2018)'
-    - regex: 'DRA-LX2'
+    - regex: 'DRA-(?:LX2|AL00)'
       model: 'Y5 Prime (2018)'
     - regex: 'DRA-LX5'
       model: 'Y5 lite'
@@ -4564,7 +5163,7 @@ Huawei:
       model: 'Y6II'
     - regex: 'ATU-L(?:11|21|22|X3)'
       model: 'Y6 (2018)'
-    - regex: 'MRD-LX1[F]?'
+    - regex: 'MRD-L(?:X1[F]?|X3)'
       model: 'Y6 (2019)'
     - regex: 'TIT-(?:AL00|L01)'
       model: 'Y6 Pro'
@@ -4576,17 +5175,19 @@ Huawei:
       model: 'Y7 (2017)'
     - regex: 'LDN-L(?:01|X3)'
       model: 'Y7 (2018)'
-    - regex: 'DUB-LX[13]'
+    - regex: 'DUB-(?:LX[13]|TL00)'
       model: 'Y7 (2019)'
-    - regex: 'LDN-(?:AL00|L21)'
+    - regex: 'DUB-AL20'
+      model: 'Y7 Pro (2019)'
+    - regex: 'LDN-(?:AL00|L21)|TRT-TL10'
       model: 'Y7 Prime'
     - regex: 'LDN-(?:LX2|TL10)|TRT-(?:L21A|L53)'
       model: 'Y7 Prime (2018)'
-    - regex: 'DUB-LX2'
+    - regex: 'DUB-(?:LX2|AL00)'
       model: 'Y7 Pro (2019)'
-    - regex: 'FLA-LX[123]'
+    - regex: 'FLA-(LX[123]|AL20|TL10)'
       model: 'Y9 (2018)'
-    - regex: 'JKM-(?:AL00|LX[123])'
+    - regex: 'JKM-(?:[TA]L00|LX[123])'
       model: 'Y9 (2019)'
     - regex: 'STK-(L2[12]|LX3)'
       model: 'Y9 Prime (2019)'
@@ -4598,17 +5199,17 @@ Huawei:
       model: 'Y635 Dual SIM'
     - regex: 'NXT-(?:AL10|L29)'
       model: 'Mate 8'
-    - regex: 'MHA-(?:L[02]9|AL00)'
+    - 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: 'ALP-(?:AL00|L[02]9)'
+    - regex: 'ALP-(?:[TA]L00|L[02]9)'
       model: 'Mate 10'
     - regex: 'RNE-(?:AL00|L(?:01|03|21|23))'
       model: 'Mate 10 Lite'
-    - regex: 'BLA-(?:A09|L[02]9|AL00)'
+    - regex: 'BLA-(?:A09|L[02]9|[TA]L00)'
       model: 'Mate 10 Pro'
     - regex: 'HMA-(?:[AT]L00|L[02]9)'
       model: 'Mate 20'
@@ -4616,11 +5217,11 @@ Huawei:
       model: 'P30 Pro'
     - regex: 'LYA-AL00P'
       model: 'Mate 20 RS'
-    - regex: 'LYA-(?:AL[01]0|L[02]9)'
+    - regex: 'LYA-(?:AL[01]0|L[02]9|L0C|TL00)'
       model: 'Mate 20 Pro'
     - regex: 'SNE-(?:AL00|LX[0-3])'
       model: 'Mate 20 Lite'
-    - regex: 'EVR-(?:AL00|L29)'
+    - regex: 'EVR-(?:[TA]L00|L29)'
       model: 'Mate 20 X'
     - regex: 'CRR-(?:L09|UL00)'
       model: 'Mate S'
@@ -4642,25 +5243,31 @@ Huawei:
     - regex: 'CMR-(?:AL[01]9|W09)'
       device: 'tablet'
       model: 'MediaPad M5 10.8'
-    - regex: 'JDN2-L09'
+    - regex: 'GEM-70[1-3]L'
+      device: 'tablet'
+      model: 'MediaPad X2'
+    - regex: 'JDN2-(:?L09|AL00)|BAH2-(?:L09|W19)'
       device: 'tablet'
       model: 'MediaPad M5 lite'
     - regex: 'SHT-(?:AL|W)09'
       device: 'tablet'
       model: 'MediaPad M5 8.4'
+    - regex: 'VRD-(AL|W)09'
+      device: 'tablet'
+      model: 'MediaPad M6 8.4'
     - regex: 'BTV-W09'
       device: 'tablet'
       model: 'MediaPad M3 8'
-    - regex: 'BAH-W09|CPN-(?:L|W)09'
+    - regex: 'BAH-W09|CPN-(?:L|W)09|CPN-AL00'
       device: 'tablet'
       model: 'MediaPad M3 Lite'
-    - regex: 'BAH-L09'
+    - regex: 'BAH-(?:L09|AL00)'
       device: 'tablet'
       model: 'MediaPad M3 Lite 10'
     - regex: 'BTV-DL09'
       device: 'tablet'
       model: 'MediaPad M3'
-    - regex: 'AGS2-(?:L|W)09'
+    - regex: 'AGS2-(?:[LW]09|L03)'
       device: 'tablet'
       model: 'MediaPad T5 10'
     - regex: 'AGS-(?:L0[39]|W09)'
@@ -4678,6 +5285,9 @@ Huawei:
     - regex: '(?:BGO-DL09|PLE-70[13]L)'
       device: 'tablet'
       model: 'MediaPad T2 7.0 Pro'
+    - regex: 'JDN-L01'
+      device: 'tablet'
+      model: 'MediaPad T2 8.0 Pro'
     - regex: 'FDR-A01(?:L|w)'
       device: 'tablet'
       model: 'MediaPad T2 10.0 Pro'
@@ -4773,10 +5383,10 @@ iRola:
 
 # Irbis
 Irbis:
-  regex: 'TZ(753|85[47]|86[45]|88[124]|89[12]|49)|T(?:Zone|Zart)|(SP(?:0[56]|2[01]|4[1-36]|45[45]|50))[;)\ ]'
+  regex: 'TZ(150|165|17[5-8]|77[17]|753|794|8[34]1|85[47]|86[45]|88[124]|89[12]|49|716|772)|T(?:Zone|Zart)|(SP(?:0[56]|2[01]|4[1-36]|45[45]|50))[;)\ ]'
   device: 'tablet'
   models:
-    - regex: '(TZ(?:753|85[47]|86[45]|88[124]|89[12]|49)|T(?:Zone|Zart))[;)\ ]'
+    - regex: '(TZ(?:150|165|17[5-8]|77[17]|753|794|8[34]1|85[47]|86[45]|88[124]|89[12]|49|716|772)|T(?:Zone|Zart))[;)\ ]'
       model: '$1'
     - regex: '(SP(?:0[56]|2[01]|4[1-36]|45[45]|50))[;)\ ]'
       device: 'smartphone'
@@ -4794,11 +5404,13 @@ iBerry:
 
 # iHunt
 iHunt:
-  regex: 'iHunt|One_ Love_|TITAN_P11000_PRO|Like_(3|4U|3_Pro)|X300 Elite'
+  regex: 'iHunt|One_ Love_|TITAN_P11000_PRO|Like_(3|4U|3_Pro)|X300 Elite|S10_Tank_2019'
   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'
@@ -4924,6 +5536,12 @@ LYF:
     - regex: 'LYF/([^/]+)/'
       model: '$1'
 
+# Lumus
+Lumus:
+  regex: 'NEOSR620[;)/ ]'
+  device: 'smartphone'
+  model: 'Neo SR620'
+
 # M4tel
 M4tel:
   regex: 'M4 SS[0-9]{4}(?:-R)?|M4_B[23]'
@@ -4982,6 +5600,12 @@ IMO Mobile:
     - regex: 'IMO Q2'
       model: 'Q2'
 
+# iLA
+iLA:
+  regex: 'iLA[-_ ](Silk|X)[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
 # iNew
 iNew:
   regex: 'iNew|(?:V7A|V3 Plus|V3-?E|V3C)(?: Build|[;/\)])'
@@ -5130,11 +5754,17 @@ Infinix:
 
 # InFocus
 InFocus:
-  regex: '(IF9007) Build'
+  regex: 'IF(9001|9007|9021|9035) Build'
   device: 'smartphone'
   models:
-    - regex: '(IF9007)'
-      model: '$1'
+    - regex: 'IF9001'
+      model: 'Turbo 5'
+    - regex: 'IF9007'
+      model: 'A3'
+    - regex: 'IF9021'
+      model: 'Turbo 5 Plus'
+    - regex: 'IF9035'
+      model: 'A2'
 
 # InnJoo
 InnJoo:
@@ -5156,6 +5786,24 @@ Innostream:
   device: 'feature phone'
   model: 'INNO$1'
 
+# Insignia
+Insignia:
+  regex: 'NS-(P11A8100|P10A8100|P10A6100|P16AT08|P16AT10|P16AT785HD|P08A7100|P10A7100)[);/ ]'
+  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"'
+
 # Inq
 INQ:
   regex: 'INQ[/ ]'
@@ -5169,11 +5817,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_+\-]+)'
@@ -5277,11 +5927,13 @@ iTel:
 
 # 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:
@@ -5325,6 +5977,12 @@ Kalley:
     - 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'
@@ -5493,13 +6151,18 @@ KDDI:
 
 # Kodak
 Kodak:
-  regex: 'KODAK'
+  regex: 'KODAK|IM5[);/ ]'
   device: 'smartphone'
   models:
+    - regex: 'IM5'
+      model: 'IM5'
     - 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:
@@ -5537,7 +6200,7 @@ K-Touch:
 
 # kyocera
 Kyocera:
-  regex: 'Kyocera|KWC-|QC-|C5120|C5170|C5155|C5215|C6730|C6750|C6522N?|C6530N|C6740|C6743|E6810|KYL21|KYY23|S2151|KC-S701'
+  regex: 'Kyocera|KWC-|QC-|C5120|C5170|C5155|C5215|C6730|C6750|C6522N?|C6530N|C6740|C6743|E6[89]10|KYL21|KYY23|S2151|KC-S701'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -5563,12 +6226,16 @@ Kyocera:
       model: 'Hydro Reach'
     - regex: 'E6810'
       model: 'DuraForce Pro'
+    - regex: 'E6910'
+      model: 'DuraForce Pro 2'
     - regex: 'KC-S701'
       model: 'Torque'
     - regex: 'KYL21'
       model: 'Digno S'
     - regex: 'KYY23'
       model: 'Urbano L03'
+    - regex: '(?:Kyocera-)?E6790'
+      model: 'DuraForce XD'
 
     # explicit feature phone models
     - regex: 'S2151'
@@ -5602,6 +6269,14 @@ LAIQ:
     - 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'
@@ -5656,7 +6331,7 @@ Lanix:
       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[139]|S(?:106|520|6[27]0)|X(?:1[12]0|2[0126]0|5[12]0|500B|710))'
+    - regex: 'Ilium[ _](Alpha 3|L(?:200|6[12]0|9[125]0|1[0124]00|1050|1120)|LT5[012]0|M[1379]|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'
@@ -5784,6 +6459,19 @@ Leotec:
     - regex: 'LESPH5014'
       model: 'Krypton K150'
 
+# 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'
@@ -5877,6 +6565,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'
@@ -5908,6 +6602,8 @@ Lenovo:
       model: 'K3 Note'
     - regex: 'A7010a48 Build'
       model: 'K4 Note'
+    - regex: 'A7010a48(?: Build|\))'
+      model: 'K4 Vibe'
     - regex: 'A7020a4[08](?: Build|\))'
       model: 'K5 Note'
     - regex: '(?:Lenovo-)?A6020(?:a40|l36)(?: Build|\))'
@@ -6026,7 +6722,7 @@ Lexibook:
 
 # LG
 LG:
-  regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713|LM-(V350|V409N|X510WM|X525|Q815[SL]|X410([KL]|UM|PM)|X510[KLS]|X415[KLS]|Q850|Q925L|Q725[KL]|Q710(?:FGN|\(FGN\)|\.FGN?)?|X2[12]0(?:APM|\(G\)|CM|G)?|G710N?|V405|V500N|G820(N|QM[0127]|UMB)?|(X410|Q610)(?:\(FGN?\)|\.FN|\.F(?:GN?)?)))[);/ ]|NetCast|RS987|RS500|VS(?:501|988|99[56]|(410|415|425|500)PP)|Nexsus 5|LML211BL|LML212VL|LM-X625N'
+  regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713|LM-(Q910|V350[N]?|V409N|X510WM|X525|Q815[SL]|X410([KL]|UM|PM)|X420N|X510[KLS]|X415[KLS]|Q850|Q925L|Q725[KL]|Q710(?:FGN|\(FGN\)|\.FGN?)?|X2[12]0(?:APM|\(G\)|CM|G)?|G710(N|VM)?|V405|V500N|G820(N|QM[0127]|UMB)?|(X410|Q610)(?:\(FGN?\)|\.FN|\.F(?:GN?)?)))[);/ ]|NetCast|RS987|RS500|VS(?:50[01]|835|98[78]|99[56]|(410|415|425|500)PP)|Nexsus 5|LML(414D|211B|713D|212V)L|LM-X(625N|210K|212\(G\)|410S)|VK810 4G|VK815'
   device: 'smartphone'
   models:
     - regex: 'LG-D325'
@@ -6045,7 +6741,7 @@ LG:
       model: 'G4 Stylus'
     - regex: 'LG-H735'
       model: 'G4 Beat'
-    - regex: 'LG-H8(?:20|30|5[08]|60)'
+    - regex: 'LG-H8(?:20|30|5[08]|60)|VS987'
       model: 'G5'
     - regex: 'LG-H84[05]'
       model: 'G5 SE'
@@ -6053,6 +6749,8 @@ LG:
       model: 'G6'
     - regex: 'LM-Q850'
       model: 'G7 Fit'
+    - regex: 'LM-Q910'
+      model: 'G7 One'
     - regex: 'LM-G820(N|QM[0127]|UMB)?'
       model: 'G8'
     - regex: 'VS501'
@@ -6087,21 +6785,27 @@ LG:
       model: 'Q8+'
     - regex: 'LM-Q925L'
       model: 'Q9'
-    - regex: 'LM-Q710'
+    - regex: 'VS835'
+      model: 'Stylo 2 V'
+    - regex: 'LM-Q710|LML713DL'
       model: 'Stylo 4'
-    - regex: 'LM-G710N?'
+    - regex: 'LM-G710(N|VM)?'
       model: 'G7 ThinQ'
     - regex: 'LM-X210CM'
       model: 'Fortune 2'
     - regex: 'LM-X410\.F[);/ ]'
       model: 'Premier Pro'
+    - regex: 'LML414DL[);/ ]'
+      model: 'Premier Pro LTE'
     - regex: 'LM-X525'
       model: 'Q60'
+    - regex: 'LM-X210K'
+      model: 'X2'
     - regex: 'LM-X510WM'
       model: 'X Power 3'
-    - regex: 'LM-X41[05]K'
+    - regex: 'LM-X(?:41[05]K|410S)'
       model: 'X4'
-    - regex: 'LM-(X415[LS]|X410L)'
+    - regex: 'LM-X(415[LS]|410L)'
       model: 'X4+'
     - regex: 'LM-X410\.FN'
       model: 'K11'
@@ -6109,8 +6813,8 @@ LG:
       model: 'K30'
     - regex: 'LM-X410'
       model: 'LM-X410'
-    - regex: 'LM-V350'
-      model: 'V35'
+    - regex: 'LM-X420N'
+      model: 'X4 (2019)'
     - regex: 'LM-X510[KLS]'
       model: 'X5'
     - regex: 'LM-X625N1'
@@ -6123,10 +6827,14 @@ LG:
       model: 'V40 ThinQ'
     - regex: 'LM-V500N'
       model: 'V50'
-    - regex: '(?:LG-)?(?:RS987|H901)'
+    - regex: '(?:LG-)?(?:RS987|H901|H96[0128]|VS990)'
       model: 'V10'
     - 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)?'
@@ -6141,6 +6849,8 @@ LG:
       model: 'V30'
     - regex: '(?:LG-)?VS410PP'
       model: 'Optimus Zone'
+    - regex: 'LM-V350[N]?'
+      model: 'V35'
     - regex: '(?:LG-)?VS415PP'
       model: 'Optimus Zone 2'
     - regex: '(?:LG-)?VS425PP'
@@ -6181,6 +6891,8 @@ LG:
       model: 'Optimus 4X HD'
     - regex: '(?:LG-)?H340n?'
       model: 'Leon'
+    - regex: '(?:LG-)?H422'
+      model: 'Spirit'
     - regex: '(?:LG)?C660'
       model: 'Optimus Pro'
     - regex: 'LML211BL|LML212VL'
@@ -6201,6 +6913,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'
@@ -6393,9 +7111,38 @@ 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:
@@ -6521,7 +7268,7 @@ Mediacom:
 
 # Medion
 Medion:
-  regex: 'Medion|(?:MD_)?LIFETAB|X5001[);/ ]|[SPX]10[0-9]{2}X[);/ ]'
+  regex: 'Medion|(?:MD_)?LIFETAB|X5001[);/ ]|([SPX]10[0-9]{2}X|E10[45]1X)[);/ ]'
   device: 'smartphone'
   models:
     - regex: '(?:MD_)?LIFETAB_([a-z0-9]+)'
@@ -6529,6 +7276,9 @@ Medion:
       model: 'Lifetab $1'
     - regex: 'X5001'
       model: 'Life X5001'
+    - regex: '(E10[45]1X)[);/ ]'
+      device: 'tablet'
+      model: '$1'
     - regex: '([SPX]10[0-9]{2}X)[);/ ]'
       model: 'Lifetab $1'
       device: 'tablet'
@@ -6597,6 +7347,28 @@ Meizu:
     - regex: 'MZ-([^/;]+) Build'
       model: '$1'
 
+# Meitu
+Meitu:
+  regex: '(Meitu[2]?|MP1503|MP1512|MP160[23]|MP170[19])[ ;/)]'
+  device: 'smartphone'
+  models:
+    - regex: 'MP1503[ ;/)]'
+      model: 'M6'
+    - regex: 'MP1512[ ;/)]'
+      model: 'M6s'
+    - regex: 'MP1602[ ;/)]'
+      model: 'T8'
+    - regex: 'MP1701[ ;/)]'
+      model: 'T8s'
+    - regex: 'MP1603[ ;/)]'
+      model: 'M8'
+    - regex: 'MP1709[ ;/)]'
+      model: 'M8s'
+    - regex: 'Meitu2[ ;/)]'
+      model: '2'
+    - regex: 'Meitu (Kiss|M4)[ ;/)]'
+      model: '$1'
+
 # Memup
 Memup:
   regex: 'SlidePad ?([^;/]*) Build|SPNG?[0-9]{2,4}[a-z]{0,2}[ ;/)]|SP704CE?'
@@ -6700,6 +7472,12 @@ Mobiola:
     - regex: 'Wave5'
       model: 'Wave 5'
 
+# Mobicel
+Mobicel:
+  regex: 'Mobicel_(R1)'
+  device: 'smartphone'
+  model: '$1'
+
 # Mobiistar
 Mobiistar:
   regex: 'Mobiistar|Zumbo_|PRIME X MAX'
@@ -6719,6 +7497,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])'
@@ -6783,6 +7563,18 @@ Mobistel:
   device: 'smartphone'
   model: '$1'
 
+# Mecool
+Mecool:
+  regex: '(KM9PRO|BB2 PRO|KII PRO)[);/ ]'
+  device: 'tv'
+  models:
+    - regex: 'KM9PRO'
+      model: 'KM9 Pro'
+    - regex: 'BB2 PRO'
+      model: 'BB2 Pro'
+    - regex: 'KII PRO'
+      model: 'KII Pro'
+
 # Modecom
 Modecom:
   regex: 'Modecom|Free(?:Way )?Tab|xino z[\d]+ x[\d]+'
@@ -6813,7 +7605,7 @@ Mofut:
 
 # motorola
 Motorola:
-  regex: 'MOT|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1021|(?: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|XT1021|XT180[3-5]|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?: Build|\))'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -6898,6 +7690,12 @@ Motorola:
       model: 'Droid Turbo'
     - regex: '(?:MOT-|Motorola-)?XT10(?:28|3[1234]|68|69)'
       model: 'Moto G'
+    - 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-)?XT10(?:49|5[23568]|60|9[23457])'
       model: 'Moto X'
     - regex: '(?:MOT-|Motorola-)?XT1562'
@@ -7039,7 +7837,7 @@ Navon:
 
 # NOA
 NOA:
-  regex: 'NOA[ _]|HummerLE'
+  regex: 'NOA[ _]|HummerLE|NextSE'
   device: 'smartphone'
   models:
     - regex: 'NOA[_ ]CORE[_ ]FORTE'
@@ -7050,6 +7848,8 @@ NOA:
       model: 'Hummer Lite'
     - regex: 'NOA[_ ]MOVEse'
       model: 'Move SE'
+    - regex: 'NextSE'
+      model: 'Next SE'
     - regex: 'NOA[_ ]NEXT'
       model: 'Next'
     - regex: 'NOA[_ ]VISION[_ ]H3SE'
@@ -7069,6 +7869,11 @@ NOA:
     - regex: 'NOA[_ ]([^;)/ ]+)'
       model: '$1'
 
+Nobby:
+  regex: 'Nobby[ ]S500[;/) ]'
+  device: 'smartphone'
+  model: 'S500'
+
 # nec
 NEC:
   regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N'
@@ -7186,9 +7991,12 @@ Noblex:
 
 # Nomi
 Nomi:
-  regex: 'Nomi[ _-]'
+  regex: 'Nomi[ _-]|C101010 Ultra2[;/) ]'
   device: 'smartphone'
   models:
+    - regex: 'C101010 Ultra2'
+      model: 'Ultra 2'
+      device: 'tablet'
     - regex: 'Nomi[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Nomi[ _-]([^;/)]+)[;/)]'
@@ -7445,19 +8253,23 @@ OnePlus:
 
 # 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|A33fw|A37fw?|PAAM00|PAC[T|M]00|PBAM00)[);/ ]|R7kf|R7plusf|R7Plusm|A1601|CPH[0-9]{4}|PCAM10|PADM00|RMX18(0[1579]|11|3[13]|2[15]|[45]1|45)|CPH19(69|79|23|1[179])|RMX194[15]|PCCM00|PBAT00|PBCM30|PBEM00|PBFM00|PAFM00'
+  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|A33fw|A37fw?|PAAM00|PAC[T|M]00|PBAM00)[);/ ]|R7kf|R7plusf|R7Plusm|A1601|CPH[0-9]{4}|PCAM10|PADM00|PBBT00|PBBM[03]0|RMX18(0[1579]|11|3[13]|2[15]|[45]1|45)|CPH19(69|79|23|1[179])|RMX(1827|194[135]|19[01]1|1971)|PC[CD]M00|PBAT00|PBCM[13]0|PBE[MT]00|PBFM00|PAFM00'
   device: 'smartphone'
   models:
     - regex: '(?:OPPO[ _]?)?U707T?[);/ ]'
       model: 'Find Way S'
     - regex: '(?:OPPO[ _]?)?CPH1979[);/ ]'
       model: 'Reno Z'
+    - regex: 'CPH1945'
+      model: 'Reno2 Z'
     - regex: 'CPH1969'
       model: 'F11 Pro'
     - regex: 'CPH1911'
       model: 'F11'
     - regex: 'CPH1917'
       model: 'Reno'
+    - regex: 'CPH1921'
+      model: 'Reno 5G'
     - regex: 'PCCM00'
       model: 'Reno 10X'
     - regex: 'CPH1919'
@@ -7546,6 +8358,12 @@ OPPO:
       model: 'A3s'
     - regex: '(?:OPPO[ _]?)?(?:CPH1809|PBAT00)[);/ ]'
       model: 'A5'
+    - regex: 'CPH1933'
+      model: 'A5 (2020)'
+    - regex: '(?:OPPO[ _]?)?CPH1938[);/ ]'
+      model: 'A9 (EN)'
+    - regex: 'CPH1937'
+      model: 'A9 (2020)'
     - regex: '(?:OPPO[ _]?)?CPH18(19|21)[);/ ]'
       model: 'F7'
     - regex: '(?:OPPO[ _]?)?CPH1823[);/ ]'
@@ -7560,6 +8378,8 @@ OPPO:
       model: 'A3'
     - regex: '(?:OPPO[ _]?)?CPH1851[);/ ]'
       model: 'AX5'
+    - regex: 'CPH1920'
+      model: 'AX5s'
     - regex: '(?:OPPO[ _]?)?CPH1859[);/ ]'
       model: 'F7'
     - regex: '(?:OPPO[ _]?)?CPH1861[);/ ]'
@@ -7568,7 +8388,7 @@ OPPO:
       model: 'K1'
     - regex: 'RMX1811'
       model: 'RealMe C1'
-    - regex: 'RMX194[15]'
+    - regex: 'RMX194[135]'
       model: 'RealMe C2'
     - regex: 'RMX1831'
       model: 'RealMe U1'
@@ -7576,9 +8396,9 @@ OPPO:
       model: 'Find X'
     - regex: '(?:OPPO[ _]?)?CPH1877[);/ ]'
       model: 'R17 Pro'
-    - regex: '(?:OPPO[ _]?)?(?:CPH1879|PBEM00)[);/ ]'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1879|PBE[MT]00)[);/ ]'
       model: 'R17'
-    - regex: '(?:OPPO[ _]?)?CPH1881[);/ ]'
+    - regex: '(?:OPPO[ _]?)?(?:CPH1825|CPH1881)[);/ ]'
       model: 'F9'
     - regex: '(?:OPPO[ _]?)?CPH1893[);/ ]'
       model: 'R17 Neo'
@@ -7586,26 +8406,42 @@ OPPO:
       model: 'A7'
     - regex: '(?:OPPO[ _]?)?CPH1903[);/ ]'
       model: 'AX7'
-    - regex: '(?:OPPO[ _]?)?A37f(w)? Build'
+    - regex: '(?:OPPO[ _]?)?A37f(w)?(?: Build|\))'
       model: 'A37f$1'
     - regex: '(?:OPPO[ _]?)?PADM00'
       model: 'A3'
     - regex: '(?:OPPO[ _]?)?PBAM00'
       model: 'A5'
-    - regex: '(?:OPPO[ _]?)?A1601 Build'
+    - regex: '(?:OPPO[ _]?)?A1601[);/ ]'
       model: 'F1s'
     - regex: '(?:OPPO[ _]?)?R1011 Build'
       model: 'Joy Plus'
-    - regex: '(?:OPPO[ _]?)?(?:PAC[TM]00|PAAM00) Build'
+    - regex: '(?:OPPO[ _]?)?(?:PAC[TM]00|PAAM00)[);/ ]'
       model: 'R15'
+    - regex: 'PBCM10[);/ ]'
+      model: 'R15x'
     - regex: 'RMX180[59]'
       model: 'Realme 2'
     - regex: 'RMX180[17]'
       model: 'Realme 2 Pro'
     - regex: 'RMX1833|RMX182[15]'
       model: 'Realme 3'
+    - regex: 'RMX1827'
+      model: 'Realme 3i'
     - regex: 'RMX1851'
       model: 'Realme 3 Pro'
+    - regex: 'RMX1901'
+      model: 'Realme X'
+    - regex: 'RMX1911'
+      model: 'Realme 5'
+    - regex: 'RMX1971'
+      model: 'Realme 5 Pro'
+    - regex: '(PBBT00|PBBM00)[);/ ]'
+      model: 'A7x'
+    - regex: 'PCDM00[);/ ]'
+      model: 'A7n'
+    - regex: 'PBBM30[);/ ]'
+      model: 'A3s'
     - regex: 'N1T?[);/ ]'
       model: 'N1T'
       device: 'phablet'
@@ -7633,7 +8469,7 @@ Opsson:
 
 # orange
 Orange:
-  regex: 'SPV[ \-]?([a-z0-9]+)|Orange[ _-]([^/;]+) Build|SC/IHD92|FunTab ([^/;]+) Build'
+  regex: 'SPV[ \-]?([a-z0-9]+)|Orange[ _-](?!Tahiti-LS\))([^/;]+)( Build|\))(?<!Tahiti-LS\))|SC/IHD92|FunTab ([^/;]+) Build'
   device: 'smartphone'
   models:
     - regex: 'SC/IHD92'
@@ -7645,7 +8481,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[34])|Rono|Roya|San Francisco|Tactile internet 2|Tado|Yomi|Yumo|Zali)[ ;/)]'
       model: '$1'
     - regex: 'SPV[ \-]?([a-z0-9]+)'
       model: 'SPV $1'
@@ -7806,7 +8646,7 @@ Pentagram:
 
 # philips
 Philips:
-  regex: 'Philips|AND1E[);/ ]|NETTV/|PI3210G|TLE821L'
+  regex: 'Philips|AND1E[);/ ]|NETTV/|PI3210G|TLE(821L|722G)'
   device: 'smartphone'
   models:
     - regex: 'AND1E(?: TV)?[);/ ]'
@@ -7818,6 +8658,9 @@ Philips:
     - 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'
@@ -7972,6 +8815,12 @@ Rokit:
     - regex: 'IO Pro'
       model: 'IO Pro'
 
+# Rombica
+Rombica:
+  regex: 'SSQ-A0500[);/ ]'
+  device: 'tv'
+  model: 'Smart Stick 4K'
+
 # Rover
 Rover:
   regex: 'Rover ([0-9]+)'
@@ -8012,7 +8861,7 @@ 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'
@@ -8205,10 +9054,10 @@ 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-(?:P350|T3[58]5(?:Y)?)'
+    - regex: '(?:SAMSUNG-)?SM-(?:P350|T3[58]5)'
       device: 'tablet'
       model: 'GALAXY Tab A 8.0" LTE'
     - regex: '(?:SAMSUNG-)?SM-T295'
@@ -8241,6 +9090,12 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T39[57]'
       device: 'tablet'
       model: 'GALAXY Tab Active 2'
+    - regex: '(?:SAMSUNG-)?SM-M305'
+      device: 'tablet'
+      model: 'GALAXY M30'
+    - regex: '(?:SAMSUNG-)?SM-M405'
+      device: 'tablet'
+      model: 'GALAXY M40'
 
     # explicit smartphone models
     - regex: '(?:SAMSUNG-)?SM-G850[AMSWY]'
@@ -8509,6 +9364,8 @@ Samsung:
       model: 'GALAXY A9 Pro'
     - regex: '(?:SAMSUNG-)?SM-A105[FGM]'
       model: 'GALAXY A10'
+    - regex: '(?:SAMSUNG-)?SM-A107[FM]'
+      model: 'GALAXY A10s'
     - regex: '(?:SAMSUNG-)?SM-A205[FG]'
       model: 'GALAXY A20'
     - regex: '(?:SAMSUNG-)?SM-A202[FG]'
@@ -8517,6 +9374,8 @@ Samsung:
       model: 'GALAXY A30'
     - regex: '(?:SAMSUNG-)?SM-A405FN'
       model: 'GALAXY A40'
+    - regex: '(?:SAMSUNG-)?SM-A3051'
+      model: 'GALAXY A40s'
     - regex: '(?:SAMSUNG-)?SM-A505(?:FN|[FG])'
       model: 'GALAXY A50'
     - regex: '(?:SAMSUNG-)?SM-A705(?:FN|[FG])'
@@ -8537,6 +9396,10 @@ Samsung:
       model: 'GALAXY J1 Ace'
     - regex: '(?:SAMSUNG-)?SM-J200[FGHY]'
       model: 'GALAXY J2'
+    - regex: '(?:SAMSUNG-)?SM-J260AZ'
+      model: 'GALAXY J2 Pure'
+    - regex: '(?:SAMSUNG-)?SM-J260([AFGM]|T1)'
+      model: 'GALAXY J2 Core'
     - regex: '(?:SAMSUNG-)?SM-J(?:210F|250[FM])'
       model: 'GALAXY J2 Pro'
     - regex: '(?:SAMSUNG-)?SM-J320(?:FN|[AFGHMNPV])'
@@ -8561,7 +9424,7 @@ Samsung:
       model: 'GALAXY J6+'
     - regex: '(?:SAMSUNG-)?SM-J410F'
       model: 'GALAXY J4 Core'
-    - regex: '(?:SAMSUNG-)?SM-J415FN'
+    - regex: '(?:SAMSUNG-)?SM-J415(?:F|FN)'
       model: 'GALAXY J4+'
     - regex: '(?:SAMSUNG-)?SM-J7[01]0(?:8|F|FN|H|K|M|MN)'
       model: 'GALAXY J7'
@@ -8599,6 +9462,8 @@ Samsung:
       model: 'GALAXY M10'
     - regex: '(?:SAMSUNG-)?SM-M205[FG]'
       model: 'GALAXY M20'
+    - regex: '(?:SAMSUNG-)?SM-M307(F|FN)'
+      model: 'GALAXY M30s'
     - regex: '(?:SAMSUNG-)?SM-G850F'
       model: 'GALAXY Alpha'
     - regex: '(?:SAMSUNG-)?SM-G910S'
@@ -8711,7 +9576,7 @@ Samsung:
     - regex: '(?:SAMSUNG-)?GT-I920[05]'
       model: 'GALAXY Mega 6.3'
       device: 'phablet'
-    - regex: '(?:SAMSUNG-)?SM-N930F|SCV34'
+    - regex: '(?:SAMSUNG-)?(?:SM-N930F|SCV34)'
       model: 'GALAXY Note 7'
       device: 'phablet'
     - regex: '(?:SAMSUNG[- ])?SM-N950|SCV37'
@@ -8720,6 +9585,12 @@ Samsung:
     - regex: '(?:SAMSUNG[- ])?SM-N960'
       model: 'GALAXY Note 9'
       device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?SM-N970(?:0|8|9|D|F|J|K|L|S|U1|U|W8|X)'
+      model: 'GALAXY Note 10'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?(?:SM-N975(?:0|F|U|U1|W|X|Xu)|SM-N976[BV])'
+      model: 'GALAXY Note 10+'
+      device: 'phablet'
 
     # explicit feature phones
     - regex: '(?:SAMSUNG-)?GT-E2152'
@@ -9232,9 +10103,14 @@ Prestigio:
   models:
     - regex: 'PMT3277_3G'
       model: 'MultiPad Ranger 7.0 3G'
+    - regex: 'PMT3201_4G'
+      model: 'Grace 4G'
     - regex: 'PMT3287_3G'
       model: 'MultiPad Ranger 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)?)[);/ ]'
@@ -9259,13 +10135,24 @@ Sanyo:
     - regex: 'MobilePhone ([a-z0-9\-]+)'
       model: '$1'
 
-# Qilive
+# Qilive (Auchan)
 Qilive:
-  regex: 'Qilive [0-9][^;/]*|Q8S55IN4G2'
+  regex: 'Qilive [0-9][^;/]*|Q(8S55IN4G2|10S5[37]IN4G|10S5IN4GR|10S6IN4G|6T7IN)'
   device: 'smartphone'
   models:
     - regex: 'Q8S55IN4G2'
-      model: 'Q8S55IN4G2'
+      model: 'Q8 5.5" 4G'
+    - regex: 'Q10S53IN4G'
+      model: 'Q10 5.3" 4G'
+    - regex: 'Q10S57IN4G'
+      model: 'Q10 5.7" 4G'
+    - regex: 'Q10S5IN4GR'
+      model: 'Q10 5.0" 4G'
+    - regex: 'Q10S6IN4G'
+      model: 'Q10 6.0" 4G'
+    - regex: 'Q6T7IN'
+      model: 'Q6'
+      device: 'tablet'
     - regex: 'Qilive ([0-5][^;/]*) Build'
       model: '$1'
     - regex: 'Qilive ([0-5][^;/]*)/'
@@ -9453,7 +10340,7 @@ Star:
 
 # Kindle
 Amazon:
-  regex: 'KF(?:OT|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|SAW[IA]|GIWI|SUWI)[);/ ]|Kindle|Silk/\d+\.\d+|Amazon (?:Tate|Jem)|AFT[BMST]|SD4930UR'
+  regex: 'KF(?:OT|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|SAW[IA]|GIWI|SUWI)[);/ ]|Kindle|Silk/\d+\.\d+|Amazon (?:Tate|Jem)|AFT[BMST]|SD4930UR|AEO(BC|KN)[);/ ]'
   device: 'tablet'
   models:
     - regex: 'AFTB'
@@ -9508,10 +10395,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
@@ -9548,14 +10451,14 @@ T-Mobile:
 
 # Tcl
 TCL:
-  regex: 'TCL[ -][a-z0-9]+|(TCL[_ -][^;/]+|7040N) Build|TCLGalaG60|A502DL'
+  regex: 'TCL[_ -][a-z0-9]+|(TCL[_ -][^;/]+|7040N) Build|TCLGalaG60|A502DL'
   device: 'smartphone'
   models:
     - regex: 'TCLGalaG60'
       model: 'Gala G60'
     - regex: 'TCL[_ -]([^;/]+) Build'
       model: '$1'
-    - regex: 'TCL[ -]([a-z0-9]+)'
+    - regex: 'TCL[_ -]([a-z0-9]+)'
       model: '$1'
     - regex: '(7040N)'
       model: '$1'
@@ -9574,13 +10477,34 @@ Teclast:
 
 # Tecno Mobile
 Tecno Mobile:
-  regex: 'Tecno|Phantom6|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[ _]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_\-]+)'
@@ -9613,7 +10537,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|5075|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[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'
   device: 'tablet'
   models:
     - regex: 'TM-9749'
@@ -9653,7 +10577,7 @@ teXet:
     - 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|5075|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'
@@ -9771,6 +10695,16 @@ Timovi:
     - 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'
@@ -9902,9 +10836,9 @@ Uhappy:
 
 # Unimax
 Unimax:
-  regex: 'U(67[013]|680)C'
+  regex: 'U((?:67[013]|680)C|(?:452|504)TL|683CL)[);/ ]'
   device: 'smartphone'
-  model: 'U$1C'
+  model: 'U$1'
 
 # Unowhy
 Unowhy:
@@ -10009,6 +10943,11 @@ Unonu:
     - regex: 'Unonu[ _-]?([^;/)]+)[);/ ]'
       model: '$1'
 
+# UTOK
+UTOK:
+  regex: 'UTOK (45[01]D)'
+  device: 'smartphone'
+  model: '$1'
 
 # Vastking
 Vastking:
@@ -10045,9 +10984,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'
 
@@ -10079,6 +11024,12 @@ Vertu:
   device: 'feature phone'
   model: '$1'
 
+# Venso mobile
+Venso:
+  regex: '(CX-508)[/;) ]'
+  device: 'smartphone'
+  model: '$1'
+
 # Verizon
 Verizon:
   regex: 'QTA(SUN[12]|XIA1|QZ3|QZ3KID|IR7)|QMV7B'
@@ -10175,8 +11126,12 @@ Vodafone:
       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[);/ ]'
@@ -10210,6 +11165,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'
@@ -10238,7 +11196,7 @@ Vodafone:
 
 # Vonino
 Vonino:
-  regex: 'Vonino|Zun[ _]X[OS]?|Xylo[ _][XSP]|Volt[ _][XS]|Gyga[ _](?:X|S|QS|XS)|Pluri[ _](?:[BCMQ]7|[CQ]8)|Magnet[ _]M[19]|Jax[ _](?:Q|QS|S|X|Mini)|Navo_QS|Xavy_T7'
+  regex: 'Vonino|Epic (?:E8|P7)|Gyga[ _](?:X|S|QS|XS)|Jax[ _](?:Q|QS|S|X|Mini)|Magnet[ _]M[19]|Navo_QS|Onyx_(QS|Z)|Orin_QS|Pluri[ _](?:[BCMQ]7|[CQ]8)|Sirius_QS|Volt[ _][XS]|Xavy_T7|Xylo[ _][XSP]|Zun[ _]X[OS]?'
   device: 'smartphone'
   models:
     - regex: 'Zun[ _]XO'
@@ -10269,6 +11227,9 @@ Vonino:
       model: 'Jax $1'
     - regex: 'Jax[ _]Mini'
       model: 'Jax Mini'
+    - regex: 'Epic (E8|P7)'
+      model: 'Epic $1'
+      device: 'tablet'
     - regex: 'Pluri[ _](B|C|M|Q)7'
       model: 'Pluri $17'
       device: 'tablet'
@@ -10281,6 +11242,15 @@ Vonino:
     - regex: 'Navo_QS'
       model: 'Navo QS'
       device: 'tablet'
+    - regex: 'Onyx_(QS|Z)'
+      model: 'Onyx $1'
+      device: 'tablet'
+    - regex: 'Orin_QS'
+      model: 'Orin QS'
+      device: 'tablet'
+    - regex: 'Sirius_QS'
+      model: 'Sirius QS'
+      device: 'tablet'
     - regex: 'Xavy_T7'
       model: 'Xavy T7'
       device: 'tablet'
@@ -10582,13 +11552,13 @@ X-View:
 
 # Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/MiuiBrowser)|(?: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|POCOPHONE|SKR-[AH]0|SKW-H0'
+  regex: 'Xiaomi(?!/MiuiBrowser)|(?: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|POCOPHONE|SKR-[AH]0|SKW-[AH]0|POCO F1'
   device: 'smartphone'
   models:
     # specific smartphone models
     - regex: 'SKR-[AH]0'
       model: 'Black Shark'
-    - regex: 'SKW-H0'
+    - regex: 'SKW-[AH]0'
       model: 'Black Shark 2'
     - regex: 'Xiaomi_2014501|2014501 Build'
       model: 'Hongmi 4G'
@@ -10596,27 +11566,86 @@ Xiaomi:
       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 9 SE[);/ ]'
+      model: 'MI 9 SE'
+    - 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'
+    - regex: 'POCOPHONE F1|POCO F1'
       model: 'Pocophone F1'
+    - regex: 'Redmi 5 Plus'
+      model: 'Redmi 5 Plus'
+    - regex: 'HM 2A[);/ ]'
+      model: 'Redmi 2A'
+    - regex: 'HM 1S[CW]?[);/ ]'
+      model: 'Redmi 1S'
+    - regex: 'HM 1[);/ ]'
+      model: 'Redmi 1'
+    - 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: 'HM NOTE 1W (?:Build|MIUI)'
+      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)'
+      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: 'Redmi Note ([^;/) ]+)?'
+    - regex: 'Redmi[ _]Note[ _]([^;/) ]+)?'
       model: 'Redmi Note $1'
       device: 'phablet'
-    - regex: 'Redmi ([^;/) ]+)?'
+    - regex: 'Redmi[ _]([^;/) ]+)?'
       model: 'Redmi $1'
-    - regex: 'MI Note ([^;/) ]+)?'
+    - regex: 'MI[ _]Note[ _]([^;/) ]+)?'
       model: 'MI Note $1'
       device: 'phablet'
     - regex: '(MI(?:-One)?[ _](?:[^;/]*))Build'
@@ -10646,7 +11675,7 @@ Xolo:
   models:
     - regex: 'BLACK-1XM'
       model: 'Black 1X'
-    - regex: '(Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05])[);/ ]'
+    - regex: '(Q600 Club|Q600|Q700s?|Q800|Q1000s Plus|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05])[);/ ]'
       model: '$1'
     - regex: 'Xolo[ _]?([^;/]+) Build'
       model: '$1'
@@ -10915,6 +11944,18 @@ Toshiba:
     - regex: 'portalmmm/[12].0 (TS[a-z0-9 ]+)'
       model: '$1'
 
+# Vivax
+Vivax:
+  regex: 'VIVAX|(Fly5[_ ]Lite)[;)/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Fly5[_ ]Lite'
+      model: 'Fly 5 Lite'
+    - regex: 'VIVAX[ _]Fly3'
+      model: 'Fly 3'
+    - regex: 'SMART Point X5010'
+      model: 'Smart Point X5010'
+
 # Fly
 Fly:
   regex: 'Fly(?!Flow|touch)|FS50[1-9]|FS51[0-8]|FS52[0-9]|FS530|FS55[134]|FS40[1-9]|FS45[1-9]|4FS06|MERIDIAN-|(?:IQ[0-9]{3,})[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?(?: Build|[;/\)])'
@@ -11184,22 +12225,53 @@ Zenek:
 Zopo:
   regex: '(?:ZOPO[_ ])?(Flash X3|ZP[0-9]{2,}[^/;]+) Build'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: '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: '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: 'ZP300[S+]?[);/ ]'
+      model: 'Field'
+    - regex: 'ZP200[+]?[);/ ]'
+      model: 'Shining'
+    - regex: 'ZP100[);/ ]'
+      model: 'Pilot'
+
+    - regex: '(Flash X3|ZP[0-9]{2,}[^/;]+) Build'
+      model: '$1'
 
 # ZTE
 ZTE:
-  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)|N9[15]8St|NX(?:403A|404H|406E|40[X2]|507J|503A|505J|506J|508J|510J|512J|511J|513J|521J|523J_V1|529J|531J|541J|549J|551J|563J|569[HJ]|573J|575J|591J|595J|597J|601J|907J|616J)|N951[0579]|N9180|N9101|N913[67]|N952[01]|N9560|N9810|N799D|[UV]9180|[UV]9815|Z(?:233V|331|667T|768G|792|81[25]|82[08]|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|963)VL|955A|95[678]|965|97[018]|98[1237]|986U|999)|Apex2|G (LTE|Lux)|Vec)[);/ ]|KIS II Max|Kis 3'
+  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)|N9[15]8St|NX(?:403A|404H|406E|40[X2]|507J|503A|505J|506J|508J|510J|512J|511J|513J|521J|523J_V1|529J|531J|541J|549J|551J|563J|569[HJ]|573J|575J|591J|595J|597J|601J|907J|616J)|N951[0579]|N9180|N9101|N913[67]|N952[01]|N9560|N9810|N799D|[UV]9180|[UV]9815|Z(?:233V|331|667T|768G|792|81[25]|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)|Apex2|G (LTE|Lux)|Vec)[);/ ]|KIS II Max|Kis 3|Z930L'
   device: 'smartphone'
   models:
     # explicit smartphone models
     - regex: 'N799D[);/ ]'
-      model: 'MTS Blaze 4'
+      model: 'Blade Eg'
     - regex: 'N918St[);/ ]'
       model: 'V5S'
     - regex: 'N958St[);/ ]'
       model: 'V5 Max'
     - regex: 'N9101[);/ ]'
       model: 'Imperial'
+    - regex: 'N9120[);/ ]'
+      model: 'Avid'
     - regex: 'N9136[);/ ]'
       model: 'Prestige 2'
     - regex: 'N9137[);/ ]'
@@ -11207,11 +12279,11 @@ ZTE:
     - regex: 'N9180[);/ ]'
       model: 'V5'
     - regex: 'N9510[);/ ]'
-      model: 'Wrap 4G'
+      model: 'Warp 4G'
     - regex: 'N9517[);/ ]'
       model: 'Blade Force'
     - regex: 'N9515[);/ ]'
-      model: 'Wrap Sync'
+      model: 'Warp Sync'
     - regex: 'N9519[);/ ]'
       model: 'Warp 7'
     - regex: 'N9520[);/ ]'
@@ -11224,8 +12296,8 @@ ZTE:
       model: 'Vital'
     - regex: 'NX40[X2][);/ ]'
       model: 'Nubia Z5 mini'
-    - regex: 'NX(403A|404H)[);/ ]'
-      model: 'Nubia Z5S mini'
+    - regex: 'NX(403[AE]|406E|404H)[);/ ]'
+      model: 'Nubia Z5S Mini'
     - regex: 'NX503A[);/ ]'
       model: 'Nubia Z5S'
     - regex: 'NX506J[);/ ]'
@@ -11254,8 +12326,10 @@ ZTE:
       model: 'Nubia Z18S'
     - regex: 'NX551J[);/ ]'
       model: 'Nubia M2'
-    - regex: '(?:NX569H|NX563J)[);/ ]'
+    - regex: 'NX563J[);/ ]'
       model: 'Nubia Z17'
+    - regex: 'NX569H[);/ ]'
+      model: 'Nubia Z17 Mini'
     - regex: 'NX595J'
       model: 'Nubia Z17S'
     - regex: 'NX513J[);/ ]'
@@ -11279,12 +12353,34 @@ ZTE:
     - 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: '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 (A(310|460|465|475|520|530|602)|L110|V580)[);/ ]'
+    - 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'
@@ -11292,24 +12388,36 @@ ZTE:
       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[);/ ]'
       model: 'Blade L8'
+    - regex: 'Blade S6 Plus[);/ ]'
+      model: 'Blade S6 Plus'
     - regex: 'Blade S6[);/ ]'
       model: 'Blade S6'
+    - regex: 'T920[);/ ]'
+      model: 'Blade S7'
     - regex: 'Blade V6 MAX[);/ ]'
       model: 'Blade V6 Max'
     - regex: 'Blade V6 Plus[);/ ]'
       model: 'Blade V6 Plus'
     - regex: 'Blade V6[);/ ]'
       model: 'Blade V6'
-    - regex: 'Blade L7A[);/ ]'
-      model: 'Blade L7A'
-    - regex: 'Blade L7[);/ ]'
-      model: 'Blade L7'
+    - regex: 'Blade (?:V7 Lite|V0720)[);/ ]'
+      model: 'Blade V7 Lite'
     - regex: 'Blade V7[);/ ]'
       model: 'Blade V7'
     - regex: 'Blade X7[);/ ]'
@@ -11322,6 +12430,12 @@ ZTE:
       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: '(Apex2|G (LTE|Lux)|Vec)'
       model: 'Blade $1'
     - regex: 'Z768G[);/ ]'
@@ -11336,6 +12450,8 @@ ZTE:
       model: 'Blade V8 Pro'
     - regex: 'Z839'
       model: 'Blade Vantage'
+    - regex: 'Z930L'
+      model: 'Unico LTE'
     - regex: 'Z965'
       model: 'Blade X'
     - regex: 'Z981'
@@ -11346,16 +12462,14 @@ ZTE:
       model: 'Blade X Max'
     - regex: 'Z717[BV]L[);/ ]'
       model: 'Citrine LTE'
-    - regex: 'Z233V'
-      model: 'Cymbal LTE'
     - regex: 'Z233VL'
       model: 'Cymbal-C LTE'
+    - regex: 'Z233V'
+      model: 'Cymbal LTE'
     - regex: 'Z232TL'
       model: 'Cymbal-G LTE'
     - regex: 'Z353VL'
       model: 'Cymbal-T LTE'
-    - regex: 'Z95[67]'
-      model: 'Grand X 4'
     - regex: 'Z718TL'
       model: 'Jasper LTE'
     - regex: 'KIS II Max'
@@ -11368,8 +12482,6 @@ ZTE:
       model: 'Majesty Pro Plus LTE'
     - regex: 'Z828TL'
       model: 'Midnight Pro LTE'
-    - regex: 'NX406E[);/ ]'
-      model: 'Nubia Z5S'
     - regex: 'Z792'
       model: 'Fanfare'
     - regex: 'Z812'
@@ -11383,7 +12495,7 @@ ZTE:
     - regex: 'Z835'
       model: 'Maven 3'
     - regex: 'Z851[);/ ]'
-      model: 'Prelude+'
+      model: 'Prelude Plus'
     - regex: 'Z851M'
       model: 'Overture 3'
     - regex: 'Z852'
@@ -11414,15 +12526,37 @@ ZTE:
       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: 'AxonPhone ([^;/]+) Build'
       model: 'AxonPhone $1'
     - regex: '([a-z0-9]+)_USA_Cricket'
@@ -11504,11 +12638,19 @@ MTC:
 
 # MegaFon
 MegaFon:
-  regex: 'MFLoginPh'
+  regex: 'MFLoginPh|(MFLogin4|MS3B|SP-A5|SP-A20i)[)\; ]'
   device: 'smartphone'
   models:
     - regex: 'MFLoginPh'
       model: 'Login+'
+    - regex: 'MFLogin4'
+      model: 'Login 4 LTE'
+    - regex: 'MS3B'
+      model: 'Optima'
+    - regex: 'SP-A20i'
+      model: 'Mint'
+    - regex: '(SP-A5)'
+      model: '$1'
 
 # Inoi
 Inoi:
@@ -11569,6 +12711,12 @@ Simbans:
     - regex: 'SX2W'
       model: 'SX2W'
 
+# MYFON
+MYFON:
+  regex: 'MYPAD7s'
+  device: 'tablet'
+  model: 'My Pad 7s'
+
 # X-TIGI
 X-TIGI:
   regex: 'X[-_]TIGI'
@@ -11585,6 +12733,24 @@ X-TIGI:
     - regex: 'X[-_]TIGI[ _-]([^/;)]+) Build'
       model: '$1'
 
+# Xiaolajiao
+Xiaolajiao:
+  regex: '(LA2-(?:L|S[N]?))[);/ ]'
+  device: 'smartphone'
+  model: '$1'
+
+# Ritmix
+Ritmix:
+  regex: 'RMD[-_](10(?:2[68]|5[89])|726)[);/ ]'
+  device: 'tablet'
+  model: 'RMD-$1'
+
+# 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)'
@@ -11618,7 +12784,17 @@ Yandex:
   device: 'smartphone'
   model: '$1'
 
+# FORME
+FORME:
+  regex: 'FORME[ _-]'
+  device: 'smartphone'
+  models:
+    - regex: 'FORME[ _-]F520[;)\ ]'
+      model: 'Forever'
+    - regex: 'FORME[ _-](A37|R7S)[;)\ ]'
+      model: '$1'
+
 Shuttle:
   regex: '(PNT-704[025])[;)/ ]'
   device: 'tablet'
-  model: '$1'
+  model: '$1'