From d74787966bb44f246a27a359eaf5997faf9f5834 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Thu, 21 Jul 2022 21:39:59 -0400
Subject: [PATCH 1/3] Delete Networks.yml

---
 Networks.yml | 113 ---------------------------------------------------
 1 file changed, 113 deletions(-)
 delete mode 100644 Networks.yml

diff --git a/Networks.yml b/Networks.yml
deleted file mode 100644
index 40782a7..0000000
--- a/Networks.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-################################
-##    Networks Collections    ##
-################################
-
-##########################################################
-##                 User/Config Credits                  ##
-##          Giving Credit Where Credit is Due           ##
-##                    JJJonesJr33                       ##
-## Glasti1, Hiren-Z, OhMyBahGosh, tuxpeople, cpt-kuesel ##
-##    meisnate12, TheUnchainedZebra, Evil Tacctician    ##
-##########################################################
-
-##############################
-##    Networks Templates    ##
-##############################
-
-templates:
-  network:
-    optional:
-      - network
-    tmdb_network: <<network>>
-    url_poster: <<poster>>
-    sort_title: <<collection_name>>
-    sync_mode: sync
-
-####################################
-##       Collections Lists        ##
-####################################
-
-# FYI: To allow for Network collections to be created you must have TMDB API in the core config setup first.
-
-collections:
-  ABC:
-    template: { name: network, network: "2, 75, 2791"}
-  Adult Swim:
-    template: { name: network, network: 80}
-  AMC:
-    template: { name: network, network: "174, 4661"}
-  Apple TV+:
-    template: { name: network, network: "2552, 1932"}
-  BBC:
-    template: { name: network, network: " 100, 1155, 375, 493, 3546, 4, 332, 3, 126, 317"}
-  Bravo:
-    template: { name: network, network: 74}
-  Cartoon Network:
-    template: { name: network, network: 56}
-  CBS:
-    template: { name: network, network: "16, 1709, 2621"}
-  Cinemax:
-    template: { name: network, network: 359}
-  Comedy Central:
-    template: { name: network, network: 47}
-  Dave:
-    template: { name: network, network: 388}
-  Disney+:
-    template: { name: network, network: 2739, 142, 44, 2991"}
-  FOX:
-    template: { name: network, network: "19, 2686, 875, 45, 87, 131, 2317, 243, 2320"}
-  Hallmark:
-    template: { name: network, network: "4056, 9027"}
-  HBO:
-    template: { name: network, network: " 49, 5484, 5485, 3186, 2593"}
-  Hulu:
-    template: { name: network, network: 453}
-  ITV:
-    template: { name: network, network: " 9, 149, 1159, 261, 590"}
-  Lifetime:
-    template: { name: network, network: "34, 1072"}
-  Marvel Studios:
-    template: { name: network, network: 420}
-  MTV:
-    template: { name: network, network: 33}
-  NBC:
-    template: { name: network, network: "6, 413"}
-  Netflix:
-    template: { name: network, network: 213}
-  Nickelodeon:
-    template: { name: network, network: " 5371, 2348, 4859"}
-  Paramount+:
-    template: { name: network, network: " 4330, 2076"}
-  PBS:
-    template: { name: network, network: " 14, 122, 2354"}
-  Prime:
-    template: { name: network, network: 1024}
-  Showtime:
-    template: { name: network, network: 67}
-  Sky:
-    template: { name: network, network: 214}
-  Starz:
-    template: { name: network, network: " 318, 758"}
-  Syfy:
-    template: { name: network, network: 77}
-  TBS:
-    template: { name: network, network: 68}
-  The CW:
-    template: { name: network, network: 71}
-  The WB:
-    template: { name: network, network: 21}
-  TLC:
-    template: { name: network, network: 84}
-  TruTV:
-    template: { name: network, network: 364}
-  USA:
-    template: { name: network, network: 30}
-####################################
-#  Streaming Services Collections  #
-####################################       
-  Trending:
-    smart_label: originally_available.desc
-    sync_mode: sync
-    trakt_trending: 50
-    summary: Shows Trending across the internet
-    sort_title: ++++++++++_Trending

From d9981d66181ff33f8c3e82243fe8015f5eaf8da1 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Fri, 22 Jul 2022 10:04:31 -0400
Subject: [PATCH 2/3] update template with order

---
 PMM/templates.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PMM/templates.yml b/PMM/templates.yml
index a1a6803..f1968d3 100644
--- a/PMM/templates.yml
+++ b/PMM/templates.yml
@@ -28,8 +28,9 @@ templates:
     default:
       collection_section: "00"
       sort: <<collection_name>>
+      key: ""
       pre: "_"
-      order: ""
+      order_<<key>>: ""
     optional:
       - collection_mode
       - radarr_add_missing
@@ -45,7 +46,7 @@ templates:
     item_radarr_tag: <<item_radarr_tag>>
     item_sonarr_tag: <<item_sonarr_tag>>
     collection_mode: <<collection_mode>>
-    sort_title: "!<<collection_section>><<pre>><<order>><<sort>>"
+    sort_title: "!<<collection_section>><<pre>><<order_<<key>>>><<sort>>"
 
   chart_shared:
     default:

From d93f898af85b0eab5597283deb3d1a029c33517f Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Sat, 23 Jul 2022 15:35:31 -0400
Subject: [PATCH 3/3] chart changes

---
 PMM/chart/anilist.yml     | 79 +++++++++++++------------------
 PMM/chart/basic.yml       | 45 +++++++++---------
 PMM/chart/imdb.yml        | 61 ++++++++++++------------
 PMM/chart/myanimelist.yml | 80 ++++++++++++++------------------
 PMM/chart/other.yml       | 61 ++++++++++++------------
 PMM/chart/tautulli.yml    | 60 +++++++++++++++++-------
 PMM/chart/tmdb.yml        | 97 ++++++++++++++-------------------------
 PMM/chart/trakt.yml       | 97 ++++++++++++++-------------------------
 PMM/templates.yml         | 18 +++++---
 9 files changed, 277 insertions(+), 321 deletions(-)

diff --git a/PMM/chart/anilist.yml b/PMM/chart/anilist.yml
index be605bc..c9faeb5 100644
--- a/PMM/chart/anilist.yml
+++ b/PMM/chart/anilist.yml
@@ -13,55 +13,42 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the AniList Popular collection on/off     #
-#          use_popular: true                                #
-#          # Determines collection order in it's section    #
-#          order_popular:                                   #
-#          # Set visible_library for AniList Popular        #
-#          visible_library_popular:                         #
-#          # Set visible_home for AniList Popular           #
-#          visible_home_popular:                            #
-#          # Set visible_shared for AniList Popular         #
-#          visible_shared_popular:                          #
-#          # Set limit for AniList Popular                  #
-#          limit_popular: 100                               #
-#                                                           #
-#          # Turn the AniList Top Rated collection on/off   #
-#          use_top: true                                    #
-#          # Determines collection order in it's section    #
-#          order_top:                                       #
-#          # Set visible_library for AniList Top Rated      #
-#          visible_library_top:                             #
-#          # Set visible_home for AniList Top Rated         #
-#          visible_home_top:                                #
-#          # Set visible_shared for AniList Top Rated       #
-#          visible_shared_top:                              #
-#          # Set limit for AniList Top Rated                #
-#          limit_top: 100                                   #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   popular          AniList Popular             #
+#          #   top              AniList Top Rated           #
+#          #   trending         AniList Trending            #
+#          #   season           AniList Season              #
 #                                                           #
-#          # Turn the AniList Trending collection on/off    #
-#          use_trending: true                               #
-#          # Determines collection order in it's section    #
-#          order_trending:                                  #
-#          # Set visible_library for AniList Trending       #
-#          visible_library_trending:                        #
-#          # Set visible_home for AniList Trending          #
-#          visible_home_trending:                           #
-#          # Set visible_shared for AniList Trending        #
-#          visible_shared_trending:                         #
-#          # Set limit for AniList Trending                 #
-#          limit_trending: 100                              #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the AniList Season collection on/off      #
-#          use_season: true                                 #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
 #          # Determines collection order in it's section    #
-#          order_season:                                    #
-#          # Set visible_library for AniList Season         #
-#          visible_library_season:                          #
-#          # Set visible_home for AniList Season            #
-#          visible_home_season:                             #
-#          # Set visible_shared for AniList Season          #
-#          visible_shared_season:                           #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Set limit for the collection                   #
+#          limit_key: 100                                   #
+#          # Adds missing from the collection to radarr     #
+#          radarr_add_missing_key:                          #
+#          # Adds missing from the collection to sonarr     #
+#          radarr_add_missing_key:                          #
+#          # Radarr Tag for added missing                   #
+#          radarr_tag_key:                                  #
+#          # Sonarr Tag for added missing                   #
+#          sonarr_tag_key:                                  #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/chart/basic.yml b/PMM/chart/basic.yml
index bc0a923..b143d0b 100644
--- a/PMM/chart/basic.yml
+++ b/PMM/chart/basic.yml
@@ -15,31 +15,30 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the Newly Released collection on/off      #
-#          use_released: true                               #
-#          # Determines how many days back to look          #
-#          in_the_last_released: 90                         #
-#          # Determines collection order in it's section    #
-#          order_released:                                  #
-#          # Set visible_library for Newly Released         #
-#          visible_library_released:                        #
-#          # Set visible_home for Newly Released            #
-#          visible_home_released:                           #
-#          # Set visible_shared for Newly Released          #
-#          visible_shared_released:                         #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   released         Newly Released              #
+#          #   episodes         New Episodes                #
+#                                                           #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the Episodes This Week collection on/off  #
-#          use_episodes: true                               #
-#          # Determines how many days back to look          #
-#          in_the_last_episodes: 7                          #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
 #          # Determines collection order in it's section    #
-#          order_episodes:                                  #
-#          # Set visible_library for Episodes This Week     #
-#          visible_library_episodes:                        #
-#          # Set visible_home for Episodes This Week        #
-#          visible_home_episodes:                           #
-#          # Set visible_shared for Episodes This Week      #
-#          visible_shared_episodes:                         #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/chart/imdb.yml b/PMM/chart/imdb.yml
index fedb5dd..23bf61b 100644
--- a/PMM/chart/imdb.yml
+++ b/PMM/chart/imdb.yml
@@ -13,38 +13,39 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the IMDb Popular collection on/off        #
-#          use_popular: true                                #
-#          # Determines collection order in it's section    #
-#          order_popular:                                   #
-#          # Set visible_library for IMDb Popular           #
-#          visible_library_popular:                         #
-#          # Set visible_home for IMDb Popular              #
-#          visible_home_popular:                            #
-#          # Set visible_shared for IMDb Popular            #
-#          visible_shared_popular:                          #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   popular          IMDb Popular                #
+#          #   top              IMDb Top 250                #
+#          #   lowest           IMDb Lowest Rated           #
 #                                                           #
-#          # Turn the IMDb Top 250 collection on/off        #
-#          use_top: true                                    #
-#          # Determines collection order in it's section    #
-#          order_top:                                       #
-#          # Set visible_library for IMDb Top 250           #
-#          visible_library_top:                             #
-#          # Set visible_home for IMDb Top 250              #
-#          visible_home_top:                                #
-#          # Set visible_shared for IMDb Top 250            #
-#          visible_shared_top:                              #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the IMDb Lowest collection on/off         #
-#          use_lowest: true                                 #
-#          # Determines collection order in it's section    #
-#          order_trending:                                  #
-#          # Set visible_library for IMDb Lowest            #
-#          visible_library_lowest:                          #
-#          # Set visible_home for IMDb Lowest               #
-#          visible_home_lowest:                             #
-#          # Set visible_shared for IMDb Lowest             #
-#          visible_shared_lowest:                           #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
+#          # Determines collection order in its section     #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Adds missing from the collection to radarr     #
+#          radarr_add_missing_key:                          #
+#          # Adds missing from the collection to sonarr     #
+#          radarr_add_missing_key:                          #
+#          # Radarr Tag for added missing                   #
+#          radarr_tag_key:                                  #
+#          # Sonarr Tag for added missing                   #
+#          sonarr_tag_key:                                  #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/chart/myanimelist.yml b/PMM/chart/myanimelist.yml
index 6118f6e..697fe16 100644
--- a/PMM/chart/myanimelist.yml
+++ b/PMM/chart/myanimelist.yml
@@ -13,55 +13,43 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the MyAnimeList Popular collection on/off #
-#          use_popular: true                                #
-#          # Determines collection order in it's section    #
-#          order_popular:                                   #
-#          # Set visible_library for MyAnimeList Popular    #
-#          visible_library_popular:                         #
-#          # Set visible_home for MyAnimeList Popular       #
-#          visible_home_popular:                            #
-#          # Set visible_shared for MyAnimeList Popular     #
-#          visible_shared_popular:                          #
-#          # Set limit for MyAnimeList Popular              #
-#          limit_popular: 100                               #
-#                                                           #
-#          # Turn the MyAnimeList Top collection on/off     #
-#          use_top: true                                    #
-#          # Determines collection order in it's section    #
-#          order_top:                                       #
-#          # Set visible_library for MyAnimeList Top Rated  #
-#          visible_library_top:                             #
-#          # Set visible_home for MyAnimeList Top Rated     #
-#          visible_home_top:                                #
-#          # Set visible_shared for MyAnimeList Top Rated   #
-#          visible_shared_top:                              #
-#          # Set limit for MyAnimeList Top Rated            #
-#          limit_top: 100                                   #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   popular          MyAnimeList Popular         #
+#          #   favorited        MyAnimeList Favorited       #
+#          #   top              MyAnimeList Top Rated       #
+#          #   airing           MyAnimeList Top Airing      #
+#          #   season           MyAnimeList Season          #
 #                                                           #
-#          # Turn the MyAnimeList Trending collection on/off#
-#          use_trending: true                               #
-#          # Determines collection order in it's section    #
-#          order_trending:                                  #
-#          # Set visible_library for MyAnimeList Trending   #
-#          visible_library_trending:                        #
-#          # Set visible_home for MyAnimeList Trending      #
-#          visible_home_trending:                           #
-#          # Set visible_shared for MyAnimeList Trending    #
-#          visible_shared_trending:                         #
-#          # Set limit for MyAnimeList Trending             #
-#          limit_trending: 100                              #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the MyAnimeList Season collection on/off  #
-#          use_season: true                                 #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
 #          # Determines collection order in it's section    #
-#          order_season:                                    #
-#          # Set visible_library for MyAnimeList Season     #
-#          visible_library_season:                          #
-#          # Set visible_home for MyAnimeList Season        #
-#          visible_home_season:                             #
-#          # Set visible_shared for MyAnimeList Season      #
-#          visible_shared_season:                           #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Set limit for the collection                   #
+#          limit_key: 100                                   #
+#          # Adds missing from the collection to radarr     #
+#          radarr_add_missing_key:                          #
+#          # Adds missing from the collection to sonarr     #
+#          radarr_add_missing_key:                          #
+#          # Radarr Tag for added missing                   #
+#          radarr_tag_key:                                  #
+#          # Sonarr Tag for added missing                   #
+#          sonarr_tag_key:                                  #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/chart/other.yml b/PMM/chart/other.yml
index bfbc04d..18bf49e 100644
--- a/PMM/chart/other.yml
+++ b/PMM/chart/other.yml
@@ -13,38 +13,39 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the StevenLu's Popular collection on/off  #
-#          use_stevenlu: true                               #
-#          # Determines collection order in it's section    #
-#          order_stevenlu:                                  #
-#          # Set visible_library for StevenLu's Popular     #
-#          visible_library_stevenlu:                        #
-#          # Set visible_home for StevenLu's Popular        #
-#          visible_home_stevenlu:                           #
-#          # Set visible_shared for StevenLu's Popular      #
-#          visible_shared_stevenlu:                         #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   stevenlu         StevenLu's Popular Movies   #
+#          #   anidb            AniDB Popular               #
+#          #   pirated          Top 10 Pirated Movies       #
 #                                                           #
-#          # Turn the AniDB Popular collection on/off       #
-#          use_anidb: true                                  #
-#          # Determines collection order in it's section    #
-#          order_anidb:                                     #
-#          # Set visible_library for AniDB Popular          #
-#          visible_library_anidb:                           #
-#          # Set visible_home for AniDB Popular             #
-#          visible_home_anidb:                              #
-#          # Set visible_shared for AniDB Popular           #
-#          visible_shared_anidb:                            #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the Pirated Movies collection on/off      #
-#          use_pirated: true                                #
-#          # Determines collection order in it's section    #
-#          order_pirated:                                   #
-#          # Set visible_library for Pirated Movies         #
-#          visible_library_pirated:                         #
-#          # Set visible_home for Pirated Movies            #
-#          visible_home_pirated:                            #
-#          # Set visible_shared for Pirated Movies          #
-#          visible_shared_pirated:                          #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
+#          # Determines collection order in its section     #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Adds missing from the collection to radarr     #
+#          radarr_add_missing_key:                          #
+#          # Adds missing from the collection to sonarr     #
+#          radarr_add_missing_key:                          #
+#          # Radarr Tag for added missing                   #
+#          radarr_tag_key:                                  #
+#          # Sonarr Tag for added missing                   #
+#          sonarr_tag_key:                                  #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/chart/tautulli.yml b/PMM/chart/tautulli.yml
index f3d7a96..9180c16 100644
--- a/PMM/chart/tautulli.yml
+++ b/PMM/chart/tautulli.yml
@@ -16,20 +16,33 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the Plex Popular collection on/off        #
-#          use_popular: true                                #
-#          # Determines collection order in it's section    #
-#          order_popular:                                   #
-#          # Set visible_library for Plex Popular           #
-#          visible_library_popular:                         #
-#          # Set visible_home for Plex Popular              #
-#          visible_home_popular:                            #
-#          # Set visible_shared for Plex Popular            #
-#          visible_shared_popular:                          #
-#          # Set list_size for Plex Popular                 #
-#          list_size_popular:                               #
-#          # Set list_days for Plex Popular                 #
-#          list_days_popular:                               #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   popular          Plex Popular                #
+#          #   watched          Plex Watched                #
+#                                                           #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
+#                                                           #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
+#          # Determines collection order in its section     #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Set list_days for the collection               #
+#          list_days_key: 30                                #
+#          # Set list_size for the collection               #
+#          list_size_key: 20                                #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
@@ -38,7 +51,7 @@ external_templates:
     collection_section: "01"
 
 templates:
-  tautulli:
+  tautulli_popular:
     default:
       list_days_popular: 30
       list_size_popular: 20
@@ -47,11 +60,26 @@ templates:
       list_days: <<list_days_popular>>
       list_size: <<list_size_popular>>
       list_buffer: 20
+  tautulli_watched:
+    default:
+      list_days_watched: 30
+      list_size_watched: 20
+    summary: A collection of Top <<library_type>>s Watched on Plex
+    tautulli_watched:
+      list_days: <<list_days_watched>>
+      list_size: <<list_size_watched>>
+      list_buffer: 20
 
 collections:
   Plex Popular:
     template:
-      - name: tautulli
+      - name: tautulli_popular
       - name: customsync
       - name: chart_shared
         key: popular
+  Plex Watched:
+    template:
+      - name: tautulli_watched
+      - name: customsync
+      - name: chart_shared
+        key: watched
diff --git a/PMM/chart/tmdb.yml b/PMM/chart/tmdb.yml
index 186612d..400470a 100644
--- a/PMM/chart/tmdb.yml
+++ b/PMM/chart/tmdb.yml
@@ -13,70 +13,43 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the TMDb Airing Today collection on/off   #
-#          use_airing: true                                 #
-#          # Determines collection order in it's section    #
-#          order_airing:                                    #
-#          # Set visible_library for TMDb Airing Today      #
-#          visible_library_airing:                          #
-#          # Set visible_home for TMDb Airing Today         #
-#          visible_home_airing:                             #
-#          # Set visible_shared for TMDb Airing Today       #
-#          visible_shared_airing:                           #
-#          # Set limit for TMDb Airing Today                #
-#          limit_airing: 100                                #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   airing           TMDb Airing Today           #
+#          #   air              TMDb On The Air             #
+#          #   popular          TMDb Popular                #
+#          #   top              TMDb Top Rated              #
+#          #   trending         TMDb Trending               #
 #                                                           #
-#          # Turn the TMDb On The Air collection on/off     #
-#          use_air: true                                    #
-#          # Determines collection order in it's section    #
-#          order_air:                                       #
-#          # Set visible_library for TMDb On The Air        #
-#          visible_library_air:                             #
-#          # Set visible_home for TMDb On The Air           #
-#          visible_home_air:                                #
-#          # Set visible_shared for TMDb On The Air         #
-#          visible_shared_air:                              #
-#          # Set limit for TMDb On The Air                  #
-#          limit_air: 100                                   #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the TMDb Popular collection on/off        #
-#          use_popular: true                                #
-#          # Determines collection order in it's section    #
-#          order_popular:                                   #
-#          # Set visible_library for TMDb Popular           #
-#          visible_library_popular:                         #
-#          # Set visible_home for TMDb Popular              #
-#          visible_home_popular:                            #
-#          # Set visible_shared for TMDb Popular            #
-#          visible_shared_popular:                          #
-#          # Set limit for TMDb Popular                     #
-#          limit_popular: 100                               #
-#                                                           #
-#          # Turn the TMDb Top Rated collection on/off      #
-#          use_top: true                                    #
-#          # Determines collection order in it's section    #
-#          order_top:                                       #
-#          # Set visible_library for TMDb Top Rated         #
-#          visible_library_top:                             #
-#          # Set visible_home for TMDb Top Rated            #
-#          visible_home_top:                                #
-#          # Set visible_shared for TMDb Top Rated          #
-#          visible_shared_top:                              #
-#          # Set limit for TMDb Top Rated                   #
-#          limit_top: 100                                   #
-#                                                           #
-#          # Turn the TMDb Trending collection on/off       #
-#          use_trending: true                               #
-#          # Determines collection order in it's section    #
-#          order_trending:                                  #
-#          # Set visible_library for TMDb Trending          #
-#          visible_library_trending:                        #
-#          # Set visible_home for TMDb Trending             #
-#          visible_home_trending:                           #
-#          # Set visible_shared for TMDb Trending           #
-#          visible_shared_trending:                         #
-#          # Set limit for TMDb Trending                    #
-#          limit_trending: 100                              #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
+#          # Determines collection order in its section     #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Set limit for the collection                   #
+#          limit_key: 100                                   #
+#          # Adds missing from the collection to radarr     #
+#          radarr_add_missing_key:                          #
+#          # Adds missing from the collection to sonarr     #
+#          radarr_add_missing_key:                          #
+#          # Radarr Tag for added missing                   #
+#          radarr_tag_key:                                  #
+#          # Sonarr Tag for added missing                   #
+#          sonarr_tag_key:                                  #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/chart/trakt.yml b/PMM/chart/trakt.yml
index dcd5002..21a7938 100644
--- a/PMM/chart/trakt.yml
+++ b/PMM/chart/trakt.yml
@@ -16,70 +16,43 @@
 #          # Sets the value at the start of the sort title  #
 #          collection_section: "01"                         #
 #                                                           #
-#          # Turn the Trakt Collected collection on/off     #
-#          use_collected: true                              #
-#          # Determines collection order in it's section    #
-#          order_collected:                                 #
-#          # Set visible_library for Trakt Collected        #
-#          visible_library_collected:                       #
-#          # Set visible_home for Trakt Collected           #
-#          visible_home_collected:                          #
-#          # Set visible_shared for Trakt Collected         #
-#          visible_shared_collected:                        #
-#          # Set limit for Trakt Collected                  #
-#          limit_collected: 250                             #
+#          # For each collection use the "key" to set       #
+#          # the options.                                   #
+#          # Available collections                          #
+#          #   KEY              COLLECTION                  #
+#          #   collected        Trakt Collected             #
+#          #   popular          Trakt Popular               #
+#          #   recommended      Trakt Recommended           #
+#          #   trending         Trakt Trending              #
+#          #   watched          Trakt Watched               #
 #                                                           #
-#          # Turn the Trakt Popular collection on/off       #
-#          use_popular: true                                #
-#          # Determines collection order in it's section    #
-#          order_popular:                                   #
-#          # Set visible_library for Trakt Popular          #
-#          visible_library_popular:                         #
-#          # Set visible_home for Trakt Popular             #
-#          visible_home_popular:                            #
-#          # Set visible_shared for Trakt Popular           #
-#          visible_shared_popular:                          #
-#          # Set limit for Trakt Popular                    #
-#          limit_popular: 250                               #
+#          # Available options. Replace "key" with the      #
+#          # desired collection's key from the chart above. #
 #                                                           #
-#          # Turn the Trakt Recommended collection on/off   #
-#          use_recommended: true                            #
-#          # Determines collection order in it's section    #
-#          order_recommended:                               #
-#          # Set visible_library for Trakt Recommended      #
-#          visible_library_recommended:                     #
-#          # Set visible_home for Trakt Recommended         #
-#          visible_home_recommended:                        #
-#          # Set visible_shared for Trakt Recommended       #
-#          visible_shared_recommended:                      #
-#          # Set limit for Trakt Recommended                #
-#          limit_recommended: 250                           #
-#                                                           #
-#          # Turn the Trakt Trending collection on/off      #
-#          use_trending: true                               #
-#          # Determines collection order in it's section    #
-#          order_trending:                                  #
-#          # Set visible_library for Trakt Trending         #
-#          visible_library_trending:                        #
-#          # Set visible_home for Trakt Trending            #
-#          visible_home_trending:                           #
-#          # Set visible_shared for Trakt Trending          #
-#          visible_shared_trending:                         #
-#          # Set limit for Trakt Trending                   #
-#          limit_trending: 250                              #
-#                                                           #
-#          # Turn the Trakt Watched collection on/off       #
-#          use_watched: true                                #
-#          # Determines collection order in it's section    #
-#          order_watched:                                   #
-#          # Set visible_library for Trakt Watched          #
-#          visible_library_watched:                         #
-#          # Set visible_home for Trakt Watched             #
-#          visible_home_watched:                            #
-#          # Set visible_shared for Trakt Watched           #
-#          visible_shared_watched:                          #
-#          # Set limit for Trakt Watched                    #
-#          limit_watched: 250                               #
+#          # Turn the collection on/off                     #
+#          use_key: true                                    #
+#          # Determines collection order in its section     #
+#          order_key:                                       #
+#          # Set visible_library for the collection         #
+#          visible_library_key:                             #
+#          # Set visible_home for the collection            #
+#          visible_home_key:                                #
+#          # Set visible_shared for the collection          #
+#          visible_shared_key:                              #
+#          # Set limit for the collection                   #
+#          limit_key: 100                                   #
+#          # Adds missing from the collection to radarr     #
+#          radarr_add_missing_key:                          #
+#          # Adds missing from the collection to sonarr     #
+#          radarr_add_missing_key:                          #
+#          # Radarr Tag for added missing                   #
+#          radarr_tag_key:                                  #
+#          # Sonarr Tag for added missing                   #
+#          sonarr_tag_key:                                  #
+#          # Radarr Tag for existing items                  #
+#          item_radarr_tag_key:                             #
+#          # Sonarr Tag for existing items                  #
+#          item_sonarr_tag_key:                             #
 #############################################################
 
 external_templates:
diff --git a/PMM/templates.yml b/PMM/templates.yml
index f1968d3..84fd410 100644
--- a/PMM/templates.yml
+++ b/PMM/templates.yml
@@ -55,6 +55,12 @@ templates:
       sort: <<collection_name>>
       pre: "_"
       order_<<key>>: ""
+      radarr_add_missing_<<key>>: <<radarr_add_missing>>
+      sonarr_add_missing_<<key>>: <<sonarr_add_missing>>
+      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>>
@@ -75,12 +81,12 @@ templates:
     visible_library: <<visible_library_<<key>>>>
     visible_home: <<visible_home_<<key>>>>
     visible_shared: <<visible_shared_<<key>>>>
-    radarr_add_missing: <<radarr_add_missing>>
-    sonarr_add_missing: <<sonarr_add_missing>>
-    radarr_tag: <<radarr_tag>>
-    sonarr_tag: <<sonarr_tag>>
-    item_radarr_tag: <<item_radarr_tag>>
-    item_sonarr_tag: <<item_sonarr_tag>>
+    radarr_add_missing: <<radarr_add_missing_<<key>>>>
+    sonarr_add_missing: <<sonarr_add_missing_<<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