diff --git a/0x5f3/metadata/movie/1_parental.yml b/0x5f3/metadata/movie/1_parental.yml
index 5cc1085..b01381b 100644
--- a/0x5f3/metadata/movie/1_parental.yml
+++ b/0x5f3/metadata/movie/1_parental.yml
@@ -1,15 +1,18 @@
+## 1_parental.yml
+
 templates:
   plex:
     sort_title: "+1_<<num>>_<<collection_name>>"
     sync_mode: sync
     collection_mode: hide
+    label.sync: Parental
     visible_home: false
     visible_shared: false
     visible_library: false
     delete_not_scheduled: false
     cache_builders: 4
 
-  mdblist_title:
+  mdblist:
     optional:
       - mdblist_extra_1
       - mdblist_extra_2
@@ -20,111 +23,24 @@ templates:
     sync_mode: sync
     collection_mode: hide
     collection_order: title.asc
+    label.sync: Parental
+    item_label.sync: Parental
     visible_home: false
     visible_shared: false
     visible_library: false
     delete_not_scheduled: false
     cache_builders: 6
     mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
-  mdblist_added:
-    optional:
-      - mdblist_extra_1
-      - mdblist_extra_2
-      - mdblist_extra_3
-      - mdblist_extra_4
-      - mdblist_extra_5
-    sort_title: "+1_<<num>>_<<collection_name>>"
-    sync_mode: sync
-    limit: 250
-    collection_mode: hide
-    collection_order: added.desc
-    visible_home: false
-    visible_shared: false
-    visible_library: false
-    delete_not_scheduled: false
-    cache_builders: 6
-    mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
-  mdblist_random:
-    optional:
-      - mdblist_extra_1
-      - mdblist_extra_2
-      - mdblist_extra_3
-      - mdblist_extra_4
-      - mdblist_extra_5
-    sort_title: "+1_<<num>>_<<collection_name>>"
-    sync_mode: sync
-    limit: 500
-    collection_mode: hide
-    collection_order: random
-    visible_home: false
-    visible_shared: false
-    visible_library: false
-    delete_not_scheduled: false
-    cache_builders: 6
-    mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
-  mdblist_toprated: 
-    optional:
-      - mdblist_extra_1
-      - mdblist_extra_2
-      - mdblist_extra_3
-      - mdblist_extra_4
-      - mdblist_extra_5
-    sort_title: "+1_<<num>>_<<collection_name>>"
-    sync_mode: sync
-    limit: 250
-    collection_mode: hide
-    collection_order: critic_rating.desc
-    visible_home: false
-    visible_shared: false
-    visible_library: false
-    delete_not_scheduled: false
-    cache_builders: 6
-    mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
+      url: https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
+      sort_by: title.desc
+
 collections:
   "Parental: All":
     summary: "Movies suitable for children"
     url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-all.png
     template: {
-                    name: mdblist_title,
-                    num: "W",
-                    mdblist_user: "a2u2y13",
-                    mdblist_list: "list-suitable-for-children"
-                    }
-                   
-  "Parental: Recently Added":
-    summary: "Recently added movies suitable for children"
-    url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-added.png
-    template: {
-                    name: mdblist_added,
-                    num: "X",
+                    name: mdblist,
+                    num: "V",
                     mdblist_user: "a2u2y13",
                     mdblist_list: "list-suitable-for-children"
                     }
@@ -135,21 +51,49 @@ collections:
     schedule: daily
     template: {
                     name: plex,
-                    num: "Y"
+                    num: "W"
                     }
     smart_filter:
       all:
         collection: "Parental: All"
       sort_by: random
       limit: 500
-      
 
-  "Parental: Top-Rated":
-    summary: "Top-Rated movies suitable for children"
+  "Parental: Recently Released":
+    summary: "Recently released movies suitable for children"
+    url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-released.png
+    template: {
+                    name: plex,
+                    num: "X"
+                    }
+    smart_filter:
+      all:
+        collection: "Parental: All"
+      sort_by: release.desc
+      limit: 250
+
+  "Parental: Recently Added":
+    summary: "Recently added movies suitable for children"
+    url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-added.png
+    template: {
+                    name: plex,
+                    num: "Y"
+                    }
+    smart_filter:
+      all:
+        collection: "Parental: All"
+      sort_by: added.desc
+      limit: 250
+
+  "Parental: Top Rated":
+    summary: "Top rated movies suitable for children"
     url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-top-rated.png
     template: {
-                    name: mdblist_toprated,
-                    num: "Z",
-                    mdblist_user: "a2u2y13",
-                    mdblist_list: "list-suitable-for-children" 
-                    }
\ No newline at end of file
+                    name: plex,
+                    num: "Z"
+                    }
+    smart_filter:
+      all:
+        collection: "Parental: All"
+      sort_by: critic_rating.desc
+      limit: 250
\ No newline at end of file
diff --git a/0x5f3/metadata/show/1_parental.yml b/0x5f3/metadata/show/1_parental.yml
index 6a47a7c..25795f9 100644
--- a/0x5f3/metadata/show/1_parental.yml
+++ b/0x5f3/metadata/show/1_parental.yml
@@ -1,15 +1,18 @@
+## 1_parental.yml
+
 templates:
   plex:
     sort_title: "+1_<<num>>_<<collection_name>>"
     sync_mode: sync
     collection_mode: hide
+    label.sync: Parental
     visible_home: false
     visible_shared: false
     visible_library: false
     delete_not_scheduled: false
     cache_builders: 4
 
-  mdblist_title:
+  mdblist:
     optional:
       - mdblist_extra_1
       - mdblist_extra_2
@@ -20,111 +23,24 @@ templates:
     sync_mode: sync
     collection_mode: hide
     collection_order: title.asc
+    label.sync: Parental
+    item_label.sync: Parental
     visible_home: false
     visible_shared: false
     visible_library: false
     delete_not_scheduled: false
     cache_builders: 6
     mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
-  mdblist_added:
-    optional:
-      - mdblist_extra_1
-      - mdblist_extra_2
-      - mdblist_extra_3
-      - mdblist_extra_4
-      - mdblist_extra_5
-    sort_title: "+1_<<num>>_<<collection_name>>"
-    sync_mode: sync
-    limit: 250
-    collection_mode: hide
-    collection_order: added.desc
-    visible_home: false
-    visible_shared: false
-    visible_library: false
-    delete_not_scheduled: false
-    cache_builders: 6
-    mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
-  mdblist_random:
-    optional:
-      - mdblist_extra_1
-      - mdblist_extra_2
-      - mdblist_extra_3
-      - mdblist_extra_4
-      - mdblist_extra_5
-    sort_title: "+1_<<num>>_<<collection_name>>"
-    sync_mode: sync
-    limit: 250
-    collection_mode: hide
-    collection_order: random
-    visible_home: false
-    visible_shared: false
-    visible_library: false
-    delete_not_scheduled: false
-    cache_builders: 6
-    mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
-  mdblist_toprated: 
-    optional:
-      - mdblist_extra_1
-      - mdblist_extra_2
-      - mdblist_extra_3
-      - mdblist_extra_4
-      - mdblist_extra_5
-    sort_title: "+1_<<num>>_<<collection_name>>"
-    sync_mode: sync
-    limit: 250
-    collection_mode: hide
-    collection_order: critic_rating.desc
-    visible_home: false
-    visible_shared: false
-    visible_library: false
-    delete_not_scheduled: false
-    cache_builders: 6
-    mdblist_list: 
-      - https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
-      - <<mdblist_extra_1>>
-      - <<mdblist_extra_2>>
-      - <<mdblist_extra_3>>
-      - <<mdblist_extra_4>>
-      - <<mdblist_extra_5>>
-      
+      url: https://mdblist.com/lists/<<mdblist_user>>/<<mdblist_list>>/
+      sort_by: title.desc
+
 collections:
   "Parental: All":
     summary: "TV shows suitable for children"
     url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-all.png
     template: {
-                    name: mdblist_title,
-                    num: "W",
-                    mdblist_user: "a2u2y13",
-                    mdblist_list: "list-suitable-for-children"
-                    }
-                   
-  "Parental: Recently Added":
-    summary: "Recently added TV shows suitable for children"
-    url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-added.png
-    template: {
-                    name: mdblist_added,
-                    num: "X",
+                    name: mdblist,
+                    num: "V",
                     mdblist_user: "a2u2y13",
                     mdblist_list: "list-suitable-for-children"
                     }
@@ -135,21 +51,49 @@ collections:
     schedule: daily
     template: {
                     name: plex,
-                    num: "Y"
+                    num: "W"
                     }
     smart_filter:
       all:
         collection: "Parental: All"
       sort_by: random
+      limit: 500
+
+  "Parental: Recently Released":
+    summary: "Recently released TV shows suitable for children"
+    url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-released.png
+    template: {
+                    name: plex,
+                    num: "X"
+                    }
+    smart_filter:
+      all:
+        collection: "Parental: All"
+      sort_by: release.desc
+      limit: 250
+
+  "Parental: Recently Added":
+    summary: "Recently added TV shows suitable for children"
+    url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-added.png
+    template: {
+                    name: plex,
+                    num: "Y"
+                    }
+    smart_filter:
+      all:
+        collection: "Parental: All"
+      sort_by: added.desc
       limit: 250
-      
 
-  "Parental: Top-Rated":
-    summary: "Top-Rated TV shows suitable for children"
+  "Parental: Top Rated":
+    summary: "Top rated TV shows suitable for children"
     url_poster: https://raw.githubusercontent.com/0x5f3/pmm-config/assets/assets/parental/parental-top-rated.png
     template: {
-                    name: mdblist_toprated,
-                    num: "Z",
-                    mdblist_user: "a2u2y13",
-                    mdblist_list: "list-suitable-for-children" 
-                    }
\ No newline at end of file
+                    name: plex,
+                    num: "Z"
+                    }
+    smart_filter:
+      all:
+        collection: "Parental: All"
+      sort_by: critic_rating.desc
+      limit: 250
\ No newline at end of file