From 4f3d455c2346b39f5ab657d106c4af4b248823fa Mon Sep 17 00:00:00 2001
From: TRaSH <TRaSH-@users.noreply.github.com>
Date: Sun, 18 Feb 2024 13:07:15 +0100
Subject: [PATCH] style(guide): Categorize streaming services (#1804)

---
 .../Radarr-collection-of-custom-formats.md    | 210 ++++++-----
 .../sonarr-collection-of-custom-formats.md    | 344 ++++++++++--------
 2 files changed, 304 insertions(+), 250 deletions(-)

diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md
index ba4e0eb81..6d5b5bf3f 100644
--- a/docs/Radarr/Radarr-collection-of-custom-formats.md
+++ b/docs/Radarr/Radarr-collection-of-custom-formats.md
@@ -1774,7 +1774,9 @@ We've made 3 guides related to this.
 
 ---
 
-### AMZN
+### General Streaming Services
+
+#### AMZN
 
 <sub>Amazon Prime Video</sub>
 
@@ -1792,7 +1794,7 @@ We've made 3 guides related to this.
 
 ---
 
-### ATVP
+#### ATVP
 
 <sub>Apple TV+</sub>
 
@@ -1810,7 +1812,25 @@ We've made 3 guides related to this.
 
 ---
 
-### CRiT
+#### BCORE
+
+<sub>Bravia Core</sub>
+
+??? question "Bravia Core - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/bcore.md" !}
+
+??? example "JSON - [Click to show/hide]"
+
+    ```json
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/bcore.json' %]][[% endfilter %]]
+    ```
+
+<sub><sup>[TOP](#index)</sup>
+
+---
+
+#### CRiT
 
 <sub>Criterion Channel</sub>
 
@@ -1828,7 +1848,7 @@ We've made 3 guides related to this.
 
 ---
 
-### DSNP
+#### DSNP
 
 <sub>Disney+</sub>
 
@@ -1846,7 +1866,7 @@ We've made 3 guides related to this.
 
 ---
 
-### HBO
+#### HBO
 
 <sub>HBO</sub>
 
@@ -1864,7 +1884,7 @@ We've made 3 guides related to this.
 
 ---
 
-### HMAX
+#### HMAX
 
 <sub>HBO Max</sub>
 
@@ -1882,25 +1902,7 @@ We've made 3 guides related to this.
 
 ---
 
-### Max
-
-<sub>Max (streaming service)</sub>
-
-??? question "Max (streaming service) - [Click to show/hide]"
-
-    {! include-markdown "../../includes/cf-descriptions/hmax.md" !}
-
-??? example "JSON - [Click to show/hide]"
-
-    ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/max.json' %]][[% endfilter %]]
-    ```
-
-<sub><sup>[TOP](#index)</sup>
-
----
-
-### Hulu
+#### Hulu
 
 <sub>Hulu</sub>
 
@@ -1918,43 +1920,43 @@ We've made 3 guides related to this.
 
 ---
 
-### iP
+#### Max
 
-<sub>BBC iPlayer aka iP</sub>
+<sub>Max (streaming service)</sub>
 
-??? question "BBC iPlayer aka iP - [Click to show/hide]"
+??? question "Max (streaming service) - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/ip.md" !}
+    {! include-markdown "../../includes/cf-descriptions/hmax.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/ip.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/max.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### ITVX
+#### MA
 
-<sub>ITVX aka ITV</sub>
+<sub>Movies Anywhere</sub>
 
-??? question "ITVX aka ITV - [Click to show/hide]"
+??? question "Movies Anywhere - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/itvx.md" !}
+    {! include-markdown "../../includes/cf-descriptions/ma.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/itvx.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/ma.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### NF
+#### NF
 
 <sub>Netflix</sub>
 
@@ -1972,7 +1974,7 @@ We've made 3 guides related to this.
 
 ---
 
-### PCOK
+#### PCOK
 
 <sub>Peacock TV</sub>
 
@@ -1990,7 +1992,7 @@ We've made 3 guides related to this.
 
 ---
 
-### PMTP
+#### PMTP
 
 <sub>Paramount+</sub>
 
@@ -2008,205 +2010,225 @@ We've made 3 guides related to this.
 
 ---
 
-### MA
+#### STAN
 
-<sub>Movies Anywhere</sub>
+<sub>Stan</sub>
 
-??? question "Movies Anywhere - [Click to show/hide]"
+??? question "STAN - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/ma.md" !}
+    {! include-markdown "../../includes/cf-descriptions/stan.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/ma.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/stan.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### Pathe
+### Asian Streamin Services
 
-<sub>Pathé Thuis</sub>
+---
 
-??? question "Pathé Thuis - [Click to show/hide]"
+#### FOD
 
-    {! include-markdown "../../includes/cf-descriptions/pathe.md" !}
+<sub>FOD = Fuji Television On Demand</sub>
+
+??? question "Fuji Television On Demand - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/pathe.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/fod.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### VDL
+#### TVer
 
-<sub>Videoland</sub>
+<sub>TVer</sub>
 
-??? question "Videoland - [Click to show/hide]"
+??? question "TVer - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/vdl.md" !}
+    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/vdl.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/tver.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### BCORE
+#### U-NEXT
 
-<sub>Bravia Core</sub>
+<sub>U-NEXT</sub>
 
-??? question "Bravia Core - [Click to show/hide]"
+??? question "U-NEXT - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/bcore.md" !}
+    {! include-markdown "../../includes/cf-descriptions/u-next.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/bcore.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/u-next.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### STAN
+#### VIU
 
-<sub>Stan</sub>
+<sub>VIU</sub>
 
-??? question "STAN - [Click to show/hide]"
+??? question "VIU - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/stan.md" !}
+    {! include-markdown "../../includes/cf-descriptions/viu.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/stan.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/viu.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### Crav
+### Dutch Streaming Services
 
-<sub>Crave</sub>
+---
 
-??? question "CRAVE - [Click to show/hide]"
+#### Pathe
 
-    {! include-markdown "../../includes/cf-descriptions/crav.md" !}
+<sub>Pathé Thuis</sub>
+
+??? question "Pathé Thuis - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/pathe.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/crav.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/pathe.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### OViD
+#### VDL
 
-<sub>OViD</sub>
+<sub>Videoland</sub>
 
-??? question "OViD - [Click to show/hide]"
+??? question "Videoland - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/ovid.md" !}
+    {! include-markdown "../../includes/cf-descriptions/vdl.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/ovid.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/vdl.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### FOD
+### UK Streaming Services
 
-<sub>FOD = Fuji Television On Demand</sub>
+---
 
-??? question "Fuji Television On Demand - [Click to show/hide]"
+#### iP
 
-    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
+<sub>BBC iPlayer aka iP</sub>
+
+??? question "BBC iPlayer aka iP - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/ip.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/fod.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/ip.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### TVer
+#### ITVX
 
-<sub>TVer</sub>
+<sub>ITVX aka ITV</sub>
 
-??? question "TVer - [Click to show/hide]"
+??? question "ITVX aka ITV - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
+    {! include-markdown "../../includes/cf-descriptions/itvx.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/tver.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/itvx.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### U-NEXT
+### Misc Streaming Services
 
-<sub>U-NEXT</sub>
+---
 
-??? question "U-NEXT - [Click to show/hide]"
+#### Crav
 
-    {! include-markdown "../../includes/cf-descriptions/u-next.md" !}
+<sub>Crave</sub>
+
+??? question "CRAVE - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/crav.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/u-next.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/crav.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### VIU
+#### OViD
 
-<sub>VIU</sub>
+<sub>OViD</sub>
 
-??? question "VIU - [Click to show/hide]"
+??? question "OViD - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/viu.md" !}
+    {! include-markdown "../../includes/cf-descriptions/ovid.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/viu.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/ovid.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### VRV
+### Anime Streaming Services
+
+---
+
+#### VRV
 
 ??? question "VRV - [Click to show/hide]"
 
diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md
index 3a1848c0b..066b76546 100644
--- a/docs/Sonarr/sonarr-collection-of-custom-formats.md
+++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md
@@ -1473,7 +1473,11 @@ We've made 3 guides related to this.
 
 ---
 
-### AMZN
+### General Streaming Services
+
+---
+
+#### AMZN
 
 <sub>Amazon Prime Video</sub>
 
@@ -1491,7 +1495,7 @@ We've made 3 guides related to this.
 
 ---
 
-### ATVP
+#### ATVP
 
 <sub>Apple TV+</sub>
 
@@ -1509,7 +1513,25 @@ We've made 3 guides related to this.
 
 ---
 
-### DCU
+#### CC
+
+<sub>CC = Comedy Central</sub>
+
+??? question "CC - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/cc.md" !}
+
+??? example "JSON - [Click to show/hide]"
+
+    ```json
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/cc.json' %]][[% endfilter %]]
+    ```
+
+<sub><sup>[TOP](#index)</sup>
+
+---
+
+#### DCU
 
 <sub>DC Universe (streaming service)</sub>
 
@@ -1527,7 +1549,7 @@ We've made 3 guides related to this.
 
 ---
 
-### DSNP
+#### DSNP
 
 <sub>Disney+</sub>
 
@@ -1545,7 +1567,7 @@ We've made 3 guides related to this.
 
 ---
 
-### HMAX
+#### HMAX
 
 <sub>HBO Max</sub>
 
@@ -1563,7 +1585,7 @@ We've made 3 guides related to this.
 
 ---
 
-### HBO
+#### HBO
 
 <sub>HBO</sub>
 
@@ -1581,25 +1603,7 @@ We've made 3 guides related to this.
 
 ---
 
-### Max
-
-<sub>Max (streaming service)</sub>
-
-??? question "Max (streaming service) - [Click to show/hide]"
-
-    {! include-markdown "../../includes/cf-descriptions/hmax.md" !}
-
-??? example "JSON - [Click to show/hide]"
-
-    ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/max.json' %]][[% endfilter %]]
-    ```
-
-<sub><sup>[TOP](#index)</sup>
-
----
-
-### Hulu
+#### Hulu
 
 <sub>Hulu</sub>
 
@@ -1617,439 +1621,463 @@ We've made 3 guides related to this.
 
 ---
 
-### iP
+#### IT
 
-<sub>BBC iPlayer aka iP</sub>
+<sub>iT = iTunes</sub>
 
-??? question "BBC iPlayer aka iP - [Click to show/hide]"
+??? question "iTunes - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/ip.md" !}
+    {! include-markdown "../../includes/cf-descriptions/it.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/ip.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/it.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### ITVX
+#### Max
 
-<sub>ITVX aka ITV</sub>
+<sub>Max (streaming service)</sub>
 
-??? question "ITVX aka ITV - [Click to show/hide]"
+??? question "Max (streaming service) - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/itvx.md" !}
+    {! include-markdown "../../includes/cf-descriptions/hmax.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/itvx.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/max.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### NLZ
+#### NF
 
-<sub>NLZiet</sub>
+<sub>Netflix</sub>
 
-??? question "NLZiet - [Click to show/hide]"
+??? question "Netflix - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/nlz.md" !}
+    {! include-markdown "../../includes/cf-descriptions/nf.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/nlz.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/nf.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### NF
+#### PMTP
 
-<sub>Netflix</sub>
+<sub>Paramount+</sub>
 
-??? question "Netflix - [Click to show/hide]"
+??? question "Paramount+ - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/nf.md" !}
+    {! include-markdown "../../includes/cf-descriptions/pmtp.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/nf.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/pmtp.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### PMTP
+#### PCOK
 
-<sub>Paramount+</sub>
+<sub>Peacock TV</sub>
 
-??? question "Paramount+ - [Click to show/hide]"
+??? question "Peacock TV - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/pmtp.md" !}
+    {! include-markdown "../../includes/cf-descriptions/pcok.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/pmtp.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/pcok.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### PCOK
+#### SHO
 
-<sub>Peacock TV</sub>
+<sub>SHOWTIME</sub>
 
-??? question "Peacock TV - [Click to show/hide]"
+??? question "SHOWTIME - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/pcok.md" !}
+    {! include-markdown "../../includes/cf-descriptions/sho.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/pcok.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/sho.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### Qibi
+#### STAN
 
-<sub>Quibi</sub>
+<sub>Stan</sub>
 
-??? question "Quibi - [Click to show/hide]"
+??? question "STAN - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/qibi.md" !}
+    {! include-markdown "../../includes/cf-descriptions/stan.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/qibi.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/stan.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### SHO
+### French Streaming Services
 
-<sub>SHOWTIME</sub>
+---
 
-??? question "SHOWTIME - [Click to show/hide]"
+#### CANALPlus
 
-    {! include-markdown "../../includes/cf-descriptions/sho.md" !}
+<sub>CANALPlus = CANAL+/MyCANAL</sub>
+
+??? question "Canal+ - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/french-canalplus.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/sho.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-canalplus.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### VDL
+#### RTBF
 
-<sub>Videoland</sub>
+<sub>RTBF = Radio-télévision belge de la Communauté française (Radio Télévision Belge Francophone)</sub>
 
-??? question "Videoland - [Click to show/hide]"
+??? question "RTBF - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/vdl.md" !}
+    {! include-markdown "../../includes/cf-descriptions/french-rtbf.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/vdl.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-rtbf.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### STAN
+#### SALTO
 
-<sub>Stan</sub>
+<sub>SALTO = SⱯLTO</sub>
 
-??? question "STAN - [Click to show/hide]"
+??? question "SⱯLTO - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/stan.md" !}
+    {! include-markdown "../../includes/cf-descriptions/french-salto.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/stan.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-salto.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### RED
+### Asian Streaming Services
 
-<sub>RED = Youtube Red = Youtube Premium</sub>
+---
 
-??? question "Youtube Red - [Click to show/hide]"
+#### FOD
 
-    {! include-markdown "../../includes/cf-descriptions/red.md" !}
+<sub>FOD = Fuji Television On Demand</sub>
+
+??? question "Fuji Television On Demand - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/red.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/fod.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### IT
+#### TVer
 
-<sub>iT = iTunes</sub>
+<sub>TVer</sub>
 
-??? question "iTunes - [Click to show/hide]"
+??? question "TVer - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/it.md" !}
+    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/it.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/tver.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### CANALPlus
+#### U-NEXT
 
-<sub>CANALPlus = CANAL+/MyCANAL</sub>
+<sub>U-NEXT</sub>
 
-??? question "Canal+ - [Click to show/hide]"
+??? question "U-NEXT - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/french-canalplus.md" !}
+    {! include-markdown "../../includes/cf-descriptions/u-next.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-canalplus.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/u-next.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### SALTO
+#### VIU
 
-<sub>SALTO = SⱯLTO</sub>
+<sub>VIU</sub>
 
-??? question "SⱯLTO - [Click to show/hide]"
+??? question "VIU - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/french-salto.md" !}
+    {! include-markdown "../../includes/cf-descriptions/viu.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-salto.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/viu.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### RTBF
+### Dutch Streaming Services
 
-<sub>RTBF = Radio-télévision belge de la Communauté française (Radio Télévision Belge Francophone)</sub>
+---
 
-??? question "RTBF - [Click to show/hide]"
+#### NLZ
 
-    {! include-markdown "../../includes/cf-descriptions/french-rtbf.md" !}
+<sub>NLZiet</sub>
+
+??? question "NLZiet - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/nlz.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-rtbf.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/nlz.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### CC
+#### VDL
 
-<sub>CC = Comedy Central</sub>
+<sub>Videoland</sub>
 
-??? question "CC - [Click to show/hide]"
+??? question "Videoland - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/cc.md" !}
+    {! include-markdown "../../includes/cf-descriptions/vdl.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/cc.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/vdl.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### Crav
+### UK Streaming Services
 
-<sub>Crave</sub>
+---
 
-??? question "CRAVE - [Click to show/hide]"
+#### 4OD
 
-    {! include-markdown "../../includes/cf-descriptions/crav.md" !}
+<sub>4OD</sub>
+
+??? question "4OD - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/all4.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/crav.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/4od.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### OViD
+#### ALL4
 
-<sub>OViD</sub>
+<sub>ALL4</sub>
 
-??? question "OViD - [Click to show/hide]"
+??? question "ALL4 - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/ovid.md" !}
+    {! include-markdown "../../includes/cf-descriptions/all4.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/ovid.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/all4.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### FOD
+#### iP
 
-<sub>FOD = Fuji Television On Demand</sub>
+<sub>BBC iPlayer aka iP</sub>
 
-??? question "Fuji Television On Demand - [Click to show/hide]"
+??? question "BBC iPlayer aka iP - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
+    {! include-markdown "../../includes/cf-descriptions/ip.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/fod.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/ip.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### TVer
+#### ITVX
 
-<sub>TVer</sub>
+<sub>ITVX aka ITV</sub>
 
-??? question "TVer - [Click to show/hide]"
+??? question "ITVX aka ITV - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/fod.md" !}
+    {! include-markdown "../../includes/cf-descriptions/itvx.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/tver.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/itvx.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### U-NEXT
+### Misc Streaming Services
 
-<sub>U-NEXT</sub>
+---
 
-??? question "U-NEXT - [Click to show/hide]"
+#### Crav
 
-    {! include-markdown "../../includes/cf-descriptions/u-next.md" !}
+<sub>Crave</sub>
+
+??? question "CRAVE - [Click to show/hide]"
+
+    {! include-markdown "../../includes/cf-descriptions/crav.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/u-next.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/crav.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### VIU
+#### OViD
 
-<sub>VIU</sub>
+<sub>OViD</sub>
 
-??? question "VIU - [Click to show/hide]"
+??? question "OViD - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/viu.md" !}
+    {! include-markdown "../../includes/cf-descriptions/ovid.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/viu.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/ovid.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### ALL4
+#### RED
 
-<sub>ALL4</sub>
+<sub>RED = Youtube Red = Youtube Premium</sub>
 
-??? question "ALL4 - [Click to show/hide]"
+??? question "Youtube Red - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/all4.md" !}
+    {! include-markdown "../../includes/cf-descriptions/red.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/all4.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/red.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### 4OD
+#### Qibi
 
-<sub>4OD</sub>
+<sub>Quibi</sub>
 
-??? question "4OD - [Click to show/hide]"
+??? question "Quibi - [Click to show/hide]"
 
-    {! include-markdown "../../includes/cf-descriptions/all4.md" !}
+    {! include-markdown "../../includes/cf-descriptions/qibi.md" !}
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/4od.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/qibi.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
 
 ---
 
-### B-Global
+### Anime Streaming Services
+
+---
+
+#### B-Global
 
 ??? question "B-Global - [Click to show/hide]"
 
@@ -2065,7 +2093,7 @@ We've made 3 guides related to this.
 
 ---
 
-### Bilibili
+#### Bilibili
 
 ??? question "Bilibili - [Click to show/hide]"
 
@@ -2081,7 +2109,7 @@ We've made 3 guides related to this.
 
 ---
 
-### CR
+#### CR
 
 <sub>Crunchyroll</sub>
 
@@ -2099,7 +2127,7 @@ We've made 3 guides related to this.
 
 ---
 
-### FUNI
+#### FUNI
 
 <sub>Funimation</sub>
 
@@ -2117,7 +2145,7 @@ We've made 3 guides related to this.
 
 ---
 
-### HIDIVE
+#### HIDIVE
 
 ??? question "HIDIVE - [Click to show/hide]"
 
@@ -2133,7 +2161,7 @@ We've made 3 guides related to this.
 
 ---
 
-### VRV
+#### VRV
 
 ??? question "VRV - [Click to show/hide]"
 
@@ -2149,7 +2177,7 @@ We've made 3 guides related to this.
 
 ---
 
-### ABEMA
+#### ABEMA
 
 ??? question "Abema - [Click to show/hide]"
     {! include-markdown "../../includes/cf-descriptions/abema.md" !}
@@ -2164,7 +2192,7 @@ We've made 3 guides related to this.
 
 ---
 
-### ADN
+#### ADN
 
 <sub>ADN = Animation Digital Network</sub>
 
@@ -2182,7 +2210,7 @@ We've made 3 guides related to this.
 
 ---
 
-### WKN
+#### WKN
 
 <sub>WKN = Wakanim</sub>
 
@@ -2200,7 +2228,11 @@ We've made 3 guides related to this.
 
 ---
 
-### UHD Streaming Boost
+### Optional Streaming Services
+
+---
+
+#### UHD Streaming Boost
 
 ??? question "UHD Streaming Boost - [Click to show/hide]"
 
@@ -2216,7 +2248,7 @@ We've made 3 guides related to this.
 
 ---
 
-### UHD Streaming Cut
+#### UHD Streaming Cut
 
 ??? question "UHD Streaming Cut - [Click to show/hide]"