diff --git a/plex/pmm/collections/genres/shows.yml b/plex/pmm/collections/genres/shows.yml
index c6d8d18..9ee45d2 100644
--- a/plex/pmm/collections/genres/shows.yml
+++ b/plex/pmm/collections/genres/shows.yml
@@ -13,3 +13,17 @@ collections:
     collection_order: random
     visible_home: false
     visible_shared: true
+
+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
+
+  Per-Genre DC Shows: # mapping name does not matter just needs to be unique
+    type: genre
+    exclude:
+      - Action/Adventure
+    title_format: <<key_name>>
+    template:
+      - Per_Genre
+    key_name_override:
+      Film-Noir: Film Noir
diff --git a/plex/pmm/operations/shows.yml b/plex/pmm/operations/shows.yml
new file mode 100644
index 0000000..74960f0
--- /dev/null
+++ b/plex/pmm/operations/shows.yml
@@ -0,0 +1,7 @@
+operations:
+  genre_mapper:
+    "Action/Adventure": "Action"
+    "Action & Adventure": "Action"
+    "Romantic Comedy": "Comedy"
+    "Film-Noir": "Film Noir"
+