diff --git a/plex/pmm/collections/decades/movies.yml b/plex/pmm/collections/decades/movies.yml
index 0ea5d61..f3bffda 100644
--- a/plex/pmm/collections/decades/movies.yml
+++ b/plex/pmm/collections/decades/movies.yml
@@ -2,20 +2,6 @@ external_templates:
   - repo: templates/collections
   - repo: templates/dynamic_collections
 
-templates:
-  Per_Decade:
-    smart_filter:
-      sort_by: audience_rating.desc
-      all:
-        year.gte: <<key_name>>
-        year.lte: <<ending>>
-    sort_title: 08_+<<level>>_<<key>>
-    visible_library: true
-    visible_shared: false
-    visible_home: false
-    schedule: monthly(17)
-    url_poster: https://raw.githubusercontent.com/zluckytraveler/Plex-Meta-Manager-Configs/master/zluckytraveler/Posters/Decades/<<key>>.png
-
 dynamic_collections:
   ## Use DC as suffix to avoid name conflicts with static collections
   ## These get generated in the order they are listed here, so put the more intensive ones at the bottom
diff --git a/plex/pmm/templates/dynamic_collections.yml b/plex/pmm/templates/dynamic_collections.yml
index 2bc51b5..3d95eef 100644
--- a/plex/pmm/templates/dynamic_collections.yml
+++ b/plex/pmm/templates/dynamic_collections.yml
@@ -1,6 +1,33 @@
 templates:
   # Dynamic Collections Templates
   # -----------------------------
+  Per_Decade:
+    smart_filter:
+      sort_by: audience_rating.desc
+      all:
+        year.gte: <<key_name>>
+        year.lte: <<ending>>
+    sort_title: 08_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: monthly(17)
+    url_poster: https://raw.githubusercontent.com/zluckytraveler/Plex-Meta-Manager-Configs/master/zluckytraveler/Posters/Decades/<<key>>.png
+
+  Per_Genre:
+    smart_filter:
+      limit: 10000
+      sort_by: critic_rating.desc
+      all:
+        genre: <<value>>
+    default:
+      level: ""
+    sort_title: 07_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: weekly(saturday)
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/genre/<<key>>.jpg
 
   Per_Actor:
     smart_filter:
@@ -29,3 +56,65 @@ templates:
     schedule:
       - weekly(friday)
       - weekly(tuesday)
+
+  Per_Country:
+    smart_filter:
+      limit: 10000
+      sort_by: critic_rating.desc
+      any:
+        country: <<value>>
+    default:
+      level: ""
+    sort_title: 11_+<<level>>_<<key>>
+    visible_library: true
+    visible_shared: false
+    visible_home: false
+    schedule: weekly(saturday)
+    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/country/color/<<key>>.jpg
+
+  Per_Holiday:
+    default:
+      level: ""
+      sync_mode: sync
+      sync_mode_<<key>>: <<sync_mode>>
+      sort_by: title.asc
+      sort_by_<<key>>: <<sort_by>>
+      schedule_<<key>>: <<schedule>>
+      limit_<<key>>: <<limit>>
+      tmdb_collection_<<key>>: <<tmdb_collection>>
+      tmdb_movie_<<key>>: <<tmdb_movie>>
+      imdb_list_<<key>>: <<imdb_list>>
+      trakt_list_<<key>>: <<trakt_list>>
+      mdblist_list_<<key>>: <<mdblist_list>>
+      summary_<<key>>: <<seasonal_summary>>
+      name_<<key>>: <<seasonal_name>>
+      emoji_<<key>>: <<emoji>>
+    optional:
+      - poster_url
+      - schedule
+      - tmdb_collection
+      - tmdb_movie
+      - limit
+      - imdb_list
+      - trakt_list
+      - mdblist_list
+    smart_label:
+      sort_by: <<sort_by_<<key>>>>
+      limit: <<limit_<<key>>>>
+      all:
+        label: <<smart_label>>
+    schedule: <<schedule_<<key>>>>
+    sync_mode: <<sync_mode_<<key>>>>
+    tmdb_collection: <<tmdb_collection_<<key>>>>
+    tmdb_movie: <<tmdb_movie_<<key>>>>
+    imdb_list: <<imdb_list_<<key>>>>
+    trakt_list: <<trakt_list_<<key>>>>
+    mdblist_list: <<mdblist_list_<<key>>>>
+    cache_builders: 1
+    summary: <<summary_<<key>>>>
+    name: <<emoji_<<key>>>><<name_<<key>>>>
+    sort_title: 03_+<<level>>_<<collection_name>>
+    visible_shared: true
+    visible_home: true
+    url_poster: <<poster_url>>
+