device_detector 1.0.0 → 1.0.1

data/regexes/client/pim.yml

@@ -39,4 +39,8 @@
 
 - regex: 'The Bat!(?: Voyager)?(?:[/ ](\d+[\.\d]+))?'
   name: 'The Bat!'
+  version: '$1'
+
+- regex: 'DAVdroid(?:/(\d+[\.\d]+))?'
+  name: 'DAVdroid'
   version: '$1'

data/regexes/device/mobiles.yml

@@ -81,9 +81,15 @@ HTC:
 
     - regex: 'NexusHD2' # custom rom for hd2
       model: 'HD2'
-    - regex: 'HTC[ _\-]((?:Flyer|P715a).*) Build'
+    - regex: 'HTC[ _\-]P715a'
       device: 'tablet'
-      model: '$1'
+      model: 'P715a'
+    - regex: 'HTC[ _\-]Flyer Build'
+      device: 'tablet'
+      model: 'Flyer'
+    - regex: 'HTC[ _\-]Flyer[ _\-]([\w]{1,5})'
+      device: 'tablet'
+      model: 'Flyer $1'
     - regex: 'HTC[ _\-]One[ _\-]max[);/ ]'
       device: 'phablet'
       model: 'One max'
@@ -115,14 +121,44 @@ HTC:
     - regex: '(One M8)'
       model: '$1'
 
+# microsoft
+Microsoft:
+  regex: 'KIN\.(One|Two)|RM-(?:1031|106[57]|109[02]|1099|1109|1114|1127|1141|1154)|Microsoft; Lumia'
+  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-109[02]'
+      model: 'Lumia 535'
+    - regex: 'RM-1099'
+      model: 'Lumia 430'
+    - regex: 'RM-1109'
+      model: 'Lumia 640'
+    - regex: 'RM-1114'
+      model: 'Lumia 435'
+    - regex: 'RM-1127'
+      model: 'Lumia 550'
+    - regex: 'RM-1141'
+      model: 'Lumia 540'
+    - regex: 'RM-1154'
+      model: 'Lumia 650'
+
+    - 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'
+  regex: 'Nokia|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-z0-9]+)$|RX-51 N900|TA-[0-9]{4} Build'
   device: 'smartphone'
   models:
     - regex: 'RX-51 N900'
       model: 'N900'
-      device: 'tablet'
     - regex: 'Nokia(N[0-9]+)'
       model: '$1'
     - regex: 'Nokia-([a-z0-9]+)'
@@ -152,6 +188,18 @@ Nokia:
       device: 'feature phone'
       model: '$1'
 
+    # Nokia branded phones by HMD Global
+    - regex: 'TA-10(07|23|29|35)'
+      model: '2'
+    - regex: 'TA-10(20|28|32|38)'
+      model: '3'
+    - regex: 'TA-10(24|27|44|53)'
+      model: '5'
+    - regex: 'TA-10(00|03|21|25|33|39)'
+      model: '6'
+    - regex: 'TA-10(04|12)'
+      model: '8'
+
 # CnM
 CnM:
   regex: 'CnM'
@@ -162,9 +210,13 @@ CnM:
 
 # RIM/BlackBerry
 RIM:
-  regex: 'BB10;|BlackBerry|rim[0-9]+|PlayBook'
+  regex: 'BB10;|BlackBerry|rim[0-9]+|PlayBook|STV100-4|STH100-2'
   device: 'smartphone'
   models:
+    - regex: 'STV100-4'
+      model: 'BlackBerry Priv'
+    - regex: 'STH100-2'
+      model: 'BlackBerry DTEK50'
     - regex: 'BB10; ([a-z0-9\- ]+)\)'
       model: 'BlackBerry $1'
     - regex: 'PlayBook.+RIM Tablet OS'
@@ -195,9 +247,12 @@ Palm:
 
 # HP
 HP:
-  regex: 'TouchPad/\d+\.\d+|hp-tablet|HP ?iPAQ|webOS.*P160U|HP Slate|HP [78]|Compaq [7|8]'
+  regex: 'TouchPad/\d+\.\d+|hp-tablet|HP ?iPAQ|webOS.*P160U|HP Slate|HP [78]|Compaq [7|8]|HP; [^;/)]+'
   device: 'smartphone'
   models:
+    - regex: 'HP Slate 6 Voice Tab'
+      model: 'Slate 6 VoiceTab'
+      device: 'phablet'
     - regex: 'HP ([78][^/;]*) Build'
       model: 'Slate $1'
       device: 'tablet'
@@ -213,6 +268,8 @@ HP:
     - regex: 'TouchPad/(\d+\.\d+)|hp-tablet'
       model: 'TouchPad'
       device: 'tablet'
+    - regex: 'HP; ([^;/)]+)'
+      model: '$1'
     - regex: 'HP(?: )?iPAQ(?: )?([a-z0-9]+)'
       model: 'iPAQ $1'
     - regex: 'webOS.*(P160U)'
@@ -259,6 +316,30 @@ Apple:
     - 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'
+      model: 'iPhone 6s Plus'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?8[C,]4'
+      model: 'iPhone SE'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?9[C,][13]'
+      model: 'iPhone 7'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?9[C,][24]'
+      model: 'iPhone 7 Plus'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,][14]'
+      model: 'iPhone 8'
+      device: 'smartphone'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,][25]'
+      model: 'iPhone 8 Plus'
+      device: 'phablet'
+    - regex: '(?:Apple-)?iPh(?:one)?10[C,][36]'
+      model: 'iPhone X'
+      device: 'phablet'
 
     # specific tablet devices
     - regex: '(?:Apple-)?iPad1[C,]1'
@@ -285,9 +366,24 @@ Apple:
     - regex: '(?:Apple-)?iPad4[C,][789]'
       model: 'iPad Mini 3'
       device: 'tablet'
+    - regex: '(?:Apple-)?iPad5[C,][12]'
+      model: 'iPad Mini 4'
+      device: 'tablet'
     - regex: '(?:Apple-)?iPad5[C,][34]'
       model: 'iPad Air 2'
       device: 'tablet'
+    - regex: '(?:Apple-)?iPad6[C,][34]'
+      model: 'iPad Pro 9.7'
+      device: 'tablet'
+    - regex: '(?:Apple-)?iPad6[C,][78]'
+      model: 'iPad Pro 12.9'
+      device: 'tablet'
+    - regex: '(?:Apple-)?iPad7[C,][12]'
+      model: 'iPad Pro 2 12.9'
+      device: 'tablet'
+    - regex: '(?:Apple-)?iPad7[C,][34]'
+      model: 'iPad Pro 10.5'
+      device: 'tablet'
 
     - regex: '(?:iTunes-)?AppleTV'
       model: 'Apple TV'
@@ -301,7 +397,7 @@ Apple:
 
 # micromax
 MicroMax:
-  regex: 'MicroMax[ \-\_]?[a-z0-9]+'
+  regex: '(MicroMax[ \-\_]?[a-z0-9]+|Q327)'
   device: 'smartphone'
   models:
     - regex: 'MicroMax(?:[ \-\_])?(P[a-z0-9]+)'
@@ -309,6 +405,8 @@ MicroMax:
       device: 'tablet'
     - regex: 'MicroMax(?:[ \-\_])?([a-z0-9]+)'
       model: '$1'
+    - regex: 'Q327'
+      model: 'Bolt'
 
 # 3Q
 3Q:
@@ -316,9 +414,38 @@ MicroMax:
   device: 'tablet'
   model: '$1'
 
+# 4Good
+4Good:
+  regex: '4Good[ _]|(?:4Good)?(S450m [43]G|S555m 4G|S501m 3G|T700i_3G|Light A103)'
+  device: 'smartphone'
+  models:
+    - regex: 'T700i_3G'
+      model: 'T700i 3G'
+      device: 'tablet'
+    - regex: '(S(?:450m|555m|501m)[_ ][43]G|Light A103)'
+      model: '$1'
+    - regex: '4Good[ _]([^;/]+) Build'
+      model: '$1'
+    - regex: '4Good[ _]([^);/ ]+)'
+      model: '$1'
+
+# Bravis
+Bravis:
+  regex: 'Bravis|A501 Bright|NB(?:10[56]|751|7[145])|NP101'
+  device: 'smartphone'
+  models:
+    - regex: 'A501 Bright'
+      model: 'A501 Bright'
+    - regex: 'Bravis[_ ]([^;\)]+) Build'
+      model: '$1'
+    - regex: '(NB(?:10[156]|751|7[145])|NP101)'
+      model: '$1'
+      device: 'tablet'
+
+
 # Acer
 Acer:
-  regex: 'acer|a(?:101|110|200|210|211|500|501|510|511|700|701)[);/ ]|Android.*V3[67]0[);/ ]|Android.*Z1[23456]0 Build|Android.*Z500 Build|A1-830|A1-81[01]|A3-A[12][01]|B1-7[1235][01]|B1-810|B1-A71|E39 Build|S5[12]0 Build|DA[0-9]+HQ?L[);/ ]'
+  regex: 'acer|(?<!ZTE BLADE )a(?:101|110|200|210|211|500|501|510|511|700|701)[);/ ]|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[);/ ]'
   device: 'smartphone'
   models:
     # smart displays
@@ -342,9 +469,24 @@ Acer:
     - regex: 'A3-A[12][01]'
       model: 'Iconia A3'
       device: 'tablet'
-    - regex: 'B1-7[1235][01]|B1-810|B1-A71'
+    - regex: 'A3-A[34]0'
+      model: 'Iconia Tab 10'
+      device: 'tablet'
+    - regex: 'B1-7[1235][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'
 
     # explicit smartphone models
     - regex: 'E39 Build'
@@ -361,8 +503,20 @@ Acer:
       model: 'Liquid Z$1'
     - regex: 'Android.*Z160 Build'
       model: 'Liquid Z4'
-    - regex: 'Android.*Z500 Build'
-      model: 'Liquid Z500'
+    - regex: 'Android.*Z(5\d{2}) Build'
+      model: 'Liquid Z$1'
+    - regex: 'Android.*T02 Build'
+      model: 'Liquid Z530'
+    - regex: 'Android.*T03 Build'
+      model: 'Liquid Z630'
+    - regex: 'Android.*T04 Build'
+      model: 'Liquid Z630S'
+    - regex: 'Android.*T06 Build'
+      model: 'Liquid Zest'
+    - regex: 'Android.*T07 Build'
+      model: 'Liquid Zest 4G'
+    - regex: 'Android.*T08 Build'
+      model: 'Liquid Zest Plus'
     - regex: 'Acer; ?([^;\)]+)'
       model: '$1'
     - regex: 'Acer[ _\-]?([^;\)]+) Build'
@@ -381,9 +535,42 @@ Airness:
 
 # Alcatel
 Alcatel:
-  regex: 'Alcatel|Alc[a-z0-9]+|One[ _]?Touch'
-  device: 'smartphone'
-  models:
+  regex: 'Alcatel|Alc[a-z0-9]+|One[ _]?Touch|(?:6036Y|6039H|50[16]5X|9005X|I213|5015D|5045D|5051X|6050[AFY]|6055K|8050D|4013M|I216X)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: '50[16]5X[);/ ]'
+      model: 'One Touch Pop 3'
+    - regex: '5015D[);/ ]'
+      model: 'One Touch Pop 3 Dual SIM'
+    - regex: '5051X[);/ ]'
+      model: 'One Touch Pop 4'
+    - regex: '6036Y[);/ ]'
+      model: 'One Touch Idol 2 mini'
+    - regex: '6050[AFY][);/ ]'
+      model: 'One Touch Idol 2S'
+    - regex: '6039H[);/ ]'
+      model: 'One Touch Idol 3'
+    - regex: '6055K[);/ ]'
+      model: 'One Touch Idol 4'
+    - regex: 'I213[);/ ]'
+      model: 'One Touch Pixi 7'
+      device: 'tablet'
+    - regex: '8050D[);/ ]'
+      model: 'One Touch Pixi 4'
+    - regex: '5045D[);/ ]'
+      model: 'One Touch Pixi 4 5"'
+    - regex: 'I216X[);/ ]'
+      model: 'One Touch Pixi 7'
+      device: 'tablet'
+    - regex: '9005X[);/ ]'
+      model: 'One Touch Pixi 8'
+      device: 'tablet'
+    - regex: 'P320X'
+      model: 'One Touch POP 8'
+      device: 'tablet'
+    - regex: 'P310X'
+      model: 'One Touch POP 7'
+      device: 'tablet'
     - regex: '(?:Alcatel[ _])?One[ _]?Touch[ _]((?:T[0-9]+|TAB[^/;]+|EVO[78](?:HD)?)) Build'
       device: 'tablet'
       model: 'One Touch $1'
@@ -401,12 +588,36 @@ Alcatel:
       model: '$1'
     - regex: 'Alc([a-z0-9]+)'
       model: '$1'
+    - regex: '4013M'
+      model: 'One Touch Pixi 3'
 
 # Allview
 Allview:
-  regex: 'Allview'
-  device: 'smartphone'
-  models:
+  regex: 'Allview|P[567]_Lite(?:_TM)?|P5_Energy|P6_Energy_(?:Lite|Mini)|X2_Soul_Xtreme|A5_(?:Easy|Ready|Quad_Plus_TM)|A6_Duo|A[89]_Lite'
+  device: 'smartphone'
+  models:
+    - regex: 'P([567])_Lite(?:_TM)?'
+      model: 'P$1 Lite'
+    - regex: 'P5_Energy'
+      model: 'P5 Energy'
+    - regex: 'P6_Energy_Lite'
+      model: 'P6 Energy Lite'
+    - regex: 'P6_Energy_mini'
+      model: 'P6 Energy Mini'
+    - regex: 'X2_Soul_Xtreme'
+      model: 'X2 Soul Xtreme'
+    - regex: 'A5_Easy'
+      model: 'A5 Easy'
+    - regex: 'A5_Ready'
+      model: 'A5 Ready'
+    - regex: 'A5_Quad_Plus_TM'
+      model: 'A5 Quad Plus'
+    - regex: 'A6_Duo'
+      model: 'A6 Duo'
+    - regex: 'A8_Lite'
+      model: 'A8 Lite'
+    - regex: 'A9_Lite'
+      model: 'A9 Lite'
     - regex: 'Allview[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Allview[ _-]([^;/]+)[;/)]'
@@ -557,7 +768,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]|Z00D)[);/ ]'
+  regex: 'Asus|Transformer|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|Z00D|Z00YD)[);/ ]'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -576,7 +787,7 @@ Asus:
     - regex: 'ME301T[);/ ]'
       model: 'MeMO Pad Smart 10'
       device: 'tablet'
-    - regex: 'K01[3A][);/ ]'
+    - regex: '(?:K01[3A]|K007|K00R)[);/ ]'
       model: 'MeMO Pad 7'
       device: 'tablet'
     - regex: 'K01E[);/ ]'
@@ -633,13 +844,16 @@ Asus:
       model: 'Fonepad 8'
       device: 'phablet'
 
-
     # explicit smartphone models
     - regex: '(?:ASUS_)?Z007'
       model: 'ZenFone C'
     - regex: '(?:ASUS_)?(?:Z00D|Z008D|Z00AD[AB]?)'
       model: 'ZenFone 2'
-    - regex: '(?:ASUS_)?T00[IQ]'
+    - regex: '(?:ASUS_)(Z00YD)'
+      model: '$1'
+    - regex: '(?:ASUS_)?Z00[ERL]D'
+      model: 'ZenFone 2 Laser'
+    - regex: '(?:ASUS_)?T00[IQ1]'
       model: 'ZenFone 4'
     - regex: '(?:ASUS_)?T00[JF]'
       model: 'ZenFone 5'
@@ -649,6 +863,20 @@ Asus:
       model: 'ZenFone 5 Lite'
     - regex: '(?:ASUS_)?(?:T00G|Z002)'
       model: 'ZenFone 6'
+    - regex: '(?:ASUS_)?Z010D'
+      model: 'ZenFone Max'
+    - regex: '(?:ASUS_)?X014D'
+      model: 'ZenFone Go Plus'
+    - regex: '(?:ASUS_)?(Z00[SV]D|X009[DB][DA])'
+      model: 'ZenFone Go'
+    - regex: '(?:ASUS_)?X013D'
+      model: 'ZenFone Go Life'
+    - regex: '(?:ASUS_)?(X008)'
+      model: 'ZenFone 3 Pegasus'
+    - regex: '(?:ASUS_)?Z00UD'
+      model: 'ZenFone Selfie'
+    - regex: '(?:ASUS_)?(Z017DA|ZE520KL)'
+      model: 'ZenFone 3'
 
     # general detections
     - regex: 'Asus(?:-|;)?([a-z0-9]+)'
@@ -686,6 +914,16 @@ Avvio:
     - regex: 'Avvio[ _]([a-z0-9\-]+)'
       model: '$1'
 
+# Azumi Mobile
+"Azumi Mobile":
+  regex: 'Azumi[_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Azumi[_ ]([^/;]+) Build'
+      model: '$1'
+    - regex: 'Azumi[_ ]([a-z0-9_]+)'
+      model: '$1'
+
 #Barnes & Noble
 'Barnes & Noble':
   regex: 'Nook|BN[TR]V[0-9]+'
@@ -698,11 +936,39 @@ Avvio:
     - regex: '(BN[TR]V[0-9]+)'
       model: 'Nook $1'
 
+# BGH
+BGH:
+  regex: '(?<!Positivo )BGH ([^/;]+) Build'
+  device: 'smartphone'
+  model: '$1'
+
+# Bitel
+Bitel:
+  regex: 'Bitel[ _-]([^/;]+) Build'
+  device: 'smartphone'
+  model: '$1'
+
 # Blu
 Blu:
-  regex: 'blu ([^/;]+) Build'
+  regex: '(?:blu|Dash)[ _]([^/;]+) Build'
   device: 'smartphone'
-  model: '$1'
+  models:
+   - regex: 'DASH[ _]([^/;]+) Build'
+     model: 'Dash $1'
+   - regex: 'blu[ _]([^/;]+) Build'
+     model: '$1'
+
+# Blackview
+Blackview:
+  regex: '(BV[2567]000(?:[ _](?:PRO))?|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550)[ _]Build'
+  device: 'smartphone'
+  models:
+    - regex: '(BV[2567]000(?:[ _](?:PRO))?)[ _]Build'
+      model: '$1'
+    - regex: 'omega[ _]pro'
+      model: 'Omega Pro'
+    - regex: '(Alife[ _][PS]1|DM550|Heatwave)'
+      model: '$1'
 
 # Boway
 Boway:
@@ -785,11 +1051,35 @@ BenQ:
   device: 'feature phone'
   model: '$1'
 
+# Blaupunkt
+Blaupunkt:
+  regex: 'Atlantis[_ ](?:1001A|1010A|A10\.G402)|Discovery[_ ](?:111C|1000C|1001A?)|Endeavour[_ ](?:785|101[GLM]|1000|1001|101[03]|1100)|Polaris[_ ]803'
+  device: 'tablet'
+  models:
+    - regex: 'Discovery[_ ]111C'
+      model: 'Discovery 111C'
+    - regex: 'Discovery[_ ]1000C'
+      model: 'Discovery 1000C'
+    - regex: 'Discovery[_ ]1001A'
+      model: 'Discovery 1001A'
+    - regex: 'Discovery[_ ]1001'
+      model: 'Discovery 1001'
+    - regex: 'Endeavour[_ ](101[GLM]|785|100[01]|101[03]|1100)'
+      model: 'Endeavour $1'
+    - regex: 'Polaris[_ ](803)'
+      model: 'Polaris $1'
+    - regex: 'Atlantis[_ ](1001A|1010A|A10\.G402)'
+      model: 'Atlantis $1'
+
 # Bmobile
 Bmobile:
-  regex: 'Bmobile_([a-z0-9]+)'
+  regex: 'Bmobile[_ ]'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'Bmobile[_ ]([^/;]+) Build'
+      model: '$1'
+    - regex: 'Bmobile[_ ]([a-z0-9]+)'
+      model: '$1'
 
 # bq
 bq:
@@ -843,9 +1133,12 @@ Casio:
 
 # Cat
 Cat:
-  regex: 'Cat ?(tablet|stargate|nova)'
+  regex: 'Cat ?(tablet|stargate|nova)|B15Q'
   device: 'tablet'
   models:
+    - regex: 'B15Q'
+      model: 'B15Q'
+      device: 'smartphone'
     - regex: 'Cat ?(?:tablet)? ?((?:Galactica|Nova|StarGate|PHOENIX)[^/;]*) Build'
       model: '$1'
     - regex: 'Cat ?tablet'
@@ -900,6 +1193,12 @@ Changhong:
       model: '$1'
       device: 'tablet'
 
+# China Mobile
+'China Mobile':
+  regex: '(M812C|1501_M02|9930i|A1303|A309W) Build'
+  device: 'smartphone'
+  model: '$1'
+
 # Compal
 Compal:
   regex: 'Compal-[a-z0-9]+'
@@ -920,15 +1219,88 @@ ConCorde:
     - regex: 'ConCorde ([^/;]+) Build'
       model: '$1'
 
+# Condor
+Condor:
+  regex: '(?:PGN\-?[456][012][0-9]|PHS\-601)[;/) ]|CTAB[^/;]+ Build'
+  device: 'smartphone'
+  models:
+    - regex: 'CTAB([^/;]+) Build'
+      device: 'tablet'
+      model: 'CTAB $1'
+
+    - regex: 'PHS\-601'
+      model: 'C8'
+    - regex: 'PGN\-?403'
+      model: 'C4+ Noir'
+    - regex: 'PGN\-?404'
+      model: 'C7 Mini'
+    - regex: 'PGN\-?409'
+      model: 'Plume P4'
+    - regex: 'PGN\-?504'
+      model: 'C5'
+    - regex: 'PGN\-?505'
+      model: 'C8S'
+    - regex: 'PGN\-?506'
+      model: 'C7'
+    - regex: 'PGN\-?507'
+      model: 'Allure A9'
+    - regex: 'PGN\-?508'
+      model: 'C6+'
+    - regex: 'PGN\-?509'
+      model: 'C6 Pro'
+    - regex: 'PGN\-?511'
+      model: 'Allure A9 Plus'
+    - regex: 'PGN\-?513'
+      model: 'Griffe G4'
+    - regex: 'PGN\-?514'
+      model: 'Plume P7'
+    - regex: 'PGN\-?515'
+      model: 'Plume P4 Pro'
+    - regex: 'PGN\-?516'
+      model: 'Plume P5'
+    - regex: 'PGN\-?51[78]'
+      model: 'Plume P6'
+    - regex: 'PGN\-?521'
+      model: 'Griffe G4 Plus'
+    - regex: 'PGN\-?522'
+      model: 'P6 Plus'
+    - regex: 'PGN\-?523'
+      model: 'P7 Plus'
+    - regex: 'PGN\-?527'
+      model: 'Plume P4 Plus'
+    - regex: 'PGN\-?528'
+      model: 'Plume P6 Pro Lte'
+    - regex: 'PGN\-?605'
+      model: 'Plume P8'
+    - regex: 'PGN\-?606'
+      model: 'Allure A55'
+    - regex: 'PGN\-?607'
+      model: 'Allure A100'
+    - regex: 'PGN\-?608'
+      model: 'Allure A55 Slim'
+    - regex: 'PGN\-?609'
+      model: 'Allure A100 Lite'
+    - regex: 'PGN\-?610'
+      model: 'Plume P8 Lite'
+    - regex: 'PGN\-?611'
+      model: 'Allure A8'
+    - regex: 'PGN\-?612'
+      model: 'Allure A8 Plus'
+    - regex: 'PGN\-?613'
+      model: 'Allure A55 Plus'
+
+    - regex: 'PGN\-?([0-9]{3})'
+      model: 'PGN-$1'
+
 # Coolpad
 Coolpad:
-  regex: '(?:YL-)?Coolpad|8190Q[ ;/\)]|8295 Build'
+  regex: '(?:YL-)?Coolpad|8190Q[ ;/\)]|(8295|5860S) Build'
   device: 'smartphone'
   models:
     - regex: '8190Q[ ;/\)]'
       model: '8190Q'
-    - regex: '8295 Build'
-      model: '8295'
+    - regex: '(5860S|8295) Build'
+      model: '$1'
     - regex: '(?:YL-)?Coolpad[ _\-]?([^/;]+) Build'
       model: '$1'
     - regex: '(?:YL-)?Coolpad[ _\-]?([a-z0-9\-]+)'
@@ -948,15 +1320,21 @@ Cricket:
 
 # Crosscall
 Crosscall:
-  regex: 'Crosscall'
+  regex: 'Crosscall|ODYSSEY_Plus|Odyssey S1|Trekker-[MSX][123]'
   device: 'smartphone'
   models:
     - regex: 'Crosscall ([^;/]+) Build'
       model: '$1'
+    - regex: 'ODYSSEY_Plus'
+      model: 'ODYSSEY+'
+    - regex: 'Odyssey S1'
+      model: 'ODYSSEY S1'
+    - regex: 'Trekker-([MSX][123](?: Core)?)'
+      model: 'Trekker-$1'
 
 # Cube
 Cube:
-  regex: 'Cube|(U[0-9]+GT|K8GT)'
+  regex: '(<!myPhone ?)Cube|(U[0-9]+GT|K8GT)'
   device: 'tablet'
   models:
     - regex: 'U27GT'
@@ -983,6 +1361,16 @@ CUBOT:
     - regex: '([^;/]+) Build/CUBOT'
       model: '$1'
 
+# Cyrus
+Cyrus:
+  regex: 'Cyrus[ _-]'
+  device: 'smartphone'
+  models:
+    - regex: 'Cyrus[ _-]?([^;/)]+) Build'
+      model: '$1'
+    - regex: 'Cyrus[ _-]?([^;/)]+)[);/ ]'
+      model: '$1'
+
 # Datang
 Datang:
   regex: 'DATANG'
@@ -1007,7 +1395,7 @@ Denver:
 
 # Dell
 Dell:
-  regex: 'Dell|Venue|XCD35'
+  regex: 'Dell[^a-z]|Venue|XCD35'
   device: 'smartphone'
   models:
     - regex: 'XCD35'
@@ -1033,6 +1421,28 @@ Desay:
     - regex: 'Desay[ _-]?([^;/)]+)[);/ ]'
       model: '$1'
 
+# DEXP
+DEXP:
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/]+) Build|H135[ _]Build'
+  device: 'smartphone'
+  models:
+
+    - regex: 'Ixion[_ ]([^;/]+) Build'
+      model: 'Ixion $1'
+
+    - regex: 'Ursus ([^;/]+) Build'
+      model: 'Ursus $1'
+      device: 'tablet'
+      
+    - regex: 'H135[ _]Build'
+      model: 'Atlas'
+      device: 'desktop'
+
+    - regex: 'DEXP[ _]([^;/]+) Build'
+      model: '$1'
+    - regex: 'DEXP[ _]([^);/]+)[);/ ]'
+      model: '$1'
+
 # Dbtel
 Dbtel:
   regex: 'DBTEL(?:[\-/])?([a-z0-9]+)'
@@ -1045,6 +1455,72 @@ Dicam:
   device: 'feature phone'
   model: '$1'
 
+# Digma
+Digma:
+  regex: 'Digma[_ ]([^;/]+) Build|HIT HT707[10]MG|CITI 1902 3G|(CITI (?:[A-Z0-9]+) 3G) C[ST]500[67]PG|iDrQ10 3G|iDxD8 3G|iDnD7|HIT 4G HT7074ML|IDX5|(iDx10|iDx7)|MVM900H(?:WZ|C)|MVM908HCZ|iDxD10 3G|(iDxD[45]|iDxQ5)|iDxD7[_ ]3G|PS604M|PT452E|Linx A400 3G LT4001PG|Linx C500 3G LT5001PG|Linx PS474S|NS6902QL|NS9797MG|((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)|(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
+  device: 'smartphone'
+  models:
+    - regex: 'HIT HT707[10]MG'
+      model: 'HIT 3G'
+      device: 'tablet'
+    - regex: 'iDx5'
+      model: 'iDx5'
+    - regex: 'iDxD10 3G'
+      model: 'iDxD10 3G'
+      device: 'tablet'
+    - regex: '(VOX[ _](?:[0-9\.A-Z]+)[_ ][43]G)'
+      model: '$1'
+    - regex: 'PS604M'
+      model: 'Linx 6.0'
+    - regex: '(Linx A400 3G) LT4001PG'
+      model: '$1'
+    - regex: '(Linx C500 3G) LT5001PG'
+      model: '$1'
+    - regex: '(Linx PS474S)'
+      model: '$1'
+    - regex: 'PT452E'
+      model: 'Linx 4.5'
+    - regex: 'MVM900H(?:WZ|C)'
+      model: 'iDx8'
+      device: 'tablet'
+    - regex: 'MVM908HCZ'
+      model: 'iDx9'
+      device: 'tablet'
+    - regex: '(iDxD7[_ ]3G)'
+      model: '$1'
+      device: 'tablet'
+    - regex: '(iDx10|iDx7)'
+      model: '$1'
+    - regex: '(iDxD[45]|iDxQ5)'
+      model: '$1'
+    - regex: 'HIT 4G HT7074ML'
+      model: 'HIT 4G'
+      device: 'tablet'
+    - regex: '(CITI 1902 3G)'
+      model: '$1'
+      device: 'tablet'
+    - regex: '(CITI (?:[A-Z0-9]+) 3G) C[ST]500[67]PG'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'iDxD8 3G'
+      model: 'D-Plane2 8'
+      device: 'tablet'
+    - regex: '(iDrQ10 3G|iDnD7)'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'NS6902QL'
+      model: 'Platina 7.2 4G'
+      device: 'tablet'
+    - regex: 'NS9797MG'
+      model: 'Platina 7.2 3G'
+      device: 'tablet'
+    - regex: '((?:Optima|Platina|Plane)[ _](?:[EM])?(?:[0-9\.ST]+|Prime)(?:[ _][43]G)?)'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'Digma[_ ]([^;/]+) Build'
+      model: '$1'
+      device: 'tablet'
+
 # DoCoMo
 DoCoMo:
   regex: 'DoCoMo|\;FOMA|KGT/1\.0'
@@ -1059,10 +1535,10 @@ DoCoMo:
 
 # Doogee
 Doogee:
-  regex: 'DOOGEE[ _-]|((?:BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS))[ -](DG[0-9]+C?)[);/ ]'
+  regex: 'DOOGEE[ _-]|((?:BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?))[ -_](DG[0-9]+C?)[);/ ]'
   device: 'smartphone'
   models:
-    - regex: '(?:DOOGEE[ _-])?((?:BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS))[ -](DG[0-9]+C?)[);/ ]'
+    - regex: '(?:DOOGEE[ _-])?((?:BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?))[ -_](DG[0-9]+C?)[);/ ]'
       model: '$1 $2'
     - regex: 'DOOGEE[ _-]([^);/]+) Build'
       model: '$1'
@@ -1085,6 +1561,16 @@ Dopod:
   device: 'feature phone'
   model: '$1'
 
+# Doro
+Doro:
+  regex: 'Doro'
+  device: 'smartphone'
+  models:
+    - regex: 'Doro[ _-]?([^;/)]+) Build'
+      model: '$1'
+    - regex: 'Doro[ _-]([0-9a-z]+)'
+      model: '$1'
+
 # Dune HD
 'Dune HD':
   regex: 'DuneHD'
@@ -1156,9 +1642,19 @@ ECS:
 
 # Elephone
 Elephone:
-  regex: 'Elephone[ _\-]([^/;]+) Build'
+  regex: 'Elephone[ _\-]([^/;]+) Build|P6000( ?Pro| ?Plus|\+| ?02)? Build'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'Elephone[ _\-]([^/;]+) Build'
+      model: '$1'
+    - regex: 'P6000 Build'
+      model: 'P6000'
+    - regex: 'P6000(\+| ?Plus) Build'
+      model: 'P6000 Plus'
+    - regex: 'P6000 02 Build'
+      model: 'P6000 02'
+    - regex: 'P6000 ?Pro Build'
+      model: 'P6000 Pro'
 
 # Energy Sistem
 'Energy Sistem':
@@ -1188,9 +1684,15 @@ Rikomagic:
   device: 'tv'
   model: 'MK$1'
 
+# Senseit
+Senseit:
+   regex: 'SENSEIT[ _]?([^;/)]+) Build'
+   device: 'smartphone'
+   model: '$1'
+
 # Sony & Sony Ericsson (combined as they are mixed up)
 Sony:
-  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|C1[569]0[45]|C2[01]0[45]|C2305|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D200[45]|D21(?:0[45]|14)|D22(?:0[236]|12|43)|D230[2356]|D240[36]|D25(?:02|33)|D510[236]|D530[36]|D5322|D5503|D58[03]3|D65(?:0[23]|43)|D66[05]3|E2303|E58[02]3|E6553|(?: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|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[345]D|[234]E|[12]C|[1235]F|[12]G)|R800[aix]|LiveWithWalkman'
+  regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|C1[569]0[45]|C2[01]0[45]|C2305|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D200[45]|D21(?:0[45]|14)|D22(?:0[236]|12|43)|D230[2356]|D240[36]|D25(?:02|33)|D510[236]|D530[36]|D5322|D5503|D58[03]3|D65(?:0[23]|43)|D66[035]3|E210[45]|E2115|E5506|E2033|E2[03]03|E23[36]3|E2306|E2312|E2353|E53[03]3|E55[36]3|E56[46305][36]|E58[02]3|E65[35]3|E66[0358]3|E68[358]3|F311[12356]|F331[13]|F321[12356]|F5[13]21|F5122|F813[12]|F833[12]|G312[135]|G311[26]|G322[136]|G3212|G331[123]|G3412|G3423|G823[12]|G8[14]4[12]|(?: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|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[345]D|[234]E|[12]C|[1235]F|[12]G)|R800[aix]|LiveWithWalkman'
   device: 'smartphone'
   models:
     # SONY ERICSSON: explicit smartphone models
@@ -1355,6 +1857,10 @@ Sony:
       model: 'Xperia E'
     - regex: '(?:Sony(?:Ericsson)?)?C160[45]'
       model: 'Xperia E Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E210[45]|E2115)'
+      model: 'Xperia E4'
+    - regex: '(?:Sony(?:Ericsson)?)?E2003'
+      model: 'Xperia E4G'
     - regex: '(?:Sony(?:Ericsson)?)?C190[45]'
       model: 'Xperia M'
     - regex: '(?:Sony(?:Ericsson)?)?C200[45]'
@@ -1384,21 +1890,37 @@ Sony:
       model: 'Xperia E3'
     - regex: '(?:Sony(?:Ericsson)?)?D2212'
       model: 'Xperia E3 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?E2033'
+      model: 'Xperia E4g Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D2302'
       model: 'Xperia M2 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D230[356]'
       model: 'Xperia M2'
     - regex: '(?:Sony(?:Ericsson)?)?D240[36]'
       model: 'Xperia M2 Aqua'
-    - regex: '(?:Sony(?:Ericsson)?)?E2303'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E230[36]|E23[35]3)'
       model: 'Xperia M4 Aqua'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E2312|E2363)'
+      model: 'Xperia M4 Aqua Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?E56[05][36]'
+      model: 'Xperia M5'
+    - regex: '(?:Sony(?:Ericsson)?)?E56[436]3'
+      model: 'Xperia M5 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D2502'
       model: 'Xperia C3 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D2533'
       model: 'Xperia C3'
+    - regex: '(?:Sony(?:Ericsson)?)?E5303'
+      model: 'Xperia C4'
+    - regex: '(?:Sony(?:Ericsson)?)?E53[03]3'
+      model: 'Xperia C4 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?E5506'
+      model: 'Xperia C5 Ultra'
+    - regex: '(?:Sony(?:Ericsson)?)?E55[36]3'
+      model: 'Xperia C5 Ultra Dual'
     - regex: '(?:Sony(?:Ericsson)?)?D510[236]'
       model: 'Xperia T3'
-    - regex: '(?:Sony(?:Ericsson)?)?D530[36]|XM50[ht]'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:D530[36]|XM50[ht])'
       model: 'Xperia T2 Ultra'
       device: 'phablet'
     - regex: '(?:Sony(?:Ericsson)?)?D5322'
@@ -1412,16 +1934,64 @@ Sony:
       model: 'Xperia Z2'
     - regex: '(?:Sony(?:Ericsson)?)?(?:D66[05]3|SO-01G)'
       model: 'Xperia Z3'
-    - regex: '(?:Sony(?:Ericsson)?)?(?:E6553)'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:D6633)'
+      model: 'Xperia Z3 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:E65[35]3)'
       model: 'Xperia Z3+'
     - regex: '(?:Sony(?:Ericsson)?)?(?:E58[02]3)'
       model: 'Xperia Z5 Compact'
+    - regex: '(?:Sony(?:Ericsson)?)?E66[05]3'
+      model: 'Xperia Z5'
+    - regex: '(?:Sony(?:Ericsson)?)?E66[38]3'
+      model: 'Xperia Z5 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?E68[58]3'
+      model: 'Xperia Z5 Premium'
+    - regex: '(?:Sony(?:Ericsson)?)?E6833'
+      model: 'Xperia Z5 Premium Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?F311[135]'
+      model: 'Xperia XA'
+    - regex: '(?:Sony(?:Ericsson)?)?F311[26]'
+      model: 'Xperia XA Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?F321[135]'
+      model: 'Xperia XA Ultra'
+    - regex: '(?:Sony(?:Ericsson)?)?F321[26]'
+      model: 'Xperia XA Ultra Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?F833[12]'
+      model: 'Xperia XZ'
+    - regex: '(?:Sony(?:Ericsson)?)?G8441'
+      model: 'Xperia XZ1 Compact'
+    - regex: '(?:Sony(?:Ericsson)?)?F331[13]'
+      model: 'Xperia E5'
+    - regex: '(?:Sony(?:Ericsson)?)?G312[135]|G311[26]'
+      model: 'Xperia XA1'
+    - regex: '(?:Sony(?:Ericsson)?)?G3412|G3423'
+      model: 'Xperia XA1 Plus'
+    - regex: '(?:Sony(?:Ericsson)?)?G322[136]|G3212'
+      model: 'Xperia XA1 Ultra'
+    - regex: '(?:Sony(?:Ericsson)?)?G823[12]'
+      model: 'Xperia XZs'
+    - regex: '(?:Sony(?:Ericsson)?)?G814[12]'
+      model: 'Xperia XZ Premium'
+    - regex: '(?:Sony(?:Ericsson)?)?G331[13]'
+      model: 'Xperia L1'
+    - regex: '(?:Sony(?:Ericsson)?)?G3312'
+      model: 'Xperia L1 Dual'
     - regex: '(?:Sony(?:Ericsson)?)?SO-04E'
       model: 'Xperia A'
     - regex: '(?:Sony(?:Ericsson)?)?SO-04D'
       model: 'Xperia GX'
     - regex: '(?:Sony(?:Ericsson)?)?SO-05D'
       model: 'Xperia SX'
+    - regex: '(?:Sony(?:Ericsson)?)?F5121'
+      model: 'Xperia X'
+    - regex: '(?:Sony(?:Ericsson)?)?F5122'
+      model: 'Xperia X Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?F5321'
+      model: 'Xperia X Compact'
+    - regex: '(?:Sony(?:Ericsson)?)?F8131'
+      model: 'Xperia X Performance'
+    - regex: '(?:Sony(?:Ericsson)?)?F8132'
+      model: 'Xperia X Performance Dual'
 
     # SONY: explicit tablet models
     - regex: 'SGP(?:311|312|321)[);/ ]|SO-03E'
@@ -1521,6 +2091,57 @@ Evertek:
     - regex: '(Ever(?:Glory|Shine|Miracle|Mellow|Classic|Trendy|Fancy|Vivid|Slim|Glow|Magic|Smart|Star)[^/;]*) Build'
       model: '$1'
 
+# Evolveo
+Evolveo:
+  regex: 'EVOLVEO[ _]([^;/]*) Build'
+  device: 'smartphone'
+  models:
+    - regex: 'Smart TV ([^;/]*) Build'
+      device: 'tv'
+      model: 'Smart TV $1'
+    - regex: 'EVOLVEO[ _]([^;/]*) Build'
+      model: '$1'
+
+# Explay
+Explay:
+  regex: 'Explay|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|sQuad[ _][0-9\.]|Onliner[1-3]|RioPlay'
+  device: 'tablet'
+  models:
+    - regex: 'ActiveD[ _]7.4[ _]3G'
+      model: 'ActiveD 7.4 3G'
+    - regex: 'ActiveD[ _]8.2[ _]3G'
+      model: 'ActiveD 8.2 3G'
+    - regex: 'CinemaTV[ _]3G'
+      model: 'CinemaTV 3G'
+    - regex: 'Informer[ _]([0-9]+(?:[ _]3G)?)'
+      model: 'Informer $1'
+    - regex: 'Surfer[ _]([0-9\.]+(?:[ _]3G)?)'
+      model: 'Surfer $1'
+    - regex: 'sQuad[ _]([0-9\.]+(?:[ _]3G)?)'
+      model: 'sQuad $1'
+    - regex: 'Onliner([1-3])'
+      model: 'Onliner $1'
+    - regex: 'Atlant[;/) ]'
+      device: 'smartphone'
+      model: 'Atlant'
+    - regex: 'Explay[ _-]([^;/]+) Build'
+      model: '$1'
+    - regex: 'Explay[ _-]([^;/]+)[;/)]'
+      model: '$1'
+    - regex: '(RioPlay)[;/) ]'
+      device: 'smartphone'
+      model: 'Rio Play'
+
+# EKO
+EKO:
+  regex: 'EKO'
+  device: 'smartphone'
+  models:
+    - regex: 'EKO[ _-]?([^;/)]+) Build'
+      model: '$1'
+    - regex: 'EKO[ _-]?([^;/)]+)[);/ ]'
+      model: '$1'
+
 # Ezze
 Ezze:
   regex: 'EZZE-|EZ[a-z0-9]+'
@@ -1554,7 +2175,7 @@ Fairphone:
 
 # Fujitsu
 Fujitsu:
-  regex: 'F-01F|F-02[EF]|F-05[DE]|F-06E|F-08D|F-09E'
+  regex: 'F-01F|F-02[EF]|F-05[DE]|F-06E|F-08D|F-09E|M532[);/ ]'
   device: 'smartphone'
   models:
     - regex: 'F-01F'
@@ -1578,6 +2199,9 @@ Fujitsu:
     - regex: 'F-05E'
       model: 'Arrows Tab F-05E'
       device: 'tablet'
+    - regex: 'M532[);/ ]'
+      model: 'Stylistic'
+      device: 'tablet'
 
 # Gemini
 Gemini:
@@ -1638,10 +2262,22 @@ Vizio:
 
 # GOCLEVER
 GOCLEVER:
-  regex: 'GOCLEVER|QUANTUM|ARIES|INSIGNIA'
+  regex: 'GOCLEVER|QUANTUM|ARIES|INSIGNIA|ORION_|ELIPSO'
   device: 'smartphone'
   models:
-    - regex: '((?:QUANTUM|ARIES|INSIGNIA)[ _-]?[^;/]+) Build'
+    - regex: 'QUANTUM_(1010N|1010M|900)'
+      model: 'QUANTUM $1'
+      device: 'tablet'
+    - regex: 'INSIGNIA_785_PRO'
+      model: 'INSIGNIA 785 PRO'
+      device: 'tablet'
+    - regex: '(ORION|ARIES|ELIPSO)[_ ](71|101|102)'
+      model: '$1 $2'
+      device: 'tablet'
+    - regex: 'TQ700N'
+      model: 'QUANTUM 700N'
+      device: 'tablet'
+    - regex: '((?:QUANTUM|ARIES|INSIGNIA|ORION|ELIPSO)[ _-]?[^;/]+) Build'
       model: '$1'
     - regex: 'GOCLEVER[ _-]TAB[ _-]?([^;/]+) Build'
       model: 'TAB $1'
@@ -1659,6 +2295,7 @@ GOCLEVER:
     - regex: 'GOCLEVER[ _-]?([^;/)]+)[;/)]'
       model: '$1'
 
+
 # Goly
 Goly:
   regex: 'Goly[ _-]'
@@ -1671,7 +2308,7 @@ Goly:
 
 # Google
 Google:
-  regex: 'Nexus|GoogleTV|Glass|CrKey[^a-z0-9]'
+  regex: 'Nexus|GoogleTV|Glass|CrKey[^a-z0-9]|Pixel Build|Pixel (?:XL|C|2|2 XL) Build'
   device: 'smartphone'
   models:
     - regex: 'Glass'
@@ -1692,6 +2329,17 @@ Google:
     - regex: 'GoogleTV'
       device: 'tv'
       model: 'GoogleTV'
+    - regex: 'Pixel Build'
+      model: 'Pixel'
+    - regex: 'Pixel XL'
+      model: 'Pixel XL'
+    - regex: 'Pixel 2 XL'
+      model: 'Pixel 2 XL'
+    - regex: 'Pixel 2'
+      model: 'Pixel 2'
+    - regex: 'Pixel C'
+      device: 'tablet'
+      model: 'Pixel C'
 
 # Gradiente
 Gradiente:
@@ -1745,7 +2393,7 @@ Hasee:
 
 # Hisense
 Hisense:
-  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense [^);/]+|HS-(?:U|EG?|I|T|X)[0-9]+[a-z0-9\-]*|E270BSA|M470BS[AE]|E2281'
+  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense [^);/]+|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*|E270BSA|M470BS[AE]|E2281|EG680'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -1758,8 +2406,10 @@ Hisense:
     - regex: 'E2281'
       device: 'tablet'
       model: 'Sero 8'
+    - regex: 'EG680'
+      model: 'Smartfren Andromax Z'
 
-    - regex: '(HS-(?:U|EG?|I|T|X)[0-9]+[a-z0-9\-]*)'
+    - regex: '(HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9\-]*)'
       model: '$1'
     - regex: '(?:HS-)?Hisense ([^;/]+) Build'
       model: '$1'
@@ -1772,6 +2422,16 @@ Hi-Level:
   device: 'tablet'
   model: 'HLV-T$1'
 
+# Homtom
+Homtom:
+  regex: 'Homtom|(?:HT[0-9]{1,2})(?: ?Pro)? Build'
+  device: 'smartphone'
+  models:
+    - regex: '(HT[0-9]{1,2}(?: ?Pro)?) Build'
+      model: '$1'
+    - regex: 'Homtom ([^;/]+) Build'
+      model: '$1'
+
 # Hosin
 Hosin:
   regex: 'HOSIN[ _-]'
@@ -1784,7 +2444,7 @@ Hosin:
 
 # Huawei
 Huawei:
-  regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]|(?:H60-L(?:01|02|03|04|11|12)|H30-(?:C00|L01M?|L02|U10|T00|T10)|G621-TL00M?|PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)|SCL-(?:AL00|CL00|TL00H?)|CH(?:E2?|M)-[CUT]L00[HM]?|CHE1-CL[12]0|CHE2-L11|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))[);/ ])'
+  regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]|(?:H60-L(?:01|02|03|04|11|12)|H30-(?:C00|L01M?|L02|U10|T00|T10)|G621-TL00M?|PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)|SCL-(?:AL00|CL00|TL00H?|L01)|CH(?:E2?|M)-[CUT]L00[HM]?|CHE1-CL[12]0|CHE2-L11|CHM-U01|KIW-L21|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508)|NEM-L[52][21]|PLE-70[13]L|BLN-(?:L2[124]|AL10)|BND-(?:AL10|L21)|PRA-L[AX]1|PRA-AL00X|RNE-L22)[);/ ])|Bucare Y330-U05'
   device: 'smartphone'
   models:
     - regex: 'U(8230|8661|8667)[);/ ]'
@@ -1817,10 +2477,55 @@ Huawei:
       model: 'Honor 3C'
     - regex: '(?:Honor_|HW-)?SCL-(?:AL00|CL00|TL00H?)(?:_TD)?[);/ ]'
       model: 'Honor 4A'
+    - regex: '(?:Honor_|HW-)?KIW-L21(?:_TD)?[);/ ]'
+      model: 'Honor 5X'
+    - regex: '(?:Honor_|HW-)?CHM-U01(?:_TD)?[);/ ]'
+      model: 'Honor 4C'
     - regex: '(?:Honor_|HW-)?H60-L(?:01|02|03|04|11|12)(?:_TD)?[);/ ]'
       model: 'Honor 6'
+    - regex: '(?:Honor_|HW-)?SCL-L01(?:_TD)?[);/ ]'
+      model: 'Honor Y6'
     - regex: '(?:Honor_|HW-)?PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)[);/ ]'
       model: 'Honor 7'
+    - regex: '(?:Honor_|HW-)?NEM-L51[);/ ]'
+      model: 'Honor 5C'
+    - regex: '(?:Honor_|HW-)?NEM-L22[);/ ]'
+      model: 'Honor 5C Dual SIM'
+    - regex: '(?:Honor_|HW-)?NEM-L21[);/ ]'
+      model: 'Honor 7 Lite'
+    - regex: '(?:HONOR[ _]?)?BLN-(?:L2[124]|AL10)'
+      model: 'Honor 6X'
+    - regex: '(?:HONOR[ _]?)?BND-(?:AL10|L21)'
+      model: 'Honor 7X'
+    - regex: 'PRA-AL00X'
+      model: 'Honor 8 Lite'
+    - regex: 'GRA-L09'
+      model: 'P8'
+    - regex: 'ALE-L(02|21|23)'
+      model: 'P8 Lite (2015)'
+    - regex: 'PRA-L[AX]1'
+      model: 'P8 Lite (2017)'
+    - regex: 'RNE-L22'
+      model: 'Nova 2I'
+    - regex: 'EVA-L09'
+      model: 'P9'
+    - regex: 'VTR-L09'
+      model: 'P10'
+    - regex: 'CAM-L21'
+      model: 'Y6II'
+    - regex: 'MHA-L[02]9'
+      model: 'Mate 9'
+    - regex: 'Bucare Y330-U05'
+      model: 'Y330-U05'
+    - regex: 'T1-A21w'
+      device: 'tablet'
+      model: 'Honor Tablet Note'
+    - regex: 'PLE-70[13]L'
+      device: 'tablet'
+      model: 'MediaPad T2 7.0 Pro'
+    - regex: 'T1-A21L'
+      device: 'tablet'
+      model: 'MediaPad T1 10'
     - regex: '(MediaPad[^/;]*) Build'
       device: 'tablet'
       model: '$1'
@@ -1892,6 +2597,82 @@ iBerry:
     - regex: 'AUXUS ([^/;]+) Build'
       model: '$1'
 
+# IconBIT
+IconBIT:
+  regex: 'NT-3506M'
+  device: 'smartphone'
+  models:
+    - regex: 'NT-3506M'
+      model: 'NetTAB Mercury Quad FHD'
+
+# LYF
+LYF:
+  regex: '(LYF[ _])?LS-[45][0-9]{3}'
+  device: 'smartphone'
+  models:
+    - regex: 'LS-4004'
+      model: 'Flame 2'
+    - regex: 'LS-5501'
+      model: 'Earth 1'
+    - regex: 'LS-5021'
+      model: 'Earth 2'
+    - regex: 'LS-5505'
+      model: 'Water F1'
+    - regex: 'LS-4503'
+      model: 'Flame LS-4503'
+    - regex: 'LS-4001'
+      model: 'Flame 3'
+    - regex: 'LS-4003'
+      model: 'Flame 4'
+    - regex: 'LS-4002'
+      model: 'Flame 5'
+    - regex: 'LS-4005'
+      model: 'Flame 6'
+    - regex: '(LYF[ _])?LS-4006'
+      model: 'Flame 7'
+    - regex: 'LS-4008'
+      model: 'Flame 7S'
+    - regex: 'LS-4505'
+      model: 'Flame 8'
+    - regex: 'LS-5002'
+      model: 'Water 1'
+    - regex: 'LS-5005'
+      model: 'Water 4'
+    - regex: 'LS-5006'
+      model: 'Water 6'
+    - regex: 'LS-5008'
+      model: 'Water 2'
+    - regex: 'LS-5009'
+      model: 'Wind 6'
+    - regex: 'LS-5013'
+      model: 'Wind 5'
+    - regex: 'LS-5014'
+      model: 'Wind 4'
+    - regex: 'LS-5010'
+      model: 'Wind 1'
+    - regex: 'LS-5015'
+      model: 'Water 8'
+    - regex: 'LS-5016'
+      model: 'Wind 7'
+    - regex: 'LS-5504'
+      model: 'Water 7'
+    - regex: 'LS-5017'
+      model: 'Water 11'
+    - regex: 'LS-5018'
+      model: 'Wind 4S'
+    - regex: 'LS-5020'
+      model: 'Water 10'
+    - regex: 'LS-5201'
+      model: 'Water F1S'
+    - regex: 'LS-5502'
+      model: 'Wind 3'
+    - regex: 'LS-5503'
+      model: 'Water 3'
+    - regex: 'LS-5506'
+      model: 'Water 9'
+    - regex: 'LS-6001'
+      model: 'Wind 2'
+
 # iNew
 iNew:
   regex: 'iNew|(?:V7A|V3 Plus|V3-?E|V3C)(?: Build|[;/\)])'
@@ -2014,7 +2795,15 @@ iTel:
     - regex: 'iTel_([a-z0-9\-_]*)'
       model: '$1'
 
-#Jiayu
+# JAY-Tech
+JAY-Tech:
+  regex: 'TPC-[A-Z0-9]+'
+  device: 'tablet'
+  models:
+    - regex: 'TPC-([A-Z0-9]+)'
+      model: 'Tablet PC $1'
+
+# Jiayu
 Jiayu:
   regex: '(JY-[a-z0-9]+)[);/ ]'
   device: 'smartphone'
@@ -2038,6 +2827,28 @@ Kazam:
     - regex: 'Kazam ([^;/]+) Build'
       model: '$1'
 
+# Kiano
+Kiano:
+  regex: 'Kiano|Elegance_5_0|CORE 10.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?[);/ ]|Cavion[_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'Slim ?Tab ?(\d+)(?:[_ ]3GR?)?'
+      model: 'Slim Tab $1'
+      device: 'tablet'
+    - regex: 'Cavion[_ ](?:Base[_ ])?(\d+)'
+      model: 'Cavion Base $1'
+      device: 'tablet'
+    - regex: 'CORE 10.1 DUAL 3G'
+      model: 'CORE 10.1 DUAL 3G'
+      device: 'tablet'
+    - regex: 'Elegance_5_0'
+      model: 'Elegance 5.0'
+    - regex: '(Kiano)?(Intelect|Elegance) ?(7|8|10)?'
+      model: '$2 $3'
+      device: 'tablet'
+    - regex: 'Kiano[ _]([^;/]+) Build'
+      model: '$1'
+
 # Kingsun
 Kingsun:
   regex: 'Kingsun[ _-]'
@@ -2149,17 +2960,37 @@ Kyocera:
 
 # Lava
 Lava:
-  regex: 'iris[ _]?([^/;]+)(?:\)| Build)'
+  regex: 'Lava |iris[ _]?([^/;]+)(?:\)| Build)'
   device: 'smartphone'
   models:
     - regex: 'iris[ _]?([^/;]+)(?:\)| Build)'
       model: 'Iris $1'
+    - regex: 'Lava[ _]?([^/;]+)(?:/| Build)'
+      model: '$1'
+
+# Landvo
+Landvo:
+  regex: 'XM[123]00|(?<!Blade )S6 Build'
+  device: 'smartphone'
+  models:
+    - regex: 'S6 Build'
+      model: 'S6'
+    - regex: 'XM([123])00([^/;]*) Build'
+      model: 'XM$100$2'
 
 # lanix
 Lanix:
-  regex: 'LANIX-([a-z0-9]+)'
+  regex: 'LANIX-([a-z0-9]+)|ILIUM[ _]([^;/]+) Build'
   device: 'feature phone'
-  model: '$1'
+  models:
+    - regex: 'ILIUM[ _]PAD[ _]([^;/]+) Build'
+      model: 'Ilium Pad $1'
+      device: 'tablet'
+    - regex: 'ILIUM[ _]([^;/]+) Build'
+      model: 'Ilium $1'
+      device: 'smartphone'
+    - regex: 'LANIX-([a-z0-9]+)'
+      model: '$1'
 
 # lct
 LCT:
@@ -2181,6 +3012,24 @@ LCT:
     - regex: 'Le ?Pan ?([^;/]+) Build'
       model: '$1'
 
+# LeEco
+LeEco:
+  regex: 'LeEco|Le ?X[0-9][^;/]+|Le Max|Le [12]'
+  device: 'smartphone'
+  models:
+    - regex: 'Le ?X([^;/]+) Build'
+      model: 'Le X$1'
+    - regex: 'Le ?X([^ ;/]+)'
+      model: 'Le X$1'
+    - regex: 'Le ?([12][^;/]+) Build'
+      model: 'Le $1'
+    - regex: 'Le Max([^;/]*) Build'
+      model: 'Le Max$1'
+    - regex: 'Le Max([^ ;/]*)'
+      model: 'Le Max$1'
+    - regex: 'LeEco ([^;/]+) Build'
+      model: '$1'
+
 # lenco
 Lenco:
   regex: 'Lenco ([^/;]*) Build'
@@ -2189,10 +3038,47 @@ Lenco:
 
 # lenovo
 Lenovo:
-  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet'
+  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet|Tab2A[0-9]-[0-9]{2}[a-z]?|YT3-X50L|ZUK[ -_]'
   device: 'smartphone'
   models:
-    - regex: 'Lenovo (B[0-9]+[^/;]*) Build'
+    - regex: 'Lenovo ?G780'
+      model: 'G780'
+      device: 'desktop'
+    - regex: 'Lenovo ?A3500-FL'
+      model: 'IdeaTab A7-40'
+      device: 'tablet'
+    - regex: 'Lenovo ?A3500-(H|HV|F)'
+      model: 'IdeaTab A7-50'
+      device: 'tablet'
+    - regex: 'Lenovo ?A5500-[HF]'
+      model: 'IdeaTab A8-50'
+      device: 'tablet'
+    - regex: 'Lenovo ?A7600-[HF]'
+      model: 'IdeaTab A10-70'
+      device: 'tablet'
+    - regex: 'TB2-X30[FL]'
+      model: 'Tab 2 A10-30'
+      device: 'tablet'
+    - regex: 'YT3-X50[FL]'
+      model: 'Yoga Tab 3'
+      device: 'tablet'
+    - regex: 'TB3-710[IF]'
+      model: 'TAB3 7 Essential'
+      device: 'tablet'
+    - regex: 'Lenovo ?B8000(-[FH])?'
+      model: 'Yoga Tablet 10'
+      device: 'tablet'
+    - regex: 'Lenovo ?B6000(-[FH])?'
+      model: 'Yoga Tablet 8'
+      device: 'tablet'
+    - regex: 'YT3-X90(L|F|X)'
+      model: 'Yoga 3 Pro'
+      device: 'tablet'
+    - regex: 'YT3-850[FL]'
+      model: 'Yoga Tab 3 8'
+      device: 'tablet'
+
+    - regex: 'Lenovo ([ASB][0-9]{4})[A-Z]?\-[EHF]'
       model: 'IdeaTab $1'
       device: 'tablet'
     - regex: 'ThinkPadTablet_(A[0-9]{3})_'
@@ -2204,15 +3090,67 @@ Lenovo:
     - regex: 'IdeaPad ?([^;/]*) Build'
       model: 'IdeaPad $1'
       device: 'tablet'
-    - regex: 'Lenovo ([^/;]*) Build'
-      model: '$1'
+    - regex: 'Lenovo TAB ?([^/;]*) Build'
+      model: 'TAB $1'
+      device: 'tablet'
+    - regex: 'Lenovo ?A3300-(?:GV|H)'
+      model: 'TAB 2 A7-30'
+      device: 'tablet'
+    - regex: 'Tab2A([0-9]-[0-9]{2}[a-z]?)'
+      model: 'TAB 2 A$1'
+      device: 'tablet'
     - regex: 'IdeaTab[ \-_]?([a-z0-9]+)'
       model: 'IdeaTab $1'
       device: 'tablet'
     - regex: 'Yoga Tablet([^;/]+) Build'
       model: 'Yoga Tablet$1'
       device: 'tablet'
-    - regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]([a-z0-9_+\-]+)'
+    - regex: 'Lenovo TB\-X704F Build/NMF26F'
+      model: 'Tab 4 10 Plus'
+      device: 'tablet'
+    - regex: 'Lenovo (TB[0-9]?\-[a-z0-9\-]+) Build'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'ZUK[ -_]([^/;]*) Build'
+      model: 'ZUK $1'
+    - regex: 'Lenovo ([^/;]*) Build'
+      model: '$1'
+    - regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]?([a-z0-9_+\-]+)'
+      model: '$1'
+
+# Lexand
+Lexand:
+  regex: '(?:SC7 PRO HD|S5A[1-4]|S4A[1-5]|S6A1|A811|A802)[);/ ]|Lexand ([^;/]+) Build'
+  device: 'smartphone'
+  models:
+    - regex: 'A(811|802)'
+      device: 'tablet'
+      model: 'A$1'
+
+    - regex: 'S4A1'
+      model: 'Vega'
+    - regex: 'S4A2'
+      model: 'Irida'
+    - regex: 'S4A3'
+      model: 'Pallada'
+    - regex: 'S4A5'
+      model: 'Oxygen'
+    - regex: 'S4A4 NEON'
+      model: 'S4A4 Neon'
+    - regex: 'S5A1'
+      model: 'Callisto'
+    - regex: 'S5A2'
+      model: 'Overon'
+    - regex: 'S5A3'
+      model: 'Capella'
+    - regex: 'S5A4'
+      model: 'Argon'
+    - regex: 'S6A1'
+      model: 'Antares'
+    - regex: 'SC7 PRO HD'
+      model: 'SC7 PRO HD'
+
+    - regex: 'Lexand ([^;/]+) Build'
       model: '$1'
 
 # lexibook
@@ -2271,9 +3209,11 @@ Lexibook:
 
 # lg
 LG:
-  regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713)[);/ ]|NetCast'
+  regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713)[);/ ]|NetCast|VS995'
   device: 'smartphone'
   models:
+    - regex: 'LG-D855'
+      model: 'G3'
     - regex: 'P713'
       model: 'Optimus L7II'
     - regex: 'L-01D'
@@ -2283,6 +3223,19 @@ LG:
     - regex: 'L-07C'
       model: 'Optimus Bright L-07C'
 
+    - regex: 'LG-V490'
+      model: 'G Pad 8.0'
+      device: 'tablet'
+    - regex: 'LG-V500'
+      model: 'G Pad 8.3'
+      device: 'tablet'
+    - regex: 'LG-V700'
+      model: 'G Pad 10.1'
+      device: 'tablet'
+    - regex: 'LG-V935'
+      model: 'G Pad II 10.1'
+      device: 'tablet'
+
     - regex: 'webOS.TV'
       device: 'tv'
       model: 'WebOS TV'
@@ -2306,6 +3259,8 @@ LG:
       model: '$1'
     - regex: '(VX[0-9]+)'
       model: '$1'
+    - regex: 'VS995'
+      model: 'V20'
 
 # Lingwin
 Lingwin:
@@ -2319,15 +3274,25 @@ Lingwin:
 
 # Logicom
 Logicom:
-  regex: '(TAB950|TAB1062|E731|E812|E912|E1031)[);/ ]'
+  regex: '(TAB950|TAB1062|E731|E812|E912|E1031|POWER BOT|(?:B|C|M|ID|VR) ?BOT ?(?:TAB )?([0-9]+\+?)(?:PLUS)?|KT712A_4\.4|L-?IXIR[0-9]*|L-ITE|L-?EMENT)[_);/ ]'
   device: 'tablet'
-  model: '$1'
-
-# microsoft
-Microsoft:
-  regex: 'KIN\.(One|Two)'
-  device: 'feature phone'
-  model: 'Kin $1'
+  models:
+    - regex: 'KT712A_4.4'
+      model: 'L-ixir Tab 701'
+    - regex: 'LIXIR1041'
+      model: 'L-ixir Tab 1041'
+    - regex: 'L-?IXIR TAB ([^;/]+) Build'
+      model: 'L-ixir Tab $1'
+    - regex: 'L-ITE[ _]([^;/]+) Build'
+      model: 'L-ite Tab $1'
+    - regex: 'L-?EMENT[ _](?:TAB)?([^;/]+) Build'
+      model: 'L-ement Tab $1'
+    - regex: '(TAB950|TAB1062|E731|E812|E912|E1031)[);/ ]'
+      model: '$1'
+    - regex: 'POWER BOT'
+      model: 'POWER BOT'
+    - regex: '((?:B|C|M|ID|VR)) ?BOT ?((?:TAB )?([0-9]+\+?)(?:PLUS)?)'
+      model: '$1 BOT $2'
 
 # Konka
 Konka:
@@ -2348,6 +3313,22 @@ Konka:
       device: 'feature phone'
       model: '$1'
 
+# Konrow
+Konrow:
+  regex: '(?:BIGCOOL|COOLFIVE|COOL-K|Just5|Link5)[);/ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'BIGCOOL[);/ ]'
+      model: 'BigCool'
+    - regex: 'COOL-K[);/ ]'
+      model: 'Cool-K'
+    - regex: 'COOLFIVE[);/ ]'
+      model: 'Cool Five'
+    - regex: 'Just5[);/ ]'
+      model: 'Just 5'
+    - regex: 'Link5[);/ ]'
+      model: 'Link 5'
+
 # Karbonn
 Karbonn:
   regex: '(?:Browser-)?Karbonn'
@@ -2422,7 +3403,7 @@ Majestic:
 
 # Manta Multimedia
 Manta Multimedia:
-  regex: '(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|1001|1002|1003|1004(?: 3G)?|1005|7802|9701|9702))[);/ ]'
+  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'
 
@@ -2528,12 +3509,17 @@ Mediacom:
 
 # Medion
 Medion:
-  regex: 'Medion|(?:MD_)?LIFETAB'
+  regex: 'Medion|(?:MD_)?LIFETAB|X5001[);/ ]|[SPX]10[0-9]{2}X[);/ ]'
   device: 'smartphone'
   models:
     - regex: '(?:MD_)?LIFETAB_([a-z0-9]+)'
       device: 'tablet'
       model: 'Lifetab $1'
+    - regex: 'X5001'
+      model: 'Life X5001'
+    - regex: '([SPX]10[0-9]{2}X)[);/ ]'
+      model: 'Lifetab $1'
+      device: 'tablet'
     - regex: 'Medion(?: Smartphone)? ([^/;]+) Build'
       model: '$1'
 
@@ -2549,17 +3535,19 @@ MEEG:
 
 # Meizu
 Meizu:
-  regex: '(M04[05]|M35[1356]|MX[ -]?[234](?: Pro)?|(?:MZ-)?m[12] note|(?:MZ-)?M57[18]C)[);/ ]'
+  regex: 'Meizu|MZ-[a-z]|(M04[05]|M35[1356]|MX[ -]?[2345](?: Pro)?|(?:MZ-)?m[1-6] note|M57[18]C|M3S)[);/ ]'
   device: 'smartphone'
   models:
     - regex: '(?:MZ-)?M571C'
       device: 'phablet'
       model: 'M2 Note'
-    - regex: '(?:MZ-)?m(1|2) note[);/ ]'
+    - regex: '(?:MZ-)?m([1-6]) note[);/ ]'
       device: 'phablet'
       model: 'M$1 Note'
     - regex: '(?:MZ-)?M578C'
       model: 'M2'
+    - regex: 'M3S'
+      model: 'M3S'
     - regex: '(M04[05]|MX[ -]?2)[);/ ]'
       model: 'MX2'
     - regex: '(M35[1356]|MX[ -]?3)[);/ ]'
@@ -2568,6 +3556,14 @@ Meizu:
       model: 'MX4 Pro'
     - regex: 'MX[ -]?4[);/ ]'
       model: 'MX4'
+    - regex: 'MX[ -]?5[);/ ]'
+      model: 'MX5'
+    - regex: '(?:MZ-)?Meizu[_ ]([^/;]+) Build'
+      model: '$1'
+    - regex: '(?:MZ-)?Meizu[_ ]([a-z0-9_]+)'
+      model: '$1'
+    - regex: 'MZ-([^/;]+) Build'
+      model: '$1'
 
 # Memup
 Memup:
@@ -2615,6 +3611,16 @@ Mitsubishi:
     - regex: 'portalmmm/[12]\.0 (M[a-z0-9]+)'
       model: '$1'
 
+# MIXC
+MIXC:
+  regex: '(M35|M20|G7106|G7108)[ );/]'
+  device: 'smartphone'
+  models:
+    - regex: '(M[0-9]{1,2})[ );/]'
+      model: '$1'
+    - regex: '(G[0-9]{4})[ );/]'
+      model: '$1'
+
 # MSI
 MSI:
   regex: 'Primo ?(?:91|76)|Enjoy 7 Plus'
@@ -2640,10 +3646,27 @@ MLLED:
 
 # Mobistel
 Mobistel:
-  regex: '(Cynus [^/;]+) Build'
+  regex: '(Cynus[ _][^/;]+) Build'
   device: 'smartphone'
   model: '$1'
 
+# Modecom
+Modecom:
+  regex: 'Modecom|Free(?:Way )?Tab|xino z[\d]+ x[\d]+'
+  device: 'tablet'
+  models:
+    - regex: 'xino Z([\d]+) X([\d]+)'
+      model: 'Xino Z$1 X$2'
+      device: 'smartphone'
+
+    - regex: 'FreeTab[ _\-]?([^/;]+)? Build'
+      model: 'FreeTab $1'
+    - regex: 'FreeTab[ _\-]?((?!Build)[^);/ ]+)?'
+      model: 'FreeTab $1'
+    - regex: 'FreeWay Tab[ _\-]?([^/;]+) Build'
+      model: 'FreeWay Tab $1'
+    - regex: 'FreeWay Tab[ _\-]?((?!Build)[^);/ ]+)'
+      model: 'FreeWay Tab $1'
 
 # Mofut
 Mofut:
@@ -2657,7 +3680,7 @@ Mofut:
 
 # motorola
 Motorola:
-  regex: 'MOT|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\))?(?: Build|\))'
+  regex: 'MOT|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-3])?(?: Build|\))'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -2666,6 +3689,8 @@ Motorola:
       device: 'feature phone'
 
     # Explicit smartphone models
+    - regex: 'Moto G'
+      model: 'Moto G'
     - regex: '(?:MOT-|Motorola-)?XT300'
       model: 'Spice'
     - regex: '(?:MOT-|Motorola-)?XT30[35]'
@@ -2740,6 +3765,8 @@ Motorola:
       model: 'Moto X'
     - regex: '(?:MOT-|Motorola-)?XT1080'
       model: 'Droid Ultra'
+    - regex: '(?:MOT-|Motorola-)?XT1635(?:-0[1-3])?'
+      model: 'Moto Z Play'
 
     - regex: 'Motorola[ _\-]([a-z0-9]+)'
       model: '$1'
@@ -2766,13 +3793,21 @@ Motorola:
 
 # myphone
 MyPhone:
-  regex: '(?:MyPhone|MyPad) [^;/]+ Build'
+  regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/]+ Build|Cube_LTE|myTab10II'
   device: 'smartphone'
   models:
-    - regex: 'MyPad ([^;/]+) Build'
+    - regex: 'MyPad[ _]([^;/]+) Build'
       model: 'MyPad $1'
       device: 'tablet'
-    - regex: 'MyPhone ([^;/]+) Build'
+    - regex: 'MyTab[ _]([^;/]+) Build'
+      model: 'MyTab $1'
+      device: 'tablet'
+    - regex: 'myTab10II'
+      model: 'MyTab 10 II'
+      device: 'tablet'
+    - regex: 'Cube_LTE'
+      model: 'Cube LTE'
+    - regex: 'MyPhone[ _]([^;/]+) Build'
       model: '$1'
 
 # M.T.T.
@@ -2798,6 +3833,16 @@ NEC:
     - regex: '(?:portalmmm|o2imode)/2\.0[ ,](N[a-z0-9]+)'
       model: '$1'
 
+# Neffos
+Neffos:
+  regex: 'Neffos'
+  device: 'smartphone'
+  models:
+    - regex: 'Neffos ([^/;]+) Build'
+      model: '$1'
+    - regex: 'Neffos ([^/;]+)/'
+      model: '$1'
+
 # newgen
 Newgen:
   regex: 'NEWGEN\-([a-z0-9]+)'
@@ -2867,6 +3912,16 @@ Noain:
     - regex: 'NOAIN[ _-]([^;/)]+)[;/)]'
       model: '$1'
 
+# Noblex
+Noblex:
+  regex: 'Noblex|NBX-'
+  device: 'smartphone'
+  models:
+    - regex: '(?:Noblex|NBX)[ _-]([^;/]+) Build'
+      model: '$1'
+    - regex: '(?:Noblex|NBX)[ _-]([^;/)]+)[;/)]'
+      model: '$1'
+
 # Nomi
 Nomi:
   regex: 'Nomi[ _-]'
@@ -2877,6 +3932,23 @@ Nomi:
     - regex: 'Nomi[ _-]([^;/)]+)[;/)]'
       model: '$1'
 
+# Nous
+Nous:
+  regex: 'NS([356]|500[346]|5511) Build'
+  device: 'smartphone'
+  models:
+    - regex: '(NS[0-9]{1,4}) Build'
+      model: '$1'
+
+# Nvidia
+Nvidia:
+  regex: '(SHIELD Tablet K1) Build'
+  device: 'tablet'
+  models:
+    - regex: '(SHIELD Tablet K1) Build'
+      model: '$1'
+
+
 # o2
 O2:
   regex: 'Xda|O2[ \-]|COCOON'
@@ -2891,6 +3963,58 @@ O2:
     - regex: 'O2-([a-z0-9]+)'
       model: '$1'
 
+# Odys
+Odys:
+  regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]'
+  device: 'tablet'
+  models:
+    - regex: 'XELIOPHONETAB3'
+      model: 'Xelio Phonetab 3'
+    - regex: 'XELIO_NEXT_10_PLUS_3G'
+      model: 'Xelio Next 10 Plus 3G'
+    - regex: 'XELIO_PHONE_TAB7_3G'
+      model: 'Xelio Phonetab 7 3G'
+    - regex: 'XELIO10EXTREME'
+      model: 'Xelio 10 Xtreme'
+    - regex: 'XELIO10_PLUS_3G'
+      model: 'Xelio 10 Plus 3G'
+    - regex: 'ELEMENT10_PLUS_3G'
+      model: 'Element 10 Plus 3G'
+    - regex: 'CONNECT8PLUS'
+      model: 'Connect 8 Plus'
+    - regex: 'CONNECT7PRO'
+      model: 'Connect 7 Pro'
+    - regex: 'MAVEN_?10_PRO_PLUS_3G'
+      model: 'Maven 10 Pro Plus 3G'
+    - regex: 'MAVEN_?10_?PLUS'
+      model: 'Maven 10 Plus'
+    - regex: 'MAVEN_?10_?PRO'
+      model: 'Maven 10 Pro'
+    - regex: 'MAVEN_?10_?HD'
+      model: 'Maven 10 HD'
+    - regex: 'RAPID_?7_?LTE'
+      model: 'Rapid 7 LTE'
+    - regex: 'RAPID_?10_?LTE'
+      model: 'Rapid 10 LTE'
+    - regex: 'TAO_X10'
+      model: 'Tao X10'
+    - regex: 'SPACE10_PLUS_3G'
+      model: 'Space 10 Plus 3G'
+    - regex: 'SPACE10_PRO_3G'
+      model: 'Space 10 Pro 3G'
+    - regex: 'THOR_?10 Build'
+      model: 'Thor 10'
+    - regex: 'THOR_?10_PLUS_3G'
+      model: 'Thor 10 Plus 3G'
+    - regex: 'IEOS[ _]([^/;]+) Build'
+      model: 'Ieos $1'
+    - regex: '(?:ODYS[ _-])?NOON Build'
+      model: 'Noon'
+    - regex: '(?:ODYS[ _-])?NOON_PRO Build'
+      model: 'Noon Pro'
+    - regex: 'Odys[ _-]([^/;]+) Build'
+      model: '$1'
+
 # onda
 Onda:
   regex: 'Onda'
@@ -2906,9 +4030,29 @@ Onda:
     - regex: 'Onda ([a-z0-9]+)'
       model: '$1'
 
+# OnePlus
+OnePlus:
+  regex: '(?:du_)?ONEPLUS|(?:A0001|A2001|A2003|A2005|A3003|A3000|A3010|A5000|E1003) Build'
+  device: 'smartphone'
+  models:
+    - regex: 'A0001'
+      model: 'One'
+    - regex: 'A2001|A2003|A2005'
+      model: '2'
+    - regex: 'E1003'
+      model: 'X'
+    - regex: 'A3003|A3000'
+      model: '3'
+    - regex: 'A3010'
+      model: '3T'
+    - regex: 'A5000'
+      model: '5'
+    - regex: '(?:du_)?ONEPLUS ?([^;/]+) Build'
+      model: '$1'
+
 # oppo
 OPPO:
-  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|(?:X90[07][067]|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[);/ ]'
+  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|A37f[);/ ]|CPH[0-9]{4}'
   device: 'smartphone'
   models:
     - regex: '(?:OPPO[ _]?)?U707T?[);/ ]'
@@ -2919,6 +4063,8 @@ OPPO:
       model: 'Find 7'
     - regex: '(?:OPPO[ _]?)?X900[067][);/ ]'
       model: 'Find 7a'
+    - regex: '(?:OPPO[ _]?)?X9009[);/ ]'
+      model: 'F1 Plus'
     - regex: '(?:OPPO[ _]?)?R8006[);/ ]'
       model: 'R1L'
     - regex: '(?:OPPO[ _]?)?R800[07][);/ ]'
@@ -2947,6 +4093,32 @@ OPPO:
       model: 'N3'
     - regex: '(?:OPPO[ _]?)?N5117[);/ ]'
       model: 'N1 Mini'
+    - regex: '(?:OPPO[ _]?)?CPH1609[);/ ]'
+      model: 'F3'
+    - regex: '(?:OPPO[ _]?)?CPH1707[);/ ]'
+      model: 'R11'
+    - regex: '(?:OPPO[ _]?)?CPH1715[);/ ]'
+      model: 'A77'
+    - regex: '(?:OPPO[ _]?)?CPH1717[);/ ]'
+      model: 'A71'
+    - regex: '(?:OPPO[ _]?)?CPH1719[);/ ]'
+      model: 'R11s'
+    - regex: '(?:OPPO[ _]?)?CPH1721[);/ ]'
+      model: 'R11s Plus'
+    - regex: '(?:OPPO[ _]?)?CPH172[37][);/ ]'
+      model: 'F5'
+    - regex: '(?:OPPO[ _]?)?CPH1725[);/ ]'
+      model: 'F5 Youth'
+    - regex: '(?:OPPO[ _]?)?CPH1607[);/ ]'
+      model: 'R9s'
+    - regex: '(?:OPPO[ _]?)?CPH1611[);/ ]'
+      model: 'R9s Plus'
+    - regex: '(?:OPPO[ _]?)?CPH1613[);/ ]'
+      model: 'F3 Plus'
+    - regex: '(?:OPPO[ _]?)?CPH1701[);/ ]'
+      model: 'A57'
+    - regex: 'A37f'
+      model: 'A37f'
 
     - regex: 'N1T?[);/ ]'
       model: 'N1T'
@@ -2974,16 +4146,22 @@ Opsson:
 
 # orange
 Orange:
-  regex: 'SPV[ \-]?([a-z0-9]+)|Orange ([^/;]+) Build|SC/IHD92'
+  regex: 'SPV[ \-]?([a-z0-9]+)|Orange ([^/;]+) Build|SC/IHD92|FunTab ([^/;]+) Build'
   device: 'smartphone'
   models:
+    - regex: 'SC/IHD92'
+      model: 'Livebox Play'
+      device: 'tv' # set top box
+    - regex: 'Sego'
+      model: 'Sego'
+      device: 'tablet'
+    - regex: 'FunTab ([^/;]+) Build'
+      model: 'FunTab $1'
+      device: 'tablet'
     - regex: 'Orange ([^/;]+) Build'
       model: '$1'
     - regex: 'SPV[ \-]?([a-z0-9]+)'
       model: 'SPV $1'
-    - regex: 'SC/IHD92'
-      model: 'Livebox Play'
-      device: 'tv' # set top box
 
 # Ouki
 Ouki:
@@ -3001,14 +4179,21 @@ Ouki:
 
 # Overmax
 Overmax:
-  regex: 'OV-[a-z]+(?:[^;/]*) Build'
+  regex: 'OV-[a-z]+(?:[^;(/]*)[();/ ]|Qualcore 1010'
   device: 'tablet'
   models:
-    - regex: 'OV-Vertis-([^;/]+) Build'
-      model: 'OV-Vertis-$1'
+    - regex: 'OV-V10'
+      model: 'Vertis Yard'
       device: 'smartphone'
+    - regex: 'OV-Vertis[ _-]([^;/]+) Build'
+      model: 'Vertis $1'
+      device: 'smartphone'
+
+    - regex: 'Qualcore 1010'
+      model: 'Qualcore 1010'
+      device: 'tablet'
 
-    - regex: '(OV-[a-z]+(?:[^;/]*)) Build'
+    - regex: '(OV-[a-z]+(?:[^;(/]*))(?<!Build)[();/ ]'
       model: '$1'
 
 # Oysters
@@ -3024,9 +4209,13 @@ Oysters:
 
 # panasonic
 Panasonic:
-  regex: 'Panasonic|PANATV[0-9]+|Viera/|P902i[);/ ]'
+  regex: 'Panasonic|PANATV[0-9]+|Viera/|P902i[);/ ]|Eluga[ _]'
   device: 'smartphone'
   models:
+    - regex: 'Eluga[ _-]([^;/]+) Build'
+      model: 'Eluga $1'
+    - regex: 'Eluga[ _-]([^;/]+)[;/)]'
+      model: 'Eluga $1'
     - regex: 'P902i[);/ ]'
       device: 'feature phone'
       model: 'P902i'
@@ -3036,19 +4225,42 @@ Panasonic:
     - regex: 'PANATV[0-9]+|Viera/'
       device: 'tv'
       model: 'Smart TV'
-    - regex: 'Panasonic[ \-]?([a-z0-9]+)'
+    - regex: 'Panasonic[ _\-]?([a-z0-9]+)'
       model: '$1'
     - regex: 'portalmmm/2.0 (P[a-z0-9]+)'
       model: '$1'
 
+# Pentagram
+Pentagram:
+  regex: 'Pentagram|Quadra|Monster X5'
+  device: 'tablet'
+  models:
+    - regex: '(?:PENTAGRAM[_ ])?EON[_ ]PRIX'
+      model: 'Eon Prix'
+    - regex: 'Quadra 7( UltraSlim)?'
+      model: 'Quadra 7 UltraSlim'
+    - regex: 'Monster X5?'
+      model: 'Monster X5'
+      device: 'smartphone'
+    - regex: 'Quadra ?([^);/]*) Build'
+      model: 'Quadra $1'
+    - regex: 'Pentagram ?TAB ?([^);/]*) Build'
+      model: 'Tab $1'
+    - regex: 'Pentagram ?([^);/]*) Build'
+      model: '$1'
+      device: 'smartphone'
+
 # philips
 Philips:
-  regex: 'Philips|AND1E[);/ ]|NETTV/'
+  regex: 'Philips|AND1E[);/ ]|NETTV/|PI3210G'
   device: 'smartphone'
   models:
     - regex: 'AND1E(?: TV)?[);/ ]'
       model: 'Android TV'
       device: 'tv'
+    - regex: '(PI3210G)'
+      model: '$1'
+      device: 'tablet'
     - regex: 'Philips, BDP([0-9]{4})'
       model: 'Blu-ray Player (BDP$1)'
       device: 'tv'
@@ -3057,9 +4269,7 @@ Philips:
       device: 'tv'
     - regex: 'Philips-FISIO ([a-z0-9]+)'
       model: 'Fisio $1'
-    - regex: 'Philips[ ]?([a-z0-9]+)'
-      model: '$1'
-    - regex: 'Philips-([a-z0-9\-@]+)'
+    - regex: 'Philips[ _-]?([a-z0-9\-@]+)'
       model: '$1'
 
 # phoneOne
@@ -3138,6 +4348,12 @@ Pomp:
     - regex: 'POMP[ _-]([^;/)]+)[;/)]'
       model: '$1'
 
+# PPTV
+PPTV:
+  regex: '(KING 7S?)'
+  device: 'smartphone'
+  model: '$1'
+
 # ProScan
 ProScan:
   regex: 'PLT([^;/]+) Build'
@@ -3188,7 +4404,7 @@ Siemens:
 
 # Samsung
 Samsung:
-  regex: 'SAMSUNG|Maple |SC-(?:02C|04E|01F)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|vollo Vi86[);/ ]|(?:OTV-)?SMT-E5015|ISW11SC'
+  regex: 'SAMSUNG|Maple |SC-(?:02[CH]|04E|01F)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|vollo Vi86[);/ ]|(?:OTV-)?SMT-E5015|ISW11SC'
   device: 'smartphone'
   models:
     # explicit tv models
@@ -3305,9 +4521,12 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T315'
       device: 'tablet'
       model: 'GALAXY Tab 3 8.0" LTE'
+    - regex: '(?:SAMSUNG-)?SM-T330'
+      device: 'tablet'
+      model: 'GALAXY Tab 4 8.0" WiFi'
     - regex: '(?:SAMSUNG-)?SM-T335'
       device: 'tablet'
-      model: 'GALAXY Tab 8.0" LTE'
+      model: 'GALAXY Tab 4 8.0" LTE'
     - regex: '(?:SAMSUNG-)?SM-T520'
       device: 'tablet'
       model: 'GALAXY TabPRO 10.1" WiFi'
@@ -3338,9 +4557,27 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T805'
       device: 'tablet'
       model: 'GALAXY Tab S 10.5" LTE'
+    - regex: '(?:SAMSUNG-)?SM-T813'
+      device: 'tablet'
+      model: 'GALAXY Tab S2 9.7" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T815'
+      device: 'tablet'
+      model: 'GALAXY Tab S2 9.7" LTE'
     - regex: '(?:SAMSUNG-)?SM-T900'
       device: 'tablet'
       model: 'GALAXY TabPRO 12.2" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T550'
+      device: 'tablet'
+      model: 'GALAXY Tab A 9.7" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T555'
+      device: 'tablet'
+      model: 'GALAXY Tab A 9.7" LTE'
+    - regex: '(?:SAMSUNG-)?SM-T580'
+      device: 'tablet'
+      model: 'GALAXY Tab A 10.1" WiFi (2016)'
+    - regex: '(?:SAMSUNG-)?SM-T560'
+      device: 'tablet'
+      model: 'GALAXY Tab E 9.6"'
 
     # explicit smartphone models
     - regex: '(?:SAMSUNG-)?GT-B5330'
@@ -3399,6 +4636,8 @@ Samsung:
       model: 'GALAXY S II Plus'
     - regex: '(?:SAMSUNG-)?(?:GT-I919[05]|SCH-I435)'
       model: 'GALAXY S4 mini'
+    - regex: '(?:SAMSUNG-)?GT-I9515'
+      model: 'GALAXY S4 Value Edition'
     - regex: '(?:SAMSUNG-)?GT-I9295'
       model: 'GALAXY S4 ACTIVE'
     - regex: '(?:SAMSUNG-)?(?:GT-I9300|SCH-I535|SCH-L710)'
@@ -3441,6 +4680,24 @@ Samsung:
       model: 'GALAXY DUOS 2'
     - regex: '(?:SAMSUNG-)?GT-S7710'
       model: 'GALAXY Xcover 2'
+    - regex: '(?:SAMSUNG-)?GT-S8500'
+      model: 'Wave'
+    - regex: '(?:SAMSUNG-)?GT-S8530'
+      model: 'Wave II'
+    - regex: '(?:SAMSUNG-)?GT-S8600'
+      model: 'Wave 3'
+    - regex: '(?:SAMSUNG-)?GT-S5380'
+      model: 'Wave Y'
+    - regex: '(?:SAMSUNG-)?GT-S7250'
+      model: 'Wave M'
+    - regex: '(?:SAMSUNG-)?GT-S5250'
+      model: 'Wave 525'
+    - regex: '(?:SAMSUNG-)?GT-S5330'
+      model: 'Wave 533'
+    - regex: '(?:SAMSUNG-)?GT-S5780'
+      model: 'Wave 578'
+    - regex: '(?:SAMSUNG-)?GT-S7230'
+      model: 'Wave 723'
     - regex: '(?:SAMSUNG-)?SM-C101'
       model: 'GALAXY S4 zoom'
     - regex: '(?:SAMSUNG-)?SM-C115'
@@ -3451,12 +4708,34 @@ Samsung:
       model: 'GALAXY CORE LTE'
     - regex: '(?:SAMSUNG-)?SM-G3815'
       model: 'GALAXY EXPRESS II'
+    - regex: '(?:SAMSUNG-)?SM-G388F'
+      model: 'GALAXY Xcover 3'
+    - regex: '(?:SAMSUNG-)?SM-G390F'
+      model: 'GALAXY Xcover 4'
     - regex: '(?:SAMSUNG-)?SM-G800'
       model: 'GALAXY S5 mini'
     - regex: '(?:SAMSUNG-)?SM-G9009D'
       model: 'GALAXY S5 Dual-SIM'
     - regex: '(?:SAMSUNG-)?SM-G900|GALAXY-S5'
       model: 'GALAXY S5'
+    - regex: '(?:SAMSUNG-)?SM-G901F'
+      model: 'GALAXY S5 LTE+'
+    - regex: '(?:SAMSUNG-)?SM-G903F'
+      model: 'GALAXY S5 Neo'
+    - regex: '(?:SAMSUNG-)?SM-G920F'
+      model: 'GALAXY S6'
+    - regex: '(?:SAMSUNG-)?SM-G925F'
+      model: 'GALAXY S6 edge'
+    - regex: '(?:SAMSUNG-)?SM-G928F'
+      model: 'GALAXY S6 edge+'
+    - regex: '(?:SAMSUNG-)?SM-G930F'
+      model: 'GALAXY S7'
+    - regex: '(?:SAMSUNG-)?SM-G935F|SC-02H'
+      model: 'GALAXY S7 edge'
+    - regex: '(?:SAMSUNG-)?SM-G950F'
+      model: 'GALAXY S8'
+    - regex: '(?:SAMSUNG-)?SM-G955F'
+      model: 'GALAXY S8+'
     - regex: '(?:SAMSUNG-)?SCH-I200'
       model: 'GALAXY Stellar'
     - regex: '(?:SAMSUNG-)?SCH-I829'
@@ -3467,6 +4746,28 @@ Samsung:
       model: 'GALAXY Centura'
     - regex: 'vollo Vi86[);/ ]'
       model: 'Vollo Vi86'
+    - regex: '(?:SAMSUNG-)?SM-A300FU'
+      model: 'GALAXY A3 (2015)'
+    - regex: '(?:SAMSUNG-)?SM-A310F'
+      model: 'GALAXY A3 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-A320FL'
+      model: 'GALAXY A3 (2017)'
+    - regex: '(?:SAMSUNG-)?SM-A500FU'
+      model: 'GALAXY A5 (2015)'
+    - regex: '(?:SAMSUNG-)?SM-A510F'
+      model: 'GALAXY A5 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-A520F'
+      model: 'GALAXY A5 (2017)'
+    - regex: '(?:SAMSUNG-)?GT-I9301I'
+      model: 'GALAXY S III Neo'
+    - regex: '(?:SAMSUNG-)?SM-J320FN?'
+      model: 'GALAXY J3 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-J500FN'
+      model: 'GALAXY J5 (2015)'
+    - regex: '(?:SAMSUNG-)?SM-J510FN'
+      model: 'GALAXY J5 (2016)'
+    - regex: '(?:SAMSUNG-)?SM-G850F'
+      model: 'GALAXY Alpha'
 
     # explicit phablet models
     - regex: '(?:SAMSUNG-)?GT-I9060'
@@ -3511,12 +4812,24 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-N915'
       model: 'GALAXY Note 4 Edge'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-N920[0CIST]'
+      model: 'GALAXY Note 5'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-N9208'
+      model: 'GALAXY Note 5 Duos'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-I915[028]'
       model: 'GALAXY Mega 5.8'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-I920[05]'
       model: 'GALAXY Mega 6.3'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-N930F'
+      model: 'GALAXY Note 7'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG[- ])?SM-N950'
+      model: 'GALAXY Note 8'
+      device: 'phablet'
 
     # explicit feature phones
     - regex: '(?:SAMSUNG-)?GT-E2152'
@@ -3645,6 +4958,34 @@ Smartfren:
       model: '$1'
       device: 'tablet'
 
+# Smartisan
+Smartisan:
+  regex: 'SM(?:70[15]|801|901|919)|OD10[35]|YQ60[1357][ /;\)]'
+  device: 'smartphone'
+  models:
+    - regex: 'SM70[15]'
+      model: 'T1'
+    - regex: 'SM801'
+      model: 'T2'
+    - regex: 'SM901'
+      model: 'M1'
+    - regex: 'SM919'
+      model: 'M1L'
+    - regex: 'YQ60[1357]'
+      model: 'U1'
+    - regex: 'OD10[35]'
+      model: 'Pro'
+
+# STK
+STK:
+  regex: 'STK[_ ]'
+  device: 'smartphone'
+  models:
+    - regex: 'STK[_ ]([^/;]+) Build'
+      model: '$1'
+    - regex: 'STK[_ ]([a-z0-9]+)'
+      model: '$1'
+
 # Stonex
 Stonex:
   regex: 'STX[ -]([^;/]+)'
@@ -3661,6 +5002,15 @@ SuperSonic:
   device: 'tablet'
   model: '$1'
 
+# Supra
+Supra:
+  regex: 'SUPRA ([^;/]+) Build'
+  device: 'smartphone'
+  models:
+    - regex: 'SUPRA ([^;/]+) Build'
+      device: 'tablet'
+      model: '$1'
+
 # Sumvision
 Sumvision:
   regex: '(Cyclone [^/;]+) Build'
@@ -3783,12 +5133,17 @@ Positivo:
 
 # Prestigio
 Prestigio:
-  regex: '(?:PMP|PAP)[0-9]+[a-z0-9_]+[);/ ]'
+  regex: '(?:PMP|PAP|PMT|PSP)[0-9]+[a-z0-9_]+[);/ ]'
   device: 'tablet'
   models:
-    - regex: '(PMP[0-9]+[a-z0-9_]+)[);/ ]'
+    - regex: 'PMT3277_3G'
+      model: 'MultiPad Ranger 7.0 3G'
+    - regex: 'PMT3287_3G'
+      model: 'MultiPad Ranger 8.0 3G'
+
+    - regex: '(PM[PT][0-9]+[a-z0-9_]+)[);/ ]'
       model: '$1'
-    - regex: '(PAP[0-9]+[a-z0-9_]+(?: DUO)?)[);/ ]'
+    - regex: '((?:PAP|PSP)[0-9]+[a-z0-9_]+(?: DUO)?)[);/ ]'
       model: '$1'
       device: 'smartphone'
 
@@ -3886,10 +5241,12 @@ Spice:
 
 # Sharp
 Sharp:
-  regex: 'SHARP|SBM|SH-?[0-9]+[a-z]?[);/ ]|AQUOS'
+  regex: 'SHARP|SBM|SH-?[0-9]+[a-z]?[);/ ]|AQUOS|506SH'
   device: 'smartphone'
   models:
     # explicit smartphone models
+    - regex: '506SH'
+      model: 'Aquos Xx3'
     - regex: 'SH-02E'
       model: 'Aquos Phone Zeta'
     - regex: 'SH06D'
@@ -3938,7 +5295,7 @@ Star:
 
 # Kindle
 Amazon:
-  regex: 'KF(?:OT|TT|JWI|JWA|SOWI|A[PRS]WI|THWI|SAW[IA])[);/ ]|Kindle|Silk/\d+\.\d+|Amazon (?:Tate|Jem)|AFT[BM]|SD4930UR'
+  regex: 'KF(?:OT|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|SAW[IA]|GIWI)[);/ ]|Kindle|Silk/\d+\.\d+|Amazon (?:Tate|Jem)|AFT[BM]|SD4930UR'
   device: 'tablet'
   models:
     - regex: 'AFTB'
@@ -3947,6 +5304,8 @@ Amazon:
     - regex: 'AFTM'
       model: 'Fire TV stick'
       device: 'tv'
+    - regex: 'KFFOWI[);/ ]'
+      model: 'Fire 7"'
     - regex: 'KFTT[);/ ]'
       model: 'Kindle Fire HD'
     - regex: 'KFJWI[);/ ]|Amazon Jem'
@@ -3967,10 +5326,18 @@ Amazon:
       model: 'Fire HD 6'
     - regex: 'KFASWI[);/ ]'
       model: 'Fire HD 7'
+    - regex: 'KFAUWI[);/ ]'
+      model: 'Fire HD 7 2017'
+    - regex: 'KFGIWI[);/ ]'
+      model: 'Fire HD 8 2016'
+    - regex: 'KFDOWI[);/ ]'
+      model: 'Fire HD 8 2017'
     - regex: 'KFSAWI[);/ ]'
       model: 'Fire HDX 8.9'
     - regex: 'KFSAWA[);/ ]'
       model: 'Fire HDX 8.9 4G'
+    - regex: 'KFTBWI[);/ ]'
+      model: 'Fire HD 10'
     - regex: 'SD4930UR'
       model: 'Fire Phone'
       device: 'smartphone'
@@ -4003,15 +5370,35 @@ T-Mobile:
     - regex: 'T-Mobile[ _]([a-z0-9_ ]+)'
       model: '$1'
 
+# TB Touch
+'TB Touch':
+  regex: 'Ignis [89]'
+  device: 'tablet'
+  models:
+    - regex: 'Ignis ([89])'
+      model: 'Ignis $1'
+
 # Tcl
 TCL:
-  regex: 'TCL[ -][a-z0-9]+|TCL[_ -][^;/]+ Build'
+  regex: 'TCL[ -][a-z0-9]+|(TCL[_ -][^;/]+|7040N) Build'
   device: 'smartphone'
   models:
     - regex: 'TCL[_ -]([^;/]+) Build'
       model: '$1'
     - regex: 'TCL[ -]([a-z0-9]+)'
       model: '$1'
+    - regex: '(7040N)'
+      model: '$1'
+
+# Teclast
+Teclast:
+  regex: 'Teclast|Tbook'
+  device: 'tablet'
+  models:
+    - regex: 'Tbook[_ -]([^;/]+) Build'
+      model: 'Tbook $1'
+    - regex: 'Teclast[_ -]([^;/]+) Build'
+      model: '$1'
 
 # Tecno Mobile
 Tecno Mobile:
@@ -4025,9 +5412,13 @@ Tecno Mobile:
 
 # Tesco
 Tesco:
-  regex: 'Hudl ([^/;]+) Build'
+  regex: 'Hudl ([^/;]+) Build|W032i-C3[);/ ]'
   device: 'tablet'
-  model: 'Hudl $1'
+  models:
+    - regex: 'Hudl ([^/;]+) Build'
+      model: 'Hudl $1'
+    - regex: 'W032i-C3[);/ ]'
+      model: 'Op3n Dott'
 
 # teXet
 teXet:
@@ -4087,6 +5478,14 @@ Toplux:
   device: 'feature phone'
   model: '$1'
 
+# TrekStor
+TrekStor:
+  regex: 'TrekStor ([^/;]+) Build'
+  device: 'tablet'
+  models:
+    - regex: 'TrekStor ([^/;]+) Build'
+      model: '$1'
+
 # Trevi
 Trevi:
   regex: 'Trevi[ _]|TAB[ _]10[ _]3G[ _]V16|TAB[ _](7|8)[ _]3G[ _]V8|TAB9 3G|MINITAB 3GV|Phablet[ _](?:4|4\.5|5|5\,3|6)[ _]?[CSQ]|REVERSE[ _]5\.5[ _]?Q'
@@ -4146,6 +5545,44 @@ UTStarcom:
   device: 'feature phone'
   model: '$1'
 
+# Ulefone
+Ulefone:
+  regex: 'Ulefone|(Armor(?:[ _]2)?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?) Build'
+  device: 'smartphone'
+  models:
+    - regex: 'Be[ _]Touch([ _][23])?'
+      model: 'Be Touch$1'
+    - regex: 'Be[ _]Pure[ _]Lite'
+      model: 'Be Pure Lite'
+    - regex: 'Be[ _]Pure'
+      model: 'Be Pure'
+    - regex: 'Be[ _]One[ _]Lite'
+      model: 'Be One Lite'
+    - regex: 'Be[ _]One'
+      model: 'Be One'
+    - regex: 'Be[ _]X'
+      model: 'Be X'
+    - regex: 'U007 Pro'
+      model: 'U007 Pro'
+    - regex: 'U008 Pro'
+      model: 'U008 Pro'
+    - regex: 'Armor[ _]2 Build'
+      model: 'Armor 2'
+    - regex: 'Armor Build'
+      model: 'Armor'
+    - regex: 'Ulefone[ _-]?([^;/]+) Build'
+      model: '$1'
+    - regex: 'Ulefone[ _-]?([^;/)]+)[;/)]'
+      model: '$1'
+
+# UMIDIGI
+UMIDIGI:
+  regex: 'UMI(?:DIGI)?[ _]'
+  device: 'smartphone'
+  models:
+    - regex: 'UMI(?:DIGI)?[ _]([^/;]+) Build'
+      model: '$1'
+
 # Uniscope
 Uniscope:
   regex: 'Uniscope'
@@ -4169,6 +5606,9 @@ ViewSonic:
   regex: 'ViewSonic|VSD[0-9]+[);/ ]|ViewPad|ViewPhone'
   device: 'smart display'
   models:
+    - regex: '(?:ViewSonic-)?V500[);/ ]'
+      model: 'V500'
+      device: 'smartphone'
     - regex: '(?:ViewSonic-)?ViewPhone ?([^;/]+) Build'
       model: 'ViewPhone $1'
       device: 'smartphone'
@@ -4202,6 +5642,14 @@ Vertu:
   device: 'feature phone'
   model: '$1'
 
+# Verykool
+Verykool:
+  regex: 'verykool'
+  device: 'smartphone'
+  models:
+    - regex: 'verykool[ _]?([^/;]+) Build'
+      model: '$1'
+
 # Videocon
 Videocon:
   regex: 'Videocon[_ \-]|VT75C'
@@ -4214,9 +5662,27 @@ Videocon:
 
 # Vodafone
 Vodafone:
-  regex: 'Vodafone[ _-]|Smart ?Tab ?(?:III? ?)?(?:|4G|7|10)[);/ -]|VodafoneSmartChat'
-  device: 'smartphone'
-  models:
+  regex: 'Vodafone[ _-]|Smart ?Tab ?(?:III? ?)?(?:|4G|7|10)[);/ -]|VodafoneSmartChat|VFD[ _][0-9]+[;/) ]'
+  device: 'smartphone'
+  models:
+    - regex: 'VFD 100'
+      model: 'Smart Mini'
+    - regex: 'VFD 200'
+      model: 'Smart First 7'
+    - regex: 'VFD 300'
+      model: 'Smart Mini 7'
+    - regex: 'VFD 50[02]'
+      model: 'Smart Turbo 7'
+    - regex: 'VFD 51[013]'
+      model: 'Smart E8'
+    - regex: 'VFD 600'
+      model: 'Smart Prime 7'
+    - regex: 'VFD 610'
+      model: 'Smart N8'
+    - regex: 'VFD 700'
+      model: 'Smart Ultra 7'
+    - regex: 'VFD 900'
+      model: 'Smart Platinum 7'
     - regex: 'Vodafone[ _]875[);/ ]'
       model: 'Smart Mini' # Alcatel
     - regex: 'Vodafone[ _]975N?[);/ ]'
@@ -4231,6 +5697,15 @@ Vodafone:
       model: 'Smart Chat'
 
     # explicit table models
+    - regex: 'VFD 1100'
+      device: 'tablet'
+      model: 'Tab Mini 7'
+    - regex: 'VFD 1300'
+      device: 'tablet'
+      model: 'Smart Tab N8'
+    - regex: 'VFD 1400'
+      device: 'tablet'
+      model: 'Tab Prime 7'
     - regex: 'Smart ?Tab ?3G'
       device: 'tablet'
       model: 'Smart Tab 3G'
@@ -4256,6 +5731,8 @@ Vodafone:
       model: 'Smart Tab III 10' # Lenovo
       device: 'tablet'
 
+    - regex: 'VFD[ _]([0-9]+)[;/) ]'
+      model: 'VFD $1'
     - regex: 'Vodafone[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Vodafone[ _-]([a-z0-9_-]+)'
@@ -4325,16 +5802,16 @@ Wexler:
 
 # Wiko
 Wiko:
-  regex: '(?:WIKO-)?CINK_[a-z0-9_]+|(?:WIKO-)?HIGHWAY_[a-z0-9_]+|(?:WIKO-)?(?:Cink.*|Highway.*|Iggy|Stairway|Rainbow|Darkside|Darkmoon|Darkfull|Darknight|Sublim|Ozzy|JIMMY|Barry|Birdy|Bloom|Getaway|Goa|Kite|Lenny|Slide|Sunset|Wax|Ridge(?: Fab)?)(?: 4G)? Build'
+  regex: '(?:WIKO-)?CINK_[a-z0-9_]+|(?:WIKO-)?HIGHWAY_[a-z0-9_]+|(?:WIKO-)?(?:Cink([^/;]*)|Highway([^/;]*)|Iggy|Stairway|Rainbow ?(Jam|Lite|Up)?|Darkside|Darkmoon|Darkfull|Darknight|Freddy|Jerry[2]?|Sublim|Ozzy|JIMMY|Barry|Birdy|Bloom|Getaway|Goa|Kite|Lenny[234]?(?: Plus)?|Slide|Sunset2?|Sunny[2]?(?: Plus)?|Tommy[2]?|PULP|Wax|Ridge(?: Fab)?)(?: 4G)? Build'
   device: 'smartphone'
   models:
     - regex: '(?:WIKO-)?CINK_([a-z0-9_]+)'
       model: 'Cink $1'
-    - regex: '(?:Wiko-)?Cink(.*) Build'
+    - regex: '(?:Wiko-)?Cink([^/;]*) Build'
       model: 'Cink$1'
     - regex: '(?:WIKO-)?HIGHWAY_([a-z0-9_]+)'
       model: 'Highway $1'
-    - regex: '(?:Wiko-)?Highway(.*) Build'
+    - regex: '(?:Wiko-)?Highway([^/;]*) Build'
       model: 'Highway$1'
     - regex: '(?:WIKO-)?Iggy Build'
       model: 'Iggy'
@@ -4348,8 +5825,8 @@ Wiko:
       model: 'Ridge 4G'
     - regex: '(?:WIKO-)?Rainbow Build'
       model: 'Rainbow'
-    - regex: '(?:WIKO-)?Rainbow 4G Build'
-      model: 'Rainbow 4G'
+    - regex: '(?:WIKO-)?Rainbow ([^/;]+) Build'
+      model: 'Rainbow $1'
     - regex: '(?:WIKO-)?Darkside Build'
       model: 'Darkside'
     - regex: '(?:WIKO-)?Darkmoon Build'
@@ -4370,20 +5847,58 @@ Wiko:
       model: 'Bloom'
     - regex: '(?:WIKO-)?JIMMY Build'
       model: 'Jimmy'
+    - regex: '(?:WIKO-)?Jerry Build'
+      model: 'Jerry'
+    - regex: '(?:WIKO-)?Jerry2 Build'
+      model: 'Jerry 2'
     - regex: '(?:WIKO-)?Getaway Build'
       model: 'Getaway'
     - regex: '(?:WIKO-)?Goa Build'
       model: 'Goa'
+    - regex: '(?:WIKO-)?Freddy Build'
+      model: 'Freddy'
     - regex: '(?:WIKO-)?Kite Build'
       model: 'Kite'
     - regex: '(?:WIKO-)?Lenny Build'
       model: 'Lenny'
+    - regex: '(?:WIKO-)?Lenny[ -_]?2 Build'
+      model: 'Lenny 2'
+    - regex: '(?:WIKO-)?Lenny[ -_]?3 Build'
+      model: 'Lenny 3'
+    - regex: '(?:WIKO-)?Lenny[ -_]?4 Build'
+      model: 'Lenny 4'
+    - regex: '(?:WIKO-)?Lenny[ -_]?4 Plus Build'
+      model: 'Lenny 4 Plus'
     - regex: '(?:WIKO-)?Slide Build'
       model: 'Slide'
     - regex: '(?:WIKO-)?Sunset Build'
       model: 'Sunset'
+    - regex: '(?:WIKO-)?Sunset2 Build'
+      model: 'Sunset 2'
+    - regex: '(?:WIKO-)?Sunny Build'
+      model: 'Sunny'
+    - regex: '(?:WIKO-)?Sunny2 Build'
+      model: 'Sunny 2'
+    - regex: '(?:WIKO-)?Sunny2 Plus Build'
+      model: 'Sunny 2 Plus'
+    - regex: '(?:WIKO-)?Tommy Build'
+      model: 'Tommy'
+    - regex: '(?:WIKO-)?Tommy2 Build'
+      model: 'Tommy 2'
     - regex: '(?:WIKO-)?Wax Build'
       model: 'Wax'
+    - regex: '(?:WIKO-)?Pulp Build'
+      model: 'Pulp'
+
+# Wileyfox
+Wileyfox:
+ regex: '(?:Wileyfox [^/]+)|Swift([^/]+) Build'
+ device: 'smartphone'
+ models:
+   - regex: 'Wileyfox ([^/]+) Build'
+     model: '$1'
+   - regex: 'Swift ([^/]+) Build'
+     model: 'Swift $1'
 
 # Wolder
 Wolder:
@@ -4396,6 +5911,12 @@ Wolder:
       device: 'tablet'
       model: 'miTab $1'
 
+# Wolfgang
+Wolfgang:
+  regex: 'AT[ _-]AS([0-9A-Z]+)[);/ ]'
+  device: 'smartphone'
+  model: 'AT-AS$1'
+
 # Wonu
 Wonu:
   regex: 'Wonu ([a-z0-9]+)'
@@ -4404,13 +5925,13 @@ Wonu:
 
 # Woxter
 Woxter:
-  regex: 'Woxter ([^/;]+) Build'
+  regex: 'Woxter[ _]([^/;]+) Build'
   device: 'tablet'
   model: '$1'
 
 #Xiaomi
 Xiaomi:
-  regex: 'Xiaomi|(MI [a-z0-9]+|MI-One[ _]?[a-z0-9]+)[);/ ]|HM ([^/;]+) Build|(2014501|2014011|201481[13]|201302[23]|2013061) Build|Redmi'
+  regex: 'Xiaomi|(MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+)[);/ ]|HM ([^/;]+) (?:Build|MIUI)|(2014501|2014011|201481[13]|201302[23]|2013061) Build|Redmi'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -4424,23 +5945,25 @@ Xiaomi:
       model: 'Hongmi'
     - regex: 'Xiaomi_2013061|2013061 Build'
       model: 'MI 3'
+    - regex: 'Mi-4c[);/ ]'
+      model: 'MI 4C'
 
-    - regex: 'Redmi Note ([^;/]+)? Build'
+    - regex: 'Redmi Note ([^;/]+)? .+?\)'
       model: 'Redmi Note $1'
       device: 'phablet'
-    - regex: 'Redmi ([^;/]+)? Build'
+    - regex: 'Redmi ([^;/]+)? .+?\)'
       model: 'Redmi $1'
-    - regex: 'MI Note ([^;/]+)? Build'
+    - regex: 'MI Note ([^;/]+)? .+?\)'
       model: 'MI Note $1'
       device: 'phablet'
     - regex: '(MI(?:-One)?[ _](?:[^;/]*))Build'
       model: '$1'
     - regex: '(MI [a-z0-9]+|MI-One[ _]?[a-z0-9]+)[);/ ]'
       model: '$1'
-    - regex: 'HM Note ([^/;]+) Build'
+    - regex: 'HM Note ([^/;]+) (?:Build|MIUI)'
       device: 'phablet'
       model: 'HM Note $1'
-    - regex: 'HM ([^/;]+) Build'
+    - regex: 'HM ([^/;]+) (?:Build|MIUI)'
       model: 'HM $1'
 
 # Xolo
@@ -4532,7 +6055,7 @@ Zonda:
 
 # Toshiba
 Toshiba:
-  regex: 'Toshiba|TSBNetTV/|portalmmm/[12].0 TS|T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AT(100|200|270|300|330|374|400|470|500|503|570|703|830)'
+  regex: 'Toshiba|TSBNetTV/|portalmmm/[12].0 TS|T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AT(10-A|10[PL]E-A|100|200|270|300|330|374|400|470|500|503|570|703|830)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -4560,6 +6083,12 @@ Toshiba:
     - regex: 'AT(100|200|270|300|330|374|400|470|500|503|570|703|830)'
       model: 'Regza AT$1'
       device: 'tablet'
+    - regex: 'AT10([PL])E-A'
+      model: 'Excite AT10$1-A'
+      device: 'tablet'
+    - regex: 'AT10-A'
+      model: 'Excite AT10-A'
+      device: 'tablet'
 
     - regex: 'TSBNetTV/'
       device: 'tv'
@@ -4573,7 +6102,7 @@ Toshiba:
 
 # Fly
 Fly:
-  regex: 'Fly(?!Flow|touch)|MERIDIAN-|(?:IQ[0-9]{3,})[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?(?: Build|[;/\)])'
+  regex: 'Fly(?!Flow|touch)|FS50[1-9]|FS511|FS551|FS40[1-7]|FS452|FS451|FS454|4FS06|MERIDIAN-|(?:IQ[0-9]{3,})[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?(?: Build|[;/\)])'
   device: 'smartphone'
   models:
     - regex: '(?:Fly_)?IQ310(?: Build|[;/\)])'
@@ -4582,6 +6111,44 @@ Fly:
 
     - regex: '(?:Fly_)?IQ236(?: Build|[;/\)])'
       model: 'Victory'
+    - regex: 'FS506'
+      model: 'Cirrus 3'
+    - regex: 'FS403'
+      model: 'Cumulus 1'
+    - regex: 'FS508'
+      model: 'Cirrus 6'
+    - regex: 'FS511'
+      model: 'Cirrus 7'
+    - regex: 'FS509'
+      model: 'Nimbus 9'
+    - regex: 'FS406'
+      model: 'Stratus 5'
+    - regex: 'FS404'
+      model: 'Stratus 3'
+    - regex: 'FS504'
+      model: 'Cirrus 2'
+    - regex: 'FS407'
+      model: 'Stratus 6'
+    - regex: 'FS401'
+      model: 'Stratus 1'
+    - regex: 'FS402'
+      model: 'Stratus 2'
+    - regex: 'FS501'
+      model: 'Nimbus 3'
+    - regex: 'FS502'
+      model: 'Cirrus 1'
+    - regex: 'FS505'
+      model: 'Nimbus 7'
+    - regex: 'FS551'
+      model: 'Nimbus 4'
+    - regex: 'FS454'
+      model: 'Nimbus 8'
+    - regex: 'FS452'
+      model: 'Nimbus 2'
+    - regex: 'FS451'
+      model: 'Nimbus 1'
+    - regex: 'FS405'
+      model: 'Stratus 4'
     - regex: '(?:Fly_)?IQ237(?: Build|[;/\)])'
       model: 'Dynamic'
     - regex: '(?:Fly_)?IQ238(?: Build|[;/\)])'
@@ -4652,6 +6219,8 @@ Fly:
       model: 'Energy 2'
     - regex: '(?:Fly_)?IQ4412 Quad(?: Build|[;/\)])'
       model: 'Coral'
+    - regex: '(?:Fly_)?IQ4413[ _]Quad(?: Build|[;/\)])'
+      model: 'Evo Chic 3'
     - regex: '(?:Fly_)?IQ4414 Quad(?: Build|[;/\)])'
       model: 'Evo Tech 3'
     - regex: '(?:Fly_)?IQ4415 Quad(?: Build|[;/\)])'
@@ -4673,11 +6242,31 @@ Fly:
     - regex: 'MERIDIAN-([a-z0-9]+)'
       model: '$1'
 
-# Devices with undectable brand, but detectable model
-Unknown:
-  regex: 'WebTV/(\d+\.\d+)'
-  device: 'tv'
-  model: 'Web TV'
+# Freetel
+Freetel:
+  regex: '(FTJ152[ABCD]|FT141B|FT142D_LTEXM|FT142A?|FTJ161B|FTJ152E|FTJ162D) Build'
+  device: 'smartphone'
+  models:
+   - regex: 'FTJ152C'
+     model: 'Samurai Miyabi'
+   - regex: 'FT141B'
+     model: 'Nico'
+   - regex: 'FT142D_LTEXM'
+     model: 'XM'
+   - regex: 'FT142A?'
+     model: 'Priori 2'
+   - regex: 'FTJ152A'
+     model: 'Priori 3'
+   - regex: 'FTJ162D'
+     model: 'Priori 4'
+   - regex: 'FTJ152B'
+     model: 'Priori 3S LTE'
+   - regex: 'FTJ152D'
+     model: 'Samurai Kiwami'
+   - regex: 'FTJ161B'
+     model: 'Samurai Rei'
+   - regex: 'FTJ152E'
+     model: 'Katana 1'
 
 # Zeemi
 Zeemi:
@@ -4697,7 +6286,7 @@ Zopo:
 
 # ZTE
 ZTE:
-  regex: 'ZTE|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade S6|N9[15]8St|NX(?:403A|40[X2]|507J|503A|505J|506J|508J|510J|511J|513J|601J)|Z331|N9510|N9180|N9101|N9515|N952[01]|N9810|N799D|[UV]9180|[UV]9815|Z768G)[);/ ]'
+  regex: 'ZTE|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade (?:L[2357]|S6|V[678]|X7|A520)|N9[15]8St|NX(?:403A|40[X2]|507J|503A|505J|506J|508J|510J|511J|513J|529J|531J|549J|601J)|Z331|N9510|N9180|N9101|NX406E|N9515|N952[01]|N9810|N799D|[UV]9180|[UV]9815|Z768G|Z820|Z981|A460)[);/ ]'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -4739,6 +6328,12 @@ ZTE:
       model: 'Nubia Z9 mini'
     - regex: 'NX510J[);/ ]'
       model: 'Nubia Z9 max'
+    - regex: 'NX531J[);/ ]'
+      model: 'Nubia Z11'
+    - regex: 'NX529J[);/ ]'
+      model: 'Nubia Z11 mini'
+    - regex: 'NX549J[);/ ]'
+      model: 'Nubia Z11 mini S'
     - regex: 'NX513J[);/ ]'
       model: 'Nubia My Prague'
     - regex: 'NX601J[);/ ]'
@@ -4749,10 +6344,44 @@ ZTE:
       model: 'Grand Memo'
     - regex: 'Z331[);/ ]'
       model: 'Z331'
+    - regex: 'Blade A520[);/ ]'
+      model: 'Blade A520'
+    - regex: 'Blade L2 Plus[);/ ]'
+      model: 'Blade L2 Plus'
+    - regex: 'Blade L2[);/ ]'
+      model: 'Blade L2'
+    - regex: 'Blade L3 Plus[);/ ]'
+      model: 'Blade L3 Plus'
+    - regex: 'Blade L3[);/ ]'
+      model: 'Blade L3'
+    - regex: 'Blade L5[);/ ]'
+      model: 'Blade L5'
     - regex: 'Blade S6[);/ ]'
       model: 'Blade S6'
+    - regex: 'Blade V6 MAX[);/ ]'
+      model: 'Blade V6 Max'
+    - regex: 'Blade V6 Plus[);/ ]'
+      model: 'Blade V6 Plus'
+    - regex: 'Blade V6[);/ ]'
+      model: 'Blade V6'
+    - regex: 'Blade L7[);/ ]'
+      model: 'Blade L7'
+    - regex: 'Blade V7[);/ ]'
+      model: 'Blade V7'
+    - regex: 'Blade X7[);/ ]'
+      model: 'Blade X7'
+    - regex: 'Blade V8 SE[);/ ]'
+      model: 'Blade V8 SE'
     - regex: 'Z768G[);/ ]'
       model: 'Midnight'
+    - regex: 'Z820[);/ ]'
+      model: 'Obsidian'
+    - regex: 'Z981[);/ ]'
+      model: 'ZMAX Pro'
+    - regex: 'Blade (A460)'
+      model: 'Blade $1'
+    - regex: 'NX406E[);/ ]'
+      model: 'Nubia Z5S'
 
     - regex: 'AxonPhone ([^;/]+) Build'
       model: 'AxonPhone $1'
@@ -4767,21 +6396,15 @@ ZTE:
       model: '$1'
     - regex: 'ZTE[ _]([a-z0-9]+)'
       model: '$1'
+# Zen'
+Zen:
+  regex: '(Admire[_ ][^/;]+|Cinemax[^/;)]+)(?:Build|\) U)'
+  device: 'smartphone'
+  model: '$1'
 
-# Symbian to Nokia ??
-# Change name from Nokia to other to not change above Nokia element
-#Nokia:
-#  regex: 'Symbian'
-#  device: 'feature phone'
+# Devices with undectable brand, but detectable model
+Unknown:
+  regex: 'WebTV/(\d+\.\d+)'
+  device: 'tv'
+  model: 'Web TV'
 
-# OnePlus
-OnePlus:
-  regex: '(?:A0001|A2005|E1003) Build'
-  device: 'smartphone'
-  models:
-    - regex: 'A0001'
-      model: 'One'
-    - regex: 'A2005'
-      model: 'Two'
-    - regex: 'E1003'
-      model: 'X'