Merge branch 'meisnate12:master' into master

PMM/CHANGELOG

@@ -3,6 +3,8 @@ Added Common Sense Selection [Movie](https://www.commonsensemedia.org/reviews/ca
 Added several [visual styles for Separators](https://github.com/meisnate12/Plex-Meta-Manager-Images/tree/master/separators) to match PLEX's Categories theming. Called using `sep_style` template variable
 
 # OVERLAY CHANGES
+Enhanced resolution.yml and special_release.yml to add International Cut, Ultimate Cut, Anniversary Cut, Theatrical Cut, Collectors Edition for both dovetail overlays with resolutions and box overlays
+Enhanced resolution.yml and special_release.yml to support both dovetail overlays with resolutions and box overlays when resolutions are not being used. Regexes were enhanced to support the new TRaSH naming guides with the `{edition-` naming scheme
 Added [Common Sense Age Rating](https://www.commonsensemedia.org/) overlays, called with `- git: PMM/overlays/commonsense` and to be used in combination with operation `mass_content_rating_update: mdb_commonsense`
 - See [this image](https://media.discordapp.net/attachments/1018513616653262908/1020094756329623624/unknown.png)
 Added Common Sense Selection overlays, called with `- git: PMM/overlays/commonsense_selection`

PMM/award/other.yml

@@ -34,17 +34,6 @@ external_templates:
     collection_section: 16
 
 collections:
-  Cesar:
-    variables:
-      key: cesar
-    template:
-      - name: shared
-        allowed_libraries: movie
-        image: award/cesar/winner
-      - name: arr
-      - name: custom
-    trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/cesar-award-best-french-film
-
   Berlinale:
     variables:
       key: berlinale
@@ -56,6 +45,28 @@ collections:
       - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/berlin-international-film-festival-golden-bears
 
+  Cesar:
+    variables:
+      key: cesar
+    template:
+      - name: shared
+        allowed_libraries: movie
+        image: award/cesar/winner
+      - name: arr
+      - name: custom
+    trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/cesar-award-best-french-film
+
+  Razzies:
+    variables:
+      key: razzie
+    template:
+      - name: shared
+        allowed_libraries: movie
+        image: award/razzie/winner
+      - name: arr
+      - name: custom
+    trakt_list_details: https://trakt.tv/users/hdlists/lists/razzie-awards-worst-picture-winners
+
   Venice:
     variables:
       key: venice
@@ -66,3 +77,4 @@ collections:
       - name: arr
       - name: custom
     trakt_list_details: https://trakt.tv/users/maxwelldeux/lists/venice-film-festival-golden-lion
+

PMM/overlays/ratings.yml

@@ -22,7 +22,8 @@
 #          # Set rating image for rating1, rating2, and/or  #
 #                rating3                                    #
 #          # Rating Images: anidb, imdb, letterboxd, tmdb,  #
-#                metacritic, rt_popcorn, rt_tomato, trakt   #
+#                metacritic, rt_popcorn, rt_tomato, trakt,  #
+#                mal                                        #
 #                                                           #
 #          rating1_image: imdb                              #
 #          rating2_image: rt_popcorn                        #
@@ -125,7 +126,7 @@ templates:
         default: true
         conditions:
           - image_level: Top
-            rating<<rating_num>>_image: [anidb, letterboxd, rt_popcorn, mdblist, tmdb, trakt]
+            rating<<rating_num>>_image: [anidb, letterboxd, rt_popcorn, mdblist, tmdb, trakt, mal]
             value: false
           - image_level: Top
             overlay_level: episode
@@ -167,6 +168,8 @@ templates:
             value: TMDb
           - rating<<rating_num>>_image: trakt
             value: Trakt
+          - rating<<rating_num>>_image: mal
+            value: MAL
       rating<<rating_num>>_horizontal_align:
         default: left
         conditions:

PMM/overlays/resolution.yml

@@ -63,6 +63,11 @@ templates:
       - Unrated-Edition
       - Special-Edition
       - Final-Cut
+      - Anniversary-Edition
+      - Collectors-Edition
+      - International-Cut
+      - Theatrical-Cut
+      - Ultimate-Cut
       - IMAX-E
       - IMAX
       - Remastered

PMM/overlays/special_release.yml

@@ -23,24 +23,36 @@
 #          # Set the vertical align for the overlay         #
 #          vertical_align: top                              #
 #                                                           #
-#          # Use the Criterion overlay                      #
-#          use_criterion: true                              #
-#          # Use the IMAX-E overlay                         #
-#          use_enhanced: true                               #
-#          # Use the IMAX overlay                           #
-#          use_imax: true                                   #
 #          # Use the Director's Cut overlay                 #
 #          use_directorscut: true                           #
-#          # Use the Uncut overlay                          #
-#          use_uncut: true                                  #
 #          # Use the Extended overlay                       #
 #          use_extended: true                               #
-#          # Use the Remastered overlay                     #
+#          # Use the Uncut overlay                          #
-#          use_remastered: true                             #
+#          use_uncut: true                                  #
+#          # Use the Unrated overlay                        #
+#          use_unrated: true                                #
 #          # Use the Special overlay                        #
 #          use_special: true                                #
 #          # Use the Final Cut overlay                      #
 #          use_finalcut: true                               #
+#          # Use the Anniversary overlay                    #
+#          use_anniversary: true                            #
+#          # Use the Collectors overlay                     #
+#          use_collector: true                              #
+#          # Use the International overlay                  #
+#          use_international: true                          #
+#          # Use the Theatrical overlay                     #
+#          use_theatrical: true                             #
+#          # Use the Ultimate overlay                       #
+#          use_ultimate: true                               #
+#          # Use the IMAX-E overlay                         #
+#          use_enhanced: true                               #
+#          # Use the IMAX overlay                           #
+#          use_imax: true                                   #
+#          # Use the Remastered overlay                     #
+#          use_remastered: true                             #
+#          # Use the Criterion overlay                      #
+#          use_criterion: true                              #
 #############################################################
 
 templates:
@@ -73,7 +85,7 @@ overlays:
   Directors-Cut:
     template:
       - name: Edition
-        weight: 100
+        weight: 150
         slug: directorscut
         overlay: Directors-Cut
     suppress_overlays:
@@ -87,7 +99,7 @@ overlays:
   Directors-Cut-Dovetail:
     template:
       - name: Edition
-        weight: 100
+        weight: 150
         slug: directorscut
         extra: ''
         vertical_offset: 99
@@ -102,7 +114,7 @@ overlays:
   Extended-Edition:
     template:
       - name: Edition
-        weight: 90
+        weight: 140
         slug: extended
         overlay: Extended-Edition
     suppress_overlays:
@@ -116,7 +128,7 @@ overlays:
   Extended-Edition-Dovetail:
     template:
       - name: Edition
-        weight: 90
+        weight: 140
         slug: extended
         extra: ''
         vertical_offset: 99
@@ -131,7 +143,7 @@ overlays:
   Uncut-Edition:
     template:
       - name: Edition
-        weight: 80
+        weight: 130
         slug: uncut
         overlay: Uncut-Edition
     suppress_overlays:
@@ -145,7 +157,7 @@ overlays:
   Uncut-Edition-Dovetail:
     template:
       - name: Edition
-        weight: 80
+        weight: 130
         slug: uncut
         extra: ''
         vertical_offset: 99
@@ -160,7 +172,7 @@ overlays:
   Unrated-Edition:
     template:
       - name: Edition
-        weight: 70
+        weight: 120
         slug: unrated
         overlay: Unrated-Edition
     suppress_overlays:
@@ -174,7 +186,7 @@ overlays:
   Unrated-Edition-Dovetail:
     template:
       - name: Edition
-        weight: 70
+        weight: 120
         slug: unrated
         extra: ''
         vertical_offset: 99
@@ -189,7 +201,7 @@ overlays:
   Special-Edition:
     template:
       - name: Edition
-        weight: 60
+        weight: 110
         slug: special
         overlay: Special-Edition
     suppress_overlays:
@@ -203,7 +215,7 @@ overlays:
   Special-Edition-Dovetail:
     template:
       - name: Edition
-        weight: 60
+        weight: 110
         slug: special
         extra: ''
         vertical_offset: 99
@@ -218,7 +230,7 @@ overlays:
   Final-Cut:
     template:
       - name: Edition
-        weight: 50
+        weight: 100
         slug: finalcut
         overlay: Final-Cut
     suppress_overlays:
@@ -232,7 +244,7 @@ overlays:
   Final-Cut-Dovetail:
     template:
       - name: Edition
-        weight: 50
+        weight: 100
         slug: finalcut
         extra: ''
         vertical_offset: 99
@@ -244,6 +256,150 @@ overlays:
         - 'edition-(?i)\bFinal\b'               # New TRaSH naming
         - '(?<=[0-9]{4}[)}>\]]\s)\bFinal\b'     # Original TRaSH naming
 
+  Anniversary-Edition:
+    template:
+      - name: Edition
+        weight: 90
+        slug: anniversary
+        overlay: Anniversary-Edition
+    suppress_overlays:
+      - Anniversary-Edition-Dovetail
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bAnniversary\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bAnniversary\b'     # Original TRaSH naming
+
+  Anniversary-Edition-Dovetail:
+    template:
+      - name: Edition
+        weight: 90
+        slug: anniversary
+        extra: ''
+        vertical_offset: 99
+        group: Dovetail
+        overlay: Anniversary-Edition
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bAnniversary\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bAnniversary\b'     # Original TRaSH naming
+
+  Collectors-Edition:
+    template:
+      - name: Edition
+        weight: 80
+        slug: collector
+        overlay: Collectors-Edition
+    suppress_overlays:
+      - Collectors-Edition-Dovetail
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\b(Collector|Collectors)\b'           # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\b(Collector|Collectors)\b' # Original TRaSH naming
+
+  Collectors-Edition-Dovetail:
+    template:
+      - name: Edition
+        weight: 80
+        slug: collector
+        extra: ''
+        vertical_offset: 99
+        group: Dovetail
+        overlay: Collectors-Edition
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\b(Collector|Collectors)\b'           # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\b(Collector|Collectors)\b' # Original TRaSH naming
+
+  International-Cut:
+    template:
+      - name: Edition
+        weight: 70
+        slug: international
+        overlay: International-Cut
+    suppress_overlays:
+      - International-Cut-Dovetail
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bInternational\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bInternational\b'     # Original TRaSH naming
+
+  International-Cut-Dovetail:
+    template:
+      - name: Edition
+        weight: 70
+        slug: international
+        extra: ''
+        vertical_offset: 99
+        group: Dovetail
+        overlay: International-Cut
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bInternational\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bInternational\b'     # Original TRaSH naming
+
+  Theatrical-Cut:
+    template:
+      - name: Edition
+        weight: 60
+        slug: theatrical
+        overlay: Theatrical-Cut
+    suppress_overlays:
+      - Theatrical-Cut-Dovetail
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bTheatrical\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bTheatrical\b'     # Original TRaSH naming
+
+  Theatrical-Cut-Dovetail:
+    template:
+      - name: Edition
+        weight: 60
+        slug: theatrical
+        extra: ''
+        vertical_offset: 99
+        group: Dovetail
+        overlay: Theatrical-Cut
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bTheatrical\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bTheatrical\b'     # Original TRaSH naming
+
+  Ultimate-Cut:
+    template:
+      - name: Edition
+        weight: 50
+        slug: Ultimate
+        overlay: Ultimate-Cut
+    suppress_overlays:
+      - Ultimate-Cut-Dovetail
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bUltimate\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bUltimate\b'     # Original TRaSH naming
+
+  Ultimate-Cut-Dovetail:
+    template:
+      - name: Edition
+        weight: 50
+        slug: Ultimate
+        extra: ''
+        vertical_offset: 99
+        group: Dovetail
+        overlay: Ultimate-Cut
+    plex_all: true
+    filters:
+      filepath.regex: 
+        - 'edition-(?i)\bUltimate\b'               # New TRaSH naming
+        - '(?<=[0-9]{4}[)}>\]]\s)\bUltimate\b'     # Original TRaSH naming
   IMAX-E:
     template:
       - name: Edition
@@ -319,6 +475,7 @@ overlays:
         overlay: Remastered
     plex_all: true
     filters:
+      filepath.regex: 
         - 'edition-(?i)\b(Remaster|Remastered|4k Remaster|4k Remastered)\b'               # New TRaSH naming
         - '(?<=[0-9]{4}[)}>\]]\s)(?i)\b(Remaster|Remastered|4k Remaster|4k Remastered)\b' # Original TRaSH naming
 
@@ -348,4 +505,4 @@ overlays:
     filters:
       filepath.regex:
         - '(?i)Criterion'
-        - '(?i)\[CC\]'
+        - '(?i)\[CC\]'

PMM/streaming.yml

@@ -80,6 +80,7 @@ templates:
   streaming:
     default:
       sort_by: release.desc
+      sort_by_<<key>>: <<sort_by>>
     ignore_blank_results: true
     cache_builders: 1
     smart_label: <<sort_by_<<key>>>>

bullmoose20/config.yml

@@ -1,7 +1,7 @@
 # This file is a template remove the .template to use the file
 
 libraries:                                        # Library mappings must have a colon (:) placed after them
-  Movies:
+  TestMovies:
     report_path: config/missing/Movies_missing.yml
     template_variables:
       sep_style: gray
@@ -110,27 +110,29 @@ libraries:                                        # Library mappings must have a
     overlay_path:
     - remove_overlays: false
     - reapply_overlay: true
-    - git: PMM/overlays/age
+    # - file: config/metadata/overlays/editions
-    - git: PMM/overlays/audio_codec
+    # - git: PMM/overlays/audio_codec
+      # # template_variables:
+        # # style: standard
+    # - git: PMM/overlays/audio_language
+    # - git: PMM/overlays/commonsense
+    # # - git: PMM/overlays/direct_play
+    # - git: PMM/overlays/oscars
       # template_variables:
-        # style: standard
+        # weight: 40
-    - git: PMM/overlays/audio_language
+    # - git: PMM/overlays/imdb_top_250
-    # - git: PMM/overlays/direct_play
+      # template_variables:
-    - git: PMM/overlays/oscars
+        # weight: 30
-      template_variables:
+    # - git: PMM/overlays/rt_cert_fresh
-        weight: 40
+      # template_variables:
-    - git: PMM/overlays/imdb_top_250
+        # weight: 20
-      template_variables:
+    # - git: PMM/overlays/mc_must_see
-        weight: 30
+      # template_variables:
-    - git: PMM/overlays/rt_cert_fresh
+        # weight: 10
-      template_variables:
+    # - git: PMM/overlays/commonsense_selection
-        weight: 20
+      # template_variables:
-    - git: PMM/overlays/mc_must_see
+        # weight: 5
-      template_variables:
+    # - git: PMM/overlays/mediastinger
-        weight: 10
-    - git: PMM/overlays/commonsense_selection
-      template_variables:
-        weight: 5
     - git: PMM/overlays/ratings
       template_variables:
         rating1: user
@@ -164,12 +166,17 @@ libraries:                                        # Library mappings must have a
         # font: config/metadata/overlays/fonts/Claspo-ND-Medium.ttf
         # rating_source: Rotten
         # font: config/metadata/overlays/fonts/Adlib.ttf
-    - git: PMM/overlays/resolution
+    # - git: PMM/overlays/resolution
-    - git: PMM/overlays/special_release
+    # - git: PMM/overlays/special_release
-    - git: PMM/overlays/streaming
+    - file: config/metadata/overlays/top10
-    - git: PMM/overlays/versions
+      template_variables:
-    - git: PMM/overlays/video_format
+        time_window: this_year
-    - git: PMM/overlays/mediastinger
+        horizontal_position: left
+    # - pmm: resolution
+    # - pmm: special_release
+    # - git: PMM/overlays/streaming
+    # - git: PMM/overlays/versions
+    # - git: PMM/overlays/video_format
     settings:
       asset_directory:
       - config/assets
@@ -186,7 +193,7 @@ libraries:                                        # Library mappings must have a
       mass_originally_available_update: tmdb
       mass_imdb_parental_labels: without_none
 
-  TV Shows:
+  TestTV Shows:
     report_path: config/missing/TV_missing.yml
     template_variables:
       sep_style: gray
@@ -242,164 +249,195 @@ libraries:                                        # Library mappings must have a
     overlay_path:
     - remove_overlays: false
     - reapply_overlay: true
-    - git: PMM/overlays/age
+    # - git: PMM/overlays/audio_codec
-    - git: PMM/overlays/age
+    # - git: PMM/overlays/audio_codec
-      template_variables:
-        overlay_level: episode
-    - git: PMM/overlays/age
-      template_variables:
-        overlay_level: season
-    - git: PMM/overlays/audio_codec
-    - git: PMM/overlays/audio_codec
-      template_variables:
-        overlay_level: episode
-    - git: PMM/overlays/audio_codec
-      template_variables:
-        overlay_level: season
-    - git: PMM/overlays/audio_language
-    - git: PMM/overlays/audio_language
-      template_variables:
-        overlay_level: episode
-    - git: PMM/overlays/audio_language
-      template_variables:
-        overlay_level: season
-    # - git: PMM/overlays/direct_play
-    # - git: PMM/overlays/direct_play
       # template_variables:
         # overlay_level: episode
-    # - git: PMM/overlays/direct_play
+    # - git: PMM/overlays/audio_codec
       # template_variables:
         # overlay_level: season
-    - git: PMM/overlays/imdb_top_250
+    # - git: PMM/overlays/audio_language
-      template_variables:
+    # - git: PMM/overlays/audio_language
-        weight: 30
+      # template_variables:
-    - git: PMM/overlays/imdb_top_250
+        # overlay_level: episode
-      template_variables:
+    # - git: PMM/overlays/audio_language
-        weight: 30
+      # template_variables:
-        overlay_level: season
+        # overlay_level: season
-    - git: PMM/overlays/imdb_top_250
+    # - git: PMM/overlays/commonsense
-      template_variables:
+    # - git: PMM/overlays/commonsense
-        weight: 30
+      # template_variables:
-        overlay_level: episode
+        # overlay_level: episode
-    - git: PMM/overlays/rt_cert_fresh
+    # - git: PMM/overlays/commonsense
-      template_variables:
+      # template_variables:
-        weight: 20
+        # overlay_level: season
-    - git: PMM/overlays/rt_cert_fresh
+   # # - git: PMM/overlays/direct_play
-      template_variables:
+    # # - git: PMM/overlays/direct_play
-        weight: 20
+      # # template_variables:
-        overlay_level: season
+        # # overlay_level: episode
-    - git: PMM/overlays/rt_cert_fresh
+    # # - git: PMM/overlays/direct_play
-      template_variables:
+      # # template_variables:
-        weight: 20
+        # # overlay_level: season
-        overlay_level: episode
+    # - git: PMM/overlays/imdb_top_250
-    - git: PMM/overlays/mc_must_see
+      # template_variables:
-      template_variables:
+        # weight: 30
-        weight: 10
+    # - git: PMM/overlays/imdb_top_250
-    - git: PMM/overlays/mc_must_see
+      # template_variables:
-      template_variables:
+        # weight: 30
-        weight: 10
+        # overlay_level: season
-        overlay_level: season
+    # - git: PMM/overlays/imdb_top_250
-    - git: PMM/overlays/mc_must_see
+      # template_variables:
-      template_variables:
+        # weight: 30
-        weight: 10
+        # overlay_level: episode
-        overlay_level: episode
+    # - git: PMM/overlays/rt_cert_fresh
-    - git: PMM/overlays/commonsense_selection
+      # template_variables:
-      template_variables:
+        # weight: 20
-        weight: 5
+    # - git: PMM/overlays/rt_cert_fresh
-    - git: PMM/overlays/commonsense_selection
+      # template_variables:
-      template_variables:
+        # weight: 20
-        weight: 5
+        # overlay_level: season
-        overlay_level: season
+    # - git: PMM/overlays/rt_cert_fresh
-    - git: PMM/overlays/commonsense_selection
+      # template_variables:
-      template_variables:
+        # weight: 20
-        weight: 5
+        # overlay_level: episode
-        overlay_level: episode
+    # - git: PMM/overlays/mc_must_see
-    - git: PMM/overlays/ratings
+      # template_variables:
-      template_variables:
+        # weight: 10
-        rating1: user
+    # - git: PMM/overlays/mc_must_see
-        rating1_image: rt_tomato
+      # template_variables:
-        rating1_font: config/metadata/overlays/fonts/Adlib.ttf
+        # weight: 10
-        rating1_font_size: 63
+        # overlay_level: season
-
+    # - git: PMM/overlays/mc_must_see
-        rating2: critic
+      # template_variables:
-        rating2_image: imdb
+        # weight: 10
-        rating2_font: config/metadata/overlays/fonts/Impact.ttf
+        # overlay_level: episode
-        rating2_font_size: 70
+    # - git: PMM/overlays/commonsense_selection
-
+      # template_variables:
-        rating3: audience
+        # weight: 5
-        rating3_image: tmdb
+    # - git: PMM/overlays/commonsense_selection
-        rating3_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf
+      # template_variables:
-        rating3_font_size: 70
+        # weight: 5
-
+        # overlay_level: season
-        horizontal_position: right
+    # - git: PMM/overlays/commonsense_selection
-    - git: PMM/overlays/ratings
+      # template_variables:
-      template_variables:
+        # weight: 5
+        # overlay_level: episode
+    # - git: PMM/overlays/mediastinger
+    # # - git: PMM/overlays/mediastinger
+      # # template_variables:
+        # # overlay_level: episode
+    # # - git: PMM/overlays/mediastinger
+      # # template_variables:
+        # # overlay_level: season
+    # - git: PMM/overlays/ratings
+      # template_variables:
         # rating1: user
         # rating1_image: rt_tomato
         # rating1_font: config/metadata/overlays/fonts/Adlib.ttf
         # rating1_font_size: 63
 
-        rating1: critic
+        # rating2: critic
-        rating1_image: imdb
+        # rating2_image: imdb
-        rating1_font: config/metadata/overlays/fonts/Impact.ttf
+        # rating2_font: config/metadata/overlays/fonts/Impact.ttf
-        rating1_font_size: 70
+        # rating2_font_size: 70
 
-        rating2: audience
+        # rating3: audience
-        rating2_image: tmdb
+        # rating3_image: tmdb
-        rating2_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf
+        # rating3_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf
-        rating2_font_size: 70
+        # rating3_font_size: 70
 
-        horizontal_position: right
+        # horizontal_position: right
-        overlay_level: episode
+    # - git: PMM/overlays/ratings
-    - git: PMM/overlays/resolution
+      # template_variables:
-    - git: PMM/overlays/resolution
+        # # rating1: user
-      template_variables:
+        # # rating1_image: rt_tomato
-        overlay_level: episode
+        # # rating1_font: config/metadata/overlays/fonts/Adlib.ttf
-    - git: PMM/overlays/resolution
+        # # rating1_font_size: 63
-      template_variables:
+
-        overlay_level: season
+        # rating1: critic
-    - file: config/metadata/overlays/episode_info
+        # rating1_image: imdb
-      template_variables:
+        # rating1_font: config/metadata/overlays/fonts/Impact.ttf
-        overlay_level: episode
+        # rating1_font_size: 70
-    - git: PMM/overlays/runtimes
+
-      template_variables:
+        # rating2: audience
-        overlay_level: episode
+        # rating2_image: tmdb
-    - git: PMM/overlays/special_release
+        # rating2_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf
-    - git: PMM/overlays/special_release
+        # rating2_font_size: 70
-      template_variables:
+
-        overlay_level: episode
+        # horizontal_position: right
-    - git: PMM/overlays/special_release
+        # overlay_level: episode
-      template_variables:
+    # - git: PMM/overlays/resolution
-        overlay_level: season
+    # - git: PMM/overlays/resolution
-    - git: PMM/overlays/streaming
-    - git: PMM/overlays/streaming
-      template_variables:
-        overlay_level: episode
-    - git: PMM/overlays/streaming
-      template_variables:
-        overlay_level: season
-    - git: PMM/overlays/versions
-    - git: PMM/overlays/versions
-      template_variables:
-        overlay_level: episode
-    - git: PMM/overlays/versions
-      template_variables:
-        overlay_level: season
-    - git: PMM/overlays/versions
-      template_variables:
-        overlay_level: show
-    - git: PMM/overlays/video_format
-    - git: PMM/overlays/video_format
-      template_variables:
-        overlay_level: episode
-    - git: PMM/overlays/video_format
-      template_variables:
-        overlay_level: season
-    - git: PMM/overlays/mediastinger
-    # - git: PMM/overlays/mediastinger
       # template_variables:
         # overlay_level: episode
-    # - git: PMM/overlays/mediastinger
+    # - git: PMM/overlays/resolution
+      # template_variables:
+        # overlay_level: season
+    # - git: PMM/overlays/episode_info
+      # template_variables:
+        # overlay_level: episode
+    # - pmm: resolution
+    # - pmm: resolution
+      # template_variables:
+        # overlay_level: episode
+    # - pmm: resolution
+      # template_variables:
+        # overlay_level: season
+    # - git: PMM/overlays/episode_info
+      # template_variables:
+        # overlay_level: episode
+    # - git: PMM/overlays/runtimes
+      # template_variables:
+        # overlay_level: episode
+    # - pmm: special_release
+    # - pmm: special_release
+      # template_variables:
+        # overlay_level: episode
+    # - pmm: special_release
+      # template_variables:
+        # overlay_level: season
+    # - git: PMM/overlays/special_release
+    # - git: PMM/overlays/special_release
+      # template_variables:
+        # overlay_level: episode
+    # - git: PMM/overlays/special_release
+      # template_variables:
+        # overlay_level: season
+    - file: config/metadata/overlays/top10
+      template_variables:
+        horizontal_position: left
+        time_window: this_year
+    - file: config/metadata/overlays/top10
+      template_variables:
+        horizontal_position: left
+        time_window: this_year
+        overlay_level: episode
+    - file: config/metadata/overlays/top10
+      template_variables:
+        horizontal_position: left
+        time_window: this_year
+        overlay_level: season
+    # - git: PMM/overlays/streaming
+    # - git: PMM/overlays/streaming
+      # template_variables:
+        # overlay_level: episode
+    # - git: PMM/overlays/streaming
+      # template_variables:
+        # overlay_level: season
+    # - git: PMM/overlays/versions
+    # - git: PMM/overlays/versions
+      # template_variables:
+        # overlay_level: episode
+    # - git: PMM/overlays/versions
+      # template_variables:
+        # overlay_level: season
+    # - git: PMM/overlays/versions
+      # template_variables:
+        # overlay_level: show
+    # - git: PMM/overlays/video_format
+    # - git: PMM/overlays/video_format
+      # template_variables:
+        # overlay_level: episode
+    # - git: PMM/overlays/video_format
       # template_variables:
         # overlay_level: season
     settings:
@@ -545,3 +583,4 @@ mal:
     expires_in: 2678400
     refresh_token: (redacted)
   localhost_url:
+  cache_expiration: 60