diff --git a/plex/pmm/collections/4KTVShows/4K_TV_Shows_collections.yml b/plex/pmm/collections/4KTVShows/4K_TV_Shows_collections.yml
new file mode 100644
index 0000000..4f3ce94
--- /dev/null
+++ b/plex/pmm/collections/4KTVShows/4K_TV_Shows_collections.yml
@@ -0,0 +1,7 @@
+# Collections specific to TV Shows (4K)
+
+external_templates:
+  - repo: templates/collections
+
+collections:
+
diff --git a/plex/pmm/collections/TVShows/TV_Shows_collections.yml b/plex/pmm/collections/TVShows/TV_Shows_collections.yml
index d2b57ff..a38211f 100644
--- a/plex/pmm/collections/TVShows/TV_Shows_collections.yml
+++ b/plex/pmm/collections/TVShows/TV_Shows_collections.yml
@@ -4,126 +4,3 @@ external_templates:
   - repo: templates/collections
 
 collections:
-  ### Custom
-  "From The Top":
-    summary: "Let's start this from the beginning"
-    collection_level: episode
-    collection_order: alpha
-    plex_pilots: true
-    visible_library: true
-    visible_home: false
-    visible_shared: true
-
-  "Previously On...":
-    summary: "Catch up on last week's episodes"
-    sort_title:
-    smart_filter:
-      type: episode
-      sort_by: release.desc
-      all:
-        # Episode aired in the last 8 days
-        episode_air_date: 8
-    sync_mode: sync
-    visible_home: true
-    visible_shared: true
-    visible_library: true
-
-  "What Everyone Is Watching":
-    template: { name: Chart,
-                level: "++" }
-    summary: "What other subscribers are checking out"
-    libraries: "TV Shows"
-    sync_mode: sync
-    collection_order: custom
-    tautulli_popular:
-      list_days: 30
-      list_size: 15
-      list_minimum: 2
-    visible_library: true
-    visible_home: false
-    visible_shared: true
-
-  "Trending Now":
-    summary: "The hottest shows right now"
-    imdb_chart: popular_shows
-    collection_order: custom
-    sync_mode: sync
-    visible_library: true
-    visible_home: true
-    visible_shared: true
-
-  "Editor's Choice":
-    template: { name: Chart,
-                level: "++" }
-    summary: "Our top picks"
-    trakt_list:
-      - https://trakt.tv/users/nwithan8/lists/recommendations-plex-sync?sort=popularity,asc
-    collection_order: release.desc
-    visible_home: true
-    visible_shared: true
-
-  ### New Content
-  "Added This Week":
-    summary: "Episodes added this week on Plex"
-    sort_title:
-    smart_filter:
-      type: episode
-      sort_by: release.desc
-      all:
-        # Episode added in the last 7 days
-        episode_added: 7
-    sync_mode: sync
-    visible_home: true
-    visible_shared: true
-    visible_library: true
-
-  "Now On Plex":
-    summary: "Shows now playing on Plex"
-    sort_title:
-    smart_filter:
-      type: show
-      sort_by: release.desc
-      all:
-        # Shows added in the last 30 days
-        added: 30
-    sync_mode: sync
-    visible_library: true
-    visible_home: true
-    visible_shared: true
-
-  ### Genres
-  "A Real-Life Whodunnit":
-    template: { name: Genre }
-    summary: "True Crime Documentaries"
-    trakt_list:
-      - https://trakt.tv/users/lish408/lists/true-crime-documentary-series-film
-    collection_order: release
-    visible_home: false
-    visible_shared: true
-
-  ### Topical
-  "Treehouse of Horror":
-    summary: "All the Simpsons' Treehouse of Horror episodes"
-    sort_title:
-    smart_filter:
-      type: episode
-      sort_by: release.asc
-      all:
-        title.is: "The Simpsons"
-        episode_title: "Treehouse"
-    sync_mode: sync
-    visible_library: true
-    visible_home: false
-    visible_shared: false
-
-  "Top 100 Simpsons Episodes":
-    collection_order: custom
-    builder_level: episode
-    smart_filter:
-      type: episodes
-      sort_by: audience_rating.desc
-      limit: 100
-      all:
-        title.ends: "Simpsons"
-    summary: A collection of the highest-rated Simpsons episodes.
-
diff --git a/plex/pmm/collections/general/movies_collections_awards_general.yml b/plex/pmm/collections/general/movies_collections_awards_general.yml
index e8bad44..cd105f9 100644
--- a/plex/pmm/collections/general/movies_collections_awards_general.yml
+++ b/plex/pmm/collections/general/movies_collections_awards_general.yml
@@ -1,3 +1,5 @@
+# Will be replicated for each movie library
+
 external_templates:
   - repo: templates/collections
 
diff --git a/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml b/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml
index 1b49052..62667f8 100644
--- a/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml
+++ b/plex/pmm/collections/general/movies_collections_in_memoriam_general.yml
@@ -1,4 +1,4 @@
-# In Memoriam collections for the all movies sections
+# Will be replicated for each movie library
 
 external_templates:
   - repo: templates/collections
diff --git a/plex/pmm/collections/general/shows_collections_awards_general.yml b/plex/pmm/collections/general/shows_collections_awards_general.yml
index e69de29..1dc2989 100644
--- a/plex/pmm/collections/general/shows_collections_awards_general.yml
+++ b/plex/pmm/collections/general/shows_collections_awards_general.yml
@@ -0,0 +1,6 @@
+# Will be replicated for each show library
+
+external_templates:
+  - repo: templates/collections
+
+collections:
diff --git a/plex/pmm/collections/general/shows_collections_general.yml b/plex/pmm/collections/general/shows_collections_general.yml
index ba55c69..020d7a2 100644
--- a/plex/pmm/collections/general/shows_collections_general.yml
+++ b/plex/pmm/collections/general/shows_collections_general.yml
@@ -5,6 +5,93 @@ external_templates:
   - repo: templates/dynamic_collections
 
 collections:
+  ### New Content
+  "Added This Week":
+    summary: "Episodes added this week on Plex"
+    sort_title:
+    smart_filter:
+      type: episode
+      sort_by: release.desc
+      all:
+        # Episode added in the last 7 days
+        episode_added: 7
+    sync_mode: sync
+    visible_home: true
+    visible_shared: true
+    visible_library: true
+
+  "Now On Plex":
+    summary: "Shows now playing on Plex"
+    sort_title:
+    smart_filter:
+      type: show
+      sort_by: release.desc
+      all:
+        # Shows added in the last 30 days
+        added: 30
+    sync_mode: sync
+    visible_library: true
+    visible_home: true
+    visible_shared: true
+
+  ### Trending
+  "From The Top":
+    summary: "Let's start this from the beginning"
+    collection_level: episode
+    collection_order: alpha
+    plex_pilots: true
+    visible_library: true
+    visible_home: false
+    visible_shared: true
+
+  "Previously On...":
+    summary: "Catch up on last week's episodes"
+    sort_title:
+    smart_filter:
+      type: episode
+      sort_by: release.desc
+      all:
+        # Episode aired in the last 8 days
+        episode_air_date: 8
+    sync_mode: sync
+    visible_home: true
+    visible_shared: true
+    visible_library: true
+
+  "What Everyone Is Watching":
+    template: { name: Chart,
+                level: "++" }
+    summary: "What other subscribers are checking out"
+    libraries: "TV Shows"
+    sync_mode: sync
+    collection_order: custom
+    tautulli_popular:
+      list_days: 30
+      list_size: 15
+      list_minimum: 2
+    visible_library: true
+    visible_home: false
+    visible_shared: true
+
+  "Trending Now":
+    summary: "The hottest shows right now"
+    imdb_chart: popular_shows
+    collection_order: custom
+    sync_mode: sync
+    visible_library: true
+    visible_home: true
+    visible_shared: true
+
+  "Editor's Choice":
+    template: { name: Chart,
+                level: "++" }
+    summary: "Our top picks"
+    trakt_list:
+      - https://trakt.tv/users/nwithan8/lists/recommendations-plex-sync?sort=popularity,asc
+    collection_order: release.desc
+    visible_home: true
+    visible_shared: true
+
   ### Studios
   ABC:
     template: { name: Network,
@@ -332,6 +419,16 @@ collections:
     visible_home: false
     visible_shared: false
 
+  ### Genres
+  "A Real-Life Whodunnit":
+    template: { name: Genre }
+    summary: "True Crime Documentaries"
+    trakt_list:
+      - https://trakt.tv/users/lish408/lists/true-crime-documentary-series-film
+    collection_order: release
+    visible_home: false
+    visible_shared: true
+
 dynamic_collections:
   ## Use DC as suffix to avoid name conflicts with static collections
   Per-Actor-Shows DC: # mapping name does not matter just needs to be unique
diff --git a/plex/pmm/collections/general/shows_collections_holidays_general.yml b/plex/pmm/collections/general/shows_collections_holidays_general.yml
index 2449609..1dc2989 100644
--- a/plex/pmm/collections/general/shows_collections_holidays_general.yml
+++ b/plex/pmm/collections/general/shows_collections_holidays_general.yml
@@ -1 +1,6 @@
+# Will be replicated for each show library
+
+external_templates:
+  - repo: templates/collections
+
 collections:
diff --git a/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml b/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml
index f10f1c8..1dc2989 100644
--- a/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml
+++ b/plex/pmm/collections/general/shows_collections_in_memoriam_general.yml
@@ -1,4 +1,4 @@
-# In Memoriam collections for the all shows sections
+# Will be replicated for each show library
 
 external_templates:
   - repo: templates/collections