diff --git a/Aldfeu/French_people.yml b/Aldfeu/French_people.yml
index b87b607..3581fdb 100644
--- a/Aldfeu/French_people.yml
+++ b/Aldfeu/French_people.yml
@@ -158,5 +158,3 @@ collections:
     template: {name: Person, person: 6014}
   Jean Carmet:
     template: {name: Person, person: 24540}
-  Louis de Funes:
-    template: {name: Person, person: 11187}
diff --git a/Khak1s/Movies/PopularOnServices.yml b/Khak1s/Movies/PopularOnServices.yml
new file mode 100644
index 0000000..707d726
--- /dev/null
+++ b/Khak1s/Movies/PopularOnServices.yml
@@ -0,0 +1,90 @@
+collections:
+  Popular Movies on Apple TV +:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Apple TV
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0546168
+      limit: 50
+    summary: Popular on Apple TV + now
+    url_poster: https://theposterdb.com/api/assets/206165
+
+  Popular Movies on Netflix:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Netflix
+    imdb_list:
+      url:  https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0144901
+      limit: 50
+    summary: Popular on Netflix now
+    url_poster: https://theposterdb.com/api/assets/205048
+
+  Popular Movies on Prime Video:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Prime Video
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0476953
+      limit: 50
+    summary: Popular on Prime Video now
+    url_poster: https://theposterdb.com/api/assets/222004
+
+  Popular Movies on Hulu:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Hulu
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0218858
+      limit: 50
+    summary: Popular on Hulu now
+    url_poster: https://theposterdb.com/api/assets/206161
+
+  Popular Movies on Paramount+:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Paramount+
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0820547
+      limit: 50
+    summary: Popular on Paramount+ now
+    url_poster: https://theposterdb.com/api/assets/168828
+
+  Popular Movies on Peacock:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Peacock
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0764707
+      limit: 50
+    summary: Popular on Peacock now
+    url_poster: https://theposterdb.com/api/assets/205411
+
+  Popular Movies on Discovery+:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Discovery+
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0834810
+      limit: 50
+    summary: Popular on Discovery+ now
+    url_poster: https://theposterdb.com/api/assets/145524
+
+  Popular Movies on Disney+:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Disney+
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0721120
+      limit: 50
+    summary: Popular on Disney+ now
+    url_poster: https://theposterdb.com/api/assets/204745
+
+  Popular Movies on HBO Max:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on HBO Max
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=feature,tv_movie,documentary,short&companies=co0754095
+      limit: 50
+    summary: Popular on HBO Max now
+    url_poster: https://theposterdb.com/api/assets/168825
\ No newline at end of file
diff --git a/Khak1s/Tv/PopularOnServices.yml b/Khak1s/Tv/PopularOnServices.yml
new file mode 100644
index 0000000..8d1de24
--- /dev/null
+++ b/Khak1s/Tv/PopularOnServices.yml
@@ -0,0 +1,90 @@
+collections:
+  Popular TV on Apple TV +:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Apple TV
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0546168
+      limit: 50
+    summary: Popular on Apple TV + now
+    url_poster: https://theposterdb.com/api/assets/206165
+
+  Popular TV on Netflix:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Netflix
+    imdb_list:
+      url:  https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0144901
+      limit: 50
+    summary: Popular on Netflix now
+    url_poster: https://theposterdb.com/api/assets/205048
+
+  Popular TV on Prime Video:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Prime Video
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0476953
+      limit: 50
+    summary: Popular on Prime Video now
+    url_poster: https://theposterdb.com/api/assets/222004
+
+  Popular TV on Hulu:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Hulu
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0218858
+      limit: 50
+    summary: Popular on Hulu now
+    url_poster: https://theposterdb.com/api/assets/206161
+
+  Popular TV on Paramount+:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Paramount+
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0820547
+      limit: 50
+    summary: Popular on Paramount+ now
+    url_poster: https://theposterdb.com/api/assets/168828
+
+  Popular TV on Peacock:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Peacock
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0764707
+      limit: 50
+    summary: Popular on Peacock now
+    url_poster: https://theposterdb.com/api/assets/205411
+
+  Popular TV on Discovery+:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Discovery+
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0834810
+      limit: 50
+    summary: Popular on Discovery+ now
+    url_poster: https://theposterdb.com/api/assets/145524
+
+  Popular TV on Disney+:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on Disney+
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0721120
+      limit: 50
+    summary: Popular on Disney+ now
+    url_poster: https://theposterdb.com/api/assets/204745
+
+  Popular TV on HBO Max:
+    sync_mode: sync
+    collection_order: custom
+    sort_title: +0_Popular on HBO Max
+    imdb_list:
+      url: https://www.imdb.com/search/title/?title_type=tv_series,tv_episode,tv_miniseries,tv_short&companies=co0754095
+      limit: 50
+    summary: Popular on HBO Max now
+    url_poster: https://theposterdb.com/api/assets/168825
\ No newline at end of file
diff --git a/PMM/templates.yml b/PMM/templates.yml
index 158037c..c4b5b1f 100644
--- a/PMM/templates.yml
+++ b/PMM/templates.yml
@@ -4,9 +4,21 @@ templates:
     default:
       collection_section: "00"
     optional:
-      - schedule_separator
+      - use_separator
       - collection_mode
-    schedule: <<schedule_separator>>
+    allowed_library_types: <<use_separator>>
+    collection_mode: <<collection_mode>>
+    sort_title: "!<<collection_section>>_!<<collection_name>>"
+    blank_collection: true
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/separators/<<separator>>.jpg
+
+  separator off:
+    default:
+      collection_section: "00"
+      use_separator: false
+    optional:
+      - collection_mode
+    allowed_library_types: <<use_separator>>
     collection_mode: <<collection_mode>>
     sort_title: "!<<collection_section>>_!<<collection_name>>"
     blank_collection: true
@@ -17,13 +29,12 @@ templates:
       collection_section: "00"
       sort: <<collection_name>>
       pre: "_"
-    cache_builders: 1
     optional:
       - collection_mode
-      - radarr_add
-      - sonarr_add
-    radarr_add: <<radarr_add>>
-    sonarr_add: <<sonarr_add>>
+      - radarr_add_missing
+      - sonarr_add_missing
+    radarr_add_missing: <<radarr_add_missing>>
+    sonarr_add_missing: <<sonarr_add_missing>>
     collection_mode: <<collection_mode>>
     sort_title: "!<<collection_section>><<pre>><<sort>>"
 
@@ -33,21 +44,18 @@ templates:
       sort: <<collection_name>>
       pre: "_~"
     optional:
-      - schedule_other
-    schedule: <<schedule_other>>
+      - use_other
+    allowed_library_types: <<use_other>>
     sort_title: "!<<collection_section>><<pre>><<sort>>"
 
-  schedule_year_collections:
-    optional:
-      - schedule_year_collections
-    schedule: <<schedule_year_collections>>
-
   award:
+    default:
+      collection_order: custom
     optional:
       - image
     cache_builders: 1
     sync_mode: sync
-    smart_label: audience_rating.desc
+    collection_order: <<collection_order>>
     url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/award/<<image>>.jpg
 
   chart:
@@ -62,13 +70,33 @@ templates:
     limit: 250
     url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/chart/<<image_encoded>>.jpg
 
-  franchise:
+  playlist:
+    default:
+      libraries: Movies, TV Shows
     cache_builders: 1
+    sync_to_users: all
     sync_mode: sync
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/franchise/<<image_encoded>>.jpg
+    libraries: <<libraries>>
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/playlist/<<playlist_name_encoded>>.jpg
+
+  streaming:
+    default:
+      sort_by: release.desc
+    cache_builders: 1
+    smart_label: <<sort_by>>
+    sync_mode: sync
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/streaming/<<image_encoded>>.jpg
+
+  use_year_collections:
+    optional:
+      - use_year_collections
+    allowed_library_types: <<use_year_collections>>
+
+######################################################
+#                  Chart Templates                   #
+######################################################
 
   Newly_Released_Movies:
-    cache_builders: 1
     optional:
       - schedule_Newly_Released_Movies
       - visible_library_Newly_Released_Movies
@@ -80,7 +108,6 @@ templates:
     visible_shared: <<visible_shared_Newly_Released_Movies>>
 
   TMDb_Trending_Movies:
-    cache_builders: 1
     optional:
       - schedule_TMDb_Trending_Movies
       - visible_library_TMDb_Trending_Movies
@@ -92,7 +119,6 @@ templates:
     visible_shared: <<visible_shared_TMDb_Trending_Movies>>
 
   TMDb_Popular_Movies:
-    cache_builders: 1
     optional:
       - schedule_TMDb_Popular_Movies
       - visible_library_TMDb_Popular_Movies
@@ -104,7 +130,6 @@ templates:
     visible_shared: <<visible_shared_TMDb_Popular_Movies>>
 
   TMDb_Now_Playing_Movies:
-    cache_builders: 1
     optional:
       - schedule_TMDb_Now_Playing_Movies
       - visible_library_TMDb_Now_Playing_Movies
@@ -116,7 +141,6 @@ templates:
     visible_shared: <<visible_shared_TMDb_Now_Playing_Movies>>
 
   IMDb_Top_250_Movies:
-    cache_builders: 1
     optional:
       - schedule_IMDb_Top_250_Movies
       - visible_library_IMDb_Top_250_Movies
@@ -128,7 +152,6 @@ templates:
     visible_shared: <<visible_shared_IMDb_Top_250_Movies>>
 
   Newly_Released_Shows:
-    cache_builders: 1
     optional:
       - schedule_Newly_Released_Shows
       - visible_library_Newly_Released_Shows
@@ -140,7 +163,6 @@ templates:
     visible_shared: <<visible_shared_Newly_Released_Shows>>
 
   New_Episodes:
-    cache_builders: 1
     optional:
       - schedule_New_Episodes
       - visible_library_New_Episodes
@@ -151,17 +173,7 @@ templates:
     visible_home: <<visible_home_New_Episodes>>
     visible_shared: <<visible_shared_New_Episodes>>
 
-  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
-
   TMDb_Trending_Shows:
-    cache_builders: 1
     optional:
       - schedule_TMDb_Trending_Shows
       - visible_library_TMDb_Trending_Shows
@@ -173,7 +185,6 @@ templates:
     visible_shared: <<visible_shared_TMDb_Trending_Shows>>
 
   TMDb_Popular_Shows:
-    cache_builders: 1
     optional:
       - schedule_TMDb_Popular_Shows
       - visible_library_TMDb_Popular_Shows
@@ -184,11 +195,9 @@ templates:
     visible_home: <<visible_home_TMDb_Popular_Shows>>
     visible_shared: <<visible_shared_TMDb_Popular_Shows>>
 
-  streaming:
-    cache_builders: 1
-    smart_label: release.desc
-    sync_mode: sync
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/streaming/<<image_encoded>>.jpg
+######################################################
+#                Streaming Templates                 #
+######################################################
 
   All4:
     optional:
@@ -333,6 +342,10 @@ templates:
     visible_home: <<visible_home_prime>>
     visible_shared: <<visible_shared_prime>>
 
+######################################################
+#                 Holiday Templates                  #
+######################################################
+
   Independence:
     optional:
       - schedule_independence
@@ -388,28 +401,6 @@ templates:
     visible_home: <<visible_home_thanksgiving>>
     visible_shared: <<visible_shared_thanksgiving>>
 
-  ThanksgivingUS:
-    optional:
-      - schedule_thanksgiving_us
-      - visible_library_thanksgiving_us
-      - visible_home_thanksgiving_us
-      - visible_shared_thanksgiving_us
-    schedule: <<schedule_thanksgiving_us>>
-    visible_library: <<visible_library_thanksgiving_us>>
-    visible_home: <<visible_home_thanksgiving_us>>
-    visible_shared: <<visible_shared_thanksgiving_us>>
-
-  ThanksgivingCA:
-    optional:
-      - schedule_thanksgiving_ca
-      - visible_library_thanksgiving_ca
-      - visible_home_thanksgiving_ca
-      - visible_shared_thanksgiving_ca
-    schedule: <<schedule_thanksgiving_ca>>
-    visible_library: <<visible_library_thanksgiving_ca>>
-    visible_home: <<visible_home_thanksgiving_ca>>
-    visible_shared: <<visible_shared_thanksgiving_ca>>
-
   Halloween:
     optional:
       - schedule_halloween