diff --git a/plex/pmm/collections/general/movies_collections_general.yml b/plex/pmm/collections/general/movies_collections_general.yml
index a95a926..31c3ea0 100644
--- a/plex/pmm/collections/general/movies_collections_general.yml
+++ b/plex/pmm/collections/general/movies_collections_general.yml
@@ -2,24 +2,7 @@
 
 external_templates:
   - repo: templates/collections
-
-templates:
-  # Dynamic Collections Templates
-  # -----------------------------
-  Best_of_Year:
-    default:
-      level: ""
-    trakt_list: https://trakt.tv/users/lish408/lists/rotten-tomatoes-best-of-<<key>>
-    sort_title: 08_+<<level>>_Best of <<key>>
-    sync_mode: sync
-    summary: Rotten Tomatoes Best Movies of <<key>>
-    collection_order: release
-    collection_minimum: 3
-    delete_below_minimum: true
-    visible_library: true
-    visible_shared: false
-    visible_home: false
-    schedule: monthly(1)
+  - repo: templates/dynamic_collections
 
 collections:
   ### New Content
@@ -466,12 +449,26 @@ dynamic_collections:
   Per-Actor DC: # mapping name does not matter just needs to be unique
     type: actor
     data:
-      depth: 5  # must be in top X billed actors for a given movie for the movie to be added
+      depth: 10  # must be in top X billed actors for a given movie for the movie to be added
       minimum: 10 # actor must be in at least X movies to have a collection made
+    title_format: <<key_name>> (Actor)
+    template:
+      - Per_Actor
+
+  Per-Director DC: # mapping name does not matter just needs to be unique
+    type: director
+    data:
+      depth: 10  # must be in top X billed directors for a given movie for the movie to be added
+      minimum: 10 # director must be in at least X movies to have a collection made
+    title_format: <<key_name>> (Director)
+    template:
+      - Per_Director
 
   Per-Country DC: # mapping name does not matter just needs to be unique
     type: country
     title_format: Top <<key_name>> Cinema
+    template:
+      - Per_Country
     key_name_override:
       France: French
       Germany: German
@@ -510,4 +507,5 @@ dynamic_collections:
     exclude:
       - Talk Show
     title_format: Top <<key_name>> <<library_type>>s
-
+    template:
+      - Per_Genre
diff --git a/plex/pmm/templates/collections.yml b/plex/pmm/templates/collections.yml
index 806bbae..db3f64b 100644
--- a/plex/pmm/templates/collections.yml
+++ b/plex/pmm/templates/collections.yml
@@ -88,47 +88,16 @@ templates:
     visible_library: true
     url_poster: <<poster_url>>
 
-  Person:
+  Genre:
     default:
       level: ""
-    smart_filter:
-      sort_by: release.desc
-      any:
-        actor: tmdb
-        director: tmdb
-        producer: tmdb
-        writer: tmdb
-    tmdb_person: <<person>>
+    optional:
+      - poster_url
     sort_title: 07_+<<level>>_<<collection_name>>
-    sync_mode: append
-    visible_library: true
-
-  Actor:
-    default:
-      level: ""
-    tmdb_actor_details: <<person>>
-    sort_title: 07_+<<level>>_<<collection_name>>
-    sync_mode: append
-    collection_order: custom
-    visible_library: true
-
-  Director:
-    default:
-      level: ""
-    tmdb_director_details: <<person>>
-    sort_title: 07_+<<level>>_<<collection_name>>
-    sync_mode: append
-    collection_order: custom
-    visible_library: true
-
-  Producer:
-    default:
-      level: ""
-    tmdb_producer_details: <<person>>
-    sort_title: 07_+<<level>>_<<collection_name>>
-    sync_mode: append
-    collection_order: custom
+    sync_mode: sync
+    schedule: weekly(wednesday), weekly(sunday)
     visible_library: true
+    url_poster: <<poster_url>>
 
   Decade:
     default:
@@ -142,16 +111,47 @@ templates:
     visible_library: true
     url_poster: <<poster_url>>
 
-  Genre:
+  Person:
     default:
       level: ""
-    optional:
-      - poster_url
+    smart_filter:
+      sort_by: release.desc
+      any:
+        actor: tmdb
+        director: tmdb
+        producer: tmdb
+        writer: tmdb
+    tmdb_person: <<person>>
     sort_title: 09_+<<level>>_<<collection_name>>
-    sync_mode: sync
-    schedule: weekly(wednesday), weekly(sunday)
+    sync_mode: append
+    visible_library: true
+
+  Actor:
+    default:
+      level: ""
+    tmdb_actor_details: <<person>>
+    sort_title: 09_+<<level>>_<<collection_name>>
+    sync_mode: append
+    collection_order: custom
+    visible_library: true
+
+  Director:
+    default:
+      level: ""
+    tmdb_director_details: <<person>>
+    sort_title: 09_+<<level>>_<<collection_name>>
+    sync_mode: append
+    collection_order: custom
+    visible_library: true
+
+  Producer:
+    default:
+      level: ""
+    tmdb_producer_details: <<person>>
+    sort_title: 09_+<<level>>_<<collection_name>>
+    sync_mode: append
+    collection_order: custom
     visible_library: true
-    url_poster: <<poster_url>>
 
   Studio:
     default:
diff --git a/plex/pmm/templates/dynamic_collections.yml b/plex/pmm/templates/dynamic_collections.yml
new file mode 100644
index 0000000..bdf9fb9
--- /dev/null
+++ b/plex/pmm/templates/dynamic_collections.yml
@@ -0,0 +1,53 @@
+templates:
+  # Dynamic Collections Templates
+  # -----------------------------
+  Best_of_Year:
+    default:
+      level: ""
+    trakt_list: https://trakt.tv/users/lish408/lists/rotten-tomatoes-best-of-<<key>>
+    sort_title: 08_+<<level>>_Best of <<key>>
+    sync_mode: sync
+    summary: Rotten Tomatoes Best Movies of <<key>>
+    collection_order: release
+    collection_minimum: 3
+    delete_below_minimum: true
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: monthly(1)
+
+  Per_Genre:
+    default:
+      level: ""
+    sort_title: 07_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: weekly(saturday)
+
+  Per_Actor:
+    default:
+      level: ""
+    sort_title: 09_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: weekly(thursday), weekly(monday)
+
+  Per_Director:
+    default:
+      level: ""
+    sort_title: 09_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: weekly(friday), weekly(tuesday)
+
+  Per_Country:
+    default:
+      level: ""
+    sort_title: 11_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: weekly(saturday)