diff --git a/plex/pmm/collections/general/movies_collections_general.yml b/plex/pmm/collections/general/movies_collections_general.yml
index f9fbc48..c72568f 100644
--- a/plex/pmm/collections/general/movies_collections_general.yml
+++ b/plex/pmm/collections/general/movies_collections_general.yml
@@ -24,7 +24,7 @@ templates:
 collections:
   ### New Content
   "Added This Week":
-    template: { name: Chart,
+    template: { name: New,
                 level: "++" }
     summary: "Movies now playing on Plex"
     smart_filter:
@@ -40,7 +40,7 @@ collections:
   ### Trending
   # Box Office
   "At The Box Office":
-    template: { name: Chart,
+    template: { name: New,
                 level: "+++" }
     summary: "Now playing on a screen near you"
     imdb_chart: box_office
@@ -99,7 +99,7 @@ collections:
   # Random list of 10 movies released in the last 10 years
   # Regenerates every time the user visits the page
   "Something New":
-    template: { name: Chart,
+    template: { name: New,
                 level: "++" }
     summary: "Let's try something new"
     smart_filter:
@@ -115,7 +115,7 @@ collections:
   # Random list of 30 movies released in the last 5 months and added in the last 2 months
   # Regenerates every time the user visits the page
   "Spin The Wheel!":
-    template: { name: Chart,
+    template: { name: New,
                 level: "+" }
     summary: "New releases for you to take a chance on!"
     smart_filter:
@@ -142,7 +142,7 @@ collections:
 
   # Top 70s movies via IMDB, updated monthly
   "Best of the 70s":
-    template: { name: Award,
+    template: { name: Decade,
                 level: "+" }
     summary: "IMDb's top movies of the 1970s"
     imdb_list:
@@ -153,7 +153,7 @@ collections:
 
   # Top 80s movies via RottenTomatoes, updated monthly
   "Best of the 80s":
-    template: { name: Award,
+    template: { name: Decade,
                 level: "+" }
     summary: "RottenTomatoes' top movies of the 1980s"
     mdblist_list: https://mdblist.com/lists/hdlists/rottentomatoes-com-s-best-of-the-80s
@@ -163,7 +163,7 @@ collections:
 
   # Top 90s movies via RottenTomatoes, updated monthly
   "Best of the 90s":
-    template: { name: Award,
+    template: { name: Decade,
                 level: "+" }
     summary: "RottenTomatoes' top movies of the 1990s"
     mdblist_list: https://mdblist.com/lists/hdlists/rottentomatoes-com-s-best-of-the-90s
@@ -173,7 +173,7 @@ collections:
 
   # Top 2000s movies via RottenTomatoes, updated monthly
   "Best of the 2000s":
-    template: { name: Award,
+    template: { name: Decade,
                 level: "+" }
     summary: "RottenTomatoes' top movies of the 2000s"
     mdblist_list: https://mdblist.com/lists/hdlists/best-of-the-00s
@@ -183,7 +183,7 @@ collections:
 
   # Top 2010s movies via RottenTomatoes, updated monthly
   "Best of the 2010s":
-    template: { name: Award,
+    template: { name: Decade,
                 level: "+" }
     summary: "RottenTomatoes' top movies of the 2010s"
     mdblist_list: https://mdblist.com/lists/hdlists/best-of-the-2010s
@@ -193,7 +193,7 @@ collections:
 
   # Top 2020s movies via IMDB, updated twice a week
   "Best of the 2020s":
-    template: { name: Award,
+    template: { name: Decade,
                 level: "+" }
     summary: "IMDb's top movies of the 2020s"
     imdb_list:
@@ -310,122 +310,6 @@ collections:
     visible_home: weekly(saturday), weekly(sunday)
     visible_shared: weekly(saturday), weekly(sunday)
 
-    ### Seasonal
-    ## All seasonal collections are only updated and visible during the season
-  "This is Halloween":
-    template: { name: Holiday,
-                level: "+++" }
-    summary: "Boo!"
-    trakt_list:
-      - https://trakt.tv/users/29zombies/lists/halloween
-      - https://trakt.tv/users/galacticboy/lists/not-so-spooky-halloween
-      # - https://trakt.tv/users/kairbear08/lists/halloween
-      # - https://trakt.tv/users/mybicycle/lists/halloween
-      # - https://trakt.tv/users/jayinftl/lists/halloween
-      # - https://trakt.tv/users/roswellgeek/lists/halloween
-    collection_order: audience_rating.desc
-    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(09/30-10/31)
-    visible_shared: range(09/30-10/31)
-
-  # TODO: Replace for 2023
-  "31 Days of Horror":
-    template: { name: Holiday,
-                level: "++" }
-    summary: "Do you dare?"
-    trakt_list:
-      - https://trakt.tv/users/lish408/lists/31-days-of-horror-2022
-    collection_order: custom
-    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(09/30-10/31)
-    visible_shared: range(09/30-10/31)
-
-  "Trick or Treat!":
-    template: { name: Holiday,
-                level: "++" }
-    summary: "Family-friendly Halloween movies"
-    trakt_list:
-      - https://trakt.tv/users/hdlists/lists/halloween-movies-for-kids
-    collection_order: custom
-    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(09/30-10/31)
-    visible_shared: range(09/30-10/31)
-
-
-  "He's Right Behind You!":
-    template: { name: Holiday,
-                level: "++" }
-    summary: "Classic slasher films"
-    trakt_list:
-      - https://trakt.tv/users/hdlists/lists/80s-slasher-movies
-    collection_order: custom
-    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(09/30-10/31)
-    visible_shared: range(09/30-10/31)
-
-  "This is Thanksgiving":
-    template: { name: Holiday,
-                level: "+++" }
-    summary: "Gobble gobble!"
-    trakt_list:
-      - https://trakt.tv/users/galacticboy/lists/thanksgiving-movies
-      - https://trakt.tv/users/shahid1296/lists/thanksgiving
-      - https://trakt.tv/users/retrogran/lists/thanksgiving-season-movies
-      - https://trakt.tv/users/padawan_seneca/lists/vibe-autumn-tv-series-movies
-    collection_order: audience_rating.desc
-    schedule: range(11/01-12/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(11/01-11/30)
-    visible_shared: range(11/01-11/30)
-
-  "This is Christmas":
-    template: { name: Holiday,
-                level: "+++" }
-    summary: "Cozy up with some Christmas classics"
-    trakt_list:
-      - https://trakt.tv/users/movistapp/lists/christmas-movies
-      - https://trakt.tv/users/questdvd/lists/absolute-hayes-christmas-classics
-      - https://trakt.tv/users/littlestella3/lists/christmas
-    collection_order: audience_rating.desc
-    schedule: range(11/29-01/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(11/29-12/31)
-    visible_shared: range(11/29-12/31)
-
-  "The Hallmark Christmas Collection":
-    template: { name: Holiday,
-                level: "++" }
-    summary: "Christmas movies with extra-sap"
-    trakt_list:
-      - https://trakt.tv/users/mzdiobolik/lists/hallmark-christmas-movies
-    collection_order: audience_rating.desc
-    schedule: range(11/29-01/01) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(11/29-12/31)
-    visible_shared: range(11/29-12/31)
-
-  "This is Valentine's Day":
-    template: { name: Holiday,
-                level: "+++" }
-    summary: "Love me tender, love me sweet"
-    trakt_list:
-      - https://trakt.tv/users/movie-pal/lists/valentine-s-day
-      - https://trakt.tv/users/barsaky/lists/den-svateho-valentina-valentine-s-day
-      - https://trakt.tv/users/abbelea/lists/movies-best-of-love
-    collection_order: audience_rating.desc
-    schedule: range(02/01-02/16) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(02/01-02/15)
-    visible_shared: range(02/01-02/15)
-
-  "This is St. Patrick's Day":
-    template: { name: Holiday,
-                level: "+++" }
-    summary: "Kiss me, I'm Irish"
-    trakt_list:
-      - https://trakt.tv/users/triadcool/lists/irish
-      - https://trakt.tv/users/sympli/lists/st-patricks-day-movies
-    collection_order: audience_rating.desc
-    schedule: range(03/10-03/19) # You have to schedule it one day longer so it will run and change visibility
-    visible_home: range(03/10-03/18)
-    visible_shared: range(03/10-03/18)
-
   ### Series and Collections
   "How Did This Get Made?":
     template: { name: Collection,
diff --git a/plex/pmm/collections/general/movies_collections_holidays_general.yml b/plex/pmm/collections/general/movies_collections_holidays_general.yml
index 2449609..8073373 100644
--- a/plex/pmm/collections/general/movies_collections_holidays_general.yml
+++ b/plex/pmm/collections/general/movies_collections_holidays_general.yml
@@ -1 +1,118 @@
+external_templates:
+  - repo: templates/collections
+
 collections:
+  ## All seasonal collections are only updated and visible during the season
+  "This is Halloween":
+    template: { name: Holiday,
+                level: "+++" }
+    summary: "Boo!"
+    trakt_list:
+      - https://trakt.tv/users/29zombies/lists/halloween
+      - https://trakt.tv/users/galacticboy/lists/not-so-spooky-halloween
+      # - https://trakt.tv/users/kairbear08/lists/halloween
+      # - https://trakt.tv/users/mybicycle/lists/halloween
+      # - https://trakt.tv/users/jayinftl/lists/halloween
+      # - https://trakt.tv/users/roswellgeek/lists/halloween
+    collection_order: audience_rating.desc
+    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(09/30-10/31)
+    visible_shared: range(09/30-10/31)
+
+  # TODO: Replace for 2023
+  "31 Days of Horror":
+    template: { name: Holiday,
+                level: "++" }
+    summary: "Do you dare?"
+    trakt_list:
+      - https://trakt.tv/users/lish408/lists/31-days-of-horror-2022
+    collection_order: custom
+    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(09/30-10/31)
+    visible_shared: range(09/30-10/31)
+
+  "Trick or Treat!":
+    template: { name: Holiday,
+                level: "++" }
+    summary: "Family-friendly Halloween movies"
+    trakt_list:
+      - https://trakt.tv/users/hdlists/lists/halloween-movies-for-kids
+    collection_order: custom
+    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(09/30-10/31)
+    visible_shared: range(09/30-10/31)
+
+
+  "He's Right Behind You!":
+    template: { name: Holiday,
+                level: "++" }
+    summary: "Classic slasher films"
+    trakt_list:
+      - https://trakt.tv/users/hdlists/lists/80s-slasher-movies
+    collection_order: custom
+    schedule: range(09/30-11/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(09/30-10/31)
+    visible_shared: range(09/30-10/31)
+
+  "This is Thanksgiving":
+    template: { name: Holiday,
+                level: "+++" }
+    summary: "Gobble gobble!"
+    trakt_list:
+      - https://trakt.tv/users/galacticboy/lists/thanksgiving-movies
+      - https://trakt.tv/users/shahid1296/lists/thanksgiving
+      - https://trakt.tv/users/retrogran/lists/thanksgiving-season-movies
+      - https://trakt.tv/users/padawan_seneca/lists/vibe-autumn-tv-series-movies
+    collection_order: audience_rating.desc
+    schedule: range(11/01-12/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(11/01-11/30)
+    visible_shared: range(11/01-11/30)
+
+  "This is Christmas":
+    template: { name: Holiday,
+                level: "+++" }
+    summary: "Cozy up with some Christmas classics"
+    trakt_list:
+      - https://trakt.tv/users/movistapp/lists/christmas-movies
+      - https://trakt.tv/users/questdvd/lists/absolute-hayes-christmas-classics
+      - https://trakt.tv/users/littlestella3/lists/christmas
+    collection_order: audience_rating.desc
+    schedule: range(11/29-01/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(11/29-12/31)
+    visible_shared: range(11/29-12/31)
+
+  "The Hallmark Christmas Collection":
+    template: { name: Holiday,
+                level: "++" }
+    summary: "Christmas movies with extra-sap"
+    trakt_list:
+      - https://trakt.tv/users/mzdiobolik/lists/hallmark-christmas-movies
+    collection_order: audience_rating.desc
+    schedule: range(11/29-01/01) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(11/29-12/31)
+    visible_shared: range(11/29-12/31)
+
+  "This is Valentine's Day":
+    template: { name: Holiday,
+                level: "+++" }
+    summary: "Love me tender, love me sweet"
+    trakt_list:
+      - https://trakt.tv/users/movie-pal/lists/valentine-s-day
+      - https://trakt.tv/users/barsaky/lists/den-svateho-valentina-valentine-s-day
+      - https://trakt.tv/users/abbelea/lists/movies-best-of-love
+    collection_order: audience_rating.desc
+    schedule: range(02/01-02/16) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(02/01-02/15)
+    visible_shared: range(02/01-02/15)
+
+  "This is St. Patrick's Day":
+    template: { name: Holiday,
+                level: "+++" }
+    summary: "Kiss me, I'm Irish"
+    trakt_list:
+      - https://trakt.tv/users/triadcool/lists/irish
+      - https://trakt.tv/users/sympli/lists/st-patricks-day-movies
+    collection_order: audience_rating.desc
+    schedule: range(03/10-03/19) # You have to schedule it one day longer so it will run and change visibility
+    visible_home: range(03/10-03/18)
+    visible_shared: range(03/10-03/18)
diff --git a/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml b/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml
index 38802f5..7beae19 100644
--- a/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml
+++ b/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml
@@ -5,4 +5,4 @@ external_templates:
 
 collections:
   "Kevin Conroy - In Memoriam":
-    template: { name: Actor, tmdb_id: 34947 }
+    template: { name: InMemoriamActor, tmdb_id: 34947 }
diff --git a/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml b/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml
index f36cf2e..ee9f191 100644
--- a/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml
+++ b/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml
@@ -5,4 +5,4 @@ external_templates:
 
 collections:
   "Kevin Conroy - In Memoriam":
-    template: { name: Actor, tmdb_id: 34947 }
+    template: { name: InMemoriamActor, tmdb_id: 34947 }
diff --git a/plex/pmm/templates/collections.yml b/plex/pmm/templates/collections.yml
index 54699f2..581ac0e 100644
--- a/plex/pmm/templates/collections.yml
+++ b/plex/pmm/templates/collections.yml
@@ -2,7 +2,7 @@ external_templates:
   git: PMM/collections
 
 templates:
-  Chart:
+  New:
     default:
       level: ""
     optional:
@@ -13,19 +13,35 @@ templates:
     visible_library: true
     url_poster: <<poster_url>>
 
-  Holiday:
+  InMemoriamActor:
     default:
       level: ""
-    optional:
-      - poster_url
-    sort_title: <<level>>+02_<<collection_name>>
-    sync_mode: sync
-    collection_order: custom
-    schedule: never
+    tmdb_person: <<tmdb_id>>
+    smart_filter:
+      sort_by: release.desc
+      any:
+        actor: tmdb
+      sort_title: <<level>>+02_<<collection_name>>
+      sync_mode: append
     visible_library: true
-    url_poster: <<poster_url>>
+    visible_shared: true
+    visible_home: true
 
-  Studio:
+  InMemoriamDirector:
+    default:
+      level: ""
+    tmdb_person: <<tmdb_id>>
+    smart_filter:
+      sort_by: release.desc
+      any:
+        director: tmdb
+      sort_title: <<level>>+02_<<collection_name>>
+      sync_mode: append
+    visible_library: true
+    visible_shared: true
+    visible_home: true
+
+  Holiday:
     default:
       level: ""
     optional:
@@ -33,22 +49,22 @@ templates:
     sort_title: <<level>>+03_<<collection_name>>
     sync_mode: sync
     collection_order: custom
-    schedule: daily
+    schedule: never
     visible_library: true
     url_poster: <<poster_url>>
 
-  Genre:
+  Chart:
     default:
       level: ""
     optional:
       - poster_url
     sort_title: <<level>>+04_<<collection_name>>
     sync_mode: sync
-    schedule: weekly(wednesday), weekly(sunday)
+    schedule: daily
     visible_library: true
     url_poster: <<poster_url>>
 
-  Country:
+  Award:
     default:
       level: ""
     optional:
@@ -60,36 +76,12 @@ templates:
     visible_library: true
     url_poster: <<poster_url>>
 
-  Award:
-    default:
-      level: ""
-    optional:
-      - poster_url
-    sort_title: <<level>>+06_<<collection_name>>
-    sync_mode: sync
-    collection_order: custom
-    schedule: weekly(wednesday), weekly(sunday)
-    visible_library: true
-    url_poster: <<poster_url>>
-
   Collection:
     default:
       level: ""
     optional:
       - poster_url
-    sort_title: <<level>>+07_<<collection_name>>
-    sync_mode: sync
-    collection_order: custom
-    schedule: weekly(wednesday), weekly(sunday)
-    visible_library: true
-    url_poster: <<poster_url>>
-
-  Decade:
-    default:
-      level: ""
-    optional:
-      - poster_url
-    sort_title: <<level>>+08_<<collection_name>>
+    sort_title: <<level>>+06_<<collection_name>>
     sync_mode: sync
     collection_order: custom
     schedule: weekly(wednesday), weekly(sunday)
@@ -107,7 +99,7 @@ templates:
         producer: tmdb
         writer: tmdb
     tmdb_person: <<person>>
-    sort_title: <<level>>+09_<<collection_name>>
+    sort_title: <<level>>+07_<<collection_name>>
     sync_mode: append
     visible_library: true
 
@@ -115,7 +107,7 @@ templates:
     default:
       level: ""
     tmdb_actor_details: <<person>>
-    sort_title: <<level>>+09_<<collection_name>>
+    sort_title: <<level>>+07_<<collection_name>>
     sync_mode: append
     collection_order: custom
     visible_library: true
@@ -124,7 +116,7 @@ templates:
     default:
       level: ""
     tmdb_director_details: <<person>>
-    sort_title: <<level>>+09_<<collection_name>>
+    sort_title: <<level>>+07_<<collection_name>>
     sync_mode: append
     collection_order: custom
     visible_library: true
@@ -133,43 +125,76 @@ templates:
     default:
       level: ""
     tmdb_producer_details: <<person>>
-    sort_title: <<level>>+09_<<collection_name>>
+    sort_title: <<level>>+07_<<collection_name>>
     sync_mode: append
     collection_order: custom
     visible_library: true
 
-  General:
+  Decade:
     default:
       level: ""
-    sort_title: <<level>>+10_<<collection_name>>
+    optional:
+      - poster_url
+    sort_title: <<level>>+08_<<collection_name>>
     sync_mode: sync
     collection_order: custom
     schedule: weekly(wednesday), weekly(sunday)
     visible_library: true
+    url_poster: <<poster_url>>
 
-  InMemoriamActor:
+  Genre:
     default:
       level: ""
-    tmdb_person: <<tmdb_id>>
-    smart_filter:
-      sort_by: release.desc
-      any:
-        actor: tmdb
-      sort_title: <<level>>+02_<<collection_name>>
-      sync_mode: append
+    optional:
+      - poster_url
+    sort_title: <<level>>+09_<<collection_name>>
+    sync_mode: sync
+    schedule: weekly(wednesday), weekly(sunday)
     visible_library: true
-    visible_shared: true
-    visible_home: true
-  InMemoriamDirector:
+    url_poster: <<poster_url>>
+
+  Studio:
     default:
       level: ""
-    tmdb_person: <<tmdb_id>>
-    smart_filter:
-      sort_by: release.desc
-      any:
-        director: tmdb
-      sort_title: <<level>>+02_<<collection_name>>
-      sync_mode: append
+    optional:
+      - poster
+    sort_title: <<level>>+10_<<collection_name>>
+    sync_mode: sync
+    collection_order: custom
+    schedule: daily
+    visible_library: true
+    url_poster: <<poster>>
+
+  Network:
+    default:
+      level: ""
+    optional:
+      - poster
+    sort_title: <<level>>+10_<<collection_name>>
+    smart_filter:
+      sort_by: title.desc
+      validate: false
+      any:
+        network: <<network>>
+    url_poster: <<poster>>
+
+  Country:
+    default:
+      level: ""
+    optional:
+      - poster_url
+    sort_title: <<level>>+11_<<collection_name>>
+    sync_mode: sync
+    collection_order: custom
+    schedule: weekly(wednesday), weekly(sunday)
+    visible_library: true
+    url_poster: <<poster_url>>
+
+  General:
+    default:
+      level: ""
+    sort_title: <<level>>+12_<<collection_name>>
+    sync_mode: sync
+    collection_order: custom
+    schedule: weekly(wednesday), weekly(sunday)
     visible_library: true
-    visible_shared: true
-    visible_home: true