device_detector 0.4.0 → 0.5.0

data/regexes/devices/mobiles.yml

@@ -71,14 +71,14 @@ HTC:
 
     - regex: 'NexusHD2' # custom rom for hd2
       model: 'HD2'
-    - regex: 'HTC[ _-]((?:Flyer|P715a).*) Build'
+    - regex: 'HTC[ _\-]((?:Flyer|P715a).*) Build'
       device: 'tablet'
       model: '$1'
     - regex: 'HTC[ _]([^/;]+) [0-9]+(?:\.[0-9]+)+ Build'
       model: '$1'
     - regex: 'HTC[ _]([^/;]+) Build'
       model: '$1'
-    - regex: 'HTC[ _]([a-z0-9]+[ _-]?(?:[a-z0-9_+\-])*)'
+    - regex: 'HTC[ _]([a-z0-9]+[ _\-]?(?:[a-z0-9_+\-])*)'
       model: '$1'
     - regex: 'USCCHTC(\d+)'
       model: '$1'
@@ -163,7 +163,7 @@ Palm:
   models:
     - regex: '((?:Pre|Pixi))/(\d+\.\d+)'
       model: '$1 $2'
-    - regex: 'Palm(?:[ -])?((?!OS|Source)[a-z0-9]+)'
+    - regex: 'Palm(?:[ \-])?((?!OS|Source)[a-z0-9]+)'
       model: '$1'
     - regex: 'Treo([a-z0-9]+)'
       model: 'Treo $1'
@@ -321,7 +321,7 @@ Acer:
 
     - regex: 'Acer; ?([^;\)]+)'
       model: '$1'
-    - regex: 'Acer[ _-]?([^;\)]+) Build'
+    - regex: 'Acer[ _\-]?([^;\)]+) Build'
       model: '$1'
     - regex: 'acer[\-_]([a-z0-9]+)'
       model: '$1'
@@ -655,9 +655,9 @@ Coolpad:
   regex: '(?:YL-)?Coolpad'
   device: 'smartphone'
   models:
-    - regex: '(?:YL-)?Coolpad[ _-]?([^/;]+) Build'
+    - regex: '(?:YL-)?Coolpad[ _\-]?([^/;]+) Build'
       model: '$1'
-    - regex: '(?:YL-)?Coolpad[ _-]?([a-z0-9-]+)'
+    - regex: '(?:YL-)?Coolpad[ _\-]?([a-z0-9\-]+)'
       model: '$1'
 
 # Cricket
@@ -707,7 +707,7 @@ Dell:
       device: 'tablet'
     - regex: 'Dell; ([^;/\)]+)'
       model: '$1'
-    - regex: 'Dell[ _-]([^/;]+) Build'
+    - regex: 'Dell[ _\-]([^/;]+) Build'
       model: '$1'
 
 # Dbtel
@@ -774,37 +774,282 @@ Ericy:
   device: 'feature phone'
   model: '$1'
 
-# Sony Ericsson
-Sony Ericsson:
-  regex: 'Sony ?Ericsson|portalmmm/2\.0 K|(?:WT|LT|SO|ST|SK)[0-9]+[a-z]*[0-9]*(?: Build|\))|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build'
+# Rikomagic
+Rikomagic:
+  regex: 'MK(80[28][^/;]*) Build'
+  device: 'tv'
+  model: 'MK$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]|C5502|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|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]*[0-9]*(?: Build|\))|X?L39H|portalmmm/2\.0 K|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[35]D|4E|[12]C)|R800[aix]'
   device: 'smartphone'
   models:
-    # explicit smartphone models
-    - regex: '(?:SonyEricsson)?CK13i'
-      model: 'txt'
-    - regex: '(?:SonyEricsson)?CK15[ai]'
-      model: 'txt pro'
-    - regex: '(?:SonyEricsson)?E10[ai]v?'
+    # SONY ERICSSON: explicit smartphone models
+    - regex: '(?:Sony(?:Ericsson)?)?E10[ai]v?'
       model: 'Xperia X10 mini'
-    - regex: '(?:SonyEricsson)?E15[ai]v?'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?U20'
+      model: 'Xperia X10 mini pro'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?E15[ai]v?'
       model: 'Xperia X8'
-    - regex: '(?:SonyEricsson)?LT15[ai]v?'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?(LT15[ai]?v?|SO-01C)'
       model: 'Xperia arc'
-    - regex: '(?:SonyEricsson)?LT18[ai]v?'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?LT18[ai]v?'
       model: 'Xperia arc S'
-    - regex: '(?:SonyEricsson)?X10[ai]v?'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?MT11'
+      model: 'Xperia neo V'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?MT15'
+      model: 'Xperia neo'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?MT27'
+      model: 'Xperia Sola'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?MK16[ai]'
+      model: 'Xperia pro'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?ST15[ai]'
+      model: 'Xperia mini'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?ST17[ai]'
+      model: 'Xperia active'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?ST18[ai]'
+      model: 'Xperia ray'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?SK17[ai]?'
+      model: 'Xperia mini pro'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?X10[ai]v?'
       model: 'Xperia X10'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?M1'
+      model: 'Aspen'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?R800'
+      model: 'Xperia PLAY'
+      brand: 'Sony Ericsson'
+    - regex: '(?:Sony(?:Ericsson)?)?WT19'
+      model: 'Live with Walkman'
+      brand: 'Sony Ericsson'
+
+    # SONY ERICSSON: explicit feature phone models
+    - regex: '(?:Sony(?:Ericsson)?)?CK13i'
+      model: 'txt'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?CK15[ai]'
+      model: 'txt pro'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?F100i'
+      model: 'Jalou'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?J105'
+      model: 'Naite'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?J108'
+      model: 'Cedar'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?J10'
+      model: 'Elm'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?J20'
+      model: 'Hazel'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?U10'
+      model: 'Aino'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?U100'
+      model: 'Yari'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?U1'
+      model: 'Satio'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?U5'
+      model: 'Vivaz'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?U8'
+      model: 'Vivaz pro'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?W20'
+      model: 'Zylo'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?W100'
+      model: 'Spiro'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?W150'
+      model: 'Yendo'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: '(?:Sony(?:Ericsson)?)?WT13'
+      model: 'Mix Walkman'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
 
-    - regex: 'SonyEricsson([a-z0-9]+) Build'
-      model: '$1'
-    - regex: 'Sony(?: )?Ericsson ?([a-z0-9\-]+)'
-      model: '$1'
-    - regex: '((?:WT|LT|SO|ST|SK)[0-9]+[a-z]*[0-9]*)(?: Build|\))'
+    # SONY: explicit smartphone models
+    - regex: '(?:Sony(?:Ericsson)?)?LT22i'
+      model: 'Xperia P'
+    - regex: '(?:Sony(?:Ericsson)?)?LT25i'
+      model: 'Xperia V'
+    - regex: '(?:Sony(?:Ericsson)?)?LT26ii'
+      model: 'Xperia SL'
+    - regex: '(?:Sony(?:Ericsson)?)?LT26i'
+      model: 'Xperia S'
+    - regex: '(?:Sony(?:Ericsson)?)?SO-02C'
+      model: 'Xperia arco'
+    - regex: '(?:Sony(?:Ericsson)?)?SO-03D'
+      model: 'Xperia arco HD'
+    - regex: '(?:Sony(?:Ericsson)?)?LT26w'
+      model: 'Xperia arco S'
+    - regex: '(?:Sony(?:Ericsson)?)?LT28[aih]'
+      model: 'Xperia ion'
+    - regex: '(?:Sony(?:Ericsson)?)?LT29i'
+      model: 'Xperia TX'
+    - regex: '(?:Sony(?:Ericsson)?)?LT30a'
+      model: 'Xperia T LTE'
+    - regex: '(?:Sony(?:Ericsson)?)?LT30p'
+      model: 'Xperia T'
+    - regex: '(?:Sony(?:Ericsson)?)?ST21[ia]2'
+      model: 'Xperia tipo dual'
+    - regex: '(?:Sony(?:Ericsson)?)?ST21[ia]'
+      model: 'Xperia tipo'
+    - regex: '(?:Sony(?:Ericsson)?)?ST23[ia]'
+      model: 'Xperia miro'
+    - regex: '(?:Sony(?:Ericsson)?)?ST25[ia]'
+      model: 'Xperia U'
+    - regex: '(?:Sony(?:Ericsson)?)?ST26[ia]'
+      model: 'Xperia J'
+    - regex: '(?:Sony(?:Ericsson)?)?ST27[ia]'
+      model: 'Xperia go'
+    - regex: '(?:Sony(?:Ericsson)?)?C150[45]'
+      model: 'Xperia E'
+    - regex: '(?:Sony(?:Ericsson)?)?C160[45]'
+      model: 'Xperia E Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?C190[45]'
+      model: 'Xperia M'
+    - regex: '(?:Sony(?:Ericsson)?)?C200[45]'
+      model: 'Xperia M Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?C210[45]'
+      model: 'Xperia L'
+    - regex: '(?:Sony(?:Ericsson)?)?C2305'
+      model: 'Xperia C'
+    - regex: '(?:Sony(?:Ericsson)?)?C530[236]'
+      model: 'Xperia SP'
+    - regex: '(?:Sony(?:Ericsson)?)?C5502'
+      model: 'Xperia ZR'
+    - regex: '(?:Sony(?:Ericsson)?)?C650[236]'
+      model: 'Xperia ZL'
+    - regex: '(?:Sony(?:Ericsson)?)?C66(?:0[236]|16)'
+      model: 'Xperia Z'
+    - regex: '(?:Sony(?:Ericsson)?)?(?:C68(?:0[26]|[34]3)|XL39H)'
+      model: 'Xperia Z Ultra'
+    - regex: '(?:Sony(?:Ericsson)?)?C69(?:0[236]|16|43)|L39H'
+      model: 'Xperia Z1'
+    - regex: '(?:Sony(?:Ericsson)?)?D200[45]'
+      model: 'Xperia E1'
+    - regex: '(?:Sony(?:Ericsson)?)?D21(?:0[45]|14)'
+      model: 'Xperia E1 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?D22(?:0[236]|43)'
+      model: 'Xperia E3'
+    - regex: '(?:Sony(?:Ericsson)?)?D2212'
+      model: 'Xperia E3 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)?)?D2502'
+      model: 'Xperia C3 Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?D2533'
+      model: 'Xperia C3'
+    - regex: '(?:Sony(?:Ericsson)?)?D510[236]'
+      model: 'Xperia T3'
+    - regex: '(?:Sony(?:Ericsson)?)?D530[36]'
+      model: 'Xperia T2 Ultra'
+    - regex: '(?:Sony(?:Ericsson)?)?D5322'
+      model: 'Xperia T2 Ultra Dual'
+    - regex: '(?:Sony(?:Ericsson)?)?D5503'
+      model: 'Xperia Z1 Compact'
+    - regex: '(?:Sony(?:Ericsson)?)?D58[03]3'
+      model: 'Xperia Z3 Compact'
+    - regex: '(?:Sony(?:Ericsson)?)?D65(?:0[23]|43)'
+      model: 'Xperia Z2'
+    - regex: '(?:Sony(?:Ericsson)?)?D66[05]3'
+      model: 'Xperia Z3'
+    - regex: '(?:Sony(?:Ericsson)?)?SO-04E'
+      model: 'Xperia A'
+    - regex: '(?:Sony(?:Ericsson)?)?SO-05D'
+      model: 'Xperia SX'
+
+    # SONY: explicit tablet models
+    - regex: 'SGP(?:311|312|321) Build'
+      model: 'Xperia Tablet Z'
+      device: 'tablet'
+    - regex: 'SGP(?:511|512|521) Build'
+      model: 'Xperia Tablet Z2'
+      device: 'tablet'
+    - regex: 'SGP(?:6[24]1) Build'
+      model: 'Xperia Tablet Z3 Compact'
+      device: 'tablet'
+    - regex: 'SGPT(?:12|121|122|123|13|131|132|133) Build'
+      model: 'Xperia Tablet S'
+      device: 'tablet'
+
+    # general detections
+    - regex: '((?:WT|SO|ST|SK|MK)[0-9]+[a-z]*[0-9]*)(?: Build|\))'
       model: '$1'
+      brand: 'Sony Ericsson'
     - regex: '(MT[0-9]{2}[a-z]?) Build'
       model: '$1'
+      brand: 'Sony Ericsson'
     - regex: 'portalmmm/2.0 K([a-z0-9]+)'
       model: 'K$1'
+      brand: 'Sony Ericsson'
+    - regex: 'Sony ?Ericsson?([^/;]*) Build'
+      model: '$1'
+      brand: 'Sony Ericsson'
+    - regex: 'SonyEricsson([CGJKPTWZ][0-9]+[a-z]+)/'
+      model: '$1'
+      brand: 'Sony Ericsson'
+      device: 'feature phone'
+    - regex: 'Sony ?Ericsson ?([a-z0-9\-]+)'
+      model: '$1'
+      brand: 'Sony Ericsson'
+
+    - regex: 'Sony (Tablet[^/;]*) Build'
+      model: '$1'
+      device: 'tablet'
+    - regex: '(SGP[^/;]*) Build'
+      model: '$1'
+      device: 'tablet'
+    - regex: 'Xperia ([^/;]*Tablet[^/;]*) Build'
+      model: 'Xperia $1'
+      device: 'tablet'
+    - regex: 'Xperia ([^;/]+) Build'
+      model: 'Xperia $1'
+    - regex: 'Sony[ ]?([^/;]*) Build'
+      model: '$1'
+    - regex: 'Sony[ ]?([a-z0-9\-]+)'
+      model: '$1'
 
 # Ericsson
 Ericsson:
@@ -931,16 +1176,35 @@ Haier:
   regex: 'Haier'
   device: 'smartphone'
   models:
-    - regex: 'Haier[ _-](H[WT]-[^/;]+) Build'
+    - regex: 'Haier[ _\-](H[WT]-[^/;]+) Build'
       model: '$1'
-    - regex: 'Haier[ _-](H[WT]-[a-z0-9_-]+)'
+    - regex: 'Haier[ _\-](H[WT]-[a-z0-9_\-]+)'
       model: '$1'
-    - regex: 'Haier[ _-](sy[0-9]+)'
+    - regex: 'Haier[ _\-](sy[0-9]+)'
       model: '$1'
-    - regex: 'Haier[ _-]([a-z0-9\-]+)'
+    - regex: 'Haier[ _\-]([a-z0-9\-]+)'
       model: '$1'
       device: 'feature phone'
 
+# Hisense
+Hisense:
+  regex: 'HS-(?:U|EG?)[0-9]+[a-z0-9\-]*|E270BSA|M470BS[AE]|E2281'
+  device: 'smartphone'
+  models:
+    # explicit tablet models
+    - regex: 'E270BSA'
+      device: 'tablet'
+      model: 'Sero 7'
+    - regex: 'M470BS[AE]'
+      device: 'tablet'
+      model: 'Sero 7 Pro'
+    - regex: 'E2281'
+      device: 'tablet'
+      model: 'Sero 8'
+
+    - regex: '(HS-(?:U|EG?)[0-9]+[a-z0-9\-]*)'
+      model: '$1'
+
 # Huawei
 Huawei:
   regex: '(HW-)?Huawei|Ideos|vodafone[a-z0-9]+'
@@ -951,11 +1215,11 @@ Huawei:
       model: '$1'
     - regex: 'Ideos([^;/]*) Build'
       model: 'Ideos$1'
-    - regex: 'Huawei[ _-]?([^/;]*) Build'
+    - regex: 'Huawei[ _\-]?([^/;]*) Build'
       model: '$1'
     - regex: '(?:HW-)?Huawei(?:/1\.0/0?(?:Huawei))?[_\- /]?([a-z0-9\-_]+)'
       model: '$1'
-    - regex: 'Huawei; ([a-z0-9 -]+)'
+    - regex: 'Huawei; ([a-z0-9 \-]+)'
       model: '$1'
     - regex: 'vodafone([a-z0-9]+)'
       model: 'Vodafone $1'
@@ -986,7 +1250,7 @@ Infinix:
       model: '$1'
     - regex: 'Infinix (X\d+)'
       model: '$1'
-    - regex: 'Infinix[ _]([a-z0-9_-]+)'
+    - regex: 'Infinix[ _]([a-z0-9_\-]+)'
       model: '$1'
 
 # Inkti
@@ -1021,7 +1285,7 @@ Intex:
       model: '$1'
     - regex: '(Aqua|Cloud)[ _\.]([^/;\)]+)(?:[ _]Build|(?<!Build)/|\))'
       model: '$1 $2'
-    - regex: 'Intex[ _]([a-z0-9_+-]+)'
+    - regex: 'Intex[ _]([a-z0-9_+\-]+)'
       model: '$1'
 
 # i-mate
@@ -1175,7 +1439,7 @@ Lenovo:
       device: 'tablet'
     - regex: 'Lenovo ([^/;]*) Build'
       model: '$1'
-    - regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]([a-z0-9_+-]+)'
+    - regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]([a-z0-9_+\-]+)'
       model: '$1'
     - regex: 'IdeaTab[ \-_]?([a-z0-9]+)'
       model: 'IdeaTab $1'
@@ -1240,14 +1504,11 @@ LG:
   regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|VX[0-9]+'
   device: 'smartphone'
   models:
-    - regex: 'LGE_DLNA_SDK|NetCast'
-      device: 'tv'
-      model: 'NetCast'
     - regex: 'LGE(?: |-LG| LG-AX|-)([a-z0-9]+)'
       model: '$1'
     - regex: 'LGE;([a-z0-9\-]+)'
       model: '$1'
-    - regex: 'LG[ _-](V90.*|Optimus[ _-]Pad.*) Build'
+    - regex: 'LG[ _\-](V90.*|Optimus[ _\-]Pad.*) Build'
       device: 'tablet'
       model: '$1'
     - regex: 'LG(?:/|-LG| |-)?([^/;]*) Build'
@@ -1315,7 +1576,7 @@ Sagem:
   regex: 'SAGEM|portalmmm/2.0 (?:SG|my)'
   device: 'smartphone'
   models:
-    - regex: 'SAGEM-(my[a-z0-9-]+)'
+    - regex: 'SAGEM-(my[a-z0-9\-]+)'
       model: '$1'
       device: 'feature phone'
     - regex: 'SAGEM ([a-z0-9]+)'
@@ -1671,11 +1932,29 @@ Siemens:
 
 # Samsung
 Samsung:
-  regex: 'SAMSUNG|SC-(?:02C|04E|01F)|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]'
+  regex: 'SAMSUNG|SC-(?:02C|04E|01F)|N7100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]'
   device: 'smartphone'
   models:
     # explicit tablet models
-    - regex: '(?:SAMSUNG-)?GT-P1000M?'
+    - regex: '(?:SAMSUNG-)?GT-N5100'
+      device: 'tablet'
+      model: 'GALAXY Note 8.0"'
+    - regex: '(?:SAMSUNG-)?GT-N5110'
+      device: 'tablet'
+      model: 'GALAXY Note 8.0" WiFi'
+    - regex: '(?:SAMSUNG-)?GT-N5120'
+      device: 'tablet'
+      model: 'GALAXY Note 8.0" LTE'
+    - regex: '(?:SAMSUNG-)?GT-N8000'
+      device: 'tablet'
+      model: 'GALAXY Note 10.1"'
+    - regex: '(?:SAMSUNG-)?GT-N8010'
+      device: 'tablet'
+      model: 'GALAXY Note 10.1" WiFi'
+    - regex: '(?:SAMSUNG-)?GT-N8020'
+      device: 'tablet'
+      model: 'GALAXY Note 10.1" LTE'
+    - regex: '(?:SAMSUNG-)?GT-P1000M?|SCH-I800'
       device: 'tablet'
       model: 'GALAXY Tab'
     - regex: '(?:SAMSUNG-)?GT-P3100B?'
@@ -1684,7 +1963,7 @@ Samsung:
     - regex: '(?:SAMSUNG-)?GT-P311[03]'
       device: 'tablet'
       model: 'GALAXY Tab 2 7" WiFi'
-    - regex: '(?:SAMSUNG-)?GT-P5100'
+    - regex: '(?:SAMSUNG-)?GT-P5100|SCH-I915'
       device: 'tablet'
       model: 'GALAXY Tab 2 10.1"'
     - regex: '(?:SAMSUNG-)?GT-P511[03]'
@@ -1759,9 +2038,15 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T315'
       device: 'tablet'
       model: 'GALAXY Tab 3 8.0" LTE'
+    - regex: '(?:SAMSUNG-)?SM-T335'
+      device: 'tablet'
+      model: 'GALAXY Tab 8.0" LTE'
     - regex: '(?:SAMSUNG-)?SM-T520'
       device: 'tablet'
       model: 'GALAXY TabPRO 10.1" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T535'
+      device: 'tablet'
+      model: 'GALAXY Tab 4 10.1" LTE'
     - regex: '(?:SAMSUNG-)?SM-T320'
       device: 'tablet'
       model: 'GALAXY TabPRO 8.4" WiFi'
@@ -1774,11 +2059,77 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-T530(?:NU)?'
       device: 'tablet'
       model: 'GALAXY Tab 4 10.1" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T700'
+      device: 'tablet'
+      model: 'GALAXY Tab S 8.4" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T705'
+      device: 'tablet'
+      model: 'GALAXY Tab S 8.4" LTE'
+    - regex: '(?:SAMSUNG-)?SM-T800'
+      device: 'tablet'
+      model: 'GALAXY Tab S 10.5" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-T805'
+      device: 'tablet'
+      model: 'GALAXY Tab S 10.5" LTE'
     - regex: '(?:SAMSUNG-)?SM-T900'
       device: 'tablet'
       model: 'GALAXY TabPRO 12.2" WiFi'
 
     # explicit smartphone models
+    - regex: '(?:SAMSUNG-)?GT-I8190'
+      model: 'GALAXY S III mini'
+    - regex: '(?:SAMSUNG-)?GT-I9105'
+      model: 'GALAXY S II Plus'
+    - regex: '(?:SAMSUNG-)?(?:GT-I9195|SCH-I435)'
+      model: 'GALAXY S4 mini'
+    - regex: '(?:SAMSUNG-)?GT-I9205'
+      model: 'GALAXY MEGA'
+    - regex: '(?:SAMSUNG-)?GT-I9295'
+      model: 'GALAXY S4 ACTIVE'
+    - regex: '(?:SAMSUNG-)?(?:GT-I9300|SCH-I535|SCH-L710)'
+      model: 'GALAXY S III'
+    - regex: '(?:SAMSUNG-)?(?:GT-I9305|SCH-R530)'
+      model: 'GALAXY S III LTE'
+    - regex: '(?:SAMSUNG-)?(?:GT-I9505|SCH-I545|SCH-I959|SCH-R970)'
+      model: 'GALAXY S4'
+    - regex: '(?:SAMSUNG-)?GT-I9506'
+      model: 'GALAXY S4 with LTE+'
+    - regex: '(?:SAMSUNG-)?(?:(?:GT-)?N7100|SCH-I605|SCH-N719|SCH-R950|SPH-L900)'
+      model: 'GALAXY Note II'
+    - regex: '(?:SAMSUNG-)?GT-N7105'
+      model: 'GALAXY Note II LTE'
+    - regex: '(?:SAMSUNG-)?GT-S5280'
+      model: 'GALAXY STAR'
+    - regex: '(?:SAMSUNG-)?GT-S5301'
+      model: 'GALAXY POCKET Plus'
+    - regex: '(?:SAMSUNG-)?GT-S5310'
+      model: 'GALAXY POCKET Neo'
+    - regex: '(?:SAMSUNG-)?GT-S5360'
+      model: 'GALAXY Y Hello Kitty'
+    - regex: '(?:SAMSUNG-)?GT-S6310'
+      model: 'GALAXY Young'
+    - regex: '(?:SAMSUNG-)?GT-S6312'
+      model: 'GALAXY Young DUOS'
+    - regex: '(?:SAMSUNG-)?GT-S6790'
+      model: 'GALAXY FAME Lite with NFC'
+    - regex: '(?:SAMSUNG-)?GT-S6810'
+      model: 'GALAXY FAME'
+    - regex: '(?:SAMSUNG-)?GT-S7275'
+      model: 'GALAXY ACE 3'
+    - regex: '(?:SAMSUNG-)?GT-S7390'
+      model: 'GALAXY Trend Lite'
+    - regex: '(?:SAMSUNG-)?GT-S7500'
+      model: 'GALAXY ACE Plus'
+    - regex: '(?:SAMSUNG-)?(?:GT-S7560|SCH-I699)'
+      model: 'GALAXY Trend'
+    - regex: '(?:SAMSUNG-)?(?:GT-S7562|SCH-I919)'
+      model: 'GALAXY S DUOS'
+    - regex: '(?:SAMSUNG-)?GT-S7580'
+      model: 'GALAXY Trend Plus'
+    - regex: '(?:SAMSUNG-)?GT-S7582'
+      model: 'GALAXY DUOS 2'
+    - regex: '(?:SAMSUNG-)?GT-S7710'
+      model: 'GALAXY Xcover 2'
     - regex: '(?:SAMSUNG-)?SM-C101'
       model: 'GALAXY S4 zoom'
     - regex: '(?:SAMSUNG-)?SM-C115'
@@ -1789,22 +2140,38 @@ Samsung:
       model: 'GALAXY CORE LTE'
     - regex: '(?:SAMSUNG-)?SM-G3815'
       model: 'GALAXY EXPRESS II'
+    - regex: '(?:SAMSUNG-)?SM-G7105'
+      model: 'GALAXY Grand 2'
+    - regex: '(?:SAMSUNG-)?SM-G800'
+      model: 'GALAXY S5 mini'
     - regex: '(?:SAMSUNG-)?SM-G9009D'
       model: 'GALAXY S5 Dual-SIM'
     - regex: '(?:SAMSUNG-)?SM-G900'
       model: 'GALAXY S5'
     - regex: '(?:SAMSUNG-)?SM-N7502'
-      model: 'Galaxy Note 3 Neo Duos'
+      model: 'GALAXY Note 3 Neo Duos'
     - regex: '(?:SAMSUNG-)?SM-N750[L50]?'
-      model: 'Galaxy Note 3 Neo'
+      model: 'GALAXY Note 3 Neo'
     - regex: '(?:SAMSUNG-)?SM-N9002'
       model: 'GALAXY Note 3 Duos'
     - regex: '(?:SAMSUNG-)?SM-N900(?:[05689][VQ]?|[AKLPSTV]|W8)?'
       model: 'GALAXY Note 3'
+    - regex: '(?:SAMSUNG-)?SCH-I200'
+      model: 'GALAXY Stellar'
+    - regex: '(?:SAMSUNG-)?SCH-I829'
+      model: 'GALAXY Style Duos'
+    - regex: '(?:SAMSUNG-)?(?:SGH-S730|SCH-R740)'
+      model: 'GALAXY Discover'
+    - regex: '(?:SAMSUNG-)?SCH-S738'
+      model: 'GALAXY Centura'
+
+    # explicit phablet models
     - regex: '(?:SAMSUNG-)?SM-N910'
       model: 'GALAXY Note 4'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?SM-N915'
       model: 'GALAXY Note 4 Edge'
+      device: 'phablet'
 
     # general detections
     - regex: '(?:SAMSUNG-)?(GT-(P|N8|N5)[0-9]+[a-z]?)'
@@ -1816,16 +2183,16 @@ Samsung:
       model: 'GALAXY Note 3'
     - regex: 'SC-04E'
       model: 'GALAXY S4'
-    - regex: '(?:SAMSUNG-)?((?:SM-[TNP]|GT-P)[a-z0-9_-]+)'
+    - regex: '(?:SAMSUNG-)?((?:SM-[TNP]|GT-P)[a-z0-9_\-]+)'
       device: 'tablet'
       model: '$1'
-    - regex: '((?:SCH|SGH|SPH|SHV|SHW|GT|SM)-[a-z0-9_-]+)'
+    - regex: '((?:SCH|SGH|SPH|SHV|SHW|GT|SM)-[a-z0-9_\-]+)'
       model: '$1'
     - regex: 'SAMSUNG[\-][ ]?([a-z0-9]+[\-_][a-z0-9]+)'
       model: '$1'
     - regex: 'SAMSUNG;[ ]?([a-z0-9]+[\-_][a-z0-9]+)'
       model: '$1'
-    - regex: 'SAMSUNG[ _/-]?([a-z0-9\-]+)'
+    - regex: 'SAMSUNG[ _/\-]?([a-z0-9\-]+)'
       model: '$1'
     - regex: 'SAMSUNG;[ ]?([a-z0-9 ]+)'
       model: '$1'
@@ -1845,6 +2212,46 @@ Samsung:
     - regex: 'sam([rua][0-9]+)'
       model: 'SCH-$1'
 
+# Smartfren
+Smartfren:
+  regex: 'Smartfren|Androtab|Andromax|PD6D1J|AD682J|AD68[89]G|AD6B1H|AD9A1H|AD682H|AD683G'
+  device: 'smartphone'
+  models:
+    # explicit tablet models
+    - regex: 'S7 Build'
+      model: 'Andromax Tab 7.0'
+      device: 'tablet'
+
+    # explicit smartphone models
+    - regex: 'PD6D1J'
+      model: 'Andromax V3s'
+    - regex: 'AD682J'
+      model: 'Andromax T'
+    - regex: 'AD688G'
+      model: 'Andromax C2'
+    - regex: 'AD689G'
+      model: 'Andromax i3'
+    - regex: 'AD682H'
+      model: 'Andromax i3s'
+    - regex: 'AD6B1H'
+      model: 'Andromax G2 Hot'
+    - regex: 'AD9A1H'
+      model: 'Andromax G2'
+    - regex: 'AD683G'
+      model: 'Andromax I'
+    - regex: 'New Andromax-i'
+      model: 'New Andromax I'
+
+    - regex: 'Andromax[ _\-]([^/;]+) Build'
+      model: 'Andromax $1'
+    - regex: 'Andromax[ _\-]([a-z0-9]+)'
+      model: 'Andromax $1'
+    - regex: 'Smartfren[ _\-]([^/;]+) Build'
+      model: '$1'
+    - regex: '(Androtab[^/;]+) Build'
+      model: '$1'
+      device: 'tablet'
+
 # SuperSonic
 SuperSonic:
   regex: '(SC-[0-9]+[a-z]+)'
@@ -1879,9 +2286,23 @@ Pantech:
 
 #Polaroid
 Polaroid:
-  regex: 'Polaroid|(?:PMID|MIDC)[0-9a-z]+ Build|MID(?:1014|0714)'
+  regex: 'Polaroid|(?:PMID|MIDC)[0-9a-z]+ Build|MID(?:1014|0714)|PRO[VG]?(?:[0-9]{3,}[a-z]*|[0-9]{2}[a-z])'
   device: 'tablet'
   models:
+    # explicit smartphone models
+    - regex: 'PRO4611(?:PR201)?'
+      model: 'Pro4611'
+      device: 'smartphone'
+    - regex: 'PROV400'
+      model: 'Agate'
+      device: 'smartphone'
+    - regex: 'PROV350'
+      model: 'ProV350'
+      device: 'smartphone'
+
+    - regex: 'PRO([VG]?(?:[0-9]{3,}[a-z]*|[0-9]{2}[a-z]))'
+      model: 'Pro$1'
+      device: 'smartphone'
     - regex: '(MID(?:1014|0714))'
       model: '$1'
     - regex: '((?:PMID|MIDC)[0-9a-z]+) Build'
@@ -1975,9 +2396,9 @@ Spice:
   regex: 'Spice'
   device: 'smartphone'
   models:
-    - regex: 'Spice[ _-]?([^/;]+)(?:[\)]| Build)'
+    - regex: 'Spice[ _\-]?([^/;]+)(?:[\)]| Build)'
       model: '$1'
-    - regex: 'Spice[ _-]?([^/;]+)(?:/|$)'
+    - regex: 'Spice[ _\-]?([^/;]+)(?:/|$)'
       model: '$1'
 
 # Sharp
@@ -2018,88 +2439,6 @@ Softbank:
     - regex: 'J-PHONE/[0-9]\.[0-9]/([a-z0-9\-]+)'
       model: '$1'
 
-# Sony
-Sony:
-  regex: 'Sony(?! ?Ericsson)|SGP|Xperia|C1[569]0[45]|C2[01]0[45]|C2305|C530[236]|C5502|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]|D530[36]|D5322|D5503|D65(?:0[23]|43)|LT22i|XL39H'
-  device: 'smartphone'
-  models:
-    # explicit smartphone models
-    - regex: '(?:Sony)?C150[45]'
-      model: 'Xperia E'
-    - regex: '(?:Sony)?C160[45]'
-      model: 'Xperia E Dual'
-    - regex: '(?:Sony)?C190[45]'
-      model: 'Xperia M'
-    - regex: '(?:Sony)?C200[45]'
-      model: 'Xperia M Dual'
-    - regex: '(?:Sony)?C210[45]'
-      model: 'Xperia L'
-    - regex: '(?:Sony)?C2305'
-      model: 'Xperia C'
-    - regex: '(?:Sony)?C530[236]'
-      model: 'Xperia SP'
-    - regex: '(?:Sony)?C5502'
-      model: 'Xperia ZR'
-    - regex: '(?:Sony)?C650[236]'
-      model: 'Xperia ZL'
-    - regex: '(?:Sony)?C66(?:0[236]|16)'
-      model: 'Xperia Z'
-    - regex: '(?:Sony)?(?:C68(?:0[26]|[34]3)|XL39H)'
-      model: 'Xperia Z Ultra'
-    - regex: '(?:Sony)?C69(?:0[236]|16|43)'
-      model: 'Xperia Z1'
-    - regex: '(?:Sony)?D200[45]'
-      model: 'Xperia E1'
-    - regex: '(?:Sony)?D21(?:0[45]|14)'
-      model: 'Xperia E1 Dual'
-    - regex: '(?:Sony)?D22(?:0[236]|43)'
-      model: 'Xperia E3'
-    - regex: '(?:Sony)?D2212'
-      model: 'Xperia E3 Dual'
-    - regex: '(?:Sony)?D2302'
-      model: 'Xperia M2 Dual'
-    - regex: '(?:Sony)?D230[356]'
-      model: 'Xperia M2'
-    - regex: '(?:Sony)?D530[36]'
-      model: 'Xperia T2 Ultra'
-    - regex: '(?:Sony)?D5322'
-      model: 'Xperia T2 Ultra Dual'
-    - regex: '(?:Sony)?D5503'
-      model: 'Xperia Z1 Compact'
-    - regex: '(?:Sony)?D65(?:0[23]|43)'
-      model: 'Xperia Z2'
-
-    # explicit tablet models
-    - regex: 'SGP(?:311|312|321) Build'
-      model: 'Xperia Tablet Z'
-      device: 'tablet'
-    - regex: 'SGP(?:511|512|521) Build'
-      model: 'Xperia Tablet Z2'
-      device: 'tablet'
-    - regex: 'SGP(?:6[24]1) Build'
-      model: 'Xperia Tablet Z3 Compact'
-      device: 'tablet'
-    - regex: 'SGPT(?:12|121|122|123|13|131|132|133) Build'
-      model: 'Xperia Tablet S'
-      device: 'tablet'
-
-    # general detections
-    - regex: 'Sony (Tablet[^/;]*) Build'
-      model: '$1'
-      device: 'tablet'
-    - regex: '(SGP[^/;]*) Build'
-      model: '$1'
-      device: 'tablet'
-    - regex: 'Xperia ([^/;]*Tablet[^/;]*) Build'
-      model: 'Xperia $1'
-      device: 'tablet'
-    - regex: 'Xperia ([^;/]+) Build'
-      model: 'Xperia $1'
-    - regex: 'Sony[ ]?([^/;]*) Build'
-      model: '$1'
-    - regex: 'Sony[ ]?([a-z0-9\-]+)'
-      model: '$1'
-
 # Kindle
 Kindle:
   regex: 'KF(?:OT|TT|JWI|JWA|SOWI|APWI|THWI) Build|Kindle|Silk/\d+\.\d+'
@@ -2161,7 +2500,7 @@ Tecno Mobile:
   models:
     - regex: 'Tecno ([^;/]+) Build'
       model: '$1'
-    - regex: 'Tecno_?([a-z0-9_-]+)'
+    - regex: 'Tecno_?([a-z0-9_\-]+)'
       model: '$1'
 
 # teXet
@@ -2274,11 +2613,11 @@ Wiko:
   models:
     - regex: '(?:Wiko-)?CINK(.*) Build'
       model: 'Cink$1'
-    - regex: '(?:Wiko-)?CINK[ _-]([a-z0-9]+)'
+    - regex: '(?:Wiko-)?CINK[ _\-]([a-z0-9]+)'
       model: 'Cink $1'
     - regex: '(?:Wiko-)?IGGY(.*) Build'
       model: 'Iggy$1'
-    - regex: '(?:Wiko-)?IGGY[ _-]([a-z0-9]+)'
+    - regex: '(?:Wiko-)?IGGY[ _\-]([a-z0-9]+)'
       model: 'Iggy $1'
     - regex: 'Stairway'
       model: 'Stairway'
@@ -2306,9 +2645,9 @@ Wolder:
   regex: 'miSmart|miTab'
   device: 'smartphone'
   models:
-    - regex: 'miSmart[ -_]?([^/]+) Build'
+    - regex: 'miSmart[ \-_]?([^/]+) Build'
       model: 'miSmart $1'
-    - regex: 'miTab[ -_]?([^/]+) Build'
+    - regex: 'miTab[ \-_]?([^/]+) Build'
       device: 'tablet'
       model: 'miTab $1'
 
@@ -2347,9 +2686,9 @@ Toshiba:
   regex: 'Toshiba|portalmmm/[12].0 TS'
   device: 'smartphone'
   models:
-    - regex: 'Toshiba[ /_\-]?([a-z0-9_ -]+) Build'
+    - regex: 'Toshiba[ /_\-]?([a-z0-9_ \-]+) Build'
       model: '$1'
-    - regex: 'Toshiba[ /_\-]?([a-z0-9_-]+)'
+    - regex: 'Toshiba[ /_\-]?([a-z0-9_\-]+)'
       model: '$1'
     - regex: 'portalmmm/[12].0 (TS[a-z0-9 ]+)'
       model: '$1'
@@ -2410,3 +2749,4 @@ ZTE:
 #Nokia:
 #  regex: 'Symbian'
 #  device: 'feature phone'
+