diff --git a/JJJonesJr33/Plex-Meta-Manager-All/metadata/decades.yml b/JJJonesJr33/Plex-Meta-Manager-All/metadata/decades.yml
index 3640685..6763265 100644
--- a/JJJonesJr33/Plex-Meta-Manager-All/metadata/decades.yml
+++ b/JJJonesJr33/Plex-Meta-Manager-All/metadata/decades.yml
@@ -9,13 +9,10 @@
 
 templates:        
   Decade:
-    smart_filter:
-      any:
-        decade: <<decade>>
-      sort_by: year.desc
-      url_poster: https://theposterdb.com/api/assets/<<poster>>
-      sort_title: +++++_<<collection_name>>
-      collection_mode: hide
+    url_poster: https://theposterdb.com/api/assets/<<poster>>
+    sort_title: +++++++++++_<<collection_name>>
+    collection_mode: hide
+    sync_mode: sync
 
 #############################
 ##       Collections       ##
@@ -23,41 +20,93 @@ templates:
 
 collections:
   2030's Films:
-    template: {name: Decade, decade: 2030, poster: 213590}
+    template: {name: Decade, poster: 213590}
+    smart_filter:
+      any:
+        decade: 2030
+      sort_by: year.desc
     summary: A collection of films during the 2030s
   2020's Films:
-    template: {name: Decade, decade: 2020, poster: 213589}
+    template: {name: Decade, poster: 213589}
+    smart_filter:
+      any:
+        decade: 2020
+      sort_by: year.desc
     summary: A collection of films during the 2020s
   2010's Films:
-    template: {name: Decade, decade: 2010, poster: 213588}
+    template: {name: Decade, poster: 213588}
+    smart_filter:
+      any:
+        decade: 2010
+      sort_by: year.desc
     summary: A collection of films during the 2010s
   2000's Films:
-    template: {name: Decade, decade: 2000, poster: 213587}
+    template: {name: Decade, poster: 213587}
+    smart_filter:
+      any:
+        decade: 2000
+      sort_by: year.desc
     summary: A collection of films during the 2000s
   1990's Films:
-    template: {name: Decade, decade: 1990, poster: 213586}
+    template: {name: Decade, poster: 213586}
+    smart_filter:
+      any:
+        decade: 1990
+      sort_by: year.desc
     summary: A collection of films during the 1990s
   1980's Films:
-    template: {name: Decade, decade: 1980, poster: 213585}
+    template: {name: Decade, poster: 213585}
+    smart_filter:
+      any:
+        decade: 1980
+      sort_by: year.desc
     summary: A collection of films during the 1980s
   1970's Films:
-    template: {name: Decade, decade: 1970, poster: 213584}
+    template: {name: Decade, poster: 213584}
+    smart_filter:
+      any:
+        decade: 1970
+      sort_by: year.desc
     summary: A collection of films during the 1970s
   1960's Films:
-    template: {name: Decade, decade: 1960, poster: 213583}
+    template: {name: Decade, poster: 213583}
+    smart_filter:
+      any:
+        decade: 1960
+      sort_by: year.desc
     summary: A collection of films during the 1960s
   1950's Films:
-    template: {name: Decade, decade: 1950, poster: 213582}
+    template: {name: Decade, poster: 213582}
+    smart_filter:
+      any:
+        decade: 1950
+      sort_by: year.desc
     summary: A collection of films during the 1950s
   1940's Films:
-    template: {name: Decade, decade: 1940, poster: 213581}
+    template: {name: Decade, poster: 213581}
+    smart_filter:
+      any:
+        decade: 1940
+      sort_by: year.desc
     summary: A collection of films during the 1940s
   1930's Films:
-    template: {name: Decade, decade: 1930, poster: 213580}
+    template: {name: Decade, poster: 213580}
+    smart_filter:
+      any:
+        decade: 1930
+      sort_by: year.desc
     summary: A collection of films during the 1930s
   1920's Films:
-    template: {name: Decade, decade: 1920, poster: 213579}
+    template: {name: Decade, poster: 213579}
+    smart_filter:
+      any:
+        decade: 1920
+      sort_by: year.desc
     summary: A collection of films during the 1920s
   1910's Films:
-    template: {name: Decade, decade: 1910, poster: 213578}
+    template: {name: Decade, poster: 213578}
+    smart_filter:
+      any:
+        decade: 1910
+      sort_by: year.desc
     summary: A collection of films during the 1910s
diff --git a/JJJonesJr33/Plex-Meta-Manager-Movies/metadata/decades.yml b/JJJonesJr33/Plex-Meta-Manager-Movies/metadata/decades.yml
index 3640685..6763265 100644
--- a/JJJonesJr33/Plex-Meta-Manager-Movies/metadata/decades.yml
+++ b/JJJonesJr33/Plex-Meta-Manager-Movies/metadata/decades.yml
@@ -9,13 +9,10 @@
 
 templates:        
   Decade:
-    smart_filter:
-      any:
-        decade: <<decade>>
-      sort_by: year.desc
-      url_poster: https://theposterdb.com/api/assets/<<poster>>
-      sort_title: +++++_<<collection_name>>
-      collection_mode: hide
+    url_poster: https://theposterdb.com/api/assets/<<poster>>
+    sort_title: +++++++++++_<<collection_name>>
+    collection_mode: hide
+    sync_mode: sync
 
 #############################
 ##       Collections       ##
@@ -23,41 +20,93 @@ templates:
 
 collections:
   2030's Films:
-    template: {name: Decade, decade: 2030, poster: 213590}
+    template: {name: Decade, poster: 213590}
+    smart_filter:
+      any:
+        decade: 2030
+      sort_by: year.desc
     summary: A collection of films during the 2030s
   2020's Films:
-    template: {name: Decade, decade: 2020, poster: 213589}
+    template: {name: Decade, poster: 213589}
+    smart_filter:
+      any:
+        decade: 2020
+      sort_by: year.desc
     summary: A collection of films during the 2020s
   2010's Films:
-    template: {name: Decade, decade: 2010, poster: 213588}
+    template: {name: Decade, poster: 213588}
+    smart_filter:
+      any:
+        decade: 2010
+      sort_by: year.desc
     summary: A collection of films during the 2010s
   2000's Films:
-    template: {name: Decade, decade: 2000, poster: 213587}
+    template: {name: Decade, poster: 213587}
+    smart_filter:
+      any:
+        decade: 2000
+      sort_by: year.desc
     summary: A collection of films during the 2000s
   1990's Films:
-    template: {name: Decade, decade: 1990, poster: 213586}
+    template: {name: Decade, poster: 213586}
+    smart_filter:
+      any:
+        decade: 1990
+      sort_by: year.desc
     summary: A collection of films during the 1990s
   1980's Films:
-    template: {name: Decade, decade: 1980, poster: 213585}
+    template: {name: Decade, poster: 213585}
+    smart_filter:
+      any:
+        decade: 1980
+      sort_by: year.desc
     summary: A collection of films during the 1980s
   1970's Films:
-    template: {name: Decade, decade: 1970, poster: 213584}
+    template: {name: Decade, poster: 213584}
+    smart_filter:
+      any:
+        decade: 1970
+      sort_by: year.desc
     summary: A collection of films during the 1970s
   1960's Films:
-    template: {name: Decade, decade: 1960, poster: 213583}
+    template: {name: Decade, poster: 213583}
+    smart_filter:
+      any:
+        decade: 1960
+      sort_by: year.desc
     summary: A collection of films during the 1960s
   1950's Films:
-    template: {name: Decade, decade: 1950, poster: 213582}
+    template: {name: Decade, poster: 213582}
+    smart_filter:
+      any:
+        decade: 1950
+      sort_by: year.desc
     summary: A collection of films during the 1950s
   1940's Films:
-    template: {name: Decade, decade: 1940, poster: 213581}
+    template: {name: Decade, poster: 213581}
+    smart_filter:
+      any:
+        decade: 1940
+      sort_by: year.desc
     summary: A collection of films during the 1940s
   1930's Films:
-    template: {name: Decade, decade: 1930, poster: 213580}
+    template: {name: Decade, poster: 213580}
+    smart_filter:
+      any:
+        decade: 1930
+      sort_by: year.desc
     summary: A collection of films during the 1930s
   1920's Films:
-    template: {name: Decade, decade: 1920, poster: 213579}
+    template: {name: Decade, poster: 213579}
+    smart_filter:
+      any:
+        decade: 1920
+      sort_by: year.desc
     summary: A collection of films during the 1920s
   1910's Films:
-    template: {name: Decade, decade: 1910, poster: 213578}
+    template: {name: Decade, poster: 213578}
+    smart_filter:
+      any:
+        decade: 1910
+      sort_by: year.desc
     summary: A collection of films during the 1910s