diff --git a/regexes/bots.yml b/regexes/bots.yml
index 463fdc8e6e..f85569d0c9 100644
--- a/regexes/bots.yml
+++ b/regexes/bots.yml
@@ -1610,7 +1610,7 @@
   category: 'Feed Reader'
   url: 'https://theoldreader.com'
 
-- regex: 'Trackable/0.1'
+- regex: 'Trackable/0\.1'
   name: 'Chartable'
   category: 'Site Monitor'
   url: 'https://help.chartable.com/article/34-what-is-the-trackable-analytics-prefix'
@@ -4311,7 +4311,7 @@
     name: 'Plesk International GmbH'
     url: 'https://www.plesk.com/'
 
-- regex: 'Who.is'
+- regex: 'Who\.is'
   name: 'Who.is Bot'
   category: 'Crawler'
   url: 'https://who.is/'
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
index fddea1e072..7191dbcc37 100644
--- a/regexes/client/browsers.yml
+++ b/regexes/client/browsers.yml
@@ -372,7 +372,7 @@
     default: 'Blink'
 
 # APN Browser
-- regex: 'Safari/537.36 (?:Browser|Navegador)'
+- regex: 'Safari/537\.36 (?:Browser|Navegador)'
   name: 'APN Browser'
   version: ''
   engine:
@@ -930,7 +930,7 @@
   version: '$1'
   engine:
     default: 'Blink'
-- regex: 'com.tcl.browser'
+- regex: 'com\.tcl\.browser'
   name: 'BrowseHere'
   version: '$1'
   engine:
@@ -1216,7 +1216,7 @@
   version: '$1'
 
 # Delta Browser (https://play.google.com/store/apps/details?id=com.airfind.deltabrowser)
-- regex: '(?:com.airfind.deltabrowser|AirSearch)(?:/(\d+[\.\d]+))?'
+- regex: '(?:com\.airfind\.deltabrowser|AirSearch)(?:/(\d+[\.\d]+))?'
   name: 'Delta Browser'
   version: '$1'
   engine:
@@ -1533,7 +1533,7 @@
 - regex: 'QIHU 360[ES]E|QihooBrowserHD/(\d+[.\d]+)'
   name: '360 Secure Browser'
   version: '$1'
-- regex: 'Chrome.+Safari/537.36/(\d+[.\d]+)$'
+- regex: 'Chrome.+Safari/537\.36/(\d+[.\d]+)$'
   name: '360 Secure Browser'
   version: '$1'
 
@@ -2043,14 +2043,14 @@
     default: 'Presto'
     versions:
       15: 'Blink'
-- regex: '(?:Opera|OPR)[/ ](?:9.80.*Version/)?(\d+\.[\.\d]+) .*Edition Next'
+- regex: '(?:Opera|OPR)[/ ](?:9\.80.*Version/)?(\d+\.[\.\d]+) .*Edition Next'
   name: 'Opera Next'
   version: '$1'
   engine:
     default: 'Presto'
     versions:
       15: 'Blink'
-- regex: '(?:Opera[/ ]?|OPR[/ ])(?:9.80.*Version/)?(\d+[\.\d]+)'
+- regex: '(?:Opera[/ ]?|OPR[/ ])(?:9\.80.*Version/)?(\d+[\.\d]+)'
   name: 'Opera'
   version: '$1'
   engine:
@@ -2321,7 +2321,7 @@
 - regex: '(?:SFB(?:rowser)?)/(\d+[\.\d]+)'
   name: 'Super Fast Browser'
   version: '$1'
-- regex: 'com.browser.tssomas(?:/(\d+[\.\d]+))?'
+- regex: 'com\.browser\.tssomas(?:/(\d+[\.\d]+))?'
   name: 'Super Fast Browser'
   version: '$1'
 
@@ -2501,7 +2501,7 @@
   version: '$1'
 
 #Openwave Mobile Browser
-- regex: 'UP.Browser(?:/(\d+[\.\d]+))?'
+- regex: 'UP\.Browser(?:/(\d+[\.\d]+))?'
   name: 'Openwave Mobile Browser'
   version: '$1'
 - regex: 'Openwave(?:/(\d+[\.\d]+))?'
@@ -2909,22 +2909,22 @@
   version: '$1'
   engine:
     default: 'Trident'
-- regex: 'MSIE.*Trident/4.0'
+- regex: 'MSIE.*Trident/4\.0'
   name: 'Internet Explorer'
   version: '8.0'
   engine:
     default: 'Trident'
-- regex: 'MSIE.*Trident/5.0'
+- regex: 'MSIE.*Trident/5\.0'
   name: 'Internet Explorer'
   version: '9.0'
   engine:
     default: 'Trident'
-- regex: 'MSIE.*Trident/6.0'
+- regex: 'MSIE.*Trident/6\.0'
   name: 'Internet Explorer'
   version: '10.0'
   engine:
     default: 'Trident'
-- regex: 'Trident/[78].0'
+- regex: 'Trident/[78]\.0'
   name: 'Internet Explorer'
   version: '11.0'
   engine:
diff --git a/regexes/client/libraries.yml b/regexes/client/libraries.yml
index d1fc0db8b5..4f8f93dcb5 100644
--- a/regexes/client/libraries.yml
+++ b/regexes/client/libraries.yml
@@ -275,7 +275,7 @@
   version: '$1'
   url: 'https://hc.apache.org/httpclient-3.x'
 
-- regex: 'WinHttp.WinHttpRequest.+([\.\d]+)'
+- regex: 'WinHttp\.WinHttpRequest.+([\.\d]+)'
   name: 'WinHttp WinHttpRequest'
   version: '$1'
 
@@ -557,12 +557,12 @@
   version: '$1'
   url: 'https://bitbucket.org/mailchimp/mandrill-api-php/src/master/'
 
-- regex: 'babashka.http-client(?:/(\d+[\.\d]+))?'
+- regex: 'babashka\.http-client(?:/(\d+[\.\d]+))?'
   name: 'Babashka HTTP Client'
   version: '$1'
   url: 'https://github.com/babashka/http-client'
 
-- regex: 'http.rb(?:/(\d+[\.\d]+))?'
+- regex: 'http\.rb(?:/(\d+[\.\d]+))?'
   name: 'http.rb'
   version: '$1'
   url: 'https://github.com/httprb/http'
@@ -577,7 +577,7 @@
   version: ''
   url: 'https://www.cakephp.org/'
 
-- regex: 'request.js'
+- regex: 'request\.js'
   name: 'request'
   version: ''
   url: 'https://github.com/request/request'
diff --git a/regexes/client/mediaplayers.yml b/regexes/client/mediaplayers.yml
index ebc0a2de12..12be0c6446 100644
--- a/regexes/client/mediaplayers.yml
+++ b/regexes/client/mediaplayers.yml
@@ -168,7 +168,7 @@
   version: '$1'
 
 # Xtream Player (https://play.google.com/store/apps/details?id=com.devcoder.iptvxtreamplayer)
-- regex: 'com.devcoder.iptvxtreamplayer'
+- regex: 'com\.devcoder\.iptvxtreamplayer'
   name: 'Xtream Player'
   version: ''
 
diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml
index e5c6f30a4f..ecc2dbc70c 100644
--- a/regexes/client/mobile_apps.yml
+++ b/regexes/client/mobile_apps.yml
@@ -44,7 +44,7 @@
   version: '$1'
 
 # Apple TV
-- regex: 'appletv.client'
+- regex: 'appletv\.client'
   name: 'Apple TV'
   version: ''
 
@@ -53,18 +53,18 @@
   name: 'Facebook Audience Network'
   version: '$1'
 
-# Facebook Messenger (https://play.google.com/store/apps/details?id=com.facebook.orca)
-- regex: '(?:MessengerForiOS|MESSENGER|FB_IAB/Orca-Android).(?:FBAV)(?:[ /]([\d\.]+))?'
-  name: 'Facebook Messenger'
-  version: '$1'
-
 # Facebook Messenger Lite
-- regex: '(?:mLite|MessengerLite(?:ForiOS)?).(?:FBAV)(?:[ /]([\d\.]+))?'
+- regex: '(?:mLite|MessengerLite(?:ForiOS)?).*(?:FBAV)(?:[ /]([\d\.]+))?'
   name: 'Facebook Messenger Lite'
   version: '$1'
 
+# Facebook Messenger (https://play.google.com/store/apps/details?id=com.facebook.orca)
+- regex: '(?:MessengerForiOS|MESSENGER|FB_IAB/Orca-Android).*(?:FBAV)(?:[ /]([\d\.]+))?'
+  name: 'Facebook Messenger'
+  version: '$1'
+
 # Facebook Groups
-- regex: '(?:GroupsForiOS).(?:FBAV)(?:[ /]([\d\.]+))?'
+- regex: '(?:GroupsForiOS).*(?:FBAV)(?:[ /]([\d\.]+))?'
   name: 'Facebook Groups'
   version: '$1'
 
@@ -79,7 +79,7 @@
   version: '$1'
 
 # Facebook
-- regex: '(?:FBAV|com.facebook.katana|facebook-mobile/1.0|facebook-mobile/|Facebook/)(?:[ /]([\d\.]+))?'
+- regex: '(?:FBAV|com\.facebook\.katana|facebook-mobile/1\.0|facebook-mobile/|Facebook/)(?:[ /]([\d\.]+))?'
   name: 'Facebook'
   version: '$1'
 - regex: '(?:FBAN|FBSV|FBID|FBBV)/'
@@ -92,27 +92,27 @@
   version: '$1'
 
 # Google Go
-- regex: 'com.google.android.apps.searchlite'
+- regex: 'com\.google\.android\.apps\.searchlite'
   name: 'Google Go'
   version: ''
 
 # Google Photos
-- regex: 'com.google.android.apps.photos'
+- regex: 'com\.google\.android\.apps\.photos'
   name: 'Google Photos'
   version: ''
 
 # Google Play Kiosk
-- regex: 'com.google.android.apps.magazines'
+- regex: 'com\.google\.android\.apps\.magazines'
   name: 'Google Play Newsstand'
   version: ''
 
 # Google Plus
-- regex: 'com.google.GooglePlus'
+- regex: 'com\.google\.GooglePlus'
   name: 'Google Plus'
   version: ''
 
 # Google Drive (https://apps.apple.com/us/app/google-drive/id507874739)
-- regex: 'Google.DriveExtension(?:/([\d\.]+))?'
+- regex: 'Google\.DriveExtension(?:/([\d\.]+))?'
   name: 'Google Drive'
   version: '$1'
 
@@ -153,7 +153,7 @@
   version: ''
 
 # YouTube
-- regex: 'com.google.android.youtube(?:/([\d\.]+))?'
+- regex: 'com\.google\.android\.youtube(?:/([\d\.]+))?'
   name: 'YouTube'
   version: '$1'
 
@@ -163,7 +163,7 @@
   version: '$1'
 
 # Netflix (https://play.google.com/store/apps/details?id=com.netflix.mediaclient)
-- regex: 'com.netflix.mediaclient(?:/(\d+\.[\d\.]+))?'
+- regex: 'com\.netflix\.mediaclient(?:/(\d+\.[\d\.]+))?'
   name: 'Netflix'
   version: '$1'
 
@@ -237,7 +237,7 @@
 - regex: '(?:^Overcast/([\d\.]+)|^Overcast.*Apple Watch)'
   name: 'Overcast'
   version: '$1'
-- regex: '(?:CastBox|fm.castbox.audiobook.radio.podcast)/?([\d\.]+)?'
+- regex: '(?:CastBox|fm\.castbox\.audiobook\.radio\.podcast)/?([\d\.]+)?'
   name: 'CastBox'
   version: '$1'
 - regex: 'Podkicker( (?:Pro|Classic))?/([\d\.]+)'
@@ -292,7 +292,7 @@
 - regex: 'com\.douban\.group/([\d\.]+)?'
   name: 'douban App'
   version: '$1'
-- regex: '(?:com.google.GoogleMobile|GSA|GoogleApp)/([\d.]+)?'
+- regex: '(?:com\.google\.GoogleMobile|GSA|GoogleApp)/([\d.]+)?'
   name: 'Google Search App'
   version: '$1'
 - regex: 'Google/(\d+[\.\d]+)? CFNetwork'
@@ -518,7 +518,7 @@
   version: '$1'
 
 # TikTok (https://apps.apple.com/app/id835599320 | https://play.google.com/store/apps/details?id=com.zhiliaoapp.musically)
-- regex: '(?:TikTok[/ ]|com.zhiliaoapp.musically|musical_ly_|AppName/musical_ly app_version/)(\d+\.(?:[\.\d]+))?'
+- regex: '(?:TikTok[/ ]|com\.zhiliaoapp\.musically|musical_ly_|AppName/musical_ly app_version/)(\d+\.(?:[\.\d]+))?'
   name: 'TikTok'
   version: '$1'
 
@@ -546,7 +546,7 @@
 - regex: 'Slack/(\d+[\.\d]+) CFNetwork'
   name: 'Slack'
   version: ''
-- regex: 'com.tinyspeck.chatlyio/(\d+[\.\d]+)'
+- regex: 'com\.tinyspeck\.chatlyio/(\d+[\.\d]+)'
   name: 'Slack'
   version: '$1'
 
@@ -666,11 +666,11 @@
   version: '$1'
 
 # Evolve Podcast (https://apps.apple.com/us/app/id1199070742)
-- regex: 'com.evolve.podcast/(\d+[\.\d]+)'
+- regex: 'com\.evolve\.podcast/(\d+[\.\d]+)'
   name: 'Evolve Podcast'
   version: '$1'
 
-- regex: ' Rocket.Chat\+?/(\d+[\.\d]+)'
+- regex: ' Rocket\.Chat\+?/(\d+[\.\d]+)'
   name: 'Rocket Chat'
   version: '$1'
 
@@ -991,7 +991,7 @@
   version: ''
 
 # Battle.net  (https://eu.shop.battle.net/en-us)
-- regex: 'Battle.net/(\d+[\.\d]+)'
+- regex: 'Battle\.net/(\d+[\.\d]+)'
   name: 'Battle.net'
   version: '$1'
 
@@ -1011,7 +1011,7 @@
   version: '$1'
 
 # Bible KJV (https://apps.apple.com/us/app/bible-kjv/id544098932)
-- regex: 'com.meevii.bibleKJV/(\d+[\.\d]+)'
+- regex: 'com\.meevii\.bibleKJV/(\d+[\.\d]+)'
   name: 'Bible KJV'
   version: '$1'
 
@@ -1021,7 +1021,7 @@
   version: '$1'
 
 # Paint by Number (https://apps.apple.com/us/app/paint-by-number-coloring-games/id1420058690)
-- regex: 'com.paint.bynumber/(\d+[\.\d]+)'
+- regex: 'com\.paint\.bynumber/(\d+[\.\d]+)'
   name: 'Paint by Number'
   version: '$1'
 
@@ -1146,7 +1146,7 @@
   version: '$1'
 
 # IMO.IM HD Version https://play.google.com/store/apps/details?id=com.imo.android.imoimhd
-- regex: 'imoAndroid/(20\d{2}.[\.\d]+)'
+- regex: 'imoAndroid/(20\d{2}\.[\.\d]+)'
   name: 'IMO HD Video Calls & Chat'
   version: '$1'
 
@@ -1204,12 +1204,12 @@
   version: ''
 
 # Q-municate (https://www.qmunicateh10.com | https://apps.apple.com/gb/app/q-municate/id909698517)
-- regex: 'com.Nanoteq.QmunicateH10p.+/(\d+\.[\.\d]+) \('
+- regex: 'com\.Nanoteq\.QmunicateH10p.+/(\d+\.[\.\d]+) \('
   name: 'Q-municate'
   version: '$1'
 
 # NET.mede (https://apps.apple.com/us/app/net-mede/id597007101)
-- regex: 'NET.mede'
+- regex: 'NET\.mede'
   name: 'NET.mede'
   version: ''
 
@@ -1254,7 +1254,7 @@
   version: '$1'
 
 # Safari Search Helper
-- regex: 'com.apple.Safari.SearchHelper/(\d+\.[\.\d]+)'
+- regex: 'com\.apple\.Safari\.SearchHelper/(\d+\.[\.\d]+)'
   name: 'Safari Search Helper'
   version: '$1'
 
@@ -1264,7 +1264,7 @@
   version: ''
 
 # Mercantile Bank of Michigan (https://apps.apple.com/us/app/mercantile-bank-of-michigan/id428982831)
-- regex: 'com.mercbank.s1mobileipad'
+- regex: 'com\.mercbank\.s1mobileipad'
   name: 'Mercantile Bank of Michigan'
   version: ''
 
@@ -1348,15 +1348,15 @@
   version: '$1'
 
 # Amazon Shopping (https://play.google.com/store/apps/details?id=com.amazon.mShop.android.shopping)
-- regex: 'Amazon.com/(\d+\.[\.\d]+)'
+- regex: 'Amazon\.com/(\d+\.[\.\d]+)'
   name: 'Amazon Shopping'
   version: '$1'
 
 # mobile.de (https://play.google.com/store/apps/details?id=de.mobile.android.app)
-- regex: 'de.mobile.android.app/(\d+\.[\.\d]+)'
+- regex: 'de\.mobile\.android\.app/(\d+\.[\.\d]+)'
   name: 'mobile.de'
   version: '$1'
-- regex: 'de.mobile.android.app/(.*) \((\d+\.[\.\d]+)\)'
+- regex: 'de\.mobile\.android\.app/(.*) \((\d+\.[\.\d]+)\)'
   name: 'mobile.de'
   version: '$2'
 
@@ -1446,12 +1446,12 @@
   version: ''
 
 # Audible
-- regex: '^(?:Audible, Android, |com.audible.playersdk.player/|Audible/)(\d+\.[.\d]+)?'
+- regex: '^(?:Audible, Android, |com\.audible\.playersdk\.player/|Audible/)(\d+\.[.\d]+)?'
   name: 'Audible'
   version: '$1'
 
 # Overcast (http://overcast.fm/)
-- regex: 'Overcast/?(\d+\.[.\d]+)? \(\+http://overcast.fm/; (?:Apple Watch|iOS) podcast'
+- regex: 'Overcast/?(\d+\.[.\d]+)? \(\+http://overcast\.fm/; (?:Apple Watch|iOS) podcast'
   name: 'Overcast'
   version: '$1'
 
@@ -1471,7 +1471,7 @@
   version: '$1'
 
 # jj2go https://apps.apple.com/us/app/jj2go/id1438749275
-- regex: 'RelesysApp/(\d+\.[.\d]+) \(\d{1,2}\) net.relesysapp.jj2go'
+- regex: 'RelesysApp/(\d+\.[.\d]+) \(\d{1,2}\) net\.relesysapp\.jj2go'
   name: 'JJ2GO'
   version: '$1'
 
@@ -1908,7 +1908,7 @@
   version: '$1'
 
 # The free NRC app offers you the latest news and the digital version of the paper newspaper.
-- regex: '(?:NRC-Nieuws/|nl.nrc.nrcapp )([\d\.]+)'
+- regex: '(?:NRC-Nieuws/|nl\.nrc\.nrcapp )([\d\.]+)'
   name: 'NRC'
   version: '$1'
 
@@ -2377,7 +2377,7 @@
   version: ''
 
 # BuzzVideo
-- regex: 'com.topbuzz.videoen/([\d\.]+)'
+- regex: 'com\.topbuzz\.videoen/([\d\.]+)'
   name: 'BuzzVideo'
   version: '$1'
 
diff --git a/regexes/client/pim.yml b/regexes/client/pim.yml
index a435323c2a..f531c08433 100644
--- a/regexes/client/pim.yml
+++ b/regexes/client/pim.yml
@@ -74,7 +74,7 @@
   version: ''
 
 # Raindrop.io (https://raindrop.io/)
-- regex: 'Raindrop.io/(\d+[\.\d]+)'
+- regex: 'Raindrop\.io/(\d+[\.\d]+)'
   name: 'Raindrop.io'
   version: '$1'
 
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 36512a719c..49fed963a5 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -103,7 +103,7 @@ Adronix:
 
 # Cherry Mobile (cherrymobile.com)
 'Cherry Mobile':
-  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2|DSR_(?:R8|R7P?)|CUBIX CUBE 3'
+  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2\.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2|DSR_(?:R8|R7P?)|CUBIX CUBE 3'
   device: 'smartphone'
   models:
     - regex: '(Flare2X|Aqua S9(?: (?:Max|Lite|Pro))?)'
@@ -3753,7 +3753,7 @@ AVH:
   regex: 'Excer[ _]'
   device: 'tablet'
   models:
-    - regex: 'Excer[ _]G5.([236])'
+    - regex: 'Excer[ _]G5\.([236])'
       model: 'Excer G5.$1'
     - regex: 'Excer[ _]G5'
       model: 'Excer G5'
@@ -3850,10 +3850,10 @@ Bitel:
 
 # Blu
 Blu:
-  regex: 'BLU[ _]|(?:blu|(?<!DROIDZ )Dash)[ _]([^/;)]+)(?: Build|[;)])|(?:Studio[ _](G3|J8M|X10L|X12|5.0K|5.5|View(?: XL)?|Mega(?: LTE)?|C 8\+8|[CGM][ _]HD|G2 HD|G4|[CGX]|SELFIE|Selfie LTE|Touch|M[45] Plus|J[1258]|X[89] HD|X10\+?|XL(?: 2)?)|Advance (4.0 ?[LM]|5.[02](?: HD)?|A4|L[45])|M6 2021|ENERGY (DIAMOND|XL)|ENERGY[_ ]DIAMOND[_ ]MINI|Energy X 2|LIFE XL|B110DL|Dash (?:X[2L]|L3)|PURE (?:X[LR]|MINI|View)|Life One X2|G50 (?:Mega|Plus)|G51 Plus|G90(?: PRO)?|G91 Pro|GRAND (?:M3|Max|5.5 HD|XL LTE|Mini|Energy)|R1 (?:HD|PLUS)|R2 (?:LTE|Plus)|Tank Xtreme [45].0|Tank Xtreme(?: Pro)?|Touchbook M7 Pro|DASH X PLUS|C[456] 2019|BOLD (?:M7|N1)|B1[34]0DL|Vivo (?:5 Mini|One Plus|5R|XL[234]| Plus|8L|XI[+]?|GO)|(?<!Neffos )C[56]L(?: 2020)?|C6 2020|G9 PRO|D701|VIEW 1|B13[15]DL|R2 3G|Grand (?:M2X?|XL|M2 LTE)|D600|D5[01]0|DIAMOND M|M8L Plus|STUDIO ENERGY|M8L 2022|LIFE X8|M10L Pro)(?:[);/ ]|$)'
+  regex: 'BLU[ _]|(?:blu|(?<!DROIDZ )Dash)[ _]([^/;)]+)(?: Build|[;)])|(?:Studio[ _](G3|J8M|X10L|X12|5\.0K|5\.5|View(?: XL)?|Mega(?: LTE)?|C 8\+8|[CGM][ _]HD|G2 HD|G4|[CGX]|SELFIE|Selfie LTE|Touch|M[45] Plus|J[1258]|X[89] HD|X10\+?|XL(?: 2)?)|Advance (4\.0 ?[LM]|5\.[02](?: HD)?|A4|L[45])|M6 2021|ENERGY (DIAMOND|XL)|ENERGY[_ ]DIAMOND[_ ]MINI|Energy X 2|LIFE XL|B110DL|Dash (?:X[2L]|L3)|PURE (?:X[LR]|MINI|View)|Life One X2|G50 (?:Mega|Plus)|G51 Plus|G90(?: PRO)?|G91 Pro|GRAND (?:M3|Max|5\.5 HD|XL LTE|Mini|Energy)|R1 (?:HD|PLUS)|R2 (?:LTE|Plus)|Tank Xtreme [45]\.0|Tank Xtreme(?: Pro)?|Touchbook M7 Pro|DASH X PLUS|C[456] 2019|BOLD (?:M7|N1)|B1[34]0DL|Vivo (?:5 Mini|One Plus|5R|XL[234]| Plus|8L|XI[+]?|GO)|(?<!Neffos )C[56]L(?: 2020)?|C6 2020|G9 PRO|D701|VIEW 1|B13[15]DL|R2 3G|Grand (?:M2X?|XL|M2 LTE)|D600|D5[01]0|DIAMOND M|M8L Plus|STUDIO ENERGY|M8L 2022|LIFE X8|M10L Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'Advance (4.0 ?[LM]|4.0|5.[02](?: HD)?|A4|L[54])'
+    - regex: 'Advance (4\.0 ?[LM]|4\.0|5\.[02](?: HD)?|A4|L[54])'
       model: 'Advance $1'
     - regex: 'M6 2021(?:[);/ ]|$)'
       model: 'M6 (2021)'
@@ -3861,9 +3861,9 @@ Blu:
       model: 'Studio X Mini'
     - regex: 'Studio X10 2022'
       model: 'Studio X10 (2022)'
-    - regex: '(?:BLU[_ ])?Studio[ _](G3|J8M|5.0 C|5.5|C 5\+5 LTE|View(?: XL)?|Mega(?: LTE)?|C 8\+8|G HD LTE|[CG][ _]HD|C|G|Touch|M HD|G2 HD|M[45] Plus|J[1258]|X[89] HD|X5|X10\+?|XL(?: 2)?|X|G4)(?:[);/ ]|$)'
+    - regex: '(?:BLU[_ ])?Studio[ _](G3|J8M|5\.0 C|5\.5|C 5\+5 LTE|View(?: XL)?|Mega(?: LTE)?|C 8\+8|G HD LTE|[CG][ _]HD|C|G|Touch|M HD|G2 HD|M[45] Plus|J[1258]|X[89] HD|X5|X10\+?|XL(?: 2)?|X|G4)(?:[);/ ]|$)'
       model: 'Studio $1'
-    - regex: '(?:BLU[_ ])?Studio[ _]5.0 ?K(?:[);/ ]|$)'
+    - regex: '(?:BLU[_ ])?Studio[ _]5\.0 ?K(?:[);/ ]|$)'
       model: 'Studio 5.0 K'
     - regex: 'STUDIO SELFIE LTE'
       model: 'Studio Selfie LTE'
@@ -3901,7 +3901,7 @@ Blu:
       model: 'Dash X Plus LTE'
     - regex: 'DASH X PLUS'
       model: 'Dash X Plus'
-    - regex: 'DASH 4.5'
+    - regex: 'DASH 4\.5'
       model: 'Dash 4.5'
     - regex: 'Dash XL'
       model: 'Dash XL'
@@ -3939,7 +3939,7 @@ Blu:
       model: 'G91 Pro'
     - regex: '(G90|D701|R2 3G)(?:[);/ ]|$)'
       model: '$1'
-    - regex: 'GRAND 5.5 HD'
+    - regex: 'GRAND 5\.5 HD'
       model: 'Grand 5.5 HD'
     - regex: 'Grand X LTE'
       model: 'Grand X LTE'
@@ -3973,7 +3973,7 @@ Blu:
       model: 'R$1 Plus'
     - regex: 'C([456]) 20(19|20)'
       model: 'C$1 (20$2)'
-    - regex: 'Tank Xtreme ([45]).0'
+    - regex: 'Tank Xtreme ([45])\.0'
       model: 'Tank Xtreme $1.0"'
     - regex: 'Tank Xtreme Pro'
       model: 'Tank Xtreme Pro'
@@ -4018,11 +4018,11 @@ Blu:
     - regex: 'M8L (2022)'
       model: 'M8L ($1)'
       device: 'tablet'
-    - regex: 'STUDIO 7.0 II'
+    - regex: 'STUDIO 7\.0 II'
       model: 'Studio 7.0" II'
       device: 'tablet'
 
-    - regex: 'DASH (L[45] LTE|5.0|L[45]X|L3|X2|[LMX])(?:[);/ ]|$)'
+    - regex: 'DASH (L[45] LTE|5\.0|L[45]X|L3|X2|[LMX])(?:[);/ ]|$)'
       model: 'Dash $1'
 
     - regex: 'DASH[ _]([^)/;]+)(?: Build|\))'
@@ -5438,7 +5438,7 @@ bq:
     - regex: 'Aquaris (M10 FHD|M10 4G|M8)'
       model: 'Aquaris $1'
       device: 'tablet'
-    - regex: 'Aquaris_([AM])4.5'
+    - regex: 'Aquaris_([AM])4\.5'
       model: 'Aquaris $14.5'
     - regex: 'BQ(?:ru)?[_ -](?:5590|5740G)(?:[);/ ]|$)'
       model: 'Spring'
@@ -5613,7 +5613,7 @@ Casper:
       model: 'VIA $1'
     - regex: 'CASPER_VIA_E1c'
       model: 'VIA E1C'
-    - regex: 'CASPER_L10_4.5G'
+    - regex: 'CASPER_L10_4\.5G'
       model: 'L10 4.5G'
       device: 'tablet'
     - regex: 'CASPER_(S[23]8)(?:[);/ ]|$)'
@@ -5819,25 +5819,25 @@ Artel:
 
 # ComTrade Tesla
 ComTrade Tesla:
-  regex: 'Tesla(?!(?:Browser|Group/LUMUS))|Impulse 7.85 3G|Impulse 10.1 OCTA|Smartphone_6.1|SP(?:6.2|6.2_Lite)|TTL(?:713G|8)|Explr 9'
+  regex: 'Tesla(?!(?:Browser|Group/LUMUS))|Impulse 7\.85 3G|Impulse 10\.1 OCTA|Smartphone_6\.1|SP(?:6\.2|6\.2_Lite)|TTL(?:713G|8)|Explr 9'
   device: 'smartphone'
   models:
     - regex: '(Explr 9)'
       model: '$1'
-    - regex: 'TeslaEvo5.0'
+    - regex: 'TeslaEvo5\.0'
       model: 'Evo 5.0'
-    - regex: '(Gravity 9.7 SHD)'
+    - regex: '(Gravity 9\.7 SHD)'
       model: '$1'
       device: 'tablet'
-    - regex: '(Impulse 7.85 3G)'
+    - regex: '(Impulse 7\.85 3G)'
       model: '$1'
       device: 'tablet'
-    - regex: 'Impulse 10.1 OCTA'
+    - regex: 'Impulse 10\.1 OCTA'
       model: 'Impulse 10.1" OCTA'
       device: 'tablet'
     - regex: 'Tesla_SP([^/;)]+)L(?: Build|[;)])'
       model: 'Smartphone $1 Lite'
-    - regex: 'Smartphone_6.1'
+    - regex: 'Smartphone_6\.1'
       model: 'Smartphone 6.1'
     - regex: '(?:Tesla_)?SP(\d+)[_.](\d+)_Lite(?: Build|[;)])'
       model: 'Smartphone $1.$2 Lite'
@@ -5861,7 +5861,7 @@ ComTrade Tesla:
     - regex: 'Tesla_Tablet_L7_3G'
       model: 'L7 3G'
       device: 'tablet'
-    - regex: '(L7.1)'
+    - regex: '(L7\.1)'
       model: '$1'
       device: 'tablet'
     - regex: 'TTL713G'
@@ -5876,7 +5876,7 @@ ComTrade Tesla:
     - regex: 'TTL8 Build'
       model: 'L8'
       device: 'tablet'
-    - regex: '(L8.1)'
+    - regex: '(L8\.1)'
       model: '$1'
       device: 'tablet'
     - regex: 'TESLA_TABLET_M7'
@@ -6631,7 +6631,7 @@ Dell:
     - regex: '(?:Dell )?(Streak|Venue) ?([^/;]*) Build'
       model: '$1 $2'
       device: 'tablet'
-    - regex: '(?:Dell Inc./)?(XPS 13 9360|Latitude (?:7480|7390|E4310)|Inspiron N?\d{4}|Inspiron 13-\d{4})(?:[);/ ]|$)'
+    - regex: '(?:Dell Inc\./)?(XPS 13 9360|Latitude (?:7480|7390|E4310)|Inspiron N?\d{4}|Inspiron 13-\d{4})(?:[);/ ]|$)'
       device: 'desktop'
       model: '$1'
     - regex: 'Dell; ((?:Streak|Venue)[^;/\)]*)'
@@ -6654,14 +6654,14 @@ Desay:
 
 # DEXP (dexp.club)
 DEXP:
-  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|Larus_TV1|Ixion(?:ML4.7|ES250)|M150Storm|(?:SENIOR|F4[38]D8000K|VA(?:[12]10|170)|ML450|MS[56]50|BL(?:[123]50|160|155)|BS(?:155|160|[1256]50)|(?<!ILIUM )S(?:3[78]0|2[89]0|670)|AL(?:[12]40|[23]50)|AS(?:155|[123]60)| (?:B260|B245|H[12]10|H270|L470|N280i|P310|P380i?|R1[18]0|Q110|E1[78]0|E[12]10|B(?:450|340|35[05])|M170|M445|M[12]10|T155|H32F8000C|U43F8000Q|A(?:1[456]0|340|[34]55)|GS15[035]|GL[23]55|G25[035]|G355|G550|G15[05]|ES750|XL150|Z[1-4]55|H[13]70|H[34]10|P[45]10|L2[17]0)|Z250|A440|(?<!MITO )A350(?! TV)|N[13]80i|(?<!Blade )L1[178]0|L3[17]0i|(?<!VOX )G450|G660|Q[123]10|Q[12]80|N[234]10|N[35]70|EX111|S[245]70|S[127]70i|S169|S110|S180i?|S770|A555(?! Universe)|(?:U75H8000K|U50H8000E|U65H8000K|U50G8000QG|U55H8050E|U43G9000CG|U43F8100QG|U55G8000QG|U50G9000CG|H32H8001C|H32G8000CG|H32F8000QG?(?:-[abc])?|H32F8[01]00Q|H39F8000Q|F43H8000K|U43H8000E|U43F8000EG|F43F8000[CQ]G?|F32[FG]8000C|F43G8000C|H24H8000C|H24F8000Q|F43F8000Q-G)(?:-[AbcfedH])?|Android 8(?:[\d.]*);(?: [\w-]+;)? A240|android 10;(?: [\w-]+;)? (?:B[23]1|B38|B1[87]|K28|K[34]1)|android 9;(?: [\w-]+;)? (?:K18|K21|B11)|android 11;(?: [\w-]+;)? (?:D[12]1|T21|K[345]1|K[342]8|K61|C3[78]|B28|B27|H28)|32FCY1|H32H8051C-G|50UCY2-G|55UCY1|H3218000K|U50F8000QG|U50H8050EG|H32I8000K|U65G8000Q|U43G8100QG|Android 11;(?: [\w-]+;)? P11)(?:[);/ ]|$)'
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|Larus_TV1|Ixion(?:ML4\.7|ES250)|M150Storm|(?:SENIOR|F4[38]D8000K|VA(?:[12]10|170)|ML450|MS[56]50|BL(?:[123]50|160|155)|BS(?:155|160|[1256]50)|(?<!ILIUM )S(?:3[78]0|2[89]0|670)|AL(?:[12]40|[23]50)|AS(?:155|[123]60)| (?:B260|B245|H[12]10|H270|L470|N280i|P310|P380i?|R1[18]0|Q110|E1[78]0|E[12]10|B(?:450|340|35[05])|M170|M445|M[12]10|T155|H32F8000C|U43F8000Q|A(?:1[456]0|340|[34]55)|GS15[035]|GL[23]55|G25[035]|G355|G550|G15[05]|ES750|XL150|Z[1-4]55|H[13]70|H[34]10|P[45]10|L2[17]0)|Z250|A440|(?<!MITO )A350(?! TV)|N[13]80i|(?<!Blade )L1[178]0|L3[17]0i|(?<!VOX )G450|G660|Q[123]10|Q[12]80|N[234]10|N[35]70|EX111|S[245]70|S[127]70i|S169|S110|S180i?|S770|A555(?! Universe)|(?:U75H8000K|U50H8000E|U65H8000K|U50G8000QG|U55H8050E|U43G9000CG|U43F8100QG|U55G8000QG|U50G9000CG|H32H8001C|H32G8000CG|H32F8000QG?(?:-[abc])?|H32F8[01]00Q|H39F8000Q|F43H8000K|U43H8000E|U43F8000EG|F43F8000[CQ]G?|F32[FG]8000C|F43G8000C|H24H8000C|H24F8000Q|F43F8000Q-G)(?:-[AbcfedH])?|Android 8(?:[\d.]*);(?: [\w-]+;)? A240|android 10;(?: [\w-]+;)? (?:B[23]1|B38|B1[87]|K28|K[34]1)|android 9;(?: [\w-]+;)? (?:K18|K21|B11)|android 11;(?: [\w-]+;)? (?:D[12]1|T21|K[345]1|K[342]8|K61|C3[78]|B28|B27|H28)|32FCY1|H32H8051C-G|50UCY2-G|55UCY1|H3218000K|U50F8000QG|U50H8050EG|H32I8000K|U65G8000Q|U43G8100QG|Android 11;(?: [\w-]+;)? P11)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:DEXP_)?(ML450|MS[56]50|ES750|XL150|ES1050)(?:[);/ ]|$)'
       model: 'Ixion $1'
     - regex: 'IxionES250(?:[);/ ]|$)'
       model: 'Ixion ES250 Rage'
-    - regex: 'IxionML4.7(?:[);/ ]|$)'
+    - regex: 'IxionML4\.7(?:[);/ ]|$)'
       model: 'Ixion ML 4.7"'
     - regex: 'Ixion ES2 5'
       model: 'Ixion ES2 5"'
@@ -7183,9 +7183,9 @@ Doro:
   models:
     - regex: 'SOLO 4K(?:[);/ ]|$)'
       model: 'Solo 4k'
-    - regex: 'DuneHD/\d.\d \([a-z]+__([a-z0-9_-]+);'
+    - regex: 'DuneHD/\d\.\d \([a-z]+__([a-z0-9_-]+);'
       model: '$1'
-    - regex: 'DuneHD/\d.\d \(([a-z0-9_-]+);'
+    - regex: 'DuneHD/\d\.\d \(([a-z0-9_-]+);'
       model: '$1'
 
 # DNS
@@ -7334,7 +7334,7 @@ Elephone:
       model: 'P6000 Plus'
     - regex: 'P6000 02(?:[);/ ]|$)'
       model: 'P6000 02'
-    - regex: 'P6000 5.0 01(?:[);/ ]|$)'
+    - regex: 'P6000 5\.0 01(?:[);/ ]|$)'
       model: 'P6000 01'
     - regex: 'P6000 ?Pro(?:[);/ ]|$)'
       model: 'P6000 Pro'
@@ -8061,7 +8061,7 @@ Sony:
     - regex: '(MT[0-9]{2}[a-z]?)(?:[);/ ]|$)'
       model: '$1'
       brand: 'Sony Ericsson'
-    - regex: 'portalmmm/2.0 K([a-z0-9]+)'
+    - regex: 'portalmmm/2\.0 K([a-z0-9]+)'
       model: 'K$1'
       brand: 'Sony Ericsson'
     - regex: 'SonyEricsson ?IS11S'
@@ -8179,12 +8179,12 @@ Ergo:
 
 # Ericsson
 Ericsson:
-  regex: '(?:Ericsson(?:/ )?[a-z0-9]+)|(?:R380 2.0 WAP1.1)'
+  regex: '(?:Ericsson(?:/ )?[a-z0-9]+)|(?:R380 2\.0 WAP1\.1)'
   device: 'feature phone'
   models:
     - regex: 'Ericsson(?:/ )?([a-z0-9]+)'
       model: '$1'
-    - regex: 'R380 2.0 WAP1.1'
+    - regex: 'R380 2\.0 WAP1\.1'
       model: 'R380'
 
 # Energizer (www.energizeyourdevice.com)
@@ -8986,13 +8986,13 @@ Explay:
   regex: 'Explay|[\w]+-EXPLAY-FIN|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|Surfer7773G|sQuad[ _][0-9\.]|Onliner[1-4]|RioPlay|Leader|Pulsar|Infinityll|Joy_TV|Imperium[78]|Winner[78]|Indigo|Lagoon|Tornado(?! 348| Slim)(?:3G)?|Onyx(?!_[A-Z]{1,2})(?:[);/ ]|$)|android 4([\d.]*);(?: [\w-]+;)? Discovery.+(?<! Mobile )Safari/|Party|Scream 3G|A350 TV'
   device: 'tablet'
   models:
-    - regex: 'ActiveD[ _]7.4[ _]3G'
+    - regex: 'ActiveD[ _]7\.4[ _]3G'
       model: 'ActiveD 7.4 3G'
     - regex: 'Scream 3G'
       model: 'Scream 3G'
     - regex: 'Imperium([78])(?:[);/ ]|$)'
       model: 'Imperium $1 3G'
-    - regex: 'ActiveD[ _]8.2[ _]3G'
+    - regex: 'ActiveD[ _]8\.2[ _]3G'
       model: 'ActiveD 8.2 3G'
     - regex: 'CinemaTV[ _]3G'
       model: 'CinemaTV 3G'
@@ -9420,7 +9420,7 @@ Hasee:
 
 # Toshiba
 Toshiba:
-  regex: 'Toshiba|TSBNetTV/|portalmmm/[12].0 TS|(?:T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AFTBOXE1|AFTDCT31|AFTHA00[2-4]|AT(?:7-C|10-A|10[PL]E-A|100|200|270|300|330|374|400|470|500a?|503|570|703|830)|AFTKMST12|AFTBAMR311|SATELLITE (?:C655|L50-C|Pro L300|A100))(?:[);/ ]|$)'
+  regex: 'Toshiba|TSBNetTV/|portalmmm/[12]\.0 TS|(?:T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AFTBOXE1|AFTDCT31|AFTHA00[2-4]|AT(?:7-C|10-A|10[PL]E-A|100|200|270|300|330|374|400|470|500a?|503|570|703|830)|AFTKMST12|AFTBAMR311|SATELLITE (?:C655|L50-C|Pro L300|A100))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # explicit smartphone models
@@ -9499,7 +9499,7 @@ Toshiba:
       model: '$1'
     - regex: 'Toshiba[ /_\-]?([a-z0-9_\-]+)'
       model: '$1'
-    - regex: 'portalmmm/[12].0 (TS[a-z0-9 ]+)'
+    - regex: 'portalmmm/[12]\.0 (TS[a-z0-9 ]+)'
       model: '$1'
 
 # AWOX (https://www.awox.com.tr/)
@@ -9707,7 +9707,7 @@ Schneider:
 
 # Sencor (sencor.cz or sencor.com)
 Sencor:
-  regex: 'Sencor|(?:ELEMENT[ _]?(?:(?:7|8|9\.7|10[ _]1)(?:[ _]?V[23])?|P[0-9]+|10.1 Q001)|10_1Q205|ELEMENT-P5501)(?:[);/ ]|$)'
+  regex: 'Sencor|(?:ELEMENT[ _]?(?:(?:7|8|9\.7|10[ _]1)(?:[ _]?V[23])?|P[0-9]+|10\.1 Q001)|10_1Q205|ELEMENT-P5501)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     # explicit tablet models
@@ -11057,7 +11057,7 @@ Huawei:
     - regex: 'T1-701u(?:[);/ ]|$)'
       device: 'tablet'
       model: 'MediaPad T1 7'
-    - regex: '(?:T1-82(?:3L|1W)|MediaPad T1 8.0)(?:[);/ ]|$)'
+    - regex: '(?:T1-82(?:3L|1W)|MediaPad T1 8\.0)(?:[);/ ]|$)'
       device: 'tablet'
       model: 'MediaPad T1 8'
     - regex: 'AGS3K-W20'
@@ -11763,12 +11763,12 @@ iNew:
 
 # iPro
 iPro:
-  regex: '(?:Kylin[ _]5.[05]S?|KYLIN(?:40|50i)|Jade[78]s|Amber[678]S?|Amber[58]S[ _]Pro|Benny10|Phonenix50S|Ruby5S|Zafiro|I9355A|Opal 4S|Perla|S[45]01A|WAVE 4.0 II|WAVE 5.0|MEGA7|SAMBA65S)(?:[);/ ]|$)'
+  regex: '(?:Kylin[ _]5\.[05]S?|KYLIN(?:40|50i)|Jade[78]s|Amber[678]S?|Amber[58]S[ _]Pro|Benny10|Phonenix50S|Ruby5S|Zafiro|I9355A|Opal 4S|Perla|S[45]01A|WAVE 4\.0 II|WAVE 5\.0|MEGA7|SAMBA65S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: 'Kylin_5.0S'
+    - regex: 'Kylin_5\.0S'
       model: 'Kylin 5.0S'
-    - regex: 'Kylin (5.[05])'
+    - regex: 'Kylin (5\.[05])'
       model: 'Kylin $1'
     - regex: 'Kylin50i'
       model: 'Kylin 50i'
@@ -11800,9 +11800,9 @@ iPro:
       model: 'Samba 65S'
     - regex: 'Zafiro'
       model: 'Zafiro'
-    - regex: 'WAVE 4.0 II'
+    - regex: 'WAVE 4\.0 II'
       model: 'Wave 4.0 II'
-    - regex: 'WAVE 5.0'
+    - regex: 'WAVE 5\.0'
       model: 'Wave 5.0'
     - regex: '(I9355A|S[45]01A|Perla)'
       model: '$1'
@@ -12335,7 +12335,7 @@ Turbo:
 
 # Turbo-X
 Turbo-X:
-  regex: 'Turbo[-_]X|(?:TURBOX_I4G|Hive V 3G|Calltab10.1|Calltab2GB10|Calltab7inch|Turbox_S3|Fire_II_WiFi|Breeze IV|Aqua_II|RainbowIII3G|RubikII7|Rubik 10\.1 II|Rubik_10_III|QUAD-CORE A33 inet)(?:[);/ ]|$)|(?<!Rombica TV )Mercury(?!/| HD Quad core)|(?:android 8([\d.]*);(?: [\w-]+;)? Dream)(?:[);/ ]|$)'
+  regex: 'Turbo[-_]X|(?:TURBOX_I4G|Hive V 3G|Calltab10\.1|Calltab2GB10|Calltab7inch|Turbox_S3|Fire_II_WiFi|Breeze IV|Aqua_II|RainbowIII3G|RubikII7|Rubik 10\.1 II|Rubik_10_III|QUAD-CORE A33 inet)(?:[);/ ]|$)|(?<!Rombica TV )Mercury(?!/| HD Quad core)|(?:android 8([\d.]*);(?: [\w-]+;)? Dream)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -12383,7 +12383,7 @@ Turbo-X:
     - regex: 'RubikII7(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Rubik II 7"'
-    - regex: 'Rubik 10.1 II(?:[);/ ]|$)'
+    - regex: 'Rubik 10\.1 II(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Rubik II 10.1"'
     - regex: 'Rubik_10_III(?:[);/ ]|$)'
@@ -12392,7 +12392,7 @@ Turbo-X:
     - regex: 'RainbowIII3G(?:[);/ ]|$)'
       device: 'tablet'
       model: 'Rainbow III 3G'
-    - regex: 'Calltab10.1'
+    - regex: 'Calltab10\.1'
       device: 'tablet'
       model: 'CallTab II 10.1"'
     - regex: 'Calltab2GB10'
@@ -12789,7 +12789,7 @@ JAY-Tech:
   regex: '(?<!VIVAX )(?<!VIVAX TABLET )TPC-(?!71213G)[A-Z0-9]+|TPCY-TX[TE][^);/ ]+'
   device: 'tablet'
   models:
-    - regex: 'TPC-PA10.1M'
+    - regex: 'TPC-PA10\.1M'
       model: 'Tablet PC PA10.1M'
     - regex: 'TPC-(XE10D-H)'
       model: 'Tablet PC $1'
@@ -12960,18 +12960,18 @@ Keneksi:
 
 # Kiano
 Kiano:
-  regex: 'Kiano|Elegance_[45]_[015](?:_PRO)?|ELEGANCE 5.0 Lite|Elegance_4.5|Elegance 6|CORE 10.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?(?:[);/ ]|$)'
+  regex: 'Kiano|Elegance_[45]_[015](?:_PRO)?|ELEGANCE 5\.0 Lite|Elegance_4\.5|Elegance 6|CORE 10\.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Slim ?Tab ?(\d+)(?:[_ ]3GR?)?'
       model: 'Slim Tab $1'
       device: 'tablet'
-    - regex: 'CORE 10.1 DUAL 3G'
+    - regex: 'CORE 10\.1 DUAL 3G'
       model: 'CORE 10.1 DUAL 3G'
       device: 'tablet'
     - regex: 'Elegance_(5)_([51])_Pro'
       model: 'Elegance $1.$2" Pro'
-    - regex: 'ELEGANCE 5.0 Lite'
+    - regex: 'ELEGANCE 5\.0 Lite'
       model: 'Elegance 5.0" Lite'
     - regex: 'Elegance 6'
       model: 'Elegance 6 5.85"'
@@ -13850,12 +13850,12 @@ Leagoo:
 
 # Ledstar
 Ledstar:
-  regex: '(?:Ledstar[_ ])?(?:Trendy 5.0|Novus_Premium_6.0)'
+  regex: '(?:Ledstar[_ ])?(?:Trendy 5\.0|Novus_Premium_6\.0)'
   device: 'smartphone'
   models:
-    - regex: 'Trendy 5.0'
+    - regex: 'Trendy 5\.0'
       model: 'Trendy 5.0'
-    - regex: 'Ledstar_Novus_Premium_6.0(?:[);/ ]|$)'
+    - regex: 'Ledstar_Novus_Premium_6\.0(?:[);/ ]|$)'
       model: 'Novus Premium 6.0"'
 
 # Leelbox
@@ -14766,7 +14766,7 @@ LG:
       model: 'Stylus 2 Plus'
     - regex: 'LM-Q[67]10\.FG(?:[);/ ]|$)'
       model: 'Q7'
-    - regex: 'LM-(Q72[57][KLS]|Q610.FGN)(?:[);/ ]|$)'
+    - regex: 'LM-(Q72[57][KLS]|Q610[\(.]FGN)(?:[);/ ]|$)'
       model: 'Q7+'
     - regex: 'LM-Q815[KSL](?:[);/ ]|$)'
       model: 'Q8+'
@@ -15187,7 +15187,7 @@ LG:
     - regex: '47LA790W-ZA'
       model: '47LA790W-ZA'
       device: 'tv'
-    - regex: 'webOS.TV'
+    - regex: 'webOS\.TV'
       device: 'tv'
       model: 'WebOS TV'
     - regex: 'LGE_DLNA_SDK|NetCast'
@@ -15221,7 +15221,7 @@ LG:
       model: '$1'
     - regex: 'LG; ([a-z0-9 ]+)'
       model: '$1'
-    - regex: 'portalmmm/2.0 ((?:KE|KG|KP|L3)[a-z0-9]+)'
+    - regex: 'portalmmm/2\.0 ((?:KE|KG|KP|L3)[a-z0-9]+)'
       model: '$1'
     - regex: '(VX[0-9]+)'
       model: '$1'
@@ -15274,7 +15274,7 @@ Logicom:
       model: 'La Tab Link 71'
     - regex: 'logikids4'
       model: 'Logikids 4'
-    - regex: 'KT712A_4.4|L-IXIR TAB 701 3G'
+    - regex: 'KT712A_4\.4|L-IXIR TAB 701 3G'
       model: 'L-ixir Tab 701 3G'
     - regex: 'L_IXIR_TAB_1047HD'
       model: 'L-ixir Tab 1047 HD'
@@ -15567,7 +15567,7 @@ Karbonn:
 
 # Sagem (https://www.sagemcom.com/)
 Sagem:
-  regex: 'SAGEM(?!com)|portalmmm/2.0 (?:SG|my)'
+  regex: 'SAGEM(?!com)|portalmmm/2\.0 (?:SG|my)'
   device: 'smartphone'
   models:
     - regex: 'SAGEM-(my[a-z0-9\-]+)'
@@ -15577,7 +15577,7 @@ Sagem:
       model: '$1'
     - regex: 'SAGEM-([a-z0-9\-]+)'
       model: '$1'
-    - regex: 'portalmmm/2.0 ((?:SG|my)[a-z0-9]+)'
+    - regex: 'portalmmm/2\.0 ((?:SG|my)[a-z0-9]+)'
       model: '$1'
 
 # Coby Kyros
@@ -16485,7 +16485,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|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
+  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|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -16857,7 +16857,7 @@ Motorola:
       model: 'DROID $1'
     - regex: '(?<!AN)DROID ?([a-z0-9]+)'
       model: 'DROID $1'
-    - regex: 'portalmmm/2.0 ((?:E378i|L6|L7|V3)[a-z0-9]+)'
+    - regex: 'portalmmm/2\.0 ((?:E378i|L6|L7|V3)[a-z0-9]+)'
       model: '$1'
     - regex: '(XOOM [^;/]*)Build'
       device: 'tablet'
@@ -17247,7 +17247,7 @@ Novey:
 
 # nec or nec lavie (www.nec-lavie.jp)
 NEC:
-  regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N|(?:PC-T[SE]\d{3}[\w]{2,3}|N-06C|N-02E|LAVIE T11 (?:11QHD1|112K1)|LAVIE Tab E (?:10|8)FHD[12]|7SD1|8HD1|LAVIE Tab (?:10FHD3|T12 12QHD1))(?:[);/ ]|$)'
+  regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2\.0[ ,]N|(?:PC-T[SE]\d{3}[\w]{2,3}|N-06C|N-02E|LAVIE T11 (?:11QHD1|112K1)|LAVIE Tab E (?:10|8)FHD[12]|7SD1|8HD1|LAVIE Tab (?:10FHD3|T12 12QHD1))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'N-06C(?:[);/ ]|$)'
@@ -17766,7 +17766,7 @@ O+:
   regex: 'O\+[ _](Presto 700 LTE|FAB GO|360|8\.(?:3[178]z|[15]2|37y|3[38]|9[12378]|1[75]|6)|Air|Grande|Crunch|Ultra|Xfinit|Upsized|Venti|EVO 4G|Sonic|360[ _]ALPHA[ _]PLUS[ _]2\.0|360[ _]HD[ _]2\.0|Stream HDTV)'
   device: 'smartphone'
   models:
-    - regex: 'O\+[ _](Presto 700 LTE|Grande|Crunch|Ultra 2.0|Xfinit|Ultra Lite|Ultra|Sonic|Upsized|Venti 4G|EVO 4G|8\.(?:3[178]z|37y|3[38]|[15]2|9[12378]|1[75]|6))'
+    - regex: 'O\+[ _](Presto 700 LTE|Grande|Crunch|Ultra 2\.0|Xfinit|Ultra Lite|Ultra|Sonic|Upsized|Venti 4G|EVO 4G|8\.(?:3[178]z|37y|3[38]|[15]2|9[12378]|1[75]|6))'
       model: '$1'
     - regex: 'O\+_AIR'
       model: 'Air'
@@ -19404,7 +19404,7 @@ Panasonic:
       device: 'tv'
     - regex: 'Panasonic[ _\-]?([a-z0-9]+)'
       model: '$1'
-    - regex: 'portalmmm/2.0 (P[a-z0-9]+)'
+    - regex: 'portalmmm/2\.0 (P[a-z0-9]+)'
       model: '$1'
 
     - regex: 'P-08D(?:[);/ ]|$)'
@@ -19764,12 +19764,12 @@ Pioneer:
 
 # Pixus
 Pixus:
-  regex: 'Pixus|(hiPower|Touch_7_3G|Ride[_ ][34]G|Play[ _]Three[ _]v(?:[234].0|3.1))(?:[);/ ]|$)'
+  regex: 'Pixus|(hiPower|Touch_7_3G|Ride[_ ][34]G|Play[ _]Three[ _]v(?:[234]\.0|3\.1))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Ride[_ ]([34])G'
       model: 'Ride $1G'
-    - regex: 'Play[ _]Three[ _]v([234].0|3.1)'
+    - regex: 'Play[ _]Three[ _]v([234]\.0|3.1)'
       model: 'Play Three v$1'
     - regex: 'Play Two'
       model: 'Play Two'
@@ -19787,7 +19787,7 @@ Pixus:
       model: 'Blast 10.1"'
     - regex: 'Pixus[ _]Joker'
       model: 'Joker 10.1"'
-    - regex: 'Pixus Blaze 10.1 3G'
+    - regex: 'Pixus Blaze 10\.1 3G'
       model: 'Blaze 10.1" 3G'
 
     - regex: 'Raze'
@@ -19995,7 +19995,7 @@ Rover:
 
 # RoverPad or Rover Pad
 RoverPad:
-  regex: '(?:Rover[ ]?Pad|RoverPhone|(?:Air|Art|Sky) 7.85 3G|Pro_Q(?:8|10)_LTE)(?:[);/ ]|$)'
+  regex: '(?:Rover[ ]?Pad|RoverPhone|(?:Air|Art|Sky) 7\.85 3G|Pro_Q(?:8|10)_LTE)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'RoverPhone(?:[);/ ]|$)'
@@ -20003,11 +20003,11 @@ RoverPad:
       device: 'smartphone'
     - regex: 'Pro_Q(8|10)_LTE(?:[);/ ]|$)'
       model: 'Pro Q$1 LTE'
-    - regex: '(?:Rover[ ]?Pad)?sky 7.85(?: 3G)?(?:[);/ ]|$)'
+    - regex: '(?:Rover[ ]?Pad)?sky 7\.85(?: 3G)?(?:[);/ ]|$)'
       model: 'Sky 7.85" 3G'
-    - regex: '(Air|Art) 7.85 3G'
+    - regex: '(Air|Art) 7\.85 3G'
       model: '$1 7.85" 3G'
-    - regex: 'RoverPad (10.4|Air S70|9.7 3G|Sky 9.7|3W A73|3W7|3WT70|3W9.4)(?:[);/ ]|$)'
+    - regex: 'RoverPad (10\.4|Air S70|9\.7 3G|Sky 9\.7|3W A73|3W7|3WT70|3W9\.4)(?:[);/ ]|$)'
       model: '$1'
 
 # Roadrover
@@ -20115,7 +20115,7 @@ Santin:
     - regex: 'G101-OG(?:[);/ ]|$)'
       device: 'tablet'
       model: 'G101-OG'
-    - regex: 'SANTIN[ _][#]?(Dante|Candy U7|Armor(?: 2)?|YSL-Y7|ANT.W|N[13]|JS|S6|V9(?:[ _]Pro)?|Life Shine|ovvi|D|11 XS Max|SHUGUO)(?:[);/ ]|$)'
+    - regex: 'SANTIN[ _][#]?(Dante|Candy U7|Armor(?: 2)?|YSL-Y7|ANT\.W|N[13]|JS|S6|V9(?:[ _]Pro)?|Life Shine|ovvi|D|11 XS Max|SHUGUO)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(RS635H)(?:[);/ ]|$)'
       model: '$1'
@@ -20137,7 +20137,7 @@ Siemens:
       model: '$1'
     - regex: '(?:SIE-)?(SL45i)'
       model: '$1'
-    - regex: 'portalmmm/2.0 (SI[a-z0-9]+)'
+    - regex: 'portalmmm/2\.0 (SI[a-z0-9]+)'
       model: '$1'
 
 # Soundmax
@@ -21756,7 +21756,7 @@ Visual Land:
 
 # Sky or Sky Devices (skydevices.com)
 Sky:
-  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:PHOTOPRO|5_0T|M45|[45]T|45T|GO|M5Plus|T[46]|[ABCDHP]5|5_5_Octa|Octa|[BCEFGHJPTV]55|[AB]65|N55|T10)|Platinum[_ ](?:5.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10)|SKYVISION|SKY Black| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Premier5|Sky,'
+  regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:PHOTOPRO|5_0T|M45|[45]T|45T|GO|M5Plus|T[46]|[ABCDHP]5|5_5_Octa|Octa|[BCEFGHJPTV]55|[AB]65|N55|T10)|Platinum[_ ](?:5\.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10)|SKYVISION|SKY Black| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Premier5|Sky,'
   device: 'smartphone'
   models:
     - regex: 'Platinum[_ ](?:5\.0M|M5)'
@@ -21823,7 +21823,7 @@ Sky:
       model: 'Pro III'
     - regex: 'PRO_SELFIE'
       model: 'Pro Selfie'
-    - regex: 'SKY 5.0Pro II'
+    - regex: 'SKY 5\.0Pro II'
       model: 'Pro II'
     - regex: 'SKY 55M'
       model: '55M'
@@ -22019,13 +22019,13 @@ SuperSonic:
 
 # Supra
 Supra:
-  regex: 'SUPRA|NVTAB 7.0 3G|M74C 3G'
+  regex: 'SUPRA|NVTAB 7\.0 3G|M74C 3G'
   device: 'smartphone'
   models:
     - regex: 'SUPRA[ _]([^;/)]+)(?: Build|[;)])'
       device: 'tablet'
       model: '$1'
-    - regex: '(NVTAB 7.0 3G|M74C 3G)'
+    - regex: '(NVTAB 7\.0 3G|M74C 3G)'
       device: 'tablet'
       model: '$1'
 
@@ -24141,7 +24141,7 @@ Tesco:
 
 # teXet (www.texet.ru)
 teXet:
-  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|400[34]|4071|450[34]|451[30]|4377|4082R|508[34]|550[358]|5010|5017|507[4-7]|5[23]77|6003|6906|702[13]|7055HD|709[69]|9747BT|9758|9751HD|9767|5513|520[410]|507[13]|558[134]|570[23]|7859|8044|9748[ _]3G|9720|7047HD[ _]3G|9757|9740|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|973[78]W|974[170]|9743W|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X Point|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?|TM_5011|X-pad (?:AIR 8|iX 7|NAVI 7.[35]|NAVI 10|SKY 8.1|STYLE 8|STYLE 10.1|HIT|LITE 7.[12]|QUAD (?:7.2|10|7)|SHINE 8.1)(?: 3G)?'
+  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|400[34]|4071|450[34]|451[30]|4377|4082R|508[34]|550[358]|5010|5017|507[4-7]|5[23]77|6003|6906|702[13]|7055HD|709[69]|9747BT|9758|9751HD|9767|5513|520[410]|507[13]|558[134]|570[23]|7859|8044|9748[ _]3G|9720|7047HD[ _]3G|9757|9740|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|973[78]W|974[170]|9743W|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X Point|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?|TM_5011|X-pad (?:AIR 8|iX 7|NAVI 7\.[35]|NAVI 10|SKY 8\.1|STYLE 8|STYLE 10\.1|HIT|LITE 7\.[12]|QUAD (?:7\.2|10|7)|SHINE 8\.1)(?: 3G)?'
   device: 'tablet'
   models:
     - regex: 'TM-9749'
@@ -24160,33 +24160,33 @@ teXet:
       model: 'NaviPad 3G'
     - regex: 'TM-9758'
       model: 'X-pad Style 10.0"'
-    - regex: 'X-pad SHINE 8.1 3G'
+    - regex: 'X-pad SHINE 8\.1 3G'
       model: 'X-pad Shine 8.1" 3G'
     - regex: 'X-pad QUAD 10 3G'
       model: 'X-pad Quad 10.0" 3G'
     - regex: 'X-pad QUAD 7 3G'
       model: 'X-pad Quad 7.0" 3G'
-    - regex: 'X-pad QUAD 7.2 3G'
+    - regex: 'X-pad QUAD 7\.2 3G'
       model: 'X-pad Quad 7.2" 3G'
     - regex: 'X-pad STYLE 8 3G'
       model: 'X-pad Style 8.0" 3G'
     - regex: 'X-pad HIT 3G'
       model: 'X-pad Hit 3G'
-    - regex: 'X-pad LITE (7.[12])'
+    - regex: 'X-pad LITE (7\.[12])'
       model: 'X-pad Lite $1"'
     - regex: 'TM-9767'
       model: 'X-pad Style 10.0" 3G'
-    - regex: 'X-pad STYLE 10.1 3G'
+    - regex: 'X-pad STYLE 10\.1 3G'
       model: 'X-pad Style 10.1" 3G'
     - regex: '(X-pad (?:AIR 8|iX 7) 3G)'
       model: '$1'
-    - regex: 'TM-7096|X-pad NAVI 7.3 3G'
+    - regex: 'TM-7096|X-pad NAVI 7\.3 3G'
       model: 'X-pad NAVI 7.3" 3G'
     - regex: 'TM-7099'
       model: 'X-pad NAVI 7.4" 3G'
-    - regex: 'X-pad NAVI 7.5 3G'
+    - regex: 'X-pad NAVI 7\.5 3G'
       model: 'X-pad NAVI 7.5" 3G'
-    - regex: 'X-pad SKY 8.1 3G'
+    - regex: 'X-pad SKY 8\.1 3G'
       model: 'X-pad Sky 8.1" 3G'
     - regex: 'TM-1046|X-pad NAVI 10 3G'
       model: 'X-pad NAVI 10.0" 3G'
@@ -24468,7 +24468,7 @@ Touchmate:
 
 # TrekStor (www.trekstor.de)
 TrekStor:
-  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|ST13416-1|VT10416-[12]|TFQCOAL01232|TFMTKAW01232|PEAQ PET 100|Xintroni10.1'
+  regex: '(?:TrekStor|Surftab) ([^/;]+)(?: Build|\))|Surftab[^;\)]*(?:[;\)]|$)|ST10216-2A|ST13416-1|VT10416-[12]|TFQCOAL01232|TFMTKAW01232|PEAQ PET 100|Xintroni10\.1'
   device: 'tablet'
   models:
     - regex: 'ST10216-2A|VT10416-[12]'
@@ -24489,7 +24489,7 @@ TrekStor:
       model: 'SurfTab L15'
     - regex: '(TFQCOAL01232)'
       model: '$1'
-    - regex: 'Xintroni10.1'
+    - regex: 'Xintroni10\.1'
       model: 'SurfTab Xintron I 10.1"'
     - regex: '(PEAQ PET 100)'
       model: '$1'
@@ -24515,7 +24515,7 @@ Trevi:
     - regex: '(?:Trevi_)?Phablet[ _]4[ _]?S'
       model: 'Phablet 4 S'
       device: 'smartphone'
-    - regex: '(?:Trevi_)?Phablet[ _]4.5[ _]?Q'
+    - regex: '(?:Trevi_)?Phablet[ _]4\.5[ _]?Q'
       model: 'Phablet 4.5Q'
       device: 'smartphone'
     - regex: '(?:Trevi_)?PHABLET[ _]5[ _]?S'
@@ -24524,7 +24524,7 @@ Trevi:
     - regex: '(?:Trevi_)?PHABLET[ _]5,3[ _]?Q'
       model: 'Phablet 5.3 Q'
       device: 'phablet'
-    - regex: '(?:Trevi_)?REVERSE[ _]5.5[ _]?Q'
+    - regex: '(?:Trevi_)?REVERSE[ _]5\.5[ _]?Q'
       model: 'Phablet 5.5 Q REVERSE'
       device: 'phablet'
     - regex: '(?:Trevi_)?PHABLET[ _]6[ _]?S'
@@ -24760,12 +24760,12 @@ UMIDIGI:
 
 # Uniqcell
 Uniqcell:
-  regex: 'UNIQCELL_|[AQ]5.8(?:[;/) ]|$)'
+  regex: 'UNIQCELL_|[AQ]5\.8(?:[;/) ]|$)'
   device: 'smartphone'
   models:
     - regex: 'UNIQCELL_A4(?:[;/) ]|$)'
       model: 'A4'
-    - regex: '(Space A5.8|Q5.8)(?:[;/) ]|$)'
+    - regex: '(Space A5\.8|Q5\.8)(?:[;/) ]|$)'
       model: '$1'
 
 # Uniscope
@@ -24884,14 +24884,14 @@ ViewSonic:
 
 # Vitelcom
 Vitelcom:
-  regex: 'Vitelcom|portalmmm/[12].0 TSM'
+  regex: 'Vitelcom|portalmmm/[12]\.0 TSM'
   device: 'feature phone'
   models:
     - regex: 'TSM-([a-z0-9]+)'
       model: '$1'
     - regex: 'TSM([a-z0-9\-]+)'
       model: '$1'
-    - regex: 'portalmmm/[12].0 (TSM[a-z0-9 ]+)'
+    - regex: 'portalmmm/[12]\.0 (TSM[a-z0-9 ]+)'
       model: '$1'
 
 # Fengxiang
@@ -26836,7 +26836,7 @@ Xion:
 
 # Xolo
 Xolo:
-  regex: 'Xolo|(?:Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05]|Era5X|Era[ _]2[VX](?:[_ ]3GB)?|era[ _]X|era_HD|era[_ ]4[GK]|Era_4?X(?:_2GB)?|BLACK-1XM|A1000s_Lite|cube 5\.0_2GB|Opus 3|era1X|era [2X]|era1Xpro)(?:[);/ ]|$)'
+  regex: 'Xolo|(?:Q600|Q700s?|Q800|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5\.[05]|Era5X|Era[ _]2[VX](?:[_ ]3GB)?|era[ _]X|era_HD|era[_ ]4[GK]|Era_4?X(?:_2GB)?|BLACK-1XM|A1000s_Lite|cube 5\.0_2GB|Opus 3|era1X|era [2X]|era1Xpro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'BLACK-1XM'
@@ -26853,7 +26853,7 @@ Xolo:
       model: 'Era $1'
     - regex: 'cube 5\.0_2GB'
       model: 'Cube 5.0'
-    - regex: '(Q600 Club|Q600|Q700s?|Q800|Q1000s Plus|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5.[05]|A1000s_Lite|Opus 3)(?:[);/ ]|$)'
+    - regex: '(Q600 Club|Q600|Q700s?|Q800|Q1000s Plus|Q1000s|Q1000[ _]Opus|Q1010i|Q2000|Omega[ _]5\.[05]|A1000s_Lite|Opus 3)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Xolo[ _]?([^;/]+) Build'
       model: '$1'
@@ -28790,18 +28790,18 @@ NEXBOX:
 
 # True or TrueSmart
 'True':
-  regex: ' TRUE BEYOND TAB 3G|HPH07|SMART[ _](4G Adventure(?: Pro)?|MAX 4.0 PLUS|4G[ _](?:GEN C [45]\.[05]|M1 Plus|Champion|Speedy 5\.0 Plus|Speedy[_ ]5inch|P1))|Alpha 5G|SMART Champ 4\.0|TRUE SMART 7.0 Quadcore|SMART 4G M1'
+  regex: ' TRUE BEYOND TAB 3G|HPH07|SMART[ _](4G Adventure(?: Pro)?|MAX 4\.0 PLUS|4G[ _](?:GEN C [45]\.[05]|M1 Plus|Champion|Speedy 5\.0 Plus|Speedy[_ ]5inch|P1))|Alpha 5G|SMART Champ 4\.0|TRUE SMART 7\.0 Quadcore|SMART 4G M1'
   device: 'smartphone'
   models:
     - regex: 'Alpha 5G(?:[);/ ]|$)'
       model: 'Alpha 5G'
-    - regex: 'SMART MAX 4.0 PLUS'
+    - regex: 'SMART MAX 4\.0 PLUS'
       model: 'Smart Max 4.0 Plus'
     - regex: 'SMART Champ 4\.0'
       model: 'Smart Champ 4.0'
-    - regex: 'SMART 4G Gen C ([45].[05])'
+    - regex: 'SMART 4G Gen C ([45]\.[05])'
       model: 'Smart 4G Gen C $1"'
-    - regex: 'SMART 4G Speedy 5.0 Plus'
+    - regex: 'SMART 4G Speedy 5\.0 Plus'
       model: 'Smart 4G Speedy 5.0 Plus'
     - regex: 'SMART 4G Adventure Pro'
       model: 'Smart 4G Adventure Pro'
@@ -29799,10 +29799,10 @@ EXO:
 
 # Q.Bell (qbell.it)
 'Q.Bell':
-  regex: '(QPHONE[_ ](?:10.1|9.[12]|7.1|5.[246])|QTAB10EW)(?:[);/ ]|$)'
+  regex: '(QPHONE[_ ](?:10\.1|9\.[12]|7\.1|5\.[246])|QTAB10EW)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(QPHONE[_ ](?:10.1|9.[12]|7.1|5.[246]))(?:[);/ ]|$)'
+    - regex: '(QPHONE[_ ](?:10\.1|9\.[12]|7\.1|5\.[246]))(?:[);/ ]|$)'
       model: '$1'
     - regex: 'QTAB10EW'
       device: 'tablet'
@@ -29875,7 +29875,7 @@ PocketBook:
       model: 'A10'
     - regex: 'SURFpad2(?:[);/ ]|$)'
       model: 'SURFpad 2'
-    - regex: 'PocketBook SURFpad 3 \(([\d]+).([\d]+)["]?\)(?:[);/ ]|$)'
+    - regex: 'PocketBook SURFpad 3 \(([\d]+)[,.]([\d]+)["]?\)(?:[);/ ]|$)'
       model: 'SURFpad 3 $1.$2"'
     - regex: 'SURFpad 4 ([LMS])(?:[);/ ]|$)'
       model: 'SURFpad 4 $1'
@@ -30705,12 +30705,12 @@ Wortmann:
 
 # BB Mobile
 BB Mobile:
-  regex: 'bb-mobile|Techno[-_ ](8\.0|9\.7|TQ863Q|X595BT|X800BJ|S700BF|I700AJ|10.1 LTE TQ060X|7.0 LTE TQ763I|I785AP|I101BI)(?:[);/ ]|$)'
+  regex: 'bb-mobile|Techno[-_ ](8\.0|9\.7|TQ863Q|X595BT|X800BJ|S700BF|I700AJ|10\.1 LTE TQ060X|7\.0 LTE TQ763I|I785AP|I101BI)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'Techno[_ ]S700BF(?:[);/ ]|$)'
       model: 'Techno 7.0" Pioneer LTE S700BF'
-    - regex: 'Techno[_ ]10.1 LTE TQ060X(?:[);/ ]|$)'
+    - regex: 'Techno[_ ]10\.1 LTE TQ060X(?:[);/ ]|$)'
       model: 'Techno 10.0" LTE TQ060X'
     - regex: 'Techno[_ ]TQ863Q(?:[);/ ]|$)'
       model: 'Techno 8.0" Poplar LTE TQ863Q'
@@ -30722,7 +30722,7 @@ BB Mobile:
       model: 'Techno 8.0" Mozg X800BJ'
     - regex: 'Techno[-_ ]I101BI(?:[);/ ]|$)'
       model: 'Techno 10.1" Mozg I101BI'
-    - regex: 'Techno[_ ]7.0 LTE TQ763I(?:[);/ ]|$)'
+    - regex: 'Techno[_ ]7\.0 LTE TQ763I(?:[);/ ]|$)'
       model: 'Techno 7.0" Kalash LTE TQ763I'
     - regex: '(FirstTab TP-17)(?:[);/ ]|$)'
       model: '$1'
@@ -30763,9 +30763,9 @@ Tele2:
   models:
     - regex: 'Tele2fon[_ ]V6'
       model: 'V6'
-    - regex: 'Tele2[ _](Mi[dn]i)[ _]1.1(?:[);/ ]|$)'
+    - regex: 'Tele2[ _](Mi[dn]i)[ _]1[_.]1(?:[);/ ]|$)'
       model: '$1 1.1'
-    - regex: 'Tele2[ _]Midi[ _]2.0(?:[);/ ]|$)'
+    - regex: 'Tele2[ _]Midi[ _]2[_.]0(?:[);/ ]|$)'
       model: 'Midi 2.0'
     - regex: 'Tele2[ _]((?:Maxi|Midi)(?:[_ ](?:Plus|LTE))?)(?:[);/ ]|$)'
       model: '$1'
@@ -32355,7 +32355,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)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'GRAVITY_OCTACORE'
@@ -32374,7 +32374,7 @@ SPC:
       model: 'Gravity 2 Max'
     - regex: 'GRAVITY 2|GRAVITY2-4G'
       model: 'Gravity 2'
-    - regex: 'SPC Glow9.7'
+    - regex: 'SPC Glow9\.7'
       model: 'Glow 9.7"'
     - regex: 'Lightyear'
       model: 'Lightyear'
@@ -33025,7 +33025,7 @@ CellAllure:
   regex: '(?:Cool_Extreme_2|Earn|Fashion2Plus|Fashion[ _]C|Cool Duo|CHIC_X1|Miracle XS|Miracle 6.0 S)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '(Cool_Extreme_2|Earn|Fashion[ _]C|Cool Duo|Miracle XS|Miracle 6.0 S)(?:[);/ ]|$)'
+    - regex: '(Cool_Extreme_2|Earn|Fashion[ _]C|Cool Duo|Miracle XS|Miracle 6\.0 S)(?:[);/ ]|$)'
       model: '$1'
     - regex: 'Fashion2Plus'
       model: 'Fashion 2 Plus'
@@ -33227,7 +33227,7 @@ Leader Phone:
 
 # Cavion (cavion.pl)
 Cavion:
-  regex: '(?:Cavion[_ ](?:Solid[_ ]4[\._]5|Base[ _](?:7|7_3G_Silver|5[._]0|10|7.2 Quad)|10_3GRQ)|base10_3g_silver|Cavion7.1quad|M1092Q)(?:[);/ ]|$)'
+  regex: '(?:Cavion[_ ](?:Solid[_ ]4[\._]5|Base[ _](?:7|7_3G_Silver|5[._]0|10|7\.2 Quad)|10_3GRQ)|base10_3g_silver|Cavion7\.1quad|M1092Q)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Cavion[_ ]Solid[_ ]4[._]5'
@@ -33237,10 +33237,10 @@ Cavion:
     - regex: 'CAVION_10_3GRQ'
       device: 'tablet'
       model: 'Base 10 3GR Quad'
-    - regex: 'Cavion(?:7.1quad)'
+    - regex: 'Cavion(?:7\.1quad)'
       device: 'tablet'
       model: 'Base 7.1" Quad'
-    - regex: 'Cavion Base 7.2 Quad'
+    - regex: 'Cavion Base 7\.2 Quad'
       device: 'tablet'
       model: 'Base 7.2" Quad'
     - regex: 'Cavion Base 10'
@@ -33535,12 +33535,12 @@ Navcity:
 
 # Jeka
 Jeka:
-  regex: '(?:JK(?:960|[71]03) 3G|JK702|JK101|JK[17]00 v2.0)(?:[);/ ]|$)'
+  regex: '(?:JK(?:960|[71]03) 3G|JK702|JK101|JK[17]00 v2\.0)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'JK(960|[71]03) 3G(?:[);/ ]|$)'
       model: 'JK $1 3G'
-    - regex: 'JK(702|[17]00 v2.0|101)(?:[);/ ]|$)'
+    - regex: 'JK(702|[17]00 v2\.0|101)(?:[);/ ]|$)'
       model: 'JK $1'
 
 # Jiake
@@ -34350,10 +34350,10 @@ Kurio:
 
 # Inch
 Inch:
-  regex: 'Inch (?:Regulus (?:7.85|II)|Avior 3)(?:[);/ ]|$)'
+  regex: 'Inch (?:Regulus (?:7\.85|II)|Avior 3)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: '(Regulus 7.85)'
+    - regex: '(Regulus 7\.85)'
       model: '$1"'
     - regex: '(Regulus II|Avior 3)'
       model: '$1'
@@ -34473,18 +34473,18 @@ Tambo:
 
 # Smooth Mobile (https://www.smoothmobile.us/)
 Smooth Mobile:
-  regex: '(?:Smooth ?(?:5.[05]|626|6.26 (?:Lite|Max|Pro)|6.[15])|S2 Advance)(?:[);/ ]|$)'
+  regex: '(?:Smooth ?(?:5\.[05]|626|6\.26 (?:Lite|Max|Pro)|6\.[15])|S2 Advance)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'S2 Advance'
       model: 'S2 Advance'
-    - regex: 'Smooth 5.5 lite'
+    - regex: 'Smooth 5\.5 lite'
       model: 'Smooth 5.5 Lite'
-    - regex: 'Smooth (5.[05]|6.[15])(?:[);/ ]|$)'
+    - regex: 'Smooth (5\.[05]|6\.[15])(?:[);/ ]|$)'
       model: 'Smooth $1'
     - regex: 'Smooth626(?:[);/ ]|$)'
       model: 'Smooth 6.26'
-    - regex: 'Smooth 6.26 (Lite|Max|Pro)(?:[);/ ]|$)'
+    - regex: 'Smooth 6\.26 (Lite|Max|Pro)(?:[);/ ]|$)'
       model: 'Smooth 6.26 $1'
 
 # Smotreshka
@@ -36286,12 +36286,12 @@ Intel:
 
 # infiniton (infiniton.es)
 Infiniton:
-  regex: 'INFINITON[_ -]|Earth 7.0''3G|EARTH10'
+  regex: 'INFINITON[_ -]|Earth 7\.0''3G|EARTH10'
   device: 'smartphone'
   models:
     - regex: 'INFINITON[_ -]T5'
       model: 'T5'
-    - regex: 'Earth 7.0''3G'
+    - regex: 'Earth 7\.0''3G'
       device: 'tablet'
       model: 'Earth 7" 3G'
     - regex: 'EARTH10'
@@ -36309,12 +36309,12 @@ PAPYRE:
   regex: 'PAPYRE[_ ]'
   device: 'tablet'
   models:
-    - regex: 'PAPYRE[_ ]pad_7.1'
+    - regex: 'PAPYRE[_ ]pad_7\.1'
       model: 'Pad 7.1"'
 
 # I-INN
 I-INN:
-  regex: 'COMMUNICATOR[_ ]9.7[_ ]3G'
+  regex: 'COMMUNICATOR[_ ]9\.7[_ ]3G'
   device: 'tablet'
   model: 'Communicator 9.7" 3G'
 
@@ -36645,12 +36645,12 @@ Hytera:
 
 # PIRANHA (piranha.com.tr)
 PIRANHA:
-  regex: 'PIRANHA[_ ]|(?:Ultra 4 Tab 9.0|Ultra 5 Tab White)(?:[);/ ]|$)'
+  regex: 'PIRANHA[_ ]|(?:Ultra 4 Tab 9\.0|Ultra 5 Tab White)(?:[);/ ]|$)'
   device: 'tablet'
   models:
-    - regex: 'Pro II Tab 7.0'
+    - regex: 'Pro II Tab 7\.0'
       model: 'Pro II'
-    - regex: 'Ultra 4 Tab 9.0'
+    - regex: 'Ultra 4 Tab 9\.0'
       model: 'Ultra 4'
     - regex: 'Ultra 5 Tab White'
       model: 'Ultra 5'
@@ -38881,7 +38881,7 @@ WeChip:
 
 # 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)(?:[);/ ]|$)'
+  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)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'WebTV/(\d+\.\d+)'
diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml
index 860cd995bf..849b4ed3d1 100644
--- a/regexes/device/notebooks.yml
+++ b/regexes/device/notebooks.yml
@@ -100,7 +100,7 @@ Schneider:
   model: 'Notebook 14" Cherry Trail'
 
 Thomson:
-  regex: 'FBMD/TH360R12.32CTW;'
+  regex: 'FBMD/TH360R12\.32CTW;'
   device: 'desktop'
   model: 'Prestige TH-360R12.32CTW'
 
diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml
index c1802643d9..7c51e5890b 100644
--- a/regexes/device/televisions.yml
+++ b/regexes/device/televisions.yml
@@ -581,7 +581,7 @@ LG:
       model: 'KEY0000213F'
     - regex: 'KEY000000(2E|2F|3B|3F)'
       model: 'KEY000000$1'
-    - regex: '(NetCast [0-9]{1}.[0-9]{1}|GLOBAL_PLAT3)'
+    - regex: '(NetCast [0-9]{1}\.[0-9]{1}|GLOBAL_PLAT3)'
       model: '$1'
     - regex: '(OLED[0-9]{2}[A-Z0-9]{3}[A-Z]{2})'
       model: '$1'
diff --git a/regexes/oss.yml b/regexes/oss.yml
index 59d0bce4ba..db0f96cc61 100644
--- a/regexes/oss.yml
+++ b/regexes/oss.yml
@@ -121,7 +121,7 @@
 ##########
 # RouterOS (https://help.mikrotik.com/docs/display/ROS/RouterOS)
 ##########
-- regex: 'Mikrotik/(\d).x'
+- regex: 'Mikrotik/(\d)\.x'
   name: 'RouterOS'
   version: '$1'
 
@@ -184,7 +184,7 @@
 ##########
 # KreaTV
 ##########
-- regex: 'KreaTV/0.0.0.0'
+- regex: 'KreaTV/0\.0\.0\.0'
   name: 'KreaTV'
   version: ''
 
@@ -230,7 +230,7 @@
   name: 'Whale OS'
   version: '$1'
 
-- regex: 'Zeasn/.*TBrowser/2.0' # https://partner.zeasn.com/partnerportal/WhaleVersion1/index.jhtml
+- regex: 'Zeasn/.*TBrowser/2\.0' # https://partner.zeasn.com/partnerportal/WhaleVersion1/index.jhtml
   name: 'Whale OS'
   version: '1'
 
@@ -275,18 +275,18 @@
   name: 'Windows Mobile'
   version: '$1'
 
-- regex: 'Windows NT 6.2; ARM;'
+- regex: 'Windows NT 6\.2; ARM;'
   name: 'Windows RT'
   version: ''
 
-- regex: 'Windows NT 6.3; ARM;'
+- regex: 'Windows NT 6\.3; ARM;'
   name: 'Windows RT'
   version: '8.1'
 
 ##########
 # Windows IoT
 ##########
-- regex: 'Windows IoT 10.0'
+- regex: 'Windows IoT 10\.0'
   name: 'Windows IoT'
   version: '10'
 
@@ -343,19 +343,19 @@
       version: '7'
     - regex: 'Andr[o0]id 7|.+FIRETVSTICK2018'
       version: '6'
-    - regex: 'Andr[o0]id 5.1'
+    - regex: 'Andr[o0]id 5\.1'
       version: '5'
-    - regex: 'Andr[o0]id 4.4.3'
+    - regex: 'Andr[o0]id 4\.4\.3'
       version: '4.5.1'
-    - regex: 'Andr[o0]id 4.4.2'
+    - regex: 'Andr[o0]id 4\.4\.2'
       version: '4'
-    - regex: 'Andr[o0]id 4.2.2'
+    - regex: 'Andr[o0]id 4\.2\.2'
       version: '3'
-    - regex: 'Andr[o0]id 4.0.[34]'
+    - regex: 'Andr[o0]id 4\.0\.[34]'
       version: '3'
-    - regex: 'Andr[o0]id 4.0'
+    - regex: 'Andr[o0]id 4\.0'
       version: '2'
-    - regex: 'Andr[o0]id 2.3.3'
+    - regex: 'Andr[o0]id 2\.3\.3'
       version: '1'
 
 - regex: 'cordova-amazon-fireos'
@@ -507,7 +507,7 @@
   name: 'Android'
   version: '$1'
 
-- regex: 'Android ?(?:jelly bean|Kit Kat|S.O. Ginger Bread|The FireCyano|:) (\d+[\.\d]*)'
+- regex: 'Android ?(?:jelly bean|Kit Kat|S\.O\. Ginger Bread|The FireCyano|:) (\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
 
@@ -819,59 +819,59 @@
   name: 'Windows'
   version: '$1'
 
-- regex: 'CYGWIN_NT-10.0|Windows NT 10.0|Windows 10'
+- regex: 'CYGWIN_NT-10\.0|Windows NT 10\.0|Windows 10'
   name: 'Windows'
   version: '10'
 
-- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10|win10'
+- regex: 'CYGWIN_NT-6\.4|Windows NT 6\.4|Windows 10|win10'
   name: 'Windows'
   version: '10'
 
-- regex: 'CYGWIN_NT-6.3|Windows NT 6.3|Windows 8.1'
+- regex: 'CYGWIN_NT-6\.3|Windows NT 6\.3|Windows 8\.1'
   name: 'Windows'
   version: '8.1'
 
-- regex: 'CYGWIN_NT-6.2|Windows NT 6.2|Windows 8'
+- regex: 'CYGWIN_NT-6\.2|Windows NT 6\.2|Windows 8'
   name: 'Windows'
   version: '8'
 
-- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7|win7|Windows \(6.1'
+- regex: 'CYGWIN_NT-6\.1|Windows NT 6\.1|Windows 7|win7|Windows \(6\.1'
   name: 'Windows'
   version: '7'
 
-- regex: 'CYGWIN_NT-6.0|Windows NT 6.0|Windows Vista'
+- regex: 'CYGWIN_NT-6\.0|Windows NT 6\.0|Windows Vista'
   name: 'Windows'
   version: 'Vista'
 
-- regex: 'CYGWIN_NT-5.2|Windows NT 5.2|Windows Server 2003 / XP x64'
+- regex: 'CYGWIN_NT-5\.2|Windows NT 5\.2|Windows Server 2003 / XP x64'
   name: 'Windows'
   version: 'Server 2003'
 
-- regex: 'CYGWIN_NT-5.1|Windows NT 5.1|Windows XP'
+- regex: 'CYGWIN_NT-5\.1|Windows NT 5\.1|Windows XP'
   name: 'Windows'
   version: 'XP'
 
-- regex: 'CYGWIN_NT-5.0|Windows NT 5.0|Windows 2000'
+- regex: 'CYGWIN_NT-5\.0|Windows NT 5\.0|Windows 2000'
   name: 'Windows'
   version: '2000'
 
-- regex: 'CYGWIN_NT-4.0|Windows NT 4.0|WinNT|Windows NT'
+- regex: 'CYGWIN_NT-4\.0|Windows NT 4\.0|WinNT|Windows NT'
   name: 'Windows'
   version: 'NT'
 
-- regex: 'CYGWIN_ME-4.90|Win 9x 4.90|Windows ME'
+- regex: 'CYGWIN_ME-4\.90|Win 9x 4\.90|Windows ME'
   name: 'Windows'
   version: 'ME'
 
-- regex: 'CYGWIN_98-4.10|Win98|Windows 98'
+- regex: 'CYGWIN_98-4\.10|Win98|Windows 98'
   name: 'Windows'
   version: '98'
 
-- regex: 'CYGWIN_95-4.0|Win32|Win95|Windows 95|Windows_95'
+- regex: 'CYGWIN_95-4\.0|Win32|Win95|Windows 95|Windows_95'
   name: 'Windows'
   version: '95'
 
-- regex: 'Windows 3.1'
+- regex: 'Windows 3\.1'
   name: 'Windows'
   version: '3.1'
 
@@ -897,11 +897,11 @@
   name: 'tvOS'
   version: '$1'
 
-- regex: 'iOS(?:; |/)((?:9|1[0-7]).\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
+- regex: 'iOS(?:; |/)((?:9|1[0-7])\.\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
   name: 'tvOS'
   version: '$1'
 
-- regex: 'tvOS((?:9|1[0-7]).\d+(?:[_\.]\d+)*);'
+- regex: 'tvOS((?:9|1[0-7])\.\d+(?:[_\.]\d+)*);'
   name: 'tvOS'
   version: '$1'
 
@@ -922,11 +922,11 @@
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPad(?:OS)?/(1[3-7]).(\d+[\.\d]*)'
+- regex: 'iPad(?:OS)?/(1[3-7])\.(\d+[\.\d]*)'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: '^iPad(?:\d+[\,\d]*)/(1[3-7]).(\d+[\.\d]*)'
+- regex: '^iPad(?:\d+[\,\d]*)/(1[3-7])\.(\d+[\.\d]*)'
   name: 'iPadOS'
   version: '$1.$2'
 
@@ -934,18 +934,18 @@
   name: 'iPadOS'
   version: '$1'
 
-- regex: 'iOS/(1[3-7]).(\d+[\.\d]*).+Apple/iPad'
+- regex: 'iOS/(1[3-7])\.(\d+[\.\d]*).+Apple/iPad'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPhone OS,(1[3-7]).(\d+[\.\d]*).+iPad'
+- regex: 'iPhone OS,(1[3-7])\.(\d+[\.\d]*).+iPad'
   name: 'iPadOS'
   version: '$1.$2'
 
 ##########
 # iOS
 ##########
-- regex: 'iPad/([89]|1[012]).(\d+[\.\d]*)'
+- regex: 'iPad/([89]|1[012])\.(\d+[\.\d]*)'
   name: 'iOS'
   version: '$1.$2'
 
@@ -973,92 +973,92 @@
   name: 'iOS'
   version: '$1'
 
-- regex: '^(?!com.apple.Safari.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
+- regex: '^(?!com\.apple\.Safari\.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
-    - regex: 'Darwin/23.4.0'
+    - regex: 'Darwin/23\.4\.0'
       version: '17.4'
-    - regex: 'Darwin/23.3.0'
+    - regex: 'Darwin/23\.3\.0'
       version: '17.3'
-    - regex: 'Darwin/23.2.0'
+    - regex: 'Darwin/23\.2\.0'
       version: '17.2'
-    - regex: 'Darwin/23.1.0'
+    - regex: 'Darwin/23\.1\.0'
       version: '17.1'
-    - regex: 'Darwin/23.0.0'
+    - regex: 'Darwin/23\.0\.0'
       version: '17.0'
-    - regex: 'Darwin/22.6.0'
+    - regex: 'Darwin/22\.6\.0'
       version: '16.6'
-    - regex: 'Darwin/22.5.0'
+    - regex: 'Darwin/22\.5\.0'
       version: '16.5'
-    - regex: 'Darwin/22.4.0'
+    - regex: 'Darwin/22\.4\.0'
       version: '16.4'
-    - regex: 'Darwin/22.3.0'
+    - regex: 'Darwin/22\.3\.0'
       version: '16.3'
-    - regex: 'Darwin/22.2.0'
+    - regex: 'Darwin/22\.2\.0'
       version: '16.2'
-    - regex: 'Darwin/22.1.0'
+    - regex: 'Darwin/22\.1\.0'
       version: '16.1'
-    - regex: 'Darwin/22.0.0'
+    - regex: 'Darwin/22\.0\.0'
       version: '16.0'
-    - regex: 'Darwin/21.6.0'
+    - regex: 'Darwin/21\.6\.0'
       version: '15.6'
-    - regex: 'Darwin/21.5.0'
+    - regex: 'Darwin/21\.5\.0'
       version: '15.5'
-    - regex: 'Darwin/21.4.0'
+    - regex: 'Darwin/21\.4\.0'
       version: '15.4'
-    - regex: 'Darwin/21.3.0'
+    - regex: 'Darwin/21\.3\.0'
       version: '15.3'
-    - regex: 'Darwin/21.2.0'
+    - regex: 'Darwin/21\.2\.0'
       version: '15.2'
-    - regex: 'Darwin/21.1.0'
+    - regex: 'Darwin/21\.1\.0'
       version: '15.1'
-    - regex: 'Darwin/21.0.0'
+    - regex: 'Darwin/21\.0\.0'
       version: '15.0'
-    - regex: 'Darwin/20.6.0'
+    - regex: 'Darwin/20\.6\.0'
       version: '14.7'
-    - regex: 'Darwin/20.5.0'
+    - regex: 'Darwin/20\.5\.0'
       version: '14.6'
-    - regex: 'Darwin/20.4.0'
+    - regex: 'Darwin/20\.4\.0'
       version: '14.5'
-    - regex: 'Darwin/20.3.0'
+    - regex: 'Darwin/20\.3\.0'
       version: '14.4'
-    - regex: 'Darwin/20.2.0'
+    - regex: 'Darwin/20\.2\.0'
       version: '14.3'
-    - regex: 'Darwin/20.1.0'
+    - regex: 'Darwin/20\.1\.0'
       version: '14.2'
-    - regex: 'Darwin/20.0.0'
+    - regex: 'Darwin/20\.0\.0'
       version: '14.0'
-    - regex: 'Darwin/19.6.0'
+    - regex: 'Darwin/19\.6\.0'
       version: '13.6'
-    - regex: 'Darwin/19.5.0'
+    - regex: 'Darwin/19\.5\.0'
       version: '13.5'
-    - regex: 'Darwin/19.4.0'
+    - regex: 'Darwin/19\.4\.0'
       version: '13.4'
-    - regex: 'Darwin/19.3.0'
+    - regex: 'Darwin/19\.3\.0'
       version: '13.3.1'
-    - regex: 'Darwin/19.2.0'
+    - regex: 'Darwin/19\.2\.0'
       version: '13.3'
-    - regex: 'Darwin/19.0.0'
+    - regex: 'Darwin/19\.0\.0'
       version: '13.0'
-    - regex: 'Darwin/18.7.0'
+    - regex: 'Darwin/18\.7\.0'
       version: '12.4'
-    - regex: 'Darwin/18.6.0'
+    - regex: 'Darwin/18\.6\.0'
       version: '12.3'
-    - regex: 'Darwin/18.5.0'
+    - regex: 'Darwin/18\.5\.0'
       version: '12.2'
-    - regex: 'Darwin/18.2.0'
+    - regex: 'Darwin/18\.2\.0'
       version: '12.1'
-    - regex: 'Darwin/18.0.0'
+    - regex: 'Darwin/18\.0\.0'
       version: '12.0'
-    - regex: 'Darwin/17.7.0'
+    - regex: 'Darwin/17\.7\.0'
       version: '11.4.1'
-    - regex: 'Darwin/17.6.0'
+    - regex: 'Darwin/17\.6\.0'
       version: '11.4'
-    - regex: 'Darwin/17.5.0'
+    - regex: 'Darwin/17\.5\.0'
       version: '11.3'
-    - regex: 'Darwin/17.4.0'
+    - regex: 'Darwin/17\.4\.0'
       version: '11.2.6'
-    - regex: 'Darwin/17.3.0'
+    - regex: 'Darwin/17\.3\.0'
       version: '11.2'
     - regex: 'CFNetwork/889'
       version: '11.1'
@@ -1196,182 +1196,182 @@
 ##########
 # Mac
 ##########
-- regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com.apple.Safari.SearchHelper|^Safari'
+- regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com\.apple\.Safari\.SearchHelper|^Safari'
   name: 'Mac'
   versions:
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.4\.0'
       version: '14.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.3\.0'
       version: '14.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.2\.0'
       version: '14.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.1\.0'
       version: '14.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.0\.0'
       version: '14.0'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.6\.0'
       version: '13.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.5\.0'
       version: '13.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.4\.0'
       version: '13.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.3\.0'
       version: '13.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.2\.0'
       version: '13.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.1\.0'
       version: '13.0.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?22\.0\.0'
       version: '13.0'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.6\.0'
       version: '12.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.5\.0'
       version: '12.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.4\.0'
       version: '12.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.3\.0'
       version: '12.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.2\.0'
       version: '12.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.1\.0'
       version: '12.0.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?21\.0\.0'
       version: '12.0'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20\.6\.0'
       version: '11.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20\.5\.0'
       version: '11.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20\.4\.0'
       version: '11.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20\.3\.0'
       version: '11.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20.2.0.*'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20\.2\.0.*'
       version: '11.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20.[01].0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?20\.[01]\.0'
       version: '11.0'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19\.6\.0'
       version: '10.15.6'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19\.5\.0'
       version: '10.15.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19\.4\.0'
       version: '10.15.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19\.3\.0'
       version: '10.15.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19\.2\.0'
       version: '10.15.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?19\.0\.0'
       version: '10.15'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18.7.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18\.7\.0'
       version: '10.14'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18\.6\.0'
       version: '10.14.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18\.5\.0'
       version: '10.14.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18\.2\.0'
       version: '10.14.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?18\.0\.0'
       version: '10.14'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.7.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.7\.0'
       version: '10.13.6'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.6\.0'
       version: '10.13.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.5\.0'
       version: '10.13.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.4\.0'
       version: '10.13.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.3\.0'
       version: '10.13.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.2\.0'
       version: '10.13.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?17\.0\.0'
       version: '10.13'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.7.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.7\.0'
       version: '10.12.6'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.6\.0'
       version: '10.12.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.5\.0'
       version: '10.12.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.4\.0'
       version: '10.12.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.3\.0'
       version: '10.12.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.2\.0'
       version: '10.12.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.1\.0'
       version: '10.12.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?16\.0\.0'
       version: '10.12'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15\.6\.0'
       version: '10.11.6'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15\.5\.0'
       version: '10.11.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15\.4\.0'
       version: '10.11.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15\.3\.0'
       version: '10.11.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?15\.2\.0'
       version: '10.11.2'
     - regex: 'CFNetwork/760'
       version: '10.11'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14\.5\.0'
       version: '10.10.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14\.4\.0'
       version: '10.10.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14\.3\.0'
       version: '10.10.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14\.1\.0'
       version: '10.10.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?14\.0\.0'
       version: '10.10'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13\.4\.0'
       version: '10.9.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13\.3\.0'
       version: '10.9.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13\.2\.0'
       version: '10.9.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13\.1\.0'
       version: '10.9.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?13\.0\.0'
       version: '10.9.0'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12.6.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12\.6\.0'
       version: '10.8.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12\.5\.0'
       version: '10.8.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12\.4\.0'
       version: '10.8.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12\.3\.0'
       version: '10.8.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12\.2\.0'
       version: '10.8.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?12\.1\.0'
       version: '10.8.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11.5.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11\.5\.0'
       version: '10.7.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11.4.2'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11\.4\.2'
       version: '10.7.5'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11.4.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11\.4\.0'
       version: '10.7.4'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11\.3\.0'
       version: '10.7.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11.2.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11\.2\.0'
       version: '10.7.2'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11.1.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?11\.1\.0'
       version: '10.7.1'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10.8.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10\.8\.0'
       version: '10.6.8'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10.7.[34]'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10\.7\.[34]'
       version: '10.6.7'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10.3.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10\.3\.0'
       version: '10.6.3'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10.0.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?10\.0\.0'
       version: '10.6'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9.8.0'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9\.8\.0'
       version: '10.5.8'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9.7.1'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9\.7\.1'
       version: '10.5.7'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9.6.2'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9\.6\.2'
       version: '10.5.6'
-    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9.5.[05]'
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?9\.5\.[05]'
       version: '10.5.5'
 
 - regex: 'Macintosh;Mac OS X \((\d+[\.\d]+)\);'
@@ -1394,7 +1394,7 @@
   name: 'Mac'
   version: '$1'
 
-- regex: 'Darwin|Macintosh|Mac[ _]PowerPC|PPC|iMac|MacBook|macOS|AppleExchangeWebServices|com.apple.trustd|Sonos/.+\(MDCR_|WhatsApp/.*N$'
+- regex: 'Darwin|Macintosh|Mac[ _]PowerPC|PPC|iMac|MacBook|macOS|AppleExchangeWebServices|com\.apple\.trustd|Sonos/.+\(MDCR_|WhatsApp/.*N$'
   name: 'Mac'
   version: ''
 
@@ -1643,6 +1643,6 @@
 ##########
 # Java ME (Java Platform, Micro Edition)
 ##########
-- regex: 'Java ME|(J2ME|Profile)/MIDP|MIDP-(?:\d+[\.\d]+)/CLDC|Configuration/CLDC|Java; U; MIDP|MMP/\d.\d'
+- regex: 'Java ME|(J2ME|Profile)/MIDP|MIDP-(?:\d+[\.\d]+)/CLDC|Configuration/CLDC|Java; U; MIDP|MMP/\d\.\d'
   name: 'Java ME'
   version: ''