[device-utils] Add new method: getMarketingName()

NEW SUBMODULE: device-utils
2025-11-20 17:16:40 +03:00 · 2024-12-02 16:15:35 +07:00 · 2024-12-02 10:45:39 +07:00
107 changed files with 3182 additions and 9042 deletions
--- a/.github/workflows/test-ci.yml
+++ b/.github/workflows/test-ci.yml
@@ -10,19 +10,14 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        arch: [amd64]
-        node-version: ['22.13', 'lts/*']
-        include:
-          - arch: ppc64le
-            node-version: 20
+        arch: [amd64, ppc64le]
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
        with: 
-          node-version:  ${{ matrix.node-version }}
+          node-version: 'lts/*'
      - name: Run the test
        run: |
-          echo "Running on ubuntu-latest-${{ matrix.arch }} with node version set as ${{ matrix.node-version }}"
          npm ci
          npx playwright install --with-deps
          npm test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,12 +23,8 @@
 - **Support for Custom/Predefined Extensions:**
  - Pass custom regexes or predefined extensions as a list to `UAParser()`

- **Support for CLI Processing:**
-  - Directly parse user-agent strings from the command line:
-    `npx ua-parser-js "<User-Agent>"`
-  - Process batch data from files: 
-    `npx ua-parser-js --input-file=log.txt >> result.json` or
-    `npx ua-parser-js --input-file=log.txt --output-file=result.json`
+- **Support for CLI Parsing:**
+  - Parse a user-agent directly from the command line using `npx ua-parser-js "[User-Agent]"`

 - **Enhanced Detection with Client Hints:**
  - `withClientHints()`: Improves detection accuracy by leveraging client hints
@@ -69,123 +65,6 @@

 --- 

-## Version 2.0.6
- Add new CLI feature: processing batch user-agent data from file and output as JSON
- Fix `setUA()`: trim leading space from user-agent string input
- Replace `undici` dependency with node's internal `Headers`
- Add new browser: Bing, Qwant
- Add new device vendor: Hisense, Wiko
- Improve browser detection: Mozilla, Pale Moon
- Improve CPU detection: 68k
- Improve device detection: Apple, BlackBerry, Huawei, Nokia, Xiaomi
- Improve OS detection: iOS 26
- `extensions` submodule:
-    - Add new fetcher: Discordbot, KeybaseBot, Slackbot, Slackbot-LinkExpanding, Slack-ImgProxy, Twitterbot
-    - Add new crawler: Qwantbot-news, SurdotlyBot, SwiftBot
-
-## Version 2.0.5
-
- Add new browser: Zalo
- Add new CPU arch: alpha
- Add new device vendor: Philips
- Improve device detection: Pico
- Fix parsing error on pages with modified Array prototypes
- Improve type declarations:
-    - Replace `node-fetch` dependency with `undici`
-    - Replace hardcoded string values with enum from `enum` submodule
- `enums` submodule:
-    - Add `Extension` enum for `extensions` submodule
-    - Type declaration file now automatically generated using build script
-    - Naming adjustments:
-        - `Browser` => `BrowserName`
-        - `CPU` => `CPUArch`
-        - `Device` => `DeviceType`
-        - `Vendor` => `DeviceVendor`
-        - `Engine` => `EngineName`
-        - `OS` => `OSName`
- `extensions` submodule:
-    - Add new crawlers: 
-        APIs-Google, Algolia Crawler, Algolia Crawler Renderscript, Baidu-ADS, BLEXBot, botify, Bravebot, Claude-Web, cohere-training-data-crawler, contxbot, Cotoyogi, Coveobot, CriteoBot, DeepSeekBot, DuckDuckGo-Favicons-Bot, Elastic, FirecrawlAgent, Freespoke, Google-CloudVertexBot, HuggingFace-Bot, Kagibot, Kangaroo Bot, marginalia, msnbot, OnCrawl, Replicate-Bot, RunPod-Bot, SBIntuitionsBot, SeekportBot, Siteimprove, Sogou Pic Spider, TikTokSpider, TwinAgent, v0bot, webzio, Webzio-Extended, xAI-Bot, YandexAccessibilityBot, YandexAdditionalBot, YandexAdNet, YandexBot MirrorDetector, YandexBlogs, YandexComBot, YandexFavicons, YandexImageResizer, YandexImages, YandexMarket, YandexMetrika, YandexMedia, YandexMobileBot, YandexMobileScreenShotBot, YandexNews, YandexOntoDB, YandexOntoDBAPI, YandexPartner, YandexRCA, YandexRenderResourcesBot, YandexScreenshotBot, YandexSpravBot, YandexTracker, YandexVertis, YandexVerticals, YandexVideo, YandexVideoParser, YandexWebmaster, YepBot, ZumBot
-    - Add new fetchers: 
-        Asana, bitlybot, Blueno, BufferLinkPreviewBot, Chrome-Lighthouse, Gemini-Deep-Research, HubSpot Page Fetcher, kakaotalk-scrap, vercel-favicon-bot, vercel-screenshot-bot, vercelflags, verceltracing, YaDirectFetcher, YandexCalendar, YandexDirect, YandexDirectDyn, YandexForDomain, YandexPagechecker, YandexSearchShop, YandexSitelinks, YandexUserproxy
- `helpers` submodule:
-    - Add some crawler to `isAIBot()`: 
-        Bravebot, cohere-training-data-crawler, FirecrawlAgent, HuggingFace-Bot, Kangaroo Bot, PanguBot, Replicate-Bot, RunPod-Bot, TikTokSpider, Together-Bot, v0bot, xAI-Bot
-
-## Version 2.0.4
-
- Add new browser: Edge WebView, Edge WebView2
- Add new device vendor: Lava, Retroid, Vizio
- Add new OS: ArcaOS, Knoppix, Xubuntu, Windows CE, Windows RT
- Improve device detection: Google Pixel & Pixelbook Series, HMD, Infinix, LG WebOS TV, Motorola, Nothing, OnePlus, Sony, Tecno
- Improve OS detection: AIX, Arch, Fuchsia, Haiku, HarmonyOS, Mint, MorphOS, Solaris, Windows
- Improve `withClientHints()` browser naming adjustments: `Microsoft Edge WebView2` => `Edge WebView2`
- Identify device that uses Firefox Reality / Wolvic as `xr`
- Identify device with large screen as `smarttv`
- Identify Windows CE & Windows RT as distinct OS variants
- `extensions` submodule:
-    - Remove lookbehind assertion to ensure regex compatibility
-    - Add new crawlers: ChatGLM, Daum, iAskBot, Onespot, Qwantbot, Startpage
-    - Add new emails: Apple's Mail, DaumMail, Polymail, ProtonMail, SparkDesktop, Zimbra, ZohoMail-Desktop
-    - Add new fetchers: Iframely, MistralAI-User, Perplexity-User
-    - Add new inApps: Discord, Evernote, Figma, Flipboard, Mattermost, Notion, Postman, Rambox, Rocket.Chat, Microsoft Teams, TikTok Lite, VS Code
-    - Add new libraries: AdobeAIR, aiohttp, nutch, httpx, urllib3
- `enum` submodule:
-    - Fix mistakenly placed `BLU` categorized as browser name instead of device vendor
-
-## Version 2.0.3
-
- Add new browser: Dooble, Ecosia, LG Browser, Otter, qutebrowser, Surf
- Add new device: BLU, Facebook Portal TV
- Improve device detection: Archos, LG, Meta Quest
- Remove jazzer.js fuzz test
- Improve `withClientHints()`:
-    - Browser naming adjustments:
-        - `HuaweiBrowser` => `Huawei Browser`
-        - `Miui Browser` => `MIUI Browser`
-        - `OperaMobile` => `Opera Mobi`
-        - `YaBrowser` => `Yandex`
- `extensions` submodule:
-    - Add new Crawler: AdIdxBot, Linespider, LinkedInBot, OpenAI Image Downloader, SemrushBot, Yahoo! Slurp
-    - Add new Fetcher: Better Uptime Bot, Google-PageRenderer, GoogleImageProxy, MicrosoftPreview, Snap URL Preview, SkypeUriPreview, TelegramBot
-    - Add new Vehicles: BMW, Jeep
-    - Add OS detection of WhatsApp user-agent
-
-## Version 2.0.2
-
- Fix TypeScript dependency issue
-
-## Version 2.0.1
-
- Add new browser: Ladybird, Daum
- Add new device: Apple HomePod
- Add new device vendor: HMD
- Add new OS: Ubuntu Touch, Windows IoT
- Improve CPU detection: ARM, x86
- Improve device detection: Lenovo, Nokia, Nvidia, Xiaomi
-    - Tablet: Google, Honor, Huawei, Infinix, Nokia, OnePlus, Xiaomi
-    - Wearable: Asus, Google, LG, Motorola, OnePlus, Oppo, Samsung, Sony
-    - Smart-TV: Xiaomi, unidentified vendors
-    - Improve detection for unknown VR devices
-    - Improve device model detection for Generic devices
- Improve OS detection: Linux, Symbian
- Improve TypeScript definitions for Headers
- Improve `withClientHints()`:
-    - `engine.version` also get updated
-    - Infer `device.vendor` & `device.type` by guessing from `device.model`
-    - Browser naming adjustments:
-        - `Google Chrome` => `Chrome`
-        - `Microsoft Edge` => `Edge`
-        - `Android WebView` => `Chrome WebView`
-        - `HeadlessChrome` => `Chrome Headless`
- `enums` submodule:
-    - Add TypeScript definitions
- `extensions` submodule:
-    - Add new list: 
-        - `Vehicles`: BYD, Rivian, Volvo
-    - Add new Fetcher: Bluesky
-    - Add new Library: Apache-HttpClient, go-http-client, got, GuzzleHttp, Java-http-client, libwww-perl, lua-resty-http, Needle, OkHttp, node-fetch, PHP-SOAP, PostmanRuntime, superagent
-
 ## Version 2.0.0

 - `ua-parser-js/extensions` submodule:
@@ -287,25 +166,6 @@

 ---

-## 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
--- a/README.md
+++ b/README.md
@@ -1,9 +1,3 @@
-#### Featured Sponsors
-
-[![https://ref.wisprflow.ai/Rxj3n8H](https://github.com/user-attachments/assets/e39fc98d-5d1b-4f7b-a355-4648e1f79a94)](https://ref.wisprflow.ai/Rxj3n8H)
-
---
-
 [![https://uaparser.dev](https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png)](https://uaparser.dev)
 [![https://uaparser.dev](https://github.com/user-attachments/assets/9f30f3d4-5cfe-441c-8f86-ead7c955f940)](https://uaparser.dev)
 [![https://uaparser.dev](https://github.com/user-attachments/assets/50da50fc-7c8a-46e3-a2bc-6a8249914372)](https://uaparser.dev)
@@ -18,12 +12,13 @@
 <a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg?logo=npm&color=red&style=for-the-badge"></a>
 <a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg?color=orange&style=for-the-badge"></a>
 <img src="https://img.shields.io/ossf-scorecard/github.com/faisalman/ua-parser-js?label=openssf%20scorecard&style=for-the-badge">
-<a target="_blank" href="https://discord.com/channels/1406959509087453236/1406959509930381375"><img alt="Discord invite" src="https://dcbadge.limes.pink/api/server/https://discord.com/channels/1406959509087453236/1406959509930381375"></a>
 </p>

 # UAParser.js

-The most comprehensive, compact, and up-to-date JavaScript library to detect user's browser, OS, CPU, and device type/model. Also detect bots, apps, and more. Runs seamlessly in the browser (client-side) or Node.js (server-side).
+The most comprehensive, compact, & up-to-date isomorphic JavaScript library to detect 
+user's Browser, Engine, OS, CPU, and Device type/model. Runs either in browser 
+(client-side) or node.js (server-side).

 # Demo

@@ -38,7 +33,7 @@ The most comprehensive, compact, and up-to-date JavaScript library to detect use
 Before upgrading from `v0.7` / `v1.0`, please read [CHANGELOG](CHANGELOG.md) to 
 see what's new & breaking.

-# Package & Pricing
+# License Options

 <table>
    <thead>
@@ -51,14 +46,14 @@ see what's new & breaking.
    <tbody>
        <tr>
            <td>License options</td>
-            <td>MIT (v1.x)</td>
-            <td>AGPL (v2.x)</td>
+            <td>MIT (v0.7~v1.0)</td>
+            <td>AGPL (&gt;=v2.0)</td>
            <td>PRO Personal</td>
            <td>PRO Business</td>
            <td>PRO Enterprise</td>
        </tr>
        <tr>
-            <td>Browser Detection</td>
+            <td>Browser detection</td>
            <td><a href="#demo" title="Basic detection">⚠️</a></td>
            <td>✅</td>
            <td>✅</td>
@@ -66,7 +61,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>CPU Detection</td>
+            <td>CPU detection</td>
            <td><a href="#demo" title="Basic detection">⚠️</a></td>
            <td>✅</td>
            <td>✅</td>
@@ -74,7 +69,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Device Detection</td>
+            <td>Device detection</td>
            <td><a href="#demo" title="Basic detection">⚠️</a></td>
            <td>✅</td>
            <td>✅</td>
@@ -82,7 +77,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Rendering Engine Detection</td>
+            <td>Engine detection</td>
            <td><a href="#demo" title="Basic detection">⚠️</a></td>
            <td>✅</td>
            <td>✅</td>
@@ -98,7 +93,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Enhanced+ Accuracy</td>
+            <td>Bot detection</td>
            <td>❌</td>
            <td>✅</td>
            <td>✅</td>
@@ -106,7 +101,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Bot Detection</td>
+            <td>AI Bot detection</td>
            <td>❌</td>
            <td>✅</td>
            <td>✅</td>
@@ -114,7 +109,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>AI Detection</td>
+            <td>Extras (Apps, Libs, Emails, Media Players, etc) detection</td>
            <td>❌</td>
            <td>✅</td>
            <td>✅</td>
@@ -122,7 +117,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Extra Detections (Apps, Libs, Emails, Media Players, Crawlers, and more)</td>
+            <td>Enhanced detection result</td>
            <td>❌</td>
            <td>✅</td>
            <td>✅</td>
@@ -130,7 +125,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Client Hints Support</td>
+            <td>Client Hints support</td>
            <td>❌</td>
            <td>✅</td>
            <td>✅</td>
@@ -138,7 +133,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>CommonJS Support</td>
+            <td>CommonJS support</td>
            <td>✅</td>
            <td>✅</td>
            <td>✅</td>
@@ -146,7 +141,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>ESM Support</td>
+            <td>ES modules support</td>
            <td>❌</td>
            <td>✅</td>
            <td>✅</td>
@@ -154,15 +149,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>TypeScript Definitions</td>
-            <td><a href="#demo" title="Community version">✅</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>npm Module Available</td>
+            <td>npm module</td>
            <td>✅</td>
            <td>✅</td>
            <td>✅</td>
@@ -170,15 +157,15 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Direct Downloads Available</td>
-            <td>✅</td>
+            <td>TypeScript declarations</td>
+            <td><a href="#demo" title="Community version">⚠️</a></td>
            <td>✅</td>
            <td>✅</td>
            <td>✅</td>
            <td>✅</td>
        </tr>
        <tr>
-            <td>Commercial Use Allowed</td>
+            <td>Allows commercial use</td>
            <td>✅</td>
            <td>✅</td>
            <td>❌</td>
@@ -186,7 +173,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Permissive (non-Copyleft) License</td>
+            <td>Permissive (non-copyleft) license</td>
            <td>✅</td>
            <td><strong title="Copyleft license">❌</strong></td>
            <td>✅</td>
@@ -194,31 +181,15 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>No Open-Source Obligations</td>
-            <td>✅</td>
-            <td><strong title="Copyleft license">❌</strong></td>
+            <td>Unlimited use per 1 license</td>
            <td>✅</td>
            <td>✅</td>
            <td>✅</td>
+            <td><strong title="1 project per 1 license">❌</strong></td>
+            <td>✅</td>
        </tr>
        <tr>
-            <td>Unlimited End-Products</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td><strong title="1 end-product per license">❌</strong></td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Unlimited Deployments</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td><strong title="1 TLD or deliverable per license">❌</strong></td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>1-year Product Support</td>
+            <td>1-year product support</td>
            <td>❌</td>
            <td>❌</td>
            <td>✅</td>
@@ -226,7 +197,7 @@ see what's new & breaking.
            <td>✅</td>
        </tr>
        <tr>
-            <td>Lifetime Updates</td>
+            <td>Lifetime updates</td>
            <td>✅</td>
            <td>✅</td>
            <td>✅</td>
@@ -235,8 +206,8 @@ see what's new & breaking.
        </tr>
        <tr>
            <td>Price</td>
-            <td><strong title="Pay as you want">FREE<sup>*</sup> (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/1.0.x/license.md">License</a>)</strong></td>
-            <td><strong title="Pay as you want">FREE<sup>*</sup> (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/master/LICENSE.md">License</a>)</strong></td>
+            <td><strong title="Pay as you want">FREE (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/1.0.x/license.md">License</a>)</strong></td>
+            <td><strong title="Pay as you want">FREE (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/master/LICENSE.md">License</a>)</strong></td>
            <td><strong title="$14 (one-time fee)">$14 (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/pro-personal/LICENSE.md">License</a>)</strong></td>
            <td><strong title="$29 (one-time fee)">$29 (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/pro-business/LICENSE.md">License</a>)</strong></td>
            <td><strong title="$599 (one-time fee)">$599 (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/pro-enterprise/LICENSE.md">License</a>)</strong></td>
@@ -265,16 +236,7 @@ Made with [contributors-img](https://contrib.rocks).

 ## Backers & Sponsors

-Support the **open-source editions** of UAParser.js through one of the following options:
-
-[![OpenCollective](https://img.shields.io/badge/OpenCollective-dddddd?style=for-the-badge&logo=opencollective&color=dddddd
-)](https://opencollective.com/ua-parser-js)
-[![GitHub Sponsors](https://img.shields.io/badge/GitHub_Sponsors-333333?style=for-the-badge&logo=githubsponsors&color=333333
-)](https://github.com/sponsors/faisalman)
-[![PayPal](https://img.shields.io/badge/Paypal-003087?style=for-the-badge&logo=paypal&color=003087
-)](https://paypal.me/faisalman)
-[![WeChat/Alipay](https://img.shields.io/badge/Other_Payment_Methods-Alipay_/_WeChat_Pay-09b83e?style=for-the-badge&logo=mastercard&color=09b83e
-)](https://store.faisalman.com/buy/3d71f2f3-cf4d-473c-892a-9d4497c890be)
-
 <a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/organizations.svg?avatarHeight=64"></a>
 <a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/individuals.svg?avatarHeight=64"></a>
+
+Support the open-source editions of UAParser.js on [OpenCollective](https://opencollective.com/ua-parser-js) or [GitHub Sponsors](https://github.com/sponsors/faisalman).
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.min.mjs
+++ b/dist/ua-parser.min.mjs
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/dist/ua-parser.pack.mjs
+++ b/dist/ua-parser.pack.mjs
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,41 +1,38 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "2.0.6",
+  "version": "2.0.0",
  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
  "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client Hints data. Supports browser & node.js environment",
  "keywords": [
    "user-agent",
    "client-hints",
+    "parser",
    "browser",
    "engine",
    "os",
    "device",
    "cpu",
+    "jquery-plugin",
+    "ecosystem:jquery",
    "ua-parser-js",
    "browser-detection",
    "device-detection",
    "os-detection",
-    "bot-detection",
-    "ai-detection",
-    "app-detection",
-    "crawler-detection"
+    "bot-detection"
  ],
  "homepage": "https://uaparser.dev",
  "contributors": [
    "Aamir Poonawalla <aamir@urx.com>",
    "Admas <mollases@users.noreply.github.com>",
-    "Aiyush <aiyushdhar85@gmail.com>",
    "algenon <m@antonz.ru>",
    "Alvin Portillo <alvin@8thwall.com>",
    "Amumu <yoyo837@hotmail.com>",
-    "Andreas Kogler <andreas.kogler@bitmovin.com>",
    "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
    "Anton Zhiyanov <m@antonz.ru>",
    "Arturo Mejia <amejia@blim.com>",
    "Arun Rama Reddy <arunramareddy@gmail.com>",
    "Austin Pray <austin@austinpray.com>",
-    "Beat YT <66485277+Beat-YT@users.noreply.github.com>",
    "Bendeguz <symunona@gmail.com>",
    "Benjamin Bertrand <bertrand.design@gmail.com>",
    "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
@@ -47,8 +44,6 @@
    "chenyuan-new <53860479+chenyuan-new@users.noreply.github.com>",
    "Christopher De Cairos <chris.decairos@gmail.com>",
    "Cyrille David <cyrille@qonto.eu>",
-    "Dai Jie <daijie@php.net>",
-    "Danila Rodichkin <daniluk4000@outlook.com>",
    "Dante <duanjl.china@gmail.com>",
    "Dario Vladovic <d.vladimyr@gmail.com>",
    "David Annez <david.annez@gmail.com>",
@@ -78,15 +73,11 @@
    "Grigory Dmitrenko <grigory@snsk.ru>",
    "gulpin <gulping.gulpin@gmail.com>",
    "Hans Ott <hansott@hotmail.be>",
-    "Harald Reingruber <74898239+haraldreingruber-dedalus@users.noreply.github.com>",
    "Hendrik Helwich <h.helwich@iplabs.de>",
    "Hermann Ebert <ebbmo@HE.local>",
    "hr6r <hedian@gmail.com>",
-    "Hyewon Kang <gpffps369@gmail.com>",
-    "Hyunbin <47051820+hyunbinseo@users.noreply.github.com>",
    "Igor Topal <i.topal@smartweb.com.ua>",
    "Ildar Kamalov <i.kamalov@adguard.com>",
-    "Ilya Daraseliya <idarase@gmail.com>",
    "insanehong <insane.hong@navercorp.com>",
    "jackpoll <jackpoll123456@gmail.com>",
    "Jacky Choo <jackychoo@adly-macbook.local>",
@@ -107,7 +98,6 @@
    "Liam Quinn <lquinn@blackberry.com>",
    "Lithin <lithin@webklipper.com>",
    "liujunlve <liujunlve@henhaoji.com>",
-    "lj0812 <xoyljlj@163.com>",
    "ll-syber <670159357@qq.com>",
    "Loris Guignard <loris.guignard@gmail.com>",
    "Lukas Drgon <lukas.drgon@gmail.com>",
@@ -121,7 +111,6 @@
    "Max Maurer <maxemanuel.maurer@gmail.com>",
    "Max Nordlund <max.nordlund@gmail.com>",
    "Michael Hess <mhess@connectify.me>",
-    "Mike <mikehuebner@me.com>",
    "MimyyK <michele.marais@hakisa.com>",
    "Mok <mok@moekm.com>",
    "nabetama <mao.nabeta@gmail.com>",
@@ -135,7 +124,6 @@
    "o.drapeza <o.drapeza@tinkoff.ru>",
    "Oscar Becerra <oscarbecerra@google.com>",
    "otakuSiD <otakusid@gmail.com>",
-    "Pablo Osés <opablo@gmail.com>",
    "Paris Morgan <paris@8thwall.com>",
    "patrick-nurt <github@pereira.dk>",
    "Pavel Studeny <studeny@avast.com>",
@@ -190,6 +178,11 @@
      "import": "./src/main/ua-parser.mjs",
      "types": "./src/main/ua-parser.d.ts"
    },
+    "./device-utils": {
+      "require": "./src/device-utils/ua-parser-device-utils.js",
+      "import": "./src/device-utils/ua-parser-device-utils.mjs",
+      "types": "./src/device-utils/ua-parser-device-utils.d.ts"
+    },
    "./enums": {
      "require": "./src/enums/ua-parser-enums.js",
      "import": "./src/enums/ua-parser-enums.mjs",
@@ -220,8 +213,8 @@
    "test:eslint": "eslint src && eslint script",
    "test:jshint": "jshint src/main",
    "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
-    "test:mocha": "mocha --recursive test/unit",
-    "test:playwright": "npx playwright install && playwright test test/e2e --browser all"
+    "test:mocha": "mocha test/unit",
+    "test:playwright": "playwright test test/e2e --browser all"
  },
  "dependencies": {
    "detect-europe-js": "^0.1.2",
@@ -231,13 +224,17 @@
  "devDependencies": {
    "@babel/parser": "7.15.8",
    "@babel/traverse": "7.23.2",
+    "@jazzer.js/core": "^1.4.0",
    "@playwright/test": "^1.49.0",
+    "@types/node": "^22.9.1",
+    "@types/node-fetch": "^2.6.12",
    "jshint": "~2.13.6",
    "mocha": "~8.2.0",
+    "node-fetch": "^2.7.0",
    "requirejs": "2.3.2",
    "safe-regex": "^2.1.1",
    "tsd": "^0.29.0",
-    "uglify-js": "~3.19.3"
+    "uglify-js": "~3.12.0"
  },
  "repository": {
    "type": "git",
--- a/script/build-dist.sh
+++ b/script/build-dist.sh
@@ -4,20 +4,10 @@ SRC_PATH="src/main/ua-parser.js"
 MIN_PATH="dist/ua-parser.min.js"
 PACK_PATH="dist/ua-parser.pack.js"

-SRC_PATH_MJS="src/main/ua-parser.mjs"
-MIN_PATH_MJS="dist/ua-parser.min.mjs"
-PACK_PATH_MJS="dist/ua-parser.pack.mjs"
-
 # minified
 echo "Generate ${MIN_PATH}"
 uglifyjs $SRC_PATH -o $MIN_PATH --comments "/^ UA/"

-echo "Generate ${MIN_PATH_MJS}"
-uglifyjs $SRC_PATH_MJS -o $MIN_PATH_MJS --comments "/^ UA/" --module
-
 # packed
 echo "Generate ${PACK_PATH}"
 uglifyjs $SRC_PATH -o $PACK_PATH --comments "/^ UA/" --compress --mangle
-
-echo "Generate ${PACK_PATH_MJS}"
-uglifyjs $SRC_PATH_MJS -o $PACK_PATH_MJS --comments "/^ UA/" --compress --mangle --module
--- a/script/build-esm.js
+++ b/script/build-esm.js
@@ -2,18 +2,15 @@
 /* jshint esversion: 6 */ 
 const fs = require('fs');

-const defaultReplacements = {
-    mjs: [
-        [/const (.+?)\s*=\s*require\(\'\.(.+)\'\)/ig, 'import $1 from \'\.$2.mjs\''],
-        [/const (.+?)\s*=\s*require\(\'(.+)\'\)/ig, 'import $1 from \'$2\''],
-        [/module\.exports =/ig, 'export']
-    ]
-}
-
-const generateFile = (module) => {
+const generateMJS = (module) => {
    let { src, dest, title, replacements } = module;
    let text = fs.readFileSync(src, 'utf-8');

+    replacements.push(
+        [/const (.+?)\s*=\s*require\(\'\.(.+)\'\)/ig, 'import $1 from \'\.$2.mjs\''],
+        [/const (.+?)\s*=\s*require\(\'(.+)\'\)/ig, 'import $1 from \'$2\''],
+        [/module\.exports =/ig, 'export']
+    );
    replacements.forEach(rep => {
        text = text.replace(rep[0], rep[1]);
    });
@@ -21,54 +18,49 @@ const generateFile = (module) => {
    console.log(`Generate ${dest}`);

    fs.writeFileSync(dest,
-`// ${title}
+`// Generated ESM version of ${title}
 // DO NOT EDIT THIS FILE!
 // Source: /${src}

 ${text}`, 'utf-8');
+
 };

-const files = [
+const modules = [
    {
        src : 'src/main/ua-parser.js',
        dest : 'src/main/ua-parser.mjs',
-        title : 'Generated ESM version of ua-parser-js',
+        title : 'ua-parser-js',
        replacements : [
            [/\(func[\s\S]+strict\';/ig, ''],
            [/esversion\: 3/ig, 'esversion: 6'],
-            [/\/[\/\s]+export[\s\S]+/ig,'export {UAParser};'],
-            ...defaultReplacements.mjs
+            [/\/[\/\s]+export[\s\S]+/ig,'export {UAParser};']
        ]
    },
+    {
+        src : 'src/device-utils/ua-parser-device-utils.js',
+        dest :'src/device-utils/ua-parser-device-utils.mjs',
+        title : 'ua-parser-js/device-utils',
+        replacements : []
+    },
    {
        src : 'src/enums/ua-parser-enums.js',
        dest :'src/enums/ua-parser-enums.mjs',
-        title : 'Generated ESM version of ua-parser-js/enums',
-        replacements : [...defaultReplacements.mjs]
-    },
-    {
-        src : 'src/enums/ua-parser-enums.js',
-        dest :'src/enums/ua-parser-enums.d.ts',
-        title : 'Generated type declarations of ua-parser-js/enums',
-        replacements : [
-            [/(const .+) = object\.freeze\(/ig, 'export $1: Readonly<'],
-            [/(const .+) =( .+;)/ig, 'export $1: typeof$2'],
-            [/}\);/ig, '}>;'],
-            [/module\.exports =.+/igs, '']
-        ]
+        title : 'ua-parser-js/enums',
+        replacements : []
    },
    {
        src : 'src/extensions/ua-parser-extensions.js',
        dest : 'src/extensions/ua-parser-extensions.mjs',
-        title : 'Generated ESM version of ua-parser-js/extensions',
-        replacements : [...defaultReplacements.mjs]
+        title : 'ua-parser-js/extensions',
+        replacements : []
    },
    {
        src : 'src/helpers/ua-parser-helpers.js',
        dest : 'src/helpers/ua-parser-helpers.mjs',
-        title : 'Generated ESM version of ua-parser-js/helpers',
-        replacements : [...defaultReplacements.mjs]
+        title : 'ua-parser-js/helpers',
+        replacements : []
    }
 ];

-files.forEach(module => generateFile(module));
+modules.forEach(module => generateMJS(module));
--- a/script/cli.js
+++ b/script/cli.js
@@ -1,94 +1,4 @@
 #!/usr/bin/env node

-try {    
-    const fs = require('node:fs');
-    const path = require('node:path');
-    const { performance } = require('node:perf_hooks');
-    const readline = require('node:readline');
-    const { parseArgs } = require('node:util');
-    const UAParser = require('../src/main/ua-parser');
-    const { Bots, Emails, ExtraDevices, InApps, Vehicles } = require('../src/extensions/ua-parser-extensions');
-
-    if (!process.argv[2].startsWith('-')) {
-
-        const results = process.argv.slice(2).map(ua => UAParser(ua));
-        console.log(JSON.stringify(results, null, 4));
-        process.exit(0);
-
-    } else if (['-h', '--help'].includes(process.argv[2])) {
-
-        console.log('Usage: npx ua-parser-js <string>');
-        console.log('   or  npx ua-parser-js --input-file <filepath> [--output-file <filepath>]');
-        console.log('-i, --input-file');
-        console.log('-o, --output-file');
-        process.exit(0);
-
-    } else {
-
-        const startPerf = performance.now();
-        const {
-            values: { 
-                'input-file': inputFile, 
-                'output-file': outputFile 
-            },
-        } = parseArgs({
-            options: {
-                'input-file': { type: 'string', short: 'i' },
-                'output-file': { type: 'string', short: 'o' }
-            }
-        });
-
-        if (!inputFile) {
-            console.error('Input file must be present');
-            process.exit(1);
-        }
-
-        const inputPath = path.resolve(__dirname, inputFile);
-        const outputPath = outputFile ? path.resolve(__dirname, outputFile) : null;
-
-        if (!fs.existsSync(inputPath)) {
-            console.error(`Input file not found: ${inputPath}`);
-            process.exit(1);
-        }
-
-        const inputStream = fs.createReadStream(inputPath, 'utf8');
-        const rl = readline.createInterface({
-            input: inputStream,
-            crlfDelay: Infinity
-        });
-
-        const outputStream = outputPath ? fs.createWriteStream(outputPath, { encoding : 'utf8' }) : process.stdout;
-
-        const uap = new UAParser([Bots, Emails, ExtraDevices, InApps, Vehicles]);
-        let lineNumber = 0;
-
-        outputStream.write('[\n');
-
-        rl.on('line', line => {
-            const result = uap.setUA(line).getResult();
-            const json = JSON.stringify(result, null, 4);
-            if (lineNumber > 0) outputStream.write(',\n');
-            outputStream.write(json);
-            lineNumber++;
-        });
-
-        rl.on('close', () => {
-            outputStream.write('\n]');
-            if (outputPath) {
-                outputStream.end(() => {
-                    const finishPerf = performance.now();
-                    console.log(`Done!`);
-                    console.log(`Number of lines found: ${lineNumber}`);
-                    console.log(`Task finished in: ${(finishPerf - startPerf).toFixed(3)}ms`);
-                    console.log(`Output written to: ${outputPath}`);
-                    process.exit(0);
-                });
-            } else {
-                process.exit(0);
-            }
-        });
-    }
-} catch (err) {
-    console.error(err);
-    process.exit(1);
-}
+const UAParser = require('ua-parser-js');
+console.log(JSON.stringify(process.argv.slice(2).map(ua => UAParser(ua)), null, 4));
--- a/src/device-utils/data/marketing-name/samsung.json
+++ b/src/device-utils/data/marketing-name/samsung.json
@@ -0,0 +1,5 @@
+[
+    {
+        "SM-S928N" : "Galaxy S24 Ultra"
+    }
+]
--- a/src/device-utils/data/marketing-name/xiaomi.json
+++ b/src/device-utils/data/marketing-name/xiaomi.json
@@ -0,0 +1,5 @@
+[
+   {
+        "M2101K9C" : "Mi 11 Lite 5G"
+   }
+]
--- a/src/device-utils/ua-parser-device-utils.d.ts
+++ b/src/device-utils/ua-parser-device-utils.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for Device Utils submodule of UAParser.js v2.0.0
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+import type { IResult, IDevice } from "../main/ua-parser";
+
+declare function getMarketingName(model: string, vendor: string): boolean;
+declare function isMobile(val: IResult | IDevice | string): boolean;
+declare function isSmartTV(val: IResult | IDevice | string): boolean;
+declare function isTablet(val: IResult | IDevice | string): boolean;
+declare function isWearable(val: IResult | IDevice | string): boolean;
+declare function isXR(val: IResult | IDevice | string): boolean;
+
+export {
+    getMarketingName,
+    isMobile,
+    isSmartTV,
+    isTablet,
+    isWearable,
+    isXR
+};
--- a/src/device-utils/ua-parser-device-utils.js
+++ b/src/device-utils/ua-parser-device-utils.js
@@ -0,0 +1,51 @@
+//////////////////////////////////////////////////
+/*  Device Utils Submodule for UAParser.js v2.0.0
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+/////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const fs = require('fs');
+const path = require('path');
+const UAParser = require('../main/ua-parser');
+const { Device: DeviceType } = require('../enums/ua-parser-enums');
+
+const isDeviceType = (val, expectedType) => {
+    const uap = typeof val == 'string' ? UAParser(val) : val; // string
+    let actualType;
+    if (uap.hasOwnProperty('device')) { // IResult
+        actualType = uap.device?.type;
+    } else if (uap.hasOwnProperty('type')) { // IDevice
+        actualType = uap.type;
+    }
+    return actualType == expectedType;
+};
+
+const getMarketingName = (model, vendor) => {
+    const normalizedVendor = vendor.toLowerCase();
+    const filePath = path.resolve(__dirname, `./data/marketing-name/${normalizedVendor}.json`);
+    if (fs.existsSync(filePath)) {
+        const map = require(`./data/marketing-name/${normalizedVendor}.json`)[0];
+        if (model in map) {
+            return map[model];
+        }
+    }
+    return model;
+};
+
+const isMobile = val => isDeviceType(val, DeviceType.MOBILE); 
+const isSmartTV = val => isDeviceType(val, DeviceType.SMARTTV);
+const isTablet = val => isDeviceType(val, DeviceType.TABLET);
+const isWearable = val => isDeviceType(val, DeviceType.WEARABLE);
+const isXR = val => isDeviceType(val, DeviceType.XR);
+
+module.exports = { 
+    getMarketingName,
+    isMobile,
+    isSmartTV,
+    isTablet,
+    isWearable,
+    isXR
+};
--- a/src/enums/ua-parser-enums.d.ts
+++ b/src/enums/ua-parser-enums.d.ts
@@ -1,744 +0,0 @@
-// Generated type declarations of ua-parser-js/enums
-// DO NOT EDIT THIS FILE!
-// Source: /src/enums/ua-parser-enums.js
-
-///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.6
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-export const BrowserName: Readonly<{
-    '115': '115',
-    '2345': '2345',
-    '360': '360',
-    ALIPAY: 'Alipay',
-    AMAYA: 'Amaya',
-    ANDROID: 'Android Browser',
-    ARORA: 'Arora',
-    AVANT: 'Avant',
-    AVAST: 'Avast Secure Browser',
-    AVG: 'AVG Secure Browser',
-    BAIDU: 'Baidu Browser',
-    BASILISK: 'Basilisk',
-    BING: 'Bing',
-    BLAZER: 'Blazer',
-    BOLT: 'Bolt',
-    BOWSER: 'Bowser',
-    BRAVE: 'Brave',
-    CAMINO: 'Camino',
-    CHIMERA: 'Chimera',
-    CHROME: 'Chrome',
-    CHROME_HEADLESS: 'Chrome Headless',
-    CHROME_MOBILE: 'Mobile Chrome',
-    CHROME_WEBVIEW: 'Chrome WebView',
-    CHROMIUM: 'Chromium',
-    COBALT: 'Cobalt',
-    COC_COC: 'Coc Coc',
-    CONKEROR: 'Conkeror',
-    DAUM: 'Daum',
-    DILLO: 'Dillo',
-    DOLPHIN: 'Dolphin',
-    DOOBLE: 'Dooble',
-    DORIS: 'Doris',
-    DRAGON: 'Dragon',
-    DUCKDUCKGO: 'DuckDuckGo',
-    ECOSIA: 'Ecosia',
-    EDGE: 'Edge',
-    EDGE_WEBVIEW: 'Edge WebView',
-    EDGE_WEBVIEW2: 'Edge WebView2',
-    EPIPHANY: 'Epiphany',
-    FACEBOOK: 'Facebook',
-    FALKON: 'Falkon',
-    FIREBIRD: 'Firebird',
-    FIREFOX: 'Firefox',
-    FIREFOX_FOCUS: 'Firefox Focus',
-    FIREFOX_MOBILE: 'Mobile Firefox',
-    FIREFOX_REALITY: 'Firefox Reality',
-    FENNEC: 'Fennec',
-    FLOCK: 'Flock',
-    FLOW: 'Flow',
-    GO: 'GoBrowser',
-    GOOGLE_SEARCH: 'GSA',
-    HELIO: 'Helio',
-    HEYTAP: 'HeyTap',
-    HONOR: 'Honor',
-    HUAWEI: 'Huawei Browser',
-    ICAB: 'iCab',
-    ICE: 'ICE Browser',
-    ICEAPE: 'IceApe',
-    ICECAT: 'IceCat',
-    ICEDRAGON: 'IceDragon',
-    ICEWEASEL: 'IceWeasel',
-    IE: 'IE',
-    INSTAGRAM: 'Instagram',
-    IRIDIUM: 'Iridium',
-    IRON: 'Iron',
-    JASMINE: 'Jasmine',
-    KONQUEROR: 'Konqueror',
-    KAKAO: 'KakaoTalk',
-    KHTML: 'KHTML',
-    K_MELEON: 'K-Meleon',
-    KLAR: 'Klar',
-    KLARNA: 'Klarna',
-    KINDLE: 'Kindle',
-    LENOVO: 'Smart Lenovo Browser',
-    LADYBIRD: 'Ladybird',
-    LG: 'LG Browser',
-    LIBREWOLF: 'LibreWolf',
-    LIEBAO: 'LBBROWSER',
-    LINE: 'Line',
-    LINKEDIN: 'LinkedIn',
-    LINKS: 'Links',
-    LUNASCAPE: 'Lunascape',
-    LYNX: 'Lynx',
-    MAEMO: 'Maemo Browser',
-    MAXTHON: 'Maxthon',
-    MIDORI: 'Midori',
-    MINIMO: 'Minimo',
-    MIUI: 'MIUI Browser',
-    MOZILLA: 'Mozilla',
-    MOSAIC: 'Mosaic',
-    NAVER: 'Naver',
-    NETFRONT: 'NetFront',
-    NETSCAPE: 'Netscape',
-    NETSURF: 'Netsurf',
-    NOKIA: 'Nokia Browser',
-    OBIGO: 'Obigo',
-    OCULUS: 'Oculus Browser',
-    OMNIWEB: 'OmniWeb',
-    OPERA: 'Opera',
-    OPERA_COAST: 'Opera Coast',
-    OPERA_GX: 'Opera GX',
-    OPERA_MINI: 'Opera Mini',
-    OPERA_MOBI: 'Opera Mobi',
-    OPERA_TABLET: 'Opera Tablet',
-    OPERA_TOUCH: 'Opera Touch',
-    OTTER: 'Otter',
-    OVI: 'OviBrowser',
-    PALEMOON: 'PaleMoon',
-    PHANTOMJS: 'PhantomJS',
-    PHOENIX: 'Phoenix',
-    PICOBROWSER: 'Pico Browser',
-    POLARIS: 'Polaris',
-    PUFFIN: 'Puffin',
-    QQ: 'QQBrowser',
-    QQ_LITE: 'QQBrowserLite',
-    QUARK: 'Quark',
-    QUPZILLA: 'QupZilla',
-    QUTEBROWSER: 'qutebrowser',
-    QWANT: 'Qwant',
-    REKONQ: 'rekonq',
-    ROCKMELT: 'Rockmelt',
-    SAFARI: 'Safari',
-    SAFARI_MOBILE: 'Mobile Safari',
-    SAILFISH: 'Sailfish Browser',
-    SAMSUNG: 'Samsung Internet',
-    SEAMONKEY: 'SeaMonkey',
-    SILK: 'Silk',
-    SKYFIRE: 'Skyfire',
-    SLEIPNIR: 'Sleipnir',
-    SLIMBOAT: 'SlimBoat',
-    SLIMBROWSER: 'SlimBrowser',
-    SLIMJET: 'Slimjet',
-    SNAPCHAT: 'Snapchat',
-    SOGOU_EXPLORER: 'Sogou Explorer',
-    SOGOU_MOBILE: 'Sogou Mobile',
-    SURF: 'Surf',
-    SWIFTFOX: 'Swiftfox',
-    TESLA: 'Tesla',
-    TIKTOK: 'TikTok',
-    TIZEN: 'Tizen Browser',
-    TWITTER: 'Twitter',
-    UC: 'UCBrowser',
-    UP: 'UP.Browser',
-    VIVALDI: 'Vivaldi',
-    VIVO: 'Vivo Browser',
-    W3M: 'w3m',
-    WATERFOX: 'Waterfox',
-    WEBKIT: 'WebKit',
-    WECHAT: 'WeChat',
-    WEIBO: 'Weibo',
-    WHALE: 'Whale',
-    WOLVIC: 'Wolvic',
-    YANDEX: 'Yandex',
-    ZALO: 'Zalo'
-
-    // TODO : test!
-}>;
-/**
- * @deprecated Use `BrowserName` instead
- */
-export const Browser: typeof BrowserName;
-
-export const BrowserType: Readonly<{
-    CRAWLER: 'crawler',
-    CLI: 'cli',
-    EMAIL: 'email',
-    FETCHER: 'fetcher',
-    INAPP: 'inapp',
-    MEDIAPLAYER: 'mediaplayer',
-    LIBRARY: 'library'
-}>;
-
-export const CPUArch: Readonly<{
-    '68K': '68k',
-    ALPHA: 'alpha',
-    ARM : 'arm',
-    ARM_64: 'arm64',
-    ARM_HF: 'armhf',
-    AVR: 'avr',
-    AVR_32: 'avr32',
-    IA64: 'ia64',
-    IRIX: 'irix',
-    IRIX_64: 'irix64',
-    MIPS: 'mips',
-    MIPS_64: 'mips64',
-    PA_RISC: 'pa-risc',
-    PPC: 'ppc',
-    SPARC: 'sparc',
-    SPARC_64: 'sparc64',
-    X86: 'ia32',
-    X86_64: 'amd64'
-}>;
-/**
- * @deprecated Use `CPUArch` instead
- */
-export const CPU: typeof CPUArch;
-
-export const DeviceType: Readonly<{
-    CONSOLE: 'console',
-    DESKTOP: 'desktop',
-    EMBEDDED: 'embedded',
-    MOBILE: 'mobile',
-    SMARTTV: 'smarttv',
-    TABLET: 'tablet',
-    WEARABLE: 'wearable',
-    XR: 'xr'
-}>;
-/**
- * @deprecated Use `DeviceType` instead
- */
-export const Device: typeof DeviceType;
-
-export const DeviceVendor: Readonly<{
-    ACER: 'Acer',
-    ADVAN: 'Advan',
-    ALCATEL: 'Alcatel',
-    APPLE: 'Apple',
-    AMAZON: 'Amazon',
-    ARCHOS: 'Archos',
-    ASUS: 'ASUS',
-    ATT: 'AT&T',
-    BENQ: 'BenQ',
-    BLACKBERRY: 'BlackBerry',
-    BLU: 'BLU',
-    CAT: 'Cat',
-    DELL: 'Dell',
-    ENERGIZER: 'Energizer',
-    ESSENTIAL: 'Essential',
-    FACEBOOK: 'Facebook',
-    FAIRPHONE: 'Fairphone',
-    GEEKSPHONE: 'GeeksPhone',
-    GENERIC: 'Generic',
-    GOOGLE: 'Google',
-    HISENSE: 'Hisense',
-    HMD: 'HMD',
-    HP: 'HP',
-    HTC: 'HTC',
-    HUAWEI: 'Huawei',
-    IMO: 'IMO',
-    INFINIX: 'Infinix',
-    ITEL: 'itel',
-    JOLLA: 'Jolla',
-    KOBO: 'Kobo',
-    LAVA: 'Lava',
-    LENOVO: 'Lenovo',
-    LG: 'LG',
-    MEIZU: 'Meizu',
-    MICROMAX: 'Micromax',
-    MICROSOFT: 'Microsoft',
-    MOTOROLA: 'Motorola',
-    NEXIAN: 'Nexian',
-    NINTENDO: 'Nintendo',
-    NOKIA: 'Nokia',
-    NOTHING: 'Nothing',
-    NVIDIA: 'Nvidia',
-    ONEPLUS: 'OnePlus',
-    OPPO: 'OPPO',
-    OUYA: 'Ouya',
-    PALM: 'Palm',
-    PANASONIC: 'Panasonic',
-    PEBBLE: 'Pebble',
-    PHILIPS: 'Philips',
-    PICO: 'Pico',
-    POLYTRON: 'Polytron',
-    REALME: 'Realme',
-    RETROID: 'Retroid',
-    RIM: 'RIM',
-    ROKU: 'Roku',
-    SAMSUNG: 'Samsung',
-    SHARP: 'Sharp',
-    SIEMENS: 'Siemens',
-    SMARTFREN: 'Smartfren',
-    SONY: 'Sony',
-    SPRINT: 'Sprint',
-    TCL: 'TCL',
-    TECHNISAT: 'TechniSAT',
-    TECNO: 'TECNO',
-    TESLA: 'Tesla',
-    ULEFONE: 'Ulefone',
-    VIVO: 'Vivo',
-    VIZIO: 'Vizio',
-    VODAFONE: 'Vodafone',
-    WIKO: 'Wiko',
-    XBOX: 'Xbox',
-    XIAOMI: 'Xiaomi',
-    ZEBRA: 'Zebra',
-    ZTE: 'ZTE',
-
-    // TODO : test!
-}>;
-/**
- * @deprecated Use `DeviceVendor` instead
- */
-export const Vendor: typeof DeviceVendor;
-
-export const EngineName: Readonly<{
-    AMAYA: 'Amaya',
-    ARKWEB: 'ArkWeb',
-    BLINK: 'Blink',
-    EDGEHTML: 'EdgeHTML',
-    FLOW: 'Flow',
-    GECKO: 'Gecko',
-    GOANNA: 'Goanna',
-    ICAB: 'iCab',
-    KHTML: 'KHTML',
-    LIBWEB: 'LibWeb',
-    LINKS: 'Links',
-    LYNX: 'Lynx',
-    NETFRONT: 'NetFront',
-    NETSURF: 'NetSurf',
-    PRESTO: 'Presto',
-    SERVO: 'Servo',
-    TASMAN: 'Tasman',
-    TRIDENT: 'Trident',
-    W3M: 'w3m',
-    WEBKIT: 'WebKit'
-}>;
-/**
- * @deprecated Use `EngineName` instead
- */
-export const Engine: typeof EngineName;
-
-export const OSName: Readonly<{
-    AIX: 'AIX',
-    AMIGA_OS: 'Amiga OS',
-    ANDROID: 'Android',
-    ANDROID_X86: 'Android-x86',
-    ARCAOS: 'ArcaOS',
-    ARCH: 'Arch',
-    BADA: 'Bada',
-    BEOS: 'BeOS',
-    BLACKBERRY: 'BlackBerry',
-    CENTOS: 'CentOS',
-    CHROME_OS: 'Chrome OS',
-    CHROMECAST: 'Chromecast',
-    CHROMECAST_ANDROID: 'Chromecast Android',
-    CHROMECAST_FUCHSIA: 'Chromecast Fuchsia',
-    CHROMECAST_LINUX: 'Chromecast Linux',
-    CHROMECAST_SMARTSPEAKER: 'Chromecast SmartSpeaker',
-    CONTIKI: 'Contiki',
-    DEBIAN: 'Debian',
-    DEEPIN: 'Deepin',
-    DRAGONFLY: 'DragonFly',
-    ELEMENTARY_OS: 'elementary OS',
-    FEDORA: 'Fedora',
-    FIREFOX_OS: 'Firefox OS',
-    FREEBSD: 'FreeBSD',
-    FUCHSIA: 'Fuchsia',
-    GENTOO: 'Gentoo',
-    GHOSTBSD: 'GhostBSD',
-    GNU: 'GNU',
-    HAIKU: 'Haiku',
-    HARMONYOS: 'HarmonyOS',
-    HP_UX: 'HP-UX',
-    HURD: 'Hurd',
-    IOS: 'iOS',
-    JOLI: 'Joli',
-    KAIOS: 'KaiOS',
-    KNOPPIX: 'Knoppix',
-    KUBUNTU: 'Kubuntu',
-    LINPUS: 'Linpus',
-    LINSPIRE: 'Linspire',
-    LINUX: 'Linux',
-    MACOS: 'macOS',
-    MAEMO: 'Maemo',
-    MAGEIA: 'Mageia',
-    MANDRIVA: 'Mandriva',
-    MANJARO: 'Manjaro',
-    MEEGO: 'MeeGo',
-    MINIX: 'Minix',
-    MINT: 'Mint',
-    MORPH_OS: 'Morph OS',
-    NETBSD: 'NetBSD',
-    NETRANGE: 'NetRange',
-    NETTV: 'NetTV',
-    NINTENDO: 'Nintendo',
-    OPENHARMONY: 'OpenHarmony',
-    OPENBSD: 'OpenBSD',
-    OPENVMS: 'OpenVMS',
-    OS2: 'OS/2',
-    PALM: 'Palm',
-    PC_BSD: 'PC-BSD',
-    PCLINUXOS: 'PCLinuxOS',
-    PICO: 'Pico',
-    PLAN9: 'Plan9',
-    PLAYSTATION: 'PlayStation',
-    QNX: 'QNX',
-    RASPBIAN: 'Raspbian',
-    REDHAT: 'RedHat',
-    RIM_TABLET_OS: 'RIM Tablet OS',
-    RISC_OS: 'RISC OS',
-    SABAYON: 'Sabayon',
-    SAILFISH: 'Sailfish',
-    SERENITYOS: 'SerenityOS',
-    SERIES40: 'Series40',
-    SLACKWARE: 'Slackware',
-    SOLARIS: 'Solaris',
-    SUSE: 'SUSE',
-    SYMBIAN: 'Symbian',
-    TIZEN: 'Tizen',
-    UBUNTU: 'Ubuntu',
-    UBUNTU_TOUCH: 'Ubuntu Touch',
-    UNIX: 'Unix',
-    VECTORLINUX: 'VectorLinux',
-    WATCHOS: 'watchOS',
-    WEBOS: 'WebOS',
-    WINDOWS: 'Windows',
-    WINDOWS_CE: 'Windows CE',
-    WINDOWS_IOT: 'Windows IoT',
-    WINDOWS_MOBILE: 'Windows Mobile',
-    WINDOWS_PHONE: 'Windows Phone',
-    WINDOWS_RT: 'Windows RT',
-    XBOX: 'Xbox',
-    XUBUNTU: 'Xubuntu',
-    ZENWALK: 'Zenwalk'
-
-    // TODO : test!
-}>;
-/**
- * @deprecated Use `OSName` instead
- */
-export const OS: typeof OSName;
-
-/*////////////////////////////////
- * Enums for Extensions submodule
- *///////////////////////////////
-
-export const Extension: Readonly<{
-    BrowserName: {
-        CLI: {
-            CURL: 'curl',
-            ELINKS: 'ELinks',
-            HTTPIE: 'HTTPie',
-            LYNX: 'Lynx',
-            WGET: 'Wget'
-        },
-        Crawler: {
-            AHREFS_BOT: 'AhrefsBot',
-            AI2_BOT: 'AI2Bot',
-            AIHIT_BOT: 'aiHitBot',
-            ALGOLIA_CRAWLER: 'Algolia Crawler',
-            APPLE_BOT: 'Applebot',
-            APPLE_BOT_EXTENDED: 'Applebot-Extended',
-            ASK_TEOMA: 'Teoma',
-            AMAZON_BOT: 'Amazonbot',
-            AMAZON_CONTXBOT: 'contxbot',
-            ANTHROPIC_AI: 'anthropic-ai',
-            ANTHROPIC_CLAUDE_BOT: 'ClaudeBot',
-            ANTHROPIC_CLAUDE_SEARCHBOT: 'Claude-SearchBot',
-            ANTHROPIC_CLAUDE_WEB: 'Claude-Web',
-            ARCHIVEORG_BOT: 'archive.org_bot',
-            BAIDU_ADS: 'Baidu-ADS',
-            BAIDU_SPIDER: 'Baiduspider',
-            BAIDU_SPIDER_ADS: 'Baiduspider-ads',
-            BAIDU_SPIDER_CPRO: 'Baiduspider-cpro',
-            BAIDU_SPIDER_FAVO: 'Baiduspider-favo',
-            BAIDU_SPIDER_IMAGE: 'Baiduspider-image',
-            BAIDU_SPIDER_NEWS: 'Baiduspider-news',
-            BAIDU_SPIDER_RENDER: 'Baiduspider-render',
-            BAIDU_SPIDER_VIDEO: 'Baiduspider-video',
-            BLEX_BOT: 'BLEXBot',
-            BOTIFY: 'botify',
-            BRAVE_BOT: 'Bravebot',
-            BYTEDANCE_BYTESPIDER: 'Bytespider',
-            BYTEDANCE_TIKTOKSPIDER: 'TikTokSpider',
-            COMMON_CRAWL_CCBOT: 'CCBot',
-            COCCOC_BOT_WEB: 'coccocbot-web',
-            COCCOC_BOT_IMAGE: 'coccocbot-image',
-            COHERE_TRAINING_DATA_CRAWLER: 'cohere-training-data-crawler',
-            COTOYOGI: 'Cotoyogi',
-            COVEO_BOT: 'Coveobot',
-            CRITEO_BOT: 'CriteoBot',
-            DATAFORSEO_BOT: 'DataForSeoBot',
-            DAUM: 'Daum',
-            DAUM_DAUMOA: 'Daumoa',
-            DAUM_DAUMOA_IMAGE: 'Daumoa-image',
-            DEEPSEEK_BOT: 'DeepSeekBot',
-            DIFFBOT: 'Diffbot',
-            DUCKDUCKGO_BOT: 'DuckDuckBot',
-            DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
-            ELASTIC: 'Elastic',
-            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
-            EXALEAD_EXABOT: 'Exabot',
-            FIRECRAWL_AGENT: 'FirecrawlAgent',
-            FREESPOKE: 'Freespoke',
-            GOOGLE_ADSBOT: 'AdsBot-Google',
-            GOOGLE_ADSBOT_MOBILE: 'Adsbot-Google-Mobile',
-            GOOGLE_ADSENSE: 'AdSense',
-            GOOGLE_APIS: 'APIs-Google',
-            GOOGLE_BOT: 'Googlebot',
-            GOOGLE_BOT_IMAGE: 'Googlebot-Image',
-            GOOGLE_BOT_NEWS: 'Googlebot-News',
-            GOOGLE_BOT_VIDEO: 'Googlebot-Video',
-            GOOGLE_CLOUDVERTEXBOT: 'Google-CloudVertexBot',
-            GOOGLE_EXTENDED: 'Google-Extended',
-            GOOGLE_INSPECTIONTOOL: 'Google-InspectionTool',
-            GOOGLE_OTHER: 'GoogleOther',
-            GOOGLE_OTHER_IMAGE: 'GoogleOther-Image',
-            GOOGLE_OTHER_VIDEO: 'GoogleOther-Video',
-            GOOGLE_SAFETY: 'Google-Safety',
-            GOOGLE_STOREBOT: 'Storebot-Google',
-            HIVE_IMAGESIFTBOT: 'ImagesiftBot',
-            HUAWEI_PANGUBOT: 'PanguBot',
-            HUAWEI_PETALBOT: 'PetalBot',
-            HUGGINGFACE_BOT: 'HuggingFace-Bot',
-            HUNTER_VELENPUBLICWEBCRAWLER: 'VelenPublicWebCrawler',
-            IA_ARCHIVER: 'ia_archiver',
-            IASK_BOT: 'iAskBot',
-            KAGI_BOT: 'Kagibot',
-            KANGAROO_BOT: 'Kangaroo Bot',
-            LINE_SPIDER: 'Linespider',
-            LINKEDIN_BOT: 'LinkedInBot',
-            MAGPIE_CRAWLER: 'magpie-crawler',
-            MARGINALIA: 'marginalia',
-            META_EXTERNALAGENT: 'meta-externalagent',
-            META_FACEBOOKBOT: 'FacebookBot',
-            META_FACEBOOKCATALOG: 'facebookcatalog',
-            META_FACEBOOKEXTERNALHIT: 'facebookexternalhit',
-            MAJESTIC_MJ12BOT: 'MJ12bot',
-            MICROSOFT_BINGBOT: 'Bingbot',
-            MICROSOFT_MSNBOT: 'msnbot',
-            MICROSOFT_ADIDXBOT: 'adidxbot',
-            MOJEEK_BOT: 'MojeekBot',
-            MOZ_DOTBOT: 'DotBot',
-            ONCRAWL: 'OnCrawl',
-            ONESPOT_SCRAPERBOT: 'Onespot-ScraperBot',
-            OPENAI_GPTBOT: 'GPTBot',
-            OPENAI_SEARCH_BOT: 'OAI-SearchBot',
-            PERPLEXITY_BOT: 'PerplexityBot',
-            QIHOO_360_SPIDER: '360Spider',
-            QWANT_BOT: 'Qwantbot',
-            QWANT_BOT_NEWS: 'Qwantbot-news',
-            REPLICATE_BOT: 'Replicate-Bot',
-            RUNPOD_BOT: 'RunPod-Bot',
-            SB_INTUITIONS_BOT: 'SBIntuitionsBot',
-            SEEKPORT_BOT: 'SeekportBot',
-            SEMRUSH_BOT: 'SemrushBot',
-            SEMRUSH_BOT_BACKLINK: 'SemrushBot-BA',
-            SEMRUSH_BOT_CONTENTSHAKE: 'SemrushBot-OCOB',
-            SEMRUSH_BOT_SEO_CHECKER: 'SemrushBot-SI',
-            SEZNAM_BOT: 'SeznamBot',
-            SITEIMPROVE: 'Siteimprove',
-            SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
-            SOGOU_WEB_SPIDER: 'Sogou web spider',
-            STARTPAGE: 'Startpage',
-            SURLY_BOT: 'SurdotlyBot',
-            TIMPI_BOT: 'Timpibot',
-            TOGETHER_BOT: 'Together-Bot',
-            TURNITIN_BOT: 'TurnitinBot',
-            TWIN_AGENT: 'TwinAgent',
-            VERCEL_V0BOT: 'v0bot',
-            WEBZIO: 'webzio',
-            WEBZIO_EXTENDED: 'Webzio-Extended',
-            WEBZIO_OMGILI: 'omgili',
-            WEBZIO_OMGILI_BOT: 'omgilibot',
-            XAI_BOT: 'xAI-Bot',
-            YAHOO_JAPAN: 'Y!J-BRW',
-            YAHOO_SLURP: 'Yahoo! Slurp',
-            YANDEX_ACCESSIBILITY_BOT: 'YandexAccessibilityBot',
-            YANDEX_ADDITIONAL_BOT: 'YandexAdditionalBot',
-            YANDEX_ADNET: 'YandexAdNet',
-            YANDEX_BLOGS: 'YandexBlogs',
-            YANDEX_BOT: 'YandexBot',
-            YANDEX_BOT_MIRRORDETECTOR: 'YandexBot MirrorDetector',
-            YANDEX_COMBOT: 'YandexComBot',
-            YANDEX_FAVICONS: 'YandexFavicons',
-            YANDEX_IMAGE_RESIZER: 'YandexImageResizer',
-            YANDEX_IMAGES: 'YandexImages',
-            YANDEX_MARKET: 'YandexMarket',
-            YANDEX_MEDIA: 'YandexMedia',
-            YANDEX_METRIKA: 'YandexMetrika',
-            YANDEX_MOBILE_BOT: 'YandexMobileBot',
-            YANDEX_MOBILE_SCREENSHOT_BOT: 'YandexMobileScreenShotBot',
-            YANDEX_NEWS: 'YandexNews',
-            YANDEX_ONTODB: 'YandexOntoDB',
-            YANDEX_ONTODB_API: 'YandexOntoDBAPI',
-            YANDEX_PARTNER: 'YandexPartner',
-            YANDEX_RCA: 'YandexRCA',
-            YANDEX_RENDERRESOURCES_BOT: 'YandexRenderResourcesBot',
-            YANDEX_SCREENSHOT_BOT: 'YandexScreenshotBot',
-            YANDEX_SPRAV_BOT: 'YandexSpravBot',
-            YANDEX_TRACKER: 'YandexTracker',
-            YANDEX_VERTICALS: 'YandexVerticals',
-            YANDEX_VERTIS: 'YandexVertis',
-            YANDEX_VIDEO: 'YandexVideo',
-            YANDEX_VIDEO_PARSER: 'YandexVideoParser',
-            YANDEX_WEBMASTER: 'YandexWebmaster',
-            YEP_BOT: 'YepBot',
-            YETI: 'Yeti',
-            YISOU_SPIDER: 'YisouSpider',
-            YOU_BOT: 'YouBot',
-            ZHIPU_CHATGLM_SPIDER: 'ChatGLM-Spider',
-            ZUM_BOT: 'ZumBot'
-        },
-        Email: {
-            AIRMAIL: 'Airmail',
-            APPLE_MAIL: 'Mail',
-            BLUEMAIL: 'BlueMail',
-            DAUM_MAIL: 'DaumMail',
-            EVOLUTION: 'Evolution',
-            EM_CLIENT: 'eM Client',
-            FOXMAIL: 'Foxmail',
-            KMAIL: 'KMail',
-            KMAIL2: 'kmail2',
-            KONTACT: 'Kontact',
-            MICROSOFT_OUTLOOK: 'Microsoft Outlook',
-            MICROSOFT_OUTLOOK_MAC: 'MacOutlook',
-            NAVER_MAILAPP: 'NaverMailApp',
-            POLYMAIL: 'Polymail',
-            PROTON_MAIL: 'ProtonMail',
-            SPARK_MAIL: 'SparkDesktop',
-            SPARROW: 'Sparrow',
-            THUNDERBIRD: 'Thunderbird',
-            YAHOO_MAIL: 'Yahoo',
-            ZIMBRA: 'Zimbra',
-            ZOHO_MAIL: 'ZohoMail-Desktop'
-        },
-        Fetcher: {
-            AHREFS_SITEAUDIT: 'AhrefsSiteAudit',
-            ANTHROPIC_CLAUDE_USER: 'Claude-User',
-            ASANA: 'Asana',
-            BETTER_UPTIME_BOT: 'Better Uptime Bot',
-            BITLY_BOT: 'bitlybot',
-            BLUESKY: 'Bluesky',
-            BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
-            COHERE_AI: 'Cohere-AI',
-            DISCORD_BOT: 'Discordbot',
-            DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
-            GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
-            GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
-            GOOGLE_GEMINI_DEEP_RESEARCH: 'Gemini-Deep-Research',
-            GOOGLE_IMAGEPROXY: 'GoogleImageProxy',
-            GOOGLE_PAGERENDERER: 'Google-PageRenderer',
-            GOOGLE_READ_ALOUD: 'Google-Read-Aloud',
-            GOOGLE_PRODUCER: 'GoogleProducer',
-            GOOGLE_SITE_VERIFICATION: 'Google-Site-Verification',
-            HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
-            IFRAMELY: 'Iframely',
-            KAKAOTALK_SCRAP: 'kakaotalk-scrap',
-            KEYBASE_BOT: 'KeybaseBot',
-            META_EXTERNALFETCHER: 'meta-externalfetcher',
-            META_WHATSAPP: 'WhatsApp',
-            MICROSOFT_BINGPREVIEW: 'BingPreview',
-            MICROSOFT_PREVIEW: 'MicrosoftPreview',
-            MISTRALAI_USER: 'MistralAI-User',
-            NAVER_BLUENO: 'Blueno',
-            ONCRAWL_ROGERBOT: 'rogerbot',
-            OPENAI_CHATGPT_USER: 'ChatGPT-User',
-            PERPLEXITY_USER: 'Perplexity-User',
-            PINTEREST_BOT: 'Pinterestbot',
-            SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
-            SLACK_BOT: 'Slackbot',
-            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
-            SLACK_IMGPROXY: 'Slack-ImgProxy',
-            SNAP_URL_PREVIEW: 'Snap URL Preview',
-            SKYPE_URIPREVIEW: 'SkypeUriPreview',
-            TELEGRAM_BOT: 'TelegramBot',
-            UPTIMEROBOT: 'UptimeRobot',
-            VERCEL_FAVICON_BOT: 'vercel-favicon-bot',
-            VERCEL_SCREENSHOT_BOT: 'vercel-screenshot-bot',
-            VERCEL_BOT: 'Vercelbot',
-            VERCEL_FLAGS: 'vercelflags',
-            VERCEL_TRACING: 'verceltracing',
-            X_TWITTERBOT: 'Twitterbot',
-            YANDEX_CALENDAR: 'YandexCalendar',
-            YANDEX_DIRECT: 'YandexDirect',
-            YANDEX_DIRECTDYN: 'YandexDirectDyn',
-            YANDEX_DIRECTFETCHER: 'YaDirectFetcher',
-            YANDEX_FORDOMAIN: 'YandexForDomain',
-            YANDEX_PAGECHECKER: 'YandexPagechecker',
-            YANDEX_SEARCHSHOP: 'YandexSearchShop',
-            YANDEX_SITELINKS: 'YandexSitelinks',
-            YANDEX_USERPROXY: 'YandexUserproxy',
-            ZOOMINFO_BOT: 'Zoombot'
-        },
-        InApp: {
-            DISCORD: 'Discord',
-            EVERNOTE: 'Evernote',
-            FIGMA: 'Figma',
-            FLIPBOARD: 'Flipboard',
-            MATTERMOST: 'Mattermost',
-            TEAMS: 'Teams',
-            NOTION: 'Notion',
-            POSTMAN: 'Postman',
-            RAMBOX: 'Rambox',
-            ROCKETCHAT: 'Rocket.Chat',
-            SLACK: 'Slack',
-            TIKTOK_LITE: 'TikTok Lite',
-            VSCODE: 'VS Code',
-            YAHOO_JAPAN: 'Yahoo! Japan'
-        },
-        Library: {
-            ADOBE_AIR: 'AdobeAIR',
-            AIOHTTP: 'aiohttp',
-            APACHE_HTTPCLIENT: 'Apache-HttpClient',
-            AXIOS: 'axios',
-            GO_HTTP_CLIENT: 'go-http-client',
-            GOT: 'got',
-            GUZZLEHTTP: 'GuzzleHttp',
-            JAVA: 'Java',
-            JAVA_HTTPCLIENT: 'Java-http-client',
-            JSDOM: 'jsdom',
-            LIBWWW_PERL: 'libwww-perl',
-            LUA_RESTY_HTTP: 'lua-resty-http',
-            NEEDLE: 'Needle',
-            NUTCH: 'Nutch',
-            OKHTTP: 'OkHttp',
-            NODE_FETCH: 'node-fetch',
-            NODE_SUPERAGENT: 'node-superagent',
-            PHP_SOAP: 'PHP-SOAP',
-            POSTMAN_RUNTIME: 'PostmanRuntime',
-            PYTHON_HTTPX: 'python-httpx',
-            PYTHON_URLLIB: 'python-urllib',
-            PYTHON_URLLIB3: 'python-urllib3',
-            PYTHON_REQUESTS: 'python-requests',
-            SCRAPY: 'Scrapy'
-        }
-    },
-    DeviceVendor: {
-        Vehicle: {
-            BMW: 'BMW',
-            BYD: 'BYD',
-            JEEP: 'Jeep',
-            RIVIAN: 'Rivian',
-            TESLA: 'Tesla',
-            VOLVO: 'Volvo'
-        }
-    }
-}>;
-
--- a/src/enums/ua-parser-enums.js
+++ b/src/enums/ua-parser-enums.js
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.6
+/*  Enums for UAParser.js v2.0.0
    https://github.com/faisalman/ua-parser-js
    Author: Faisal Salman <f@faisalman.com>
    AGPLv3 License */
@@ -7,7 +7,7 @@

 /*jshint esversion: 6 */ 

-const BrowserName = Object.freeze({
+const Browser = Object.freeze({
    '115': '115',
    '2345': '2345',
    '360': '360',
@@ -20,7 +20,6 @@ const BrowserName = Object.freeze({
    AVG: 'AVG Secure Browser',
    BAIDU: 'Baidu Browser',
    BASILISK: 'Basilisk',
-    BING: 'Bing',
    BLAZER: 'Blazer',
    BOLT: 'Bolt',
    BOWSER: 'Bowser',
@@ -35,17 +34,12 @@ const BrowserName = Object.freeze({
    COBALT: 'Cobalt',
    COC_COC: 'Coc Coc',
    CONKEROR: 'Conkeror',
-    DAUM: 'Daum',
    DILLO: 'Dillo',
    DOLPHIN: 'Dolphin',
-    DOOBLE: 'Dooble',
    DORIS: 'Doris',
    DRAGON: 'Dragon',
    DUCKDUCKGO: 'DuckDuckGo',
-    ECOSIA: 'Ecosia',
    EDGE: 'Edge',
-    EDGE_WEBVIEW: 'Edge WebView',
-    EDGE_WEBVIEW2: 'Edge WebView2',
    EPIPHANY: 'Epiphany',
    FACEBOOK: 'Facebook',
    FALKON: 'Falkon',
@@ -82,8 +76,6 @@ const BrowserName = Object.freeze({
    KLARNA: 'Klarna',
    KINDLE: 'Kindle',
    LENOVO: 'Smart Lenovo Browser',
-    LADYBIRD: 'Ladybird',
-    LG: 'LG Browser',
    LIBREWOLF: 'LibreWolf',
    LIEBAO: 'LBBROWSER',
    LINE: 'Line',
@@ -108,12 +100,10 @@ const BrowserName = Object.freeze({
    OMNIWEB: 'OmniWeb',
    OPERA: 'Opera',
    OPERA_COAST: 'Opera Coast',
-    OPERA_GX: 'Opera GX',
    OPERA_MINI: 'Opera Mini',
    OPERA_MOBI: 'Opera Mobi',
    OPERA_TABLET: 'Opera Tablet',
    OPERA_TOUCH: 'Opera Touch',
-    OTTER: 'Otter',
    OVI: 'OviBrowser',
    PALEMOON: 'PaleMoon',
    PHANTOMJS: 'PhantomJS',
@@ -125,8 +115,6 @@ const BrowserName = Object.freeze({
    QQ_LITE: 'QQBrowserLite',
    QUARK: 'Quark',
    QUPZILLA: 'QupZilla',
-    QUTEBROWSER: 'qutebrowser',
-    QWANT: 'Qwant',
    REKONQ: 'rekonq',
    ROCKMELT: 'Rockmelt',
    SAFARI: 'Safari',
@@ -143,7 +131,6 @@ const BrowserName = Object.freeze({
    SNAPCHAT: 'Snapchat',
    SOGOU_EXPLORER: 'Sogou Explorer',
    SOGOU_MOBILE: 'Sogou Mobile',
-    SURF: 'Surf',
    SWIFTFOX: 'Swiftfox',
    TESLA: 'Tesla',
    TIKTOK: 'TikTok',
@@ -160,15 +147,10 @@ const BrowserName = Object.freeze({
    WEIBO: 'Weibo',
    WHALE: 'Whale',
    WOLVIC: 'Wolvic',
-    YANDEX: 'Yandex',
-    ZALO: 'Zalo'
+    YANDEX: 'Yandex'

    // TODO : test!
 });
-/**
- * @deprecated Use `BrowserName` instead
- */
-const Browser = BrowserName;

 const BrowserType = Object.freeze({
    CRAWLER: 'crawler',
@@ -180,9 +162,8 @@ const BrowserType = Object.freeze({
    LIBRARY: 'library'
 });

-const CPUArch = Object.freeze({
+const CPU = Object.freeze({
    '68K': '68k',
-    ALPHA: 'alpha',
    ARM : 'arm',
    ARM_64: 'arm64',
    ARM_HF: 'armhf',
@@ -200,12 +181,8 @@ const CPUArch = Object.freeze({
    X86: 'ia32',
    X86_64: 'amd64'
 });
-/**
- * @deprecated Use `CPUArch` instead
- */
-const CPU = CPUArch;

-const DeviceType = Object.freeze({
+const Device = Object.freeze({
    CONSOLE: 'console',
    DESKTOP: 'desktop',
    EMBEDDED: 'embedded',
@@ -215,12 +192,8 @@ const DeviceType = Object.freeze({
    WEARABLE: 'wearable',
    XR: 'xr'
 });
-/**
- * @deprecated Use `DeviceType` instead
- */
-const Device = DeviceType;

-const DeviceVendor = Object.freeze({
+const Vendor = Object.freeze({
    ACER: 'Acer',
    ADVAN: 'Advan',
    ALCATEL: 'Alcatel',
@@ -231,7 +204,6 @@ const DeviceVendor = Object.freeze({
    ATT: 'AT&T',
    BENQ: 'BenQ',
    BLACKBERRY: 'BlackBerry',
-    BLU: 'BLU',
    CAT: 'Cat',
    DELL: 'Dell',
    ENERGIZER: 'Energizer',
@@ -241,7 +213,6 @@ const DeviceVendor = Object.freeze({
    GEEKSPHONE: 'GeeksPhone',
    GENERIC: 'Generic',
    GOOGLE: 'Google',
-    HISENSE: 'Hisense',
    HMD: 'HMD',
    HP: 'HP',
    HTC: 'HTC',
@@ -251,7 +222,6 @@ const DeviceVendor = Object.freeze({
    ITEL: 'itel',
    JOLLA: 'Jolla',
    KOBO: 'Kobo',
-    LAVA: 'Lava',
    LENOVO: 'Lenovo',
    LG: 'LG',
    MEIZU: 'Meizu',
@@ -269,11 +239,9 @@ const DeviceVendor = Object.freeze({
    PALM: 'Palm',
    PANASONIC: 'Panasonic',
    PEBBLE: 'Pebble',
-    PHILIPS: 'Philips',
    PICO: 'Pico',
    POLYTRON: 'Polytron',
    REALME: 'Realme',
-    RETROID: 'Retroid',
    RIM: 'RIM',
    ROKU: 'Roku',
    SAMSUNG: 'Samsung',
@@ -284,13 +252,11 @@ const DeviceVendor = Object.freeze({
    SPRINT: 'Sprint',
    TCL: 'TCL',
    TECHNISAT: 'TechniSAT',
-    TECNO: 'TECNO',
+    TECNO: 'Tecno',
    TESLA: 'Tesla',
    ULEFONE: 'Ulefone',
    VIVO: 'Vivo',
-    VIZIO: 'Vizio',
    VODAFONE: 'Vodafone',
-    WIKO: 'Wiko',
    XBOX: 'Xbox',
    XIAOMI: 'Xiaomi',
    ZEBRA: 'Zebra',
@@ -298,12 +264,8 @@ const DeviceVendor = Object.freeze({

    // TODO : test!
 });
-/**
- * @deprecated Use `DeviceVendor` instead
- */
-const Vendor = DeviceVendor;

-const EngineName = Object.freeze({
+const Engine = Object.freeze({
    AMAYA: 'Amaya',
    ARKWEB: 'ArkWeb',
    BLINK: 'Blink',
@@ -325,17 +287,12 @@ const EngineName = Object.freeze({
    W3M: 'w3m',
    WEBKIT: 'WebKit'
 });
-/**
- * @deprecated Use `EngineName` instead
- */
-const Engine = EngineName;

-const OSName = Object.freeze({
+const OS = Object.freeze({
    AIX: 'AIX',
    AMIGA_OS: 'Amiga OS',
    ANDROID: 'Android',
    ANDROID_X86: 'Android-x86',
-    ARCAOS: 'ArcaOS',
    ARCH: 'Arch',
    BADA: 'Bada',
    BEOS: 'BeOS',
@@ -366,7 +323,6 @@ const OSName = Object.freeze({
    IOS: 'iOS',
    JOLI: 'Joli',
    KAIOS: 'KaiOS',
-    KNOPPIX: 'Knoppix',
    KUBUNTU: 'Kubuntu',
    LINPUS: 'Linpus',
    LINSPIRE: 'Linspire',
@@ -409,348 +365,25 @@ const OSName = Object.freeze({
    SYMBIAN: 'Symbian',
    TIZEN: 'Tizen',
    UBUNTU: 'Ubuntu',
-    UBUNTU_TOUCH: 'Ubuntu Touch',
    UNIX: 'Unix',
    VECTORLINUX: 'VectorLinux',
    WATCHOS: 'watchOS',
    WEBOS: 'WebOS',
    WINDOWS: 'Windows',
-    WINDOWS_CE: 'Windows CE',
-    WINDOWS_IOT: 'Windows IoT',
    WINDOWS_MOBILE: 'Windows Mobile',
    WINDOWS_PHONE: 'Windows Phone',
-    WINDOWS_RT: 'Windows RT',
    XBOX: 'Xbox',
-    XUBUNTU: 'Xubuntu',
    ZENWALK: 'Zenwalk'

    // TODO : test!
 });
-/**
- * @deprecated Use `OSName` instead
- */
-const OS = OSName;
-
-/*////////////////////////////////
- * Enums for Extensions submodule
- *///////////////////////////////
-
-const Extension = Object.freeze({
-    BrowserName: {
-        CLI: {
-            CURL: 'curl',
-            ELINKS: 'ELinks',
-            HTTPIE: 'HTTPie',
-            LYNX: 'Lynx',
-            WGET: 'Wget'
-        },
-        Crawler: {
-            AHREFS_BOT: 'AhrefsBot',
-            AI2_BOT: 'AI2Bot',
-            AIHIT_BOT: 'aiHitBot',
-            ALGOLIA_CRAWLER: 'Algolia Crawler',
-            APPLE_BOT: 'Applebot',
-            APPLE_BOT_EXTENDED: 'Applebot-Extended',
-            ASK_TEOMA: 'Teoma',
-            AMAZON_BOT: 'Amazonbot',
-            AMAZON_CONTXBOT: 'contxbot',
-            ANTHROPIC_AI: 'anthropic-ai',
-            ANTHROPIC_CLAUDE_BOT: 'ClaudeBot',
-            ANTHROPIC_CLAUDE_SEARCHBOT: 'Claude-SearchBot',
-            ANTHROPIC_CLAUDE_WEB: 'Claude-Web',
-            ARCHIVEORG_BOT: 'archive.org_bot',
-            BAIDU_ADS: 'Baidu-ADS',
-            BAIDU_SPIDER: 'Baiduspider',
-            BAIDU_SPIDER_ADS: 'Baiduspider-ads',
-            BAIDU_SPIDER_CPRO: 'Baiduspider-cpro',
-            BAIDU_SPIDER_FAVO: 'Baiduspider-favo',
-            BAIDU_SPIDER_IMAGE: 'Baiduspider-image',
-            BAIDU_SPIDER_NEWS: 'Baiduspider-news',
-            BAIDU_SPIDER_RENDER: 'Baiduspider-render',
-            BAIDU_SPIDER_VIDEO: 'Baiduspider-video',
-            BLEX_BOT: 'BLEXBot',
-            BOTIFY: 'botify',
-            BRAVE_BOT: 'Bravebot',
-            BYTEDANCE_BYTESPIDER: 'Bytespider',
-            BYTEDANCE_TIKTOKSPIDER: 'TikTokSpider',
-            COMMON_CRAWL_CCBOT: 'CCBot',
-            COCCOC_BOT_WEB: 'coccocbot-web',
-            COCCOC_BOT_IMAGE: 'coccocbot-image',
-            COHERE_TRAINING_DATA_CRAWLER: 'cohere-training-data-crawler',
-            COTOYOGI: 'Cotoyogi',
-            COVEO_BOT: 'Coveobot',
-            CRITEO_BOT: 'CriteoBot',
-            DATAFORSEO_BOT: 'DataForSeoBot',
-            DAUM: 'Daum',
-            DAUM_DAUMOA: 'Daumoa',
-            DAUM_DAUMOA_IMAGE: 'Daumoa-image',
-            DEEPSEEK_BOT: 'DeepSeekBot',
-            DIFFBOT: 'Diffbot',
-            DUCKDUCKGO_BOT: 'DuckDuckBot',
-            DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
-            ELASTIC: 'Elastic',
-            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
-            EXALEAD_EXABOT: 'Exabot',
-            FIRECRAWL_AGENT: 'FirecrawlAgent',
-            FREESPOKE: 'Freespoke',
-            GOOGLE_ADSBOT: 'AdsBot-Google',
-            GOOGLE_ADSBOT_MOBILE: 'Adsbot-Google-Mobile',
-            GOOGLE_ADSENSE: 'AdSense',
-            GOOGLE_APIS: 'APIs-Google',
-            GOOGLE_BOT: 'Googlebot',
-            GOOGLE_BOT_IMAGE: 'Googlebot-Image',
-            GOOGLE_BOT_NEWS: 'Googlebot-News',
-            GOOGLE_BOT_VIDEO: 'Googlebot-Video',
-            GOOGLE_CLOUDVERTEXBOT: 'Google-CloudVertexBot',
-            GOOGLE_EXTENDED: 'Google-Extended',
-            GOOGLE_INSPECTIONTOOL: 'Google-InspectionTool',
-            GOOGLE_OTHER: 'GoogleOther',
-            GOOGLE_OTHER_IMAGE: 'GoogleOther-Image',
-            GOOGLE_OTHER_VIDEO: 'GoogleOther-Video',
-            GOOGLE_SAFETY: 'Google-Safety',
-            GOOGLE_STOREBOT: 'Storebot-Google',
-            HIVE_IMAGESIFTBOT: 'ImagesiftBot',
-            HUAWEI_PANGUBOT: 'PanguBot',
-            HUAWEI_PETALBOT: 'PetalBot',
-            HUGGINGFACE_BOT: 'HuggingFace-Bot',
-            HUNTER_VELENPUBLICWEBCRAWLER: 'VelenPublicWebCrawler',
-            IA_ARCHIVER: 'ia_archiver',
-            IASK_BOT: 'iAskBot',
-            KAGI_BOT: 'Kagibot',
-            KANGAROO_BOT: 'Kangaroo Bot',
-            LINE_SPIDER: 'Linespider',
-            LINKEDIN_BOT: 'LinkedInBot',
-            MAGPIE_CRAWLER: 'magpie-crawler',
-            MARGINALIA: 'marginalia',
-            META_EXTERNALAGENT: 'meta-externalagent',
-            META_FACEBOOKBOT: 'FacebookBot',
-            META_FACEBOOKCATALOG: 'facebookcatalog',
-            META_FACEBOOKEXTERNALHIT: 'facebookexternalhit',
-            MAJESTIC_MJ12BOT: 'MJ12bot',
-            MICROSOFT_BINGBOT: 'Bingbot',
-            MICROSOFT_MSNBOT: 'msnbot',
-            MICROSOFT_ADIDXBOT: 'adidxbot',
-            MOJEEK_BOT: 'MojeekBot',
-            MOZ_DOTBOT: 'DotBot',
-            ONCRAWL: 'OnCrawl',
-            ONESPOT_SCRAPERBOT: 'Onespot-ScraperBot',
-            OPENAI_GPTBOT: 'GPTBot',
-            OPENAI_SEARCH_BOT: 'OAI-SearchBot',
-            PERPLEXITY_BOT: 'PerplexityBot',
-            QIHOO_360_SPIDER: '360Spider',
-            QWANT_BOT: 'Qwantbot',
-            QWANT_BOT_NEWS: 'Qwantbot-news',
-            REPLICATE_BOT: 'Replicate-Bot',
-            RUNPOD_BOT: 'RunPod-Bot',
-            SB_INTUITIONS_BOT: 'SBIntuitionsBot',
-            SEEKPORT_BOT: 'SeekportBot',
-            SEMRUSH_BOT: 'SemrushBot',
-            SEMRUSH_BOT_BACKLINK: 'SemrushBot-BA',
-            SEMRUSH_BOT_CONTENTSHAKE: 'SemrushBot-OCOB',
-            SEMRUSH_BOT_SEO_CHECKER: 'SemrushBot-SI',
-            SEZNAM_BOT: 'SeznamBot',
-            SITEIMPROVE: 'Siteimprove',
-            SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
-            SOGOU_WEB_SPIDER: 'Sogou web spider',
-            STARTPAGE: 'Startpage',
-            SURLY_BOT: 'SurdotlyBot',
-            TIMPI_BOT: 'Timpibot',
-            TOGETHER_BOT: 'Together-Bot',
-            TURNITIN_BOT: 'TurnitinBot',
-            TWIN_AGENT: 'TwinAgent',
-            VERCEL_V0BOT: 'v0bot',
-            WEBZIO: 'webzio',
-            WEBZIO_EXTENDED: 'Webzio-Extended',
-            WEBZIO_OMGILI: 'omgili',
-            WEBZIO_OMGILI_BOT: 'omgilibot',
-            XAI_BOT: 'xAI-Bot',
-            YAHOO_JAPAN: 'Y!J-BRW',
-            YAHOO_SLURP: 'Yahoo! Slurp',
-            YANDEX_ACCESSIBILITY_BOT: 'YandexAccessibilityBot',
-            YANDEX_ADDITIONAL_BOT: 'YandexAdditionalBot',
-            YANDEX_ADNET: 'YandexAdNet',
-            YANDEX_BLOGS: 'YandexBlogs',
-            YANDEX_BOT: 'YandexBot',
-            YANDEX_BOT_MIRRORDETECTOR: 'YandexBot MirrorDetector',
-            YANDEX_COMBOT: 'YandexComBot',
-            YANDEX_FAVICONS: 'YandexFavicons',
-            YANDEX_IMAGE_RESIZER: 'YandexImageResizer',
-            YANDEX_IMAGES: 'YandexImages',
-            YANDEX_MARKET: 'YandexMarket',
-            YANDEX_MEDIA: 'YandexMedia',
-            YANDEX_METRIKA: 'YandexMetrika',
-            YANDEX_MOBILE_BOT: 'YandexMobileBot',
-            YANDEX_MOBILE_SCREENSHOT_BOT: 'YandexMobileScreenShotBot',
-            YANDEX_NEWS: 'YandexNews',
-            YANDEX_ONTODB: 'YandexOntoDB',
-            YANDEX_ONTODB_API: 'YandexOntoDBAPI',
-            YANDEX_PARTNER: 'YandexPartner',
-            YANDEX_RCA: 'YandexRCA',
-            YANDEX_RENDERRESOURCES_BOT: 'YandexRenderResourcesBot',
-            YANDEX_SCREENSHOT_BOT: 'YandexScreenshotBot',
-            YANDEX_SPRAV_BOT: 'YandexSpravBot',
-            YANDEX_TRACKER: 'YandexTracker',
-            YANDEX_VERTICALS: 'YandexVerticals',
-            YANDEX_VERTIS: 'YandexVertis',
-            YANDEX_VIDEO: 'YandexVideo',
-            YANDEX_VIDEO_PARSER: 'YandexVideoParser',
-            YANDEX_WEBMASTER: 'YandexWebmaster',
-            YEP_BOT: 'YepBot',
-            YETI: 'Yeti',
-            YISOU_SPIDER: 'YisouSpider',
-            YOU_BOT: 'YouBot',
-            ZHIPU_CHATGLM_SPIDER: 'ChatGLM-Spider',
-            ZUM_BOT: 'ZumBot'
-        },
-        Email: {
-            AIRMAIL: 'Airmail',
-            APPLE_MAIL: 'Mail',
-            BLUEMAIL: 'BlueMail',
-            DAUM_MAIL: 'DaumMail',
-            EVOLUTION: 'Evolution',
-            EM_CLIENT: 'eM Client',
-            FOXMAIL: 'Foxmail',
-            KMAIL: 'KMail',
-            KMAIL2: 'kmail2',
-            KONTACT: 'Kontact',
-            MICROSOFT_OUTLOOK: 'Microsoft Outlook',
-            MICROSOFT_OUTLOOK_MAC: 'MacOutlook',
-            NAVER_MAILAPP: 'NaverMailApp',
-            POLYMAIL: 'Polymail',
-            PROTON_MAIL: 'ProtonMail',
-            SPARK_MAIL: 'SparkDesktop',
-            SPARROW: 'Sparrow',
-            THUNDERBIRD: 'Thunderbird',
-            YAHOO_MAIL: 'Yahoo',
-            ZIMBRA: 'Zimbra',
-            ZOHO_MAIL: 'ZohoMail-Desktop'
-        },
-        Fetcher: {
-            AHREFS_SITEAUDIT: 'AhrefsSiteAudit',
-            ANTHROPIC_CLAUDE_USER: 'Claude-User',
-            ASANA: 'Asana',
-            BETTER_UPTIME_BOT: 'Better Uptime Bot',
-            BITLY_BOT: 'bitlybot',
-            BLUESKY: 'Bluesky',
-            BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
-            COHERE_AI: 'Cohere-AI',
-            DISCORD_BOT: 'Discordbot',
-            DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
-            GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
-            GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
-            GOOGLE_GEMINI_DEEP_RESEARCH: 'Gemini-Deep-Research',
-            GOOGLE_IMAGEPROXY: 'GoogleImageProxy',
-            GOOGLE_PAGERENDERER: 'Google-PageRenderer',
-            GOOGLE_READ_ALOUD: 'Google-Read-Aloud',
-            GOOGLE_PRODUCER: 'GoogleProducer',
-            GOOGLE_SITE_VERIFICATION: 'Google-Site-Verification',
-            HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
-            IFRAMELY: 'Iframely',
-            KAKAOTALK_SCRAP: 'kakaotalk-scrap',
-            KEYBASE_BOT: 'KeybaseBot',
-            META_EXTERNALFETCHER: 'meta-externalfetcher',
-            META_WHATSAPP: 'WhatsApp',
-            MICROSOFT_BINGPREVIEW: 'BingPreview',
-            MICROSOFT_PREVIEW: 'MicrosoftPreview',
-            MISTRALAI_USER: 'MistralAI-User',
-            NAVER_BLUENO: 'Blueno',
-            ONCRAWL_ROGERBOT: 'rogerbot',
-            OPENAI_CHATGPT_USER: 'ChatGPT-User',
-            PERPLEXITY_USER: 'Perplexity-User',
-            PINTEREST_BOT: 'Pinterestbot',
-            SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
-            SLACK_BOT: 'Slackbot',
-            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
-            SLACK_IMGPROXY: 'Slack-ImgProxy',
-            SNAP_URL_PREVIEW: 'Snap URL Preview',
-            SKYPE_URIPREVIEW: 'SkypeUriPreview',
-            TELEGRAM_BOT: 'TelegramBot',
-            UPTIMEROBOT: 'UptimeRobot',
-            VERCEL_FAVICON_BOT: 'vercel-favicon-bot',
-            VERCEL_SCREENSHOT_BOT: 'vercel-screenshot-bot',
-            VERCEL_BOT: 'Vercelbot',
-            VERCEL_FLAGS: 'vercelflags',
-            VERCEL_TRACING: 'verceltracing',
-            X_TWITTERBOT: 'Twitterbot',
-            YANDEX_CALENDAR: 'YandexCalendar',
-            YANDEX_DIRECT: 'YandexDirect',
-            YANDEX_DIRECTDYN: 'YandexDirectDyn',
-            YANDEX_DIRECTFETCHER: 'YaDirectFetcher',
-            YANDEX_FORDOMAIN: 'YandexForDomain',
-            YANDEX_PAGECHECKER: 'YandexPagechecker',
-            YANDEX_SEARCHSHOP: 'YandexSearchShop',
-            YANDEX_SITELINKS: 'YandexSitelinks',
-            YANDEX_USERPROXY: 'YandexUserproxy',
-            ZOOMINFO_BOT: 'Zoombot'
-        },
-        InApp: {
-            DISCORD: 'Discord',
-            EVERNOTE: 'Evernote',
-            FIGMA: 'Figma',
-            FLIPBOARD: 'Flipboard',
-            MATTERMOST: 'Mattermost',
-            TEAMS: 'Teams',
-            NOTION: 'Notion',
-            POSTMAN: 'Postman',
-            RAMBOX: 'Rambox',
-            ROCKETCHAT: 'Rocket.Chat',
-            SLACK: 'Slack',
-            TIKTOK_LITE: 'TikTok Lite',
-            VSCODE: 'VS Code',
-            YAHOO_JAPAN: 'Yahoo! Japan'
-        },
-        Library: {
-            ADOBE_AIR: 'AdobeAIR',
-            AIOHTTP: 'aiohttp',
-            APACHE_HTTPCLIENT: 'Apache-HttpClient',
-            AXIOS: 'axios',
-            GO_HTTP_CLIENT: 'go-http-client',
-            GOT: 'got',
-            GUZZLEHTTP: 'GuzzleHttp',
-            JAVA: 'Java',
-            JAVA_HTTPCLIENT: 'Java-http-client',
-            JSDOM: 'jsdom',
-            LIBWWW_PERL: 'libwww-perl',
-            LUA_RESTY_HTTP: 'lua-resty-http',
-            NEEDLE: 'Needle',
-            NUTCH: 'Nutch',
-            OKHTTP: 'OkHttp',
-            NODE_FETCH: 'node-fetch',
-            NODE_SUPERAGENT: 'node-superagent',
-            PHP_SOAP: 'PHP-SOAP',
-            POSTMAN_RUNTIME: 'PostmanRuntime',
-            PYTHON_HTTPX: 'python-httpx',
-            PYTHON_URLLIB: 'python-urllib',
-            PYTHON_URLLIB3: 'python-urllib3',
-            PYTHON_REQUESTS: 'python-requests',
-            SCRAPY: 'Scrapy'
-        }
-    },
-    DeviceVendor: {
-        Vehicle: {
-            BMW: 'BMW',
-            BYD: 'BYD',
-            JEEP: 'Jeep',
-            RIVIAN: 'Rivian',
-            TESLA: 'Tesla',
-            VOLVO: 'Volvo'
-        }
-    }
-});

 module.exports = { 
-    Browser,// deprecated
-    CPU,    // deprecated
-    Device, // deprecated
-    Vendor, // deprecated
-    Engine, // deprecated
-    OS,     // deprecated
-    BrowserName,
+    Browser,
    BrowserType, 
-    CPUArch,
-    DeviceType, 
-    DeviceVendor,
-    EngineName,
-    OSName,
-    Extension
+    CPU, 
+    Device, 
+    Vendor,
+    Engine,
+    OS
 };
--- a/src/enums/ua-parser-enums.mjs
+++ b/src/enums/ua-parser-enums.mjs
@@ -3,7 +3,7 @@
 // Source: /src/enums/ua-parser-enums.js

 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.6
+/*  Enums for UAParser.js v2.0.0
    https://github.com/faisalman/ua-parser-js
    Author: Faisal Salman <f@faisalman.com>
    AGPLv3 License */
@@ -11,7 +11,7 @@

 /*jshint esversion: 6 */ 

-const BrowserName = Object.freeze({
+const Browser = Object.freeze({
    '115': '115',
    '2345': '2345',
    '360': '360',
@@ -24,7 +24,6 @@ const BrowserName = Object.freeze({
    AVG: 'AVG Secure Browser',
    BAIDU: 'Baidu Browser',
    BASILISK: 'Basilisk',
-    BING: 'Bing',
    BLAZER: 'Blazer',
    BOLT: 'Bolt',
    BOWSER: 'Bowser',
@@ -39,17 +38,12 @@ const BrowserName = Object.freeze({
    COBALT: 'Cobalt',
    COC_COC: 'Coc Coc',
    CONKEROR: 'Conkeror',
-    DAUM: 'Daum',
    DILLO: 'Dillo',
    DOLPHIN: 'Dolphin',
-    DOOBLE: 'Dooble',
    DORIS: 'Doris',
    DRAGON: 'Dragon',
    DUCKDUCKGO: 'DuckDuckGo',
-    ECOSIA: 'Ecosia',
    EDGE: 'Edge',
-    EDGE_WEBVIEW: 'Edge WebView',
-    EDGE_WEBVIEW2: 'Edge WebView2',
    EPIPHANY: 'Epiphany',
    FACEBOOK: 'Facebook',
    FALKON: 'Falkon',
@@ -86,8 +80,6 @@ const BrowserName = Object.freeze({
    KLARNA: 'Klarna',
    KINDLE: 'Kindle',
    LENOVO: 'Smart Lenovo Browser',
-    LADYBIRD: 'Ladybird',
-    LG: 'LG Browser',
    LIBREWOLF: 'LibreWolf',
    LIEBAO: 'LBBROWSER',
    LINE: 'Line',
@@ -112,12 +104,10 @@ const BrowserName = Object.freeze({
    OMNIWEB: 'OmniWeb',
    OPERA: 'Opera',
    OPERA_COAST: 'Opera Coast',
-    OPERA_GX: 'Opera GX',
    OPERA_MINI: 'Opera Mini',
    OPERA_MOBI: 'Opera Mobi',
    OPERA_TABLET: 'Opera Tablet',
    OPERA_TOUCH: 'Opera Touch',
-    OTTER: 'Otter',
    OVI: 'OviBrowser',
    PALEMOON: 'PaleMoon',
    PHANTOMJS: 'PhantomJS',
@@ -129,8 +119,6 @@ const BrowserName = Object.freeze({
    QQ_LITE: 'QQBrowserLite',
    QUARK: 'Quark',
    QUPZILLA: 'QupZilla',
-    QUTEBROWSER: 'qutebrowser',
-    QWANT: 'Qwant',
    REKONQ: 'rekonq',
    ROCKMELT: 'Rockmelt',
    SAFARI: 'Safari',
@@ -147,7 +135,6 @@ const BrowserName = Object.freeze({
    SNAPCHAT: 'Snapchat',
    SOGOU_EXPLORER: 'Sogou Explorer',
    SOGOU_MOBILE: 'Sogou Mobile',
-    SURF: 'Surf',
    SWIFTFOX: 'Swiftfox',
    TESLA: 'Tesla',
    TIKTOK: 'TikTok',
@@ -164,15 +151,10 @@ const BrowserName = Object.freeze({
    WEIBO: 'Weibo',
    WHALE: 'Whale',
    WOLVIC: 'Wolvic',
-    YANDEX: 'Yandex',
-    ZALO: 'Zalo'
+    YANDEX: 'Yandex'

    // TODO : test!
 });
-/**
- * @deprecated Use `BrowserName` instead
- */
-const Browser = BrowserName;

 const BrowserType = Object.freeze({
    CRAWLER: 'crawler',
@@ -184,9 +166,8 @@ const BrowserType = Object.freeze({
    LIBRARY: 'library'
 });

-const CPUArch = Object.freeze({
+const CPU = Object.freeze({
    '68K': '68k',
-    ALPHA: 'alpha',
    ARM : 'arm',
    ARM_64: 'arm64',
    ARM_HF: 'armhf',
@@ -204,12 +185,8 @@ const CPUArch = Object.freeze({
    X86: 'ia32',
    X86_64: 'amd64'
 });
-/**
- * @deprecated Use `CPUArch` instead
- */
-const CPU = CPUArch;

-const DeviceType = Object.freeze({
+const Device = Object.freeze({
    CONSOLE: 'console',
    DESKTOP: 'desktop',
    EMBEDDED: 'embedded',
@@ -219,12 +196,8 @@ const DeviceType = Object.freeze({
    WEARABLE: 'wearable',
    XR: 'xr'
 });
-/**
- * @deprecated Use `DeviceType` instead
- */
-const Device = DeviceType;

-const DeviceVendor = Object.freeze({
+const Vendor = Object.freeze({
    ACER: 'Acer',
    ADVAN: 'Advan',
    ALCATEL: 'Alcatel',
@@ -235,7 +208,6 @@ const DeviceVendor = Object.freeze({
    ATT: 'AT&T',
    BENQ: 'BenQ',
    BLACKBERRY: 'BlackBerry',
-    BLU: 'BLU',
    CAT: 'Cat',
    DELL: 'Dell',
    ENERGIZER: 'Energizer',
@@ -245,8 +217,6 @@ const DeviceVendor = Object.freeze({
    GEEKSPHONE: 'GeeksPhone',
    GENERIC: 'Generic',
    GOOGLE: 'Google',
-    HISENSE: 'Hisense',
-    HMD: 'HMD',
    HP: 'HP',
    HTC: 'HTC',
    HUAWEI: 'Huawei',
@@ -255,7 +225,6 @@ const DeviceVendor = Object.freeze({
    ITEL: 'itel',
    JOLLA: 'Jolla',
    KOBO: 'Kobo',
-    LAVA: 'Lava',
    LENOVO: 'Lenovo',
    LG: 'LG',
    MEIZU: 'Meizu',
@@ -273,11 +242,9 @@ const DeviceVendor = Object.freeze({
    PALM: 'Palm',
    PANASONIC: 'Panasonic',
    PEBBLE: 'Pebble',
-    PHILIPS: 'Philips',
    PICO: 'Pico',
    POLYTRON: 'Polytron',
    REALME: 'Realme',
-    RETROID: 'Retroid',
    RIM: 'RIM',
    ROKU: 'Roku',
    SAMSUNG: 'Samsung',
@@ -288,13 +255,11 @@ const DeviceVendor = Object.freeze({
    SPRINT: 'Sprint',
    TCL: 'TCL',
    TECHNISAT: 'TechniSAT',
-    TECNO: 'TECNO',
+    TECNO: 'Tecno',
    TESLA: 'Tesla',
    ULEFONE: 'Ulefone',
    VIVO: 'Vivo',
-    VIZIO: 'Vizio',
    VODAFONE: 'Vodafone',
-    WIKO: 'Wiko',
    XBOX: 'Xbox',
    XIAOMI: 'Xiaomi',
    ZEBRA: 'Zebra',
@@ -302,12 +267,8 @@ const DeviceVendor = Object.freeze({

    // TODO : test!
 });
-/**
- * @deprecated Use `DeviceVendor` instead
- */
-const Vendor = DeviceVendor;

-const EngineName = Object.freeze({
+const Engine = Object.freeze({
    AMAYA: 'Amaya',
    ARKWEB: 'ArkWeb',
    BLINK: 'Blink',
@@ -329,17 +290,12 @@ const EngineName = Object.freeze({
    W3M: 'w3m',
    WEBKIT: 'WebKit'
 });
-/**
- * @deprecated Use `EngineName` instead
- */
-const Engine = EngineName;

-const OSName = Object.freeze({
+const OS = Object.freeze({
    AIX: 'AIX',
    AMIGA_OS: 'Amiga OS',
    ANDROID: 'Android',
    ANDROID_X86: 'Android-x86',
-    ARCAOS: 'ArcaOS',
    ARCH: 'Arch',
    BADA: 'Bada',
    BEOS: 'BeOS',
@@ -370,8 +326,6 @@ const OSName = Object.freeze({
    IOS: 'iOS',
    JOLI: 'Joli',
    KAIOS: 'KaiOS',
-    KNOPPIX: 'Knoppix',
-    KUBUNTU: 'Kubuntu',
    LINPUS: 'Linpus',
    LINSPIRE: 'Linspire',
    LINUX: 'Linux',
@@ -413,348 +367,25 @@ const OSName = Object.freeze({
    SYMBIAN: 'Symbian',
    TIZEN: 'Tizen',
    UBUNTU: 'Ubuntu',
-    UBUNTU_TOUCH: 'Ubuntu Touch',
    UNIX: 'Unix',
    VECTORLINUX: 'VectorLinux',
    WATCHOS: 'watchOS',
    WEBOS: 'WebOS',
    WINDOWS: 'Windows',
-    WINDOWS_CE: 'Windows CE',
-    WINDOWS_IOT: 'Windows IoT',
    WINDOWS_MOBILE: 'Windows Mobile',
    WINDOWS_PHONE: 'Windows Phone',
-    WINDOWS_RT: 'Windows RT',
    XBOX: 'Xbox',
-    XUBUNTU: 'Xubuntu',
    ZENWALK: 'Zenwalk'

    // TODO : test!
 });
-/**
- * @deprecated Use `OSName` instead
- */
-const OS = OSName;
-
-/*////////////////////////////////
- * Enums for Extensions submodule
- *///////////////////////////////
-
-const Extension = Object.freeze({
-    BrowserName: {
-        CLI: {
-            CURL: 'curl',
-            ELINKS: 'ELinks',
-            HTTPIE: 'HTTPie',
-            LYNX: 'Lynx',
-            WGET: 'Wget'
-        },
-        Crawler: {
-            AHREFS_BOT: 'AhrefsBot',
-            AI2_BOT: 'AI2Bot',
-            AIHIT_BOT: 'aiHitBot',
-            ALGOLIA_CRAWLER: 'Algolia Crawler',
-            APPLE_BOT: 'Applebot',
-            APPLE_BOT_EXTENDED: 'Applebot-Extended',
-            ASK_TEOMA: 'Teoma',
-            AMAZON_BOT: 'Amazonbot',
-            AMAZON_CONTXBOT: 'contxbot',
-            ANTHROPIC_AI: 'anthropic-ai',
-            ANTHROPIC_CLAUDE_BOT: 'ClaudeBot',
-            ANTHROPIC_CLAUDE_SEARCHBOT: 'Claude-SearchBot',
-            ANTHROPIC_CLAUDE_WEB: 'Claude-Web',
-            ARCHIVEORG_BOT: 'archive.org_bot',
-            BAIDU_ADS: 'Baidu-ADS',
-            BAIDU_SPIDER: 'Baiduspider',
-            BAIDU_SPIDER_ADS: 'Baiduspider-ads',
-            BAIDU_SPIDER_CPRO: 'Baiduspider-cpro',
-            BAIDU_SPIDER_FAVO: 'Baiduspider-favo',
-            BAIDU_SPIDER_IMAGE: 'Baiduspider-image',
-            BAIDU_SPIDER_NEWS: 'Baiduspider-news',
-            BAIDU_SPIDER_RENDER: 'Baiduspider-render',
-            BAIDU_SPIDER_VIDEO: 'Baiduspider-video',
-            BLEX_BOT: 'BLEXBot',
-            BOTIFY: 'botify',
-            BRAVE_BOT: 'Bravebot',
-            BYTEDANCE_BYTESPIDER: 'Bytespider',
-            BYTEDANCE_TIKTOKSPIDER: 'TikTokSpider',
-            COMMON_CRAWL_CCBOT: 'CCBot',
-            COCCOC_BOT_WEB: 'coccocbot-web',
-            COCCOC_BOT_IMAGE: 'coccocbot-image',
-            COHERE_TRAINING_DATA_CRAWLER: 'cohere-training-data-crawler',
-            COTOYOGI: 'Cotoyogi',
-            COVEO_BOT: 'Coveobot',
-            CRITEO_BOT: 'CriteoBot',
-            DATAFORSEO_BOT: 'DataForSeoBot',
-            DAUM: 'Daum',
-            DAUM_DAUMOA: 'Daumoa',
-            DAUM_DAUMOA_IMAGE: 'Daumoa-image',
-            DEEPSEEK_BOT: 'DeepSeekBot',
-            DIFFBOT: 'Diffbot',
-            DUCKDUCKGO_BOT: 'DuckDuckBot',
-            DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
-            ELASTIC: 'Elastic',
-            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
-            EXALEAD_EXABOT: 'Exabot',
-            FIRECRAWL_AGENT: 'FirecrawlAgent',
-            FREESPOKE: 'Freespoke',
-            GOOGLE_ADSBOT: 'AdsBot-Google',
-            GOOGLE_ADSBOT_MOBILE: 'Adsbot-Google-Mobile',
-            GOOGLE_ADSENSE: 'AdSense',
-            GOOGLE_APIS: 'APIs-Google',
-            GOOGLE_BOT: 'Googlebot',
-            GOOGLE_BOT_IMAGE: 'Googlebot-Image',
-            GOOGLE_BOT_NEWS: 'Googlebot-News',
-            GOOGLE_BOT_VIDEO: 'Googlebot-Video',
-            GOOGLE_CLOUDVERTEXBOT: 'Google-CloudVertexBot',
-            GOOGLE_EXTENDED: 'Google-Extended',
-            GOOGLE_INSPECTIONTOOL: 'Google-InspectionTool',
-            GOOGLE_OTHER: 'GoogleOther',
-            GOOGLE_OTHER_IMAGE: 'GoogleOther-Image',
-            GOOGLE_OTHER_VIDEO: 'GoogleOther-Video',
-            GOOGLE_SAFETY: 'Google-Safety',
-            GOOGLE_STOREBOT: 'Storebot-Google',
-            HIVE_IMAGESIFTBOT: 'ImagesiftBot',
-            HUAWEI_PANGUBOT: 'PanguBot',
-            HUAWEI_PETALBOT: 'PetalBot',
-            HUGGINGFACE_BOT: 'HuggingFace-Bot',
-            HUNTER_VELENPUBLICWEBCRAWLER: 'VelenPublicWebCrawler',
-            IA_ARCHIVER: 'ia_archiver',
-            IASK_BOT: 'iAskBot',
-            KAGI_BOT: 'Kagibot',
-            KANGAROO_BOT: 'Kangaroo Bot',
-            LINE_SPIDER: 'Linespider',
-            LINKEDIN_BOT: 'LinkedInBot',
-            MAGPIE_CRAWLER: 'magpie-crawler',
-            MARGINALIA: 'marginalia',
-            META_EXTERNALAGENT: 'meta-externalagent',
-            META_FACEBOOKBOT: 'FacebookBot',
-            META_FACEBOOKCATALOG: 'facebookcatalog',
-            META_FACEBOOKEXTERNALHIT: 'facebookexternalhit',
-            MAJESTIC_MJ12BOT: 'MJ12bot',
-            MICROSOFT_BINGBOT: 'Bingbot',
-            MICROSOFT_MSNBOT: 'msnbot',
-            MICROSOFT_ADIDXBOT: 'adidxbot',
-            MOJEEK_BOT: 'MojeekBot',
-            MOZ_DOTBOT: 'DotBot',
-            ONCRAWL: 'OnCrawl',
-            ONESPOT_SCRAPERBOT: 'Onespot-ScraperBot',
-            OPENAI_GPTBOT: 'GPTBot',
-            OPENAI_SEARCH_BOT: 'OAI-SearchBot',
-            PERPLEXITY_BOT: 'PerplexityBot',
-            QIHOO_360_SPIDER: '360Spider',
-            QWANT_BOT: 'Qwantbot',
-            QWANT_BOT_NEWS: 'Qwantbot-news',
-            REPLICATE_BOT: 'Replicate-Bot',
-            RUNPOD_BOT: 'RunPod-Bot',
-            SB_INTUITIONS_BOT: 'SBIntuitionsBot',
-            SEEKPORT_BOT: 'SeekportBot',
-            SEMRUSH_BOT: 'SemrushBot',
-            SEMRUSH_BOT_BACKLINK: 'SemrushBot-BA',
-            SEMRUSH_BOT_CONTENTSHAKE: 'SemrushBot-OCOB',
-            SEMRUSH_BOT_SEO_CHECKER: 'SemrushBot-SI',
-            SEZNAM_BOT: 'SeznamBot',
-            SITEIMPROVE: 'Siteimprove',
-            SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
-            SOGOU_WEB_SPIDER: 'Sogou web spider',
-            STARTPAGE: 'Startpage',
-            SURLY_BOT: 'SurdotlyBot',
-            TIMPI_BOT: 'Timpibot',
-            TOGETHER_BOT: 'Together-Bot',
-            TURNITIN_BOT: 'TurnitinBot',
-            TWIN_AGENT: 'TwinAgent',
-            VERCEL_V0BOT: 'v0bot',
-            WEBZIO: 'webzio',
-            WEBZIO_EXTENDED: 'Webzio-Extended',
-            WEBZIO_OMGILI: 'omgili',
-            WEBZIO_OMGILI_BOT: 'omgilibot',
-            XAI_BOT: 'xAI-Bot',
-            YAHOO_JAPAN: 'Y!J-BRW',
-            YAHOO_SLURP: 'Yahoo! Slurp',
-            YANDEX_ACCESSIBILITY_BOT: 'YandexAccessibilityBot',
-            YANDEX_ADDITIONAL_BOT: 'YandexAdditionalBot',
-            YANDEX_ADNET: 'YandexAdNet',
-            YANDEX_BLOGS: 'YandexBlogs',
-            YANDEX_BOT: 'YandexBot',
-            YANDEX_BOT_MIRRORDETECTOR: 'YandexBot MirrorDetector',
-            YANDEX_COMBOT: 'YandexComBot',
-            YANDEX_FAVICONS: 'YandexFavicons',
-            YANDEX_IMAGE_RESIZER: 'YandexImageResizer',
-            YANDEX_IMAGES: 'YandexImages',
-            YANDEX_MARKET: 'YandexMarket',
-            YANDEX_MEDIA: 'YandexMedia',
-            YANDEX_METRIKA: 'YandexMetrika',
-            YANDEX_MOBILE_BOT: 'YandexMobileBot',
-            YANDEX_MOBILE_SCREENSHOT_BOT: 'YandexMobileScreenShotBot',
-            YANDEX_NEWS: 'YandexNews',
-            YANDEX_ONTODB: 'YandexOntoDB',
-            YANDEX_ONTODB_API: 'YandexOntoDBAPI',
-            YANDEX_PARTNER: 'YandexPartner',
-            YANDEX_RCA: 'YandexRCA',
-            YANDEX_RENDERRESOURCES_BOT: 'YandexRenderResourcesBot',
-            YANDEX_SCREENSHOT_BOT: 'YandexScreenshotBot',
-            YANDEX_SPRAV_BOT: 'YandexSpravBot',
-            YANDEX_TRACKER: 'YandexTracker',
-            YANDEX_VERTICALS: 'YandexVerticals',
-            YANDEX_VERTIS: 'YandexVertis',
-            YANDEX_VIDEO: 'YandexVideo',
-            YANDEX_VIDEO_PARSER: 'YandexVideoParser',
-            YANDEX_WEBMASTER: 'YandexWebmaster',
-            YEP_BOT: 'YepBot',
-            YETI: 'Yeti',
-            YISOU_SPIDER: 'YisouSpider',
-            YOU_BOT: 'YouBot',
-            ZHIPU_CHATGLM_SPIDER: 'ChatGLM-Spider',
-            ZUM_BOT: 'ZumBot'
-        },
-        Email: {
-            AIRMAIL: 'Airmail',
-            APPLE_MAIL: 'Mail',
-            BLUEMAIL: 'BlueMail',
-            DAUM_MAIL: 'DaumMail',
-            EVOLUTION: 'Evolution',
-            EM_CLIENT: 'eM Client',
-            FOXMAIL: 'Foxmail',
-            KMAIL: 'KMail',
-            KMAIL2: 'kmail2',
-            KONTACT: 'Kontact',
-            MICROSOFT_OUTLOOK: 'Microsoft Outlook',
-            MICROSOFT_OUTLOOK_MAC: 'MacOutlook',
-            NAVER_MAILAPP: 'NaverMailApp',
-            POLYMAIL: 'Polymail',
-            PROTON_MAIL: 'ProtonMail',
-            SPARK_MAIL: 'SparkDesktop',
-            SPARROW: 'Sparrow',
-            THUNDERBIRD: 'Thunderbird',
-            YAHOO_MAIL: 'Yahoo',
-            ZIMBRA: 'Zimbra',
-            ZOHO_MAIL: 'ZohoMail-Desktop'
-        },
-        Fetcher: {
-            AHREFS_SITEAUDIT: 'AhrefsSiteAudit',
-            ANTHROPIC_CLAUDE_USER: 'Claude-User',
-            ASANA: 'Asana',
-            BETTER_UPTIME_BOT: 'Better Uptime Bot',
-            BITLY_BOT: 'bitlybot',
-            BLUESKY: 'Bluesky',
-            BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
-            COHERE_AI: 'Cohere-AI',
-            DISCORD_BOT: 'Discordbot',
-            DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
-            GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
-            GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
-            GOOGLE_GEMINI_DEEP_RESEARCH: 'Gemini-Deep-Research',
-            GOOGLE_IMAGEPROXY: 'GoogleImageProxy',
-            GOOGLE_PAGERENDERER: 'Google-PageRenderer',
-            GOOGLE_READ_ALOUD: 'Google-Read-Aloud',
-            GOOGLE_PRODUCER: 'GoogleProducer',
-            GOOGLE_SITE_VERIFICATION: 'Google-Site-Verification',
-            HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
-            IFRAMELY: 'Iframely',
-            KAKAOTALK_SCRAP: 'kakaotalk-scrap',
-            KEYBASE_BOT: 'KeybaseBot',
-            META_EXTERNALFETCHER: 'meta-externalfetcher',
-            META_WHATSAPP: 'WhatsApp',
-            MICROSOFT_BINGPREVIEW: 'BingPreview',
-            MICROSOFT_PREVIEW: 'MicrosoftPreview',
-            MISTRALAI_USER: 'MistralAI-User',
-            NAVER_BLUENO: 'Blueno',
-            ONCRAWL_ROGERBOT: 'rogerbot',
-            OPENAI_CHATGPT_USER: 'ChatGPT-User',
-            PERPLEXITY_USER: 'Perplexity-User',
-            PINTEREST_BOT: 'Pinterestbot',
-            SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
-            SLACK_BOT: 'Slackbot',
-            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
-            SLACK_IMGPROXY: 'Slack-ImgProxy',
-            SNAP_URL_PREVIEW: 'Snap URL Preview',
-            SKYPE_URIPREVIEW: 'SkypeUriPreview',
-            TELEGRAM_BOT: 'TelegramBot',
-            UPTIMEROBOT: 'UptimeRobot',
-            VERCEL_FAVICON_BOT: 'vercel-favicon-bot',
-            VERCEL_SCREENSHOT_BOT: 'vercel-screenshot-bot',
-            VERCEL_BOT: 'Vercelbot',
-            VERCEL_FLAGS: 'vercelflags',
-            VERCEL_TRACING: 'verceltracing',
-            X_TWITTERBOT: 'Twitterbot',
-            YANDEX_CALENDAR: 'YandexCalendar',
-            YANDEX_DIRECT: 'YandexDirect',
-            YANDEX_DIRECTDYN: 'YandexDirectDyn',
-            YANDEX_DIRECTFETCHER: 'YaDirectFetcher',
-            YANDEX_FORDOMAIN: 'YandexForDomain',
-            YANDEX_PAGECHECKER: 'YandexPagechecker',
-            YANDEX_SEARCHSHOP: 'YandexSearchShop',
-            YANDEX_SITELINKS: 'YandexSitelinks',
-            YANDEX_USERPROXY: 'YandexUserproxy',
-            ZOOMINFO_BOT: 'Zoombot'
-        },
-        InApp: {
-            DISCORD: 'Discord',
-            EVERNOTE: 'Evernote',
-            FIGMA: 'Figma',
-            FLIPBOARD: 'Flipboard',
-            MATTERMOST: 'Mattermost',
-            TEAMS: 'Teams',
-            NOTION: 'Notion',
-            POSTMAN: 'Postman',
-            RAMBOX: 'Rambox',
-            ROCKETCHAT: 'Rocket.Chat',
-            SLACK: 'Slack',
-            TIKTOK_LITE: 'TikTok Lite',
-            VSCODE: 'VS Code',
-            YAHOO_JAPAN: 'Yahoo! Japan'
-        },
-        Library: {
-            ADOBE_AIR: 'AdobeAIR',
-            AIOHTTP: 'aiohttp',
-            APACHE_HTTPCLIENT: 'Apache-HttpClient',
-            AXIOS: 'axios',
-            GO_HTTP_CLIENT: 'go-http-client',
-            GOT: 'got',
-            GUZZLEHTTP: 'GuzzleHttp',
-            JAVA: 'Java',
-            JAVA_HTTPCLIENT: 'Java-http-client',
-            JSDOM: 'jsdom',
-            LIBWWW_PERL: 'libwww-perl',
-            LUA_RESTY_HTTP: 'lua-resty-http',
-            NEEDLE: 'Needle',
-            NUTCH: 'Nutch',
-            OKHTTP: 'OkHttp',
-            NODE_FETCH: 'node-fetch',
-            NODE_SUPERAGENT: 'node-superagent',
-            PHP_SOAP: 'PHP-SOAP',
-            POSTMAN_RUNTIME: 'PostmanRuntime',
-            PYTHON_HTTPX: 'python-httpx',
-            PYTHON_URLLIB: 'python-urllib',
-            PYTHON_URLLIB3: 'python-urllib3',
-            PYTHON_REQUESTS: 'python-requests',
-            SCRAPY: 'Scrapy'
-        }
-    },
-    DeviceVendor: {
-        Vehicle: {
-            BMW: 'BMW',
-            BYD: 'BYD',
-            JEEP: 'Jeep',
-            RIVIAN: 'Rivian',
-            TESLA: 'Tesla',
-            VOLVO: 'Volvo'
-        }
-    }
-});

 export { 
-    Browser,// deprecated
-    CPU,    // deprecated
-    Device, // deprecated
-    Vendor, // deprecated
-    Engine, // deprecated
-    OS,     // deprecated
-    BrowserName,
+    Browser,
    BrowserType, 
-    CPUArch,
-    DeviceType, 
-    DeviceVendor,
-    EngineName,
-    OSName,
-    Extension
+    CPU, 
+    Device, 
+    Vendor,
+    Engine,
+    OS
 };
--- a/src/extensions/ua-parser-extensions.d.ts
+++ b/src/extensions/ua-parser-extensions.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Helpers submodule of UAParser.js v2.0.5
+// Type definitions for Helpers submodule of UAParser.js v2.0.0
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>

@@ -13,4 +13,3 @@ export const Fetchers: UAParserExt;
 export const InApps: UAParserExt;
 export const Libraries: UAParserExt;
 export const MediaPlayers: UAParserExt;
-export const Vehicles: UAParserExt;
--- a/src/extensions/ua-parser-extensions.js
+++ b/src/extensions/ua-parser-extensions.js
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.6
+/*  Extensions for UAParser.js v2.0.0
    https://github.com/faisalman/ua-parser-js
    Author: Faisal Salman <f@faisalman.com>
    AGPLv3 License */
@@ -42,50 +42,32 @@ const Crawlers = Object.freeze({
        [
            // AhrefsBot - https://ahrefs.com/robot
            // Amazonbot - https://developer.amazon.com/amazonbot
-            // Bingbot / AdIdxBot - https://www.bing.com/webmasters/help/which-crawlers-does-bing-use-8c184ec0
-            // Bravebot - https://search.brave.com/help/brave-search-crawler
+            // Bingbot - http://www.bing.com/bingbot.htm
            // CCBot - https://commoncrawl.org/faq
-            // contxbot - https://affiliate-program.amazon.com/help/node/topic/GT98G5PPRERNVZ2C
-            // Coveobot - https://connect.coveo.com/s/article/19648
-            // CriteoBot - https://www.criteo.com/criteo-crawler/
            // Dotbot - https://moz.com/help/moz-procedures/crawlers/dotbot
            // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
            // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
            // GPTBot - https://platform.openai.com/docs/gptbot
-            // iAskBot - https://iask.ai
-            // Kagibot - https://kagi.com/bot
-            // Kangaroo Bot - https://kangaroollm.com.au/kangaroo-bot/
-            // LinkedInBot - http://www.linkedin.com
            // MJ12bot - https://mj12bot.com/
            // MojeekBot - https://www.mojeek.com/bot.html
-            // Onespot - https://www.onespot.com/identifying-traffic.html
            // OpenAI's SearchGPT - https://platform.openai.com/docs/bots
            // PerplexityBot - https://perplexity.ai/perplexitybot
-            // SBIntuitionsBot - https://www.sbintuitions.co.jp/bot/
+            // SemrushBot - http://www.semrush.com/bot.html
            // SeznamBot - http://napoveda.seznam.cz/seznambot-intro
-            // SurdotlyBot - http://sur.ly/bot.html
-            // Swiftbot - https://swiftype.com/swiftbot
-            // YepBot - https://yep.com/yepbot/
-            /((?:adidx|ahrefs|amazon|bing|brave|cc|contx|coveo|criteo|dot|duckduck(?:go-favicons-)?|exa|facebook|gpt|iask|kagi|kangaroo |linkedin|mj12|mojeek|oai-search|onespot-scraper|perplexity|sbintuitions|semrush|seznam|surdotly|swift|yep)bot)\/([\w\.-]+)/i,
-
-            // Algolia Crawler
-            /(algolia crawler(?: renderscript)?)\/?([\w\.]*)/i,
+            /((?:ahrefs|amazon|bing|cc|dot|duckduck|exa|facebook|gpt|mj12|mojeek|oai-search|perplexity|semrush|seznam)bot)\/([\w\.-]+)/i,

            // Applebot - http://apple.com/go/applebot
-            /(applebot(?:-extended)?)\/?([\w\.]*)/i,
+            /(applebot(?:-extended)?)\/([\w\.]+)/i,

            // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
-            /(baiduspider[-imagevdonwsfcpr]{0,7})\/?([\w\.]*)/i,
+            /(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i,

            // ClaudeBot (Anthropic)
-            /(claude(?:bot|-searchbot|-web)|anthropic-ai)\/?([\w\.]*)/i, 
+            /(claude(?:bot|-web)|anthropic-ai)\/?([\w\.]*)/i, 

            // Coc Coc Bot - https://help.coccoc.com/en/search-engine
            /(coccocbot-(?:image|web))\/([\w\.]+)/i, 

-            // Daum
-            /(daum(?:oa)?(?:-image)?)[ \/]([\w\.]+)/i,
-
            // Facebook / Meta 
            // https://developers.facebook.com/docs/sharing/webmasters/web-crawlers
            /(facebook(?:externalhit|catalog)|meta-externalagent)\/([\w\.]+)/i,
@@ -96,15 +78,6 @@ const Crawlers = Object.freeze({
            // Internet Archive (archive.org)
            /(ia_archiver|archive\.org_bot)\/?([\w\.]*)/i,

-            // OnCrawl
-            /(oncrawl) mobile\/([\w\.]+)/i,
-
-            // Qwantbot - https://help.qwant.com/bot
-            /(qwantbot(?:-news)?)[-\w]*\/?([\w\.]*)/i,
-
-            // SemrushBot - http://www.semrush.com/bot.html
-            /((?:semrush|splitsignal)bot[-abcfimostw]*)\/?([\w\.-]*)/i,
-
            // Sogou Spider
            /(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i, 

@@ -112,38 +85,30 @@ const Crawlers = Object.freeze({
            /(y!?j-(?:asr|br[uw]|dscv|mmp|vsidx|wsc))\/([\w\.]+)/i, 

            // Yandex Bots - https://yandex.com/bots
-            /(yandex(?:(?:mobile)?(?:accessibility|additional|com|renderresources|screenshot|sprav)?bot(?!.+mirror)|image(?:s|resizer)|adnet|blogs|favicons|market|media|metrika|news|ontodb(?:api)?|partner|rca|tracker|turbo|verti(?:cal)?s|webmaster|video(?:parser)?))\/([\w\.]+)/i,
+            /(yandex(?:(?:mobile)?(?:accessibility|additional|renderresources|screenshot|sprav)?bot|image(?:s|resizer)|video(?:parser)?|blogs|adnet|favicons|fordomain|market|media|metrika|news|ontodb(?:api)?|pagechecker|partner|rca|tracker|turbo|vertis|webmaster|antivirus))\/([\w\.]+)/i,

            // Yeti (Naver)
            /(yeti)\/([\w\.]+)/i,

-            // aiHitBot / Algolia Crawler / BLEXBot / Diffbot / FirecrawlAgent / HuggingFace-Bot / Linespider / MSNBot / Magpie-Crawler / Omgilibot / OpenAI Image Downloader / PanguBot / Replicate-Bot / RunPod-Bot / Webzio-Extended / Screaming Frog SEO Spider / Startpage / Timpibot / Together-Bot / VelenPublicWebCrawler / xAI-Bot / YisouSpider / YouBot / ZumBot
-            // Cotoyogi - https://ds.rois.ac.jp/en_center8/en_crawler/
-            // Freespoke - https://docs.freespoke.com/search/bot/
-            /((?:aihit|blex|diff|huggingface-|msn|pangu|replicate-|runpod-|timpi|together-|xai-|you|zum)bot|(?:magpie-|velenpublicweb)crawler|(?:chatglm-|line|screaming frog seo |yisou)spider|cotoyogi|firecrawlagent|freespoke|omgili(?:bot)?|openai image downloader|startpageprivateimageproxy|twinagent|webzio-extended)\/?([\w\.]*)/i
+            // aiHitBot / Diffbot / Magpie-Crawler / Omgilibot / Webzio-Extended / Screaming Frog SEO Spider / Timpibot / VelenPublicWebCrawler / YisouSpider / YouBot
+            /((?:aihit|diff|timpi|you)bot|omgili(?:bot)?|(?:magpie-|velenpublicweb)crawler|webzio-extended|(?:screaming frog seo |yisou)spider)\/?([\w\.]*)/i
        ],
-        [NAME, VERSION, [TYPE, CRAWLER]],

-        [
-            // YandexBot MirrorDetector
-            /(yandexbot\/([\w\.]+); mirrordetector)/i
-        ],
-        [[NAME, /\/.+;/ig, ''], VERSION, [TYPE, CRAWLER]],
+        [NAME, VERSION, [TYPE, CRAWLER]],

        [
            // Google Bots
            /((?:adsbot|apis|mediapartners)-google(?:-mobile)?|google-?(?:other|cloudvertexbot|extended|safety))/i,

            // AI2Bot - https://allenai.org/crawler
+            // Bytespider
            // DataForSeoBot - https://dataforseo.com/dataforseo-bot
            // Huawei AspiegelBot / PetalBot https://aspiegel.com/petalbot
            // ImagesiftBot - https://imagesift.com/about
-            // Siteimprove - https://help.siteimprove.com/support/solutions/articles/80000448553
+            // Qihoo 360Spider
            // TurnitinBot - https://www.turnitin.com/robot/crawlerinfo.html
-            // v0bot - https://vercel.com/docs/bot-management
            // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
-            // Botify / Bytespider / DeepSeekBot / Qihoo 360Spider / SeekportBot / TikTokSpider
-            /\b((ai2|aspiegel|dataforseo|deepseek|imagesift|petal|seekport|turnitin|v0)bot|360spider-?(image|video)?|baidu-ads|botify|(byte|tiktok)spider|cohere-training-data-crawler|elastic(?=\/s)|marginalia|siteimprove(?=bot|\.com)|teoma|webzio|yahoo! slurp)/i
+            /\b(360spider-?(?:image|video)?|bytespider|(?:ai2|aspiegel|dataforseo|imagesift|petal|turnitin)bot|teoma|(?=yahoo! )slurp)/i
        ], 
        [NAME, [TYPE, CRAWLER]]
    ]
@@ -236,18 +201,9 @@ const ExtraDevices = Object.freeze({
 const Emails = Object.freeze({
    browser : [
        [
-        // Evolution / Kontact/KMail[2] / [Microsoft/Mac] Outlook / Thunderbird
-        // Airmail / BlueMail / DaumMail / eMClient / Foxmail / NaverMailApp / Polymail
-        // ProtonMail / SparkDesktop / Sparrow / Yahoo! Mail / Zimbra / ZohoMail-Desktop
-        /((?:air|blue|daum|fox|poly|proton)mail|emclient|evolution|kmail2?|kontact|(?:microsoft |mac)?outlook(?:-express)?|navermailapp|(?!chrom.+)sparrow|sparkdesktop|thunderbird|yahoo|zohomail-desktop)(?:m.+ail; |[\/ ])([\w\.]+)/i,
-
-        // Apple's Mail
-        /(mail)\/([\w\.]+) cf/i
-        ], [NAME, VERSION, [TYPE, EMAIL]], [
-        
-        // Zimbra
-        /zdesktop\/([\w\.]+)/i
-        ], [VERSION, [NAME, 'Zimbra'], [TYPE, EMAIL]]
+        // Evolution / Kontact/KMail / [Microsoft/Mac] Outlook / Thunderbird
+        /(airmail|bluemail|emclient|evolution|foxmail|kmail2?|kontact|(?:microsoft |mac)?outlook(?:-express)?|navermailapp|(?!chrom.+)sparrow|thunderbird|yahoo)(?:m.+ail; |[\/ ])([\w\.]+)/i
+        ], [NAME, VERSION, [TYPE, EMAIL]]
    ]
 });

@@ -258,42 +214,36 @@ const Emails = Object.freeze({
 const Fetchers = Object.freeze({
    browser : [
        [
-            // Asana / Bitlybot / Better Uptime / BingPreview / Blueno / Cohere-AI / HubSpot Page Fetcher / kakaotalk-scrap / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot
            // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
-            // Buffer Link Preview Bot - https://scraper.buffer.com/about/bots/link-preview-bot
            // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
            // DuckAssistBot - https://duckduckgo.com/duckassistbot/
-            // Google Site Verifier / Meta / Yahoo! Japan
-            // Iframely - https://iframely.com/docs/about
-            // Perplexity-User - https://docs.perplexity.ai/guides/bots
-            // MistralAI-User - https://docs.mistral.ai/robots/
-            // Yandex Bots - https://yandex.com/bots
-            /(asana|ahrefssiteaudit|(?:bing|microsoft)preview|blueno|(?:chatgpt|claude|mistralai|perplexity)-user|cohere-ai|hubspot page fetcher|mastodon|(?:bitly|bufferlinkpreview|discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero|zoom)bot|google-site-verification|iframely|kakaotalk-scrap|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|fordomain|pagechecker|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            // BingPreview / Mastodon / Pinterestbot / Redditbot / Rogerbot / Telegrambot / Twitterbot / UptimeRobot
+            /(ahrefssiteaudit|bingpreview|chatgpt-user|mastodon|(?:discord|duckassist|linkedin|pinterest|reddit|roger|telegram|twitter|uptimero)bot)\/([\w\.]+)/i,

-            // Bluesky
-            /(bluesky) cardyb\/([\w\.]+)/i,
+            // Google Site Verifier
+            /(google-site-verification)\/([\w\.]+)/i,

-            // Skype
-            /(skypeuripreview) preview\/([\w\.]+)/i,
+            // Meta
+            /(meta-externalfetcher)\/([\w\.]+)/i,

            // Slackbot - https://api.slack.com/robots
            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
            
            // WhatsApp
-            /(whatsapp)\/([\w\.]+)/i
+            /(whatsapp)\/([\w\.]+)[\/ ][ianw]/i,
+
+            // Yahoo! Japan
+            /(y!?j-dlc)\/([\w\.]+)/i,
+
+            // Yandex Bots - https://yandex.com/bots
+            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(yandex(?:sitelinks|userproxy))/i
        ], 
        [NAME, VERSION, [TYPE, FETCHER]],

-        [
-            // Google Bots / Chrome-Lighthouse / Gemini-Deep-Research / KeybaseBot / Snapchat / Vercelbot / Yandex Bots
-            /((?:better uptime |keybase|telegram|vercel)bot|chrome-lighthouse|feedfetcher-google|gemini-deep-research|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|vercel(flags|tracing|-(favicon|screenshot)-bot)|yandex(?:sitelinks|userproxy))/i
-        ], 
+        // Google Bots / Cohere / Snapchat / Vercelbot
+        [/(cohere-ai|vercelbot|feedfetcher-google|google(?:-read-aloud|producer)|(?=bot; )snapchat)/i], 
        [NAME, [TYPE, FETCHER]],
-    ],
-
-    os : [
-        [/whatsapp\/[\d\.]+ (a|i)/i],
-        [[NAME, os => os == 'A' ? 'Android' : 'iOS' ]]
    ]
 });

@@ -302,32 +252,12 @@ const Fetchers = Object.freeze({
 ///////////////////

 const InApps = Object.freeze({
-    browser : [[
-        // Discord/Figma/Flipboard/Mattermost/Notion/Postman/Rambox/Rocket.Chat/Slack/Teams
-        /\b(discord|figma|mattermost|notion|postman|rambox|rocket.chat|slack|teams)\/([\w\.]+).+(electron\/|; ios)/i,
-        /(flipboard)\/([\w\.]+)/i
-        ], [NAME, VERSION, [TYPE, INAPP]], [
-
-        // Evernote/Teams on mobile
-        /(evernote) win/i,
-        /(teams)mobile-(ios|and)/i
-        ], [NAME, [TYPE, INAPP]], [
-
+    browser : [
        // Slack
-        /chatlyio\/([\d\.]+)/i], 
-        [VERSION, [NAME, 'Slack'], [TYPE, INAPP]], [
-
-        // TikTok Lite
-        /ultralite app_version\/([\w\.]+)/i], 
-        [VERSION, [NAME, 'TikTok Lite'], [TYPE, INAPP]], [
-
-        // VS Code
-        /\) code\/([\d\.]+).+electron\//i], 
-        [VERSION, [NAME, 'VS Code'], [TYPE, INAPP]], [
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]],

        // Yahoo! Japan
-        /jp\.co\.yahoo\.(?:android\.yjtop|ipn\.appli)\/([\d\.]+)/i], 
-        [VERSION, [NAME, 'Yahoo! Japan'], [TYPE, INAPP]]
+        [/jp\.co\.yahoo\.android\.yjtop\/([\d\.]+)/i], [VERSION, 'Yahoo! Japan', [TYPE, INAPP]]
    ]
 });

@@ -391,37 +321,12 @@ const Libraries = Object.freeze({
    browser : [
        // Apache-HttpClient/Axios/go-http-client/got/GuzzleHttp/Java[-HttpClient]/jsdom/libwww-perl/lua-resty-http/Needle/node-fetch/OkHttp/PHP-SOAP/PostmanRuntime/python-urllib/python-requests/Scrapy/superagent
        [
-            /^(apache-httpclient|axios|(?:go|java)-http-client|got|guzzlehttp|java|libwww-perl|lua-resty-http|needle|node-(?:fetch|superagent)|okhttp|php-soap|postmanruntime|python-(?:httpx|urllib[23]?|requests)|scrapy)\/([\w\.]+)/i,
-            /(adobeair|aiohttp|jsdom)\/([\w\.]+)/i,
-            /(nutch)-([\w\.-]+)(\(|$)/i,
-            /\((java)\/([\w\.]+)/i
+            /^(apache-httpclient|axios|(?:go|java)-http-client|got|guzzlehttp|java|libwww-perl|lua-resty-http|needle|node-(?:fetch|superagent)|okhttp|php-soap|postmanruntime|python-(?:urllib|requests)|scrapy)\/([\w\.]+)/i,
+            /(jsdom|(?<=\()java)\/([\w\.]+)/i
        ], [NAME, VERSION, [TYPE, LIBRARY]]
    ]
 });

-/////////////
-// VEHICLES
-////////////
-
-const Vehicles = Object.freeze({
-    device : [
-        [/aftlbt962e2/i],                                                   // BMW
-        [[VENDOR, 'BMW']],
-
-        [/dilink.+(byd) auto/i],                                            // BYD
-        [VENDOR],
-
-        [/aftlft962x3/i],                                                   // Jeep
-        [[VENDOR, 'Jeep'], [MODEL, 'Wagooner']],
-        
-        [/(rivian) (r1t)/i],                                                // Rivian
-        [VENDOR, MODEL],
-
-        [/vcc.+netfront/i],                                                 // Volvo
-        [[VENDOR, 'Volvo']]
-    ]
-});
-
 //////////
 // BOTS
 /////////
@@ -429,12 +334,9 @@ const Vehicles = Object.freeze({
 const Bots = Object.freeze({
    browser : [
        ...CLIs.browser,
-        ...Fetchers.browser,
        ...Crawlers.browser,
+        ...Fetchers.browser,
        ...Libraries.browser
-    ],
-    os : [
-        ...Fetchers.os
    ]
 });

@@ -447,6 +349,5 @@ module.exports = {
    Fetchers,
    InApps,
    Libraries,
-    MediaPlayers,
-    Vehicles
+    MediaPlayers
 };
--- a/src/extensions/ua-parser-extensions.mjs
+++ b/src/extensions/ua-parser-extensions.mjs
@@ -3,7 +3,7 @@
 // Source: /src/extensions/ua-parser-extensions.js

 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.6
+/*  Extensions for UAParser.js v2.0.0
    https://github.com/faisalman/ua-parser-js
    Author: Faisal Salman <f@faisalman.com>
    AGPLv3 License */
@@ -46,50 +46,32 @@ const Crawlers = Object.freeze({
        [
            // AhrefsBot - https://ahrefs.com/robot
            // Amazonbot - https://developer.amazon.com/amazonbot
-            // Bingbot / AdIdxBot - https://www.bing.com/webmasters/help/which-crawlers-does-bing-use-8c184ec0
-            // Bravebot - https://search.brave.com/help/brave-search-crawler
+            // Bingbot - http://www.bing.com/bingbot.htm
            // CCBot - https://commoncrawl.org/faq
-            // contxbot - https://affiliate-program.amazon.com/help/node/topic/GT98G5PPRERNVZ2C
-            // Coveobot - https://connect.coveo.com/s/article/19648
-            // CriteoBot - https://www.criteo.com/criteo-crawler/
            // Dotbot - https://moz.com/help/moz-procedures/crawlers/dotbot
            // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
            // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
            // GPTBot - https://platform.openai.com/docs/gptbot
-            // iAskBot - https://iask.ai
-            // Kagibot - https://kagi.com/bot
-            // Kangaroo Bot - https://kangaroollm.com.au/kangaroo-bot/
-            // LinkedInBot - http://www.linkedin.com
            // MJ12bot - https://mj12bot.com/
            // MojeekBot - https://www.mojeek.com/bot.html
-            // Onespot - https://www.onespot.com/identifying-traffic.html
            // OpenAI's SearchGPT - https://platform.openai.com/docs/bots
            // PerplexityBot - https://perplexity.ai/perplexitybot
-            // SBIntuitionsBot - https://www.sbintuitions.co.jp/bot/
+            // SemrushBot - http://www.semrush.com/bot.html
            // SeznamBot - http://napoveda.seznam.cz/seznambot-intro
-            // SurdotlyBot - http://sur.ly/bot.html
-            // Swiftbot - https://swiftype.com/swiftbot
-            // YepBot - https://yep.com/yepbot/
-            /((?:adidx|ahrefs|amazon|bing|brave|cc|contx|coveo|criteo|dot|duckduck(?:go-favicons-)?|exa|facebook|gpt|iask|kagi|kangaroo |linkedin|mj12|mojeek|oai-search|onespot-scraper|perplexity|sbintuitions|semrush|seznam|surdotly|swift|yep)bot)\/([\w\.-]+)/i,
-
-            // Algolia Crawler
-            /(algolia crawler(?: renderscript)?)\/?([\w\.]*)/i,
+            /((?:ahrefs|amazon|bing|cc|dot|duckduck|exa|facebook|gpt|mj12|mojeek|oai-search|perplexity|semrush|seznam)bot)\/([\w\.-]+)/i,

            // Applebot - http://apple.com/go/applebot
-            /(applebot(?:-extended)?)\/?([\w\.]*)/i,
+            /(applebot(?:-extended)?)\/([\w\.]+)/i,

            // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
-            /(baiduspider[-imagevdonwsfcpr]{0,7})\/?([\w\.]*)/i,
+            /(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i,

            // ClaudeBot (Anthropic)
-            /(claude(?:bot|-searchbot|-web)|anthropic-ai)\/?([\w\.]*)/i, 
+            /(claude(?:bot|-web)|anthropic-ai)\/?([\w\.]*)/i, 

            // Coc Coc Bot - https://help.coccoc.com/en/search-engine
            /(coccocbot-(?:image|web))\/([\w\.]+)/i, 

-            // Daum
-            /(daum(?:oa)?(?:-image)?)[ \/]([\w\.]+)/i,
-
            // Facebook / Meta 
            // https://developers.facebook.com/docs/sharing/webmasters/web-crawlers
            /(facebook(?:externalhit|catalog)|meta-externalagent)\/([\w\.]+)/i,
@@ -100,15 +82,6 @@ const Crawlers = Object.freeze({
            // Internet Archive (archive.org)
            /(ia_archiver|archive\.org_bot)\/?([\w\.]*)/i,

-            // OnCrawl
-            /(oncrawl) mobile\/([\w\.]+)/i,
-
-            // Qwantbot - https://help.qwant.com/bot
-            /(qwantbot(?:-news)?)[-\w]*\/?([\w\.]*)/i,
-
-            // SemrushBot - http://www.semrush.com/bot.html
-            /((?:semrush|splitsignal)bot[-abcfimostw]*)\/?([\w\.-]*)/i,
-
            // Sogou Spider
            /(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i, 

@@ -116,38 +89,30 @@ const Crawlers = Object.freeze({
            /(y!?j-(?:asr|br[uw]|dscv|mmp|vsidx|wsc))\/([\w\.]+)/i, 

            // Yandex Bots - https://yandex.com/bots
-            /(yandex(?:(?:mobile)?(?:accessibility|additional|com|renderresources|screenshot|sprav)?bot(?!.+mirror)|image(?:s|resizer)|adnet|blogs|favicons|market|media|metrika|news|ontodb(?:api)?|partner|rca|tracker|turbo|verti(?:cal)?s|webmaster|video(?:parser)?))\/([\w\.]+)/i,
+            /(yandex(?:(?:mobile)?(?:accessibility|additional|renderresources|screenshot|sprav)?bot|image(?:s|resizer)|video(?:parser)?|blogs|adnet|favicons|fordomain|market|media|metrika|news|ontodb(?:api)?|pagechecker|partner|rca|tracker|turbo|vertis|webmaster|antivirus))\/([\w\.]+)/i,

            // Yeti (Naver)
            /(yeti)\/([\w\.]+)/i,

-            // aiHitBot / Algolia Crawler / BLEXBot / Diffbot / FirecrawlAgent / HuggingFace-Bot / Linespider / MSNBot / Magpie-Crawler / Omgilibot / OpenAI Image Downloader / PanguBot / Replicate-Bot / RunPod-Bot / Webzio-Extended / Screaming Frog SEO Spider / Startpage / Timpibot / Together-Bot / VelenPublicWebCrawler / xAI-Bot / YisouSpider / YouBot / ZumBot
-            // Cotoyogi - https://ds.rois.ac.jp/en_center8/en_crawler/
-            // Freespoke - https://docs.freespoke.com/search/bot/
-            /((?:aihit|blex|diff|huggingface-|msn|pangu|replicate-|runpod-|timpi|together-|xai-|you|zum)bot|(?:magpie-|velenpublicweb)crawler|(?:chatglm-|line|screaming frog seo |yisou)spider|cotoyogi|firecrawlagent|freespoke|omgili(?:bot)?|openai image downloader|startpageprivateimageproxy|twinagent|webzio-extended)\/?([\w\.]*)/i
+            // aiHitBot / Diffbot / Magpie-Crawler / Omgilibot / Webzio-Extended / Screaming Frog SEO Spider / Timpibot / VelenPublicWebCrawler / YisouSpider / YouBot
+            /((?:aihit|diff|timpi|you)bot|omgili(?:bot)?|(?:magpie-|velenpublicweb)crawler|webzio-extended|(?:screaming frog seo |yisou)spider)\/?([\w\.]*)/i
        ],
-        [NAME, VERSION, [TYPE, CRAWLER]],

-        [
-            // YandexBot MirrorDetector
-            /(yandexbot\/([\w\.]+); mirrordetector)/i
-        ],
-        [[NAME, /\/.+;/ig, ''], VERSION, [TYPE, CRAWLER]],
+        [NAME, VERSION, [TYPE, CRAWLER]],

        [
            // Google Bots
            /((?:adsbot|apis|mediapartners)-google(?:-mobile)?|google-?(?:other|cloudvertexbot|extended|safety))/i,

            // AI2Bot - https://allenai.org/crawler
+            // Bytespider
            // DataForSeoBot - https://dataforseo.com/dataforseo-bot
            // Huawei AspiegelBot / PetalBot https://aspiegel.com/petalbot
            // ImagesiftBot - https://imagesift.com/about
-            // Siteimprove - https://help.siteimprove.com/support/solutions/articles/80000448553
+            // Qihoo 360Spider
            // TurnitinBot - https://www.turnitin.com/robot/crawlerinfo.html
-            // v0bot - https://vercel.com/docs/bot-management
            // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
-            // Botify / Bytespider / DeepSeekBot / Qihoo 360Spider / SeekportBot / TikTokSpider
-            /\b((ai2|aspiegel|dataforseo|deepseek|imagesift|petal|seekport|turnitin|v0)bot|360spider-?(image|video)?|baidu-ads|botify|(byte|tiktok)spider|cohere-training-data-crawler|elastic(?=\/s)|marginalia|siteimprove(?=bot|\.com)|teoma|webzio|yahoo! slurp)/i
+            /\b(360spider-?(?:image|video)?|bytespider|(?:ai2|aspiegel|dataforseo|imagesift|petal|turnitin)bot|teoma|(?=yahoo! )slurp)/i
        ], 
        [NAME, [TYPE, CRAWLER]]
    ]
@@ -200,7 +165,7 @@ const ExtraDevices = Object.freeze({
        /\b(zur\d{3}) b/i                                                   // Swiss ZUR Tablet
        ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [

-        /^((zeki)?tb.*\b) b/i                                               // Zeki Tablets
+        /\b((zeki)?tb.*\b) b/i                                              // Zeki Tablets
        ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [

        /\b([yr]\d{2}) b/i,
@@ -240,18 +205,9 @@ const ExtraDevices = Object.freeze({
 const Emails = Object.freeze({
    browser : [
        [
-        // Evolution / Kontact/KMail[2] / [Microsoft/Mac] Outlook / Thunderbird
-        // Airmail / BlueMail / DaumMail / eMClient / Foxmail / NaverMailApp / Polymail
-        // ProtonMail / SparkDesktop / Sparrow / Yahoo! Mail / Zimbra / ZohoMail-Desktop
-        /((?:air|blue|daum|fox|poly|proton)mail|emclient|evolution|kmail2?|kontact|(?:microsoft |mac)?outlook(?:-express)?|navermailapp|(?!chrom.+)sparrow|sparkdesktop|thunderbird|yahoo|zohomail-desktop)(?:m.+ail; |[\/ ])([\w\.]+)/i,
-
-        // Apple's Mail
-        /(mail)\/([\w\.]+) cf/i
-        ], [NAME, VERSION, [TYPE, EMAIL]], [
-        
-        // Zimbra
-        /zdesktop\/([\w\.]+)/i
-        ], [VERSION, [NAME, 'Zimbra'], [TYPE, EMAIL]]
+        // Evolution / Kontact/KMail / [Microsoft/Mac] Outlook / Thunderbird
+        /(airmail|bluemail|emclient|evolution|foxmail|kmail2?|kontact|(?:microsoft |mac)?outlook(?:-express)?|navermailapp|(?!chrom.+)sparrow|thunderbird|yahoo)(?:m.+ail; |[\/ ])([\w\.]+)/i
+        ], [NAME, VERSION, [TYPE, EMAIL]]
    ]
 });

@@ -262,42 +218,36 @@ const Emails = Object.freeze({
 const Fetchers = Object.freeze({
    browser : [
        [
-            // Asana / Bitlybot / Better Uptime / BingPreview / Blueno / Cohere-AI / HubSpot Page Fetcher / kakaotalk-scrap / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot
            // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
-            // Buffer Link Preview Bot - https://scraper.buffer.com/about/bots/link-preview-bot
            // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
            // DuckAssistBot - https://duckduckgo.com/duckassistbot/
-            // Google Site Verifier / Meta / Yahoo! Japan
-            // Iframely - https://iframely.com/docs/about
-            // Perplexity-User - https://docs.perplexity.ai/guides/bots
-            // MistralAI-User - https://docs.mistral.ai/robots/
-            // Yandex Bots - https://yandex.com/bots
-            /(asana|ahrefssiteaudit|(?:bing|microsoft)preview|blueno|(?:chatgpt|claude|mistralai|perplexity)-user|cohere-ai|hubspot page fetcher|mastodon|(?:bitly|bufferlinkpreview|discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero|zoom)bot|google-site-verification|iframely|kakaotalk-scrap|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|fordomain|pagechecker|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            // BingPreview / Mastodon / Pinterestbot / Redditbot / Rogerbot / Telegrambot / Twitterbot / UptimeRobot
+            /(ahrefssiteaudit|bingpreview|chatgpt-user|mastodon|(?:discord|duckassist|linkedin|pinterest|reddit|roger|telegram|twitter|uptimero)bot)\/([\w\.]+)/i,

-            // Bluesky
-            /(bluesky) cardyb\/([\w\.]+)/i,
+            // Google Site Verifier
+            /(google-site-verification)\/([\w\.]+)/i,

-            // Skype
-            /(skypeuripreview) preview\/([\w\.]+)/i,
+            // Meta
+            /(meta-externalfetcher)\/([\w\.]+)/i,

            // Slackbot - https://api.slack.com/robots
            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
            
            // WhatsApp
-            /(whatsapp)\/([\w\.]+)/i
+            /(whatsapp)\/([\w\.]+)[\/ ][ianw]/i,
+
+            // Yahoo! Japan
+            /(y!?j-dlc)\/([\w\.]+)/i,
+
+            // Yandex Bots - https://yandex.com/bots
+            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(yandex(?:sitelinks|userproxy))/i
        ], 
        [NAME, VERSION, [TYPE, FETCHER]],

-        [
-            // Google Bots / Chrome-Lighthouse / Gemini-Deep-Research / KeybaseBot / Snapchat / Vercelbot / Yandex Bots
-            /((?:better uptime |keybase|telegram|vercel)bot|chrome-lighthouse|feedfetcher-google|gemini-deep-research|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|vercel(flags|tracing|-(favicon|screenshot)-bot)|yandex(?:sitelinks|userproxy))/i
-        ], 
+        // Google Bots / Cohere / Snapchat / Vercelbot
+        [/(cohere-ai|vercelbot|feedfetcher-google|google(?:-read-aloud|producer)|(?=bot; )snapchat)/i], 
        [NAME, [TYPE, FETCHER]],
-    ],
-
-    os : [
-        [/whatsapp\/[\d\.]+ (a|i)/i],
-        [[NAME, os => os == 'A' ? 'Android' : 'iOS' ]]
    ]
 });

@@ -306,32 +256,12 @@ const Fetchers = Object.freeze({
 ///////////////////

 const InApps = Object.freeze({
-    browser : [[
-        // Discord/Figma/Flipboard/Mattermost/Notion/Postman/Rambox/Rocket.Chat/Slack/Teams
-        /\b(discord|figma|mattermost|notion|postman|rambox|rocket.chat|slack|teams)\/([\w\.]+).+(electron\/|; ios)/i,
-        /(flipboard)\/([\w\.]+)/i
-        ], [NAME, VERSION, [TYPE, INAPP]], [
-
-        // Evernote/Teams on mobile
-        /(evernote) win/i,
-        /(teams)mobile-(ios|and)/i
-        ], [NAME, [TYPE, INAPP]], [
-
+    browser : [
        // Slack
-        /chatlyio\/([\d\.]+)/i], 
-        [VERSION, [NAME, 'Slack'], [TYPE, INAPP]], [
-
-        // TikTok Lite
-        /ultralite app_version\/([\w\.]+)/i], 
-        [VERSION, [NAME, 'TikTok Lite'], [TYPE, INAPP]], [
-
-        // VS Code
-        /\) code\/([\d\.]+).+electron\//i], 
-        [VERSION, [NAME, 'VS Code'], [TYPE, INAPP]], [
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]],

        // Yahoo! Japan
-        /jp\.co\.yahoo\.(?:android\.yjtop|ipn\.appli)\/([\d\.]+)/i], 
-        [VERSION, [NAME, 'Yahoo! Japan'], [TYPE, INAPP]]
+        [/jp\.co\.yahoo\.android\.yjtop\/([\d\.]+)/i], [VERSION, 'Yahoo! Japan', [TYPE, INAPP]]
    ]
 });

@@ -341,48 +271,104 @@ const InApps = Object.freeze({

 const MediaPlayers = Object.freeze({
    browser : [[
-        /(apple(?:coremedia|tv))\/([\w\._]+)/i,                             // Generic Apple CoreMedia
-        /(coremedia) v([\w\._]+)/i,         
-                                                                            // Ares/Nexplayer/OSSProxy
-        /(ares|clementine|music player daemon|nexplayer|ossproxy) ([\w\.-]+)/i, 
-                                                                            // Aqualung/Lyssna/BSPlayer/Clementine/MPD
-                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/GnomeMplayer/MoC
+
+        /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
+        /(coremedia) v([\w\._]+)/i
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
+                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
                                                                            // NSPlayer/PSP-InternetRadioPlayer/Videos
-                                                                            // Nero Home/Nero Scout/Nokia
-                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
-                                                                            // SoundTap/Totem/Stagefright/Streamium
-                                                                            // XBMC/gvfs/Xine/XMMS/irapp
-        /^(aqualung|audacious|audimusicstream|amarok|bass|bsplayer|core|gnomemplayer|gvfs|irapp|lyssna|music on console|nero (?:home|scout)|nokia\d+|nsplayer|psp-internetradioplayer|quicktime|rma|radioapp|radioclientapplication|soundtap|stagefright|streamium|totem|videos|xbmc|xine|xmms)\/([\w\.-]+)/i,
-        /(lg player|nexplayer) ([\d\.]+)/i,
-        /player\/(nexplayer|lg player) ([\w\.-]+)/i,                        // NexPlayer/LG Player
-        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i,                    // Gstreamer
-        /(htc streaming player) [\w_]+ \/ ([\d\.]+)/i,                      // HTC Streaming Player
-        /(lavf)([\d\.]+)/i,                                                 // Lavf (FFMPEG)
-                                                                            // MPlayer SVN
-        /(mplayer)(?: |\/)(?:(?:sherpya-){0,1}svn)(?:-| )(r\d+(?:-\d+[\w\.-]+))/i,
-        / (songbird)\/([\w\.-]+)/i,                                         // Songbird/Philips-Songbird
-        /(winamp)(?:3 version|mpeg| ) ([\w\.-]+)/i,                         // Winamp
-        /(vlc)(?:\/| media player - version )([\w\.-]+)/i,                  // VLC Videolan
-        /^(foobar2000|itunes|smp)\/([\d\.]+)/i,                             // Foobar2000/iTunes/SMP
-        /com\.(riseupradioalarm)\/([\d\.]*)/i,                              // RiseUP Radio Alarm
-        /(mplayer)(?:\s|\/| unknown-)([\w\.\-]+)/i,                         // MPlayer
-                                                                            // Windows Media Server
-        /(windows)\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ home media server/i
+        /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
+        /(lg player|nexplayer)\s([\d\.]+)/i,
+        /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+        /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [

        /(flrp)\/([\w\.-]+)/i                                               // Flip Player
        ], [[NAME, 'Flip Player'], VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(fstream|nativehost|queryseekspider)/i
                                                                            // FStream/NativeHost/QuerySeekSpider
-                                                                            // MPlayer (no other info)/Media Player Classic/Nero ShowTime
-                                                                            // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
-                                                                            // inlight radio / YourMuze
-        /(fstream|media player classic|inlight radio|mplayer|nativehost|nero showtime|ocms-bot|queryseekspider|tapinradio|tunein radio|winamp|yourmuze)/i                                                                          
        ], [NAME, [TYPE, MEDIAPLAYER]], [

-        /(htc_one_s|windows-media-player|wmplayer)\/([\w\.-]+)/i,           // HTC One S / Windows Media Player
-        ], [[NAME, /[_-]/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
+        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
+                                                                            // Gstreamer
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [

-        /(rad.io|radio.(?:de|at|fr)) ([\d\.]+)/i                            // Rad.io
+        /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
+        /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
+        ], [[NAME, /_/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
+                                                                            // MPlayer SVN
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
+        /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(mplayer)/i,                                                       // MPlayer (no other info)
+        /(yourmuze)/i,                                                      // YourMuze
+        /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
+        ], [NAME, [TYPE, MEDIAPLAYER]], [
+
+        /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
+        /(winamp)\s([\w\.-]+)/i,
+        /(winamp)mpeg\/([\w\.-]+)/i
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
+                                                                            // inlight radio
+        ], [NAME, [TYPE, MEDIAPLAYER]], [
+
+        /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
+                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
+                                                                            // SoundTap/Totem/Stagefright/Streamium
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(smp)([\d\.]+)/i                                                   // SMP
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
+        /(vlc)\/([\w\.-]+)/i,
+        /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
+        /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
+        /(itunes)\/([\d\.]+)/i                                              // iTunes
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
+        /(windows-media-player)\/([\w\.-]+)/i
+        ], [[NAME, /-/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
+                                                                            // Windows Media Server
+        ], [VERSION, [NAME, 'Windows'], [TYPE, MEDIAPLAYER]], [
+
+        /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+
+        /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
+        /(radio.(?:de|at|fr))\s([\d\.]+)/i
        ], [[NAME, 'rad.io'], VERSION, [TYPE, MEDIAPLAYER]]
    ]
 });
@@ -395,37 +381,12 @@ const Libraries = Object.freeze({
    browser : [
        // Apache-HttpClient/Axios/go-http-client/got/GuzzleHttp/Java[-HttpClient]/jsdom/libwww-perl/lua-resty-http/Needle/node-fetch/OkHttp/PHP-SOAP/PostmanRuntime/python-urllib/python-requests/Scrapy/superagent
        [
-            /^(apache-httpclient|axios|(?:go|java)-http-client|got|guzzlehttp|java|libwww-perl|lua-resty-http|needle|node-(?:fetch|superagent)|okhttp|php-soap|postmanruntime|python-(?:httpx|urllib[23]?|requests)|scrapy)\/([\w\.]+)/i,
-            /(adobeair|aiohttp|jsdom)\/([\w\.]+)/i,
-            /(nutch)-([\w\.-]+)(\(|$)/i,
-            /\((java)\/([\w\.]+)/i
+            /^(apache-httpclient|axios|(?:go|java)-http-client|got|guzzlehttp|java|libwww-perl|lua-resty-http|needle|node-(?:fetch|superagent)|okhttp|php-soap|postmanruntime|python-(?:urllib|requests)|scrapy)\/([\w\.]+)/i,
+            /(jsdom|(?<=\()java)\/([\w\.]+)/i
        ], [NAME, VERSION, [TYPE, LIBRARY]]
    ]
 });

-/////////////
-// VEHICLES
-////////////
-
-const Vehicles = Object.freeze({
-    device : [
-        [/aftlbt962e2/i],                                                   // BMW
-        [[VENDOR, 'BMW']],
-
-        [/dilink.+(byd) auto/i],                                            // BYD
-        [VENDOR],
-
-        [/aftlft962x3/i],                                                   // Jeep
-        [[VENDOR, 'Jeep'], [MODEL, 'Wagooner']],
-        
-        [/(rivian) (r1t)/i],                                                // Rivian
-        [VENDOR, MODEL],
-
-        [/vcc.+netfront/i],                                                 // Volvo
-        [[VENDOR, 'Volvo']]
-    ]
-});
-
 //////////
 // BOTS
 /////////
@@ -433,12 +394,9 @@ const Vehicles = Object.freeze({
 const Bots = Object.freeze({
    browser : [
        ...CLIs.browser,
-        ...Fetchers.browser,
        ...Crawlers.browser,
+        ...Fetchers.browser,
        ...Libraries.browser
-    ],
-    os : [
-        ...Fetchers.os
    ]
 });

@@ -451,6 +409,5 @@ export {
    Fetchers,
    InApps,
    Libraries,
-    MediaPlayers,
-    Vehicles
+    MediaPlayers
 };
--- a/src/helpers/ua-parser-helpers.d.ts
+++ b/src/helpers/ua-parser-helpers.d.ts
@@ -1,15 +1,27 @@
-// Type definitions for Helpers submodule of UAParser.js v2.0.5
+// Type definitions for Helpers submodule of UAParser.js v2.0.0
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>

-import type { IResult } from "../main/ua-parser";
+import { IResult } from "../main/ua-parser";

-export function getDeviceVendor(model: string): string | undefined;
-export function isAppleSilicon(resultOrUA: IResult | string): boolean;
-export function isAIBot(resultOrUA: IResult | string): boolean;
-export function isBot(resultOrUA: IResult | string): boolean;
-export function isChromeFamily(resultOrUA: IResult | string): boolean;
-export function isElectron(): boolean;
-export function isFromEU(): boolean;
-export function isFrozenUA(ua: string): boolean;
-export function isStandalonePWA(): boolean;
+declare function getDeviceVendor(model: string): string | undefined;
+declare function isAppleSilicon(resultOrUA: IResult | string): boolean;
+declare function isAIBot(resultOrUA: IResult | string): boolean;
+declare function isBot(resultOrUA: IResult | string): boolean;
+declare function isChromeFamily(resultOrUA: IResult | string): boolean;
+declare function isElectron(): boolean;
+declare function isFromEU(): boolean;
+declare function isFrozenUA(ua: string): boolean;
+declare function isStandalonePWA(): boolean;
+
+export {
+    getDeviceVendor,
+    isAppleSilicon,
+    isAIBot,
+    isBot,
+    isChromeFamily,
+    isElectron,
+    isFromEU,
+    isFrozenUA,
+    isStandalonePWA
+}
--- a/src/helpers/ua-parser-helpers.js
+++ b/src/helpers/ua-parser-helpers.js
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.6
+/*  Helpers for UAParser.js v2.0.0
    https://github.com/faisalman/ua-parser-js
    Author: Faisal Salman <f@faisalman.com>
    AGPLv3 License */
@@ -8,12 +8,11 @@
 /*jshint esversion: 6 */ 

 const { UAParser } = require('../main/ua-parser');
-const { CPUArch, OSName, EngineName, Extension, BrowserType } = require('../enums/ua-parser-enums');
-const { Bots, Crawlers } = require('../extensions/ua-parser-extensions');
+const { CPU, OS, Engine } = require('../enums/ua-parser-enums');
+const { Bots } = require('../extensions/ua-parser-extensions');
 const { isFromEU } = require('detect-europe-js');
 const { isFrozenUA } = require('ua-is-frozen');
 const { isStandalonePWA } = require('is-standalone-pwa');
-const { Crawler } = Extension.BrowserName;

 const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;

@@ -21,8 +20,8 @@ const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${m

 const isAppleSilicon = (resultOrUA) => {
    const res = toResult(resultOrUA);
-    if (res.os.is(OSName.MACOS)) {
-        if (res.cpu.is(CPUArch.ARM)) {
+    if (res.os.is(OS.MACOS)) {
+        if (res.cpu.is(CPU.ARM)) {
            return true;
        }
        if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
@@ -45,129 +44,82 @@ const isAppleSilicon = (resultOrUA) => {
 const isAIBot = (resultOrUA) => [

    // AI2
-    Crawler.AI2_BOT,
+    'ai2bot',

    // Amazon
-    Crawler.AMAZON_BOT,
+    'amazonbot',

    // Anthropic
-    Crawler.ANTHROPIC_AI,
-    Crawler.ANTHROPIC_CLAUDE_BOT,
-    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
-    Crawler.ANTHROPIC_CLAUDE_WEB,
+    'anthropic-ai',
+    'claude-web',
+    'claudebot',

    // Apple
-    Crawler.APPLE_BOT,
-    Crawler.APPLE_BOT_EXTENDED,
-
-    // Brave
-    Crawler.BRAVE_BOT,
+    'applebot',
+    'applebot-extended',

    // ByteDance
-    Crawler.BYTEDANCE_BYTESPIDER,
-    Crawler.BYTEDANCE_TIKTOKSPIDER,
-
-    // Cohere
-    Crawler.COHERE_TRAINING_DATA_CRAWLER,
+    'bytespider',

    // Common Crawl
-    Crawler.COMMON_CRAWL_CCBOT,
-    
-    // Coveo
-    Crawler.COVEO_BOT,
+    'ccbot',

    // DataForSeo
-    Crawler.DATAFORSEO_BOT,
-
-    // DeepSeek
-    Crawler.DEEPSEEK_BOT,
+    'dataforseobot',

    // Diffbot
-    Crawler.DIFFBOT,
+    'diffbot',

    // Google
-    Crawler.GOOGLE_EXTENDED,
-    Crawler.GOOGLE_OTHER,
-    Crawler.GOOGLE_OTHER_IMAGE,
-    Crawler.GOOGLE_OTHER_VIDEO,
-    Crawler.GOOGLE_CLOUDVERTEXBOT,
+    'googleother',
+    'googleother-image',
+    'googleother-video',
+    'google-extended',

    // Hive AI
-    Crawler.HIVE_IMAGESIFTBOT,
+    'imagesiftbot',

    // Huawei
-    Crawler.HUAWEI_PETALBOT,
-    Crawler.HUAWEI_PANGUBOT,
-
-    // Hugging Face
-    Crawler.HUGGINGFACE_BOT,
-
-    // Kangaroo
-    Crawler.KANGAROO_BOT,
-
-    // Mendable.ai
-    Crawler.FIRECRAWL_AGENT,
+    'petalbot',

    // Meta
-    Crawler.META_FACEBOOKBOT,
-    Crawler.META_EXTERNALAGENT,
+    'facebookbot',
+    'meta-externalagent',

    // OpenAI
-    Crawler.OPENAI_GPTBOT,
-    Crawler.OPENAI_SEARCH_BOT,
+    'gptbot',
+    'oai-searchbot',

    // Perplexity
-    Crawler.PERPLEXITY_BOT,
-
-    // Replicate
-    Crawler.REPLICATE_BOT,
-
-    // Runpod
-    Crawler.RUNPOD_BOT,
-
-    // SB Intuitions
-    Crawler.SB_INTUITIONS_BOT,
-
-    // Semrush
-    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
+    'perplexitybot',

    // Timpi
-    Crawler.TIMPI_BOT,
-
-    // Together AI
-    Crawler.TOGETHER_BOT,
+    'timpibot',

    // Velen.io
-    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
-
-    // Vercel
-    Crawler.VERCEL_V0BOT,
+    'velenpublicwebcrawler',

    // Webz.io
-    Crawler.WEBZIO_OMGILI,
-    Crawler.WEBZIO_OMGILI_BOT,
-    Crawler.WEBZIO_EXTENDED,
-
-    // X
-    Crawler.XAI_BOT,
+    'omgili',
+    'omgilibot',
+    'webzio-extended',

    // You.com
-    Crawler.YOU_BOT,
+    'youbot',

-    // Zhipu AI
-    Crawler.ZHIPU_CHATGLM_SPIDER
-    ]
-    .map((s) => s.toLowerCase())
-    .includes(String(toResult(resultOrUA, Crawlers).browser.name).toLowerCase());
+    // Zyte
+    'scrapy'
+
+    ].includes(String(toResult(resultOrUA, Bots).browser.name).toLowerCase());

 const isBot = (resultOrUA) => [
-    BrowserType.CLI, 
-    BrowserType.CRAWLER, 
-    BrowserType.FETCHER, 
-    BrowserType.LIBRARY
+    'cli', 
+    'crawler', 
+    'fetcher', 
+    'library'
    ].includes(toResult(resultOrUA, Bots).browser.type);

-const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(EngineName.BLINK);
+const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(Engine.BLINK);

 const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
                            / electron\//i.test(navigator?.userAgent));         // browser
--- a/src/helpers/ua-parser-helpers.mjs
+++ b/src/helpers/ua-parser-helpers.mjs
@@ -3,7 +3,7 @@
 // Source: /src/helpers/ua-parser-helpers.js

 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.6
+/*  Helpers for UAParser.js v2.0.0
    https://github.com/faisalman/ua-parser-js
    Author: Faisal Salman <f@faisalman.com>
    AGPLv3 License */
@@ -12,12 +12,11 @@
 /*jshint esversion: 6 */ 

 import { UAParser } from '../main/ua-parser.mjs';
-import { CPUArch, OSName, EngineName, Extension, BrowserType } from '../enums/ua-parser-enums.mjs';
-import { Bots, Crawlers } from '../extensions/ua-parser-extensions.mjs';
+import { CPU, OS, Engine } from '../enums/ua-parser-enums.mjs';
+import { Bots } from '../extensions/ua-parser-extensions.mjs';
 import { isFromEU } from 'detect-europe-js';
 import { isFrozenUA } from 'ua-is-frozen';
 import { isStandalonePWA } from 'is-standalone-pwa';
-const { Crawler } = Extension.BrowserName;

 const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;

@@ -25,8 +24,8 @@ const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${m

 const isAppleSilicon = (resultOrUA) => {
    const res = toResult(resultOrUA);
-    if (res.os.is(OSName.MACOS)) {
-        if (res.cpu.is(CPUArch.ARM)) {
+    if (res.os.is(OS.MACOS)) {
+        if (res.cpu.is(CPU.ARM)) {
            return true;
        }
        if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
@@ -49,129 +48,82 @@ const isAppleSilicon = (resultOrUA) => {
 const isAIBot = (resultOrUA) => [

    // AI2
-    Crawler.AI2_BOT,
+    'ai2bot',

    // Amazon
-    Crawler.AMAZON_BOT,
+    'amazonbot',

    // Anthropic
-    Crawler.ANTHROPIC_AI,
-    Crawler.ANTHROPIC_CLAUDE_BOT,
-    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
-    Crawler.ANTHROPIC_CLAUDE_WEB,
+    'anthropic-ai',
+    'claude-web',
+    'claudebot',

    // Apple
-    Crawler.APPLE_BOT,
-    Crawler.APPLE_BOT_EXTENDED,
-
-    // Brave
-    Crawler.BRAVE_BOT,
+    'applebot',
+    'applebot-extended',

    // ByteDance
-    Crawler.BYTEDANCE_BYTESPIDER,
-    Crawler.BYTEDANCE_TIKTOKSPIDER,
-
-    // Cohere
-    Crawler.COHERE_TRAINING_DATA_CRAWLER,
+    'bytespider',

    // Common Crawl
-    Crawler.COMMON_CRAWL_CCBOT,
-    
-    // Coveo
-    Crawler.COVEO_BOT,
+    'ccbot',

    // DataForSeo
-    Crawler.DATAFORSEO_BOT,
-
-    // DeepSeek
-    Crawler.DEEPSEEK_BOT,
+    'dataforseobot',

    // Diffbot
-    Crawler.DIFFBOT,
+    'diffbot',

    // Google
-    Crawler.GOOGLE_EXTENDED,
-    Crawler.GOOGLE_OTHER,
-    Crawler.GOOGLE_OTHER_IMAGE,
-    Crawler.GOOGLE_OTHER_VIDEO,
-    Crawler.GOOGLE_CLOUDVERTEXBOT,
+    'googleother',
+    'googleother-image',
+    'googleother-video',
+    'google-extended',

    // Hive AI
-    Crawler.HIVE_IMAGESIFTBOT,
+    'imagesiftbot',

    // Huawei
-    Crawler.HUAWEI_PETALBOT,
-    Crawler.HUAWEI_PANGUBOT,
-
-    // Hugging Face
-    Crawler.HUGGINGFACE_BOT,
-
-    // Kangaroo
-    Crawler.KANGAROO_BOT,
-
-    // Mendable.ai
-    Crawler.FIRECRAWL_AGENT,
+    'petalbot',

    // Meta
-    Crawler.META_FACEBOOKBOT,
-    Crawler.META_EXTERNALAGENT,
+    'facebookbot',
+    'meta-externalagent',

    // OpenAI
-    Crawler.OPENAI_GPTBOT,
-    Crawler.OPENAI_SEARCH_BOT,
+    'gptbot',
+    'oai-searchbot',

    // Perplexity
-    Crawler.PERPLEXITY_BOT,
-
-    // Replicate
-    Crawler.REPLICATE_BOT,
-
-    // Runpod
-    Crawler.RUNPOD_BOT,
-
-    // SB Intuitions
-    Crawler.SB_INTUITIONS_BOT,
-
-    // Semrush
-    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
+    'perplexitybot',

    // Timpi
-    Crawler.TIMPI_BOT,
-
-    // Together AI
-    Crawler.TOGETHER_BOT,
+    'timpibot',

    // Velen.io
-    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
-
-    // Vercel
-    Crawler.VERCEL_V0BOT,
+    'velenpublicwebcrawler',

    // Webz.io
-    Crawler.WEBZIO_OMGILI,
-    Crawler.WEBZIO_OMGILI_BOT,
-    Crawler.WEBZIO_EXTENDED,
-
-    // X
-    Crawler.XAI_BOT,
+    'omgili',
+    'omgilibot',
+    'webzio-extended',

    // You.com
-    Crawler.YOU_BOT,
+    'youbot',

-    // Zhipu AI
-    Crawler.ZHIPU_CHATGLM_SPIDER
-    ]
-    .map((s) => s.toLowerCase())
-    .includes(String(toResult(resultOrUA, Crawlers).browser.name).toLowerCase());
+    // Zyte
+    'scrapy'
+
+    ].includes(String(toResult(resultOrUA, Bots).browser.name).toLowerCase());

 const isBot = (resultOrUA) => [
-    BrowserType.CLI, 
-    BrowserType.CRAWLER, 
-    BrowserType.FETCHER, 
-    BrowserType.LIBRARY
+    'cli', 
+    'crawler', 
+    'fetcher', 
+    'library'
    ].includes(toResult(resultOrUA, Bots).browser.type);

-const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(EngineName.BLINK);
+const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(Engine.BLINK);

 const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
                            / electron\//i.test(navigator?.userAgent));         // browser
--- a/src/main/ua-parser.d.ts
+++ b/src/main/ua-parser.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for UAParser.js v2.0.6
+// Type definitions for UAParser.js v2.0.0
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>

-import { BrowserType, CPUArch, DeviceType, EngineName } from "../enums/ua-parser-enums";
+import type { IncomingHttpHeaders } from 'http';
+import type { Headers as FetchAPIHeaders } from 'node-fetch';

 declare namespace UAParser {
    
@@ -17,21 +18,21 @@ declare namespace UAParser {
        name?: string;
        version?: string;
        major?: string;
-        type?: typeof BrowserType[keyof typeof BrowserType];
+        type?: 'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'mediaplayer' | 'library';
    }

    interface ICPU extends IData<ICPU> {
-        architecture?: typeof CPUArch[keyof typeof CPUArch];
+        architecture?: 'ia32' | 'ia64' | 'amd64' | 'arm' | 'arm64' | 'armhf' | 'avr' | 'avr32' | 'irix' | 'irix64' | 'mips' | 'mips64' | '68k' | 'pa-risc' | 'ppc' | 'sparc' | 'sparc64';
    }

    interface IDevice extends IData<IDevice> {
-        type?: typeof DeviceType[keyof typeof DeviceType];
+        type?: 'mobile' | 'tablet' | 'console' | 'smarttv' | 'wearable' | 'xr' | 'embedded';
        vendor?: string;
        model?: string;
    }

    interface IEngine extends IData<IEngine> {
-        name?: typeof EngineName[keyof typeof EngineName];
+        name?: 'Amaya' | 'ArkWeb' | 'Blink' | 'EdgeHTML' | 'Flow' | 'Gecko' | 'Goanna' | 'iCab' | 'KHTML' | 'LibWeb' | 'Links' | 'Lynx' | 'NetFront' | 'NetSurf' | 'Presto' | 'Servo' | 'Tasman' | 'Trident' | 'w3m' | 'WebKit';
        version?: string;
    }

@@ -52,7 +53,7 @@ declare namespace UAParser {
    type RegexMap = ((RegExp | string | (string | RegExp | Function)[])[])[];
    type UAParserProps = 'browser' | 'cpu' | 'device' | 'engine' | 'os';
    type UAParserExt = Partial<Record<UAParserProps, RegexMap>> | Partial<Record<UAParserProps, RegexMap>>[];
-    export type UAParserHeaders = Record<string, string | string[] | undefined> | Headers;
+    type UAParserHeaders = Record<string, string> | IncomingHttpHeaders | FetchAPIHeaders;

    export function UAParser(uastring?: string, extensions?: UAParserExt, headers?: UAParserHeaders): IResult;
    export function UAParser(uastring?: string, headers?: UAParserHeaders): IResult;
--- a/src/main/ua-parser.js
+++ b/src/main/ua-parser.js
--- a/src/main/ua-parser.mjs
+++ b/src/main/ua-parser.mjs
--- a/test/data/ua-ch/headers.js
+++ b/test/data/ua-ch/headers.js
@@ -1,242 +0,0 @@
-const UACHTests = [
-    {
-        desc: 'Avast Secure Browser',
-        headers : {
-            'sec-ch-ua': '"Avast Secure Browser";v="131", "Chromium";v="131", "Not_A Brand";v="24"'
-        },
-        expect: {
-            browser : {
-                name : 'Avast Secure Browser',
-                version : '131',
-                major : '131',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Brave',
-        headers : {
-            'sec-ch-ua': '"Not A(Brand";v="8", "Chromium";v="132", "Brave";v="132"'
-        },
-        expect: {
-            browser : {
-                name : 'Brave',
-                version : '132',
-                major : '132',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Chrome',
-        headers : {
-            'sec-ch-ua': '"Google Chrome";v="111", "Not(A:Brand";v="8", "Chromium";v="111"'
-        },
-        expect: {
-            browser : {
-                name : 'Chrome',
-                version : '111',
-                major : '111',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Chrome Headless',
-        headers : {
-            'sec-ch-ua': '"Chromium";v="124", "HeadlessChrome";v="124", "Not-A.Brand";v="99"'
-        },
-        expect: {
-            browser : {
-                name : 'Chrome Headless',
-                version : '124',
-                major : '124',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Chrome WebView',
-        headers : {
-            'sec-ch-ua': '"Android WebView";v="123", "Not:A-Brand";v="8", "Chromium";v="123"'
-        },
-        expect: {
-            browser : {
-                name : 'Chrome WebView',
-                version : '123',
-                major : '123',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'DuckDuckGo',
-        headers : {
-            'sec-ch-ua': '"DuckDuckGo";v="131", "Chromium";v="131", "Not_A Brand";v="24"'
-        },
-        expect : {
-            browser : {
-                name : 'DuckDuckGo',
-                version : '131',
-                major : '131',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Edge',
-        headers : {
-            'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Microsoft Edge";v="120"'
-        },
-        expect: {
-            browser : {
-                name : 'Edge',
-                version : '120',
-                major : '120',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Edge WebView2',
-        headers : {
-            'sec-ch-ua': '" Not;A Brand";v="99", "Microsoft Edge";v="103", "Chromium";v="103", "Microsoft Edge WebView2";v="104"'
-        },
-        expect: {
-            browser : {
-                name : 'Edge WebView2',
-                version : '104',
-                major : '104',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Huawei Browser',
-        headers : {
-            'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "HuaweiBrowser";v="114"'
-        },
-        expect: {
-            browser : {
-                name : 'Huawei Browser',
-                version : '114',
-                major : '114',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'MIUI Browser',
-        headers : {
-            'sec-ch-ua': '"Miui Browser";v="123", "Not:A-Brand";v="8", "Chromium";v="123"'
-        },
-        expect: {
-            browser : {
-                name : 'MIUI Browser',
-                version : '123',
-                major : '123',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Oculus Browser',
-        headers : {
-            'sec-ch-ua': '"Chromium";v="130", "Oculus Browser";v="36", "Not?A_Brand";v="99"'
-        },
-        expect: {
-            browser : {
-                name : 'Oculus Browser',
-                version : '36',
-                major : '36',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Opera',
-        headers : {
-            'sec-ch-ua': '"Opera";v="116", "Chromium";v="131", "Not_A Brand";v="24"'
-        },
-        expect: {
-            browser : {
-                name : 'Opera',
-                version : '116',
-                major : '116',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Opera GX',
-        headers : {
-            'sec-ch-ua': '"Chromium";v="128", "Not;A=Brand";v="24", "Opera GX";v="114"'
-        },
-        expect: {
-            browser : {
-                name : 'Opera GX',
-                version : '114',
-                major : '114',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Opera Mobi',
-        headers : {
-            'sec-ch-ua': '"OperaMobile";v="86", ";Not A Brand";v="99", "Opera";v="115", "Chromium";v="130"'
-        },
-        expect: {
-            browser : {
-                name : 'Opera Mobi',
-                version : '86',
-                major : '86',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Opera Mobi',
-        headers : {
-            'sec-ch-ua': '"Chromium";v="132", "OperaMobile";v="87", "Opera";v="117", " Not A;Brand";v="99"'
-        },
-        expect: {
-            browser : {
-                name : 'Opera Mobi',
-                version : '87',
-                major : '87',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Samsung Internet',
-        headers : {
-            'sec-ch-ua': '"Chromium";v="125", "Not.A/Brand";v="24", "Samsung Internet";v="27.0"'
-        },
-        expect: {
-            browser : {
-                name : 'Samsung Internet',
-                version : '27.0',
-                major : '27',
-                type : undefined
-            }
-        }
-    },
-    {
-        desc: 'Yandex',
-        headers : {
-            'sec-ch-ua': '"Chromium";v="130", "YaBrowser";v="24.12", "Not?A_Brand";v="99", "Yowser";v="2.5"'
-        },
-        expect: {
-            browser : {
-                name : 'Yandex',
-                version : '24.12',
-                major : '24',
-                type : undefined
-            }
-        }
-    }
-];
-
-module.exports = UACHTests;
--- a/test/data/ua/browser/browser-all.json
+++ b/test/data/ua/browser/browser-all.json
@@ -271,26 +271,6 @@
            "major"   : "11"
        }
    },
-    {
-        "desc"    : "Bing",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.5 Mobile/15E148 Safari/605.1.15 BingSapphire/31.8.430522001",
-        "expect"  :
-        {
-            "name"    : "Bing",
-            "version" : "31.8.430522001",
-            "major"   : "31"
-        }
-    },
-    {
-        "desc"    : "Bing",
-        "ua"      : "Mozilla/5.0 (Linux; Android 9; MIX 2 Build/PKQ1.190118.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4893.0 Mobile Safari/537.36 BingWeb/6.9.12",
-        "expect"  :
-        {
-            "name"    : "Bing",
-            "version" : "6.9.12",
-            "major"   : "6"
-        }
-    },
    {
        "desc"    : "Blazer",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/hspr-H102; Blazer/4.0) 16;320x320",
@@ -531,16 +511,6 @@
            "major"   : "2"
        }
    },
-    {
-        "desc"    : "Dooble",
-        "ua"      : "Mozilla/5.0 (X11; Haiku BePC) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.15.17 Chrome/87.0.4280.144 Safari/537.36 Dooble/2023.12.25 Dooble/2023.12.25",
-        "expect"  :
-        {
-            "name"    : "Dooble",
-            "version" : "2023.12.25",
-            "major"   : "2023"
-        }
-    },
    {
        "desc"    : "Doris",
        "ua"      : "Doris/1.15 [en] (Symbian)",
@@ -571,26 +541,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "Ecosia on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; SM-G975U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36 (Ecosia android@85.0.4183.127)",
-        "expect"  :
-        {
-            "name"    : "Ecosia",
-            "version" : "85.0.4183.127",
-            "major"   : "85"
-        }
-    },
-    {
-        "desc"    : "Ecosia on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60 (Ecosia ios@3.0.1.533)",
-        "expect"  :
-        {
-            "name"    : "Ecosia",
-            "version" : "3.0.1.533",
-            "major"   : "3"
-        }
-    },
    {
        "desc"    : "Epiphany",
        "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
@@ -631,16 +581,6 @@
            "major"   : "55"
        }
    },
-    {
-        "desc"    : "PaleMoon",
-        "ua"      : "(Windows NT 6.2; WOW64) KHTML/4.11 Gecko/20130308 Firefox/23.0 (PaleMoon/20.3)",
-        "expect"  :
-        {
-            "name"    : "PaleMoon",
-            "version" : "20.3",
-            "major"   : "20"
-        }
-    },
    {
        "desc"    : "PaleMoon",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:52.9) Gecko/20100101 Goanna/3.4 Firefox/52.9 PaleMoon/27.6.1",
@@ -1066,16 +1006,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "Otter",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/602.1 (KHTML, like Gecko) Otter/1.0.81",
-        "expect"  :
-        {
-            "name"    : "Otter",
-            "version" : "1.0.81",
-            "major"   : "1"
-        }
-    },
    {
        "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",
@@ -1137,33 +1067,13 @@
        }
    },
    {
-        "desc"    : "Surf Browser",
-        "ua"      : "Mozilla/5.0 (Android 6.0; HUAWEI ALE-L21) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 SurfBrowser/3.0",
+        "desc"    : "LibreWolf",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 LibreWolf/91.0",
        "expect"  :
        {
-            "name"    : "Surf",
-            "version" : "3.0",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "LG Browser",
-        "ua"      : "Mozilla/5.0 (Unknown; Linux armv7l) AppleWebKit/537.1+ (KHTML, like Gecko) Safari/537.1+ LG Browser/6.00.00(+mouse+3D+SCREEN+TUNER; LGE; 47LA621V-ZD; 04.28.17; 0x00000001;); LG NetCast.TV-2013 /04.28.17 (LG, 47LA621V-ZD, wired)",
-        "expect"  :
-        {
-            "name"    : "LG Browser",
-            "version" : "6.00.00",
-            "major"   : "6"
-        }
-    },
-    {
-        "desc"    : "Ladybird",
-        "ua"      : "Mozilla/5.0 (Linux; x86_64) Ladybird/1.0",
-        "expect"  :
-        {
-            "name"    : "Ladybird",
-            "version" : "1.0",
-            "major"   : "1"
+            "name"    : "LibreWolf",
+            "version" : "91.0",
+            "major"   : "91"
        }
    },
    {
@@ -1368,16 +1278,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "Mozilla",
-        "ua"      : "Mozilla/2.02 [fr] (WinNT; I)",
-        "expect"  :
-        {
-            "name"    : "Mozilla",
-            "version" : "2.02",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "MSIE",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0b1; Mac_PowerPC)",
@@ -1718,46 +1618,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "qutebrowser",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) qutebrowser/2.4.0 QtWebEngine/5.15.6 Chrome/95.0.4628.2 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "qutebrowser",
-            "version" : "2.4.0",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Qwant",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) QwantMobile/6.7.6 Mobile/15E148 Safari/605.1.15",
-        "expect"  :
-        {
-            "name"    : "Qwant",
-            "version" : "6.7.6",
-            "major"   : "6"
-        }
-    },
-    {
-        "desc"    : "Qwant",
-        "ua"      : "QwantMobile/2.0 (Android 8.0.0; Mobile; rv:59.0) Gecko/59.0 Firefox/59.0 QwantBrowser/59.0",
-        "expect"  :
-        {
-            "name"    : "Qwant",
-            "version" : "59.0",
-            "major"   : "59"
-        }
-    },
-    {
-        "desc"    : "Qwant",
-        "ua"      : "QwantMobile/2.0 (iPad; CPU OS 15_8_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) QwantiOS/2.7.0b1 Mobile/15E148 Safari/605.1.15",
-        "expect"  :
-        {
-            "name"    : "Qwant",
-            "version" : "2.0",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "Rekonq 2",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.2.1 Safari/537.21",
@@ -2299,26 +2159,6 @@
            "major"   : "74"
        }
    },
-    {
-        "desc"    : "Microsoft Edge WebView",
-        "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"    : "Edge WebView",
-            "version" : "18.17763",
-            "major"   : "18"
-        }
-    },
-    {
-        "desc"    : "Microsoft Edge WebView2",
-        "ua"      : "Mozilla/5.0 (Linux; Android 11; SM-G991B Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.120 Mobile Safari/537.36 EdgW/1.0",
-        "expect"  :
-        {
-            "name"    : "Edge WebView2",
-            "version" : "91.0.4472.120",
-            "major"   : "91"
-        }
-    },
    {
        "desc"    : "Iridium",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Iridium/43.8 Safari/537.36 Chrome/43.0.2357.132",
@@ -2653,26 +2493,6 @@
            "type"    : "inapp"
        }
    },
-    {
-      "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",
@@ -2765,27 +2585,5 @@
            "major"   : "10",
            "type"    : "inapp"
        }
-    },
-    {
-        "desc"    : "Zalo on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Zalo/20.05.01 Mobile/15E148",
-        "expect"  :
-        {
-            "name"    : "Zalo",
-            "version" : "20.05.01",
-            "major"   : "20",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Zalo on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; Vsmart Live Build/QKQ1.190918.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 Mobile Safari/537.36 Zalo/20.04.02.r1",
-        "expect"  :
-        {
-            "name"    : "Zalo",
-            "version" : "20.04.02.r1",
-            "major"   : "20",
-            "type"    : "inapp"
-        }
    }
 ]
--- a/test/data/ua/cpu/cpu-all.json
+++ b/test/data/ua/cpu/cpu-all.json
@@ -87,22 +87,6 @@
            "architecture"  : "amd64"
        }
    },
-    {
-        "desc"    : "Alpha",
-        "ua"      : "Mozilla/3.01 (WinNT; I) [AXP]",
-        "expect"  :
-        {
-            "architecture"  : "alpha"
-        }
-    },
-    {
-        "desc"    : "Alpha",
-        "ua"      : "Mozilla/5.0 (X11; OpenBSD alpha; rv:78.0) Gecko/20100101 Firefox/78.0",
-        "expect"  :
-        {
-            "architecture"  : "alpha"
-        }
-    },
    {
        "desc"    : "ARM",
        "ua"      : "Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 635) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537",
@@ -191,14 +175,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",
@@ -289,26 +265,10 @@
    },
    {
        "desc"    : "68k",
-        "ua"      : "Mozilla/1.1 (Macintosh; U; 68K)",
+        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
        "expect"  : 
        {
            "architecture"  : "68k"
        }
-    },
-    {
-        "desc"    : "MC680x0",
-        "ua"      : "AmigaVoyager/3.2 (AmigaOS/MC680x0)",
-        "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/data/ua/device/_others.json
+++ b/test/data/ua/device/_others.json
@@ -1,18 +1,10 @@
 [
-    {
-        "desc": "Generic Android Device",
-        "ua": "Dalvik/2.1.0 (Linux; U; Android 9; X96mini_RP Build/X96mini_RP)",
-        "expect": {
-            "vendor": "Generic",
-            "model": "X96mini_RP"
-        }
-    },
    {
        "desc": "Generic Android Device",
        "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; i980 Build/MRA58K)",
        "expect": {
            "vendor": "Generic",
-            "model": "i980"
+            "model": "Android 6.0.1"
        }
    },
    {
@@ -24,14 +16,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Unknown VR Device",
-        "ua": "Mozilla/5.0 (Linux; Android 5.0.2; Unknown Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile VR Safari/537.36",
-        "expect": {
-            "model": "Unknown",
-            "type": "xr"
-        }
-    },
    {
        "desc": "Desktop (IE11 with Tablet string)",
        "ua": "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; .NET CLR 3.0.30729; Tablet PC 2.0; GWX:MANAGED; rv:11.0) like Gecko",
@@ -50,33 +34,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "ChangHong Android TV",
-        "ua": "Mozilla/5.0 (Linux; U; Android 5.1.1; zh-cn; ChangHong Android TV Build/LMY49J) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/10.8 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "undefined",
-            "model": "ChangHong",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "MStar Android TV",
-        "ua": "Mozilla/5.0 (Linux; Android 4.3.1; MStar Android TV Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.95 Safari/537.36",
-        "expect": {
-            "vendor": "undefined",
-            "model": "MStar",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "ONIDA Android TV",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0; ONIDA Android TV Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/48.0.2542.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "undefined",
-            "model": "ONIDA",
-            "type": "smarttv"
-        }
-    },
    {
        "desc": "JVC LT-43V55LFA Smart TV",
        "ua": "Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36 OPR/40.0.2207.0 OMI/4.9.0.237.DOM3-OPT.245 Model/Vestel-MB211 VSTVB MB200 HbbTV/1.2.1 (; JVC; MB211; 3.19.4.2; _TV_NT72563_2017 SmartTvA/3.0.0",
@@ -122,6 +79,51 @@
            "type": "undefined"
        }
    },
+    {
+        "desc": "OnePlus 7T Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 10; HD1913) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.5563.57 Mobile Safari/537.36 EdgA/110.0.1587.66",
+        "expect": {
+            "vendor": "undefined",
+            "model": "HD1913",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Philips SmartTV",
+        "ua": "Opera/9.80 HbbTV/1.1.1 (; Philips; ; ; ; ) NETTV/4.0.2; en) Version/11.60",
+        "expect": {
+            "vendor": "Philips",
+            "model": "",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "Philips 32PFL6606K/02 SmartTV (2011)",
+        "ua": "Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.6.33 Version/10.70",
+        "expect": {
+            "vendor": "Philips",
+            "model": "",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "Philips 32PFL6606K/02 SmartTV (2013)",
+        "ua": "Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.6.33 Version/10.70",
+        "expect": {
+            "vendor": "Philips",
+            "model": "",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "Philips 32PHS5301/12 SmartTV (2016)",
+        "ua": "Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 Safari/537.36 OPR/29.0.1803.0 OMI/4.5.23.37.MOT2.13 HbbTV/1.2.1 (;Philips;32PHS5301/12;;_TV_MT5800;) Firmware/TPM161E_012.002.045.001 en",
+        "expect": {
+            "vendor": "Philips",
+            "model": "32PHS5301/12",
+            "type": "smarttv"
+        }
+    },
    {
        "desc": "Samsung SmartTV",
        "ua": "Mozilla/5.0 (SMART-TV; X11; Linux armv7l) AppleWebkit/537.42 (KHTML, like Gecko) Safari/537.42",
@@ -236,69 +238,6 @@
            "type": "smarttv"
        }
    },
-    {
-        "desc": "Unknown TV",
-        "ua": "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.127 Large Screen Safari/533.4 GoogleTV/ 162671",
-        "expect": {
-            "vendor": "undefined",
-            "model": "undefined",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Unknown TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.41 (KHTML, like Gecko) Large Screen WebAppManager Safari/537.41",
-        "expect": {
-            "vendor": "undefined",
-            "model": "undefined",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Unknown VR Device using Firefox Reality",
-        "ua": "Mozilla/5.0 (Android 10; Mobile VR; rv:123.0) Gecko/123.0 Firefox/123.0",
-        "expect": {
-            "vendor": "undefined",
-            "model": "undefined",
-            "type": "xr"
-        }
-    },
-    {
-        "desc": "Unknown VR Device using Wolvic",
-        "ua": "Mozilla/5.0 (Android 14; Mobile VR; rv:128.0) Gecko/128.0 Firefox/128.0 Wolvic/1.8",
-        "expect": {
-            "vendor": "undefined",
-            "model": "undefined",
-            "type": "xr"
-        }
-    },
-    {
-        "desc": "Smart TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 HbbTV/1.6.1 ( DRM; LGE/ATMACA/GRAETZ; GR32S1470; WEBOS22 04.41.53; W22_K8AP; DTV_C22L;) LaTivu_1.0.1_2022",
-        "expect": {
-            "vendor": "GRAETZ",
-            "model": "GR32S1470",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Smart TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36 HbbTV/1.5.1 (+DRM; LGE/DUALSHINE/SKYTECH; ST-5090; WEBOS5.0 04.50.63; W50_K6LP; DTV_C20P;)",
-        "expect": {
-            "vendor": "SKYTECH",
-            "model": "ST-5090",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Smart TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 HbbTV/1.6.1 (+DRM; LGE/SILICONPLAYER/Hyundai; 50HYN3205; WEBOS22 04.42.26; W22_K8LP; DTV_C22P;)",
-        "expect": {
-            "vendor": "Hyundai",
-            "model": "50HYN3205",
-            "type": "smarttv"
-        }
-    },
    {
        "desc": "PDA with Windows CE",
        "ua": "Mozilla/4.0 (PDA; Windows CE/1.0.1) NetFront/3.0",
@@ -307,14 +246,5 @@
            "model": "undefined",
            "type": "mobile"
        }
-    },
-    {
-        "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": {
-            "vendor": "undefined",
-            "model": "undefined",
-            "type": "embedded"
-        }
    }
 ]
--- a/test/data/ua/device/alcatel.json
+++ b/test/data/ua/device/alcatel.json
@@ -1,15 +1,6 @@
 [
    {
-        "desc": "Alcatel 4056W",
-        "ua": "Mozilla/5.0 (Mobile; ALCATEL 4056W; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.0",
-        "expect": {
-            "vendor": "ALCATEL",
-            "model": "4056W",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Alcatel A564C",
+        "desc": "Alcatel",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ALCATEL A564C Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Mobile Safari/537.36",
        "expect": {
            "vendor": "ALCATEL",
--- a/test/data/ua/device/apple.json
+++ b/test/data/ua/device/apple.json
@@ -44,105 +44,6 @@
            "type": "tablet"
        }
    },
-    {
-        "desc": "iPad using Chrome",
-        "ua": "Mozilla/5.0 (iPad13,10; CPU OS 16_6_2 like Mac OS X) AppleWebKit/602.3 (KHTML, like Gecko) CriOS/97.0.0.5927.72 Mobile/11S296 Safari/602.3",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using DuckDuckGo",
-        "ua": "Mozilla/5.0 (iPad; iPad13,6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) DuckDuckGo/130.0.0.0 Mobile/15E148 Safari/604.1",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using Discord",
-        "ua": "Discord/52.0 (iPad; iOS 14.4; Scale/2.00)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using Firefox",
-        "ua": "Mozilla/5.0 (iPad; iPad14,2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Firefox/120.0 Mobile/15E148 Safari/604.1",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using iTunes",
-        "ua": "itunesstored/1.0 iOS/15.6.1 model/iPad13,8 hwp/t8103 build/19G82 (5; dt:238)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using MS OneNote",
-        "ua": "Microsoft Office OneNote/16.81/240108 (iOS/16.5.1; Tablet; AppStore; Apple/iPad8,3)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using MS Word",
-        "ua": "Microsoft Office Word/2.44.1211 (iOS/13.7; Tablet; es-MX; AppStore; Apple/iPad11,3)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using Quora",
-        "ua": "Quora 8.4.30 rv:3230 env:prod (iPad11,3; iPadOS 17.7; en_GB) AppleWebKit",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using TuneIn Radio",
-        "ua": "TuneIn Radio/27.1.0; iPad6,3; iPadOS/16.6",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using TuneIn Radio Pro",
-        "ua": "TuneIn Radio Pro/21.4.1; iPad8,9; iOS/15.0",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "iPad using YouTube",
-        "ua": "com.google.ios.youtube/20.31.6 (iPad13,5; U; CPU iPadOS 18_6 like Mac OS X; en_US)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPad",
-            "type": "tablet"
-        }
-    },
    {
        "desc": "iPod",
        "ua": "Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53",
@@ -161,15 +62,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "iPhone using Spotify",
-        "ua": "Spotify/8.7.70 iOS/16.0 (iPhone15,3)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "iPhone15,3",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "iPhone SE",
        "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
@@ -224,15 +116,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Apple HomePod",
-        "ua": "AppleCoreMedia/1.0.0.15D61 (HomePod; U; CPU OS 11_2_5 like Mac OS X; en_us)",
-        "expect": {
-            "vendor": "Apple",
-            "model": "HomePod",
-            "type": "embedded"
-        }
-    },
    {
        "desc": "Issue #519",
        "ua": "ios/iPhone/14.2/SOME_CUSTOM_APP_VERSION",
--- a/test/data/ua/device/archos.json
+++ b/test/data/ua/device/archos.json
@@ -1,227 +0,0 @@
-[
-    {
-        "desc": "Archos 5",
-        "ua": "Mozilla/5.0 (Linux; U; Android 1.6; fr-fr; Archos5 Build/Donut) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1",
-        "expect": {
-            "vendor": "Archos",
-            "model": "5",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 40b Titanium Surround",
-        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Archos 40b Titanium Surround Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "40b Titanium Surround",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 40c Titanium v2",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ARCHOS 40C TIv2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "40C TIv2",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 45 Neon",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Archos 45 Neon Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "45 Neon",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 45 Neon",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; AC45NE Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 YaBrowser/15.6.2311.6088.00 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "AC45NE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 45B Helium",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; AC45BHE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "AC45BHE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 45B Titanium",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Archos 45B Titanium) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "45B Titanium",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 50 Cesium",
-        "ua": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; ARCHOS; AC50CE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
-        "expect": {
-            "vendor": "Archos",
-            "model": "AC50CE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 50B Helium 4G",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; AC50BHE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "AC50BHE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 55 diamond Selfie",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; Archos 55 diamond Selfie Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "55 diamond Selfie",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Archos 80 G9",
-        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; zh-tw; ARCHOS 80G9 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
-        "expect": {
-            "vendor": "Archos",
-            "model": "80G9",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 80 Xenon",
-        "ua": "Mozilla/5.0 (Linux; Android 4.1.2; Archos 80 Xenon Build/JZO54K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36 OPR/50.6.2426.201126",
-        "expect": {
-            "vendor": "Archos",
-            "model": "80 Xenon",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 97c Platinum",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0; Archos 97c Platinum Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "97c Platinum",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 101 Access 3G V2",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; Archos Access 101 3G V2 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.130 Safari/537.36[FBAN/EMA;FBLC/pt_PT;FBAV/360.0.0.7.53;]",
-        "expect": {
-            "vendor": "Archos",
-            "model": "Access 101 3G V2",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 101 Oxygen 4G",
-        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Archos 101 Oxygen 4G Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.71 Safari/537.36 [FB_IAB/FB4A;FBAV/374.0.0.20.109;]",
-        "expect": {
-            "vendor": "Archos",
-            "model": "101 Oxygen 4G",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 101 Platinum 3G V2",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; AC101PL3GV2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "AC101PL3GV2",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 101B Helium 4G",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0; AC101BHE Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "AC101BHE",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos 101s Oxygen Ardoiz",
-        "ua": "Mozilla/5.0 (Linux; Android 9; Archos Oxygen 101S ARDOIZ Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.102 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "Oxygen 101S ARDOIZ",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos GAMEPAD2",
-        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; ARCHOS GAMEPAD2 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.94 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "GAMEPAD2",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos Hello 7",
-        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Archos Hello 7 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.53 Safari/537.36 GoogleApp/13.24.9.26.arm64",
-        "expect": {
-            "vendor": "Archos",
-            "model": "Hello 7",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos Sense 101 X",
-        "ua": "Mozilla/5.0 (Linux; arm; Android 7.0; Archos Sense 101 X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 YaBrowser/20.2.0.215.01 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "Sense 101 X",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos T101 FHD WiFi",
-        "ua": "Mozilla/5.0 (Linux; Android 13; ARCHOS T101 FHD WiFi Build/T00624; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.159 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "T101 FHD WiFi",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos Tikeasy 10d",
-        "ua": "Mozilla/5.0 (Linux; Android 13; Tikeasy 10d Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/131.0.6778.260 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "Tikeasy 10d",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos T96 WIFI",
-        "ua": "Mozilla/5.0 (Linux; Android 11; ARCHOS T96 WIFI_EEA Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.78 Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "T96 WIFI_EEA",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Archos X67 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 10; X67 5G Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.58 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Archos",
-            "model": "X67 5G",
-            "type": "tablet"
-        }
-    }
-]
--- a/test/data/ua/device/blackberry.json
+++ b/test/data/ua/device/blackberry.json
@@ -1,25 +1,7 @@
 [
-    {
-        "desc": "BlackBerry 9650",
-        "ua": "Mozilla/5.0 (BlackBerry; U; BlackBerry 9650; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.524 Mobile Safari/534.8+",
-        "expect": {
-            "vendor": "BlackBerry",
-            "model": "9650",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BlackBerry 9780",
-        "ua": "Mozilla/5.0 (BlackBerry; U; BlackBerry 9780; en) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.546 Mobile Safari/534.8+",
-        "expect": {
-            "vendor": "BlackBerry",
-            "model": "9780",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "BlackBerry Priv",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; STV100-1 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/46.0.2490.76 Mobile Safari/537.36",
+        "ua": "User-Agent: Mozilla/5.0 (Linux; Android 5.1.1; STV100-1 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/46.0.2490.76 Mobile Safari/537.36",
        "expect": {
            "vendor": "BlackBerry",
            "model": "STV100-1",
@@ -46,7 +28,7 @@
    },
    {
        "desc": "BlackBerry Key2 LE",
-        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; BBE100-1 Build/OPM1.171019.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497 Mobile Safari/537.36",
+        "ua": "User-Agent: Mozilla/5.0 (Linux; Android 8.1.0; BBE100-1 Build/OPM1.171019.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497 Mobile Safari/537.36",
        "expect": {
            "vendor": "BlackBerry",
            "model": "BBE100-1",
--- a/test/data/ua/device/blu.json
+++ b/test/data/ua/device/blu.json
@@ -1,101 +0,0 @@
-[
-    {
-        "desc": "BLU Grand X LTE",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; BLU Grand X LTE Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "BLU",
-            "model": "Grand X LTE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU Neo Energy Mini",
-        "ua": "Mozilla/5.0 (Linux; Android 10; BLU_NEO_ENERGY_MINI Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/101.0.4951.54 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "BLU",
-            "model": "NEO_ENERGY_MINI",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU NEO X PLUS",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; BLU NEO X PLUS Build/N090U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "BLU",
-            "model": "NEO X PLUS",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU STUDIO X MINI",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; BLU STUDIO X MINI Build/S0150UU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "BLU",
-            "model": "STUDIO X MINI",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU Tank Mega",
-        "ua": "Mozilla/5.0 (Mobile; BLU_TankMega_3G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1",
-        "expect": {
-            "vendor": "BLU",
-            "model": "TankMega_3G",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU TOUCHBOOK G7",
-        "ua": "Mozilla/5.0 (Linux; Android 5.0; BLU TOUCHBOOK G7 Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.107 Safari/537.36 OPR/29.0.1809.91837",
-        "expect": {
-            "vendor": "BLU",
-            "model": "TOUCHBOOK G7",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU Vivo 5 Mini",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; Vivo 5 Mini Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "BLU",
-            "model": "Vivo 5 Mini",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU VIVO AIR LTE",
-        "ua": "Mozilla/5.0 (Linux; Android 5.0.2; BLU VIVO AIR LTE Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.107 Mobile Safari/537.36 OPR/29.0.1809.91837",
-        "expect": {
-            "vendor": "BLU",
-            "model": "VIVO AIR LTE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU VIVO GO",
-        "ua": "Mozilla/5.0 (Linux; U; Android 9; VIVO GO Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/72.0.3626.121 Mobile Safari/537.36 OPR/50.0.2254.149182",
-        "expect": {
-            "vendor": "BLU",
-            "model": "VIVO GO",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU Vivo One Plus 2019",
-        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Vivo One Plus 2019 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/277.0.0.41.126;]",
-        "expect": {
-            "vendor": "BLU",
-            "model": "Vivo One Plus 2019",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "BLU VIVO SELFIE",
-        "ua": "Mozilla/5.0 (Linux; U; Android 5.0; es-LA; BLU VIVO SELFIE Build/LRX21M) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/11.3.5.972 U3/0.8.0 Mobile Safari/534.30",
-        "expect": {
-            "vendor": "BLU",
-            "model": "VIVO SELFIE",
-            "type": "mobile"
-        }
-    }
-]
--- a/test/data/ua/device/facebook.json
+++ b/test/data/ua/device/facebook.json
@@ -34,14 +34,5 @@
            "model": "Quest Pro",
            "type": "xr"
        }
-    },
-    {
-        "desc": "Portal TV",
-        "ua": "Mozilla/5.0 (Linux; Android 9; PortalTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.120 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Facebook",
-            "model": "PortalTV",
-            "type": "smarttv"
-        }
    }
 ]
--- a/test/data/ua/device/google.json
+++ b/test/data/ua/device/google.json
@@ -71,6 +71,51 @@
            "type": "mobile"
        }
    },
+    {
+        "desc": "Google Pixel Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel Tablet Build/AP2A.240905.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.107 Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel Tablet",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Google Pixel Watch",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 13; Google Pixel Watch Build/TWD4.231005.002)",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel Watch",
+            "type": "wearable"
+        }
+    },
+    {
+        "desc": "Google Pixel Watch 2",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 13; Google Pixel Watch 2 Build/TWD9.240605.001.A1)",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel Watch 2",
+            "type": "wearable"
+        }
+    },
+    {
+        "desc": "Google Pixel XL",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1; Pixel XL Build/NDE63X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel XL",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Google Pixel XL",
+        "ua": "Mozilla/5.0 (Linux; Android 9; Pixel XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel XL",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "Google Pixel 2",
        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Pixel 2 Build/OPM1.171019.013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Safari/537.36",
@@ -80,24 +125,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Google Pixel 2",
-        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 2) AppleWebKit/537.36 (KHTML, like Gecko) Edg/57.0.986.6",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 2",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 2",
-        "ua": "Mozilla/5.0 (Linux; Android 7.1.2; G011A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 Safari/537.36 OPR/68.3.3557.64528",
-        "expect": {
-            "vendor": "Google",
-            "model": "G011A",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Google Pixel 2 XL",
        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Pixel 2 XL Build/OPM1.171019.013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Safari/537.36",
@@ -125,24 +152,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Google Pixel 3",
-        "ua": "Mozilla/5.0 (Linux; Android 11; G013A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G013A",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 3a",
-        "ua": "Mozilla/5.0 (Linux; Android 14; G020E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G020E",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Google Pixel 3 XL",
        "ua": "Mozilla/5.0 (Linux; Android 9; Pixel 3 XL Build/PD1A.180720.030) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36",
@@ -188,15 +197,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Google Pixel 4",
-        "ua": "Mozilla/5.0 (Linux; Android 12; G020M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G020M",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Google Pixel 4a",
        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 4a) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.83 Mobile Safari/537.36",
@@ -206,42 +206,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Google Pixel 4a",
-        "ua": "Mozilla/5.0 (Linux; Android 13; G025J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G025J",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 4a",
-        "ua": "Mozilla/5.0 (Linux; Android 12; GA02099) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GA02099",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 4a",
-        "ua": "Mozilla/5.0 (Linux; Android 13; G025N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G025N",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 4a (5G)",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel 4a (5G) Build/UP1A.231105.001.B2; ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36 EdgA/124.0.2478.64",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 4a (5G)",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Google Pixel 4 XL",
        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 4 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Mobile Safari/537.36",
@@ -251,33 +215,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Google Pixel 5",
-        "ua": "Mozilla/5.0 (Linux; Android 13; G5NZ6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G5NZ6",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 5",
-        "ua": "Mozilla/5.0 (Linux; Android 12; GD1YQ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GD1YQ",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 5",
-        "ua": "Mozilla/5.0 (Linux; Android 12; GTT9Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GTT9Q",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Google Pixel 5",
        "ua": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.120 Mobile Safari/537.36",
@@ -287,51 +224,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Google Pixel 5a 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 14; G4S1M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G4S1M",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 5a 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 12; G1F8F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G1F8F",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 6",
-        "ua": "Mozilla/5.0 (Linux; Android 11; Pixel 6 Build/QP1A.190711.020) AppleWebKit/545.31 (KHTML, like Gecko) Firefox/109.0.2318.118 Mobile Safari/545.22",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 6",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 6 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 15; Pixel 6 Pro Build/AP4A.241205.013; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.163 Mobile Safari/537.36 Line/15.0.0/IAB",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 6 Pro",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 6 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 13; G8VOU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G8VOU",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Google Pixel 7",
        "ua": "Mozilla/5.0 (Linux; Android 13; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
@@ -340,275 +232,5 @@
            "model": "Pixel 7",
            "type": "mobile"
        }
-    },
-    {
-        "desc": "Google Pixel 7 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 15; Pixel 7 Pro Build/AP4A.250205.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/133.0.6943.121 Mobile Safari/537.36 musical_ly_2023808030 BytedanceWebview/d8a21c6",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 7 Pro",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 7 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 14; GP4BC) AppleWebKit/537.46 (KHTML, like Gecko) Chrome/118.0.5993.80 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GP4BC",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 7 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 14; GE2AE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.5993.48 Mobile Safari/537.46",
-        "expect": {
-            "vendor": "Google",
-            "model": "GE2AE",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 7a",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel 7a Build/AP2A.240905.003; ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36 EdgA/124.0.2478.64",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 7a",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 8",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel 8 Build/UPB2.230407.014) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.2.7822.95 Mobile Safari/537.36 Vivaldi/5.2.9076.131",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 8",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 8",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel 8 Pro Build/UPB1.230309.017; Rooted) AppleWebKit/537.36 (KHTML, like Gecko) Puffin/10.9.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 8 Pro",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 8a",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Google Pixel 8a) Chrome/121.0.6167 Mobile",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 8a",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 8a",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GKV4X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GKV4X",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 8a",
-        "ua": "Mozilla/5.0 (Linux; Android 15; G8HHN) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G8HHN",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 8a",
-        "ua": "Mozilla/5.0 (Linux; Android 15; G576D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G576D",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9",
-        "ua": "Mozilla/5.0 (Linux; U; Android 14; Pixel 9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 9",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9",
-        "ua": "Mozilla/5.0 (Linux; Android 15; G2YBB) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G2YBB",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GUR25) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GUR25",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GWVK6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GWVK6",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9",
-        "ua": "Mozilla/5.0 (Linux; Android 15; G1B60) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "G1B60",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel 9 Pro Build/AD1A.240530.047; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/134.0.6998.170 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/506.1.0.74.27;IABMV/1;]",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 9 Pro",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GR83Y) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GR83Y",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GEC77) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GEC77",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro Fold",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel 9 Pro Fold) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 9 Pro Fold",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro Fold",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GC15S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GC15S",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro Fold",
-        "ua": "Mozilla/5.0 (Linux; Android 15; GGH2X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "GGH2X",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel 9 Pro XL",
-        "ua": "Mozilla/5.0 (Linux; U; Android 15; Pixel 9 Pro XL Build/AP4A.250105.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/133.0.6943.89 Mobile Safari/537.36 OPR/88.0.2254.75874",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel 9 Pro XL",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel Fold",
-        "ua": "Mozilla/5.0 (Linux; Android 15; Pixel Fold Build/AP4A.250105.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.97 Safari/537.36 [FB_IAB/FB4A;FBAV/497.0.0.40.36;IABMV/1;]",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel Fold",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel Tablet",
-        "ua": "Mozilla/5.0 (Linux; Android 14; Pixel Tablet Build/AP2A.240905.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.107 Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel Tablet",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Google Pixel Watch",
-        "ua": "Dalvik/2.1.0 (Linux; U; Android 13; Google Pixel Watch Build/TWD4.231005.002)",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel Watch",
-            "type": "wearable"
-        }
-    },
-    {
-        "desc": "Google Pixel Watch 2",
-        "ua": "Dalvik/2.1.0 (Linux; U; Android 13; Google Pixel Watch 2 Build/TWD9.240605.001.A1)",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel Watch 2",
-            "type": "wearable"
-        }
-    },
-    {
-        "desc": "Google Pixel XL",
-        "ua": "Mozilla/5.0 (Linux; Android 7.1; Pixel XL Build/NDE63X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel XL",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixel XL",
-        "ua": "Mozilla/5.0 (Linux; Android 9; Pixel XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixel XL",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Google Pixelbook",
-        "ua": "Mozilla/5.0 (Linux; Android 9; Google Pixelbook) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixelbook",
-            "type": "undefined"
-        }
-    },
-    {
-        "desc": "Google Pixelbook Go",
-        "ua": "Mozilla/5.0 (Linux; Android 9; Google Pixelbook Go) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36 OPR/62.3.3146.57763",
-        "expect": {
-            "vendor": "Google",
-            "model": "Pixelbook Go",
-            "type": "undefined"
-        }
    }
 ]
--- a/test/data/ua/device/hisense.json
+++ b/test/data/ua/device/hisense.json
@@ -1,20 +0,0 @@
-[
-    {
-        "desc": "Hisense E50 Lite",
-        "ua": "Mozilla/5.0 (Linux; Android 11; Hisense E50 Lite) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.126 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Hisense",
-            "model": "E50 Lite",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Hisense V40s",
-        "ua": "Mozilla/5.0 (Linux; Android 11; Hisense V40s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.5195.125 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Hisense",
-            "model": "V40s",
-            "type": "mobile"
-        }
-    }
-]
--- a/test/data/ua/device/hmd.json
+++ b/test/data/ua/device/hmd.json
@@ -1,22 +1,4 @@
 [
-    {
-        "desc": "HMD Barbie Phone",
-        "ua": "Mozilla/5.0 (Mobile; HMD Barbie Phone; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.1",
-        "expect": {
-            "vendor": "HMD",
-            "model": "Barbie Phone",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "HMD Fusion",
-        "ua": "Mozilla/5.0 (Linux; Android 14; HMD Fusion) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "HMD",
-            "model": "Fusion",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "HMD Pulse",
        "ua": "Mozilla/5.0 (Linux; Android 14; HMD Pulse) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Mobile Safari/537.36",
@@ -43,23 +25,5 @@
            "model": "Pulse Pro",
            "type": "mobile"
        }
-    },
-    {
-        "desc": "HMD Skyline",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 14; HMD Skyline) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.1804 YaApp_Android/24.120.1 YaSearchBrowser/24.120.1 BroPP/1.0 SA/3 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "HMD",
-            "model": "Skyline",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "HMD Vibe",
-        "ua": "Mozilla/5.0 (Linux; Android 14; N159V Build/UKQ1.231025.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/135.0.7049.111 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/497.0.0.47.36;]",
-        "expect": {
-            "vendor": "HMD",
-            "model": "N159V",
-            "type": "mobile"
-        }
    }
 ]
--- a/test/data/ua/device/huawei.json
+++ b/test/data/ua/device/huawei.json
@@ -701,15 +701,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Huawei P10 Lite",
-        "ua": "Mozilla/5.0 (Linux; Android 8.0.0; WAS-L03T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5199.205 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Huawei",
-            "model": "WAS-L03T",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Huawei P20 Lite",
        "ua": "Mozilla/5.0 (Linux; Android 8.0.0; ANE-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36",
@@ -737,15 +728,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Huawei P30",
-        "ua": "Mozilla/5.0 (Linux; Android 10; ELE-L04) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.109 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Huawei",
-            "model": "ELE-L04",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Huawei P30",
        "ua": "Mozilla/5.0 (Linux; Android 9; ELE-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36",
@@ -800,15 +782,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Huawei Nova",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; HUAWEI CAN-L13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5113.212 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Huawei",
-            "model": "CAN-L13",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Huawei Nova 5T",
        "ua": "Mozilla/5.0 (Linux; Android 10; YAL-L21) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
@@ -926,15 +899,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Huawei Y7p",
-        "ua": "Mozilla/5.0 (Linux; Android 10; ART-L28; HMSCore 6.8.0.311) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4476.0 HuaweiBrowser/12.1.2.312 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Huawei",
-            "model": "ART-L28",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Huawei Y7p",
        "ua": "Mozilla/5.0 (Linux; Android 9; ART-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36",
--- a/test/data/ua/device/infinix.json
+++ b/test/data/ua/device/infinix.json
@@ -1,22 +1,4 @@
 [
-    {
-        "desc": "Infinix Hot 4",
-        "ua": "Mozilla/5.0 (Linux; U; Android 7.0; en-us; Infinix HOT 4 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 PHX/17.9",
-        "expect": {
-            "vendor": "Infinix",
-            "model": "HOT 4",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Infinix Hot 4 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0; Infinix_X556_LTE Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/69.0.3497.100 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/390.0.0.27.105;]",
-        "expect": {
-            "vendor": "Infinix",
-            "model": "X556_LTE",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Infinix Hot 7 Pro",
        "ua": "Mozilla/5.0 (Linux; Android 9; Infinix X625C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
@@ -44,15 +26,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Infinix Note 3",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0; Infinix_X601_LTE Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/81.0.4044.111 Mobile Safari/537.36 GSA/11.5.9.21.arm64",
-        "expect": {
-            "vendor": "Infinix",
-            "model": "X601_LTE",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Infinix Smart 5",
        "ua": "Mozilla/5.0 (Linux; Android 10; Infinix X657C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
--- a/test/data/ua/device/lava.json
+++ b/test/data/ua/device/lava.json
@@ -1,110 +0,0 @@
-[
-    {
-        "desc": "Lava Agni 2 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 14; LAVA LXX504 Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/133.0.6943.46 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/499.0.0.31.60;IABMV/1;]",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LXX504",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Agni 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 12; LAVA LXX501 Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/122.0.6261.119 Mobile Safari/537.36[FBAN/EMA;FBLC/hi_IN;FBAV/396.0.0.9.115;]",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LXX501",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Blaze",
-        "ua": "Mozilla/5.0 (Linux; U; Android 12; en-US; LAVA Blaze Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.4.0.1306 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "Blaze",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Blaze 2",
-        "ua": "Mozilla/5.0 (Linux; Android 13; LAVA LZX409 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.97 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/497.0.0.47.36;IABMV/1;]",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LZX409",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Blaze 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 12; LAVA LXX503) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/23.0 Chrome/115.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LXX503",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Blaze Curve",
-        "ua": "Mozilla/5.0 (Linux; Android 14; LAVA LXX505 Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/134.0.6998.105 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/505.0.0.57.45;IABMV/1;]",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LXX505",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Blaze Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 13; LAVA LZX404 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/134.0.6998.50 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/503.0.0.69.76;IABMV/1;]",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LZX404",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Iris 46",
-        "ua": "Mozilla/5.0 (Linux; Android 9; LAVA LH9950) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/21.0 Chrome/110.0.5481.154 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LH9950",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Iris 54",
-        "ua": "Mozilla/5.0 (Linux; U; Android 9; LAVA LH9931 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/79.0.3945.116 Mobile Safari/537.36 OPR/39.1.2254.136708",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LH9931",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava Storm 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 13; LAVA LXX508 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/129.0.6668.100 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LXX508",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava V7 Prime",
-        "ua": "Mozilla/5.0 (Linux; Android 9; LAVA LE9940) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LE9940",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Lava V7s Prime",
-        "ua": "Mozilla/5.0 (Linux; U; Android 9; LAVA LE9940_W Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/79.0.3945.116 Mobile Safari/537.36 OPR/43.2.2254.140294",
-        "expect": {
-            "vendor": "LAVA",
-            "model": "LE9940_W",
-            "type": "mobile"
-        }
-    }
-]
--- a/test/data/ua/device/lg.json
+++ b/test/data/ua/device/lg.json
@@ -134,33 +134,6 @@
            "type": "smarttv"
        }
    },
-    {
-        "desc": "LG Smart TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.41 (KHTML, like Gecko) Large Screen Safari/537.41 LG Browser/7.00.00(LGE; 42LB670V-ZA; 05.05.90; 1); webOS.TV-2014; LG NetCast.TV-2013 Compatible (LGE, 42LB670V-ZA, wireless)",
-        "expect": {
-            "vendor": "LG",
-            "model": "42LB670V-ZA",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "LG Smart TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chr0me/53.0.2785.34 Safari/537.36 LG Browser/8.00.00(LGE; 32LM627BPSB; 05.40.45; 1; DTV_W19R); webOS.TV-2019; LG NetCast.TV-2013 Compatible (LGE, 32LM627BPSB, wireless)",
-        "expect": {
-            "vendor": "LG",
-            "model": "32LM627BPSB",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "LG Smart TV",
-        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.122 Safari/537.36 HbbTV/1.3.1 ( DRM; LGE; OLED55B7V_Z; WEBOS3.5 06.10.60; W3_M16P; ) FVC/2.0 (LGE; WEBOS3.5 ;)",
-        "expect": {
-            "vendor": "LG",
-            "model": "OLED55B7V_Z",
-            "type": "smarttv"
-        }
-    },
    {
        "desc": "LG Android TV",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.2.2; zh-cn; LG Android TV Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
--- a/test/data/ua/device/motorola.json
+++ b/test/data/ua/device/motorola.json
@@ -1,10 +1,28 @@
 [
    {
-        "desc": "Motorola Defy XT",
-        "ua": "Mozilla/5.0 (Linux; U; Android 2.3.7; en-us; XT555C Build/V1.67D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+        "desc": "Motorola Moto X",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; XT1097 Build/KXE21.187-38) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36",
        "expect": {
            "vendor": "Motorola",
-            "model": "XT555C",
+            "model": "XT1097",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Motorola Moto Z3 Play",
+        "ua": "Mozilla/5.0 (Linux; Android 9; Moto Z3 Play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Motorola",
+            "model": "Moto Z3 Play",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Motorola Nexus 6",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Motorola",
+            "model": "Nexus 6",
            "type": "mobile"
        }
    },
@@ -17,42 +35,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Motorola Edge 30 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 13; XT2201-1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2201-1",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Edge 30 Ultra",
-        "ua": "Mozilla/5.0 (Linux; Android 14; motorola edge 30 ultra Build/U1SQS34.52-21-1-13; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.107 M",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "edge 30 ultra",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Edge 40",
-        "ua": "Mozilla/5.0 (Linux; Android 14; motorola edge 40 Build/U1TL34.115-16-1-7; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/131.0.6778.104 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "edge 40",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Edge X30",
-        "ua": "Mozilla/5.0 (Linux; Android 14; XT2201-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.6668.59 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2201-2",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Motorola RAZR 2019",
        "ua": "Mozilla/5.0 (Linux; Android 9; motorola razr) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/11.1 Chrome/75.0.3770.143 Mobile Safari/537.36",
@@ -63,65 +45,11 @@
        }
    },
    {
-        "desc": "Motorola Moto 360",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4; Moto 360 Build/KNX01S) AppleWebKit/537.36 (KHTML, like Gecko) WIB/0.9.8 Mobile Safari/537.36",
+        "desc": "Moto X",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.2; xx-xx; XT1058 Build/13.9.0Q2.X-70-GHOST-ATT_LE-2) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
        "expect": {
            "vendor": "Motorola",
-            "model": "Moto 360",
-            "type": "wearable"
-        }
-    },
-    {
-        "desc": "Motorola Moto E",
-        "ua": "Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4) Build/NDQS26.69-64-11-7; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "Moto E (4)",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto E6s",
-        "ua": "Mozilla/5.0 (Linux; Android 9; MOTOROLA E6S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "E6S",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto E7 Plus",
-        "ua": "Mozilla/5.0 (Linux; Android 10; moto e(7) plus Build/QPZS30.30-Q3-38-69-12; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/131.0.6778.14 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "moto e(7) plus",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto E7 Plus",
-        "ua": "Mozilla/5.0 (Linux; Android 14; XT2081-1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.5790.171 Mobile Safari/537.36 OPR/102.0.4864.0",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2081-1",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto G 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 14; moto g 5G - 2023 Build/U1TPNS34.26-48-2-7; ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36 EdgA/124.0.2478.64",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "moto g 5G - 2023",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto G 5G (2022)",
-        "ua": "Mozilla/5.0 (Linux; Android 12; moto g 5G (2022) Build/S1SAS32.47-77-9; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.116 Mobile Safari/537.36 [FB_IAB/Orca-Android;FBAV/402.0.0.11.101;]",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "moto g 5G (2022)",
+            "model": "XT1058",
            "type": "mobile"
        }
    },
@@ -144,156 +72,21 @@
        }
    },
    {
-        "desc": "Motorola Moto G10",
-        "ua": "Mozilla/5.0 (Linux; Android 12; XT2127-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Mobile Safari/537.36",
+        "desc": "Motorola Moto E",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4) Build/NDQS26.69-64-11-7; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36",
        "expect": {
            "vendor": "Motorola",
-            "model": "XT2127-2",
+            "model": "Moto E (4)",
            "type": "mobile"
        }
    },
    {
-        "desc": "Motorola Moto G24 Power",
-        "ua": "Mozilla/5.0 (Linux; U; Android 14; moto g24 power Build/UTAS34.82-97-1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/133.0.6943.138 Mobile Safari/537.36 OPR/89.0.2254.76420",
+        "desc": "Motorola Moto 360",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4; Moto 360 Build/KNX01S) AppleWebKit/537.36 (KHTML, like Gecko) WIB/0.9.8 Mobile Safari/537.36",
        "expect": {
            "vendor": "Motorola",
-            "model": "moto g24 power",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto G30",
-        "ua": "Mozilla/5.0 (Linux; Android 14; XT2129-3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2129-3",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto G54 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 14; moto g54 5G Build/U1TDS34.94-12-9-10-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.6834.122 Mobile Safari/537.36 OPX/2",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "moto g54 5G",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto X",
-        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; XT1097 Build/KXE21.187-38) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT1097",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto X",
-        "ua": "Mozilla/5.0 (Linux; U; Android 4.2; xx-xx; XT1058 Build/13.9.0Q2.X-70-GHOST-ATT_LE-2) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT1058",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto X Force",
-        "ua": "Mozilla/5.0 (Linux; U; Android 7.0; XT1580 Build/NPKS25.200-12-9; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/65.0.3325.109 Mobile Safari/537.36 OPR/32.0.2254.123747",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT1580",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto S30",
-        "ua": "Mozilla/5.0 (Linux; Android 13; XT2243-2 Build/T1SJC33.51-19-7; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/97.0.4692.98 Mobile Safari/537.36 T7/13.30 SP-engine/2.53.0 matrixstyle/0 lite baiduboxapp/6.2.0.10 (Baidu; P1 13) NABar/1.0",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2243-2",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto X30 Pro",
-        "ua": "Mozilla/5.0 (Linux; U; Android 13; zh-CN; XT2241-1 Build/T1SQ33.111-12-19) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/16.1.3.1264 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2241-1",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto Z3 Play",
-        "ua": "Mozilla/5.0 (Linux; Android 9; Moto Z3 Play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "Moto Z3 Play",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Moto Z4",
-        "ua": "Mozilla/5.0 (Linux; U; Android 10; moto z4 Build/QDF30.130-42-5-17; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/108.0.5359.128 Mobile Safari/537.36 OPR/2.3.0",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "moto z4",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Nexus 6",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "Nexus 6",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola One 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 11; motorola one 5G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "one 5G",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola P30",
-        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; XT1943-1 Build/OPM1.171019.019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/97.0.4692.98 Mobile Safari/537.36 T7/13.50 SP-engine/2.88.0 baiduboxapp/13.50.5.10 (Baidu; P1 8.1.0) NABar/1.0",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT1943-1",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Razr 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 12; motorola razr 5G Build/S2PS32.57-23-21; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.97 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/497.0.0.47.36;IABMV/1;]",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "razr 5G",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Razr 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 11; XT2071-4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "XT2071-4",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Motorola Razr 50 Ultra",
-        "ua": "Mozilla/5.0 (Linux; Android 14; motorola razr 50 ultra Build/U3UX34.56-29-2; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/131.0.6778.260 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Motorola",
-            "model": "razr 50 ultra",
-            "type": "mobile"
+            "model": "Moto 360",
+            "type": "wearable"
        }
    }
 ]
--- a/test/data/ua/device/nokia.json
+++ b/test/data/ua/device/nokia.json
@@ -1,13 +1,4 @@
 [
-    {
-        "desc": "Nokia 1",
-        "ua": "Mozilla/5.0 (Linux; Android 10; Nokia 1 Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5304.15 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Nokia",
-            "model": "1",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Nokia3xx",
        "ua": "Nokia303/14.87 CLDC-1.1",
@@ -26,15 +17,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Nokia 5800 XpressMusic",
-        "ua": "Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1/10.4.016; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413",
-        "expect": {
-            "vendor": "Nokia",
-            "model": "5800d-1",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Nokia 7",
        "ua": "Mozilla/5.0 (Linux; Android 11; Nokia 7.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
@@ -44,33 +26,6 @@
            "type": "mobile"
        }
    },
-    {
-        "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": {
-            "vendor": "Nokia",
-            "model": "808 PureView",
-            "type": "mobile"
-        }
-    },
-    {
-        "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": {
-            "vendor": "Nokia",
-            "model": "808PureView",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Nokia Lumia 630",
-        "ua": "UCWEB/2.0 (Windows; U; wds 8.10; en-IN; NOKIA; RM-978_1046) U2/1.0.0 UCBrowser/4.2.0.524 U2/1.0.0 Mobile",
-        "expect": {
-            "vendor": "Nokia",
-            "model": "RM-978",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Nokia N9",
        "ua": "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
@@ -80,15 +35,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Nokia N900",
-        "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": {
-            "vendor": "Nokia",
-            "model": "N900",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Nokia T20",
        "ua": "Mozilla/5.0 (Linux; Android 12; Nokia T20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
--- a/test/data/ua/device/nothing.json
+++ b/test/data/ua/device/nothing.json
@@ -17,15 +17,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Nothing 2",
-        "ua": "Mozilla/5.0 (Linux; Android 15; AIN065 Build/AQ3A.240929.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.90 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/496.0.0.45.65;IABMV/1;] FBNV/500",
-        "expect": {
-            "vendor": "Nothing",
-            "model": "AIN065",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Nothing 2a",
        "ua": "Mozilla/5.0 (Linux; Android 14; A142 Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/126.0.6478.71 Mobile Safari/537.36",
@@ -34,32 +25,5 @@
            "model": "A142",
            "type": "mobile"
        }
-    },
-    {
-        "desc": "Nothing 2a Plus",
-        "ua": "Mozilla/5.0 (Linux; Android 14; A142P Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.107 Mobile Safari/537.36 OPX/2.6",
-        "expect": {
-            "vendor": "Nothing",
-            "model": "A142P",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Nothing 3a",
-        "ua": "Mozilla/5.0 (Linux; Android 15; A059 Build/AQ3A.241015.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/127.0.6533.103 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Nothing",
-            "model": "A059",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Nothing 3a Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 15; A059P Build/AQ3A.241015.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/136.0.7103.57 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/511.0.0.73.36;IABMV/1;]",
-        "expect": {
-            "vendor": "Nothing",
-            "model": "A059P",
-            "type": "mobile"
-        }
    }
 ]
--- a/test/data/ua/device/nvidia.json
+++ b/test/data/ua/device/nvidia.json
@@ -1,22 +1,4 @@
 [
-    {
-        "desc": "Tegra Note 7",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; TegraNote-P1640 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Safari/537.36",
-        "expect": {
-            "vendor": "Nvidia",
-            "model": "TegraNote-P1640",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Nvidia Shield",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; SHIELD) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Nvidia",
-            "model": "SHIELD",
-            "type": "console"
-        }
-    },
    {
        "desc": "Nvidia Shield Tablet",
        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SHIELD Tablet Build/LVY48E; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/45.0.2454.19 Safari/537.36",
@@ -25,23 +7,5 @@
            "model": "SHIELD Tablet",
            "type": "tablet"
        }
-    },
-    {
-        "desc": "Nvidia Shield Tablet K1",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; SHIELD Tablet K1 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.98 Safari/537.36",
-        "expect": {
-            "vendor": "Nvidia",
-            "model": "SHIELD Tablet K1",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Nvidia Shield TV",
-        "ua": "Mozilla/5.0 (Linux; Android 11; SHIELD Android TV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36  ",
-        "expect": {
-            "vendor": "Nvidia",
-            "model": "SHIELD Android TV",
-            "type": "smarttv"
-        }
    }
 ]
--- a/test/data/ua/device/oneplus.json
+++ b/test/data/ua/device/oneplus.json
@@ -54,20 +54,11 @@
        }
    },
    {
-        "desc": "OnePlus 7T Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 10; HD1913) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.5563.57 Mobile Safari/537.36 EdgA/110.0.1587.66",
+        "desc": "OnePlus 8T",
+        "ua": "Mozilla/5.0 (Linux; Android 11; KB2005) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36",
        "expect": {
            "vendor": "OnePlus",
-            "model": "HD1913",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 8 Lite",
-        "ua": "Mozilla/5.0 (Linux; Android 10; OnePlus 8 Lite) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4741.47 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "8 Lite",
+            "model": "KB2005",
            "type": "mobile"
        }
    },
@@ -80,213 +71,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "OnePlus 8T",
-        "ua": "Mozilla/5.0 (Linux; Android 11; KB2005) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "KB2005",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 9",
-        "ua": "Mozilla/5.0 (Android 14; SDK 28; OnePlus 9) Gecko/128.0 Firefox/128.0",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "9",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 9",
-        "ua": "Mozilla/5.0 (Linux; Android 13; LE2113 Build/TP1A.220905.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.162 Mobile Safari/537.36 Flipboard/4.3.14/5377,4.3.14.5377",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "LE2113",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 9 Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 13; LE2123) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.128 Mobile Safari/537.36 OPR/73.0.3832.69371",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "LE2123",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 9R",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; LE2100) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 YaApp_Android/21.114.1 YaSearchBrowser/21.114.1 BroPP/1.0 SA/3 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "LE2100",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 9RT 5G",
-        "ua": "Mozilla/5.0 (Linux; U; Android 11; en-in; MT2111 Build/RKQ1.210614.002) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 GSA/13.14.15.23.arm64",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "MT2111",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 10 Pro",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 12; NE2213) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.148 YaBrowser/22.7.5.90.00 SA/3 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "NE2213",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 10RT",
-        "ua": "Mozilla/5.0 (Linux; Android 13; CPH2413) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "CPH2413",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 11R",
-        "ua": "Mozilla/5.0 (Linux; Android 14; CPH2487) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "CPH2487",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus 13",
-        "ua": "Mozilla/5.0 (Linux; Android 15; CPH2653 Build/AP3A.240617.008; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/134.0.6998.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/504.0.0.69.64;IABMV/1;] FBNV/5",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "CPH2653",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace",
-        "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-cn; PGKM10 Build/AP3A.240617.008) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/115.0.5790.168 Mobile Safari/537.36 HeyTapBrowser/40.9.6.2",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PGKM10",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 2",
-        "ua": "Mozilla/5.0 (Linux; U; Android 14; zh-CN; PHK110 Build/UKQ1.231108.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/17.3.6.1367 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PHK110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 2 Pro",
-        "ua": "Mozilla/5.0 (Linux; arm; Android 13; PJA110) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 YaBrowser/23.1.0.284.00 (beta) SA/3 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PJA110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 2V",
-        "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-cn; PHP110 Build/AP3A.240617.008) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/121.0.6167.71 MQQBrowser/16.3 Mobile Safari/537.36 COVC/047707",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PHP110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 3",
-        "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-CN; PJE110 Build/TP1A.220905.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.80 Quark/7.9.7.782 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PJE110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 3 Pro 5G",
-        "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-CN; PJX110 Build/UKQ1.231108.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.80 Quark/7.11.4.814 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PJX110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 3V",
-        "ua": "Mozilla/5.0 (Linux; U; Android 14; zh-cn; PJF110 Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.61 Mobile Safari/537.36 HeyTapBrowser/40.8.33.1.2beta",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PJF110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace 5",
-        "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-cn; PKG110 Build/UKQ1.231108.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/115.0.5790.168 Mobile Safari/537.36 HeyTapBrowser/40.9.9.2",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PKG110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace Pro",
-        "ua": "Mozilla/5.0 (Linux; U; Android 14; zh-CN; PGP110 Build/UKQ1.230924.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/17.2.9.1360 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PGP110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Ace Racing Edition",
-        "ua": "Mozilla/5.0 (Linux; U; Android 13; zh-CN; PGZ110 Build/TP1A.220905.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/17.3.6.1367 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "PGZ110",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Nord CE 4",
-        "ua": "Mozilla/5.0 (Linux; Android 14; CPH2613) AppleWebKit/537.36 (KHTML, like Gecko) JioSphere/5.0.4 Chrome/119.0.6045.193 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "CPH2613",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Nord N10 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 10; BE2029) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "BE2029",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "OnePlus Nord N30 SE 5G",
-        "ua": "Mozilla/5.0 (Linux; Android 14; CPH2605 Build/TP1A.220905.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/135.0.7049.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/509.0.0.67.28;IABMV/1;]",
-        "expect": {
-            "vendor": "OnePlus",
-            "model": "CPH2605",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "OnePlus Nord N100",
        "ua": "Mozilla/5.0 (Linux; Android 10; BE2015 Build/QKQ1.200719.002; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36",
@@ -297,11 +81,11 @@
        }
    },
    {
-        "desc": "OnePlus Open",
-        "ua": "Dalvik/2.1.0 (Linux; U; Android 15; CPH2551 Build/AP3A.240617.008)",
+        "desc": "OnePlus Nord N10 5G",
+        "ua": "Mozilla/5.0 (Linux; Android 10; BE2029) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Mobile Safari/537.36",
        "expect": {
            "vendor": "OnePlus",
-            "model": "CPH2551",
+            "model": "BE2029",
            "type": "mobile"
        }
    },
--- a/test/data/ua/device/oppo.json
+++ b/test/data/ua/device/oppo.json
@@ -1,4 +1,13 @@
 [
+    {
+        "desc": "OnePlus 10RT",
+        "ua": "Mozilla/5.0 (Linux; Android 13; CPH2413) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "OPPO",
+            "model": "CPH2413",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "OPPO Pad",
        "ua": "Mozilla/5.0 (Linux; U; Android 13; zh-CN; OPD2101 Build/TP1A.220905.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/16.3.9.1290 Mobile Safari/537.36",
--- a/test/data/ua/device/philips.json
+++ b/test/data/ua/device/philips.json
@@ -1,83 +0,0 @@
-[
-    {
-        "desc": "Philips S616",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; Philips S616 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Philips",
-            "model": "S616",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Philips W8510",
-        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Philips W8510 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.68 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Philips",
-            "model": "W8510",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Philips SmartTV",
-        "ua": "Mozilla/5.0 (Linux; Android 11; PHILIPS 4k TV Build/RTXC.231010.082.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/126.0.6478.71 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "PHILIPS",
-            "model": "undefined",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Philips SmartTV",
-        "ua": "Opera/9.80 HbbTV/1.1.1 (; Philips; ; ; ; ) NETTV/4.0.2; en) Version/11.60",
-        "expect": {
-            "vendor": "Philips",
-            "model": "",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Philips 32PFL6606K/02 SmartTV (2011)",
-        "ua": "Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.6.33 Version/10.70",
-        "expect": {
-            "vendor": "Philips",
-            "model": "",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Philips 32PFL6606K/02 SmartTV (2013)",
-        "ua": "Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.6.33 Version/10.70",
-        "expect": {
-            "vendor": "Philips",
-            "model": "",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Philips 32PHS5301/12 SmartTV (2016)",
-        "ua": "Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 Safari/537.36 OPR/29.0.1803.0 OMI/4.5.23.37.MOT2.13 HbbTV/1.2.1 (;Philips;32PHS5301/12;;_TV_MT5800;) Firmware/TPM161E_012.002.045.001 en",
-        "expect": {
-            "vendor": "Philips",
-            "model": "32PHS5301/12",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Philips PH0M_EA_T32",
-        "ua": "Mozilla/5.0 (Linux; Android 10; Philips FHD Android TV Build/QTG3.201102.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/125.0.6422.186 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Philips",
-            "model": "undefined",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "Philips PH3M_AL_T32",
-        "ua": "Mozilla/5.0 (Linux; Android 11; Philips Google TV TA7 Build/RTM5.220609.199; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.58 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Philips",
-            "model": "undefined",
-            "type": "smarttv"
-        }
-    }
-]
--- a/test/data/ua/device/pico.json
+++ b/test/data/ua/device/pico.json
@@ -25,23 +25,5 @@
            "model": "Neo3 Link",
            "type": "xr"
        }
-    },
-    {
-        "desc": "Pico Neo 3",
-        "ua": "Mozilla/5.0 (X11; Linux x86_64; Pico Neo 3 OS5.12.2 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.48 Chrome/105.0.5195.68 VR Safari/537.36  OculusBrowser/7.0",
-        "expect": {
-            "vendor": "Pico",
-            "model": "Neo 3",
-            "type": "xr"
-        }
-    },
-    {
-        "desc": "Pico Neo 3 Pro",
-        "ua": "Mozilla/5.0 (X11; Linux x86_64; Pico Neo 3 Pro OS5.9.9.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.46 Chrome/105.0.5195.68 VR Safari/537.36  OculusBrowser/7.0",
-        "expect": {
-            "vendor": "Pico",
-            "model": "Neo 3 Pro",
-            "type": "xr"
-        }
    }
 ]
--- a/test/data/ua/device/retroid.json
+++ b/test/data/ua/device/retroid.json
@@ -1,11 +0,0 @@
-[
-    {
-        "desc": "Retroid Pocket 4 Pro",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 13; Retroid Pocket 4 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.96 YaBrowser/24.4.3.96.00 SA/3 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Retroid",
-            "model": "Pocket 4 Pro",
-            "type": "console"
-        }
-    }
-]
--- a/test/data/ua/device/samsung.json
+++ b/test/data/ua/device/samsung.json
@@ -296,15 +296,6 @@
            "type": "smarttv"
        }
    },
-    {
-        "desc": "Samsung SmartTV",
-        "ua": "Mozilla/5.0 (SMART-TV; Linux; Tizen 8.0) AppleWebKit/537.36 (KHTML, like Gecko) Samsung Browser/7.0 Chrome/108.0.5359.1 TV Safari/537.36",
-        "expect": {
-            "vendor": "Samsung",
-            "model": "undefined",
-            "type": "smarttv"
-        }
-    },
    {
        "desc": "Samsung SmartTV HBBTV",
        "ua": "HbbTV/1.5.1 (+DRM;Samsung;SmartTV2021:UAU7000;T-KSU2EDEUC-1506.0;KantSU2e;urn:samsungtv:familyname:21_KANTSU2E_UHD_BASIC:2021;) Tizen/6.0 (+TVPLUS+SmartHubLink) Chrome/76 LaTivu_1.0.1_2021 RVID/17",
--- a/test/data/ua/device/sony.json
+++ b/test/data/ua/device/sony.json
@@ -98,15 +98,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Sony Xperia 1 VI",
-        "ua": "Mozilla/5.0 (Linux; Android 14; XQ-EC44) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Sony",
-            "model": "XQ-EC44",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Sony Xperia 10ii",
        "ua": "Mozilla/5.0 (Linux; Android 10; XQ-AU52) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
@@ -116,24 +107,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Sony Xperia 10 III Lite",
-        "ua": "Mozilla/5.0 (Linux; Android 12; XQ-BT44 Build/62.1.A.1.227; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/101.0.4951.61 Mobile Safari/537.36 Sleipnir/3.6.0",
-        "expect": {
-            "vendor": "Sony",
-            "model": "XQ-BT44",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Sony Xperia 10 VI",
-        "ua": "Mozilla/5.0 (Linux; Android 14; XQ-ES72 Build/70.0.A.2.233; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/129.0.6668.71 Mobile Safari/537.36 Line/14.16.0/IAB",
-        "expect": {
-            "vendor": "Sony",
-            "model": "XQ-ES72",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Sony Xperia Pro",
        "ua": "Mozilla/5.0 (Linux; Android 10; XQ-AQ52) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Mobile Safari/537.36",
@@ -143,24 +116,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Sony Xperia Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 12; Sony XQ-AQ52) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/23.0 Chrome/115.0.0.0 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Sony",
-            "model": "XQ-AQ52",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Sony Xperia Pro I",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; XQ-BE72) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.148 YaBrowser/22.7.3.82.00 SA/3 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Sony",
-            "model": "XQ-BE72",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Sony SGP521 (Xperia Z2 Tablet)",
        "ua": "Mozilla/5.0 (Linux; Android 4.4; SGP521 Build/17.1.A.0.432) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36",
--- a/test/data/ua/device/tcl.json
+++ b/test/data/ua/device/tcl.json
@@ -296,15 +296,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "TCL 4056S",
-        "ua": "Mozilla/5.0 (Mobile; TCL 4056S; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.0",
-        "expect": {
-            "vendor": "TCL",
-            "model": "4056S",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "TCL A3",
        "ua": "Mozilla/5.0 (Linux; Android 11; A509DL Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/101.0.4951.61 Mobile Safari/537.36 GSA/13.18.7.23.arm64",
--- a/test/data/ua/device/tecno.json
+++ b/test/data/ua/device/tecno.json
@@ -1,31 +1,4 @@
 [
-    {
-        "desc": "Tecno DroiPad 8D",
-        "ua": "Mozilla/5.0 (Linux; U; Android 5.1; TECNO DP8D Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Safari/537.36 OPR/42.0.2254.139280",
-        "expect": {
-            "vendor": "TECNO",
-            "model": "DP8D",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Tecno DroiPad 10A Pro",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; TECNO DP10A Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Safari/537.36",
-        "expect": {
-            "vendor": "TECNO",
-            "model": "DP10A Pro",
-            "type": "tablet"
-        }
-    },
-    {
-        "desc": "Tecno DroiPad 10D 4G",
-        "ua": "Mozilla/5.0 (Linux; Android 7.0; TECNO P904) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36 OPR/77.0.4054.90",
-        "expect": {
-            "vendor": "TECNO",
-            "model": "P904",
-            "type": "tablet"
-        }
-    },
    {
        "desc": "Tecno KC8",
        "ua": "Mozilla/5.0 (Linux; Android 10; TECNO KC8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
--- a/test/data/ua/device/vizio.json
+++ b/test/data/ua/device/vizio.json
@@ -1,20 +0,0 @@
-[
-    {
-        "desc": "VIZIO",
-        "ua": "Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36 CrKey/1.0.999999 VIZIO SmartCast(Conjure/SX7B-4.6.419.12 FW/7.0.23.2-4 Model/M557-G0)",
-        "expect": {
-            "vendor": "VIZIO",
-            "model": "M557-G0",
-            "type": "smarttv"
-        }
-    },
-    {
-        "desc": "VIZIO",
-        "ua": "VIZIO V506-J09 ViziOS/1.4.512.847.1 WatchFree/24.06.13.2 FancyPlayer/1.1.30-qa ",
-        "expect": {
-            "vendor": "VIZIO",
-            "model": "V506-J09",
-            "type": "smarttv"
-        }
-    }
-]
--- a/test/data/ua/device/wiko.json
+++ b/test/data/ua/device/wiko.json
@@ -1,29 +0,0 @@
-[
-    {
-        "desc": "Wiko Life 3",
-        "ua": "Mozilla/5.0 (Linux; Android 11; Wiko U316AT) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5199.205 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Wiko",
-            "model": "U316AT",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Wiko Ride 3",
-        "ua": "Mozilla/5.0 (Linux; Android 11; Wiko U614AS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.181 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Wiko",
-            "model": "U614AS",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "Wiko T10",
-        "ua": "Mozilla/5.0 (Linux; Android 11; WIKO T10 Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5304.62 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "WIKO",
-            "model": "T10",
-            "type": "mobile"
-        }
-    }
-]
--- a/test/data/ua/device/xiaomi.json
+++ b/test/data/ua/device/xiaomi.json
@@ -116,15 +116,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Xiaomi Mi 11 Lite 5G",
-        "ua": "Mozilla/5.0 (Linux; U; Android 12; zh-CN; Mi 11 Lite 5G Build/SKQ1.211006.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.136 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.17.0-gn",
-        "expect": {
-            "vendor": "Xiaomi",
-            "model": "Mi 11 Lite 5G",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Xiaomi Mi 5s Plus",
        "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; zh-cn; MI 5s Plus Build/MXB48T) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.146 Mobile Safari/537.36 XiaoMi/MiuiBrowser/8.7.1",
@@ -197,15 +188,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "Xiaomi Mi 10T",
-        "ua": "Mozilla/5.0 (Linux; U; Android 12; fr-CA; Mi 10T Build/SKQ1.211006.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.79 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.16.1-gn",
-        "expect": {
-            "vendor": "Xiaomi",
-            "model": "Mi 10T",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "Xiaomi Mi A2",
        "ua": "Mozilla/5.0 (Linux; Android 9; Mi A2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36",
@@ -332,15 +314,6 @@
            "type": "tablet"
        }
    },
-    {
-        "desc": "Xiaomi Pad 5",
-        "ua": "Mozilla/5.0 (Linux; U; Android 12; ca-ES; Xiaomi Pad 5 Build/SKQ1.220303.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/89.0.4389.86 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.6.0-gn",
-        "expect": {
-            "vendor": "Xiaomi",
-            "model": "mi Pad 5",
-            "type": "tablet"
-        }
-    },
    {
        "desc": "Xiaomi Pad 6S Pro 12.4",
        "ua": "Mozilla/5.0 (Linux; Android 14; 24018RPACC) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36",
@@ -485,15 +458,6 @@
            "type": "mobile"
        }
    },
-    {
-        "desc": "XiaoMi Redmi Note 10 Lite",
-        "ua": "Mozilla/5.0 (Linux; U; Android 12; es-VE; Mi Note 10 Lite Build/SKQ1.210908.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.88 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.16.1-gn",
-        "expect": {
-            "vendor": "Xiaomi",
-            "model": "Mi Note 10 Lite",
-            "type": "mobile"
-        }
-    },
    {
        "desc": "XiaoMi Redmi Note 10 Pro",
        "ua": "Mozilla/5.0 (Linux; Android 13; M2101K6P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
--- a/test/data/ua/engine/engine-all.json
+++ b/test/data/ua/engine/engine-all.json
@@ -62,15 +62,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",
--- a/test/data/ua/extension/crawler.json
+++ b/test/data/ua/extension/crawler.json
--- a/test/data/ua/extension/email.json
+++ b/test/data/ua/extension/email.json
@@ -9,16 +9,6 @@
            "type"    : "email"
        }
    },
-    {
-        "desc"    : "Apple Mail",
-        "ua"      : "Mail/3826.500.181.1.5 CFNetwork/3826.500.111.1.1 Darwin/24.4.0",
-        "expect"  :
-        {
-            "name"    : "Mail",
-            "version" : "3826.500.181.1.5",
-            "type"    : "email"
-        }
-    },
    {
        "desc"    : "BlueMail",
        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) BlueMail/0.10.31 Chrome/61.0.3163.100 Electron/2.0.18 Safari/537.36",
@@ -39,16 +29,6 @@
            "type"    : "email"
        }
    },
-    {
-        "desc"    : "DaumMail",
-        "ua"      : "DaumMobileApp (LG-KU5400; U; Android 2.3.7|10; ko-kr) DaumMail/1.0.8 ",
-        "expect"  :
-        {
-            "name"    : "DaumMail",
-            "version" : "1.0.8",
-            "type"    : "email"
-        }
-    },
    {
        "desc"    : "Evolution",
        "ua"      : "Evolution/3.52.3",
@@ -139,36 +119,6 @@
            "type"    : "email"
        }
    },
-    {
-        "desc"    : "Polymail",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Polymail/2.3.12 Chrome/114.0.5735.134 Electron/25.2.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Polymail",
-            "version" : "2.3.12",
-            "type"    : "email"
-        }
-    },
-    {
-        "desc"    : "ProtonMail",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) ProtonMail/1.4.0 Chrome/122.0.6261.156 Electron/29.4.6 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "ProtonMail",
-            "version" : "1.4.0",
-            "type"    : "email"
-        }
-    },
-    {
-        "desc"    : "SparkDesktop",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) SparkDesktop/3.0.30 Chrome/102.0.5005.63 Electron/19.0.4 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "SparkDesktop",
-            "version" : "3.0.30",
-            "type"    : "email"
-        }
-    },
    {
        "desc"    : "Sparrow",
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/604.5.6 (KHTML, like Gecko) Sparrow/1043.1",
@@ -208,25 +158,5 @@
            "version" : "1.3.10",
            "type"    : "email"
        }
-    },
-    {
-        "desc"    : "Zimbra",
-        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 6.2; it; rv:1.9.2.19pre) Gecko/20110902 Prism zdesktop/7.2.8",
-        "expect"  :
-        {
-            "name"    : "Zimbra",
-            "version" : "7.2.8",
-            "type"    : "email"
-        }
-    },
-    {
-        "desc"    : "ZohoMail",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) ZohoMail-Desktop/1.6.3 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "ZohoMail-Desktop",
-            "version" : "1.6.3",
-            "type"    : "email"
-        }
    }
 ]
--- a/test/data/ua/extension/fetcher.json
+++ b/test/data/ua/extension/fetcher.json
@@ -9,26 +9,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "Asana",
-        "ua"      : "Asana/1.4.0 WebsiteMetadataRetriever",
-        "expect"  :
-        {
-            "name"    : "Asana",
-            "version" : "1.4.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Better Uptime Bot",
-        "ua"      : "Better Uptime Bot Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Better Uptime Bot",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "BingPreview",
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) BingPreview/1.0b",
@@ -39,46 +19,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "Bit.ly",
-        "ua"      : "bitlybot/3.0 (+http://bit.ly/)",
-        "expect"  :
-        {
-            "name"    : "bitlybot",
-            "version" : "3.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Blueno",
-        "ua"      : "facebookexternalhit/1.1 (compatible; Blueno/1.0; +http://naver.me/scrap)",
-        "expect"  :
-        {
-            "name"    : "Blueno",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Bluesky",
-        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Bluesky Cardyb/1.1; +mailto:support@bsky.app) Chrome/100.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Bluesky",
-            "version" : "1.1",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "BufferLinkPreviewBot",
-        "ua"      : "BufferLinkPreviewBot/1.0 (+https://scraper.buffer.com/about/bots/link-preview-bot)",
-        "expect"  :
-        {
-            "name"    : "BufferLinkPreviewBot",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "ChatGPT-User",
        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko); compatible; ChatGPT-User/1.0; +https://openai.com/bot",
@@ -89,46 +29,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "Chrome-Lighthouse",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4590.2 Mobile Safari/537.36 Chrome-Lighthouse",
-        "expect"  :
-        {
-            "name"    : "Chrome-Lighthouse",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Claude-User",
-        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Claude-User/1.0; +Claude-User@anthropic.com)",
-        "expect"  :
-        {
-            "name"    : "Claude-User",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Cohere-AI",
-        "ua"      : "Mozilla/5.0 (compatible; Cohere-AI/1.0; +https://cohere.com/)",
-        "expect"  :
-        {
-            "name"    : "Cohere-AI",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Discordbot",
-        "ua"      : "Mozilla/5.0 (compatible; Discordbot/2.0; +https://discordapp.com)",
-        "expect"  :
-        {
-            "name"    : "Discordbot",
-            "version" : "2.0",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "DuckAssistBot",
        "ua"      : "DuckAssistBot/1.2; (+http://duckduckgo.com/duckassistbot.html)",
@@ -139,16 +39,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "Gemini-Deep-Research",
-        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Gemini-Deep-Research; +https://gemini.google/overview/deep-research/) Chrome/135.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Gemini-Deep-Research",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "Google FeedFetcher",
        "ua"      : "FeedFetcher-Google; (+http://www.google.com/feedfetcher.html)",
@@ -159,16 +49,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "Google Image Proxy",
-        "ua"      : "Mozilla/5.0 (Windows NT 5.1; rv:11.0) Gecko Firefox/11.0 (via ggpht.com GoogleImageProxy)",
-        "expect"  :
-        {
-            "name"    : "GoogleImageProxy",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "Google Read Aloud - Mobile agent",
        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36 (compatible; Google-Read-Aloud; +https://support.google.com/webmasters/answer/1061943)",
@@ -189,16 +69,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "Google Page Renderer",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 Google-PageRenderer Google (+https://developers.google.com/+/web/snippet/) ",
-        "expect"  :
-        {
-            "name"    : "Google-PageRenderer",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "Google Publisher Center",
        "ua"      : "GoogleProducer; (+https://developers.google.com/search/docs/crawling-indexing/google-producer)",
@@ -219,46 +89,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "HubSpot Page Fetcher",
-        "ua"      : "HubSpot Page Fetcher/1.0 http://www.hubspot.com/ web-crawlers@hubspot.com",
-        "expect"  :
-        {
-            "name"    : "HubSpot Page Fetcher",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Iframely",
-        "ua"      : "Iframely/1.3.1 (+https://iframely.com/docs/about)",
-        "expect"  :
-        {
-            "name"    : "Iframely",
-            "version" : "1.3.1",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "kakaotalk-scrap",
-        "ua"      : "facebookexternalhit/1.1; kakaotalk-scrap/1.0; +https://devtalk.kakao.com/t/scrap/33984",
-        "expect"  :
-        {
-            "name"    : "kakaotalk-scrap",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "KeybaseBot",
-        "ua"      : "Mozilla/5.0 (compatible; KeybaseBot; +https://keybase.io)",
-        "expect"  :
-        {
-            "name"    : "KeybaseBot",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "Meta-ExternalFetcher",
        "ua"      : "meta-externalfetcher/1.1 (+https://developers.facebook.com/docs/sharing/webmasters/crawler)",
@@ -269,46 +99,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "MicrosoftPreview",
-        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; MicrosoftPreview/2.0; +https://aka.ms/MicrosoftPreview) Chrome/W.X.Y.Z Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "MicrosoftPreview",
-            "version" : "2.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "MistralAI-User",
-        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; MistralAI-User/1.0; +https://docs.mistral.ai/robots)",
-        "expect"  :
-        {
-            "name"    : "MistralAI-User",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Perplexity-User",
-        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Perplexity-User/1.0; +https://perplexity.ai/perplexity-user)",
-        "expect"  :
-        {
-            "name"    : "Perplexity-User",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Pinterestbot",
-        "ua"      : "Mozilla/5.0 (compatible; Pinterestbot/1.0; +http://www.pinterest.com/bot.html)",
-        "expect"  :
-        {
-            "name"    : "Pinterestbot",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "Rogerbot",
        "ua"      : "Mozilla/5.0 (compatible; rogerBot/1.0; UrlCrawler; http://www.seomoz.org/dp/rogerbot)",
@@ -319,86 +109,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "SiteAuditBot",
-        "ua"      : "Mozilla/5.0 (compatible; SiteAuditBot/0.97; +http://www.semrush.com/bot.html)",
-        "expect"  :
-        {
-            "name"    : "SiteAuditBot",
-            "version" : "0.97",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Slack-ImgProxy",
-        "ua"      : "Slack-ImgProxy 0.19 (+https://api.slack.com/robots)",
-        "expect"  :
-        {
-            "name"    : "Slack-ImgProxy",
-            "version" : "0.19",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Slackbot",
-        "ua"      : "Slackbot 1.0 (+https://api.slack.com/robots)",
-        "expect"  :
-        {
-            "name"    : "Slackbot",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Slackbot-LinkExpanding",
-        "ua"      : "Slackbot-LinkExpanding 1.0 (+https://api.slack.com/robots)",
-        "expect"  :
-        {
-            "name"    : "Slackbot-LinkExpanding",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Snap URL Preview",
-        "ua"      : "Snap URL Preview Service; bot; snapchat; https://developers.snap.com/robots  ",
-        "expect"  :
-        {
-            "name"    : "Snap URL Preview",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "SkypeUriPreview",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) SkypeUriPreview Preview/0.5 skype-url-preview@microsoft.com",
-        "expect"  :
-        {
-            "name"    : "SkypeUriPreview",
-            "version" : "0.5",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "TelegramBot",
-        "ua"      : "TelegramBot (like TwitterBot)",
-        "expect"  :
-        {
-            "name"    : "TelegramBot",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Twitterbot",
-        "ua"      : "Twitterbot/1.0",
-        "expect"  :
-        {
-            "name"    : "Twitterbot",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "UptimeRobot",
        "ua"      : "Mozilla/5.0 (compatible; UptimeRobot/2.0; http://www.uptimerobot.com/)",
@@ -409,26 +119,6 @@
            "type"    : "fetcher"
        }
    },
-    {
-        "desc"    : "vercel-favicon-bot",
-        "ua"      : "vercel-favicon-bot",
-        "expect"  :
-        {
-            "name"    : "vercel-favicon-bot",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "vercel-screenshot-bot",
-        "ua"      : "vercel-screenshot-bot",
-        "expect"  :
-        {
-            "name"    : "vercel-screenshot-bot",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
    {
        "desc"    : "Vercelbot",
        "ua"      : "Vercelbot (+https://vercel.com)",
@@ -438,135 +128,5 @@
            "version" : "undefined",
            "type"    : "fetcher"
        }
-    },
-    {
-        "desc"    : "vercelflags",
-        "ua"      : "vercelflags",
-        "expect"  :
-        {
-            "name"    : "vercelflags",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "verceltracing",
-        "ua"      : "verceltracing",
-        "expect"  :
-        {
-            "name"    : "verceltracing",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "WhatsApp",
-        "ua"      : "WhatsApp/2.23.20.0",
-        "expect"  :
-        {
-            "name"    : "WhatsApp",
-            "version" : "2.23.20.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YaDirectFetcher",
-        "ua"      : "Mozilla/5.0 (compatible; YaDirectFetcher/1.0; Dyatel; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YaDirectFetcher",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexCalendar",
-        "ua"      : "Mozilla/5.0 (compatible; YandexCalendar/1.0; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexCalendar",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexDirect",
-        "ua"      : "Mozilla/5.0 (compatible; YandexDirect/3.0; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexDirect",
-            "version" : "3.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexDirectDyn",
-        "ua"      : "Mozilla/5.0 (compatible; YandexDirectDyn/1.0; +http://yandex.com/bots",
-        "expect"  :
-        {
-            "name"    : "YandexDirectDyn",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexForDomain",
-        "ua"      : "Mozilla/5.0 (compatible; YandexForDomain/1.0; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexForDomain",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexPagechecker",
-        "ua"      : "Mozilla/5.0 (compatible; YandexPagechecker/1.0; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexPagechecker",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexSearchShop",
-        "ua"      : "Mozilla/5.0 (compatible; YandexSearchShop/1.0; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexSearchShop",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexSitelinks",
-        "ua"      : "Mozilla/5.0 (compatible; YandexSitelinks; Dyatel; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexSitelinks",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "YandexUserproxy",
-        "ua"      : "Mozilla/5.0 (compatible; YandexUserproxy; robot; +http://yandex.com/bots)",
-        "expect"  :
-        {
-            "name"    : "YandexUserproxy",
-            "version" : "undefined",
-            "type"    : "fetcher"
-        }
-    },
-    {
-        "desc"    : "Zoombot",
-        "ua"      : "Mozilla/5.0 (compatible; Zoombot/1.0; +https://zoom.us; crawler@domain.com)",
-        "expect"  :
-        {
-            "name"    : "Zoombot",
-            "version" : "1.0",
-            "type"    : "fetcher"
-        }
    }
 ]
--- a/test/data/ua/extension/inapp.json
+++ b/test/data/ua/extension/inapp.json
@@ -1,202 +0,0 @@
-[
-    {
-        "desc"    : "Discord on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) discord/0.0.26 Chrome/108.0.5359.215 Electron/22.3.2 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "discord",
-            "version" : "0.0.26",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Discord on iPad",
-        "ua"      : "Discord/52.0 (iPad; iOS 14.4; Scale/2.00)",
-        "expect"  :
-        {
-            "name"    : "Discord",
-            "version" : "52.0",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Evernote on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Evernote Windows/306387 (pt-PT, DDL); Windows/6.1.0 (Win32); Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Evernote",
-            "version" : "undefined",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Figma on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) Figma/99.0.0 Chrome/89.0.4389.128 Electron/12.0.9 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Figma",
-            "version" : "99.0.0",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Flipboard on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 8.0.0; SM-A720F Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36 Flipboard/4.1.13/4342,4.1.13.4342",
-        "expect"  :
-        {
-            "name"    : "Flipboard",
-            "version" : "4.1.13",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Mattermost on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Mattermost/4.4.0 Chrome/76.0.3809.146 Electron/6.1.7 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mattermost",
-            "version" : "4.4.0",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Mattermost on iPad",
-        "ua"      : "Mattermost/1.49.1 (iPad; iOS 15.3.1; Scale/2.00)",
-        "expect"  :
-        {
-            "name"    : "Mattermost",
-            "version" : "1.49.1",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Microsoft Teams on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_3_1) AppleWebKit/537.36 (KHTML, like Gecko) Teams/1.8.00.3758 Chrome/126.0.6478.261 Electron/31.7.7 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Teams",
-            "version" : "1.8.00.3758",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Microsoft Teams on iPad",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 TeamsMobile-iOS",
-        "expect"  :
-        {
-            "name"    : "Teams",
-            "version" : "undefined",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Microsoft Teams on iPhone",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 TeamsMobile-iOS",
-        "expect"  :
-        {
-            "name"    : "Teams",
-            "version" : "undefined",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Microsoft Teams on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0; SM-G610F Build/M1AJQ; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.101 Mobile Safari/537.36 TeamsMobile-Android",
-        "expect"  :
-        {
-            "name"    : "Teams",
-            "version" : "undefined",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Notion on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Notion/2.0.23 Chrome/91.0.4472.164 Electron/13.6.9 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Notion",
-            "version" : "2.0.23",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Postman on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Postman/9.29.0 Chrome/94.0.4606.81 Electron/15.5.7 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Postman",
-            "version" : "9.29.0",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Rambox on mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Rambox/0.7.7 Chrome/78.0.3904.130 Electron/7.2.4 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Rambox",
-            "version" : "0.7.7",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Rocket.Chat on mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Rocket.Chat/3.8.16 Chrome/106.0.5249.199 Electron/21.3.3 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Rocket.Chat",
-            "version" : "3.8.16",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Slack on mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Slack/4.39.90 Chrome/127.0.6533.72 Electron/13.1.9 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Slack",
-            "version" : "4.39.90",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "TikTok Lite",
-        "ua"      : "Mozilla/5.0 (Linux; Android 8.0.0; SM-J400F Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 Channel/release AppName/ultralite app_version/27.2.3 Region/ID ByteLocale/id-ID ByteFullLocale/id-ID",
-        "expect"  :
-        {
-            "name"    : "TikTok Lite",
-            "version" : "27.2.3",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "VS Code on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Code/1.85.1 Chrome/114.0.5735.289 Electron/25.9.7 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "VS Code",
-            "version" : "1.85.1",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Yahoo! Japan on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 13; SH-M20 Build/TKQ1.220915.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.163 Mobile Safari/537.36 YJApp-ANDROID jp.co.yahoo.android.yjtop/3.187.0",
-        "expect"  :
-        {
-            "name"    : "Yahoo! Japan",
-            "version" : "3.187.0",
-            "type"    : "inapp"
-        }
-    },
-    {
-        "desc"    : "Yahoo! Japan on iOS",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 18_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 YJApp-IOS jp.co.yahoo.ipn.appli/4.131.0",
-        "expect"  :
-        {
-            "name"    : "Yahoo! Japan",
-            "version" : "4.131.0",
-            "type"    : "inapp"
-        }
-    }
-]
--- a/test/data/ua/extension/library.json
+++ b/test/data/ua/extension/library.json
@@ -1,24 +1,4 @@
 [
-    {
-        "desc"    : "AdobeAIR",
-        "ua"      : "Mozilla/5.0 (Windows; U; en-US) AppleWebKit/533.19.4 (KHTML, like Gecko) AdobeAIR/3.1",
-        "expect"  :
-        {
-            "name"    : "AdobeAIR",
-            "version" : "3.1",
-            "type"    : "library"
-        }
-    },
-    {
-        "desc"    : "aiohttp",
-        "ua"      : "Python/3.9 aiohttp/3.8.1",
-        "expect"  :
-        {
-            "name"    : "aiohttp",
-            "version" : "3.8.1",
-            "type"    : "library"
-        }
-    },
    {
        "desc"    : "Apache-HttpClient",
        "ua"      : "Apache-HttpClient/4.5.14 (Java/17.0.12)",
@@ -129,16 +109,6 @@
            "type"    : "library"
        }
    },
-    {
-        "desc"    : "Nutch",
-        "ua"      : "AliyunSecBot/Nutch-1.21-SNAPSHOT",
-        "expect"  :
-        {
-            "name"    : "Nutch",
-            "version" : "1.21-SNAPSHOT",
-            "type"    : "library"
-        }
-    },
    {
        "desc"    : "OkHttp",
        "ua"      : "okhttp/3.2.0",
@@ -179,16 +149,6 @@
            "type"    : "library"
        }
    },
-    {
-        "desc"    : "Python httpx",
-        "ua"      : "python-httpx/0.27.2",
-        "expect"  :
-        {
-            "name"    : "python-httpx",
-            "version" : "0.27.2",
-            "type"    : "library"
-        }
-    },
    {
        "desc"    : "Python urllib",
        "ua"      : "Python-urllib/2.6",
@@ -199,16 +159,6 @@
            "type"    : "library"
        }
    },
-    {
-        "desc"    : "Python urllib3",
-        "ua"      : "python-urllib3/1.26.18",
-        "expect"  :
-        {
-            "name"    : "python-urllib3",
-            "version" : "1.26.18",
-            "type"    : "library"
-        }
-    },
    {
        "desc"    : "Python requests",
        "ua"      : "python-requests/2.32",
--- a/test/data/ua/extension/vehicle.json
+++ b/test/data/ua/extension/vehicle.json
@@ -1,62 +0,0 @@
-[
-    {
-        "desc"    : "BMW",
-        "ua"      : "Mozilla/5.0 (Linux; Android 9; AFTLBT962E2) AppleWebKit/537.36 (KHTML, like Gecko) Silk/118.3.1 like Chrome/118.0.5993.155 Safari/537.36",
-        "expect"  :
-        {
-            "vendor" : "BMW",
-            "model"  : "undefined",
-            "type"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "BYD",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; DiLink3.0 For BYD AUTO Build/QKQ1.200816.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.186 Safari/537.36",
-        "expect"  :
-        {
-            "vendor" : "BYD",
-            "model"  : "undefined",
-            "type"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Jeep",
-        "ua"      : "Mozilla/5.0 (Linux; Android 9; AFTLFT962X3) AppleWebKit/537.36 (KHTML, like Gecko) Silk/124.5.2 like Chrome/124.0.6367.248 Safari/537.36",
-        "expect"  :
-        {
-            "vendor" : "Jeep",
-            "model"  : "Wagooner",
-            "type"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Rivian",
-        "ua"      : "Dalvik/2.1.0 (Linux; U; Android 10; Rivian R1T Build/QQ3A.200605.002)",
-        "expect"  :
-        {
-            "vendor" : "Rivian",
-            "model"  : "R1T",
-            "type"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Tesla",
-        "ua"      : "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/537.36 (KHTML, like Gecko) Chromium/79.0.3945.130 Chrome/79.0.3945.130 Safari/537.36 Tesla/2020.36.16-3e9e4e8dd287",
-        "expect"  :
-        {
-            "vendor" : "Tesla",
-            "model"  : "undefined",
-            "type"   : "embedded"
-        }
-    },
-    {
-        "desc"    : "Volvo",
-        "ua"      : "Mozilla/5.0 (VCC; 1.0; like Gecko) NetFront/4.2",
-        "expect"  :
-        {
-            "vendor" : "Volvo",
-            "model"  : "undefined",
-            "type"   : "undefined"
-        }
-    }
-]
--- a/test/data/ua/os/aix.json
+++ b/test/data/ua/os/aix.json
@@ -7,32 +7,5 @@
            "name"    : "AIX",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "AIX",
-        "ua"      : "Mozilla/5.0 (AIX; SPARC64; smart-thumbtack; Mosaic/2.7) Gecko/20100101 Mosaic/2.7",
-        "expect"  :
-        {
-            "name"    : "AIX",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "AIX",
-        "ua"      : "Mozilla/5.0 (X11; N; Linux i686; en-US; rv:1.8.1.12) Gecko/20080219 Firefox/2.0.0.12 Mozilla/3.0 (X11; I; AIX 2) Navigator/9.0.0.6",
-        "expect"  :
-        {
-            "name"    : "AIX",
-            "version" : "2"
-        }
-    },
-    {
-        "desc"    : "AIX",
-        "ua"      : "Mozilla/5.0 (X11; U; AIX 7.2; en-US; rv:1.7.12) Gecko/20100101 Firefox/126.0",
-        "expect"  :
-        {
-            "name"    : "AIX",
-            "version" : "7.2"
-        }
    }
 ]
--- a/test/data/ua/os/arcaos.json
+++ b/test/data/ua/os/arcaos.json
@@ -1,20 +0,0 @@
-[
-    {
-        "desc"    : "ArcaOS",
-        "ua"      : "Mozilla/5.0 (OS/2; ArcaOS 5.0.6; x86_64; rv:89.0) Gecko/20100101 Firefox/89.0",
-        "expect"  :
-        {
-            "name"    : "ArcaOS",
-            "version" : "5.0.6"
-        }
-    },
-    {
-        "desc"    : "ArcaOS",
-        "ua"      : "Mozilla/5.0 (OS/2; ArcaOS; x64; rv:89.0) Gecko/20100101 Firefox/89.0",
-        "expect"  :
-        {
-            "name"    : "ArcaOS",
-            "version" : "undefined"
-        }
-    }
-]
--- a/test/data/ua/os/arch.json
+++ b/test/data/ua/os/arch.json
@@ -1,22 +1,4 @@
 [
-    {
-        "desc"    : "Arch",
-        "ua"      : "Mozilla/5.0 (X11; Arch Linux i686; rv:2.0) Gecko/20100101 Firefox/126.1",
-        "expect"  :
-        {
-            "name"    : "Arch",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Arch",
-        "ua"      : "Mozilla/5.0 ArchLinux (X11; Linux x86_64) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.41 Safari/535.1",
-        "expect"  :
-        {
-            "name"    : "Arch",
-            "version" : "undefined"
-        }
-    },
    {
        "desc"    : "Arch",
        "ua"      : "Uzbl (Webkit 1.1.10) (Arch Linux)",
--- a/test/data/ua/os/debian.json
+++ b/test/data/ua/os/debian.json
@@ -52,14 +52,5 @@
            "name"    : "Debian",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux sparc64; es-PY; rv:5.0) Gecko/20100101 IceCat/5.0 (like Firefox/5.0; Debian-6.0.1)",
-        "expect"  :
-        {
-            "name"    : "Debian",
-            "version" : "6.0.1"
-        }
    }
 ]
--- a/test/data/ua/os/fuchsia.json
+++ b/test/data/ua/os/fuchsia.json
@@ -7,14 +7,5 @@
            "name"    : "Fuchsia",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "Fuchsia",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36 Mozilla/5.0 (X11; Linux; Fuchsia; GoogleTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Large Screen Safari/537.36 GoogleTV",
-        "expect"  :
-        {
-            "name"    : "Fuchsia",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/data/ua/os/haiku.json
+++ b/test/data/ua/os/haiku.json
@@ -7,32 +7,5 @@
            "name"    : "Haiku",
            "version" : "R1"
        }
-    },
-    {
-        "desc"    : "Haiku",
-        "ua"      : "Mozilla/5.0 (X11; Haiku x86_64; rv:128.0) Gecko/20100101 Firefox/128.0",
-        "expect"  :
-        {
-            "name"    : "Haiku",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Haiku",
-        "ua"      : "Mozilla/5.0 (Haiku; BeOS; rv:99.0) Gecko/20100101 Firefox/99.0",
-        "expect"  :
-        {
-            "name"    : "Haiku",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Haiku",
-        "ua"      : "Mozilla/5.0 (X11; Haiku BePC) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.15.17 Chrome/87.0.4280.144 Safari/537.36 Dooble/2023.12.25 Dooble/2023.12.25",
-        "expect"  :
-        {
-            "name"    : "Haiku",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/data/ua/os/harmonyos.json
+++ b/test/data/ua/os/harmonyos.json
@@ -5,52 +5,7 @@
        "expect"  :
        {
            "name"    : "HarmonyOS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "HarmonyOS 2",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; STK-AL00 Build/HUAWEISTK-AL00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/88.0.4324.93 Mobile Safari/537.36 BDOS/1.0 (HarmonyOS 2.2.0) SP-engine/2.72.0 baiduboxapp/13.34.5.10 (Baidu; P1 10) NABar/1.0",
-        "expect"  :
-        {
-            "name"    : "HarmonyOS",
-            "version" : "2.2.0"
-        }
-    },
-    {
-        "desc"    : "HarmonyOS 3",
-        "ua"      : "Mozilla/5.0 (Linux; Android 12; Huawei P60 Pro Build/HarmonyOS 3.1.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.1.6136.139 Mobile Safari/537.36 OPR/111.11",
-        "expect"  :
-        {
-            "name"    : "HarmonyOS",
-            "version" : "3.1.0"
-        }
-    },
-    {
-        "desc"    : "HarmonyOS 4",
-        "ua"      : "Mozilla/5.0 (Android 12; HarmonyOS 4.0.0.118; OXF-AN00 Build/HUAWEIOXF-AN00; HMSCore 6.13.0.302; wv) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36 EdgA/125.0.0.0 Language/zh_TW ABI/arm64-v8a",
-        "expect"  :
-        {
-            "name"    : "HarmonyOS",
-            "version" : "4.0.0.118"
-        }
-    },
-    {
-        "desc"    : "HarmonyOS 4",
-        "ua"      : "Mozilla/5.0 (Linux; Android 12; HarmonyOS/4.0.3.601; JAD-AL50; HMSCore/6.13.0.320 Build/AP31.240223.016.A3; x64; ARM64) AppleWebKit/537.36 (KHTML, like Gecko) HuaweiBrowser/14.0.7.302 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "HarmonyOS",
-            "version" : "4.0.3.601"
-        }
-    },
-    {
-        "desc"    : "HarmonyOS 5",
-        "ua"      : "Mozilla/5.0 (PC; OpenHarmony 5.0; HarmonyOS 5.0) AppleWebKit/537.36 (KHTML,like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Browser/harmony360Browser/1.0.0",
-        "expect"  :
-        {
-            "name"    : "HarmonyOS",
-            "version" : "5.0"
+            "version" : "10"
        }
    }
 ]
--- a/test/data/ua/os/ios.json
+++ b/test/data/ua/os/ios.json
@@ -1,22 +1,4 @@
 [
-    {
-        "desc"    : "iOS 18.6",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.6 Mobile/15E148 Safari/604.1",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "18.6"
-        }
-    },
-    {
-        "desc"    : "iOS 26",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "26.0"
-        }
-    },
    {
        "desc"    : "iOS in App",
        "ua"      : "AppName/version CFNetwork/version Darwin/version",
@@ -35,15 +17,6 @@
            "version" : "5.1.1"
        }
    },
-    {
-        "desc"    : "iOS with DuckDuckGo",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1 Ddg/26.0",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "18.7"
-        }
-    },
    {
        "desc"    : "iOS with Opera Mini",
        "ua"      : "Opera/9.80 (iPhone; Opera Mini/7.1.32694/27.1407; U; en) Presto/2.8.119 Version/11.10",
@@ -62,33 +35,6 @@
            "version" : "13.6.1"
        }
    },
-    {
-        "desc": "iOS with Instagram",
-        "ua": "Instagram 5.0.2 (iPhone5,1; iPhone OS 7_0_4; en_US; en) AppleWebKit/420+",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "7.0.4"
-        }
-    },
-    {
-        "desc": "iOS with MS Word App",
-        "ua": "Microsoft Office Word/2.44.1211 (iOS/13.7; Tablet; es-MX; AppStore; Apple/iPad11,3)",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "13.7"
-        }
-    },
-    {
-        "desc": "iOS with Quora App",
-        "ua": "Quora 8.4.30 rv:3230 env:prod (iPad11,3; iPadOS 17.7; en_GB) AppleWebKit",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "17.7"
-        }
-    },
    {
        "desc": "iOS with Slack App",
        "ua": "com.tinyspeck.chatlyio/23.04.10 (iPhone; iOS 16.4.1; Scale/3.00)",
@@ -98,33 +44,6 @@
            "version" : "16.4.1"
        }
    },
-    {
-        "desc": "iOS with Snapchat",
-        "ua": "Snapchat/12.12.1.40 (iPhone15,2; iOS 16.2; gzip)",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "16.2"
-        }
-    },
-    {
-        "desc": "iOS with Spotify App",
-        "ua": "Spotify/8.7.70 iOS/16.0 (iPhone15,3)",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "16.0"
-        }
-    },
-    {
-        "desc": "iOS with TuneIn Radio App",
-        "ua": "TuneIn Radio/27.1.0; iPad6,3; iPadOS/16.6",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "16.6"
-        }
-    },
    {
        "desc"    : "iOS BE App",
        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
@@ -133,14 +52,5 @@
            "name"    : "iOS",
            "version" : "7.0.2"
        }
-    },
-    {
-        "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"
-        }
    }
 ]
--- a/test/data/ua/os/knoppix.json
+++ b/test/data/ua/os/knoppix.json
@@ -1,11 +0,0 @@
-[
-    {
-        "desc"    : "Knoppix",
-        "ua"      : "Mozilla/5.0 (Knoppix; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.3",
-        "expect"  :
-        {
-            "name"    : "Knoppix",
-            "version" : "undefined"
-        }
-    }
-]
--- a/test/data/ua/os/kubuntu.json
+++ b/test/data/ua/os/kubuntu.json
@@ -7,14 +7,5 @@
            "name"    : "Kubuntu",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "Kubuntu",
-        "ua"      : "Mozilla/5.0 (Kubuntu; Linux x86_64; rv:124.0) Gecko/20100101 Firefox/124.0",
-        "expect"  :
-        {
-            "name"    : "Kubuntu",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/data/ua/os/linux.json
+++ b/test/data/ua/os/linux.json
@@ -5,16 +5,7 @@
        "expect"  :
        {
            "name"    : "Linux",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Linux",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
-        "expect"  :
-        {
-            "name"    : "Linux",
-            "version" : "undefined"
+            "version" : "x86_64"
        }
    }
 ]
--- a/test/data/ua/os/maemo.json
+++ b/test/data/ua/os/maemo.json
@@ -7,23 +7,5 @@
            "name"    : "Maemo",
            "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"
-        }
    }
 ]
--- a/test/data/ua/os/mint.json
+++ b/test/data/ua/os/mint.json
@@ -25,104 +25,5 @@
            "name"    : "Mint",
            "version" : "6"
        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.5) Gecko/2008121622 Linux Mint/6 (Felicia) Firefox/3.0.4",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "6"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Opera/9.80 (X11; Linux i686; Edition Linux Mint) Presto/2.12.388 Version/12.15",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Opera/9.51 (X11; Linux i686; U; Linux Mint; en)",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; Linux Mint/19.3 x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Brave Chrome/83.0.4103.97 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "19.3"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; Linux Mint/20 x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Kiwi Chrome/100.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "20"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; Linux Mint/20.2; x86_64) Gecko/20100101 Firefox/92.0.1",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "20.2"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; es-ES; rv:1.9.0.10) Gecko/2009042513 Linux Mint/5 (Elyssa) Firefox/3.0.10",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "5"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.11) Gecko/2009060308 Linux Mint/7 (Gloria) Firefox/54.0",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.3) Gecko/20091020 Linux Mint/8 (Helena) Firefox/3.5.3",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "8"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; es-ES; rv:2.0) Gecko/20100101 Linux Mint 16/Petra Firefox/25.0.1.",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "16"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (Linux x86_64; Mint 21.3) AppleWebKit/537.36 (KHTML, like Gecko) Brave/128.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "21.3"
-        }
    }
 ]
--- a/test/data/ua/os/morphos.json
+++ b/test/data/ua/os/morphos.json
@@ -7,32 +7,5 @@
            "name"    : "MorphOS",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "MorphOS",
-        "ua"      : "Mozilla/5.0 (Macintosh; PowerPC MorphOS 3.7; Odyssey Web Browser; rv:1.23) AppleWebKit/538.1 (KHTML, like Gecko) OWB/1.23 Safari/538.1",
-        "expect"  :
-        {
-            "name"    : "MorphOS",
-            "version" : "3.7"
-        }
-    },
-    {
-        "desc"    : "MorphOS",
-        "ua"      : "Mozilla/5.0 (X11; MorphOS ppc64; rv:88.0) Gecko/20100101 Firefox/88.0",
-        "expect"  :
-        {
-            "name"    : "MorphOS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "MorphOS",
-        "ua"      : "Mozilla/5.0 (compatible; Origyn Web Browser; MorphOS; PPC; U) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+)",
-        "expect"  :
-        {
-            "name"    : "MorphOS",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/data/ua/os/os2.json
+++ b/test/data/ua/os/os2.json
@@ -7,23 +7,5 @@
            "name"    : "OS/2",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "OS/2",
-        "ua"      : "Mozilla/5.0 (OS/2; OS/2 i386) AppleWebKit/538.36 (KHTML, like Gecko) QtWebEngine/5.15.2 Chrome/127.0.6533.72",
-        "expect"  :
-        {
-            "name"    : "OS/2",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "OS/2",
-        "ua"      : "Mozilla/5.0 (OS/2; Warp 4.5; rv:45.0) Gecko/20100101 Firefox/45.0",
-        "expect"  :
-        {
-            "name"    : "OS/2",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/data/ua/os/qnx.json
+++ b/test/data/ua/os/qnx.json
@@ -5,7 +5,7 @@
        "expect"  :
        {
            "name"    : "QNX",
-            "version" : "undefined"
+            "version" : "x86pc"
        }
    }
 ]
--- a/test/data/ua/os/solaris.json
+++ b/test/data/ua/os/solaris.json
@@ -5,16 +5,7 @@
        "expect"  :
        {
            "name"    : "Solaris",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Solaris",
-        "ua"      : "Mozilla/5.0 (Solaris; SPARC; w3m/0.5.3; rv:1.0) Gecko/20100101 w3m/0.5.3",
-        "expect"  :
-        {
-            "name"    : "Solaris",
-            "version" : "undefined"
+            "version" : "sun4u"
        }
    },
    {
@@ -25,23 +16,5 @@
            "name"    : "Solaris",
            "version" : "4.1.4"
        }
-    },
-    {
-        "desc"    : "Solaris",
-        "ua"      : "Opera/5.0 (SunOS 5.8 sun4m; U) [en]",
-        "expect"  :
-        {
-            "name"    : "Solaris",
-            "version" : "5.8"
-        }
-    },
-    {
-        "desc"    : "Solaris",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100215 Solaris/10.1 (GNU) Superswan/3.5.8 (Byte/me)",
-        "expect"  :
-        {
-            "name"    : "Solaris",
-            "version" : "10.1"
-        }
    }
 ]
--- a/test/data/ua/os/suse.json
+++ b/test/data/ua/os/suse.json
@@ -7,14 +7,5 @@
            "name"    : "SUSE",
            "version" : "3.6.17-0.2.1"
        }
-    },
-    {
-        "desc"    : "SUSE",
-        "ua"      : "Mozilla/5.0 (X11; SUSE; Linux amd64; rv:86.0) Gecko/20100101 Firefox/86.0",
-        "expect"  :
-        {
-            "name"    : "SUSE",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/data/ua/os/symbian.json
+++ b/test/data/ua/os/symbian.json
@@ -1,6 +1,6 @@
 [
    {
-        "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"  :
        {
@@ -9,57 +9,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"
        }
    }
 ]
--- a/test/data/ua/os/ubuntu-touch.json
+++ b/test/data/ua/os/ubuntu-touch.json
@@ -1,11 +0,0 @@
-[
-    {
-        "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"
-        }
-    }
-]
--- a/test/data/ua/os/ubuntu.json
+++ b/test/data/ua/os/ubuntu.json
@@ -16,32 +16,5 @@
            "name"    : "Ubuntu",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "Mozilla/5.0 (Wayland; Linux x86_64; Huawei) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Ubuntu/23.04 Edg/110.0.1587.41",
-        "expect"  :
-        {
-            "name"    : "Ubuntu",
-            "version" : "23.04"
-        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Ubuntu 20.04; Linux arm; rv:99.0) Gecko/20100101 Firefox/99.0",
-        "expect"  :
-        {
-            "name"    : "Ubuntu",
-            "version" : "20.04"
-        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16",
-        "expect"  :
-        {
-            "name"    : "Ubuntu",
-            "version" : "14.10"
-        }
    }
 ]
--- a/test/data/ua/os/webos.json
+++ b/test/data/ua/os/webos.json
@@ -1,6 +1,6 @@
 [
    {
-        "desc"    : "HP WebOS",
+        "desc"    : "WebOS",
        "ua"      : "Mozilla/5.0 (hp-tablet; Linux; hpwOS/3.0.5; U; en-US) AppleWebKit/534.6 (KHTML, like Gecko) wOSBrowser/234.83 Safari/534.6 TouchPad/1.0",
        "expect"  :
        {
@@ -9,7 +9,7 @@
        }
    },
    {
-        "desc"    : "Palm WebOS",
+        "desc"    : "WebOS",
        "ua"      : "Mozilla/5.0 (webOS/1.4.5; U; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pre/1.0",
        "expect"  :
        {
@@ -17,58 +17,13 @@
            "version" : "1.4.5"
        }
    },
-    {
-        "desc"    : "WebOS TV 22",
-        "ua"      : " Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chr0me/87.0.4280.88 Safari/537.36 LG Browser/8.00.00(LGE; ST50K-LG2200WEB; 04.42.26; 0x00000001; DTV_C22P); webOS.TV-2022; LG NetCast.TV-2013 Compatible (LGE, ST50K-LG2200WEB, wireless)",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "22"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 22",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 HbbTV/1.6.1 (+DRM; LGE/SILICONPLAYER/Hyundai; 50HYN3205; WEBOS22 04.42.26; W22_K8LP; DTV_C22P;)",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "22"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 5.0",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chr0me/68.0.3440.106 Safari/537.36 LG Browser/8.00.00(LGE; SWU-6522; 04.50.63; 0x00000001; DTV_C20P); webOS.TV-2020; LG NetCast.TV-2013 Compatible (LGE, SWU-6522, wireless)",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "5"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 5.0",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36 HbbTV/1.5.1 (+DRM; LGE/WALTON/Hyundai; 50HYN3205; WEBOS5.0 04.50.63; W50_K6LP; DTV_C20P;)",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "5.0"
-        }
-    },
    {
        "desc"    : "WebOS TV 5.x",
        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36 WebAppManager",
        "expect"  :
        {
            "name"    : "webOS",
-            "version" : "5"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 5.x",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chr0me/68.0.3440.106 Safari/537.36 LG Browser/8.00.00(LGE; E65A71B-S; 04.50.63; 0x00000001; DTV_C20P); webOS.TV-2020; LG NetCast.TV-2013 Compatible (LGE, E65A71B-S, wired)",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "5"
+            "version" : "TV"
        }
    },
    {
@@ -77,16 +32,7 @@
        "expect"  :
        {
            "name"    : "webOS",
-            "version" : "4"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 3.5",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.122 Safari/537.36 HbbTV/1.3.1 ( DRM; LGE; OLED55B7V-T; WEBOS3.5 06.10.60; W3_M16P; ) FVC/2.0 (LGE; WEBOS3.5 ;)",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "3.5"
+            "version" : "TV"
        }
    },
    {
@@ -95,7 +41,7 @@
        "expect"  :
        {
            "name"    : "webOS",
-            "version" : "3"
+            "version" : "TV"
        }
    },
    {
@@ -104,7 +50,7 @@
        "expect"  :
        {
            "name"    : "webOS",
-            "version" : "2"
+            "version" : "TV"
        }
    },
    {
@@ -113,7 +59,7 @@
        "expect"  :
        {
            "name"    : "webOS",
-            "version" : "1"
+            "version" : "TV"
        }
    }
 ]
--- a/test/data/ua/os/windows-ce.json
+++ b/test/data/ua/os/windows-ce.json
@@ -1,20 +0,0 @@
-[
-    {
-        "desc"    : "Windows CE",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11)",
-        "expect"  :
-        {
-            "name"    : "Windows CE",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Windows CE",
-        "ua"      : "Mozilla/4.0 (PDA; Windows CE/1.0.1) NetFront/3.0",
-        "expect"  :
-        {
-            "name"    : "Windows CE",
-            "version" : "1.0.1"
-        }
-    }
-]
--- a/test/data/ua/os/windows-iot.json
+++ b/test/data/ua/os/windows-iot.json
@@ -1,11 +0,0 @@
-[
-    {
-        "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"
-        }
-    }
-]
--- a/test/data/ua/os/windows-mobile.json
+++ b/test/data/ua/os/windows-mobile.json
@@ -16,23 +16,5 @@
            "name"    : "Windows Mobile",
            "version" : "undefined"
        }
-    },
-    {
-        "desc"    : "Windows Mobile",
-        "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
-        "expect"  :
-        {
-            "name"    : "Windows Mobile",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Windows Mobile 6.1",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11) 320x240; VZW; Motorola-Q9c; Windows Mobile 6.1 Standard",
-        "expect"  :
-        {
-            "name"    : "Windows Mobile",
-            "version" : "6.1"
-        }
    }
 ]
--- a/test/data/ua/os/windows-phone.json
+++ b/test/data/ua/os/windows-phone.json
@@ -9,32 +9,14 @@
        }
    },
    {
-        "desc"    : "Windows Phone 6.5",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; HTC_Touch2_T3333; Windows Phone 6.5)",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "6.5"
-        }
-    },
-    {
-        "desc"    : "Windows Phone 7.0",
+        "desc"    : "Windows Phone OS",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DELL; Venue Pro)",
        "expect"  :
        {
-            "name"    : "Windows Phone",
+            "name"    : "Windows Phone OS",
            "version" : "7.0"
        }
    },
-    {
-        "desc"    : "Windows Phone 7.5",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; NOKIA; Lumia 800)",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "7.5"
-        }
-    },
    {
        "desc"    : "Windows Phone 8",
        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HTC; Windows Phone 8X by HTC)",
@@ -43,14 +25,5 @@
            "name"    : "Windows Phone",
            "version" : "8.0"
        }
-    },
-    {
-        "desc"    : "Windows Phone 8.1",
-        "ua"      : "Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 635) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "8.1"
-        }
    }
 ]
--- a/test/data/ua/os/windows-rt.json
+++ b/test/data/ua/os/windows-rt.json
@@ -1,20 +0,0 @@
-[
-    {
-        "desc"    : "Windows RT 8",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
-        "expect"  :
-        {
-            "name"    : "Windows RT",
-            "version" : "8"
-        }
-    },
-    {
-        "desc"    : "Windows RT 8.1",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.3; ARM; Trident/7.0; Touch; rv:11.0) like Gecko",
-        "expect"  :
-        {
-            "name"    : "Windows RT",
-            "version" : "8.1"
-        }
-    }
-]
--- a/test/data/ua/os/windows.json
+++ b/test/data/ua/os/windows.json
@@ -1,103 +1,4 @@
 [
-    {
-        "desc"    : "Windows 3.1",
-        "ua"      : "NCSA_Mosaic/2.0 (Windows 3.1)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "3.1"
-        }
-    },
-    {
-        "desc"    : "Windows 3.1",
-        "ua"      : "Mozilla/1.22 (compatible; MSIE 2.0; Windows 3.1)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "3.1"
-        }
-    },
-    {
-        "desc"    : "Windows NT",
-        "ua"      : "Mozilla/4.51 [de] (WinNT; I)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "NT"
-        }
-    },
-    {
-        "desc"    : "Windows NT 3.51",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 4.0; Windows NT)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "NT"
-        }
-    },
-    {
-        "desc"    : "Windows NT 3.51",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.05; Windows NT 3.51)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "NT 3.51"
-        }
-    },
-    {
-        "desc"    : "Windows NT 4.0",
-        "ua"      : "Opera/8.41.(Windows NT 4.0; ts-ZA) Presto/2.9.178 Version/11.00",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "NT 4.0"
-        }
-    },
-    {
-        "desc"    : "Windows NT 4.0",
-        "ua"      : "Mozilla/5.0 (Windows; U; WinNT4.0; de-DE; rv:1.7.5) Gecko/20041108 Firefox/52.7.4",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "NT 4.0"
-        }
-    },
-    {
-        "desc"    : "Netscape on Windows 95",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win95; de-DE; rv:0.9.2) Gecko/20010726 Netscape6/6.1",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "95"
-        }
-    },
-    {
-        "desc"    : "Windows 95",
-        "ua"      : "Mozilla/3.0 (Win95)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "95"
-        }
-    },
-    {
-        "desc"    : "Windows 95",
-        "ua"      : "Mozilla/3.0 (compatible; Opera/3.0; Windows 95/NT4) 3.2",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "95"
-        }
-    },
-    {
-        "desc"    : "Windows 95",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0; Windows 95) Opera 6.02 [en]",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "95"
-        }
-    },
    {
        "desc"    : "Windows 95",
        "ua"      : "Mozilla/1.22 (compatible; MSIE 2.0; Windows 95)",
@@ -116,24 +17,6 @@
            "version" : "98"
        }
    },
-    {
-        "desc"    : "Firebird on Windows 98",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.5) Gecko/20031007 Firebird/0.7",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "98"
-        }
-    },
-    {
-        "desc"    : "K-Meleon on Windows 98",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.5) Gecko/20031016 K-Meleon/0.8.2",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "98"
-        }
-    },
    {
        "desc"    : "Windows ME",
        "ua"      : "Mozilla/5.0 (Windows; U; Win 9x 4.90) Gecko/20020502 CS 2000 7.0/7.0",
@@ -143,51 +26,6 @@
            "version" : "ME"
        }
    },
-    {
-        "desc"    : "Opera on Windows ME",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0; Windows ME) Opera 5.12 [de]",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "ME"
-        }
-    },
-    {
-        "desc"    : "Netscape on Windows ME",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win 9x 4.90; en-US; rv:1.8.1.8pre) Gecko/20071015 Firefox/2.0.0.7 Navigator/9.0",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "ME"
-        }
-    },
-    {
-        "desc"    : "Netscape on Windows 2000",
-        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.5) Gecko/20050519 Netscape/8.0.1",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "2000"
-        }
-    },
-    {
-        "desc"    : "Opera on Windows 2000",
-        "ua"      : "Opera/6.05 (Windows 2000; U)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "2000"
-        }
-    },
-    {
-        "desc"    : "Opera on Windows 2000",
-        "ua"      : "Opera/9.69 (Windows NT 5.01; en-US) Presto/2.8.160 Version/10.00",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "2000"
-        }
-    },
    {
        "desc"    : "Windows 2000",
        "ua"      : "Mozilla/3.0 (compatible; MSIE 3.0; Windows NT 5.0)",
@@ -206,15 +44,6 @@
            "version" : "XP"
        }
    },
-    {
-        "desc"    : "Windows XP",
-        "ua"      : "Mozilla/5.0 (Windows XP; U) Opera 6.05  [de]",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "XP"
-        }
-    },
    {
        "desc"    : "Windows Vista",
        "ua"      : "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.0; fr-FR)",
@@ -224,33 +53,6 @@
            "version" : "Vista"
        }
    },
-    {
-        "desc"    : "Windows 7",
-        "ua"      : "Microsoft Windows 7",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "Windows 7",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Evernote Windows/306387 (pt-PT, DDL); Windows/6.1.0 (Win32); Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "Windows 7",
-        "ua"      : "Mozilla/5.0 (Windows 7 Enterprise; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6099.71 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
    {
        "desc"    : "Windows 7",
        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)",
@@ -269,15 +71,6 @@
            "version" : "8"
        }
    },
-    {
-        "desc"    : "Windows 8.1",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.3; WOW64; rv:66.0.5) Gecko/20100101 Firefox/66.0.5",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "8.1"
-        }
-    },
    {
        "desc"    : "Windows 10",
        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
@@ -287,15 +80,6 @@
            "version" : "10"
        }
    },
-    {
-        "desc"    : "Windows Server 2012 R2",
-        "ua"      : "Mozilla/5.0 (Windows Server 2012 R2 Standard; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.5975.80 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "Server 2012 R2"
-        }
-    },
    {
        "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",
@@ -315,75 +99,48 @@
        }
    },
    {
-        "desc"    : "iTunes on Windows Vista",
+        "desc"    : "Windows RT",
+        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "RT"
+        }
+    },
+    {
+        "desc"    : "Windows CE",
+        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11)",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "CE"
+        }
+    },
+    {
+        "desc"    : "Windows NT on x86 or aarch64 CPU using Firefox",
+        "ua"      : "Mozilla/5.0 (Windows NT x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "NT x"
+        }
+    },
+    {
+        "desc"    : "Windows NT on x64 CPU using Firefox",
+        "ua"      : "Mozilla/5.0 (Windows NT x.y; Win64; x64; rv:10.0) Gecko/20100101 Firefox/10.0",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "NT x"
+        }
+    },
+    {
+        "desc"    : "iTunes Windows Vista",
        "ua"      : "iTunes/10.7 (Windows; Microsoft Windows Vista Home Premium Edition Service Pack 1 (Build 6001)) AppleWebKit/536.26.9",
        "expect"  :
        {
            "name"    : "Windows",
            "version" : "Vista"
        }
-    },
-    {
-        "desc"    : "iTunes on Windows 7",
-        "ua"      : "iTunes/10.6.3 (Windows; Microsoft Windows 7 x64 Business Edition Service Pack 1 (Build 7601)) AppleWebKit/534.57.2",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "iTunes on Windows 8",
-        "ua"      : "iTunes/12.1.1 (Windows; Microsoft Windows 8 x64 Business Edition (Build 9200)) AppleWebKit/7600.1017.9000.2",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "8"
-        }
-    },
-    {
-        "desc"    : "iTunes on Windows 8.1",
-        "ua"      : "iTunes/12.4 (Windows; Microsoft Windows 8.1 x64 Business Edition (Build 9200); x64) AppleWebKit/7601.6016.1000.1",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "8.1"
-        }
-    },
-    {
-        "desc"    : "iTunes on Windows 10",
-        "ua"      : "iTunes/12.9.1 (Windows; Microsoft Windows 10 x64 Professional Edition (Build 18362); x64) AppleWebKit/7606.2104.0.21",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "10"
-        }
-    },
-    {
-        "desc"    : "iTunes on Windows 10",
-        "ua"      : "iTunes/12.6.3 (Windows; Microsoft Windows 10.0 x64 (Build 17763); x64) AppleWebKit/7604.1038.1006.6",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "10"
-        }
-    },
-    {
-        "desc"    : "iTunes on Windows 10 S",
-        "ua"      : "iTunes/12.12 (Windows; Microsoft Windows 10 S x64; x64) AppleWebKit/7613.2007",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "10"
-        }
-    },
-    {
-        "desc"    : "iTunes on Windows 11",
-        "ua"      : "iTunes/12.13 (Windows; Microsoft Windows 11 x64; x64) AppleWebKit/7613.2007",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "11"
-        }
    }
 ]
--- a/test/data/ua/os/xubuntu.json
+++ b/test/data/ua/os/xubuntu.json
@@ -1,20 +0,0 @@
-[
-    {
-        "desc"    : "Xubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Xubuntu Linux 21.10 x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.81 Safari/537.57 Vivaldi/5.1.2 (Blink)",
-        "expect"  :
-        {
-            "name"    : "Xubuntu",
-            "version" : "21.10"
-        }
-    },
-    {
-        "desc"    : "Xubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Xubuntu 14.04.5 LTS) AppleWebKit/537.36 (KHTML, like Gecko) Xubuntu Chrome/66.0.2623.87 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Xubuntu",
-            "version" : "14.04.5"
-        }
-    }
-]
--- a/test/data/ua/os/zenwalk.json
+++ b/test/data/ua/os/zenwalk.json
@@ -7,14 +7,5 @@
            "name"    : "Zenwalk",
            "version" : "7.3"
        }
-    },
-    {
-        "desc"    : "Zenwalk",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; de; rv:1.9.2.13) Gecko/20101221 IceCat/3.6.13 (like Firefox/3.6.13) (Zenwalk GNU Linux)",
-        "expect"  :
-        {
-            "name"    : "Zenwalk",
-            "version" : "undefined"
-        }
    }
 ]
--- a/test/unit/cli/cli.spec.js
+++ b/test/unit/cli/cli.spec.js
@@ -1,37 +0,0 @@
-const assert = require('node:assert');
-const { exec } = require('node:child_process');
-const fs = require('node:fs');
-const { UAParser } = require('../../../src/main/ua-parser');
-const uap = new UAParser();
-
-const input = [
-    'Opera/9.25 (Windows NT 6.0; U; ru)',
-    'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
-];
-const output = input.map(x => uap.setUA(x).getResult());
-
-describe('npx ua-parser-js <string>', () => {
-    it ('print result to stdout', () => {
-        exec('npx ua-parser-js "TEST"', (err, stdout, stderr) => {
-            assert.deepEqual(JSON.parse(stdout), JSON.parse(JSON.stringify([uap.setUA("TEST").getResult()])));
-        });
-    })
-});
-
-describe('npx ua-parser-js --input-file=<filepath>', () => {
-    it ('load file and print result to stdout', () => {
-        exec('npx ua-parser-js --input-file="../test/unit/cli/input.txt"', (err, stdout, stderr) => {
-            assert.deepEqual(JSON.parse(stdout), JSON.parse(JSON.stringify(output)));
-        });
-    });
-});
-
-describe('npx ua-parser-js --input-file=<filepath> --output-file=<filepath>', () => {
-    it ('load file and save result to file', () => {
-        exec('npx ua-parser-js --input-file="../test/unit/cli/input.txt" --output-file="../test/unit/cli/output.json"', (err, stdout, stderr) => {
-            fs.readFile('test/unit/cli/output.json', (err, data) => {
-                assert.deepEqual(JSON.parse(data), JSON.parse(JSON.stringify(output)));
-            });
-        });
-    });
-});
--- a/test/unit/cli/input.txt
+++ b/test/unit/cli/input.txt
@@ -1,2 +0,0 @@
-Opera/9.25 (Windows NT 6.0; U; ru)
-Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Faisal Salman	638e237c8d	[device-utils] Add new method: `getMarketingName()`	2024-12-02 16:15:35 +07:00
Faisal Salman	d177b83965	NEW SUBMODULE: `device-utils`	2024-12-02 10:45:39 +07:00