From e1cd881e29d50eff64c3d41993af72826534289a Mon Sep 17 00:00:00 2001
From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com>
Date: Mon, 1 Jul 2024 06:55:09 -0500
Subject: [PATCH] fix(Revert): "chore(starr): Improve streaming service CFs"
 (#2000)

---
 docs/json/radarr/cf/atvp.json             |  2 +-
 docs/json/radarr/cf/crav.json             |  2 +-
 docs/json/radarr/cf/dsnp.json             |  2 +-
 docs/json/radarr/cf/fod.json              |  2 +-
 docs/json/radarr/cf/hbo.json              |  2 +-
 docs/json/radarr/cf/hmax.json             |  2 +-
 docs/json/radarr/cf/htsr.json             |  2 +-
 docs/json/radarr/cf/ip.json               |  3 +--
 docs/json/radarr/cf/it.json               |  2 +-
 docs/json/radarr/cf/itvx.json             |  4 ++--
 docs/json/radarr/cf/max.json              |  4 ++--
 docs/json/radarr/cf/ovid.json             |  2 +-
 docs/json/radarr/cf/pcok.json             |  2 +-
 docs/json/radarr/cf/pmtp.json             |  3 +--
 docs/json/radarr/cf/stan.json             |  2 +-
 docs/json/radarr/cf/tver.json             |  2 +-
 docs/json/radarr/cf/u-next.json           |  2 +-
 docs/json/sonarr/cf/4od.json              |  2 +-
 docs/json/sonarr/cf/all4.json             |  2 +-
 docs/json/sonarr/cf/atvp.json             |  2 +-
 docs/json/sonarr/cf/bglobal.json          | 18 ++++++++--------
 docs/json/sonarr/cf/bilibili.json         | 18 ++++++++--------
 docs/json/sonarr/cf/cc.json               |  2 +-
 docs/json/sonarr/cf/cr.json               | 18 ++++++++--------
 docs/json/sonarr/cf/crav.json             |  2 +-
 docs/json/sonarr/cf/dcu.json              |  2 +-
 docs/json/sonarr/cf/dsnp.json             |  2 +-
 docs/json/sonarr/cf/fod.json              |  2 +-
 docs/json/sonarr/cf/french-adn.json       | 18 ++++++++--------
 docs/json/sonarr/cf/french-canalplus.json | 26 +++++++++++------------
 docs/json/sonarr/cf/french-rtbf.json      | 18 ++++++++--------
 docs/json/sonarr/cf/french-salto.json     | 18 ++++++++--------
 docs/json/sonarr/cf/french-wkn.json       | 18 ++++++++--------
 docs/json/sonarr/cf/funi.json             | 18 ++++++++--------
 docs/json/sonarr/cf/hbo.json              |  2 +-
 docs/json/sonarr/cf/hidive.json           | 18 ++++++++--------
 docs/json/sonarr/cf/hmax.json             |  2 +-
 docs/json/sonarr/cf/htsr.json             |  2 +-
 docs/json/sonarr/cf/ip.json               |  3 +--
 docs/json/sonarr/cf/it.json               | 20 +----------------
 docs/json/sonarr/cf/itvx.json             |  4 ++--
 docs/json/sonarr/cf/max.json              |  4 ++--
 docs/json/sonarr/cf/nlz.json              |  2 +-
 docs/json/sonarr/cf/ovid.json             |  2 +-
 docs/json/sonarr/cf/pcok.json             |  2 +-
 docs/json/sonarr/cf/pmtp.json             |  2 +-
 docs/json/sonarr/cf/red.json              |  4 ++--
 docs/json/sonarr/cf/sho.json              |  2 +-
 docs/json/sonarr/cf/stan.json             |  2 +-
 docs/json/sonarr/cf/tver.json             |  2 +-
 docs/json/sonarr/cf/u-next.json           |  2 +-
 51 files changed, 140 insertions(+), 161 deletions(-)

diff --git a/docs/json/radarr/cf/atvp.json b/docs/json/radarr/cf/atvp.json
index 05c35901f..4153b26e0 100644
--- a/docs/json/radarr/cf/atvp.json
+++ b/docs/json/radarr/cf/atvp.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((atvp|aptv)\\b|Apple[ ._-]TV\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(atvp|aptv|Apple TV\\+)\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/crav.json b/docs/json/radarr/cf/crav.json
index 41ca4c71c..f67ef4945 100644
--- a/docs/json/radarr/cf/crav.json
+++ b/docs/json/radarr/cf/crav.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "f6ff65b3f4b464a79dcc75950fe20382",
-  "trash_regex": "https://regex101.com/r/eymcie/latest",
+  "trash_regex": "https://regex101.com/r/eymcie/1",
   "name": "CRAV",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/radarr/cf/dsnp.json b/docs/json/radarr/cf/dsnp.json
index 5d3441e3c..d0d0a6f02 100644
--- a/docs/json/radarr/cf/dsnp.json
+++ b/docs/json/radarr/cf/dsnp.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((dsnp|dsny|disney)\\b|Disney\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(dsnp|dsny|disney|Disney\\+)\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/fod.json b/docs/json/radarr/cf/fod.json
index 8c193b6f2..98e7d271a 100644
--- a/docs/json/radarr/cf/fod.json
+++ b/docs/json/radarr/cf/fod.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "917d1f2c845b2b466036b0cc2d7c72a3",
-  "trash_regex": "https://regex101.com/r/kgngPG/latest",
+  "trash_regex": "https://regex101.com/r/kgngPG/1",
   "name": "FOD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/radarr/cf/hbo.json b/docs/json/radarr/cf/hbo.json
index 54c81129f..9fd54291c 100644
--- a/docs/json/radarr/cf/hbo.json
+++ b/docs/json/radarr/cf/hbo.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(hbo)(?![ ._-]max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(hbo)(?![ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/radarr/cf/hmax.json b/docs/json/radarr/cf/hmax.json
index 141d5a7bd..bda624618 100644
--- a/docs/json/radarr/cf/hmax.json
+++ b/docs/json/radarr/cf/hmax.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/radarr/cf/htsr.json b/docs/json/radarr/cf/htsr.json
index 356c1e502..93950307d 100644
--- a/docs/json/radarr/cf/htsr.json
+++ b/docs/json/radarr/cf/htsr.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "834b2c0ba0a8596029b4479a29e1a032",
-  "trash_regex": "https://regex101.com/r/PNiRKh/latest",
+  "trash_regex": "https://regex101.com/r/PNiRKh/1",
   "name": "HTSR",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/radarr/cf/ip.json b/docs/json/radarr/cf/ip.json
index aa3fda681..910c7ba6c 100644
--- a/docs/json/radarr/cf/ip.json
+++ b/docs/json/radarr/cf/ip.json
@@ -1,6 +1,5 @@
 {
   "trash_id": "6185878161f1e2eef9cd0641a0d09eae",
-  "trash_regex": "https://regex101.com/r/iuUsmT/latest",
   "name": "IP",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -10,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(ip(layer)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(ip|iplayer)\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/it.json b/docs/json/radarr/cf/it.json
index 4b23249dd..474ad1662 100644
--- a/docs/json/radarr/cf/it.json
+++ b/docs/json/radarr/cf/it.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(it(unes)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(it|itunes)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/radarr/cf/itvx.json b/docs/json/radarr/cf/itvx.json
index 916975e9b..e21d1f7c9 100644
--- a/docs/json/radarr/cf/itvx.json
+++ b/docs/json/radarr/cf/itvx.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "c3492a26af412e385404eade438ec51c",
-  "trash_regex": "https://regex101.com/r/WzmpCx/latest",
+  "trash_regex": "https://regex101.com/r/WzmpCx/1",
   "name": "ITVX",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -10,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(ITV(X)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\bITV(X)?\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/max.json b/docs/json/radarr/cf/max.json
index b3106909d..c25e9e929 100644
--- a/docs/json/radarr/cf/max.json
+++ b/docs/json/radarr/cf/max.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "6a061313d22e51e0f25b7cd4dc065233",
-  "trash_regex": "https://regex101.com/r/fa649l/latest",
+  "trash_regex": "https://regex101.com/r/fa649l/1",
   "name": "MAX",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -10,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((?<!hbo[ ._-])max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b((?<!hbo[ ._-])max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/radarr/cf/ovid.json b/docs/json/radarr/cf/ovid.json
index 9a857bb5f..dd296fa3e 100644
--- a/docs/json/radarr/cf/ovid.json
+++ b/docs/json/radarr/cf/ovid.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "fbca986396c5e695ef7b2def3c755d01",
-  "trash_regex": "https://regex101.com/r/hWHpjV/latest",
+  "trash_regex": "https://regex101.com/r/hWHpjV/1",
   "name": "OViD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/radarr/cf/pcok.json b/docs/json/radarr/cf/pcok.json
index abb32a086..1f01eeb60 100644
--- a/docs/json/radarr/cf/pcok.json
+++ b/docs/json/radarr/cf/pcok.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(pcok|peacock)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(pcok|peacock)\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/pmtp.json b/docs/json/radarr/cf/pmtp.json
index be0f5152f..33a069fca 100644
--- a/docs/json/radarr/cf/pmtp.json
+++ b/docs/json/radarr/cf/pmtp.json
@@ -1,6 +1,5 @@
 {
   "trash_id": "e36a0ba1bc902b26ee40818a1d59b8bd",
-  "trash_regex": "https://regex101.com/r/3EhY8J/latest",
   "name": "PMTP",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -10,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((pmtp|Paramount[ ._-]Plus)\\b|Paramount\\+)[ ._-]web[ ._-]?(dl|rip)\\b"
+        "value": "\\b(pmtp|Paramount Plus)\\b"
       }
     },
     {
diff --git a/docs/json/radarr/cf/stan.json b/docs/json/radarr/cf/stan.json
index 44e8bc73b..be6e5008e 100644
--- a/docs/json/radarr/cf/stan.json
+++ b/docs/json/radarr/cf/stan.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "c2863d2a50c9acad1fb50e53ece60817",
-  "trash_regex": "https://regex101.com/r/IMS7Or/latest",
+  "trash_regex": "https://regex101.com/r/IMS7Or/1",
   "name": "STAN",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/radarr/cf/tver.json b/docs/json/radarr/cf/tver.json
index 9471a7fdc..a87858163 100644
--- a/docs/json/radarr/cf/tver.json
+++ b/docs/json/radarr/cf/tver.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "f1b0bae9bc222dab32c1b38b5a7a1088",
-  "trash_regex": "https://regex101.com/r/ZdWC9D/latest",
+  "trash_regex": "https://regex101.com/r/ZdWC9D/1",
   "name": "TVer",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/radarr/cf/u-next.json b/docs/json/radarr/cf/u-next.json
index 9462b5e0f..4e33cb732 100644
--- a/docs/json/radarr/cf/u-next.json
+++ b/docs/json/radarr/cf/u-next.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "279bda7434fd9075786de274e6c3c202",
-  "trash_regex": "https://regex101.com/r/04ZSLm/latest",
+  "trash_regex": "https://regex101.com/r/04ZSLm/1",
   "name": "U-NEXT",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/4od.json b/docs/json/sonarr/cf/4od.json
index 3bb4610d3..32832d702 100644
--- a/docs/json/sonarr/cf/4od.json
+++ b/docs/json/sonarr/cf/4od.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/pa5TPZ/latest",
+  "trash_regex": "https://regex101.com/r/pa5TPZ/1",
   "name": "4OD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/all4.json b/docs/json/sonarr/cf/all4.json
index fe5b401b1..4a1ab3765 100644
--- a/docs/json/sonarr/cf/all4.json
+++ b/docs/json/sonarr/cf/all4.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/pUDbbp/latest",
+  "trash_regex": "https://regex101.com/r/pUDbbp/1",
   "name": "ALL4",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/atvp.json b/docs/json/sonarr/cf/atvp.json
index 831330779..e32089552 100644
--- a/docs/json/sonarr/cf/atvp.json
+++ b/docs/json/sonarr/cf/atvp.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((atvp|aptv)\\b|Apple[ ._-]TV\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(atvp|aptv|Apple TV\\+)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/bglobal.json b/docs/json/sonarr/cf/bglobal.json
index 55c2aab51..3254f6a45 100644
--- a/docs/json/sonarr/cf/bglobal.json
+++ b/docs/json/sonarr/cf/bglobal.json
@@ -3,15 +3,6 @@
   "name": "B-Global",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "B-Global",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(B[ ._-]?Global)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -38,6 +29,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "B-Global",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(B[ .-]?Global)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/bilibili.json b/docs/json/sonarr/cf/bilibili.json
index 05c5c1e39..62d236b6f 100644
--- a/docs/json/sonarr/cf/bilibili.json
+++ b/docs/json/sonarr/cf/bilibili.json
@@ -3,15 +3,6 @@
   "name": "Bilibili",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "Bilibili",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(Bilibili)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -38,6 +29,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "Bilibili",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(Bilibili)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/cc.json b/docs/json/sonarr/cf/cc.json
index 5f9ad8714..1125c16cf 100644
--- a/docs/json/sonarr/cf/cc.json
+++ b/docs/json/sonarr/cf/cc.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/A3TRwE/latest",
+  "trash_regex": "https://regex101.com/r/A3TRwE/1",
   "name": "CC",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/cr.json b/docs/json/sonarr/cf/cr.json
index 557efbe7b..ec6455f55 100644
--- a/docs/json/sonarr/cf/cr.json
+++ b/docs/json/sonarr/cf/cr.json
@@ -6,15 +6,6 @@
   "name": "CR",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "Crunchyroll",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(C(runchy)?[ ._-]?R(oll)?)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -41,6 +32,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "Crunchyroll",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(C(runchy)?[ .-]?R(oll)?)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/crav.json b/docs/json/sonarr/cf/crav.json
index 3053016ec..4056a398f 100644
--- a/docs/json/sonarr/cf/crav.json
+++ b/docs/json/sonarr/cf/crav.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/eymcie/latest",
+  "trash_regex": "https://regex101.com/r/eymcie/1",
   "name": "CRAV",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/dcu.json b/docs/json/sonarr/cf/dcu.json
index f4eee6ed0..6f8802170 100644
--- a/docs/json/sonarr/cf/dcu.json
+++ b/docs/json/sonarr/cf/dcu.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(dcu|DC[ ._-]Universe)\\b"
+        "value": "\\b(dcu|DC Universe)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/dsnp.json b/docs/json/sonarr/cf/dsnp.json
index 6ce0f7555..5dd0824bf 100644
--- a/docs/json/sonarr/cf/dsnp.json
+++ b/docs/json/sonarr/cf/dsnp.json
@@ -13,7 +13,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((dsnp|dsny|disney)\\b|Disney\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(dsnp|dsny|disney|Disney\\+)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/fod.json b/docs/json/sonarr/cf/fod.json
index 3b34d80ff..662d883a1 100644
--- a/docs/json/sonarr/cf/fod.json
+++ b/docs/json/sonarr/cf/fod.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/CbFoaJ/latest",
+  "trash_regex": "https://regex101.com/r/CbFoaJ/1",
   "name": "FOD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/french-adn.json b/docs/json/sonarr/cf/french-adn.json
index 4ea1b600d..bdd530f64 100644
--- a/docs/json/sonarr/cf/french-adn.json
+++ b/docs/json/sonarr/cf/french-adn.json
@@ -7,15 +7,6 @@
   "name": "ADN",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "ADN",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(ADN)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -42,6 +33,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "ADN",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(ADN)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/french-canalplus.json b/docs/json/sonarr/cf/french-canalplus.json
index f42c67e2f..df8868e71 100644
--- a/docs/json/sonarr/cf/french-canalplus.json
+++ b/docs/json/sonarr/cf/french-canalplus.json
@@ -1,43 +1,43 @@
 {
   "trash_id": "f27d46a831e6b16fa3fee2c4e5d10984",
-  "trash_regex": "https://regex101.com/r/UYB7E7/latest",
+  "trash_regex": "https://regex101.com/r/UYB7E7/1",
   "name": "CANAL+",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
     {
-      "name": "CANAL+",
-      "implementation": "ReleaseTitleSpecification",
+      "name": "WEBDL",
+      "implementation": "SourceSpecification",
       "negate": false,
       "required": false,
       "fields": {
-        "value": "\\b(C(?:anal)?[ ._-]?(Plus|\\+))[ ._-]"
+        "value": 3
       }
     },
     {
-      "name": "MyCANAL",
-      "implementation": "ReleaseTitleSpecification",
+      "name": "WEBRIP",
+      "implementation": "SourceSpecification",
       "negate": false,
       "required": false,
       "fields": {
-        "value": "\\b(MyCANAL)\\b"
+        "value": 4
       }
     },
     {
-      "name": "WEBDL",
-      "implementation": "SourceSpecification",
+      "name": "CANAL+",
+      "implementation": "ReleaseTitleSpecification",
       "negate": false,
       "required": false,
       "fields": {
-        "value": 3
+        "value": "\\b(C(?:anal)?[ .-]?(Plus|\\+))[ .]"
       }
     },
     {
-      "name": "WEBRIP",
-      "implementation": "SourceSpecification",
+      "name": "MyCANAL",
+      "implementation": "ReleaseTitleSpecification",
       "negate": false,
       "required": false,
       "fields": {
-        "value": 4
+        "value": "\\b(MyCANAL)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/french-rtbf.json b/docs/json/sonarr/cf/french-rtbf.json
index e40b8cd68..66d69fc29 100644
--- a/docs/json/sonarr/cf/french-rtbf.json
+++ b/docs/json/sonarr/cf/french-rtbf.json
@@ -3,15 +3,6 @@
   "name": "RTBF",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "Radio Télévision Belge Francophone",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(RTBF|AUVIO)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -29,6 +20,15 @@
       "fields": {
         "value": 4
       }
+    },
+    {
+      "name": "Radio Télévision Belge Francophone",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(RTBF|AUVIO)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/french-salto.json b/docs/json/sonarr/cf/french-salto.json
index b3c62f9b5..8c4e9e539 100644
--- a/docs/json/sonarr/cf/french-salto.json
+++ b/docs/json/sonarr/cf/french-salto.json
@@ -3,15 +3,6 @@
   "name": "SALTO",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "SALTO",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(SALTO)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -29,6 +20,15 @@
       "fields": {
         "value": 4
       }
+    },
+    {
+      "name": "SALTO",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(SALTO)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/french-wkn.json b/docs/json/sonarr/cf/french-wkn.json
index bba41ba30..106b6d8d1 100644
--- a/docs/json/sonarr/cf/french-wkn.json
+++ b/docs/json/sonarr/cf/french-wkn.json
@@ -3,15 +3,6 @@
   "name": "WKN",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "WKN",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(WKN|Waka(nim)?)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -38,6 +29,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "WKN",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(WKN|Waka(nim)?)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/funi.json b/docs/json/sonarr/cf/funi.json
index ec34f83a0..5fad70007 100644
--- a/docs/json/sonarr/cf/funi.json
+++ b/docs/json/sonarr/cf/funi.json
@@ -6,15 +6,6 @@
   "name": "FUNi",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "Funimation",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(FUNi(mation)?)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -41,6 +32,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "Funimation",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(FUNi(mation)?)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/hbo.json b/docs/json/sonarr/cf/hbo.json
index ea7944592..1f130c300 100644
--- a/docs/json/sonarr/cf/hbo.json
+++ b/docs/json/sonarr/cf/hbo.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(hbo)(?![ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)?\\b)"
+        "value": "\\b(hbo)(?![ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/hidive.json b/docs/json/sonarr/cf/hidive.json
index a332233e4..f1814f586 100644
--- a/docs/json/sonarr/cf/hidive.json
+++ b/docs/json/sonarr/cf/hidive.json
@@ -3,15 +3,6 @@
   "name": "HIDIVE",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
-    {
-      "name": "HIDIVE",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(HIDI(VE)?)\\b"
-      }
-    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -38,6 +29,15 @@
       "fields": {
         "value": 1
       }
+    },
+    {
+      "name": "HIDIVE",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(HIDI(VE)?)\\b"
+      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/hmax.json b/docs/json/sonarr/cf/hmax.json
index 1a185be95..cd5d931ed 100644
--- a/docs/json/sonarr/cf/hmax.json
+++ b/docs/json/sonarr/cf/hmax.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/htsr.json b/docs/json/sonarr/cf/htsr.json
index 072aeab3b..977122f84 100644
--- a/docs/json/sonarr/cf/htsr.json
+++ b/docs/json/sonarr/cf/htsr.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "4404ad44d87ccbb82746e180713112fb",
-  "trash_regex": "https://regex101.com/r/PNiRKh/latest",
+  "trash_regex": "https://regex101.com/r/PNiRKh/1",
   "trash_scores": {
     "default": 50
   },
diff --git a/docs/json/sonarr/cf/ip.json b/docs/json/sonarr/cf/ip.json
index e059f53a5..f7f7dcb11 100644
--- a/docs/json/sonarr/cf/ip.json
+++ b/docs/json/sonarr/cf/ip.json
@@ -3,7 +3,6 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/iuUsmT/latest",
   "name": "IP",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -13,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(ip(layer)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(ip|iplayer)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/it.json b/docs/json/sonarr/cf/it.json
index b038818db..2c7284946 100644
--- a/docs/json/sonarr/cf/it.json
+++ b/docs/json/sonarr/cf/it.json
@@ -12,25 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(it(unes)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
-      }
-    },
-    {
-      "name": "WEBDL",
-      "implementation": "SourceSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": 3
-      }
-    },
-    {
-      "name": "WEBRIP",
-      "implementation": "SourceSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": 4
+        "value": "\\b(it|itunes)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     }
   ]
diff --git a/docs/json/sonarr/cf/itvx.json b/docs/json/sonarr/cf/itvx.json
index b3238f33c..0fb9040b5 100644
--- a/docs/json/sonarr/cf/itvx.json
+++ b/docs/json/sonarr/cf/itvx.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/Nw3FiP/latest",
+  "trash_regex": "https://regex101.com/r/Nw3FiP/1",
   "name": "ITVX",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -13,7 +13,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(ITV(X)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\bITV(X)?\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/max.json b/docs/json/sonarr/cf/max.json
index c35474b42..3f7ae7eff 100644
--- a/docs/json/sonarr/cf/max.json
+++ b/docs/json/sonarr/cf/max.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 90
   },
-  "trash_regex": "https://regex101.com/r/fa649l/latest",
+  "trash_regex": "https://regex101.com/r/fa649l/1",
   "name": "MAX",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -13,7 +13,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((?<!hbo[ ._-])max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b((?<!hbo[ ._-])max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/nlz.json b/docs/json/sonarr/cf/nlz.json
index 95c9f5814..f3cda1f55 100644
--- a/docs/json/sonarr/cf/nlz.json
+++ b/docs/json/sonarr/cf/nlz.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(nlz(iet)?)\\b"
+        "value": "\\b(nlz|NLZiet)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/ovid.json b/docs/json/sonarr/cf/ovid.json
index 100e2d1e0..8cb378824 100644
--- a/docs/json/sonarr/cf/ovid.json
+++ b/docs/json/sonarr/cf/ovid.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/hWHpjV/latest",
+  "trash_regex": "https://regex101.com/r/hWHpjV/1",
   "name": "OViD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/pcok.json b/docs/json/sonarr/cf/pcok.json
index 63c12a9db..2da0588cd 100644
--- a/docs/json/sonarr/cf/pcok.json
+++ b/docs/json/sonarr/cf/pcok.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(pcok|Peacock[ ._-]TV)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(pcok|Peacock TV)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/pmtp.json b/docs/json/sonarr/cf/pmtp.json
index e3b83c1d2..ec3dea2ca 100644
--- a/docs/json/sonarr/cf/pmtp.json
+++ b/docs/json/sonarr/cf/pmtp.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((pmtp|Paramount[ ._-]Plus)\\b|Paramount\\+)[ ._-]web[ ._-]?(dl|rip)\\b"
+        "value": "\\b(pmtp|Paramount\\+)\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/red.json b/docs/json/sonarr/cf/red.json
index 5bc32fe0f..c8d7f23fd 100644
--- a/docs/json/sonarr/cf/red.json
+++ b/docs/json/sonarr/cf/red.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/GfOSFe/latest",
+  "trash_regex": "https://regex101.com/r/GfOSFe/1",
   "name": "RED",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -13,7 +13,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(red|youtube[ ._-]red)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(red|youtube red)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {
diff --git a/docs/json/sonarr/cf/sho.json b/docs/json/sonarr/cf/sho.json
index 9d1da3aff..e5f1450ca 100644
--- a/docs/json/sonarr/cf/sho.json
+++ b/docs/json/sonarr/cf/sho.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/kjPPbG/latest",
+  "trash_regex": "https://regex101.com/r/kjPPbG/1",
   "name": "SHO",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/stan.json b/docs/json/sonarr/cf/stan.json
index d5227c2c4..e9280d9d3 100644
--- a/docs/json/sonarr/cf/stan.json
+++ b/docs/json/sonarr/cf/stan.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 60
   },
-  "trash_regex": "https://regex101.com/r/IMS7Or/latest",
+  "trash_regex": "https://regex101.com/r/IMS7Or/1",
   "name": "STAN",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/tver.json b/docs/json/sonarr/cf/tver.json
index aee8f8454..037d23268 100644
--- a/docs/json/sonarr/cf/tver.json
+++ b/docs/json/sonarr/cf/tver.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/o9YVOG/latest",
+  "trash_regex": "https://regex101.com/r/o9YVOG/1",
   "name": "TVer",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
diff --git a/docs/json/sonarr/cf/u-next.json b/docs/json/sonarr/cf/u-next.json
index c7106eb77..b7f9712fa 100644
--- a/docs/json/sonarr/cf/u-next.json
+++ b/docs/json/sonarr/cf/u-next.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/eQuNMO/latest",
+  "trash_regex": "https://regex101.com/r/eQuNMO/1",
   "name": "U-NEXT",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [