device_detector 1.0.2 → 1.0.6

data/regexes/oss.yml

@@ -1,26 +1,46 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
 ##########
-# Tizen
+# GridOS (https://web.archive.org/web/20111123141630/http://fusiongarage.com/grid-os/about)
 ##########
-- regex: 'Tizen[ /]?(\d+[\.\d]+)?'
-  name: 'Tizen'
+- regex: 'Grid OS (\d+[\.\d]+)'
+  name: 'GridOS'
   version: '$1'
 
-
+##########
+# Caixa Mágica (https://caixamagica.pt/)
+##########
+- regex: 'CaixaMagica'
+  name: 'Caixa Mágica'
+  version: ''
 
 ##########
-## Sailfish OS
-###########
-- regex: 'Sailfish|Jolla'
-  name: 'Sailfish OS'
+# Mageia (https://www.mageia.org/en/)
+##########
+- regex: 'Mageia; Linux'
+  name: 'Mageia'
   version: ''
 
+##########
+# Whale OS (https://www.zeasn.com/)
+##########
+- regex: '(?:WH|WhaleTV/)(\d+[\.\d]+)'
+  name: 'Whale OS'
+  version: '$1'
+
+##########
+# Tizen
+##########
+- regex: 'Tizen[ /]?(\d+[\.\d]+)?'
+  name: 'Tizen'
+  version: '$1'
+
+
 ##########
 # YunOS (Android based)
 ##########
@@ -31,11 +51,14 @@
 ##########
 # Windows Mobile
 ##########
-- regex: 'Windows Phone (?:OS)?[ ]?(\d+[\.\d]+)'
+- regex: 'Windows Phone;FBSV/(\d+[\.\d]+)'
   name: 'Windows Phone'
   version: '$1'
-  
-  
+
+- regex: '(?:Windows Phone (?:OS)?|wds)[ /]?(\d+[\.\d]+)'
+  name: 'Windows Phone'
+  version: '$1'
+
 - regex: 'XBLWP7|Windows Phone'
   name: 'Windows Phone'
   version: ''
@@ -43,17 +66,15 @@
 - regex: 'Windows CE(?: (\d+[\.\d]+))?'
   name: 'Windows CE'
   version: '$1'
-  
-  
+
 - regex: '(?:IEMobile|Windows ?Mobile)(?: (\d+[\.\d]+))?'
   name: 'Windows Mobile'
   version: '$1'
-  
-  
+
 - regex: 'Windows NT 6.2; ARM;'
   name: 'Windows RT'
   version: ''
-  
+
 - regex: 'Windows NT 6.3; ARM;'
   name: 'Windows RT'
   version: '8.1'
@@ -75,6 +96,10 @@
 ##########
 # Custom Android Roms
 ##########
+- regex: 'HarmonyOS(?:[/ ](\d+[\.\d]+))?'
+  name: 'HarmonyOS'
+  version: '$1'
+
 - regex: 'RazoDroiD(?: v(\d+[\.\d]*))?'
   name: 'RazoDroiD'
   version: '$1'
@@ -95,15 +120,50 @@
   name: 'Fire OS'
   version: '$1'
 
+- regex: 'AFTSO001'
+  name: 'Fire OS'
+  version: '7'
+
+- regex: 'FydeOS'
+  name: 'FydeOS'
+  version: ''
+
 ##########
 # Android
 ##########
-- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]*)'
+- regex: '(?:Podbean|Podimo)(?:.+)?/Android'
+  name: 'Android'
+  version: ''
+
+- regex: 'Pinterest for Android/.+; (\d(?:[\d\.]+)?)\)$'
+  name: 'Android'
+  version: '$1'
+
+- regex: 'Android; (\d+[\.\d]*); Mobile;'
+  name: 'Android'
+  version: '$1'
+
+- regex: '[ ]([\d\.]+)\) AppleWebKit.*ROBLOX Android App'
+  name: 'Android'
+  version: '$1'
+
+- regex: '(?:(?:Orca-)?Android|Adr)[ /]?(?:[a-z]+ )?(\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+- regex: '(?:Allview_TX1_Quasar|Cosmote_My_mini_Tab) (\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+- regex: 'Android ?(?:jelly bean|Kit Kat|S.O. Ginger Bread|The FireCyano|:) (\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+- regex: '(?:Orca-Android|FB4A).*FBSV/(\d+[\.\d]*);'
   name: 'Android'
   version: '$1'
-  
-  
-- regex: 'Android|Silk-Accelerated=[a-z]{4,5}'
+
+- regex: ' Adr |Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
 
@@ -111,11 +171,26 @@
   name: 'Android'
   version: '$1'
 
-- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe'
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|.+K_?Android_?TV_|Sonos/.+\(ACR_'
   name: 'Android'
   version: ''
-  
-  
+
+- regex: 'Linux; Andr0id[; ](\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+# Inverted Android
+- regex: 'Linux; diordnA[; ](\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+##########
+## Sailfish OS
+###########
+- regex: 'Sailfish|Jolla'
+  name: 'Sailfish OS'
+  version: ''
+
 ##########
 # AmigaOS
 ##########
@@ -144,9 +219,49 @@
   name: 'MTK / Nucleus'
   version: '$1'
 
+##########
+# MRE / MAUI Runtime Environment
+##########
+- regex: 'MRE/(\d+)\.(\d+).*;MAUI'
+  name: 'MRE'
+  version: '$1.$2'
+
 ##########
 # Linux
 ##########
+# DVKBuntu (https://www.dvkbuntu.org/)
+- regex: 'dvkbuntu'
+  name: 'DVKBuntu'
+  version: ''
+
+# Lumin OS (https://developer.magicleap.com/en-us/learn/guides/lumin-os-release-notes-summary)
+- regex: 'Helio/(\d+[\.\d]+)'
+  name: 'Lumin OS'
+  version: '$1'
+
+# HasCodingOS (https://forum.hascoding.com/HasCodingOS)
+- regex: 'HasCodingOs (\d+[\.\d]+)'
+  name: 'HasCodingOS'
+  version: '$1'
+
+# PCLinuxOS (https://www.pclinuxos.com/)
+- regex: 'PCLinuxOS/(\d+[\.\d]+)'
+  name: 'PCLinuxOS'
+  version: '$1'
+
+- regex: '(Ordissimo|webissimo3)'
+  name: 'Ordissimo'
+  version: ''
+
+# Fenix (https://fenixlinux.com/)
+- regex: '(?:Win|Sistema )Fenix'
+  name: 'Fenix'
+  version: ''
+
+- regex: 'TOS; Linux'
+  name: 'TmaxOS'
+  version: ''
+
 - regex: 'Maemo'
   name: 'Maemo'
   version: ''
@@ -163,16 +278,44 @@
   name: '$1'
   version: '$2'
 
-- regex: '(Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Sabayon|Slackware|SUSE|CentOS|BackTrack)(?:(?: Enterprise)? Linux)?(?:[ /\-](\d+[\.\d]+))?'
+- regex: 'Deepin[ /](\d+[\.\d]+)'
+  name: 'Deepin'
+  version: '$1'
+
+- regex: '(Debian|Knoppix|Mint(?! Browser)|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Sabayon|Slackware|SUSE|CentOS|BackTrack|Freebox)(?:(?: Enterprise)? Linux)?(?:[ /\-](\d+[\.\d]+))?'
   name: '$1'
   version: '$2'
 
+- regex: 'OS ROSA; Linux'
+  name: 'Rosa'
+  version: ''
+
 # generic linux match -> end of file
 
 ##########
 # webOS
 ##########
-- regex: '(?:webOS|Palm webOS)(?:/(\d+[\.\d]+))?'
+- regex: 'WEBOS(\d+[\.\d]+)'
+  name: 'webOS'
+  version: '$1'
+
+- regex: 'Web0S; Linux/SmartTV.+Chrome/68'
+  name: 'webOS'
+  version: '5'
+- regex: 'Web0S; Linux/SmartTV.+Chrome/53'
+  name: 'webOS'
+  version: '4'
+- regex: 'Web0S; Linux/SmartTV.+Chrome/38'
+  name: 'webOS'
+  version: '3'
+- regex: 'Web0S; Linux/SmartTV.+Safari/538'
+  name: 'webOS'
+  version: '2'
+- regex: 'Web0S; Linux/SmartTV.+Safari/537'
+  name: 'webOS'
+  version: '1'
+
+- regex: '(?:Web0S; .*WEBOS|webOS|web0S|Palm webOS|hpwOS)(?:[/]?(\d+[\.\d]+))?'
   name: 'webOS'
   version: '$1'
 
@@ -184,88 +327,86 @@
   name: 'palmOS'
   version: '$1'
 
-
 - regex: 'MorphOS(?:[ /](\d+[\.\d]+))?'
   name: 'MorphOS'
   version: '$1'
 
-  
+
 ##########
 # Windows
 ##########
+- regex: 'FBW.+FBSV/(\d+[\.\d]*);'
+  name: 'Windows'
+  version: '$1'
+
+- regex: 'mingw32'
+  name: 'Windows'
+  version: ''
+
+- regex: 'Windows/(\d+\.\d+)'
+  name: 'Windows'
+  version: '$1'
+
 - regex: 'CYGWIN_NT-10.0|Windows NT 10.0|Windows 10'
   name: 'Windows'
   version: '10'
 
-- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10'
+- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10|win10'
   name: 'Windows'
   version: '10'
-  
+
 - regex: 'CYGWIN_NT-6.3|Windows NT 6.3|Windows 8.1'
   name: 'Windows'
   version: '8.1'
 
-
 - regex: 'CYGWIN_NT-6.2|Windows NT 6.2|Windows 8'
   name: 'Windows'
   version: '8'
-  
-  
-- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7'
+
+- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7|win7'
   name: 'Windows'
   version: '7'
-  
-  
+
 - regex: 'CYGWIN_NT-6.0|Windows NT 6.0|Windows Vista'
   name: 'Windows'
   version: 'Vista'
-  
-  
+
 - regex: 'CYGWIN_NT-5.2|Windows NT 5.2|Windows Server 2003 / XP x64'
   name: 'Windows'
   version: 'Server 2003'
-  
-  
+
 - regex: 'CYGWIN_NT-5.1|Windows NT 5.1|Windows XP'
   name: 'Windows'
   version: 'XP'
-  
-  
+
 - regex: 'CYGWIN_NT-5.0|Windows NT 5.0|Windows 2000'
   name: 'Windows'
   version: '2000'
-  
-  
+
 - regex: 'CYGWIN_NT-4.0|Windows NT 4.0|WinNT|Windows NT'
   name: 'Windows'
   version: 'NT'
-  
-  
+
 - regex: 'CYGWIN_ME-4.90|Win 9x 4.90|Windows ME'
   name: 'Windows'
   version: 'ME'
-  
-  
+
 - regex: 'CYGWIN_98-4.10|Win98|Windows 98'
   name: 'Windows'
   version: '98'
-  
-  
+
 - regex: 'CYGWIN_95-4.0|Win32|Win95|Windows 95|Windows_95'
   name: 'Windows'
   version: '95'
-  
-  
+
 - regex: 'Windows 3.1'
   name: 'Windows'
   version: '3.1'
-  
-  
+
 - regex: 'Windows'
   name: 'Windows'
   version: ''
 
-
 ##########
 # Haiku OS
 ##########
@@ -273,27 +414,147 @@
   name: 'Haiku OS'
   version: ''
 
-  
+##########
+# tvOS (https://developer.apple.com/tvos/)
+##########
+- regex: 'Apple TV.*CPU (?:iPhone )?OS ((?:9|1[0-5])_\d+(?:[_\.]\d+)*)'
+  name: 'tvOS'
+  version: '$1'
+
+- regex: 'iOS(?:; |/)((?:9|1[0-5]).\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
+  name: 'tvOS'
+  version: '$1'
+
+##########
+# watchOS (https://developer.apple.com/watchos/)
+##########
+- regex: '(?:Watch1,[12]/|Watch OS,|watchOS[ /])(\d+[\.\d]*)'
+  name: 'watchOS'
+  version: '$1'
+
+##########
+# iPadOS (https://www.apple.com/ipados/)
+##########
+- regex: 'FBMD/iPad;.*FBSV/ ?(1[345]).(\d+[\.\d]*);'
+  name: 'iPadOS'
+  version: '$1.$2'
+
+- regex: 'iPad/(1[345]).(\d+[\.\d]*)'
+  name: 'iPadOS'
+  version: '$1.$2'
+
+- regex: 'iPad.+CPU OS ((1[345])+(?:[_\.]\d+)*)'
+  name: 'iPadOS'
+  version: '$1'
+
+- regex: 'iOS/(1[345]).(\d+[\.\d]*).+Apple/iPad'
+  name: 'iPadOS'
+  version: '$1.$2'
+
 ##########
 # iOS
 ##########
-- regex: 'CFNetwork/889'
+- regex: 'iPad/([89]|1[012]).(\d+[\.\d]*)'
   name: 'iOS'
-  version: '11.1'
+  version: '$1.$2'
 
-- regex: 'CFNetwork/887.*(x86_64)'
-  name: 'Mac'
-  version: '10.13'
+- regex: 'Pinterest for iOS/.+; (\d(?:[\d\.]+)?)\)$'
+  name: 'iOS'
+  version: '$1'
 
-- regex: 'CFNetwork/887'
+- regex: 'CFNetwork/.+ Darwin/21.0.0(?!.*x86_64)'
   name: 'iOS'
-  version: '11.0'
+  version: '15.0'
 
-- regex: 'CFNetwork/811.*(x86_64)'
-  name: 'Mac'
-  version: '10.12'
+- regex: 'CFNetwork/.+ Darwin/20.6.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.7'
+
+- regex: 'CFNetwork/.+ Darwin/20.5.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.6'
+
+- regex: 'CFNetwork/.+ Darwin/20.4.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.5'
+
+- regex: 'CFNetwork/.+ Darwin/20.3.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.4'
+
+- regex: 'CFNetwork/.+ Darwin/20.2.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.3'
+
+- regex: 'CFNetwork/.+ Darwin/20.1.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.2'
+
+- regex: 'CFNetwork/.+ Darwin/20.0.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '14.0'
+
+- regex: 'CFNetwork/.+ Darwin/19.6.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '13.6'
+
+- regex: 'CFNetwork/.+ Darwin/19.5.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '13.5'
+
+- regex: 'CFNetwork/.+ Darwin/19.4.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '13.4'
+
+- regex: 'CFNetwork/.+ Darwin/19.3.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '13.3.1'
+
+- regex: 'CFNetwork/.+ Darwin/19.2.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '13.3'
+
+- regex: 'CFNetwork/.+ Darwin/19.0.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '13.0'
+
+- regex: 'CFNetwork/.+ Darwin/18.7.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '12.4'
+
+- regex: 'CFNetwork/.+ Darwin/18.6.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '12.3'
+
+- regex: 'CFNetwork/.+ Darwin/18.5.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '12.2'
+
+- regex: 'CFNetwork/.+ Darwin/18.2.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '12.1'
+
+- regex: 'CFNetwork/.+ Darwin/18.0.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '12.0'
+
+- regex: 'CFNetwork/.+ Darwin/17.7.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '11.4.1'
+
+- regex: 'CFNetwork/.+ Darwin/17.6.0(?!.*x86_64)'
+  name: 'iOS'
+  version: '11.4'
+
+- regex: 'CFNetwork/889(?!.*x86_64)'
+  name: 'iOS'
+  version: '11.1'
+
+- regex: 'CFNetwork/887(?!.*x86_64)'
+  name: 'iOS'
+  version: '11.0'
 
-- regex: 'CFNetwork/811'
+- regex: 'CFNetwork/811(?!.*x86_64)'
   name: 'iOS'
   version: '10.3'
 
@@ -409,47 +670,261 @@
   name: 'iOS'
   version: '3.1'
 
+- regex: 'iPhone/(\d+[\.\d]*) hw/'
+  name: 'iOS'
+  version: '$1'
+
+- regex: 'iOS(\d+\.\d+\.\d+)'
+  name: 'iOS'
+  version: '$1'
+
+- regex: 'iOS(\d+)\.(\d+)0'
+  name: 'iOS'
+  version: '$1.$2'
+
+- regex: 'iPhone OS ([0-9]{1})([0-9]{1})([0-9]{1})'
+  name: 'iOS'
+  version: '$1.$2.$3'
+
 - regex: '(?:CPU OS|iPh(?:one)?[ _]OS|iOS)[ _/](\d+(?:[_\.]\d+)*)'
   name: 'iOS'
   version: '$1'
 
+- regex: '(?:FBIOS|Messenger(?:Lite)?ForiOS).*FBSV/ ?(\d+[\.\d]*);'
+  name: 'iOS'
+  version: '$1'
+
 - regex: '(?:Apple-)?(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)?'
   name: 'iOS'
   version: '$1'
 
-- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher|RSSRadio/'
+- regex: '(?:Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|\(iOS\)|iOS; Opera|Overcast|Castro|Podcat|iCatcher|RSSRadio/|MobileSafari/)(?!.*x86_64)'
   name: 'iOS'
   version: ''
 
-- regex: 'iTunes-(iPod|iPad|iPhone)/(?:[\d\.]+)'
+- regex: 'iTunes-(AppleTV|iPod|iPad|iPhone)/(?:[\d\.]+)'
   name: 'iOS'
   version: ''
 
+- regex: 'iOS/Version ([\d\.]+)'
+  name: 'iOS'
+  version: '$1'
+
+- regex: 'Sonos/.+\(ICRU_'
+  name: 'iOS'
+  version: ''
 
 ##########
 # Mac
 ##########
+- regex: 'CFNetwork/.+ Darwin/20.2.0.*(x86_64)|(x86_64-apple-)?darwin20.2.0'
+  name: 'Mac'
+  version: '11.1'
+
+- regex: 'CFNetwork/.+ Darwin/20.[01].0.*(x86_64)|(x86_64-apple-)?darwin20.[01].0'
+  name: 'Mac'
+  version: '11.0'
+
+- regex: 'CFNetwork/.+ Darwin/19.6.0.*(x86_64)|(x86_64-apple-)?darwin19.6.0'
+  name: 'Mac'
+  version: '10.15.6'
+
+- regex: 'CFNetwork/.+ Darwin/19.5.0.*(x86_64)|(x86_64-apple-)?darwin19.5.0'
+  name: 'Mac'
+  version: '10.15.5'
+
+- regex: 'CFNetwork/.+ Darwin/19.4.0.*(x86_64)|(x86_64-apple-)?darwin19.4.0'
+  name: 'Mac'
+  version: '10.15.4'
+
+- regex: 'CFNetwork/.+ Darwin/19.3.0.*(x86_64)|(x86_64-apple-)?darwin19.3.0'
+  name: 'Mac'
+  version: '10.15.3'
+
+- regex: 'CFNetwork/.+ Darwin/19.2.0.*(x86_64)|(x86_64-apple-)?darwin19.2.0'
+  name: 'Mac'
+  version: '10.15.2'
+
+- regex: 'CFNetwork/(?:108[258]|109[18]|1103).*(x86_64)'
+  name: 'Mac'
+  version: '10.15'
+
+- regex: 'CFNetwork/.+ Darwin/18.2.0.*(x86_64)|(x86_64-apple-)?darwin18.2.0'
+  name: 'Mac'
+  version: '10.14.1'
+
+- regex: 'CFNetwork/(?:96[29]|97[14568]).*(x86_64)'
+  name: 'Mac'
+  version: '10.14'
+
+- regex: 'CFNetwork/.+ Darwin/17.7.0.*(x86_64)|(x86_64-apple-)?darwin17.7.0'
+  name: 'Mac'
+  version: '10.13.6'
+
+- regex: 'CFNetwork/.+ Darwin/17.6.0.*(x86_64)|(x86_64-apple-)?darwin17.6.0'
+  name: 'Mac'
+  version: '10.13.5'
+
+- regex: 'CFNetwork/.+ Darwin/17.5.0.*(x86_64)|(x86_64-apple-)?darwin17.5.0'
+  name: 'Mac'
+  version: '10.13.4'
+
+- regex: 'CFNetwork/.+ Darwin/17.4.0.*(x86_64)|(x86_64-apple-)?darwin17.4.0'
+  name: 'Mac'
+  version: '10.13.3'
+
+- regex: 'CFNetwork/.+ Darwin/17.3.0.*(x86_64)|(x86_64-apple-)?darwin17.3.0'
+  name: 'Mac'
+  version: '10.13.2'
+
+- regex: 'CFNetwork/.+ Darwin/17.2.0.*(x86_64)|(x86_64-apple-)?darwin17.2.0'
+  name: 'Mac'
+  version: '10.13.1'
+
+- regex: 'CFNetwork/(?:887|889|893|897|901|902).*(x86_64)'
+  name: 'Mac'
+  version: '10.13'
+
+- regex: 'CFNetwork/.+ Darwin/16.7.0.*(x86_64)|(x86_64-apple-)?darwin16.7.0'
+  name: 'Mac'
+  version: '10.12.6'
+
+- regex: 'CFNetwork/.+ Darwin/16.6.0.*(x86_64)|(x86_64-apple-)?darwin16.6.0'
+  name: 'Mac'
+  version: '10.12.5'
+
+- regex: 'CFNetwork/.+ Darwin/16.5.0.*(x86_64)|(x86_64-apple-)?darwin16.5.0'
+  name: 'Mac'
+  version: '10.12.4'
+
+- regex: 'CFNetwork/.+ Darwin/16.3.0.*(x86_64)|(x86_64-apple-)?darwin16.3.0'
+  name: 'Mac'
+  version: '10.12.3'
+
+- regex: 'CFNetwork/.+ Darwin/16.2.0.*(x86_64)|(x86_64-apple-)?darwin16.2.0'
+  name: 'Mac'
+  version: '10.12.2'
+
+- regex: 'CFNetwork/.+ Darwin/16.1.0.*(x86_64)|(x86_64-apple-)?darwin16.1.0'
+  name: 'Mac'
+  version: '10.12.1'
+
+- regex: 'CFNetwork/811.*(x86_64)'
+  name: 'Mac'
+  version: '10.12'
 
 - regex: 'CFNetwork/807'
   name: 'Mac'
   version: '10.12'
 
+- regex: 'CFNetwork/.+ Darwin/15.6.0.*(x86_64)|(x86_64-apple-)?darwin15.6.0'
+  name: 'Mac'
+  version: '10.11.6'
+
+- regex: 'CFNetwork/.+ Darwin/15.5.0.*(x86_64)|(x86_64-apple-)?darwin15.5.0'
+  name: 'Mac'
+  version: '10.11.5'
+
+- regex: 'CFNetwork/.+ Darwin/15.4.0.*(x86_64)|(x86_64-apple-)?darwin15.4.0'
+  name: 'Mac'
+  version: '10.11.4'
+
+- regex: 'CFNetwork/.+ Darwin/15.3.0.*(x86_64)|(x86_64-apple-)?darwin15.3.0'
+  name: 'Mac'
+  version: '10.11.3'
+
+- regex: 'CFNetwork/.+ Darwin/15.2.0.*(x86_64)|(x86_64-apple-)?darwin15.2.0'
+  name: 'Mac'
+  version: '10.11.2'
+
 - regex: 'CFNetwork/760'
   name: 'Mac'
   version: '10.11'
 
+- regex: 'CFNetwork/.+ Darwin/14.5.0.*(x86_64)|(x86_64-apple-)?darwin14.5.0'
+  name: 'Mac'
+  version: '10.10.5'
+
+- regex: 'CFNetwork/.+ Darwin/14.4.0.*(x86_64)|(x86_64-apple-)?darwin14.4.0'
+  name: 'Mac'
+  version: '10.10.4'
+
+- regex: 'CFNetwork/.+ Darwin/14.3.0.*(x86_64)|(x86_64-apple-)?darwin14.3.0'
+  name: 'Mac'
+  version: '10.10.3'
+
+- regex: 'CFNetwork/.+ Darwin/14.1.0.*(x86_64)|(x86_64-apple-)?darwin14.1.0'
+  name: 'Mac'
+  version: '10.10.2'
+
 - regex: 'CFNetwork/720'
   name: 'Mac'
   version: '10.10'
 
+- regex: 'CFNetwork/.+ Darwin/13.4.0.*(x86_64)|(x86_64-apple-)?darwin13.4.0'
+  name: 'Mac'
+  version: '10.9.5'
+
+- regex: 'CFNetwork/.+ Darwin/13.3.0.*(x86_64)|(x86_64-apple-)?darwin13.3.0'
+  name: 'Mac'
+  version: '10.9.4'
+
+- regex: 'CFNetwork/.+ Darwin/13.2.0.*(x86_64)|(x86_64-apple-)?darwin13.2.0'
+  name: 'Mac'
+  version: '10.9.3'
+
+- regex: 'CFNetwork/.+ Darwin/13.1.0.*(x86_64)|(x86_64-apple-)?darwin13.1.0'
+  name: 'Mac'
+  version: '10.9.2'
+
 - regex: 'CFNetwork/673'
   name: 'Mac'
   version: '10.9'
 
+- regex: 'CFNetwork/.+ Darwin/12.5.0.*(x86_64)|(x86_64-apple-)?darwin12.5.0'
+  name: 'Mac'
+  version: '10.8.5'
+
+- regex: 'CFNetwork/.+ Darwin/12.4.0.*(x86_64)|(x86_64-apple-)?darwin12.4.0'
+  name: 'Mac'
+  version: '10.8.4'
+
+- regex: 'CFNetwork/.+ Darwin/12.3.0.*(x86_64)|(x86_64-apple-)?darwin12.3.0'
+  name: 'Mac'
+  version: '10.8.3'
+
+- regex: 'CFNetwork/.+ Darwin/12.2.0.*(x86_64)|(x86_64-apple-)?darwin12.2.0'
+  name: 'Mac'
+  version: '10.8.2'
+
+- regex: 'CFNetwork/.+ Darwin/12.1.0.*(x86_64)|(x86_64-apple-)?darwin12.1.0'
+  name: 'Mac'
+  version: '10.8.1'
+
 - regex: 'CFNetwork/596'
   name: 'Mac'
   version: '10.8'
 
+- regex: 'CFNetwork/.+ Darwin/11.5.0.*(x86_64)|(x86_64-apple-)?darwin11.5.0'
+  name: 'Mac'
+  version: '10.7.5'
+
+- regex: 'CFNetwork/.+ Darwin/11.4.0.*(x86_64)|(x86_64-apple-)?darwin11.4.0'
+  name: 'Mac'
+  version: '10.7.4'
+
+- regex: 'CFNetwork/.+ Darwin/11.3.0.*(x86_64)|(x86_64-apple-)?darwin11.3.0'
+  name: 'Mac'
+  version: '10.7.3'
+
+- regex: 'CFNetwork/.+ Darwin/11.2.0.*(x86_64)|(x86_64-apple-)?darwin11.2.0'
+  name: 'Mac'
+  version: '10.7.2'
+
+- regex: 'CFNetwork/.+ Darwin/11.1.0.*(x86_64)|(x86_64-apple-)?darwin11.1.0'
+  name: 'Mac'
+  version: '10.7.1'
+
 - regex: 'CFNetwork/520'
   name: 'Mac'
   version: '10.7'
@@ -474,56 +949,59 @@
   name: 'Mac'
   version: '10.2'
 
-- regex: 'Mac[ +]OS[ +]X(?:[ /](?:Version )?(\d+(?:[_\.]\d+)+))?'
+- regex: 'Mac[ +]OS[ +]?X(?:[ /](?:Version )?(\d+(?:[_\.]\d+)+))?'
+  name: 'Mac'
+  version: '$1'
+
+- regex: 'Mac (?:OS/)?(\d+(?:[_\.]\d+)+)'
   name: 'Mac'
   version: '$1'
-  
-- regex: 'Mac (\d+(?:[_\.]\d+)+)'
+
+- regex: 'macOS/(\d+[\.\d]+)'
   name: 'Mac'
   version: '$1'
 
-- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC|iMac|MacBook'
+- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC|iMac|MacBook|macOS|Sonos/.+\(MDCR_'
   name: 'Mac'
   version: ''
-  
-  
-  
+
+##########
+# SeewoOS
+##########
+- regex: 'SeewoOS x86_64 (\d+[\.\d]+)'
+  name: 'SeewoOS'
+  version: '$1'
+
 ##########
 # ChromeOS
 ##########
 - regex: 'CrOS [a-z0-9_]+ .* Chrome/(\d+[\.\d]+)'
   name: 'Chrome OS'
   version: '$1'
-  
-  
-  
+
 ##########
 # BlackBerry
 ##########
 - regex: '(?:BB10;.+Version|Black[Bb]erry[0-9a-z]+|Black[Bb]erry.+Version)/(\d+[\.\d]+)'
   name: 'BlackBerry OS'
   version: '$1'
-  
-  
+
 - regex: 'RIM Tablet OS (\d+[\.\d]+)'
   name: 'BlackBerry Tablet OS'
   version: '$1'
-  
-  
+
 - regex: 'RIM Tablet OS|QNX|Play[Bb]ook'
   name: 'BlackBerry Tablet OS'
   version: ''
-  
-  
+
 - regex: 'BlackBerry'
   name: 'BlackBerry OS'
   version: ''
-  
+
 - regex: 'bPod'
   name: 'BlackBerry OS'
   version: ''
 
-
 ##########
 # BeOS
 ##########
@@ -531,9 +1009,6 @@
   name: 'BeOS'
   version: ''
 
-
-
-
 ##########
 # Symbian
 ##########
@@ -541,48 +1016,38 @@
   name: 'Symbian^3'
   version: 'Anna'
 
-
 - regex: 'Symbian/3.+NokiaBrowser/7\.4'
   name: 'Symbian^3'
   version: 'Belle'
 
-
 - regex: 'Symbian/3'
   name: 'Symbian^3'
   version: ''
 
-
 - regex: '(?:Series ?60|SymbOS|S60)(?:[ /]?(\d+[\.\d]+|V\d+))?'
   name: 'Symbian OS Series 60'
   version: '$1'
 
-
 - regex: 'Series40'
   name: 'Symbian OS Series 40'
   version: ''
 
-
 - regex: 'SymbianOS/(\d+[\.\d]+)'
   name: 'Symbian OS'
   version: '$1'
-  
-  
+
 - regex: 'MeeGo|WeTab'
   name: 'MeeGo'
   version: ''
-  
-  
+
 - regex: 'Symbian(?: OS)?|SymbOS'
   name: 'Symbian OS'
   version: ''
-  
-  
+
 - regex: 'Nokia'
   name: 'Symbian'
   version: ''
 
-
-
 ##########
 # Firefox OS
 ##########
@@ -590,7 +1055,6 @@
   name: 'Firefox OS'
   version: ''
 
-
 ##########
 # RISC OS
 ##########
@@ -598,7 +1062,6 @@
   name: 'RISC OS'
   version: '$1'
 
-
 ##########
 # Inferno
 ##########
@@ -606,50 +1069,41 @@
   name: 'Inferno'
   version: '$1'
 
-
 ##########
 # Bada
 ##########
-- regex: 'bada(?:[ /](\d+[\.\d]+))'
+- regex: 'bada(?:[ /](\d+[\.\d]+))?'
   name: 'Bada'
   version: '$1'
-  
-  
-- regex: 'bada'
-  name: 'Bada'
-  version: ''
 
+##########
+# REX
+##########
+- regex: 'REX; U;'
+  name: 'REX'
+  version: ''
 
 ##########
 # Brew
 ##########
-- regex: '(?:Brew MP|BREW|BMP)(?:[ /](\d+[\.\d]+))'
+- regex: '(?:Brew(?!-Applet)(?: MP)?|BMP)(?:[ /](\d+[\.\d]+))?'
   name: 'Brew'
   version: '$1'
 
-
-- regex: 'Brew MP|BREW|BMP'
-  name: 'Brew'
-  version: ''
-
-  
 ##########
 # Web TV
 ##########
 - regex: 'GoogleTV(?:[ /](\d+[\.\d]+))?'
   name: 'Google TV'
   version: '$1'
-  
-  
+
 - regex: 'AppleTV(?:/?(\d+[\.\d]+))?'
   name: 'Apple TV'
   version: '$1'
-  
-  
+
 - regex: 'WebTV/(\d+[\.\d]+)'
   name: 'WebTV'
   version: '$1'
-  
 
 ##########
 # Remix OS
@@ -666,108 +1120,92 @@
   name: 'Remix OS'
   version: ''
 
-
 ##########
 # Unix
 ##########
 - regex: '(?:SunOS|Solaris)(?:[/ ](\d+[\.\d]+))?'
   name: 'Solaris'
   version: '$1'
-  
-  
+
 - regex: 'AIX(?:[/ ]?(\d+[\.\d]+))?'
   name: 'AIX'
   version: '$1'
-  
-  
+
 - regex: 'HP-UX(?:[/ ]?(\d+[\.\d]+))?'
   name: 'HP-UX'
   version: '$1'
-  
-  
+
 - regex: 'FreeBSD(?:[/ ]?(\d+[\.\d]+))?'
   name: 'FreeBSD'
   version: '$1'
-  
-  
+
 - regex: 'NetBSD(?:[/ ]?(\d+[\.\d]+))?'
   name: 'NetBSD'
   version: '$1'
-  
-  
+
 - regex: 'OpenBSD(?:[/ ]?(\d+[\.\d]+))?'
   name: 'OpenBSD'
   version: '$1'
-  
-  
+
 - regex: 'DragonFly(?:[/ ]?(\d+[\.\d]+))?'
   name: 'DragonFly'
   version: '$1'
-  
-  
+
 - regex: 'Syllable(?:[/ ]?(\d+[\.\d]+))?'
   name: 'Syllable'
   version: '$1'
-  
-  
+
 - regex: 'IRIX(?:;64)?(?:[/ ]?(\d+[\.\d]+))'
   name: 'IRIX'
   version: '$1'
-  
-  
+
 - regex: 'OSF1(?:[/ ]?v?(\d+[\.\d]+))?'
   name: 'OSF1'
   version: '$1'
-  
-  
-  
+
 ##########
 # Gaming Console
 ##########
-- regex: 'Nintendo Wii'
+- regex: 'Nintendo (Wii|Switch)'
   name: 'Nintendo'
-  version: 'Wii'
-  
-  
-- regex: 'PlayStation ?([3|4])'
+  version: '$1'
+
+- regex: 'PlayStation ?([34])'
   name: 'PlayStation'
   version: '$1'
-  
-  
+
 - regex: 'Xbox|KIN\.(?:One|Two)'
   name: 'Xbox'
   version: '360'
-  
-  
-  
+
 ##########
 # Mobile Gaming Console
 ##########
 - regex: 'Nitro|Nintendo ([3]?DS[i]?)'
   name: 'Nintendo Mobile'
   version: '$1'
-  
-  
+
 - regex: 'PlayStation ((?:Portable|Vita))'
   name: 'PlayStation Portable'
   version: '$1'
-  
-  
-  
+
 ##########
 # IBM
 ##########
 - regex: 'OS/2'
   name: 'OS/2'
   version: ''
-  
-
 
 ###########
 # Linux (Generic)
 ###########
-- regex: 'Linux(?:OS)?[^a-z]'
+- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)'
   name: 'GNU/Linux'
   version: ''
 
-
+##########
+# Java ME (Java Platform, Micro Edition)
+##########
+- regex: 'Java ME|(J2ME|Profile)/MIDP|MIDP-(?:\d+[\.\d]+)/CLDC|Configuration/CLDC|Java; U; MIDP|MMP/\d.\d'
+  name: 'Java ME'
+  version: ''