Bump version 1.0.37 (mirror of 0.7.37)

2025-11-15 22:52:16 +03:00 · 2023-10-27 19:49:46 +07:00
15 changed files with 189 additions and 3985 deletions
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ua-parser-js",
-  "version": "0.7.41",
+  "version": "1.0.37",
  "authors": [
    "Faisal Salman <f@faisalman.com>"
  ],
--- a/changelog.md
+++ b/changelog.md
@@ -4,39 +4,6 @@

 Version 1.0.x is basically the equivalent of version 0.7.x. See [#536](https://github.com/faisalman/ua-parser-js/issues/536) for the reason behind this confusion.

-## Version 0.7.41 / 1.0.41
- Add new browser: Daum, Ladybird
- Add new device vendor: HMD
- Add new engine: LibWeb
- Add new os: Windows IoT, Ubuntu Touch
- Improve cpu detection: ARM, x86
- Improve device vendor detection: Apple, Archos, Generic, Google, Honor, Huawei, Infinix, Nvidia, Lenovo, Nokia, OnePlus, Xiaomi
- Improve device type detection: smarttv, wearables
- Improve os detection: Linux, Symbian
-
-## Version 0.7.40 / 1.0.40
- Add new browser: 115, LibreWolf, Slimboat, Slimjet
- Add new device: Advan, Cat, Energizer, IMO, Micromax, Smartfren
- Add new engine: ArkWeb, Servo
- Add new os: OpenHarmony
- Improve browser detection: 2345, 360, Dragon, Iron, Maxthon
- Recognize Honor as a separate device vendor from Huawei
- Fix Python Request mistakenly identified as Meta Quest
-
-## Version 0.7.39 / 1.0.39
- Add new feature: executable command using `npx ua-parser-js "[INSERT-UA-HERE]"`
- Add new browser: Helio, Pico Browser, Wolvic
- Add new device vendor: itel, Nothing, TCL
- Improve browser detection: ICEBrowser, Klar, QQBrowser, Quark, Rekonq, Sleipnir
- Improve device detection: Xiaomi Pro, Amazon Echo Show, Samsung Galaxy Watch
- Removed from browser: Viera
-
-## Version 0.7.38 / 1.0.38
- Fix error on getOS() when userAgentData.platform is undefined
- Add new browser: Opera GX, Twitter
- Improve browser detection: DuckDuckGo
- Improve device detection: OPPO Pad, Oculus Quest
-
 ## Version 0.7.37 / 1.0.37
 - Fix misidentified WebView token as device model
 - Increase UA_MAX_LENGTH to 500
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/license.md
+++ b/license.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2012-2025 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  name: 'faisalman:ua-parser-js',
-  version: '0.7.41',
+  version: '1.0.37',
  summary: 'Lightweight JavaScript-based user-agent string parser',
  git: 'https://github.com/faisalman/ua-parser-js.git',
  documentation: 'readme.md'
--- a/package.json
+++ b/package.json
@@ -1,27 +1,29 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.41",
+  "version": "1.0.37",
  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
  "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data. Supports browser & node.js environment",
  "keywords": [
-    "ua-parser-js",
    "user-agent",
+    "parser",
    "browser",
    "engine",
    "os",
    "device",
-    "mobile",
    "cpu",
-    "platform",
-    "detect",
-    "javascript",
-    "jquery",
-    "typescript",
-    "node-js",
-    "client-hints"
+    "jquery-plugin",
+    "ecosystem:jquery",
+    "ua-parser-js",
+    "client-hints",
+    "user-agent-detection",
+    "device-detection",
+    "platform-detection",
+    "mobile-detection",
+    "browser-detection",
+    "architecture-detection"
  ],
-  "homepage": "https://uaparser.dev",
+  "homepage": "https://github.com/faisalman/ua-parser-js",
  "contributors": [
    "Aamir Poonawalla <aamir@urx.com>",
    "Admas <mollases@users.noreply.github.com>",
@@ -151,7 +153,6 @@
    "dist",
    "src"
  ],
-  "bin": "./script/cli.js",
  "scripts": {
    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle",
    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
@@ -194,7 +195,7 @@
    "test": "test"
  },
  "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "demo": "https://uaparser.dev",
+  "demo": "https://faisalman.github.io/ua-parser-js",
  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js",
  "funding": [
    {
@@ -206,8 +207,8 @@
      "url": "https://paypal.me/faisalman"
    },
    {
-      "type": "github",
-      "url": "https://github.com/sponsors/faisalman"
+        "type": "github",
+        "url": "https://github.com/sponsors/faisalman"
    }
  ]
 }
--- a/readme.md
+++ b/readme.md
@@ -15,11 +15,11 @@
 JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data with relatively small footprint (~17KB minified, ~6KB gzipped) that can be used either in browser (client-side) or node.js (server-side).

 * Author    : Faisal Salman <<f@faisalman.com>>
-* Demo      : https://uaparser.dev
+* Demo      : https://faisalman.github.io/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js
 * Documentation : 
-  * v1 : https://github.com/faisalman/ua-parser-js/tree/1.0.x#documentation
-  * v2 : https://docs.uaparser.dev
+  * v1 : https://github.com/faisalman/ua-parser-js/tree/1.0.35#documentation
+  * v2 : https://faisalman.github.io/ua-parser-js-docs/v2

 ***

@@ -36,8 +36,6 @@ JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model fro
 </tbody>
 </table>

-<a href="https://uaparser.dev"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
-
 ---

 # Documentation
@@ -100,23 +98,23 @@ The methods are self explanatory, here's a small overview on all the available m

 ```sh
 # Possible 'browser.name':
-115 Browser, 2345Explorer, 360 Browser, Alipay, Amaya, Android Browser, Arora, 
-Avant, Avast, AVG, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
-Chrome Headless, Chrome WebView, Chrome, Chromium, Cobalt, Comodo Dragon, Daum,
-Dillo, Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, 
-Fennec, Firebird, Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, Helio, 
-Heytap, Huawei Browser, iCab, ICE Browser, IE, IEMobile, IceApe, IceCat, 
-IceDragon, Iceweasel, Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], 
-K-Meleon, Kindle, Klar, Klarna, Konqueror, Ladybird, LBBROWSER, LibreWolf, Line, 
-LinkedIn, Links, Lunascape, Lynx, MIUI Browser, Maemo, Maxthon, Midori, Minimo, 
-Mobile Safari, Mosaic, Mozilla, NetFront, NetSurf, Netfront, Netscape, 
-NokiaBrowser, Obigo, Oculus Browser, OmniWeb, Opera Coast, 
-Opera [GX/Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, Pico Browser, Polaris, 
-Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, 
-Sailfish Browser, Samsung Internet, SeaMonkey, Silk, Skyfire, Sleipnir, 
-Slim[Browser/Boat/Jet], Smart Lenovo Browser, Snapchat, Sogou [Explorer/Mobile], 
-Swiftfox, Tesla, TikTok, Tizen Browser, Twitter, UCBrowser, UP.Browser, Vivaldi, 
-Vivo Browser, w3m, Waterfox, WeChat, Weibo, Whale Browser, Wolvic, Yandex, ...
+2345Explorer, 360 Browser, Alipay, Amaya, Android Browser, Arora, Avant, Avast, 
+AVG, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
+Chrome Headless, Chrome WebView, Chrome, Chromium, Cobalt, Comodo Dragon, Dillo,
+Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, 
+Firebird, Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, Heytap, 
+Huawei Browser, iCab, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, 
+Iceweasel, Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, 
+Kindle, Klar, Klarna, Konqueror, LBBROWSER, Line, LinkedIn, Links, Lunascape, 
+Lynx, MIUI Browser, Maemo, Maxthon, Midori, Minimo, Mobile Safari, Mosaic, 
+Mozilla, NetFront, NetSurf, Netfront, Netscape, NokiaBrowser, Obigo, 
+Oculus Browser, OmniWeb, Opera Coast, Opera [Mini/Mobi/Tablet], PaleMoon, 
+PhantomJS, Phoenix, Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, Quark, 
+QupZilla, RockMelt, Safari, Sailfish Browser, Samsung Internet, SeaMonkey, Silk, 
+Skyfire, Sleipnir, Slim, SlimBrowser, Smart Lenovo Browser, Snapchat, 
+Sogou [Explorer/Mobile], Swiftfox, Tesla, TikTok, Tizen Browser, UCBrowser, 
+UP.Browser, Viera, Vivaldi, Vivo Browser, Waterfox, WeChat, Weibo, Yandex, w3m, 
+Whale Browser, ...

 # 'browser.version' determined dynamically
 ```
@@ -136,13 +134,12 @@ console, mobile, tablet, smarttv, wearable, embedded
 ##########

 # Possible 'device.vendor':
-Acer, Advan, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Cat, 
-Dell, Energizer, Essential, Facebook, Fairphone, GeeksPhone, Google, HP, HMD, 
-HTC, Huawei, IMO, Infinix, itel, Jolla, Kobo, Lenovo, LG, Meizu, Micromax, 
-Microsoft, Motorola, Nexian, Nintendo, Nokia, Nothing, Nvidia, OnePlus, OPPO, 
-Ouya, Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, Sharp, 
-Siemens, Smartfren, Sony[Ericsson], Sprint, TCL, Tecno, Tesla, Ulefone, Vivo, 
-Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
+Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
+Essential, Facebook, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Infinix, 
+Jolla, Kobo, Lenovo, LG, Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, 
+Nvidia, OnePlus, OPPO, Ouya, Palm, Panasonic, Pebble, Polytron, Realme, RIM, 
+Roku, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Tecno, Tesla, Ulefone, 
+Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...

 # 'device.model' determined dynamically
 ```
@@ -152,8 +149,8 @@ Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...

 ```sh
 # Possible 'engine.name'
-Amaya, ArkWeb, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, LibWeb, Links, 
-Lynx, NetFront, NetSurf, Presto, Servo, Tasman, Trident, w3m, WebKit
+Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, LibWeb, Links, Lynx, 
+NetFront, NetSurf, Presto, Tasman, Trident, w3m, WebKit

 # 'engine.version' determined dynamically
 ```
@@ -167,11 +164,11 @@ AIX, Amiga OS, Android[-x86], Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
 Contiki, Fedora, Firefox OS, FreeBSD, Debian, Deepin, DragonFly, elementary OS, 
 Fuchsia, Gentoo, GhostBSD, GNU, Haiku, HarmonyOS, HP-UX, Hurd, iOS, Joli, KaiOS, 
 Linpus, Linspire,Linux, Mac OS, Maemo, Mageia, Mandriva, Manjaro, MeeGo, Minix, 
-Mint, Morph OS, NetBSD, NetRange, NetTV, Nintendo, OpenBSD, OpenHarmony, OpenVMS, 
-OS/2, Palm, PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, 
-RIM Tablet OS, RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, 
-Solaris, SUSE, Symbian, Tizen, Ubuntu [Touch], Unix, VectorLinux, Viera, watchOS, 
-WebOS, Windows [Phone/Mobile/IoT], Zenwalk, ...
+Mint, Morph OS, NetBSD, NetRange, NetTV, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, 
+PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, RIM Tablet OS, 
+RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, Solaris, SUSE, 
+Symbian, Tizen, Ubuntu, Unix, VectorLinux, Viera, watchOS, WebOS, 
+Windows [Phone/Mobile], Zenwalk, ...

 # 'os.version' determined dynamically
 ```
@@ -324,14 +321,6 @@ console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
 $('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```

-## Using npx
-
-UAParser.js can be executed as a command that returns the parsed data in JSON format:
-
-```sh
-$ npx ua-parser-js "[INSERT-UA-HERE]"
-```
-
 ## Using Extension

 * `UAParser([uastring,] extensions)`
@@ -375,7 +364,7 @@ Made with [contributors-img](https://contrib.rocks).

 MIT License

-Copyright (c) 2012-2024 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/script/cli.js
+++ b/script/cli.js
@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-const UAParser = require('ua-parser-js');
-console.log(JSON.stringify(process.argv.slice(2).map(ua => UAParser(ua)), null, 4));
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v0.7.41
-   Copyright © 2012-2025 Faisal Salman <f@faisalman.com>
+/* UAParser.js v1.0.37
+   Copyright © 2012-2021 Faisal Salman <f@faisalman.com>
   MIT License *//*
   Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
   Supports browser & node.js environment. 
@@ -17,7 +17,7 @@
    /////////////


-    var LIBVERSION  = '0.7.41',
+    var LIBVERSION  = '1.0.37',
        EMPTY       = '',
        UNKNOWN     = '?',
        FUNC_TYPE   = 'function',
@@ -48,16 +48,11 @@
        EDGE    = 'Edge',
        FIREFOX = 'Firefox',
        GOOGLE  = 'Google',
-        HONOR   = 'Honor',
        HUAWEI  = 'Huawei',
-        LENOVO  = 'Lenovo',
        LG      = 'LG',
        MICROSOFT = 'Microsoft',
        MOTOROLA  = 'Motorola',
-        NVIDIA  = 'Nvidia',
-        ONEPLUS = 'OnePlus',
        OPERA   = 'Opera',
-        OPPO    = 'OPPO',
        SAMSUNG = 'Samsung',
        SHARP   = 'Sharp',
        SONY    = 'Sony',
@@ -65,8 +60,7 @@
        ZEBRA   = 'Zebra',
        FACEBOOK    = 'Facebook',
        CHROMIUM_OS = 'Chromium OS',
-        MAC_OS  = 'Mac OS',
-        SUFFIX_BROWSER = ' Browser';
+        MAC_OS  = 'Mac OS';

    ///////////
    // Helper
@@ -177,7 +171,7 @@
                    return (i === UNKNOWN) ? undefined : i;
                }
            }
-            return map.hasOwnProperty('*') ? map['*'] : str;
+            return str;
    };

    ///////////////
@@ -229,33 +223,24 @@
            ], [NAME, VERSION], [
            /opios[\/ ]+([\w\.]+)/i                                             // Opera mini on iphone >= 8.0
            ], [VERSION, [NAME, OPERA+' Mini']], [
-            /\bop(?:rg)?x\/([\w\.]+)/i                                          // Opera GX
-            ], [VERSION, [NAME, OPERA+' GX']], [
            /\bopr\/([\w\.]+)/i                                                 // Opera Webkit
            ], [VERSION, [NAME, OPERA]], [

            // Mixed
            /\bb[ai]*d(?:uhd|[ub]*[aekoprswx]{5,6})[\/ ]?([\w\.]+)/i            // Baidu
            ], [VERSION, [NAME, 'Baidu']], [
-            /\b(?:mxbrowser|mxios|myie2)\/?([-\w\.]*)\b/i                       // Maxthon
-            ], [VERSION, [NAME, 'Maxthon']], [
            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /(lunascape|maxthon|netfront|jasmine|blazer|sleipnir)[\/ ]?([\w\.]*)/i,      
-                                                                                // Lunascape/Maxthon/Netfront/Jasmine/Blazer/Sleipnir
+            /(lunascape|maxthon|netfront|jasmine|blazer)[\/ ]?([\w\.]*)/i,      // Lunascape/Maxthon/Netfront/Jasmine/Blazer
            // Trident based
-            /(avant|iemobile|slim(?:browser|boat|jet))[\/ ]?([\d\.]*)/i,        // Avant/IEMobile/SlimBrowser/SlimBoat/Slimjet
+            /(avant|iemobile|slim)\s?(?:browser)?[\/ ]?([\w\.]*)/i,             // Avant/IEMobile/SlimBrowser
            /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer

-            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
-            /(heytap|ovi|115)browser\/([\d\.]+)/i,                              // HeyTap/Ovi/115
+            // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
+            /(flock|rockmelt|midori|epiphany|silk|skyfire|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|qq|duckduckgo)\/([-\w\.]+)/i,
+                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
+            /(heytap|ovi)browser\/([\d\.]+)/i,                                  // Heytap/Ovi
            /(weibo)__([\d\.]+)/i                                               // Weibo
            ], [NAME, VERSION], [
-            /quark(?:pc)?\/([-\w\.]+)/i                                         // Quark
-            ], [VERSION, [NAME, 'Quark']], [
-            /\bddg\/([\w\.]+)/i                                                 // DuckDuckGo
-            ], [VERSION, [NAME, 'DuckDuckGo']], [
            /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
            ], [VERSION, [NAME, 'UC'+BROWSER]], [
            /microm.+\bqbcore\/([\w\.]+)/i,                                     // WeChat Desktop for Windows Built-in Browser
@@ -283,31 +268,28 @@
            /coast\/([\w\.]+)/i                                                 // Opera Coast
            ], [VERSION, [NAME, OPERA+' Coast']], [
            /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI' + SUFFIX_BROWSER]], [
-            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
+            ], [VERSION, [NAME, 'MIUI '+BROWSER]], [
+            /fxios\/([-\w\.]+)/i                                                // Firefox for iOS
            ], [VERSION, [NAME, FIREFOX]], [
-            /\bqihoobrowser\/?([\w\.]*)/i                                       // 360
-            ], [VERSION, [NAME, '360']], [
-            /\b(qq)\/([\w\.]+)/i                                                // QQ
-            ], [[NAME, /(.+)/, '$1Browser'], VERSION], [
-            /(oculus|sailfish|huawei|vivo|pico)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [              // Oculus/Sailfish/HuaweiBrowser/VivoBrowser/PicoBrowser
+            /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
+            ], [[NAME, '360 ' + BROWSER]], [
+            /(oculus|sailfish|huawei|vivo)browser\/([\w\.]+)/i
+            ], [[NAME, /(.+)/, '$1 ' + BROWSER], VERSION], [                    // Oculus/Sailfish/HuaweiBrowser/VivoBrowser
            /samsungbrowser\/([\w\.]+)/i                                        // Samsung Internet
            ], [VERSION, [NAME, SAMSUNG + ' Internet']], [
+            /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
+            ], [[NAME, /_/g, ' '], VERSION], [
            /metasr[\/ ]?([\d\.]+)/i                                            // Sogou Explorer
            ], [VERSION, [NAME, 'Sogou Explorer']], [
            /(sogou)mo\w+\/([\d\.]+)/i                                          // Sogou Mobile
            ], [[NAME, 'Sogou Mobile'], VERSION], [
            /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
            /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
-            /m?(qqbrowser|2345(?=browser|chrome|explorer))\w*[\/ ]?v?([\w\.]+)/i   // QQ/2345
+            /m?(qqbrowser|2345Explorer)[\/ ]?([\w\.]+)/i                        // QQBrowser/2345 Browser
            ], [NAME, VERSION], [
-            /(lbbrowser|rekonq)/i,                                              // LieBao Browser/Rekonq
+            /(lbbrowser)/i,                                                     // LieBao Browser
            /\[(linkedin)app\]/i                                                // LinkedIn App for iOS & Android
            ], [NAME], [
-            /ome\/([\w\.]+) \w* ?(iron) saf/i,                                  // Iron
-            /ome\/([\w\.]+).+qihu (360)[es]e/i                                  // 360
-            ], [VERSION, NAME], [

            // WebView
            /((?:fban\/fbios|fb_iab\/fb4a)(?!.+fbav)|;fbav\/([\w\.]+);)/i       // Facebook App for iOS & Android
@@ -315,11 +297,9 @@
            /(Klarna)\/([\w\.]+)/i,                                             // Klarna Shopping Browser for iOS & Android
            /(kakao(?:talk|story))[\/ ]([\w\.]+)/i,                             // Kakao App
            /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
-            /(daum)apps[\/ ]([\w\.]+)/i,                                        // Daum App
            /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
            /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
            /(alipay)client\/([\w\.]+)/i,                                       // Alipay
-            /(twitter)(?:and| f.+e\/([\w\.]+))/i,                               // Twitter
            /(chromium|instagram|snapchat)[\/ ]([-\w\.]+)/i                     // Chromium/Instagram/Snapchat
            ], [NAME, VERSION], [
            /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
@@ -352,24 +332,23 @@
            // Gecko based
            /(navigator|netscape\d?)\/([-\w\.]+)/i                              // Netscape
            ], [[NAME, 'Netscape'], VERSION], [
-            /(wolvic|librewolf)\/([\w\.]+)/i                                    // Wolvic/LibreWolf
-            ], [NAME, VERSION], [
            /mobile vr; rv:([\w\.]+)\).+firefox/i                               // Firefox Reality
            ], [VERSION, [NAME, FIREFOX+' Reality']], [
            /ekiohf.+(flow)\/([\w\.]+)/i,                                       // Flow
            /(swiftfox)/i,                                                      // Swiftfox
-            /(icedragon|iceweasel|camino|chimera|fennec|maemo browser|minimo|conkeror)[\/ ]?([\w\.\+]+)/i,
-                                                                                // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
+            /(icedragon|iceweasel|camino|chimera|fennec|maemo browser|minimo|conkeror|klar)[\/ ]?([\w\.\+]+)/i,
+                                                                                // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror/Klar
            /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([-\w\.]+)$/i,
                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
            /(firefox)\/([\w\.]+)/i,                                            // Other Firefox-based
            /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,                         // Mozilla

            // Other
-            /(amaya|dillo|doris|icab|ladybird|lynx|mosaic|netsurf|obigo|polaris|w3m|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
-                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser/Ladybird
-            /\b(links) \(([\w\.]+)/i                                            // Links
-            ], [NAME, [VERSION, /_/g, '.']], [
+            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
+                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Sleipnir/Obigo/Mosaic/Go/ICE/UP.Browser
+            /(links) \(([\w\.]+)/i,                                             // Links
+            /panasonic;(viera)/i                                                // Panasonic Viera
+            ], [NAME, VERSION], [
            
            /(cobalt)\/([\w\.]+)/i                                              // Cobalt
            ], [NAME, [VERSION, /master.|lts./, ""]]
@@ -377,30 +356,32 @@

        cpu : [[

-            /\b((amd|x|x86[-_]?|wow|win)64)\b/i                                 // AMD64 (x64)
+            /(?:(amd|x(?:(?:86|64)[-_])?|wow|win)64)[;\)]/i                     // AMD64 (x64)
            ], [[ARCHITECTURE, 'amd64']], [

-            /(ia32(?=;))/i,                                                     // IA32 (quicktime)
-            /\b((i[346]|x)86)(pc)?\b/i                                          // IA32 (x86)
+            /(ia32(?=;))/i                                                      // IA32 (quicktime)
+            ], [[ARCHITECTURE, lowerize]], [
+
+            /((?:i[346]|x)86)[;\)]/i                                            // IA32 (x86)
            ], [[ARCHITECTURE, 'ia32']], [

-            /\b(aarch64|arm(v?[89]e?l?|_?64))\b/i                               // ARM64
+            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                 // ARM64
            ], [[ARCHITECTURE, 'arm64']], [

-            /\b(arm(v[67])?ht?n?[fl]p?)\b/i                                     // ARMHF
+            /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
            ], [[ARCHITECTURE, 'armhf']], [

            // PocketPC mistakenly identified as PowerPC
-            /( (ce|mobile); ppc;|\/[\w\.]+arm\b)/i
+            /windows (ce|mobile); ppc;/i
            ], [[ARCHITECTURE, 'arm']], [

-            /((ppc|powerpc)(64)?)( mac|;|\))/i                                  // PowerPC
+            /((?:ppc|powerpc)(?:64)?)(?: mac|;|\))/i                            // PowerPC
            ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [

-            / sun4\w[;\)]/i                                                     // SPARC
+            /(sun4\w)[;\)]/i                                                    // SPARC
            ], [[ARCHITECTURE, 'sparc']], [

-            /\b(avr32|ia64(?=;)|68k(?=\))|\barm(?=v([1-7]|[5-7]1)l?|;|eabi)|(irix|mips|sparc)(64)?\b|pa-risc)/i
+            /((?:avr32|ia64(?=;))|68k(?=\))|\barm(?=v(?:[1-7]|[5-7]1)l?|;|eabi)|(?=atmel )avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
                                                                                // IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
            ], [[ARCHITECTURE, lowerize]]
        ],
@@ -414,8 +395,8 @@
            // Samsung
            /\b(sch-i[89]0\d|shw-m380s|sm-[ptx]\w{2,4}|gt-[pn]\d{2,4}|sgh-t8[56]9|nexus 10)/i
            ], [MODEL, [VENDOR, SAMSUNG], [TYPE, TABLET]], [
-            /\b((?:s[cgp]h|gt|sm)-(?![lr])\w+|sc[g-]?[\d]+a?|galaxy nexus)/i,
-            /samsung[- ]((?!sm-[lr])[-\w]+)/i,
+            /\b((?:s[cgp]h|gt|sm)-\w+|sc[g-]?[\d]+a?|galaxy nexus)/i,
+            /samsung[- ]([-\w]+)/i,
            /sec-(sgh\w+)/i
            ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [

@@ -433,39 +414,29 @@
            /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
            ], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [

-            // Honor
-            /\b((?:brt|eln|hey2?|gdi|jdn)-a?[lnw]09|(?:ag[rm]3?|jdn2|kob2)-a?[lw]0[09]hn)(?: bui|\)|;)/i
-            ], [MODEL, [VENDOR, HONOR], [TYPE, TABLET]], [
-            /honor([-\w ]+)[;\)]/i
-            ], [MODEL, [VENDOR, HONOR], [TYPE, MOBILE]], [
-
            // Huawei
-            /\b((?:ag[rs][2356]?k?|bah[234]?|bg[2o]|bt[kv]|cmr|cpn|db[ry]2?|jdn2|got|kob2?k?|mon|pce|scm|sht?|[tw]gr|vrd)-[ad]?[lw][0125][09]b?|605hw|bg2-u03|(?:gem|fdr|m2|ple|t1)-[7a]0[1-4][lu]|t1-a2[13][lw]|mediapad[\w\. ]*(?= bui|\)))\b(?!.+d\/s)/i
+            /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
            ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei)([-\w ]+)[;\)]/i,
+            /(?:huawei|honor)([-\w ]+)[;\)]/i,
            /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
            ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [

            // Xiaomi
-            /oid[^\)]+; (2[\dbc]{4}(182|283|rp\w{2})[cgl]|m2105k81a?c)(?: bui|\))/i,
-            /\b((?:red)?mi[-_ ]?pad[\w- ]*)(?: bui|\))/i                                // Mi Pad tablets
-            ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
-
            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
            /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
            /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
            /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
            /oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i,        // Xiaomi Redmi 'numeric' models
-            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite|pro)?)(?: bui|\))/i, // Xiaomi Mi
-            / ([\w ]+) miui\/v?\d/i
+            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite)?)(?: bui|\))/i // Xiaomi Mi
            ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
+            /oid[^\)]+; (2\d{4}(283|rpbf)[cgl])( bui|\))/i,                     // Redmi Pad
+            /\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i                        // Mi Pad tablets
+            ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [

            // OPPO
            /; (\w+) bui.+ oppo/i,
            /\b(cph[12]\d{3}|p(?:af|c[al]|d\w|e[ar])[mt]\d0|x9007|a101op)\b/i
-            ], [MODEL, [VENDOR, OPPO], [TYPE, MOBILE]], [
-            /\b(opd2(\d{3}a?))(?: bui|\))/i
-            ], [MODEL, [VENDOR, strMapper, { 'OnePlus' : ['304', '403', '203'], '*' : OPPO }], [TYPE, TABLET]], [
+            ], [MODEL, [VENDOR, 'OPPO'], [TYPE, MOBILE]], [

            // Vivo
            /vivo (\w+)(?: bui|\))/i,
@@ -479,7 +450,7 @@
            // Motorola
            /\b(milestone|droid(?:[2-4x]| (?:bionic|x2|pro|razr))?:?( 4g)?)\b[\w ]+build\//i,
            /\bmot(?:orola)?[- ](\w*)/i,
-            /((?:moto(?! 360)[\w\(\) ]+|xt\d{3,4}|nexus 6)(?= bui|\)))/i
+            /((?:moto[\w\(\) ]+|xt\d{3,4}|nexus 6)(?= bui|\)))/i
            ], [MODEL, [VENDOR, MOTOROLA], [TYPE, MOBILE]], [
            /\b(mz60\d|xoom[2 ]{0,2}) build\//i
            ], [MODEL, [VENDOR, MOTOROLA], [TYPE, TABLET]], [
@@ -488,30 +459,28 @@
            /((?=lg)?[vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i
            ], [MODEL, [VENDOR, LG], [TYPE, TABLET]], [
            /(lm(?:-?f100[nv]?|-[\w\.]+)(?= bui|\))|nexus [45])/i,
-            /\blg[-e;\/ ]+((?!browser|netcast|android tv|watch)\w+)/i,
+            /\blg[-e;\/ ]+((?!browser|netcast|android tv)\w+)/i,
            /\blg-?([\d\w]+) bui/i
            ], [MODEL, [VENDOR, LG], [TYPE, MOBILE]], [

            // Lenovo
-            /(ideatab[-\w ]+|602lv|d-42a|a101lv|a2109a|a3500-hv|s[56]000|pb-6505[my]|tb-?x?\d{3,4}(?:f[cu]|xu|[av])|yt\d?-[jx]?\d+[lfmx])( bui|;|\)|\/)/i,
-            /lenovo ?(b[68]0[08]0-?[hf]?|tab(?:[\w- ]+?)|tb[\w-]{6,7})( bui|;|\)|\/)/i
-            ], [MODEL, [VENDOR, LENOVO], [TYPE, TABLET]], [
+            /(ideatab[-\w ]+)/i,
+            /lenovo ?(s[56]000[-\w]+|tab(?:[\w ]+)|yt[-\d\w]{6}|tb[-\d\w]{6})/i
+            ], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [

            // Nokia
-            /(nokia) (t[12][01])/i
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-            /(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
-            /nokia[-_ ]?(([-\w\. ]*))/i
-            ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
+            /(?:maemo|nokia).*(n900|lumia \d+)/i,
+            /nokia[-_ ]?([-\w\.]*)/i
+            ], [[MODEL, /_/g, ' '], [VENDOR, 'Nokia'], [TYPE, MOBILE]], [

            // Google
-            /(pixel (c|tablet))\b/i                                             // Google Pixel C/Tablet
+            /(pixel c)\b/i                                                      // Google Pixel C
            ], [MODEL, [VENDOR, GOOGLE], [TYPE, TABLET]], [
            /droid.+; (pixel[\daxl ]{0,6})(?: bui|\))/i                         // Google Pixel
            ], [MODEL, [VENDOR, GOOGLE], [TYPE, MOBILE]], [

            // Sony
-            /droid.+; (a?\d[0-2]{2}so|[c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
+            /droid.+ (a?\d[0-2]{2}so|[c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
            ], [MODEL, [VENDOR, SONY], [TYPE, MOBILE]], [
            /sony tablet [ps]/i,
            /\b(?:sony)?sgp\w+(?: bui|\))/i
@@ -520,11 +489,11 @@
            // OnePlus
            / (kb2005|in20[12]5|be20[12][59])\b/i,
            /(?:one)?(?:plus)? (a\d0\d\d)(?: b|\))/i
-            ], [MODEL, [VENDOR, ONEPLUS], [TYPE, MOBILE]], [
+            ], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [

            // Amazon
            /(alexa)webm/i,
-            /(kf[a-z]{2}wi|aeo(?!bc)\w\w)( bui|\))/i,                           // Kindle Fire without Silk / Echo Show
+            /(kf[a-z]{2}wi|aeo[c-r]{2})( bui|\))/i,                             // Kindle Fire without Silk / Echo Show
            /(kf[a-z]+)( bui|\)).+silk\//i                                      // Kindle Fire HD
            ], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
            /((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i                     // Fire Phone
@@ -553,14 +522,6 @@
            /(alcatel|geeksphone|nexian|panasonic(?!(?:;|\.))|sony(?!-bra))[-_ ]?([-\w]*)/i         // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [

-            // TCL
-            /droid [\w\.]+; ((?:8[14]9[16]|9(?:0(?:48|60|8[01])|1(?:3[27]|66)|2(?:6[69]|9[56])|466))[gqswx])\w*(\)| bui)/i
-            ], [MODEL, [VENDOR, 'TCL'], [TYPE, TABLET]], [
-
-            // itel
-            /(itel) ((\w+))/i
-            ], [[VENDOR, lowerize], MODEL, [TYPE, strMapper, { 'tablet' : ['p10001l', 'w7001'], '*' : 'mobile' }]], [
-
            // Acer
            /droid.+; ([ab][1-7]-?[0178a]\d\d?)/i
            ], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [
@@ -574,47 +535,19 @@
            /; ((?:power )?armor(?:[\w ]{0,8}))(?: bui|\))/i
            ], [MODEL, [VENDOR, 'Ulefone'], [TYPE, MOBILE]], [

-            // Energizer
-            /; (energy ?\w+)(?: bui|\))/i,
-            /; energizer ([\w ]+)(?: bui|\))/i
-            ], [MODEL, [VENDOR, 'Energizer'], [TYPE, MOBILE]], [
-
-            // Cat
-            /; cat (b35);/i,
-            /; (b15q?|s22 flip|s48c|s62 pro)(?: bui|\))/i
-            ], [MODEL, [VENDOR, 'Cat'], [TYPE, MOBILE]], [
-
-            // Smartfren
-            /((?:new )?andromax[\w- ]+)(?: bui|\))/i
-            ], [MODEL, [VENDOR, 'Smartfren'], [TYPE, MOBILE]], [
-
-            // Nothing
-            /droid.+; (a(?:015|06[35]|142p?))/i
-            ], [MODEL, [VENDOR, 'Nothing'], [TYPE, MOBILE]], [
-
-            // Archos
-            /; (x67 5g|tikeasy \w+|ac[1789]\d\w+)( b|\))/i,
-            /archos ?(5|gamepad2?|([\w ]*[t1789]|hello) ?\d+[\w ]*)( b|\))/i
-            ], [MODEL, [VENDOR, 'Archos'], [TYPE, TABLET]], [
-            /archos ([\w ]+)( b|\))/i,
-            /; (ac[3-6]\d\w{2,8})( b|\))/i 
-            ], [MODEL, [VENDOR, 'Archos'], [TYPE, MOBILE]], [
-
            // MIXED
-            /(imo) (tab \w+)/i,                                                 // IMO
-            /(infinix) (x1101b?)/i                                              // Infinix XPad
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus(?! zenw)|dell|jolla|meizu|motorola|polytron|infinix|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
-                                                                                // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Infinix/Tecno/Micromax/Advan
-            /; (hmd|imo) ([\w ]+?)(?: bui|\))/i,                                // HMD/IMO
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno)[-_ ]?([-\w]*)/i,
+                                                                                // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
            /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
+            /(asus)-?(\w+)/i,                                                   // Asus
            /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
-            /(lenovo)[-_ ]?([-\w ]+?)(?: bui|\)|\/)/i,                          // Lenovo
+            /(lenovo)[-_ ]?([-\w]+)/i,                                          // Lenovo
+            /(jolla)/i,                                                         // Jolla
            /(oppo) ?([\w ]+) bui/i                                             // OPPO
            ], [VENDOR, MODEL, [TYPE, MOBILE]], [

            /(kobo)\s(ereader|touch)/i,                                         // Kobo
+            /(archos) (gamepad2?)/i,                                            // Archos
            /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
            /(kindle)\/([\w\.]+)/i,                                             // Kindle
            /(nook)[\w ]+build\/(\w+)/i,                                        // Nook
@@ -672,8 +605,8 @@
            ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
            /\btu_(1491) b/i                                                    // Rotor Tablets
            ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]], [
-            /((?:tegranote|shield t(?!.+d tv))[\w- ]*?)(?: b|\))/i              // Nvidia Tablets
-            ], [MODEL, [VENDOR, NVIDIA], [TYPE, TABLET]], [
+            /(shield[\w ]+) b/i                                                 // Nvidia Shield Tablets
+            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, TABLET]], [
            /(sprint) (\w+)/i                                                   // Sprint Phones
            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
            /(kin\.[onetw]{3})/i                                                // Microsoft Kin
@@ -699,24 +632,19 @@
            ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
            /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
            ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
-            /(shield \w+ tv)/i                                                  // Nvidia Shield TV
-            ], [MODEL, [VENDOR, NVIDIA], [TYPE, SMARTTV]], [
            /\(dtv[\);].+(aquos)/i,
            /(aquos-tv[\w ]+)\)/i                                               // Sharp
            ], [MODEL, [VENDOR, SHARP], [TYPE, SMARTTV]],[
            /(bravia[\w ]+)( bui|\))/i                                              // Sony
            ], [MODEL, [VENDOR, SONY], [TYPE, SMARTTV]], [
-            /(mi(tv|box)-?\w+) bui/i                                            // Xiaomi
+            /(mitv-\w{5}) bui/i                                                 // Xiaomi
            ], [MODEL, [VENDOR, XIAOMI], [TYPE, SMARTTV]], [
            /Hbbtv.*(technisat) (.*);/i                                         // TechniSAT
            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
            /\b(roku)[\dx]*[\)\/]((?:dvp-)?[\d\.]*)/i,                          // Roku
            /hbbtv\/\d+\.\d+\.\d+ +\([\w\+ ]*; *([\w\d][^;]*);([^;]*)/i         // HbbTV devices
            ], [[VENDOR, trim], [MODEL, trim], [TYPE, SMARTTV]], [
-                                                                                // SmartTV from Unidentified Vendors
-            /droid.+; ([\w- ]+) (?:android tv|smart[- ]?tv)/i
-            ], [MODEL, [TYPE, SMARTTV]], [
-            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i
+            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i                   // SmartTV from Unidentified Vendors
            ], [[TYPE, SMARTTV]], [

            ///////////////////
@@ -726,9 +654,9 @@
            /(ouya)/i,                                                          // Ouya
            /(nintendo) ([wids3utch]+)/i                                        // Nintendo
            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-            /droid.+; (shield)( bui|\))/i                                       // Nvidia Portable
-            ], [MODEL, [VENDOR, NVIDIA], [TYPE, CONSOLE]], [
-            /(playstation \w+)/i                                                // Playstation
+            /droid.+; (shield) bui/i                                            // Nvidia
+            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
+            /(playstation [345portablevi]+)/i                                   // Playstation
            ], [MODEL, [VENDOR, SONY], [TYPE, CONSOLE]], [
            /\b(xbox(?: one)?(?!; xbox))[\); ]/i                                // Microsoft Xbox
            ], [MODEL, [VENDOR, MICROSOFT], [TYPE, CONSOLE]], [
@@ -737,35 +665,15 @@
            // WEARABLES
            ///////////////////

-            /\b(sm-[lr]\d\d[0156][fnuw]?s?|gear live)\b/i                       // Samsung Galaxy Watch
-            ], [MODEL, [VENDOR, SAMSUNG], [TYPE, WEARABLE]], [
-            /((pebble))app/i,                                                   // Pebble
-            /(asus|google|lg|oppo) ((pixel |zen)?watch[\w ]*)( bui|\))/i        // Asus ZenWatch / LG Watch / Pixel Watch
+            /((pebble))app/i                                                    // Pebble
            ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
-            /(ow(?:19|20)?we?[1-3]{1,3})/i                                      // Oppo Watch
-            ], [MODEL, [VENDOR, OPPO], [TYPE, WEARABLE]], [
            /(watch)(?: ?os[,\/]|\d,\d\/)[\d\.]+/i                              // Apple Watch
            ], [MODEL, [VENDOR, APPLE], [TYPE, WEARABLE]], [
-            /(opwwe\d{3})/i                                                     // OnePlus Watch
-            ], [MODEL, [VENDOR, ONEPLUS], [TYPE, WEARABLE]], [
-            /(moto 360)/i                                                       // Motorola 360
-            ], [MODEL, [VENDOR, MOTOROLA], [TYPE, WEARABLE]], [
-            /(smartwatch 3)/i                                                   // Sony SmartWatch
-            ], [MODEL, [VENDOR, SONY], [TYPE, WEARABLE]], [
-            /(g watch r)/i                                                      // LG G Watch R
-            ], [MODEL, [VENDOR, LG], [TYPE, WEARABLE]], [
-            /droid.+; (wt63?0{2,3})\)/i
-            ], [MODEL, [VENDOR, ZEBRA], [TYPE, WEARABLE]], [
-
-            ///////////////////
-            // XR
-            ///////////////////
-
            /droid.+; (glass) \d/i                                              // Google Glass
            ], [MODEL, [VENDOR, GOOGLE], [TYPE, WEARABLE]], [
-            /(pico) (4|neo3(?: link|pro)?)/i                                    // Pico
-            ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
-            /; (quest( \d| pro)?)/i                                             // Oculus Quest
+            /droid.+; (wt63?0{2,3})\)/i
+            ], [MODEL, [VENDOR, ZEBRA], [TYPE, WEARABLE]], [
+            /(quest( 2| pro)?)/i                                                // Oculus Quest
            ], [MODEL, [VENDOR, FACEBOOK], [TYPE, WEARABLE]], [

            ///////////////////
@@ -776,10 +684,6 @@
            ], [VENDOR, [TYPE, EMBEDDED]], [
            /(aeobc)\b/i                                                        // Echo Dot
            ], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [
-            /(homepod).+mac os/i                                                // Apple HomePod
-            ], [MODEL, [VENDOR, APPLE], [TYPE, EMBEDDED]], [
-            /windows iot/i
-            ], [[TYPE, EMBEDDED]], [

            ////////////////////
            // MIXED (GENERIC)
@@ -793,7 +697,7 @@
            ], [[TYPE, TABLET]], [
            /(phone|mobile(?:[;\/]| [ \w\/\.]*safari)|pda(?=.+windows ce))/i    // Unidentifiable Mobile
            ], [[TYPE, MOBILE]], [
-            /droid .+?; ([\w\. -]+)( bui|\))/i                                  // Generic Android Device
+            /(android[-\w\. ]{0,9});.+buil/i                                    // Generic Android Device
            ], [MODEL, [VENDOR, 'Generic']]
        ],

@@ -802,22 +706,16 @@
            /windows.+ edge\/([\w\.]+)/i                                       // EdgeHTML
            ], [VERSION, [NAME, EDGE+'HTML']], [

-            /(arkweb)\/([\w\.]+)/i                                              // ArkWeb
-            ], [NAME, VERSION], [
-
            /webkit\/537\.36.+chrome\/(?!27)([\w\.]+)/i                         // Blink
            ], [VERSION, [NAME, 'Blink']], [

            /(presto)\/([\w\.]+)/i,                                             // Presto
-            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna|servo)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna/Servo
+            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
            /ekioh(flow)\/([\w\.]+)/i,                                          // Flow
            /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i,                           // KHTML/Tasman/Links
            /(icab)[\/ ]([23]\.[\d\.]+)/i,                                      // iCab
-
-            /\b(libweb)/i                                                       // LibWeb
+            /\b(libweb)/i
            ], [NAME, VERSION], [
-            /ladybird\//i
-            ], [[NAME, 'LibWeb']], [

            /rv\:([\w\.]{1,9})\b.+(gecko)/i                                     // Gecko
            ], [VERSION, NAME]
@@ -828,15 +726,15 @@
            // Windows
            /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
            ], [NAME, VERSION], [
-            /(windows (?:phone(?: os)?|mobile|iot))[\/ ]?([\d\.\w ]*)/i         // Windows Phone
+            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i             // Windows Phone
            ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
-            /windows nt 6\.2; (arm)/i,                                          // Windows RT
-            /windows[\/ ]([ntce\d\. ]+\w)(?!.+xbox)/i,
+            /windows nt 6\.2; (arm)/i,                                        // Windows RT
+            /windows[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i,
            /(?:win(?=3|9|n)|win 9x )([nt\d\.]+)/i
            ], [[VERSION, strMapper, windowsVersionMap], [NAME, 'Windows']], [

            // iOS/macOS
-            /[adehimnop]{4,7}\b(?:.*os ([\w]+) like mac|; opera)/i,             // iOS
+            /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
            /cfnetwork\/.+darwin/i
            ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
@@ -846,15 +744,15 @@

            // Mobile OSes
            /droid ([\w\.]+)\b.+(android[- ]x86|harmonyos)/i                    // Android-x86/HarmonyOS
-            ], [VERSION, NAME], [                                               
-            /(ubuntu) ([\w\.]+) like android/i                                  // Ubuntu Touch
-            ], [[NAME, /(.+)/, '$1 Touch'], VERSION], [
-                                                                                // Android/Blackberry/WebOS/QNX/Bada/RIM/KaiOS/Maemo/MeeGo/S40/Sailfish OS/OpenHarmony/Tizen
-            /(android|bada|blackberry|kaios|maemo|meego|openharmony|qnx|rim tablet os|sailfish|series40|symbian|tizen|webos)\w*[-\/; ]?([\d\.]*)/i
+            ], [VERSION, NAME], [                                               // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS
+            /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish)[-\/ ]?([\w\.]*)/i,
+            /(blackberry)\w*\/([\w\.]*)/i,                                      // Blackberry
+            /(tizen|kaios)[\/ ]([\w\.]+)/i,                                     // Tizen/KaiOS
+            /\((series40);/i                                                    // Series 40
            ], [NAME, VERSION], [
            /\(bb(10);/i                                                        // BlackBerry 10
            ], [VERSION, [NAME, BLACKBERRY]], [
-            /(?:symbian ?os|symbos|s60(?=;)|series ?60)[-\/ ]?([\w\.]*)/i       // Symbian
+            /(?:symbian ?os|symbos|s60(?=;)|series60)[-\/ ]?([\w\.]*)/i         // Symbian
            ], [VERSION, [NAME, 'Symbian']], [
            /mozilla\/[\d\.]+ \((?:mobile|tablet|tv|mobile; [\w ]+); rv:.+ gecko\/([\w\.]+)/i // Firefox OS
            ], [VERSION, [NAME, FIREFOX+' OS']], [
@@ -885,7 +783,7 @@
            /(mageia|vectorlinux)[; ]/i,                                        // Mageia/VectorLinux
            /([kxln]?ubuntu|debian|suse|opensuse|gentoo|arch(?= linux)|slackware|fedora|mandriva|centos|pclinuxos|red ?hat|zenwalk|linpus|raspbian|plan 9|minix|risc os|contiki|deepin|manjaro|elementary os|sabayon|linspire)(?: gnu\/linux)?(?: enterprise)?(?:[- ]linux)?(?:-gnu)?[-\/ ]?(?!chrom|package)([-\w\.]*)/i,
                                                                                // Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware/Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus/Raspbian/Plan9/Minix/RISCOS/Contiki/Deepin/Manjaro/elementary/Sabayon/Linspire
-            /(hurd|linux)(?: arm\w*| x86\w*| ?)([\w\.]*)/i,                     // Hurd/Linux
+            /(hurd|linux) ?([\w\.]*)/i,                                         // Hurd/Linux
            /(gnu) ?([\w\.]*)/i,                                                // GNU
            /\b([-frentopcghs]{0,5}bsd|dragonfly)[\/ ]?(?!amd|[ix346]{1,2}86)([\w\.]*)/i, // FreeBSD/NetBSD/OpenBSD/PC-BSD/GhostBSD/DragonFly
            /(haiku) (\w+)/i                                                    // Haiku
@@ -967,7 +865,7 @@
            _os[NAME] = undefined;
            _os[VERSION] = undefined;
            rgxMapper.call(_os, _ua, _rgxmap.os);
-            if (_isSelfNav && !_os[NAME] && _uach && _uach.platform && _uach.platform != 'Unknown') {
+            if (_isSelfNav && !_os[NAME] && _uach && _uach.platform != 'Unknown') {
                _os[NAME] = _uach.platform  
                                    .replace(/chrome os/i, CHROMIUM_OS)
                                    .replace(/macos/i, MAC_OS);           // backward compatibility
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -1,72 +1,12 @@
 [
-    {
-        "desc"    : "115 Browser",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36 115Browser/24.3.0.3",
-        "expect"  :
-        {
-            "name"    : "115",
-            "version" : "24.3.0.3",
-            "major"   : "24"
-        }
-    },
-    {
-        "desc"    : "2345 Browser",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; MI NOTE Pro Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Mobile Safari/537.36 Mb2345Browser/15.6.2",
-        "expect"  :
-        {
-            "name"    : "2345",
-            "version" : "15.6.2",
-            "major"   : "15"
-        }
-    },
-    {
-        "desc"    : "2345 Chrome",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML like Gecko) Chrome/39.0.2171.99 Safari/537.36 2345chrome v3.0.0.9739",
-        "expect"  :
-        {
-            "name"    : "2345",
-            "version" : "3.0.0.9739",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "2345 Explorer",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.90 Safari/537.36 2345Explorer/9.2.1.17116",
-        "expect"  :
-        {
-            "name"    : "2345",
-            "version" : "9.2.1.17116",
-            "major"   : "9"
-        }
-    },
    {
        "desc"    : "360 Browser on iOS",
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/607.3.9 (KHTML, like Gecko) Mobile/16G102 QHBrowser/317 QihooBrowser/4.0.10",
        "expect"  :
        {
-            "name"    : "360",
-            "version" : "4.0.10",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "360 Secure Browser on Windows 10",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36 QIHU 360SE",
-        "expect"  :
-        {
-            "name"    : "360",
-            "version" : "86.0.4240.198",
-            "major"   : "86"
-        }
-    },
-    {
-        "desc"    : "360 Speed Browser on Windows 10",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36 QIHU 360EE",
-        "expect"  :
-        {
-            "name"    : "360",
-            "version" : "86.0.4240.198",
-            "major"   : "86"
+            "name"    : "360 Browser",
+            "version" : "undefined",
+            "major"   : "undefined"
        }
    },
    {
@@ -269,16 +209,6 @@
            "major"   : "11"
        }
    },
-    {
-        "desc"    : "Blazer",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/hspr-H102; Blazer/4.0) 16;320x320",
-        "expect"  :
-        {
-            "name"    : "Blazer",
-            "version" : "4.0",
-            "major"   : "4"
-        }
-    },
    {
        "desc"    : "Bolt",
        "ua"      : "Mozilla/5.0 (X11; 78; CentOS; US-en) AppleWebKit/527+ (KHTML, like Gecko) Bolt/0.862 Version/3.0 Safari/523.15",
@@ -459,36 +389,6 @@
            "major"   : "78"
        }
    },
-    {
-        "desc"    : "Comodo Dragon",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.2) AppleWebKit/535.7 (KHTML, like Gecko) Comodo_Dragon/16.1.1.0 Chrome/16.0.912.63 Safari/535.7",
-        "expect"  :
-        {
-            "name"    : "Dragon",
-            "version" : "16.1.1.0",
-            "major"   : "16"
-        }
-    },
-    {
-        "desc"    : "Comodo Dragon",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Dragon/98.0.4758.102 Chrome/98.0.4758.102 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Dragon",
-            "version" : "98.0.4758.102",
-            "major"   : "98"
-        }
-    },
-    {
-        "desc"    : "Conkeror",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:6.0.1) Gecko/20110831 conkeror/0.9.3",
-        "expect"  :
-        {
-            "name"    : "conkeror",
-            "version" : "0.9.3",
-            "major"   : "0"
-        }
-    },
    {
        "desc"    : "Dillo",
        "ua"      : "Dillo/2.2",
@@ -519,16 +419,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "DuckDuckGo",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Safari/605.1.1517.4.1 Ddg/17.4.1",
-        "expect"  :
-        {
-            "name"    : "DuckDuckGo",
-            "version" : "17.4.1",
-            "major"   : "17"
-        }
-    },
    {
        "desc"    : "DuckDuckGo",
        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile DuckDuckGo/5 Safari/537.36",
@@ -559,16 +449,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "Go Browser",
-        "ua"      : "NokiaE66/GoBrowser/2.0.297",
-        "expect"  :
-        {
-            "name"    : "GoBrowser",
-            "version" : "2.0.297",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "Waterfox",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:55.0) Gecko/20100101 Firefox/55.2.2 Waterfox/55.2.2",
@@ -768,26 +648,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Helio",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 Safari/537.36 Helio/0.98.20",
-        "expect"  :
-        {
-            "name"    : "Helio",
-            "version" : "0.98.20",
-            "major"   : "0"
-        }
-    },
-    {
-        "desc"    : "HeyTap",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.61 Safari/537.36 HeyTapBrowser/40.8.10.1",
-        "expect"  :
-        {
-            "name"    : "HeyTap",
-            "version" : "40.8.10.1",
-            "major"   : "40"
-        }
-    },
    {
        "desc"    : "HuaweiBrowser",
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00；HMSCore/4.0.0 GMS/10.4 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",
@@ -838,16 +698,6 @@
            "major"   : "2"
        }
    },
-    {
-        "desc"    : "ICEBrowser",
-        "ua"      : "Mozilla/5.0 (Java 1.6.0_01; Windows XP 5.1 x86; en) ICEbrowser/v6_1_2",
-        "expect"  :
-        {
-            "name"    : "ICEbrowser",
-            "version" : "6.1.2",
-            "major"   : "6"
-        }
-    },
    {
        "desc"    : "IceCat",
        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.3) Gecko/2008092921 IceCat/3.0.3-g1",
@@ -908,46 +758,6 @@
            "major"   : "11"
        }
    },
-    {
-        "desc"    : "Iron",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1250.0 Iron/22.0.2150.0 Safari/537.4",
-        "expect"  :
-        {
-            "name"    : "Iron",
-            "version" : "22.0.2150.0",
-            "major"   : "22"
-        }
-    },
-    {
-        "desc"    : "Iron",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Iron Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Iron",
-            "version" : "129.0.0.0",
-            "major"   : "129"
-        }
-    },
-    {
-        "desc"    : "Iron",
-        "ua"      : "Mozilla/5.0 (Linux; Android 11; Pixel 4 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Mobile Iron Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Iron",
-            "version" : "113.0.0.0",
-            "major"   : "113"
-        }
-    },
-    {
-        "desc"    : "Jasmine",
-        "ua"      : "SAMSUNG-S8000/S8000XXIF3 SHP/VPP/R5 Jasmine/1.0 Nextreaming SMM-MMS/1.2.0 profile/MIDP-2.1 configuration/CLDC-1.1",
-        "expect"  :
-        {
-            "name"    : "Jasmine",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "K-Meleon",
        "ua"      : "Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.5) Gecko/20031016 K-Meleon/0.8.2",
@@ -968,16 +778,6 @@
            "major"   : "2"
        }
    },
-    {
-        "desc"    : "Klar < 4.1",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Klar/1.0 Chrome/58.0.3029.83 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Klar",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "Konqueror",
        "ua"      : "Mozilla/5.0 (compatible; Konqueror/3.5; Linux; X11; x86_64) KHTML/3.5.6 (like Gecko) (Kubuntu)",
@@ -998,36 +798,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "PicoBrowser",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; Pico Neo3 Link OS5.8.4.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.22 Chrome/105.0.5195.68 VR Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Pico Browser",
-            "version" : "3.3.22",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "PicoBrowser",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; PICO 4 OS5.4.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.22 Chrome/105.0.5195.68 VR Safari/537.36 OculusBrowser/7.0",
-        "expect"  :
-        {
-            "name"    : "Pico Browser",
-            "version" : "3.3.22",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "Rekonq",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux x86_64; cs-CZ) AppleWebKit/533.3 (KHTML, like Gecko) rekonq Safari/533.3",
-        "expect"  :
-        {
-            "name"    : "rekonq",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
    {
        "desc"    : "Smart Lenovo Browser",
        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 SLBrowser/8.0.0.10171 SLBChan/8",
@@ -1048,36 +818,6 @@
            "major"   : "9"
        }
    },
-    {
-        "desc"    : "LibreWolf",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 LibreWolf/91.0",
-        "expect"  :
-        {
-            "name"    : "LibreWolf",
-            "version" : "91.0",
-            "major"   : "91"
-        }
-    },
-    {
-        "desc"    : "Ladybird",
-        "ua"      : "Mozilla/5.0 (Linux; x86_64) Ladybird/1.0",
-        "expect"  :
-        {
-            "name"    : "Ladybird",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "LibreWolf",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Firefox/97.0 LibreWolf/97.0.1",
-        "expect"  :
-        {
-            "name"    : "LibreWolf",
-            "version" : "97.0.1",
-            "major"   : "97"
-        }
-    },
    {
        "desc"    : "LINE on Android",
        "ua"      : "Mozilla/5.0 (Linux; Android 5.0; ASUS_Z00AD Build/LRX21V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.81 Mobile Safari/537.36 Line/6.5.1/IAB",
@@ -1129,57 +869,7 @@
        }
    },
    {
-        "desc"    : "Maxthon on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 5.1.1; KFAUWI Build/LVY48F; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.127 Safari/537.36 MxBrowser/4.3.5.2000",
-        "expect"  :
-        {
-            "name"    : "Maxthon",
-            "version" : "4.3.5.2000",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "Maxthon on iOS",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 13_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/10.0 Mobile/15E148 Safari/602.1 MXiOS/5.4.5.2",
-        "expect"  :
-        {
-            "name"    : "Maxthon",
-            "version" : "5.4.5.2",
-            "major"   : "5"
-        }
-    },
-    {
-        "desc"    : "Maxthon on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux i686; Ubuntu 14.04.3 LTS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.0 Maxthon/1.0.5.3 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Maxthon",
-            "version" : "1.0.5.3",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Maxthon on macOS",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/604.5.6 (KHTML, like Gecko) Version/11.0.3 Safari/604.5.6 Maxthon/5.1.102",
-        "expect"  :
-        {
-            "name"    : "Maxthon",
-            "version" : "5.1.102",
-            "major"   : "5"
-        }
-    },
-    {
-        "desc"    : "Maxthon on Windows Server 2003",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; MyIE2; .NET CLR 1.1.4322)",
-        "expect"  :
-        {
-            "name"    : "Maxthon",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Maxthon on Windows XP",
+        "desc"    : "Maxthon",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; SV1; Maxthon; .NET CLR 1.1.4322)",
        "expect"  :
        {
@@ -1188,16 +878,6 @@
            "major"   : "undefined"
        }
    },
-    {
-        "desc"    : "Maxthon on Windows 10",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36 Maxthon/5.2.7.2000",
-        "expect"  :
-        {
-            "name"    : "Maxthon",
-            "version" : "5.2.7.2000",
-            "major"   : "5"
-        }
-    },
    {
        "desc"    : "Midori",
        "ua"      : "Midori/0.2.2 (X11; Linux i686; U; en-us) WebKit/531.2+",
@@ -1308,26 +988,6 @@
            "major"   : "6"
        }
    },
-    {
-        "desc"    : "NetSurf in Plan9",
-        "ua"      : "Mozilla/5.0 (Plan9) NetSurf/3.12",
-        "expect"  :
-        {
-            "name"    : "NetSurf",
-            "version" : "3.12",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "NetSurf in Linux",
-        "ua"      : "NetSurf/3.10 (Linux; Arch Linux)",
-        "expect"  :
-        {
-            "name"    : "NetSurf",
-            "version" : "3.10",
-            "major"   : "3"
-        }
-    },
    {
        "desc"    : "Nokia Browser",
        "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaN8-00/025.007; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
@@ -1458,26 +1118,6 @@
            "major"   : "12"
        }
    },
-    {
-        "desc"    : "Opera GX on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; Redmi Note 8 Pro Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.5790.168 Mobile Safari/537.36 OPX/2",
-        "expect"  :
-        {
-            "name"    : "Opera GX",
-            "version" : "2",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Opera GX on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36 OPR/60.0.3255.50747 OPRGX/60.0.3255.50747",
-        "expect"  :
-        {
-            "name"    : "Opera GX",
-            "version" : "60.0.3255.50747",
-            "major"   : "60"
-        }
-    },
    {
        "desc"    : "Opera Tablet",
        "ua"      : "Opera/9.80 (Windows NT 6.1; Opera Tablet/15165; U; en) Presto/2.8.149 Version/11.1",
@@ -1508,16 +1148,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "OviBrowser",
-        "ua"      : "Mozilla/5.0 (Series40; NokiaX3-02/le6.32; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/1.0.0.11.8",
-        "expect"  :
-        {
-            "name"    : "OviBrowser",
-            "version" : "1.0.0.11.8",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "PhantomJS",
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34",
@@ -1549,7 +1179,7 @@
        }
    },
    {
-        "desc"    : "QQBrowser",
+        "desc"    : "QQ",
        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.4.4; zh-cn; OPPO R7s Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 Chrome/37.0.0.0 MQQBrowser/7.1 Mobile Safari/537.36",
        "expect"  :
        {
@@ -1558,36 +1188,6 @@
            "major"   : "7"
        }
    },
-    {
-        "desc"    : "QQBrowser",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 9; zh-cn; vivo X21 Build/PKQ1.180819.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/9.9 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "QQBrowser",
-            "version" : "9.9",
-            "major"   : "9"
-        }
-    },
-    {
-        "desc"    : "Quark",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 12; zh-Hans-CN; JLH-AN00 Build/HONORJLH-AN00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 Quark/5.8.2.221 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Quark",
-            "version" : "5.8.2.221",
-            "major"   : "5"
-        }
-    },
-    {
-        "desc"    : "Quark",
-        "ua"      : "mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/112.0.0.0 safari/537.36 quarkpc/1.5.5.75",
-        "expect"  :
-        {
-            "name"    : "Quark",
-            "version" : "1.5.5.75",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "QupZilla",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/538.1 (KHTML, like Gecko) QupZilla/1.8.9 Safari/538.1",
@@ -1598,16 +1198,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Rekonq 2",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.2.1 Safari/537.21",
-        "expect"  :
-        {
-            "name"    : "rekonq",
-            "version" : "2.2.1",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "RockMelt",
        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.7 (KHTML, like Gecko) RockMelt/0.8.36.78 Chrome/7.0.517.44 Safari/534.7",
@@ -1717,68 +1307,17 @@
            "version" : "2.0",
            "major"   : "2"
        }
-    },    
-    {
-        "desc"    : "Sleipnir",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; SOV37 Build/52.1.C.0.220; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.120 Mobile Safari/537.36 Sleipnir/3.7.5",
-        "expect"  :
-        {
-            "name"    : "Sleipnir",
-            "version" : "3.7.5",
-            "major"   : "3"
-        }
-    },
-
-    {
-        "desc"    : "Sleipnir",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Sleipnir 2.8.4)",
-        "expect"  :
-        {
-            "name"    : "Sleipnir",
-            "version" : "2.8.4",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Sleipnir",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.1; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022) Sleipnir/2.8.4",
-        "expect"  :
-        {
-            "name"    : "Sleipnir",
-            "version" : "2.8.4",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "SlimBoat",
-        "ua"      : "Mozilla/5.0 (Windows NT 5.2) AppleWebKit/534.34 (KHTML, like Gecko) SlimBoat/1.1.23 Chrome/11.0.696.7 Version/5.1 Safari/534.34",
-        "expect"  :
-        {
-            "name"    : "SlimBoat",
-            "version" : "1.1.23",
-            "major"   : "1"
-        }
    },
    {
        "desc"    : "SlimBrowser",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; SlimBrowser)",
        "expect"  :
        {
-            "name"    : "SlimBrowser",
+            "name"    : "Slim",
            "version" : "undefined",
            "major"   : "undefined"
        }
    },
-    {
-        "desc"    : "Slimjet",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.75 Safari/537.36 Slimjet/20.0.2.0",
-        "expect"  :
-        {
-            "name"    : "Slimjet",
-            "version" : "20.0.2.0",
-            "major"   : "20"
-        }
-    },
    {
        "desc"    : "Swiftfox",
        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1) Gecko/20061024 Firefox/2.0 (Swiftfox)",
@@ -1880,7 +1419,7 @@
        }
    },
    {
-        "desc"    : "UP.Browser",
+        "desc"    : "UPBrowser",
        "ua"      : "BenQ-CF61/1.00/WAP2.0/MIDP2.0/CLDC1.0 UP.Browser/6.3.0.4.c.1.102 (GUI) MMP/2.0",
        "expect"  :
        {
@@ -1950,23 +1489,13 @@
        }
    },
    {
-        "desc"    : "w3m",
-        "ua"      : "w3m/0.5.1",
+        "desc"    : "Viera",
+        "ua"      : "HbbTV/1.2.1 (;Panasonic;VIERA 2015;3.014;a001-003 4000-0000;)",
        "expect"  :
        {
-            "name"    : "w3m",
-            "version" : "0.5.1",
-            "major"   : "0"
-        }
-    },
-    {
-        "desc"    : "Wolvic",
-        "ua"      : "Mozilla/5.0 (Android 12; Mobile VR; rv:121.0) Gecko/121.0 Firefox/121.0 Wolvic/1.6.1",
-        "expect"  :
-        {
-            "name"    : "Wolvic",
-            "version" : "1.6.1",
-            "major"   : "1"
+            "name"    : "VIERA",
+            "version" : "undefined",
+            "major"   : "undefined"
        }
    },
    {
@@ -2164,7 +1693,7 @@
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Mobile/14A456 QQ/6.5.3.410 V1_IPH_SQ_6.5.3_1_APP_A Pixel/1080 Core/UIWebView NetType/WIFI Mem/26",
        "expect"  :
        {
-            "name"    : "QQBrowser",
+            "name"    : "QQ",
            "version" : "6.5.3.410",
            "major"   : "6"
        }
@@ -2174,7 +1703,7 @@
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; PRO 6 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile MQQBrowser/6.8 TBS/036824 Safari/537.36 V1_AND_SQ_6.5.8_422_YYB_D PA QQ/6.5.8.2910 NetType/WIFI WebP/0.3.0 Pixel/1080",
        "expect"  :
        {
-            "name"    : "QQBrowser",
+            "name"    : "QQ",
            "version" : "6.5.8.2910",
            "major"   : "6"
        }
@@ -2247,6 +1776,16 @@
            "name"    : "LBBROWSER"
        }
    },
+    {
+        "desc"    : "2345 Browser",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.90 Safari/537.36 2345Explorer/9.2.1.17116",
+        "expect"  :
+        {
+            "name"    : "2345Explorer",
+            "version" : "9.2.1.17116",
+            "major"   : "9"
+        }
+    },
    {
        "desc"    : "QQBrowserLite",
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/602.2.14 (KHTML, like Gecko) Version/10.0.1 Safari/602.2.14 QQBrowserLite/1.1.0",
@@ -2305,46 +1844,6 @@
            "name"    : "LinkedIn"
        }
    },
-    {
-        "desc"    : "Links in Linux",
-        "ua"      : "Links (2.xpre7; Linux 2.4.18 i586; x)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.xpre7",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Links in Mac",
-        "ua"      : "Links (2.1pre33; Darwin 8.11.0 Power Macintosh; 169x55)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.1pre33",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Links in NetBSD",
-        "ua"      : "Links (2.29; NetBSD 10.0 i386; GNU C 10.5; x)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.29",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Links in FreeBSD",
-        "ua"      : "Links (2.1pre15; FreeBSD 5.3-RELEASE i386; 196x84)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.1pre15",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "Safari including comma in minor version number",
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6,2 Safari/605.1.15",
@@ -2446,26 +1945,6 @@
            "major"  : "10"
        }
    },
-    {
-      "desc"     : "Daum App Android",
-      "ua"       : "Mozilla/5.0 (Linux; Android 11; SM-G970N Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36 DaumApps/7.5.0 DaumDevice/mobile",
-      "expect"   : {
-        "name"   : "Daum",
-        "version": "7.5.0",
-        "major"  : "7",
-        "type"    : "inapp"
-      }
-    },
-    {
-      "desc"     : "Daum App iOS",
-      "ua"       : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Safari/605.1.15 Mobile/15E148 DaumApps/7.5.1 DaumDevice/mobile",
-      "expect"   : {
-        "name"   : "Daum",
-        "version": "7.5.1",
-        "major"  : "7",
-        "type"    : "inapp"
-      }
-    },
    {
        "desc"     : "TikTok",
        "ua"       : "Mozilla/5.0 (Linux; Android 11; 21061119AG Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile Safari/537.36 trill_2022109040 JsSdk/1.0 NetType/MOBILE Channel/googleplay AppName/musical_ly app_version/21.9.4 ByteLocale/ru-RU ByteFullLocale/ru-RU Region/KG BytedanceWebview/d8a21c6",
@@ -2532,25 +2011,5 @@
            "version" : "12.33.0.36",
            "major"   : "12"
        }
-    },
-    {
-        "desc"    : "Twitter",
-        "ua"      : "Mozilla/5.0 (Linux; Android 13; CPH2531 Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.120 Mobile Safari/537.36 TwitterAndroid",
-        "expect"  :
-        {
-            "name"    : "Twitter",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Twitter",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 15_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/19H12 Twitter for iPhone/10.34",
-        "expect"  :
-        {
-            "name"    : "Twitter",
-            "version" : "10.34",
-            "major"   : "10"
-        }
    }
 ]
--- a/test/cpu-test.json
+++ b/test/cpu-test.json
@@ -7,14 +7,6 @@
            "architecture"  : "ia32"
        }
    },
-    {
-        "desc"    : "i686",
-        "ua"      : "Mozilla/5.0 (X11; U; CrOS i686 9.10.0; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.253.0 Safari/532.5",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
    {
        "desc"    : "i386",
        "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
@@ -175,22 +167,6 @@
            "architecture"  : "arm64"
        }
    },
-    {
-        "desc"    : "Google Search App",
-        "ua"      : "Mozilla/5.0 (Linux; Android 9; JAT-LX1 Build/HONORJAT-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.96 Mobile Safari/537.36 GoogleApp/11.11.10.21.arm",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "Google Search App",
-        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; M5s Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.147 Mobile Safari/537.36 GSA/12.40.17.23.arm64",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
    {
        "desc"    : "Pocket PC",
        "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
@@ -270,21 +246,5 @@
        {
            "architecture"  : "irix64"
        }
-    },
-    {
-        "desc"    : "68k",
-        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
-        "expect"  : 
-        {
-            "architecture"  : "68k"
-        }
-    },
-    {
-        "desc"    : "x86",
-        "ua"      : "Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:1.8.1.20) Gecko/20090127 BonEcho/2.0.0.20",
-        "expect"  : 
-        {
-            "architecture"  : "ia32"
-        }
    }
 ]
--- a/test/device-test.json
+++ b/test/device-test.json
--- a/test/engine-test.json
+++ b/test/engine-test.json
@@ -1,13 +1,4 @@
 [
-    {
-        "desc"    : "ArkWeb",
-        "ua"      : "Mozilla/5.0 (Phone; OpenHarmony 4.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile",
-        "expect"  :
-        {
-            "name"    : "ArkWeb",
-            "version" : "4.1.6.1"
-        }
-    },
    {
        "desc"    : "Blink",
        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; SM-G920I Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/3.4.9 SamsungBrowser/4.0 Chrome/57.0.2987.146 Mobile VR Safari/537.36",
@@ -62,15 +53,6 @@
            "version" : "4.5.4"
        }
    },
-    {
-        "desc"    : "LibWeb",
-        "ua"      : "Mozilla/5.0 (Linux; x86_64) Ladybird/1.0",
-        "expect"  :
-        {
-            "name"    : "LibWeb",
-            "version" : "undefined"
-        }
-    },
    {
        "desc"    : "LibWeb",
        "ua"      : "Mozilla/4.0 (SerenityOS; x86) LibWeb+LibJS (Not KHTML, nor Gecko) LibWeb",
@@ -98,15 +80,6 @@
            "version" : "2.8.149"
        }
    },
-    {
-        "desc"    : "Servo",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Servo/1.0 Firefox/111.0",
-        "expect"  :
-        {
-            "name"    : "Servo",
-            "version" : "1.0"
-        }
-    },
    {
        "desc"    : "Tasman",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; PPC Mac OS X 10.4.7; Tasman 1.0)",
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -80,15 +80,6 @@
            "version" : "10"
        }
    },
-    {
-        "desc"    : "Windows IoT",
-        "ua"      : "Mozilla/5.0 (Windows IoT 10.0; Android 6.0.1; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Mobile Safari/537.36 Edge/18.17763",
-        "expect"  :
-        {
-            "name"    : "Windows IoT",
-            "version" : "10.0"
-        }
-    },
    {
        "desc"    : "WeChat Desktop for Windows Built-in Browser",
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.901.400 QQBrowser/9.0.2524.400",
@@ -242,15 +233,6 @@
            "version" : "2.2.2"
        }
    },
-    {
-        "desc"    : "MIUI",
-        "ua"      : "Dalvik/2.1.0 (Linux; U; Android 9; Mi MIX 3 5G MIUI/V10.3.2.0.PEMEUVF)",
-        "expect"  :
-        {
-            "name"    : "Android",
-            "version" : "9"
-        }
-    },
    {
        "desc"    : "HarmonyOS",
        "ua"      : "Mozilla/5.0 (Linux; Android 10; HarmonyOS; YAL-AL10; HMSCore 6.3.0.327; GMSCore 21.48.15) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.3.310 Mobile Safari/537.36",
@@ -338,7 +320,7 @@
        "expect"  :
        {
            "name"    : "QNX",
-            "version" : "undefined"
+            "version" : "x86pc"
        }
    },
    {
@@ -368,24 +350,6 @@
            "version" : "undefined"
        }
    },
-    {
-        "desc"    : "Nokia N900 Linux mobile, on the Maemo browser",
-        "ua"      : "Mozilla/5.0(X11; U; Linux armv7l; fr-FR; rv:1.9.2a1pre) Gecko/20091127 Firefox/3.5 Maemo Browser 1.5.6 RX-51 N900",
-        "expect"  :
-        {
-            "name"    : "Maemo",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Nokia N900 Linux mobile, on the Maemo browser",
-        "ua"      : "Mozilla/5.0 (Linux; Maemo 5.0; Nokia N900; Build/4.0.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Maemo",
-            "version" : "5.0"
-        }
-    },
    {
        "desc"    : "MeeGo",
        "ua"      : "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
@@ -396,7 +360,7 @@
        }
    },
    {
-        "desc"    : "Nokia 5250",
+        "desc"    : "Symbian",
        "ua"      : "Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba",
        "expect"  :
        {
@@ -405,57 +369,12 @@
        }
    },
    {
-        "desc"    : "Nokia N79",
-        "ua"      : "Mozilla/5.0 (SymbianOS/9.3; U; Series60/3.2 NokiaN79-1/32.001; Profile/MIDP-2.1 Configuration/CLDC-1",
-        "expect"  :
-        {
-            "name"    : "Symbian",
-            "version" : "9.3"
-        }
-    },
-    {
-        "desc"    : "Nokia E71",
-        "ua"      : "Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 NokiaE71-1/110.07.127; Profile/MIDP-2.0 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413",
-        "expect"  :
-        {
-            "name"    : "Symbian",
-            "version" : "9.2"
-        }
-    },
-    {
-        "desc"    : "Opera Mini on S60",
-        "ua"      : "Opera/9.80 (Series 60; Opera Mini/7.1.32444/191.361; U; de) Presto/2.12.423 Version/12.16",
-        "expect"  :
-        {
-            "name"    : "Symbian",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "NokiaBrowser on Nokia C7",
+        "desc"    : "Symbian",
        "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaC7-00/024.001; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
        "expect"  :
        {
            "name"    : "Symbian",
-            "version" : "3"
-        }
-    },
-    {
-        "desc"    : "Nokia 808 PureView",
-        "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.5 Nokia808PureView/113.010.1508; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.2.21 Mobile Safari/535.1 3gpp-gba",
-        "expect"  :
-        {
-            "name"    : "Symbian",
-            "version" : "3"
-        }
-    },
-    {
-        "desc"    : "Nokia 808 PureView",
-        "ua"      : "Mozilla/5.0 (Symbian; U; Nokia808 PureView; en-GB) AppleWebKit/534.3 (KHTML, like Gecko) Version/3.0 Mobile/1A543a Mobile Safari/534.3",
-        "expect"  :
-        {
-            "name"    : "Symbian",
-            "version" : "undefined"
+            "version" : "5.2"
        }
    },
    {
@@ -602,15 +521,6 @@
            "version" : "undefined"
        }
    },
-    {
-        "desc"    : "Ubuntu Touch",
-        "ua"      : "Mozilla/5.0 (Linux; Ubuntu 16.04 like Android 4.4) AppleWebKit/537.36 Chromium/65.0.3325.151 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Ubuntu Touch",
-            "version" : "16.04"
-        }
-    },
    {
        "desc"    : "Kubuntu",
        "ua"      : "Mozilla/5.0 (compatible; Konqueror/4.4; Linux 2.6.32-22-generic; X11; en_US) KHTML/4.4.3 (like Gecko) Kubuntu",
@@ -890,15 +800,6 @@
            "version" : "16.4.1"
        }
    },
-    {
-        "desc": "Apple HomePod",
-        "ua": "AppleCoreMedia/1.0.0.15D61 (HomePod; U; CPU OS 11_2_5 like Mac OS X; en_us)",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "11.2.5"
-        }
-    },
    {
        "desc"    : "watchOS",
        "ua"      : "server-bag [Watch OS,8.4,19S546,Watch3,4]",
@@ -1202,7 +1103,7 @@
        "expect"  :
        {
            "name"    : "Linux",
-            "version" : "undefined"
+            "version" : "x86_64"
        }
    },
    {
@@ -1339,14 +1240,5 @@
            "name"    : "SerenityOS",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "OpenHarmony",
-        "ua"      : "Mozilla/5.0 (Phone; OpenHarmony 4.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile",
-        "expect"  :
-        {
-            "name"    : "OpenHarmony",
-            "version" : "4.1"
-        }
    }
 ]