diff --git a/docs/Radarr/Radarr-recommended-naming-scheme.md b/docs/Radarr/Radarr-recommended-naming-scheme.md
index 4fcf5615b..e2298681b 100644
--- a/docs/Radarr/Radarr-recommended-naming-scheme.md
+++ b/docs/Radarr/Radarr-recommended-naming-scheme.md
@@ -24,22 +24,42 @@ This naming scheme is made to be compatible with the [New Plex Agent](https://fo
     `{edition-{Edition Tags}}` with `{Edition Tags}`
 
 ```bash
-{Movie CleanTitle} {(Release Year)} {imdb-{ImdbId}} {edition-{Edition Tags}} {[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}][{Mediainfo VideoCodec}]{-Release Group}
+{{ radarr['naming']['radarr-naming']['file']['default'] }}
 ```
 
 ??? summary "RESULTS: - [CLICK TO EXPAND]"
 
     `The Movie Title (2010) {imdb-tt0066921} {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE`
 
+For Jellyfin/Emby:
+
+```bash
+{{ radarr['naming']['radarr-naming']['file']['emby'] }}
+```
+
+??? summary "RESULTS: - [CLICK TO EXPAND]"
+
+    `The Movie Title (2010) {imdbid-tt0066921} {edition-Ultimate Extended Edition} [IMAX HYBRID][Bluray-1080p Proper][3D][DV HDR10][DTS 5.1][x264]-EVOLVE`
+
 If you do Anime
 
 ```bash
-{Movie CleanTitle} {(Release Year)} {imdb-{ImdbId}} {edition-{Edition Tags}} {[Custom Formats]}{[Quality Full]}{[MediaInfo 3D]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels}]{MediaInfo AudioLanguages}[{MediaInfo VideoBitDepth}bit][{Mediainfo VideoCodec}]{-Release Group}
+{{ radarr['naming']['radarr-naming']['file']['anime'] }}
+```
+
+??? summary "RESULTS: - [CLICK TO EXPAND]"
+
+    `The Movie Title (2010) [imdb-tt0066921] {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE`
+
+For Jellyfin/Emby:
+
+```bash
+{{ radarr['naming']['radarr-naming']['file']['anime-emby'] }}
 ```
 
 ??? summary "RESULTS: - [CLICK TO EXPAND]"
 
-    `The Movie Title (2010) {imdb-tt0066921} {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE`
+    `The Movie Title (2010) [imdbid-tt0066921] {edition-Ultimate Extended Edition} [Surround Sound x264][Bluray-1080p Proper][3D][DTS 5.1][DE][10bit][AVC]-EVOLVE`
 
 ------
 
@@ -72,7 +92,7 @@ The filename can be Obscured where the Release naming isn't, especially when you
 ### Minimal needed and recommended
 
 ```bash
-{Movie CleanTitle} ({Release Year})
+{{ radarr['naming']['radarr-naming']['folder']['default'] }}
 ```
 
 RESULT:
@@ -90,11 +110,37 @@ RESULT:
 
         TMDb is usually better as it guarantees a match, IMDb only gets matched if the TMDb entry has the correct IMDb ID association. We don't actually talk to IMDb.
 
+#### Optional Movies Folder Format for the Plex Movies Scanner and Jellyfin/Emby
+
+This naming scheme is made to be compatible with the new [Plex TV Series Scanner](https://forums.plex.tv/t/beta-new-plex-tv-series-scanner/696242){:target="_blank" rel="noopener noreferrer"} that now support IMDB and TVDB IDs in file names.
+
+For Plex:
+
+```bash
+{{ radarr['naming']['radarr-naming']['folder']['plex'] }}
+```
+
+RESULT:
+
+`The Movie Title (2010) [imdb-tt1520211]`
+
+For Jellyfin/Emby:
+
+```bash
+{{ radarr['naming']['radarr-naming']['folder']['emby'] }}
+```
+
+RESULT:
+
+`The Movie Title (2010) [imdbid-tt1520211]`
+
+!!! tip
+    IMDb IDs are going to be very accurate and rarely change, TVDB/TMDB IDs, on the other hand, do change or are removed more frequently.
+
 ------
 
 Thanks:
 
 A big Thanks to [fryfrog](https://github.com/fryfrog) and [rg9400](https://github.com/rg9400) for the suggestions.
 
-{! include-markdown "../../includes/support.md" !}
-<!-- --8<-- "includes/support.md" -->
+--8<-- "includes/support.md"
diff --git a/docs/Sonarr/Sonarr-recommended-naming-scheme.md b/docs/Sonarr/Sonarr-recommended-naming-scheme.md
index 204ac6ac3..da743ac6a 100644
--- a/docs/Sonarr/Sonarr-recommended-naming-scheme.md
+++ b/docs/Sonarr/Sonarr-recommended-naming-scheme.md
@@ -16,13 +16,13 @@ it gets imported correctly and isn't incorrectly matched as HDTV or WEB-DL etc.
 ## Standard Episode Format
 
 ```bash
-{Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{[MediaInfo VideoCodec]}{-Release Group}
+{{ sonarr['naming']['sonarr-naming']['episodes']['standard']['default:3'] }}
 ```
 
 !!! warning "Sonarr V4 - Is now using Custom Formats instead of Release Profiles. Use the below naming scheme instead :warning:"
 
     ```bash
-    {Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{[MediaInfo VideoCodec]}{-Release Group}
+    {{ sonarr['naming']['sonarr-naming']['episodes']['standard']['default:4'] }}
     ```
 
 ??? summary "RESULTS: - [CLICK TO EXPAND]"
@@ -40,13 +40,13 @@ it gets imported correctly and isn't incorrectly matched as HDTV or WEB-DL etc.
 ## Daily Episode Format
 
 ```bash
-{Series TitleYear} - {Air-Date} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{[MediaInfo VideoCodec]}{-Release Group}
+{{ sonarr['naming']['sonarr-naming']['episodes']['daily']['default:3'] }}
 ```
 
 !!! warning "Sonarr V4 - Is now using Custom Formats instead of Release Profiles. Use the below naming scheme instead :warning:"
 
     ```bash
-    {Series TitleYear} - {Air-Date} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{[MediaInfo VideoCodec]}{-Release Group}
+    {{ sonarr['naming']['sonarr-naming']['episodes']['daily']['default:4'] }}
     ```
 
 ??? summary "RESULTS: - [CLICK TO EXPAND]"
@@ -58,13 +58,13 @@ it gets imported correctly and isn't incorrectly matched as HDTV or WEB-DL etc.
 ## Anime Episode Format
 
 ```bash
-{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}[{MediaInfo VideoBitDepth}bit]{[MediaInfo VideoCodec]}[{Mediainfo AudioCodec} { Mediainfo AudioChannels}]{MediaInfo AudioLanguages}{-Release Group}
+{{ sonarr['naming']['sonarr-naming']['episodes']['anime']['default:3'] }}
 ```
 
 !!! warning "Sonarr V4 - Is now using Custom Formats instead of Release Profiles. Use the below naming scheme instead :warning:"
 
     ```bash
-    {Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}[{MediaInfo VideoBitDepth}bit]{[MediaInfo VideoCodec]}[{Mediainfo AudioCodec} { Mediainfo AudioChannels}]{MediaInfo AudioLanguages}{-Release Group}
+    {{ sonarr['naming']['sonarr-naming']['episodes']['anime']['default:4'] }}
     ```
 
 ??? summary "RESULTS: - [CLICK TO EXPAND]"
@@ -82,7 +82,7 @@ it gets imported correctly and isn't incorrectly matched as HDTV or WEB-DL etc.
 ### Series Folder Format
 
 ```bash
-{Series TitleYear}
+{{ sonarr['naming']['sonarr-naming']['series']['default'] }}
 ```
 
 RESULT:
@@ -96,17 +96,17 @@ This naming scheme is made to be compatible with the new [Plex TV Series Scanner
 For Plex:
 
 ```bash
-{Series TitleYear} [imdb-{ImdbId}]
+{{ sonarr['naming']['sonarr-naming']['series']['plex'] }}
 ```
 
 RESULT:
 
-`The Series Title! (2010) [imdb-tt1520211]`
+`The Series Title! (2010) {imdb-tt1520211}`
 
 For Jellyfin/Emby:
 
 ```bash
-{Series TitleYear} [tvdbid-{TvdbId}]
+{{ sonarr['naming']['sonarr-naming']['series']['emby'] }}
 ```
 
 RESULT:
@@ -164,5 +164,4 @@ Thanks:
 
 A big Thanks to [fryfrog](https://github.com/fryfrog), [rg9400](https://github.com/rg9400) and [bakerboy448](https://github.com/bakerboy448) for the suggestions.
 
-{! include-markdown "../../includes/support.md" !}
-<!-- --8<-- "includes/support.md" -->
+--8<-- "includes/support.md"