diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index acd8cc5..8b4d715 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,6 +18,6 @@ jobs:
           webhook_token: ${{ secrets.RELEASE_WEBHOOK_TOKEN }}
           release: true
           title: Plex Meta Manager Defaults VERSION
-          message: "<@&967002324646113290>"
+          message: "<@&1021857386132144202> - The PMM Default Metadata & Overlays (use `!defaults` to learn more) have been updated as follows"
           username: Metabot
           avatar_url: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager/master/.github/pmm.png
\ No newline at end of file
diff --git a/PMM/award/bafta.yml b/PMM/award/bafta.yml
index cd4e1a0..3fb1b2e 100644
--- a/PMM/award/bafta.yml
+++ b/PMM/award/bafta.yml
@@ -44,12 +44,15 @@ templates:
 
 collections:
   BAFTA Best Films:
+    variables:
+      key: best
     template:
-      - name: award
-        image: bafta/winner
       - name: shared
         sort: BAFTA !
-    allowed_library_types: movie
+        library_type: movie
+        image: award/bafta/winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/bafta-award-best-film
 
 dynamic_collections:
@@ -63,5 +66,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - BAFTA
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/award/cannes.yml b/PMM/award/cannes.yml
index 995a9a3..0d15c48 100644
--- a/PMM/award/cannes.yml
+++ b/PMM/award/cannes.yml
@@ -44,12 +44,15 @@ templates:
 
 collections:
   Cannes - Palme d'or:
+    variables:
+      key: palme
     template:
-      - name: award
-        image: cannes/winner
       - name: shared
         sort: Cannes !
-    allowed_library_types: movie
+        library_type: movie
+        image: award/cannes/winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/cannes-film-festival-palme-d-or
 
 dynamic_collections:
@@ -63,5 +66,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - Cannes
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/award/choice.yml b/PMM/award/choice.yml
index 3a00696..704061f 100644
--- a/PMM/award/choice.yml
+++ b/PMM/award/choice.yml
@@ -62,8 +62,9 @@ dynamic_collections:
     template:
       - use_year_collections
       - Choice
-      - award
       - shared
+      - arr
+      - custom
     template_variables:
       url:
         2019: critics
diff --git a/PMM/award/emmy.yml b/PMM/award/emmy.yml
index 1bf7706..34bb1a6 100644
--- a/PMM/award/emmy.yml
+++ b/PMM/award/emmy.yml
@@ -59,5 +59,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - Emmy
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/award/golden.yml b/PMM/award/golden.yml
index 84e1b8a..605bd59 100644
--- a/PMM/award/golden.yml
+++ b/PMM/award/golden.yml
@@ -51,11 +51,14 @@ templates:
 
 collections:
   Golden Globe Best Motion Pictures:
+    variables:
+      key: best
     template:
-      - name: award
-        image: golden/best_picture_winner
       - name: shared
         sort: Golden Globes !1
+        image: award/golden/best_picture_winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/golden-globe-award-best-motion-picture
 
 dynamic_collections:
@@ -69,5 +72,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - Golden
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/award/oscars.yml b/PMM/award/oscars.yml
index cdd7c56..a93db22 100644
--- a/PMM/award/oscars.yml
+++ b/PMM/award/oscars.yml
@@ -44,22 +44,28 @@ templates:
 collections:
 
   Oscars Best Picture Winners:
+    variables:
+      key: best_picture
     template:
-      - name: award
-        image: oscars/best_picture_winner
       - name: shared
         sort: Oscars !1
-    allowed_library_types: movie
+        library_type: movie
+        image: award/oscars/best_picture_winner
+      - name: arr
+      - name: custom
     imdb_list: https://www.imdb.com/search/title/?groups=best_picture_winner
     summary: The Academy Award for Best Picture is one of the Academy Awards presented annually by the Academy of Motion Picture Arts and Sciences since the awards debuted in 1929.
 
   Oscars Best Director Winners:
+    variables:
+      key: best_director
     template:
-      - name: award
-        image: oscars/best_director_winner
       - name: shared
         sort: Oscars !2
-    allowed_library_types: movie
+        library_type: movie
+        image: award/oscars/best_director_winner
+      - name: arr
+      - name: custom
     imdb_list: https://www.imdb.com/search/title/?groups=best_director_winner
     summary: The Academy Award for Best Director is one of the Academy Awards presented annually by the Academy of Motion Picture Arts and Sciences since the awards debuted in 1929.
 
@@ -74,5 +80,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - Oscars
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/award/other.yml b/PMM/award/other.yml
index 5302c40..723d248 100644
--- a/PMM/award/other.yml
+++ b/PMM/award/other.yml
@@ -35,25 +35,34 @@ external_templates:
 
 collections:
   Cesar:
+    variables:
+      key: cesar
     template:
-      - name: award
-        image: cesar/winner
       - name: shared
-    allowed_library_types: movie
+        library_type: movie
+        image: award/cesar/winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/cesar-award-best-french-film
 
   Berlinale:
+    variables:
+      key: berlinale
     template:
-      - name: award
-        image: berlinale/winner
       - name: shared
-    allowed_library_types: movie
+        library_type: movie
+        image: award/berlinale/winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/berlin-international-film-festival-golden-bears
 
   Venice:
+    variables:
+      key: venice
     template:
-      - name: award
-        image: venice/winner
       - name: shared
-    allowed_library_types: movie
+        library_type: movie
+        image: award/venice/winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/venice-film-festival-golden-lion
diff --git a/PMM/award/spirit.yml b/PMM/award/spirit.yml
index 1244514..877b6ca 100644
--- a/PMM/award/spirit.yml
+++ b/PMM/award/spirit.yml
@@ -52,5 +52,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - Spirit
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/award/sundance.yml b/PMM/award/sundance.yml
index 857bbcd..f1a69ef 100644
--- a/PMM/award/sundance.yml
+++ b/PMM/award/sundance.yml
@@ -43,12 +43,15 @@ templates:
 
 collections:
   Sundance Grand Jury Winners:
+    variables:
+      key: grand
     template:
-      - name: award
-        image: sundance/grand_jury_winner
       - name: shared
         sort: Sundance !1
-    allowed_library_types: movie
+        library_type: movie
+        image: award/sundance/grand_jury_winner
+      - name: arr
+      - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/sundance-film-festival-grand-jury-prize
 
 dynamic_collections:
@@ -62,5 +65,6 @@ dynamic_collections:
     template:
       - use_year_collections
       - Sundance
-      - award
       - shared
+      - arr
+      - custom
diff --git a/PMM/chart/anilist.yml b/PMM/chart/anilist.yml
index edefa91..8b5f715 100644
--- a/PMM/chart/anilist.yml
+++ b/PMM/chart/anilist.yml
@@ -47,7 +47,7 @@
 #          radarr_folder_key:                               #
 #          # Sonarr Folder to add to                        #
 #          sonarr_folder_key:                               #
-#          # Radarr Tag for existing items                  #
+#          # Radarr Tag for added missing                   #
 #          radarr_tag_key:                                  #
 #          # Sonarr Tag for added missing                   #
 #          sonarr_tag_key:                                  #
@@ -85,29 +85,41 @@ templates:
 collections:
 
   AniList Popular:
+    variables:
+      key: popular
     template:
       - name: popular
-      - name: chart_shared
-        key: popular
+      - name: shared
+      - name: arr
+      - name: custom
 
   AniList Top Rated:
+    variables:
+      key: top
     template:
       - name: top
-      - name: chart_shared
-        key: top
+      - name: shared
+      - name: arr
+      - name: custom
 
   AniList Trending:
+    variables:
+      key: trending
     template:
       - name: trending
-      - name: chart_shared
-        key: trending
+      - name: shared
+      - name: arr
+      - name: custom
 
   AniList Season:
+    variables:
+      key: season
     anilist_search:
       season: current
       year:
       sort_by: popular
     summary: A collection of Anime from the Current Season according to AniList.
     template:
-      - name: chart_shared
-        key: season
+      - name: shared
+      - name: arr
+      - name: custom
diff --git a/PMM/chart/basic.yml b/PMM/chart/basic.yml
index b653684..2f088e5 100644
--- a/PMM/chart/basic.yml
+++ b/PMM/chart/basic.yml
@@ -75,14 +75,16 @@ collections:
         separator: chart
 
   Newly Released:
+    variables:
+      key: released
     template:
       - name: released
-      - name: smart_chart_shared
-        key: released
+      - name: shared
 
   New Episodes:
+    variables:
+      key: episodes
     template:
       - name: episodes
-      - name: smart_chart_shared
-        key: episodes
-        check_library: show
+      - name: shared
+        library_type: show
diff --git a/PMM/chart/imdb.yml b/PMM/chart/imdb.yml
index d863cd1..2b6ae3e 100644
--- a/PMM/chart/imdb.yml
+++ b/PMM/chart/imdb.yml
@@ -67,22 +67,31 @@ templates:
 collections:
 
   IMDb Popular:
+    variables:
+      key: popular
     template:
       - name: imdb
         chart: popular
-      - name: chart_shared
-        key: popular
+      - name: shared
+      - name: arr
+      - name: custom
 
   IMDb Top 250:
+    variables:
+      key: top
     template:
       - name: imdb
         chart: top
-      - name: chart_shared
-        key: top
+      - name: shared
+      - name: arr
+      - name: custom
 
   IMDb Lowest Rated:
+    variables:
+      key: lowest
     imdb_chart: lowest_rated
     template:
-      - name: chart_shared
-        key: lowest
-        check_library: movie
+      - name: shared
+        library_type: movie
+      - name: arr
+      - name: custom
diff --git a/PMM/chart/myanimelist.yml b/PMM/chart/myanimelist.yml
index 0173603..79a4bc1 100644
--- a/PMM/chart/myanimelist.yml
+++ b/PMM/chart/myanimelist.yml
@@ -92,34 +92,49 @@ templates:
 collections:
 
   MyAnimeList Popular:
+    variables:
+      key: popular
     template:
       - name: popular
-      - name: chart_shared
-        key: popular
+      - name: shared
+      - name: arr
+      - name: custom
 
   MyAnimeList Favorited:
+    variables:
+      key: favorited
     template:
       - name: favorited
-      - name: chart_shared
-        key: favorited
+      - name: shared
+      - name: arr
+      - name: custom
 
   MyAnimeList Top Rated:
+    variables:
+      key: top
     template:
       - name: top
-      - name: chart_shared
-        key: top
+      - name: shared
+      - name: arr
+      - name: custom
 
   MyAnimeList Top Airing:
+    variables:
+      key: airing
     template:
       - name: airing
-      - name: chart_shared
-        key: airing
+      - name: shared
+      - name: arr
+      - name: custom
 
   MyAnimeList Season:
+    variables:
+      key: season
     mal_season:
       season: current
       sort_by: score
     summary: A collection of Anime from the Current Season according to MyAnimeList.
     template:
-      - name: chart_shared
-        key: season
+      - name: shared
+      - name: arr
+      - name: custom
diff --git a/PMM/chart/other.yml b/PMM/chart/other.yml
index 0de090a..9516bfe 100644
--- a/PMM/chart/other.yml
+++ b/PMM/chart/other.yml
@@ -61,36 +61,53 @@ external_templates:
     collection_section: "01"
 
 templates:
+  anidb:
+    default:
+      limit_anidb: 30
+    summary: A collection of Popular Anime on AniDB
+    anidb_popular: <<limit_anidb>>
+
   css:
     mdblist_list: https://mdblist.com/lists/plexmetamanager/cssfamilies<<library_type>>s
     summary: A collection of Common Sense <<library_type>>s. Common Sense recognizes outstanding entertainment with an official seal for quality and impact. Common Sense Selections include age-appropriate media with the potential to spark family conversations, entertain families of all kinds, and have a positive, lasting effect on society.
 
 collections:
   AniDB Popular:
-    summary: A collection of Popular Anime on AniDB
-    anidb_popular: 30
+    variables:
+      key: anidb
     template:
-      - name: chart_shared
-        key: anidb
+      - name: anidb
+      - name: shared
+      - name: arr
+      - name: custom
 
   Common Sense Selection:
+    variables:
+      key: commonsense
     template:
       - name: css
-      - name: chart_shared
-        key: commonsense
+      - name: shared
+      - name: arr
+      - name: custom
 
   StevenLu's Popular Movies:
+    variables:
+      key: stevenlu
     summary: A collection of StevenLu's Most Popular Movies
     stevenlu_popular: true
     template:
-      - name: chart_shared
-        key: stevenlu
-        check_library: movie
+      - name: shared
+        library_type: movie
+      - name: arr
+      - name: custom
 
   Top 10 Pirated Movies of the Week:
+    variables:
+      key: pirated
     mdblist_list: https://mdblist.com/lists/hdlists/top-ten-pirated-movies-of-the-week-torrent-freak-com/
     summary: TorrentFreak.com's Weekly Top Ten Pirated Movies
     template:
-      - name: chart_shared
-        key: pirated
-        check_library: movie
+      - name: shared
+        library_type: movie
+      - name: arr
+      - name: custom
diff --git a/PMM/chart/tautulli.yml b/PMM/chart/tautulli.yml
index 2d03a84..d8a06c2 100644
--- a/PMM/chart/tautulli.yml
+++ b/PMM/chart/tautulli.yml
@@ -74,12 +74,19 @@ templates:
 
 collections:
   Plex Popular:
+    variables:
+      key: popular
     template:
       - name: tautulli_popular
-      - name: chart_shared
-        key: popular
+      - name: shared
+      - name: arr
+      - name: custom
+
   Plex Watched:
+    variables:
+      key: watched
     template:
       - name: tautulli_watched
-      - name: chart_shared
-        key: watched
+      - name: shared
+      - name: arr
+      - name: custom
diff --git a/PMM/chart/tmdb.yml b/PMM/chart/tmdb.yml
index cabc5d3..10c106d 100644
--- a/PMM/chart/tmdb.yml
+++ b/PMM/chart/tmdb.yml
@@ -98,33 +98,48 @@ templates:
 collections:
 
   TMDb Airing Today:
+    variables:
+      key: airing
     template:
       - name: airing
-      - name: chart_shared
-        key: airing
-        check_library: show
+      - name: shared
+        library_type: show
+      - name: arr
+      - name: custom
 
   TMDb On The Air:
+    variables:
+      key: air
     template:
       - name: air
-      - name: chart_shared
-        key: air
-        check_library: show
+      - name: shared
+        library_type: show
+      - name: arr
+      - name: custom
 
   TMDb Popular:
+    variables:
+      key: popular
     template:
       - name: popular
-      - name: chart_shared
-        key: popular
+      - name: shared
+      - name: arr
+      - name: custom
 
   TMDb Top Rated:
+    variables:
+      key: top
     template:
       - name: top
-      - name: chart_shared
-        key: top
+      - name: shared
+      - name: arr
+      - name: custom
 
   TMDb Trending:
+    variables:
+      key: trending
     template:
       - name: trending
-      - name: chart_shared
-        key: trending
\ No newline at end of file
+      - name: shared
+      - name: arr
+      - name: custom
\ No newline at end of file
diff --git a/PMM/chart/trakt.yml b/PMM/chart/trakt.yml
index 533d27c..0bc23c3 100644
--- a/PMM/chart/trakt.yml
+++ b/PMM/chart/trakt.yml
@@ -87,4 +87,6 @@ dynamic_collections:
     title_format: Trakt <<key_name>>
     template:
       - trakt
-      - chart_shared
+      - shared
+      - arr
+      - custom
diff --git a/PMM/movie/franchise.yml b/PMM/movie/franchise.yml
index 6878f4b..eacd427 100644
--- a/PMM/movie/franchise.yml
+++ b/PMM/movie/franchise.yml
@@ -48,6 +48,9 @@ templates:
     sync_mode: sync
     collection_order: <<collection_order>>
     radarr_add_missing: <<radarr_add_missing>>
+    radarr_folder: <<radarr_folder>>
+    radarr_tag: <<radarr_tag>>
+    item_radarr_tag: <<item_radarr_tag>>
 
 dynamic_collections:
   TMDb Collections:
diff --git a/PMM/movie/seasonal.yml b/PMM/movie/seasonal.yml
index 568946a..163ebfb 100644
--- a/PMM/movie/seasonal.yml
+++ b/PMM/movie/seasonal.yml
@@ -131,7 +131,6 @@ collections:
       - name: Holiday
         key: independence
         schedule_independence: range(06/23-07/11)
-      - name: shared
     imdb_list: 
       - https://www.imdb.com/list/ls068664510/
       - https://www.imdb.com/list/ls080925875/
@@ -141,7 +140,6 @@ collections:
       - name: Holiday
         key: easter
         schedule_easter: range(03/15-04/30)
-      - name: shared
     imdb_list: 
       - https://www.imdb.com/list/ls062665509/
       - https://www.imdb.com/list/ls051733651/
@@ -151,7 +149,6 @@ collections:
       - name: Holiday
         key: valentine
         schedule_valentine: range(02/01-02/29)
-      - name: shared
     imdb_list:
       - https://www.imdb.com/list/ls000094398/
       - https://www.imdb.com/list/ls057783436/
@@ -162,7 +159,6 @@ collections:
       - name: Holiday
         key: patrick
         schedule_patrick: range(03/01-03/18)
-      - name: shared
     imdb_list: https://www.imdb.com/list/ls063934595/
 
   Thanksgiving:
@@ -170,7 +166,6 @@ collections:
       - name: Holiday
         key: thanksgiving
         schedule_thanksgiving: range(11/01-11/30)
-      - name: shared
     imdb_list: 
       - https://www.imdb.com/list/ls000835734/
       - https://www.imdb.com/list/ls091597850/
@@ -180,7 +175,6 @@ collections:
       - name: Holiday
         key: halloween
         schedule_halloween: range(10/01-10/31)
-      - name: shared
     imdb_list:
       - https://www.imdb.com/list/ls023118929/
       - https://www.imdb.com/list/ls000099714/
@@ -197,7 +191,6 @@ collections:
       - name: Holiday
         key: christmas
         schedule_christmas: range(12/01-12/31)
-      - name: shared
     imdb_list: https://www.imdb.com/list/ls000096828/
 
   New Year's Day:
@@ -205,5 +198,4 @@ collections:
       - name: Holiday
         key: years
         schedule_years: range(12/26-01/04)
-      - name: shared
     imdb_list: https://www.imdb.com/list/ls066838460/
\ No newline at end of file
diff --git a/PMM/movie/universe.yml b/PMM/movie/universe.yml
index 0fb9608..3b2304a 100644
--- a/PMM/movie/universe.yml
+++ b/PMM/movie/universe.yml
@@ -37,9 +37,7 @@ templates:
   multi-franchise:
     optional:
       - name_mapping
-    cache_builders: 1
-    sync_mode: sync
-    collection_order: custom
+    name_mapping: <<name_mapping>>
     url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/franchise/<<image_encoded>>.jpg
 
 collections:
@@ -48,77 +46,113 @@ collections:
       - name: separator
         separator: universe
   Star Wars Universe:
+    variables:
+      key: star
     template:
-      - name: shared
       - name: multi-franchise
         image: Star Wars
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/zorge88/lists/star-wars
   DC Animated Universe:
+    variables:
+      key: dca
     template:
-      - name: shared
       - name: multi-franchise
         image: DC Universe
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/dc-animated-movie-universe
   DC Extended Universe:
+    variables:
+      key: dcu
     template:
-      - name: shared
       - name: multi-franchise
         image: DC Universe
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/dc-extended-universe
     summary: The DC Extended Universe (DCEU) is the fictional shared universe where most stories in American comic book titles published by DC Comics take place. DC superheroes such as Superman, Batman, Wonder Woman, Martian Manhunter, The Flash, Green Lantern and Aquaman are from this universe, as well as teams such as the Justice League and the Teen Titans.
   Marvel Cinematic Universe:
+    variables:
+      key: mcu
     template:
-      - name: shared
       - name: multi-franchise
         image: Marvel Cinematic Universe
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe
   Wizarding World:
+    variables:
+      key: wizard
     template:
-      - name: shared
       - name: multi-franchise
         image: Wizarding World
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/strangerer/lists/harry-potter
   "Alien / Predator":
+    variables:
+      key: avp
     template:
-      - name: shared
       - name: multi-franchise
         image: Alien Predator
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/alien-predator-timeline
     name_mapping: Alien Predator
   X-Men Universe:
+    variables:
+      key: xmen
     template:
-      - name: shared
       - name: multi-franchise
         image: X-Men
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/donxy/lists/x-men-universe
   Middle Earth:
+    variables:
+      key: middle
     template:
-      - name: shared
       - name: multi-franchise
         image: Middle Earth
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/dybro/lists/lord-of-the-rings
   Fast & Furious:
+    variables:
+      key: fast
     template:
-      - name: shared
       - name: multi-franchise
         image: Fast & Furious
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/vargajoe/lists/fast-and-furious-chronology
   Star Trek:
+    variables:
+      key: trek
     template:
-      - name: shared
       - name: multi-franchise
         image: Star Trek
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/arachn0id/lists/star-trek-movies
   Rocky / Creed:
+    variables:
+      key: rocky
     template:
-      - name: shared
       - name: multi-franchise
         image: Rocky Creed
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/strangerer/lists/rocky
     name_mapping: Rocky Creed
   The Mummy Universe:
+    variables:
+      key: mummy
     template:
-      - name: shared
       - name: multi-franchise
         image: The Mummy
+      - name: shared
+      - name: custom
     trakt_list: https://trakt.tv/users/rzepkowski/lists/the-mummy-movies
\ No newline at end of file
diff --git a/PMM/playlist.yml b/PMM/playlist.yml
index f2805af..a1b3800 100644
--- a/PMM/playlist.yml
+++ b/PMM/playlist.yml
@@ -58,33 +58,15 @@ templates:
   playlist:
     default:
       libraries: Movies, TV Shows
-      radarr_add_missing_<<key>>: <<radarr_add_missing>>
-      sonarr_add_missing_<<key>>: <<sonarr_add_missing>>
-      radarr_folder_<<key>>: <<radarr_folder>>
-      sonarr_folder_<<key>>: <<sonarr_folder>>
-      radarr_tag_<<key>>: <<radarr_tag>>
-      sonarr_tag_<<key>>: <<sonarr_tag>>
       item_radarr_tag_<<key>>: <<item_radarr_tag>>
       item_sonarr_tag_<<key>>: <<item_sonarr_tag>>
       url_<<key>>: <<trakt_url>>
     optional:
       - use_<<key>>
-      - radarr_add_missing
-      - sonarr_add_missing
-      - radarr_folder
-      - sonarr_folder
-      - radarr_tag
-      - sonarr_tag
       - item_radarr_tag
       - item_sonarr_tag
     allowed_library_types:
       - <<use_<<key>>>>
-    radarr_add_missing: <<radarr_add_missing_<<key>>>>
-    sonarr_add_missing: <<sonarr_add_missing_<<key>>>>
-    radarr_folder: <<radarr_folder_<<key>>>>
-    sonarr_folder: <<sonarr_folder_<<key>>>>
-    radarr_tag: <<radarr_tag_<<key>>>>
-    sonarr_tag: <<sonarr_tag_<<key>>>>
     item_radarr_tag: <<item_radarr_tag_<<key>>>>
     item_sonarr_tag: <<item_sonarr_tag_<<key>>>>
     trakt_list: <<url_<<key>>>>
@@ -96,57 +78,73 @@ templates:
 
 playlists:
   Arrowverse (Timeline Order):
+    variables:
+      key: arrow
     template:
       - name: playlist
-        key: arrow
         trakt_url: https://trakt.tv/users/donxy/lists/arrowverse
+      - name: arr
     summary: The Arrowverse is an American superhero media franchise and a shared universe that is centered on various interconnected television series based on DC Comics superhero characters, primarily airing on The CW as well as web series on CW Seed.
 
   Marvel Cinematic Universe (Timeline Order):
+    variables:
+      key: mcu
     template:
       - name: playlist
-        key: mcu
         trakt_url: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe
+      - name: arr
     summary: The Marvel Cinematic Universe (MCU) is a collection of movies and television series that tell a singular narrative related to Marvel characters, settings and stories. The MCU is a product from Disney and Marvel that brings us heroes from Black Panther and Doctor Strange to Spider-Man and Iron Man.
 
   DC Animated Universe (Timeline Order):
+    variables:
+      key: dcau
     template:
       - name: playlist
-        key: dcau
         trakt_url: https://trakt.tv/users/donxy/lists/dc-animated-series-universe
+      - name: arr
     summary: "The DC Animated Universe (DCAU) is a shared universe consisting primarily of superhero-based animated television series, produced by Warner Bros. Animation and based on characters that appear in American comic books published by DC Comics. The first TV series set in the DCAU was Batman: The Animated Series, which premiered in 1992; the last TV series was Justice League Unlimited, which ended its run in 2006."
 
   Pokémon (Timeline Order):
+    variables:
+      key: pokemon
     template:
       - name: playlist
-        key: pokemon
         trakt_url: https://trakt.tv/users/munch54/lists/pokemon-watching-order
+      - name: arr
     summary: Ash Ketchum, his yellow pet Pikachu, and his human friends explore a world of powerful creatures. Ten-year-old Ash aspires to be the greatest Pokémon (pocket monster) trainer in the world. To do this, he enlists the help of many friends, and his own Pokémon, Pikachu.
 
   Star Trek (Timeline Order):
+    variables:
+      key: startrek
     template:
       - name: playlist
-        key: startrek
         trakt_url: https://trakt.tv/users/pedrohcramos/lists/star-trek-timeline
+      - name: arr
     summary: Few film franchises have lasted as long as Star Trek. Through five decades and three different crews, the Star Trek films have saved more than a few worlds (and the whales), traveling through time more than once to do it. With them being set in so many different time periods, their actual chronological order might get a little confusing. No need to fret as this is the proper order… in linear time, anyway. On a quantum level is a whole other thing.
 
   Star Wars (Timeline Order):
+    variables:
+      key: starwars
     template:
       - name: playlist
-        key: starwars
         trakt_url: https://trakt.tv/users/ruben_vw_/lists/star-wars-canon-timeline
+      - name: arr
     summary: A long time ago in a galaxy far, far away, a farm boy on a desert planet dreamed of joining a rebellion and saving a princess from a dark lord, and thus, one of the most successful cinematic sagas of all time was born. What began with one space opera in 1977 quickly grew into a media empire that included toys, comic books, video games, TV series, and memorabilia in every possible form. Today, more than 40 years after it first arrived, Star Wars remains a global pop culture phenomenon, and the story still isn't over. 
 
   Star Wars The Clone Wars (Timeline Order):
+    variables:
+      key: clonewars
     template:
       - name: playlist
-        key: clonewars
         trakt_url: https://trakt.tv/users/tomfin46/lists/star-wars-the-clone-wars-chronological-episode-order
+      - name: arr
     summary: As more star systems get swept into the Clone Wars, the valiant Jedi knights struggle to maintain order. Anakin Skywalker and his Padawan learner Ahsoka Tano embark on a mission that brings them face-to-face with Jabba the Hutt. Plotting against them is evil Count Dooku and his agent, Asajj Ventress, who would ensure that the Jedis fail. Meanwhile, Yoda and Obi-Wan Kenobi lead the clone army against the forces of the Dark Side.
 
   X-Men (Timeline Order):
+    variables:
+      key: xmen
     template:
       - name: playlist
-        key: xmen
         trakt_url: https://trakt.tv/users/heyitsbea/lists/x-men
+      - name: arr
     summary: The X-Men are a fictional team of superheroes appearing in American comic books published by Marvel Comics, first appearing in The X-Men Issue 1. Although initially cancelled in 1970, following its 1975 revival and subsequent direction under writer Chris Claremont, it became one of the most recognizable and successful franchises of Marvel Comics.
diff --git a/PMM/show/franchise.yml b/PMM/show/franchise.yml
index 5103795..c5c618c 100644
--- a/PMM/show/franchise.yml
+++ b/PMM/show/franchise.yml
@@ -46,7 +46,10 @@ templates:
     sync_mode: sync
     collection_order: <<collection_order>>
     sonarr_add_missing: <<sonarr_add_missing>>
-    build_collection: <<build_collection>>
+    sonarr_folder: <<sonarr_folder>>
+    sonarr_tag: <<sonarr_tag>>
+    item_sonarr_tag: <<item_sonarr_tag>>
+
 dynamic_collections:
   Show Franchise Collections:
     type: custom
diff --git a/PMM/streaming.yml b/PMM/streaming.yml
index 6ac62b9..4487713 100644
--- a/PMM/streaming.yml
+++ b/PMM/streaming.yml
@@ -128,3 +128,5 @@ dynamic_collections:
     template:
       - streaming
       - shared
+      - arr
+      - custom
diff --git a/PMM/templates.yml b/PMM/templates.yml
index a6c31a6..4b0495e 100644
--- a/PMM/templates.yml
+++ b/PMM/templates.yml
@@ -30,112 +30,64 @@ templates:
     default:
       collection_section: "00"
       sort: <<collection_name>>
-      key: ""
-      pre: "_"
-      order_<<key>>: ""
-    optional:
-      - collection_mode
-      - radarr_add_missing
-      - sonarr_add_missing
-      - radarr_folder
-      - sonarr_folder
-      - radarr_tag
-      - sonarr_tag
-      - item_radarr_tag
-      - item_sonarr_tag
-    radarr_add_missing: <<radarr_add_missing>>
-    sonarr_add_missing: <<sonarr_add_missing>>
-    radarr_folder: <<radarr_folder>>
-    sonarr_folder: <<sonarr_folder>>
-    radarr_tag: <<radarr_tag>>
-    sonarr_tag: <<sonarr_tag>>
-    item_radarr_tag: <<item_radarr_tag>>
-    item_sonarr_tag: <<item_sonarr_tag>>
-    collection_mode: <<collection_mode>>
-    sort_title: "!<<collection_section>><<pre>><<order_<<key>>>><<sort>>"
-
-  smart_chart_shared:
-    default:
-      collection_section: "00"
       key: <<collection_name>>
-      sort: <<collection_name>>
       pre: "_"
       order_<<key>>: ""
+      image: chart/<<name_encoded>>
       item_radarr_tag_<<key>>: <<item_radarr_tag>>
       item_sonarr_tag_<<key>>: <<item_sonarr_tag>>
     optional:
       - use_<<key>>
+      - library_type
+      - collection_mode
       - visible_library_<<key>>
       - visible_home_<<key>>
       - visible_shared_<<key>>
-      - collection_mode
       - item_radarr_tag
       - item_sonarr_tag
-      - library_types
-      - check_library
     allowed_library_types:
       - <<use_<<key>>>>
-      - <<check_library>>
+      - <<library_type>>
+    ignore_blank_results: true
+    collection_mode: <<collection_mode>>
     visible_library: <<visible_library_<<key>>>>
     visible_home: <<visible_home_<<key>>>>
     visible_shared: <<visible_shared_<<key>>>>
     item_radarr_tag: <<item_radarr_tag_<<key>>>>
     item_sonarr_tag: <<item_sonarr_tag_<<key>>>>
-    collection_mode: <<collection_mode>>
     sort_title: "!<<collection_section>><<pre>><<order_<<key>>>><<sort>>"
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/chart/<<collection_name_encoded>>.jpg
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/<<image>>.jpg
 
-  chart_shared:
+  arr:
     default:
-      collection_section: "00"
-      collection_order_<<key>>: custom
       key: <<collection_name>>
-      sort: <<collection_name>>
-      pre: "_"
-      order_<<key>>: ""
       radarr_add_missing_<<key>>: <<radarr_add_missing>>
       sonarr_add_missing_<<key>>: <<sonarr_add_missing>>
       radarr_folder_<<key>>: <<radarr_folder>>
       sonarr_folder_<<key>>: <<sonarr_folder>>
       radarr_tag_<<key>>: <<radarr_tag>>
       sonarr_tag_<<key>>: <<sonarr_tag>>
-      item_radarr_tag_<<key>>: <<item_radarr_tag>>
-      item_sonarr_tag_<<key>>: <<item_sonarr_tag>>
     optional:
-      - use_<<key>>
-      - visible_library_<<key>>
-      - visible_home_<<key>>
-      - visible_shared_<<key>>
-      - collection_mode
       - radarr_add_missing
       - sonarr_add_missing
       - radarr_folder
       - sonarr_folder
       - radarr_tag
       - sonarr_tag
-      - item_radarr_tag
-      - item_sonarr_tag
-      - library_types
-      - check_library
-    allowed_library_types:
-      - <<use_<<key>>>>
-      - <<check_library>>
-    collection_order: <<collection_order_<<key>>>>
-    sync_mode: sync
-    visible_library: <<visible_library_<<key>>>>
-    visible_home: <<visible_home_<<key>>>>
-    visible_shared: <<visible_shared_<<key>>>>
     radarr_add_missing: <<radarr_add_missing_<<key>>>>
     sonarr_add_missing: <<sonarr_add_missing_<<key>>>>
     radarr_folder: <<radarr_folder_<<key>>>>
     sonarr_folder: <<sonarr_folder_<<key>>>>
     radarr_tag: <<radarr_tag_<<key>>>>
     sonarr_tag: <<sonarr_tag_<<key>>>>
-    item_radarr_tag: <<item_radarr_tag_<<key>>>>
-    item_sonarr_tag: <<item_sonarr_tag_<<key>>>>
-    collection_mode: <<collection_mode>>
-    sort_title: "!<<collection_section>><<pre>><<order_<<key>>>><<sort>>"
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/chart/<<collection_name_encoded>>.jpg
+
+  custom:
+    default:
+      collection_order: custom
+      collection_order_<<key>>: <<collection_order>>
+    collection_order: <<collection_order_<<key>>>>
+    sync_mode: sync
+    cache_builders: 1
 
   other_collection:
     default:
@@ -147,31 +99,7 @@ templates:
     allowed_library_types: <<use_other>>
     sort_title: "!<<collection_section>><<pre>><<sort>>"
 
-  award:
-    default:
-      collection_order: custom
-    optional:
-      - image
-    cache_builders: 1
-    sync_mode: sync
-    collection_order: <<collection_order>>
-    ignore_blank_results: true
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/award/<<image>>.jpg
-
-  playlist:
-    default:
-      libraries: Movies, TV Shows
-    cache_builders: 1
-    sync_to_users: all
-    sync_mode: sync
-    libraries: <<libraries>>
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/playlist/<<playlist_name_encoded>>.jpg
-
   use_year_collections:
     optional:
       - use_year_collections
     allowed_library_types: <<use_year_collections>>
-
-  customsync:
-    collection_order: custom
-    sync_mode: sync
\ No newline at end of file