diff --git a/PMM/templates.yml b/PMM/templates.yml
index 158037c..a96994c 100644
--- a/PMM/templates.yml
+++ b/PMM/templates.yml
@@ -17,13 +17,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>>"
 
@@ -37,17 +36,14 @@ templates:
     schedule: <<schedule_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 +58,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
+
+  schedule_year_collections:
+    optional:
+      - schedule_year_collections
+    schedule: <<schedule_year_collections>>
+
+######################################################
+#                  Chart Templates                   #
+######################################################
 
   Newly_Released_Movies:
-    cache_builders: 1
     optional:
       - schedule_Newly_Released_Movies
       - visible_library_Newly_Released_Movies
@@ -80,7 +96,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 +107,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 +118,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 +129,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 +140,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 +151,6 @@ templates:
     visible_shared: <<visible_shared_Newly_Released_Shows>>
 
   New_Episodes:
-    cache_builders: 1
     optional:
       - schedule_New_Episodes
       - visible_library_New_Episodes
@@ -151,17 +161,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 +173,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 +183,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 +330,10 @@ templates:
     visible_home: <<visible_home_prime>>
     visible_shared: <<visible_shared_prime>>
 
+######################################################
+#                 Holiday Templates                  #
+######################################################
+
   Independence:
     optional:
       - schedule_independence