diff --git a/parser/client/browser-families.js b/parser/client/browser-families.js
index 48fdb50b..7499cc8c 100644
--- a/parser/client/browser-families.js
+++ b/parser/client/browser-families.js
@@ -33,7 +33,7 @@ module.exports = {
   'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'P5', 'H5', 'V3',
   'K3', 'Q4', 'G2', 'R2', 'WX', 'XP', '3I', 'BG', 'R0',
   'JO', 'OL', 'GN', 'W4', 'QI', 'E1', 'RI', '8B', '5B',
-  'K4',
+  'K4', 'WK',
   ],
   'Firefox': [
   'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
@@ -41,7 +41,7 @@ module.exports = {
   'IW', 'LH', 'LY', 'MB', 'MN', 'MO', 'MY', 'OA', 'OS',
   'PI', 'PX', 'QA', 'S5', 'SX', 'TF', 'TO', 'WF', 'ZV',
   'FP', 'AD', 'WL', '2I', 'P9', 'KJ', 'WY', 'VK', 'W5',
-  '7C', 'N7',
+  '7C', 'N7', 'W7', '8P',
   ],
   'Internet Explorer': ['IE', 'CZ', 'BZ', 'IM', 'PS', '3A', '4A', 'RN'],
   'Konqueror': ['KO'],
diff --git a/parser/client/browser-short-mobile.js b/parser/client/browser-short-mobile.js
index 61bc00e3..23f6c08e 100644
--- a/parser/client/browser-short-mobile.js
+++ b/parser/client/browser-short-mobile.js
@@ -20,6 +20,6 @@ module.exports = [
   'H5', 'V3', 'G2', 'BG', 'OL', 'II', 'TL', 'M6', 'Y3',
   'M7', 'GN', 'D3', 'IG', 'HW', '4O', 'OU', '5P', 'KE',
   '5A', 'TT', '6P', 'G3', '7P', 'VU', 'F8', 'L4', 'DK',
-  'DP', 'KL', 'K4', 'N6', 'KU',
+  'DP', 'KL', 'K4', 'N6', 'KU', 'WK',
   
 ];
diff --git a/parser/client/browser-short.js b/parser/client/browser-short.js
index 9e71a951..926448c0 100755
--- a/parser/client/browser-short.js
+++ b/parser/client/browser-short.js
@@ -71,6 +71,7 @@ module.exports = {
   'VG': 'AVG Secure Browser',
   'AC': 'Avira Secure Browser',
   'A1': 'AwoX',
+  '7A': 'Awesomium',
   '5B': 'Basic Web Browser',
   'BA': 'Beaker Browser',
   'BM': 'Beamrise',
@@ -423,6 +424,7 @@ module.exports = {
   'PL': 'Palm Blazer',
   'PM': 'Pale Moon',
   'PY': 'Polypane',
+  '8P': 'Prism',
   'PP': 'Oppo Browser',
   'P6': 'Opus Browser',
   'PR': 'Palm Pre',
@@ -454,6 +456,7 @@ module.exports = {
   'P0': 'PronHub Browser',
   'PC': 'PSI Secure Browser',
   'RW': 'Reqwireless WebViewer',
+  'RO': 'Roccat',
   'PS': 'Microsoft Edge',
   'QA': 'Qazweb',
   'QI': 'Qiyu',
@@ -537,6 +540,7 @@ module.exports = {
   'S4': 'Steam In-Game Overlay',
   'ST': 'Streamy',
   'SX': 'Swiftfox',
+  'W7': 'Swiftweasel',
   'SZ': 'Seznam Browser',
   'W1': 'Sweet Browser',
   '2X': 'SX Browser',
@@ -602,6 +606,7 @@ module.exports = {
   'WT': 'WeTab Browser',
   '1W': 'World Browser',
   'WL': 'Wolvic',
+  'WK': 'Wukong Browser',
   'WY': 'Wyzo',
   'YG': 'YAGI',
   'YJ': 'Yahoo! Japan Browser',
diff --git a/parser/device/brand-short.js b/parser/device/brand-short.js
index af60199f..23fa679f 100755
--- a/parser/device/brand-short.js
+++ b/parser/device/brand-short.js
@@ -47,6 +47,7 @@ module.exports = {
   'Q3': 'AKIRA',
   '1A': 'Alba',
   'AL': 'Alcatel',
+  'AL0': 'Alienware',
   '20': 'Alcor',
   'XY': 'Alps',
   'XYA': 'XY Auto',
@@ -654,6 +655,7 @@ module.exports = {
   '8X': 'Hi Nova',
   'HLL': 'HLLO',
   'HKC': 'HKC',
+  'HMD': 'HMD',
   '8W': 'HKPro',
   'HOF': 'HOFER',
   'H1': 'Hoffmann',
@@ -1568,6 +1570,7 @@ module.exports = {
   'T1': 'Tolino',
   '0T': 'Tone',
   'TY': 'Tooky',
+  'TYD': 'TYD',
   'TOO': 'TOOGO',
   'T9': 'Top House',
   'DK': 'Topelotek',
@@ -1649,6 +1652,7 @@ module.exports = {
   'VP': 'Vargo',
   'VC': 'Vankyo',
   'VAL': 'VALEM',
+  'VA2': 'VALE',
   'VAT': 'VALTECH',
   'VAN': 'VANGUARD',
   'VAW': 'VANWIN',
diff --git a/parser/os/os_families.js b/parser/os/os_families.js
index 57516806..a95cec50 100755
--- a/parser/os/os_families.js
+++ b/parser/os/os_families.js
@@ -3,9 +3,9 @@ module.exports = {
   'Android': [
   'AND', 'CYN', 'FIR', 'REM', 'RZD', 'MLD', 'MCD', 'YNS', 'GRI', 'HAR',
   'ADR', 'CLR', 'BOS', 'REV', 'LEN', 'SIR', 'RRS', 'WER', 'PIC', 'ARM',
-  'HEL',
+  'HEL', 'BYI',
   ],
-  'AmigaOS': ['AMG', 'MOR'],
+  'AmigaOS': ['AMG', 'MOR', 'ARO'],
   'BlackBerry': ['BLB', 'QNX'],
   'Brew': ['BMP'],
   'BeOS': ['BEO', 'HAI'],
@@ -24,20 +24,22 @@ module.exports = {
   'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', 'CST',
   'NOV', 'ROU', 'ZOR', 'RED', 'KAL', 'ORA', 'VID', 'TIV', 'BSN', 'RAS',
   'UOS', 'PIO', 'FRI', 'LIR', 'WEB', 'SER', 'ASP', 'AOS', 'LOO', 'EUL',
-  'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE', 'RST',
+  'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE', 'RST', 'EZX', 'GNS', 'JOL',
+  'TUR', 'QTP', 'WPO',
   ],
   'Mac': ['MAC'],
   'Mobile Gaming Console': ['PSP', 'NDS', 'XBX'],
+  'OpenVMS': ['OVS'],
   'Real-time OS': ['MTK', 'TDX', 'MRE', 'JME', 'REX'],
-  'Other Mobile': ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE', 'LUN'],
+  'Other Mobile': ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE', 'LUN', 'GEO'],
   'Symbian': ['SYM', 'SYS', 'SY3', 'S60', 'S40'],
   'Unix': [
   'SOS', 'AIX', 'HPX', 'BSD', 'NBS', 'OBS', 'DFB', 'SYL', 'IRI', 'T64',
-  'INF', 'ELE',
+  'INF', 'ELE', 'GNX', 'ULT', 'NWS', 'NXT', 'SBL',
   ],
   'WebTV': ['WTV'],
   'Windows': ['WIN'],
-  'Windows Mobile': ['WPH', 'WMO', 'WCE', 'WRT', 'WIO'],
+  'Windows Mobile': ['WPH', 'WMO', 'WCE', 'WRT', 'WIO', 'KIN'],
   'Other Smart TV': ['WHS'],
   
 };
diff --git a/parser/os/os_systems.js b/parser/os/os_systems.js
index 3f83e78d..a25c56c0 100755
--- a/parser/os/os_systems.js
+++ b/parser/os/os_systems.js
@@ -7,12 +7,14 @@ module.exports = {
   'AMZ': 'Amazon Linux',
   'AMG': 'AmigaOS',
   'ARM': 'Armadillo OS',
+  'ARO': 'AROS',
   'ATV': 'tvOS',
   'ARL': 'Arch Linux',
   'AOS': 'AOSC OS',
   'ASP': 'ASPLinux',
   'BTR': 'BackTrack',
   'SBA': 'Bada',
+  'BYI': 'Baidu Yi',
   'BEO': 'BeOS',
   'BLB': 'BlackBerry OS',
   'QNX': 'BlackBerry Tablet OS',
@@ -45,6 +47,9 @@ module.exports = {
   'FYD': 'FydeOS',
   'FUC': 'Fuchsia',
   'GNT': 'Gentoo',
+  'GNX': 'GENIX',
+  'GEO': 'GEOS',
+  'GNS': 'gNewSense',
   'GRI': 'GridOS',
   'GTV': 'Google TV',
   'HPX': 'HP-UX',
@@ -56,9 +61,11 @@ module.exports = {
   'IRI': 'IRIX',
   'INF': 'Inferno',
   'JME': 'Java ME',
+  'JOL': 'Joli OS',
   'KOS': 'KaiOS',
   'KAL': 'Kali',
   'KAN': 'Kanotix',
+  'KIN': 'KIN OS',
   'KNO': 'Knoppix',
   'KTV': 'KreaTV',
   'KBT': 'Kubuntu',
@@ -79,18 +86,22 @@ module.exports = {
   'SMG': 'MeeGo',
   'MCD': 'MocorDroid',
   'MON': 'moonOS',
+  'EZX': 'Motorola EZX',
   'MIN': 'Mint',
   'MLD': 'MildWild',
   'MOR': 'MorphOS',
   'NBS': 'NetBSD',
   'MTK': 'MTK / Nucleus',
   'MRE': 'MRE',
+  'NXT': 'NeXTSTEP',
+  'NWS': 'NEWS-OS',
   'WII': 'Nintendo',
   'NDS': 'Nintendo Mobile',
   'NOV': 'Nova',
   'OS2': 'OS/2',
   'T64': 'OSF1',
   'OBS': 'OpenBSD',
+  'OVS': 'OpenVMS',
   'OVZ': 'OpenVZ',
   'OWR': 'OpenWrt',
   'OTV': 'Opera TV',
@@ -104,6 +115,7 @@ module.exports = {
   'PS3': 'PlayStation',
   'PVE': 'Proxmox VE',
   'PUR': 'PureOS',
+  'QTP': 'Qtopia',
   'PIO': 'Raspberry Pi OS',
   'RAS': 'Raspbian',
   'RHT': 'Red Hat',
@@ -128,6 +140,7 @@ module.exports = {
   'SIR': 'Sirin OS',
   'SLW': 'Slackware',
   'SOS': 'Solaris',
+  'SBL': 'Star-Blade OS',
   'SYL': 'Syllable',
   'SYM': 'Symbian',
   'SYS': 'Symbian OS',
@@ -139,7 +152,9 @@ module.exports = {
   'TIZ': 'Tizen',
   'TIV': 'TiVo OS',
   'TOS': 'TmaxOS',
+  'TUR': 'Turbolinux',
   'UBT': 'Ubuntu',
+  'ULT': 'ULTRIX',
   'UOS': 'UOS',
   'VID': 'VIDAA',
   'WAS': 'watchOS',
@@ -152,6 +167,7 @@ module.exports = {
   'WMO': 'Windows Mobile',
   'WPH': 'Windows Phone',
   'WRT': 'Windows RT',
+  'WPO': 'WoPhone',
   'XBX': 'Xbox',
   'XBT': 'Xubuntu',
   'YNS': 'YunOS',
diff --git a/regexes/bots.yml b/regexes/bots.yml
index 6c25fedf..3918bfd5 100644
--- a/regexes/bots.yml
+++ b/regexes/bots.yml
@@ -132,10 +132,18 @@
 - regex: 'Applebot'
   name: 'Applebot'
   category: 'Crawler'
-  url: 'https://support.apple.com/en-us/HT204683'
+  url: 'https://support.apple.com/en-us/119829'
   producer:
     name: 'Apple Inc'
-    url: 'https://www.apple.com'
+    url: 'https://www.apple.com/'
+
+- regex: 'iTMS'
+  name: 'iTMS'
+  category: 'Crawler'
+  url: 'https://support.apple.com/en-us/119829'
+  producer:
+    name: 'Apple Inc'
+    url: 'https://www.apple.com/'
 
 - regex: 'AppSignalBot'
   name: 'AppSignalBot'
@@ -3361,7 +3369,7 @@
     name: 'Comodo Security Solutions, Inc.'
     url: 'https://www.comodo.com/'
 
-- regex: 'Sectigo DCV'
+- regex: 'Sectigo DCV|acme\.sectigo\.com'
   name: 'Sectigo DCV'
   category: 'Service Agent'
   url: 'https://sectigo.com/'
@@ -4512,8 +4520,21 @@
   category: 'Security Checker'
   url: 'https://ducks.party/'
 
+- regex: 'DepSpid/[\d.]+'
+  name: 'DepSpid'
+  category: 'Crawler'
+  url: 'https://web.archive.org/web/20080321224033/http://about.depspid.net/'
+
+- regex: 'Website-info\.net'
+  name: 'Website-info'
+  category: 'Crawler'
+  url: 'https://website-info.net/robot'
+  producer:
+    name: 'Meins und Vogel GmbH'
+    url: 'https://muv.com/'
+
 # Generic bots
-- regex: 'nuhk|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr\.com|teoma|oegp|http%20client|htdig|mogimogi|larbin|scrubby|searchsight|semanticdiscovery|snappy|vortex(?!(?: Build|Plus| CM62| HD65))|zeal(?!ot)|dataparksearch|findlinks|BrowserMob|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|7Siters|centuryb\.o\.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|cortex|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello,? world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99|^revolt|nvd0rz|xfa1|Hakai|gbrmss|fuck-your-hp|IDBTE4M CODE87|Antoine|Insomania|Hells-Net|b3astmode|Linux Gnu \(cow\)|Test Certificate Info|iplabel|Magellan|TheSafex?Internetx?Search|Searcherweb|kirkland-signature|LinkChain|survey-security-dot-txt|infrawatch|Time/|r00ts3c-owned-you|nvdorz|Root Slut|NiggaBalls|BotPoke|^xenu|^(?:chrome|firefox|Abcd|Dark|KvshClient|url|Zeus|ZmEu)$'
+- regex: 'nuhk|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr\.com|teoma|oegp|http%20client|htdig|mogimogi|larbin|scrubby|searchsight|semanticdiscovery|snappy|vortex(?!(?: Build|Plus| CM62| HD65))|zeal(?!ot)|dataparksearch|findlinks|BrowserMob|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|7Siters|centuryb\.o\.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|cortex|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello,? world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99|^revolt|nvd0rz|xfa1|Hakai|gbrmss|fuck-your-hp|IDBTE4M CODE87|Antoine|Insomania|Hells-Net|b3astmode|Linux Gnu \(cow\)|Test Certificate Info|iplabel|Magellan|TheSafex?Internetx?Search|Searcherweb|kirkland-signature|LinkChain|survey-security-dot-txt|infrawatch|Time/|r00ts3c-owned-you|nvdorz|Root Slut|NiggaBalls|BotPoke|GlobalWebSearch|^xenu|^(?:chrome|firefox|Abcd|Dark|KvshClient|url|Zeus|ZmEu)$'
   name: 'Generic Bot'
 
 # Generic detections
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
index e75c90ce..4da35e77 100644
--- a/regexes/client/browsers.yml
+++ b/regexes/client/browsers.yml
@@ -5,6 +5,37 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Prism (https://wiki.mozilla.org/Prism/FAQ)
+- regex: 'Prism/([\d\.]+)'
+  name: 'Prism'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# Awesomium (https://web.archive.org/web/20150205230848/http://awesomium.com/)
+- regex: 'Awesomium/([\d\.]+)'
+  name: 'Awesomium'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
+# Roccat (https://runecats.com/roccat-browser-for-mac/)
+- regex: 'Roccat(?:/(\d+[\.\d]+))?'
+  name: 'Roccat'
+  version: '$1'
+
+# Swiftweasel (https://swiftweasel.tuxfamily.org/)
+- regex: 'Swiftweasel(?:/(\d+[\.\d]+))?'
+  name: 'Swiftweasel'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
+# Wukong Browser (https://www.wkbrowser.com/)
+- regex: 'wkbrowser (\d+[\.\d]+)'
+  name: 'Wukong Browser'
+  version: '$1'
+
 # KUN (https://api.dcmys.kr/etc/historical/kun_3.0.1_cp_개발자_가이드_v1.1.pdf)
 - regex: 'KUN/(\d+[\.\d]+)'
   name: 'KUN'
@@ -1460,8 +1491,8 @@
   engine:
     default: 'Blink'
 
-# 7Star
-- regex: '7Star/(?:(\d+[\.\d]+))'
+# 7Star or 7 Star or Kuaiso (https://web.archive.org/web/20210614112514/http://browser.kuaiso.com/)
+- regex: '(?:7Star|Kuaiso)/(?:(\d+[\.\d]+))'
   name: '7Star'
   version: '$1'
   engine:
diff --git a/regexes/client/libraries.yml b/regexes/client/libraries.yml
index 9363f67c..1e28b3ac 100644
--- a/regexes/client/libraries.yml
+++ b/regexes/client/libraries.yml
@@ -5,6 +5,11 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+- regex: 'IPinfoClient/.*/(\d+[\.\d]+)'
+  name: 'IPinfo'
+  version: '$1'
+  url: 'https://github.com/ipinfo'
+
 - regex: 'kiwi-tcms/(\d+[\.\d]+)'
   name: 'Kiwi TCMS'
   version: '$1'
@@ -611,3 +616,13 @@
   name: 'Boto3'
   version: '$1'
   url: 'https://github.com/boto/boto3'
+
+- regex: 'Python-xmlrpc(?:/(\d+[\.\d]+))?'
+  name: 'XML-RPC'
+  version: '$1'
+  url: 'https://docs.python.org/3/library/xmlrpc.html'
+
+- regex: 'ICAP-Client-Library(?:/(\d+[\.\d]+))?'
+  name: 'ICAP Client'
+  version: '$1'
+  url: 'https://github.com/Peoplecantfly/icapserver'
diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml
index c6068a90..eee63fb8 100644
--- a/regexes/client/mobile_apps.yml
+++ b/regexes/client/mobile_apps.yml
@@ -2137,7 +2137,7 @@
   name: 'Shadowrocket'
   version: '$1'
 
-- regex: '^SiriusXM/([\d\.]+)'
+- regex: '^(?:SiriusXM|sxm-android|sxm-apple)/([\d\.]+)'
   name: 'SiriusXM'
   version: '$1'
 
@@ -2482,6 +2482,11 @@
   name: 'SoFi'
   version: '$1'
 
+# WNYC (https://play.google.com/store/apps/details?id=org.wnyc.android)
+- regex: 'WNYC(?: App)?[/ ]?([\d\.]+)?'
+  name: 'WNYC'
+  version: '$1'
+
 # Electron generic apps
 - regex:  ' (?!(?:AppleWebKit|brave|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|TweakStyle|Colibri|Polypane|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/'
   name: '$1'
diff --git a/regexes/client/pim.yml b/regexes/client/pim.yml
index 46e1347c..43f7c0a7 100644
--- a/regexes/client/pim.yml
+++ b/regexes/client/pim.yml
@@ -27,6 +27,11 @@
   name: 'Thunderbird'
   version: '$1'
 
+# Spicebird (http://www.spicebird.org/)
+- regex: 'Spicebird/(\d+\.[\.\d]+)'
+  name: 'Spicebird'
+  version: '$1'
+
 - regex: 'Airmail(?: (\d+[\.\d]+))?'
   name: 'Airmail'
   version: '$1'
@@ -155,3 +160,8 @@
 - regex: 'mailapp/(\d+\.[\.\d]+)'
   name: 'mailapp'
   version: '$1'
+
+# Gmail
+- regex: 'Android-Gmail'
+  name: 'Gmail'
+  version: ''
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index a3823146..7f59b0e1 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -1006,7 +1006,7 @@ Apple:
     - regex: 'Watch7,[24]'
       device: 'wearable'
       model: 'Watch Series 9 45mm'
-    - regex: 'Apple Watch'
+    - regex: '(:?Apple Watch|watchOS)'
       device: 'wearable'
       model: 'Watch'
 
@@ -2259,9 +2259,9 @@ AGM:
       model: 'H3'
     - regex: 'AGM_H5_PRO(?:[);/ ]|$)'
       model: 'H5 Pro'
-    - regex: 'AGM[_ ]PAD[_ ]P1(?:[);/ ]|$)'
+    - regex: 'AGM[_ ]PAD[_ ]P([12])(?:[);/ ]|$)'
       device: 'tablet'
-      model: 'Pad P1'
+      model: 'Pad P$1'
     - regex: 'AGM[ _]([^/;)]+)(?: Build|[;)])'
       model: '$1'
 
@@ -4094,7 +4094,7 @@ Bluegood:
 
 # Blackview
 Blackview:
-  regex: 'Blackview|(BL8[08]00|BV([24-9]000|8800|[468]900|(5[1589]|9[135689])00|6[12368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|N6000|Heatwave|DM550|BV9700Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))|(?:SOLID 4 G2|A[86]0Plus|A80S|BL(?:6000|8800)Pro|R6 Lite|P2Lite|A8 MAX|A30-RU|A20Pro|Android 10(?:[\d.]*);(?: [\w-]+;)? Tab[89]|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:A80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A95|A100)|Android 1[12](?:[\d.]*);(?: [\w-]+;)? (?:A[79]0|A70 Pro|A55 Pro|Tab 1[01356]|Tab 6)|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:A200 Pro|Tab [86]0|Tab 18)|BV500|BV4800|BV[579]200|SOLID_4G1|BV5300(?: Pro)?|Active 8 Pro|Active 8|SHARK 8|Tab 8E|Tab (?:7|[57]0|8|11) WiFi|COLOR 8|Tab 1[23] Pro|MEGA 1|WAVE 6C)(?:[);/ ]|$)'
+  regex: 'Blackview|(BL8[08]00|BV([24-9]000|8800|[468]900|(5[1589]|9[135689])00|6[12368]00|7100)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|N6000|Heatwave|DM550|BV9700Pro|BL9000 Pro|(?<!Lenovo[_ ])A[68]0(?:Pro)?\))|(?:SOLID 4 G2|A[86]0Plus|A80S|BL(?:6000|8800)Pro|R6 Lite|P2Lite|A8 MAX|A30-RU|A20Pro|Android 10(?:[\d.]*);(?: [\w-]+;)? Tab[89]|Android 10(?:[\d.]*);(?: [\w-]+;)? (?:A80)|Android 11(?:[\d.]*);(?: [\w-]+;)? (?:A95|A100|BL5000)|Android 1[12](?:[\d.]*);(?: [\w-]+;)? (?:A[79]0|A70 Pro|A55 Pro|Tab 1[01356]|Tab 6)|Android 13(?:[\d.]*);(?: [\w-]+;)? (?:A200 Pro|Tab [86]0|Tab 18|BL9000)|BV500|BV4800|BV[579]200|SOLID_4G1|BV5300(?: Pro)?|Active 8 Pro|Active 8|SHARK 8|Tab 8E|Tab (?:7|[57]0|8|11) WiFi|COLOR 8|Tab 1[23] Pro|MEGA 1|WAVE 6C)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'A([2678]0|55) ?Pro(?:[);/ ]|$)'
@@ -4109,14 +4109,14 @@ Blackview:
       model: 'A30'
     - regex: '(A[86]0|BV[59]500)Plus(?:[);/ ]|$)'
       model: '$1 Plus'
-    - regex: '(BV6000S|BL8[08]00|N6000)(?:[);/ ]|$)'
-      model: '$1'
     - regex: '(P2|R6) ?Lite'
       model: '$1 Lite'
     - regex: 'BV9000Pro-F'
       model: 'BV9000 Pro'
-    - regex: '(BL6000|BL8800|BV(?:[0-9]+)|A200) ?Pro'
+    - regex: '(BL[69]000|BL8800|BV(?:[0-9]+)|A200) ?Pro'
       model: '$1 Pro'
+    - regex: '(BL[579]000|BV6000S|BL8[08]00|N6000)'
+      model: '$1'
     - regex: 'Blackview (A[78]|E7S)'
       model: '$1'
     - regex: 'COLOR 8'
@@ -4314,7 +4314,7 @@ VGO TEL:
 
 # Vivo (vivo.com.cn, vivo.com)
 Vivo:
-  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|iQOO Neo \d|(?:V1730(D[AT]|GA)|V18(?:01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936TL|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V20[34]4|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[123678]|I2127|I221[234679]|I222[03]|I230[124]|V211[4-8]A?|V204[57]A?|V210[28]A?|I2009|I2017|I2022|V215[4678]A|V215[0-478]|V218[03568]A|V2180GA|V219[069]A|V213[012459]A?|V2023EA|V1962BA|V212[57]|V214[0-79]|V2140A|V1930|V216[0289]|V2164[KP]A|V216[234568]A|V217[08]A|PA2170|PA23[57]3|V220[37]A|V220[1-9]|V221[789]A|V221[24789]|V222[079]A|V222[12589]|V22[34]1A|V224[2345]A|V2241HA|V2236|V224[0246789]|V22[36]6A|V230[123479]A|V230[23789]|V232[012457]|V232[349]A|V231[0125-9]|V231[23478]A|V2312BA|V233[123469]|V233[4789]A|V223[01289]A|V223[01789]|V225[0123]|V2254A?|V227[01289]A|V228[2345]A|V2344A|V234[25]|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|V2234(?:_PK)?|V2406|iQOO (?:U[13]x?|Z1x 5G)|NEX 3s 5G|Z5x 712|V2230EA|iPA2375|PA2473|V2156FA|V2352A?|Y51A|Y51 PK)(?:[);/ ]|$)'
+  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|iQOO Neo \d|(?:V1730(D[AT]|GA)|V18(?:01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2026|2031|2036|2043)_21|V1936TL|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|I201[19]|I2126|X50 Pro\+|I220[123678]|I2127|I221[234679]|I222[03]|I230[124]|I2009|I2017|I2022|V1962BA|V1930|PA2170|PA23[57]3|V20(?:0[1256]|0[215]A|[34]4|29_PK|4[57]A?|23EA|2[2-9]|3[0-35-9]|4[0-3568]|5[02-5789]|6[015689]|69A|70)|V21(?:0[12459]|1[01]|2[04-79]|3[012459]A?|7[12]A|4[0-79]|40A|6[0289]|64[KP]A|6[234568]A|7[08]A|1[4-8]A?|0[28]A?|5[4678]A|5[0-478]|8[03568]A|80GA|66(?:BA)?|56FA|9[069]A)|V22(?:8[2345]A|7[01289]A|5[0123]|30EA|4[0246789]|41HA|54A?|3[016789]|34(?:_PK)?|3[01289]A|4[2345]A|[34]1A|2[12589]|2[079]A|[36]6A|0[37]A|0[1-9]|1[789]A|1[24789])|V23(?:44A|4[25]|12BA|24HA|66GA|3[1-4679]|3[4789]A|0[1-479]A|0[23789]|52A?|54A|2[0-57]|2[349]A|1[0125-9]|1[23478]A)|V24(?:06|12)|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|iQOO (?:U[13]x?|Z1x 5G)|NEX 3s 5G|Z5x 712|iPA2375|PA2473|Y51A|Y51 PK)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PA2170'
@@ -4358,10 +4358,16 @@ Vivo:
       model: 'G2'
     - regex: 'V2324A|V2309(?:[);/ ]|$)'
       model: 'X100 Pro'
+    - regex: 'V2366[GH]A'
+      model: 'X100 Ultra'
     - regex: 'V2309A|V2308'
       model: 'X100'
+    - regex: 'V2324HA'
+      model: 'X100s Pro'
     - regex: 'V2307(?:[);/ ]|$)'
       model: 'Y200 5G'
+    - regex: 'V2354A'
+      model: 'Y200i'
     - regex: 'V2336(?:[);/ ]|$)'
       model: 'Y200e 5G'
     - regex: 'V1824[B]?A(?:[);/ ]|$)'
@@ -4508,6 +4514,8 @@ Vivo:
       model: 'iQOO 8 Pro'
     - regex: 'V2339(?:[);/ ]|$)'
       model: 'V30e'
+    - regex: 'V2337(?:[);/ ]|$)'
+      model: 'V40 SE 5G'
     - regex: '(?:V2025)(?:[);/ ]|$)'
       model: 'V20'
     - regex: '(?:V2066|V2108)(?:[);/ ]|$)'
@@ -4812,7 +4820,7 @@ Vivo:
       model: 'Y10 T1'
     - regex: 'V2313A'
       model: 'Y100 5G'
-    - regex: 'V2239'
+    - regex: 'V2239|V2412'
       model: 'Y100'
     - regex: 'V2168'
       model: 'T1'
@@ -7294,7 +7302,7 @@ DoCoMo:
 
 # Doogee
 Doogee:
-  regex: 'DOOGEE[/ _-]|Valencia2_Y100(?:_?(?:pro|plus))?|Y100_Plus|X5max(?:[_ ]PRO)?|Shoot_[12]|x5_doogee|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)(?:[);/ ]|$)|(?:BL12000|BL5500[_ ]Lite| Y6C|X9 Mini|LEO_DG280|Y9Plus|Y8 Plus|Hitman_DG850|S(?:4[01]|[568]8|9[05678]|59|61|8[69])Pro|X9[567]Pro|S[478]0Lite|S88Plus|BL[579]000|N[24]0Pro|(?<!Lenovo )S90C|Ibiza_F2|S55_Lite|T5_Lite|S60 ?Lite|Iron-bone DG750|X10S|X[569]0L|MIX2|Y6 Max|Y6_Piano(?:_black)?|S100Pro|X[679]pro|V20Pro|S96GT|android 10(?:[\d.]*);(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12(?:[\d.]*);(?: [\w-]+;)? (?:S98|S61|S89|V Max|S100|V30T?|S51)|Y7Plus|S35T|V31GT|Smini|T[23]0Ultra|T10E|[TV]20S|V30Pro|android 13(?:[\d.]*);(?: [\w-]+;)? (?:R[12]0)|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:N100|N20|Y8)|N50S|D60 Pro|Turbo_mini_F1|Y100X|T30Pro|T10S|T10Plus|T20Mini|S41 Max|S41 Plus)(?:[);/ ]|$)'
+  regex: 'DOOGEE[/ _-]|Valencia2_Y100(?:_?(?:pro|plus))?|Y100_Plus|X5max(?:[_ ]PRO)?|Shoot_[12]|x5_doogee|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)(?:[);/ ]|$)|(?:BL12000|BL5500[_ ]Lite| Y6C|X9 Mini|LEO_DG280|Y9Plus|Y8 Plus|Hitman_DG850|S(?:4[01]|[568]8|9[05678]|59|61|8[69])Pro|X9[567]Pro|S[478]0Lite|S88Plus|BL[579]000|N[24]0Pro|(?<!Lenovo )S90C|Ibiza_F2|S55_Lite|T5_Lite|S60 ?Lite|Iron-bone DG750|X10S|X[569]0L|MIX2|Y6 Max|Y6_Piano(?:_black)?|S100Pro|X[679]pro|V20Pro|S96GT|android 10(?:[\d.]*);(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12(?:[\d.]*);(?: [\w-]+;)? (?:S98|S61|S89|V Max|S100|V30T?|S51)|Y7Plus|S35T|V31GT|Smini|T[23]0Ultra|T10E|[TV]20S|V30Pro|android 13(?:[\d.]*);(?: [\w-]+;)? (?:R[12]0)|Android 9(?:[\d.]*);(?: [\w-]+;)? (?:N100|N20|Y8)|N50S|D60 Pro|Turbo_mini_F1|Y100X|T30Pro|T10S|T10Plus|T20Mini|S41 Max|S41 Plus|N55 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'T30Pro(?:[);/ ]|$)'
@@ -7337,7 +7345,7 @@ Doogee:
       model: 'X$1 Pro'
     - regex: 'V30Pro(?:[);/ ]|$)'
       model: 'V30 Pro'
-    - regex: 'N([24]0)Pro(?:[);/ ]|$)'
+    - regex: 'N([24]0|55) ?Pro(?:[);/ ]|$)'
       model: 'N$1 Pro'
     - regex: 'N(50)S(?:[);/ ]|$)'
       model: 'N$1S'
@@ -9453,8 +9461,9 @@ Google:
   regex: 'Nexus(?! 6P)|GoogleTV|Google Fiber|Google Pixel|Glass(?<!Browser)|CrKey[^a-z0-9]|(?:Pixel|sailfish|taimen|blueline|Chromecast(?: HD)?)(?:;? Build|[)])|Pixel (?:XL|9 Pro XL|C|[2-8]|[2-4] XL|Fold|Tablet)|Google 2XL|PIXEL4X|G011A|AOSP on (?:bramble|HammerHead|Manta|sunfish)|Pipit|ADT-2|GE2AE|G0DZQ|G1MNW|G82U8|G9BQD|G025I|G020[AMP]|G9FPL|GWKK3|GP4BC|GKWS6|GHL1X|GC3VE|GA01180-US'
   device: 'smartphone'
   models:
-    - regex: 'Glass'
-      model: 'Glass'
+    - regex: 'Glass 1'
+      device: 'wearable'
+      model: 'Glass 1'
     - regex: 'Galaxy Nexus'
       model: 'Galaxy Nexus'
     - regex: 'AOSP on HammerHead'
@@ -12272,6 +12281,8 @@ Infinix:
   models:
     - regex: 'Infinix[ _-]X6739'
       model: 'GT 10 Pro'
+    - regex: 'Infinix[ _-]X6871'
+      model: 'GT 20 Pro'
     - regex: 'Infinix[ _-]X260'
       model: 'Buzz'
     - regex: 'Infinix[ _-]X502'
@@ -12598,6 +12609,12 @@ Infinix:
     - regex: 'Infinix[ _-]X6850'
       model: 'Note 40 Pro'
       device: 'phablet'
+    - regex: 'Infinix[ _-]X6851B'
+      model: 'Note 40 Pro+ 5G'
+      device: 'phablet'
+    - regex: 'Infinix[ _-]X6851'
+      model: 'Note 40 Pro 5G'
+      device: 'phablet'
     - regex: 'Infinix[ _-]X685'
       model: 'Note 40'
       device: 'phablet'
@@ -12616,9 +12633,13 @@ Infinix:
 
 # InnJoo (innjoo.es)
 InnJoo:
-  regex: 'InnJoo|(?:Halo Plus|Halo X|Halo 5 3G|Halo[ _]4(?:[ _]mini[ _]LTE)?|VISION LTE|Halo2 3G|Fire 4 ?(?:Pro|Plus)?|Fire_Plus_LTE|Fire3 mini|Fire2 (?:Air|Pro|Plus) LTE|Fire2 LTE|Superb(?:_PLus)?)(?:[);/ ]|$)'
+  regex: 'InnJoo|(?:Halo Plus|Halo X|Halo 5 3G|Halo[ _]4(?:[ _]mini[ _]LTE)?|VISION LTE|Halo2 3G|Fire 4 ?(?:Pro|Plus)?|Fire_Plus_LTE|Fire3 mini|Fire2 (?:Air|Pro|Plus) LTE|Fire2 LTE|Superb(?:_PLus)?|VOOM TAB 2)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'VOOM TAB 2'
+      device: 'tablet'
+      model: 'Voom Tab 2'
+
     - regex: 'InnJoo[ _]X3(?:[);/ ]|$)'
       model: 'X3'
     - regex: 'Halo[ _]X[ _]LTE(?:[);/ ]|$)'
@@ -17073,7 +17094,7 @@ Torque:
 
 # motorola
 Motorola:
-  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2\.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-6|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2243-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT2335-3|XT2131-4|XT2301-5|XT2321-2|XT2323-3|XT194[23]-1|XT1929-15|XT2093DL|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD|PAMR0008IN'
+  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2\.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-[26]|XT-2201|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2225-1|XT2233-2|XT2243-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT2335-3|XT2131-4|XT2301-5|XT2321-2|XT2323-3|XT194[23]-1|XT1929-15|XT2093DL|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD|PAMR0008IN'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -17183,8 +17204,12 @@ Motorola:
       model: 'Moto G53y 5G'
     - regex: 'XT2335-3'
       model: 'Moto G53'
+    - regex: 'XT2225-1'
+      model: 'Moto G82'
     - regex: 'PAMR0008IN'
       model: 'Moto G10 Power'
+    - regex: 'Moto G8 Power'
+      model: 'Moto G8 Power'
     - regex: '(?:MOT-|Motorola-)?(?:XT102[12]|XT830C|XT15[12]4|XT152[67])' # 2015
       model: 'Moto E'
     - regex: 'Moto E \(XT2052DL\)'
@@ -17199,6 +17224,8 @@ Motorola:
       model: 'Moto E$1 Plus'
     - regex: 'Moto E([0-9]) Play'
       model: 'Moto E$1 Play'
+    - regex: 'moto-e([0-9])-play'
+      model: 'Moto E$1 Play'
     - regex: 'moto e6 \(XT2005DL\)'
       model: 'Moto E6 (XT2005DL)'
     - regex: 'moto e5 cruise(?:[);/ ]|$)'
@@ -17291,6 +17318,8 @@ Motorola:
       model: 'Moto S30'
     - regex: '(?:MOT-|Motorola-)?XT2201-6'
       model: 'Moto X30'
+    - regex: '(?:MOT-|Motorola-)?XT-2201'
+      model: 'Moto Edge X30 5G'
     - regex: '(?:MOT-|Motorola-)?XT2301-5'
       model: 'Moto X40'
     - regex: '(?:MOT-|Motorola-)?XT1943-1'
@@ -17383,6 +17412,8 @@ Motorola:
       model: 'Moto G 5G'
     - regex: 'moto g\(?40\)? fusion'
       model: 'Moto G40 Fusion'
+    - regex: 'XT2233-2'
+      model: 'Moto G42'
     - regex: 'moto g\(?60\)?s'
       model: 'Moto G60s'
     - regex: 'moto g(\d+)\((\w)\)'
@@ -19286,7 +19317,7 @@ Realme:
 
 # Oppo (oppo.com)
 OPPO:
-  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|R820[16]|A101OP|OPG0[1-4]|A00[12]OP|(?:X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057]|15 Neo)[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|A303OP|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDCT00|PDET10|PDS[TM]00|PEC[MT]30|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10|A103OP|PCCT00|PFTM[12]0|PFFM20|OW19W[123]|OW20W1|PGJM10|PGAM10|PF[EF]M10|Reno[4567]|Find X[23]|Find N| R7sf| 1201|[56].*; (?:R7[gf])|OPD(?:210[12]A?|2201|230[12])|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PHW110|PHA120|PGGM10|PH[MU]110|PG[WX]110|PGU110|PHJ110|PCCM40|PHQ110|CHP1723|PGT110|PGEM10|RX17Neo|R15 Dream Mirror|R9 Plustm A|PGFM10|A301OP|P(?:J[CGJSU]|H[FVSTNYZ])110|K9 Pro 5G| K9[xs]|CPH1821EX|PJH110|PJB110)(?:[);/ ]|$)'
+  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|R820[16]|A101OP|OPG0[1-4]|A00[12]OP|(?:X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057]|15 Neo)[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|A303OP|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDCT00|PDET10|PDS[TM]00|PEC[MT]30|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10|A103OP|PCCT00|PFTM[12]0|PFFM20|OW19W[123]|OW20W1|PGJM10|PGAM10|PF[EF]M10|Reno[4567]|Find X[23]|Find N| R7sf| 1201|[56].*; (?:R7[gf])|OPD(?:210[12]A?|2201|230[12])|PFZM10|PGIM10|A1603|A201OP|PESM10|PGBM10|PHW110|PHA120|PGGM10|PH[MU]110|PG[WX]110|PGU110|PHJ110|PCCM40|PHQ110|CHP1723|PGT110|PGEM10|RX17Neo|R15 Dream Mirror|R9 Plustm A|PGFM10|A301OP|P(?:J[CGJSU]|H[FVSTNYZ])110|K9 Pro 5G| K9[xs]|CPH1821EX|PJ[HYB]110)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PCHM10(?:[);/ ]|$)'
@@ -19299,6 +19330,8 @@ OPPO:
       model: 'A2x 5G'
     - regex: 'PJB110'
       model: 'A2 5G'
+    - regex: 'PJY110'
+      model: 'A3 Pro 5G'
     - regex: 'PCHT30(?:[);/ ]|$)'
       model: 'A11x'
     - regex: '(?:CPH2083|CPH2077)(?:[);/ ]|$)'
@@ -19924,7 +19957,7 @@ Oukitel:
     - regex: 'RT7 TITAN'
       device: 'tablet'
       model: 'RT7 Titan'
-    - regex: ' (RT[12356]|OKT[13]|OT[568])(?:[);/ ]|$)'
+    - regex: ' (RT[12356]|OKT[13]|OT5 S|OT[568])(?:[);/ ]|$)'
       device: 'tablet'
       model: '$1'
 
@@ -20893,13 +20926,13 @@ Siemens:
 
 # Soundmax
 Soundmax:
-  regex: '((?:SM-LED32M(?:11|04)S)|SM-QLED50T2SU|SM-LED(?:40M04S|65M01SU))(?:_-Ver01)?(?:[);/ ]|$)'
+  regex: '((?:SM-LED32M(?:1[014]|0[49])S)|SM-QLED50T2SU|SM-LED(?:24M0[69]S|40M04S|(?:5[05]|43)M02SU|65M0[12]SU))(?:_-Ver01)?(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
 # Samsung
 Samsung:
-  regex: 'SAMSUNG(?! ?(?:Browser|Redmi|TicWatch))|FamilyHub|Maple (?!III)|Maple2012|SMART-TV.+Tizen.+SamsungBrowser|Gear Live|(?:SEC_)?SC-(?:001|01[EFGHKLM]|02[CGHJKLMF]|03[EFJKL]|04[EFJLG]|05[GL]|(?:4[12]|5[1-4])A|5[1-5]B|5[1-5]C|56C|5[23]D)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|beyond[02]q?|crownq?lte|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G2[01]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
+  regex: 'SAMSUNG(?! ?(?:Browser|Redmi|TicWatch))|FamilyHub|Maple (?!III)|Maple2012|SMART-TV.+Tizen.+SamsungBrowser|Gear Live|(?:SEC_)?SC-(?:001|01[EFGHKLM]|02[CGHJKLMF]|03[EFJKL]|04[EFJLG]|05[GL]|(?:4[12]|5[1-4])A|5[1-5]B|5[1-5]C|56C|5[23]D)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|beyond[02]q?|crownq?lte|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g|Verizon-SM)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G2[01]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit tv models
@@ -21049,6 +21082,9 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-X210'
       device: 'tablet'
       model: 'Galaxy Tab A9+ 11.0"'
+    - regex: '(?:SAMSUNG-)?SM-X115'
+      device: 'tablet'
+      model: 'Galaxy Tab A9 8.7"'
     - regex: '(?:SAMSUNG-)?SM-T11[03]'
       device: 'tablet'
       model: 'Galaxy Tab 3 Lite 7.0" WiFi'
@@ -21097,18 +21133,27 @@ Samsung:
     - regex: '(?:SAMSUNG-)?SM-X900'
       device: 'tablet'
       model: 'Galaxy Tab S8 Ultra 14.6" WiFi'
-    - regex: '(?:SAMSUNG-)?SM-X916B'
+    - regex: '(?:SAMSUNG-)?SM-X910(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Galaxy Tab S9 Ultra 14.6" WiFi'
+    - regex: '(?:SAMSUNG-)?SM-X916[CB]'
       device: 'tablet'
       model: 'Galaxy Tab S9 Ultra 14.6" 5G'
     - regex: '(?:SAMSUNG-)?SM-X810'
       device: 'tablet'
       model: 'Galaxy Tab S9+ 12.4"'
+    - regex: '(?:SAMSUNG-)?(?:SM-X818U|SM-X816[BN])'
+      device: 'tablet'
+      model: 'Galaxy Tab S9+ 12.4" 5G'
     - regex: '(?:SAMSUNG-)?SM-X716'
       device: 'tablet'
       model: 'Galaxy Tab S9 12.4" 5G'
     - regex: '(?:SAMSUNG-)?SM-X616'
       device: 'tablet'
       model: 'Galaxy Tab S9 FE+ 12.4" 5G'
+    - regex: '(?:SAMSUNG-)?SM-X610'
+      device: 'tablet'
+      model: 'Galaxy Tab S9 FE+ 12.4" WiFi'
     - regex: '(?:SAMSUNG-)?SM-T111'
       device: 'tablet'
       model: 'Galaxy Tab 3 Lite 7.0"'
@@ -21700,7 +21745,7 @@ Samsung:
       model: 'Galaxy S6 Edge'
     - regex: '(?:SAMSUNG-)?SM-G928(?:7C|N0|R4|W8|[07ACFGIKLPSTVX])'
       model: 'Galaxy S6 Edge+'
-    - regex: '(?:SAMSUNG-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
+    - regex: '(?:SAMSUNG-|Verizon-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
       model: 'Galaxy S7'
     - regex: '(?:SAMSUNG-)?SM-G935(?:R4|W8|[0AFKLPSTUVX])|SC-02H|SCV33|Galaxy s7 edge'
       model: 'Galaxy S7 Edge'
@@ -21970,6 +22015,8 @@ Samsung:
       model: 'Galaxy A53 5G UW'
     - regex: '(?:SAMSUNG-)?(?:SM-A536|SC-53C|SCG15|SM-S536DL)'
       model: 'Galaxy A53 5G'
+    - regex: '(?:SAMSUNG-)?SM-A546S'
+      model: 'Galaxy Quantum 4'
     - regex: '(?:SAMSUNG-)?(?:SM-A546|SC-53D|SCG21)'
       model: 'Galaxy A54 5G'
     - regex: '(?:SAMSUNG-)?(?: SM-A556)'
@@ -21990,6 +22037,8 @@ Samsung:
       model: 'Galaxy F12'
     - regex: '(?:SAMSUNG-)?SM-E135F'
       model: 'Galaxy F13'
+    - regex: '(?:SAMSUNG-)?SM-E146B'
+      model: 'Galaxy F14 5G'
     - regex: '(?:SAMSUNG-)?SM-E156B'
       model: 'Galaxy F15 5G'
     - regex: '(?:SAMSUNG-)?SM-E225F(?:[);/ ]|$)'
@@ -22233,6 +22282,8 @@ Samsung:
       model: 'Galaxy C5'
     - regex: '(?:SAMSUNG-)?SM-C501[08]'
       model: 'Galaxy C5 Pro'
+    - regex: '(?:SAMSUNG-)?SM-C5560'
+      model: 'Galaxy C55 5G'
     - regex: '(?:SAMSUNG-)?SM-C700[0X]'
       model: 'Galaxy C7'
     - regex: '(?:SAMSUNG-)?SM-C701[08FX]'
@@ -22663,13 +22714,15 @@ Sky:
       model: '$1'
       device: 'tv'
 
-# Skyworth
+# Skyworth or SWTV
 Skyworth:
-  regex: 'Sky_?worth|SWTV-|(?:FlowBox-F1|SWTV)(?:[);/ ]|$)'
+  regex: 'Sky_?worth|SWTV-|(?:FlowBox-F1|SWTV|SW-22AE NF)(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'FlowBox-F1'
       model: 'FlowBox-F1'
+    - regex: 'SW-22AE NF'
+      model: 'SWTV-22AE NF'
     - regex: '(SWTV-2[02]AE(?:-PRO|-FHD)?)'
       model: '$1'
     - regex: 'Sky_?worth ([^;/)]+)(?: Build|[;)])'
@@ -23793,7 +23846,7 @@ Sigma:
 
 # Spice
 Spice:
-  regex: '(?<![\d];)Spice|(?:Xlife[-_ ](?:\d+Q?|Victor5|M5q\+|M5 Pro|Proton5|Electro55HD))(?:[);/ ]|$)'
+  regex: '(?<![\d];)Spice(?!bird)|(?:Xlife[-_ ](?:\d+Q?|Victor5|M5q\+|M5 Pro|Proton5|Electro55HD))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Spice_)?Xlife[-_ ](\d+Q?|M5\+)(?:[);/ ]|$)'
@@ -24745,6 +24798,8 @@ Tecno Mobile:
       model: 'Camon 30'
     - regex: 'Tecno[ _-]CL9(?:[);/ ]|$)'
       model: 'Camon 30 Premier 5G'
+    - regex: 'Tecno[ _-]CL7[ks]?(?:[);/ ]|$)'
+      model: 'Camon 30 5G'
     - regex: 'Tecno[ _-]CA6S?(?:[);/ ]|$)'
       model: 'Camon CM'
     - regex: 'Tecno[ _-]CA7(?:[);/ ]|$)'
@@ -26573,9 +26628,13 @@ Inka:
 
 # Wink
 Wink:
-  regex: '(?<!mismart )Wink[_ ]'
+  regex: '(?<!mismart )Wink[_ ]|SWITRON-i12A'
   device: 'smartphone'
   models:
+    - regex: 'SWITRON-i12A'
+      device: 'tv'
+      model: 'Switron i12A'
+
     - regex: 'Wink[_ ]((?:Glory|World|Share|City)(?:[_ ](?:SE|S))?)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Wink[ _](Primo|Highway)(?:[);/ ]|$)'
@@ -26979,12 +27038,12 @@ X-View:
 
 # POCO (sub brand Xiaomi)
 POCO:
-  regex: '(?:POCO[ _](?:X[2-6](?:_SN)?|F[26] PRO|M[32456]|M5s|F[35]|F4(?: GT)?|C40|C3|C51|C65)|M2010J19(?:C[GI]|GC)|M2007J20C[ITG]|M2012K11AG|M2006C3MI|M2004J19PI|M2102J20S[GI]|M2103K19P[IGY]|21091116AG|21061110AG|M2104K10I|211033MI|220111[67]P[GI]|camellian?|21121210G|2203(?:1116AI|33QPG)|22021211R[GI]|2204121(?:6U?G|9P[GI])|2207(?:1219C[GI]|33SP[IH]|117BPG)|22101320[GI]|22111317P[GI]|23013PC75G|2302EPCC4I|23049PCD8[GI]|2305EPCC4G|2312BPC51H|22127PC95I|2310FPCA4[GI]|MZB0E6DIN|23076PC4BI|2312(?:FPCA6G|2PCD1[GI]|8PC33I)|2311DRK48[GI]|24069PC21G|2404APC5FG)(?:[);/ ]|$)'
+  regex: '(?:POCO[ _](?:X[2-6](?:_SN)?|F[26] PRO|M[32456]|M5s|F[35]|F4(?: GT)?|C40|C3|C51|C65)|M2010J19(?:C[GI]|GC)|M2007J20C[ITG]|M2012K11AG|M2006C3MI|M2004J19PI|M2102J20S[GI]|M2103K19P[IGY]|21091116AG|21061110AG|M2104K10I|211033MI|220111[67]P[GI]|camellian?|21121210G|2203(?:1116AI|33QPG)|22021211R[GI]|2204121(?:6U?G|9P[GI])|2207(?:1219C[GI]|33SP[IH]|117BPG)|22101320[GI]|22111317P[GI]|23013PC75G|2302EPCC4I|23049PCD8[GI]|2305EPCC4G|22127PC95I|2310FPCA4[GI]|MZB0E6DIN|23076PC4BI|2312(?:FRAFDI|BPC51H|FPCA6G|2PCD1[GI]|8PC33I)|2311(?:3RKC6G|DRK48[GI])|24069PC21G|2404APC5FG)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'POCO X2(?:[);/ ]|$)'
       model: 'X2'
-    - regex: 'POCO F6 Pro(?:[);/ ]|$)'
+    - regex: '23113RKC6G|POCO F6 Pro(?:[);/ ]|$)'
       model: 'F6 Pro'
     - regex: '24069PC21G'
       model: 'F6'
@@ -26992,6 +27051,8 @@ POCO:
       model: 'X6 Pro 5G'
     - regex: '23122PCD1[GI]|POCO X6 5G(?: Build|[;)])'
       model: 'X6 5G'
+    - regex: '2312FRAFDI'
+      model: 'X6 Neo'
     - regex: '(?:M2012K11AG|POCO F3)(?:[);/ ]|$)'
       model: 'F3'
     - regex: '23013PC75G|POCO F5 Pro'
@@ -27141,7 +27202,7 @@ QIN:
 
 # Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)| ONC(?: Build|[;)])|MiTV-\w|Mi9 ?(?:Lite|SE)|MiProj(?:A1|M05)|Mi9 Pro 5G|(?:Mi5X|MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo|AFTBTX4)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?KTUS-[AH]0|(?:SHARK )?(KLE|KSR|MBU|PAR)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002(?:J9[SEG]|F4LG)|HM2014819|WT88047|210611(?:8C|19(?:BI|[AD]G|AL))|M2001(?:J[12]G|C3K3I)|M2004J1(?:5SC|9AG)|M2004J(?:7[AB]|19)[CG]|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J(?:15SC|15SS|6B2G|6A1G)|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG0[1234]|2107119DC|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G)|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i|U[GI])|220111(?:7T[LGIY]|19TI|19UY|6S[IRC]|6TG|[67]SG|7SL)|21121(?:119S[CG]|23A[CG]|119VL|210C)|2204121(?:6[CI]|6UC|9[CGI]|9NY|1AC)|220333Q(?:AG|NY|L|BI)|2107113S[IGR]|22031(?:29G|116BG|21C)|PAR-H0|M2105K81A?C|2109119BC|2202(?:1119KR|1211RC|33L2[CGI])|22011(?:2[23][CG]|211C|16TI|17S[YI])|joyeuse|galahad|hydrogen|begonia|kenzo|willow|beryllium|rosemary| MDG1|KLE-AO|Mi ?Pad ?\d|220612(?:18C|[23]SC)|2207(?:12(?:2MC|12AG|19AI)|33S(?:F?G|[ILH])|43FI)|2208(?:7RA4DI|1212(?:U?G|C)|128(?:1AC|3[GC]))|Black Shark|MZB82(?:98|57)IN|2210(?:1317C|1320C|1316(?:U[PG]|UCP?|[CIG])|1(?:29SG|32[CG]))|2211(?:13(?:3[CG]|17I)|1317G)|23013RK75C|2305(?:3RN02[AYLI]|4RA19C)|2209(?:5RA98C|116AG|129SC)|2212(?:0RN86[CGIH]|6RN91Y|ARNC4L|2RK93C|7RK46C)|2302(?:6RN54G|1RAA(?:EG|2Y)|7RAD4I|8R(?:N4D[GI]|A60L|NCA[GI]))|angelican|vnd_camellia|2304(?:9RAD8C|FPN6D[GC]|6RP50C|3RP34[CGI]|6PNC9C)|2303(?:0RAC7Y|CRA44A|ERA42L)|M1906G7G|Hongmi 4A|M1912G7BC|2307(?:7RABDC|6RN4BI|6RN8DY|8PND5G|8RKD5C|6RA4BC|3RPBF[GCL]|BRPDCC)|2310(?:6RN0DA|8RN04Y)|2312(?:DRA50G|9RAA4G|9RA5FL|9RN51[HX]|CRAD3C|DRAAB[CGI]|7PN0C[CG]|DRA50[CI]|4RA7EO|4RN87[CIG])|2311(?:6PN5BC|7RA68G|DRN14I|7RK66C|FRAFDC|DRK48C|3RKC6C)|2308CPXD0C|24018RPAC[CG]|2404(?:ARN45A|8RN6CG)|24053PY09C|2306EPN60G|23090(?:RA98[CGI])|23100RN82L|2403(?:1PN0DC|0PN60G)|QIN3ULTRA|FengMiProjA2'
+  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)| ONC(?: Build|[;)])|MiTV-\w|Mi9 ?(?:Lite|SE)|MiProj(?:A1|M05)|Mi9 Pro 5G|(?:Mi5X|MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo|AFTBTX4)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?KTUS-[AH]0|(?:SHARK )?(KLE|KSR|MBU|PAR)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002(?:J9[SEG]|F4LG)|HM2014819|WT88047|210611(?:8C|19(?:BI|[AD]G|AL))|M2001(?:J[12]G|C3K3I)|M2004J1(?:5SC|9AG)|M2004J(?:7[AB]|19)[CG]|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J(?:15SC|15SS|6B2G|6A1G)|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG0[1234]|2107119DC|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G)|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i|U[GI])|220111(?:7T[LGIY]|19TI|19UY|6S[IRC]|6TG|[67]SG|7SL)|21121(?:119S[CG]|23A[CG]|119VL|210C)|2204121(?:6[CI]|6UC|9[CGI]|9NY|1AC)|220333Q(?:AG|NY|L|BI)|2107113S[IGR]|22031(?:29G|116BG|21C)|PAR-H0|M2105K81A?C|2109119BC|2202(?:1119KR|1211RC|33L2[CGI])|22011(?:2[23][CG]|211C|16TI|17S[YI])|joyeuse|galahad|hydrogen|begonia|kenzo|willow|beryllium|rosemary| MDG1|KLE-AO|Mi ?Pad ?\d|220612(?:18C|[23]SC)|2207(?:12(?:2MC|12AG|19AI)|33S(?:F?G|[ILH])|43FI)|2208(?:7RA4DI|1212(?:U?G|C)|128(?:1AC|3[GC]))|Black Shark|MZB82(?:98|57)IN|2210(?:1317C|1320C|1316(?:U[PG]|UCP?|[CIG])|1(?:29SG|32[CG]))|2211(?:13(?:3[CG]|17I)|1317G)|23013RK75C|2305(?:3RN02[AYLI]|4RA19C)|2209(?:5RA98C|116AG|129SC)|2212(?:0RN86[CGIH]|6RN91Y|ARNC4L|2RK93C|7RK46C)|2302(?:6RN54G|1RAA(?:EG|2Y)|7RAD4I|8R(?:N4D[GI]|A60L|NCA[GI]))|angelican|vnd_camellia|2304(?:9RAD8C|FPN6D[GC]|6RP50C|3RP34[CGI]|6PNC9C)|2303(?:0RAC7Y|CRA44A|ERA42L)|M1906G7G|Hongmi 4A|M1912G7BC|2307(?:7RABDC|6RN4BI|6RN8DY|8PND5G|8RKD5C|6RA4BC|3RPBF[GCL]|BRPDCC)|2310(?:6RN0DA|8RN04Y)|2312(?:CRNCCL|DRA50G|9RAA4G|9RA5FL|9RN51[HX]|CRAD3C|DRAAB[CGI]|7PN0C[CG]|DRA50[CI]|4RA7EO|4RN87[CIG])|2311(?:6PN5BC|7RA68G|DRN14I|7RK66C|FRAFDC|DRK48C|3RKC6C)|2308CPXD0C|24018RPAC[CG]|2404(?:ARN45A|8RN6CG|0RN64Y)|24053PY09C|2306EPN60G|23090(?:RA98[CGI])|23100RN82L|24069RA21C|2403(?:1PN0DC|0PN60G)|QIN3ULTRA|FengMiProjA2'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -27339,6 +27400,8 @@ Xiaomi:
       model: 'Mi Note 3'
     - regex: 'POCOPHONE[ _]F1|POCO F1|beryllium'
       model: 'Pocophone F1'
+    - regex: '24069RA21C'
+      model: 'Redmi Turbo 3'
     - regex: 'Redmi 5 Plus'
       model: 'Redmi 5 Plus'
     - regex: 'MDG1(?:[);/ ]|$)'
@@ -27365,7 +27428,7 @@ Xiaomi:
       model: 'Redmi 10C'
     - regex: '(?:2310(?:6RN0DA|8RN04Y|0RN82L)|2311DRN14I)(?:[);/ ]|$)'
       model: 'Redmi 13C'
-    - regex: '2404ARN45A'
+    - regex: '2404ARN45A|24040RN64Y'
       model: 'Redmi 13'
     - regex: '(?:23124RN87[CIG])(?:[);/ ]|$)'
       model: 'Redmi 13C 5G'
@@ -27495,6 +27558,8 @@ Xiaomi:
       model: 'Redmi 3'
     - regex: '24048RN6CG'
       model: 'Redmi A3x'
+    - regex: '2312CRNCCL'
+      model: 'Redmi A3'
     - regex: 'QIN3ULTRA'
       model: 'Qin 3 Ultra'
     - regex: 'Qin ?2 Pro(?:[);/ ]|$)'
@@ -28694,7 +28759,7 @@ Zenek:
 
 # Nubia (www.nubia.com)
 Nubia:
-  regex: 'Nubia[ _]|(?:NX(?:403A|404H|406E|40[X2]|503A|50[5678]J|51[0123]J|521J|523J_V1|529Jq?|5[345]1J|5[48]9J|569[HJ]|5[67]3J|575J|59[157]J|60[1689]J|61[12679]J|62[79]J|65[19]J|6[126]9J|66[67]J|679[JS]|70[129]J|71[123]J|72[19]J|769J|709S|907J)|NP01J)(?:[);/ ]|$)'
+  regex: 'Nubia[ _]|(?:NX(?:403A|404H|406E|40[X2]|503A|50[5678]J|51[0123]J|521J|523J_V1|529Jq?|5[345]1J|5[48]9J|569[HJ]|5[67]3J|575J|59[157]J|60[1689]J|61[12679]J|62[79]J|65[19]J|6[126]9J|66[67]J|679[JS]|70[129]J|71[123]J|72[19]J|769J|709S|907J)|NP01J|Z2352N)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NP01J'
@@ -28703,6 +28768,8 @@ Nubia:
 
     - regex: '8150N'
       model: 'Neo 5G'
+    - regex: 'Z2352N'
+      model: 'Neo 2 5G'
     - regex: 'NX711J'
       model: 'Z50'
     - regex: 'NX712J'
@@ -29929,13 +29996,13 @@ NEXBOX:
       model: 'ID TV HPH07'
 
 Yandex:
-  regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[12]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
+  regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[123]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'YandexModule2-00001'
       device: 'tv'
       model: 'Module'
-    - regex: 'YNDX-?(0007[12]|0009[12]|0010[12])'
+    - regex: 'YNDX-?(0007[123]|0009[12]|0010[12])'
       device: 'tv'
       model: 'YNDX-$1'
     - regex: 'YNDX-?000SB'
@@ -30152,15 +30219,18 @@ Qumo:
 
 # Qubo (qubomobile.com)
 Qubo:
-  regex: '(?:Cronos|MINERVA(?:_32GB)?|X668_64GB|X626_4G|Hermes)(?:[);/ ]|$)'
+  regex: '(?:Cronos|MINERVA(?:_32GB)?|X668_64GB|X626_4G|Hermes|T104_64GB)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'MINERVA(?:_32GB)?(?:[);/ ]|$)'
       model: 'Minerva'
-    - regex: 'X668_64GB(?:[);/ ]|$)'
+    - regex: 'X668_64GB'
       model: 'X668'
     - regex: '(Cronos|Hermes|X626_4G)(?:[);/ ]|$)'
       model: '$1'
+    - regex: 'T104_64GB(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'T104'
 
 # Umax (umax.cz)
 Umax:
@@ -31814,9 +31884,9 @@ Bobarry:
 
 # Wortmann (wortmann.de)
 Wortmann:
-  regex: 'TERRA[ _]PAD[ _](\d+)(?:[);/ ]|$)'
+  regex: 'TERRA[ _]PAD[ _](\d+)(_V2)?(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Terra Pad $1'
+  model: 'Terra Pad $1$2'
 
 # BB Mobile
 BB Mobile:
@@ -32655,11 +32725,11 @@ X88:
 
 # X96
 X96:
-  regex: '(?:X96Air_A100|X96_X6_I|X96Max_Plus_Ultra|X96MATE_PLUS|X96MINI_11)(?:[);/ ]|$)'
+  regex: '(?:X96Air_(?:A100|100W|V2|P[1-3])|X96_X6_I|X96Max_Plus_Ultra|X96MATE_PLUS|X96MINI_11)(?:[);/ ]|$)'
   device: 'tv'
   models:
-    - regex: 'X96Air_A100'
-      model: 'Air A100'
+    - regex: 'X96Air_(100W|A100|V2|P[1-3])'
+      model: 'Air $1'
     - regex: 'X96Max_Plus_Ultra'
       model: 'Max Plus Ultra'
     - regex: 'X96_X6_I'
@@ -33515,7 +33585,7 @@ Sparx:
 
 # SPC or SPC Universe or SPC Mobile (spc.es)
 SPC:
-  regex: '(?:GRAVITY [34]G(?:_2019)?|GRAVITY2-4G|GRAVITY_OCTACORE|GRAVITY[ -](?:Max|SE|PRO|2-MAX|2)|SPC (?:GEN|SMART)|SPC_ALIEN(?:_STICK)?|SPC Glow9\.7|Lightyear|Laika|L70_Lite|L60 Turbo|L60 Pro|FLOW 7|SMART_ULTIMATE_64)(?:[);/ ]|$)'
+  regex: '(?:GRAVITY [34]G(?:_2019)?|GRAVITY2-4G|GRAVITY_OCTACORE|GRAVITY[ -](?:Max|SE|PRO|2-MAX|2)|SPC (?:GEN|SMART)|SPC_ALIEN(?:_STICK)?|SPC Glow9\.7|Lightyear|Laika|L70_Lite|L60 Turbo|L60 Pro|FLOW 7|SMART_ULTIMATE(?:_64)?)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'GRAVITY_OCTACORE'
@@ -33545,7 +33615,7 @@ SPC:
     - regex: 'Laika'
       model: 'Laika'
 
-    - regex: 'SMART_ULTIMATE_64'
+    - regex: 'SMART_ULTIMATE(?:_64)?'
       device: 'smartphone'
       model: 'Smart Ultimate'
     - regex: 'SPC SMART PLUS'
@@ -36529,7 +36599,7 @@ Alps:
 
 # Starwind (starwind.com.ru)
 Starwind:
-  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB302|42SB300|40SG300|43SG30[20]|43UB404|32SG3(?:0[012]|11)|55UG400|50UB401|65UG403))(?:[);/ ]|$)'
+  regex: 'Smart_Starwind|(?:SW-LED(?:24SG303|32SB302|42SB300|40SG300|43SG30[20]|43UB404|32SG3(?:0[012]|11)|55UG40[03]|58UG401|50UB401|65UG403))(?:[);/ ]|$)'
   device: 'tv'
   models:
     - regex: 'SW-LED(\d{2}[SU][BG]\d{3})'
@@ -36962,10 +37032,10 @@ Ookee:
 
 # TOSCIDO (www.toscido.com)
 TOSCIDO:
-  regex: '(?:(?:T1[235]|T151|T2[12])-EEA|W-?109)(?:[);/ ]|$)'
+  regex: '(?:(?:T1[235]|T151|T2[126])-EEA|W-?109)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(T1[235]|T151|T2[12])-EEA(?:[);/ ]|$)'
+    - regex: '(T1[235]|T151|T2[126])-EEA(?:[);/ ]|$)'
       model: '$1'
     - regex: 'W-?109(?:[);/ ]|$)'
       model: 'W109'
@@ -37356,9 +37426,11 @@ BROR:
 
 # Vortex (https://vortexcellular.com/)
 Vortex:
-  regex: '(SYNQ|CMG101|CM62|CG65|T10M_Pro|HD62|HD65_Ultra|ZTAB10|BTAB10|HD65 Choice)(?:[);/ ]|$)'
+  regex: '(SYNQ|CMG101|CM62|CG65|T10M_Pro|HD62|HD65_Ultra|ZTAB10|BTAB10|HD65 Choice|ZG65 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
+    - regex: 'ZG65 Pro'
+      model: 'ZG65 Pro'
     - regex: 'HD65[_ ]Ultra'
       model: 'HD65 Ultra'
     - regex: '(SYNQ|HD6[25]|CM62|CG65)'
@@ -37743,6 +37815,12 @@ Kenbo:
     - regex: '(O[76]1)(?:[);/ ]|$)'
       model: '$1'
 
+# VALE
+VALE:
+  regex: 'V12E-LTE-8128'
+  device: 'tablet'
+  model: 'V12E LTE'
+
 # VALEM
 VALEM:
   regex: 'PHANTOM_Z'
@@ -39382,7 +39460,7 @@ HIPER:
 
 # TopDevice (https://topdevice.ru/)
 TopDevice:
-  regex: 'TopDevice|TDTV\d{2}[BC]S\d{2}[FHU]|TDT45(?:18|41)_4G|TDT3778_Wi_E|TDT4528_4G_E'
+  regex: 'TopDevice|TDTV\d{2}[BC]S\d{2}[FHU]|TDT45(?:18|41)_4G|TDT3778_Wi_E|TDT3887_Wi_D|TDT4528_4G_E'
   device: 'tv'
   models:
     - regex: '(?:TopDevice_)?(TDTV\d{2}[BC]S\d{2}[FHU])'
@@ -39396,6 +39474,9 @@ TopDevice:
     - regex: 'TDT3778_Wi_E'
       device: 'tablet'
       model: 'K8'
+    - regex: 'TDT3887_Wi_D'
+      device: 'tablet'
+      model: 'K7'
     - regex: 'TDT4528_4G_E'
       device: 'tablet'
       model: 'C8'
@@ -40598,6 +40679,18 @@ Rocket:
   device: 'tablet'
   model: '$1'
 
+# TYD or JXCNSNW
+TYD:
+  regex: '(TYD-109([_ ]Pro)?)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# HMD (hmd.com)
+HMD:
+  regex: 'HMD Pulse Pro'
+  device: 'smartphone'
+  model: 'Pulse Pro'
+
 # Devices with undectable brand, but detectable model
 Unknown:
   regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro| BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|(?:M10 Ultra|FO-R15|TVBOX|Smart[ _-]?TV|SmartATV|M8S\+ 4K|PCBox|rk(?:3128|322x|3368)(?:[_-]box)?|H10 PLAY|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|mips.+(?:Opera TV|wireless|wired)|smartbox|TV BOX|BOX TV|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|tv001 on rtd289x|hx322x_box|X98_S500|8K3528-T|MX10|V88|H8S|X92|AI PONT|tv\.plus)(?:[);/ ]|$)'
diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml
index 849b4ed3..05e19917 100644
--- a/regexes/device/notebooks.yml
+++ b/regexes/device/notebooks.yml
@@ -39,6 +39,19 @@ Asus:
     - regex: 'FBMD/X556UQK;'
       model: 'X556UQK'
 
+Alienware:
+  regex: 'FBMD/(?:Alienware [0-9]{2,3}R[0-9]{1,2}|Area-51m|R3|R4|Alienware Aurora R[0-9]+(:? [0-9]+)?);'
+  device: 'desktop'
+  models:
+    - regex: 'Alienware 15R3;'
+      model: 'Alienware 15 R3'
+    - regex: 'Alienware 17R4;'
+      model: 'Alienware 17 R4'
+    - regex: 'Area-51m;'
+      model: 'Area-51m'
+    - regex: 'Aurora (R[0-9]+)'
+      model: 'Aurora $1'
+
 Dell:
   regex: 'FBMD/(?:Latitude E4300|Inspiron 3541|XPS 15 95[35]0);'
   device: 'desktop'
diff --git a/regexes/oss.yml b/regexes/oss.yml
index 359cb2ea..79534289 100644
--- a/regexes/oss.yml
+++ b/regexes/oss.yml
@@ -5,6 +5,118 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# WoPhone
+##########
+- regex: 'WoPhone(?:/(\d+[\.\d]+))?'
+  name: 'WoPhone'
+  version: '$1'
+
+##########
+# KIN OS (https://en.wikipedia.org/wiki/Microsoft_Kin)
+##########
+- regex: 'KIN\.(?:One|Two) (\d+[\.\d]+)'
+  name: 'KIN OS'
+  version: '$1'
+
+##########
+# Star-Blade OS
+##########
+- regex: 'Star-Blade OS'
+  name: 'Star-Blade OS'
+  version: ''
+
+##########
+# Qtopia (https://en.wikipedia.org/wiki/Qt_Extended)
+##########
+- regex: 'Qtopia/(\d+[\.\d]+)'
+  name: 'Qtopia'
+  version: '$1'
+
+##########
+# OpenVMS (https://vmssoftware.com/)
+##########
+- regex: 'OpenVMS V(\d+[\.\d]+)'
+  name: 'OpenVMS'
+  version: '$1'
+
+##########
+# AROS (https://aros.sourceforge.io/)
+##########
+- regex: 'AROS'
+  name: 'AROS'
+  version: ''
+
+##########
+# NeXTSTEP
+##########
+- regex: '\(NEXT\)'
+  name: 'NeXTSTEP'
+  version: ''
+
+##########
+# NEWS-OS (https://en.wikipedia.org/wiki/Sony_NEWS)
+##########
+- regex: 'NEWS-OS (\d+[\.\d]+)'
+  name: 'NEWS-OS'
+  version: '$1'
+
+##########
+# ULTRIX (https://en.wikipedia.org/wiki/Ultrix)
+##########
+- regex: 'ULTRIX (\d+[\.\d]+)'
+  name: 'ULTRIX'
+  version: '$1'
+
+##########
+# Turbolinux (http://www.turbolinux.com/)
+##########
+- regex: 'Turbolinux/(\d+[\.\d]+)'
+  name: 'Turbolinux'
+  version: '$1'
+
+##########
+# Joli OS (https://www.jolicloud.com/products/)
+##########
+- regex: 'Joli OS/(\d+[\.\d]+)'
+  name: 'Joli OS'
+  version: '$1'
+
+##########
+# GENIX
+##########
+- regex: 'GENIX (\d+[\.\d]+)'
+  name: 'GENIX'
+  version: '$1'
+
+##########
+# gNewSense (http://www.gnewsense.org)
+##########
+- regex: 'gNewSense/.*\((\d+[\.\d]+)'
+  name: 'gNewSense'
+  version: '$1'
+
+##########
+# GEOS
+##########
+- regex: 'Geos (\d+[\.\d]+)'
+  name: 'GEOS'
+  version: '$1'
+
+##########
+# Motorola EZX
+##########
+- regex: 'MOT-.*LinuxOS/'
+  name: 'Motorola EZX'
+  version: ''
+
+##########
+# Baidu Yi (https://en.wikipedia.org/wiki/Baidu_Yi)
+##########
+- regex: 'Baidu Yi'
+  name: 'Baidu Yi'
+  version: ''
+
 ##########
 # Red Star (https://en.wikipedia.org/wiki/Red_Star_OS)
 ##########
@@ -701,7 +813,7 @@
 ##########
 # ThreadX
 ##########
-- regex: 'ThreadX(?:/(\d+[\.\d]*))?'
+- regex: 'ThreadX(?:_OS)?(?:/(\d+[\.\d]*))?'
   name: 'ThreadX'
   version: '$1'
 
@@ -1088,7 +1200,7 @@
 ##########
 # watchOS (https://developer.apple.com/watchos/)
 ##########
-- regex: '(?:Watch1,[12]/|Watch OS,|watchOS[ /])(\d+[\.\d]*)'
+- regex: '(?:Watch1,[12]/|Watch OS,|watchOS[ /]?)(\d+[\.\d]*)?'
   name: 'watchOS'
   version: '$1'
 - regex: 'Apple Watch(?!;)'
@@ -1819,7 +1931,7 @@
   name: 'GNU/Linux'
   version: '$1'
 
-- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu|X11'
+- regex: 'Linux[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu|X11'
   name: 'GNU/Linux'
   version: ''
 
diff --git a/tests/fixtures/clients/browser.yml b/tests/fixtures/clients/browser.yml
index cd4408ad..31ebfb6c 100644
--- a/tests/fixtures/clients/browser.yml
+++ b/tests/fixtures/clients/browser.yml
@@ -9460,3 +9460,57 @@
     engine: WebKit
     engine_version: 605.1.15
     family: ""
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; OPPO R9tm Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36 wkbrowser 4.1.61 3091
+  client:
+    type: browser
+    name: Wukong Browser
+    version: 4.1.61
+    engine: Blink
+    engine_version: 43.0.2357.121
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a5pre) Gecko/20070530 Swiftweasel/3.0a5.1pre
+  client:
+    type: browser
+    name: Swiftweasel
+    version: "3.0"
+    engine: Gecko
+    engine_version: "1.9"
+    family: Firefox
+-
+  user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_7_3; en-us) AppleWebKit/534.53.11 (KHTML, like Gecko) Roccat/2.3 Roccat/534.53.11
+  client:
+    type: browser
+    name: Roccat
+    version: "2.3"
+    engine: WebKit
+    engine_version: 534.53.11
+    family: ""
+-
+  user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 Kuaiso/1.42.501.448 Safari/537.36
+  client:
+    type: browser
+    name: 7Star
+    version: 1.42.501.448
+    engine: Blink
+    engine_version: 42.0.2311.152
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1003.1 Safari/535.19 Awesomium/1.7.4.2
+  client:
+    type: browser
+    name: Awesomium
+    version: 1.7.4.2
+    engine: WebKit
+    engine_version: "535.19"
+    family: ""
+-
+  user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.3) Gecko/20100402 Prism/1.0b4
+  client:
+    type: browser
+    name: Prism
+    version: "1.0"
+    engine: Gecko
+    engine_version: 1.9.2.3
+    family: Firefox
diff --git a/tests/fixtures/clients/library.yml b/tests/fixtures/clients/library.yml
index 461e6423..8ce5a0b9 100644
--- a/tests/fixtures/clients/library.yml
+++ b/tests/fixtures/clients/library.yml
@@ -659,3 +659,33 @@
     type: library
     name: Boto3
     version: 1.17.18
+-
+  user_agent: Python-xmlrpc/3.12
+  client:
+    type: library
+    name: XML-RPC
+    version: "3.12"
+-
+  user_agent: ICAP-Client-Library/2.3
+  client:
+    type: library
+    name: ICAP Client
+    version: "2.3"
+-
+  user_agent: IPinfoClient/PHP/3.1.2
+  client:
+    type: library
+    name: IPinfo
+    version: 3.1.2
+-
+  user_agent: IPinfoClient/Ruby/2.2.1
+  client:
+    type: library
+    name: IPinfo
+    version: 2.2.1
+-
+  user_agent: IPinfoClient/Java/3.0.0
+  client:
+    type: library
+    name: IPinfo
+    version: 3.0.0
diff --git a/tests/fixtures/clients/pim.yml b/tests/fixtures/clients/pim.yml
index a5c87d57..42eb58d9 100644
--- a/tests/fixtures/clients/pim.yml
+++ b/tests/fixtures/clients/pim.yml
@@ -275,3 +275,15 @@
     type: pim
     name: mailapp
     version: 6.5.0
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.2pre) Gecko/2009031304 Spicebird/0.7.1
+  client:
+    type: pim
+    name: Spicebird
+    version: 0.7.1
+-
+  user_agent: Android-Gmail/64562652 (sw411dp; 420dpi) (r7 TP1A.220624.014)
+  client:
+    type: pim
+    name: Gmail
+    version: ""
diff --git a/tests/fixtures/devices/bots.yml b/tests/fixtures/devices/bots.yml
index 4ac9fc3f..7bfa978c 100644
--- a/tests/fixtures/devices/bots.yml
+++ b/tests/fixtures/devices/bots.yml
@@ -156,10 +156,10 @@
   bot:
     name: Applebot
     category: Crawler
-    url: https://support.apple.com/en-us/HT204683
+    url: https://support.apple.com/en-us/119829
     producer:
       name: Apple Inc
-      url: https://www.apple.com
+      url: https://www.apple.com/
 -
   user_agent: AppSignalBot/1.0 (+https://appsignal.com)
   bot:
@@ -174,10 +174,28 @@
   bot:
     name: Applebot
     category: Crawler
-    url: https://support.apple.com/en-us/HT204683
+    url: https://support.apple.com/en-us/119829
     producer:
       name: Apple Inc
-      url: https://www.apple.com
+      url: https://www.apple.com/
+-
+  user_agent: Applebot-Extended
+  bot:
+    name: Applebot
+    category: Crawler
+    url: https://support.apple.com/en-us/119829
+    producer:
+      name: Apple Inc
+      url: https://www.apple.com/
+-
+  user_agent: iTMS
+  bot:
+    name: iTMS
+    category: Crawler
+    url: https://support.apple.com/en-us/119829
+    producer:
+      name: Apple Inc
+      url: https://www.apple.com/
 -
   user_agent: Arachni/v1.5.1
   bot:
@@ -5870,6 +5888,12 @@
     name: phpMyAdmin
     category: Service Agent
     url: https://www.phpmyadmin.net/
+-
+  user_agent: phpMyAdmin/reporting-script
+  bot:
+    name: phpMyAdmin
+    category: Service Agent
+    url: https://www.phpmyadmin.net/
 -
   user_agent: Trackable/0.1 NNjCeA
   bot:
@@ -7724,3 +7748,49 @@
     producer:
       name: CloudFlare
       url: https://www.cloudflare.com/
+-
+  user_agent: Mozilla/4.0 (compatible; DepSpid/5.07; +http://about.depspid.net)
+  bot:
+    name: DepSpid
+    category: Crawler
+    url: https://web.archive.org/web/20080321224033/http://about.depspid.net/
+-
+  user_agent: GlobalWebSearch
+  bot:
+    name: Generic Bot
+-
+  user_agent: acme.sectigo.com/v2/DV
+  bot:
+    name: Sectigo DCV
+    category: Service Agent
+    url: https://sectigo.com/
+    producer:
+      name: Sectigo Limited
+      url: https://sectigo.com/
+-
+  user_agent: acme.sectigo.com/v2/OV
+  bot:
+    name: Sectigo DCV
+    category: Service Agent
+    url: https://sectigo.com/
+    producer:
+      name: Sectigo Limited
+      url: https://sectigo.com/
+-
+  user_agent: acme.sectigo.com/v2/EV
+  bot:
+    name: Sectigo DCV
+    category: Service Agent
+    url: https://sectigo.com/
+    producer:
+      name: Sectigo Limited
+      url: https://sectigo.com/
+-
+  user_agent: Mozilla/5.0 (compatible; Website-info.net-Robot; https://website-info.net/robot)
+  bot:
+    name: Website-info
+    category: Crawler
+    url: https://website-info.net/robot
+    producer:
+      name: Meins und Vogel GmbH
+      url: https://muv.com/
diff --git a/tests/fixtures/devices/desktop.yml b/tests/fixtures/devices/desktop.yml
index e110d789..0c04497c 100644
--- a/tests/fixtures/devices/desktop.yml
+++ b/tests/fixtures/devices/desktop.yml
@@ -9727,3 +9727,35 @@
     model: Engage One Pro AIO
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.2pre) Gecko/2009031304 Spicebird/0.7.1
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: x86
+  client:
+    type: pim
+    name: Spicebird
+    version: 0.7.1
+  device:
+    type: desktop
+    brand: ""
+    model: ""
+  os_family: GNU/Linux
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Windows NT 10.0.18362.356; osmeta 10.3.45364) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.45364 Build/45364 FBAN/FBW;FBAV/186.0.0.88.783;FBBV/171658047;FBDV/AlienwareAuroraR70858;FBMD/Alienware Aurora R7 0858;FBSN/Windows;FBSV/10.0.18362.657;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0
+  os:
+    name: Windows
+    version: "10.0.18362.657"
+    platform: ""
+  client:
+    type: mobile app
+    name: Facebook
+    version: "186.0.0.88.783"
+  device:
+    type: desktop
+    brand: Alienware
+    model: Aurora R7
+  os_family: Windows
+  browser_family: Unknown
diff --git a/tests/fixtures/devices/feature_phone.yml b/tests/fixtures/devices/feature_phone.yml
index f2c444b3..ab6a1b20 100644
--- a/tests/fixtures/devices/feature_phone.yml
+++ b/tests/fixtures/devices/feature_phone.yml
@@ -300,8 +300,8 @@
 -
   user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 6.12; es-US; KIN.Two 1.0)
   os:
-    name: Windows CE
-    version: ""
+    name: KIN OS
+    version: "1.0"
     platform: ""
   client:
     type: browser
diff --git a/tests/fixtures/devices/phablet-1.yml b/tests/fixtures/devices/phablet-1.yml
index e14301a3..717001fe 100644
--- a/tests/fixtures/devices/phablet-1.yml
+++ b/tests/fixtures/devices/phablet-1.yml
@@ -4606,3 +4606,93 @@
     model: Redmi Note 12R Pro
   os_family: Android
   browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; Infinix X6851) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: phablet
+    brand: Infinix
+    model: Note 40 Pro 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; Infinix X6851B Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/125.0.6422.148 YaBrowser/22.8.1.94 (lite) Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 22.8.1.94
+    engine: Blink
+    engine_version: 125.0.6422.148
+  device:
+    type: phablet
+    brand: Infinix
+    model: Note 40 Pro+ 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-F946N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.00
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: phablet
+    brand: Samsung
+    model: Galaxy Z Fold 5
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-F9460) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.00
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: phablet
+    brand: Samsung
+    model: Galaxy Z Fold 5
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; SM-N976N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.71 YaSearchBrowser/24.47.1 BroPP/1.0 YaSearchApp/24.47.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.47.1
+    engine: Blink
+    engine_version: 122.0.6261.71
+  device:
+    type: phablet
+    brand: Samsung
+    model: Galaxy Note 10+
+  os_family: Android
+  browser_family: Unknown
diff --git a/tests/fixtures/devices/podcasting.yml b/tests/fixtures/devices/podcasting.yml
index c85371d8..0ed0babe 100644
--- a/tests/fixtures/devices/podcasting.yml
+++ b/tests/fixtures/devices/podcasting.yml
@@ -7792,6 +7792,23 @@
     model: ""
   os_family: iOS
   browser_family: Unknown
+
+-
+  user_agent: sxm-android/7.5.2 motorola/moto-e5-play Android/8.0.0
+  os:
+    name: Android
+    version: "8.0.0"
+    platform: ""
+  client:
+    type: mobile app
+    name: SiriusXM
+    version: '7.5.2'
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto E5 Play
+  os_family: Android
+  browser_family: Unknown
 -
   user_agent: Snipd/2.2.52 CFNetwork/1410.0.3 Darwin/22.6.0 (iPhone iOS/16.6)
   os:
@@ -8898,3 +8915,71 @@
     model: Galaxy S21+ 5G
   os_family: Android
   browser_family: Unknown
+
+-
+  user_agent: WNYC App/3.0.3 Android/24 device/Verizon-SM-G930V
+  os:
+    name: Android
+    version: "24"
+    platform: ""
+  client:
+    type: mobile app
+    name: WNYC
+    version: "3.0.3"
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy S7
+  os_family: Android
+  browser_family: Unknown
+
+-
+  user_agent: 'WNYC/3.0.17-11105 iOS/11.1.2 device/iPhone7,2'
+  os:
+    name: iOS
+    version: "11.1.2"
+    platform: ""
+  client:
+    type: mobile app
+    name: WNYC
+    version: 3.0.17
+  device:
+    type: smartphone
+    brand: Apple
+    model: iPhone 6
+  os_family: iOS
+  browser_family: Unknown
+
+-
+  user_agent: WNYC 2.1.19 rv:11042 (iPhone; iPhone OS 10.3.2; en_US)
+  os:
+    name: iOS
+    version: "10.3.2"
+    platform: ""
+  client:
+    type: mobile app
+    name: WNYC
+    version: 2.1.19
+  device:
+    type: smartphone
+    brand: Apple
+    model: iPhone
+  os_family: iOS
+  browser_family: Unknown
+
+-
+  user_agent: WNYC/9556 CFNetwork/1496.0.7 Darwin/23.5.0
+  os:
+    name: iOS
+    version: "17.5"
+    platform: ""
+  client:
+    type: mobile app
+    name: WNYC
+    version: "9556"
+  device:
+    type: ""
+    brand: Apple
+    model: ""
+  os_family: iOS
+  browser_family: Unknown
diff --git a/tests/fixtures/devices/smartphone-1.yml b/tests/fixtures/devices/smartphone-1.yml
index 28a01f08..9eb5ee4b 100644
--- a/tests/fixtures/devices/smartphone-1.yml
+++ b/tests/fixtures/devices/smartphone-1.yml
@@ -1584,8 +1584,8 @@
     platform: ""
   client:
     type: browser
-    name: Chrome Webview
-    version: 30.0.0.0
+    name: Wukong Browser
+    version: 4.0.4
     engine: Blink
     engine_version: 30.0.0.0
   device:
diff --git a/tests/fixtures/devices/smartphone-3.yml b/tests/fixtures/devices/smartphone-3.yml
index c5abbb85..030af412 100644
--- a/tests/fixtures/devices/smartphone-3.yml
+++ b/tests/fixtures/devices/smartphone-3.yml
@@ -3833,8 +3833,8 @@
     platform: ""
   client:
     type: browser
-    name: Chrome Webview
-    version: 39.0.0.0
+    name: Wukong Browser
+    version: 4.1.55
     engine: Blink
     engine_version: 39.0.0.0
   device:
diff --git a/tests/fixtures/devices/smartphone-39.yml b/tests/fixtures/devices/smartphone-39.yml
index 2663ce7d..2ebf7e31 100644
--- a/tests/fixtures/devices/smartphone-39.yml
+++ b/tests/fixtures/devices/smartphone-39.yml
@@ -5573,3 +5573,631 @@
     model: F3 5G
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-cn; PJY110 Build/UP1A.230620.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.61 Mobile Safari/537.36 HeyTapBrowser/40.8.30.3
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: mobile app
+    name: HeyTapBrowser
+    version: 40.8.30.3
+  device:
+    type: smartphone
+    brand: OPPO
+    model: A3 Pro 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; ASUS_AI2401_A Build/UKQ1.231003.002) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 OPR/12.140.205 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Opera
+    version: 12.140.205
+    engine: Presto
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: Asus
+    model: ROG Phone 8
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SMART_ULTIMATE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: SPC
+    model: Smart Ultimate
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; XT2233-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 116.0.0.0
+    engine: Blink
+    engine_version: 116.0.0.0
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto G42
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; XT2225-1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 124.0.0.0
+    engine: Blink
+    engine_version: 124.0.0.0
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto G82
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; XT-2201) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 122.0.0.0
+    engine: Blink
+    engine_version: 122.0.0.0
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto Edge X30 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; Z2352N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: Nubia
+    model: Neo 2 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; ZG65 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: Vortex
+    model: ZG65 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; HMD Pulse Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 118.0.0.0
+    engine: Blink
+    engine_version: 118.0.0.0
+  device:
+    type: smartphone
+    brand: HMD
+    model: Pulse Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; 24040RN64Y) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 120.0.0.0
+    engine: Blink
+    engine_version: 120.0.0.0
+  device:
+    type: smartphone
+    brand: Xiaomi
+    model: Redmi 13
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; 2312FRAFDI) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: POCO
+    model: X6 Neo
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; 2312CRNCCL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.179 Mobile Safari/537.36 OPR/82.5.4342.79868
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 82.5.4342.79868
+    engine: Blink
+    engine_version: 124.0.6367.179
+  device:
+    type: smartphone
+    brand: Xiaomi
+    model: Redmi A3
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; 23113RKC6G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: POCO
+    model: F6 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; V2337) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: Vivo
+    model: V40 SE 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; V2366GA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: Vivo
+    model: X100 Ultra
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; V2324HA; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.141 Mobile Safari/537.36 VivoBrowser/18.7.10.0
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: vivo Browser
+    version: 18.7.10.0
+    engine: Blink
+    engine_version: 87.0.4280.141
+  device:
+    type: smartphone
+    brand: Vivo
+    model: X100s Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; V2412 Build/UP1A.231005.007_NONFCMOD1) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 124.0.6367.179
+    engine: Blink
+    engine_version: 124.0.6367.179
+  device:
+    type: smartphone
+    brand: Vivo
+    model: Y100
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; Motorola Moto G8 Power) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6295.213 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 122.0.6295.213
+    engine: Blink
+    engine_version: 122.0.6295.213
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto G8 Power
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; Infinix X6871) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 121.0.0.0
+    engine: Blink
+    engine_version: 121.0.0.0
+  device:
+    type: smartphone
+    brand: Infinix
+    model: GT 20 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; ZTE Nubia Z20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6267.203 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 122.0.6267.203
+    engine: Blink
+    engine_version: 122.0.6267.203
+  device:
+    type: smartphone
+    brand: Nubia
+    model: Z20
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; BL9000 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: smartphone
+    brand: Blackview
+    model: BL9000 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; BL5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.104 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 96.0.4664.104
+    engine: Blink
+    engine_version: 96.0.4664.104
+  device:
+    type: smartphone
+    brand: Blackview
+    model: BL5000
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; BL9000 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/125.0.6422.147 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 125.0.6422.147
+    engine: Blink
+    engine_version: 125.0.6422.147
+  device:
+    type: smartphone
+    brand: Blackview
+    model: BL9000
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; V2354A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.71 YaSearchBrowser/24.47.1 BroPP/1.0 YaSearchApp/24.47.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.47.1
+    engine: Blink
+    engine_version: 122.0.6261.71
+  device:
+    type: smartphone
+    brand: Vivo
+    model: Y200i
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; TECNO CL7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.447 YaApp_Android/24.45 YaSearchBrowser/24.45 BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "24.45"
+    engine: Blink
+    engine_version: 122.0.6261.447
+  device:
+    type: smartphone
+    brand: Tecno Mobile
+    model: Camon 30 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-M346B2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.00
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy M34 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-C5560) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.447 YaApp_Android/24.45.1 YaSearchBrowser/24.45.1 BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.45.1
+    engine: Blink
+    engine_version: 122.0.6261.447
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy C55 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-A5560) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.00
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy A55 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-A546S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.71 YaSearchBrowser/24.47.1 BroPP/1.0 YaSearchApp/24.47.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.47.1
+    engine: Blink
+    engine_version: 122.0.6261.71
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy Quantum 4
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-A155N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.121 YaSearchBrowser/24.46.1 BroPP/1.0 YaSearchApp/24.46.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.46.1
+    engine: Blink
+    engine_version: 122.0.6261.121
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy A15
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; N55 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.447 YaApp_Android/24.45.1 YaSearchBrowser/24.45.1 BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.45.1
+    engine: Blink
+    engine_version: 122.0.6261.447
+  device:
+    type: smartphone
+    brand: Doogee
+    model: N55 Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; 24069RA21C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.71 YaSearchBrowser/24.47.1 BroPP/1.0 YaSearchApp/24.47.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.47.1
+    engine: Blink
+    engine_version: 122.0.6261.71
+  device:
+    type: smartphone
+    brand: Xiaomi
+    model: Redmi Turbo 3
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; SM-E146B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.00
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy F14 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; SM-G977P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.81 YaSearchBrowser/24.47 BroPP/1.0 YaSearchApp/24.47 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "24.47"
+    engine: Blink
+    engine_version: 122.0.6261.81
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy S10
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 11; conquest_S20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.991 YaApp_Android/24.43.1 YaSearchBrowser/24.43.1 BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.43.1
+    engine: Blink
+    engine_version: 122.0.6261.991
+  device:
+    type: smartphone
+    brand: Conquest
+    model: S20
+  os_family: Android
+  browser_family: Unknown
diff --git a/tests/fixtures/devices/smartphone-4.yml b/tests/fixtures/devices/smartphone-4.yml
index 60fa1d8f..782d8721 100644
--- a/tests/fixtures/devices/smartphone-4.yml
+++ b/tests/fixtures/devices/smartphone-4.yml
@@ -8306,24 +8306,6 @@
     model: Galaxy Nexus
   os_family: Android
   browser_family: Android Browser
--
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE7) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    version: 4.0.4
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: Google
-    model: Glass
-  os_family: Android
-  browser_family: Android Browser
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.1; vi-vn; Nexus 4 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
diff --git a/tests/fixtures/devices/tablet-11.yml b/tests/fixtures/devices/tablet-11.yml
index f4330f09..44cccca0 100644
--- a/tests/fixtures/devices/tablet-11.yml
+++ b/tests/fixtures/devices/tablet-11.yml
@@ -6371,3 +6371,325 @@
     model: ZC-P95
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 10; en-us; TYD-109 Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 76.0.3809.111
+    engine: Blink
+    engine_version: 76.0.3809.111
+  device:
+    type: tablet
+    brand: TYD
+    model: TYD-109
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; TYD-109_Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: tablet
+    brand: TYD
+    model: TYD-109 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; T104_64GB) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: tablet
+    brand: Qubo
+    model: T104
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; TERRA_PAD_1200_V2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.179 Safari/537.36 OPR/82.3.4342.79590
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Opera
+    version: 82.3.4342.79590
+    engine: Blink
+    engine_version: 124.0.6367.179
+  device:
+    type: tablet
+    brand: Wortmann
+    model: Terra Pad 1200 V2
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; V12E-LTE-8128 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/125.0.6422.165 Safari/537.36 TwitterAndroid
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: mobile app
+    name: Twitter
+    version: ""
+  device:
+    type: tablet
+    brand: VALE
+    model: V12E LTE
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 14; AGM_PAD_P2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 125.0.0.0
+    engine: Blink
+    engine_version: 125.0.0.0
+  device:
+    type: tablet
+    brand: AGM
+    model: Pad P2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X916C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.447 YaApp_Android/24.45/apad YaSearchBrowser/24.45/apad BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "24.45"
+    engine: Blink
+    engine_version: 122.0.6261.447
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab S9 Ultra 14.6" 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X910) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.01 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.01
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab S9 Ultra 14.6" WiFi
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X818U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.01 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.01
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab S9+ 12.4" 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X816B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.44 YaBrowser/24.4.7.44.01 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.44.01
+    engine: Blink
+    engine_version: 122.0.6261.44
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab S9+ 12.4" 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X610) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.71 YaSearchBrowser/24.47/apad BroPP/1.0 YaSearchApp/24.47/apad webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "24.47"
+    engine: Blink
+    engine_version: 122.0.6261.71
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab S9 FE+ 12.4" WiFi
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X216C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.01 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.01
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab A9+ 11.0" 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-X115) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.01 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.01
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab A9 8.7"
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; OT5 S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.39 YaBrowser/24.4.7.39.01 Safari/537.36
+  os:
+    name: Android
+    version: "14"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.7.39.01
+    engine: Blink
+    engine_version: 122.0.6261.39
+  device:
+    type: tablet
+    brand: Oukitel
+    model: OT5 S
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; SM-X216N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.105 YaBrowser/24.4.5.105.01 Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.5.105.01
+    engine: Blink
+    engine_version: 122.0.6261.105
+  device:
+    type: tablet
+    brand: Samsung
+    model: Galaxy Tab A9+ 11.0" 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; T26-EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.447 YaApp_Android/24.45/apad YaSearchBrowser/24.45/apad BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "24.45"
+    engine: Blink
+    engine_version: 122.0.6261.447
+  device:
+    type: tablet
+    brand: TOSCIDO
+    model: T26
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 11; TDT3887_Wi_D_CIS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.5993.414 YaSearchBrowser/23.115/apad BroPP/1.0 YaSearchApp/23.115/apad webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "23.115"
+    engine: Blink
+    engine_version: 118.0.5993.414
+  device:
+    type: tablet
+    brand: TopDevice
+    model: K7
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; VOOM TAB 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 79.0.3945.116
+    engine: Blink
+    engine_version: 79.0.3945.116
+  device:
+    type: tablet
+    brand: InnJoo
+    model: Voom Tab 2
+  os_family: Android
+  browser_family: Chrome
diff --git a/tests/fixtures/devices/tv-2.yml b/tests/fixtures/devices/tv-2.yml
index 9774b249..6d33d3c8 100644
--- a/tests/fixtures/devices/tv-2.yml
+++ b/tests/fixtures/devices/tv-2.yml
@@ -9926,3 +9926,75 @@
     model: 24PL51TC-SM
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; YNDX-00073 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.86 (lite) TV Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.86
+    engine: Blink
+    engine_version: 113.0.5672.163
+  device:
+    type: tv
+    brand: Yandex
+    model: YNDX-00073
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; X96Air_V2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 71.0.3578.99
+    engine: Blink
+    engine_version: 71.0.3578.99
+  device:
+    type: tv
+    brand: X96
+    model: Air V2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; X96Air_100W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 84.0.4147.89
+    engine: Blink
+    engine_version: 84.0.4147.89
+  device:
+    type: tv
+    brand: X96
+    model: Air 100W
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; X96Air_P1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 74.0.3729.136
+    engine: Blink
+    engine_version: 74.0.3729.136
+  device:
+    type: tv
+    brand: X96
+    model: Air P1
+  os_family: Android
+  browser_family: Chrome
diff --git a/tests/fixtures/devices/tv-3.yml b/tests/fixtures/devices/tv-3.yml
index 29d0c690..a172366a 100644
--- a/tests/fixtures/devices/tv-3.yml
+++ b/tests/fixtures/devices/tv-3.yml
@@ -7383,3 +7383,273 @@
     model: J-Link II
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED65M02SU Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/24.1.2.163 (lite) Safari/537.36 TV
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.163
+    engine: Blink
+    engine_version: 83.0.4103.120
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED65M02SU
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED55M02SU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 86.0.4240.185
+    engine: Blink
+    engine_version: 86.0.4240.185
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED55M02SU
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED50M02SU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 86.0.4240.185
+    engine: Blink
+    engine_version: 86.0.4240.185
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED50M02SU
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED43M02SU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 86.0.4240.185
+    engine: Blink
+    engine_version: 86.0.4240.185
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED43M02SU
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED32M14S Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/23.1.0.39 (lite) Safari/537.36 TV
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 23.1.0.39
+    engine: Blink
+    engine_version: 83.0.4103.120
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED32M14S
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED32M10S Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/24.1.2.87 (lite) Safari/537.36 TV
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.87
+    engine: Blink
+    engine_version: 83.0.4103.120
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED32M10S
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED32M09S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 86.0.4240.185
+    engine: Blink
+    engine_version: 86.0.4240.185
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED32M09S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED24M09S Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/24.1.2.87 (lite) TV Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.87
+    engine: Blink
+    engine_version: 83.0.4103.120
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED24M09S
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-LED24M06S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 86.0.4240.185
+    engine: Blink
+    engine_version: 86.0.4240.185
+  device:
+    type: tv
+    brand: Soundmax
+    model: SM-LED24M06S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SW-LED58UG401 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 YaBrowser/24.1.2.86 (lite) TV Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.86
+    engine: Blink
+    engine_version: 112.0.5615.136
+  device:
+    type: tv
+    brand: Starwind
+    model: SW-LED58UG401
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SW-22AE NF Build/RTT2.220103.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/125.0.6422.165 YaBrowser/24.1.2.163 (lite) TV Safari/537.36'
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.163
+    engine: Blink
+    engine_version: 125.0.6422.165
+  device:
+    type: tv
+    brand: Skyworth
+    model: SWTV-22AE NF
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; X96Air_P2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 74.0.3729.136
+    engine: Blink
+    engine_version: 74.0.3729.136
+  device:
+    type: tv
+    brand: X96
+    model: Air P2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; X96Air_P3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 71.0.3578.99
+    engine: Blink
+    engine_version: 71.0.3578.99
+  device:
+    type: tv
+    brand: X96
+    model: Air P3
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; SW-LED55UG403 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.116 YaBrowser/24.1.2.86 (lite) TV Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Yandex Browser Lite
+    version: 24.1.2.86
+    engine: Blink
+    engine_version: 111.0.5563.116
+  device:
+    type: tv
+    brand: Starwind
+    model: SW-LED55UG403
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; SWITRON-i12A Build/PSV1.210329.021; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.205 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 114.0.5735.205
+    engine: Blink
+    engine_version: 114.0.5735.205
+  device:
+    type: tv
+    brand: Wink
+    model: Switron i12A
+  os_family: Android
+  browser_family: Chrome
diff --git a/tests/fixtures/devices/wearable.yml b/tests/fixtures/devices/wearable.yml
index 8b6f3726..d3617917 100644
--- a/tests/fixtures/devices/wearable.yml
+++ b/tests/fixtures/devices/wearable.yml
@@ -287,6 +287,20 @@
     model: Watch Series 5 44mm
   os_family: iOS
   browser_family: Unknown
+-
+  user_agent: atc/1.0 watchOS
+  os:
+    name: watchOS
+    version: ""
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch
+  os_family: iOS
+  browser_family: Unknown
+
 -
   user_agent: com.apple.appstored/1.0 watchOS/7.0 model/Watch6,1 hwp/t8301 build/18R382 (6; dt:226) AMS/1
   os:
@@ -2423,3 +2437,21 @@
     model: Galaxy Watch 4 Classic 42mm
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE7) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    version: 4.0.4
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: wearable
+    brand: Google
+    model: Glass 1
+  os_family: Android
+  browser_family: Android Browser
diff --git a/tests/fixtures/oss.yml b/tests/fixtures/oss.yml
index d88135bf..6a8a0114 100644
--- a/tests/fixtures/oss.yml
+++ b/tests/fixtures/oss.yml
@@ -106,8 +106,8 @@
 -
   user_agent: MOT-A1600/1.0 LinuxOS/2.4.20 Release/8.22.2006 Browser/Opera8.00 Profile/MIDP-2.0 Configuration/CLDC-1.1 Software/R542_G_11.61.33R
   os:
-    name: GNU/Linux
-    short_name: LIN
+    name: Motorola EZX
+    short_name: EZX
     version: ""
     platform: ""
     family: GNU/Linux
@@ -4966,3 +4966,139 @@
     version: "18.0"
     platform: ""
     family: iOS
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.3.4; xx; Baidu Yi on Passion Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) FlyFlow/2.2 Version/4.0 Mobile Safari/533.1
+  os:
+    name: Baidu Yi
+    short_name: BYI
+    version: ""
+    platform: ""
+    family: Android
+-
+  user_agent: Nokia-Communicator-WWW-Browser/3.0 (Geos 3.0 Nokia-9110)
+  os:
+    name: GEOS
+    short_name: GEO
+    version: "3.0"
+    platform: ""
+    family: Other Mobile
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux x86_64; xx) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+ gNewSense/parkes (2.30.6-1gnewsense1) Epiphany/2.30.6
+  os:
+    name: gNewSense
+    short_name: GNS
+    version: 2.30.6
+    platform: x64
+    family: GNU/Linux
+-
+  user_agent: Mozilla/5.0 (X11; U; GENIX 4.1 MG-200/NS32332; en-US; rv:4.7.1.1) Gecko/20080815 SeaMonkey/1.2.3
+  os:
+    name: GENIX
+    short_name: GNX
+    version: "4.1"
+    platform: ""
+    family: Unix
+-
+  user_agent: Mozilla/5.0 (X11; Jolicloud Linux i686) AppleWebKit/537.6 (KHTML, like Gecko) Joli OS/1.2 Chromium/23.0.1240.0 Chrome/23.0.1240.0 Safari/537.6
+  os:
+    name: Joli OS
+    short_name: JOL
+    version: "1.2"
+    platform: x86
+    family: GNU/Linux
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; xx; rv:1.9.1.11) Gecko/20100728 Turbolinux/3.5.11-1 Firefox/3.5.11
+  os:
+    name: Turbolinux
+    short_name: TUR
+    version: 3.5.11
+    platform: x86
+    family: GNU/Linux
+-
+  user_agent: Links (2.8; ULTRIX 4.5 VAX; GNU C 1; text)
+  os:
+    name: ULTRIX
+    short_name: ULT
+    version: "4.5"
+    platform: ""
+    family: Unix
+-
+  user_agent: Mozilla/1.1I (X11; I; NEWS-OS 6.1.1 news5000)
+  os:
+    name: NEWS-OS
+    short_name: NWS
+    version: 6.1.1
+    platform: ""
+    family: Unix
+-
+  user_agent: PhilipsX2300/W1245_V12 ThreadX_OS/4.0 MOCOR/W12 Release/11.08.2012 Browser/Dorado1.0
+  os:
+    name: ThreadX
+    short_name: TDX
+    version: "4.0"
+    platform: ""
+    family: Real-time OS
+-
+  user_agent: WorldWideweb (NEXT)
+  os:
+    name: NeXTSTEP
+    short_name: NXT
+    version: ""
+    platform: ""
+    family: Unix
+-
+  user_agent: Mozilla/5.0 (i386; AROS 0.0; Odyssey Web Browser; rv:1.23) AppleWebKit/538.1 (KHTML, like Gecko) OWB/1.23 Safari/538.1
+  os:
+    name: AROS
+    short_name: ARO
+    version: ""
+    platform: x86
+    family: AmigaOS
+-
+  user_agent: 'VMS_Mosaic/3.8-1 (Motif;OpenVMS V7.3-2 DEC 3000 - M700) libwww/2.12_Mosaic'
+  os:
+    name: OpenVMS
+    short_name: OVS
+    version: "7.3"
+    platform: ""
+    family: OpenVMS
+-
+  user_agent: Mozilla/4.08 (PDA; SL-C860/1.40,Qtopia/1.5.4) NetFront/3.1 480x640
+  os:
+    name: Qtopia
+    short_name: QTP
+    version: 1.5.4
+    platform: ""
+    family: GNU/Linux
+-
+  user_agent: Mozilla/6.0 (Future Star Technologies Corp. Star-Blade OS; U; en-US) iNet Browser 2.5
+  os:
+    name: Star-Blade OS
+    short_name: SBL
+    version: ""
+    platform: ""
+    family: Unix
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 6.12; en-US; KIN.One 1.0)
+  os:
+    name: KIN OS
+    short_name: KIN
+    version: "1.0"
+    platform: ""
+    family: Windows Mobile
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 6.12; en-US; KIN.Two 1.0)
+  os:
+    name: KIN OS
+    short_name: KIN
+    version: "1.0"
+    platform: ""
+    family: Windows Mobile
+-
+  user_agent: TCL_J720/1.0 WoPhone/1.0 UPhone/1.0 Browser/UPhoneWebBrowser1.0 Profile/MIDP-1.0 Configuration/CLDC-1.0
+  os:
+    name: WoPhone
+    short_name: WPO
+    version: "1.0"
+    platform: ""
+    family: GNU/Linux